From a23e8f77a3710ca96b34f17774f8651f4a3a20e1 Mon Sep 17 00:00:00 2001 From: AcuityAds Date: Wed, 17 Aug 2022 10:36:34 +0300 Subject: [PATCH 01/12] add prebid.js adapter --- modules/acuityAdsBidAdapter.js | 207 + modules/acuityAdsBidAdapter.md | 79 + package-lock.json | 23604 +--------------- test/spec/modules/acuityAdsBidAdapter_spec.js | 398 + 4 files changed, 727 insertions(+), 23561 deletions(-) create mode 100644 modules/acuityAdsBidAdapter.js create mode 100644 modules/acuityAdsBidAdapter.md create mode 100644 test/spec/modules/acuityAdsBidAdapter_spec.js diff --git a/modules/acuityAdsBidAdapter.js b/modules/acuityAdsBidAdapter.js new file mode 100644 index 00000000000..f469fe48c60 --- /dev/null +++ b/modules/acuityAdsBidAdapter.js @@ -0,0 +1,207 @@ +import { isFn, deepAccess, logMessage, logError } from '../src/utils.js'; +import { convertOrtbRequestToProprietaryNative } from '../src/native.js'; + +import { registerBidder } from '../src/adapters/bidderFactory.js'; +import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js'; +import { config } from '../src/config.js'; + +const BIDDER_CODE = 'acuityads'; +const AD_URL = 'https://prebid.admanmedia.com/pbjs'; +const SYNC_URL = 'https://cs.admanmedia.com'; + +function isBidResponseValid(bid) { + if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) { + return false; + } + + switch (bid.mediaType) { + case BANNER: + return Boolean(bid.width && bid.height && bid.ad); + case VIDEO: + return Boolean(bid.vastUrl || bid.vastXml); + case NATIVE: + return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length); + default: + return false; + } +} + +function getPlacementReqData(bid) { + const { params, bidId, mediaTypes } = bid; + const schain = bid.schain || {}; + const { placementId } = params; + const bidfloor = getBidFloor(bid); + + const placement = { + bidId, + schain, + bidfloor + }; + + placement.placementId = placementId; + placement.type = 'publisher'; + + if (mediaTypes && mediaTypes[BANNER]) { + placement.adFormat = BANNER; + placement.sizes = mediaTypes[BANNER].sizes; + } else if (mediaTypes && mediaTypes[VIDEO]) { + placement.adFormat = VIDEO; + placement.playerSize = mediaTypes[VIDEO].playerSize; + placement.minduration = mediaTypes[VIDEO].minduration; + placement.maxduration = mediaTypes[VIDEO].maxduration; + placement.mimes = mediaTypes[VIDEO].mimes; + placement.protocols = mediaTypes[VIDEO].protocols; + placement.startdelay = mediaTypes[VIDEO].startdelay; + placement.placement = mediaTypes[VIDEO].placement; + placement.skip = mediaTypes[VIDEO].skip; + placement.skipafter = mediaTypes[VIDEO].skipafter; + placement.minbitrate = mediaTypes[VIDEO].minbitrate; + placement.maxbitrate = mediaTypes[VIDEO].maxbitrate; + placement.delivery = mediaTypes[VIDEO].delivery; + placement.playbackmethod = mediaTypes[VIDEO].playbackmethod; + placement.api = mediaTypes[VIDEO].api; + placement.linearity = mediaTypes[VIDEO].linearity; + } else if (mediaTypes && mediaTypes[NATIVE]) { + placement.native = mediaTypes[NATIVE]; + placement.adFormat = NATIVE; + } + + return placement; +} + +function getBidFloor(bid) { + if (!isFn(bid.getFloor)) { + return deepAccess(bid, 'params.bidfloor', 0); + } + + try { + const bidFloor = bid.getFloor({ + currency: 'USD', + mediaType: '*', + size: '*', + }); + return bidFloor.floor; + } catch (err) { + logError(err); + return 0; + } +} + +export const spec = { + code: BIDDER_CODE, + supportedMediaTypes: [BANNER, VIDEO, NATIVE], + + isBidRequestValid: (bid = {}) => { + const { params, bidId, mediaTypes } = bid; + let valid = Boolean(bidId && params && params.placementId); + + if (mediaTypes && mediaTypes[BANNER]) { + valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes); + } else if (mediaTypes && mediaTypes[VIDEO]) { + valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize); + } else if (mediaTypes && mediaTypes[NATIVE]) { + valid = valid && Boolean(mediaTypes[NATIVE]); + } else { + valid = false; + } + return valid; + }, + + buildRequests: (validBidRequests = [], bidderRequest = {}) => { + // convert Native ORTB definition to old-style prebid native definition + validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests); + + let deviceWidth = 0; + let deviceHeight = 0; + + let winLocation; + try { + const winTop = window.top; + deviceWidth = winTop.screen.width; + deviceHeight = winTop.screen.height; + winLocation = winTop.location; + } catch (e) { + logMessage(e); + winLocation = window.location; + } + + const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page; + let refferLocation; + try { + refferLocation = refferUrl && new URL(refferUrl); + } catch (e) { + logMessage(e); + } + // TODO: does the fallback make sense here? + let location = refferLocation || winLocation; + const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : ''; + const host = location.host; + const page = location.pathname; + const secure = location.protocol === 'https:' ? 1 : 0; + const placements = []; + const request = { + deviceWidth, + deviceHeight, + language, + secure, + host, + page, + placements, + coppa: config.getConfig('coppa') === true ? 1 : 0, + ccpa: bidderRequest.uspConsent || undefined, + gdpr: bidderRequest.gdprConsent || undefined, + tmax: config.getConfig('bidderTimeout') + }; + + const len = validBidRequests.length; + for (let i = 0; i < len; i++) { + const bid = validBidRequests[i]; + placements.push(getPlacementReqData(bid)); + } + + return { + method: 'POST', + url: AD_URL, + data: request + }; + }, + + interpretResponse: (serverResponse) => { + let response = []; + for (let i = 0; i < serverResponse.body.length; i++) { + let resItem = serverResponse.body[i]; + if (isBidResponseValid(resItem)) { + const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : []; + resItem.meta = { ...resItem.meta, advertiserDomains }; + + response.push(resItem); + } + } + return response; + }, + + getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => { + let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image'; + let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`; + if (gdprConsent && gdprConsent.consentString) { + if (typeof gdprConsent.gdprApplies === 'boolean') { + syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`; + } else { + syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`; + } + } + if (uspConsent && uspConsent.consentString) { + syncUrl += `&ccpa_consent=${uspConsent.consentString}`; + } + + const coppa = config.getConfig('coppa') ? 1 : 0; + syncUrl += `&coppa=${coppa}`; + + return [{ + type: syncType, + url: syncUrl + }]; + } +}; + +registerBidder(spec); diff --git a/modules/acuityAdsBidAdapter.md b/modules/acuityAdsBidAdapter.md new file mode 100644 index 00000000000..a19e0a6b0ba --- /dev/null +++ b/modules/acuityAdsBidAdapter.md @@ -0,0 +1,79 @@ +# Overview + +``` +Module Name: AcuityAds Bidder Adapter +Module Type: AcuityAds Bidder Adapter +Maintainer: sa-support@brightcom.com +``` + +# Description + +Connects to AcuityAds exchange for bids. +AcuityAds bid adapter supports Banner, Video (instream and outstream) and Native. + +# Test Parameters +``` + var adUnits = [ + // Will return static test banner + { + code: 'adunit1', + mediaTypes: { + banner: { + sizes: [ [300, 250], [320, 50] ], + } + }, + bids: [ + { + bidder: 'acuityads', + params: { + placementId: 'testBanner', + } + } + ] + }, + { + code: 'addunit2', + mediaTypes: { + video: { + playerSize: [ [640, 480] ], + context: 'instream', + minduration: 5, + maxduration: 60, + } + }, + bids: [ + { + bidder: 'acuityads', + params: { + placementId: 'testVideo', + } + } + ] + }, + { + code: 'addunit3', + mediaTypes: { + native: { + title: { + required: true + }, + body: { + required: true + }, + icon: { + required: true, + size: [64, 64] + } + } + }, + bids: [ + { + bidder: 'acuityads', + params: { + placementId: 'testNative', + } + } + ] + } + ]; +``` \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index c29ddad3673..94bafa70653 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,23508 +1,8 @@ { "name": "prebid.js", "version": "7.9.0-pre", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "prebid.js", - "version": "7.8.0-pre", - "license": "Apache-2.0", - "dependencies": { - "@babel/core": "^7.16.7", - "@babel/plugin-transform-runtime": "^7.18.9", - "@babel/preset-env": "^7.16.8", - "@babel/runtime": "^7.18.9", - "core-js": "^3.13.0", - "core-js-pure": "^3.13.0", - "criteo-direct-rsa-validate": "^1.1.0", - "crypto-js": "^3.3.0", - "dlv": "1.1.3", - "dset": "2.0.1", - "express": "^4.15.4", - "fun-hooks": "^0.9.9", - "just-clone": "^1.0.2", - "live-connect-js": "2.3.3" - }, - "devDependencies": { - "@babel/eslint-parser": "^7.16.5", - "@jsdevtools/coverage-istanbul-loader": "^3.0.3", - "@wdio/browserstack-service": "^7.16.0", - "@wdio/cli": "^7.5.2", - "@wdio/concise-reporter": "^7.5.2", - "@wdio/local-runner": "^7.5.2", - "@wdio/mocha-framework": "^7.5.2", - "@wdio/spec-reporter": "^7.19.0", - "@wdio/sync": "^7.5.2", - "ajv": "6.12.3", - "assert": "^2.0.0", - "babel-loader": "^8.0.5", - "babel-register": "^6.26.0", - "body-parser": "^1.19.0", - "chai": "^4.2.0", - "coveralls": "^3.1.0", - "deep-equal": "^2.0.3", - "documentation": "^13.2.5", - "es5-shim": "^4.5.14", - "eslint": "^7.27.0", - "eslint-config-standard": "^10.2.1", - "eslint-plugin-import": "^2.20.2", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prebid": "file:./plugins/eslint", - "eslint-plugin-promise": "^5.1.0", - "eslint-plugin-standard": "^3.0.1", - "execa": "^1.0.0", - "faker": "^5.5.3", - "fs.extra": "^1.3.2", - "gulp": "^4.0.0", - "gulp-clean": "^0.3.2", - "gulp-concat": "^2.6.0", - "gulp-connect": "^5.7.0", - "gulp-eslint": "^4.0.0", - "gulp-if": "^3.0.0", - "gulp-js-escape": "^1.0.1", - "gulp-replace": "^1.0.0", - "gulp-shell": "^0.8.0", - "gulp-sourcemaps": "^3.0.0", - "gulp-terser": "^2.0.1", - "gulp-util": "^3.0.0", - "is-docker": "^2.2.1", - "istanbul": "^0.4.5", - "karma": "^6.3.2", - "karma-babel-preprocessor": "^8.0.1", - "karma-browserstack-launcher": "1.4.0", - "karma-chai": "^0.1.0", - "karma-chrome-launcher": "^3.1.0", - "karma-coverage": "^2.0.1", - "karma-coverage-istanbul-reporter": "^3.0.3", - "karma-es5-shim": "^0.0.4", - "karma-firefox-launcher": "^2.1.0", - "karma-ie-launcher": "^1.0.0", - "karma-mocha": "^2.0.1", - "karma-mocha-reporter": "^2.2.5", - "karma-opera-launcher": "^1.0.0", - "karma-safari-launcher": "^1.0.0", - "karma-script-launcher": "^1.0.0", - "karma-sinon": "^1.0.5", - "karma-sourcemap-loader": "^0.3.7", - "karma-spec-reporter": "^0.0.32", - "karma-webpack": "^5.0.0", - "lodash": "^4.17.21", - "mocha": "^5.0.0", - "morgan": "^1.10.0", - "opn": "^5.4.0", - "resolve-from": "^5.0.0", - "sinon": "^4.1.3", - "through2": "^4.0.2", - "url": "^0.11.0", - "url-parse": "^1.0.5", - "webdriverio": "^7.6.1", - "webpack": "^5.70.0", - "webpack-bundle-analyzer": "^4.5.0", - "webpack-stream": "^7.0.0", - "yargs": "^1.3.1" - }, - "engines": { - "node": ">=8.9.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz", - "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==", - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.0" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", - "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==", - "dependencies": { - "@babel/highlight": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz", - "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.17.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz", - "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==", - "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.3", - "@babel/helper-compilation-targets": "^7.16.7", - "@babel/helper-module-transforms": "^7.16.7", - "@babel/helpers": "^7.17.2", - "@babel/parser": "^7.17.3", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.3", - "@babel/types": "^7.17.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/eslint-parser": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz", - "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==", - "dev": true, - "dependencies": { - "eslint-scope": "^5.1.1", - "eslint-visitor-keys": "^2.1.0", - "semver": "^6.3.0" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || >=14.0.0" - }, - "peerDependencies": { - "@babel/core": ">=7.11.0", - "eslint": "^7.5.0 || ^8.0.0" - } - }, - "node_modules/@babel/generator": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz", - "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==", - "dependencies": { - "@babel/types": "^7.17.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz", - "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz", - "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==", - "dependencies": { - "@babel/helper-explode-assignable-expression": "^7.16.7", - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz", - "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==", - "dependencies": { - "@babel/compat-data": "^7.16.4", - "@babel/helper-validator-option": "^7.16.7", - "browserslist": "^4.17.5", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.17.6", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz", - "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==", - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", - "@babel/helper-member-expression-to-functions": "^7.16.7", - "@babel/helper-optimise-call-expression": "^7.16.7", - "@babel/helper-replace-supers": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz", - "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==", - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "regexpu-core": "^5.0.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz", - "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==", - "dependencies": { - "@babel/helper-compilation-targets": "^7.13.0", - "@babel/helper-module-imports": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/traverse": "^7.13.0", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" - }, - "peerDependencies": { - "@babel/core": "^7.4.0-0" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz", - "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-explode-assignable-expression": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz", - "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz", - "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==", - "dependencies": { - "@babel/helper-get-function-arity": "^7.16.7", - "@babel/template": "^7.16.7", - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-get-function-arity": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz", - "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz", - "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz", - "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", - "dependencies": { - "@babel/types": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.17.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz", - "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==", - "dependencies": { - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-module-imports": "^7.16.7", - "@babel/helper-simple-access": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/helper-validator-identifier": "^7.16.7", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.3", - "@babel/types": "^7.17.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz", - "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz", - "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz", - "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==", - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-wrap-function": "^7.16.8", - "@babel/types": "^7.16.8" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-replace-supers": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz", - "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==", - "dependencies": { - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-member-expression-to-functions": "^7.16.7", - "@babel/helper-optimise-call-expression": "^7.16.7", - "@babel/traverse": "^7.16.7", - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz", - "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz", - "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==", - "dependencies": { - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz", - "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", - "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz", - "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-wrap-function": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz", - "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==", - "dependencies": { - "@babel/helper-function-name": "^7.16.7", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.16.8", - "@babel/types": "^7.16.8" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.17.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz", - "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==", - "dependencies": { - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.0", - "@babel/types": "^7.17.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.16.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz", - "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==", - "dependencies": { - "@babel/helper-validator-identifier": "^7.16.7", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz", - "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz", - "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz", - "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0", - "@babel/plugin-proposal-optional-chaining": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.13.0" - } - }, - "node_modules/@babel/plugin-proposal-async-generator-functions": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz", - "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-remap-async-to-generator": "^7.16.8", - "@babel/plugin-syntax-async-generators": "^7.8.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-class-properties": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz", - "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==", - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-class-static-block": { - "version": "7.17.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz", - "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==", - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.17.6", - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-class-static-block": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.12.0" - } - }, - "node_modules/@babel/plugin-proposal-dynamic-import": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz", - "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-export-namespace-from": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz", - "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-json-strings": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz", - "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-json-strings": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz", - "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz", - "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-numeric-separator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz", - "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz", - "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==", - "dependencies": { - "@babel/compat-data": "^7.17.0", - "@babel/helper-compilation-targets": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-optional-catch-binding": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz", - "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-optional-chaining": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz", - "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-private-methods": { - "version": "7.16.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz", - "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==", - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.16.10", - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz", - "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==", - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-create-class-features-plugin": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-unicode-property-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz", - "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==", - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz", - "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz", - "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==", - "dependencies": { - "@babel/helper-module-imports": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-remap-async-to-generator": "^7.16.8" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz", - "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz", - "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-classes": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz", - "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==", - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", - "@babel/helper-optimise-call-expression": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-replace-supers": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz", - "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz", - "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz", - "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==", - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz", - "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz", - "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==", - "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-for-of": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz", - "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-function-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz", - "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==", - "dependencies": { - "@babel/helper-compilation-targets": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz", - "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz", - "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz", - "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==", - "dependencies": { - "@babel/helper-module-transforms": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7", - "babel-plugin-dynamic-import-node": "^2.3.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz", - "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==", - "dependencies": { - "@babel/helper-module-transforms": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-simple-access": "^7.16.7", - "babel-plugin-dynamic-import-node": "^2.3.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz", - "integrity": "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==", - "dependencies": { - "@babel/helper-hoist-variables": "^7.16.7", - "@babel/helper-module-transforms": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-validator-identifier": "^7.16.7", - "babel-plugin-dynamic-import-node": "^2.3.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz", - "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==", - "dependencies": { - "@babel/helper-module-transforms": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz", - "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==", - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/plugin-transform-new-target": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz", - "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-object-super": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz", - "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-replace-supers": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-parameters": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz", - "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz", - "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz", - "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==", - "dependencies": { - "regenerator-transform": "^0.14.2" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz", - "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-runtime": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.9.tgz", - "integrity": "sha512-wS8uJwBt7/b/mzE13ktsJdmS4JP/j7PQSaADtnb4I2wL0zK51MQ0pmF8/Jy0wUIS96fr+fXT6S/ifiPXnvrlSg==", - "dependencies": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.9", - "babel-plugin-polyfill-corejs2": "^0.3.1", - "babel-plugin-polyfill-corejs3": "^0.5.2", - "babel-plugin-polyfill-regenerator": "^0.3.1", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz", - "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-spread": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz", - "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz", - "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz", - "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz", - "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz", - "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz", - "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==", - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/preset-env": { - "version": "7.16.11", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz", - "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==", - "dependencies": { - "@babel/compat-data": "^7.16.8", - "@babel/helper-compilation-targets": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-validator-option": "^7.16.7", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7", - "@babel/plugin-proposal-async-generator-functions": "^7.16.8", - "@babel/plugin-proposal-class-properties": "^7.16.7", - "@babel/plugin-proposal-class-static-block": "^7.16.7", - "@babel/plugin-proposal-dynamic-import": "^7.16.7", - "@babel/plugin-proposal-export-namespace-from": "^7.16.7", - "@babel/plugin-proposal-json-strings": "^7.16.7", - "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", - "@babel/plugin-proposal-numeric-separator": "^7.16.7", - "@babel/plugin-proposal-object-rest-spread": "^7.16.7", - "@babel/plugin-proposal-optional-catch-binding": "^7.16.7", - "@babel/plugin-proposal-optional-chaining": "^7.16.7", - "@babel/plugin-proposal-private-methods": "^7.16.11", - "@babel/plugin-proposal-private-property-in-object": "^7.16.7", - "@babel/plugin-proposal-unicode-property-regex": "^7.16.7", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.16.7", - "@babel/plugin-transform-async-to-generator": "^7.16.8", - "@babel/plugin-transform-block-scoped-functions": "^7.16.7", - "@babel/plugin-transform-block-scoping": "^7.16.7", - "@babel/plugin-transform-classes": "^7.16.7", - "@babel/plugin-transform-computed-properties": "^7.16.7", - "@babel/plugin-transform-destructuring": "^7.16.7", - "@babel/plugin-transform-dotall-regex": "^7.16.7", - "@babel/plugin-transform-duplicate-keys": "^7.16.7", - "@babel/plugin-transform-exponentiation-operator": "^7.16.7", - "@babel/plugin-transform-for-of": "^7.16.7", - "@babel/plugin-transform-function-name": "^7.16.7", - "@babel/plugin-transform-literals": "^7.16.7", - "@babel/plugin-transform-member-expression-literals": "^7.16.7", - "@babel/plugin-transform-modules-amd": "^7.16.7", - "@babel/plugin-transform-modules-commonjs": "^7.16.8", - "@babel/plugin-transform-modules-systemjs": "^7.16.7", - "@babel/plugin-transform-modules-umd": "^7.16.7", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8", - "@babel/plugin-transform-new-target": "^7.16.7", - "@babel/plugin-transform-object-super": "^7.16.7", - "@babel/plugin-transform-parameters": "^7.16.7", - "@babel/plugin-transform-property-literals": "^7.16.7", - "@babel/plugin-transform-regenerator": "^7.16.7", - "@babel/plugin-transform-reserved-words": "^7.16.7", - "@babel/plugin-transform-shorthand-properties": "^7.16.7", - "@babel/plugin-transform-spread": "^7.16.7", - "@babel/plugin-transform-sticky-regex": "^7.16.7", - "@babel/plugin-transform-template-literals": "^7.16.7", - "@babel/plugin-transform-typeof-symbol": "^7.16.7", - "@babel/plugin-transform-unicode-escapes": "^7.16.7", - "@babel/plugin-transform-unicode-regex": "^7.16.7", - "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.16.8", - "babel-plugin-polyfill-corejs2": "^0.3.0", - "babel-plugin-polyfill-corejs3": "^0.5.0", - "babel-plugin-polyfill-regenerator": "^0.3.0", - "core-js-compat": "^3.20.2", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/preset-modules": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-transform-dotall-regex": "^7.4.4", - "@babel/types": "^7.4.4", - "esutils": "^2.0.2" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/runtime": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz", - "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", - "dependencies": { - "regenerator-runtime": "^0.13.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/runtime/node_modules/regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" - }, - "node_modules/@babel/template": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz", - "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==", - "dependencies": { - "@babel/code-frame": "^7.16.7", - "@babel/parser": "^7.16.7", - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz", - "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==", - "dependencies": { - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.3", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", - "@babel/helper-hoist-variables": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.17.3", - "@babel/types": "^7.17.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz", - "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==", - "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", - "dev": true, - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", - "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", - "dev": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/@eslint/eslintrc/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.12.1", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz", - "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@gulp-sourcemaps/identity-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz", - "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==", - "dev": true, - "dependencies": { - "acorn": "^6.4.1", - "normalize-path": "^3.0.0", - "postcss": "^7.0.16", - "source-map": "^0.6.0", - "through2": "^3.0.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/@gulp-sourcemaps/identity-map/node_modules/acorn": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", - "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/@gulp-sourcemaps/identity-map/node_modules/picocolors": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", - "dev": true - }, - "node_modules/@gulp-sourcemaps/identity-map/node_modules/postcss": { - "version": "7.0.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", - "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", - "dev": true, - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/@gulp-sourcemaps/identity-map/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@gulp-sourcemaps/identity-map/node_modules/through2": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", - "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", - "dev": true, - "dependencies": { - "inherits": "^2.0.4", - "readable-stream": "2 || 3" - } - }, - "node_modules/@gulp-sourcemaps/map-sources": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz", - "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=", - "dev": true, - "dependencies": { - "normalize-path": "^2.0.1", - "through2": "^2.0.3" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/@gulp-sourcemaps/map-sources/node_modules/normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "dependencies": { - "remove-trailing-separator": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@gulp-sourcemaps/map-sources/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", - "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", - "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "node_modules/@hutson/parse-repository-url": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz", - "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/types": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", - "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^16.0.0", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/@jest/types/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/types/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@jest/types/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@jest/types/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/@jest/types/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", - "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", - "dev": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.11", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", - "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, - "node_modules/@jsdevtools/coverage-istanbul-loader": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz", - "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==", - "dev": true, - "dependencies": { - "convert-source-map": "^1.7.0", - "istanbul-lib-instrument": "^4.0.3", - "loader-utils": "^2.0.0", - "merge-source-map": "^1.1.0", - "schema-utils": "^2.7.0" - } - }, - "node_modules/@polka/url": { - "version": "1.0.0-next.21", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz", - "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", - "dev": true - }, - "node_modules/@sindresorhus/is": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", - "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" - } - }, - "node_modules/@sinonjs/commons": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", - "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/@sinonjs/formatio": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", - "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", - "dev": true, - "dependencies": { - "samsam": "1.3.0" - } - }, - "node_modules/@sinonjs/samsam": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", - "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.3.0", - "array-from": "^2.1.1", - "lodash": "^4.17.15" - } - }, - "node_modules/@sinonjs/text-encoding": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", - "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", - "dev": true - }, - "node_modules/@socket.io/base64-arraybuffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz", - "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==", - "dev": true, - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/@szmarczak/http-timer": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", - "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", - "dev": true, - "dependencies": { - "defer-to-connect": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@types/aria-query": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.0.tgz", - "integrity": "sha512-P+dkdFu0n08PDIvw+9nT9ByQnd+Udc8DaWPb9HKfaPwCvWvQpC5XaMRx2xLWECm9x1VKNps6vEAlirjA6+uNrQ==", - "dev": true - }, - "node_modules/@types/cacheable-request": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz", - "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==", - "dev": true, - "dependencies": { - "@types/http-cache-semantics": "*", - "@types/keyv": "*", - "@types/node": "*", - "@types/responselike": "*" - } - }, - "node_modules/@types/component-emitter": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz", - "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==", - "dev": true - }, - "node_modules/@types/cookie": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", - "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==", - "dev": true - }, - "node_modules/@types/cors": { - "version": "2.8.12", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", - "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==", - "dev": true - }, - "node_modules/@types/diff": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.2.tgz", - "integrity": "sha512-uw8eYMIReOwstQ0QKF0sICefSy8cNO/v7gOTiIy9SbwuHyEecJUm7qlgueOO5S1udZ5I/irVydHVwMchgzbKTg==", - "dev": true - }, - "node_modules/@types/easy-table": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-0.0.33.tgz", - "integrity": "sha512-/vvqcJPmZUfQwCgemL0/34G7bIQnCuvgls379ygRlcC1FqNqk3n+VZ15dAO51yl6JNDoWd8vsk+kT8zfZ1VZSw==", - "dev": true - }, - "node_modules/@types/ejs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.0.tgz", - "integrity": "sha512-DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA==", - "dev": true - }, - "node_modules/@types/eslint": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz", - "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==", - "dev": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", - "dev": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "node_modules/@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", - "dev": true - }, - "node_modules/@types/expect": { - "version": "1.20.4", - "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz", - "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==", - "dev": true - }, - "node_modules/@types/fibers": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@types/fibers/-/fibers-3.1.1.tgz", - "integrity": "sha512-yHoUi46uika0snoTpNcVqUSvgbRndaIps4TUCotrXjtc0DHDoPQckmyXEZ2bX3e4mpJmyEW3hRhCwQa/ISCPaA==", - "dev": true - }, - "node_modules/@types/fs-extra": { - "version": "9.0.13", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", - "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", - "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", - "dev": true - }, - "node_modules/@types/inquirer": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.0.tgz", - "integrity": "sha512-BNoMetRf3gmkpAlV5we+kxyZTle7YibdOntIZbU5pyIfMdcwy784KfeZDAcuyMznkh5OLa17RVXZOGA5LTlkgQ==", - "dev": true, - "dependencies": { - "@types/through": "*", - "rxjs": "^7.2.0" - } - }, - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "*" - } - }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-report": "*" - } - }, - "node_modules/@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", - "dev": true - }, - "node_modules/@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", - "dev": true - }, - "node_modules/@types/keyv": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz", - "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/lodash": { - "version": "4.14.179", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz", - "integrity": "sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==", - "dev": true - }, - "node_modules/@types/lodash.flattendeep": { - "version": "4.4.6", - "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.6.tgz", - "integrity": "sha512-uLm2MaRVlqJSGsMK0RZpP5T3KqReq+9WbYDHCUhBhp98v56hMG/Yht52bsoTSui9xz2mUvQ9NfG3LrNGDL92Ng==", - "dev": true, - "dependencies": { - "@types/lodash": "*" - } - }, - "node_modules/@types/lodash.pickby": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.6.tgz", - "integrity": "sha512-NFa13XxlMd9eFi0UFZFWIztpMpXhozbijrx3Yb1viYZphT7jyopIFVoIRF4eYMjruWNEG1rnyrRmg/8ej9T8Iw==", - "dev": true, - "dependencies": { - "@types/lodash": "*" - } - }, - "node_modules/@types/lodash.union": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz", - "integrity": "sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==", - "dev": true, - "dependencies": { - "@types/lodash": "*" - } - }, - "node_modules/@types/mdast": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz", - "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==", - "dev": true, - "dependencies": { - "@types/unist": "*" - } - }, - "node_modules/@types/minimist": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", - "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==", - "dev": true - }, - "node_modules/@types/mocha": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz", - "integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==", - "dev": true - }, - "node_modules/@types/node": { - "version": "17.0.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz", - "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==", - "dev": true - }, - "node_modules/@types/normalize-package-data": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", - "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", - "dev": true - }, - "node_modules/@types/object-inspect": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.8.1.tgz", - "integrity": "sha512-0JTdf3CGV0oWzE6Wa40Ayv2e2GhpP3pEJMcrlM74vBSJPuuNkVwfDnl0SZxyFCXETcB4oKA/MpTVfuYSMOelBg==", - "dev": true - }, - "node_modules/@types/puppeteer": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.5.tgz", - "integrity": "sha512-lxCjpDEY+DZ66+W3x5Af4oHnEmUXt0HuaRzkBGE2UZiZEp/V1d3StpLPlmNVu/ea091bdNmVPl44lu8Wy/0ZCA==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/recursive-readdir": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.0.tgz", - "integrity": "sha512-HGk753KRu2N4mWduovY4BLjYq4jTOL29gV2OfGdGxHcPSWGFkC5RRIdk+VTs5XmYd7MVAD+JwKrcb5+5Y7FOCg==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/responselike": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", - "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true - }, - "node_modules/@types/stream-buffers": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.4.tgz", - "integrity": "sha512-qU/K1tb2yUdhXkLIATzsIPwbtX6BpZk0l3dPW6xqWyhfzzM1ECaQ/8faEnu3CNraLiQ9LHyQQPBGp7N9Fbs25w==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==", - "dev": true - }, - "node_modules/@types/through": { - "version": "0.0.30", - "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz", - "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/tmp": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.3.tgz", - "integrity": "sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==", - "dev": true - }, - "node_modules/@types/ua-parser-js": { - "version": "0.7.36", - "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz", - "integrity": "sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ==", - "dev": true - }, - "node_modules/@types/unist": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", - "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==", - "dev": true - }, - "node_modules/@types/vinyl": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz", - "integrity": "sha512-ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==", - "dev": true, - "dependencies": { - "@types/expect": "^1.20.4", - "@types/node": "*" - } - }, - "node_modules/@types/which": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.2.tgz", - "integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==", - "dev": true - }, - "node_modules/@types/yargs": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", - "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true - }, - "node_modules/@types/yauzl": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", - "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==", - "dev": true, - "optional": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true - }, - "node_modules/@vue/compiler-core": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz", - "integrity": "sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==", - "dev": true, - "optional": true, - "dependencies": { - "@babel/parser": "^7.16.4", - "@vue/shared": "3.2.31", - "estree-walker": "^2.0.2", - "source-map": "^0.6.1" - } - }, - "node_modules/@vue/compiler-core/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@vue/compiler-dom": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz", - "integrity": "sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg==", - "dev": true, - "optional": true, - "dependencies": { - "@vue/compiler-core": "3.2.31", - "@vue/shared": "3.2.31" - } - }, - "node_modules/@vue/compiler-sfc": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz", - "integrity": "sha512-748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ==", - "dev": true, - "optional": true, - "dependencies": { - "@babel/parser": "^7.16.4", - "@vue/compiler-core": "3.2.31", - "@vue/compiler-dom": "3.2.31", - "@vue/compiler-ssr": "3.2.31", - "@vue/reactivity-transform": "3.2.31", - "@vue/shared": "3.2.31", - "estree-walker": "^2.0.2", - "magic-string": "^0.25.7", - "postcss": "^8.1.10", - "source-map": "^0.6.1" - } - }, - "node_modules/@vue/compiler-sfc/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@vue/compiler-ssr": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz", - "integrity": "sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==", - "dev": true, - "optional": true, - "dependencies": { - "@vue/compiler-dom": "3.2.31", - "@vue/shared": "3.2.31" - } - }, - "node_modules/@vue/reactivity-transform": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz", - "integrity": "sha512-uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA==", - "dev": true, - "optional": true, - "dependencies": { - "@babel/parser": "^7.16.4", - "@vue/compiler-core": "3.2.31", - "@vue/shared": "3.2.31", - "estree-walker": "^2.0.2", - "magic-string": "^0.25.7" - } - }, - "node_modules/@vue/shared": { - "version": "3.2.31", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz", - "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==", - "dev": true, - "optional": true - }, - "node_modules/@wdio/browserstack-service": { - "version": "7.16.16", - "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-7.16.16.tgz", - "integrity": "sha512-q4wUh/j0MR2SwhTkmIFif2DaXgH5yzdgOer6G/fac2n81zLCSpQHWO5aQ9T0An9CAd4L2A+t3dmChpBJPkHWSw==", - "dev": true, - "dependencies": { - "@types/node": "^17.0.4", - "@wdio/logger": "7.16.0", - "@wdio/types": "7.16.14", - "browserstack-local": "^1.4.5", - "got": "^11.0.2", - "webdriverio": "7.16.16" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "@wdio/cli": "^7.0.0" - } - }, - "node_modules/@wdio/cli": { - "version": "7.16.16", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.16.16.tgz", - "integrity": "sha512-Wz/e5zm1UNHB9RAIsJIM7ioDzVllUwTvhVWOrI7HR/53GmO/cIvAVjpnlglizJNgK8WlbnM/cKNVIXxqxrnFmw==", - "dev": true, - "dependencies": { - "@types/ejs": "^3.0.5", - "@types/fs-extra": "^9.0.4", - "@types/inquirer": "^8.1.2", - "@types/lodash.flattendeep": "^4.4.6", - "@types/lodash.pickby": "^4.6.6", - "@types/lodash.union": "^4.6.6", - "@types/node": "^17.0.4", - "@types/recursive-readdir": "^2.2.0", - "@wdio/config": "7.16.16", - "@wdio/logger": "7.16.0", - "@wdio/types": "7.16.14", - "@wdio/utils": "7.16.14", - "async-exit-hook": "^2.0.1", - "chalk": "^4.0.0", - "chokidar": "^3.0.0", - "cli-spinners": "^2.1.0", - "ejs": "^3.0.1", - "fs-extra": "^10.0.0", - "inquirer": "8.1.5", - "lodash.flattendeep": "^4.4.0", - "lodash.pickby": "^4.6.0", - "lodash.union": "^4.6.0", - "mkdirp": "^1.0.4", - "recursive-readdir": "^2.2.2", - "webdriverio": "7.16.16", - "yargs": "^17.0.0", - "yarn-install": "^1.0.0" - }, - "bin": { - "wdio": "bin/wdio.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/cli/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@wdio/cli/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@wdio/cli/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@wdio/cli/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/@wdio/cli/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@wdio/cli/node_modules/yargs": { - "version": "17.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", - "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@wdio/concise-reporter": { - "version": "7.16.14", - "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-7.16.14.tgz", - "integrity": "sha512-CR+9+skJ3mXPIdRo0AnIJTJHOArrWdKlXTnyZ/DD6M9VrNk5aiTWQyphT/IeHV5+fxjHlMNIf/KgIhj1ewschQ==", - "dev": true, - "dependencies": { - "@wdio/reporter": "7.16.14", - "@wdio/types": "7.16.14", - "chalk": "^4.0.0", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "@wdio/cli": "^7.0.0" - } - }, - "node_modules/@wdio/concise-reporter/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@wdio/concise-reporter/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@wdio/concise-reporter/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@wdio/concise-reporter/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/@wdio/concise-reporter/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@wdio/config": { - "version": "7.16.16", - "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.16.16.tgz", - "integrity": "sha512-K/ObPuo6Da2liz++OKOIfbdpFwI7UWiFcBylfJkCYbweuXCoW1aUqlKI6rmKPwCH9Uqr/RHWu6p8eo0zWe6xVA==", - "dev": true, - "dependencies": { - "@wdio/logger": "7.16.0", - "@wdio/types": "7.16.14", - "deepmerge": "^4.0.0", - "glob": "^7.1.2" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/local-runner": { - "version": "7.16.16", - "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.16.16.tgz", - "integrity": "sha512-AJaOyM842PWgMffrrXyHJjouVseLHoiL5U1sw2VVproi3ORWHbltl1AMnreU/lrGu9L0CVKHYT1pxu5UbSOCxQ==", - "dev": true, - "dependencies": { - "@types/stream-buffers": "^3.0.3", - "@wdio/logger": "7.16.0", - "@wdio/repl": "7.16.14", - "@wdio/runner": "7.16.16", - "@wdio/types": "7.16.14", - "async-exit-hook": "^2.0.1", - "split2": "^4.0.0", - "stream-buffers": "^3.0.2" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "@wdio/cli": "^7.0.0" - } - }, - "node_modules/@wdio/logger": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.16.0.tgz", - "integrity": "sha512-/6lOGb2Iow5eSsy7RJOl1kCwsP4eMlG+/QKro5zUJsuyNJSQXf2ejhpkzyKWLgQbHu83WX6cM1014AZuLkzoQg==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "loglevel": "^1.6.0", - "loglevel-plugin-prefix": "^0.8.4", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/logger/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@wdio/logger/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@wdio/logger/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@wdio/logger/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/@wdio/logger/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@wdio/mocha-framework": { - "version": "7.16.15", - "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.16.15.tgz", - "integrity": "sha512-XRya85/RYPZk4MZ7Cvl3oudTdrOo+RyO8b5Ff+dH8hD3GBCACaWgW9AjbsyhvbSTdUlF0gNLPdqOCsxV5XyM3w==", - "dev": true, - "dependencies": { - "@types/mocha": "^9.0.0", - "@wdio/logger": "7.16.0", - "@wdio/types": "7.16.14", - "@wdio/utils": "7.16.14", - "expect-webdriverio": "^3.0.0", - "mocha": "^9.0.0" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/@wdio/mocha-framework/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/chalk/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/@wdio/mocha-framework/node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "bin": { - "he": "bin/he" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/mocha": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz", - "integrity": "sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==", - "dev": true, - "dependencies": { - "@ungap/promise-all-settled": "1.1.2", - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.3", - "debug": "4.3.3", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.2.0", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "4.1.0", - "log-symbols": "4.1.0", - "minimatch": "3.0.4", - "ms": "2.1.3", - "nanoid": "3.2.0", - "serialize-javascript": "6.0.0", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "which": "2.0.2", - "workerpool": "6.2.0", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha" - }, - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - }, - "node_modules/@wdio/mocha-framework/node_modules/nanoid": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", - "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", - "dev": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/yargs-parser": { - "version": "20.2.4", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/@wdio/protocols": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.16.7.tgz", - "integrity": "sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==", - "dev": true, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/repl": { - "version": "7.16.14", - "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.16.14.tgz", - "integrity": "sha512-Ezih0Y+lsGkKv3H3U56hdWgZiQGA3VaAYguSLd9+g1xbQq+zMKqSmfqECD9bAy+OgCCiVTRstES6lHZxJVPhAg==", - "dev": true, - "dependencies": { - "@wdio/utils": "7.16.14" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/reporter": { - "version": "7.16.14", - "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.16.14.tgz", - "integrity": "sha512-e/I2oGfqjx9+zI4NT/garqxm7Afnos1EcrGSNu75WmP3PNJt4i+9DKkROu4PM6XWcpUB4v2UF7Mv/NrL3TU9aA==", - "dev": true, - "dependencies": { - "@types/diff": "^5.0.0", - "@types/node": "^17.0.4", - "@types/object-inspect": "^1.8.0", - "@types/supports-color": "^8.1.0", - "@types/tmp": "^0.2.0", - "@wdio/types": "7.16.14", - "diff": "^5.0.0", - "fs-extra": "^10.0.0", - "object-inspect": "^1.10.3", - "supports-color": "8.1.1" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/runner": { - "version": "7.16.16", - "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.16.16.tgz", - "integrity": "sha512-Tt2ja6GukGPq1m98WP26yOWUGwzK1y7gPTLy6rKlamz3mOBC7koL0T9+iqcFREquUe4CMy2jWp1lqvPlwMbu7g==", - "dev": true, - "dependencies": { - "@wdio/config": "7.16.16", - "@wdio/logger": "7.16.0", - "@wdio/types": "7.16.14", - "@wdio/utils": "7.16.14", - "deepmerge": "^4.0.0", - "gaze": "^1.1.2", - "webdriver": "7.16.16", - "webdriverio": "7.16.16" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/spec-reporter": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.1.tgz", - "integrity": "sha512-qnZkn3VcyBPtcorUtpyCFE8v5ubyWmR7mFETXNzyriHyvjvk+NeFCWaFcIehpXYXiAmNpAwyfnZoIY6tkKQixQ==", - "dev": true, - "dependencies": { - "@types/easy-table": "^0.0.33", - "@wdio/reporter": "7.19.1", - "@wdio/types": "7.19.1", - "chalk": "^4.0.0", - "easy-table": "^1.1.1", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "@wdio/cli": "^7.0.0" - } - }, - "node_modules/@wdio/spec-reporter/node_modules/@wdio/reporter": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.1.tgz", - "integrity": "sha512-sWmBBV4dPCZkGk9Qq0m35T/vHGen0N10nH4osQcVP3IZJqpo2eLIH4w+X6EUbjZ2GdgOA2bLMMzb1bl9JqnGPg==", - "dev": true, - "dependencies": { - "@types/diff": "^5.0.0", - "@types/node": "^17.0.4", - "@types/object-inspect": "^1.8.0", - "@types/supports-color": "^8.1.0", - "@types/tmp": "^0.2.0", - "@wdio/types": "7.19.1", - "diff": "^5.0.0", - "fs-extra": "^10.0.0", - "object-inspect": "^1.10.3", - "supports-color": "8.1.1" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/spec-reporter/node_modules/@wdio/reporter/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/@wdio/spec-reporter/node_modules/@wdio/types": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.1.tgz", - "integrity": "sha512-mOodKlmvYxpj8P5BhjggEGpXuiRSlsyn2ClG8QqJ3lfXgOtOVEzFNfv/Ai7TkHr+lHDQNXLjllCjSqoCHhwlqg==", - "dev": true, - "dependencies": { - "@types/node": "^17.0.4", - "got": "^11.8.1" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "typescript": "^4.6.2" - } - }, - "node_modules/@wdio/spec-reporter/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@wdio/spec-reporter/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@wdio/spec-reporter/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@wdio/spec-reporter/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/@wdio/spec-reporter/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@wdio/sync": { - "version": "7.16.16", - "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-7.16.16.tgz", - "integrity": "sha512-MbVFAteaAOxHLKkMiMzOnh1hzINAK2U41GDIfy1yaPumcw1pNuJIhWrBYxprNMlqt8srk++wqQWgj5XpFjCL6g==", - "dev": true, - "dependencies": { - "@types/fibers": "^3.1.0", - "@types/puppeteer": "^5.4.0", - "@wdio/logger": "7.16.0", - "@wdio/types": "7.16.14", - "fibers": "^5.0.0", - "webdriverio": "7.16.16" - }, - "engines": { - "node": ">=12.0.0 <16" - } - }, - "node_modules/@wdio/types": { - "version": "7.16.14", - "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.16.14.tgz", - "integrity": "sha512-AyNI9iBSos9xWBmiFAF3sBs6AJXO/55VppU/eeF4HRdbZMtMarnvMuahM+jlUrA3vJSmDW+ufelG0MT//6vrnw==", - "dev": true, - "dependencies": { - "@types/node": "^17.0.4", - "got": "^11.8.1" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@wdio/utils": { - "version": "7.16.14", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.16.14.tgz", - "integrity": "sha512-wwin8nVpIlhmXJkq6GJw9aDDzgLOJKgXTcEua0T2sdXjoW78u5Ly/GZrFXTjMGhacFvoZfitTrjyfyy4CxMVvw==", - "dev": true, - "dependencies": { - "@wdio/logger": "7.16.0", - "@wdio/types": "7.16.14", - "p-iteration": "^1.1.8" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", - "dev": true, - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" - } - }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", - "dev": true, - "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" - } - }, - "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", - "dev": true, - "dependencies": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", - "dev": true, - "dependencies": { - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", - "dev": true - }, - "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" - } - }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" - } - }, - "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true - }, - "node_modules/@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true - }, - "node_modules/abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true - }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/acorn-node": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", - "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", - "dev": true, - "dependencies": { - "acorn": "^7.0.0", - "acorn-walk": "^7.0.0", - "xtend": "^4.0.2" - } - }, - "node_modules/acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/add-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", - "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=", - "dev": true - }, - "node_modules/agent-base": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", - "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", - "dev": true, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.4.2" - } - }, - "node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.21.3" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", - "dev": true, - "dependencies": { - "ansi-wrap": "0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", - "dev": true, - "engines": [ - "node >= 0.8.0" - ], - "bin": { - "ansi-html": "bin/ansi-html" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/append-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz", - "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=", - "dev": true, - "dependencies": { - "buffer-equal": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/archiver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz", - "integrity": "sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==", - "dev": true, - "dependencies": { - "archiver-utils": "^2.1.0", - "async": "^3.2.0", - "buffer-crc32": "^0.2.1", - "readable-stream": "^3.6.0", - "readdir-glob": "^1.0.0", - "tar-stream": "^2.2.0", - "zip-stream": "^4.1.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/archiver-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", - "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", - "dev": true, - "dependencies": { - "glob": "^7.1.4", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/archiver/node_modules/async": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", - "dev": true - }, - "node_modules/archiver/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", - "dev": true - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/aria-query": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz", - "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==", - "dev": true, - "engines": { - "node": ">=6.0" - } - }, - "node_modules/arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-filter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz", - "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=", - "dev": true, - "dependencies": { - "make-iterator": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz", - "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=", - "dev": true, - "dependencies": { - "make-iterator": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" - }, - "node_modules/array-from": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", - "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", - "dev": true - }, - "node_modules/array-ify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", - "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=", - "dev": true - }, - "node_modules/array-includes": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz", - "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.1", - "get-intrinsic": "^1.1.1", - "is-string": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-initial": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", - "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=", - "dev": true, - "dependencies": { - "array-slice": "^1.0.0", - "is-number": "^4.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-initial/node_modules/is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-last": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz", - "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==", - "dev": true, - "dependencies": { - "is-number": "^4.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-last/node_modules/is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-sort": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz", - "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==", - "dev": true, - "dependencies": { - "default-compare": "^1.0.0", - "get-value": "^2.0.6", - "kind-of": "^5.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array.prototype.flat": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz", - "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/asn1": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", - "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "dev": true, - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/assert": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz", - "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==", - "dev": true, - "dependencies": { - "es6-object-assign": "^1.1.0", - "is-nan": "^1.2.1", - "object-is": "^1.0.1", - "util": "^0.12.0" - } - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "node_modules/async-done": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz", - "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==", - "dev": true, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.2", - "process-nextick-args": "^2.0.0", - "stream-exhaust": "^1.0.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/async-each": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", - "dev": true - }, - "node_modules/async-exit-hook": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", - "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/async-settle": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz", - "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=", - "dev": true, - "dependencies": { - "async-done": "^1.2.2" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "node_modules/atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true, - "bin": { - "atob": "bin/atob.js" - }, - "engines": { - "node": ">= 4.5.0" - } - }, - "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "dev": true - }, - "node_modules/babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "dependencies": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - } - }, - "node_modules/babel-code-frame/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/babel-code-frame/node_modules/ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/babel-code-frame/node_modules/chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "dependencies": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/babel-code-frame/node_modules/js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - }, - "node_modules/babel-code-frame/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/babel-code-frame/node_modules/supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/babel-core": { - "version": "6.26.3", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", - "dev": true, - "dependencies": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" - } - }, - "node_modules/babel-core/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/babel-core/node_modules/json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/babel-core/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/babel-core/node_modules/slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "dependencies": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - } - }, - "node_modules/babel-generator/node_modules/detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "dependencies": { - "repeating": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/babel-generator/node_modules/jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - } - }, - "node_modules/babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, - "dependencies": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "node_modules/babel-loader": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz", - "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==", - "dev": true, - "dependencies": { - "find-cache-dir": "^3.3.1", - "loader-utils": "^1.4.0", - "make-dir": "^3.1.0", - "schema-utils": "^2.6.5" - }, - "engines": { - "node": ">= 8.9" - }, - "peerDependencies": { - "@babel/core": "^7.0.0", - "webpack": ">=2" - } - }, - "node_modules/babel-loader/node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/babel-loader/node_modules/loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "dependencies": { - "babel-runtime": "^6.22.0" - } - }, - "node_modules/babel-plugin-dynamic-import-node": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", - "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", - "dependencies": { - "object.assign": "^4.1.0" - } - }, - "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz", - "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==", - "dependencies": { - "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.3.1", - "semver": "^6.1.1" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz", - "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==", - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.3.1", - "core-js-compat": "^3.21.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", - "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==", - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.3.1" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "dev": true, - "dependencies": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" - } - }, - "node_modules/babel-register/node_modules/core-js": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", - "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", - "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", - "dev": true, - "hasInstallScript": true - }, - "node_modules/babel-register/node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/babel-register/node_modules/source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "dependencies": { - "source-map": "^0.5.6" - } - }, - "node_modules/babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "dependencies": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "node_modules/babel-runtime/node_modules/core-js": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", - "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", - "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", - "dev": true, - "hasInstallScript": true - }, - "node_modules/babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "dependencies": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "node_modules/babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "dependencies": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - } - }, - "node_modules/babel-traverse/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/babel-traverse/node_modules/globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/babel-traverse/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "dependencies": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "node_modules/babel-types/node_modules/to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/babelify": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz", - "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true, - "bin": { - "babylon": "bin/babylon.js" - } - }, - "node_modules/bach": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz", - "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=", - "dev": true, - "dependencies": { - "arr-filter": "^1.1.1", - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "array-each": "^1.0.0", - "array-initial": "^1.0.0", - "array-last": "^1.1.1", - "async-done": "^1.2.2", - "async-settle": "^1.0.0", - "now-and-later": "^2.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/bail": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", - "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "dependencies": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/base/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/base64id": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", - "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", - "dev": true, - "engines": { - "node": "^4.5.0 || >= 5.9" - } - }, - "node_modules/basic-auth": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "dev": true, - "dependencies": { - "safe-buffer": "5.1.2" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", - "dev": true - }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, - "node_modules/beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/binary": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", - "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=", - "dev": true, - "dependencies": { - "buffers": "~0.1.1", - "chainsaw": "~0.1.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/binaryextensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz", - "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==", - "dev": true, - "engines": { - "node": ">=0.8" - }, - "funding": { - "url": "https://bevry.me/fund" - } - }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "dev": true, - "optional": true, - "dependencies": { - "file-uri-to-path": "1.0.0" - } - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bl/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/bluebird": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", - "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=", - "dev": true - }, - "node_modules/body": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz", - "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=", - "dev": true, - "dependencies": { - "continuable-cache": "^0.3.1", - "error": "^7.0.0", - "raw-body": "~1.1.0", - "safe-json-parse": "~1.0.1" - } - }, - "node_modules/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==", - "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.8.1", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.9.7", - "raw-body": "2.4.3", - "type-is": "~1.6.18" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/body-parser/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/body-parser/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "node_modules/body/node_modules/bytes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz", - "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=", - "dev": true - }, - "node_modules/body/node_modules/raw-body": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz", - "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=", - "dev": true, - "dependencies": { - "bytes": "1", - "string_decoder": "0.10" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/body/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browser-resolve": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", - "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", - "dev": true, - "dependencies": { - "resolve": "1.1.7" - } - }, - "node_modules/browser-resolve/node_modules/resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "node_modules/browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "node_modules/browserslist": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz", - "integrity": "sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==", - "dependencies": { - "caniuse-lite": "^1.0.30001313", - "electron-to-chromium": "^1.4.76", - "escalade": "^3.1.1", - "node-releases": "^2.0.2", - "picocolors": "^1.0.0" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } - }, - "node_modules/browserstack": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz", - "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==", - "dev": true, - "dependencies": { - "https-proxy-agent": "^2.2.1" - } - }, - "node_modules/browserstack-local": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.9.tgz", - "integrity": "sha512-V+q8HQwRQFr9nd32xR66ZZ3VDWa3Kct4IMMudhKgcuD7cWrvvFARZOibx71II+Rf7P5nMQpWWxl9z/3p927nbg==", - "dev": true, - "dependencies": { - "https-proxy-agent": "^4.0.0", - "is-running": "^2.1.0", - "ps-tree": "=1.2.0", - "temp-fs": "^0.9.9" - } - }, - "node_modules/browserstack/node_modules/agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true, - "dependencies": { - "es6-promisify": "^5.0.0" - }, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/browserstack/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/browserstack/node_modules/https-proxy-agent": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", - "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", - "dev": true, - "dependencies": { - "agent-base": "^4.3.0", - "debug": "^3.1.0" - }, - "engines": { - "node": ">= 4.5.0" - } - }, - "node_modules/browserstacktunnel-wrapper": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.4.tgz", - "integrity": "sha512-GCV599FUUxNOCFl3WgPnfc5dcqq9XTmMXoxWpqkvmk0R9TOIoqmjENNU6LY6DtgIL6WfBVbg/jmWtnM5K6UYSg==", - "dev": true, - "dependencies": { - "https-proxy-agent": "^2.2.1", - "unzipper": "^0.9.3" - }, - "engines": { - "node": ">= 0.10.20" - } - }, - "node_modules/browserstacktunnel-wrapper/node_modules/agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true, - "dependencies": { - "es6-promisify": "^5.0.0" - }, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/browserstacktunnel-wrapper/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/browserstacktunnel-wrapper/node_modules/https-proxy-agent": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", - "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", - "dev": true, - "dependencies": { - "agent-base": "^4.3.0", - "debug": "^3.1.0" - }, - "engines": { - "node": ">= 4.5.0" - } - }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/buffer-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", - "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "node_modules/buffer-indexof-polyfill": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz", - "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/buffer-shims": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=", - "dev": true - }, - "node_modules/buffers": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", - "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=", - "dev": true, - "engines": { - "node": ">=0.2.0" - } - }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/cac": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz", - "integrity": "sha1-bSTO7Dcu/lybeYgIvH9JtHJCpO8=", - "dev": true, - "dependencies": { - "camelcase-keys": "^3.0.0", - "chalk": "^1.1.3", - "indent-string": "^3.0.0", - "minimist": "^1.2.0", - "read-pkg-up": "^1.0.1", - "suffix": "^0.1.0", - "text-table": "^0.2.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/cac/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/camelcase-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz", - "integrity": "sha1-/AxsNgNj9zd+N5O5oWvM8QcMHKQ=", - "dev": true, - "dependencies": { - "camelcase": "^3.0.0", - "map-obj": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "dependencies": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "dependencies": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/cac/node_modules/load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "dependencies": { - "error-ex": "^1.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "dependencies": { - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "dependencies": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "dependencies": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "dependencies": { - "is-utf8": "^0.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cac/node_modules/supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, - "dependencies": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cacheable-lookup": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", - "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", - "dev": true, - "engines": { - "node": ">=10.6.0" - } - }, - "node_modules/cacheable-request": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz", - "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==", - "dev": true, - "dependencies": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^4.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^6.0.1", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cacheable-request/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cached-path-relative": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz", - "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==", - "dev": true - }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/caller-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", - "dev": true, - "dependencies": { - "callsites": "^0.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/caller-path/node_modules/callsites": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase-keys": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", - "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", - "dev": true, - "dependencies": { - "camelcase": "^5.3.1", - "map-obj": "^4.0.0", - "quick-lru": "^4.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/camelcase-keys/node_modules/quick-lru": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", - "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001320", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz", - "integrity": "sha512-MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - } - ] - }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, - "node_modules/ccount": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz", - "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/chai": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", - "dev": true, - "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", - "pathval": "^1.1.1", - "type-detect": "^4.0.5" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chainsaw": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", - "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=", - "dev": true, - "dependencies": { - "traverse": ">=0.3.0 <0.4" - }, - "engines": { - "node": "*" - } - }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/character-entities": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", - "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/character-entities-html4": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz", - "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/character-entities-legacy": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", - "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/character-reference-invalid": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", - "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, - "node_modules/check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true - }, - "node_modules/chrome-launcher": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.0.tgz", - "integrity": "sha512-ZQqX5kb9H0+jy1OqLnWampfocrtSZaGl7Ny3F9GRha85o4odbL8x55paUzh51UC7cEmZ5obp3H2Mm70uC2PpRA==", - "dev": true, - "dependencies": { - "@types/node": "*", - "escape-string-regexp": "^4.0.0", - "is-wsl": "^2.2.0", - "lighthouse-logger": "^1.0.0" - }, - "bin": { - "print-chrome-path": "bin/print-chrome-path.js" - }, - "engines": { - "node": ">=12.13.0" - } - }, - "node_modules/chrome-launcher/node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true, - "engines": { - "node": ">=6.0" - } - }, - "node_modules/circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", - "deprecated": "CircularJSON is in maintenance only, flatted is its successor.", - "dev": true - }, - "node_modules/class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, - "dependencies": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/class-utils/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "dependencies": { - "restore-cursor": "^3.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cli-spinners": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", - "dev": true, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/clone-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", - "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, - "dependencies": { - "mimic-response": "^1.0.0" - } - }, - "node_modules/clone-stats": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", - "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", - "dev": true - }, - "node_modules/cloneable-readable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz", - "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==", - "dev": true, - "dependencies": { - "inherits": "^2.0.1", - "process-nextick-args": "^2.0.0", - "readable-stream": "^2.3.5" - } - }, - "node_modules/co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true, - "engines": { - "iojs": ">= 1.0.0", - "node": ">= 0.12.0" - } - }, - "node_modules/code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/collection-map": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz", - "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", - "dev": true, - "dependencies": { - "arr-map": "^2.0.2", - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, - "dependencies": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, - "bin": { - "color-support": "bin.js" - } - }, - "node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true, - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/comma-separated-tokens": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz", - "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", - "dev": true - }, - "node_modules/commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "node_modules/compare-func": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", - "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", - "dev": true, - "dependencies": { - "array-ify": "^1.0.0", - "dot-prop": "^5.1.0" - } - }, - "node_modules/component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true - }, - "node_modules/compress-commons": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz", - "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==", - "dev": true, - "dependencies": { - "buffer-crc32": "^0.2.13", - "crc32-stream": "^4.0.2", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/compress-commons/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "node_modules/concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, - "engines": [ - "node >= 0.8" - ], - "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "node_modules/concat-with-sourcemaps": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz", - "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==", - "dev": true, - "dependencies": { - "source-map": "^0.6.1" - } - }, - "node_modules/concat-with-sourcemaps/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/connect": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", - "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", - "dev": true, - "dependencies": { - "debug": "2.6.9", - "finalhandler": "1.1.2", - "parseurl": "~1.3.3", - "utils-merge": "1.0.1" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/connect-livereload": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz", - "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/connect/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/connect/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-disposition/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/continuable-cache": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz", - "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=", - "dev": true - }, - "node_modules/conventional-changelog": { - "version": "3.1.24", - "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.24.tgz", - "integrity": "sha512-ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg==", - "dev": true, - "dependencies": { - "conventional-changelog-angular": "^5.0.12", - "conventional-changelog-atom": "^2.0.8", - "conventional-changelog-codemirror": "^2.0.8", - "conventional-changelog-conventionalcommits": "^4.5.0", - "conventional-changelog-core": "^4.2.1", - "conventional-changelog-ember": "^2.0.9", - "conventional-changelog-eslint": "^3.0.9", - "conventional-changelog-express": "^2.0.6", - "conventional-changelog-jquery": "^3.0.11", - "conventional-changelog-jshint": "^2.0.9", - "conventional-changelog-preset-loader": "^2.3.4" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-angular": { - "version": "5.0.13", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz", - "integrity": "sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==", - "dev": true, - "dependencies": { - "compare-func": "^2.0.0", - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-atom": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz", - "integrity": "sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==", - "dev": true, - "dependencies": { - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-codemirror": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz", - "integrity": "sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==", - "dev": true, - "dependencies": { - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-config-spec": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz", - "integrity": "sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==", - "dev": true - }, - "node_modules/conventional-changelog-conventionalcommits": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.1.tgz", - "integrity": "sha512-lzWJpPZhbM1R0PIzkwzGBCnAkH5RKJzJfFQZcl/D+2lsJxAwGnDKBqn/F4C1RD31GJNn8NuKWQzAZDAVXPp2Mw==", - "dev": true, - "dependencies": { - "compare-func": "^2.0.0", - "lodash": "^4.17.15", - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-core": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz", - "integrity": "sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==", - "dev": true, - "dependencies": { - "add-stream": "^1.0.0", - "conventional-changelog-writer": "^5.0.0", - "conventional-commits-parser": "^3.2.0", - "dateformat": "^3.0.0", - "get-pkg-repo": "^4.0.0", - "git-raw-commits": "^2.0.8", - "git-remote-origin-url": "^2.0.0", - "git-semver-tags": "^4.1.1", - "lodash": "^4.17.15", - "normalize-package-data": "^3.0.0", - "q": "^1.5.1", - "read-pkg": "^3.0.0", - "read-pkg-up": "^3.0.0", - "through2": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-core/node_modules/dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/conventional-changelog-core/node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-core/node_modules/normalize-package-data": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", - "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-core/node_modules/read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "dependencies": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/conventional-changelog-core/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-ember": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz", - "integrity": "sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==", - "dev": true, - "dependencies": { - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-eslint": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz", - "integrity": "sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==", - "dev": true, - "dependencies": { - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-express": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz", - "integrity": "sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==", - "dev": true, - "dependencies": { - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-jquery": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz", - "integrity": "sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==", - "dev": true, - "dependencies": { - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-jshint": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz", - "integrity": "sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==", - "dev": true, - "dependencies": { - "compare-func": "^2.0.0", - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-preset-loader": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz", - "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-writer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz", - "integrity": "sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==", - "dev": true, - "dependencies": { - "conventional-commits-filter": "^2.0.7", - "dateformat": "^3.0.0", - "handlebars": "^4.7.7", - "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.15", - "meow": "^8.0.0", - "semver": "^6.0.0", - "split": "^1.0.0", - "through2": "^4.0.0" - }, - "bin": { - "conventional-changelog-writer": "cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-changelog-writer/node_modules/dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/conventional-changelog-writer/node_modules/split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "dev": true, - "dependencies": { - "through": "2" - }, - "engines": { - "node": "*" - } - }, - "node_modules/conventional-commits-filter": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz", - "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==", - "dev": true, - "dependencies": { - "lodash.ismatch": "^4.4.0", - "modify-values": "^1.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-commits-parser": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz", - "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==", - "dev": true, - "dependencies": { - "is-text-path": "^1.0.1", - "JSONStream": "^1.0.4", - "lodash": "^4.17.15", - "meow": "^8.0.0", - "split2": "^3.0.0", - "through2": "^4.0.0" - }, - "bin": { - "conventional-commits-parser": "cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-commits-parser/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/conventional-commits-parser/node_modules/split2": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", - "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", - "dev": true, - "dependencies": { - "readable-stream": "^3.0.0" - } - }, - "node_modules/conventional-recommended-bump": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz", - "integrity": "sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==", - "dev": true, - "dependencies": { - "concat-stream": "^2.0.0", - "conventional-changelog-preset-loader": "^2.3.4", - "conventional-commits-filter": "^2.0.7", - "conventional-commits-parser": "^3.2.0", - "git-raw-commits": "^2.0.8", - "git-semver-tags": "^4.1.1", - "meow": "^8.0.0", - "q": "^1.5.1" - }, - "bin": { - "conventional-recommended-bump": "cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/conventional-recommended-bump/node_modules/concat-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", - "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", - "dev": true, - "engines": [ - "node >= 6.0" - ], - "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - } - }, - "node_modules/conventional-recommended-bump/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "dependencies": { - "safe-buffer": "~5.1.1" - } - }, - "node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" - }, - "node_modules/copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/copy-props": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz", - "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==", - "dev": true, - "dependencies": { - "each-props": "^1.3.2", - "is-plain-object": "^5.0.0" - } - }, - "node_modules/core-js": { - "version": "3.21.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz", - "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==", - "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", - "hasInstallScript": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, - "node_modules/core-js-compat": { - "version": "3.21.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz", - "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==", - "dependencies": { - "browserslist": "^4.19.1", - "semver": "7.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, - "node_modules/core-js-compat/node_modules/semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/core-js-pure": { - "version": "3.21.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz", - "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==", - "deprecated": "core-js-pure@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js-pure.", - "hasInstallScript": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true - }, - "node_modules/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "dev": true, - "dependencies": { - "object-assign": "^4", - "vary": "^1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/coveralls": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.1.tgz", - "integrity": "sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==", - "dev": true, - "dependencies": { - "js-yaml": "^3.13.1", - "lcov-parse": "^1.0.0", - "log-driver": "^1.2.7", - "minimist": "^1.2.5", - "request": "^2.88.2" - }, - "bin": { - "coveralls": "bin/coveralls.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/crc-32": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz", - "integrity": "sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==", - "dev": true, - "dependencies": { - "exit-on-epipe": "~1.0.1", - "printj": "~1.3.1" - }, - "bin": { - "crc32": "bin/crc32.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/crc32-stream": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz", - "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==", - "dev": true, - "dependencies": { - "crc-32": "^1.2.0", - "readable-stream": "^3.4.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/crc32-stream/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/criteo-direct-rsa-validate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz", - "integrity": "sha512-7gQ3zX+d+hS/vOxzLrZ4aRAceB7qNJ0VzaGNpcWjDCmtOpASB50USJDupTik/H2nHgiSAA3VNZ3SFuONs8LR9Q==" - }, - "node_modules/cross-fetch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", - "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", - "dev": true, - "dependencies": { - "node-fetch": "2.6.7" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/crypto-js": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz", - "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==" - }, - "node_modules/css": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz", - "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==", - "dev": true, - "dependencies": { - "inherits": "^2.0.4", - "source-map": "^0.6.1", - "source-map-resolve": "^0.6.0" - } - }, - "node_modules/css-shorthand-properties": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz", - "integrity": "sha512-Md+Juc7M3uOdbAFwOYlTrccIZ7oCFuzrhKYQjdeUEW/sE1hv17Jp/Bws+ReOPpGVBTYCBoYo+G17V5Qo8QQ75A==", - "dev": true - }, - "node_modules/css-value": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz", - "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=", - "dev": true - }, - "node_modules/css/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "dependencies": { - "array-find-index": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/custom-event": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", - "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", - "dev": true - }, - "node_modules/d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "dev": true, - "dependencies": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, - "node_modules/dargs": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", - "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/date-format": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.4.tgz", - "integrity": "sha512-/jyf4rhB17ge328HJuJjAcmRtCsGd+NDeAtahRBTaK6vSPR6MO5HlrAit3Nn7dVjaa6sowW0WXt8yQtLyZQFRg==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/dateformat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", - "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/de-indent": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", - "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=", - "dev": true, - "optional": true - }, - "node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/debug-fabulous": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz", - "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==", - "dev": true, - "dependencies": { - "debug": "3.X", - "memoizee": "0.4.X", - "object-assign": "4.X" - } - }, - "node_modules/debug-fabulous/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decamelize-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", - "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", - "dev": true, - "dependencies": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decamelize-keys/node_modules/map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decompress-response/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "dev": true, - "dependencies": { - "type-detect": "^4.0.0" - }, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/deep-equal": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz", - "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "es-get-iterator": "^1.1.1", - "get-intrinsic": "^1.0.1", - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.2", - "is-regex": "^1.1.1", - "isarray": "^2.0.5", - "object-is": "^1.1.4", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "regexp.prototype.flags": "^1.3.0", - "side-channel": "^1.0.3", - "which-boxed-primitive": "^1.0.1", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/default-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz", - "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==", - "dev": true, - "dependencies": { - "kind-of": "^5.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/default-resolution": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz", - "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, - "dependencies": { - "clone": "^1.0.2" - } - }, - "node_modules/defaults/node_modules/clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dependencies": { - "object-keys": "^1.0.12" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", - "dev": true - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" - }, - "node_modules/detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "dev": true, - "bin": { - "detect-libc": "bin/detect-libc.js" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/detect-newline": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", - "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/detective": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz", - "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==", - "dev": true, - "dependencies": { - "acorn-node": "^1.6.1", - "defined": "^1.0.0", - "minimist": "^1.1.1" - }, - "bin": { - "detective": "bin/detective.js" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/devtools": { - "version": "7.16.16", - "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz", - "integrity": "sha512-M0kzkuSgfEhpqIis3gdtWsNjn/HQ+vRAmEzDnbYx/7FfjFxhSv1d+rOOT20pvd60soItMYpsOova1igACEGkGQ==", - "dev": true, - "dependencies": { - "@types/node": "^17.0.4", - "@types/ua-parser-js": "^0.7.33", - "@wdio/config": "7.16.16", - "@wdio/logger": "7.16.0", - "@wdio/protocols": "7.16.7", - "@wdio/types": "7.16.14", - "@wdio/utils": "7.16.14", - "chrome-launcher": "^0.15.0", - "edge-paths": "^2.1.0", - "puppeteer-core": "^13.1.3", - "query-selector-shadow-dom": "^1.0.0", - "ua-parser-js": "^1.0.1", - "uuid": "^8.0.0" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/devtools-protocol": { - "version": "0.0.973690", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.973690.tgz", - "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==", - "dev": true - }, - "node_modules/devtools/node_modules/ua-parser-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.2.tgz", - "integrity": "sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/ua-parser-js" - }, - { - "type": "paypal", - "url": "https://paypal.me/faisalman" - } - ], - "engines": { - "node": "*" - } - }, - "node_modules/devtools/node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/di": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", - "dev": true - }, - "node_modules/diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/diff-sequences": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz", - "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==", - "dev": true, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/dlv": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==" - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/doctrine-temporary-fork": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz", - "integrity": "sha512-nliqOv5NkE4zMON4UA6AMJE6As35afs8aYXATpU4pTUdIKiARZwrJVEP1boA3Rx1ZXHVkwxkhcq4VkqvsuRLsA==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/documentation": { - "version": "13.2.5", - "resolved": "https://registry.npmjs.org/documentation/-/documentation-13.2.5.tgz", - "integrity": "sha512-d1TrfrHXYZR63xrOzkYwwe297vkSwBoEhyyMBOi20T+7Ohe1aX1dW4nqXncQmdmE5MxluSaxxa3BW1dCvbF5AQ==", - "dev": true, - "dependencies": { - "@babel/core": "7.12.3", - "@babel/generator": "7.12.1", - "@babel/parser": "7.12.3", - "@babel/traverse": "^7.12.1", - "@babel/types": "^7.12.1", - "ansi-html": "^0.0.7", - "babelify": "^10.0.0", - "chalk": "^2.3.0", - "chokidar": "^3.4.0", - "concat-stream": "^1.6.0", - "diff": "^4.0.1", - "doctrine-temporary-fork": "2.1.0", - "get-port": "^5.0.0", - "git-url-parse": "^11.1.2", - "github-slugger": "1.2.0", - "glob": "^7.1.2", - "globals-docs": "^2.4.0", - "highlight.js": "^10.7.2", - "ini": "^1.3.5", - "js-yaml": "^3.10.0", - "lodash": "^4.17.10", - "mdast-util-find-and-replace": "^1.1.1", - "mdast-util-inject": "^1.1.0", - "micromatch": "^3.1.5", - "mime": "^2.2.0", - "module-deps-sortable": "^5.0.3", - "parse-filepath": "^1.0.2", - "pify": "^5.0.0", - "read-pkg-up": "^4.0.0", - "remark": "^13.0.0", - "remark-gfm": "^1.0.0", - "remark-html": "^13.0.1", - "remark-reference-links": "^5.0.0", - "remark-toc": "^7.2.0", - "resolve": "^1.8.1", - "stream-array": "^1.1.2", - "strip-json-comments": "^2.0.1", - "tiny-lr": "^1.1.0", - "unist-builder": "^2.0.3", - "unist-util-visit": "^2.0.3", - "vfile": "^4.0.0", - "vfile-reporter": "^6.0.0", - "vfile-sort": "^2.1.0", - "vinyl": "^2.1.0", - "vinyl-fs": "^3.0.2", - "yargs": "^15.3.1" - }, - "bin": { - "documentation": "bin/documentation.js" - }, - "engines": { - "node": ">=10" - }, - "optionalDependencies": { - "@vue/compiler-sfc": "^3.0.11", - "vue-template-compiler": "^2.6.12" - } - }, - "node_modules/documentation/node_modules/@babel/core": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz", - "integrity": "sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helpers": "^7.12.1", - "@babel/parser": "^7.12.3", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.12.1", - "@babel/types": "^7.12.1", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.19", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/documentation/node_modules/@babel/generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz", - "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.12.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/documentation/node_modules/@babel/parser": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz", - "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/documentation/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/documentation/node_modules/cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "node_modules/documentation/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/documentation/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/documentation/node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/documentation/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/documentation/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/documentation/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/documentation/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/documentation/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/documentation/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/documentation/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/documentation/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/documentation/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "node_modules/documentation/node_modules/yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "dev": true, - "dependencies": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/documentation/node_modules/yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/dom-serialize": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", - "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", - "dev": true, - "dependencies": { - "custom-event": "~1.0.0", - "ent": "~2.2.0", - "extend": "^3.0.0", - "void-elements": "^2.0.0" - } - }, - "node_modules/dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dotgitignore": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz", - "integrity": "sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==", - "dev": true, - "dependencies": { - "find-up": "^3.0.0", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/dotgitignore/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/dotgitignore/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/dotgitignore/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/dotgitignore/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/dotgitignore/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/dset": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/dset/-/dset-2.0.1.tgz", - "integrity": "sha512-nI29OZMRYq36hOcifB6HTjajNAAiBKSXsyWZrq+VniusseuP2OpNlTiYgsaNRSGvpyq5Wjbc2gQLyBdTyWqhnQ==", - "deprecated": "Please use dset@2.1.0 or later for an important security patch", - "engines": { - "node": ">=4" - } - }, - "node_modules/duplexer": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", - "dev": true - }, - "node_modules/duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", - "dev": true, - "dependencies": { - "readable-stream": "^2.0.2" - } - }, - "node_modules/duplexify": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz", - "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==", - "dev": true, - "dependencies": { - "end-of-stream": "^1.4.1", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1", - "stream-shift": "^1.0.0" - } - }, - "node_modules/duplexify/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/each-props": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz", - "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==", - "dev": true, - "dependencies": { - "is-plain-object": "^2.0.1", - "object.defaults": "^1.1.0" - } - }, - "node_modules/each-props/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/easy-table": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz", - "integrity": "sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "optionalDependencies": { - "wcwidth": "^1.0.1" - } - }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/edge-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-2.2.1.tgz", - "integrity": "sha512-AI5fC7dfDmCdKo3m5y7PkYE8m6bMqR6pvVpgtrZkkhcJXFLelUgkjrhk3kXXx8Kbw2cRaTT4LkOR7hqf39KJdw==", - "dev": true, - "dependencies": { - "@types/which": "^1.3.2", - "which": "^2.0.2" - } - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" - }, - "node_modules/ejs": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz", - "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==", - "dev": true, - "dependencies": { - "jake": "^10.6.1" - }, - "bin": { - "ejs": "bin/cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/electron-to-chromium": { - "version": "1.4.78", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.78.tgz", - "integrity": "sha512-o61+D/Lx7j/E0LIin/efOqeHpXhwi1TaQco9vUcRmr91m25SfZY6L5hWJDv/r+6kNjboFKgBw1LbfM0lbhuK6Q==" - }, - "node_modules/emoji-regex": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz", - "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=", - "dev": true - }, - "node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/engine.io": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz", - "integrity": "sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==", - "dev": true, - "dependencies": { - "@types/cookie": "^0.4.1", - "@types/cors": "^2.8.12", - "@types/node": ">=10.0.0", - "accepts": "~1.3.4", - "base64id": "2.0.0", - "cookie": "~0.4.1", - "cors": "~2.8.5", - "debug": "~4.3.1", - "engine.io-parser": "~5.0.3", - "ws": "~8.2.3" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/engine.io-parser": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz", - "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==", - "dev": true, - "dependencies": { - "@socket.io/base64-arraybuffer": "~1.0.2" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/enhanced-resolve": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz", - "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "dependencies": { - "ansi-colors": "^4.1.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", - "dev": true - }, - "node_modules/errno": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", - "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", - "dev": true, - "dependencies": { - "prr": "~1.0.1" - }, - "bin": { - "errno": "cli.js" - } - }, - "node_modules/error": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz", - "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==", - "dev": true, - "dependencies": { - "string-template": "~0.2.1" - } - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/es-abstract": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", - "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.1.1", - "get-symbol-description": "^1.0.0", - "has": "^1.0.3", - "has-symbols": "^1.0.2", - "internal-slot": "^1.0.3", - "is-callable": "^1.2.4", - "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.1", - "is-string": "^1.0.7", - "is-weakref": "^1.0.1", - "object-inspect": "^1.11.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "string.prototype.trimend": "^1.0.4", - "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-get-iterator": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz", - "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.0", - "has-symbols": "^1.0.1", - "is-arguments": "^1.1.0", - "is-map": "^2.0.2", - "is-set": "^2.0.2", - "is-string": "^1.0.5", - "isarray": "^2.0.5" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", - "dev": true - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es5-ext": { - "version": "0.10.57", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.57.tgz", - "integrity": "sha512-L7cCNoPwTkAp7IBHxrKLsh7NKiVFkcdxlP9vbVw9QUvb7gF0Mz9bEBN0WY9xqdTjGF907EMT/iG013vnbqwu1Q==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.3", - "next-tick": "^1.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/es5-shim": { - "version": "4.6.5", - "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.5.tgz", - "integrity": "sha512-vfQ4UAai8szn0sAubCy97xnZ4sJVDD1gt/Grn736hg8D7540wemIb1YPrYZSTqlM2H69EQX1or4HU/tSwRTI3w==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "dependencies": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "node_modules/es6-object-assign": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", - "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=", - "dev": true - }, - "node_modules/es6-promise": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", - "dev": true - }, - "node_modules/es6-promisify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", - "dev": true, - "dependencies": { - "es6-promise": "^4.0.3" - } - }, - "node_modules/es6-symbol": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", - "dev": true, - "dependencies": { - "d": "^1.0.1", - "ext": "^1.1.2" - } - }, - "node_modules/es6-weak-map": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", - "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", - "dev": true, - "dependencies": { - "d": "1", - "es5-ext": "^0.10.46", - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.1" - } - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" - }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", - "dev": true, - "dependencies": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", - "esutils": "^2.0.2", - "optionator": "^0.8.1" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=0.12.0" - }, - "optionalDependencies": { - "source-map": "~0.2.0" - } - }, - "node_modules/escodegen/node_modules/estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/escodegen/node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "dev": true, - "optional": true, - "dependencies": { - "amdefine": ">=0.0.4" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/escodegen/node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/eslint": { - "version": "7.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", - "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-config-standard": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz", - "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=", - "dev": true, - "peerDependencies": { - "eslint": ">=3.19.0", - "eslint-plugin-import": ">=2.2.0", - "eslint-plugin-node": ">=4.2.2", - "eslint-plugin-promise": ">=3.5.0", - "eslint-plugin-standard": ">=3.0.0" - } - }, - "node_modules/eslint-import-resolver-node": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", - "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", - "dev": true, - "dependencies": { - "debug": "^3.2.7", - "resolve": "^1.20.0" - } - }, - "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-module-utils": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz", - "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==", - "dev": true, - "dependencies": { - "debug": "^3.2.7", - "find-up": "^2.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-module-utils/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-es": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", - "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", - "dev": true, - "dependencies": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - }, - "engines": { - "node": ">=8.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=4.19.1" - } - }, - "node_modules/eslint-plugin-import": { - "version": "2.25.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz", - "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.4", - "array.prototype.flat": "^1.2.5", - "debug": "^2.6.9", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.2", - "has": "^1.0.3", - "is-core-module": "^2.8.0", - "is-glob": "^4.0.3", - "minimatch": "^3.0.4", - "object.values": "^1.1.5", - "resolve": "^1.20.0", - "tsconfig-paths": "^3.12.0" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" - } - }, - "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-import/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/eslint-plugin-node": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", - "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", - "dev": true, - "dependencies": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" - }, - "engines": { - "node": ">=8.10.0" - }, - "peerDependencies": { - "eslint": ">=5.16.0" - } - }, - "node_modules/eslint-plugin-node/node_modules/ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/eslint-plugin-prebid": { - "resolved": "plugins/eslint", - "link": true - }, - "node_modules/eslint-plugin-promise": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz", - "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==", - "dev": true, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "peerDependencies": { - "eslint": "^7.0.0" - } - }, - "node_modules/eslint-plugin-standard": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz", - "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==", - "dev": true, - "peerDependencies": { - "eslint": ">=3.19.0" - } - }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/eslint/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/eslint/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/eslint/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/eslint/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/eslint/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/eslint/node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/globals": { - "version": "13.12.1", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz", - "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", - "dev": true, - "dependencies": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", - "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true, - "optional": true - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, - "dependencies": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "node_modules/event-stream": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", - "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", - "dev": true, - "dependencies": { - "duplexer": "~0.1.1", - "from": "~0", - "map-stream": "~0.1.0", - "pause-stream": "0.0.11", - "split": "0.3", - "stream-combiner": "~0.0.4", - "through": "~2.3.1" - } - }, - "node_modules/event-stream/node_modules/map-stream": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", - "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", - "dev": true - }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "dev": true - }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "engines": { - "node": ">=0.8.x" - } - }, - "node_modules/execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "dependencies": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/execa/node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "dependencies": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "engines": { - "node": ">=4.8" - } - }, - "node_modules/execa/node_modules/path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/execa/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/execa/node_modules/shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "dependencies": { - "shebang-regex": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/execa/node_modules/shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/execa/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/exit-on-epipe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz", - "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "dependencies": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/expand-brackets/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/expand-brackets/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true, - "dependencies": { - "homedir-polyfill": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expect": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz", - "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==", - "dev": true, - "dependencies": { - "@jest/types": "^27.5.1", - "jest-get-type": "^27.5.1", - "jest-matcher-utils": "^27.5.1", - "jest-message-util": "^27.5.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/expect-webdriverio": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-3.1.4.tgz", - "integrity": "sha512-65FTS3bmxcIp0cq6fLb/72TrCQXBCpwPLC7SwMWdpPlLq461mXcK1BPKJJjnIC587aXSKD+3E4hvnlCtwDmXfg==", - "dev": true, - "dependencies": { - "expect": "^27.0.2", - "jest-matcher-utils": "^27.0.2" - } - }, - "node_modules/express": { - "version": "4.17.3", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz", - "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==", - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.19.2", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.4.2", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.7", - "qs": "6.9.7", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.17.2", - "serve-static": "1.14.2", - "setprototypeof": "1.2.0", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/express/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/express/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "node_modules/express/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/ext": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", - "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==", - "dev": true, - "dependencies": { - "type": "^2.5.0" - } - }, - "node_modules/ext/node_modules/type": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz", - "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==", - "dev": true - }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "node_modules/extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, - "dependencies": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "dependencies": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/external-editor/node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "dependencies": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "bin": { - "extract-zip": "cli.js" - }, - "engines": { - "node": ">= 10.17.0" - }, - "optionalDependencies": { - "@types/yauzl": "^2.9.1" - } - }, - "node_modules/extract-zip/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true, - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/faker": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz", - "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==", - "dev": true - }, - "node_modules/fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", - "dev": true, - "dependencies": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "node_modules/faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true, - "dependencies": { - "websocket-driver": ">=0.5.1" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "dev": true, - "dependencies": { - "pend": "~1.2.0" - } - }, - "node_modules/fibers": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.1.tgz", - "integrity": "sha512-VMC7Frt87Oo0AOJ6EcPFbi+tZmkQ4tD85aatwyWL6I9cYMJmm2e+pXUJsfGZ36U7MffXtjou2XIiWJMtHriErw==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "detect-libc": "^1.0.3" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "dev": true, - "optional": true - }, - "node_modules/filelist": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", - "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", - "dev": true, - "dependencies": { - "minimatch": "^3.0.4" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/filter-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", - "integrity": "sha1-mzERErxsYSehbgFsbF1/GeCAXFs=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/finalhandler/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/finalhandler/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "node_modules/find-cache-dir": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", - "dev": true, - "dependencies": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/avajs/find-cache-dir?sponsor=1" - } - }, - "node_modules/find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "dependencies": { - "locate-path": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/findup-sync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", - "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", - "dev": true, - "dependencies": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/fined": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", - "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", - "dev": true, - "dependencies": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/fined/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/flagged-respawn": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", - "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true, - "bin": { - "flat": "cli.js" - } - }, - "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "dependencies": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", - "dev": true - }, - "node_modules/flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - } - }, - "node_modules/follow-redirects": { - "version": "1.14.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "dependencies": { - "for-in": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true - }, - "node_modules/foreachasync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz", - "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=", - "dev": true - }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/fork-stream": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz", - "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=", - "dev": true - }, - "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, - "dependencies": { - "map-cache": "^0.2.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/from": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", - "dev": true - }, - "node_modules/fs-access": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", - "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", - "dev": true, - "dependencies": { - "null-check": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true - }, - "node_modules/fs-extra": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz", - "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/fs-mkdirp-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", - "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.11", - "through2": "^2.0.3" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/fs-mkdirp-stream/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/fs.extra": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz", - "integrity": "sha1-3QI/kwE77iRTHxszUUw3sg/ZM0k=", - "dev": true, - "dependencies": { - "fs-extra": "~0.6.1", - "mkdirp": "~0.3.5", - "walk": "^2.3.9" - }, - "engines": { - "node": "*" - } - }, - "node_modules/fs.extra/node_modules/fs-extra": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz", - "integrity": "sha1-9G8MdbeEH40gCzNIzU1pHVoJnRU=", - "dev": true, - "dependencies": { - "jsonfile": "~1.0.1", - "mkdirp": "0.3.x", - "ncp": "~0.4.2", - "rimraf": "~2.2.0" - } - }, - "node_modules/fs.extra/node_modules/jsonfile": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz", - "integrity": "sha1-6l7+QLg2kLmGZ2FKc5L8YOhCwN0=", - "dev": true - }, - "node_modules/fs.extra/node_modules/mkdirp": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=", - "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", - "dev": true - }, - "node_modules/fs.extra/node_modules/rimraf": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", - "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=", - "dev": true, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - }, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/fstream/node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/fstream/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/fun-hooks": { - "version": "0.9.10", - "resolved": "https://registry.npmjs.org/fun-hooks/-/fun-hooks-0.9.10.tgz", - "integrity": "sha512-7xBjdT+oMYOPWgwFxNiNzF4ubeUvim4zs1DnQqSSGyxu8UD7AW/6Z0iFsVRwuVSIZKUks2en2VHHotmNfj3ipw==", - "dependencies": { - "typescript-tuple": "^2.2.1" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, - "node_modules/gaze": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", - "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", - "dev": true, - "dependencies": { - "globule": "^1.0.0" - }, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-pkg-repo": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz", - "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==", - "dev": true, - "dependencies": { - "@hutson/parse-repository-url": "^3.0.0", - "hosted-git-info": "^4.0.0", - "through2": "^2.0.0", - "yargs": "^16.2.0" - }, - "bin": { - "get-pkg-repo": "src/cli.js" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-pkg-repo/node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/get-pkg-repo/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/get-pkg-repo/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/get-pkg-repo/node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/get-port": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", - "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - } - }, - "node_modules/git-raw-commits": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz", - "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==", - "dev": true, - "dependencies": { - "dargs": "^7.0.0", - "lodash": "^4.17.15", - "meow": "^8.0.0", - "split2": "^3.0.0", - "through2": "^4.0.0" - }, - "bin": { - "git-raw-commits": "cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/git-raw-commits/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/git-raw-commits/node_modules/split2": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", - "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", - "dev": true, - "dependencies": { - "readable-stream": "^3.0.0" - } - }, - "node_modules/git-remote-origin-url": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz", - "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=", - "dev": true, - "dependencies": { - "gitconfiglocal": "^1.0.0", - "pify": "^2.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/git-remote-origin-url/node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/git-semver-tags": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz", - "integrity": "sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==", - "dev": true, - "dependencies": { - "meow": "^8.0.0", - "semver": "^6.0.0" - }, - "bin": { - "git-semver-tags": "cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/git-up": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/git-up/-/git-up-4.0.5.tgz", - "integrity": "sha512-YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA==", - "dev": true, - "dependencies": { - "is-ssh": "^1.3.0", - "parse-url": "^6.0.0" - } - }, - "node_modules/git-url-parse": { - "version": "11.6.0", - "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz", - "integrity": "sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g==", - "dev": true, - "dependencies": { - "git-up": "^4.0.0" - } - }, - "node_modules/gitconfiglocal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz", - "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=", - "dev": true, - "dependencies": { - "ini": "^1.3.2" - } - }, - "node_modules/github-slugger": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz", - "integrity": "sha512-wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q==", - "dev": true, - "dependencies": { - "emoji-regex": ">=6.0.0 <=6.1.1" - } - }, - "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/glob-stream": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", - "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", - "dev": true, - "dependencies": { - "extend": "^3.0.0", - "glob": "^7.1.1", - "glob-parent": "^3.1.0", - "is-negated-glob": "^1.0.0", - "ordered-read-streams": "^1.0.0", - "pumpify": "^1.3.5", - "readable-stream": "^2.1.5", - "remove-trailing-separator": "^1.0.1", - "to-absolute-glob": "^2.0.0", - "unique-stream": "^2.0.2" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/glob-stream/node_modules/glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "dependencies": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - } - }, - "node_modules/glob-stream/node_modules/is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true - }, - "node_modules/glob-watcher": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz", - "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==", - "dev": true, - "dependencies": { - "anymatch": "^2.0.0", - "async-done": "^1.2.0", - "chokidar": "^2.0.0", - "is-negated-glob": "^1.0.0", - "just-debounce": "^1.0.0", - "normalize-path": "^3.0.0", - "object.defaults": "^1.1.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/glob-watcher/node_modules/anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "dependencies": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - } - }, - "node_modules/glob-watcher/node_modules/anymatch/node_modules/normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "dependencies": { - "remove-trailing-separator": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-watcher/node_modules/binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-watcher/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-watcher/node_modules/chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies", - "dev": true, - "dependencies": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - }, - "optionalDependencies": { - "fsevents": "^1.2.7" - } - }, - "node_modules/glob-watcher/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-watcher/node_modules/fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-watcher/node_modules/fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - }, - "engines": { - "node": ">= 4.0" - } - }, - "node_modules/glob-watcher/node_modules/glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "dependencies": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - } - }, - "node_modules/glob-watcher/node_modules/glob-parent/node_modules/is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-watcher/node_modules/is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "dependencies": { - "binary-extensions": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-watcher/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-watcher/node_modules/readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/glob-watcher/node_modules/to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "dependencies": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "dev": true, - "dependencies": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/global-prefix/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "engines": { - "node": ">=4" - } - }, - "node_modules/globals-docs": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/globals-docs/-/globals-docs-2.4.1.tgz", - "integrity": "sha512-qpPnUKkWnz8NESjrCvnlGklsgiQzlq+rcCxoG5uNQ+dNA7cFMCmn231slLAwS2N/PlkzZ3COL8CcS10jXmLHqg==", - "dev": true - }, - "node_modules/globule": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz", - "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==", - "dev": true, - "dependencies": { - "glob": "~7.1.1", - "lodash": "~4.17.10", - "minimatch": "~3.0.2" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/globule/node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/globule/node_modules/minimatch": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", - "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/glogg": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", - "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==", - "dev": true, - "dependencies": { - "sparkles": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/got": { - "version": "11.8.3", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz", - "integrity": "sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==", - "dev": true, - "dependencies": { - "@sindresorhus/is": "^4.0.0", - "@szmarczak/http-timer": "^4.0.5", - "@types/cacheable-request": "^6.0.1", - "@types/responselike": "^1.0.0", - "cacheable-lookup": "^5.0.3", - "cacheable-request": "^7.0.2", - "decompress-response": "^6.0.0", - "http2-wrapper": "^1.0.0-beta.5.2", - "lowercase-keys": "^2.0.0", - "p-cancelable": "^2.0.0", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=10.19.0" - }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.9", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", - "dev": true - }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", - "dev": true - }, - "node_modules/growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true, - "engines": { - "node": ">=4.x" - } - }, - "node_modules/gulp": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz", - "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==", - "dev": true, - "dependencies": { - "glob-watcher": "^5.0.3", - "gulp-cli": "^2.2.0", - "undertaker": "^1.2.1", - "vinyl-fs": "^3.0.0" - }, - "bin": { - "gulp": "bin/gulp.js" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/gulp-clean": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.3.2.tgz", - "integrity": "sha1-o0fUc6zqQBgvk1WHpFGUFnGSgQI=", - "dev": true, - "dependencies": { - "gulp-util": "^2.2.14", - "rimraf": "^2.2.8", - "through2": "^0.4.2" - }, - "engines": { - "node": ">=0.9" - } - }, - "node_modules/gulp-clean/node_modules/ansi-regex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/ansi-styles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "dependencies": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/chalk": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", - "dev": true, - "dependencies": { - "ansi-styles": "^1.1.0", - "escape-string-regexp": "^1.0.0", - "has-ansi": "^0.1.0", - "strip-ansi": "^0.3.0", - "supports-color": "^0.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "node_modules/gulp-clean/node_modules/dateformat": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", - "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", - "dev": true, - "dependencies": { - "get-stdin": "^4.0.1", - "meow": "^3.3.0" - }, - "bin": { - "dateformat": "bin/cli.js" - }, - "engines": { - "node": "*" - } - }, - "node_modules/gulp-clean/node_modules/find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "dependencies": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/gulp-util": { - "version": "2.2.20", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", - "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", - "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5", - "dev": true, - "dependencies": { - "chalk": "^0.5.0", - "dateformat": "^1.0.7-1.2.3", - "lodash._reinterpolate": "^2.4.1", - "lodash.template": "^2.4.1", - "minimist": "^0.2.0", - "multipipe": "^0.1.0", - "through2": "^0.5.0", - "vinyl": "^0.2.1" - }, - "engines": { - "node": ">= 0.9" - } - }, - "node_modules/gulp-clean/node_modules/gulp-util/node_modules/through2": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", - "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", - "dev": true, - "dependencies": { - "readable-stream": "~1.0.17", - "xtend": "~3.0.0" - } - }, - "node_modules/gulp-clean/node_modules/gulp-util/node_modules/xtend": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=", - "dev": true, - "engines": { - "node": ">=0.4" - } - }, - "node_modules/gulp-clean/node_modules/has-ansi": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", - "dev": true, - "dependencies": { - "ansi-regex": "^0.2.0" - }, - "bin": { - "has-ansi": "cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "dependencies": { - "repeating": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/gulp-clean/node_modules/load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/lodash._reinterpolate": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", - "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=", - "dev": true - }, - "node_modules/gulp-clean/node_modules/lodash.defaults": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", - "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", - "dev": true, - "dependencies": { - "lodash._objecttypes": "~2.4.1", - "lodash.keys": "~2.4.1" - } - }, - "node_modules/gulp-clean/node_modules/lodash.template": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", - "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", - "dev": true, - "dependencies": { - "lodash._escapestringchar": "~2.4.1", - "lodash._reinterpolate": "~2.4.1", - "lodash.defaults": "~2.4.1", - "lodash.escape": "~2.4.1", - "lodash.keys": "~2.4.1", - "lodash.templatesettings": "~2.4.1", - "lodash.values": "~2.4.1" - } - }, - "node_modules/gulp-clean/node_modules/lodash.templatesettings": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", - "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", - "dev": true, - "dependencies": { - "lodash._reinterpolate": "~2.4.1", - "lodash.escape": "~2.4.1" - } - }, - "node_modules/gulp-clean/node_modules/map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "dependencies": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/meow/node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "node_modules/gulp-clean/node_modules/minimist": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz", - "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==", - "dev": true - }, - "node_modules/gulp-clean/node_modules/object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", - "dev": true - }, - "node_modules/gulp-clean/node_modules/parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "dependencies": { - "error-ex": "^1.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "dependencies": { - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "dependencies": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "dependencies": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/gulp-clean/node_modules/redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "dependencies": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/gulp-clean/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/gulp-clean/node_modules/strip-ansi": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", - "dev": true, - "dependencies": { - "ansi-regex": "^0.2.1" - }, - "bin": { - "strip-ansi": "cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "dependencies": { - "is-utf8": "^0.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "dependencies": { - "get-stdin": "^4.0.1" - }, - "bin": { - "strip-indent": "cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/supports-color": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=", - "dev": true, - "bin": { - "supports-color": "cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/through2": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", - "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", - "dev": true, - "dependencies": { - "readable-stream": "~1.0.17", - "xtend": "~2.1.1" - } - }, - "node_modules/gulp-clean/node_modules/trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-clean/node_modules/vinyl": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", - "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", - "dev": true, - "dependencies": { - "clone-stats": "~0.0.1" - }, - "engines": { - "node": ">= 0.9" - } - }, - "node_modules/gulp-clean/node_modules/xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", - "dev": true, - "dependencies": { - "object-keys": "~0.4.0" - }, - "engines": { - "node": ">=0.4" - } - }, - "node_modules/gulp-cli": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz", - "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==", - "dev": true, - "dependencies": { - "ansi-colors": "^1.0.1", - "archy": "^1.0.0", - "array-sort": "^1.0.0", - "color-support": "^1.1.3", - "concat-stream": "^1.6.0", - "copy-props": "^2.0.1", - "fancy-log": "^1.3.2", - "gulplog": "^1.0.0", - "interpret": "^1.4.0", - "isobject": "^3.0.1", - "liftoff": "^3.1.0", - "matchdep": "^2.0.0", - "mute-stdout": "^1.0.0", - "pretty-hrtime": "^1.0.0", - "replace-homedir": "^1.0.0", - "semver-greatest-satisfied-range": "^1.1.0", - "v8flags": "^3.2.0", - "yargs": "^7.1.0" - }, - "bin": { - "gulp": "bin/gulp.js" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/gulp-cli/node_modules/ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "dev": true, - "dependencies": { - "ansi-wrap": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "dependencies": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "node_modules/gulp-cli/node_modules/find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "dependencies": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "node_modules/gulp-cli/node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "dependencies": { - "error-ex": "^1.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "dependencies": { - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "dependencies": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "dependencies": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "node_modules/gulp-cli/node_modules/string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "dependencies": { - "is-utf8": "^0.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true - }, - "node_modules/gulp-cli/node_modules/wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, - "dependencies": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-cli/node_modules/y18n": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz", - "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==", - "dev": true - }, - "node_modules/gulp-cli/node_modules/yargs": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz", - "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==", - "dev": true, - "dependencies": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.1" - } - }, - "node_modules/gulp-cli/node_modules/yargs-parser": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz", - "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==", - "dev": true, - "dependencies": { - "camelcase": "^3.0.0", - "object.assign": "^4.1.0" - } - }, - "node_modules/gulp-concat": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz", - "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=", - "dev": true, - "dependencies": { - "concat-with-sourcemaps": "^1.0.0", - "through2": "^2.0.0", - "vinyl": "^2.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/gulp-concat/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/gulp-connect": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.7.0.tgz", - "integrity": "sha512-8tRcC6wgXMLakpPw9M7GRJIhxkYdgZsXwn7n56BA2bQYGLR9NOPhMzx7js+qYDy6vhNkbApGKURjAw1FjY4pNA==", - "dev": true, - "dependencies": { - "ansi-colors": "^2.0.5", - "connect": "^3.6.6", - "connect-livereload": "^0.6.0", - "fancy-log": "^1.3.2", - "map-stream": "^0.0.7", - "send": "^0.16.2", - "serve-index": "^1.9.1", - "serve-static": "^1.13.2", - "tiny-lr": "^1.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-connect/node_modules/ansi-colors": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz", - "integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/gulp-connect/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/gulp-connect/node_modules/http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/gulp-connect/node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "node_modules/gulp-connect/node_modules/mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", - "dev": true, - "bin": { - "mime": "cli.js" - } - }, - "node_modules/gulp-connect/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/gulp-connect/node_modules/send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", - "dev": true, - "dependencies": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.6.2", - "mime": "1.4.1", - "ms": "2.0.0", - "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/gulp-connect/node_modules/setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "node_modules/gulp-connect/node_modules/statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/gulp-eslint": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-4.0.2.tgz", - "integrity": "sha512-fcFUQzFsN6dJ6KZlG+qPOEkqfcevRUXgztkYCvhNvJeSvOicC8ucutN4qR/ID8LmNZx9YPIkBzazTNnVvbh8wg==", - "dev": true, - "dependencies": { - "eslint": "^4.0.0", - "fancy-log": "^1.3.2", - "plugin-error": "^1.0.0" - } - }, - "node_modules/gulp-eslint/node_modules/acorn": { - "version": "5.7.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", - "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/gulp-eslint/node_modules/acorn-jsx": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", - "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", - "dev": true, - "dependencies": { - "acorn": "^3.0.4" - } - }, - "node_modules/gulp-eslint/node_modules/acorn-jsx/node_modules/acorn": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/gulp-eslint/node_modules/ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "dependencies": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, - "node_modules/gulp-eslint/node_modules/ajv-keywords": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", - "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", - "dev": true, - "peerDependencies": { - "ajv": "^5.0.0" - } - }, - "node_modules/gulp-eslint/node_modules/ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/chardet": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", - "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", - "dev": true - }, - "node_modules/gulp-eslint/node_modules/cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "dependencies": { - "restore-cursor": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/cli-width": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", - "dev": true - }, - "node_modules/gulp-eslint/node_modules/cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "dependencies": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "node_modules/gulp-eslint/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/gulp-eslint/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-eslint/node_modules/eslint": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", - "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", - "dev": true, - "dependencies": { - "ajv": "^5.3.0", - "babel-code-frame": "^6.22.0", - "chalk": "^2.1.0", - "concat-stream": "^1.6.0", - "cross-spawn": "^5.1.0", - "debug": "^3.1.0", - "doctrine": "^2.1.0", - "eslint-scope": "^3.7.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^3.5.4", - "esquery": "^1.0.0", - "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.0.1", - "ignore": "^3.3.3", - "imurmurhash": "^0.1.4", - "inquirer": "^3.0.6", - "is-resolvable": "^1.0.0", - "js-yaml": "^3.9.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.4", - "minimatch": "^3.0.2", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", - "progress": "^2.0.0", - "regexpp": "^1.0.1", - "require-uncached": "^1.0.3", - "semver": "^5.3.0", - "strip-ansi": "^4.0.0", - "strip-json-comments": "~2.0.1", - "table": "4.0.2", - "text-table": "~0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==", - "dev": true, - "dependencies": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/gulp-eslint/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/espree": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", - "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", - "dev": true, - "dependencies": { - "acorn": "^5.5.0", - "acorn-jsx": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-eslint/node_modules/external-editor": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", - "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", - "dev": true, - "dependencies": { - "chardet": "^0.4.0", - "iconv-lite": "^0.4.17", - "tmp": "^0.0.33" - }, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/gulp-eslint/node_modules/fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", - "dev": true - }, - "node_modules/gulp-eslint/node_modules/figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", - "dev": true, - "dependencies": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-eslint/node_modules/flat-cache": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz", - "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==", - "dev": true, - "dependencies": { - "circular-json": "^0.3.1", - "graceful-fs": "^4.1.2", - "rimraf": "~2.6.2", - "write": "^0.2.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-eslint/node_modules/ignore": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", - "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", - "dev": true - }, - "node_modules/gulp-eslint/node_modules/inquirer": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", - "dev": true, - "dependencies": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^2.0.4", - "figures": "^2.0.0", - "lodash": "^4.3.0", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rx-lite": "^4.0.8", - "rx-lite-aggregates": "^4.0.8", - "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", - "through": "^2.3.6" - } - }, - "node_modules/gulp-eslint/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true - }, - "node_modules/gulp-eslint/node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/gulp-eslint/node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "node_modules/gulp-eslint/node_modules/mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/gulp-eslint/node_modules/mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, - "node_modules/gulp-eslint/node_modules/onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "dependencies": { - "mimic-fn": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/gulp-eslint/node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/gulp-eslint/node_modules/regexpp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", - "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", - "dev": true, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/gulp-eslint/node_modules/restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "dependencies": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/gulp-eslint/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/gulp-eslint/node_modules/shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "dependencies": { - "shebang-regex": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-eslint/node_modules/shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-eslint/node_modules/slice-ansi": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", - "dev": true, - "dependencies": { - "is-fullwidth-code-point": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/gulp-eslint/node_modules/table": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", - "dev": true, - "dependencies": { - "ajv": "^5.2.3", - "ajv-keywords": "^2.1.0", - "chalk": "^2.1.0", - "lodash": "^4.17.4", - "slice-ansi": "1.0.0", - "string-width": "^2.1.1" - } - }, - "node_modules/gulp-eslint/node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/gulp-eslint/node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/gulp-eslint/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/gulp-eslint/node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "node_modules/gulp-if": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-3.0.0.tgz", - "integrity": "sha512-fCUEngzNiEZEK2YuPm+sdMpO6ukb8+/qzbGfJBXyNOXz85bCG7yBI+pPSl+N90d7gnLvMsarthsAImx0qy7BAw==", - "dev": true, - "dependencies": { - "gulp-match": "^1.1.0", - "ternary-stream": "^3.0.0", - "through2": "^3.0.1" - } - }, - "node_modules/gulp-if/node_modules/through2": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", - "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", - "dev": true, - "dependencies": { - "inherits": "^2.0.4", - "readable-stream": "2 || 3" - } - }, - "node_modules/gulp-js-escape": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gulp-js-escape/-/gulp-js-escape-1.0.1.tgz", - "integrity": "sha1-HNRF+9AJ4Np2lZoDp/SbNWav+Gg=", - "dev": true, - "dependencies": { - "through2": "^0.6.3" - } - }, - "node_modules/gulp-js-escape/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/gulp-js-escape/node_modules/readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/gulp-js-escape/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/gulp-js-escape/node_modules/through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "dev": true, - "dependencies": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - } - }, - "node_modules/gulp-match": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz", - "integrity": "sha512-DlyVxa1Gj24DitY2OjEsS+X6tDpretuxD6wTfhXE/Rw2hweqc1f6D/XtsJmoiCwLWfXgR87W9ozEityPCVzGtQ==", - "dev": true, - "dependencies": { - "minimatch": "^3.0.3" - } - }, - "node_modules/gulp-replace": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz", - "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==", - "dev": true, - "dependencies": { - "@types/node": "^14.14.41", - "@types/vinyl": "^2.0.4", - "istextorbinary": "^3.0.0", - "replacestream": "^4.0.3", - "yargs-parser": ">=5.0.0-security.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gulp-replace/node_modules/@types/node": { - "version": "14.18.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz", - "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==", - "dev": true - }, - "node_modules/gulp-shell": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.8.0.tgz", - "integrity": "sha512-wHNCgmqbWkk1c6Gc2dOL5SprcoeujQdeepICwfQRo91DIylTE7a794VEE+leq3cE2YDoiS5ulvRfKVIEMazcTQ==", - "dev": true, - "dependencies": { - "chalk": "^3.0.0", - "fancy-log": "^1.3.3", - "lodash.template": "^4.5.0", - "plugin-error": "^1.0.1", - "through2": "^3.0.1", - "tslib": "^1.10.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/gulp-shell/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/gulp-shell/node_modules/chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/gulp-shell/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/gulp-shell/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/gulp-shell/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/gulp-shell/node_modules/through2": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", - "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", - "dev": true, - "dependencies": { - "inherits": "^2.0.4", - "readable-stream": "2 || 3" - } - }, - "node_modules/gulp-sourcemaps": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz", - "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==", - "dev": true, - "dependencies": { - "@gulp-sourcemaps/identity-map": "^2.0.1", - "@gulp-sourcemaps/map-sources": "^1.0.0", - "acorn": "^6.4.1", - "convert-source-map": "^1.0.0", - "css": "^3.0.0", - "debug-fabulous": "^1.0.0", - "detect-newline": "^2.0.0", - "graceful-fs": "^4.0.0", - "source-map": "^0.6.0", - "strip-bom-string": "^1.0.0", - "through2": "^2.0.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/gulp-sourcemaps/node_modules/acorn": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", - "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/gulp-sourcemaps/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-sourcemaps/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/gulp-terser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz", - "integrity": "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==", - "dev": true, - "dependencies": { - "plugin-error": "^1.0.1", - "terser": "^5.9.0", - "through2": "^4.0.2", - "vinyl-sourcemaps-apply": "^0.2.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gulp-util": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", - "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5", - "dev": true, - "dependencies": { - "array-differ": "^1.0.0", - "array-uniq": "^1.0.2", - "beeper": "^1.0.0", - "chalk": "^1.0.0", - "dateformat": "^2.0.0", - "fancy-log": "^1.1.0", - "gulplog": "^1.0.0", - "has-gulplog": "^0.1.0", - "lodash._reescape": "^3.0.0", - "lodash._reevaluate": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.template": "^3.0.0", - "minimist": "^1.1.0", - "multipipe": "^0.1.2", - "object-assign": "^3.0.0", - "replace-ext": "0.0.1", - "through2": "^2.0.0", - "vinyl": "^0.5.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/gulp-util/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-util/node_modules/ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-util/node_modules/chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "dependencies": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-util/node_modules/clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/gulp-util/node_modules/clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "node_modules/gulp-util/node_modules/lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "dev": true, - "dependencies": { - "lodash._root": "^3.0.0" - } - }, - "node_modules/gulp-util/node_modules/lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "dependencies": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" - } - }, - "node_modules/gulp-util/node_modules/lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "dev": true, - "dependencies": { - "lodash._basecopy": "^3.0.0", - "lodash._basetostring": "^3.0.0", - "lodash._basevalues": "^3.0.0", - "lodash._isiterateecall": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0", - "lodash.keys": "^3.0.0", - "lodash.restparam": "^3.0.0", - "lodash.templatesettings": "^3.0.0" - } - }, - "node_modules/gulp-util/node_modules/lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", - "dev": true, - "dependencies": { - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0" - } - }, - "node_modules/gulp-util/node_modules/object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-util/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-util/node_modules/supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/gulp-util/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/gulp-util/node_modules/vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", - "dev": true, - "dependencies": { - "clone": "^1.0.0", - "clone-stats": "^0.0.1", - "replace-ext": "0.0.1" - }, - "engines": { - "node": ">= 0.9" - } - }, - "node_modules/gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "dev": true, - "dependencies": { - "glogg": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/gzip-size": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", - "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", - "dev": true, - "dependencies": { - "duplexer": "^0.1.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" - }, - "engines": { - "node": ">=0.4.7" - }, - "optionalDependencies": { - "uglify-js": "^3.1.4" - } - }, - "node_modules/handlebars/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/har-validator/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/hard-rejection": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", - "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-ansi/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-bigints": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", - "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "dev": true, - "dependencies": { - "sparkles": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, - "dependencies": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/has-values/node_modules/kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/hast-util-is-element": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz", - "integrity": "sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/hast-util-sanitize": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-3.0.2.tgz", - "integrity": "sha512-+2I0x2ZCAyiZOO/sb4yNLFmdwPBnyJ4PBkVTUMKMqBwYNA+lXSgOmoRXlJFazoyid9QPogRRKgKhVEodv181sA==", - "dev": true, - "dependencies": { - "xtend": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/hast-util-to-html": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-7.1.3.tgz", - "integrity": "sha512-yk2+1p3EJTEE9ZEUkgHsUSVhIpCsL/bvT8E5GzmWc+N1Po5gBw+0F8bo7dpxXR0nu0bQVxVZGX2lBGF21CmeDw==", - "dev": true, - "dependencies": { - "ccount": "^1.0.0", - "comma-separated-tokens": "^1.0.0", - "hast-util-is-element": "^1.0.0", - "hast-util-whitespace": "^1.0.0", - "html-void-elements": "^1.0.0", - "property-information": "^5.0.0", - "space-separated-tokens": "^1.0.0", - "stringify-entities": "^3.0.1", - "unist-util-is": "^4.0.0", - "xtend": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/hast-util-whitespace": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz", - "integrity": "sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true, - "bin": { - "he": "bin/he" - } - }, - "node_modules/highlight.js": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", - "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "dev": true, - "dependencies": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, - "dependencies": { - "parse-passwd": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "node_modules/html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "node_modules/html-void-elements": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz", - "integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", - "dev": true - }, - "node_modules/http-errors": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", - "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/http-parser-js": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz", - "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==", - "dev": true - }, - "node_modules/http-proxy": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", - "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", - "dev": true, - "dependencies": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, - "node_modules/http2-wrapper": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", - "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", - "dev": true, - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.0.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/https-proxy-agent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", - "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", - "dev": true, - "dependencies": { - "agent-base": "5", - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/import-fresh/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/inquirer": { - "version": "8.1.5", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.5.tgz", - "integrity": "sha512-G6/9xUqmt/r+UvufSyrPpt84NYwhKZ9jLsgMbQzlx804XErNupor8WQdBnBRrXmBfTPpuwf1sV+ss2ovjgdXIg==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.21", - "mute-stream": "0.0.8", - "ora": "^5.4.1", - "run-async": "^2.4.0", - "rxjs": "^7.2.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/inquirer/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/inquirer/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/inquirer/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/internal-slot": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", - "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "dependencies": { - "loose-envify": "^1.0.0" - } - }, - "node_modules/invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "dev": true, - "dependencies": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-alphabetical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", - "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/is-alphanumerical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", - "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", - "dev": true, - "dependencies": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/is-arguments": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "engines": { - "node": ">=4" - } - }, - "node_modules/is-callable": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-core-module": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", - "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", - "dependencies": { - "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-decimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", - "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-descriptor/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true, - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "dependencies": { - "is-plain-object": "^2.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-extendable/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-finite": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", - "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", - "dev": true, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-hexadecimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", - "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-nan": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", - "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-negated-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", - "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number-object": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz", - "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-number/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/is-number/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-promise": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", - "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", - "dev": true - }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "dev": true, - "dependencies": { - "is-unc-path": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, - "node_modules/is-running": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz", - "integrity": "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=", - "dev": true - }, - "node_modules/is-set": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", - "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-ssh": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.3.tgz", - "integrity": "sha512-NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ==", - "dev": true, - "dependencies": { - "protocols": "^1.1.0" - } - }, - "node_modules/is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-text-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", - "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=", - "dev": true, - "dependencies": { - "text-extensions": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-typed-array": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz", - "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.18.5", - "foreach": "^2.0.5", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "node_modules/is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "dev": true, - "dependencies": { - "unc-path-regex": "^0.1.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, - "node_modules/is-valid-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", - "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakset": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", - "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, - "node_modules/isbinaryfile": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz", - "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==", - "dev": true, - "engines": { - "node": ">= 8.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/gjtorikian/" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "node_modules/isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "node_modules/istanbul": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", - "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", - "deprecated": "This module is no longer maintained, try this instead:\n npm i nyc\nVisit https://istanbul.js.org/integrations for other alternatives.", - "dev": true, - "dependencies": { - "abbrev": "1.0.x", - "async": "1.x", - "escodegen": "1.8.x", - "esprima": "2.7.x", - "glob": "^5.0.15", - "handlebars": "^4.0.1", - "js-yaml": "3.x", - "mkdirp": "0.5.x", - "nopt": "3.x", - "once": "1.x", - "resolve": "1.1.x", - "supports-color": "^3.1.0", - "which": "^1.1.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "istanbul": "lib/cli.js" - } - }, - "node_modules/istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", - "dev": true, - "dependencies": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "dev": true, - "dependencies": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-report/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-source-maps/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/istanbul-reports": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz", - "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==", - "dev": true, - "dependencies": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul/node_modules/glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "dependencies": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/istanbul/node_modules/has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/istanbul/node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/istanbul/node_modules/resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "node_modules/istanbul/node_modules/supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "dependencies": { - "has-flag": "^1.0.0" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/istanbul/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/istextorbinary": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz", - "integrity": "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==", - "dev": true, - "dependencies": { - "binaryextensions": "^2.2.0", - "textextensions": "^3.2.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://bevry.me/fund" - } - }, - "node_modules/jake": { - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", - "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", - "dev": true, - "dependencies": { - "async": "0.9.x", - "chalk": "^2.4.2", - "filelist": "^1.0.1", - "minimatch": "^3.0.4" - }, - "bin": { - "jake": "bin/cli.js" - }, - "engines": { - "node": "*" - } - }, - "node_modules/jake/node_modules/async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", - "dev": true - }, - "node_modules/jest-diff": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz", - "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^27.5.1", - "jest-get-type": "^27.5.1", - "pretty-format": "^27.5.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-diff/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-diff/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-diff/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jest-diff/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-diff/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-get-type": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", - "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", - "dev": true, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-matcher-utils": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz", - "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^27.5.1", - "jest-get-type": "^27.5.1", - "pretty-format": "^27.5.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-matcher-utils/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-matcher-utils/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-matcher-utils/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jest-matcher-utils/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-matcher-utils/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-message-util": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", - "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^27.5.1", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^27.5.1", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-message-util/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-message-util/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-message-util/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jest-message-util/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-message-util/node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, - "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/jest-message-util/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/js-yaml/node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "node_modules/json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", - "dev": true, - "engines": [ - "node >= 0.2.0" - ] - }, - "node_modules/JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true, - "dependencies": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - }, - "bin": { - "JSONStream": "bin.js" - }, - "engines": { - "node": "*" - } - }, - "node_modules/jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", - "dev": true, - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.4.0", - "verror": "1.10.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/just-clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz", - "integrity": "sha1-v7P672WqEqMWBYcSlFwyb9jwFDQ=" - }, - "node_modules/just-debounce": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz", - "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==", - "dev": true - }, - "node_modules/just-extend": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz", - "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", - "dev": true - }, - "node_modules/karma": { - "version": "6.3.17", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz", - "integrity": "sha512-2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g==", - "dev": true, - "dependencies": { - "@colors/colors": "1.5.0", - "body-parser": "^1.19.0", - "braces": "^3.0.2", - "chokidar": "^3.5.1", - "connect": "^3.7.0", - "di": "^0.0.1", - "dom-serialize": "^2.2.1", - "glob": "^7.1.7", - "graceful-fs": "^4.2.6", - "http-proxy": "^1.18.1", - "isbinaryfile": "^4.0.8", - "lodash": "^4.17.21", - "log4js": "^6.4.1", - "mime": "^2.5.2", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.5", - "qjobs": "^1.2.0", - "range-parser": "^1.2.1", - "rimraf": "^3.0.2", - "socket.io": "^4.2.0", - "source-map": "^0.6.1", - "tmp": "^0.2.1", - "ua-parser-js": "^0.7.30", - "yargs": "^16.1.1" - }, - "bin": { - "karma": "bin/karma" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/karma-babel-preprocessor": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/karma-babel-preprocessor/-/karma-babel-preprocessor-8.0.2.tgz", - "integrity": "sha512-6ZUnHwaK2EyhgxbgeSJW6n6WZUYSEdekHIV/qDUnPgMkVzQBHEvd07d2mTL5AQjV8uTUgH6XslhaPrp+fHWH2A==", - "dev": true, - "engines": { - "node": ">=6" - }, - "peerDependencies": { - "@babel/core": "7" - } - }, - "node_modules/karma-browserstack-launcher": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/karma-browserstack-launcher/-/karma-browserstack-launcher-1.4.0.tgz", - "integrity": "sha512-bUQK84U+euDfOUfEjcF4IareySMOBNRLrrl9q6cttIe8f011Ir6olLITTYMOJDcGY58wiFIdhPHSPd9Pi6+NfQ==", - "dev": true, - "dependencies": { - "browserstack": "~1.5.1", - "browserstacktunnel-wrapper": "~2.0.2", - "q": "~1.5.0" - }, - "peerDependencies": { - "karma": ">=0.9" - } - }, - "node_modules/karma-chai": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz", - "integrity": "sha1-vuWtQEAFF4Ea40u5RfdikJEIt5o=", - "dev": true, - "peerDependencies": { - "chai": "*", - "karma": ">=0.10.9" - } - }, - "node_modules/karma-chrome-launcher": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz", - "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==", - "dev": true, - "dependencies": { - "which": "^1.2.1" - } - }, - "node_modules/karma-chrome-launcher/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/karma-coverage": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.0.tgz", - "integrity": "sha512-gPVdoZBNDZ08UCzdMHHhEImKrw1+PAOQOIiffv1YsvxFhBjqvo/SVXNk4tqn1SYqX0BJZT6S/59zgxiBe+9OuA==", - "dev": true, - "dependencies": { - "istanbul-lib-coverage": "^3.2.0", - "istanbul-lib-instrument": "^5.1.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.1", - "istanbul-reports": "^3.0.5", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/karma-coverage-istanbul-reporter": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz", - "integrity": "sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==", - "dev": true, - "dependencies": { - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^3.0.6", - "istanbul-reports": "^3.0.2", - "minimatch": "^3.0.4" - }, - "funding": { - "url": "https://github.com/sponsors/mattlewis92" - } - }, - "node_modules/karma-coverage-istanbul-reporter/node_modules/istanbul-lib-source-maps": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz", - "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "rimraf": "^2.6.3", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/karma-coverage-istanbul-reporter/node_modules/istanbul-lib-source-maps/node_modules/istanbul-lib-coverage": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", - "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/karma-coverage-istanbul-reporter/node_modules/make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "dependencies": { - "pify": "^4.0.1", - "semver": "^5.6.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/karma-coverage-istanbul-reporter/node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/karma-coverage-istanbul-reporter/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/karma-coverage-istanbul-reporter/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/karma-coverage-istanbul-reporter/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/karma-coverage/node_modules/istanbul-lib-instrument": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz", - "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==", - "dev": true, - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/karma-es5-shim": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/karma-es5-shim/-/karma-es5-shim-0.0.4.tgz", - "integrity": "sha1-zdADM8znfC5M4D46yT8vjs0fuVI=", - "dev": true, - "dependencies": { - "es5-shim": "^4.0.5" - } - }, - "node_modules/karma-firefox-launcher": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.2.tgz", - "integrity": "sha512-VV9xDQU1QIboTrjtGVD4NCfzIH7n01ZXqy/qpBhnOeGVOkG5JYPEm8kuSd7psHE6WouZaQ9Ool92g8LFweSNMA==", - "dev": true, - "dependencies": { - "is-wsl": "^2.2.0", - "which": "^2.0.1" - } - }, - "node_modules/karma-ie-launcher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz", - "integrity": "sha1-SXmGhCxJAZA0bNifVJTKmDDG1Zw=", - "dev": true, - "dependencies": { - "lodash": "^4.6.1" - }, - "peerDependencies": { - "karma": ">=0.9" - } - }, - "node_modules/karma-mocha": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-2.0.1.tgz", - "integrity": "sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.3" - } - }, - "node_modules/karma-mocha-reporter": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz", - "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=", - "dev": true, - "dependencies": { - "chalk": "^2.1.0", - "log-symbols": "^2.1.0", - "strip-ansi": "^4.0.0" - }, - "peerDependencies": { - "karma": ">=0.13" - } - }, - "node_modules/karma-mocha-reporter/node_modules/ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/karma-mocha-reporter/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/karma-opera-launcher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/karma-opera-launcher/-/karma-opera-launcher-1.0.0.tgz", - "integrity": "sha1-+lFihTGh0L6EstjcDX7iCfyP+Ro=", - "dev": true, - "peerDependencies": { - "karma": ">=0.9" - } - }, - "node_modules/karma-safari-launcher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz", - "integrity": "sha1-lpgqLMR9BmquccVTursoMZEVos4=", - "dev": true, - "peerDependencies": { - "karma": ">=0.9" - } - }, - "node_modules/karma-script-launcher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-1.0.0.tgz", - "integrity": "sha1-zQF8TeXvCeWp2nkydhdhCN1LVC0=", - "dev": true, - "peerDependencies": { - "karma": ">=0.9" - } - }, - "node_modules/karma-sinon": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.5.tgz", - "integrity": "sha1-TjRD8oMP3s/2JNN0cWPxIX2qKpo=", - "dev": true, - "engines": { - "node": ">= 0.10.0" - }, - "peerDependencies": { - "karma": ">=0.10", - "sinon": "*" - } - }, - "node_modules/karma-sourcemap-loader": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz", - "integrity": "sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2" - } - }, - "node_modules/karma-spec-reporter": { - "version": "0.0.32", - "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz", - "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=", - "dev": true, - "dependencies": { - "colors": "^1.1.2" - }, - "peerDependencies": { - "karma": ">=0.9" - } - }, - "node_modules/karma-webpack": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz", - "integrity": "sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3", - "minimatch": "^3.0.4", - "webpack-merge": "^4.1.5" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "webpack": "^5.0.0" - } - }, - "node_modules/karma/node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/karma/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/karma/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/karma/node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/keyv": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz", - "integrity": "sha512-tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/konan": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/konan/-/konan-2.1.1.tgz", - "integrity": "sha512-7ZhYV84UzJ0PR/RJnnsMZcAbn+kLasJhVNWsu8ZyVEJYRpGA5XESQ9d/7zOa08U0Ou4cmB++hMNY/3OSV9KIbg==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.10.5", - "@babel/traverse": "^7.10.5" - } - }, - "node_modules/ky": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/ky/-/ky-0.29.0.tgz", - "integrity": "sha512-01TBSOqlHmLfcQhHseugGHLxPtU03OyZWaLDWt5MfzCkijG6xWFvAQPhKVn0cR2MMjYvBP9keQ8A3+rQEhLO5g==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sindresorhus/ky?sponsor=1" - } - }, - "node_modules/last-run": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz", - "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=", - "dev": true, - "dependencies": { - "default-resolution": "^2.0.0", - "es6-weak-map": "^2.0.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/lazystream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", - "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", - "dev": true, - "dependencies": { - "readable-stream": "^2.0.5" - }, - "engines": { - "node": ">= 0.6.3" - } - }, - "node_modules/lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, - "dependencies": { - "invert-kv": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/lcov-parse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz", - "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=", - "dev": true, - "bin": { - "lcov-parse": "bin/cli.js" - } - }, - "node_modules/lead": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz", - "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=", - "dev": true, - "dependencies": { - "flush-write-stream": "^1.0.2" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/liftoff": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz", - "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==", - "dev": true, - "dependencies": { - "extend": "^3.0.0", - "findup-sync": "^3.0.0", - "fined": "^1.0.1", - "flagged-respawn": "^1.0.0", - "is-plain-object": "^2.0.4", - "object.map": "^1.0.0", - "rechoir": "^0.6.2", - "resolve": "^1.1.7" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/liftoff/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/lighthouse-logger": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz", - "integrity": "sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==", - "dev": true, - "dependencies": { - "debug": "^2.6.9", - "marky": "^1.2.2" - } - }, - "node_modules/lighthouse-logger/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/lighthouse-logger/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "node_modules/listenercount": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz", - "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=", - "dev": true - }, - "node_modules/live-connect-js": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.3.3.tgz", - "integrity": "sha512-WfY6v1jVutW/OGPvm0OaWAHc0MvB5MDdSuniZ+n9cpCltArWHTJtAsjWe8T+ACmdLAlZS9z7hzL3ntLnq+J0yQ==", - "dependencies": { - "tiny-hashes": "1.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/livereload-js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz", - "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==", - "dev": true - }, - "node_modules/load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/load-json-file/node_modules/pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/loader-runner": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", - "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==", - "dev": true, - "engines": { - "node": ">=6.11.5" - } - }, - "node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, - "node_modules/locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "dependencies": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "node_modules/lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "node_modules/lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", - "dev": true - }, - "node_modules/lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", - "dev": true - }, - "node_modules/lodash._escapehtmlchar": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", - "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", - "dev": true, - "dependencies": { - "lodash._htmlescapes": "~2.4.1" - } - }, - "node_modules/lodash._escapestringchar": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", - "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=", - "dev": true - }, - "node_modules/lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "node_modules/lodash._htmlescapes": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", - "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=", - "dev": true - }, - "node_modules/lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "node_modules/lodash._isnative": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", - "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=", - "dev": true - }, - "node_modules/lodash._objecttypes": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", - "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=", - "dev": true - }, - "node_modules/lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", - "dev": true - }, - "node_modules/lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", - "dev": true - }, - "node_modules/lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", - "dev": true - }, - "node_modules/lodash._reunescapedhtml": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", - "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", - "dev": true, - "dependencies": { - "lodash._htmlescapes": "~2.4.1", - "lodash.keys": "~2.4.1" - } - }, - "node_modules/lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", - "dev": true - }, - "node_modules/lodash._shimkeys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", - "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", - "dev": true, - "dependencies": { - "lodash._objecttypes": "~2.4.1" - } - }, - "node_modules/lodash.clone": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz", - "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=", - "dev": true - }, - "node_modules/lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "node_modules/lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" - }, - "node_modules/lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=", - "dev": true - }, - "node_modules/lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", - "dev": true - }, - "node_modules/lodash.escape": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", - "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", - "dev": true, - "dependencies": { - "lodash._escapehtmlchar": "~2.4.1", - "lodash._reunescapedhtml": "~2.4.1", - "lodash.keys": "~2.4.1" - } - }, - "node_modules/lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", - "dev": true - }, - "node_modules/lodash.flattendeep": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", - "dev": true - }, - "node_modules/lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "node_modules/lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "node_modules/lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "node_modules/lodash.ismatch": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", - "integrity": "sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=", - "dev": true - }, - "node_modules/lodash.isobject": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", - "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=", - "dev": true - }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", - "dev": true - }, - "node_modules/lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "dev": true, - "dependencies": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" - } - }, - "node_modules/lodash.keys/node_modules/lodash.isobject": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", - "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", - "dev": true, - "dependencies": { - "lodash._objecttypes": "~2.4.1" - } - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/lodash.pickby": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz", - "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=", - "dev": true - }, - "node_modules/lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", - "dev": true - }, - "node_modules/lodash.some": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", - "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=", - "dev": true - }, - "node_modules/lodash.template": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", - "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", - "dev": true, - "dependencies": { - "lodash._reinterpolate": "^3.0.0", - "lodash.templatesettings": "^4.0.0" - } - }, - "node_modules/lodash.templatesettings": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", - "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", - "dev": true, - "dependencies": { - "lodash._reinterpolate": "^3.0.0" - } - }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, - "node_modules/lodash.union": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", - "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=", - "dev": true - }, - "node_modules/lodash.values": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz", - "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", - "dev": true, - "dependencies": { - "lodash.keys": "~2.4.1" - } - }, - "node_modules/lodash.zip": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz", - "integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=", - "dev": true - }, - "node_modules/log-driver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", - "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", - "dev": true, - "engines": { - "node": ">=0.8.6" - } - }, - "node_modules/log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "dev": true, - "dependencies": { - "chalk": "^2.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/log4js": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.2.tgz", - "integrity": "sha512-k80cggS2sZQLBwllpT1p06GtfvzMmSdUCkW96f0Hj83rKGJDAu2vZjt9B9ag2vx8Zz1IXzxoLgqvRJCdMKybGg==", - "dev": true, - "dependencies": { - "date-format": "^4.0.4", - "debug": "^4.3.3", - "flatted": "^3.2.5", - "rfdc": "^1.3.0", - "streamroller": "^3.0.4" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/loglevel": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz", - "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==", - "dev": true, - "engines": { - "node": ">= 0.6.0" - }, - "funding": { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/loglevel" - } - }, - "node_modules/loglevel-plugin-prefix": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz", - "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==", - "dev": true - }, - "node_modules/lolex": { - "version": "2.7.5", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz", - "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==", - "dev": true - }, - "node_modules/longest-streak": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", - "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, - "node_modules/loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "dependencies": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/loupe": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", - "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", - "dev": true, - "dependencies": { - "get-func-name": "^2.0.0" - } - }, - "node_modules/lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/lru-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz", - "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=", - "dev": true, - "dependencies": { - "es5-ext": "~0.10.2" - } - }, - "node_modules/magic-string": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", - "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", - "dev": true, - "optional": true, - "dependencies": { - "sourcemap-codec": "^1.4.8" - } - }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", - "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/make-iterator/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/map-obj": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", - "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/map-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", - "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=", - "dev": true - }, - "node_modules/map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, - "dependencies": { - "object-visit": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/markdown-table": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", - "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", - "dev": true, - "dependencies": { - "repeat-string": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/marky": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.4.tgz", - "integrity": "sha512-zd2/GiSn6U3/jeFVZ0J9CA1LzQ8RfIVvXkb/U0swFHF/zT+dVohTAWjmo2DcIuofmIIIROlwTbd+shSeXmxr0w==", - "dev": true - }, - "node_modules/matchdep": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz", - "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=", - "dev": true, - "dependencies": { - "findup-sync": "^2.0.0", - "micromatch": "^3.0.4", - "resolve": "^1.4.0", - "stack-trace": "0.0.10" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/matchdep/node_modules/findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", - "dev": true, - "dependencies": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/matchdep/node_modules/is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mdast-util-definitions": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz", - "integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==", - "dev": true, - "dependencies": { - "unist-util-visit": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-find-and-replace": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz", - "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^4.0.0", - "unist-util-is": "^4.0.0", - "unist-util-visit-parents": "^3.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mdast-util-from-markdown": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", - "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", - "dev": true, - "dependencies": { - "@types/mdast": "^3.0.0", - "mdast-util-to-string": "^2.0.0", - "micromark": "~2.11.0", - "parse-entities": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-from-markdown/node_modules/mdast-util-to-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", - "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz", - "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==", - "dev": true, - "dependencies": { - "mdast-util-gfm-autolink-literal": "^0.1.0", - "mdast-util-gfm-strikethrough": "^0.2.0", - "mdast-util-gfm-table": "^0.1.0", - "mdast-util-gfm-task-list-item": "^0.1.0", - "mdast-util-to-markdown": "^0.6.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm-autolink-literal": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz", - "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==", - "dev": true, - "dependencies": { - "ccount": "^1.0.0", - "mdast-util-find-and-replace": "^1.1.0", - "micromark": "^2.11.3" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm-strikethrough": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz", - "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==", - "dev": true, - "dependencies": { - "mdast-util-to-markdown": "^0.6.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm-table": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz", - "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==", - "dev": true, - "dependencies": { - "markdown-table": "^2.0.0", - "mdast-util-to-markdown": "~0.6.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm-task-list-item": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz", - "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==", - "dev": true, - "dependencies": { - "mdast-util-to-markdown": "~0.6.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-inject": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz", - "integrity": "sha1-2wa4tYW+lZotzS+H9HK6m3VvNnU=", - "dev": true, - "dependencies": { - "mdast-util-to-string": "^1.0.0" - } - }, - "node_modules/mdast-util-to-hast": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz", - "integrity": "sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==", - "dev": true, - "dependencies": { - "@types/mdast": "^3.0.0", - "@types/unist": "^2.0.0", - "mdast-util-definitions": "^4.0.0", - "mdurl": "^1.0.0", - "unist-builder": "^2.0.0", - "unist-util-generated": "^1.0.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-to-markdown": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", - "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "longest-streak": "^2.0.0", - "mdast-util-to-string": "^2.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.0.0", - "zwitch": "^1.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-to-markdown/node_modules/mdast-util-to-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", - "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-to-string": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz", - "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-toc": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-5.1.0.tgz", - "integrity": "sha512-csimbRIVkiqc+PpFeKDGQ/Ck2N4f9FYH3zzBMMJzcxoKL8m+cM0n94xXm0I9eaxHnKdY9n145SGTdyJC7i273g==", - "dev": true, - "dependencies": { - "@types/mdast": "^3.0.3", - "@types/unist": "^2.0.3", - "extend": "^3.0.2", - "github-slugger": "^1.2.1", - "mdast-util-to-string": "^2.0.0", - "unist-util-is": "^4.0.0", - "unist-util-visit": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-toc/node_modules/github-slugger": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz", - "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==", - "dev": true - }, - "node_modules/mdast-util-toc/node_modules/mdast-util-to-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", - "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=", - "dev": true - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/memoizee": { - "version": "0.4.15", - "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", - "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==", - "dev": true, - "dependencies": { - "d": "^1.0.1", - "es5-ext": "^0.10.53", - "es6-weak-map": "^2.0.3", - "event-emitter": "^0.3.5", - "is-promise": "^2.2.2", - "lru-queue": "^0.1.0", - "next-tick": "^1.1.0", - "timers-ext": "^0.1.7" - } - }, - "node_modules/memory-fs": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", - "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", - "dev": true, - "dependencies": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - }, - "engines": { - "node": ">=4.3.0 <5.0.0 || >=5.10" - } - }, - "node_modules/meow": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", - "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", - "dev": true, - "dependencies": { - "@types/minimist": "^1.2.0", - "camelcase-keys": "^6.2.2", - "decamelize-keys": "^1.1.0", - "hard-rejection": "^2.1.0", - "minimist-options": "4.1.0", - "normalize-package-data": "^3.0.0", - "read-pkg-up": "^7.0.1", - "redent": "^3.0.0", - "trim-newlines": "^3.0.0", - "type-fest": "^0.18.0", - "yargs-parser": "^20.2.3" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/meow/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/normalize-package-data": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", - "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/meow/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/meow/node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "dependencies": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, - "dependencies": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg/node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/meow/node_modules/read-pkg/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/meow/node_modules/type-fest": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", - "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" - }, - "node_modules/merge-source-map": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", - "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", - "dev": true, - "dependencies": { - "source-map": "^0.6.1" - } - }, - "node_modules/merge-source-map/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/micromark": { - "version": "2.11.4", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", - "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "dependencies": { - "debug": "^4.0.0", - "parse-entities": "^2.0.0" - } - }, - "node_modules/micromark-extension-gfm": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz", - "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==", - "dev": true, - "dependencies": { - "micromark": "~2.11.0", - "micromark-extension-gfm-autolink-literal": "~0.5.0", - "micromark-extension-gfm-strikethrough": "~0.6.5", - "micromark-extension-gfm-table": "~0.4.0", - "micromark-extension-gfm-tagfilter": "~0.3.0", - "micromark-extension-gfm-task-list-item": "~0.3.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-autolink-literal": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz", - "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==", - "dev": true, - "dependencies": { - "micromark": "~2.11.3" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-strikethrough": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz", - "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==", - "dev": true, - "dependencies": { - "micromark": "~2.11.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-table": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz", - "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==", - "dev": true, - "dependencies": { - "micromark": "~2.11.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-tagfilter": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz", - "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-task-list-item": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz", - "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==", - "dev": true, - "dependencies": { - "micromark": "~2.11.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/micromatch/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/micromatch/node_modules/braces/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/micromatch/node_modules/fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/micromatch/node_modules/fill-range/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/micromatch/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/micromatch/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/micromatch/node_modules/to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true, - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/mime-db": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", - "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.34", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", - "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", - "dependencies": { - "mime-db": "1.51.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/min-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" - }, - "node_modules/minimist-options": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", - "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", - "dev": true, - "dependencies": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0", - "kind-of": "^6.0.3" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/minimist-options/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mixin-deep": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", - "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, - "dependencies": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true - }, - "node_modules/mocha": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", - "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", - "dev": true, - "dependencies": { - "browser-stdout": "1.3.1", - "commander": "2.15.1", - "debug": "3.1.0", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.5", - "he": "1.1.1", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "supports-color": "5.4.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha" - }, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/mocha/node_modules/debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/mocha/node_modules/diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/mocha/node_modules/glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/mocha/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/mocha/node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/mocha/node_modules/minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "node_modules/mocha/node_modules/mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", - "dev": true, - "dependencies": { - "minimist": "0.0.8" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mocha/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/mocha/node_modules/supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/modify-values": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", - "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/module-deps-sortable": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/module-deps-sortable/-/module-deps-sortable-5.0.3.tgz", - "integrity": "sha512-eiyIZj/A0dj1o4ywXWqicazUL3l0HP3TydUR6xF0X3xh3LGBMLqW8a9aFe6MuNH4mxNMk53QKBHM6LOPR8kSgw==", - "dev": true, - "dependencies": { - "browser-resolve": "^1.7.0", - "cached-path-relative": "^1.0.0", - "concat-stream": "~1.5.0", - "defined": "^1.0.0", - "detective": "^5.2.0", - "duplexer2": "^0.1.2", - "inherits": "^2.0.1", - "JSONStream": "^1.0.3", - "konan": "^2.1.1", - "readable-stream": "^2.0.2", - "resolve": "^1.1.3", - "standard-version": "^9.0.0", - "stream-combiner2": "^1.1.1", - "subarg": "^1.0.0", - "through2": "^2.0.0", - "xtend": "^4.0.0" - }, - "bin": { - "module-deps": "bin/cmd.js" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/module-deps-sortable/node_modules/concat-stream": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", - "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=", - "dev": true, - "engines": [ - "node >= 0.8" - ], - "dependencies": { - "inherits": "~2.0.1", - "readable-stream": "~2.0.0", - "typedarray": "~0.0.5" - } - }, - "node_modules/module-deps-sortable/node_modules/concat-stream/node_modules/readable-stream": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~0.10.x", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/module-deps-sortable/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "node_modules/module-deps-sortable/node_modules/process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "node_modules/module-deps-sortable/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/module-deps-sortable/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/morgan": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", - "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", - "dev": true, - "dependencies": { - "basic-auth": "~2.0.1", - "debug": "2.6.9", - "depd": "~2.0.0", - "on-finished": "~2.3.0", - "on-headers": "~1.0.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/morgan/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/morgan/node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/morgan/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/mrmime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.0.tgz", - "integrity": "sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "dev": true, - "dependencies": { - "duplexer2": "0.0.2" - } - }, - "node_modules/multipipe/node_modules/duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "dev": true, - "dependencies": { - "readable-stream": "~1.1.9" - } - }, - "node_modules/multipipe/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/multipipe/node_modules/readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/multipipe/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/mute-stdout": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz", - "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, - "node_modules/nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", - "dev": true, - "optional": true - }, - "node_modules/nanoid": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", - "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", - "dev": true, - "optional": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/nanomatch/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "node_modules/ncp": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz", - "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=", - "dev": true, - "bin": { - "ncp": "bin/ncp" - } - }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, - "node_modules/next-tick": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", - "dev": true - }, - "node_modules/nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, - "node_modules/nise": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", - "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", - "dev": true, - "dependencies": { - "@sinonjs/formatio": "^3.2.1", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "lolex": "^5.0.1", - "path-to-regexp": "^1.7.0" - } - }, - "node_modules/nise/node_modules/@sinonjs/formatio": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", - "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1", - "@sinonjs/samsam": "^3.1.0" - } - }, - "node_modules/nise/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/nise/node_modules/lolex": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", - "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.7.0" - } - }, - "node_modules/nise/node_modules/path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "dev": true, - "dependencies": { - "isarray": "0.0.1" - } - }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-releases": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz", - "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==" - }, - "node_modules/nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - } - }, - "node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/normalize-url": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/now-and-later": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz", - "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==", - "dev": true, - "dependencies": { - "once": "^1.3.2" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "dependencies": { - "path-key": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/npm-run-path/node_modules/path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/null-check": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", - "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, - "dependencies": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/object-copy/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", - "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-is": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", - "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, - "dependencies": { - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", - "dev": true, - "dependencies": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", - "dev": true, - "dependencies": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.reduce": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz", - "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=", - "dev": true, - "dependencies": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.values": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", - "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/opener": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", - "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", - "dev": true, - "bin": { - "opener": "bin/opener-bin.js" - } - }, - "node_modules/opn": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", - "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", - "dev": true, - "dependencies": { - "is-wsl": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/opn/node_modules/is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, - "dependencies": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/ora/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/ora/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/ora/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/ora/node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ordered-read-streams": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", - "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=", - "dev": true, - "dependencies": { - "readable-stream": "^2.0.1" - } - }, - "node_modules/os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, - "dependencies": { - "lcid": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/p-cancelable": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", - "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/p-iteration": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/p-iteration/-/p-iteration-1.1.8.tgz", - "integrity": "sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==", - "dev": true, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "dependencies": { - "p-try": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "dependencies": { - "p-limit": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "dev": true, - "dependencies": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", - "dev": true, - "dependencies": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "dependencies": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/parse-ms": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", - "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/parse-path": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.3.tgz", - "integrity": "sha512-9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA==", - "dev": true, - "dependencies": { - "is-ssh": "^1.3.0", - "protocols": "^1.4.0", - "qs": "^6.9.4", - "query-string": "^6.13.8" - } - }, - "node_modules/parse-url": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-6.0.5.tgz", - "integrity": "sha512-e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA==", - "dev": true, - "dependencies": { - "is-ssh": "^1.3.0", - "normalize-url": "^6.1.0", - "parse-path": "^4.0.0", - "protocols": "^1.4.0" - } - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true - }, - "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "node_modules/path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", - "dev": true, - "dependencies": { - "path-root-regex": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" - }, - "node_modules/path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "dependencies": { - "pify": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/path-type/node_modules/pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/pause-stream": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", - "dev": true, - "dependencies": { - "through": "~2.3" - } - }, - "node_modules/pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", - "dev": true - }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, - "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", - "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "dependencies": { - "pinkie": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-dir/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/plugin-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", - "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", - "dev": true, - "dependencies": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/plugin-error/node_modules/ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "dev": true, - "dependencies": { - "ansi-wrap": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pluralize": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postcss": { - "version": "8.4.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz", - "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==", - "dev": true, - "optional": true, - "dependencies": { - "nanoid": "^3.3.1", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - }, - "engines": { - "node": "^10 || ^12 || >=14" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/pretty-format/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/pretty-hrtime": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/pretty-ms": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", - "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==", - "dev": true, - "dependencies": { - "parse-ms": "^2.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/printj": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz", - "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==", - "dev": true, - "bin": { - "printj": "bin/printj.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/property-information": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz", - "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==", - "dev": true, - "dependencies": { - "xtend": "^4.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/protocols": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz", - "integrity": "sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==", - "dev": true - }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true - }, - "node_modules/prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, - "node_modules/ps-tree": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz", - "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==", - "dev": true, - "dependencies": { - "event-stream": "=3.3.4" - }, - "bin": { - "ps-tree": "bin/ps-tree.js" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "node_modules/psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, - "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/pumpify": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", - "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", - "dev": true, - "dependencies": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" - } - }, - "node_modules/pumpify/node_modules/duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", - "dev": true, - "dependencies": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - } - }, - "node_modules/pumpify/node_modules/pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/puppeteer-core": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.5.1.tgz", - "integrity": "sha512-dobVqWjV34ilyfQHR3BBnCYaekBYTi5MgegEYBRYd3s3uFy8jUpZEEWbaFjG9ETm+LGzR5Lmr0aF6LLuHtiuCg==", - "dev": true, - "dependencies": { - "cross-fetch": "3.1.5", - "debug": "4.3.3", - "devtools-protocol": "0.0.969999", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.0", - "pkg-dir": "4.2.0", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.5.0" - }, - "engines": { - "node": ">=10.18.1" - } - }, - "node_modules/puppeteer-core/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/puppeteer-core/node_modules/devtools-protocol": { - "version": "0.0.969999", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.969999.tgz", - "integrity": "sha512-6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ==", - "dev": true - }, - "node_modules/puppeteer-core/node_modules/https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/puppeteer-core/node_modules/ws": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", - "dev": true, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true, - "engines": { - "node": ">=0.6.0", - "teleport": ">=0.2.0" - } - }, - "node_modules/qjobs": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz", - "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==", - "dev": true, - "engines": { - "node": ">=0.9" - } - }, - "node_modules/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/query-selector-shadow-dom": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.0.tgz", - "integrity": "sha512-bK0/0cCI+R8ZmOF1QjT7HupDUYCxbf/9TJgAmSXQxZpftXmTAeil9DRoCnTDkWbvOyZzhcMBwKpptWcdkGFIMg==", - "dev": true - }, - "node_modules/query-string": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz", - "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==", - "dev": true, - "dependencies": { - "decode-uri-component": "^0.2.0", - "filter-obj": "^1.1.0", - "split-on-first": "^1.0.0", - "strict-uri-encode": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", - "dev": true, - "engines": { - "node": ">=0.4.x" - } - }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "dependencies": { - "safe-buffer": "^5.1.0" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", - "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "1.8.1", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true - }, - "node_modules/read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", - "dev": true, - "dependencies": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", - "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", - "dev": true, - "dependencies": { - "find-up": "^3.0.0", - "read-pkg": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/read-pkg-up/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/read-pkg-up/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/read-pkg-up/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/read-pkg-up/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/readable-stream/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "node_modules/readdir-glob": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz", - "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==", - "dev": true, - "dependencies": { - "minimatch": "^3.0.4" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, - "dependencies": { - "resolve": "^1.1.6" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/recursive-readdir": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", - "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", - "dev": true, - "dependencies": { - "minimatch": "3.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/recursive-readdir/node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/redent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", - "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", - "dev": true, - "dependencies": { - "indent-string": "^4.0.0", - "strip-indent": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/regenerate": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" - }, - "node_modules/regenerate-unicode-properties": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz", - "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==", - "dependencies": { - "regenerate": "^1.4.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "node_modules/regenerator-transform": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", - "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", - "dependencies": { - "@babel/runtime": "^7.8.4" - } - }, - "node_modules/regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, - "dependencies": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/regexp.prototype.flags": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz", - "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/regexpu-core": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz", - "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==", - "dependencies": { - "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.0.1", - "regjsgen": "^0.6.0", - "regjsparser": "^0.8.2", - "unicode-match-property-ecmascript": "^2.0.0", - "unicode-match-property-value-ecmascript": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/regjsgen": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz", - "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==" - }, - "node_modules/regjsparser": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz", - "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==", - "dependencies": { - "jsesc": "~0.5.0" - }, - "bin": { - "regjsparser": "bin/parser" - } - }, - "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "bin": { - "jsesc": "bin/jsesc" - } - }, - "node_modules/remark": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz", - "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==", - "dev": true, - "dependencies": { - "remark-parse": "^9.0.0", - "remark-stringify": "^9.0.0", - "unified": "^9.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-gfm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz", - "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==", - "dev": true, - "dependencies": { - "mdast-util-gfm": "^0.1.0", - "micromark-extension-gfm": "^0.3.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-html": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-13.0.2.tgz", - "integrity": "sha512-LhSRQ+3RKdBqB/RGesFWkNNfkGqprDUCwjq54SylfFeNyZby5kqOG8Dn/vYsRoM8htab6EWxFXCY6XIZvMoRiQ==", - "dev": true, - "dependencies": { - "hast-util-sanitize": "^3.0.0", - "hast-util-to-html": "^7.0.0", - "mdast-util-to-hast": "^10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-parse": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", - "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", - "dev": true, - "dependencies": { - "mdast-util-from-markdown": "^0.8.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-reference-links": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/remark-reference-links/-/remark-reference-links-5.0.0.tgz", - "integrity": "sha512-oSIo6lfDyG/1yYl2jPZNXmD9dgyPxp07mSd7snJagVMsDU6NRlD8i54MwHWUgMoOHTs8lIKPkwaUok/tbr5syQ==", - "dev": true, - "dependencies": { - "unist-util-visit": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-stringify": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz", - "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==", - "dev": true, - "dependencies": { - "mdast-util-to-markdown": "^0.6.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-toc": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/remark-toc/-/remark-toc-7.2.0.tgz", - "integrity": "sha512-ppHepvpbg7j5kPFmU5rzDC4k2GTcPDvWcxXyr/7BZzO1cBSPk0stKtEJdsgAyw2WHKPGxadcHIZRjb2/sHxjkg==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.3", - "mdast-util-toc": "^5.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remove-bom-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz", - "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5", - "is-utf8": "^0.2.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/remove-bom-buffer/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/remove-bom-stream": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz", - "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=", - "dev": true, - "dependencies": { - "remove-bom-buffer": "^3.0.0", - "safe-buffer": "^5.1.0", - "through2": "^2.0.3" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/remove-bom-stream/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "node_modules/repeat-element": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz", - "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "dependencies": { - "is-finite": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/replace-homedir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz", - "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=", - "dev": true, - "dependencies": { - "homedir-polyfill": "^1.0.1", - "is-absolute": "^1.0.0", - "remove-trailing-separator": "^1.1.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/replacestream": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz", - "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^1.0.3", - "object-assign": "^4.0.1", - "readable-stream": "^2.0.2" - } - }, - "node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/request/node_modules/qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "node_modules/require-uncached": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", - "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", - "dev": true, - "dependencies": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-uncached/node_modules/resolve-from": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "dev": true - }, - "node_modules/resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", - "dependencies": { - "is-core-module": "^2.8.1", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true - }, - "node_modules/resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "dev": true, - "dependencies": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/resolve-options": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", - "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=", - "dev": true, - "dependencies": { - "value-or-function": "^3.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "deprecated": "https://github.com/lydell/resolve-url#deprecated", - "dev": true - }, - "node_modules/responselike": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz", - "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", - "dev": true, - "dependencies": { - "lowercase-keys": "^2.0.0" - } - }, - "node_modules/resq": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/resq/-/resq-1.10.2.tgz", - "integrity": "sha512-HmgVS3j+FLrEDBTDYysPdPVF9/hioDMJ/otOiQDKqk77YfZeeLOj0qi34yObumcud1gBpk+wpBTEg4kMicD++A==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^2.0.1" - } - }, - "node_modules/resq/node_modules/fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/rfdc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", - "dev": true - }, - "node_modules/rgb2hex": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz", - "integrity": "sha512-22MOP1Rh7sAo1BZpDG6R5RFYzR2lYEgwq7HEmyW2qcsOqR2lQKmn+O//xV3YG/0rrhMC6KVX2hU+ZXuaw9a5bw==", - "dev": true - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/rx-lite": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", - "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true - }, - "node_modules/rx-lite-aggregates": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", - "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", - "dev": true, - "dependencies": { - "rx-lite": "*" - } - }, - "node_modules/rxjs": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", - "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/rxjs/node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - }, - "node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "node_modules/safe-json-parse": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz", - "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=", - "dev": true - }, - "node_modules/safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, - "dependencies": { - "ret": "~0.1.10" - } - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "node_modules/samsam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", - "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==", - "deprecated": "This package has been deprecated in favour of @sinonjs/samsam", - "dev": true - }, - "node_modules/schema-utils": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", - "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.5", - "ajv": "^6.12.4", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 8.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/schema-utils/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/schema-utils/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/semver-greatest-satisfied-range": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz", - "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=", - "dev": true, - "dependencies": { - "sver-compat": "^1.5.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/send": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz", - "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", - "dependencies": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "1.8.1", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "node_modules/send/node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/serialize-error": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz", - "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/serialize-error/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", - "dev": true, - "dependencies": { - "randombytes": "^2.1.0" - } - }, - "node_modules/serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", - "dev": true, - "dependencies": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/serve-index/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/serve-index/node_modules/http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/serve-index/node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "node_modules/serve-index/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/serve-index/node_modules/setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "node_modules/serve-static": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz", - "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", - "dependencies": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "node_modules/set-value": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/set-value/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/set-value/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/set-value/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true - }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/sinon": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz", - "integrity": "sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "@sinonjs/formatio": "^2.0.0", - "diff": "^3.1.0", - "lodash.get": "^4.4.2", - "lolex": "^2.2.0", - "nise": "^1.2.0", - "supports-color": "^5.1.0", - "type-detect": "^4.0.5" - } - }, - "node_modules/sinon/node_modules/diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/sinon/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/sinon/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/sirv": { - "version": "1.0.19", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz", - "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==", - "dev": true, - "dependencies": { - "@polka/url": "^1.0.0-next.20", - "mrmime": "^1.0.0", - "totalist": "^1.0.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/slice-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/slice-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/slice-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, - "dependencies": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, - "dependencies": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-node/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, - "dependencies": { - "kind-of": "^3.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-util/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/snapdragon-util/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/snapdragon/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/snapdragon/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/snapdragon/node_modules/source-map-resolve": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", - "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", - "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", - "dev": true, - "dependencies": { - "atob": "^2.1.2", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "node_modules/socket.io": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz", - "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==", - "dev": true, - "dependencies": { - "accepts": "~1.3.4", - "base64id": "~2.0.0", - "debug": "~4.3.2", - "engine.io": "~6.1.0", - "socket.io-adapter": "~2.3.3", - "socket.io-parser": "~4.0.4" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/socket.io-adapter": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz", - "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==", - "dev": true - }, - "node_modules/socket.io-parser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", - "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", - "dev": true, - "dependencies": { - "@types/component-emitter": "^1.2.10", - "component-emitter": "~1.3.0", - "debug": "~4.3.1" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-resolve": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz", - "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==", - "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", - "dev": true, - "dependencies": { - "atob": "^2.1.2", - "decode-uri-component": "^0.2.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/source-map-support/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-url": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", - "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", - "deprecated": "See https://github.com/lydell/source-map-url#deprecated", - "dev": true - }, - "node_modules/sourcemap-codec": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", - "dev": true, - "optional": true - }, - "node_modules/space-separated-tokens": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz", - "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/sparkles": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz", - "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", - "dev": true - }, - "node_modules/split": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", - "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", - "dev": true, - "dependencies": { - "through": "2" - }, - "engines": { - "node": "*" - } - }, - "node_modules/split-on-first": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", - "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, - "dependencies": { - "extend-shallow": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/split2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz", - "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==", - "dev": true, - "engines": { - "node": ">= 10.x" - } - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "node_modules/sshpk": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", - "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", - "dev": true, - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/stack-utils": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", - "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/stack-utils/node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/standard-version": { - "version": "9.3.2", - "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-9.3.2.tgz", - "integrity": "sha512-u1rfKP4o4ew7Yjbfycv80aNMN2feTiqseAhUhrrx2XtdQGmu7gucpziXe68Z4YfHVqlxVEzo4aUA0Iu3VQOTgQ==", - "deprecated": "standard-version is deprecated. If you're a GitHub user, I recommend https://github.com/googleapis/release-please as an alternative.", - "dev": true, - "dependencies": { - "chalk": "^2.4.2", - "conventional-changelog": "3.1.24", - "conventional-changelog-config-spec": "2.1.0", - "conventional-changelog-conventionalcommits": "4.6.1", - "conventional-recommended-bump": "6.1.0", - "detect-indent": "^6.0.0", - "detect-newline": "^3.1.0", - "dotgitignore": "^2.1.0", - "figures": "^3.1.0", - "find-up": "^5.0.0", - "fs-access": "^1.0.1", - "git-semver-tags": "^4.0.0", - "semver": "^7.1.1", - "stringify-package": "^1.0.1", - "yargs": "^16.0.0" - }, - "bin": { - "standard-version": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/standard-version/node_modules/detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/standard-version/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/standard-version/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/standard-version/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/standard-version/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/standard-version/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/standard-version/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/standard-version/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/standard-version/node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, - "dependencies": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/static-extend/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/stream-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/stream-array/-/stream-array-1.1.2.tgz", - "integrity": "sha1-nl9zRfITfDDuO0mLkRToC1K7frU=", - "dev": true, - "dependencies": { - "readable-stream": "~2.1.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/stream-array/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "node_modules/stream-array/node_modules/process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "node_modules/stream-array/node_modules/readable-stream": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz", - "integrity": "sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=", - "dev": true, - "dependencies": { - "buffer-shims": "^1.0.0", - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~0.10.x", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/stream-array/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/stream-buffers": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz", - "integrity": "sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==", - "dev": true, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/stream-combiner": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", - "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", - "dev": true, - "dependencies": { - "duplexer": "~0.1.1" - } - }, - "node_modules/stream-combiner2": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", - "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=", - "dev": true, - "dependencies": { - "duplexer2": "~0.1.0", - "readable-stream": "^2.0.2" - } - }, - "node_modules/stream-exhaust": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", - "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==", - "dev": true - }, - "node_modules/stream-shift": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", - "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", - "dev": true - }, - "node_modules/streamroller": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz", - "integrity": "sha512-GI9NzeD+D88UFuIlJkKNDH/IsuR+qIN7Qh8EsmhoRZr9bQoehTraRgwtLUkZbpcAw+hLPfHOypmppz8YyGK68w==", - "dev": true, - "dependencies": { - "date-format": "^4.0.4", - "debug": "^4.3.3", - "fs-extra": "^10.0.1" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/strict-uri-encode": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", - "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/string-template": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz", - "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=", - "dev": true - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", - "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", - "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/stringify-entities": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz", - "integrity": "sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==", - "dev": true, - "dependencies": { - "character-entities-html4": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "xtend": "^4.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/stringify-package": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz", - "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==", - "dev": true - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-bom-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", - "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/strip-indent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", - "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", - "dev": true, - "dependencies": { - "min-indent": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/subarg": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", - "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=", - "dev": true, - "dependencies": { - "minimist": "^1.1.0" - } - }, - "node_modules/suffix": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz", - "integrity": "sha1-zFgjFkag7xEC95R47zqSSP2chC8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/sver-compat": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz", - "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=", - "dev": true, - "dependencies": { - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" - } - }, - "node_modules/table": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz", - "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==", - "dev": true, - "dependencies": { - "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz", - "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "dev": true, - "dependencies": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tar-stream/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/temp-fs": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz", - "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=", - "dev": true, - "dependencies": { - "rimraf": "~2.5.2" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/temp-fs/node_modules/rimraf": { - "version": "2.5.4", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", - "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=", - "dev": true, - "dependencies": { - "glob": "^7.0.5" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/ternary-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz", - "integrity": "sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==", - "dev": true, - "dependencies": { - "duplexify": "^4.1.1", - "fork-stream": "^0.0.4", - "merge-stream": "^2.0.0", - "through2": "^3.0.1" - } - }, - "node_modules/ternary-stream/node_modules/through2": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", - "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", - "dev": true, - "dependencies": { - "inherits": "^2.0.4", - "readable-stream": "2 || 3" - } - }, - "node_modules/terser": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", - "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", - "dev": true, - "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/terser-webpack-plugin": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz", - "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==", - "dev": true, - "dependencies": { - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "source-map": "^0.6.1", - "terser": "^5.7.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "uglify-js": { - "optional": true - } - } - }, - "node_modules/terser-webpack-plugin/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/terser-webpack-plugin/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/terser/node_modules/acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/terser/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "node_modules/text-extensions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", - "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "node_modules/textextensions": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz", - "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://bevry.me/fund" - } - }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, - "node_modules/through2": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", - "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", - "dev": true, - "dependencies": { - "readable-stream": "3" - } - }, - "node_modules/through2-filter": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz", - "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==", - "dev": true, - "dependencies": { - "through2": "~2.0.0", - "xtend": "~4.0.0" - } - }, - "node_modules/through2-filter/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/through2/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/timers-ext": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz", - "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==", - "dev": true, - "dependencies": { - "es5-ext": "~0.10.46", - "next-tick": "1" - } - }, - "node_modules/tiny-hashes": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tiny-hashes/-/tiny-hashes-1.0.1.tgz", - "integrity": "sha512-knIN5zj4fl7kW4EBU5sLP20DWUvi/rVouvJezV0UAym2DkQaqm365Nyc8F3QEiOvunNDMxR8UhcXd1d5g+Wg1g==" - }, - "node_modules/tiny-lr": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz", - "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==", - "dev": true, - "dependencies": { - "body": "^5.1.0", - "debug": "^3.1.0", - "faye-websocket": "~0.10.0", - "livereload-js": "^2.3.0", - "object-assign": "^4.1.0", - "qs": "^6.4.0" - } - }, - "node_modules/tiny-lr/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dev": true, - "dependencies": { - "rimraf": "^3.0.0" - }, - "engines": { - "node": ">=8.17.0" - } - }, - "node_modules/to-absolute-glob": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", - "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", - "dev": true, - "dependencies": { - "is-absolute": "^1.0.0", - "is-negated-glob": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "engines": { - "node": ">=4" - } - }, - "node_modules/to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-object-path/node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/to-object-path/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, - "dependencies": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/to-regex-range/node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/to-through": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz", - "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=", - "dev": true, - "dependencies": { - "through2": "^2.0.3" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/to-through/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/totalist": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz", - "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, - "node_modules/traverse": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", - "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/trim-newlines": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", - "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/trough": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", - "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/tsconfig-paths": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.13.0.tgz", - "integrity": "sha512-nWuffZppoaYK0vQ1SQmkSsQzJoHA4s6uzdb2waRpD806x9yfq153AdVsWz4je2qZcW+pENrMQXbGQ3sMCkXuhw==", - "dev": true, - "dependencies": { - "@types/json5": "^0.0.29", - "json5": "^1.0.1", - "minimist": "^1.2.0", - "strip-bom": "^3.0.0" - } - }, - "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, - "node_modules/type": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==", - "dev": true - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "node_modules/typescript-compare": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz", - "integrity": "sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==", - "dependencies": { - "typescript-logic": "^0.0.0" - } - }, - "node_modules/typescript-logic": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/typescript-logic/-/typescript-logic-0.0.0.tgz", - "integrity": "sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q==" - }, - "node_modules/typescript-tuple": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/typescript-tuple/-/typescript-tuple-2.2.1.tgz", - "integrity": "sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==", - "dependencies": { - "typescript-compare": "^0.0.2" - } - }, - "node_modules/ua-parser-js": { - "version": "0.7.31", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz", - "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/ua-parser-js" - }, - { - "type": "paypal", - "url": "https://paypal.me/faisalman" - } - ], - "engines": { - "node": "*" - } - }, - "node_modules/uglify-js": { - "version": "3.15.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz", - "integrity": "sha512-peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A==", - "dev": true, - "optional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/unbox-primitive": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", - "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "has-bigints": "^1.0.1", - "has-symbols": "^1.0.2", - "which-boxed-primitive": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", - "dev": true, - "dependencies": { - "buffer": "^5.2.1", - "through": "^2.3.8" - } - }, - "node_modules/unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/undertaker": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz", - "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==", - "dev": true, - "dependencies": { - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "bach": "^1.0.0", - "collection-map": "^1.0.0", - "es6-weak-map": "^2.0.1", - "fast-levenshtein": "^1.0.0", - "last-run": "^1.1.0", - "object.defaults": "^1.0.0", - "object.reduce": "^1.0.0", - "undertaker-registry": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/undertaker-registry": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz", - "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/undertaker/node_modules/fast-levenshtein": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz", - "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=", - "dev": true - }, - "node_modules/unicode-canonical-property-names-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", - "engines": { - "node": ">=4" - } - }, - "node_modules/unicode-match-property-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", - "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", - "dependencies": { - "unicode-canonical-property-names-ecmascript": "^2.0.0", - "unicode-property-aliases-ecmascript": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", - "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", - "engines": { - "node": ">=4" - } - }, - "node_modules/unicode-property-aliases-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz", - "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==", - "engines": { - "node": ">=4" - } - }, - "node_modules/unified": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", - "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", - "dev": true, - "dependencies": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unified/node_modules/is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/union-value": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, - "dependencies": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/union-value/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unique-stream": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz", - "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==", - "dev": true, - "dependencies": { - "json-stable-stringify-without-jsonify": "^1.0.1", - "through2-filter": "^3.0.0" - } - }, - "node_modules/unist-builder": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz", - "integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-generated": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz", - "integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-is": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-position": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz", - "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.2" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-visit": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz", - "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0", - "unist-util-visit-parents": "^3.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-visit-parents": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", - "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, - "dependencies": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, - "dependencies": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "dependencies": { - "isarray": "1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "node_modules/unzipper": { - "version": "0.9.15", - "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.9.15.tgz", - "integrity": "sha512-2aaUvO4RAeHDvOCuEtth7jrHFaCKTSXPqUkXwADaLBzGbgZGzUDccoEdJ5lW+3RmfpOZYNx0Rw6F6PUzM6caIA==", - "dev": true, - "dependencies": { - "big-integer": "^1.6.17", - "binary": "~0.3.0", - "bluebird": "~3.4.1", - "buffer-indexof-polyfill": "~1.0.0", - "duplexer2": "~0.1.4", - "fstream": "^1.0.12", - "listenercount": "~1.0.1", - "readable-stream": "~2.3.6", - "setimmediate": "~1.0.4" - } - }, - "node_modules/upath": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", - "dev": true, - "engines": { - "node": ">=4", - "yarn": "*" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "deprecated": "Please see https://github.com/lydell/urix#deprecated", - "dev": true - }, - "node_modules/url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, - "dependencies": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "node_modules/url/node_modules/punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - }, - "node_modules/use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/util": { - "version": "0.12.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", - "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "is-arguments": "^1.0.4", - "is-generator-function": "^1.0.7", - "is-typed-array": "^1.1.3", - "safe-buffer": "^5.1.2", - "which-typed-array": "^1.1.2" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "dev": true, - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true - }, - "node_modules/v8flags": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", - "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", - "dev": true, - "dependencies": { - "homedir-polyfill": "^1.0.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/value-or-function": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", - "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "node_modules/verror/node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "node_modules/vfile": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", - "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-message": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/vfile-message": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", - "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/vfile-reporter": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.2.tgz", - "integrity": "sha512-GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA==", - "dev": true, - "dependencies": { - "repeat-string": "^1.5.0", - "string-width": "^4.0.0", - "supports-color": "^6.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-sort": "^2.1.2", - "vfile-statistics": "^1.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/vfile-reporter/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/vfile-reporter/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/vfile-sort": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.2.tgz", - "integrity": "sha512-tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/vfile-statistics": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.4.tgz", - "integrity": "sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/vinyl": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", - "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==", - "dev": true, - "dependencies": { - "clone": "^2.1.1", - "clone-buffer": "^1.0.0", - "clone-stats": "^1.0.0", - "cloneable-readable": "^1.0.0", - "remove-trailing-separator": "^1.0.1", - "replace-ext": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/vinyl-fs": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", - "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==", - "dev": true, - "dependencies": { - "fs-mkdirp-stream": "^1.0.0", - "glob-stream": "^6.1.0", - "graceful-fs": "^4.0.0", - "is-valid-glob": "^1.0.0", - "lazystream": "^1.0.0", - "lead": "^1.0.0", - "object.assign": "^4.0.4", - "pumpify": "^1.3.5", - "readable-stream": "^2.3.3", - "remove-bom-buffer": "^3.0.0", - "remove-bom-stream": "^1.2.0", - "resolve-options": "^1.1.0", - "through2": "^2.0.0", - "to-through": "^2.0.0", - "value-or-function": "^3.0.0", - "vinyl": "^2.0.0", - "vinyl-sourcemap": "^1.1.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/vinyl-fs/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/vinyl-sourcemap": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz", - "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=", - "dev": true, - "dependencies": { - "append-buffer": "^1.0.2", - "convert-source-map": "^1.5.0", - "graceful-fs": "^4.1.6", - "normalize-path": "^2.1.1", - "now-and-later": "^2.0.0", - "remove-bom-buffer": "^3.0.0", - "vinyl": "^2.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/vinyl-sourcemap/node_modules/normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "dependencies": { - "remove-trailing-separator": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/vinyl-sourcemaps-apply": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", - "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", - "dev": true, - "dependencies": { - "source-map": "^0.5.1" - } - }, - "node_modules/vinyl/node_modules/replace-ext": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz", - "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/void-elements": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", - "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/vue-template-compiler": { - "version": "2.6.14", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz", - "integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==", - "dev": true, - "optional": true, - "dependencies": { - "de-indent": "^1.0.2", - "he": "^1.1.0" - } - }, - "node_modules/walk": { - "version": "2.3.15", - "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.15.tgz", - "integrity": "sha512-4eRTBZljBfIISK1Vnt69Gvr2w/wc3U6Vtrw7qiN5iqYJPH7LElcYh/iU4XWhdCy2dZqv1ToMyYlybDylfG/5Vg==", - "dev": true, - "dependencies": { - "foreachasync": "^3.0.0" - } - }, - "node_modules/watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", - "dev": true, - "dependencies": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "dev": true, - "dependencies": { - "defaults": "^1.0.3" - } - }, - "node_modules/webdriver": { - "version": "7.16.16", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.16.16.tgz", - "integrity": "sha512-x8UoG9k/P8KDrfSh1pOyNevt9tns3zexoMxp9cKnyA/7HYSErhZYTLGlgxscAXLtQG41cMH/Ba/oBmOx7Hgd8w==", - "dev": true, - "dependencies": { - "@types/node": "^17.0.4", - "@wdio/config": "7.16.16", - "@wdio/logger": "7.16.0", - "@wdio/protocols": "7.16.7", - "@wdio/types": "7.16.14", - "@wdio/utils": "7.16.14", - "got": "^11.0.2", - "ky": "^0.29.0", - "lodash.merge": "^4.6.1" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/webdriverio": { - "version": "7.16.16", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.16.16.tgz", - "integrity": "sha512-caPaEWyuD3Qoa7YkW4xCCQA4v9Pa9wmhFGPvNZh3ERtjMCNi8L/XXOdkekWNZmFh3tY0kFguBj7+fAwSY7HAGw==", - "dev": true, - "dependencies": { - "@types/aria-query": "^5.0.0", - "@types/node": "^17.0.4", - "@wdio/config": "7.16.16", - "@wdio/logger": "7.16.0", - "@wdio/protocols": "7.16.7", - "@wdio/repl": "7.16.14", - "@wdio/types": "7.16.14", - "@wdio/utils": "7.16.14", - "archiver": "^5.0.0", - "aria-query": "^5.0.0", - "css-shorthand-properties": "^1.1.1", - "css-value": "^0.0.1", - "devtools": "7.16.16", - "devtools-protocol": "^0.0.973690", - "fs-extra": "^10.0.0", - "get-port": "^5.1.1", - "grapheme-splitter": "^1.0.2", - "lodash.clonedeep": "^4.5.0", - "lodash.isobject": "^3.0.2", - "lodash.isplainobject": "^4.0.6", - "lodash.zip": "^4.2.0", - "minimatch": "^5.0.0", - "puppeteer-core": "^13.1.3", - "query-selector-shadow-dom": "^1.0.0", - "resq": "^1.9.1", - "rgb2hex": "0.2.5", - "serialize-error": "^8.0.0", - "webdriver": "7.16.16" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/webdriverio/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/webdriverio/node_modules/minimatch": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", - "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, - "node_modules/webpack": { - "version": "5.70.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz", - "integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==", - "dev": true, - "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", - "acorn-import-assertions": "^1.7.6", - "browserslist": "^4.14.5", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.9.2", - "es-module-lexer": "^0.9.0", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", - "webpack-sources": "^3.2.3" - }, - "bin": { - "webpack": "bin/webpack.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } - } - }, - "node_modules/webpack-bundle-analyzer": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz", - "integrity": "sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==", - "dev": true, - "dependencies": { - "acorn": "^8.0.4", - "acorn-walk": "^8.0.0", - "chalk": "^4.1.0", - "commander": "^7.2.0", - "gzip-size": "^6.0.0", - "lodash": "^4.17.20", - "opener": "^1.5.2", - "sirv": "^1.0.7", - "ws": "^7.3.1" - }, - "bin": { - "webpack-bundle-analyzer": "lib/bin/analyzer.js" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/webpack-bundle-analyzer/node_modules/acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/webpack-bundle-analyzer/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/webpack-bundle-analyzer/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/webpack-bundle-analyzer/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/webpack-bundle-analyzer/node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/webpack-bundle-analyzer/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-bundle-analyzer/node_modules/ws": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", - "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/webpack-merge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", - "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", - "dev": true, - "dependencies": { - "lodash": "^4.17.15" - } - }, - "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/webpack-stream": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webpack-stream/-/webpack-stream-7.0.0.tgz", - "integrity": "sha512-XoAQTHyCaYMo6TS7Atv1HYhtmBgKiVLONJbzLBl2V3eibXQ2IT/MCRM841RW/r3vToKD5ivrTJFWgd/ghoxoRg==", - "dev": true, - "dependencies": { - "fancy-log": "^1.3.3", - "lodash.clone": "^4.3.2", - "lodash.some": "^4.2.2", - "memory-fs": "^0.5.0", - "plugin-error": "^1.0.1", - "supports-color": "^8.1.1", - "through": "^2.3.8", - "vinyl": "^2.2.1" - }, - "engines": { - "node": ">= 10.0.0" - }, - "peerDependencies": { - "webpack": "^5.21.2" - } - }, - "node_modules/webpack/node_modules/acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/webpack/node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true, - "peerDependencies": { - "acorn": "^8" - } - }, - "node_modules/webpack/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/webpack/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/webpack/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/websocket-driver": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", - "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", - "dev": true, - "dependencies": { - "http-parser-js": ">=0.5.1", - "safe-buffer": ">=5.1.0", - "websocket-extensions": ">=0.1.1" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/websocket-extensions": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", - "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", - "dev": true, - "dependencies": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "node_modules/which-typed-array": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz", - "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.18.5", - "foreach": "^2.0.5", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - }, - "node_modules/workerpool": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", - "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==", - "dev": true - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/wrap-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "node_modules/write": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", - "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", - "dev": true, - "dependencies": { - "mkdirp": "^0.5.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/write/node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", - "dev": true, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, - "engines": { - "node": ">=0.4" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/yargs": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz", - "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=", - "dev": true - }, - "node_modules/yargs-parser": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", - "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-unparser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", - "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", - "dev": true, - "dependencies": { - "camelcase": "^6.0.0", - "decamelize": "^4.0.0", - "flat": "^5.0.2", - "is-plain-obj": "^2.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs-unparser/node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/yargs-unparser/node_modules/decamelize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", - "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/yargs-unparser/node_modules/is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yarn-install": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz", - "integrity": "sha1-V/RQULgu/VcYKzlzxUqgXLXSUjA=", - "dev": true, - "dependencies": { - "cac": "^3.0.3", - "chalk": "^1.1.3", - "cross-spawn": "^4.0.2" - }, - "bin": { - "yarn-install": "bin/yarn-install.js", - "yarn-remove": "bin/yarn-remove.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yarn-install/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/yarn-install/node_modules/ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/yarn-install/node_modules/chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "dependencies": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/yarn-install/node_modules/cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", - "dev": true, - "dependencies": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "node_modules/yarn-install/node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "node_modules/yarn-install/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/yarn-install/node_modules/supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/yarn-install/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/yarn-install/node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", - "dev": true, - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/zip-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz", - "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==", - "dev": true, - "dependencies": { - "archiver-utils": "^2.1.0", - "compress-commons": "^4.1.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/zip-stream/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/zwitch": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", - "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "plugins/eslint": { - "name": "eslint-plugin-prebid", - "version": "1.0.0", - "dev": true, - "license": "Apache-2.0" - } - }, "dependencies": { "@ampproject/remapping": { "version": "2.1.2", @@ -26135,6 +2635,16 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, + "requires": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + } + }, "abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", @@ -26160,8 +2670,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} + "dev": true }, "acorn-node": { "version": "1.8.2", @@ -27004,8 +3513,7 @@ "version": "10.0.0", "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz", "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==", - "dev": true, - "requires": {} + "dev": true }, "babylon": { "version": "6.18.0", @@ -28497,8 +5005,8 @@ "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==", "dev": true, "requires": { - "is-text-path": "^1.0.1", "JSONStream": "^1.0.4", + "is-text-path": "^1.0.1", "lodash": "^4.17.15", "meow": "^8.0.0", "split2": "^3.0.0", @@ -30034,8 +6542,7 @@ "version": "10.2.1", "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz", "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=", - "dev": true, - "requires": {} + "dev": true }, "eslint-import-resolver-node": { "version": "0.3.6", @@ -30159,21 +6666,20 @@ } }, "eslint-plugin-prebid": { - "version": "file:plugins/eslint" + "version": "file:plugins/eslint", + "dev": true }, "eslint-plugin-promise": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz", "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==", - "dev": true, - "requires": {} + "dev": true }, "eslint-plugin-standard": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz", "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==", - "dev": true, - "requires": {} + "dev": true }, "eslint-scope": { "version": "5.1.1", @@ -32627,8 +9133,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", - "dev": true, - "requires": {} + "dev": true }, "ansi-escapes": { "version": "3.2.0", @@ -34921,16 +11426,6 @@ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, - "JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true, - "requires": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - } - }, "jsprim": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", @@ -35034,8 +11529,7 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/karma-babel-preprocessor/-/karma-babel-preprocessor-8.0.2.tgz", "integrity": "sha512-6ZUnHwaK2EyhgxbgeSJW6n6WZUYSEdekHIV/qDUnPgMkVzQBHEvd07d2mTL5AQjV8uTUgH6XslhaPrp+fHWH2A==", - "dev": true, - "requires": {} + "dev": true }, "karma-browserstack-launcher": { "version": "1.4.0", @@ -35052,8 +11546,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz", "integrity": "sha1-vuWtQEAFF4Ea40u5RfdikJEIt5o=", - "dev": true, - "requires": {} + "dev": true }, "karma-chrome-launcher": { "version": "3.1.0", @@ -35246,29 +11739,25 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/karma-opera-launcher/-/karma-opera-launcher-1.0.0.tgz", "integrity": "sha1-+lFihTGh0L6EstjcDX7iCfyP+Ro=", - "dev": true, - "requires": {} + "dev": true }, "karma-safari-launcher": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz", "integrity": "sha1-lpgqLMR9BmquccVTursoMZEVos4=", - "dev": true, - "requires": {} + "dev": true }, "karma-script-launcher": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-1.0.0.tgz", "integrity": "sha1-zQF8TeXvCeWp2nkydhdhCN1LVC0=", - "dev": true, - "requires": {} + "dev": true }, "karma-sinon": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.5.tgz", "integrity": "sha1-TjRD8oMP3s/2JNN0cWPxIX2qKpo=", - "dev": true, - "requires": {} + "dev": true }, "karma-sourcemap-loader": { "version": "0.3.8", @@ -36821,6 +13310,7 @@ "integrity": "sha512-eiyIZj/A0dj1o4ywXWqicazUL3l0HP3TydUR6xF0X3xh3LGBMLqW8a9aFe6MuNH4mxNMk53QKBHM6LOPR8kSgw==", "dev": true, "requires": { + "JSONStream": "^1.0.3", "browser-resolve": "^1.7.0", "cached-path-relative": "^1.0.0", "concat-stream": "~1.5.0", @@ -36828,7 +13318,6 @@ "detective": "^5.2.0", "duplexer2": "^0.1.2", "inherits": "^2.0.1", - "JSONStream": "^1.0.3", "konan": "^2.1.1", "readable-stream": "^2.0.2", "resolve": "^1.1.3", @@ -38165,8 +14654,7 @@ "version": "8.5.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -38935,8 +15423,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -39937,15 +16424,6 @@ "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=", "dev": true }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, "string-template": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz", @@ -39991,6 +16469,15 @@ "define-properties": "^1.1.3" } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, "stringify-entities": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz", @@ -40265,8 +16752,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "schema-utils": { "version": "3.1.1", @@ -41402,8 +17888,7 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true, - "requires": {} + "dev": true }, "ajv": { "version": "6.12.6", @@ -41421,8 +17906,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "schema-utils": { "version": "3.1.1", @@ -41519,8 +18003,7 @@ "version": "7.5.7", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -41721,8 +18204,7 @@ "version": "8.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", - "dev": true, - "requires": {} + "dev": true }, "xtend": { "version": "4.0.2", diff --git a/test/spec/modules/acuityAdsBidAdapter_spec.js b/test/spec/modules/acuityAdsBidAdapter_spec.js new file mode 100644 index 00000000000..18ea574c1ce --- /dev/null +++ b/test/spec/modules/acuityAdsBidAdapter_spec.js @@ -0,0 +1,398 @@ +import { expect } from 'chai'; +import { spec } from '../../../modules/acuityAdsBidAdapter'; +import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js'; +import { getUniqueIdentifierStr } from '../../../src/utils.js'; + +const bidder = 'acuityads' + +describe('AcuityAdsBidAdapter', function () { + const bids = [ + { + bidId: getUniqueIdentifierStr(), + bidder: bidder, + mediaTypes: { + [BANNER]: { + sizes: [[300, 250]] + } + }, + params: { + placementId: 'testBanner', + } + }, + { + bidId: getUniqueIdentifierStr(), + bidder: bidder, + mediaTypes: { + [VIDEO]: { + playerSize: [[300, 300]], + minduration: 5, + maxduration: 60 + } + }, + params: { + placementId: 'testVideo', + } + }, + { + bidId: getUniqueIdentifierStr(), + bidder: bidder, + mediaTypes: { + [NATIVE]: { + native: { + title: { + required: true + }, + body: { + required: true + }, + icon: { + required: true, + size: [64, 64] + } + } + } + }, + params: { + placementId: 'testNative', + } + } + ]; + + const invalidBid = { + bidId: getUniqueIdentifierStr(), + bidder: bidder, + mediaTypes: { + [BANNER]: { + sizes: [[300, 250]] + } + }, + params: { + + } + } + + const bidderRequest = { + uspConsent: '1---', + gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw', + refererInfo: { + referer: 'https://test.com' + } + }; + + describe('isBidRequestValid', function () { + it('Should return true if there are bidId, params and key parameters present', function () { + expect(spec.isBidRequestValid(bids[0])).to.be.true; + }); + it('Should return false if at least one of parameters is not present', function () { + expect(spec.isBidRequestValid(invalidBid)).to.be.false; + }); + }); + + describe('buildRequests', function () { + let serverRequest = spec.buildRequests(bids, bidderRequest); + + it('Creates a ServerRequest object with method, URL and data', function () { + expect(serverRequest).to.exist; + expect(serverRequest.method).to.exist; + expect(serverRequest.url).to.exist; + expect(serverRequest.data).to.exist; + }); + + it('Returns POST method', function () { + expect(serverRequest.method).to.equal('POST'); + }); + + it('Returns valid URL', function () { + expect(serverRequest.url).to.equal('https://prebid.admanmedia.com/pbjs'); + }); + + it('Returns general data valid', function () { + let data = serverRequest.data; + expect(data).to.be.an('object'); + expect(data).to.have.all.keys('deviceWidth', + 'deviceHeight', + 'language', + 'secure', + 'host', + 'page', + 'placements', + 'coppa', + 'ccpa', + 'gdpr', + 'tmax' + ); + expect(data.deviceWidth).to.be.a('number'); + expect(data.deviceHeight).to.be.a('number'); + expect(data.language).to.be.a('string'); + expect(data.secure).to.be.within(0, 1); + expect(data.host).to.be.a('string'); + expect(data.page).to.be.a('string'); + expect(data.coppa).to.be.a('number'); + expect(data.gdpr).to.be.a('string'); + expect(data.ccpa).to.be.a('string'); + expect(data.tmax).to.be.a('number'); + expect(data.placements).to.have.lengthOf(3); + }); + + it('Returns valid placements', function () { + const { placements } = serverRequest.data; + for (let i = 0, len = placements.length; i < len; i++) { + const placement = placements[i]; + expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']); + expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]); + expect(placement.bidId).to.be.a('string'); + expect(placement.schain).to.be.an('object'); + expect(placement.bidfloor).to.exist.and.to.equal(0); + expect(placement.type).to.exist.and.to.equal('publisher'); + + if (placement.adFormat === BANNER) { + expect(placement.sizes).to.be.an('array'); + } + switch (placement.adFormat) { + case BANNER: + expect(placement.sizes).to.be.an('array'); + break; + case VIDEO: + expect(placement.playerSize).to.be.an('array'); + expect(placement.minduration).to.be.an('number'); + expect(placement.maxduration).to.be.an('number'); + break; + case NATIVE: + expect(placement.native).to.be.an('object'); + break; + } + } + }); + + it('Returns data with gdprConsent and without uspConsent', function () { + delete bidderRequest.uspConsent; + serverRequest = spec.buildRequests(bids, bidderRequest); + let data = serverRequest.data; + expect(data.gdpr).to.exist; + expect(data.gdpr).to.be.a('string'); + expect(data.gdpr).to.equal(bidderRequest.gdprConsent); + expect(data.ccpa).to.not.exist; + delete bidderRequest.gdprConsent; + }); + + it('Returns data with uspConsent and without gdprConsent', function () { + bidderRequest.uspConsent = '1---'; + delete bidderRequest.gdprConsent; + serverRequest = spec.buildRequests(bids, bidderRequest); + let data = serverRequest.data; + expect(data.ccpa).to.exist; + expect(data.ccpa).to.be.a('string'); + expect(data.ccpa).to.equal(bidderRequest.uspConsent); + expect(data.gdpr).to.not.exist; + }); + + it('Returns empty data if no valid requests are passed', function () { + serverRequest = spec.buildRequests([], bidderRequest); + let data = serverRequest.data; + expect(data.placements).to.be.an('array').that.is.empty; + }); + }); + + describe('interpretResponse', function () { + it('Should interpret banner response', function () { + const banner = { + body: [{ + mediaType: 'banner', + width: 300, + height: 250, + cpm: 0.4, + ad: 'Test', + requestId: '23fhj33i987f', + ttl: 120, + creativeId: '2', + netRevenue: true, + currency: 'USD', + dealId: '1', + meta: { + advertiserDomains: ['google.com'], + advertiserId: 1234 + } + }] + }; + let bannerResponses = spec.interpretResponse(banner); + expect(bannerResponses).to.be.an('array').that.is.not.empty; + let dataItem = bannerResponses[0]; + expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId', + 'netRevenue', 'currency', 'dealId', 'mediaType', 'meta'); + expect(dataItem.requestId).to.equal(banner.body[0].requestId); + expect(dataItem.cpm).to.equal(banner.body[0].cpm); + expect(dataItem.width).to.equal(banner.body[0].width); + expect(dataItem.height).to.equal(banner.body[0].height); + expect(dataItem.ad).to.equal(banner.body[0].ad); + expect(dataItem.ttl).to.equal(banner.body[0].ttl); + expect(dataItem.creativeId).to.equal(banner.body[0].creativeId); + expect(dataItem.netRevenue).to.be.true; + expect(dataItem.currency).to.equal(banner.body[0].currency); + expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains'); + }); + it('Should interpret video response', function () { + const video = { + body: [{ + vastUrl: 'test.com', + mediaType: 'video', + cpm: 0.5, + requestId: '23fhj33i987f', + ttl: 120, + creativeId: '2', + netRevenue: true, + currency: 'USD', + dealId: '1', + meta: { + advertiserDomains: ['google.com'], + advertiserId: 1234 + } + }] + }; + let videoResponses = spec.interpretResponse(video); + expect(videoResponses).to.be.an('array').that.is.not.empty; + + let dataItem = videoResponses[0]; + expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId', + 'netRevenue', 'currency', 'dealId', 'mediaType', 'meta'); + expect(dataItem.requestId).to.equal('23fhj33i987f'); + expect(dataItem.cpm).to.equal(0.5); + expect(dataItem.vastUrl).to.equal('test.com'); + expect(dataItem.ttl).to.equal(120); + expect(dataItem.creativeId).to.equal('2'); + expect(dataItem.netRevenue).to.be.true; + expect(dataItem.currency).to.equal('USD'); + expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains'); + }); + it('Should interpret native response', function () { + const native = { + body: [{ + mediaType: 'native', + native: { + clickUrl: 'test.com', + title: 'Test', + image: 'test.com', + impressionTrackers: ['test.com'], + }, + ttl: 120, + cpm: 0.4, + requestId: '23fhj33i987f', + creativeId: '2', + netRevenue: true, + currency: 'USD', + meta: { + advertiserDomains: ['google.com'], + advertiserId: 1234 + } + }] + }; + let nativeResponses = spec.interpretResponse(native); + expect(nativeResponses).to.be.an('array').that.is.not.empty; + + let dataItem = nativeResponses[0]; + expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta'); + expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image') + expect(dataItem.requestId).to.equal('23fhj33i987f'); + expect(dataItem.cpm).to.equal(0.4); + expect(dataItem.native.clickUrl).to.equal('test.com'); + expect(dataItem.native.title).to.equal('Test'); + expect(dataItem.native.image).to.equal('test.com'); + expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty; + expect(dataItem.native.impressionTrackers[0]).to.equal('test.com'); + expect(dataItem.ttl).to.equal(120); + expect(dataItem.creativeId).to.equal('2'); + expect(dataItem.netRevenue).to.be.true; + expect(dataItem.currency).to.equal('USD'); + expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains'); + }); + it('Should return an empty array if invalid banner response is passed', function () { + const invBanner = { + body: [{ + width: 300, + cpm: 0.4, + ad: 'Test', + requestId: '23fhj33i987f', + ttl: 120, + creativeId: '2', + netRevenue: true, + currency: 'USD', + dealId: '1' + }] + }; + + let serverResponses = spec.interpretResponse(invBanner); + expect(serverResponses).to.be.an('array').that.is.empty; + }); + it('Should return an empty array if invalid video response is passed', function () { + const invVideo = { + body: [{ + mediaType: 'video', + cpm: 0.5, + requestId: '23fhj33i987f', + ttl: 120, + creativeId: '2', + netRevenue: true, + currency: 'USD', + dealId: '1' + }] + }; + let serverResponses = spec.interpretResponse(invVideo); + expect(serverResponses).to.be.an('array').that.is.empty; + }); + it('Should return an empty array if invalid native response is passed', function () { + const invNative = { + body: [{ + mediaType: 'native', + clickUrl: 'test.com', + title: 'Test', + impressionTrackers: ['test.com'], + ttl: 120, + requestId: '23fhj33i987f', + creativeId: '2', + netRevenue: true, + currency: 'USD', + }] + }; + let serverResponses = spec.interpretResponse(invNative); + expect(serverResponses).to.be.an('array').that.is.empty; + }); + it('Should return an empty array if invalid response is passed', function () { + const invalid = { + body: [{ + ttl: 120, + creativeId: '2', + netRevenue: true, + currency: 'USD', + dealId: '1' + }] + }; + let serverResponses = spec.interpretResponse(invalid); + expect(serverResponses).to.be.an('array').that.is.empty; + }); + }); + + describe('getUserSyncs', function() { + it('Should return array of objects with proper sync config , include GDPR', function() { + const syncData = spec.getUserSyncs({}, {}, { + consentString: 'ALL', + gdprApplies: true, + }, {}); + expect(syncData).to.be.an('array').which.is.not.empty; + expect(syncData[0]).to.be.an('object') + expect(syncData[0].type).to.be.a('string') + expect(syncData[0].type).to.equal('image') + expect(syncData[0].url).to.be.a('string') + expect(syncData[0].url).to.equal('https://cs.admanmedia.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0') + }); + it('Should return array of objects with proper sync config , include CCPA', function() { + const syncData = spec.getUserSyncs({}, {}, {}, { + consentString: '1---' + }); + expect(syncData).to.be.an('array').which.is.not.empty; + expect(syncData[0]).to.be.an('object') + expect(syncData[0].type).to.be.a('string') + expect(syncData[0].type).to.equal('image') + expect(syncData[0].url).to.be.a('string') + expect(syncData[0].url).to.equal('https://cs.admanmedia.com/image?pbjs=1&ccpa_consent=1---&coppa=0') + }); + }); +}); From 05f59829fd6ab5b606a2fe935be51e31c70103a8 Mon Sep 17 00:00:00 2001 From: AcuityAds Date: Thu, 25 Aug 2022 00:10:16 +0300 Subject: [PATCH 02/12] changes --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 21c786a32d3..a0c4d857ca6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "prebid.js", - "version": "7.10.0-pre", + "version": "7.12.0-pre", "lockfileVersion": 2, "requires": true, "packages": { From c2e64f13a7b72d00c18c67d7bc34bccf18186424 Mon Sep 17 00:00:00 2001 From: AcuityAds Date: Thu, 25 Aug 2022 00:13:11 +0300 Subject: [PATCH 03/12] changes --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index a0c4d857ca6..a6ae1e5a3e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42137,4 +42137,4 @@ "dev": true } } -} \ No newline at end of file +} From f1b7c900b8588754be8db47c53b17c7f6c207ad9 Mon Sep 17 00:00:00 2001 From: AcuityAds Date: Thu, 25 Aug 2022 00:14:01 +0300 Subject: [PATCH 04/12] changes --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index a6ae1e5a3e8..a057b763565 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "prebid.js", - "version": "7.10.0-pre", + "version": "7.12.0-pre", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.7", From afe8d2a49e4e3dc5372b62138931dd3e245b65e5 Mon Sep 17 00:00:00 2001 From: AcuityAds Date: Thu, 25 Aug 2022 00:15:00 +0300 Subject: [PATCH 05/12] changes --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index a057b763565..749fafaebc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "prebid.js", - "version": "7.12.0-pre", + "version": "7.10.0-pre", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "prebid.js", - "version": "7.12.0-pre", + "version": "7.10.0-pre", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.7", From a4623058bf546a831e6bf84408210ff1986b3235 Mon Sep 17 00:00:00 2001 From: AcuityAds Date: Fri, 28 Oct 2022 15:06:34 +0300 Subject: [PATCH 06/12] fix downolad --- modules/{acuityAdsBidAdapter.js => acuityadsBidAdapter.js} | 0 modules/{acuityAdsBidAdapter.md => acuityadsBidAdapter.md} | 0 ...{acuityAdsBidAdapter_spec.js => acuityadsBidAdapter_spec.js} | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename modules/{acuityAdsBidAdapter.js => acuityadsBidAdapter.js} (100%) rename modules/{acuityAdsBidAdapter.md => acuityadsBidAdapter.md} (100%) rename test/spec/modules/{acuityAdsBidAdapter_spec.js => acuityadsBidAdapter_spec.js} (99%) diff --git a/modules/acuityAdsBidAdapter.js b/modules/acuityadsBidAdapter.js similarity index 100% rename from modules/acuityAdsBidAdapter.js rename to modules/acuityadsBidAdapter.js diff --git a/modules/acuityAdsBidAdapter.md b/modules/acuityadsBidAdapter.md similarity index 100% rename from modules/acuityAdsBidAdapter.md rename to modules/acuityadsBidAdapter.md diff --git a/test/spec/modules/acuityAdsBidAdapter_spec.js b/test/spec/modules/acuityadsBidAdapter_spec.js similarity index 99% rename from test/spec/modules/acuityAdsBidAdapter_spec.js rename to test/spec/modules/acuityadsBidAdapter_spec.js index 18ea574c1ce..2497b435a19 100644 --- a/test/spec/modules/acuityAdsBidAdapter_spec.js +++ b/test/spec/modules/acuityadsBidAdapter_spec.js @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { spec } from '../../../modules/acuityAdsBidAdapter'; +import { spec } from '../../../modules/acuityadsBidAdapter'; import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js'; import { getUniqueIdentifierStr } from '../../../src/utils.js'; From fc3fdddd2af828802b77ed01639092aef0a923e1 Mon Sep 17 00:00:00 2001 From: AcuityAds Date: Thu, 28 Sep 2023 10:30:48 +0300 Subject: [PATCH 07/12] add gpp --- modules/acuityadsBidAdapter.js | 9 ++++++ modules/acuityadsBidAdapter.md | 2 +- test/spec/modules/acuityadsBidAdapter_spec.js | 31 ++++++++++++++++++- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/modules/acuityadsBidAdapter.js b/modules/acuityadsBidAdapter.js index b0bb132ddae..5b12eb2133b 100644 --- a/modules/acuityadsBidAdapter.js +++ b/modules/acuityadsBidAdapter.js @@ -153,6 +153,15 @@ export const spec = { tmax: bidderRequest.timeout }; + // Add GPP consent + if (bidderRequest.gppConsent) { + request.gpp = bidderRequest.gppConsent.gppString; + request.gpp_sid = bidderRequest.gppConsent.applicableSections; + } else if (bidderRequest.ortb2?.regs?.gpp) { + request.gpp = bidderRequest.ortb2.regs.gpp; + request.gpp_sid = bidderRequest.ortb2.regs.gpp_sid; + } + const len = validBidRequests.length; for (let i = 0; i < len; i++) { const bid = validBidRequests[i]; diff --git a/modules/acuityadsBidAdapter.md b/modules/acuityadsBidAdapter.md index a19e0a6b0ba..7f001cd9376 100644 --- a/modules/acuityadsBidAdapter.md +++ b/modules/acuityadsBidAdapter.md @@ -3,7 +3,7 @@ ``` Module Name: AcuityAds Bidder Adapter Module Type: AcuityAds Bidder Adapter -Maintainer: sa-support@brightcom.com +Maintainer: rafi.babler@acuityads.com ``` # Description diff --git a/test/spec/modules/acuityadsBidAdapter_spec.js b/test/spec/modules/acuityadsBidAdapter_spec.js index b6101082bf4..31ef9dd6466 100644 --- a/test/spec/modules/acuityadsBidAdapter_spec.js +++ b/test/spec/modules/acuityadsBidAdapter_spec.js @@ -77,7 +77,8 @@ describe('AcuityAdsBidAdapter', function () { refererInfo: { referer: 'https://test.com' }, - timeout: 500 + timeout: 500, + ortb2: {} }; describe('isBidRequestValid', function () { @@ -187,6 +188,34 @@ describe('AcuityAdsBidAdapter', function () { expect(data.gdpr).to.not.exist; }); + describe('Returns data with gppConsent', function () { + it('bidderRequest.gppConsent', () => { + bidderRequest.gppConsent = { + gppString: 'abc123', + applicableSections: [8] + }; + + serverRequest = spec.buildRequests(bids, bidderRequest); + let data = serverRequest.data; + expect(data).to.be.an('object'); + expect(data).to.have.property('gpp'); + expect(data).to.have.property('gpp_sid'); + delete bidderRequest.gppConsent; + }) + + it('bidderRequest.ortb2.regs.gpp', () => { + bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {}; + bidderRequest.ortb2.regs.gpp = 'abc123'; + bidderRequest.ortb2.regs.gpp_sid = [8]; + + serverRequest = spec.buildRequests(bids, bidderRequest); + let data = serverRequest.data; + expect(data).to.be.an('object'); + expect(data).to.have.property('gpp'); + expect(data).to.have.property('gpp_sid'); + }) + }); + it('Returns empty data if no valid requests are passed', function () { serverRequest = spec.buildRequests([], bidderRequest); let data = serverRequest.data; From 8a5c61904e7bd9d0a3f580e40535a5c70d4fc63a Mon Sep 17 00:00:00 2001 From: AcuityAds Date: Mon, 16 Dec 2024 14:49:45 +0200 Subject: [PATCH 08/12] Merge remote-tracking branch 'prebid/master' --- .circleci/config.yml | 4 +- .devcontainer/Dockerfile | 2 +- .eslintrc.js | 74 +- .github/PULL_REQUEST_TEMPLATE.md | 5 +- .github/codeql/codeql-config.yml | 3 + .github/codeql/queries/deviceMemory.ql | 14 + .github/codeql/queries/hardwareConcurrency.ql | 14 + .github/codeql/queries/prebid.qll | 36 + .github/codeql/queries/qlpack.yml | 8 + .github/release-drafter.yml | 4 + .github/workflows/codeql-analysis.yml | 6 +- .github/workflows/issue_tracker.yml | 2 +- .github/workflows/jscpd.yml | 124 + .github/workflows/linter.yml | 110 + .github/workflows/release-drafter.yml | 2 +- .nvmrc | 2 +- PR_REVIEW.md | 18 +- README.md | 52 +- RELEASE_SCHEDULE.md | 2 +- allowedModules.js | 11 +- browsers.json | 26 +- creative/README.md | 44 + creative/constants.js | 10 + creative/crossDomain.js | 107 + creative/renderers/display/constants.js | 4 + creative/renderers/display/renderer.js | 21 + creative/renderers/native/constants.js | 14 + creative/renderers/native/renderer.js | 88 + features.json | 3 +- gulpfile.js | 230 +- .../gpt/51DegreesRtdProvider_example.html | 195 + .../gpt/adnuntius_example.html | 8 +- .../gpt/adnuntius_multiformat_example.html | 132 + ....html => anonymised_segments_example.html} | 8 +- .../gpt/azerionedgeRtdProvider_example.html | 91 + .../gpt/contxtfulRtdProvider_example.html | 212 + .../gpt/creative_rendering.html | 15 - integrationExamples/gpt/cstg_example.html | 317 + integrationExamples/gpt/gdpr_hello_world.html | 3 +- integrationExamples/gpt/hello_world.html | 30 +- .../gpt/jwplayerRtdProvider_example.html | 106 - integrationExamples/gpt/nexverse.html | 126 + ...fledge_example.html => paapi_example.html} | 17 +- .../gpt/prebidServer_example.html | 40 +- ...e.html => prebidServer_paapi_example.html} | 15 +- integrationExamples/gpt/precisoExample.html | 170 + .../gpt/precisonativeExample.html | 203 + .../gpt/publir_hello_world.html | 84 + .../gpt/pubxaiRtdProvider_example.html | 113 + .../gpt/raynRtdProvider_example.html | 168 + .../gpt/rewardedInterestIdSystem_example.html | 114 + .../gpt/symitridap_segments_example.html | 133 + integrationExamples/gpt/tpmn_example.html | 168 + .../gpt/tpmn_serverless_example.html | 121 + .../gpt/weboramaRtdProvider_example.html | 330 +- .../gpt/wurflRtdProvider_example.html | 106 + .../gpt/x-domain/creative.html | 108 +- .../noadserver/jwplayerBidAdapter_sample.html | 75 + .../noadserver/native_noadserver.html | 68 +- .../native_renderer/custom_renderer.html | 90 + .../noadserver/native_renderer/renderer.js | 69 + .../jwplayerRtdProvider_example.html | 103 + .../top-level-paapi/gam-contextual.html | 135 + .../top-level-paapi/no_adserver.html | 114 + .../top-level-paapi/shared/decisionLogic.js | 57 + .../top-level-paapi/shared/example-setup.js | 95 + .../adPlayerPro/bidRequestScheduling.html | 143 + .../adPlayerPro/eventListeners.html | 154 + .../videoModule/jwplayer/bidMarkedAsUsed.html | 7 + .../jwplayer/bidRequestScheduling.html | 13 +- .../jwplayer/bidsBackHandlerOverride.html | 7 + .../videoModule/jwplayer/eventListeners.html | 7 + .../videoModule/jwplayer/eventsUI.html | 7 + .../jwplayer/gamAdServerMediation.html | 7 + .../videoModule/jwplayer/mediaMetadata.html | 7 + .../videoModule/jwplayer/playlist.html | 7 + .../videoModule/videojs/bidMarkedAsUsed.html | 7 + .../videojs/bidRequestScheduling.html | 7 + .../videojs/bidsBackHandlerOverride.html | 7 + .../videoModule/videojs/eventListeners.html | 7 + .../videoModule/videojs/eventsUI.html | 7 + .../videojs/gamAdServerMediation.html | 7 + .../videoModule/videojs/mediaMetadata.html | 7 + .../videoModule/videojs/playlist.html | 7 + karma.conf.maker.js | 34 +- karmaRunner.js | 92 +- libraries/adagioUtils/adagioUtils.js | 35 + libraries/adkernelUtils/adkernelUtils.js | 11 + libraries/advangUtils/index.js | 228 + .../analyticsAdapter/AnalyticsAdapter.js | 8 +- libraries/appnexusUtils/anKeywords.js | 4 +- libraries/appnexusUtils/anUtils.js | 17 + libraries/audUtils/bidderUtils.js | 238 + libraries/autoplayDetection/autoplay.js | 50 + libraries/biddoInvamiaUtils/index.js | 70 + libraries/braveUtils/buildAndInterpret.js | 78 + libraries/braveUtils/index.js | 95 + libraries/braveUtils/nativeAssets.js | 23 + libraries/cmp/cmpClient.js | 48 +- libraries/connectionInfo/connectionUtils.js | 33 + libraries/consentManagement/cmUtils.js | 38 + .../creative-renderer-display/renderer.js | 2 + .../creative-renderer-native/renderer.js | 2 + libraries/currencyUtils/floor.js | 23 + libraries/deepintentUtils/index.js | 42 + libraries/dfpUtils/dfpUtils.js | 26 + libraries/dspxUtils/bidderUtils.js | 390 + libraries/equativUtils/equativUtils.js | 30 + libraries/fpdUtils/deviceInfo.js | 58 + libraries/fpdUtils/pageInfo.js | 71 + libraries/gptUtils/gptUtils.js | 100 +- .../intentIqConstants/intentIqConstants.js | 10 + libraries/intentIqUtils/detectBrowserUtils.js | 82 + libraries/intentIqUtils/getGppValue.js | 16 + libraries/intentIqUtils/getRefferer.js | 64 + libraries/interpretResponseUtils/index.js | 22 + libraries/keywords/keywords.js | 2 +- libraries/liveIntentId/externalIdSystem.js | 174 + libraries/liveIntentId/idSystem.js | 234 + libraries/liveIntentId/shared.js | 276 + libraries/mediaImpactUtils/index.js | 61 + libraries/mgidUtils/mgidUtils.js | 73 + libraries/mspa/activityControls.js | 5 +- libraries/navigatorData/navigatorData.js | 29 + libraries/nexverseUtils/index.js | 130 + libraries/objectGuard/objectGuard.js | 2 + libraries/objectGuard/ortbGuard.js | 4 + libraries/ortb2.5Translator/translator.js | 2 + libraries/ortb2Utils/currency.js | 3 + libraries/ortbConverter/README.md | 9 +- libraries/ortbConverter/converter.js | 2 +- libraries/ortbConverter/lib/composer.js | 8 +- libraries/ortbConverter/lib/sizes.js | 14 - libraries/ortbConverter/processors/banner.js | 16 +- libraries/ortbConverter/processors/default.js | 16 + libraries/ortbConverter/processors/video.js | 44 +- libraries/paapiTools/buyerOrigins.js | 35 + libraries/pbsExtensions/processors/aliases.js | 12 + libraries/pbsExtensions/processors/params.js | 12 +- libraries/percentInView/percentInView.js | 63 + libraries/precisoUtils/bidNativeUtils.js | 104 + libraries/precisoUtils/bidUtils.js | 249 + libraries/precisoUtils/bidUtilsCommon.js | 162 + libraries/processResponse/index.js | 12 + libraries/riseUtils/index.js | 336 + .../schainSerializer/schainSerializer.js | 24 + libraries/sizeUtils/tranformSize.js | 43 + libraries/smartyadsUtils/getAdUrlByRegion.js | 32 + libraries/targetVideoUtils/bidderUtils.js | 213 + libraries/targetVideoUtils/constants.js | 25 + libraries/teqblazeUtils/bidderUtils.js | 261 + libraries/timeoutQueue/timeoutQueue.js | 22 + libraries/uid1Eids/uid1Eids.js | 16 + libraries/uid2Eids/uid2Eids.js | 14 + libraries/userAgentUtils/index.js | 58 + .../userAgentUtils/userAgentTypes.enums.js | 22 + libraries/userSyncUtils/userSyncUtils.js | 24 + libraries/vastTrackers/vastTrackers.js | 122 + libraries/vidazooUtils/bidderUtils.js | 500 + libraries/vidazooUtils/constants.js | 7 + libraries/video/constants/ortb.js | 17 +- libraries/video/constants/vendorCodes.js | 1 + libraries/video/shared/parentModule.js | 1 + libraries/viewport/viewport.js | 13 + libraries/weakStore/weakStore.js | 15 + libraries/xeUtils/bidderUtils.js | 158 + modules/.submodules.json | 55 +- modules/1plusXRtdProvider.js | 39 +- modules/1plusXRtdProvider.md | 19 +- modules/33acrossAnalyticsAdapter.js | 655 + modules/33acrossAnalyticsAdapter.md | 76 + modules/33acrossBidAdapter.js | 35 +- modules/33acrossIdSystem.js | 138 +- modules/33acrossIdSystem.md | 10 +- modules/51DegreesRtdProvider.js | 335 + modules/51DegreesRtdProvider.md | 162 + ...er.js => AsteriobidPbmAnalyticsAdapter.js} | 42 +- modules/AsteriobidPbmAnalyticsAdapter.md | 9 + modules/BTBidAdapter.js | 204 + modules/BTBidAdapter.md | 70 + modules/a1MediaBidAdapter.js | 17 +- modules/a1MediaRtdProvider.js | 6 +- modules/aaxBlockmeterRtdProvider.js | 3 +- modules/ablidaBidAdapter.js | 6 + modules/acuityadsBidAdapter.js | 207 +- modules/ad2ictionBidAdapter.js | 59 + modules/ad2ictionBidAdapter.md | 30 + modules/adWMGAnalyticsAdapter.js | 20 +- modules/adagioAnalyticsAdapter.js | 478 +- modules/adagioAnalyticsAdapter.md | 4 + modules/adagioBidAdapter.js | 726 +- modules/adagioBidAdapter.md | 7 +- modules/adagioRtdProvider.js | 740 + modules/adagioRtdProvider.md | 38 + modules/adbookpspBidAdapter.js | 830 - modules/adbookpspBidAdapter.md | 191 - modules/adbutlerBidAdapter.js | 113 + modules/adbutlerBidAdapter.md | 31 + modules/addefendBidAdapter.js | 3 +- modules/adfBidAdapter.js | 38 +- modules/adfusionBidAdapter.js | 30 + modules/adgenerationBidAdapter.js | 51 +- modules/adgridBidAdapter.js | 189 + modules/adgridBidAdapter.md | 45 + modules/adhashBidAdapter.js | 20 +- modules/adkernelAdnAnalyticsAdapter.js | 16 +- modules/adkernelAdnBidAdapter.js | 13 +- modules/adkernelBidAdapter.js | 262 +- modules/adlooxAdServerVideo.js | 4 +- modules/adlooxAnalyticsAdapter.js | 12 +- modules/adlooxRtdProvider.js | 2 +- modules/admanBidAdapter.js | 220 +- modules/admaticBidAdapter.js | 278 +- modules/admediaBidAdapter.js | 6 + modules/admixerBidAdapter.js | 38 +- modules/admixerBidAdapter.md | 42 + modules/admixerIdSystem.js | 7 + modules/adnowBidAdapter.js | 6 +- modules/adnuntiusBidAdapter.js | 392 +- modules/adnuntiusRtdProvider.js | 4 + modules/adomikAnalyticsAdapter.js | 262 - modules/adotBidAdapter.js | 83 +- modules/adpartnerBidAdapter.js | 114 +- modules/adplayerproVideoProvider.js | 439 + modules/adplayerproVideoProvider.md | 54 + modules/adpod.js | 17 +- modules/adprimeBidAdapter.js | 193 +- modules/adqueryBidAdapter.js | 87 +- modules/adqueryIdSystem.js | 21 +- modules/adrelevantisBidAdapter.js | 31 +- modules/adriverBidAdapter.js | 8 +- modules/adriverIdSystem.js | 8 +- modules/ads_interactiveBidAdapter.js | 21 + modules/ads_interactiveBidAdapter.md | 79 + modules/adspiritBidAdapter.js | 124 + modules/adspiritBidAdapter.md | 66 + modules/adstirBidAdapter.js | 92 + modules/adstirBidAdapter.md | 38 + modules/adtargetBidAdapter.js | 1 + modules/adtelligentBidAdapter.js | 17 +- modules/adtelligentIdSystem.js | 7 + modules/adtrgtmeBidAdapter.js | 6 +- modules/adtrueBidAdapter.js | 1 + modules/aduptechBidAdapter.js | 5 + modules/advRedAnalyticsAdapter.js | 198 + modules/advRedAnalyticsAdapter.md | 30 + modules/advangelistsBidAdapter.js | 322 +- modules/adverxoBidAdapter.js | 356 + modules/adverxoBidAdapter.md | 101 + modules/adxcgAnalyticsAdapter.js | 23 +- modules/adxcgBidAdapter.js | 404 +- modules/adxpremiumAnalyticsAdapter.js | 18 +- modules/adyoulikeBidAdapter.js | 15 +- modules/agmaAnalyticsAdapter.js | 224 + modules/agmaAnalyticsAdapter.md | 28 + modules/aidemBidAdapter.js | 24 +- modules/airgridRtdProvider.js | 8 +- modules/ajaBidAdapter.js | 188 +- modules/ajaBidAdapter.md | 60 +- modules/akamaiDapRtdProvider.js | 814 +- modules/alkimiBidAdapter.js | 81 +- modules/ampliffyBidAdapter.js | 414 + modules/ampliffyBidAdapter.md | 39 + modules/amxBidAdapter.js | 125 +- modules/anPspParamsConverter.js | 128 + modules/anPspParamsConverter.md | 10 + modules/aniviewBidAdapter.js | 525 +- modules/aniviewBidAdapter.md | 8 +- modules/anonymisedRtdProvider.js | 126 + modules/anonymisedRtdProvider.md | 54 + modules/anyclipBidAdapter.js | 54 + modules/anyclipBidAdapter.md | 52 + modules/apacdexBidAdapter.js | 8 +- modules/appierAnalyticsAdapter.js | 12 +- modules/appierBidAdapter.js | 7 +- modules/appnexusBidAdapter.js | 361 +- modules/appushBidAdapter.js | 3 +- modules/apstreamBidAdapter.js | 3 +- modules/arcspanRtdProvider.js | 7 +- modules/asoBidAdapter.js | 335 +- modules/asoBidAdapter.md | 5 +- modules/asteriobidAnalyticsAdapter.js | 336 + modules/asteriobidAnalyticsAdapter.md | 41 + modules/astraoneBidAdapter.js | 9 +- modules/atsAnalyticsAdapter.js | 10 +- modules/audiencerunBidAdapter.js | 20 +- modules/automatadAnalyticsAdapter.js | 95 +- modules/axisBidAdapter.js | 197 +- modules/axonixBidAdapter.js | 4 +- modules/azerionedgeRtdProvider.js | 153 + modules/azerionedgeRtdProvider.md | 97 + modules/beachfrontBidAdapter.js | 105 +- modules/beopBidAdapter.js | 69 +- modules/betweenBidAdapter.js | 11 +- modules/beyondmediaBidAdapter.js | 193 +- modules/bidResponseFilter/index.js | 55 + modules/bidViewability.js | 23 +- modules/bidViewabilityIO.js | 6 +- modules/biddoBidAdapter.js | 89 +- modules/bidglassBidAdapter.js | 12 +- modules/bidmaticBidAdapter.js | 144 + modules/bidmaticBidAdapter.md | 32 + modules/bidtheatreBidAdapter.js | 117 + modules/bidtheatreBidAdapter.md | 111 + modules/bidwatchAnalyticsAdapter.js | 19 +- modules/big-richmediaBidAdapter.js | 10 +- modules/bizzclickBidAdapter.js | 322 - modules/bizzclickBidAdapter.md | 104 - modules/blastoBidAdapter.js | 77 + modules/blastoBidAdapter.md | 109 + modules/bliinkBidAdapter.js | 55 +- modules/bluebillywigBidAdapter.js | 374 - modules/bluebillywigBidAdapter.md | 38 - modules/blueconicRtdProvider.js | 15 +- modules/boldwinBidAdapter.js | 181 +- modules/brandmetricsRtdProvider.js | 33 +- modules/braveBidAdapter.js | 252 +- modules/bridBidAdapter.js | 147 +- modules/bridgewellBidAdapter.js | 5 + modules/brightMountainMediaBidAdapter.js | 6 +- modules/brightcomBidAdapter.js | 303 - modules/brightcomBidAdapter.md | 46 - modules/britepoolIdSystem.js | 148 - modules/britepoolIdSystem.md | 42 - modules/browsiBidAdapter.js | 5 + modules/browsiRtdProvider.js | 27 +- modules/bucksenseBidAdapter.js | 18 +- modules/buzzoolaBidAdapter.js | 7 +- modules/byDataAnalyticsAdapter.js | 6 +- modules/c1xBidAdapter.js | 6 +- modules/cadentApertureMXBidAdapter.js | 16 +- modules/carodaBidAdapter.js | 20 +- modules/ccxBidAdapter.js | 8 +- modules/ceeIdSystem.js | 63 + modules/ceeIdSystem.md | 31 + modules/cleanioRtdProvider.js | 14 +- modules/cleanmedianetBidAdapter.js | 2 +- modules/clickforceBidAdapter.js | 6 + modules/codefuelBidAdapter.js | 62 +- modules/cointrafficBidAdapter.js | 10 +- modules/coinzillaBidAdapter.js | 6 + modules/colombiaBidAdapter.js | 107 + modules/colombiaBidAdapter.md | 31 + modules/colossussspBidAdapter.js | 12 +- modules/compassBidAdapter.js | 205 +- modules/conceptxBidAdapter.js | 15 +- modules/concertAnalyticsAdapter.js | 12 +- modules/concertBidAdapter.js | 21 +- modules/confiantRtdProvider.js | 8 +- modules/connatixBidAdapter.js | 301 +- modules/connatixBidAdapter.md | 19 +- modules/connectIdSystem.js | 51 +- modules/connectadBidAdapter.js | 169 +- modules/consentManagementGpp.js | 263 +- ...tManagement.js => consentManagementTcf.js} | 57 +- modules/consentManagementUsp.js | 14 +- modules/consumableBidAdapter.js | 22 +- modules/contentexchangeBidAdapter.js | 207 +- modules/contxtfulBidAdapter.js | 216 + modules/contxtfulBidAdapter.md | 98 + modules/contxtfulRtdProvider.js | 376 + modules/contxtfulRtdProvider.md | 105 + modules/conversantAnalyticsAdapter.js | 9 +- modules/conversantBidAdapter.js | 423 +- modules/copper6sspBidAdapter.js | 21 + modules/copper6sspBidAdapter.md | 79 + modules/cpmstarBidAdapter.js | 88 +- modules/cpmstarBidAdapter.md | 5 +- modules/craftBidAdapter.js | 66 +- modules/criteoBidAdapter.js | 862 +- modules/criteoIdSystem.js | 59 +- modules/currency.js | 178 +- modules/cwireBidAdapter.js | 37 +- modules/cwireBidAdapter.md | 39 +- modules/czechAdIdSystem.js | 5 + modules/dailyhuntBidAdapter.js | 2 +- modules/dailymotionBidAdapter.js | 298 + modules/dailymotionBidAdapter.md | 221 + modules/datablocksBidAdapter.js | 2 +- modules/datawrkzBidAdapter.js | 14 +- modules/debugging/bidInterceptor.js | 42 +- modules/debugging/debugging.js | 13 +- modules/debugging/pbsInterceptor.js | 21 +- modules/deepintentBidAdapter.js | 83 +- modules/deepintentBidAdapter.md | 116 +- modules/deepintentDpesIdSystem.js | 15 +- modules/deltaprojectsBidAdapter.js | 41 +- modules/dexertoBidAdapter.js | 31 + modules/dexertoBidAdapter.md | 38 + modules/dfpAdServerVideo.js | 225 +- modules/dfpAdpod.js | 95 + modules/dgkeywordRtdProvider.js | 54 +- modules/dianomiBidAdapter.js | 31 +- modules/digitalMatterBidAdapter.js | 210 + modules/digitalMatterBidAdapter.md | 38 + modules/discoveryBidAdapter.js | 313 +- modules/djaxBidAdapter.js | 113 + modules/djaxBidAdapter.md | 51 + modules/dmdIdSystem.js | 7 + modules/docereeAdManagerBidAdapter.js | 154 + modules/docereeAdManagerBidAdapter.md | 68 + modules/docereeBidAdapter.js | 29 + modules/driftpixelBidAdapter.js | 18 + modules/driftpixelBidAdapter.md | 54 + modules/dsaControl.js | 67 + modules/dsp_genieeBidAdapter.js | 134 + modules/dsp_genieeBidAdapter.md | 39 + modules/dspxBidAdapter.js | 409 +- modules/dxkultureBidAdapter.js | 438 +- modules/dxkultureBidAdapter.md | 10 +- modules/dynamicAdBoostRtdProvider.js | 119 + modules/dynamicAdBoostRtdProvider.md | 40 + modules/e_volutionBidAdapter.js | 174 +- modules/ebdrBidAdapter.js | 156 - modules/ebdrBidAdapter.md | 53 - modules/eclickadsBidAdapter.js | 80 + modules/eclickadsBidAdapter.md | 55 + modules/edge226BidAdapter.js | 17 + modules/edge226BidAdapter.md | 79 + modules/ehealthcaresolutionsBidAdapter.js | 41 + modules/ehealthcaresolutionsBidAdapter.md | 61 + modules/eightPodAnalyticsAdapter.js | 205 + modules/eightPodAnalyticsAdapter.md | 19 + modules/eightPodBidAdapter.js | 249 + modules/eightPodBidAdapter.md | 36 + modules/emtvBidAdapter.js | 202 +- modules/engageyaBidAdapter.js | 2 +- modules/enrichmentFpdModule.js | 2 - modules/eplanningAnalyticsAdapter.js | 130 - modules/eplanningBidAdapter.js | 2 +- modules/equativBidAdapter.js | 174 + modules/equativBidAdapter.md | 40 + modules/eskimiBidAdapter.js | 169 +- modules/eskimiBidAdapter.md | 33 +- modules/etargetBidAdapter.js | 6 +- modules/euidIdSystem.js | 25 +- modules/euidIdSystem.md | 57 +- modules/exadsBidAdapter.js | 514 + modules/exadsBidAdapter.md | 484 + modules/excoBidAdapter.js | 37 + modules/excoBidAdapter.md | 35 + modules/experianRtdProvider.js | 6 + modules/fabrickIdSystem.js | 7 + modules/fanAdapter.js | 176 + modules/fanAdapter.md | 40 + modules/feedadBidAdapter.js | 9 + modules/finativeBidAdapter.js | 15 +- modules/fintezaAnalyticsAdapter.js | 23 +- modules/fledgeForGpt.js | 167 - modules/flippBidAdapter.js | 35 +- modules/flippBidAdapter.md | 5 +- modules/fluctBidAdapter.js | 10 +- modules/fpdModule/index.md | 3 +- modules/freewheel-sspBidAdapter.js | 61 +- modules/ftrackIdSystem.js | 9 +- modules/gameraRtdProvider.js | 107 + modules/gameraRtdProvider.md | 51 + modules/gammaBidAdapter.js | 58 +- modules/gammaBidAdapter.md | 23 +- modules/gamoshiBidAdapter.js | 2 +- modules/genericAnalyticsAdapter.js | 14 +- modules/geoedgeRtdProvider.js | 68 +- modules/geolocationRtdProvider.js | 2 + modules/getintentBidAdapter.js | 19 +- modules/gjirafaBidAdapter.js | 21 +- modules/globalsunBidAdapter.js | 203 +- modules/gmosspBidAdapter.js | 30 +- modules/gnetBidAdapter.js | 10 +- modules/goldbachBidAdapter.js | 42 +- modules/goldfishAdsRtdProvider.js | 198 + modules/goldfishAdsRtdProvider.md | 48 + modules/gothamadsBidAdapter.js | 24 +- modules/gptPreAuction.js | 94 +- modules/gravitoIdSystem.js | 24 +- modules/greenbidsAnalyticsAdapter.js | 178 +- modules/greenbidsAnalyticsAdapter.md | 37 +- modules/greenbidsRtdProvider.js | 87 +- modules/greenbidsRtdProvider.md | 2 +- modules/gridBidAdapter.js | 60 +- modules/growthCodeAnalyticsAdapter.js | 32 +- modules/growthCodeIdSystem.js | 169 +- modules/growthCodeIdSystem.md | 40 +- modules/growthCodeRtdProvider.js | 12 +- modules/gumgumBidAdapter.js | 173 +- modules/hadronAnalyticsAdapter.js | 30 +- modules/hadronIdSystem.js | 73 +- modules/hadronIdSystem.md | 21 +- modules/hadronRtdProvider.js | 127 +- modules/holidBidAdapter.js | 30 +- modules/humansecurityRtdProvider.js | 180 + modules/humansecurityRtdProvider.md | 223 + modules/hybridBidAdapter.js | 21 +- modules/hypelabBidAdapter.js | 36 +- modules/id5AnalyticsAdapter.js | 19 +- modules/id5IdSystem.js | 446 +- modules/id5IdSystem.md | 71 +- modules/idImportLibrary.js | 22 +- modules/idWardRtdProvider.js | 104 - modules/idWardRtdProvider.md | 44 - modules/identityLinkIdSystem.js | 19 +- modules/idxBidAdapter.js | 28 +- modules/idxIdSystem.js | 5 + modules/illuminBidAdapter.js | 37 + ...plusBidAdapter.md => illuminBidAdapter.md} | 10 +- modules/imRtdProvider.js | 8 +- modules/imdsBidAdapter.js | 5 +- modules/imdsBidAdapter.md | 8 +- modules/impactifyBidAdapter.js | 243 +- modules/impactifyBidAdapter.md | 40 +- modules/improvedigitalBidAdapter.js | 103 +- modules/improvedigitalBidAdapter.md | 5 +- modules/imuIdSystem.js | 6 + modules/incrxBidAdapter.js | 132 +- modules/incrxBidAdapter.md | 45 + modules/inmobiBidAdapter.js | 347 + modules/inmobiBidAdapter.md | 87 + modules/innityBidAdapter.js | 3 + modules/insticatorBidAdapter.js | 359 +- modules/instreamTracking.js | 21 +- modules/integr8BidAdapter.js | 33 +- modules/integr8BidAdapter.md | 12 +- modules/intentIqAnalyticsAdapter.js | 324 + modules/intentIqAnalyticsAdapter.md | 85 + modules/intentIqIdSystem.js | 424 +- modules/intentIqIdSystem.md | 71 + modules/interactiveOffersBidAdapter.js | 25 +- modules/invamiaBidAdapter.js | 89 +- modules/invibesBidAdapter.js | 112 +- modules/invisiblyAnalyticsAdapter.js | 41 +- modules/ipromBidAdapter.js | 4 +- modules/iqmBidAdapter.js | 273 - modules/iqxBidAdapter.js | 18 + modules/iqxBidAdapter.md | 54 + modules/iqzoneBidAdapter.js | 204 +- modules/ivsBidAdapter.js | 7 + modules/ixBidAdapter.js | 495 +- modules/ixBidAdapter.md | 5 + modules/jixieBidAdapter.js | 118 +- modules/justIdSystem.js | 10 +- modules/jwplayerBidAdapter.js | 412 + modules/jwplayerBidAdapter.md | 72 + modules/jwplayerRtdProvider.js | 184 +- modules/jwplayerRtdProvider.md | 49 +- modules/jwplayerVideoProvider.js | 6 + modules/kargoAnalyticsAdapter.js | 6 +- modules/kargoBidAdapter.js | 213 +- modules/kimberliteBidAdapter.js | 102 + modules/kimberliteBidAdapter.md | 65 + modules/kinessoIdSystem.js | 6 + modules/kiviadsBidAdapter.js | 203 +- modules/koblerBidAdapter.js | 75 +- modules/konduitAnalyticsAdapter.js | 26 +- modules/krushmediaBidAdapter.js | 173 +- modules/kubientBidAdapter.js | 4 +- modules/kueezBidAdapter.js | 7 +- modules/kueezRtbBidAdapter.js | 329 +- modules/lassoBidAdapter.js | 21 +- modules/lemmaDigitalBidAdapter.js | 87 +- modules/lifestreetBidAdapter.js | 4 + modules/limelightDigitalBidAdapter.js | 19 +- modules/liveIntentAnalyticsAdapter.js | 15 +- modules/liveIntentIdSystem.js | 323 +- modules/livewrappedAnalyticsAdapter.js | 38 +- modules/livewrappedBidAdapter.js | 14 +- modules/lkqdBidAdapter.js | 5 +- modules/lm_kiviadsBidAdapter.js | 18 + modules/lm_kiviadsBidAdapter.md | 54 + modules/lmpIdSystem.js | 61 + modules/lmpIdSystem.md | 27 + modules/lockrAIMIdSystem.js | 165 + modules/lockrAIMIdSystem.md | 165 + modules/loganBidAdapter.js | 91 +- modules/logicadBidAdapter.js | 50 +- modules/lotamePanoramaIdSystem.js | 122 +- modules/lotamePanoramaIdSystem.md | 31 +- modules/loyalBidAdapter.js | 17 + modules/loyalBidAdapter.md | 79 + modules/luceadBidAdapter.js | 193 + modules/luceadBidAdapter.md | 41 + modules/lunamediahbBidAdapter.js | 131 +- modules/luponmediaBidAdapter.js | 35 +- modules/mabidderBidAdapter.js | 9 +- modules/madvertiseBidAdapter.js | 11 +- modules/magniteAnalyticsAdapter.js | 133 +- modules/malltvAnalyticsAdapter.js | 10 +- modules/malltvBidAdapter.js | 17 +- modules/marsmediaAnalyticsAdapter.js | 53 - modules/marsmediaBidAdapter.js | 4 +- modules/mathildeadsBidAdapter.js | 203 +- modules/mediaConsortiumBidAdapter.js | 273 + modules/mediaConsortiumBidAdapter.md | 79 + modules/mediabramaBidAdapter.js | 22 + modules/mediabramaBidAdapter.md | 33 + modules/mediafilterRtdProvider.js | 96 + modules/mediafilterRtdProvider.md | 37 + modules/mediaforceBidAdapter.js | 6 + modules/mediafuseBidAdapter.js | 45 +- modules/mediagoBidAdapter.js | 300 +- modules/mediaimpactBidAdapter.js | 147 + modules/mediaimpactBidAdapter.md | 45 + modules/mediakeysBidAdapter.js | 6 +- modules/medianetAnalyticsAdapter.js | 143 +- modules/medianetBidAdapter.js | 205 +- modules/medianetBidAdapter.md | 20 + modules/medianetRtdProvider.js | 3 +- modules/mediasniperBidAdapter.js | 5 +- modules/mediasquareBidAdapter.js | 65 +- modules/merkleIdSystem.js | 35 +- modules/mgidBidAdapter.js | 161 +- modules/mgidRtdProvider.js | 4 + modules/mgidXBidAdapter.js | 260 +- modules/microadBidAdapter.js | 21 +- modules/minutemediaBidAdapter.js | 413 +- modules/minutemediaplusBidAdapter.js | 349 - modules/missenaBidAdapter.js | 189 +- modules/mobfoxpbBidAdapter.js | 129 +- modules/mobianRtdProvider.js | 203 + modules/mobianRtdProvider.md | 156 + modules/multibid/index.js | 62 +- modules/mwOpenLinkIdSystem.js | 31 +- modules/mygaruIdSystem.js | 104 + modules/mygaruIdSystem.md | 24 + modules/mytargetBidAdapter.md | 40 - modules/nativeRendering.js | 27 + modules/nativoBidAdapter.js | 116 +- modules/nativoBidAdapter.md | 101 +- modules/naveggIdSystem.js | 151 +- modules/naveggIdSystem.md | 8 + modules/netIdSystem.js | 7 + modules/neuwoRtdProvider.js | 6 +- modules/newspassidBidAdapter.js | 15 +- modules/nextMillenniumBidAdapter.js | 674 +- modules/nextrollBidAdapter.js | 30 +- modules/nexverseBidAdapter.js | 247 + modules/nexverseBidAdapter.md | 41 + modules/nexx360BidAdapter.js | 54 +- modules/nexx360BidAdapter.md | 6 +- modules/nobidAnalyticsAdapter.js | 125 +- modules/nobidBidAdapter.js | 67 +- modules/novatiqIdSystem.js | 29 +- modules/novatiqIdSystem.md | 5 +- modules/oguryBidAdapter.js | 38 +- ...htcomSSPBidAdapter.js => omsBidAdapter.js} | 162 +- ...htcomSSPBidAdapter.md => omsBidAdapter.md} | 10 +- modules/oneKeyIdSystem.js | 37 +- modules/oneKeyRtdProvider.js | 4 + modules/onetagBidAdapter.js | 35 +- modules/ooloAnalyticsAdapter.js | 9 +- modules/openwebBidAdapter.js | 315 +- modules/openwebBidAdapter.md | 50 +- modules/openxBidAdapter.js | 34 +- modules/operaadsBidAdapter.js | 50 +- modules/operaadsBidAdapter.md | 56 +- modules/operaadsIdSystem.js | 35 +- modules/opscoBidAdapter.js | 133 + modules/opscoBidAdapter.md | 36 + modules/optableBidAdapter.js | 67 + modules/optableBidAdapter.md | 41 + modules/optidigitalBidAdapter.js | 79 +- modules/optimeraRtdProvider.js | 13 +- modules/optimonAnalyticsAdapter.js | 16 +- modules/optoutBidAdapter.js | 2 +- modules/orakiBidAdapter.js | 19 + modules/orakiBidAdapter.md | 79 + modules/orbidderBidAdapter.js | 20 +- modules/outbrainBidAdapter.js | 73 +- modules/ownadxBidAdapter.js | 99 + modules/oxxionAnalyticsAdapter.js | 33 +- modules/oxxionRtdProvider.js | 113 +- modules/oxxionRtdProvider.md | 9 +- modules/ozoneBidAdapter.js | 223 +- modules/paapi.js | 744 + modules/paapiForGpt.js | 165 + modules/{fledgeForGpt.md => paapiForGpt.md} | 76 +- modules/pairIdSystem.js | 65 +- modules/pangleBidAdapter.js | 148 +- modules/parrableIdSystem.js | 410 - modules/performaxBidAdapter.js | 77 + modules/performaxBidAdapter.md | 36 + modules/permutiveIdentityManagerIdSystem.js | 151 + modules/permutiveIdentityManagerIdSystem.md | 58 + modules/permutiveRtdProvider.js | 119 +- modules/pgamsspBidAdapter.js | 205 +- modules/pilotxBidAdapter.js | 40 +- modules/pixfutureBidAdapter.js | 5 +- modules/playdigoBidAdapter.js | 21 + modules/playdigoBidAdapter.md | 78 + .../prebidServerBidAdapter/bidderConfig.js | 158 + modules/prebidServerBidAdapter/config.js | 31 +- modules/prebidServerBidAdapter/index.js | 109 +- .../prebidServerBidAdapter/ortbConverter.js | 87 +- modules/prebidmanagerAnalyticsAdapter.md | 9 - modules/precisoBidAdapter.js | 192 +- modules/precisoBidAdapter.md | 61 +- modules/priceFloors.js | 108 +- modules/prismaBidAdapter.js | 85 +- modules/programmaticaBidAdapter.js | 153 + modules/programmaticaBidAdapter.md | 46 + modules/pstudioBidAdapter.js | 433 + modules/pstudioBidAdapter.md | 150 + modules/pubCircleBidAdapter.js | 222 +- modules/pubProvidedIdSystem.js | 9 +- modules/pubgeniusBidAdapter.js | 18 +- modules/publinkIdSystem.js | 49 +- modules/publirBidAdapter.js | 138 + modules/publirBidAdapter.md | 47 + modules/pubmaticAnalyticsAdapter.js | 165 +- modules/pubmaticBidAdapter.js | 161 +- modules/pubmaticBidAdapter.md | 9 +- modules/pubriseBidAdapter.js | 19 + modules/pubriseBidAdapter.md | 79 + modules/pubwiseAnalyticsAdapter.js | 22 +- modules/pubwiseBidAdapter.js | 14 +- modules/pubxBidAdapter.js | 4 +- modules/pubxaiAnalyticsAdapter.js | 482 +- modules/pubxaiRtdProvider.js | 166 + modules/pubxaiRtdProvider.md | 68 + modules/pulsepointBidAdapter.js | 8 - modules/pxyzBidAdapter.js | 10 +- modules/qortexRtdProvider.js | 265 + modules/qortexRtdProvider.md | 68 + modules/qtBidAdapter.js | 21 + modules/qtBidAdapter.md | 79 + modules/quantcastBidAdapter.js | 10 +- modules/quantcastIdSystem.js | 4 + modules/r2b2BidAdapter.js | 309 + modules/r2b2BidAdapter.md | 37 + modules/radsBidAdapter.js | 4 + modules/rasBidAdapter.js | 167 - modules/raynRtdProvider.js | 231 + modules/raynRtdProvider.md | 118 + modules/readpeakBidAdapter.js | 4 +- modules/reconciliationRtdProvider.js | 4 + modules/redtramBidAdapter.js | 146 +- modules/relaidoBidAdapter.js | 81 +- modules/relevantdigitalBidAdapter.js | 11 +- modules/relevatehealthBidAdapter.js | 144 + modules/relevatehealthBidAdapter.md | 40 + modules/resetdigitalBidAdapter.js | 130 +- modules/resetdigitalBidAdapter.md | 99 +- modules/retailspotBidAdapter.js | 7 +- modules/revcontentBidAdapter.js | 2 +- modules/rewardedInterestIdSystem.js | 142 + modules/rewardedInterestIdSystem.md | 23 + modules/rhythmoneBidAdapter.js | 2 +- modules/richaudienceBidAdapter.js | 76 +- modules/richaudienceBidAdapter.md | 2 +- modules/ringieraxelspringerBidAdapter.js | 403 + ...er.md => ringieraxelspringerBidAdapter.md} | 14 +- modules/riseBidAdapter.js | 420 +- modules/riseBidAdapter.md | 1 - modules/rixengineBidAdapter.js | 67 + modules/rixengineBidAdapter.md | 32 + modules/roxotAnalyticsAdapter.js | 18 +- modules/rtbhouseBidAdapter.js | 182 +- modules/rtbhouseBidAdapter.md | 30 +- modules/rtbsapeBidAdapter.js | 8 + modules/rtdModule/index.js | 44 +- modules/rubiconBidAdapter.js | 282 +- modules/s2sTesting.js | 2 +- modules/saambaaBidAdapter.js | 420 +- modules/scaleableAnalyticsAdapter.js | 10 +- modules/seedingAllianceBidAdapter.js | 252 +- modules/seedtagBidAdapter.js | 146 +- modules/setupadBidAdapter.js | 194 + modules/setupadBidAdapter.md | 35 + modules/sharedIdSystem.js | 8 + modules/sharethroughAnalyticsAdapter.md | 41 + modules/sharethroughBidAdapter.js | 121 +- modules/shinezBidAdapter.js | 375 +- modules/shinezRtbBidAdapter.js | 38 + modules/shinezRtbBidAdapter.md | 35 + modules/showheroes-bsBidAdapter.js | 419 +- modules/showheroes-bsBidAdapter.md | 135 +- modules/sigmoidAnalyticsAdapter.js | 293 - modules/silvermobBidAdapter.js | 76 + modules/silvermobBidAdapter.md | 70 + modules/silverpushBidAdapter.js | 15 +- modules/sirdataRtdProvider.js | 786 +- modules/sirdataRtdProvider.md | 216 +- modules/sizeMapping.js | 29 +- modules/sizeMappingV2.js | 2 +- modules/slimcutBidAdapter.js | 37 +- modules/smaatoBidAdapter.js | 484 +- modules/smartadserverBidAdapter.js | 122 +- modules/smarthubBidAdapter.js | 234 +- modules/smarthubBidAdapter.md | 10 +- modules/smartxBidAdapter.js | 19 +- modules/smartxBidAdapter.md | 4 +- modules/smartyadsAnalyticsAdapter.js | 133 + modules/smartyadsAnalyticsAdapter.md | 11 + modules/smartyadsBidAdapter.js | 116 +- modules/smartyadsBidAdapter.md | 18 +- modules/smartytechBidAdapter.js | 9 +- modules/smartytechBidAdapter.md | 2 +- modules/smilewantedBidAdapter.js | 179 +- modules/smootBidAdapter.js | 19 + modules/smootBidAdapter.md | 80 + modules/snigelBidAdapter.js | 66 +- modules/sonobiAnalyticsAdapter.js | 277 - modules/sonobiBidAdapter.js | 27 +- modules/sovrnAnalyticsAdapter.js | 289 - modules/sovrnAnalyticsAdapter.md | 23 - modules/sovrnBidAdapter.js | 137 +- modules/sovrnBidAdapter.md | 2 +- modules/sparteoBidAdapter.js | 174 + modules/sparteoBidAdapter.md | 35 + modules/spotxBidAdapter.js | 522 - modules/spotxBidAdapter.md | 136 - modules/sspBCBidAdapter.js | 230 +- modules/ssp_genieeBidAdapter.js | 425 + modules/ssp_genieeBidAdapter.md | 43 + modules/staqAnalyticsAdapter.js | 433 - modules/stnBidAdapter.js | 109 + modules/stnBidAdapter.md | 76 + modules/stroeerCoreBidAdapter.js | 22 +- modules/stvBidAdapter.js | 264 +- modules/sublimeBidAdapter.js | 9 +- modules/symitriAnalyticsAdapter.js | 61 + modules/symitriAnalyticsAdapter.md | 35 + modules/symitriDapRtdProvider.js | 863 + modules/symitriDapRtdProvider.md | 97 + modules/taboolaBidAdapter.js | 336 +- modules/tagorasBidAdapter.js | 39 + modules/tagorasBidAdapter.md | 35 + modules/tapnativeBidAdapter.js | 41 + modules/tapnativeBidAdapter.md | 61 + modules/tappxBidAdapter.js | 40 +- modules/tappxBidAdapter.md | 2 +- modules/targetVideoAdServerVideo.js | 96 + modules/targetVideoAdServerVideo.md | 26 + modules/targetVideoBidAdapter.js | 285 +- modules/targetVideoBidAdapter.md | 23 +- modules/{gdprEnforcement.js => tcfControl.js} | 43 +- modules/teadsBidAdapter.js | 78 +- modules/teadsIdSystem.js | 35 +- modules/telariaBidAdapter.js | 34 +- modules/telariaBidAdapter.md | 2 +- modules/temedyaBidAdapter.js | 38 +- modules/terceptAnalyticsAdapter.js | 17 +- modules/theAdxBidAdapter.js | 66 +- modules/theAdxBidAdapter.md | 19 +- modules/themoneytizerBidAdapter.js | 102 + modules/themoneytizerBidAdapter.md | 44 + modules/timeoutRtdProvider.js | 6 +- modules/tncIdSystem.js | 11 +- modules/tncIdSystem.md | 2 + modules/topLevelPaapi.js | 214 + modules/topicsFpdModule.js | 32 +- modules/topicsFpdModule.md | 26 +- modules/tpmnBidAdapter.js | 349 +- modules/tpmnBidAdapter.md | 86 +- modules/trafficgateBidAdapter.js | 10 - modules/tripleliftBidAdapter.js | 111 +- modules/truereachBidAdapter.js | 7 +- modules/ttdBidAdapter.js | 57 +- modules/twistDigitalBidAdapter.js | 39 + modules/twistDigitalBidAdapter.md | 42 + modules/ucfunnelAnalyticsAdapter.js | 12 +- modules/ucfunnelBidAdapter.js | 63 +- modules/uid2IdSystem.js | 43 +- modules/uid2IdSystem.md | 171 +- modules/uid2IdSystem_shared.js | 680 +- modules/underdogmediaBidAdapter.js | 2 +- modules/undertoneBidAdapter.js | 20 +- modules/unicornBidAdapter.js | 30 +- modules/unifiedIdSystem.js | 19 +- modules/unrulyBidAdapter.js | 66 +- modules/userId/eids.js | 60 +- modules/userId/eids.md | 78 +- modules/userId/index.js | 757 +- modules/userId/userId.md | 31 +- modules/{utiqSystem.js => utiqIdSystem.js} | 41 +- modules/{utiqSystem.md => utiqIdSystem.md} | 7 +- modules/utiqMtpIdSystem.js | 138 + modules/utiqMtpIdSystem.md | 22 + modules/validationFpdModule/index.js | 39 +- modules/vdoaiBidAdapter.js | 186 +- modules/verizonMediaIdSystem.js | 7 + modules/viantOrtbBidAdapter.js | 24 +- modules/viantOrtbBidAdapter.md | 2 +- modules/vibrantmediaBidAdapter.js | 18 +- modules/vidazooBidAdapter.js | 450 +- modules/videoModule/coreVideo.js | 6 +- modules/videoModule/gamAdServerSubmodule.js | 1 - modules/videoModule/index.js | 43 +- modules/videobyteBidAdapter.js | 23 +- modules/videoheroesBidAdapter.js | 245 +- modules/videojsVideoProvider.js | 8 +- modules/videonowBidAdapter.js | 6 + modules/vidoomyBidAdapter.js | 4 +- modules/viouslyBidAdapter.js | 2 +- modules/viqeoBidAdapter.js | 155 +- modules/viqeoBidAdapter.md | 36 +- modules/visiblemeasuresBidAdapter.js | 203 +- modules/visxBidAdapter.js | 136 +- modules/voxBidAdapter.js | 32 +- modules/vrtcalBidAdapter.js | 31 +- modules/waardexBidAdapter.js | 1 - modules/waardexBidAdapter.md | 2 +- modules/weboramaRtdProvider.js | 454 +- modules/weboramaRtdProvider.md | 39 +- modules/welectBidAdapter.js | 7 + modules/widespaceBidAdapter.js | 4 +- modules/winrBidAdapter.js | 72 +- modules/wurflRtdProvider.js | 286 + modules/wurflRtdProvider.md | 67 + modules/xeBidAdapter.js | 202 +- ...sspBidAdapter.js => yahooAdsBidAdapter.js} | 21 +- ...sspBidAdapter.md => yahooAdsBidAdapter.md} | 14 +- modules/yandexAnalyticsAdapter.js | 165 + modules/yandexAnalyticsAdapter.md | 46 + modules/yandexBidAdapter.js | 149 +- modules/yandexBidAdapter.md | 4 +- modules/yandexIdSystem.js | 165 + modules/yieldlabBidAdapter.js | 110 +- modules/yieldmoBidAdapter.js | 116 +- modules/yieldoneAnalyticsAdapter.js | 14 +- modules/yuktamediaAnalyticsAdapter.js | 38 +- modules/zeotapIdPlusIdSystem.js | 5 + modules/zetaBidAdapter.js | 44 +- modules/zeta_global_sspAnalyticsAdapter.js | 147 +- modules/zeta_global_sspBidAdapter.js | 141 +- modules/zmaticooBidAdapter.js | 302 + modules/zmaticooBidAdapter.md | 72 + package-lock.json | 31677 +++++++++------- package.json | 59 +- plugins/eslint/index.js | 104 + plugins/eslint/package.json | 2 +- plugins/eslint/validateImports.js | 41 +- plugins/pbjsGlobals.js | 3 +- src/Renderer.js | 9 +- src/activities/activities.js | 5 + src/activities/params.js | 6 +- src/activities/redactor.js | 21 +- src/activities/rules.js | 14 +- src/adRendering.js | 301 +- src/adServerManager.js | 2 +- src/adUnits.js | 48 +- src/adapterManager.js | 95 +- src/adapters/bidderFactory.js | 93 +- src/adloader.js | 58 +- src/ajax.js | 62 +- src/auction.js | 319 +- src/auctionIndex.js | 62 +- src/auctionManager.js | 40 +- src/banner.js | 21 + src/bidTTL.js | 24 +- src/bidderSettings.js | 4 +- src/bidfactory.js | 26 +- src/config.js | 300 +- src/consentHandler.js | 14 +- src/constants.js | 199 + src/constants.json | 180 - src/creativeRenderers.js | 24 + src/debugging.js | 4 +- src/events.js | 17 +- src/fpd/enrichment.js | 66 +- src/mediaTypes.js | 8 +- src/native.js | 151 +- src/prebid.js | 344 +- src/prebid.public.js | 1 + src/refererDetection.js | 12 +- src/secureCreatives.js | 193 +- src/storageManager.js | 141 +- src/targeting.js | 562 +- src/types/ortb2.d.ts | 59 + src/userSync.js | 19 +- src/utils.js | 351 +- src/utils/focusTimeout.js | 52 + src/utils/{gpdr.js => gdpr.js} | 4 +- src/utils/ipUtils.js | 52 + src/utils/perfMetrics.js | 40 +- src/utils/ttlCollection.js | 43 +- src/video.js | 88 +- src/videoCache.js | 85 +- test/fake-server/fake-responder.js | 2 +- .../fixtures/basic-outstream/request.json | 2 + test/fixtures/fixtures.js | 156 +- test/helpers/analytics.js | 12 +- test/helpers/cookies.js | 5 + test/helpers/indexStub.js | 4 +- test/helpers/index_adapter_utils.js | 4 +- test/helpers/karma-init.js | 6 - test/helpers/testing-utils.js | 25 +- test/mocks/adloaderStub.js | 4 +- test/mocks/ortbConverter.js | 8 + test/mocks/videoCacheStub.js | 2 +- test/pages/banner_sync.html | 97 + test/pages/consent_mgt_gdpr.html | 3 +- test/pipeline_setup.js | 21 + test/spec/AnalyticsAdapter_spec.js | 6 +- test/spec/activities/redactor_spec.js | 18 + test/spec/adloader_spec.js | 32 +- test/spec/ajax_spec.js | 11 + test/spec/auctionmanager_spec.js | 611 +- test/spec/banner_spec.js | 182 + test/spec/config_spec.js | 63 +- .../spec/creative/crossDomainCreative_spec.js | 260 + test/spec/creative/displayRenderer_spec.js | 55 + test/spec/creative/nativeRenderer_spec.js | 298 + test/spec/e2e/banner/basic_banner_ad.spec.js | 34 +- .../instream/basic_instream_video_ad.spec.js | 4 +- .../longform/basic_w_bidderSettings.spec.js | 32 +- ...asic_w_custom_adserver_translation.spec.js | 32 +- .../e2e/longform/basic_w_priceGran.spec.js | 32 +- .../basic_w_requireExactDuration.spec.js | 32 +- .../basic_wo_brandCategoryExclusion.spec.js | 30 +- .../basic_wo_requireExactDuration.spec.js | 28 +- .../e2e/modules/e2e_bidderSettings.spec.js | 4 +- .../e2e/modules/e2e_consent_mgt_gdpr.spec.js | 4 +- test/spec/e2e/modules/e2e_currency.spec.js | 4 +- .../multi-bidder/e2e_multiple_bidders.spec.js | 4 +- test/spec/e2e/native/basic_native_ad.spec.js | 4 +- .../basic_outstream_video_ad.spec.js | 12 +- test/spec/fpd/enrichment_spec.js | 161 +- test/spec/fpd/gdpr_spec.js | 30 +- .../fpd/{oneClient.js => oneClient_spec.js} | 0 .../libraries/mspa/activityControls_spec.js | 23 +- .../precisoUtils/bidNativeUtils_spec.js | 78 + .../precisoUtils/bidUtilsCommon_spec.js | 267 + .../libraries/precisoUtils/bidUtils_spec.js | 150 + test/spec/libraries/processResponse_spec.js | 60 + .../teqblazeUtils/bidderUtils_spec.js | 541 + test/spec/libraries/userAgentUtils_spec.js | 109 + test/spec/libraries/vastTrackers_spec.js | 88 + test/spec/libraries/weakStore_spec.js | 32 + test/spec/modules/1plusXRtdProvider_spec.js | 32 +- .../modules/33acrossAnalyticsAdapter_spec.js | 1162 + test/spec/modules/33acrossBidAdapter_spec.js | 212 +- test/spec/modules/33acrossIdSystem_spec.js | 713 +- .../spec/modules/51DegreesRtdProvider_spec.js | 485 + ... => AsteriobidPbmAnalyticsAdapter_spec.js} | 6 +- test/spec/modules/BTBidAdapter_spec.js | 208 + test/spec/modules/a1MediaBidAdapter_spec.js | 31 +- test/spec/modules/acuityadsBidAdapter_spec.js | 123 +- test/spec/modules/ad2ictionBidAdapter_spec.js | 223 + .../modules/adWMGAnalyticsAdapter_spec.js | 28 +- .../modules/adagioAnalyticsAdapter_spec.js | 1151 +- test/spec/modules/adagioBidAdapter_spec.js | 757 +- test/spec/modules/adagioRtdProvider_spec.js | 616 + test/spec/modules/adbookpspBidAdapter_spec.js | 1344 - test/spec/modules/adbutlerBidAdapter_spec.js | 329 + test/spec/modules/adfBidAdapter_spec.js | 179 +- test/spec/modules/adfusionBidAdapter_spec.js | 37 +- .../modules/adgenerationBidAdapter_spec.js | 74 +- test/spec/modules/adgridBidAdapter_spec.js | 131 + test/spec/modules/adhashBidAdapter_spec.js | 30 +- .../spec/modules/adkernelAdnAnalytics_spec.js | 12 +- test/spec/modules/adkernelBidAdapter_spec.js | 131 +- .../modules/adlooxAnalyticsAdapter_spec.js | 14 +- test/spec/modules/admanBidAdapter_spec.js | 618 +- test/spec/modules/admaruBidAdapter_spec.js | 8 +- test/spec/modules/admaticBidAdapter_spec.js | 1238 +- test/spec/modules/admixerBidAdapter_spec.js | 67 +- test/spec/modules/adnuntiusBidAdapter_spec.js | 704 +- test/spec/modules/adoceanBidAdapter_spec.js | 8 +- .../modules/adomikAnalyticsAdapter_spec.js | 253 - test/spec/modules/adotBidAdapter_spec.js | 4 +- test/spec/modules/adpartnerBidAdapter_spec.js | 5 +- test/spec/modules/adprimeBidAdapter_spec.js | 304 +- test/spec/modules/adqueryBidAdapter_spec.js | 30 +- test/spec/modules/adqueryIdSystem_spec.js | 34 +- .../modules/adrelevantisBidAdapter_spec.js | 8 +- .../modules/ads_interactiveBidAdapter_spec.js | 515 + test/spec/modules/adspiritBidAdapter_spec.js | 292 + test/spec/modules/adstirBidAdapter_spec.js | 413 + .../modules/adtelligentBidAdapter_spec.js | 2 +- .../modules/advRedAnalyticsAdapter_spec.js | 114 + .../modules/advangelistsBidAdapter_spec.js | 6 +- test/spec/modules/adverxoBidAdapter_spec.js | 725 + .../modules/adxcgAnalyticsAdapter_spec.js | 14 +- test/spec/modules/adxcgBidAdapter_spec.js | 1351 +- .../adxpremiumAnalyticsAdapter_spec.js | 14 +- test/spec/modules/adyoulikeBidAdapter_spec.js | 20 +- .../spec/modules/agmaAnalyticsAdapter_spec.js | 392 + test/spec/modules/aidemBidAdapter_spec.js | 124 +- test/spec/modules/ajaBidAdapter_spec.js | 178 +- .../spec/modules/akamaiDapRtdProvider_spec.js | 32 +- test/spec/modules/alkimiBidAdapter_spec.js | 22 +- test/spec/modules/ampliffyBidAdapter_spec.js | 453 + test/spec/modules/amxBidAdapter_spec.js | 237 +- test/spec/modules/amxIdSystem_spec.js | 312 +- .../spec/modules/anPspParamsConverter_spec.js | 133 + test/spec/modules/aniviewBidAdapter_spec.js | 588 +- .../modules/anonymisedRtdProvider_spec.js | 214 + test/spec/modules/anyclipBidAdapter_spec.js | 458 + test/spec/modules/apacdexBidAdapter_spec.js | 7 +- .../modules/appierAnalyticsAdapter_spec.js | 2 +- test/spec/modules/appierBidAdapter_spec.js | 12 +- test/spec/modules/appnexusBidAdapter_spec.js | 645 +- test/spec/modules/asealBidAdapter_spec.js | 8 +- test/spec/modules/asoBidAdapter_spec.js | 384 +- .../asteriobidAnalyticsAdapter_spec.js | 151 + test/spec/modules/atsAnalyticsAdapter_spec.js | 16 +- .../modules/audiencerunBidAdapter_spec.js | 16 +- .../modules/automatadAnalyticsAdapter_spec.js | 121 +- test/spec/modules/axisBidAdapter_spec.js | 93 +- .../modules/azerionedgeRtdProvider_spec.js | 198 + .../spec/modules/beachfrontBidAdapter_spec.js | 14 +- .../spec/modules/bedigitechBidAdapter_spec.js | 14 +- test/spec/modules/beopBidAdapter_spec.js | 78 +- .../modules/beyondmediaBidAdapter_spec.js | 99 +- test/spec/modules/bidResponseFilter_spec.js | 176 + test/spec/modules/bidViewabilityIO_spec.js | 4 +- test/spec/modules/bidViewability_spec.js | 34 +- test/spec/modules/bidglassAdapter_spec.js | 8 +- test/spec/modules/bidmaticBidAdapter_spec.js | 309 + .../spec/modules/bidtheatreBidAdapter_spec.js | 266 + .../modules/bidwatchAnalyticsAdapter_spec.js | 13 +- .../modules/big-richmediaBidAdapter_spec.js | 25 - test/spec/modules/bizzclickBidAdapter_spec.js | 419 - test/spec/modules/blastoBidAdapter_spec.js | 308 + test/spec/modules/bliinkBidAdapter_spec.js | 109 +- .../modules/bluebillywigBidAdapter_spec.js | 1094 - test/spec/modules/boldwinBidAdapter_spec.js | 297 +- test/spec/modules/bridBidAdapter_spec.js | 20 + test/spec/modules/brightcomBidAdapter_spec.js | 411 - test/spec/modules/britepoolIdSystem_spec.js | 129 - test/spec/modules/browsiRtdProvider_spec.js | 39 +- .../modules/byDataAnalyticsAdapter_spec.js | 9 +- test/spec/modules/c1xBidAdapter_spec.js | 6 +- .../cadentApertureMXBidAdapter_spec.js | 59 +- test/spec/modules/carodaBidAdapter_spec.js | 39 +- test/spec/modules/ccxBidAdapter_spec.js | 81 + test/spec/modules/ceeIdSystem_spec.js | 131 + test/spec/modules/cleanioRtdProvider_spec.js | 17 +- .../modules/cleanmedianetBidAdapter_spec.js | 10 +- .../spec/modules/clickforceBidAdapter_spec.js | 8 +- .../modules/cointrafficBidAdapter_spec.js | 5 + test/spec/modules/colombiaBidAdapter_spec.js | 155 + .../modules/colossussspBidAdapter_spec.js | 50 +- test/spec/modules/compassBidAdapter_spec.js | 147 +- .../modules/concertAnalyticsAdapter_spec.js | 13 +- test/spec/modules/concertBidAdapter_spec.js | 58 +- test/spec/modules/confiantRtdProvider_spec.js | 4 +- test/spec/modules/connatixBidAdapter_spec.js | 738 +- test/spec/modules/connectIdSystem_spec.js | 129 +- test/spec/modules/connectadBidAdapter_spec.js | 330 +- .../spec/modules/consentManagementGpp_spec.js | 508 +- .../spec/modules/consentManagementUsp_spec.js | 14 +- test/spec/modules/consentManagement_spec.js | 4 +- .../spec/modules/consumableBidAdapter_spec.js | 89 +- .../modules/contentexchangeBidAdapter_spec.js | 156 +- test/spec/modules/contxtfulBidAdapter_spec.js | 484 + .../spec/modules/contxtfulRtdProvider_spec.js | 656 + .../conversantAnalyticsAdapter_spec.js | 124 +- .../spec/modules/conversantBidAdapter_spec.js | 553 +- .../spec/modules/copper6sspBidAdapter_spec.js | 515 + test/spec/modules/cpmstarBidAdapter_spec.js | 2 +- test/spec/modules/craftBidAdapter_spec.js | 18 +- test/spec/modules/criteoBidAdapter_spec.js | 2750 +- test/spec/modules/criteoIdSystem_spec.js | 88 +- test/spec/modules/currency_spec.js | 197 +- ...System_spec.js => czechAdIdSystem_spec.js} | 26 +- test/spec/modules/dailyhuntBidAdapter_spec.js | 8 +- .../modules/dailymotionBidAdapter_spec.js | 1953 + test/spec/modules/datawrkzBidAdapter_spec.js | 20 +- test/spec/modules/debugging_mod_spec.js | 121 +- .../spec/modules/deepintentBidAdapter_spec.js | 47 +- .../modules/deepintentDpesIdsystem_spec.js | 78 +- test/spec/modules/dexertoBidAdapter_spec.js | 199 + test/spec/modules/dfpAdServerVideo_spec.js | 738 +- test/spec/modules/dfpAdpod_spec.js | 257 + .../spec/modules/dgkeywordRtdProvider_spec.js | 34 +- test/spec/modules/dianomiBidAdapter_spec.js | 49 +- .../modules/digitalMatterBidAdapter_spec.js | 265 + test/spec/modules/discoveryBidAdapter_spec.js | 573 +- test/spec/modules/djaxBidAdapter_spec.js | 100 + .../docereeAdManagerBidAdapter_spec.js | 222 + test/spec/modules/docereeBidAdapter_spec.js | 33 + .../spec/modules/driftpixelBidAdapter_spec.js | 458 + test/spec/modules/dsaControl_spec.js | 112 + .../spec/modules/dsp_genieeBidAdapter_spec.js | 181 + test/spec/modules/dspxBidAdapter_spec.js | 203 +- test/spec/modules/dxkultureBidAdapter_spec.js | 886 +- .../modules/dynamicAdBoostRtdProvider_spec.js | 77 + .../spec/modules/e_volutionBidAdapter_spec.js | 355 +- test/spec/modules/ebdrBidAdapter_spec.js | 245 - test/spec/modules/eclickadsBidAdapter_spec.js | 214 + test/spec/modules/edge226BidAdapter_spec.js | 477 + .../ehealthcaresolutionsBidAdapter_spec.js | 322 + test/spec/modules/eids_spec.js | 658 +- .../modules/eightPodAnalyticsAdapter_spec.js | 187 + test/spec/modules/eightPodBidAdapter_spec.js | 203 + test/spec/modules/emtvBidAdapter_spec.js | 148 +- test/spec/modules/enrichmentFpdModule_spec.js | 0 .../modules/eplanningAnalyticsAdapter_spec.js | 157 - test/spec/modules/equativBidAdapter_spec.js | 878 + test/spec/modules/eskimiBidAdapter_spec.js | 18 +- test/spec/modules/euidIdSystem_spec.js | 83 +- test/spec/modules/exadsBidAdapter_spec.js | 632 + test/spec/modules/excoBidAdapter_spec.js | 655 + test/spec/modules/fanAdapter_spec.js | 315 + .../modules/fintezaAnalyticsAdapter_spec.js | 10 +- test/spec/modules/fledgeForGpt_spec.js | 430 - test/spec/modules/flippBidAdapter_spec.js | 10 +- test/spec/modules/fluctBidAdapter_spec.js | 24 +- .../modules/freewheel-sspBidAdapter_spec.js | 26 +- test/spec/modules/ftrackIdSystem_spec.js | 45 +- test/spec/modules/gameraRtdProvider_spec.js | 223 + test/spec/modules/gammaBidAdapter_spec.js | 13 +- test/spec/modules/gamoshiBidAdapter_spec.js | 11 +- .../modules/genericAnalyticsAdapter_spec.js | 10 +- test/spec/modules/geoedgeRtdProvider_spec.js | 121 +- test/spec/modules/globalsunBidAdapter_spec.js | 147 +- test/spec/modules/gmosspBidAdapter_spec.js | 8 +- test/spec/modules/gnetBidAdapter_spec.js | 8 +- test/spec/modules/goldbachBidAdapter_spec.js | 16 +- .../modules/goldfishAdsRtdProvider_spec.js | 163 + test/spec/modules/gptPreAuction_spec.js | 194 +- .../modules/greenbidsAnalyticsAdapter_spec.js | 233 +- .../spec/modules/greenbidsRtdProvider_spec.js | 188 +- test/spec/modules/gridBidAdapter_spec.js | 72 +- .../growthCodeAnalyticsAdapter_spec.js | 4 +- test/spec/modules/growthCodeIdSystem_spec.js | 66 +- test/spec/modules/gumgumBidAdapter_spec.js | 236 +- .../modules/hadronAnalyticsAdapter_spec.js | 6 +- test/spec/modules/hadronIdSystem_spec.js | 60 +- test/spec/modules/hadronRtdProvider_spec.js | 91 +- .../modules/humansecurityRtdProvider_spec.js | 210 + test/spec/modules/hypelabBidAdapter_spec.js | 6 +- test/spec/modules/id5AnalyticsAdapter_spec.js | 12 +- test/spec/modules/id5IdSystem_spec.js | 1291 +- test/spec/modules/idImportLibrary_spec.js | 14 + test/spec/modules/idWardRtdProvider_spec.js | 116 - .../spec/modules/identityLinkIdSystem_spec.js | 72 +- test/spec/modules/idxIdSystem_spec.js | 10 +- test/spec/modules/illuminBidAdapter_spec.js | 655 + test/spec/modules/imdsBidAdapter_spec.js | 18 +- test/spec/modules/impactifyBidAdapter_spec.js | 184 +- .../modules/improvedigitalBidAdapter_spec.js | 203 +- test/spec/modules/imuIdSystem_spec.js | 37 + test/spec/modules/incrxBidAdapter_spec.js | 179 +- test/spec/modules/inmobiBidAdapter_spec.js | 1965 + test/spec/modules/innityBidAdapter_spec.js | 6 + .../spec/modules/insticatorBidAdapter_spec.js | 645 +- test/spec/modules/integr8BidAdapter_spec.js | 4 +- .../modules/intentIqAnalyticsAdapter_spec.js | 327 + test/spec/modules/intentIqIdSystem_spec.js | 305 +- test/spec/modules/invibesBidAdapter_spec.js | 174 +- .../modules/invisiblyAnalyticsAdapter_spec.js | 80 +- test/spec/modules/iqmBidAdapter_spec.js | 414 - test/spec/modules/iqxBidAdapter_spec.js | 447 + test/spec/modules/iqzoneBidAdapter_spec.js | 151 +- test/spec/modules/ixBidAdapter_spec.js | 835 +- test/spec/modules/jixieBidAdapter_spec.js | 227 +- test/spec/modules/justIdSystem_spec.js | 2 +- test/spec/modules/jwplayerBidAdapter_spec.js | 412 + test/spec/modules/jwplayerRtdProvider_spec.js | 818 +- .../modules/kargoAnalyticsAdapter_spec.js | 6 +- test/spec/modules/kargoBidAdapter_spec.js | 2581 +- .../spec/modules/kimberliteBidAdapter_spec.js | 260 + test/spec/modules/kinessoIdSystem_spec.js | 26 + test/spec/modules/kiviadsBidAdapter_spec.js | 152 +- test/spec/modules/koblerBidAdapter_spec.js | 128 +- .../modules/konduitAnalyticsAdapter_spec.js | 26 +- .../spec/modules/krushmediaBidAdapter_spec.js | 364 +- test/spec/modules/kueezRtbBidAdapter_spec.js | 53 +- test/spec/modules/lassoBidAdapter_spec.js | 77 +- .../modules/lemmaDigitalBidAdapter_spec.js | 2 +- .../limelightDigitalBidAdapter_spec.js | 66 +- .../liveIntentAnalyticsAdapter_spec.js | 36 +- .../liveIntentExternalIdSystem_spec.js | 463 + .../modules/liveIntentIdMinimalSystem_spec.js | 57 +- test/spec/modules/liveIntentIdSystem_spec.js | 708 +- .../livewrappedAnalyticsAdapter_spec.js | 147 +- .../modules/livewrappedBidAdapter_spec.js | 261 +- test/spec/modules/lkqdBidAdapter_spec.js | 10 +- .../spec/modules/lm_kiviadsBidAdapter_spec.js | 447 + test/spec/modules/lmpIdSystem_spec.js | 130 + test/spec/modules/lockrAIMIdSystem_spec.js | 72 + test/spec/modules/loganBidAdapter_spec.js | 2 +- test/spec/modules/logicadBidAdapter_spec.js | 65 +- .../modules/lotamePanoramaIdSystem_spec.js | 152 +- test/spec/modules/loyalBidAdapter_spec.js | 476 + test/spec/modules/luceadBidAdapter_spec.js | 184 + .../modules/lunamediahbBidAdapter_spec.js | 309 +- .../spec/modules/luponmediaBidAdapter_spec.js | 53 +- .../spec/modules/madvertiseBidAdapter_spec.js | 2 +- .../modules/magniteAnalyticsAdapter_spec.js | 213 +- .../modules/malltvAnalyticsAdapter_spec.js | 6 +- test/spec/modules/mantisBidAdapter_spec.js | 8 +- .../modules/mathildeadsBidAdapter_spec.js | 106 +- .../modules/mediaConsortiumBidAdapter_spec.js | 411 + .../spec/modules/mediabramaBidAdapter_spec.js | 256 + .../modules/mediafilterRtdProvider_spec.js | 147 + test/spec/modules/mediafuseBidAdapter_spec.js | 16 +- test/spec/modules/mediagoBidAdapter_spec.js | 509 +- .../modules/mediaimpactBidAdapter_spec.js | 337 + .../modules/medianetAnalyticsAdapter_spec.js | 24 +- test/spec/modules/medianetBidAdapter_spec.js | 694 +- .../modules/mediasquareBidAdapter_spec.js | 30 + test/spec/modules/merkleIdSystem_spec.js | 69 + test/spec/modules/mgidBidAdapter_spec.js | 20 +- test/spec/modules/mgidXBidAdapter_spec.js | 153 +- test/spec/modules/microadBidAdapter_spec.js | 194 +- .../modules/minutemediaBidAdapter_spec.js | 32 +- test/spec/modules/missenaBidAdapter_spec.js | 206 +- test/spec/modules/mobfoxpbBidAdapter_spec.js | 344 +- test/spec/modules/mobianRtdProvider_spec.js | 245 + test/spec/modules/mygaruIdSystem_spec.js | 62 + test/spec/modules/mytargetBidAdapter_spec.js | 199 - test/spec/modules/nativoBidAdapter_spec.js | 100 +- test/spec/modules/naveggIdSystem_spec.js | 172 +- test/spec/modules/netIdSystem_spec.js | 23 + .../modules/nextMillenniumBidAdapter_spec.js | 1387 +- test/spec/modules/nexverseBidAdapter_spec.js | 203 + test/spec/modules/nexx360BidAdapter_spec.js | 45 +- .../modules/nobidAnalyticsAdapter_spec.js | 217 +- test/spec/modules/nobidBidAdapter_spec.js | 3 +- test/spec/modules/oguryBidAdapter_spec.js | 557 +- ...dAdapter_spec.js => omsBidAdapter_spec.js} | 169 +- test/spec/modules/onetagBidAdapter_spec.js | 144 +- test/spec/modules/onomagicBidAdapter_spec.js | 6 +- .../spec/modules/ooloAnalyticsAdapter_spec.js | 66 +- test/spec/modules/openwebBidAdapter_spec.js | 901 +- test/spec/modules/openxBidAdapter_spec.js | 133 +- test/spec/modules/operaadsBidAdapter_spec.js | 89 + test/spec/modules/operaadsIdSystem_spec.js | 93 +- test/spec/modules/opscoBidAdapter_spec.js | 260 + test/spec/modules/optableBidAdapter_spec.js | 116 + .../modules/optidigitalBidAdapter_spec.js | 38 +- test/spec/modules/optimeraRtdProvider_spec.js | 6 +- .../modules/optimonAnalyticsAdapter_spec.js | 1 - test/spec/modules/orakiBidAdapter_spec.js | 511 + test/spec/modules/orbidderBidAdapter_spec.js | 102 +- test/spec/modules/outbrainBidAdapter_spec.js | 91 +- test/spec/modules/ownadxBidAdapter_spec.js | 103 + .../modules/oxxionAnalyticsAdapter_spec.js | 35 +- test/spec/modules/oxxionRtdProvider_spec.js | 95 - test/spec/modules/ozoneBidAdapter_spec.js | 959 +- test/spec/modules/paapiForGpt_spec.js | 216 + test/spec/modules/paapi_spec.js | 1857 + test/spec/modules/pangleBidAdapter_spec.js | 214 +- test/spec/modules/parrableIdSystem_spec.js | 762 - test/spec/modules/performaxBidAdapter_spec.js | 175 + .../permutiveIdentityManagerIdSystem_spec.js | 126 + .../spec/modules/permutiveRtdProvider_spec.js | 78 +- test/spec/modules/pgamsspBidAdapter_spec.js | 147 +- .../modules/pianoDmpAnalyticsAdapter_spec.js | 18 +- test/spec/modules/pixfutureBidAdapter_spec.js | 8 +- test/spec/modules/playdigoBidAdapter_spec.js | 476 + .../modules/prebidServerBidAdapter_spec.js | 1379 +- test/spec/modules/precisoBidAdapter_spec.js | 245 +- test/spec/modules/priceFloors_spec.js | 335 +- test/spec/modules/prismaBidAdapter_spec.js | 2 +- .../modules/programmaticaBidAdapter_spec.js | 263 + .../spec/modules/proxistoreBidAdapter_spec.js | 2 +- test/spec/modules/pstudioBidAdapter_spec.js | 514 + test/spec/modules/pubCircleBidAdapter_spec.js | 100 +- test/spec/modules/pubgeniusBidAdapter_spec.js | 1 - test/spec/modules/publinkIdSystem_spec.js | 43 +- test/spec/modules/publirBidAdapter_spec.js | 488 + .../modules/pubmaticAnalyticsAdapter_spec.js | 465 +- test/spec/modules/pubmaticBidAdapter_spec.js | 386 +- test/spec/modules/pubriseBidAdapter_spec.js | 515 + .../modules/pubstackAnalyticsAdapter_spec.js | 1 - .../modules/pubwiseAnalyticsAdapter_spec.js | 28 +- test/spec/modules/pubxBidAdapter_spec.js | 8 +- .../modules/pubxaiAnalyticsAdapter_spec.js | 1691 +- test/spec/modules/pubxaiRtdProvider_spec.js | 429 + .../spec/modules/pulsepointBidAdapter_spec.js | 52 +- test/spec/modules/pxyzBidAdapter_spec.js | 41 +- test/spec/modules/qortexRtdProvider_spec.js | 408 + test/spec/modules/qtBidAdapter_spec.js | 514 + test/spec/modules/quantcastBidAdapter_spec.js | 4 - test/spec/modules/quantcastIdSystem_spec.js | 22 + test/spec/modules/r2b2BidAdapter_spec.js | 689 + test/spec/modules/radsBidAdapter_spec.js | 8 +- test/spec/modules/rakutenBidAdapter_spec.js | 8 +- test/spec/modules/rasBidAdapter_spec.js | 196 - test/spec/modules/raynRtdProvider_spec.js | 333 + test/spec/modules/readpeakBidAdapter_spec.js | 2 +- test/spec/modules/realTimeDataModule_spec.js | 18 +- test/spec/modules/relaidoBidAdapter_spec.js | 104 + .../modules/relevantAnalyticsAdapter_spec.js | 6 +- .../modules/relevantdigitalBidAdapter_spec.js | 18 +- .../modules/relevatehealthBidAdapter_spec.js | 239 + .../spec/modules/retailspotBidAdapter_spec.js | 14 +- .../modules/rewardedInterestIdSystem_spec.js | 190 + .../modules/richaudienceBidAdapter_spec.js | 157 +- .../ringieraxelspringerBidAdapter_spec.js | 678 + test/spec/modules/riseBidAdapter_spec.js | 68 +- .../spec/modules/rivrAnalyticsAdapter_spec.js | 8 +- test/spec/modules/rixengineBidAdapter_spec.js | 141 + .../modules/roxotAnalyticsAdapter_spec.js | 50 +- test/spec/modules/rtbhouseBidAdapter_spec.js | 319 +- test/spec/modules/rubiconBidAdapter_spec.js | 1271 +- .../modules/scaleableAnalyticsAdapter_spec.js | 10 +- .../modules/seedingAllianceAdapter_spec.js | 169 +- test/spec/modules/seedtagBidAdapter_spec.js | 413 +- test/spec/modules/setupadBidAdapter_spec.js | 390 + test/spec/modules/sharedIdSystem_spec.js | 18 + .../modules/sharethroughBidAdapter_spec.js | 297 +- test/spec/modules/shinezRtbBidAdapter_spec.js | 657 + .../modules/showheroes-bsBidAdapter_spec.js | 752 +- .../modules/sigmoidAnalyticsAdapter_spec.js | 58 - test/spec/modules/silvermobBidAdapter_spec.js | 301 + test/spec/modules/sirdataRtdProvider_spec.js | 155 +- test/spec/modules/slimcutBidAdapter_spec.js | 24 +- test/spec/modules/smaatoBidAdapter_spec.js | 1235 +- .../modules/smartadserverBidAdapter_spec.js | 492 +- test/spec/modules/smarthubBidAdapter_spec.js | 37 +- test/spec/modules/smartxBidAdapter_spec.js | 9 - .../modules/smartyadsAnalyticsAdapter_spec.js | 441 + test/spec/modules/smartyadsBidAdapter_spec.js | 95 +- .../spec/modules/smartytechBidAdapter_spec.js | 6 +- .../modules/smilewantedBidAdapter_spec.js | 244 +- test/spec/modules/smootBidAdapter_spec.js | 595 + test/spec/modules/snigelBidAdapter_spec.js | 98 + .../modules/sonobiAnalyticsAdapter_spec.js | 84 - test/spec/modules/sonobiBidAdapter_spec.js | 44 +- .../modules/sovrnAnalyticsAdapter_spec.js | 530 - test/spec/modules/sovrnBidAdapter_spec.js | 333 +- test/spec/modules/sparteoBidAdapter_spec.js | 478 + test/spec/modules/spotxBidAdapter_spec.js | 711 - test/spec/modules/sspBCBidAdapter_spec.js | 146 +- .../spec/modules/ssp_genieeBidAdapter_spec.js | 401 + .../spec/modules/staqAnalyticsAdapter_spec.js | 302 - test/spec/modules/stnBidAdapter_spec.js | 619 + .../modules/stroeerCoreBidAdapter_spec.js | 174 +- test/spec/modules/stvBidAdapter_spec.js | 58 +- .../modules/symitriAnalyticsAdapter_spec.js | 90 + .../modules/symitriDapRtdProvider_spec.js | 661 + test/spec/modules/taboolaBidAdapter_spec.js | 861 +- ...pter_spec.js => tagorasBidAdapter_spec.js} | 102 +- test/spec/modules/tapadIdSystem_spec.js | 19 + test/spec/modules/tapnativeBidAdapter_spec.js | 322 + test/spec/modules/tappxBidAdapter_spec.js | 8 +- .../modules/targetVideoAdServerVideo_spec.js | 179 + .../modules/targetVideoBidAdapter_spec.js | 143 +- ...Enforcement_spec.js => tcfControl_spec.js} | 60 +- test/spec/modules/teadsBidAdapter_spec.js | 336 +- .../modules/terceptAnalyticsAdapter_spec.js | 14 +- test/spec/modules/theAdxBidAdapter_spec.js | 112 +- .../modules/themoneytizerBidAdapter_spec.js | 289 + test/spec/modules/tncIdSystem_spec.js | 36 +- test/spec/modules/topLevelPaapi_spec.js | 501 + test/spec/modules/topicsFpdModule_spec.js | 115 +- test/spec/modules/tpmnBidAdapter_spec.js | 511 +- .../modules/trafficgateBidAdapter_spec.js | 27 +- test/spec/modules/trionBidAdapter_spec.js | 2 +- .../spec/modules/tripleliftBidAdapter_spec.js | 331 +- test/spec/modules/truereachBidAdapter_spec.js | 5 +- test/spec/modules/ttdBidAdapter_spec.js | 11 +- .../modules/twistDigitalBidAdapter_spec.js | 942 + .../modules/ucfunnelAnalyticsAdapter_spec.js | 2 +- test/spec/modules/ucfunnelBidAdapter_spec.js | 18 +- test/spec/modules/uid2IdSystem_helpers.js | 10 +- test/spec/modules/uid2IdSystem_spec.js | 395 +- .../modules/underdogmediaBidAdapter_spec.js | 15 + test/spec/modules/unicornBidAdapter_spec.js | 51 +- test/spec/modules/unifiedIdSystem_spec.js | 46 + test/spec/modules/unrulyBidAdapter_spec.js | 437 +- test/spec/modules/userId_spec.js | 2005 +- ...tiqSystem_spec.js => utiqIdSystem_spec.js} | 67 +- test/spec/modules/utiqMtpIdSystem_spec.js | 188 + test/spec/modules/vdoaiBidAdapter_spec.js | 311 +- test/spec/modules/viantOrtbBidAdapter_spec.js | 139 +- .../modules/vibrantmediaBidAdapter_spec.js | 19 +- test/spec/modules/vidazooBidAdapter_spec.js | 231 +- test/spec/modules/videoModule/pbVideo_spec.js | 10 +- .../adplayerproVideoProvider_spec.js | 521 + .../submodules/videojsVideoProvider_spec.js | 4 +- .../spec/modules/videoreachBidAdapter_spec.js | 8 +- test/spec/modules/vidoomyBidAdapter_spec.js | 6 +- test/spec/modules/viqeoBidAdapter_spec.js | 13 +- .../modules/visiblemeasuresBidAdapter_spec.js | 147 +- test/spec/modules/visxBidAdapter_spec.js | 965 +- test/spec/modules/voxBidAdapter_spec.js | 22 +- test/spec/modules/vrtcalBidAdapter_spec.js | 35 + test/spec/modules/weboramaRtdProvider_spec.js | 216 +- test/spec/modules/winrBidAdapter_spec.js | 18 +- test/spec/modules/wipesBidAdapter_spec.js | 6 +- test/spec/modules/wurflRtdProvider_spec.js | 453 + test/spec/modules/xeBidAdapter_spec.js | 92 +- ...ter_spec.js => yahooAdsBidAdapter_spec.js} | 102 +- .../modules/yandexAnalyticsAdapter_spec.js | 164 + test/spec/modules/yandexBidAdapter_spec.js | 192 +- test/spec/modules/yandexIdSystem_spec.js | 201 + test/spec/modules/yieldlabBidAdapter_spec.js | 184 +- test/spec/modules/yieldmoBidAdapter_spec.js | 191 +- .../modules/yieldoneAnalyticsAdapter_spec.js | 43 +- test/spec/modules/yieldoneBidAdapter_spec.js | 6 +- .../yuktamediaAnalyticsAdapter_spec.js | 65 +- .../spec/modules/zeotapIdPlusIdSystem_spec.js | 25 +- .../zeta_global_sspAnalyticsAdapter_spec.js | 381 +- .../modules/zeta_global_sspBidAdapter_spec.js | 156 +- test/spec/modules/zmaticooBidAdapter_spec.js | 266 + test/spec/native_spec.js | 606 +- test/spec/ortbConverter/banner_spec.js | 10 + test/spec/ortbConverter/common_spec.js | 44 + test/spec/ortbConverter/converter_spec.js | 10 +- test/spec/ortbConverter/gdpr_spec.js | 2 +- test/spec/ortbConverter/native_spec.js | 10 + .../pbsExtensions/aliases_spec.js | 72 +- .../pbsExtensions/params_spec.js | 58 - test/spec/ortbConverter/userId_spec.js | 33 - test/spec/ortbConverter/video_spec.js | 11 +- .../schainSerializer/schainSerializer_spec.js | 138 + test/spec/unit/adRendering_spec.js | 410 + test/spec/unit/adUnits_spec.js | 30 +- test/spec/unit/core/adapterManager_spec.js | 314 +- test/spec/unit/core/ajax_spec.js | 122 +- test/spec/unit/core/auctionIndex_spec.js | 60 +- test/spec/unit/core/bidderFactory_spec.js | 404 +- test/spec/unit/core/bidderSettings_spec.js | 7 + test/spec/unit/core/events_spec.js | 19 +- test/spec/unit/core/storageManager_spec.js | 119 +- test/spec/unit/core/targeting_spec.js | 255 +- test/spec/unit/pbjs_api_spec.js | 823 +- test/spec/unit/secureCreatives_spec.js | 475 +- test/spec/unit/utils/focusTimeout_spec.js | 87 + test/spec/unit/utils/ipUtils_spec.js | 58 + test/spec/unit/utils/ttlCollection_spec.js | 27 + test/spec/utils_spec.js | 174 +- test/spec/videoCache_spec.js | 127 +- test/spec/video_spec.js | 332 +- test/test_deps.js | 11 + test/test_index.js | 23 +- wdio.conf.js | 24 +- wdio.local.conf.js | 13 + wdio.shared.conf.js | 23 + webpack.conf.js | 14 +- webpack.creative.js | 25 + webpack.debugging.js | 30 + 1527 files changed, 173803 insertions(+), 74068 deletions(-) create mode 100644 .github/codeql/queries/deviceMemory.ql create mode 100644 .github/codeql/queries/hardwareConcurrency.ql create mode 100644 .github/codeql/queries/prebid.qll create mode 100644 .github/codeql/queries/qlpack.yml create mode 100644 .github/workflows/jscpd.yml create mode 100644 .github/workflows/linter.yml create mode 100644 creative/README.md create mode 100644 creative/constants.js create mode 100644 creative/crossDomain.js create mode 100644 creative/renderers/display/constants.js create mode 100644 creative/renderers/display/renderer.js create mode 100644 creative/renderers/native/constants.js create mode 100644 creative/renderers/native/renderer.js create mode 100644 integrationExamples/gpt/51DegreesRtdProvider_example.html create mode 100644 integrationExamples/gpt/adnuntius_multiformat_example.html rename integrationExamples/gpt/{idward_segments_example.html => anonymised_segments_example.html} (96%) create mode 100644 integrationExamples/gpt/azerionedgeRtdProvider_example.html create mode 100644 integrationExamples/gpt/contxtfulRtdProvider_example.html delete mode 100644 integrationExamples/gpt/creative_rendering.html create mode 100644 integrationExamples/gpt/cstg_example.html delete mode 100644 integrationExamples/gpt/jwplayerRtdProvider_example.html create mode 100644 integrationExamples/gpt/nexverse.html rename integrationExamples/gpt/{fledge_example.html => paapi_example.html} (90%) rename integrationExamples/gpt/{prebidServer_fledge_example.html => prebidServer_paapi_example.html} (89%) create mode 100644 integrationExamples/gpt/precisoExample.html create mode 100644 integrationExamples/gpt/precisonativeExample.html create mode 100644 integrationExamples/gpt/publir_hello_world.html create mode 100644 integrationExamples/gpt/pubxaiRtdProvider_example.html create mode 100644 integrationExamples/gpt/raynRtdProvider_example.html create mode 100644 integrationExamples/gpt/rewardedInterestIdSystem_example.html create mode 100644 integrationExamples/gpt/symitridap_segments_example.html create mode 100644 integrationExamples/gpt/tpmn_example.html create mode 100644 integrationExamples/gpt/tpmn_serverless_example.html create mode 100644 integrationExamples/gpt/wurflRtdProvider_example.html create mode 100644 integrationExamples/noadserver/jwplayerBidAdapter_sample.html create mode 100644 integrationExamples/noadserver/native_renderer/custom_renderer.html create mode 100644 integrationExamples/noadserver/native_renderer/renderer.js create mode 100644 integrationExamples/realTimeData/jwplayerRtdProvider_example.html create mode 100644 integrationExamples/top-level-paapi/gam-contextual.html create mode 100644 integrationExamples/top-level-paapi/no_adserver.html create mode 100644 integrationExamples/top-level-paapi/shared/decisionLogic.js create mode 100644 integrationExamples/top-level-paapi/shared/example-setup.js create mode 100644 integrationExamples/videoModule/adPlayerPro/bidRequestScheduling.html create mode 100644 integrationExamples/videoModule/adPlayerPro/eventListeners.html create mode 100644 libraries/adagioUtils/adagioUtils.js create mode 100644 libraries/adkernelUtils/adkernelUtils.js create mode 100644 libraries/advangUtils/index.js create mode 100644 libraries/audUtils/bidderUtils.js create mode 100644 libraries/autoplayDetection/autoplay.js create mode 100644 libraries/biddoInvamiaUtils/index.js create mode 100644 libraries/braveUtils/buildAndInterpret.js create mode 100644 libraries/braveUtils/index.js create mode 100644 libraries/braveUtils/nativeAssets.js create mode 100644 libraries/connectionInfo/connectionUtils.js create mode 100644 libraries/consentManagement/cmUtils.js create mode 100644 libraries/creative-renderer-display/renderer.js create mode 100644 libraries/creative-renderer-native/renderer.js create mode 100644 libraries/currencyUtils/floor.js create mode 100644 libraries/deepintentUtils/index.js create mode 100644 libraries/dfpUtils/dfpUtils.js create mode 100644 libraries/dspxUtils/bidderUtils.js create mode 100644 libraries/equativUtils/equativUtils.js create mode 100644 libraries/fpdUtils/deviceInfo.js create mode 100644 libraries/fpdUtils/pageInfo.js create mode 100644 libraries/intentIqConstants/intentIqConstants.js create mode 100644 libraries/intentIqUtils/detectBrowserUtils.js create mode 100644 libraries/intentIqUtils/getGppValue.js create mode 100644 libraries/intentIqUtils/getRefferer.js create mode 100644 libraries/interpretResponseUtils/index.js create mode 100644 libraries/liveIntentId/externalIdSystem.js create mode 100644 libraries/liveIntentId/idSystem.js create mode 100644 libraries/liveIntentId/shared.js create mode 100644 libraries/mediaImpactUtils/index.js create mode 100644 libraries/mgidUtils/mgidUtils.js create mode 100644 libraries/navigatorData/navigatorData.js create mode 100644 libraries/nexverseUtils/index.js create mode 100644 libraries/ortb2Utils/currency.js delete mode 100644 libraries/ortbConverter/lib/sizes.js create mode 100644 libraries/paapiTools/buyerOrigins.js create mode 100644 libraries/percentInView/percentInView.js create mode 100644 libraries/precisoUtils/bidNativeUtils.js create mode 100644 libraries/precisoUtils/bidUtils.js create mode 100644 libraries/precisoUtils/bidUtilsCommon.js create mode 100644 libraries/processResponse/index.js create mode 100644 libraries/riseUtils/index.js create mode 100644 libraries/schainSerializer/schainSerializer.js create mode 100644 libraries/sizeUtils/tranformSize.js create mode 100644 libraries/smartyadsUtils/getAdUrlByRegion.js create mode 100644 libraries/targetVideoUtils/bidderUtils.js create mode 100644 libraries/targetVideoUtils/constants.js create mode 100644 libraries/teqblazeUtils/bidderUtils.js create mode 100644 libraries/timeoutQueue/timeoutQueue.js create mode 100644 libraries/uid1Eids/uid1Eids.js create mode 100644 libraries/uid2Eids/uid2Eids.js create mode 100644 libraries/userAgentUtils/index.js create mode 100644 libraries/userAgentUtils/userAgentTypes.enums.js create mode 100644 libraries/userSyncUtils/userSyncUtils.js create mode 100644 libraries/vastTrackers/vastTrackers.js create mode 100644 libraries/vidazooUtils/bidderUtils.js create mode 100644 libraries/vidazooUtils/constants.js create mode 100644 libraries/viewport/viewport.js create mode 100644 libraries/weakStore/weakStore.js create mode 100644 libraries/xeUtils/bidderUtils.js create mode 100644 modules/33acrossAnalyticsAdapter.js create mode 100644 modules/33acrossAnalyticsAdapter.md create mode 100644 modules/51DegreesRtdProvider.js create mode 100644 modules/51DegreesRtdProvider.md rename modules/{prebidmanagerAnalyticsAdapter.js => AsteriobidPbmAnalyticsAdapter.js} (91%) create mode 100644 modules/AsteriobidPbmAnalyticsAdapter.md create mode 100644 modules/BTBidAdapter.js create mode 100644 modules/BTBidAdapter.md create mode 100644 modules/ad2ictionBidAdapter.js create mode 100644 modules/ad2ictionBidAdapter.md create mode 100644 modules/adagioRtdProvider.js create mode 100644 modules/adagioRtdProvider.md delete mode 100644 modules/adbookpspBidAdapter.js delete mode 100644 modules/adbookpspBidAdapter.md create mode 100644 modules/adbutlerBidAdapter.js create mode 100644 modules/adbutlerBidAdapter.md create mode 100644 modules/adgridBidAdapter.js create mode 100644 modules/adgridBidAdapter.md delete mode 100644 modules/adomikAnalyticsAdapter.js create mode 100644 modules/adplayerproVideoProvider.js create mode 100644 modules/adplayerproVideoProvider.md create mode 100644 modules/ads_interactiveBidAdapter.js create mode 100755 modules/ads_interactiveBidAdapter.md create mode 100644 modules/adspiritBidAdapter.js create mode 100644 modules/adspiritBidAdapter.md create mode 100644 modules/adstirBidAdapter.js create mode 100644 modules/adstirBidAdapter.md create mode 100644 modules/advRedAnalyticsAdapter.js create mode 100644 modules/advRedAnalyticsAdapter.md create mode 100644 modules/adverxoBidAdapter.js create mode 100644 modules/adverxoBidAdapter.md create mode 100644 modules/agmaAnalyticsAdapter.js create mode 100644 modules/agmaAnalyticsAdapter.md create mode 100644 modules/ampliffyBidAdapter.js create mode 100644 modules/ampliffyBidAdapter.md create mode 100644 modules/anPspParamsConverter.js create mode 100644 modules/anPspParamsConverter.md create mode 100644 modules/anonymisedRtdProvider.js create mode 100644 modules/anonymisedRtdProvider.md create mode 100644 modules/anyclipBidAdapter.js create mode 100644 modules/anyclipBidAdapter.md create mode 100644 modules/asteriobidAnalyticsAdapter.js create mode 100644 modules/asteriobidAnalyticsAdapter.md create mode 100644 modules/azerionedgeRtdProvider.js create mode 100644 modules/azerionedgeRtdProvider.md create mode 100644 modules/bidResponseFilter/index.js create mode 100644 modules/bidmaticBidAdapter.js create mode 100644 modules/bidmaticBidAdapter.md create mode 100644 modules/bidtheatreBidAdapter.js create mode 100644 modules/bidtheatreBidAdapter.md delete mode 100644 modules/bizzclickBidAdapter.js delete mode 100644 modules/bizzclickBidAdapter.md create mode 100644 modules/blastoBidAdapter.js create mode 100644 modules/blastoBidAdapter.md delete mode 100644 modules/bluebillywigBidAdapter.js delete mode 100644 modules/bluebillywigBidAdapter.md delete mode 100644 modules/brightcomBidAdapter.js delete mode 100644 modules/brightcomBidAdapter.md delete mode 100644 modules/britepoolIdSystem.js delete mode 100644 modules/britepoolIdSystem.md create mode 100644 modules/ceeIdSystem.js create mode 100644 modules/ceeIdSystem.md create mode 100644 modules/colombiaBidAdapter.js create mode 100644 modules/colombiaBidAdapter.md rename modules/{consentManagement.js => consentManagementTcf.js} (85%) create mode 100644 modules/contxtfulBidAdapter.js create mode 100644 modules/contxtfulBidAdapter.md create mode 100644 modules/contxtfulRtdProvider.js create mode 100644 modules/contxtfulRtdProvider.md create mode 100644 modules/copper6sspBidAdapter.js create mode 100755 modules/copper6sspBidAdapter.md create mode 100644 modules/dailymotionBidAdapter.js create mode 100644 modules/dailymotionBidAdapter.md create mode 100644 modules/dexertoBidAdapter.js create mode 100644 modules/dexertoBidAdapter.md create mode 100644 modules/dfpAdpod.js create mode 100644 modules/digitalMatterBidAdapter.js create mode 100644 modules/digitalMatterBidAdapter.md create mode 100644 modules/djaxBidAdapter.js create mode 100644 modules/djaxBidAdapter.md create mode 100644 modules/docereeAdManagerBidAdapter.js create mode 100644 modules/docereeAdManagerBidAdapter.md create mode 100644 modules/driftpixelBidAdapter.js create mode 100644 modules/driftpixelBidAdapter.md create mode 100644 modules/dsaControl.js create mode 100644 modules/dsp_genieeBidAdapter.js create mode 100644 modules/dsp_genieeBidAdapter.md create mode 100644 modules/dynamicAdBoostRtdProvider.js create mode 100644 modules/dynamicAdBoostRtdProvider.md delete mode 100644 modules/ebdrBidAdapter.js delete mode 100644 modules/ebdrBidAdapter.md create mode 100644 modules/eclickadsBidAdapter.js create mode 100644 modules/eclickadsBidAdapter.md create mode 100644 modules/edge226BidAdapter.js create mode 100644 modules/edge226BidAdapter.md create mode 100644 modules/ehealthcaresolutionsBidAdapter.js create mode 100644 modules/ehealthcaresolutionsBidAdapter.md create mode 100644 modules/eightPodAnalyticsAdapter.js create mode 100644 modules/eightPodAnalyticsAdapter.md create mode 100644 modules/eightPodBidAdapter.js create mode 100644 modules/eightPodBidAdapter.md delete mode 100644 modules/enrichmentFpdModule.js delete mode 100644 modules/eplanningAnalyticsAdapter.js create mode 100644 modules/equativBidAdapter.js create mode 100644 modules/equativBidAdapter.md create mode 100644 modules/exadsBidAdapter.js create mode 100644 modules/exadsBidAdapter.md create mode 100644 modules/excoBidAdapter.js create mode 100644 modules/excoBidAdapter.md create mode 100644 modules/fanAdapter.js create mode 100644 modules/fanAdapter.md delete mode 100644 modules/fledgeForGpt.js create mode 100644 modules/gameraRtdProvider.js create mode 100644 modules/gameraRtdProvider.md create mode 100755 modules/goldfishAdsRtdProvider.js create mode 100755 modules/goldfishAdsRtdProvider.md create mode 100644 modules/humansecurityRtdProvider.js create mode 100644 modules/humansecurityRtdProvider.md delete mode 100644 modules/idWardRtdProvider.js delete mode 100644 modules/idWardRtdProvider.md create mode 100644 modules/illuminBidAdapter.js rename modules/{minutemediaplusBidAdapter.md => illuminBidAdapter.md} (72%) create mode 100644 modules/incrxBidAdapter.md create mode 100644 modules/inmobiBidAdapter.js create mode 100644 modules/inmobiBidAdapter.md create mode 100644 modules/intentIqAnalyticsAdapter.js create mode 100644 modules/intentIqAnalyticsAdapter.md create mode 100644 modules/intentIqIdSystem.md delete mode 100644 modules/iqmBidAdapter.js create mode 100644 modules/iqxBidAdapter.js create mode 100644 modules/iqxBidAdapter.md create mode 100644 modules/jwplayerBidAdapter.js create mode 100644 modules/jwplayerBidAdapter.md create mode 100644 modules/kimberliteBidAdapter.js create mode 100644 modules/kimberliteBidAdapter.md create mode 100644 modules/lm_kiviadsBidAdapter.js create mode 100644 modules/lm_kiviadsBidAdapter.md create mode 100644 modules/lmpIdSystem.js create mode 100644 modules/lmpIdSystem.md create mode 100644 modules/lockrAIMIdSystem.js create mode 100644 modules/lockrAIMIdSystem.md create mode 100644 modules/loyalBidAdapter.js create mode 100644 modules/loyalBidAdapter.md create mode 100755 modules/luceadBidAdapter.js create mode 100755 modules/luceadBidAdapter.md delete mode 100644 modules/marsmediaAnalyticsAdapter.js create mode 100644 modules/mediaConsortiumBidAdapter.js create mode 100644 modules/mediaConsortiumBidAdapter.md create mode 100644 modules/mediabramaBidAdapter.js create mode 100644 modules/mediabramaBidAdapter.md create mode 100644 modules/mediafilterRtdProvider.js create mode 100644 modules/mediafilterRtdProvider.md create mode 100644 modules/mediaimpactBidAdapter.js create mode 100644 modules/mediaimpactBidAdapter.md delete mode 100644 modules/minutemediaplusBidAdapter.js create mode 100644 modules/mobianRtdProvider.js create mode 100644 modules/mobianRtdProvider.md create mode 100644 modules/mygaruIdSystem.js create mode 100644 modules/mygaruIdSystem.md delete mode 100644 modules/mytargetBidAdapter.md create mode 100644 modules/nativeRendering.js create mode 100644 modules/nexverseBidAdapter.js create mode 100644 modules/nexverseBidAdapter.md rename modules/{brightcomSSPBidAdapter.js => omsBidAdapter.js} (63%) rename modules/{brightcomSSPBidAdapter.md => omsBidAdapter.md} (73%) create mode 100644 modules/opscoBidAdapter.js create mode 100644 modules/opscoBidAdapter.md create mode 100644 modules/optableBidAdapter.js create mode 100644 modules/optableBidAdapter.md create mode 100644 modules/orakiBidAdapter.js create mode 100644 modules/orakiBidAdapter.md create mode 100644 modules/ownadxBidAdapter.js create mode 100644 modules/paapi.js create mode 100644 modules/paapiForGpt.js rename modules/{fledgeForGpt.md => paapiForGpt.md} (55%) delete mode 100644 modules/parrableIdSystem.js create mode 100644 modules/performaxBidAdapter.js create mode 100644 modules/performaxBidAdapter.md create mode 100644 modules/permutiveIdentityManagerIdSystem.js create mode 100644 modules/permutiveIdentityManagerIdSystem.md create mode 100644 modules/playdigoBidAdapter.js create mode 100644 modules/playdigoBidAdapter.md create mode 100644 modules/prebidServerBidAdapter/bidderConfig.js delete mode 100644 modules/prebidmanagerAnalyticsAdapter.md create mode 100644 modules/programmaticaBidAdapter.js create mode 100644 modules/programmaticaBidAdapter.md create mode 100644 modules/pstudioBidAdapter.js create mode 100644 modules/pstudioBidAdapter.md create mode 100644 modules/publirBidAdapter.js create mode 100644 modules/publirBidAdapter.md create mode 100644 modules/pubriseBidAdapter.js create mode 100755 modules/pubriseBidAdapter.md create mode 100644 modules/pubxaiRtdProvider.js create mode 100644 modules/pubxaiRtdProvider.md create mode 100644 modules/qortexRtdProvider.js create mode 100644 modules/qortexRtdProvider.md create mode 100644 modules/qtBidAdapter.js create mode 100644 modules/qtBidAdapter.md create mode 100644 modules/r2b2BidAdapter.js create mode 100644 modules/r2b2BidAdapter.md delete mode 100644 modules/rasBidAdapter.js create mode 100644 modules/raynRtdProvider.js create mode 100644 modules/raynRtdProvider.md create mode 100644 modules/relevatehealthBidAdapter.js create mode 100644 modules/relevatehealthBidAdapter.md create mode 100644 modules/rewardedInterestIdSystem.js create mode 100644 modules/rewardedInterestIdSystem.md mode change 100755 => 100644 modules/richaudienceBidAdapter.js create mode 100644 modules/ringieraxelspringerBidAdapter.js rename modules/{rasBidAdapter.md => ringieraxelspringerBidAdapter.md} (88%) create mode 100644 modules/rixengineBidAdapter.js create mode 100644 modules/rixengineBidAdapter.md create mode 100644 modules/setupadBidAdapter.js create mode 100644 modules/setupadBidAdapter.md create mode 100644 modules/sharethroughAnalyticsAdapter.md create mode 100644 modules/shinezRtbBidAdapter.js create mode 100644 modules/shinezRtbBidAdapter.md delete mode 100644 modules/sigmoidAnalyticsAdapter.js create mode 100644 modules/silvermobBidAdapter.js create mode 100644 modules/silvermobBidAdapter.md create mode 100644 modules/smartyadsAnalyticsAdapter.js create mode 100644 modules/smartyadsAnalyticsAdapter.md create mode 100644 modules/smootBidAdapter.js create mode 100644 modules/smootBidAdapter.md delete mode 100644 modules/sonobiAnalyticsAdapter.js delete mode 100644 modules/sovrnAnalyticsAdapter.js delete mode 100644 modules/sovrnAnalyticsAdapter.md create mode 100644 modules/sparteoBidAdapter.js create mode 100644 modules/sparteoBidAdapter.md delete mode 100644 modules/spotxBidAdapter.js delete mode 100644 modules/spotxBidAdapter.md create mode 100644 modules/ssp_genieeBidAdapter.js create mode 100644 modules/ssp_genieeBidAdapter.md delete mode 100644 modules/staqAnalyticsAdapter.js create mode 100644 modules/stnBidAdapter.js create mode 100644 modules/stnBidAdapter.md create mode 100644 modules/symitriAnalyticsAdapter.js create mode 100644 modules/symitriAnalyticsAdapter.md create mode 100644 modules/symitriDapRtdProvider.js create mode 100644 modules/symitriDapRtdProvider.md create mode 100644 modules/tagorasBidAdapter.js create mode 100644 modules/tagorasBidAdapter.md create mode 100644 modules/tapnativeBidAdapter.js create mode 100644 modules/tapnativeBidAdapter.md create mode 100644 modules/targetVideoAdServerVideo.js create mode 100644 modules/targetVideoAdServerVideo.md rename modules/{gdprEnforcement.js => tcfControl.js} (91%) create mode 100644 modules/themoneytizerBidAdapter.js create mode 100644 modules/themoneytizerBidAdapter.md create mode 100644 modules/topLevelPaapi.js create mode 100644 modules/twistDigitalBidAdapter.js create mode 100644 modules/twistDigitalBidAdapter.md rename modules/{utiqSystem.js => utiqIdSystem.js} (83%) rename modules/{utiqSystem.md => utiqIdSystem.md} (54%) create mode 100644 modules/utiqMtpIdSystem.js create mode 100644 modules/utiqMtpIdSystem.md create mode 100644 modules/wurflRtdProvider.js create mode 100644 modules/wurflRtdProvider.md rename modules/{yahoosspBidAdapter.js => yahooAdsBidAdapter.js} (97%) rename modules/{yahoosspBidAdapter.md => yahooAdsBidAdapter.md} (96%) create mode 100644 modules/yandexAnalyticsAdapter.js create mode 100644 modules/yandexAnalyticsAdapter.md create mode 100644 modules/yandexIdSystem.js create mode 100644 modules/zmaticooBidAdapter.js create mode 100644 modules/zmaticooBidAdapter.md create mode 100644 plugins/eslint/index.js create mode 100644 src/banner.js create mode 100644 src/constants.js delete mode 100644 src/constants.json create mode 100644 src/creativeRenderers.js create mode 100644 src/prebid.public.js create mode 100644 src/types/ortb2.d.ts create mode 100644 src/utils/focusTimeout.js rename src/utils/{gpdr.js => gdpr.js} (72%) create mode 100644 src/utils/ipUtils.js create mode 100644 test/helpers/cookies.js delete mode 100644 test/helpers/karma-init.js create mode 100644 test/mocks/ortbConverter.js create mode 100644 test/pages/banner_sync.html create mode 100644 test/pipeline_setup.js create mode 100644 test/spec/ajax_spec.js create mode 100644 test/spec/banner_spec.js create mode 100644 test/spec/creative/crossDomainCreative_spec.js create mode 100644 test/spec/creative/displayRenderer_spec.js create mode 100644 test/spec/creative/nativeRenderer_spec.js rename test/spec/fpd/{oneClient.js => oneClient_spec.js} (100%) create mode 100644 test/spec/libraries/precisoUtils/bidNativeUtils_spec.js create mode 100644 test/spec/libraries/precisoUtils/bidUtilsCommon_spec.js create mode 100644 test/spec/libraries/precisoUtils/bidUtils_spec.js create mode 100644 test/spec/libraries/processResponse_spec.js create mode 100644 test/spec/libraries/teqblazeUtils/bidderUtils_spec.js create mode 100644 test/spec/libraries/userAgentUtils_spec.js create mode 100644 test/spec/libraries/vastTrackers_spec.js create mode 100644 test/spec/libraries/weakStore_spec.js create mode 100644 test/spec/modules/33acrossAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/51DegreesRtdProvider_spec.js rename test/spec/modules/{prebidmanagerAnalyticsAdapter_spec.js => AsteriobidPbmAnalyticsAdapter_spec.js} (96%) create mode 100644 test/spec/modules/BTBidAdapter_spec.js create mode 100644 test/spec/modules/ad2ictionBidAdapter_spec.js create mode 100644 test/spec/modules/adagioRtdProvider_spec.js delete mode 100755 test/spec/modules/adbookpspBidAdapter_spec.js create mode 100644 test/spec/modules/adbutlerBidAdapter_spec.js create mode 100644 test/spec/modules/adgridBidAdapter_spec.js delete mode 100644 test/spec/modules/adomikAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/ads_interactiveBidAdapter_spec.js create mode 100644 test/spec/modules/adspiritBidAdapter_spec.js create mode 100644 test/spec/modules/adstirBidAdapter_spec.js create mode 100644 test/spec/modules/advRedAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/adverxoBidAdapter_spec.js create mode 100644 test/spec/modules/agmaAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/ampliffyBidAdapter_spec.js create mode 100644 test/spec/modules/anPspParamsConverter_spec.js create mode 100644 test/spec/modules/anonymisedRtdProvider_spec.js create mode 100644 test/spec/modules/anyclipBidAdapter_spec.js create mode 100644 test/spec/modules/asteriobidAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/azerionedgeRtdProvider_spec.js create mode 100644 test/spec/modules/bidResponseFilter_spec.js create mode 100644 test/spec/modules/bidmaticBidAdapter_spec.js create mode 100644 test/spec/modules/bidtheatreBidAdapter_spec.js delete mode 100644 test/spec/modules/bizzclickBidAdapter_spec.js create mode 100644 test/spec/modules/blastoBidAdapter_spec.js delete mode 100644 test/spec/modules/bluebillywigBidAdapter_spec.js delete mode 100644 test/spec/modules/brightcomBidAdapter_spec.js delete mode 100644 test/spec/modules/britepoolIdSystem_spec.js create mode 100644 test/spec/modules/ceeIdSystem_spec.js create mode 100644 test/spec/modules/colombiaBidAdapter_spec.js create mode 100644 test/spec/modules/contxtfulBidAdapter_spec.js create mode 100644 test/spec/modules/contxtfulRtdProvider_spec.js create mode 100644 test/spec/modules/copper6sspBidAdapter_spec.js rename test/spec/modules/{cpexIdSystem_spec.js => czechAdIdSystem_spec.js} (54%) create mode 100644 test/spec/modules/dailymotionBidAdapter_spec.js create mode 100644 test/spec/modules/dexertoBidAdapter_spec.js create mode 100644 test/spec/modules/dfpAdpod_spec.js create mode 100644 test/spec/modules/digitalMatterBidAdapter_spec.js create mode 100644 test/spec/modules/djaxBidAdapter_spec.js create mode 100644 test/spec/modules/docereeAdManagerBidAdapter_spec.js create mode 100644 test/spec/modules/driftpixelBidAdapter_spec.js create mode 100644 test/spec/modules/dsaControl_spec.js create mode 100644 test/spec/modules/dsp_genieeBidAdapter_spec.js create mode 100644 test/spec/modules/dynamicAdBoostRtdProvider_spec.js delete mode 100644 test/spec/modules/ebdrBidAdapter_spec.js create mode 100644 test/spec/modules/eclickadsBidAdapter_spec.js create mode 100644 test/spec/modules/edge226BidAdapter_spec.js create mode 100644 test/spec/modules/ehealthcaresolutionsBidAdapter_spec.js create mode 100644 test/spec/modules/eightPodAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/eightPodBidAdapter_spec.js delete mode 100644 test/spec/modules/enrichmentFpdModule_spec.js delete mode 100644 test/spec/modules/eplanningAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/equativBidAdapter_spec.js create mode 100644 test/spec/modules/exadsBidAdapter_spec.js create mode 100644 test/spec/modules/excoBidAdapter_spec.js create mode 100644 test/spec/modules/fanAdapter_spec.js delete mode 100644 test/spec/modules/fledgeForGpt_spec.js create mode 100644 test/spec/modules/gameraRtdProvider_spec.js create mode 100755 test/spec/modules/goldfishAdsRtdProvider_spec.js create mode 100644 test/spec/modules/humansecurityRtdProvider_spec.js delete mode 100644 test/spec/modules/idWardRtdProvider_spec.js create mode 100644 test/spec/modules/illuminBidAdapter_spec.js create mode 100644 test/spec/modules/inmobiBidAdapter_spec.js create mode 100644 test/spec/modules/intentIqAnalyticsAdapter_spec.js delete mode 100644 test/spec/modules/iqmBidAdapter_spec.js create mode 100644 test/spec/modules/iqxBidAdapter_spec.js create mode 100644 test/spec/modules/jwplayerBidAdapter_spec.js create mode 100644 test/spec/modules/kimberliteBidAdapter_spec.js create mode 100644 test/spec/modules/kinessoIdSystem_spec.js create mode 100644 test/spec/modules/liveIntentExternalIdSystem_spec.js create mode 100644 test/spec/modules/lm_kiviadsBidAdapter_spec.js create mode 100644 test/spec/modules/lmpIdSystem_spec.js create mode 100644 test/spec/modules/lockrAIMIdSystem_spec.js create mode 100644 test/spec/modules/loyalBidAdapter_spec.js create mode 100755 test/spec/modules/luceadBidAdapter_spec.js create mode 100644 test/spec/modules/mediaConsortiumBidAdapter_spec.js create mode 100644 test/spec/modules/mediabramaBidAdapter_spec.js create mode 100644 test/spec/modules/mediafilterRtdProvider_spec.js create mode 100644 test/spec/modules/mediaimpactBidAdapter_spec.js create mode 100644 test/spec/modules/mobianRtdProvider_spec.js create mode 100644 test/spec/modules/mygaruIdSystem_spec.js delete mode 100644 test/spec/modules/mytargetBidAdapter_spec.js create mode 100644 test/spec/modules/netIdSystem_spec.js create mode 100644 test/spec/modules/nexverseBidAdapter_spec.js rename test/spec/modules/{brightcomSSPBidAdapter_spec.js => omsBidAdapter_spec.js} (69%) create mode 100644 test/spec/modules/opscoBidAdapter_spec.js create mode 100644 test/spec/modules/optableBidAdapter_spec.js create mode 100644 test/spec/modules/orakiBidAdapter_spec.js create mode 100644 test/spec/modules/ownadxBidAdapter_spec.js create mode 100644 test/spec/modules/paapiForGpt_spec.js create mode 100644 test/spec/modules/paapi_spec.js delete mode 100644 test/spec/modules/parrableIdSystem_spec.js create mode 100644 test/spec/modules/performaxBidAdapter_spec.js create mode 100644 test/spec/modules/permutiveIdentityManagerIdSystem_spec.js create mode 100644 test/spec/modules/playdigoBidAdapter_spec.js create mode 100644 test/spec/modules/programmaticaBidAdapter_spec.js create mode 100644 test/spec/modules/pstudioBidAdapter_spec.js create mode 100644 test/spec/modules/publirBidAdapter_spec.js create mode 100644 test/spec/modules/pubriseBidAdapter_spec.js create mode 100644 test/spec/modules/pubxaiRtdProvider_spec.js create mode 100644 test/spec/modules/qortexRtdProvider_spec.js create mode 100644 test/spec/modules/qtBidAdapter_spec.js create mode 100644 test/spec/modules/r2b2BidAdapter_spec.js delete mode 100644 test/spec/modules/rasBidAdapter_spec.js create mode 100644 test/spec/modules/raynRtdProvider_spec.js create mode 100644 test/spec/modules/relevatehealthBidAdapter_spec.js create mode 100644 test/spec/modules/rewardedInterestIdSystem_spec.js create mode 100644 test/spec/modules/ringieraxelspringerBidAdapter_spec.js create mode 100644 test/spec/modules/rixengineBidAdapter_spec.js create mode 100644 test/spec/modules/setupadBidAdapter_spec.js create mode 100644 test/spec/modules/shinezRtbBidAdapter_spec.js delete mode 100644 test/spec/modules/sigmoidAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/silvermobBidAdapter_spec.js create mode 100644 test/spec/modules/smartyadsAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/smootBidAdapter_spec.js delete mode 100644 test/spec/modules/sonobiAnalyticsAdapter_spec.js delete mode 100644 test/spec/modules/sovrnAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/sparteoBidAdapter_spec.js delete mode 100644 test/spec/modules/spotxBidAdapter_spec.js create mode 100644 test/spec/modules/ssp_genieeBidAdapter_spec.js delete mode 100644 test/spec/modules/staqAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/stnBidAdapter_spec.js create mode 100644 test/spec/modules/symitriAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/symitriDapRtdProvider_spec.js rename test/spec/modules/{minutemediaplusBidAdapter_spec.js => tagorasBidAdapter_spec.js} (90%) create mode 100644 test/spec/modules/tapnativeBidAdapter_spec.js create mode 100644 test/spec/modules/targetVideoAdServerVideo_spec.js rename test/spec/modules/{gdprEnforcement_spec.js => tcfControl_spec.js} (96%) create mode 100644 test/spec/modules/themoneytizerBidAdapter_spec.js create mode 100644 test/spec/modules/topLevelPaapi_spec.js create mode 100644 test/spec/modules/twistDigitalBidAdapter_spec.js create mode 100644 test/spec/modules/unifiedIdSystem_spec.js rename test/spec/modules/{utiqSystem_spec.js => utiqIdSystem_spec.js} (72%) create mode 100644 test/spec/modules/utiqMtpIdSystem_spec.js create mode 100644 test/spec/modules/videoModule/submodules/adplayerproVideoProvider_spec.js create mode 100644 test/spec/modules/wurflRtdProvider_spec.js rename test/spec/modules/{yahoosspBidAdapter_spec.js => yahooAdsBidAdapter_spec.js} (94%) create mode 100644 test/spec/modules/yandexAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/yandexIdSystem_spec.js create mode 100644 test/spec/modules/zmaticooBidAdapter_spec.js create mode 100644 test/spec/ortbConverter/common_spec.js delete mode 100644 test/spec/ortbConverter/userId_spec.js create mode 100644 test/spec/schainSerializer/schainSerializer_spec.js create mode 100644 test/spec/unit/adRendering_spec.js create mode 100644 test/spec/unit/utils/focusTimeout_spec.js create mode 100644 test/spec/unit/utils/ipUtils_spec.js create mode 100644 wdio.local.conf.js create mode 100644 wdio.shared.conf.js create mode 100644 webpack.creative.js create mode 100644 webpack.debugging.js diff --git a/.circleci/config.yml b/.circleci/config.yml index 84ddcdf26ea..dcf2ba804c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ aliases: - &environment docker: # specify the version you desire here - - image: circleci/node:12.16.1-browsers + - image: cimg/node:20.14.0-browsers resource_class: xlarge # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images @@ -18,8 +18,6 @@ aliases: - &restore_dep_cache keys: - v1-dependencies-{{ checksum "package.json" }} - # fallback to using the latest cache if no exact match is found - - v1-dependencies- - &save_dep_cache paths: diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 69e13850258..9b1bb6e39cf 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT="12" +ARG VARIANT="20" FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT} RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarn-archive-keyring.gpg diff --git a/.eslintrc.js b/.eslintrc.js index fc3ad3afe66..5b69afa019f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -11,12 +11,25 @@ module.exports = { node: { moduleDirectory: ['node_modules', './'] } + }, + 'jsdoc': { + mode: 'typescript', + tagNamePreference: { + 'tag constructor': 'constructor', + extends: 'extends', + method: 'method', + return: 'return', + } } }, - extends: 'standard', + extends: [ + 'standard', + 'plugin:jsdoc/recommended' + ], plugins: [ 'prebid', - 'import' + 'import', + 'jsdoc' ], globals: { 'BROWSERSTACK_USERNAME': false, @@ -29,6 +42,7 @@ module.exports = { sourceType: 'module', ecmaVersion: 2018, }, + ignorePatterns: ['libraries/creative-renderer*'], rules: { 'comma-dangle': 'off', @@ -46,6 +60,25 @@ module.exports = { 'no-undef': 2, 'no-useless-escape': 'off', 'no-console': 'error', + 'jsdoc/check-types': 'off', + 'jsdoc/no-defaults': 'off', + 'jsdoc/newline-after-description': 'off', + 'jsdoc/require-jsdoc': 'off', + 'jsdoc/require-param': 'off', + 'jsdoc/require-param-description': 'off', + 'jsdoc/require-param-name': 'off', + 'jsdoc/require-param-type': 'off', + 'jsdoc/require-property': 'off', + 'jsdoc/require-property-description': 'off', + 'jsdoc/require-property-name': 'off', + 'jsdoc/require-property-type': 'off', + 'jsdoc/require-returns': 'off', + 'jsdoc/require-returns-check': 'off', + 'jsdoc/require-returns-description': 'off', + 'jsdoc/require-returns-type': 'off', + 'jsdoc/require-yields': 'off', + 'jsdoc/require-yields-check': 'off', + 'jsdoc/tag-lines': 'off' }, overrides: Object.keys(allowedModules).map((key) => ({ files: key + '/**/*.js', @@ -57,11 +90,48 @@ module.exports = { name: 'require', message: 'use import instead' } + ], + 'prebid/no-global': [ + 'error', + ...['localStorage', 'sessionStorage'].map(name => ({name, message: 'use storageManager instead'})), + { + name: 'XMLHttpRequest', + message: 'use ajax.js instead' + }, + ], + 'prebid/no-member': [ + 'error', + { + name: 'cookie', + target: 'document', + message: 'use storageManager instead' + }, + { + name: 'sendBeacon', + target: 'navigator', + message: 'use ajax.js instead' + }, + ...['outerText', 'innerText'].map(name => ({ + name, + message: 'use .textContent instead' + })) ] } })).concat([{ // code in other packages (such as plugins/eslint) is not "seen" by babel and its parser will complain. files: 'plugins/*/**/*.js', parser: 'esprima' + }, { + files: '**BidAdapter.js', + rules: { + 'no-restricted-imports': [ + 'error', { + patterns: [ + '**/src/events.js', + '**/src/adloader.js' + ] + } + ] + } }]) }; diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 09ef5c445f2..367ace94d37 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -16,7 +16,8 @@ For any user facing change, submit a link to a PR on the docs repo at https://gi - [ ] Bugfix - [ ] Feature -- [ ] New bidder adapter +- [ ] New bidder adapter +- [ ] Updated bidder adapter - [ ] Code style update (formatting, local variables) - [ ] Refactoring (no functional changes, no api changes) - [ ] Build related changes @@ -40,7 +41,7 @@ For any user facing change, submit a link to a PR on the docs repo at https://gi } ``` -Be sure to test the integration with your adserver using the [Hello World](/integrationExamples/gpt/hello_world.html) sample page. --> +Be sure to test the integration with your adserver using the [Hello World](https://github.com/prebid/Prebid.js/blob/master/integrationExamples/gpt/hello_world.html) sample page. --> ## Other information diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml index 2e8465003e4..8d3788e8956 100644 --- a/.github/codeql/codeql-config.yml +++ b/.github/codeql/codeql-config.yml @@ -2,3 +2,6 @@ paths: - src - modules - libraries +queries: + - name: Prebid queries + uses: ./.github/codeql/queries diff --git a/.github/codeql/queries/deviceMemory.ql b/.github/codeql/queries/deviceMemory.ql new file mode 100644 index 00000000000..6f650abf0e1 --- /dev/null +++ b/.github/codeql/queries/deviceMemory.ql @@ -0,0 +1,14 @@ +/** + * @id prebid/device-memory + * @name Access to navigator.deviceMemory + * @kind problem + * @problem.severity warning + * @description Finds uses of deviceMemory + */ + +import prebid + +from SourceNode nav +where + nav = windowPropertyRead("navigator") +select nav.getAPropertyRead("deviceMemory"), "deviceMemory is an indicator of fingerprinting" diff --git a/.github/codeql/queries/hardwareConcurrency.ql b/.github/codeql/queries/hardwareConcurrency.ql new file mode 100644 index 00000000000..350dbd1ae81 --- /dev/null +++ b/.github/codeql/queries/hardwareConcurrency.ql @@ -0,0 +1,14 @@ +/** + * @id prebid/hardware-concurrency + * @name Access to navigator.hardwareConcurrency + * @kind problem + * @problem.severity warning + * @description Finds uses of hardwareConcurrency + */ + +import prebid + +from SourceNode nav +where + nav = windowPropertyRead("navigator") +select nav.getAPropertyRead("hardwareConcurrency"), "hardwareConcurrency is an indicator of fingerprinting" diff --git a/.github/codeql/queries/prebid.qll b/.github/codeql/queries/prebid.qll new file mode 100644 index 00000000000..02fb5adc93c --- /dev/null +++ b/.github/codeql/queries/prebid.qll @@ -0,0 +1,36 @@ +import javascript +import DataFlow + +SourceNode otherWindow() { + result = globalVarRef("top") or + result = globalVarRef("self") or + result = globalVarRef("parent") or + result = globalVarRef("frames").getAPropertyRead() or + result = DOM::documentRef().getAPropertyRead("defaultView") +} + +SourceNode connectedWindow(SourceNode win) { + result = win.getAPropertyRead("self") or + result = win.getAPropertyRead("top") or + result = win.getAPropertyRead("parent") or + result = win.getAPropertyRead("frames").getAPropertyRead() or + result = win.getAPropertyRead("document").getAPropertyRead("defaultView") +} + +SourceNode relatedWindow(SourceNode win) { + result = connectedWindow(win) or + result = relatedWindow+(connectedWindow(win)) +} + +SourceNode anyWindow() { + result = otherWindow() or + result = relatedWindow(otherWindow()) +} + +/* + Matches uses of property `prop` done on any window object. +*/ +SourceNode windowPropertyRead(string prop) { + result = globalVarRef(prop) or + result = anyWindow().getAPropertyRead(prop) +} diff --git a/.github/codeql/queries/qlpack.yml b/.github/codeql/queries/qlpack.yml new file mode 100644 index 00000000000..72e90d3de9b --- /dev/null +++ b/.github/codeql/queries/qlpack.yml @@ -0,0 +1,8 @@ +--- +library: false +warnOnImplicitThis: false +name: queries +version: 0.0.1 +dependencies: + codeql/javascript-all: ^1.1.1 + codeql/javascript-queries: ^1.1.0 diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index a3246cffd6d..5876dfa0138 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,6 +1,10 @@ name-template: 'Prebid $RESOLVED_VERSION Release' tag-template: '$RESOLVED_VERSION' +autolabeler: + - label: 'maintenance' + title: + - '/^(?!.*(bug|initial|release|fix)).*$/i' categories: - title: '🚀 New Features' label: 'feature' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 84c97376a3e..3bee8f7c947 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} config-file: ./.github/codeql/codeql-config.yml @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -70,4 +70,4 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/issue_tracker.yml b/.github/workflows/issue_tracker.yml index a55e5f05cb8..b5c59c85160 100644 --- a/.github/workflows/issue_tracker.yml +++ b/.github/workflows/issue_tracker.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Generate token id: generate_token - uses: tibdex/github-app-token@0914d50df753bbc42180d982a6550f195390069f + uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a with: app_id: ${{ secrets.ISSUE_APP_ID }} private_key: ${{ secrets.ISSUE_APP_PEM }} diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml new file mode 100644 index 00000000000..de5f1408dff --- /dev/null +++ b/.github/workflows/jscpd.yml @@ -0,0 +1,124 @@ +name: Check for Duplicated Code + +on: + pull_request_target: + branches: + - master + +jobs: + check-duplication: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch all history for all branches + ref: ${{ github.event.pull_request.head.sha }} + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: Install dependencies + run: | + npm install -g jscpd diff-so-fancy + + - name: Create jscpd config file + run: | + echo '{ + "threshold": 20, + "minTokens": 100, + "reporters": [ + "json" + ], + "output": "./", + "pattern": "**/*.js", + "ignore": "**/*spec.js" + }' > .jscpd.json + + - name: Run jscpd on entire codebase + run: jscpd + + - name: Fetch base and target branches + run: | + git fetch origin +refs/heads/${{ github.event.pull_request.base.ref }}:refs/remotes/origin/${{ github.event.pull_request.base.ref }} + git fetch origin +refs/pull/${{ github.event.pull_request.number }}/merge:refs/remotes/pull/${{ github.event.pull_request.number }}/merge + + - name: Get the diff + run: git diff --name-only origin/${{ github.event.pull_request.base.ref }}...refs/remotes/pull/${{ github.event.pull_request.number }}/merge > changed_files.txt + + - name: List generated files (debug) + run: ls -l + + - name: Upload unfiltered jscpd report + if: always() + uses: actions/upload-artifact@v4 + with: + name: unfiltered-jscpd-report + path: ./jscpd-report.json + + - name: Filter jscpd report for changed files + run: | + if [ ! -f ./jscpd-report.json ]; then + echo "jscpd-report.json not found" + exit 1 + fi + echo "Filtering jscpd report for changed files..." + CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' changed_files.txt) + echo "Changed files: $CHANGED_FILES" + jq --argjson changed_files "$CHANGED_FILES" ' + .duplicates | map(select( + (.firstFile?.name as $fname | $changed_files | any(. == $fname)) or + (.secondFile?.name as $sname | $changed_files | any(. == $sname)) + )) + ' ./jscpd-report.json > filtered-jscpd-report.json + cat filtered-jscpd-report.json + + - name: Check if filtered jscpd report exists + id: check_filtered_report + run: | + if [ $(wc -l < ./filtered-jscpd-report.json) -gt 1 ]; then + echo "filtered_report_exists=true" >> $GITHUB_ENV + else + echo "filtered_report_exists=false" >> $GITHUB_ENV + fi + + - name: Upload filtered jscpd report + if: env.filtered_report_exists == 'true' + uses: actions/upload-artifact@v4 + with: + name: filtered-jscpd-report + path: ./filtered-jscpd-report.json + + - name: Post GitHub comment + if: env.filtered_report_exists == 'true' + uses: actions/github-script@v7 + with: + script: | + const fs = require('fs'); + const filteredReport = JSON.parse(fs.readFileSync('filtered-jscpd-report.json', 'utf8')); + let comment = "Whoa there, partner! 🌵🤠 We wrangled some duplicated code in your PR:\n\n"; + function link(dup) { + return `https://github.com/${{ github.event.repository.full_name }}/blob/${{ github.event.pull_request.head.sha }}/${dup.name}#L${dup.start + 1}-L${dup.end - 1}` + } + filteredReport.forEach(duplication => { + const firstFile = duplication.firstFile; + const secondFile = duplication.secondFile; + const lines = duplication.lines; + comment += `- [\`${firstFile.name}\`](${link(firstFile)}) has ${lines} duplicated lines with [\`${secondFile.name}\`](${link(secondFile)})\n`; + }); + comment += "\nReducing code duplication by importing common functions from a library not only makes our code cleaner but also easier to maintain. Please move the common code from both files into a library and import it in each. We hate that we have to mention this, however, commits designed to hide from this utility by renaming variables or reordering an object are poor conduct. We will not look upon them kindly! Keep up the great work! 🚀"; + github.rest.issues.createComment({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + body: comment + }); + + - name: Fail if duplications are found + if: env.filtered_report_exists == 'true' + run: | + echo "Duplications found, failing the check." + exit 1 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml new file mode 100644 index 00000000000..03ef6478f1c --- /dev/null +++ b/.github/workflows/linter.yml @@ -0,0 +1,110 @@ +name: Check for linter warnings / exceptions + +on: + pull_request_target: + branches: + - master + +jobs: + check-linter: + runs-on: ubuntu-latest + + steps: + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.base.sha }} + + - name: Fetch base and target branches + run: | + git fetch origin +refs/heads/${{ github.event.pull_request.base.ref }}:refs/remotes/origin/${{ github.event.pull_request.base.ref }} + git fetch origin +refs/pull/${{ github.event.pull_request.number }}/merge:refs/remotes/pull/${{ github.event.pull_request.number }}/merge + + - name: Install dependencies + run: npm ci + + - name: Get the diff + run: git diff --name-only origin/${{ github.event.pull_request.base.ref }}...refs/remotes/pull/${{ github.event.pull_request.number }}/merge | grep '^\(modules\|src\|libraries\|creative\)/.*\.js$' > __changed_files.txt || true + + - name: Run linter on base branch + run: npx eslint --no-inline-config --format json $(cat __changed_files.txt | xargs stat --printf '%n\n' 2> /dev/null) > __base.json || true + + - name: Check out PR + run: git checkout ${{ github.event.pull_request.head.sha }} + + - name: Install dependencies + run: npm ci + + - name: Run linter on PR + run: npx eslint --no-inline-config --format json $(cat __changed_files.txt | xargs stat --printf '%n\n' 2> /dev/null) > __pr.json || true + + - name: Compare them and post comment if necessary + uses: actions/github-script@v7 + with: + script: | + const fs = require('fs'); + const path = require('path'); + const process = require('process'); + + function parse(fn) { + return JSON.parse(fs.readFileSync(fn)).reduce((memo, data) => { + const file = path.relative(process.cwd(), data.filePath); + if (!memo.hasOwnProperty(file)) { memo[file] = { errors: 0, warnings: 0} } + data.messages.forEach(({severity}) => { + memo[file][severity > 1 ? 'errors' : 'warnings']++; + }); + return memo; + }, {}) + } + + function mkDiff(old, new_) { + const files = Object.fromEntries( + Object.entries(new_) + .map(([file, {errors, warnings}]) => { + const {errors: oldErrors, warnings: oldWarnings} = old[file] || {}; + return [file, {errors: Math.max(0, errors - (oldErrors ?? 0)), warnings: Math.max(0, warnings - (oldWarnings ?? 0))}] + }) + .filter(([_, {errors, warnings}]) => errors > 0 || warnings > 0) + ) + return Object.values(files).reduce((memo, {warnings, errors}) => { + memo.errors += errors; + memo.warnings += warnings; + return memo; + }, {errors: 0, warnings: 0, files}) + } + + function mkComment({errors, warnings, files}) { + function pl(noun, number) { + return noun + (number === 1 ? '' : 's') + } + if (errors === 0 && warnings === 0) return; + const summary = []; + if (errors) summary.push(`**${errors}** linter ${pl('error', errors)}`) + if (warnings) summary.push(`**${warnings}** linter ${pl('warning', warnings)}`) + let cm = `Tread carefully! This PR adds ${summary.join(' and ')} (possibly disabled through directives):\n\n`; + Object.entries(files).forEach(([file, {errors, warnings}]) => { + const summary = []; + if (errors) summary.push(`+${errors} ${pl('error', errors)}`); + if (warnings) summary.push(`+${warnings} ${pl('warning', warnings)}`) + cm += ` * \`${file}\` (${summary.join(', ')})\n` + }) + return cm; + } + + const [base, pr] = ['__base.json', '__pr.json'].map(parse); + const comment = mkComment(mkDiff(base, pr)); + + if (comment) { + github.rest.issues.createComment({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + body: comment + }); + } diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index a13237f1290..a14e12664b6 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: # Drafts your next Release notes as Pull Requests are merged into "master" - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter.yml env: diff --git a/.nvmrc b/.nvmrc index 66df3b7ab2d..f203ab89b79 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -12.16.1 +20.13.1 diff --git a/PR_REVIEW.md b/PR_REVIEW.md index 45ca30a7a3d..f6a2c157d2d 100644 --- a/PR_REVIEW.md +++ b/PR_REVIEW.md @@ -23,10 +23,11 @@ General gulp commands include separate commands for serving the codebase on a bu - Checkout the branch (these instructions are available on the GitHub PR page as well). - Verify PR is a single change type. Example, refactor OR bugfix. If more than 1 type, ask submitter to break out requests. - Verify code under review has at least 80% unit test coverage. If legacy code doesn't have enough unit test coverage, require that additional unit tests to be included in the PR. -- Verify tests are green in Travis-ci + local build by running `gulp serve` | `gulp test` +- Verify tests are green in circle-ci + local build by running `gulp serve` | `gulp test` - Verify no code quality violations are present from linting (should be reported in terminal) - Make sure the code is not setting cookies or localstorage directly -- it must use the `StorageManager`. - Review for obvious errors or bad coding practice / use best judgement here. +- Don't allow needless code duplication with other js files; require both files import common code. Do not allow commits designed to fool the code duplication checker. - If the change is a new feature / change to core prebid.js - review the change with a Tech Lead on the project and make sure they agree with the nature of change. - If the change results in needing updates to docs (such as public API change, module interface etc), add a label for "needs docs" and inform the submitter they must submit a docs PR to update the appropriate area of Prebid.org **before the PR can merge**. Help them with finding where the docs are located on prebid.org if needed. - If all above is good, add a `LGTM` comment and, if the change is in PBS-core or is an important module like the prebidServerBidAdapter, request 1 additional core member to review. @@ -51,21 +52,21 @@ Follow steps above for general review process. In addition, please verify the fo - If the adapter being submitted is an alias type, check with the bidder contact that is being aliased to make sure it's allowed. - All bidder parameter conventions must be followed: - Video params must be read from AdUnit.mediaTypes.video when available; however bidder config can override the ad unit. - - First party data must be read from [getConfig('ortb2');](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-fpd). + - First party data must be read from the bid request object: bidrequest.ortb2 - Adapters that accept a floor parameter must also support the [floors module](https://docs.prebid.org/dev-docs/modules/floors.html) -- look for a call to the `getFloor()` function. - Adapters cannot accept an schain parameter. Rather, they must look for the schain parameter at bidRequest.schain. - The bidderRequest.refererInfo.referer must be checked in addition to any bidder-specific parameter. - - If they're getting the COPPA flag, it must come from config.getConfig('coppa'); - Page position must come from bidrequest.mediaTypes.banner.pos or bidrequest.mediaTypes.video.pos - - Global OpenRTB fields should come from [getConfig('ortb2');](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-fpd): + - Eids object is to be preferred to Userids object in the bid request, as the userid object may be removed in a future version + - Global OpenRTB fields should come from bidrequest.ortb2 - bcat, battr, badv - Impression-specific OpenRTB fields should come from bidrequest.ortb2imp - instl - Below are some examples of bidder specific updates that should require docs update (in their dev-docs/bidders/BIDDER.md file): - - If they support the GDPR consentManagement module and TCF1, add `gdpr_supported: true` - - If they support the GDPR consentManagement module and TCF2, add `tcf2_supported: true` + - If they support the TCF consentManagementTcf module and TCF2, add `tcf2_supported: true` - If they support the US Privacy consentManagementUsp module, add `usp_supported: true` - - If they support one or more userId modules, add `userId: (list of supported vendors)` + - If they support the GPP consentManagementGpp module, add `gpp_supported: true` + - If they support one or more userId modules, add `userId: (list of supported vendors) or (all)` - If they support video and/or native mediaTypes add `media_types: video, native`. Note that display is added by default. If you don't support display, add "no-display" as the first entry, e.g. `media_types: no-display, native` - If they support COPPA, add `coppa_supported: true` - If they support SChain, add `schain_supported: true` @@ -101,7 +102,7 @@ Follow steps above for general review process. In addition: - modules/userId/userId.md - tests can go either within the userId_spec.js file or in their own _spec file if they wish - GVLID is recommended in the *IdSystem file if they operate in EU -- make sure example configurations align to the actual code (some modules use the userId storage settings and allow pub configuration, while others handle reading/writing cookies on their own, so should not include the storage params in examples) +- make sure example configurations align to the actual code (some modules use the userId storage settings and allow pub configuration, while others handle reading/writing cookies on their own, so should not include the storage params in examples). This ability to write will be removed in a future version, see https://github.com/prebid/Prebid.js/issues/10710 - the 3 available methods (getId, extendId, decode) should be used as they were intended - decode (required method) should not be making requests to retrieve a new ID, it should just be decoding a response - extendId (optional method) should not be making requests to retrieve a new ID, it should just be adding additional data to the id object @@ -122,6 +123,7 @@ Follow steps above for general review process. In addition: - Confirm that the module - is not loading external code. If it is, escalate to the #prebid-js Slack channel. - is reading `config` from the function signature rather than calling `getConfig`. + - Is practicing reasonable data minimization, eg not sending all eids over the wire without publisher whitelisting - is sending data to the bid request only as either First Party Data or in bidRequest.rtd.RTDPROVIDERCODE. - is making HTTPS requests as early as possible, but not more often than needed. - doesn't force bid adapters to load additional code. diff --git a/README.md b/README.md index 58007519b15..65dc668164e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://circleci.com/gh/prebid/Prebid.js.svg?style=svg)](https://circleci.com/gh/prebid/Prebid.js) -[![Percentage of issues still open](http://isitmaintained.com/badge/open/prebid/Prebid.js.svg)](http://isitmaintained.com/project/prebid/Prebid.js "Percentage of issues still open") +[![Percentage of issues still open](http://isitmaintained.com/badge/open/prebid/Prebid.js.svg)](https://isitmaintained.com/project/prebid/Prebid.js "Percentage of issues still open") [![Coverage Status](https://coveralls.io/repos/github/prebid/Prebid.js/badge.svg)](https://coveralls.io/github/prebid/Prebid.js) # Prebid.js @@ -7,8 +7,8 @@ > A free and open source library for publishers to quickly implement header bidding. This README is for developers who want to contribute to Prebid.js. -Additional documentation can be found at [the Prebid homepage](http://prebid.org). -Working examples can be found in [the developer docs](http://prebid.org/dev-docs/getting-started.html). +Additional documentation can be found at [the Prebid.js documentation homepage](https://docs.prebid.org/prebid/prebidjs.html). +Working examples can be found in [the developer docs](https://prebid.org/dev-docs/getting-started.html). Prebid.js is open source software that is offered for free as a convenience. While it is designed to help companies address legal requirements associated with header bidding, we cannot and do not warrant that your use of Prebid.js will satisfy legal requirements. You are solely responsible for ensuring that your use of Prebid.js complies with all applicable laws. We strongly encourage you to obtain legal advice when using Prebid.js to ensure your implementation complies with all laws where you operate. @@ -26,7 +26,7 @@ Prebid.js is open source software that is offered for free as a convenience. Whi *Note:* Requires Prebid.js v1.38.0+ -Prebid.js depends on Babel and some Babel Plugins in order to run correctly in the browser. Here are some examples for +Prebid.js depends on Babel and some Babel Plugins in order to run correctly in the browser. Here are some examples for configuring webpack to work with Prebid.js. With Babel 7: @@ -37,7 +37,7 @@ module.exports = { mode: 'production', module: { rules: [ - + // this rule can be excluded if you don't require babel-loader for your other application files { test: /\.m?js$/, @@ -46,7 +46,7 @@ module.exports = { loader: 'babel-loader', } }, - + // this separate rule is required to make sure that the Prebid.js files are babel-ified. this rule will // override the regular exclusion from above (for being inside node_modules). { @@ -71,7 +71,7 @@ Or for Babel 6: // you must manually install and specify the presets and plugins yourself options: { plugins: [ - "transform-object-assign", // required (for IE support) and "babel-plugin-transform-object-assign" + "transform-object-assign", // required (for IE support) and "babel-plugin-transform-object-assign" // must be installed as part of your package. require('prebid.js/plugins/pbjsGlobals.js') // required! ], @@ -79,7 +79,7 @@ Or for Babel 6: ["env", { // you can use other presets if you wish. "targets": { // this example is using "babel-presets-env", which must be installed if you "browsers": [ // follow this example. - ... // your browser targets. they should probably match the targets you're using for the rest + ... // your browser targets. they should probably match the targets you're using for the rest // of your application ] } @@ -143,7 +143,7 @@ This will run testing but not linting. A web server will start at `http://localh Development may be a bit slower but if you prefer linting and additional watch files you can also still run just: - $ gulp serve + $ gulp serve ### Build Optimization @@ -162,11 +162,11 @@ Building with just these adapters will result in a smaller bundle which should a - Then run the build: $ gulp build --modules=openxBidAdapter,rubiconBidAdapter,sovrnBidAdapter - + Alternatively, a `.json` file can be specified that contains a list of modules you would like to include. $ gulp build --modules=modules.json - + With `modules.json` containing the following ```json modules.json [ @@ -202,7 +202,7 @@ gulp bundle --tag one --modules=one.json gulp bundle --tag two --modules=two.json ``` -This generates slightly larger files, but has the advantage of being much faster to run (after the initial `gulp build`). It's also the method used by [the Prebid.org download page](https://docs.prebid.org/download.html). +This generates slightly larger files, but has the advantage of being much faster to run (after the initial `gulp build`). It's also the method used by [the Prebid.org download page](https://docs.prebid.org/download.html). @@ -229,6 +229,16 @@ Or, if you are consuming Prebid through npm, with the `disableFeatures` option i **Note**: this is still a work in progress - at the moment, `NATIVE` is the only feature that can be disabled this way, resulting in a minimal decrease in size (but you can expect that to improve over time). +## Unminified code + +You can get a version of the code that's unminified for debugging with `build-bundle-dev`: + +```bash +gulp build-bundle-dev --modules=bidderA,module1,... +``` + +The results will be in build/dev/prebid.js. + ## Test locally To lint the code: @@ -237,6 +247,12 @@ To lint the code: gulp lint ``` +To lint and only show errors + +```bash +gulp lint --no-lint-warnings +``` + To run the unit tests: ```bash @@ -245,7 +261,7 @@ gulp test To run the unit tests for a particular file (example for pubmaticBidAdapter_spec.js): ```bash -gulp test --file "test/spec/modules/pubmaticBidAdapter_spec.js" +gulp test --file "test/spec/modules/pubmaticBidAdapter_spec.js" --nolint ``` To generate and view the code coverage reports: @@ -255,6 +271,12 @@ gulp test-coverage gulp view-coverage ``` +Local end-to-end testing can be done with: + +```bash +gulp e2e-test --local +``` + For Prebid.org members with access to BrowserStack, additional end-to-end testing can be done with: ```bash @@ -352,11 +374,11 @@ The results will be in *Note*: Starting in June 2016, all pull requests to Prebid.js need to include tests with greater than 80% code coverage before they can be merged. For more information, see [#421](https://github.com/prebid/Prebid.js/issues/421). -For instructions on writing tests for Prebid.js, see [Testing Prebid.js](http://prebid.org/dev-docs/testing-prebid.html). +For instructions on writing tests for Prebid.js, see [Testing Prebid.js](https://prebid.org/dev-docs/testing-prebid.html). ### Supported Browsers -Prebid.js is supported on IE11 and modern browsers until 5.x. 6.x+ transpiles to target >0.25%; not Opera Mini; not IE11. +Prebid.js is supported on IE11 and modern browsers until 5.x. 6.x+ transpiles to target >0.25%; not Opera Mini; not IE11. ### Governance Review our governance model [here](https://github.com/prebid/Prebid.js/tree/master/governance.md). diff --git a/RELEASE_SCHEDULE.md b/RELEASE_SCHEDULE.md index 45f4e6c7dc5..016e3e71cfc 100644 --- a/RELEASE_SCHEDULE.md +++ b/RELEASE_SCHEDULE.md @@ -9,7 +9,7 @@ ## Release Schedule -We aim to push a new release of Prebid.js every week on Tuesday. +We aim to push a new release of Prebid.js each week barring any unforseen circumstances or in observance of holidays. While the releases will be available immediately for those using direct Git access, it will be about a week before the Prebid Org [Download Page](https://docs.prebid.org/download.html) will be updated. diff --git a/allowedModules.js b/allowedModules.js index 3e6e3039fa2..dbcae2db2cc 100644 --- a/allowedModules.js +++ b/allowedModules.js @@ -1,22 +1,17 @@ -const sharedWhiteList = [ -]; - module.exports = { 'modules': [ - ...sharedWhiteList, - 'criteo-direct-rsa-validate', 'crypto-js', 'live-connect' // Maintained by LiveIntent : https://github.com/liveintent-berlin/live-connect/ ], 'src': [ - ...sharedWhiteList, 'fun-hooks/no-eval', - 'just-clone', + 'klona', 'dlv', 'dset' ], 'libraries': [ - ...sharedWhiteList // empty for now, but keep it to enable linting + ], + 'creative': [ ] }; diff --git a/browsers.json b/browsers.json index bd6bd5772d6..0649a13e873 100644 --- a/browsers.json +++ b/browsers.json @@ -1,39 +1,39 @@ { - "bs_edge_latest_windows_10": { + "bs_edge_latest_windows_11": { "base": "BrowserStack", - "os_version": "10", + "os_version": "11", "browser": "edge", "browser_version": "latest", "device": null, "os": "Windows" }, - "bs_chrome_latest_windows_10": { + "bs_chrome_latest_windows_11": { "base": "BrowserStack", - "os_version": "10", + "os_version": "11", "browser": "chrome", "browser_version": "latest", "device": null, "os": "Windows" }, - "bs_chrome_87_windows_10": { + "bs_chrome_107_windows_10": { "base": "BrowserStack", "os_version": "10", "browser": "chrome", - "browser_version": "87.0", + "browser_version": "107.0", "device": null, "os": "Windows" }, - "bs_firefox_latest_windows_10": { + "bs_firefox_latest_windows_11": { "base": "BrowserStack", - "os_version": "10", + "os_version": "11", "browser": "firefox", "browser_version": "latest", "device": null, "os": "Windows" }, - "bs_safari_latest_mac_bigsur": { + "bs_safari_latest_mac": { "base": "BrowserStack", - "os_version": "Big Sur", + "os_version": "Sonoma", "browser": "safari", "browser_version": "latest", "device": null, @@ -41,11 +41,11 @@ }, "bs_safari_15_catalina": { "base": "BrowserStack", - "os_version": "Catalina", + "os_version": "Monterey", "browser": "safari", - "browser_version": "13.1", + "browser_version": "15.6", "device": null, "os": "OS X" } - + } diff --git a/creative/README.md b/creative/README.md new file mode 100644 index 00000000000..76f0be833e3 --- /dev/null +++ b/creative/README.md @@ -0,0 +1,44 @@ +## Dynamic creative renderers + +The contents of this directory are compiled separately from the rest of Prebid, and intended to be dynamically injected +into creative frames: + +- `crossDomain.js` (compiled into `build/creative/creative.js`, also exposed in `integrationExamples/gpt/x-domain/creative.html`) + is the logic that should be statically set up in the creative. +- At build time, each folder under 'renderers' is compiled into a source string made available from a corresponding +`creative-renderer-*` library. These libraries are committed in source so that they are available to NPM consumers. +- At render time, Prebid passes the appropriate renderer's source string to the remote creative, which then runs it. + +The goal is to have a creative script that is as simple, lightweight, and unchanging as possible, but still allow the possibility +of complex or frequently updated rendering logic. Compared to the approach taken by [PUC](https://github.com/prebid/prebid-universal-creative), this: + +- should perform marginally better: the creative only runs logic that is pertinent (for example, it sees native logic only on native bids); +- avoids the problem of synchronizing deployments when the rendering logic is updated (see https://github.com/prebid/prebid-universal-creative/issues/187), since it's bundled together with the rest of Prebid; +- is easier to embed directly in the creative (saving a network call), since the static "shell" is designed to change as infrequently as possible; +- allows the same rendering logic to be used both in remote (cross-domain) and local (`pbjs.renderAd`) frames, since it's directly available to Prebid; +- requires Prebid.js - meaning it does not support AMP/App/Mobile (but it's still possible for something like PUC to run the same dynamic renderers + when it receives them from Prebid, and fall back to separate AMP/App/Mobile logic otherwise). + +### Renderer interface + +A creative renderer (not related to other types of renderers in the codebase) is a script that exposes a global `window.render` function: + +```javascript +window.render = function(data, {mkFrame, sendMessage}, win) { ... } +``` + +where: + + - `data` is rendering data about the winning bid, and varies depending on the bid type - see `getRenderingData` in `adRendering.js`; + - `mkFrame(document, attributes)` is a utility that creates a frame with the given attributes and convenient defaults (no border, margin, and scrolling); + - `sendMessage(messageType, payload)` is the mechanism by which the renderer/creative can communicate back with Prebid - see `creativeMessageHandler` in `adRendering.js`; + - `win` is the window to render into; note that this is not the same window that runs the renderer. + +The function may return a promise; if it does and the promise rejects, or if the function throws, an AD_RENDER_FAILED event is emitted in Prebid. Otherwise an AD_RENDER_SUCCEEDED is fired +when the promise resolves (or when `render` returns anything other than a promise). + +### Renderer development + +Since renderers are compiled into source, they use production settings even during development builds. You can toggle this with +the `--creative-dev` CLI option (e.g., `gulp serve-fast --creative-dev`), which disables the minifier and generates source maps; if you do, take care +to not commit the resulting `creative-renderer-*` libraries (or run a normal build before you do). diff --git a/creative/constants.js b/creative/constants.js new file mode 100644 index 00000000000..5f807c69f87 --- /dev/null +++ b/creative/constants.js @@ -0,0 +1,10 @@ +// eslint-disable-next-line prebid/validate-imports +import {AD_RENDER_FAILED_REASON, EVENTS, MESSAGES} from '../src/constants.js'; + +export {PB_LOCATOR} from '../src/constants.js'; +export const MESSAGE_REQUEST = MESSAGES.REQUEST; +export const MESSAGE_RESPONSE = MESSAGES.RESPONSE; +export const MESSAGE_EVENT = MESSAGES.EVENT; +export const EVENT_AD_RENDER_FAILED = EVENTS.AD_RENDER_FAILED; +export const EVENT_AD_RENDER_SUCCEEDED = EVENTS.AD_RENDER_SUCCEEDED; +export const ERROR_EXCEPTION = AD_RENDER_FAILED_REASON.EXCEPTION; diff --git a/creative/crossDomain.js b/creative/crossDomain.js new file mode 100644 index 00000000000..d3524f61d4b --- /dev/null +++ b/creative/crossDomain.js @@ -0,0 +1,107 @@ +import { + ERROR_EXCEPTION, + EVENT_AD_RENDER_FAILED, + EVENT_AD_RENDER_SUCCEEDED, + MESSAGE_EVENT, + MESSAGE_REQUEST, + MESSAGE_RESPONSE, + PB_LOCATOR +} from './constants.js'; + +const mkFrame = (() => { + const DEFAULTS = { + frameBorder: 0, + scrolling: 'no', + marginHeight: 0, + marginWidth: 0, + topMargin: 0, + leftMargin: 0, + allowTransparency: 'true', + }; + return (doc, attrs) => { + const frame = doc.createElement('iframe'); + Object.entries(Object.assign({}, attrs, DEFAULTS)) + .forEach(([k, v]) => frame.setAttribute(k, v)); + return frame; + }; +})(); + +function isPrebidWindow(win) { + return !!win.frames[PB_LOCATOR]; +} + +export function renderer(win) { + let target = win.parent; + try { + while (target !== win.top && !isPrebidWindow(target)) { + target = target.parent; + } + if (!isPrebidWindow(target)) target = win.parent; + } catch (e) { + } + + return function ({adId, pubUrl, clickUrl}) { + const pubDomain = new URL(pubUrl, window.location).origin; + + function sendMessage(type, payload, responseListener) { + const channel = new MessageChannel(); + channel.port1.onmessage = guard(responseListener); + target.postMessage(JSON.stringify(Object.assign({message: type, adId}, payload)), pubDomain, [channel.port2]); + } + + function onError(e) { + sendMessage(MESSAGE_EVENT, { + event: EVENT_AD_RENDER_FAILED, + info: { + reason: e?.reason || ERROR_EXCEPTION, + message: e?.message + } + }); + // eslint-disable-next-line no-console + e?.stack && console.error(e); + } + + function guard(fn) { + return function () { + try { + return fn.apply(this, arguments); + } catch (e) { + onError(e); + } + }; + } + + function onMessage(ev) { + let data; + try { + data = JSON.parse(ev.data); + } catch (e) { + return; + } + if (data.message === MESSAGE_RESPONSE && data.adId === adId) { + const renderer = mkFrame(win.document, { + width: 0, + height: 0, + style: 'display: none', + srcdoc: `` + }); + renderer.onload = guard(function () { + const W = renderer.contentWindow; + // NOTE: on Firefox, `Promise.resolve(P)` or `new Promise((resolve) => resolve(P))` + // does not appear to work if P comes from another frame + W.Promise.resolve(W.render(data, {sendMessage, mkFrame}, win)).then( + () => sendMessage(MESSAGE_EVENT, {event: EVENT_AD_RENDER_SUCCEEDED}), + onError + ); + }); + win.document.body.appendChild(renderer); + } + } + + sendMessage(MESSAGE_REQUEST, { + options: {clickUrl} + }, onMessage); + }; +} + +window.pbRender = renderer(window); diff --git a/creative/renderers/display/constants.js b/creative/renderers/display/constants.js new file mode 100644 index 00000000000..2493fb2d163 --- /dev/null +++ b/creative/renderers/display/constants.js @@ -0,0 +1,4 @@ +// eslint-disable-next-line prebid/validate-imports +import { AD_RENDER_FAILED_REASON } from '../../../src/constants.js'; + +export const ERROR_NO_AD = AD_RENDER_FAILED_REASON.NO_AD; diff --git a/creative/renderers/display/renderer.js b/creative/renderers/display/renderer.js new file mode 100644 index 00000000000..e031679b116 --- /dev/null +++ b/creative/renderers/display/renderer.js @@ -0,0 +1,21 @@ +import {ERROR_NO_AD} from './constants.js'; + +export function render({ad, adUrl, width, height}, {mkFrame}, win) { + if (!ad && !adUrl) { + throw { + reason: ERROR_NO_AD, + message: 'Missing ad markup or URL' + }; + } else { + const doc = win.document; + const attrs = {width, height}; + if (adUrl && !ad) { + attrs.src = adUrl; + } else { + attrs.srcdoc = ad; + } + doc.body.appendChild(mkFrame(doc, attrs)); + } +} + +window.render = render; diff --git a/creative/renderers/native/constants.js b/creative/renderers/native/constants.js new file mode 100644 index 00000000000..b82e2d1d54e --- /dev/null +++ b/creative/renderers/native/constants.js @@ -0,0 +1,14 @@ +// eslint-disable-next-line prebid/validate-imports +import { MESSAGES } from '../../../src/constants.js'; + +export const MESSAGE_NATIVE = MESSAGES.NATIVE; +export const ACTION_RESIZE = 'resizeNativeHeight'; +export const ACTION_CLICK = 'click'; +export const ACTION_IMP = 'fireNativeImpressionTrackers'; + +export const ORTB_ASSETS = { + title: 'text', + data: 'value', + img: 'url', + video: 'vasttag' +} diff --git a/creative/renderers/native/renderer.js b/creative/renderers/native/renderer.js new file mode 100644 index 00000000000..5cc8f100108 --- /dev/null +++ b/creative/renderers/native/renderer.js @@ -0,0 +1,88 @@ +import {ACTION_CLICK, ACTION_IMP, ACTION_RESIZE, MESSAGE_NATIVE, ORTB_ASSETS} from './constants.js'; + +export function getReplacer(adId, {assets = [], ortb, nativeKeys = {}}) { + const assetValues = Object.fromEntries((assets).map(({key, value}) => [key, value])); + let repl = Object.fromEntries( + Object.entries(nativeKeys).flatMap(([name, key]) => { + const value = assetValues.hasOwnProperty(name) ? assetValues[name] : undefined; + return [ + [`##${key}##`, value], + [`${key}:${adId}`, value] + ]; + }) + ); + if (ortb) { + Object.assign(repl, + { + '##hb_native_linkurl##': ortb.link?.url, + '##hb_native_privacy##': ortb.privacy + }, + Object.fromEntries( + (ortb.assets || []).flatMap(asset => { + const type = Object.keys(ORTB_ASSETS).find(type => asset[type]); + return [ + type && [`##hb_native_asset_id_${asset.id}##`, asset[type][ORTB_ASSETS[type]]], + asset.link?.url && [`##hb_native_asset_link_id_${asset.id}##`, asset.link.url] + ].filter(e => e); + }) + ) + ); + } + repl = Object.entries(repl).concat([[/##hb_native_asset_(link_)?id_\d+##/g]]); + + return function (template) { + return repl.reduce((text, [pattern, value]) => text.replaceAll(pattern, value || ''), template); + }; +} + +function loadScript(url, doc) { + return new Promise((resolve, reject) => { + const script = doc.createElement('script'); + script.onload = resolve; + script.onerror = reject; + script.src = url; + doc.body.appendChild(script); + }); +} + +export function getAdMarkup(adId, nativeData, replacer, win, load = loadScript) { + const {rendererUrl, assets, ortb, adTemplate} = nativeData; + const doc = win.document; + if (rendererUrl) { + return load(rendererUrl, doc).then(() => { + if (typeof win.renderAd !== 'function') { + throw new Error(`Renderer from '${rendererUrl}' does not define renderAd()`); + } + const payload = assets || []; + payload.ortb = ortb; + return win.renderAd(payload); + }); + } else { + return Promise.resolve(replacer(adTemplate ?? doc.body.innerHTML)); + } +} + +export function render({adId, native}, {sendMessage}, win, getMarkup = getAdMarkup) { + const {head, body} = win.document; + const resize = () => sendMessage(MESSAGE_NATIVE, { + action: ACTION_RESIZE, + height: body.offsetHeight, + width: body.offsetWidth + }); + const replacer = getReplacer(adId, native); + head && (head.innerHTML = replacer(head.innerHTML)); + return getMarkup(adId, native, replacer, win).then(markup => { + body.innerHTML = markup; + if (typeof win.postRenderAd === 'function') { + win.postRenderAd({adId, ...native}); + } + win.document.querySelectorAll('.pb-click').forEach(el => { + const assetId = el.getAttribute('hb_native_asset_id'); + el.addEventListener('click', () => sendMessage(MESSAGE_NATIVE, {action: ACTION_CLICK, assetId})); + }); + sendMessage(MESSAGE_NATIVE, {action: ACTION_IMP}); + win.document.readyState === 'complete' ? resize() : win.onload = resize; + }); +} + +window.render = render; diff --git a/features.json b/features.json index ccb2166a05f..4d8377cda7d 100644 --- a/features.json +++ b/features.json @@ -1,4 +1,5 @@ [ "NATIVE", - "VIDEO" + "VIDEO", + "UID2_CSTG" ] diff --git a/gulpfile.js b/gulpfile.js index 09de874e389..a32a2d11ce6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -11,6 +11,7 @@ var webpackStream = require('webpack-stream'); var gulpClean = require('gulp-clean'); var opens = require('opn'); var webpackConfig = require('./webpack.conf.js'); +const standaloneDebuggingConfig = require('./webpack.debugging.js'); var helpers = require('./gulpHelpers.js'); var concat = require('gulp-concat'); var replace = require('gulp-replace'); @@ -25,6 +26,8 @@ const path = require('path'); const execa = require('execa'); const {minify} = require('terser'); const Vinyl = require('vinyl'); +const wrap = require('gulp-wrap'); +const rename = require('gulp-rename'); var prebid = require('./package.json'); var port = 9999; @@ -52,6 +55,18 @@ function clean() { .pipe(gulpClean()); } +function requireNodeVersion(version) { + return (done) => { + const [major] = process.versions.node.split('.'); + + if (major < version) { + throw new Error(`This task requires Node v${version}`) + } + + done(); + } +} + // Dependant task for building postbid. It escapes postbid-config file. function escapePostbidConfig() { gulp.src('./integrationExamples/postbid/oas/postbid-config.js') @@ -71,12 +86,13 @@ function lint(done) { 'src/**/*.js', 'modules/**/*.js', 'libraries/**/*.js', + 'creative/**/*.js', 'test/**/*.js', 'plugins/**/*.js', '!plugins/**/node_modules/**', './*.js' ], { base: './' }) - .pipe(gulpif(argv.nolintfix, eslint(), eslint({ fix: true }))) + .pipe(eslint({ fix: !argv.nolintfix, quiet: !(typeof argv.lintWarnings === 'boolean' ? argv.lintWarnings : true) })) .pipe(eslint.format('stylish')) .pipe(eslint.failAfterError()) .pipe(gulpif(isFixed, gulp.dest('./'))); @@ -112,21 +128,26 @@ function viewReview(done) { viewReview.displayName = 'view-review'; -function makeDevpackPkg() { - var cloned = _.cloneDeep(webpackConfig); - Object.assign(cloned, { - devtool: 'source-map', - mode: 'development' - }) - - const babelConfig = require('./babelConfig.js')({disableFeatures: helpers.getDisabledFeatures(), prebidDistUrlBase: argv.distUrlBase || '/build/dev/'}); - - // update babel config to set local dist url - cloned.module.rules - .flatMap((rule) => rule.use) - .filter((use) => use.loader === 'babel-loader') - .forEach((use) => use.options = Object.assign({}, use.options, babelConfig)); +function makeVerbose(config = webpackConfig) { + return _.merge({}, config, { + optimization: { + minimizer: [ + new TerserPlugin({ + parallel: true, + terserOptions: { + mangle: false, + format: { + comments: 'all' + } + }, + extractComments: false, + }), + ], + } + }); +} +function prebidSource(webpackCfg) { var externalModules = helpers.getArgModules(); const analyticsSources = helpers.getAnalyticsSources(); @@ -134,30 +155,76 @@ function makeDevpackPkg() { return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js')) .pipe(helpers.nameModules(externalModules)) - .pipe(webpackStream(cloned, webpack)) - .pipe(gulp.dest('build/dev')) - .pipe(connect.reload()); + .pipe(webpackStream(webpackCfg, webpack)); +} + +function makeDevpackPkg(config = webpackConfig) { + return function() { + var cloned = _.cloneDeep(config); + Object.assign(cloned, { + devtool: 'source-map', + mode: 'development' + }) + + const babelConfig = require('./babelConfig.js')({disableFeatures: helpers.getDisabledFeatures(), prebidDistUrlBase: argv.distUrlBase || '/build/dev/'}); + + // update babel config to set local dist url + cloned.module.rules + .flatMap((rule) => rule.use) + .filter((use) => use.loader === 'babel-loader') + .forEach((use) => use.options = Object.assign({}, use.options, babelConfig)); + + return prebidSource(cloned) + .pipe(gulp.dest('build/dev')) + .pipe(connect.reload()); + } } -function makeWebpackPkg(extraConfig = {}) { - var cloned = _.merge(_.cloneDeep(webpackConfig), extraConfig); +function makeWebpackPkg(config = webpackConfig) { + var cloned = _.cloneDeep(config) if (!argv.sourceMaps) { delete cloned.devtool; } return function buildBundle() { - var externalModules = helpers.getArgModules(); - - const analyticsSources = helpers.getAnalyticsSources(); - const moduleSources = helpers.getModulePaths(externalModules); - - return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js')) - .pipe(helpers.nameModules(externalModules)) - .pipe(webpackStream(cloned, webpack)) + return prebidSource(cloned) .pipe(gulp.dest('build/dist')); } } +function buildCreative(mode = 'production') { + const opts = {mode}; + if (mode === 'development') { + opts.devtool = 'inline-source-map' + } + return function() { + return gulp.src(['**/*']) + .pipe(webpackStream(Object.assign(require('./webpack.creative.js'), opts))) + .pipe(gulp.dest('build/creative')) + } +} + +function updateCreativeRenderers() { + return gulp.src(['build/creative/renderers/**/*']) + .pipe(wrap('// this file is autogenerated, see creative/README.md\nexport const RENDERER = <%= JSON.stringify(contents.toString()) %>')) + .pipe(rename(function (path) { + return { + dirname: `creative-renderer-${path.basename}`, + basename: 'renderer', + extname: '.js' + } + })) + .pipe(gulp.dest('libraries')) +} + +function updateCreativeExample(cb) { + const CREATIVE_EXAMPLE = 'integrationExamples/gpt/x-domain/creative.html'; + const root = require('node-html-parser').parse(fs.readFileSync(CREATIVE_EXAMPLE)); + root.querySelectorAll('script')[0].textContent = fs.readFileSync('build/creative/creative.js') + fs.writeFileSync(CREATIVE_EXAMPLE, root.toString()) + cb(); +} + function getModulesListToAddInBanner(modules) { if (!modules || modules.length === helpers.getModuleNames().length) { return 'All available modules for this version.' @@ -247,8 +314,7 @@ function bundle(dev, moduleArr) { [coreFile].concat(moduleFiles).map(name => path.basename(name)).forEach((file) => { (depGraph[file] || []).forEach((dep) => dependencies.add(helpers.getBuiltPath(dev, dep))); }); - - const entries = [coreFile].concat(Array.from(dependencies), moduleFiles); + const entries = _.uniq([coreFile].concat(Array.from(dependencies), moduleFiles)); var outputFileName = argv.bundleName ? argv.bundleName : 'prebid.js'; @@ -279,7 +345,7 @@ function bundle(dev, moduleArr) { // If --notest is given, it will immediately skip the test task (useful for developing changes with `gulp serve --notest`) function testTaskMaker(options = {}) { - ['watch', 'e2e', 'file', 'browserstack', 'notest'].forEach(opt => { + ['watch', 'file', 'browserstack', 'notest'].forEach(opt => { options[opt] = options.hasOwnProperty(opt) ? options[opt] : argv[opt]; }) @@ -288,22 +354,6 @@ function testTaskMaker(options = {}) { return function test(done) { if (options.notest) { done(); - } else if (options.e2e) { - const integ = startIntegServer(); - startLocalServer(); - runWebdriver(options) - .then(stdout => { - // kill fake server - integ.kill('SIGINT'); - done(); - process.exit(0); - }) - .catch(err => { - // kill fake server - integ.kill('SIGINT'); - done(new Error(`Tests failed with error: ${err}`)); - process.exit(1); - }); } else { runKarma(options, done) } @@ -312,10 +362,34 @@ function testTaskMaker(options = {}) { const test = testTaskMaker(); +function e2eTestTaskMaker() { + return function test(done) { + const integ = startIntegServer(); + startLocalServer(); + runWebdriver({}) + .then(stdout => { + // kill fake server + integ.kill('SIGINT'); + done(); + process.exit(0); + }) + .catch(err => { + // kill fake server + integ.kill('SIGINT'); + done(new Error(`Tests failed with error: ${err}`)); + process.exit(1); + }); + } +} + function runWebdriver({file}) { process.env.TEST_SERVER_HOST = argv.host || 'localhost'; + + let local = argv.local || false; + + let wdioConfFile = local === true ? 'wdio.local.conf.js' : 'wdio.conf.js'; let wdioCmd = path.join(__dirname, 'node_modules/.bin/wdio'); - let wdioConf = path.join(__dirname, 'wdio.conf.js'); + let wdioConf = path.join(__dirname, wdioConfFile); let wdioOpts; if (file) { @@ -336,7 +410,9 @@ function runKarma(options, done) { // the karma server appears to leak memory; starting it multiple times in a row will run out of heap // here we run it in a separate process to bypass the problem options = Object.assign({browsers: helpers.parseBrowserArgs(argv)}, options) - const child = fork('./karmaRunner.js'); + const child = fork('./karmaRunner.js', null, { + env: Object.assign({}, options.env, process.env) + }); child.on('exit', (exitCode) => { if (exitCode) { done(new Error('Karma tests failed with exit code ' + exitCode)); @@ -349,7 +425,15 @@ function runKarma(options, done) { // If --file "" is given, the task will only run tests in the specified file. function testCoverage(done) { - runKarma({coverage: true, browserstack: false, watch: false, file: argv.file}, done); + runKarma({ + coverage: true, + browserstack: false, + watch: false, + file: argv.file, + env: { + NODE_OPTIONS: '--max-old-space-size=8096' + } + }, done); } function coveralls() { // 2nd arg is a dependency: 'test' must be finished @@ -391,7 +475,15 @@ function startLocalServer(options = {}) { port: port, host: INTEG_SERVER_HOST, root: './', - livereload: options.livereload + livereload: options.livereload, + middleware: function () { + return [ + function (req, res, next) { + res.setHeader('Ad-Auction-Allowed', 'True'); + next(); + } + ]; + } }); } @@ -405,6 +497,9 @@ function watchTaskMaker(options = {}) { return function watch(done) { var mainWatcher = gulp.watch([ 'src/**/*.js', + 'libraries/**/*.js', + '!libraries/creative-renderer-*/**/*.js', + 'creative/**/*.js', 'modules/**/*.js', ].concat(options.alsoWatch)); @@ -426,38 +521,26 @@ gulp.task(clean); gulp.task(escapePostbidConfig); -gulp.task('build-bundle-dev', gulp.series(makeDevpackPkg, gulpBundle.bind(null, true))); -gulp.task('build-bundle-prod', gulp.series(makeWebpackPkg(), gulpBundle.bind(null, false))); +gulp.task('build-creative-dev', gulp.series(buildCreative(argv.creativeDev ? 'development' : 'production'), updateCreativeRenderers)); +gulp.task('build-creative-prod', gulp.series(buildCreative(), updateCreativeRenderers)); + +gulp.task('build-bundle-dev', gulp.series('build-creative-dev', makeDevpackPkg(standaloneDebuggingConfig), makeDevpackPkg(), gulpBundle.bind(null, true))); +gulp.task('build-bundle-prod', gulp.series('build-creative-prod', makeWebpackPkg(standaloneDebuggingConfig), makeWebpackPkg(), gulpBundle.bind(null, false))); // build-bundle-verbose - prod bundle except names and comments are preserved. Use this to see the effects // of dead code elimination. -gulp.task('build-bundle-verbose', gulp.series(makeWebpackPkg({ - optimization: { - minimizer: [ - new TerserPlugin({ - parallel: true, - terserOptions: { - mangle: false, - format: { - comments: 'all' - } - }, - extractComments: false, - }), - ], - } -}), gulpBundle.bind(null, false))); +gulp.task('build-bundle-verbose', gulp.series('build-creative-dev', makeWebpackPkg(makeVerbose(standaloneDebuggingConfig)), makeWebpackPkg(makeVerbose()), gulpBundle.bind(null, true))); // public tasks (dependencies are needed for each task since they can be ran on their own) gulp.task('test-only', test); gulp.task('test-all-features-disabled', testTaskMaker({disableFeatures: require('./features.json'), oneBrowser: 'chrome', watch: false})); -gulp.task('test', gulp.series(clean, lint, gulp.series('test-all-features-disabled', 'test-only'))); +gulp.task('test', gulp.series(clean, lint, 'test-all-features-disabled', 'test-only')); gulp.task('test-coverage', gulp.series(clean, testCoverage)); gulp.task(viewCoverage); gulp.task('coveralls', gulp.series('test-coverage', coveralls)); -gulp.task('build', gulp.series(clean, 'build-bundle-prod')); +gulp.task('build', gulp.series(clean, 'build-bundle-prod', updateCreativeExample)); gulp.task('build-postbid', gulp.series(escapePostbidConfig, buildPostbid)); gulp.task('serve', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, test))); @@ -469,8 +552,9 @@ gulp.task('serve-e2e-dev', gulp.series(clean, 'build-bundle-dev', gulp.parallel( gulp.task('default', gulp.series(clean, 'build-bundle-prod')); -gulp.task('e2e-test-only', () => runWebdriver({file: argv.file})); -gulp.task('e2e-test', gulp.series(clean, 'build-bundle-prod', testTaskMaker({e2e: true}))); +gulp.task('e2e-test-only', gulp.series(requireNodeVersion(16), () => runWebdriver({file: argv.file}))); +gulp.task('e2e-test', gulp.series(requireNodeVersion(16), clean, 'build-bundle-prod', e2eTestTaskMaker())); + // other tasks gulp.task(bundleToStdout); gulp.task('bundle', gulpBundle.bind(null, false)); // used for just concatenating pre-built files with no build step diff --git a/integrationExamples/gpt/51DegreesRtdProvider_example.html b/integrationExamples/gpt/51DegreesRtdProvider_example.html new file mode 100644 index 00000000000..7864f2e05f5 --- /dev/null +++ b/integrationExamples/gpt/51DegreesRtdProvider_example.html @@ -0,0 +1,195 @@ + + + + + + + + + + + + 51Degrees RTD submodule example - Prebid.js + + +

51Degrees RTD submodule - example of usage

+ +

div-banner-native-1

+
+

No response

+ +
+ +

div-banner-native-2

+
+

No response

+ +
+ +
+

Testing/Debugging Guidance

+
    +
  1. Make sure you have debug: true under pbjs.setConfig in this example code (be sure to remove it for production!) +
  2. Make sure you have replaced <YOUR RESOURCE KEY> in this example code with the one you have obtained + from the 51Degrees Configurator Tool
    3. +
  3. Open DevTools Console in your browser and refresh the page
    4. +
  4. Observe the enriched ortb device data shown below and also in the console as part of the [51Degrees RTD Submodule]: reqBidsConfigObj: message (under reqBidsConfigObj.global.device)
    5. +
+
+ + + diff --git a/integrationExamples/gpt/adnuntius_example.html b/integrationExamples/gpt/adnuntius_example.html index b61c4e0674e..541a5888f3b 100644 --- a/integrationExamples/gpt/adnuntius_example.html +++ b/integrationExamples/gpt/adnuntius_example.html @@ -17,7 +17,7 @@ bidder: 'adnuntius', params: { auId: "201208", - network: "adnuntius", + network: "1287", bidType: 'netBid' } }] @@ -50,6 +50,12 @@ } }); + pbjs.bidderSettings = { + standard: { + storageAllowed: true + } + }; + pbjs.addAdUnits(adUnits); pbjs.requestBids({bidsBackHandler: initAdserver}); }); diff --git a/integrationExamples/gpt/adnuntius_multiformat_example.html b/integrationExamples/gpt/adnuntius_multiformat_example.html new file mode 100644 index 00000000000..87b30d5887a --- /dev/null +++ b/integrationExamples/gpt/adnuntius_multiformat_example.html @@ -0,0 +1,132 @@ + + + + + + + +

Adnuntius NATIVE

+
Ad Slot 1
+ + +
+ +
+ + + diff --git a/integrationExamples/gpt/idward_segments_example.html b/integrationExamples/gpt/anonymised_segments_example.html similarity index 96% rename from integrationExamples/gpt/idward_segments_example.html rename to integrationExamples/gpt/anonymised_segments_example.html index 9bc06124c77..16f3f879636 100644 --- a/integrationExamples/gpt/idward_segments_example.html +++ b/integrationExamples/gpt/anonymised_segments_example.html @@ -23,7 +23,6 @@ } } ] - }]; var pbjs = pbjs || {}; @@ -46,17 +45,18 @@ ortb2: { user: { data: [ - // ID Ward segment taxonomy inserted here + // Anonymised segment taxonomy inserted here ] }, }, realTimeData: { dataProviders: [ { - name: "idWard", + name: "anonymised", params: { cohortStorageKey: "cohort_ids", - + bidders: ['smartadserver', 'appnexus'], + segtax: 1000 } } ] diff --git a/integrationExamples/gpt/azerionedgeRtdProvider_example.html b/integrationExamples/gpt/azerionedgeRtdProvider_example.html new file mode 100644 index 00000000000..e85ab705235 --- /dev/null +++ b/integrationExamples/gpt/azerionedgeRtdProvider_example.html @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + +

Azerion Edge RTD

+ +
+ +
+ + Segments: +
+ + diff --git a/integrationExamples/gpt/contxtfulRtdProvider_example.html b/integrationExamples/gpt/contxtfulRtdProvider_example.html new file mode 100644 index 00000000000..e47bd4142f9 --- /dev/null +++ b/integrationExamples/gpt/contxtfulRtdProvider_example.html @@ -0,0 +1,212 @@ + + + + + +Contxtful Rtd Provider Example + + + +

Contxtful Rtd Provider Example

+ +

+ +
Div-1
+
+ +
+ +
+ +
Div-2
+
+ +
+ + diff --git a/integrationExamples/gpt/creative_rendering.html b/integrationExamples/gpt/creative_rendering.html deleted file mode 100644 index 04d4736c631..00000000000 --- a/integrationExamples/gpt/creative_rendering.html +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/integrationExamples/gpt/cstg_example.html b/integrationExamples/gpt/cstg_example.html new file mode 100644 index 00000000000..2ca8b43b9de --- /dev/null +++ b/integrationExamples/gpt/cstg_example.html @@ -0,0 +1,317 @@ + + + + + UID2 and EUID Prebid.js Integration Example + + + + +

UID2 and EUID Prebid.js Integration Examples

+ +

+ This example demonstrates how a content publisher can integrate with UID2 and Prebid.js using the UID2 Client-Side Integration Guide for Prebid.js, which includes generating UID2 tokens within the browser.
+ This example is configured to hit endpoints at https://operator-integ.uidapi.com. Calls to this endpoint will be rejected if made from localhost.
+ A working sample subscription_id and client_key are declared in the javascript. Please override them in set[Uid2|Euid]Config() to test with your own CSTG credentials.
+ Note Generation of UID2 after EUID will fail due to consent settings on pbjs config. + +

+ +

UID2 Example

+
+ + + + + + + + + + + + + +
CSTG Subscription Id:
CSTG Public Key:
Email Address (DII):
+            
+          

+
+      

+      

+        
+          
+            
+            
+          
+          
+            
+            
+          
+        
Ready for Targeted Advertising:
UID2 Advertising Token:

+      

+      
+    

+    

+    

+    
EUID Example

+    

+      
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+      
CSTG Subscription Id:
CSTG Public Key:
Email Address (DII):
+            
+          

+
+      

+      

+        
+          
+            
+            
+          
+          
+            
+            
+          
+        
Ready for Targeted Advertising:
EUID Advertising Token:

+      

+      
+    

+  
+
diff --git a/integrationExamples/gpt/gdpr_hello_world.html b/integrationExamples/gpt/gdpr_hello_world.html
index c62569cfc4f..e23a866d4fd 100644
--- a/integrationExamples/gpt/gdpr_hello_world.html
+++ b/integrationExamples/gpt/gdpr_hello_world.html
@@ -54,8 +54,7 @@
           pbjs.setConfig({
             consentManagement: {
               cmpApi: 'iab',
-              timeout: 5000,
-              allowAuctionWithoutConsent: true
+              timeout: 5000
             },
             pubcid: {
               enable: false
diff --git a/integrationExamples/gpt/hello_world.html b/integrationExamples/gpt/hello_world.html
index 47ba5b8f18a..03a2356f0ef 100644
--- a/integrationExamples/gpt/hello_world.html
+++ b/integrationExamples/gpt/hello_world.html
@@ -8,6 +8,7 @@
 -->
 
 
+
 
     
     
@@ -19,9 +20,10 @@
             code: 'div-gpt-ad-1460505748561-0',
             mediaTypes: {
                 banner: {
-                    sizes: [[300, 250], [300,600]],
+                    sizes: [[300, 250]],
                 }
             },
+
             // Replace this object to test a new Adapter!
             bids: [{
                 bidder: 'appnexus',
@@ -40,12 +42,13 @@
     
-
+    
Prebid.js Test

+    
Div-1

+    

+        
+    

 
+
 
\ No newline at end of file
diff --git a/integrationExamples/gpt/jwplayerRtdProvider_example.html b/integrationExamples/gpt/jwplayerRtdProvider_example.html
deleted file mode 100644
index 41c27b70ece..00000000000
--- a/integrationExamples/gpt/jwplayerRtdProvider_example.html
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-    
-    
-    
-    JW Player RTD Provider Example
-    
-
-    
-
-    
-
-
-
-
Div-1

-

-    
-

-
-
diff --git a/integrationExamples/gpt/nexverse.html b/integrationExamples/gpt/nexverse.html
new file mode 100644
index 00000000000..498cf2bd2f3
--- /dev/null
+++ b/integrationExamples/gpt/nexverse.html
@@ -0,0 +1,126 @@
+
+
+
+
+
+    NexVerse Prebid.Js Demo
+    
+    
+    
+
+    
+
+    
+
+
+
+    
Nexverse Prebid.js Test

+    
Div-1

+    

+        
+    

+
+    
Div-2

+    

+        
+    

+
+
+
\ No newline at end of file
diff --git a/integrationExamples/gpt/fledge_example.html b/integrationExamples/gpt/paapi_example.html
similarity index 90%
rename from integrationExamples/gpt/fledge_example.html
rename to integrationExamples/gpt/paapi_example.html
index 5059e03daef..860d7c22edf 100644
--- a/integrationExamples/gpt/fledge_example.html
+++ b/integrationExamples/gpt/paapi_example.html
@@ -3,7 +3,7 @@
   
   
   
@@ -44,15 +44,11 @@
 
     pbjs.que.push(function() {
       pbjs.setConfig({
-        fledgeForGpt: {
-          enabled: true
-        }
-      });
-
-      pbjs.setBidderConfig({
-        bidders: ['openx'],
-        config: {
-          fledgeEnabled: true
+        paapi: {
+          enabled: true,
+          gpt: {
+              autoconfig: false
+          }
         }
       });
 
@@ -69,6 +65,7 @@
         googletag.cmd.push(function() {
           pbjs.que.push(function() {
             pbjs.setTargetingForGPTAsync();
+            pbjs.setPAAPIConfigForGPT();
             googletag.pubads().refresh();
           });
         });
diff --git a/integrationExamples/gpt/prebidServer_example.html b/integrationExamples/gpt/prebidServer_example.html
index f23554369bc..ded50777ad2 100644
--- a/integrationExamples/gpt/prebidServer_example.html
+++ b/integrationExamples/gpt/prebidServer_example.html
@@ -33,31 +33,41 @@
 
     pbjs.que.push(function() {
         var adUnits = [{
-            code: 'div-gpt-ad-1460505748561-0',
-            mediaTypes: {
-              banner: {
-                sizes: [[300, 250]]
-              } 
-            },
-            bids: [
-              {
-                bidder: 'appnexus',
-                params: {
-                   placementId: 13144370
-                }
+          code: 'div-gpt-ad-1460505748561-0',
+          mediaTypes: {
+            banner: {
+              sizes: [600, 500]
+            } 
+          },
+          bids: [
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 12883451
               }
-            ]
-          }];
+            }
+          ]
+        }];
 
+        pbjs.bidderSettings = {
+          appnexus: {
+            bidCpmAdjustment: function () {
+              return 10;
+            }
+          }
+        }  
         pbjs.setConfig({
           bidderTimeout: 3000,
           s2sConfig : {
             accountId : '1',
             enabled : true, //default value set to false
-            defaultVendor: 'appnexus',
+            defaultVendor: 'appnexuspsp',
             bidders : ['appnexus'],
             timeout : 1000, //default value is 1000
             adapter : 'prebidServer', //if we have any other s2s adapter, default value is s2s
+          },
+          ortb2: {
+            test: 1
           }
         });
 
diff --git a/integrationExamples/gpt/prebidServer_fledge_example.html b/integrationExamples/gpt/prebidServer_paapi_example.html
similarity index 89%
rename from integrationExamples/gpt/prebidServer_fledge_example.html
rename to integrationExamples/gpt/prebidServer_paapi_example.html
index 8523c0f2920..d138d2b7753 100644
--- a/integrationExamples/gpt/prebidServer_fledge_example.html
+++ b/integrationExamples/gpt/prebidServer_paapi_example.html
@@ -3,7 +3,7 @@
   
   
   
@@ -44,26 +44,19 @@
 
     pbjs.que.push(function() {
       pbjs.setConfig({
-        fledgeForGpt: {
-          enabled: true
+        paapi: {
+          enabled: true,
         },
         s2sConfig: [{
           accountId : '1',
           enabled : true,
-          defaultVendor: 'appnexus',
+          defaultVendor: 'appnexuspsp',
           bidders : ['openx'],
           timeout : 1500,
           adapter : 'prebidServer'
         }]
       });
 
-      pbjs.setBidderConfig({
-        bidders: ['openx'],
-        config: {
-          fledgeEnabled: true
-        }
-      });
-
       pbjs.addAdUnits(adUnits);
 
       pbjs.requestBids({
diff --git a/integrationExamples/gpt/precisoExample.html b/integrationExamples/gpt/precisoExample.html
new file mode 100644
index 00000000000..04f44b28345
--- /dev/null
+++ b/integrationExamples/gpt/precisoExample.html
@@ -0,0 +1,170 @@
+
+
+
+  
+
+  
+  
+  
+
+
+
+
+  
+  
Basic Prebid.js Example with Preciso Bidder

+  
Adslot-1

+  

+    
+  

+
+  

+    
Adslot-2

+    
+  

+
+
+
+
diff --git a/integrationExamples/gpt/precisonativeExample.html b/integrationExamples/gpt/precisonativeExample.html
new file mode 100644
index 00000000000..4e7009e2c58
--- /dev/null
+++ b/integrationExamples/gpt/precisonativeExample.html
@@ -0,0 +1,203 @@
+
+
+
+    
+
+    
+
+
+
+    
+    
+    
+    
+
+
+
+    
Ad Serverless Test Page

+    

+        Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's
+        standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make
+        a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting,
+        remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing
+        Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions
+        of Lorem Ipsum
+    

+    

+    

+        Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin
+        literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney
+        College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and
+        going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum
+        comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by
+        Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance.
+        The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.
+    

+    

+
+
+
\ No newline at end of file
diff --git a/integrationExamples/gpt/publir_hello_world.html b/integrationExamples/gpt/publir_hello_world.html
new file mode 100644
index 00000000000..4763525408d
--- /dev/null
+++ b/integrationExamples/gpt/publir_hello_world.html
@@ -0,0 +1,84 @@
+
+
+
+    
+    Prebid.js Banner gpt Example
+    
+    
+    
+
+    
+
+    
+
+
+
+    
Prebid.js Test

+    
Div-1

+    

+        
+    

+
+
+
\ No newline at end of file
diff --git a/integrationExamples/gpt/pubxaiRtdProvider_example.html b/integrationExamples/gpt/pubxaiRtdProvider_example.html
new file mode 100644
index 00000000000..566cfe0c928
--- /dev/null
+++ b/integrationExamples/gpt/pubxaiRtdProvider_example.html
@@ -0,0 +1,113 @@
+
+  
+    Individual Ad Unit Refresh Example
+    
+    
+    
+
+    
+  
+
+  
+    
Individual Ad Unit Refresh Example

+    
Div-1

+    

+    

+      
+    

+  
+
diff --git a/integrationExamples/gpt/raynRtdProvider_example.html b/integrationExamples/gpt/raynRtdProvider_example.html
new file mode 100644
index 00000000000..7965daa6e85
--- /dev/null
+++ b/integrationExamples/gpt/raynRtdProvider_example.html
@@ -0,0 +1,168 @@
+
+  
+    
+    
+    
+
+    
+
+    
+
+    
+  
+
+  
+    
Rayn RTD Prebid

+
+    

+      
+    

+
+    Rayn Segments:
+    

+  
+
diff --git a/integrationExamples/gpt/rewardedInterestIdSystem_example.html b/integrationExamples/gpt/rewardedInterestIdSystem_example.html
new file mode 100644
index 00000000000..c9730f354b3
--- /dev/null
+++ b/integrationExamples/gpt/rewardedInterestIdSystem_example.html
@@ -0,0 +1,114 @@
+
+
+
+
+    Rewarded Interest ID Example
+    
+    
+
+    
+
+    
+
+    
+
+
+
+
+
+
Rewarded Interest ID Example

+
+
Generated IDs:

+

+
+
Generated EIDs

+

+
+
+
diff --git a/integrationExamples/gpt/symitridap_segments_example.html b/integrationExamples/gpt/symitridap_segments_example.html
new file mode 100644
index 00000000000..1f5a654cfdb
--- /dev/null
+++ b/integrationExamples/gpt/symitridap_segments_example.html
@@ -0,0 +1,133 @@
+
+
+    
+    
+    
+
+    
+
+    
+
+                              
+
+
+
Prebid.js Test

+
Div-1

+

+    
+

+
Segments Sent to Bidding Adapter

+

+
+
diff --git a/integrationExamples/gpt/tpmn_example.html b/integrationExamples/gpt/tpmn_example.html
new file mode 100644
index 00000000000..f215181c7e0
--- /dev/null
+++ b/integrationExamples/gpt/tpmn_example.html
@@ -0,0 +1,168 @@
+
+
+
+    
+    Prebid.js Banner Example
+    
+    
+    
+    
+    
+    
+    
+     
+
+
+    
Prebid.js TPMN Banner Example

+    
+    

+    
Prebid.js TPMN Video Example

+    

+        
+    

+    

+    

+
diff --git a/integrationExamples/gpt/tpmn_serverless_example.html b/integrationExamples/gpt/tpmn_serverless_example.html
new file mode 100644
index 00000000000..0acaefbeb9c
--- /dev/null
+++ b/integrationExamples/gpt/tpmn_serverless_example.html
@@ -0,0 +1,121 @@
+
+
+
+
+
+  
+
+  
+
+
+
+
+
+
Ad Serverless Test Page

+
+
+

+

+
+
diff --git a/integrationExamples/gpt/weboramaRtdProvider_example.html b/integrationExamples/gpt/weboramaRtdProvider_example.html
index 7e75721103f..82b97696371 100644
--- a/integrationExamples/gpt/weboramaRtdProvider_example.html
+++ b/integrationExamples/gpt/weboramaRtdProvider_example.html
@@ -1,187 +1,201 @@
 
-    
-        
-        
-        weborama rtd submodule example
-    
-
-
-    
+  
+    
+    
+    weborama rtd submodule example
+  
+  
+    
     
 
     
     
 
     

-        

-            test webo rtd submodule with prebid.js
-        

+      
test webo rtd submodule with prebid.js

     

     
Basic Prebid.js Example

     
Div-1

     
-    

-        
+    

+      
     

 
-    
-
-
-
\ No newline at end of file
+  
+
diff --git a/integrationExamples/gpt/wurflRtdProvider_example.html b/integrationExamples/gpt/wurflRtdProvider_example.html
new file mode 100644
index 00000000000..f2bfe7f76b7
--- /dev/null
+++ b/integrationExamples/gpt/wurflRtdProvider_example.html
@@ -0,0 +1,106 @@
+
+
+
+    
+    
+    
+    
+
+    
+
+    
+
+
+
+    
Prebid.js Test

+    
Div-1

+    

+        
+    

+
+
+
\ No newline at end of file
diff --git a/integrationExamples/gpt/x-domain/creative.html b/integrationExamples/gpt/x-domain/creative.html
index 2216d0ed6ae..63842b00882 100644
--- a/integrationExamples/gpt/x-domain/creative.html
+++ b/integrationExamples/gpt/x-domain/creative.html
@@ -1,105 +1,13 @@
-
 
-}
-
-
-function requestAdFromPrebid() {
-  const message = JSON.stringify({
-    message: 'Prebid Request',
-    adId
-  });
-  const channel = new MessageChannel();
-  channel.port1.onmessage = renderAd;
-  window.parent.postMessage(message, publisherDomain, [channel.port2]);
-}
-
-function listenAdFromPrebid() {
-  window.addEventListener('message', receiveMessage, false);
-}
-
-listenAdFromPrebid();
-requestAdFromPrebid();
+
diff --git a/integrationExamples/noadserver/jwplayerBidAdapter_sample.html b/integrationExamples/noadserver/jwplayerBidAdapter_sample.html
new file mode 100644
index 00000000000..f8b15af64a2
--- /dev/null
+++ b/integrationExamples/noadserver/jwplayerBidAdapter_sample.html
@@ -0,0 +1,75 @@
+
+
+
+    
+
+    
+
+
+
+
+
diff --git a/integrationExamples/noadserver/native_noadserver.html b/integrationExamples/noadserver/native_noadserver.html
index 81c71d2acfd..356c559b86f 100755
--- a/integrationExamples/noadserver/native_noadserver.html
+++ b/integrationExamples/noadserver/native_noadserver.html
@@ -12,18 +12,33 @@
                 code: 'native-div',
                 mediaTypes: {
                     native: {
-                        adTemplate: document.getElementById('native-template').innerHTML,
-                        title: {
-                            required: true,
-                            len: 800
+                        ortb: {
+                            assets: [
+                                {
+                                    id: 1,
+                                    required: 1,
+                                    title: {
+                                        len: 800
+                                    }
+                                },
+                                {
+                                    id: 2,
+                                    required: 1,
+                                    img: {
+                                        type: 3,
+                                        w: 989,
+                                        h: 742
+                                    }
+                                },
+                                {
+                                    id: 3,
+                                    required: 1,
+                                    data: {
+                                        type: 1
+                                    }
+                                }
+                            ]
                         },
-                        image: {
-                            required: true,
-                            sizes: [989, 742],
-                        },
-                        sponsoredBy: {
-                            required: true
-                        }
                     }
                 },
                 bids: [{
@@ -59,31 +74,16 @@
 
             function renderNative(divId, bid) {
                 const slot = document.getElementById(divId);
-                const content = `
-                    
-                    
-                        
-                            
+
+    
+
+
+
+
+
+
+
Prebid Native w/custom renderer

+

+

+
+

+

+
+
+
+
diff --git a/integrationExamples/noadserver/native_renderer/renderer.js b/integrationExamples/noadserver/native_renderer/renderer.js
new file mode 100644
index 00000000000..d1c754f20b7
--- /dev/null
+++ b/integrationExamples/noadserver/native_renderer/renderer.js
@@ -0,0 +1,69 @@
+window.renderAd = function (data) {
+  data = Object.fromEntries(data.map(({key, value}) => [key, value]));
+  return `
+    
+    

+        

+            

+                

+                    ${data.title}
+                

+            

+            

+                ${data.sponsoredBy}
+            

+        

+    
`;
+};
diff --git a/integrationExamples/realTimeData/jwplayerRtdProvider_example.html b/integrationExamples/realTimeData/jwplayerRtdProvider_example.html
new file mode 100644
index 00000000000..c6170b565b5
--- /dev/null
+++ b/integrationExamples/realTimeData/jwplayerRtdProvider_example.html
@@ -0,0 +1,103 @@
+
+
+
+
+    /* Paste JW Player script tag here */
+
+    
+    
+    JW Player RTD Provider Example
+    
+
+    
+
+
+
+
+
diff --git a/integrationExamples/top-level-paapi/gam-contextual.html b/integrationExamples/top-level-paapi/gam-contextual.html
new file mode 100644
index 00000000000..47bf9607680
--- /dev/null
+++ b/integrationExamples/top-level-paapi/gam-contextual.html
@@ -0,0 +1,135 @@
+
+
+    
+    
+
+    
+
+    
+
+
+
+
GAM contextual + Publisher as top level PAAPI seller example

+
+

+   This example starts PAAPI auctions at the same time as GAM targeting. The flow is
+    similar to a typical GAM auction, but if Prebid wins, and got a
+    PAAPI bid, it is rendered instead of the contextual bid.
+

+

+    
+

+
Div-1

+

+    
+

+

+
Instructions

+
Start local server with:

+gulp serve-fast --https
+
Chrome flags:

+--enable-features=CookieDeprecationFacilitatedTesting:label/treatment_1.2/force_eligible/true
+    --privacy-sandbox-enrollment-overrides=https://localhost:9999
+
Join interest group at https://www.optable.co/
+

+

+
+
diff --git a/integrationExamples/top-level-paapi/no_adserver.html b/integrationExamples/top-level-paapi/no_adserver.html
new file mode 100644
index 00000000000..dd363e53485
--- /dev/null
+++ b/integrationExamples/top-level-paapi/no_adserver.html
@@ -0,0 +1,114 @@
+
+
+    
+    
+
+    
+
+
+
+
No ad server, publisher as top level PAAPI seller example

+
+

+
+

+

+    
+

+
Div-1

+

+    
+

+

+    
Instructions

+    
Start local server with:

+    gulp serve-fast --https
+    
Chrome flags:

+    --enable-features=CookieDeprecationFacilitatedTesting:label/treatment_1.2/force_eligible/true
+        --privacy-sandbox-enrollment-overrides=https://localhost:9999
+    
Join interest group at https://www.optable.co/
+    

+

+
+
diff --git a/integrationExamples/top-level-paapi/shared/decisionLogic.js b/integrationExamples/top-level-paapi/shared/decisionLogic.js
new file mode 100644
index 00000000000..265234ffeba
--- /dev/null
+++ b/integrationExamples/top-level-paapi/shared/decisionLogic.js
@@ -0,0 +1,57 @@
+function logPrefix(scope) {
+  return [
+    `%c PAAPI %c ${scope} %c`,
+    'color: green;  background-color:yellow; border: 1px solid black',
+    'color: blue; border:1px solid black',
+    '',
+  ];
+}
+
+function scoreAd(
+  adMetadata,
+  bid,
+  auctionConfig,
+  trustedScoringSignals,
+  browserSignals,
+  directFromSellerSignals
+) {
+  console.group(...logPrefix('scoreAd'), 'Buyer:', browserSignals.interestGroupOwner);
+  console.log('Context:', JSON.stringify({
+    adMetadata,
+    bid,
+    auctionConfig: {
+      ...auctionConfig,
+      componentAuctions: '[omitted]'
+    },
+    trustedScoringSignals,
+    browserSignals,
+    directFromSellerSignals
+  }, ' ', ' '));
+
+  const result = {
+    desirability: bid,
+    allowComponentAuction: true,
+  };
+  const {bidfloor, bidfloorcur} = auctionConfig.auctionSignals?.prebid || {};
+  if (bidfloor) {
+    if (browserSignals.bidCurrency !== '???' && browserSignals.bidCurrency !== bidfloorcur) {
+      console.log(`Floor currency (${bidfloorcur}) does not match bid currency (${browserSignals.bidCurrency}), and currency conversion is not yet implemented. Rejecting bid.`);
+      result.desirability = -1;
+    } else if (bid < bidfloor) {
+      console.log(`Bid (${bid}) lower than contextual winner/floor (${bidfloor}). Rejecting bid.`);
+      result.desirability = -1;
+      result.rejectReason = 'bid-below-auction-floor';
+    }
+  }
+  console.log('Result:', result);
+  console.groupEnd();
+  return result;
+}
+
+function reportResult(auctionConfig, browserSignals) {
+  console.group(...logPrefix('reportResult'));
+  console.log('Context', JSON.stringify({auctionConfig, browserSignals}, ' ', ' '));
+  console.groupEnd();
+  sendReportTo(`${auctionConfig.seller}/report/win?${Object.entries(browserSignals).map(([k, v]) => `${k}=${encodeURIComponent(v)}`).join('&')}`);
+  return {};
+}
diff --git a/integrationExamples/top-level-paapi/shared/example-setup.js b/integrationExamples/top-level-paapi/shared/example-setup.js
new file mode 100644
index 00000000000..1c52abf02c9
--- /dev/null
+++ b/integrationExamples/top-level-paapi/shared/example-setup.js
@@ -0,0 +1,95 @@
+// intercept navigator.runAdAuction and print parameters to console
+(() => {
+  var originalRunAdAuction = navigator.runAdAuction;
+  navigator.runAdAuction = function (...args) {
+    console.log('%c runAdAuction', 'background: cyan; border: 2px; border-radius: 3px', ...args);
+    return originalRunAdAuction.apply(navigator, args);
+  };
+})();
+init();
+setupContextualResponse();
+
+function addExampleControls(requestBids) {
+  const ctl = document.createElement('div');
+  ctl.innerHTML = `
+    
+       Simulate contextual bid:
+        
+        CPM
+        
+    
+  `;
+  ctl.style = 'margin-top: 30px';
+  document.body.appendChild(ctl);
+  ctl.querySelector('.bid').addEventListener('click', function (ev) {
+    const cpm = ctl.querySelector('.cpm').value;
+    if (cpm) {
+      setupContextualResponse(parseInt(cpm, 10));
+    }
+    requestBids();
+  });
+}
+
+function init() {
+  window.pbjs = window.pbjs || {que: []};
+  window.pbjs.que.push(() => {
+    pbjs.aliasBidder('optable', 'contextual');
+    [
+      'auctionInit',
+      'auctionTimeout',
+      'auctionEnd',
+      'bidAdjustment',
+      'bidTimeout',
+      'bidRequested',
+      'bidResponse',
+      'bidRejected',
+      'noBid',
+      'seatNonBid',
+      'bidWon',
+      'bidderDone',
+      'bidderError',
+      'setTargeting',
+      'beforeRequestBids',
+      'beforeBidderHttp',
+      'requestBids',
+      'addAdUnits',
+      'adRenderFailed',
+      'adRenderSucceeded',
+      'tcf2Enforcement',
+      'auctionDebug',
+      'bidViewable',
+      'staleRender',
+      'billableEvent',
+      'bidAccepted',
+      'paapiRunAuction',
+      'paapiBid',
+      'paapiNoBid',
+      'paapiError',
+    ].forEach(evt => {
+      pbjs.onEvent(evt, (arg) => {
+        console.log('Event:', evt, arg);
+      })
+    });
+  });
+}
+
+function setupContextualResponse(cpm = 1) {
+  pbjs.que.push(() => {
+    pbjs.setConfig({
+      debugging: {
+        enabled: true,
+        intercept: [
+          {
+            when: {
+              bidder: 'contextual'
+            },
+            then: {
+              cpm,
+              currency: 'USD'
+            }
+          }
+        ]
+      }
+    });
+  });
+}
diff --git a/integrationExamples/videoModule/adPlayerPro/bidRequestScheduling.html b/integrationExamples/videoModule/adPlayerPro/bidRequestScheduling.html
new file mode 100644
index 00000000000..7c73312c5c3
--- /dev/null
+++ b/integrationExamples/videoModule/adPlayerPro/bidRequestScheduling.html
@@ -0,0 +1,143 @@
+
+
+
+    
+    
+
+    AdPlayer.Pro bid request scheduling
+
+    
+
+    
+
+
+
+
+
AdPlayer.Pro Event Listeners

+
+
Div-1: Player placeholder div

+

+
+
+
diff --git a/integrationExamples/videoModule/adPlayerPro/eventListeners.html b/integrationExamples/videoModule/adPlayerPro/eventListeners.html
new file mode 100644
index 00000000000..3c26ef42bee
--- /dev/null
+++ b/integrationExamples/videoModule/adPlayerPro/eventListeners.html
@@ -0,0 +1,154 @@
+
+
+
+  
+  
+
+  AdPlayer.Pro Event Listeners
+
+  
+
+  
+
+
+
+
+
AdPlayer.Pro Event Listeners

+
+
Div-1: Player placeholder div

+

+
+
+
diff --git a/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html b/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
index 80ea81d09b6..d0b261043e4 100644
--- a/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
+++ b/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
@@ -20,6 +20,13 @@
         },
 
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html b/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html
index 663765317b0..c40af32cac2 100644
--- a/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html
+++ b/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html
@@ -50,12 +50,17 @@
                           mediationLayerAdServer: "dfp",
                           bidTimeout: 2000
                         },
-                        bidders: [
-                          {
+                        bidders: [{
+                          bidder: 'jwplayer',
+                          params: {
+                            publisherId: 'test-publisher-id',
+                            siteId: 'test-site-id',
+                            placementId: 'test-placement-id'
+                          }
+                        }, {
                             name: "ix",
                             siteId: "300"
-                          }
-                        ]
+                        }]
                       }
                     }
                   }
diff --git a/integrationExamples/videoModule/jwplayer/bidsBackHandlerOverride.html b/integrationExamples/videoModule/jwplayer/bidsBackHandlerOverride.html
index 66eaff26090..75a72ba3501 100644
--- a/integrationExamples/videoModule/jwplayer/bidsBackHandlerOverride.html
+++ b/integrationExamples/videoModule/jwplayer/bidsBackHandlerOverride.html
@@ -19,6 +19,13 @@
         },
 
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/jwplayer/eventListeners.html b/integrationExamples/videoModule/jwplayer/eventListeners.html
index 39acb086107..6f04f37264b 100644
--- a/integrationExamples/videoModule/jwplayer/eventListeners.html
+++ b/integrationExamples/videoModule/jwplayer/eventListeners.html
@@ -23,6 +23,13 @@
 
         // Replace this object to test a new Adapter!
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/jwplayer/eventsUI.html b/integrationExamples/videoModule/jwplayer/eventsUI.html
index 78d72a6153d..cfd1efe7624 100644
--- a/integrationExamples/videoModule/jwplayer/eventsUI.html
+++ b/integrationExamples/videoModule/jwplayer/eventsUI.html
@@ -22,6 +22,13 @@
         },
 
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html b/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
index 018c8eba8b2..1f4331785ea 100644
--- a/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
+++ b/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
@@ -19,6 +19,13 @@
           divId: 'player', // required to indicate which player is being used to render this ad unit.
         },
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/jwplayer/mediaMetadata.html b/integrationExamples/videoModule/jwplayer/mediaMetadata.html
index 7581af571d3..63e62aa4b82 100644
--- a/integrationExamples/videoModule/jwplayer/mediaMetadata.html
+++ b/integrationExamples/videoModule/jwplayer/mediaMetadata.html
@@ -20,6 +20,13 @@
         },
 
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/jwplayer/playlist.html b/integrationExamples/videoModule/jwplayer/playlist.html
index 89efaea3d5c..9e89f606f23 100644
--- a/integrationExamples/videoModule/jwplayer/playlist.html
+++ b/integrationExamples/videoModule/jwplayer/playlist.html
@@ -20,6 +20,13 @@
       },
 
       bids: [{
+        bidder: 'jwplayer',
+        params: {
+          publisherId: 'test-publisher-id',
+          siteId: 'test-site-id',
+          placementId: 'test-placement-id'
+        }
+      }, {
         bidder: 'ix',
         params: {
           siteId: '300',
diff --git a/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html b/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
index d6656bc0c93..35745ab281f 100644
--- a/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
+++ b/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
@@ -35,6 +35,13 @@
         },
 
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/videojs/bidRequestScheduling.html b/integrationExamples/videoModule/videojs/bidRequestScheduling.html
index eb10fda89a2..da6499ca4cc 100644
--- a/integrationExamples/videoModule/videojs/bidRequestScheduling.html
+++ b/integrationExamples/videoModule/videojs/bidRequestScheduling.html
@@ -37,6 +37,13 @@
         },
 
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/videojs/bidsBackHandlerOverride.html b/integrationExamples/videoModule/videojs/bidsBackHandlerOverride.html
index ac8f4163e76..74217ecee2c 100644
--- a/integrationExamples/videoModule/videojs/bidsBackHandlerOverride.html
+++ b/integrationExamples/videoModule/videojs/bidsBackHandlerOverride.html
@@ -34,6 +34,13 @@
         },
 
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/videojs/eventListeners.html b/integrationExamples/videoModule/videojs/eventListeners.html
index 1966f134e02..3fc2ef7137c 100644
--- a/integrationExamples/videoModule/videojs/eventListeners.html
+++ b/integrationExamples/videoModule/videojs/eventListeners.html
@@ -35,6 +35,13 @@
       },
 
       bids: [{
+        bidder: 'jwplayer',
+        params: {
+          publisherId: 'test-publisher-id',
+          siteId: 'test-site-id',
+          placementId: 'test-placement-id'
+        }
+      }, {
         bidder: 'ix',
         params: {
           siteId: '300',
diff --git a/integrationExamples/videoModule/videojs/eventsUI.html b/integrationExamples/videoModule/videojs/eventsUI.html
index 9eba09f7a52..215b2de4d25 100644
--- a/integrationExamples/videoModule/videojs/eventsUI.html
+++ b/integrationExamples/videoModule/videojs/eventsUI.html
@@ -37,6 +37,13 @@
         },
 
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/videojs/gamAdServerMediation.html b/integrationExamples/videoModule/videojs/gamAdServerMediation.html
index 6ffc1a67c03..d6603abbf8f 100644
--- a/integrationExamples/videoModule/videojs/gamAdServerMediation.html
+++ b/integrationExamples/videoModule/videojs/gamAdServerMediation.html
@@ -34,6 +34,13 @@
           divId: 'player', // required to indicate which player is being used to render this ad unit.
         },
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/videojs/mediaMetadata.html b/integrationExamples/videoModule/videojs/mediaMetadata.html
index ede076fd814..084c597cddd 100644
--- a/integrationExamples/videoModule/videojs/mediaMetadata.html
+++ b/integrationExamples/videoModule/videojs/mediaMetadata.html
@@ -35,6 +35,13 @@
         },
 
         bids: [{
+          bidder: 'jwplayer',
+          params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+          }
+        }, {
           bidder: 'ix',
           params: {
             siteId: '300',
diff --git a/integrationExamples/videoModule/videojs/playlist.html b/integrationExamples/videoModule/videojs/playlist.html
index eb813f095f7..2563717df41 100644
--- a/integrationExamples/videoModule/videojs/playlist.html
+++ b/integrationExamples/videoModule/videojs/playlist.html
@@ -36,6 +36,13 @@
       },
 
       bids: [{
+        bidder: 'jwplayer',
+        params: {
+          publisherId: 'test-publisher-id',
+          siteId: 'test-site-id',
+          placementId: 'test-placement-id'
+        }
+      }, {
         bidder: 'ix',
         params: {
           siteId: '300',
diff --git a/karma.conf.maker.js b/karma.conf.maker.js
index e05d5b08afd..fbef10ff567 100644
--- a/karma.conf.maker.js
+++ b/karma.conf.maker.js
@@ -15,8 +15,7 @@ function newWebpackConfig(codeCoverage, disableFeatures) {
     mode: 'development',
     devtool: 'inline-source-map',
   });
-
-  delete webpackConfig.entry;
+  ['entry', 'optimization'].forEach(prop => delete webpackConfig[prop]);
 
   webpackConfig.module.rules
     .flatMap((r) => r.use)
@@ -109,14 +108,12 @@ function setBrowsers(karmaConf, browserstack) {
 module.exports = function(codeCoverage, browserstack, watchMode, file, disableFeatures) {
   var webpackConfig = newWebpackConfig(codeCoverage, disableFeatures);
   var plugins = newPluginsArray(browserstack);
-
-  var files = file ? ['test/test_deps.js', file, 'test/helpers/hookSetup.js'].flatMap(f => f) : ['test/test_index.js'];
-  // This file opens the /debug.html tab automatically.
-  // It has no real value unless you're running --watch, and intend to do some debugging in the browser.
-  if (watchMode) {
-    files.push('test/helpers/karma-init.js');
+  if (file) {
+    file = Array.isArray(file) ? ['test/pipeline_setup.js', ...file] : [file]
   }
 
+  var files = file ? ['test/test_deps.js', ...file, 'test/helpers/hookSetup.js'].flatMap(f => f) : ['test/test_index.js'];
+
   var config = {
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: './',
@@ -128,15 +125,15 @@ module.exports = function(codeCoverage, browserstack, watchMode, file, disableFe
     },
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['es5-shim', 'mocha', 'chai', 'sinon'],
+    frameworks: ['es5-shim', 'mocha', 'chai', 'sinon', 'webpack'],
 
-    files: files,
+    // test files should not be watched or they'll run twice after an update
+    // (they are still, in fact, watched through autoWatch: true)
+    files: files.map(fn => ({pattern: fn, watched: false, served: true, included: true})),
 
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: {
-      'test/test_index.js': ['webpack', 'sourcemap']
-    },
+    preprocessors: Object.fromEntries(files.map(f => [f, ['webpack', 'sourcemap']])),
 
     // web server port
     port: 9876,
@@ -149,7 +146,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file, disableFe
     logLevel: karmaConstants.LOG_INFO,
 
     // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: true,
+    autoWatch: watchMode,
 
     reporters: ['mocha'],
 
@@ -176,15 +173,6 @@ module.exports = function(codeCoverage, browserstack, watchMode, file, disableFe
     plugins: plugins
   };
 
-  // To ensure that, we are able to run single spec file
-  // here we are adding preprocessors, when file is passed
-  if (file) {
-    config.files.forEach((file) => {
-      config.preprocessors[file] = ['webpack', 'sourcemap'];
-    });
-    delete config.preprocessors['test/test_index.js'];
-  }
-
   setReporters(config, codeCoverage, browserstack);
   setBrowsers(config, browserstack);
   return config;
diff --git a/karmaRunner.js b/karmaRunner.js
index 96259069966..7239d2a2556 100644
--- a/karmaRunner.js
+++ b/karmaRunner.js
@@ -1,23 +1,97 @@
 const karma = require('karma');
 const process = require('process');
 const karmaConfMaker = require('./karma.conf.maker.js');
+const glob = require('glob');
+/**
+ * Environment variables:
+ *
+ * TEST_CHUNKS: number of chunks to split tests into, or MAX to run each test suite in isolation
+ * TEST_CHUNK: run only this chunk (e.g. TEST_CHUNKS=4 TEST_CHUNK=2 gulp test) will run only the second quarter
+ * TEST_ALL: set to continue running remaining chunks after a previous chunk failed
+ * TEST_PAT: test file pattern (default is *_spec.js)
+ */
 
-process.on('message', function(options) {
-  try {
-    let cfg = karmaConfMaker(options.coverage, options.browserstack, options.watch, options.file, options.disableFeatures);
+process.on('message', function (options) {
+  function info(msg) {
+    // eslint-disable-next-line no-console
+    console.log('\x1b[46m\x1b[30m%s\x1b[0m', msg);
+  }
+
+  function error(msg) {
+    // eslint-disable-next-line no-console
+    console.log('\x1b[41m\x1b[37m%s\x1b[0m', msg);
+  }
+
+  function chunkDesc(chunk) {
+    return chunk.length > 1 ? `From ${chunk[0]} to ${chunk[chunk.length - 1]}` : chunk[0];
+  }
+
+  const failures = [];
+
+  function quit(fail) {
+    // eslint-disable-next-line no-console
+    console.log('');
+    failures.forEach(([chunkNo, chunkTot, chunk]) => {
+      error(`Chunk ${chunkNo + 1} of ${chunkTot} failed: ${chunkDesc(chunk)}`);
+      fail = true;
+    });
+    process.exit(fail ? 1 : 0);
+  }
+
+  process.on('SIGINT', () => quit());
+
+  function runKarma(file) {
+    let cfg = karmaConfMaker(options.coverage, options.browserstack, options.watch, file, options.disableFeatures);
     if (options.browsers && options.browsers.length) {
       cfg.browsers = options.browsers;
     }
     if (options.oneBrowser) {
-      cfg.browsers = [cfg.browsers.find((b) => b.toLowerCase().includes(options.oneBrowser.toLowerCase())) || cfg.browsers[0]]
+      cfg.browsers = [cfg.browsers.find((b) => b.toLowerCase().includes(options.oneBrowser.toLowerCase())) || cfg.browsers[0]];
     }
     cfg = karma.config.parseConfig(null, cfg);
-    new karma.Server(cfg, (exitCode) => {
-      process.exit(exitCode);
-    }).start();
+    return new Promise((resolve, reject) => {
+      new karma.Server(cfg, (exitCode) => {
+        exitCode ? reject(exitCode) : resolve(exitCode);
+      }).start();
+    });
+  }
+
+  try {
+    let chunks = [];
+    if (options.file) {
+      chunks.push([options.file]);
+    } else {
+      const chunkNum = process.env['TEST_CHUNKS'] ?? 1;
+      const pat = process.env['TEST_PAT'] ?? '*_spec.js'
+      const tests = glob.sync('test/**/' + pat).sort();
+      const chunkLen = chunkNum === 'MAX' ? 0 : Math.floor(tests.length / Number(chunkNum));
+      chunks.push([]);
+      tests.forEach((fn) => {
+        chunks[chunks.length - 1].push(fn);
+        if (chunks[chunks.length - 1].length > chunkLen) chunks.push([]);
+      });
+      chunks = chunks.filter(chunk => chunk.length > 0);
+      if (chunks.length > 1) {
+        info(`Splitting tests into ${chunkNum} chunks, ${chunkLen + 1} suites each`);
+      }
+    }
+    let pm = Promise.resolve();
+    chunks.forEach((chunk, i) => {
+      if (process.env['TEST_CHUNK'] && Number(process.env['TEST_CHUNK']) !== i + 1) return;
+      pm = pm.then(() => {
+        info(`Starting chunk ${i + 1} of ${chunks.length}: ${chunkDesc(chunk)}`);
+        return runKarma(chunk);
+      }).catch(() => {
+        failures.push([i, chunks.length, chunk]);
+        if (!process.env['TEST_ALL']) quit();
+      }).finally(() => {
+        info(`Chunk ${i + 1} of ${chunks.length}: done`);
+      });
+    });
+    pm.then(() => quit());
   } catch (e) {
     // eslint-disable-next-line
-    console.error(e);
-    process.exit(1);
+    error(e);
+    quit(true);
   }
 });
diff --git a/libraries/adagioUtils/adagioUtils.js b/libraries/adagioUtils/adagioUtils.js
new file mode 100644
index 00000000000..c2614c45d0c
--- /dev/null
+++ b/libraries/adagioUtils/adagioUtils.js
@@ -0,0 +1,35 @@
+import {
+  canAccessWindowTop,
+  generateUUID,
+  getWindowSelf,
+  getWindowTop,
+  isSafeFrameWindow
+} from '../../src/utils.js';
+
+/**
+ * Returns the best Window object to use with ADAGIO.
+ * @returns {Window} window.top or window.self object
+ */
+export function getBestWindowForAdagio() {
+  return (canAccessWindowTop()) ? getWindowTop() : getWindowSelf();
+}
+
+/**
+ * Returns the window.ADAGIO global object used to store Adagio data.
+ * This object is created in window.top if possible, otherwise in window.self.
+ */
+export const _ADAGIO = (function() {
+  const w = getBestWindowForAdagio();
+
+  w.ADAGIO = w.ADAGIO || {};
+  w.ADAGIO.pageviewId = w.ADAGIO.pageviewId || generateUUID();
+  w.ADAGIO.adUnits = w.ADAGIO.adUnits || {};
+  w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits || [];
+  w.ADAGIO.queue = w.ADAGIO.queue || [];
+  w.ADAGIO.versions = w.ADAGIO.versions || {};
+  w.ADAGIO.versions.pbjs = '$prebid.version$';
+  w.ADAGIO.windows = w.ADAGIO.windows || [];
+  w.ADAGIO.isSafeFrameWindow = isSafeFrameWindow();
+
+  return w.ADAGIO;
+})();
diff --git a/libraries/adkernelUtils/adkernelUtils.js b/libraries/adkernelUtils/adkernelUtils.js
new file mode 100644
index 00000000000..0b2d48f3824
--- /dev/null
+++ b/libraries/adkernelUtils/adkernelUtils.js
@@ -0,0 +1,11 @@
+export function getBidFloor(bid, mediaType, sizes) {
+  var floor;
+  var size = sizes.length === 1 ? sizes[0] : '*';
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({currency: 'USD', mediaType, size});
+    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+      floor = parseFloat(floorInfo.floor);
+    }
+  }
+  return floor;
+}
diff --git a/libraries/advangUtils/index.js b/libraries/advangUtils/index.js
new file mode 100644
index 00000000000..f815f389ed6
--- /dev/null
+++ b/libraries/advangUtils/index.js
@@ -0,0 +1,228 @@
+import { deepAccess, generateUUID, isFn, parseSizesInput, parseUrl } from '../../src/utils.js';
+import { config } from '../../src/config.js';
+import { find, includes } from '../../src/polyfill.js';
+
+export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
+
+export function isBannerBid(bid) {
+  return deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
+}
+
+export function isVideoBid(bid) {
+  return deepAccess(bid, 'mediaTypes.video');
+}
+
+export function getBannerBidFloor(bid) {
+  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'banner', size: '*' }) : {};
+  return floorInfo?.floor || getBannerBidParam(bid, 'bidfloor');
+}
+
+export function getVideoBidFloor(bid) {
+  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'video', size: '*' }) : {};
+  return floorInfo.floor || getVideoBidParam(bid, 'bidfloor');
+}
+
+export function isVideoBidValid(bid) {
+  return isVideoBid(bid) && getVideoBidParam(bid, 'pubid') && getVideoBidParam(bid, 'placement');
+}
+
+export function isBannerBidValid(bid) {
+  return isBannerBid(bid) && getBannerBidParam(bid, 'pubid') && getBannerBidParam(bid, 'placement');
+}
+
+export function getVideoBidParam(bid, key) {
+  return deepAccess(bid, 'params.video.' + key) || deepAccess(bid, 'params.' + key);
+}
+
+export function getBannerBidParam(bid, key) {
+  return deepAccess(bid, 'params.banner.' + key) || deepAccess(bid, 'params.' + key);
+}
+
+export function isMobile() {
+  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
+}
+
+export function isConnectedTV() {
+  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
+}
+
+export function getDoNotTrack() {
+  return navigator.doNotTrack === '1' || window.doNotTrack === '1' || navigator.msDoNoTrack === '1' || navigator.doNotTrack === 'yes';
+}
+
+export function findAndFillParam(o, key, value) {
+  try {
+    if (typeof value === 'function') {
+      o[key] = value();
+    } else {
+      o[key] = value;
+    }
+  } catch (ex) {}
+}
+
+export function getOsVersion() {
+  let clientStrings = [
+    { s: 'Android', r: /Android/ },
+    { s: 'iOS', r: /(iPhone|iPad|iPod)/ },
+    { s: 'Mac OS X', r: /Mac OS X/ },
+    { s: 'Mac OS', r: /(MacPPC|MacIntel|Mac_PowerPC|Macintosh)/ },
+    { s: 'Linux', r: /(Linux|X11)/ },
+    { s: 'Windows 10', r: /(Windows 10.0|Windows NT 10.0)/ },
+    { s: 'Windows 8.1', r: /(Windows 8.1|Windows NT 6.3)/ },
+    { s: 'Windows 8', r: /(Windows 8|Windows NT 6.2)/ },
+    { s: 'Windows 7', r: /(Windows 7|Windows NT 6.1)/ },
+    { s: 'Windows Vista', r: /Windows NT 6.0/ },
+    { s: 'Windows Server 2003', r: /Windows NT 5.2/ },
+    { s: 'Windows XP', r: /(Windows NT 5.1|Windows XP)/ },
+    { s: 'UNIX', r: /UNIX/ },
+    { s: 'Search Bot', r: /(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves\/Teoma|ia_archiver)/ }
+  ];
+  let cs = find(clientStrings, cs => cs.r.test(navigator.userAgent));
+  return cs ? cs.s : 'unknown';
+}
+
+export function getFirstSize(sizes) {
+  return (sizes && sizes.length) ? sizes[0] : { w: undefined, h: undefined };
+}
+
+export function parseSizes(sizes) {
+  return parseSizesInput(sizes).map(size => {
+    let [ width, height ] = size.split('x');
+    return {
+      w: parseInt(width, 10) || undefined,
+      h: parseInt(height, 10) || undefined
+    };
+  });
+}
+
+export function getVideoSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
+}
+
+export function getBannerSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
+}
+
+export function getTopWindowReferrer(bidderRequest) {
+  return bidderRequest?.refererInfo?.ref || '';
+}
+
+export function getTopWindowLocation(bidderRequest) {
+  return parseUrl(bidderRequest?.refererInfo?.page, {decodeSearchAsString: true});
+}
+
+export function getVideoTargetingParams(bid, VIDEO_TARGETING) {
+  const result = {};
+  const excludeProps = ['playerSize', 'context', 'w', 'h'];
+  Object.keys(Object(bid.mediaTypes.video))
+    .filter(key => !includes(excludeProps, key))
+    .forEach(key => {
+      result[ key ] = bid.mediaTypes.video[ key ];
+    });
+  Object.keys(Object(bid.params.video))
+    .filter(key => includes(VIDEO_TARGETING, key))
+    .forEach(key => {
+      result[ key ] = bid.params.video[ key ];
+    });
+  return result;
+}
+
+export function createRequestData(bid, bidderRequest, isVideo, getBidParam, getSizes, getBidFloor, BIDDER_CODE, ADAPTER_VERSION) {
+  let topLocation = getTopWindowLocation(bidderRequest);
+  let topReferrer = getTopWindowReferrer(bidderRequest);
+  let paramSize = getBidParam(bid, 'size');
+  let sizes = [];
+  let coppa = config.getConfig('coppa');
+
+  if (typeof paramSize !== 'undefined' && paramSize != '') {
+    sizes = parseSizes(paramSize);
+  } else {
+    sizes = getSizes(bid);
+  }
+
+  const firstSize = getFirstSize(sizes);
+  let floor = getBidFloor(bid) || (isVideo ? 0.5 : 0.1);
+  const o = {
+    'device': {
+      'langauge': (global.navigator.language).split('-')[0],
+      'dnt': (global.navigator.doNotTrack === 1 ? 1 : 0),
+      'devicetype': isMobile() ? 4 : isConnectedTV() ? 3 : 2,
+      'js': 1,
+      'os': getOsVersion()
+    },
+    'at': 2,
+    'site': {},
+    'tmax': Math.min(3000, bidderRequest.timeout),
+    'cur': ['USD'],
+    'id': bid.bidId,
+    'imp': [],
+    'regs': {
+      'ext': {}
+    },
+    'user': {
+      'ext': {}
+    }
+  };
+
+  o.site['page'] = topLocation.href;
+  o.site['domain'] = topLocation.hostname;
+  o.site['search'] = topLocation.search;
+  o.site['ref'] = topReferrer;
+  o.site['mobile'] = isMobile() ? 1 : 0;
+  const secure = topLocation.protocol.indexOf('https') === 0 ? 1 : 0;
+  o.device['dnt'] = getDoNotTrack() ? 1 : 0;
+
+  findAndFillParam(o.site, 'name', function() {
+    return global.top.document.title;
+  });
+
+  findAndFillParam(o.device, 'h', function() {
+    return global.screen.height;
+  });
+  findAndFillParam(o.device, 'w', function() {
+    return global.screen.width;
+  });
+
+  let placement = getBidParam(bid, 'placement');
+  let impType = isVideo ? {
+    'video': Object.assign({
+      'id': generateUUID(),
+      'pos': 0,
+      'w': firstSize.w,
+      'h': firstSize.h,
+      'mimes': DEFAULT_MIMES
+    }, getVideoTargetingParams(bid))
+  } : {
+    'banner': {
+      'id': generateUUID(),
+      'pos': 0,
+      'w': firstSize.w,
+      'h': firstSize.h
+    }
+  };
+
+  for (let j = 0; j < sizes.length; j++) {
+    o.imp.push({
+      'id': '' + j,
+      'displaymanager': '' + BIDDER_CODE,
+      'displaymanagerver': '' + ADAPTER_VERSION,
+      'tagId': placement,
+      'bidfloor': floor,
+      'bidfloorcur': 'USD',
+      'secure': secure,
+      ...impType
+    });
+  }
+
+  if (coppa) {
+    o.regs.ext = {'coppa': 1};
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    let { gdprApplies, consentString } = bidderRequest.gdprConsent;
+    o.regs.ext = {'gdpr': gdprApplies ? 1 : 0};
+    o.user.ext = {'consent': consentString};
+  }
+
+  return o;
+}
diff --git a/libraries/analyticsAdapter/AnalyticsAdapter.js b/libraries/analyticsAdapter/AnalyticsAdapter.js
index e1933d215e4..395a21e5571 100644
--- a/libraries/analyticsAdapter/AnalyticsAdapter.js
+++ b/libraries/analyticsAdapter/AnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import CONSTANTS from '../../src/constants.json';
+import { EVENTS } from '../../src/constants.js';
 import {ajax} from '../../src/ajax.js';
 import {logError, logMessage} from '../../src/utils.js';
 import * as events from '../../src/events.js';
@@ -9,8 +9,8 @@ export const _internal = {
 const ENDPOINT = 'endpoint';
 const BUNDLE = 'bundle';
 
-export const DEFAULT_INCLUDE_EVENTS = Object.values(CONSTANTS.EVENTS)
-  .filter(ev => ev !== CONSTANTS.EVENTS.AUCTION_DEBUG);
+export const DEFAULT_INCLUDE_EVENTS = Object.values(EVENTS)
+  .filter(ev => ev !== EVENTS.AUCTION_DEBUG);
 
 let debounceDelay = 100;
 
@@ -114,7 +114,7 @@ export default function AnalyticsAdapter({ url, analyticsType, global, handler }
       const trackedEvents = (() => {
         const {includeEvents = DEFAULT_INCLUDE_EVENTS, excludeEvents = []} = (config || {});
         return new Set(
-          Object.values(CONSTANTS.EVENTS)
+          Object.values(EVENTS)
             .filter(ev => includeEvents.includes(ev))
             .filter(ev => !excludeEvents.includes(ev))
         );
diff --git a/libraries/appnexusUtils/anKeywords.js b/libraries/appnexusUtils/anKeywords.js
index d6714dacc21..4a0da18024e 100644
--- a/libraries/appnexusUtils/anKeywords.js
+++ b/libraries/appnexusUtils/anKeywords.js
@@ -78,7 +78,7 @@ export function convertKeywordStringToANMap(keyStr) {
 }
 
 /**
- * @param {Array} kwarray: keywords as an array of strings
+ * @param {Array} kwarray keywords as an array of strings
  * @return {{}} appnexus-style keyword map
  */
 function convertKeywordsToANMap(kwarray) {
@@ -136,7 +136,7 @@ export function getANMapFromOrtbSegments(ortb2) {
     let ortbSegsArrObj = deepAccess(ortb2, path) || [];
     ortbSegsArrObj.forEach(segObj => {
       // only read segment data from known sources
-      const segtax = ORTB_SEGTAX_KEY_MAP[deepAccess(segObj, 'ext.segtax')];
+      const segtax = ORTB_SEGTAX_KEY_MAP[segObj?.ext?.segtax];
       if (segtax) {
         segObj.segment.forEach(seg => {
           // if source was in multiple locations of ortb or had multiple segments in same area, stack them together into an array
diff --git a/libraries/appnexusUtils/anUtils.js b/libraries/appnexusUtils/anUtils.js
index 9b55cd5c2a4..1d04711bd0f 100644
--- a/libraries/appnexusUtils/anUtils.js
+++ b/libraries/appnexusUtils/anUtils.js
@@ -10,6 +10,23 @@ export function convertCamelToUnderscore(value) {
   }).replace(/^_/, '');
 }
 
+export const appnexusAliases = [
+  { code: 'appnexusAst', gvlid: 32 },
+  { code: 'emxdigital', gvlid: 183 },
+  { code: 'emetriq', gvlid: 213 },
+  { code: 'pagescience', gvlid: 32 },
+  { code: 'gourmetads', gvlid: 32 },
+  { code: 'matomy', gvlid: 32 },
+  { code: 'featureforward', gvlid: 32 },
+  { code: 'oftmedia', gvlid: 32 },
+  { code: 'adasta', gvlid: 32 },
+  { code: 'beintoo', gvlid: 618 },
+  { code: 'projectagora', gvlid: 1032 },
+  { code: 'stailamedia', gvlid: 32 },
+  { code: 'uol', gvlid: 32 },
+  { code: 'adzymic', gvlid: 723 },
+];
+
 /**
  * Creates an array of n length and fills each item with the given value
  */
diff --git a/libraries/audUtils/bidderUtils.js b/libraries/audUtils/bidderUtils.js
new file mode 100644
index 00000000000..0d3392ec951
--- /dev/null
+++ b/libraries/audUtils/bidderUtils.js
@@ -0,0 +1,238 @@
+import {
+  deepAccess,
+  deepSetValue,
+  generateUUID,
+  logError
+} from '../../src/utils.js';
+
+// Declare native assets
+const NATIVE_ASSETS = [
+  { id: 1, required: 1, title: { len: 100 } }, // Title
+  { id: 2, required: 1, img: { type: 3, w: 300, h: 250 } }, // Main image
+  { id: 3, required: 0, data: { type: 1, len: 140 } }, // Body
+  { id: 4, required: 1, data: { type: 2 } }, // Sponsored by
+  { id: 5, required: 1, icon: { w: 50, h: 50 } }, // Icon
+  { id: 6, required: 1, data: { type: 12, len: 15 } } // Call to action
+];
+// Function to get Request
+export const getBannerRequest = (bidRequests, bidderRequest, ENDPOINT) => {
+  let request = [];
+  // Loop for each bid request
+  bidRequests.forEach(bidReq => {
+    let guid = generateUUID();
+    const req = {
+      id: guid,
+      imp: [getImpDetails(bidReq)],
+      placementId: bidReq.params.placement_id,
+      site: getSiteDetails(bidderRequest),
+      user: getUserDetails(bidReq)
+    };
+    // Fetch GPP Consent from bidderRequest
+    if (bidderRequest && bidderRequest.gppConsent && bidderRequest.gppConsent.gppString) {
+      deepSetValue(req, 'regs.gpp', bidderRequest.gppConsent.gppString);
+      deepSetValue(req, 'regs.gpp_sid', bidderRequest.gppConsent.applicableSections);
+    } else if (bidderRequest && bidderRequest.ortb2 && bidderRequest.ortb2.regs && bidderRequest.ortb2.regs.gpp) {
+      deepSetValue(req, 'regs.gpp', bidderRequest.ortb2.regs.gpp);
+      deepSetValue(req, 'regs.gpp_sid', bidderRequest.ortb2.regs.gpp_sid);
+    }
+    // Fetch coppa compliance from bidderRequest
+    if (bidderRequest && bidderRequest.ortb2 && bidderRequest.ortb2.regs && bidderRequest.ortb2.regs.coppa) {
+      deepSetValue(req, 'regs.coppa', 1);
+    }
+    // Fetch uspConsent from bidderRequest
+    if (bidderRequest?.uspConsent) {
+      deepSetValue(req, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+    req.MediaType = getMediaType(bidReq);
+    request.push(req);
+  });
+  // Return the array of request
+  return {
+    method: 'POST',
+    url: ENDPOINT,
+    data: JSON.stringify(request),
+    options: {
+      contentType: 'application/json',
+    }
+  };
+}
+// Function to get Response
+export const getBannerResponse = (bidResponse, mediaType) => {
+  return formatResponse(bidResponse, mediaType);
+}
+// Function to get NATIVE Response
+export const getNativeResponse = (bidResponse, bidRequest, mediaType) => {
+  const assets = JSON.parse(JSON.parse(bidRequest.data)[0].imp[0].native.request).assets;
+  return formatResponse(bidResponse, mediaType, assets);
+}
+// Function to format response
+const formatResponse = (bidResponse, mediaType, assets) => {
+  let responseArray = [];
+  if (bidResponse) {
+    try {
+      let bidResp = deepAccess(bidResponse, 'body.seatbid', []);
+      if (bidResp && bidResp[0] && bidResp[0].bid) {
+        bidResp[0].bid.forEach(bidReq => {
+          let response = {};
+          response.requestId = bidReq.impid;
+          response.cpm = bidReq.price;
+          response.width = bidReq.w;
+          response.height = bidReq.h;
+          response.ad = bidReq.adm;
+          response.meta = {
+            advertiserDomains: bidReq.adomain,
+            primaryCatId: bidReq.cat || [],
+            attr: bidReq.attr || []
+          };
+          response.creativeId = bidReq.crid;
+          response.netRevenue = false;
+          response.currency = 'USD';
+          response.ttl = 300;
+          response.dealId = bidReq.dealId;
+          response.mediaType = mediaType;
+          if (mediaType == 'native') {
+            let nativeResp = JSON.parse(bidReq.adm).native;
+            let nativeData = {
+              clickUrl: nativeResp.link.url,
+              impressionTrackers: nativeResp.imptrackers
+            };
+            nativeResp.assets.forEach(asst => {
+              let data = getNativeAssestData(asst, assets);
+              nativeData[data.key] = data.value;
+            });
+            response.native = nativeData;
+          }
+          responseArray.push(response);
+        });
+      }
+    } catch (e) {
+      logError(e);
+    }
+  }
+  return responseArray;
+}
+// Function to get imp based on Media Type
+const getImpDetails = (bidReq) => {
+  let imp = {};
+  if (bidReq) {
+    imp.id = bidReq.bidId;
+    imp.bidfloor = getFloorPrice(bidReq);
+    if (bidReq.mediaTypes.native) {
+      let assets = { assets: NATIVE_ASSETS };
+      imp.native = { request: JSON.stringify(assets) };
+    } else if (bidReq.mediaTypes.banner) {
+      imp.banner = getBannerDetails(bidReq);
+    }
+  }
+  return imp;
+}
+// Function to get banner object
+const getBannerDetails = (bidReq) => {
+  let response = {};
+  if (bidReq.mediaTypes.banner) {
+    // Fetch width and height from MediaTypes object, if not provided in bidReq params
+    if (bidReq.mediaTypes.banner.sizes && !bidReq.params.height && !bidReq.params.width) {
+      let sizes = bidReq.mediaTypes.banner.sizes;
+      if (sizes.length > 0) {
+        response.h = sizes[0][1];
+        response.w = sizes[0][0];
+      }
+    } else {
+      response.h = bidReq.params.height;
+      response.w = bidReq.params.width;
+    }
+  }
+  return response;
+}
+// Function to get floor price
+const getFloorPrice = (bidReq) => {
+  let bidfloor = deepAccess(bidReq, 'params.bid_floor', 0);
+  return bidfloor;
+}
+// Function to get site object
+const getSiteDetails = (bidderRequest) => {
+  let page = '';
+  let name = '';
+  if (bidderRequest && bidderRequest.refererInfo) {
+    page = bidderRequest.refererInfo.page;
+    name = bidderRequest.refererInfo.domain;
+  }
+  return {page: page, name: name};
+}
+// Function to build the user object
+const getUserDetails = (bidReq) => {
+  let user = {};
+  if (bidReq && bidReq.ortb2 && bidReq.ortb2.user) {
+    user.id = bidReq.ortb2.user.id ? bidReq.ortb2.user.id : '';
+    user.buyeruid = bidReq.ortb2.user.buyeruid ? bidReq.ortb2.user.buyeruid : '';
+    user.keywords = bidReq.ortb2.user.keywords ? bidReq.ortb2.user.keywords : '';
+    user.customdata = bidReq.ortb2.user.customdata ? bidReq.ortb2.user.customdata : '';
+  } else {
+    user.id = '';
+    user.buyeruid = '';
+    user.keywords = '';
+    user.customdata = '';
+  }
+  return user;
+}
+// Function to get asset data for response
+const getNativeAssestData = (params, assets) => {
+  let response = {};
+  if (params.title) {
+    response.key = 'title';
+    response.value = params.title.text;
+  }
+  if (params.data) {
+    response.key = getAssetData(params.id, assets);
+    response.value = params.data.value;
+  }
+  if (params.img) {
+    response.key = getAssetImageDataType(params.id, assets);
+    response.value = {
+      url: params.img.url,
+      height: params.img.h,
+      width: params.img.w
+    }
+  }
+  return response;
+}
+// Function to get asset data types based on id
+const getAssetData = (paramId, asset) => {
+  let resp = '';
+  for (let i = 0; i < asset.length; i++) {
+    if (asset[i].id == paramId) {
+      switch (asset[i].data.type) {
+        case 1 : resp = 'sponsored';
+          break;
+        case 2 : resp = 'desc';
+          break;
+        case 12 : resp = 'cta';
+          break;
+      }
+    }
+  }
+  return resp;
+}
+// Function to get image type based on the id
+const getAssetImageDataType = (paramId, asset) => {
+  let resp = '';
+  for (let i = 0; i < asset.length; i++) {
+    if (asset[i].id == paramId) {
+      switch (asset[i].img.type) {
+        case 1 : resp = 'icon';
+          break;
+        case 3 : resp = 'image';
+          break;
+      }
+    }
+  }
+  return resp;
+}
+// Function to get Media Type
+const getMediaType = (bidReq) => {
+  if (bidReq.mediaTypes.native) {
+    return 'native';
+  } else if (bidReq.mediaTypes.banner) {
+    return 'banner';
+  }
+}
diff --git a/libraries/autoplayDetection/autoplay.js b/libraries/autoplayDetection/autoplay.js
new file mode 100644
index 00000000000..3ca4c4a8d11
--- /dev/null
+++ b/libraries/autoplayDetection/autoplay.js
@@ -0,0 +1,50 @@
+let autoplayEnabled = null;
+
+/**
+ * DEVELOPER WARNING: IMPORTING THIS LIBRARY MAY MAKE YOUR ADAPTER NO LONGER COMPATIBLE WITH APP PUBLISHERS USING WKWEBVIEW
+ * Note: this function returns true if detection is not done yet. This is by design: if autoplay is not allowed,
+ * the call to video.play() will fail immediately, otherwise it may not terminate.
+ * @returns true if autoplay is not forbidden
+ */
+export const isAutoplayEnabled = () => autoplayEnabled !== false;
+
+// generated with:
+// ask ChatGPT for a 160x90 black PNG image (1/8th the size of 720p)
+//
+// encode with:
+// ffmpeg -i black_image_160x90.png -r 1 -c:v libx264 -bsf:v 'filter_units=remove_types=6' -pix_fmt yuv420p autoplay.mp4
+// this creates a 1 second long, 1 fps YUV 4:2:0 video encoded with H.264 without encoder details.
+//
+// followed by:
+// echo "data:video/mp4;base64,$(base64 -i autoplay.mp4)"
+
+const autoplayVideoUrl =
+  'data:video/mp4;base64,AAAAIGZ0eXBpc29tAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQAAADxtZGF0AAAAMGWIhAAV//73ye/Apuvb3rW/k89I/Cy3PsIqP39atohOSV14BYa1heKCYgALQC5K4QAAAwZtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAD6AABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACMHRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAEAAAAAAAAD6AAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAoAAAAFoAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAA+gAAAAAAAEAAAAAAahtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAEAAAABAAFXEAAAAAAAtaGRscgAAAAAAAAAAdmlkZQAAAAAAAAAAAAAAAFZpZGVvSGFuZGxlcgAAAAFTbWluZgAAABR2bWhkAAAAAQAAAAAAAAAAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAABE3N0YmwAAACvc3RzZAAAAAAAAAABAAAAn2F2YzEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAoABaAEgAAABIAAAAAAAAAAEVTGF2YzYwLjMxLjEwMiBsaWJ4MjY0AAAAAAAAAAAAAAAY//8AAAA1YXZjQwFkAAr/4QAYZ2QACqzZQo35IQAAAwABAAADAAIPEiWWAQAGaOvjyyLA/fj4AAAAABRidHJ0AAAAAAAAAaAAAAGgAAAAGHN0dHMAAAAAAAAAAQAAAAEAAEAAAAAAHHN0c2MAAAAAAAAAAQAAAAEAAAABAAAAAQAAABRzdHN6AAAAAAAAADQAAAABAAAAFHN0Y28AAAAAAAAAAQAAADAAAABidWR0YQAAAFptZXRhAAAAAAAAACFoZGxyAAAAAAAAAABtZGlyYXBwbAAAAAAAAAAAAAAAAC1pbHN0AAAAJal0b28AAAAdZGF0YQAAAAEAAAAATGF2ZjYwLjE2LjEwMA==';
+
+function startDetection() {
+  const version = navigator.userAgent.match(/iPhone OS (\d+)_(\d+)/)
+  if (version !== null && parseInt(version[1]) < 17 && !navigator.userAgent.includes('Safari')) {
+    // skip autodetection on iOS 16 WebView
+    return
+  }
+
+  // we create an HTMLVideoElement muted and not displayed in which we try to play a one frame video
+  const videoElement = document.createElement('video');
+  videoElement.src = autoplayVideoUrl;
+  videoElement.setAttribute('playsinline', 'true');
+  videoElement.muted = true;
+
+  videoElement
+    .play()
+    .then(() => {
+      autoplayEnabled = true;
+      // if the video is played on a WebView with playsinline = false, this stops the video, to prevent it from being displayed fullscreen
+      videoElement.src = '';
+    })
+    .catch(() => {
+      autoplayEnabled = false;
+    });
+}
+
+// starts detection as soon as this library is loaded
+startDetection();
diff --git a/libraries/biddoInvamiaUtils/index.js b/libraries/biddoInvamiaUtils/index.js
new file mode 100644
index 00000000000..0d7c4b1b683
--- /dev/null
+++ b/libraries/biddoInvamiaUtils/index.js
@@ -0,0 +1,70 @@
+/**
+ * Helper function to build request payload for banner ads.
+ * @param {Object} bidRequest - The bid request object.
+ * @param {string} endpointUrl - The endpoint URL specific to the bidder.
+ * @returns {Array} An array of server requests.
+ */
+export function buildBannerRequests(bidRequest, endpointUrl) {
+  const serverRequests = [];
+  const sizes = bidRequest.mediaTypes.banner.sizes;
+
+  sizes.forEach(([width, height]) => {
+    bidRequest.params.requestedSizes = [width, height];
+
+    const payload = {
+      ctype: 'div',
+      pzoneid: bidRequest.params.zoneId,
+      width,
+      height,
+    };
+
+    const payloadString = Object.keys(payload)
+      .map((key) => `${key}=${encodeURIComponent(payload[key])}`)
+      .join('&');
+
+    serverRequests.push({
+      method: 'GET',
+      url: endpointUrl,
+      data: payloadString,
+      bidderRequest: bidRequest,
+    });
+  });
+
+  return serverRequests;
+}
+
+/**
+ * Helper function to interpret server response for banner ads.
+ * @param {Object} serverResponse - The server response object.
+ * @param {Object} bidderRequest - The matched bid request for this response.
+ * @returns {Array} An array of bid responses.
+ */
+export function interpretBannerResponse(serverResponse, bidderRequest) {
+  const response = serverResponse.body;
+  const bidResponses = [];
+
+  if (response && response.template && response.template.html) {
+    const { bidId } = bidderRequest;
+    const [width, height] = bidderRequest.params.requestedSizes;
+
+    const bidResponse = {
+      requestId: bidId,
+      cpm: response.hb.cpm,
+      creativeId: response.banner.hash,
+      currency: 'USD',
+      netRevenue: response.hb.netRevenue,
+      ttl: 600,
+      ad: response.template.html,
+      mediaType: 'banner',
+      meta: {
+        advertiserDomains: response.hb.adomains || [],
+      },
+      width,
+      height,
+    };
+
+    bidResponses.push(bidResponse);
+  }
+
+  return bidResponses;
+}
diff --git a/libraries/braveUtils/buildAndInterpret.js b/libraries/braveUtils/buildAndInterpret.js
new file mode 100644
index 00000000000..66cd63896f7
--- /dev/null
+++ b/libraries/braveUtils/buildAndInterpret.js
@@ -0,0 +1,78 @@
+import { isEmpty, parseUrl } from '../../src/utils.js';
+import {config} from '../../src/config.js';
+import { createNativeRequest, createBannerRequest, createVideoRequest } from './index.js';
+import { convertOrtbRequestToProprietaryNative } from '../../src/native.js';
+
+export const buildRequests = (validBidRequests, bidderRequest, endpointURL, defaultCur) => {
+  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+  if (!validBidRequests.length || !bidderRequest) return [];
+
+  const endpoint = endpointURL.replace('hash', validBidRequests[0].params.placementId);
+  const imp = validBidRequests.map((br) => {
+    const impObject = { id: br.bidId, secure: 1 };
+    if (br.mediaTypes.banner) impObject.banner = createBannerRequest(br);
+    else if (br.mediaTypes.video) impObject.video = createVideoRequest(br);
+    else if (br.mediaTypes.native) impObject.native = { id: br.transactionId, ver: '1.2', request: createNativeRequest(br) };
+    return impObject;
+  });
+
+  const page = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+  const data = {
+    id: bidderRequest.bidderRequestId,
+    cur: [defaultCur],
+    device: { w: screen.width, h: screen.height, language: navigator.language?.split('-')[0], ua: navigator.userAgent },
+    site: { domain: parseUrl(page).hostname, page: page },
+    tmax: bidderRequest.timeout,
+    imp,
+  };
+
+  if (bidderRequest.refererInfo.ref) data.site.ref = bidderRequest.refererInfo.ref;
+  if (bidderRequest.gdprConsent) {
+    data.regs = { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0 } };
+    data.user = { ext: { consent: bidderRequest.gdprConsent.consentString || '' } };
+  }
+  if (bidderRequest.uspConsent) data.regs.ext.us_privacy = bidderRequest.uspConsent;
+  if (config.getConfig('coppa')) data.regs.coppa = 1;
+  if (validBidRequests[0].schain) data.source = { ext: { schain: validBidRequests[0].schain } };
+
+  return { method: 'POST', url: endpoint, data };
+};
+
+export const interpretResponse = (serverResponse, defaultCur, parseNative) => {
+  if (!serverResponse || isEmpty(serverResponse.body)) return [];
+
+  let bids = [];
+  serverResponse.body.seatbid.forEach(response => {
+    response.bid.forEach(bid => {
+      const mediaType = bid.ext?.mediaType || 'banner';
+
+      const bidObj = {
+        requestId: bid.impid,
+        cpm: bid.price,
+        width: bid.w,
+        height: bid.h,
+        ttl: 1200,
+        currency: defaultCur,
+        netRevenue: true,
+        creativeId: bid.crid,
+        dealId: bid.dealid || null,
+        mediaType,
+      };
+
+      switch (mediaType) {
+        case 'video':
+          bidObj.vastUrl = bid.adm;
+          break;
+        case 'native':
+          bidObj.native = parseNative(bid.adm);
+          break;
+        default:
+          bidObj.ad = bid.adm;
+      }
+
+      bids.push(bidObj);
+    });
+  });
+
+  return bids;
+};
diff --git a/libraries/braveUtils/index.js b/libraries/braveUtils/index.js
new file mode 100644
index 00000000000..5756e09ae5c
--- /dev/null
+++ b/libraries/braveUtils/index.js
@@ -0,0 +1,95 @@
+import { NATIVE_ASSETS, NATIVE_ASSETS_IDS } from './nativeAssets.js';
+
+/**
+ * Builds a native request object based on the bid request
+ * @param {object} br - The bid request
+ * @returns {object} The native request object
+ */
+export function createNativeRequest(br) {
+  let impObject = {
+    ver: '1.2',
+    assets: []
+  };
+
+  Object.keys(br.mediaTypes.native).forEach((key) => {
+    const props = NATIVE_ASSETS[key];
+    if (props) {
+      const asset = {
+        required: br.mediaTypes.native[key].required ? 1 : 0,
+        id: props.id,
+        [props.name]: {}
+      };
+
+      if (props.type) asset[props.name]['type'] = props.type;
+      if (br.mediaTypes.native[key].len) asset[props.name]['len'] = br.mediaTypes.native[key].len;
+      if (br.mediaTypes.native[key].sizes && br.mediaTypes.native[key].sizes[0]) {
+        asset[props.name]['w'] = br.mediaTypes.native[key].sizes[0];
+        asset[props.name]['h'] = br.mediaTypes.native[key].sizes[1];
+      }
+
+      impObject.assets.push(asset);
+    }
+  });
+
+  return impObject;
+}
+
+/**
+ * Builds a banner request object based on the bid request
+ * @param {object} br - The bid request
+ * @returns {object} The banner request object
+ */
+export function createBannerRequest(br) {
+  let size = br.mediaTypes.banner.sizes?.[0] || [300, 250];
+  return { id: br.transactionId, w: size[0], h: size[1] };
+}
+
+/**
+ * Builds a video request object based on the bid request
+ * @param {object} br - The bid request
+ * @returns {object} The video request object
+ */
+export function createVideoRequest(br) {
+  let videoObj = { id: br.transactionId };
+  const supportedParams = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'skip', 'minbitrate', 'maxbitrate', 'api', 'linearity'];
+
+  supportedParams.forEach((param) => {
+    if (br.mediaTypes.video[param] !== undefined) {
+      videoObj[param] = br.mediaTypes.video[param];
+    }
+  });
+
+  const playerSize = br.mediaTypes.video.playerSize;
+  if (playerSize) {
+    videoObj.w = Array.isArray(playerSize[0]) ? playerSize[0][0] : playerSize[0];
+    videoObj.h = Array.isArray(playerSize[0]) ? playerSize[0][1] : playerSize[1];
+  } else {
+    videoObj.w = 640;
+    videoObj.h = 480;
+  }
+
+  return videoObj;
+}
+
+/**
+ * Parses the native ad response
+ * @param {object} adm - The native ad response
+ * @returns {object} Parsed native ad object
+ */
+export function parseNative(adm) {
+  let bid = {
+    clickUrl: adm.native.link?.url,
+    impressionTrackers: adm.native.imptrackers || [],
+    clickTrackers: adm.native.link?.clicktrackers || [],
+    jstracker: adm.native.jstracker || []
+  };
+  adm.native.assets.forEach((asset) => {
+    const kind = NATIVE_ASSETS_IDS[asset.id];
+    const content = kind && asset[NATIVE_ASSETS[kind].name];
+    if (content) {
+      bid[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+
+  return bid;
+}
diff --git a/libraries/braveUtils/nativeAssets.js b/libraries/braveUtils/nativeAssets.js
new file mode 100644
index 00000000000..07de1264d0c
--- /dev/null
+++ b/libraries/braveUtils/nativeAssets.js
@@ -0,0 +1,23 @@
+/**
+ * IDs and asset types for native ad assets.
+ */
+export const NATIVE_ASSETS_IDS = {
+  1: 'title',
+  2: 'icon',
+  3: 'image',
+  4: 'body',
+  5: 'sponsoredBy',
+  6: 'cta'
+};
+
+/**
+ * Native assets definition for mapping purposes.
+ */
+export const NATIVE_ASSETS = {
+  title: { id: 1, name: 'title' },
+  icon: { id: 2, type: 1, name: 'img' },
+  image: { id: 3, type: 3, name: 'img' },
+  body: { id: 4, type: 2, name: 'data' },
+  sponsoredBy: { id: 5, type: 1, name: 'data' },
+  cta: { id: 6, type: 12, name: 'data' }
+};
diff --git a/libraries/cmp/cmpClient.js b/libraries/cmp/cmpClient.js
index 03a50c37bb3..1d0b327cee4 100644
--- a/libraries/cmp/cmpClient.js
+++ b/libraries/cmp/cmpClient.js
@@ -4,46 +4,46 @@ import {GreedyPromise} from '../../src/utils/promise.js';
  * @typedef {function} CMPClient
  *
  * @param {{}} params CMP parameters. Currently this is a subset of {command, callback, parameter, version}.
- * @param {bool} once if true, discard cross-frame event listeners once a reply message is received.
+ * @param {boolean} once if true, discard cross-frame event listeners once a reply message is received.
  * @returns {Promise<*>} a promise to the API's "result" - see the `mode` argument to `cmpClient` on how that's determined.
  * @property {boolean} isDirect true if the CMP is directly accessible (no postMessage required)
  * @property {() => void} close close the client; currently, this just stops listening for cross-frame messages.
  */
 
+export const MODE_MIXED = 0;
+export const MODE_RETURN = 1;
+export const MODE_CALLBACK = 2;
+
 /**
  * Returns a client function that can interface with a CMP regardless of where it's located.
  *
- * @param apiName name of the CMP api, e.g. "__gpp"
- * @param apiVersion? CMP API version
- * @param apiArgs? names of the arguments taken by the api function, in order.
- * @param callbackArgs? names of the cross-frame response payload properties that should be passed as callback arguments, in order
- * @param mode? controls the callbacks passed to the underlying API, and how the promises returned by the client are resolved.
+ * @param {object} obj
+ * @param obj.apiName name of the CMP api, e.g. "__gpp"
+ * @param [obj.apiVersion] CMP API version
+ * @param [obj.apiArgs] names of the arguments taken by the api function, in order.
+ * @param [obj.callbackArgs] names of the cross-frame response payload properties that should be passed as callback arguments, in order
+ * @param [obj.mode] controls the callbacks passed to the underlying API, and how the promises returned by the client are resolved.
  *
- *  The client behaves differently when it's provided a `callback` argument vs when it's not - for short, let's name these
- *  cases "subscriptions" and "one-shot calls" respectively:
+ * The client behaves differently when it's provided a `callback` argument vs when it's not - for short, let's name these
+ * cases "subscriptions" and "one-shot calls" respectively:
  *
- *  With `mode: MODE_MIXED` (the default), promises returned on subscriptions are resolved to undefined when the callback
- *  is first run (that is, the promise resolves when the CMP replies, but what it replies with is discarded and
- *  left for the callback to deal with). For one-shot calls, the returned promise is resolved to the API's
- *  return value when it's directly accessible, or with the result from the first (and, presumably, the only)
- *  cross-frame reply when it's not;
+ * With `mode: MODE_MIXED` (the default), promises returned on subscriptions are resolved to undefined when the callback
+ * is first run (that is, the promise resolves when the CMP replies, but what it replies with is discarded and
+ * left for the callback to deal with). For one-shot calls, the returned promise is resolved to the API's
+ * return value when it's directly accessible, or with the result from the first (and, presumably, the only)
+ * cross-frame reply when it's not;
  *
- *  With `mode: MODE_RETURN`, the returned promise always resolves to the API's return value - which is taken to be undefined
- *  when cross-frame;
+ * With `mode: MODE_RETURN`, the returned promise always resolves to the API's return value - which is taken to be undefined
+ * when cross-frame;
  *
- *  With `mode: MODE_CALLBACK`, the underlying API is expected to never directly return anything significant; instead,
- *  it should always accept a callback and - for one-shot calls - invoke it only once with the result. The client will
- *  automatically generate an appropriate callback for one-shot calls and use the result it's given to resolve
- *  the returned promise. Subscriptions are treated in the same way as MODE_MIXED.
+ * With `mode: MODE_CALLBACK`, the underlying API is expected to never directly return anything significant; instead,
+ * it should always accept a callback and - for one-shot calls - invoke it only once with the result. The client will
+ * automatically generate an appropriate callback for one-shot calls and use the result it's given to resolve
+ * the returned promise. Subscriptions are treated in the same way as MODE_MIXED.
  *
  * @param win
  * @returns {CMPClient} CMP invocation function (or null if no CMP was found).
  */
-
-export const MODE_MIXED = 0;
-export const MODE_RETURN = 1;
-export const MODE_CALLBACK = 2;
-
 export function cmpClient(
   {
     apiName,
diff --git a/libraries/connectionInfo/connectionUtils.js b/libraries/connectionInfo/connectionUtils.js
new file mode 100644
index 00000000000..29fed27b91d
--- /dev/null
+++ b/libraries/connectionInfo/connectionUtils.js
@@ -0,0 +1,33 @@
+/**
+ * Returns the type of connection.
+ *
+ * @returns {number} - Type of connection.
+ */
+export function getConnectionType() {
+  const connection = navigator.connection || navigator.webkitConnection;
+  if (!connection) {
+    return 0;
+  }
+  switch (connection.type) {
+    case 'ethernet':
+      return 1;
+    case 'wifi':
+      return 2;
+    case 'wimax':
+      return 6;
+    default:
+      switch (connection.effectiveType) {
+        case 'slow-2g':
+        case '2g':
+          return 4;
+        case '3g':
+          return 5;
+        case '4g':
+          return 6;
+        case '5g':
+          return 7;
+        default:
+          return connection.type == 'cellular' ? 3 : 0;
+      }
+  }
+}
diff --git a/libraries/consentManagement/cmUtils.js b/libraries/consentManagement/cmUtils.js
new file mode 100644
index 00000000000..f4dbd81f493
--- /dev/null
+++ b/libraries/consentManagement/cmUtils.js
@@ -0,0 +1,38 @@
+import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
+import {logError, logInfo, logWarn} from '../../src/utils.js';
+
+export function consentManagementHook(name, getConsent, loadConsentData) {
+  function loadIfMissing(cb) {
+    if (getConsent()) {
+      logInfo('User consent information already known.  Pulling internally stored information...');
+      // eslint-disable-next-line standard/no-callback-literal
+      cb(false);
+    } else {
+      loadConsentData(cb);
+    }
+  }
+
+  return timedAuctionHook(name, function requestBidsHook(fn, reqBidsConfigObj) {
+    loadIfMissing(function (shouldCancelAuction, errMsg, ...extraArgs) {
+      if (errMsg) {
+        let log = logWarn;
+        if (shouldCancelAuction) {
+          log = logError;
+          errMsg = `${errMsg} Canceling auction as per consentManagement config.`;
+        }
+        log(errMsg, ...extraArgs);
+      }
+
+      if (shouldCancelAuction) {
+        fn.stopTiming();
+        if (typeof reqBidsConfigObj.bidsBackHandler === 'function') {
+          reqBidsConfigObj.bidsBackHandler();
+        } else {
+          logError('Error executing bidsBackHandler');
+        }
+      } else {
+        fn.call(this, reqBidsConfigObj);
+      }
+    });
+  });
+}
diff --git a/libraries/creative-renderer-display/renderer.js b/libraries/creative-renderer-display/renderer.js
new file mode 100644
index 00000000000..146afab46ae
--- /dev/null
+++ b/libraries/creative-renderer-display/renderer.js
@@ -0,0 +1,2 @@
+// this file is autogenerated, see creative/README.md
+export const RENDERER = "(()=>{\"use strict\";window.render=function({ad:d,adUrl:e,width:i,height:r},{mkFrame:n},o){if(!d&&!e)throw{reason:\"noAd\",message:\"Missing ad markup or URL\"};{const s=o.document,t={width:i,height:r};e&&!d?t.src=e:t.srcdoc=d,s.body.appendChild(n(s,t))}}})();"
\ No newline at end of file
diff --git a/libraries/creative-renderer-native/renderer.js b/libraries/creative-renderer-native/renderer.js
new file mode 100644
index 00000000000..d7d85cdd7ba
--- /dev/null
+++ b/libraries/creative-renderer-native/renderer.js
@@ -0,0 +1,2 @@
+// this file is autogenerated, see creative/README.md
+export const RENDERER = "(()=>{\"use strict\";const e=\"Prebid Native\",t={title:\"text\",data:\"value\",img:\"url\",video:\"vasttag\"};function n(e,t){return new Promise(((n,r)=>{const i=t.createElement(\"script\");i.onload=n,i.onerror=r,i.src=e,t.body.appendChild(i)}))}function r(e,t,r,i,o=n){const{rendererUrl:s,assets:a,ortb:d,adTemplate:c}=t,l=i.document;return s?o(s,l).then((()=>{if(\"function\"!=typeof i.renderAd)throw new Error(`Renderer from '${s}' does not define renderAd()`);const e=a||[];return e.ortb=d,i.renderAd(e)})):Promise.resolve(r(c??l.body.innerHTML))}window.render=function({adId:n,native:i},{sendMessage:o},s,a=r){const{head:d,body:c}=s.document,l=()=>o(e,{action:\"resizeNativeHeight\",height:c.offsetHeight,width:c.offsetWidth}),u=function(e,{assets:n=[],ortb:r,nativeKeys:i={}}){const o=Object.fromEntries(n.map((({key:e,value:t})=>[e,t])));let s=Object.fromEntries(Object.entries(i).flatMap((([t,n])=>{const r=o.hasOwnProperty(t)?o[t]:void 0;return[[`##${n}##`,r],[`${n}:${e}`,r]]})));return r&&Object.assign(s,{\"##hb_native_linkurl##\":r.link?.url,\"##hb_native_privacy##\":r.privacy},Object.fromEntries((r.assets||[]).flatMap((e=>{const n=Object.keys(t).find((t=>e[t]));return[n&&[`##hb_native_asset_id_${e.id}##`,e[n][t[n]]],e.link?.url&&[`##hb_native_asset_link_id_${e.id}##`,e.link.url]].filter((e=>e))})))),s=Object.entries(s).concat([[/##hb_native_asset_(link_)?id_\\d+##/g]]),function(e){return s.reduce(((e,[t,n])=>e.replaceAll(t,n||\"\")),e)}}(n,i);return d&&(d.innerHTML=u(d.innerHTML)),a(n,i,u,s).then((t=>{c.innerHTML=t,\"function\"==typeof s.postRenderAd&&s.postRenderAd({adId:n,...i}),s.document.querySelectorAll(\".pb-click\").forEach((t=>{const n=t.getAttribute(\"hb_native_asset_id\");t.addEventListener(\"click\",(()=>o(e,{action:\"click\",assetId:n})))})),o(e,{action:\"fireNativeImpressionTrackers\"}),\"complete\"===s.document.readyState?l():s.onload=l}))}})();"
\ No newline at end of file
diff --git a/libraries/currencyUtils/floor.js b/libraries/currencyUtils/floor.js
new file mode 100644
index 00000000000..ee41bad01da
--- /dev/null
+++ b/libraries/currencyUtils/floor.js
@@ -0,0 +1,23 @@
+import * as utils from '../../src/utils.js';
+
+/**
+ * get BidFloor
+ * @param {*} bid
+ * @returns
+ */
+export function getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return utils.deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor?.floor;
+  } catch (_) {
+    return 0;
+  }
+}
diff --git a/libraries/deepintentUtils/index.js b/libraries/deepintentUtils/index.js
new file mode 100644
index 00000000000..5abe2d1d061
--- /dev/null
+++ b/libraries/deepintentUtils/index.js
@@ -0,0 +1,42 @@
+import { isInteger } from '../../src/utils.js';
+
+export const COMMON_ORTB_VIDEO_PARAMS = {
+  'mimes': (value) => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
+  'minduration': (value) => isInteger(value),
+  'maxduration': (value) => isInteger(value),
+  'protocols': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 10),
+  'w': (value) => isInteger(value),
+  'h': (value) => isInteger(value),
+  'startdelay': (value) => isInteger(value),
+  'linearity': (value) => [1, 2].indexOf(value) !== -1,
+  'skip': (value) => [0, 1].indexOf(value) !== -1,
+  'skipmin': (value) => isInteger(value),
+  'skipafter': (value) => isInteger(value),
+  'sequence': (value) => isInteger(value),
+  'battr': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 17),
+  'maxextended': (value) => isInteger(value),
+  'minbitrate': (value) => isInteger(value),
+  'maxbitrate': (value) => isInteger(value),
+  'boxingallowed': (value) => [0, 1].indexOf(value) !== -1,
+  'playbackmethod': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6),
+  'playbackend': (value) => [1, 2, 3].indexOf(value) !== -1,
+  'api': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6)
+};
+
+export function formatResponse(bid) {
+  return {
+    requestId: bid && bid.impid ? bid.impid : undefined,
+    cpm: bid && bid.price ? bid.price : 0.0,
+    width: bid && bid.w ? bid.w : 0,
+    height: bid && bid.h ? bid.h : 0,
+    ad: bid && bid.adm ? bid.adm : '',
+    meta: {
+      advertiserDomains: bid && bid.adomain ? bid.adomain : []
+    },
+    creativeId: bid && bid.crid ? bid.crid : undefined,
+    netRevenue: false,
+    currency: bid && bid.cur ? bid.cur : 'USD',
+    ttl: 300,
+    dealId: bid && bid.dealId ? bid.dealId : undefined
+  }
+}
diff --git a/libraries/dfpUtils/dfpUtils.js b/libraries/dfpUtils/dfpUtils.js
new file mode 100644
index 00000000000..4b957eb4999
--- /dev/null
+++ b/libraries/dfpUtils/dfpUtils.js
@@ -0,0 +1,26 @@
+import {gdprDataHandler} from '../../src/consentHandler.js';
+
+/** Safe defaults which work on pretty much all video calls. */
+export const DEFAULT_DFP_PARAMS = {
+  env: 'vp',
+  gdfp_req: 1,
+  output: 'vast',
+  unviewed_position_start: 1,
+}
+
+export const DFP_ENDPOINT = {
+  protocol: 'https',
+  host: 'securepubads.g.doubleclick.net',
+  pathname: '/gampad/ads'
+}
+
+export function gdprParams() {
+  const gdprConsent = gdprDataHandler.getConsentData();
+  const params = {};
+  if (gdprConsent) {
+    if (typeof gdprConsent.gdprApplies === 'boolean') { params.gdpr = Number(gdprConsent.gdprApplies); }
+    if (gdprConsent.consentString) { params.gdpr_consent = gdprConsent.consentString; }
+    if (gdprConsent.addtlConsent) { params.addtl_consent = gdprConsent.addtlConsent; }
+  }
+  return params;
+}
diff --git a/libraries/dspxUtils/bidderUtils.js b/libraries/dspxUtils/bidderUtils.js
new file mode 100644
index 00000000000..612a20f6865
--- /dev/null
+++ b/libraries/dspxUtils/bidderUtils.js
@@ -0,0 +1,390 @@
+import { BANNER, VIDEO } from '../../src/mediaTypes.js';
+import {deepAccess, isArray, isEmptyStr, isFn, logError} from '../../src/utils.js';
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+/**
+ * Adds userIds to payload
+ *
+ * @param bidRequest
+ * @param payload
+ */
+export function fillUsersIds(bidRequest, payload) {
+  if (bidRequest.hasOwnProperty('userId')) {
+    let didMapping = {
+      did_netid: 'userId.netId',
+      did_id5: 'userId.id5id.uid',
+      did_id5_linktype: 'userId.id5id.ext.linkType',
+      did_uid2: 'userId.uid2',
+      did_sharedid: 'userId.sharedid',
+      did_pubcid: 'userId.pubcid',
+      did_uqid: 'userId.utiq',
+      did_cruid: 'userId.criteoid',
+      did_euid: 'userId.euid',
+      // did_tdid: 'unifiedId',
+      did_tdid: 'userId.tdid',
+      did_ppuid: function() {
+        let path = 'userId.pubProvidedId';
+        let value = deepAccess(bidRequest, path);
+        if (isArray(value)) {
+          for (const rec of value) {
+            if (rec.uids && rec.uids.length > 0) {
+              for (let i = 0; i < rec.uids.length; i++) {
+                if ('id' in rec.uids[i] && deepAccess(rec.uids[i], 'ext.stype') === 'ppuid') {
+                  return (rec.uids[i].atype ?? '') + ':' + rec.source + ':' + rec.uids[i].id;
+                }
+              }
+            }
+          }
+        }
+        return undefined;
+      },
+      did_cpubcid: 'crumbs.pubcid'
+    };
+    for (let paramName in didMapping) {
+      let path = didMapping[paramName];
+
+      // handle function
+      if (typeof path == 'function') {
+        let value = path(paramName);
+        if (value) {
+          payload[paramName] = value;
+        }
+        continue;
+      }
+      // direct access
+      let value = deepAccess(bidRequest, path);
+      if (typeof value == 'string' || typeof value == 'number') {
+        payload[paramName] = value;
+      } else if (typeof value == 'object') {
+        // trying to find string ID value
+        if (typeof deepAccess(bidRequest, path + '.id') == 'string') {
+          payload[paramName] = deepAccess(bidRequest, path + '.id');
+        } else {
+          if (Object.keys(value).length > 0) {
+            logError(`WARNING: fillUserIds had to use first key in user object to get value for bid.userId key: ${path}.`);
+            payload[paramName] = value[Object.keys(value)[0]];
+          }
+        }
+      }
+    }
+  }
+}
+
+export function appendToUrl(url, what) {
+  if (!what) {
+    return url;
+  }
+  return url + (url.indexOf('?') !== -1 ? '&' : '?') + what;
+}
+
+export function objectToQueryString(obj, prefix) {
+  let str = [];
+  let p;
+  for (p in obj) {
+    if (obj.hasOwnProperty(p)) {
+      let k = prefix ? prefix + '[' + p + ']' : p;
+      let v = obj[p];
+      str.push((v !== null && typeof v === 'object')
+        ? objectToQueryString(v, k)
+        : encodeURIComponent(k) + '=' + encodeURIComponent(v));
+    }
+  }
+  return str.filter(n => n).join('&');
+}
+
+/**
+ * Check if it's a banner bid request
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {boolean} True if it's a banner bid
+ */
+export function isBannerRequest(bid) {
+  return bid.mediaType === 'banner' || !!deepAccess(bid, 'mediaTypes.banner') || !isVideoRequest(bid);
+}
+
+/**
+ * Check if it's a video bid request
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {boolean} True if it's a video bid
+ */
+export function isVideoRequest(bid) {
+  return bid.mediaType === 'video' || !!deepAccess(bid, 'mediaTypes.video');
+}
+
+/**
+ * Get video sizes
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {object}
+ */
+export function getVideoSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
+}
+
+/**
+ * Get video context
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {object}
+ */
+export function getVideoContext(bid) {
+  return deepAccess(bid, 'mediaTypes.video.context') || 'unknown';
+}
+
+/**
+ * Get banner sizes
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {object} True if it's a video bid
+ */
+export function getBannerSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
+}
+
+/**
+ * Parse size
+ * @param size
+ * @returns {object} sizeObj
+ */
+export function parseSize(size) {
+  let sizeObj = {}
+  sizeObj.width = parseInt(size[0], 10);
+  sizeObj.height = parseInt(size[1], 10);
+  return sizeObj;
+}
+
+/**
+ * Parse sizes
+ * @param sizes
+ * @returns {{width: number , height: number }[]}
+ */
+export function parseSizes(sizes) {
+  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
+    return sizes.map(size => parseSize(size));
+  }
+  return [parseSize(sizes)]; // or a single one ? (ie. [728,90])
+}
+
+/**
+ * Get MediaInfo object for server request
+ *
+ * @param mediaTypesInfo
+ * @returns {*}
+ */
+export function convertMediaInfoForRequest(mediaTypesInfo) {
+  let requestData = {};
+  Object.keys(mediaTypesInfo).forEach(mediaType => {
+    requestData[mediaType] = mediaTypesInfo[mediaType].map(size => {
+      return size.width + 'x' + size.height;
+    }).join(',');
+  });
+  return requestData;
+}
+
+/**
+ * Get media types info
+ *
+ * @param bid
+ */
+export function getMediaTypesInfo(bid) {
+  let mediaTypesInfo = {};
+
+  if (bid.mediaTypes) {
+    Object.keys(bid.mediaTypes).forEach(mediaType => {
+      if (mediaType === BANNER) {
+        mediaTypesInfo[mediaType] = getBannerSizes(bid);
+      }
+      if (mediaType === VIDEO) {
+        mediaTypesInfo[mediaType] = getVideoSizes(bid);
+      }
+    });
+  } else {
+    mediaTypesInfo[BANNER] = getBannerSizes(bid);
+  }
+  return mediaTypesInfo;
+}
+
+/**
+ * Get Bid Floor
+ * @param bid
+ * @returns {number|*}
+ */
+export function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'EUR',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor?.floor;
+  } catch (_) {
+    return 0
+  }
+}
+
+/**
+ * Convert site.content to string
+ * @param content
+ */
+export function siteContentToString(content) {
+  if (!content) {
+    return '';
+  }
+  let stringKeys = ['id', 'title', 'series', 'season', 'artist', 'genre', 'isrc', 'url', 'keywords'];
+  let intKeys = ['episode', 'context', 'livestream'];
+  let arrKeys = ['cat'];
+  let retArr = [];
+  arrKeys.forEach(k => {
+    let val = deepAccess(content, k);
+    if (val && Array.isArray(val)) {
+      retArr.push(k + ':' + val.join('|'));
+    }
+  });
+  intKeys.forEach(k => {
+    let val = deepAccess(content, k);
+    if (val && typeof val === 'number') {
+      retArr.push(k + ':' + val);
+    }
+  });
+  stringKeys.forEach(k => {
+    let val = deepAccess(content, k);
+    if (val && typeof val === 'string') {
+      retArr.push(k + ':' + encodeURIComponent(val));
+    }
+  });
+  return retArr.join(',');
+}
+
+/**
+ * Assigns multiple values to the specified keys on an object if the values are not undefined.
+ * @param {Object} target - The object to which the values will be assigned.
+ * @param {Object} values - An object containing key-value pairs to be assigned.
+ */
+export function assignDefinedValues(target, values) {
+  for (const key in values) {
+    if (values[key] !== undefined) {
+      target[key] = values[key];
+    }
+  }
+}
+
+/**
+ * Extracts user segments/topics from the bid request object
+ * @param {Object} bid - The bid request object
+ * @returns {{segclass: *, segtax: *, segments: *}|undefined} - User segments/topics or undefined if not found
+ */
+export function extractUserSegments(bid) {
+  const userData = deepAccess(bid, 'ortb2.user.data') || [];
+  for (const dataObj of userData) {
+    if (dataObj.segment && isArray(dataObj.segment) && dataObj.segment.length > 0) {
+      const segments = dataObj.segment
+        .filter(seg => seg.id && !isEmptyStr(seg.id) && isFinite(seg.id))
+        .map(seg => Number(seg.id));
+      if (segments.length > 0) {
+        return {
+          segtax: deepAccess(dataObj, 'ext.segtax'),
+          segclass: deepAccess(dataObj, 'ext.segclass'),
+          segments: segments.join(',')
+        };
+      }
+    }
+  }
+  return undefined;
+}
+
+export function handleSyncUrls(syncOptions, serverResponses, gdprConsent, uspConsent) {
+  if (!serverResponses || serverResponses.length === 0) {
+    return [];
+  }
+
+  const syncs = [];
+  let gdprParams = '';
+  if (gdprConsent) {
+    if ('gdprApplies' in gdprConsent && typeof gdprConsent.gdprApplies === 'boolean') {
+      gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+    } else {
+      gdprParams = `gdpr_consent=${gdprConsent.consentString}`;
+    }
+  }
+
+  if (serverResponses.length > 0 && serverResponses[0].body.userSync) {
+    if (syncOptions.iframeEnabled) {
+      serverResponses[0].body.userSync.iframeUrl.forEach((url) => syncs.push({
+        type: 'iframe',
+        url: appendToUrl(url, gdprParams)
+      }));
+    }
+    if (syncOptions.pixelEnabled) {
+      serverResponses[0].body.userSync.imageUrl.forEach((url) => syncs.push({
+        type: 'image',
+        url: appendToUrl(url, gdprParams)
+      }));
+    }
+  }
+  return syncs;
+}
+
+export function interpretResponse(serverResponse, bidRequest, rendererFunc) {
+  const bidResponses = [];
+  const response = serverResponse.body;
+  const crid = response.crid || 0;
+  const cpm = response.cpm / 1000000 || 0;
+  if (cpm !== 0 && crid !== 0) {
+    const dealId = response.dealid || '';
+    const currency = response.currency || 'EUR';
+    const netRevenue = (response.netRevenue === undefined) ? true : response.netRevenue;
+    const bidResponse = {
+      requestId: response.bid_id,
+      cpm: cpm,
+      width: response.width,
+      height: response.height,
+      creativeId: crid,
+      dealId: dealId,
+      currency: currency,
+      netRevenue: netRevenue,
+      type: response.type,
+      ttl: 60,
+      meta: {
+        advertiserDomains: response.adomain || []
+      }
+    };
+
+    if (response.vastUrl) {
+      bidResponse.vastUrl = response.vastUrl;
+      bidResponse.mediaType = 'video';
+    }
+    if (response.vastXml) {
+      bidResponse.vastXml = response.vastXml;
+      bidResponse.mediaType = 'video';
+    }
+    if (response.renderer) {
+      bidResponse.renderer = rendererFunc(bidRequest, response);
+    }
+
+    if (response.videoCacheKey) {
+      bidResponse.videoCacheKey = response.videoCacheKey;
+    }
+
+    if (response.adTag) {
+      bidResponse.ad = response.adTag;
+    }
+
+    if (response.bid_appendix) {
+      Object.keys(response.bid_appendix).forEach(fieldName => {
+        bidResponse[fieldName] = response.bid_appendix[fieldName];
+      });
+    }
+
+    bidResponses.push(bidResponse);
+  }
+  return bidResponses;
+}
diff --git a/libraries/equativUtils/equativUtils.js b/libraries/equativUtils/equativUtils.js
new file mode 100644
index 00000000000..bdcbdad2f33
--- /dev/null
+++ b/libraries/equativUtils/equativUtils.js
@@ -0,0 +1,30 @@
+import { VIDEO } from '../../src/mediaTypes.js';
+import { deepAccess, isFn } from '../../src/utils.js';
+
+const DEFAULT_FLOOR = 0.0;
+
+/**
+ * Get floors from Prebid Price Floors module
+ *
+ * @param {object} bid Bid request object
+ * @param {string} currency Ad server currency
+ * @param {string} mediaType Bid media type
+ * @return {number} Floor price
+ */
+export function getBidFloor (bid, currency, mediaType) {
+  const floors = [];
+
+  if (isFn(bid.getFloor)) {
+    (deepAccess(bid, `mediaTypes.${mediaType}.${mediaType === VIDEO ? 'playerSize' : 'sizes'}`) || []).forEach(size => {
+      const floor = bid.getFloor({
+        currency: currency || 'USD',
+        mediaType,
+        size
+      }).floor;
+
+      floors.push(!isNaN(floor) ? floor : DEFAULT_FLOOR);
+    });
+  }
+
+  return floors.length ? Math.min(...floors) : DEFAULT_FLOOR;
+}
diff --git a/libraries/fpdUtils/deviceInfo.js b/libraries/fpdUtils/deviceInfo.js
new file mode 100644
index 00000000000..fd2c4bf47d6
--- /dev/null
+++ b/libraries/fpdUtils/deviceInfo.js
@@ -0,0 +1,58 @@
+import * as utils from '../../src/utils.js';
+
+/**
+ * get device
+ * @return {boolean}
+ */
+export function getDevice() {
+  let check = false;
+  (function (a) {
+    let reg1 = new RegExp(
+      [
+        '(android|bbd+|meego)',
+        '.+mobile|avantgo|bada/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)',
+        '|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone',
+        '|p(ixi|re)/|plucker|pocket|psp|series(4|6)0|symbian|treo|up.(browser|link)|vodafone|wap',
+        '|windows ce|xda|xiino|android|ipad|playbook|silk',
+      ].join(''),
+      'i'
+    );
+    let reg2 = new RegExp(
+      [
+        '1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)',
+        '|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )',
+        '|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55/|capi|ccwa|cdm-|cell',
+        '|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)',
+        '|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene',
+        '|gf-5|g-mo|go(.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c',
+        '|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|/)|ibro|idea|ig01|ikom',
+        '|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc-|kyo(c|k)',
+        '|le(no|xi)|lg( g|/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)',
+        '|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]',
+        '|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)',
+        '|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio',
+        '|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms',
+        '|ny|va)|sc(01|h-|oo|p-)|sdk/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al',
+        '|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)',
+        '|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(.b|g1|si)|utst|',
+        'v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)',
+        '|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-',
+        '|your|zeto|zte-',
+      ].join(''),
+      'i'
+    );
+    if (reg1.test(a) || reg2.test(a.substr(0, 4))) {
+      check = true;
+    }
+  })(navigator.userAgent || navigator.vendor || window.opera);
+  return check;
+}
+
+/**
+ * get screen size
+ *
+ * @returns {Array} eg: "['widthxheight']"
+ */
+export function getScreenSize() {
+  return utils.parseSizesInput([window.screen.width, window.screen.height]);
+}
diff --git a/libraries/fpdUtils/pageInfo.js b/libraries/fpdUtils/pageInfo.js
new file mode 100644
index 00000000000..8e02134e070
--- /dev/null
+++ b/libraries/fpdUtils/pageInfo.js
@@ -0,0 +1,71 @@
+/**
+ * get page title
+ * @returns {string}
+ */
+export function getPageTitle(win = window) {
+  try {
+    const ogTitle = win.top.document.querySelector('meta[property="og:title"]');
+    return win.top.document.title || (ogTitle && ogTitle.content) || '';
+  } catch (e) {
+    const ogTitle = document.querySelector('meta[property="og:title"]');
+    return document.title || (ogTitle && ogTitle.content) || '';
+  }
+}
+
+/**
+ * get page description
+ * @returns {string}
+ */
+export function getPageDescription(win = window) {
+  let element;
+
+  try {
+    element = win.top.document.querySelector('meta[name="description"]') ||
+      win.top.document.querySelector('meta[property="og:description"]')
+  } catch (e) {
+    element = document.querySelector('meta[name="description"]') ||
+      document.querySelector('meta[property="og:description"]')
+  }
+
+  return (element && element.content) || '';
+}
+
+/**
+ * get page keywords
+ * @returns {string}
+ */
+export function getPageKeywords(win = window) {
+  let element;
+
+  try {
+    element = win.top.document.querySelector('meta[name="keywords"]');
+  } catch (e) {
+    element = document.querySelector('meta[name="keywords"]');
+  }
+
+  return (element && element.content) || '';
+}
+
+/**
+ * get connection downlink
+ * @returns {number}
+ */
+export function getConnectionDownLink(win = window) {
+  const nav = win.navigator || {};
+  return nav && nav.connection && nav.connection.downlink >= 0 ? nav.connection.downlink.toString() : undefined;
+}
+
+/**
+ * @param bidRequest
+ * @param bidderRequest
+ * @returns {string}
+ */
+export function getReferrer(bidRequest = {}, bidderRequest = {}) {
+  let pageUrl;
+  if (bidRequest.params && bidRequest.params.referrer) {
+    pageUrl = bidRequest.params.referrer;
+  } else {
+    pageUrl = bidderRequest?.refererInfo?.page;
+  }
+  return pageUrl;
+}
diff --git a/libraries/gptUtils/gptUtils.js b/libraries/gptUtils/gptUtils.js
index 950f28c618f..923d207c0d9 100644
--- a/libraries/gptUtils/gptUtils.js
+++ b/libraries/gptUtils/gptUtils.js
@@ -1,5 +1,6 @@
+import { CLIENT_SECTIONS } from '../../src/fpd/oneClient.js';
 import {find} from '../../src/polyfill.js';
-import {compareCodeAndSlot, isGptPubadsDefined} from '../../src/utils.js';
+import {compareCodeAndSlot, deepAccess, isGptPubadsDefined, uniques} from '../../src/utils.js';
 
 /**
  * Returns filter function to match adUnitCode in slot
@@ -10,6 +11,18 @@ export function isSlotMatchingAdUnitCode(adUnitCode) {
   return (slot) => compareCodeAndSlot(slot, adUnitCode);
 }
 
+/**
+ * @summary Export a k-v pair to GAM
+ */
+export function setKeyValue(key, value) {
+  if (!key || typeof key !== 'string') return false;
+  window.googletag = window.googletag || {cmd: []};
+  window.googletag.cmd = window.googletag.cmd || [];
+  window.googletag.cmd.push(() => {
+    window.googletag.pubads().setTargeting(key, value);
+  });
+}
+
 /**
  * @summary Uses the adUnit's code in order to find a matching gpt slot object on the page
  */
@@ -35,3 +48,88 @@ export function getGptSlotInfoForAdUnitCode(adUnitCode) {
   }
   return {};
 }
+
+export const taxonomies = ['IAB_AUDIENCE_1_1', 'IAB_CONTENT_2_2'];
+
+export function getSignals(fpd) {
+  const signals = Object.entries({
+    [taxonomies[0]]: getSegments(fpd, ['user.data'], 4),
+    [taxonomies[1]]: getSegments(fpd, CLIENT_SECTIONS.map(section => `${section}.content.data`), 6)
+  }).map(([taxonomy, values]) => values.length ? {taxonomy, values} : null)
+    .filter(ob => ob);
+
+  return signals;
+}
+
+export function getSegments(fpd, sections, segtax) {
+  return sections
+    .flatMap(section => deepAccess(fpd, section) || [])
+    .filter(datum => datum.ext?.segtax === segtax)
+    .flatMap(datum => datum.segment?.map(seg => seg.id))
+    .filter(ob => ob)
+    .filter(uniques)
+}
+
+/**
+ * Add an event listener on the given GAM event.
+ * If GPT Pubads isn't defined, window.googletag is set to a new object.
+ * @param {String} event
+ * @param {Function} callback
+ */
+export function subscribeToGamEvent(event, callback) {
+  const register = () => window.googletag.pubads().addEventListener(event, callback);
+  if (isGptPubadsDefined()) {
+    register();
+    return;
+  }
+  window.googletag = window.googletag || {};
+  window.googletag.cmd = window.googletag.cmd || [];
+  window.googletag.cmd.push(register);
+}
+
+/**
+ * @typedef {Object} Slot
+ * @property {function(String): (String|null)} get
+ * @property {function(): String} getAdUnitPath
+ * @property {function(): String[]} getAttributeKeys
+ * @property {function(): String[]} getCategoryExclusions
+ * @property {function(String): String} getSlotElementId
+ * @property {function(): String[]} getTargeting
+ * @property {function(): String[]} getTargetingKeys
+ * @see {@link https://developers.google.com/publisher-tag/reference#googletag.Slot GPT official docs}
+ */
+
+/**
+ * @typedef {Object} SlotRenderEndedEvent
+ * @property {(String|null)} advertiserId
+ * @property {(String|null)} campaignId
+ * @property {(String[]|null)} companyIds
+ * @property {(Number|null)} creativeId
+ * @property {(Number|null)} creativeTemplateId
+ * @property {(Boolean)} isBackfill
+ * @property {(Boolean)} isEmpty
+ * @property {(Number[]|null)} labelIds
+ * @property {(Number|null)} lineItemId
+ * @property {(String)} serviceName
+ * @property {(string|Number[]|null)} size
+ * @property {(Slot)} slot
+ * @property {(Boolean)} slotContentChanged
+ * @property {(Number|null)} sourceAgnosticCreativeId
+ * @property {(Number|null)} sourceAgnosticLineItemId
+ * @property {(Number[]|null)} yieldGroupIds
+ * @see {@link https://developers.google.com/publisher-tag/reference#googletag.events.SlotRenderEndedEvent GPT official docs}
+ */
+
+/**
+ * @callback SlotRenderEndedEventCallback
+ * @param {SlotRenderEndedEvent} event
+ * @returns {void}
+ */
+
+/**
+ * Add an event listener on the GAM event 'slotRenderEnded'.
+ * @param {SlotRenderEndedEventCallback} callback
+ */
+export function subscribeToGamSlotRenderEndedEvent(callback) {
+  subscribeToGamEvent('slotRenderEnded', callback)
+}
diff --git a/libraries/intentIqConstants/intentIqConstants.js b/libraries/intentIqConstants/intentIqConstants.js
new file mode 100644
index 00000000000..ed9856fc213
--- /dev/null
+++ b/libraries/intentIqConstants/intentIqConstants.js
@@ -0,0 +1,10 @@
+export const FIRST_PARTY_KEY = '_iiq_fdata';
+
+export const WITH_IIQ = 'A';
+export const WITHOUT_IIQ = 'B';
+export const NOT_YET_DEFINED = 'U';
+export const OPT_OUT = 'O';
+export const BLACK_LIST = 'L';
+export const CLIENT_HINTS_KEY = '_iiq_ch';
+export const EMPTY = 'EMPTY'
+export const VERSION = 0.24
diff --git a/libraries/intentIqUtils/detectBrowserUtils.js b/libraries/intentIqUtils/detectBrowserUtils.js
new file mode 100644
index 00000000000..c7004c77ae9
--- /dev/null
+++ b/libraries/intentIqUtils/detectBrowserUtils.js
@@ -0,0 +1,82 @@
+import { logError } from '../../src/utils.js';
+
+/**
+ * Detects the browser using either userAgent or userAgentData
+ * @return {string} The name of the detected browser or 'unknown' if unable to detect
+ */
+export function detectBrowser() {
+  try {
+    if (navigator.userAgent) {
+      return detectBrowserFromUserAgent(navigator.userAgent);
+    } else if (navigator.userAgentData) {
+      return detectBrowserFromUserAgentData(navigator.userAgentData);
+    }
+  } catch (error) {
+    logError('Error detecting browser:', error);
+  }
+  return 'unknown';
+}
+
+/**
+ * Detects the browser from the user agent string
+ * @param {string} userAgent - The user agent string from the browser
+ * @return {string} The name of the detected browser or 'unknown' if unable to detect
+ */
+export function detectBrowserFromUserAgent(userAgent) {
+  const browserRegexPatterns = {
+    opera: /Opera|OPR/,
+    edge: /Edg/,
+    chrome: /Chrome|CriOS/,
+    safari: /Safari/,
+    firefox: /Firefox/,
+    ie: /MSIE|Trident/,
+  };
+
+  // Check for Edge first
+  if (browserRegexPatterns.edge.test(userAgent)) {
+    return 'edge';
+  }
+
+  // Check for Opera next
+  if (browserRegexPatterns.opera.test(userAgent)) {
+    return 'opera';
+  }
+
+  // Check for Chrome first to avoid confusion with Safari
+  if (browserRegexPatterns.chrome.test(userAgent)) {
+    return 'chrome';
+  }
+
+  // Now we can safely check for Safari
+  if (browserRegexPatterns.safari.test(userAgent) && !browserRegexPatterns.chrome.test(userAgent)) {
+    return 'safari';
+  }
+
+  // Check other browsers
+  for (const browser in browserRegexPatterns) {
+    if (browserRegexPatterns[browser].test(userAgent)) {
+      return browser;
+    }
+  }
+
+  return 'unknown';
+}
+
+/**
+ * Detects the browser from the NavigatorUAData object
+ * @param {NavigatorUAData} userAgentData - The user agent data object from the browser
+ * @return {string} The name of the detected browser or 'unknown' if unable to detect
+ */
+export function detectBrowserFromUserAgentData(userAgentData) {
+  const brandNames = userAgentData.brands.map(brand => brand.brand);
+
+  if (brandNames.includes('Microsoft Edge')) {
+    return 'edge';
+  } else if (brandNames.includes('Opera')) {
+    return 'opera';
+  } else if (brandNames.some(brand => brand === 'Chromium' || brand === 'Google Chrome')) {
+    return 'chrome';
+  }
+
+  return 'unknown';
+}
diff --git a/libraries/intentIqUtils/getGppValue.js b/libraries/intentIqUtils/getGppValue.js
new file mode 100644
index 00000000000..9c538b4f753
--- /dev/null
+++ b/libraries/intentIqUtils/getGppValue.js
@@ -0,0 +1,16 @@
+import {gppDataHandler} from '../../src/consentHandler.js';
+
+/**
+ * Retrieves the GPP string value and additional GPP-related information.
+ * This function extracts the GPP data, encodes it, and determines specific GPP flags such as GPI and applicable sections.
+ * @return {Object} An object containing:
+ * - `gppString` (string): The encoded GPP string value.
+ * - `gpi` (number): An indicator representing whether GPP consent is available (0 if available, 1 if not).
+ */
+export function getGppValue() {
+  const gppData = gppDataHandler.getConsentData();
+  const gppString = gppData?.gppString || '';
+  const gpi = gppString ? 0 : 1;
+
+  return { gppString, gpi };
+}
diff --git a/libraries/intentIqUtils/getRefferer.js b/libraries/intentIqUtils/getRefferer.js
new file mode 100644
index 00000000000..39fde70ac24
--- /dev/null
+++ b/libraries/intentIqUtils/getRefferer.js
@@ -0,0 +1,64 @@
+import { getWindowTop, logError, getWindowLocation, getWindowSelf } from '../../src/utils.js';
+
+/**
+ * Determines if the script is running inside an iframe and retrieves the URL.
+ * @return {string} The encoded vrref value representing the relevant URL.
+ */
+export function getReferrer() {
+  try {
+    if (getWindowSelf() === getWindowTop()) {
+      return encodeURIComponent(getWindowLocation().href);
+    } else {
+      return encodeURIComponent(getWindowTop().location.href);
+    }
+  } catch (error) {
+    logError(`Error accessing location: ${error}`);
+    return '';
+  }
+}
+
+/**
+ * Appends `vrref` and `fui` parameters to the provided URL.
+ * If the referrer URL is available, it appends `vrref` with the relevant referrer value based on the domain.
+ * Otherwise, it appends `fui=1`. If a domain name is provided, it may also append `vrref` with the domain.
+ * @param {string} url - The URL to append parameters to.
+ * @param {string} domainName - The domain name used to determine the relevant referrer.
+ * @return {string} The modified URL with appended `vrref` or `fui` parameters.
+ */
+export function appendVrrefAndFui(url, domainName) {
+  const fullUrl = getReferrer();
+  if (fullUrl) {
+    return (url += '&vrref=' + getRelevantRefferer(domainName, fullUrl));
+  }
+  url += '&fui=1'; // Full Url Issue
+  url += '&vrref=' + encodeURIComponent(domainName || '');
+  return url;
+}
+
+/**
+ * Get the relevant referrer based on full URL and domain
+ * @param {string} domainName The domain name to compare
+ * @param {string} fullUrl The full URL to analyze
+ * @return {string} The relevant referrer
+ */
+export function getRelevantRefferer(domainName, fullUrl) {
+  if (domainName && isDomainIncluded(fullUrl, domainName)) {
+    return fullUrl;
+  }
+  return domainName ? encodeURIComponent(domainName) : fullUrl;
+}
+
+/**
+ * Checks if the provided domain name is included in the full URL.
+ * @param {string} fullUrl - The full URL to check.
+ * @param {string} domainName - The domain name to search for within the URL.
+ * @return {boolean} `True` if the domain name is found in the URL, `false` otherwise.
+ */
+export function isDomainIncluded(fullUrl, domainName) {
+  try {
+    return fullUrl.includes(domainName);
+  } catch (error) {
+    logError(`Invalid URL provided: ${error}`);
+    return false;
+  }
+}
diff --git a/libraries/interpretResponseUtils/index.js b/libraries/interpretResponseUtils/index.js
new file mode 100644
index 00000000000..6d081e4c272
--- /dev/null
+++ b/libraries/interpretResponseUtils/index.js
@@ -0,0 +1,22 @@
+import {logError} from '../../src/utils.js';
+
+export function interpretResponseUtil(serverResponse, {bidderRequest}, eachBidCallback) {
+  const bids = [];
+  if (!serverResponse.body || serverResponse.body.error) {
+    let errorMessage = `in response for ${bidderRequest.bidderCode} adapter`;
+    if (serverResponse.body && serverResponse.body.error) { errorMessage += `: ${serverResponse.body.error}`; }
+    logError(errorMessage);
+    return bids;
+  }
+  (serverResponse.body.tags || []).forEach(serverBid => {
+    try {
+      const bid = eachBidCallback(serverBid);
+      if (bid) {
+        bids.push(bid);
+      }
+    } catch (e) {
+      // Do nothing
+    }
+  });
+  return bids;
+}
diff --git a/libraries/keywords/keywords.js b/libraries/keywords/keywords.js
index 645c9c8d38f..b317bcf0c6b 100644
--- a/libraries/keywords/keywords.js
+++ b/libraries/keywords/keywords.js
@@ -6,7 +6,7 @@ const ORTB_KEYWORDS_PATHS = ['user.keywords'].concat(
 );
 
 /**
- * @param commaSeparatedKeywords: any number of either keyword arrays, or comma-separated keyword strings
+ * @param commaSeparatedKeywords any number of either keyword arrays, or comma-separated keyword strings
  * @returns an array with all unique keywords contained across all inputs
  */
 export function mergeKeywords(...commaSeparatedKeywords) {
diff --git a/libraries/liveIntentId/externalIdSystem.js b/libraries/liveIntentId/externalIdSystem.js
new file mode 100644
index 00000000000..9fcb9e6da1b
--- /dev/null
+++ b/libraries/liveIntentId/externalIdSystem.js
@@ -0,0 +1,174 @@
+import { logError } from '../../src/utils.js';
+import { gdprDataHandler, uspDataHandler, gppDataHandler } from '../../src/adapterManager.js';
+import { submodule } from '../../src/hook.js';
+import { DEFAULT_AJAX_TIMEOUT, MODULE_NAME, parseRequestedAttributes, composeIdObject, eids, GVLID, PRIMARY_IDS, makeSourceEventToSend } from './shared.js'
+
+// Reference to the client for the liQHub.
+let cachedClientRef
+
+/**
+ * This function is used in tests.
+ */
+export function resetSubmodule() {
+  cachedClientRef = undefined
+}
+
+window.liQHub = window.liQHub ?? []
+
+function initializeClient(configParams) {
+  // Only initialize once.
+  if (cachedClientRef != null) return cachedClientRef
+
+  const clientRef = {}
+
+  const clientDetails = { name: 'prebid', version: '$prebid.version$' }
+
+  const collectConfig = configParams.liCollectConfig ?? {};
+
+  let integration
+  if (collectConfig.appId != null) {
+    integration = { type: 'application', appId: collectConfig.appId, publisherId: configParams.publisherId }
+  } else if (configParams.distributorId != null && configParams.publisherId == null) {
+    integration = { type: 'distributor', distributorId: configParams.distributorId }
+  } else {
+    integration = { type: 'custom', publisherId: configParams.publisherId, distributorId: configParams.distributorId }
+  }
+
+  const partnerCookies = new Set(configParams.identifiersToResolve ?? []);
+
+  const collectSettings = { timeout: collectConfig.ajaxTimeout ?? DEFAULT_AJAX_TIMEOUT }
+
+  let identityPartner
+  if (collectConfig.appId == null && configParams.distributorId != null) {
+    identityPartner = configParams.distributorId
+  } else if (configParams.partner != null) {
+    identityPartner = configParams.partner
+  } else {
+    identityPartner = 'prebid'
+  }
+
+  const resolveSettings = {
+    identityPartner,
+    timeout: configParams.ajaxTimeout ?? DEFAULT_AJAX_TIMEOUT
+  }
+
+  let idCookieSettings
+  if (configParams.fpid != null) {
+    const fpidConfig = configParams.fpid
+    let source
+    if (fpidConfig.strategy === 'html5') {
+      source = 'local_storage'
+    } else {
+      source = fpidConfig.strategy
+    }
+    idCookieSettings = { idCookieSettings: { type: 'provided', source, key: fpidConfig.name } };
+  } else {
+    idCookieSettings = {}
+  }
+
+  function loadConsent() {
+    const consent = {}
+    const usPrivacyString = uspDataHandler.getConsentData();
+    if (usPrivacyString != null) {
+      consent.usPrivacy = { consentString: usPrivacyString }
+    }
+    const gdprConsent = gdprDataHandler.getConsentData()
+    if (gdprConsent != null) {
+      consent.gdpr = gdprConsent
+    }
+    const gppConsent = gppDataHandler.getConsentData();
+    if (gppConsent != null) {
+      consent.gpp = { consentString: gppConsent.gppString, applicableSections: gppConsent.applicableSections }
+    }
+
+    return consent
+  }
+  const consent = loadConsent()
+
+  window.liQHub.push({
+    type: 'register_client',
+    clientRef,
+    clientDetails,
+    integration,
+    consent,
+    partnerCookies,
+    collectSettings,
+    ...idCookieSettings,
+    resolveSettings
+  })
+
+  let sourceEvent = makeSourceEventToSend(configParams)
+  if (sourceEvent != null) {
+    window.liQHub.push({ type: 'collect', clientRef, sourceEvent })
+  }
+
+  cachedClientRef = clientRef
+  return clientRef
+}
+
+/**
+ * Create requestedAttributes array to pass to LiveConnect.
+ * @function
+ * @param {Object} overrides - object with boolean values that will override defaults { 'foo': true, 'bar': false }
+ * @returns {Array}
+ */
+
+function resolve(configParams, clientRef, callback) {
+  function onFailure(error) {
+    logError(`${MODULE_NAME}: ID fetch encountered an error: `, error);
+    callback();
+  }
+
+  const onSuccess = [{ type: 'callback', callback }]
+
+  window.liQHub.push({
+    type: 'resolve',
+    clientRef,
+    requestedAttributes: parseRequestedAttributes(configParams.requestedAttributesOverrides),
+    onFailure,
+    onSuccess
+  })
+}
+
+/**
+ * @typedef {import('../../modules/userId/index.js').Submodule} Submodule
+ */
+
+/** @type {Submodule} */
+export const liveIntentExternalIdSubmodule = {
+  /**
+   * Used to link submodule with config.
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  gvlid: GVLID,
+
+  /**
+   * Decode the stored id value for passing to bid requests.
+   * @function
+   */
+  decode(value, config) {
+    const configParams = config?.params ?? {};
+
+    // Ensure client is initialized and we fired at least one collect request.
+    initializeClient(configParams)
+
+    return composeIdObject(value);
+  },
+
+  /**
+   * Performs action to obtain id and return a value in the callback's response argument.
+   * @function
+   */
+  getId(config) {
+    const configParams = config?.params ?? {};
+
+    const clientRef = initializeClient(configParams)
+
+    return { callback: function(cb) { resolve(configParams, clientRef, cb); } };
+  },
+  primaryIds: PRIMARY_IDS,
+  eids
+};
+
+submodule('userId', liveIntentExternalIdSubmodule);
diff --git a/libraries/liveIntentId/idSystem.js b/libraries/liveIntentId/idSystem.js
new file mode 100644
index 00000000000..a9b8052c752
--- /dev/null
+++ b/libraries/liveIntentId/idSystem.js
@@ -0,0 +1,234 @@
+/**
+ * This module adds LiveIntentId to the User ID module.
+ * The {@link module:modules/userId} module is required.
+ * @module modules/idSystem
+ * @requires module:modules/userId
+ */
+import { triggerPixel, logError } from '../../src/utils.js';
+import { ajaxBuilder } from '../../src/ajax.js';
+import { gdprDataHandler, uspDataHandler, gppDataHandler } from '../../src/adapterManager.js';
+import { submodule } from '../../src/hook.js';
+import { LiveConnect } from 'live-connect-js'; // eslint-disable-line prebid/validate-imports
+import { getStorageManager } from '../../src/storageManager.js';
+import { MODULE_TYPE_UID } from '../../src/activities/modules.js';
+import { DEFAULT_AJAX_TIMEOUT, MODULE_NAME, composeIdObject, eids, GVLID, DEFAULT_DELAY, PRIMARY_IDS, parseRequestedAttributes, makeSourceEventToSend } from './shared.js'
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
+const EVENTS_TOPIC = 'pre_lips';
+
+export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
+const calls = {
+  ajaxGet: (url, onSuccess, onError, timeout, headers) => {
+    ajaxBuilder(timeout)(
+      url,
+      {
+        success: onSuccess,
+        error: onError
+      },
+      undefined,
+      {
+        method: 'GET',
+        withCredentials: true,
+        customHeaders: headers
+      }
+    )
+  },
+  pixelGet: (url, onload) => triggerPixel(url, onload)
+}
+
+let eventFired = false;
+let liveConnect = null;
+
+/**
+ * This function is used in tests.
+ */
+export function reset() {
+  if (window && window.liQ_instances) {
+    window.liQ_instances.forEach(i => i.eventBus.off(EVENTS_TOPIC, setEventFiredFlag));
+    window.liQ_instances = [];
+  }
+  liveIntentIdSubmodule.setModuleMode(null);
+  eventFired = false;
+  liveConnect = null;
+}
+
+/**
+ * This function is used in tests.
+ */
+export function setEventFiredFlag() {
+  eventFired = true;
+}
+
+function parseLiveIntentCollectorConfig(collectConfig) {
+  const config = {};
+  collectConfig = collectConfig || {};
+  collectConfig.appId && (config.appId = collectConfig.appId);
+  collectConfig.fpiStorageStrategy && (config.storageStrategy = collectConfig.fpiStorageStrategy);
+  collectConfig.fpiExpirationDays && (config.expirationDays = collectConfig.fpiExpirationDays);
+  collectConfig.collectorUrl && (config.collectorUrl = collectConfig.collectorUrl);
+  config.ajaxTimeout = collectConfig.ajaxTimeout || DEFAULT_AJAX_TIMEOUT;
+  return config;
+}
+
+/**
+ * Create requestedAttributes array to pass to LiveConnect.
+ * @function
+ * @param {Object} overrides - object with boolean values that will override defaults { 'foo': true, 'bar': false }
+ * @returns {Array}
+ */
+
+function initializeLiveConnect(configParams) {
+  if (liveConnect) {
+    return liveConnect;
+  }
+
+  configParams = configParams || {};
+  const fpidConfig = configParams.fpid || {};
+
+  const publisherId = configParams.publisherId || 'any';
+  const identityResolutionConfig = {
+    publisherId: publisherId,
+    requestedAttributes: parseRequestedAttributes(configParams.requestedAttributesOverrides),
+    extraAttributes: {
+      ipv4: configParams.ipv4,
+      ipv6: configParams.ipv6
+    }
+  };
+  if (configParams.url) {
+    identityResolutionConfig.url = configParams.url;
+  };
+
+  identityResolutionConfig.ajaxTimeout = configParams.ajaxTimeout || DEFAULT_AJAX_TIMEOUT;
+
+  const liveConnectConfig = parseLiveIntentCollectorConfig(configParams.liCollectConfig);
+
+  if (!liveConnectConfig.appId && configParams.distributorId) {
+    liveConnectConfig.distributorId = configParams.distributorId;
+    identityResolutionConfig.source = configParams.distributorId;
+  } else {
+    identityResolutionConfig.source = configParams.partner || 'prebid';
+  }
+
+  liveConnectConfig.wrapperName = 'prebid';
+  liveConnectConfig.trackerVersion = '$prebid.version$';
+  liveConnectConfig.identityResolutionConfig = identityResolutionConfig;
+  liveConnectConfig.identifiersToResolve = configParams.identifiersToResolve || [];
+  liveConnectConfig.fireEventDelay = configParams.fireEventDelay;
+
+  liveConnectConfig.idCookie = {};
+  liveConnectConfig.idCookie.name = fpidConfig.name;
+  liveConnectConfig.idCookie.strategy = fpidConfig.strategy == 'html5' ? 'localStorage' : fpidConfig.strategy;
+
+  const usPrivacyString = uspDataHandler.getConsentData();
+  if (usPrivacyString) {
+    liveConnectConfig.usPrivacyString = usPrivacyString;
+  }
+  const gdprConsent = gdprDataHandler.getConsentData();
+  if (gdprConsent) {
+    liveConnectConfig.gdprApplies = gdprConsent.gdprApplies;
+    liveConnectConfig.gdprConsent = gdprConsent.consentString;
+  }
+  const gppConsent = gppDataHandler.getConsentData();
+  if (gppConsent) {
+    liveConnectConfig.gppString = gppConsent.gppString;
+    liveConnectConfig.gppApplicableSections = gppConsent.applicableSections;
+  }
+  // The second param is the storage object, LS & Cookie manipulation uses PBJS.
+  // The third param is the ajax and pixel object, the AJAX and pixel use PBJS.
+  liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls);
+
+  const sourceEvent = makeSourceEventToSend(configParams)
+  if (sourceEvent != null) {
+    liveConnect.push(sourceEvent);
+  }
+  return liveConnect;
+}
+
+function tryFireEvent() {
+  if (!eventFired && liveConnect) {
+    const eventDelay = liveConnect.config.fireEventDelay || DEFAULT_DELAY;
+    setTimeout(() => {
+      const instances = window.liQ_instances;
+      instances.forEach(i => i.eventBus.once(EVENTS_TOPIC, setEventFiredFlag));
+      if (!eventFired && liveConnect) {
+        liveConnect.fire();
+      }
+    }, eventDelay);
+  }
+}
+
+/** @type {Submodule} */
+export const liveIntentIdSubmodule = {
+  moduleMode: '$$LIVE_INTENT_MODULE_MODE$$',
+  /**
+   * Used to link submodule with config.
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  gvlid: GVLID,
+  setModuleMode(mode) {
+    this.moduleMode = mode;
+  },
+  getInitializer() {
+    return (liveConnectConfig, storage, calls) => LiveConnect(liveConnectConfig, storage, calls, this.moduleMode);
+  },
+
+  /**
+   * Decode the stored id value for passing to bid requests.
+   * Note that lipb object is a wrapper for everything, and
+   * internally it could contain more data other than `lipbid`
+   * (e.g. `segments`) depending on the `partner` and `publisherId`
+   * params.
+   * @function
+   * @param {{unifiedId:string}} value
+   * @param {SubmoduleConfig|undefined} config
+   * @returns {{lipb:Object}}
+   */
+  decode(value, config) {
+    const configParams = (config && config.params) || {};
+
+    if (!liveConnect) {
+      initializeLiveConnect(configParams);
+    }
+    tryFireEvent();
+
+    return composeIdObject(value);
+  },
+
+  /**
+   * Performs action to obtain id and return a value in the callback's response argument.
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config) {
+    const configParams = (config && config.params) || {};
+    const liveConnect = initializeLiveConnect(configParams);
+    if (!liveConnect) {
+      return;
+    }
+    tryFireEvent();
+    const result = function(callback) {
+      liveConnect.resolve(
+        response => {
+          callback(response);
+        },
+        error => {
+          logError(`${MODULE_NAME}: ID fetch encountered an error: `, error);
+          callback();
+        }
+      )
+    }
+
+    return { callback: result };
+  },
+  primaryIds: PRIMARY_IDS,
+  eids
+};
+
+submodule('userId', liveIntentIdSubmodule);
diff --git a/libraries/liveIntentId/shared.js b/libraries/liveIntentId/shared.js
new file mode 100644
index 00000000000..509f91e44d9
--- /dev/null
+++ b/libraries/liveIntentId/shared.js
@@ -0,0 +1,276 @@
+import {UID1_EIDS} from '../uid1Eids/uid1Eids.js';
+import {UID2_EIDS} from '../uid2Eids/uid2Eids.js';
+import { getRefererInfo } from '../../src/refererDetection.js';
+import { coppaDataHandler } from '../../src/adapterManager.js';
+
+export const PRIMARY_IDS = ['libp'];
+export const GVLID = 148;
+export const DEFAULT_AJAX_TIMEOUT = 5000;
+export const DEFAULT_DELAY = 500;
+export const MODULE_NAME = 'liveIntentId';
+export const LI_PROVIDER_DOMAIN = 'liveintent.com';
+export const DEFAULT_REQUESTED_ATTRIBUTES = { 'nonId': true };
+
+export function parseRequestedAttributes(overrides) {
+  function renameAttribute(attribute) {
+    if (attribute === 'fpid') {
+      return 'idCookie';
+    } else {
+      return attribute;
+    };
+  }
+  function createParameterArray(config) {
+    return Object.entries(config).flatMap(([k, v]) => (typeof v === 'boolean' && v) ? [renameAttribute(k)] : []);
+  }
+  if (typeof overrides === 'object') {
+    return createParameterArray({...DEFAULT_REQUESTED_ATTRIBUTES, ...overrides});
+  } else {
+    return createParameterArray(DEFAULT_REQUESTED_ATTRIBUTES);
+  }
+}
+
+export function makeSourceEventToSend(configParams) {
+  const sourceEvent = {}
+  let nonEmpty = false
+  if (typeof configParams.emailHash === 'string') {
+    nonEmpty = true
+    sourceEvent.emailHash = configParams.emailHash
+  }
+  if (typeof configParams.ipv4 === 'string') {
+    nonEmpty = true
+    sourceEvent.ipv4 = configParams.ipv4
+  }
+  if (typeof configParams.ipv6 === 'string') {
+    nonEmpty = true
+    sourceEvent.ipv6 = configParams.ipv6
+  }
+  if (typeof configParams.userAgent === 'string') {
+    nonEmpty = true
+    sourceEvent.userAgent = configParams.userAgent
+  }
+
+  if (nonEmpty) {
+    return sourceEvent
+  }
+}
+
+export function composeIdObject(value) {
+  const result = {};
+
+  // old versions stored lipbid in unifiedId. Ensure that we can still read the data.
+  const lipbid = value.nonId || value.unifiedId
+  if (lipbid) {
+    const lipb = { ...value, lipbid };
+    delete lipb.unifiedId;
+    result.lipb = lipb;
+  }
+
+  // Lift usage of uid2 by exposing uid2 if we were asked to resolve it.
+  // As adapters are applied in lexicographical order, we will always
+  // be overwritten by the 'proper' uid2 module if it is present.
+  if (value.uid2) {
+    result.uid2 = { 'id': value.uid2, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.bidswitch) {
+    result.bidswitch = { 'id': value.bidswitch, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.medianet) {
+    result.medianet = { 'id': value.medianet, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.magnite) {
+    result.magnite = { 'id': value.magnite, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.index) {
+    result.index = { 'id': value.index, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.openx) {
+    result.openx = { 'id': value.openx, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.pubmatic) {
+    result.pubmatic = { 'id': value.pubmatic, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.sovrn) {
+    result.sovrn = { 'id': value.sovrn, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.idCookie) {
+    if (!coppaDataHandler.getCoppa()) {
+      result.lipb = { ...result.lipb, fpid: value.idCookie };
+      result.fpid = { 'id': value.idCookie };
+    }
+    delete result.lipb.idCookie;
+  }
+
+  if (value.thetradedesk) {
+    result.lipb = {...result.lipb, tdid: value.thetradedesk}
+    result.tdid = { 'id': value.thetradedesk, ext: { rtiPartner: 'TDID', provider: getRefererInfo().domain || LI_PROVIDER_DOMAIN } }
+    delete result.lipb.thetradedesk
+  }
+
+  if (value.sharethrough) {
+    result.sharethrough = { 'id': value.sharethrough, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.sonobi) {
+    result.sonobi = { 'id': value.sonobi, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  if (value.vidazoo) {
+    result.vidazoo = { 'id': value.vidazoo, ext: { provider: LI_PROVIDER_DOMAIN } }
+  }
+
+  return result
+}
+
+export const eids = {
+  ...UID1_EIDS,
+  ...UID2_EIDS,
+  'lipb': {
+    getValue: function(data) {
+      return data.lipbid;
+    },
+    source: 'liveintent.com',
+    atype: 3,
+    getEidExt: function(data) {
+      if (Array.isArray(data.segments) && data.segments.length) {
+        return {
+          segments: data.segments
+        };
+      }
+    }
+  },
+  'bidswitch': {
+    source: 'bidswitch.net',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+  'medianet': {
+    source: 'media.net',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+  'magnite': {
+    source: 'rubiconproject.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+  'index': {
+    source: 'liveintent.indexexchange.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+  'openx': {
+    source: 'openx.net',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+  'pubmatic': {
+    source: 'pubmatic.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+  'sovrn': {
+    source: 'liveintent.sovrn.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+  'fpid': {
+    source: 'fpid.liveintent.com',
+    atype: 1,
+    getValue: function(data) {
+      return data.id;
+    }
+  },
+  'sharethrough': {
+    source: 'sharethrough.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+  'sonobi': {
+    source: 'liveintent.sonobi.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+  'vidazoo': {
+    source: 'liveintent.vidazoo.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  }
+}
diff --git a/libraries/mediaImpactUtils/index.js b/libraries/mediaImpactUtils/index.js
new file mode 100644
index 00000000000..a56761d8ed4
--- /dev/null
+++ b/libraries/mediaImpactUtils/index.js
@@ -0,0 +1,61 @@
+import { buildUrl } from '../../src/utils.js';
+import { ajax } from '../../src/ajax.js';
+
+/**
+ * Builds the bid requests and beacon parameters.
+ * @param {Array} validBidRequests - The array of valid bid requests.
+ * @param {string} referer - The referer URL.
+ * @returns {Object} - An object containing bidRequests and beaconParams.
+ */
+export function buildBidRequestsAndParams(validBidRequests, referer) {
+  const bidRequests = [];
+  const beaconParams = { tag: [], partner: [], sizes: [], referer: encodeURIComponent(referer) };
+
+  validBidRequests.forEach(function (validBidRequest) {
+    const sizes = validBidRequest.params.sizes || validBidRequest.sizes;
+
+    const bidRequestObject = {
+      adUnitCode: validBidRequest.adUnitCode,
+      sizes: sizes,
+      bidId: validBidRequest.bidId,
+      referer: referer,
+    };
+
+    if (parseInt(validBidRequest.params.unitId)) {
+      bidRequestObject.unitId = parseInt(validBidRequest.params.unitId);
+      beaconParams.tag.push(validBidRequest.params.unitId);
+    }
+
+    if (parseInt(validBidRequest.params.partnerId)) {
+      bidRequestObject.unitId = 0;
+      bidRequestObject.partnerId = parseInt(validBidRequest.params.partnerId);
+      beaconParams.partner.push(validBidRequest.params.partnerId);
+    }
+
+    bidRequests.push(bidRequestObject);
+    beaconParams.sizes.push(joinSizesToString(sizes));
+  });
+
+  // Finalize beaconParams
+  if (beaconParams.partner.length > 0) {
+    beaconParams.partner = beaconParams.partner.join(',');
+  } else {
+    delete beaconParams.partner;
+  }
+  beaconParams.tag = beaconParams.tag.join(',');
+  beaconParams.sizes = beaconParams.sizes.join(',');
+
+  return { bidRequests, beaconParams };
+}
+
+export function joinSizesToString(sizes) {
+  return sizes.map(size => size.join('x')).join('|');
+}
+
+export function postRequest(endpoint, data) {
+  ajax(endpoint, null, data, { method: 'POST' });
+}
+
+export function buildEndpointUrl(protocol, hostname, pathname, searchParams) {
+  return buildUrl({ protocol, hostname, pathname, search: searchParams });
+}
diff --git a/libraries/mgidUtils/mgidUtils.js b/libraries/mgidUtils/mgidUtils.js
new file mode 100644
index 00000000000..9ac84e231b7
--- /dev/null
+++ b/libraries/mgidUtils/mgidUtils.js
@@ -0,0 +1,73 @@
+import {
+  isPlainObject,
+  isArray,
+  isStr,
+  isNumber,
+} from '../../src/utils.js';
+import { config } from '../../src/config.js';
+import { USERSYNC_DEFAULT_CONFIG } from '../../src/userSync.js';
+
+const PIXEL_SYNC_URL = 'https://cm.mgid.com/i.gif';
+const IFRAME_SYNC_URL = 'https://cm.mgid.com/i.html';
+
+export function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) {
+  const spb = isPlainObject(config.getConfig('userSync')) &&
+        isNumber(config.getConfig('userSync').syncsPerBidder)
+    ? config.getConfig('userSync').syncsPerBidder : USERSYNC_DEFAULT_CONFIG.syncsPerBidder;
+
+  if (spb > 0 && isPlainObject(syncOptions) && (syncOptions.iframeEnabled || syncOptions.pixelEnabled)) {
+    let pixels = [];
+    if (serverResponses &&
+            isArray(serverResponses) &&
+            serverResponses.length > 0 &&
+            isPlainObject(serverResponses[0].body) &&
+            isPlainObject(serverResponses[0].body.ext) &&
+            isArray(serverResponses[0].body.ext.cm) &&
+            serverResponses[0].body.ext.cm.length > 0) {
+      pixels = serverResponses[0].body.ext.cm;
+    }
+
+    const syncs = [];
+    const query = [];
+    query.push('cbuster={cbuster}');
+    query.push('gdpr_consent=' + encodeURIComponent(isPlainObject(gdprConsent) && isStr(gdprConsent?.consentString) ? gdprConsent.consentString : ''));
+    if (isPlainObject(gdprConsent) && typeof gdprConsent?.gdprApplies === 'boolean' && gdprConsent.gdprApplies) {
+      query.push('gdpr=1');
+    } else {
+      query.push('gdpr=0');
+    }
+    if (isPlainObject(uspConsent) && uspConsent?.consentString) {
+      query.push(`us_privacy=${encodeURIComponent(uspConsent?.consentString)}`);
+    }
+    if (isPlainObject(gppConsent) && gppConsent?.gppString) {
+      query.push(`gppString=${encodeURIComponent(gppConsent?.gppString)}`);
+    }
+    if (config.getConfig('coppa')) {
+      query.push('coppa=1')
+    }
+    const q = query.join('&')
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: IFRAME_SYNC_URL + '?' + q.replace('{cbuster}', Math.round(new Date().getTime()))
+      });
+    } else if (syncOptions.pixelEnabled) {
+      if (pixels.length === 0) {
+        for (let i = 0; i < spb; i++) {
+          syncs.push({
+            type: 'image',
+            url: PIXEL_SYNC_URL + '?' + q.replace('{cbuster}', Math.round(new Date().getTime())) // randomly selects partner if sync required
+          });
+        }
+      } else {
+        for (let i = 0; i < spb && i < pixels.length; i++) {
+          syncs.push({
+            type: 'image',
+            url: pixels[i] + (pixels[i].indexOf('?') > 0 ? '&' : '?') + q.replace('{cbuster}', Math.round(new Date().getTime()))
+          });
+        }
+      }
+    }
+    return syncs;
+  }
+}
diff --git a/libraries/mspa/activityControls.js b/libraries/mspa/activityControls.js
index eaf515e2385..eb68259d585 100644
--- a/libraries/mspa/activityControls.js
+++ b/libraries/mspa/activityControls.js
@@ -97,6 +97,9 @@ export function mspaRule(sids, getConsent, denies, applicableSids = () => gppDat
       if (consent == null) {
         return {allow: false, reason: 'consent data not available'};
       }
+      if (consent.Version !== 1) {
+        return {allow: false, reason: `unsupported consent specification version "${consent.Version}"`}
+      }
       if (denies(consent)) {
         return {allow: false};
       }
@@ -105,7 +108,7 @@ export function mspaRule(sids, getConsent, denies, applicableSids = () => gppDat
 }
 
 function flatSection(subsections) {
-  if (subsections == null) return subsections;
+  if (!Array.isArray(subsections)) return subsections;
   return subsections.reduceRight((subsection, consent) => {
     return Object.assign(consent, subsection);
   }, {});
diff --git a/libraries/navigatorData/navigatorData.js b/libraries/navigatorData/navigatorData.js
new file mode 100644
index 00000000000..f1a34fc51eb
--- /dev/null
+++ b/libraries/navigatorData/navigatorData.js
@@ -0,0 +1,29 @@
+export function getHLen(win = window) {
+  let hLen;
+  try {
+    hLen = win.top.history.length;
+  } catch (error) {
+    hLen = undefined;
+  }
+  return hLen;
+}
+
+export function getHC(win = window) {
+  let hc;
+  try {
+    hc = win.top.navigator.hardwareConcurrency;
+  } catch (error) {
+    hc = undefined;
+  }
+  return hc;
+}
+
+export function getDM(win = window) {
+  let dm;
+  try {
+    dm = win.top.navigator.deviceMemory;
+  } catch (error) {
+    dm = undefined;
+  }
+  return dm;
+}
diff --git a/libraries/nexverseUtils/index.js b/libraries/nexverseUtils/index.js
new file mode 100644
index 00000000000..c9e286c221d
--- /dev/null
+++ b/libraries/nexverseUtils/index.js
@@ -0,0 +1,130 @@
+import { logError, logInfo, logWarn, generateUUID } from '../../src/utils.js';
+
+const LOG_WARN_PREFIX = '[Nexverse warn]: ';
+const LOG_ERROR_PREFIX = '[Nexverse error]: ';
+const LOG_INFO_PREFIX = '[Nexverse info]: ';
+const NEXVERSE_USER_COOKIE_KEY = 'user_nexverse';
+
+/**
+ * Determines the device model (if possible).
+ * @returns {string} The device model or a fallback message if not identifiable.
+ */
+export function getDeviceModel() {
+  const ua = navigator.userAgent;
+  if (/iPhone/i.test(ua)) {
+    return 'iPhone';
+  } else if (/iPad/i.test(ua)) {
+    return 'iPad';
+  } else if (/Android/i.test(ua)) {
+    const match = ua.match(/Android.*;\s([a-zA-Z0-9\s]+)\sBuild/);
+    return match ? match[1].trim() : 'Unknown Android Device';
+  } else if (/Windows Phone/i.test(ua)) {
+    return 'Windows Phone';
+  } else if (/Macintosh/i.test(ua)) {
+    return 'Mac';
+  } else if (/Linux/i.test(ua)) {
+    return 'Linux';
+  } else if (/Windows/i.test(ua)) {
+    return 'Windows PC';
+  }
+  return '';
+}
+
+/**
+ * Prepapre the endpoint URL based on passed bid request.
+ * @param {string} bidderEndPoint - Bidder End Point.
+ * @param {object} bid - Bid details.
+ * @returns {string} The Endpoint URL with required parameters.
+ */
+export function buildEndpointUrl(bidderEndPoint, bid) {
+  const { uid, pubId, pubEpid } = bid.params;
+  const isDebug = bid.isDebug;
+  let endPoint = `${bidderEndPoint}?uid=${encodeURIComponent(uid)}&pub_id=${encodeURIComponent(pubId)}&pub_epid=${encodeURIComponent(pubEpid)}`;
+  if (isDebug) {
+    endPoint = `${endPoint}&test=1`;
+  }
+  return endPoint;
+}
+/**
+ * Validates the bid request to ensure all required parameters are present.
+ * @param {Object} bid - The bid request object.
+ * @returns {boolean} True if the bid request is valid, false otherwise.
+ */
+export function isBidRequestValid(bid) {
+  const isValid = !!(
+    bid.params &&
+    bid.params.uid && bid.params.uid.trim() &&
+    bid.params.pubId && bid.params.pubId.trim() &&
+    bid.params.pubEpid && bid.params.pubEpid.trim()
+  );
+  if (!isValid) {
+    logError(`${LOG_ERROR_PREFIX} Missing required bid parameters.`);
+  }
+
+  return isValid;
+}
+
+/**
+ * Parses the native response from the server into Prebid's native format.
+ *
+ * @param {string} adm - The adm field from the bid response (JSON string).
+ * @returns {Object} The parsed native response object.
+ */
+export function parseNativeResponse(adm) {
+  try {
+    const admObj = JSON.parse(adm);
+    return admObj.native;
+  } catch (e) {
+    printLog('error', `Error parsing native response: `, e)
+    logError(`${LOG_ERROR_PREFIX} Error parsing native response: `, e);
+    return {};
+  }
+}
+
+/**
+ * Parses the native response from the server into Prebid's native format.
+ * @param {type} type - Type of log. default is info
+ * @param {args} args - Log data.
+ */
+export function printLog(type, ...args) {
+  // Determine the prefix based on the log type
+  const prefixes = {
+    error: LOG_ERROR_PREFIX,
+    warning: LOG_WARN_PREFIX, // Assuming warning uses the same prefix as error
+    info: LOG_INFO_PREFIX
+  };
+
+  // Construct the log message by joining all arguments into a single string
+  const logMessage = args
+    .map(arg => (arg instanceof Error ? `${arg.name}: ${arg.message}` : arg))
+    .join(' '); // Join all arguments into a single string with a space separator
+  // Add prefix and punctuation (for info type)
+  const formattedMessage = `${prefixes[type] || LOG_INFO_PREFIX} ${logMessage}${type === 'info' ? '.' : ''}`;
+  // Map the log type to its corresponding log function
+  const logFunctions = {
+    error: logError,
+    warning: logWarn,
+    info: logInfo
+  };
+
+  // Call the appropriate log function (defaulting to logInfo)
+  (logFunctions[type] || logInfo)(formattedMessage);
+}
+/**
+ * Get or Create Uid for First Party Cookie
+ */
+export const getUid = (storage) => {
+  let nexverseUid = storage.getCookie(NEXVERSE_USER_COOKIE_KEY);
+  if (!nexverseUid) {
+    nexverseUid = generateUUID();
+  }
+  try {
+    const expirationInMs = 60 * 60 * 24 * 1000; // 1 day in milliseconds
+    const expirationTime = new Date(Date.now() + expirationInMs); // Set expiration time
+    // Set the cookie with the expiration date
+    storage.setCookie(NEXVERSE_USER_COOKIE_KEY, nexverseUid, expirationTime.toUTCString());
+  } catch (e) {
+    printLog('error', `Failed to set UID cookie: ${e.message}`);
+  }
+  return nexverseUid;
+};
diff --git a/libraries/objectGuard/objectGuard.js b/libraries/objectGuard/objectGuard.js
index cf3d2f38256..784c3f1444d 100644
--- a/libraries/objectGuard/objectGuard.js
+++ b/libraries/objectGuard/objectGuard.js
@@ -2,6 +2,8 @@ import {isData, objectTransformer, sessionedApplies} from '../../src/activities/
 import {deepAccess, deepClone, deepEqual, deepSetValue} from '../../src/utils.js';
 
 /**
+ * @typedef {import('../src/activities/redactor.js').TransformationRuleDef} TransformationRuleDef
+ * @typedef {import('../src/adapters/bidderFactory.js').TransformationRule} TransformationRule
  * @typedef {Object} ObjectGuard
  * @property {*} obj a view on the guarded object
  * @property {function(): void} verify a function that checks for and rolls back disallowed changes to the guarded object
diff --git a/libraries/objectGuard/ortbGuard.js b/libraries/objectGuard/ortbGuard.js
index 7911b378c3d..62918d55548 100644
--- a/libraries/objectGuard/ortbGuard.js
+++ b/libraries/objectGuard/ortbGuard.js
@@ -9,6 +9,10 @@ import {
 import {objectGuard, writeProtectRule} from './objectGuard.js';
 import {mergeDeep} from '../../src/utils.js';
 
+/**
+ * @typedef {import('./objectGuard.js').ObjectGuard} ObjectGuard
+ */
+
 function ortb2EnrichRules(isAllowed = isActivityAllowed) {
   return [
     {
diff --git a/libraries/ortb2.5Translator/translator.js b/libraries/ortb2.5Translator/translator.js
index 1afad516ef0..6dd6d247d1c 100644
--- a/libraries/ortb2.5Translator/translator.js
+++ b/libraries/ortb2.5Translator/translator.js
@@ -1,10 +1,12 @@
 import {deepAccess, deepSetValue, logError} from '../../src/utils.js';
 
 export const EXT_PROMOTIONS = [
+  'device.sua',
   'source.schain',
   'regs.gdpr',
   'regs.us_privacy',
   'regs.gpp',
+  'regs.gpp_sid',
   'user.consent',
   'user.eids'
 ];
diff --git a/libraries/ortb2Utils/currency.js b/libraries/ortb2Utils/currency.js
new file mode 100644
index 00000000000..5c2c6b7956d
--- /dev/null
+++ b/libraries/ortb2Utils/currency.js
@@ -0,0 +1,3 @@
+export function getCurrencyFromBidderRequest(bidderRequest) {
+  return bidderRequest?.ortb2?.ext?.prebid?.adServerCurrency;
+}
diff --git a/libraries/ortbConverter/README.md b/libraries/ortbConverter/README.md
index 31f56b4c754..751971eebdc 100644
--- a/libraries/ortbConverter/README.md
+++ b/libraries/ortbConverter/README.md
@@ -80,8 +80,7 @@ However, there are two restrictions (to avoid them, use the [other customization
     )   
     ```
 
-
-### Fine grained customization - imp, request, bidResponse, response
+###  Fine grained customization - imp, request, bidResponse, response
 
 When invoked, `toORTB({bidRequests, bidderRequest})` first loops through each request in `bidRequests`, converting them into ORTB `imp` objects.
 It then packages them into a single ORTB request, adding other parameters that are not imp-specific (such as for example `request.tmax`).
@@ -91,7 +90,7 @@ a single return value.
 
 You can customize each of these steps using the `ortbConverter` arguments `imp`, `request`, `bidResponse` and `response`:
 
-### Customizing imps: `imp(buildImp, bidRequest, context)`
+###  Customizing imps: `imp(buildImp, bidRequest, context)`
 
 Invoked once for each input `bidRequest`; should return the ORTB `imp` object to include in the request.
 The arguments are:
@@ -101,7 +100,7 @@ The arguments are:
 - `context`: a [context object](#context) that contains at least:
    - `bidderRequest`: the `bidderRequest` argument passed to `toORTB`.
    
-#### Example: attaching custom bid params
+####  Example: attaching custom bid params
 
 ```javascript
 const converter = ortbConverter({
@@ -351,7 +350,7 @@ const converter = ortbConverter({
 - the `context` argument of `ortbConverter`: e.g. `ortbConverter({context: {ttl: 30}})`. This will set `context.ttl = 30` globally for the converter.
 - the `context` argument of `toORTB`: e.g. `converter.toORTB({bidRequests, bidderRequest, context: {ttl: 30}})`. This will set `context.ttl = 30` only for this request.
 
-###  Special `context` properties
+###  Special `context` properties
 
 For ease of use, the conversion logic gives special meaning to some context properties:
 
diff --git a/libraries/ortbConverter/converter.js b/libraries/ortbConverter/converter.js
index c367aec268a..9cef8898c39 100644
--- a/libraries/ortbConverter/converter.js
+++ b/libraries/ortbConverter/converter.js
@@ -117,7 +117,7 @@ export function ortbConverter({
         throw new Error('ortbRequest passed to `fromORTB` must be the same object returned by `toORTB`')
       }
       function augmentContext(ctx, extraParams = {}) {
-        return Object.assign(ctx, {ortbRequest: request}, extraParams, ctx);
+        return Object.assign(ctx, {ortbRequest: request}, extraParams);
       }
       const impsById = Object.fromEntries((request.imp || []).map(imp => [imp.id, imp]));
       const bidResponses = (response.seatbid || []).flatMap(seatbid =>
diff --git a/libraries/ortbConverter/lib/composer.js b/libraries/ortbConverter/lib/composer.js
index 0ceff7f9edb..477d4e10890 100644
--- a/libraries/ortbConverter/lib/composer.js
+++ b/libraries/ortbConverter/lib/composer.js
@@ -11,13 +11,13 @@ const SORTED = new WeakMap();
 
 /**
  *
- * @param {Object[string, Component]} components to compose
- * @param {Object[string, function|boolean]} overrides a map from component name, to a function that should override that component.
+ * @param {Object.} components - An object where keys are component names and values are components to compose.
+ * @param {Object.} overrides - A map from component names to functions that should override those components.
  * Override functions are replacements, except that they get the original function they are overriding as their first argument. If the override
  * is `false`, the component is disabled.
  *
- * @return a function that will run all components in order of priority, with functions from `overrides` taking
- * precedence over components that match names
+ * @return {function} - A function that will run all components in order of priority, with functions from `overrides` taking
+ * precedence over components that match names.
  */
 export function compose(components, overrides = {}) {
   if (!SORTED.has(components)) {
diff --git a/libraries/ortbConverter/lib/sizes.js b/libraries/ortbConverter/lib/sizes.js
deleted file mode 100644
index 16b75048203..00000000000
--- a/libraries/ortbConverter/lib/sizes.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import {parseSizesInput} from '../../../src/utils.js';
-
-export function sizesToFormat(sizes) {
-  sizes = parseSizesInput(sizes);
-
-  // get sizes in form [{ w: , h:  }, ...]
-  return sizes.map(size => {
-    const [width, height] = size.split('x');
-    return {
-      w: parseInt(width, 10),
-      h: parseInt(height, 10)
-    };
-  });
-}
diff --git a/libraries/ortbConverter/processors/banner.js b/libraries/ortbConverter/processors/banner.js
index 51c93b652ef..877a8b9081b 100644
--- a/libraries/ortbConverter/processors/banner.js
+++ b/libraries/ortbConverter/processors/banner.js
@@ -1,6 +1,12 @@
-import {createTrackPixelHtml, deepAccess, inIframe, mergeDeep} from '../../../src/utils.js';
+import {
+  createTrackPixelHtml,
+  inIframe,
+  mergeDeep,
+  sizesToSizeTuples,
+  sizeTupleToRtbSize,
+  encodeMacroURI
+} from '../../../src/utils.js';
 import {BANNER} from '../../../src/mediaTypes.js';
-import {sizesToFormat} from '../lib/sizes.js';
 
 /**
  * fill in a request `imp` with banner parameters from `bidRequest`.
@@ -8,13 +14,13 @@ import {sizesToFormat} from '../lib/sizes.js';
 export function fillBannerImp(imp, bidRequest, context) {
   if (context.mediaType && context.mediaType !== BANNER) return;
 
-  const bannerParams = deepAccess(bidRequest, 'mediaTypes.banner');
+  const bannerParams = bidRequest?.mediaTypes?.banner;
   if (bannerParams) {
     const banner = {
       topframe: inIframe() === true ? 0 : 1
     };
     if (bannerParams.sizes) {
-      banner.format = sizesToFormat(bannerParams.sizes);
+      banner.format = sizesToSizeTuples(bannerParams.sizes).map(sizeTupleToRtbSize);
     }
     if (bannerParams.hasOwnProperty('pos')) {
       banner.pos = bannerParams.pos;
@@ -24,7 +30,7 @@ export function fillBannerImp(imp, bidRequest, context) {
   }
 }
 
-export function bannerResponseProcessor({createPixel = (url) => createTrackPixelHtml(decodeURIComponent(url))} = {}) {
+export function bannerResponseProcessor({createPixel = (url) => createTrackPixelHtml(decodeURIComponent(url), encodeMacroURI)} = {}) {
   return function fillBannerResponse(bidResponse, bid) {
     if (bidResponse.mediaType === BANNER) {
       if (bid.adm && bid.nurl) {
diff --git a/libraries/ortbConverter/processors/default.js b/libraries/ortbConverter/processors/default.js
index 8db2c1c461e..f9c7e3baefc 100644
--- a/libraries/ortbConverter/processors/default.js
+++ b/libraries/ortbConverter/processors/default.js
@@ -61,6 +61,12 @@ export const DEFAULT_PROCESSORS = {
           delete imp.ext?.data?.pbadslot;
         }
       }
+    },
+    secure: {
+      // should set imp.secure to 1 unless publisher has set it
+      fn(imp, bidRequest) {
+        imp.secure = imp.secure ?? 1;
+      }
     }
   },
   [BID_RESPONSE]: {
@@ -97,6 +103,16 @@ export const DEFAULT_PROCESSORS = {
         if (bid.adomain) {
           bidResponse.meta.advertiserDomains = bid.adomain;
         }
+        if (bid.ext?.dsa) {
+          bidResponse.meta.dsa = bid.ext.dsa;
+        }
+        if (bid.cat) {
+          bidResponse.meta.primaryCatId = bid.cat[0];
+          bidResponse.meta.secondaryCatIds = bid.cat.slice(1);
+        }
+        if (bid.attr) {
+          bidResponse.meta.attr = bid.attr;
+        }
       }
     }
   }
diff --git a/libraries/ortbConverter/processors/video.js b/libraries/ortbConverter/processors/video.js
index c38231d9002..3bb4e69e24d 100644
--- a/libraries/ortbConverter/processors/video.js
+++ b/libraries/ortbConverter/processors/video.js
@@ -1,63 +1,33 @@
-import {deepAccess, isEmpty, logWarn, mergeDeep} from '../../../src/utils.js';
+import {isEmpty, logWarn, mergeDeep, sizesToSizeTuples, sizeTupleToRtbSize} from '../../../src/utils.js';
 import {VIDEO} from '../../../src/mediaTypes.js';
-import {sizesToFormat} from '../lib/sizes.js';
 
-// parameters that share the same name & semantics between pbjs adUnits and imp.video
-const ORTB_VIDEO_PARAMS = new Set([
-  'pos',
-  'placement',
-  'plcmt',
-  'api',
-  'mimes',
-  'protocols',
-  'playbackmethod',
-  'minduration',
-  'maxduration',
-  'w',
-  'h',
-  'startdelay',
-  'placement',
-  'linearity',
-  'skip',
-  'skipmin',
-  'skipafter',
-  'minbitrate',
-  'maxbitrate',
-  'delivery',
-  'playbackend'
-]);
-
-const PLACEMENT = {
-  'instream': 1,
-}
+import {ORTB_VIDEO_PARAMS} from '../../../src/video.js';
 
 export function fillVideoImp(imp, bidRequest, context) {
   if (context.mediaType && context.mediaType !== VIDEO) return;
 
-  const videoParams = deepAccess(bidRequest, 'mediaTypes.video');
+  const videoParams = bidRequest?.mediaTypes?.video;
   if (!isEmpty(videoParams)) {
     const video = Object.fromEntries(
+      // Parameters that share the same name & semantics between pbjs adUnits and imp.video
       Object.entries(videoParams)
         .filter(([name]) => ORTB_VIDEO_PARAMS.has(name))
     );
     if (videoParams.playerSize) {
-      const format = sizesToFormat(videoParams.playerSize);
+      const format = sizesToSizeTuples(videoParams.playerSize).map(sizeTupleToRtbSize);
       if (format.length > 1) {
         logWarn('video request specifies more than one playerSize; all but the first will be ignored')
       }
       Object.assign(video, format[0]);
     }
-    const placement = PLACEMENT[videoParams.context];
-    if (placement != null) {
-      video.placement = placement;
-    }
+
     imp.video = mergeDeep(video, imp.video);
   }
 }
 
 export function fillVideoResponse(bidResponse, seatbid, context) {
   if (bidResponse.mediaType === VIDEO) {
-    if (deepAccess(context.imp, 'video.w') && deepAccess(context.imp, 'video.h')) {
+    if (context?.imp?.video?.w && context?.imp?.video?.h) {
       [bidResponse.playerWidth, bidResponse.playerHeight] = [context.imp.video.w, context.imp.video.h];
     }
 
diff --git a/libraries/paapiTools/buyerOrigins.js b/libraries/paapiTools/buyerOrigins.js
new file mode 100644
index 00000000000..ace9b7da073
--- /dev/null
+++ b/libraries/paapiTools/buyerOrigins.js
@@ -0,0 +1,35 @@
+/*
+   This list is several known buyer origins for PAAPI auctions.
+   Bidders should add anyone they like to it.
+   It is not intended to be comphensive nor maintained by the Core team.
+   Rather, Bid adapters should simply append additional constants whenever
+   the need arises in their adapter.
+
+   The goal is to reduce expression of common constants over many
+   bid adapters attempting to define interestGroupBuyers
+   in advance of network traffic.
+
+   Bidders should consider updating their interstGroupBuyer list
+   with server communication for auctions initiated after the first bid response.
+
+   Known buyers without current importers are commented out. If you need one, uncomment it.
+*/
+
+export const BO_CSR_ONET = 'https://csr.onet.pl';
+// export const BO_DOUBLECLICK_GOOGLEADS = 'https://googleads.g.doubleclick.net';
+// export const BO_DOUBLECLICK_TD = 'https://td.doubleclick.net';
+// export const BO_RTBHOUSE = 'https://f.creativecdn.com';
+// export const BO_CRITEO_US = 'https://fledge.us.criteo.com';
+// export const BO_CRITEO_EU = 'https://fledge.eu.criteo.com';
+// export const BO_CRITEO_AS = 'https://fledge.as.criteo.com';
+// export const BO_CRITEO_GRID_MERCURY = 'https://grid-mercury.criteo.com';
+// export const BO_CRITEO_BIDSWITCH_TRADR = 'https://tradr.bsw-sb.criteo.com';
+// export const BO_CRITEO_BIDSWITCH_SANDBOX = 'https://dsp-paapi-sandbox.bsw-ig.criteo.com';
+// export const BO_APPSPOT = 'https://fledge-buyer-testing-1.uc.r.appspot.com';
+// export const BO_OPTABLE = 'https://ads.optable.co';
+// export const BO_ADROLL = 'https://x.adroll.com';
+// export const BO_ADFORM = 'https://a2.adform.net';
+// export const BO_RETARGETLY = 'https://cookieless-campaign.prd-00.retargetly.com';
+// export const BO_AUDIGENT = 'https://proton.ad.gt';
+// export const BO_YAHOO = 'https://pa.ybp.yahoo.com';
+// export const BO_DOTOMI = 'https://usadmm.dotomi.com';
diff --git a/libraries/pbsExtensions/processors/aliases.js b/libraries/pbsExtensions/processors/aliases.js
index 3dcd2c4fd9b..42dea969e6b 100644
--- a/libraries/pbsExtensions/processors/aliases.js
+++ b/libraries/pbsExtensions/processors/aliases.js
@@ -1,4 +1,5 @@
 import adapterManager from '../../../src/adapterManager.js';
+import {config} from '../../../src/config.js';
 import {deepSetValue} from '../../../src/utils.js';
 
 export function setRequestExtPrebidAliases(ortbRequest, bidderRequest, context, {am = adapterManager} = {}) {
@@ -7,11 +8,22 @@ export function setRequestExtPrebidAliases(ortbRequest, bidderRequest, context,
     // adding alias only if alias source bidder exists and alias isn't configured to be standalone
     // pbs adapter
     if (!bidder || !bidder.getSpec().skipPbsAliasing) {
+      // set alias
       deepSetValue(
         ortbRequest,
         `ext.prebid.aliases.${bidderRequest.bidderCode}`,
         am.aliasRegistry[bidderRequest.bidderCode]
       );
+
+      // set alias gvlids if present also
+      const gvlId = config.getConfig(`gvlMapping.${bidderRequest.bidderCode}`) || bidder?.getSpec?.().gvlid;
+      if (gvlId) {
+        deepSetValue(
+          ortbRequest,
+          `ext.prebid.aliasgvlids.${bidderRequest.bidderCode}`,
+          gvlId
+        );
+      }
     }
   }
 }
diff --git a/libraries/pbsExtensions/processors/params.js b/libraries/pbsExtensions/processors/params.js
index 010ffa5b372..dbfbb928953 100644
--- a/libraries/pbsExtensions/processors/params.js
+++ b/libraries/pbsExtensions/processors/params.js
@@ -1,17 +1,7 @@
-import {auctionManager} from '../../../src/auctionManager.js';
-import adapterManager from '../../../src/adapterManager.js';
 import {deepSetValue} from '../../../src/utils.js';
 
-export function setImpBidParams(
-  imp, bidRequest, context,
-  {adUnit, bidderRequests, index = auctionManager.index, bidderRegistry = adapterManager.bidderRegistry} = {}) {
+export function setImpBidParams(imp, bidRequest) {
   let params = bidRequest.params;
-  const adapter = bidderRegistry[bidRequest.bidder];
-  if (adapter && adapter.getSpec().transformBidParams) {
-    adUnit = adUnit || index.getAdUnit(bidRequest);
-    bidderRequests = bidderRequests || [context.bidderRequest];
-    params = adapter.getSpec().transformBidParams(params, true, adUnit, bidderRequests);
-  }
   if (params) {
     deepSetValue(
       imp,
diff --git a/libraries/percentInView/percentInView.js b/libraries/percentInView/percentInView.js
new file mode 100644
index 00000000000..13381c5c541
--- /dev/null
+++ b/libraries/percentInView/percentInView.js
@@ -0,0 +1,63 @@
+
+function getBoundingBox(element, {w, h} = {}) {
+  let {width, height, left, top, right, bottom} = element.getBoundingClientRect();
+
+  if ((width === 0 || height === 0) && w && h) {
+    width = w;
+    height = h;
+    right = left + w;
+    bottom = top + h;
+  }
+
+  return {width, height, left, top, right, bottom};
+}
+
+function getIntersectionOfRects(rects) {
+  const bbox = {
+    left: rects[0].left, right: rects[0].right, top: rects[0].top, bottom: rects[0].bottom
+  };
+
+  for (let i = 1; i < rects.length; ++i) {
+    bbox.left = Math.max(bbox.left, rects[i].left);
+    bbox.right = Math.min(bbox.right, rects[i].right);
+
+    if (bbox.left >= bbox.right) {
+      return null;
+    }
+
+    bbox.top = Math.max(bbox.top, rects[i].top);
+    bbox.bottom = Math.min(bbox.bottom, rects[i].bottom);
+
+    if (bbox.top >= bbox.bottom) {
+      return null;
+    }
+  }
+
+  bbox.width = bbox.right - bbox.left;
+  bbox.height = bbox.bottom - bbox.top;
+
+  return bbox;
+}
+
+export const percentInView = (element, topWin, {w, h} = {}) => {
+  const elementBoundingBox = getBoundingBox(element, {w, h});
+
+  // Obtain the intersection of the element and the viewport
+  const elementInViewBoundingBox = getIntersectionOfRects([{
+    left: 0, top: 0, right: topWin.innerWidth, bottom: topWin.innerHeight
+  }, elementBoundingBox]);
+
+  let elementInViewArea, elementTotalArea;
+
+  if (elementInViewBoundingBox !== null) {
+    // Some or all of the element is in view
+    elementInViewArea = elementInViewBoundingBox.width * elementInViewBoundingBox.height;
+    elementTotalArea = elementBoundingBox.width * elementBoundingBox.height;
+
+    return ((elementInViewArea / elementTotalArea) * 100);
+  }
+
+  // No overlap between element and the viewport; therefore, the element
+  // lies completely out of view
+  return 0;
+}
diff --git a/libraries/precisoUtils/bidNativeUtils.js b/libraries/precisoUtils/bidNativeUtils.js
new file mode 100644
index 00000000000..29b39f6d77d
--- /dev/null
+++ b/libraries/precisoUtils/bidNativeUtils.js
@@ -0,0 +1,104 @@
+import { deepAccess, logInfo } from '../../src/utils.js';
+import { NATIVE } from '../../src/mediaTypes.js';
+import { macroReplace } from './bidUtils.js';
+
+const TTL = 55;
+// Codes defined by OpenRTB Native Ads 1.1 specification
+export const OPENRTB = {
+  NATIVE: {
+    IMAGE_TYPE: {
+      ICON: 1,
+      MAIN: 3,
+    },
+    ASSET_ID: {
+      TITLE: 1,
+      IMAGE: 2,
+      ICON: 3,
+      BODY: 4,
+      SPONSORED: 5,
+      CTA: 6
+    },
+    DATA_ASSET_TYPE: {
+      SPONSORED: 1,
+      DESC: 2,
+      CTA_TEXT: 12,
+    },
+  }
+};
+
+/**
+ * @param {object} serverBid Bid by OpenRTB 2.5 §4.2.3
+ * @returns {object} Prebid native bidObject
+ */
+export function interpretNativeBid(serverBid) {
+  return {
+    requestId: serverBid.impid,
+    mediaType: NATIVE,
+    cpm: serverBid.price,
+    creativeId: serverBid.adid || serverBid.crid,
+    width: 1,
+    height: 1,
+    ttl: TTL,
+    meta: {
+      advertiserDomains: serverBid.adomain
+    },
+    netRevenue: true,
+    currency: 'USD',
+    // native: interpretNativeAd(serverBid.adm)
+    native: interpretNativeAd(macroReplace(serverBid.adm, serverBid.price))
+  }
+}
+
+/**
+ * @param {string} adm JSON-encoded Request by OpenRTB Native Ads 1.1 §4.1
+ * @returns {object} Prebid bidObject.native
+ */
+
+export function interpretNativeAd(adm) {
+  try {
+    const native = JSON.parse(adm).native;
+    if (native) {
+      const result = {
+        clickUrl: encodeURI(native.link.url),
+        impressionTrackers: native.imptrackers || native.eventtrackers[0].url,
+      };
+      if (native.link.clicktrackers) {
+        result.clickTrackers = native.link.clicktrackers[0];
+      }
+
+      native.assets.forEach(asset => {
+        switch (asset.id) {
+          case OPENRTB.NATIVE.ASSET_ID.TITLE:
+            result.title = deepAccess(asset, 'title.text');
+            break;
+          case OPENRTB.NATIVE.ASSET_ID.IMAGE:
+            result.image = {
+              url: encodeURI(asset.img.url),
+              width: deepAccess(asset, 'img.w'),
+              height: deepAccess(asset, 'img.h')
+            };
+            break;
+          case OPENRTB.NATIVE.ASSET_ID.ICON:
+            result.icon = {
+              url: encodeURI(asset.img.url),
+              width: deepAccess(asset, 'img.w'),
+              height: deepAccess(asset, 'img.h')
+            };
+            break;
+          case OPENRTB.NATIVE.ASSET_ID.BODY:
+            result.body = deepAccess(asset, 'data.value');
+            break;
+          case OPENRTB.NATIVE.ASSET_ID.SPONSORED:
+            result.sponsoredBy = deepAccess(asset, 'data.value');
+            break;
+          case OPENRTB.NATIVE.ASSET_ID.CTA:
+            result.cta = deepAccess(asset, 'data.value');
+            break;
+        }
+      });
+      return result;
+    }
+  } catch (error) {
+    logInfo('Error in bidUtils interpretNativeAd' + error);
+  }
+}
diff --git a/libraries/precisoUtils/bidUtils.js b/libraries/precisoUtils/bidUtils.js
new file mode 100644
index 00000000000..8359963cd03
--- /dev/null
+++ b/libraries/precisoUtils/bidUtils.js
@@ -0,0 +1,249 @@
+import { convertOrtbRequestToProprietaryNative } from '../../src/native.js';
+import { replaceAuctionPrice, deepAccess } from '../../src/utils.js';
+import { ajax } from '../../src/ajax.js';
+// import { NATIVE } from '../../src/mediaTypes.js';
+import { consentCheck, getBidFloor } from './bidUtilsCommon.js';
+import { interpretNativeBid } from './bidNativeUtils.js';
+
+export const buildRequests = (endpoint) => (validBidRequests = [], bidderRequest) => {
+  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+  var city = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  let req = {
+    id: validBidRequests[0].auctionId,
+    imp: validBidRequests.map(slot => mapImpression(slot, bidderRequest)),
+    user: {
+      id: validBidRequests[0].userId.pubcid || '',
+      buyeruid: validBidRequests[0].buyerUid || '',
+      geo: {
+        country: validBidRequests[0].params.region || city,
+        region: validBidRequests[0].params.region || city,
+      },
+
+    },
+    device: validBidRequests[0].ortb2.device,
+    site: validBidRequests[0].ortb2.site,
+    source: validBidRequests[0].ortb2.source,
+    bcat: validBidRequests[0].ortb2.bcat || validBidRequests[0].params.bcat,
+    badv: validBidRequests[0].ortb2.badv || validBidRequests[0].params.badv,
+    wlang: validBidRequests[0].ortb2.wlang || validBidRequests[0].params.wlang,
+  };
+  if (req.device && req.device != 'undefined') {
+    req.device.geo = {
+      country: req.user.geo.country,
+      region: req.user.geo.region,
+
+    };
+  };
+  req.site.publisher = {
+    publisherId: validBidRequests[0].params.publisherId
+  };
+
+  consentCheck(bidderRequest, req);
+  return {
+    method: 'POST',
+    url: endpoint,
+    data: req,
+
+  };
+}
+
+export function interpretResponse(serverResponse) {
+  const bidsValue = []
+  const bidResponse = serverResponse.body
+  bidResponse.seatbid.forEach(seat => {
+    seat.bid.forEach(bid => {
+      bidsValue.push({
+        requestId: bid.impid,
+        cpm: bid.price,
+        width: bid.w,
+        height: bid.h,
+        creativeId: bid.crid,
+        ad: macroReplace(bid.adm, bid.price),
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 300,
+        meta: {
+          advertiserDomains: bid.adomain || '',
+        },
+      })
+    })
+  })
+  return bidsValue
+}
+
+export function onBidWon(bid) {
+  if (bid.nurl) {
+    const resolvedNurl = replaceAuctionPrice(bid.nurl, bid.price);
+    ajax(resolvedNurl);
+  }
+}
+
+export function macroReplace(adm, cpm) {
+  let replacedadm = replaceAuctionPrice(adm, cpm);
+  return replacedadm;
+}
+
+function mapImpression(slot, bidderRequest) {
+  const imp = {
+    id: slot.bidId,
+    bidFloor: getBidFloor(slot),
+  };
+
+  if (slot.mediaType === 'native' || deepAccess(slot, 'mediaTypes.native')) {
+    imp.native = mapNative(slot)
+  } else {
+    imp.banner = mapBanner(slot)
+  }
+  return imp
+}
+
+function mapNative(slot) {
+  if (slot.mediaType === 'native' || deepAccess(slot, 'mediaTypes.native')) {
+    let request = {
+      assets: slot.nativeOrtbRequest.assets || slot.nativeParams.ortb.assets,
+      ver: '1.2'
+    };
+    return {
+      request: JSON.stringify(request)
+    }
+  }
+}
+
+function mapBanner(slot) {
+  if (slot.mediaTypes.banner) {
+    let format = (slot.mediaTypes.banner.sizes || slot.sizes).map(size => {
+      return { w: size[0], h: size[1] }
+    });
+
+    return {
+      format
+    }
+  }
+}
+
+export function buildBidResponse(serverResponse) {
+  const responseBody = serverResponse.body;
+  const bids = [];
+  responseBody.seatbid.forEach(seat => {
+    seat.bid.forEach(serverBid => {
+      if (!serverBid.price) {
+        return;
+      }
+      if (serverBid.adm.indexOf('{') === 0) {
+        let interpretedBid = interpretNativeBid(serverBid);
+        bids.push(interpretedBid
+        );
+      } else {
+        bids.push({
+          requestId: serverBid.impid,
+          cpm: serverBid.price,
+          width: serverBid.w,
+          height: serverBid.h,
+          creativeId: serverBid.crid,
+          ad: macroReplace(serverBid.adm, serverBid.price),
+          currency: 'USD',
+          netRevenue: true,
+          ttl: 300,
+          meta: {
+            advertiserDomains: serverBid.adomain || '',
+          },
+        });
+      }
+    })
+  });
+  return bids;
+}
+
+// export function interpretNativeAd(adm) {
+//   try {
+//     // logInfo('adm::' + adm);
+//     const native = JSON.parse(adm).native;
+//     if (native) {
+//       const result = {
+//         clickUrl: encodeURI(native.link.url),
+//         impressionTrackers: native.eventtrackers[0].url,
+//       };
+//       if (native.link.clicktrackers[0]) {
+//         result.clickTrackers = native.link.clicktrackers[0];
+//       }
+
+//       native.assets.forEach(asset => {
+//         switch (asset.id) {
+//           case OPENRTB.NATIVE.ASSET_ID.TITLE:
+//             result.title = deepAccess(asset, 'title.text');
+//             break;
+//           case OPENRTB.NATIVE.ASSET_ID.IMAGE:
+//             result.image = {
+//               url: encodeURI(asset.img.url),
+//               width: deepAccess(asset, 'img.w'),
+//               height: deepAccess(asset, 'img.h')
+//             };
+//             break;
+//           case OPENRTB.NATIVE.ASSET_ID.ICON:
+//             result.icon = {
+//               url: encodeURI(asset.img.url),
+//               width: deepAccess(asset, 'img.w'),
+//               height: deepAccess(asset, 'img.h')
+//             };
+//             break;
+//           case OPENRTB.NATIVE.ASSET_ID.DATA:
+//             result.body = deepAccess(asset, 'data.value');
+//             break;
+//           case OPENRTB.NATIVE.ASSET_ID.SPONSORED:
+//             result.sponsoredBy = deepAccess(asset, 'data.value');
+//             break;
+//           case OPENRTB.NATIVE.ASSET_ID.CTA:
+//             result.cta = deepAccess(asset, 'data.value');
+//             break;
+//         }
+//       });
+//       return result;
+//     }
+//   } catch (error) {
+//     logInfo('Error in bidUtils interpretNativeAd' + error);
+//   }
+// }
+
+// export const OPENRTB = {
+//   NATIVE: {
+//     IMAGE_TYPE: {
+//       ICON: 1,
+//       MAIN: 3,
+//     },
+//     ASSET_ID: {
+//       TITLE: 1,
+//       IMAGE: 2,
+//       ICON: 3,
+//       BODY: 4,
+//       SPONSORED: 5,
+//       CTA: 6
+//     },
+//     DATA_ASSET_TYPE: {
+//       SPONSORED: 1,
+//       DESC: 2,
+//       CTA_TEXT: 12,
+//     },
+//   }
+// };
+
+// /**
+//  * @param {object} serverBid Bid by OpenRTB 2.5 §4.2.3
+//  * @returns {object} Prebid native bidObject
+//  */
+// export function interpretNativeBid(serverBid) {
+//   return {
+//     requestId: serverBid.impid,
+//     mediaType: NATIVE,
+//     cpm: serverBid.price,
+//     creativeId: serverBid.adid || serverBid.crid,
+//     width: 1,
+//     height: 1,
+//     ttl: 56,
+//     meta: {
+//       advertiserDomains: serverBid.adomain
+//     },
+//     netRevenue: true,
+//     currency: 'USD',
+//     native: interpretNativeAd(macroReplace(serverBid.adm, serverBid.price))
+//   }
+// }
diff --git a/libraries/precisoUtils/bidUtilsCommon.js b/libraries/precisoUtils/bidUtilsCommon.js
new file mode 100644
index 00000000000..a8ea97efcaf
--- /dev/null
+++ b/libraries/precisoUtils/bidUtilsCommon.js
@@ -0,0 +1,162 @@
+import { config } from '../../src/config.js';
+import {
+  isFn,
+  isStr,
+  deepAccess,
+  getWindowTop,
+  triggerPixel
+} from '../../src/utils.js';
+import { BANNER, VIDEO, NATIVE } from '../../src/mediaTypes.js';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+        !bid.ttl || !bid.currency || !bid.meta) {
+    return false;
+  }
+
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastXml || bid.vastUrl);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers);
+    default:
+      return false;
+  }
+}
+
+export function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.bidFloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor?.floor;
+  } catch (_) {
+    return 0
+  }
+}
+
+export function isBidRequestValid(bid) {
+  return Boolean(bid.bidId && bid.params && bid.params.placementId);
+}
+
+export const buildBidRequests = (adurl) => (validBidRequests = [], bidderRequest) => {
+  const winTop = getWindowTop();
+  const location = winTop.location;
+  const placements = [];
+
+  const request = {
+    deviceWidth: winTop.screen.width,
+    deviceHeight: winTop.screen.height,
+    language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
+    host: location.host,
+    page: location.pathname,
+    placements: placements
+  };
+  consentCheck(bidderRequest, request);
+  const len = validBidRequests.length;
+  for (let i = 0; i < len; i++) {
+    const bid = validBidRequests[i];
+    const placement = {
+      placementId: bid.params.placementId,
+      bidId: bid.bidId,
+      schain: bid.schain || {},
+      bidfloor: getBidFloor(bid)
+    };
+
+    if (typeof bid.userId !== 'undefined') {
+      placement.userId = bid.userId;
+    }
+
+    const mediaType = bid.mediaTypes;
+
+    if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+      placement.sizes = mediaType[BANNER].sizes;
+      placement.adFormat = BANNER;
+    }
+
+    placements.push(placement);
+  }
+
+  return {
+    method: 'POST',
+    url: adurl,
+    data: request
+  };
+}
+
+export function interpretResponse(serverResponse) {
+  let response = [];
+  for (let i = 0; i < serverResponse.body.length; i++) {
+    let resItem = serverResponse.body[i];
+    if (isBidResponseValid(resItem)) {
+      const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+      resItem.meta = { ...resItem.meta, advertiserDomains };
+
+      response.push(resItem);
+    }
+  }
+  return response;
+}
+
+export function consentCheck(bidderRequest, req) {
+  if (bidderRequest) {
+    if (bidderRequest.uspConsent) {
+      req.ccpa = bidderRequest.uspConsent;
+    }
+    if (bidderRequest.gdprConsent) {
+      req.gdpr = bidderRequest.gdprConsent
+    }
+    if (bidderRequest.gppConsent) {
+      req.gpp = bidderRequest.gppConsent;
+    }
+  }
+}
+
+export const buildUserSyncs = (syncOptions, serverResponses, gdprConsent, uspConsent, syncEndpoint) => {
+  let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+  const isCk2trk = syncEndpoint.includes('ck.2trk.info');
+
+  let syncUrl = isCk2trk ? syncEndpoint : `${syncEndpoint}/${syncType}?pbjs=1`;
+
+  if (gdprConsent && gdprConsent.consentString) {
+    if (typeof gdprConsent.gdprApplies === 'boolean') {
+      syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+    } else {
+      syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+    }
+  } else {
+    syncUrl += isCk2trk ? `&gdpr=0&gdpr_consent=` : '';
+  }
+
+  if (isCk2trk) {
+    syncUrl += uspConsent ? `&us_privacy=${uspConsent}` : `&us_privacy=`;
+    syncUrl += (syncOptions.iframeEnabled) ? `&t=4` : `&t=2`
+  } else {
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+  }
+
+  return [{
+    type: syncType,
+    url: syncUrl
+  }];
+}
+
+export function bidWinReport (bid) {
+  const cpm = deepAccess(bid, 'adserverTargeting.hb_pb') || '';
+  if (isStr(bid.nurl) && bid.nurl !== '') {
+    bid.nurl = bid.nurl.replace(/\${AUCTION_PRICE}/, cpm);
+    triggerPixel(bid.nurl);
+  }
+}
diff --git a/libraries/processResponse/index.js b/libraries/processResponse/index.js
new file mode 100644
index 00000000000..5ca2e9329f3
--- /dev/null
+++ b/libraries/processResponse/index.js
@@ -0,0 +1,12 @@
+import { logError } from '../../src/utils.js';
+
+export function getBidFromResponse(respItem, LOG_ERROR_MESS) {
+  if (!respItem) {
+    logError(LOG_ERROR_MESS.emptySeatbid);
+  } else if (!respItem.bid) {
+    logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
+  } else if (!respItem.bid[0]) {
+    logError(LOG_ERROR_MESS.noBid);
+  }
+  return respItem && respItem.bid && respItem.bid[0];
+}
diff --git a/libraries/riseUtils/index.js b/libraries/riseUtils/index.js
new file mode 100644
index 00000000000..60f31ef2603
--- /dev/null
+++ b/libraries/riseUtils/index.js
@@ -0,0 +1,336 @@
+import {
+  isArray,
+  isFn,
+  deepAccess,
+  isEmpty,
+  contains,
+  isInteger,
+  getBidIdParameter,
+  isPlainObject
+} from '../../src/utils.js';
+import { BANNER, VIDEO } from '../../src/mediaTypes.js';
+import {config} from '../../src/config.js';
+
+export function getFloor(bid, mediaType) {
+  if (!isFn(bid.getFloor)) {
+    return 0;
+  }
+  let floorResult = bid.getFloor({
+    currency: 'USD',
+    mediaType: mediaType,
+    size: '*'
+  });
+  return isPlainObject(floorResult) && floorResult.currency === 'USD' && floorResult.floor ? floorResult.floor : 0;
+}
+
+export function getSizesArray(bid, mediaType) {
+  let sizesArray = [];
+
+  if (deepAccess(bid, `mediaTypes.${mediaType}.sizes`)) {
+    sizesArray = bid.mediaTypes[mediaType].sizes;
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizesArray = bid.sizes;
+  }
+
+  return sizesArray;
+}
+
+export function getSupplyChain(schainObject) {
+  if (isEmpty(schainObject)) {
+    return '';
+  }
+  let scStr = `${schainObject.ver},${schainObject.complete}`;
+  schainObject.nodes.forEach((node) => {
+    scStr += '!';
+    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.hp)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
+  });
+  return scStr;
+}
+
+export function getEncodedValIfNotEmpty(val) {
+  return (val !== '' && val !== undefined) ? encodeURIComponent(val) : '';
+}
+
+export function getAllowedSyncMethod(filterSettings, bidderCode) {
+  const iframeConfigsToCheck = ['all', 'iframe'];
+  const pixelConfigToCheck = 'image';
+  if (filterSettings && iframeConfigsToCheck.some(config => isSyncMethodAllowed(filterSettings[config], bidderCode))) {
+    return 'iframe';
+  }
+  if (!filterSettings || !filterSettings[pixelConfigToCheck] || isSyncMethodAllowed(filterSettings[pixelConfigToCheck], bidderCode)) {
+    return 'pixel';
+  }
+}
+
+export function isSyncMethodAllowed(syncRule, bidderCode) {
+  if (!syncRule) {
+    return false;
+  }
+  const isInclude = syncRule.filter === 'include';
+  const bidders = isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
+  return isInclude && contains(bidders, bidderCode);
+}
+
+export function getEndpoint(testMode, baseUrl, modes) {
+  const protocol = baseUrl.startsWith('http') ? '' : 'https://';
+  const url = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`;
+  return testMode
+    ? `${protocol}${url}${modes.TEST}`
+    : `${protocol}${url}${modes.PRODUCTION}`;
+}
+
+export function getDeviceType(ua) {
+  if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(ua.toLowerCase())) {
+    return '5';
+  }
+  if (/iphone|ipod|android|blackberry|opera|mini|windows\\sce|palm|smartphone|iemobile/i.test(ua.toLowerCase())) {
+    return '4';
+  }
+  if (/smart[-_\\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\\bdtv\\b|sonydtv|inettvbrowser|\\btv\\b/i.test(ua.toLowerCase())) {
+    return '3';
+  }
+  return '1';
+}
+
+export function generateBidsParams(validBidRequests, bidderRequest) {
+  const bidsArray = [];
+
+  if (validBidRequests.length) {
+    validBidRequests.forEach(bid => {
+      bidsArray.push(generateBidParameters(bid, bidderRequest));
+    });
+  }
+
+  return bidsArray;
+}
+
+export function generateBidParameters(bid, bidderRequest) {
+  const { params } = bid;
+  const mediaType = isBanner(bid) ? BANNER : VIDEO;
+  const sizesArray = getSizesArray(bid, mediaType);
+
+  if (isNaN(params.floorPrice)) {
+    params.floorPrice = 0;
+  }
+
+  const bidObject = {
+    mediaType,
+    adUnitCode: getBidIdParameter('adUnitCode', bid),
+    sizes: sizesArray,
+    floorPrice: Math.max(getFloor(bid, mediaType), params.floorPrice),
+    bidId: getBidIdParameter('bidId', bid),
+    loop: bid.bidderRequestsCount || 0,
+    bidderRequestId: getBidIdParameter('bidderRequestId', bid),
+    transactionId: bid.ortb2Imp?.ext?.tid || '',
+    coppa: 0,
+  };
+
+  const pos = deepAccess(bid, `mediaTypes.${mediaType}.pos`);
+  if (pos) {
+    bidObject.pos = pos;
+  }
+
+  const gpid = deepAccess(bid, `ortb2Imp.ext.gpid`);
+  if (gpid) {
+    bidObject.gpid = gpid;
+  }
+
+  const placementId = params.placementId || deepAccess(bid, `mediaTypes.${mediaType}.name`);
+  if (placementId) {
+    bidObject.placementId = placementId;
+  }
+
+  const mimes = deepAccess(bid, `mediaTypes.${mediaType}.mimes`);
+  if (mimes) {
+    bidObject.mimes = mimes;
+  }
+
+  const api = deepAccess(bid, `mediaTypes.${mediaType}.api`);
+  if (api) {
+    bidObject.api = api;
+  }
+
+  const sua = deepAccess(bid, `ortb2.device.sua`);
+  if (sua) {
+    bidObject.sua = sua;
+  }
+
+  const coppa = deepAccess(bid, `ortb2.regs.coppa`);
+  if (coppa) {
+    bidObject.coppa = 1;
+  }
+
+  if (mediaType === VIDEO) {
+    const playbackMethod = deepAccess(bid, `mediaTypes.video.playbackmethod`);
+    let playbackMethodValue;
+
+    if (Array.isArray(playbackMethod) && isInteger(playbackMethod[0])) {
+      playbackMethodValue = playbackMethod[0];
+    } else if (isInteger(playbackMethod)) {
+      playbackMethodValue = playbackMethod;
+    }
+
+    if (playbackMethodValue) {
+      bidObject.playbackMethod = playbackMethodValue;
+    }
+
+    const placement = deepAccess(bid, `mediaTypes.video.placement`);
+    if (placement) {
+      bidObject.placement = placement;
+    }
+
+    const minDuration = deepAccess(bid, `mediaTypes.video.minduration`);
+    if (minDuration) {
+      bidObject.minDuration = minDuration;
+    }
+
+    const maxDuration = deepAccess(bid, `mediaTypes.video.maxduration`);
+    if (maxDuration) {
+      bidObject.maxDuration = maxDuration;
+    }
+
+    const skip = deepAccess(bid, `mediaTypes.video.skip`);
+    if (skip) {
+      bidObject.skip = skip;
+    }
+
+    const linearity = deepAccess(bid, `mediaTypes.video.linearity`);
+    if (linearity) {
+      bidObject.linearity = linearity;
+    }
+
+    const protocols = deepAccess(bid, `mediaTypes.video.protocols`);
+    if (protocols) {
+      bidObject.protocols = protocols;
+    }
+
+    const plcmt = deepAccess(bid, `mediaTypes.video.plcmt`);
+    if (plcmt) {
+      bidObject.plcmt = plcmt;
+    }
+  }
+
+  return bidObject;
+}
+
+export function buildBidResponse(adUnit, DEFAULT_CURRENCY, TTL, VIDEO, BANNER) {
+  const bidResponse = {
+    requestId: adUnit.requestId,
+    cpm: adUnit.cpm,
+    currency: adUnit.currency || DEFAULT_CURRENCY,
+    width: adUnit.width,
+    height: adUnit.height,
+    ttl: adUnit.ttl || TTL,
+    creativeId: adUnit.creativeId,
+    netRevenue: adUnit.netRevenue || true,
+    nurl: adUnit.nurl,
+    mediaType: adUnit.mediaType,
+    meta: {
+      mediaType: adUnit.mediaType
+    }
+  };
+
+  if (adUnit.mediaType === VIDEO) {
+    bidResponse.vastXml = adUnit.vastXml;
+  } else if (adUnit.mediaType === BANNER) {
+    bidResponse.ad = adUnit.ad;
+  }
+
+  if (adUnit.adomain && adUnit.adomain.length) {
+    bidResponse.meta.advertiserDomains = adUnit.adomain;
+  }
+
+  return bidResponse;
+}
+
+function isBanner(bid) {
+  return bid.mediaTypes && bid.mediaTypes.banner;
+}
+
+export function generateGeneralParams(generalObject, bidderRequest, adapterVersion) {
+  const domain = window.location.hostname;
+  const { syncEnabled, filterSettings } = config.getConfig('userSync') || {};
+  const { bidderCode } = bidderRequest;
+  const generalBidParams = generalObject.params;
+  const timeout = bidderRequest.timeout;
+  const adapVer = adapterVersion || '6.0.0';
+
+  const generalParams = {
+    wrapper_type: 'prebidjs',
+    wrapper_vendor: '$$PREBID_GLOBAL$$',
+    wrapper_version: '$prebid.version$',
+    adapter_version: adapVer,
+    auction_start: bidderRequest.auctionStart,
+    publisher_id: generalBidParams.org,
+    publisher_name: domain,
+    site_domain: domain,
+    dnt: (navigator.doNotTrack === 'yes' || navigator.doNotTrack === '1' || navigator.msDoNotTrack === '1') ? 1 : 0,
+    device_type: getDeviceType(navigator.userAgent),
+    ua: navigator.userAgent,
+    is_wrapper: !!generalBidParams.isWrapper,
+    session_id: generalBidParams.sessionId || getBidIdParameter('bidderRequestId', generalObject),
+    tmax: timeout
+  };
+
+  const userIdsParam = getBidIdParameter('userId', generalObject);
+  if (userIdsParam) {
+    generalParams.userIds = JSON.stringify(userIdsParam);
+  }
+
+  const ortb2Metadata = bidderRequest.ortb2 || {};
+  if (ortb2Metadata.site) {
+    generalParams.site_metadata = JSON.stringify(ortb2Metadata.site);
+  }
+  if (ortb2Metadata.user) {
+    generalParams.user_metadata = JSON.stringify(ortb2Metadata.user);
+  }
+
+  if (ortb2Metadata.device) {
+    generalParams.device = ortb2Metadata.device;
+  }
+
+  if (syncEnabled) {
+    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
+    if (allowedSyncMethod) {
+      generalParams.cs_method = allowedSyncMethod;
+    }
+  }
+
+  if (bidderRequest.uspConsent) {
+    generalParams.us_privacy = bidderRequest.uspConsent;
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+    generalParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
+    generalParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
+  }
+
+  if (bidderRequest.gppConsent) {
+    generalParams.gpp = bidderRequest.gppConsent.gppString;
+    generalParams.gpp_sid = bidderRequest.gppConsent.applicableSections;
+  } else if (bidderRequest.ortb2?.regs?.gpp) {
+    generalParams.gpp = bidderRequest.ortb2.regs.gpp;
+    generalParams.gpp_sid = bidderRequest.ortb2.regs.gpp_sid;
+  }
+
+  if (generalBidParams.ifa) {
+    generalParams.ifa = generalBidParams.ifa;
+  }
+
+  if (generalObject.schain) {
+    generalParams.schain = getSupplyChain(generalObject.schain);
+  }
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    generalParams.referrer = deepAccess(bidderRequest, 'refererInfo.ref');
+    generalParams.page_url = deepAccess(bidderRequest, 'refererInfo.page') || deepAccess(window, 'location.href');
+    generalParams.site_domain = deepAccess(bidderRequest, 'refererInfo.domain') || deepAccess(window, 'location.hostname');
+  }
+
+  return generalParams;
+}
diff --git a/libraries/schainSerializer/schainSerializer.js b/libraries/schainSerializer/schainSerializer.js
new file mode 100644
index 00000000000..7d9a3c4ddc6
--- /dev/null
+++ b/libraries/schainSerializer/schainSerializer.js
@@ -0,0 +1,24 @@
+/**
+ * Serialize the SupplyChain for Non-OpenRTB Requests
+ * https://github.com/InteractiveAdvertisingBureau/openrtb/blob/main/supplychainobject.md
+ *
+ * @param {Object} schain                 The supply chain object.
+ * @param {string} schain.ver             The version of the supply chain.
+ * @param {number} schain.complete        Indicates if the chain is complete (1) or not (0).
+ * @param {Array} schain.nodes    An array of nodes in the supply chain.
+ * @param {Array} nodesProperties The list of node properties to include in the serialized string.
+ *                                           Can include: 'asi', 'sid', 'hp', 'rid', 'name', 'domain', 'ext'.
+ * @returns {string|null} The serialized supply chain string or null if the nodes are not present.
+ */
+export function serializeSupplyChain(schain, nodesProperties) {
+  if (!schain?.nodes) return null;
+
+  const header = `${schain.ver},${schain.complete}!`;
+  const nodes = schain.nodes.map(
+    node => nodesProperties.map(
+      prop => node[prop] ? encodeURIComponent(node[prop]).replace(/!/g, '%21') : ''
+    ).join(',')
+  ).join('!');
+
+  return header + nodes;
+}
diff --git a/libraries/sizeUtils/tranformSize.js b/libraries/sizeUtils/tranformSize.js
new file mode 100644
index 00000000000..1746ac74fb3
--- /dev/null
+++ b/libraries/sizeUtils/tranformSize.js
@@ -0,0 +1,43 @@
+import * as utils from '../../src/utils.js';
+
+/**
+ * get sizes for rtb
+ * @param  {Array|Object} requestSizes
+ * @return {Object}
+ */
+export function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (
+    utils.isArray(requestSizes) &&
+      requestSizes.length === 2 &&
+      !utils.isArray(requestSizes[0])
+  ) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+export const normalAdSize = [
+  { w: 300, h: 250 },
+  { w: 300, h: 600 },
+  { w: 728, h: 90 },
+  { w: 970, h: 250 },
+  { w: 320, h: 50 },
+  { w: 160, h: 600 },
+  { w: 320, h: 180 },
+  { w: 320, h: 100 },
+  { w: 336, h: 280 },
+];
diff --git a/libraries/smartyadsUtils/getAdUrlByRegion.js b/libraries/smartyadsUtils/getAdUrlByRegion.js
new file mode 100644
index 00000000000..cad9055f671
--- /dev/null
+++ b/libraries/smartyadsUtils/getAdUrlByRegion.js
@@ -0,0 +1,32 @@
+const adUrls = {
+  US_EAST: 'https://n1.smartyads.com/?c=o&m=prebid&secret_key=prebid_js',
+  EU: 'https://n2.smartyads.com/?c=o&m=prebid&secret_key=prebid_js',
+  SGP: 'https://n6.smartyads.com/?c=o&m=prebid&secret_key=prebid_js'
+};
+
+export function getAdUrlByRegion(bid) {
+  let adUrl;
+
+  if (bid.params.region && adUrls[bid.params.region]) {
+    adUrl = adUrls[bid.params.region];
+  } else {
+    try {
+      const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+      const region = timezone.split('/')[0];
+
+      switch (region) {
+        case 'Europe':
+          adUrl = adUrls['EU'];
+          break;
+        case 'Asia':
+          adUrl = adUrls['SGP'];
+          break;
+        default: adUrl = adUrls['US_EAST'];
+      }
+    } catch (err) {
+      adUrl = adUrls['US_EAST'];
+    }
+  }
+
+  return adUrl;
+};
diff --git a/libraries/targetVideoUtils/bidderUtils.js b/libraries/targetVideoUtils/bidderUtils.js
new file mode 100644
index 00000000000..cf106566944
--- /dev/null
+++ b/libraries/targetVideoUtils/bidderUtils.js
@@ -0,0 +1,213 @@
+import {SYNC_URL} from './constants.js';
+import {VIDEO} from '../../src/mediaTypes.js';
+import {getRefererInfo} from '../../src/refererDetection.js';
+import {createTrackPixelHtml, deepAccess, getBidRequest, formatQS} from '../../src/utils.js';
+
+export function getSizes(request) {
+  let sizes = request.sizes;
+  if (!sizes && request.mediaTypes && request.mediaTypes.banner && request.mediaTypes.banner.sizes) {
+    sizes = request.mediaTypes.banner.sizes;
+  }
+  if (Array.isArray(sizes) && !Array.isArray(sizes[0])) {
+    sizes = [sizes[0], sizes[1]];
+  }
+  if (!Array.isArray(sizes) || !Array.isArray(sizes[0])) {
+    sizes = [[0, 0]];
+  }
+
+  return sizes;
+}
+
+export function formatRequest({payload, url, bidderRequest, bidId}) {
+  const request = {
+    method: 'POST',
+    data: JSON.stringify(payload),
+    url,
+    options: {
+      withCredentials: true,
+    }
+  }
+
+  if (bidderRequest) {
+    request.bidderRequest = bidderRequest;
+  }
+
+  if (bidId) {
+    request.bidId = bidId;
+  }
+
+  return request;
+}
+
+export function createVideoTag(bid) {
+  const tag = {};
+  tag.id = parseInt(bid.params.placementId, 10);
+  tag.gpid = 'targetVideo';
+  tag.sizes = getSizes(bid);
+  tag.primary_size = tag.sizes[0];
+  tag.ad_types = [VIDEO];
+  tag.uuid = bid.bidId;
+  tag.allow_smaller_sizes = false;
+  tag.use_pmt_rule = false;
+  tag.prebid = true;
+  tag.disable_psa = true;
+  tag.hb_source = 1;
+  tag.require_asset_url = true;
+  tag.video = {
+    playback_method: 2,
+    skippable: true
+  };
+
+  return tag;
+}
+
+export function bannerBid(serverBid, rtbBid, bidderRequest, margin) {
+  const bidRequest = getBidRequest(serverBid.uuid, [bidderRequest]);
+  const sizes = getSizes(bidRequest);
+  const bid = {
+    requestId: serverBid.uuid,
+    cpm: rtbBid.cpm / margin,
+    creativeId: rtbBid.creative_id,
+    dealId: rtbBid.deal_id,
+    currency: 'USD',
+    netRevenue: true,
+    width: sizes[0][0],
+    height: sizes[0][1],
+    ttl: 300,
+    adUnitCode: bidRequest.adUnitCode,
+    appnexus: {
+      buyerMemberId: rtbBid.buyer_member_id,
+      dealPriority: rtbBid.deal_priority,
+      dealCode: rtbBid.deal_code
+    }
+  };
+
+  if (rtbBid.rtb.video) {
+    Object.assign(bid, {
+      vastImpUrl: rtbBid.notify_url,
+      ad: getBannerHtml(rtbBid.notify_url + '&redir=' + encodeURIComponent(rtbBid.rtb.video.asset_url)),
+      ttl: 3600
+    });
+  }
+
+  return bid;
+}
+
+export function videoBid(serverBid, requestId, currency, params, ttl) {
+  const {ad, adUrl, vastUrl, vastXml} = getAd(serverBid);
+
+  const bid = {
+    requestId,
+    params,
+    currency,
+    cpm: serverBid.price,
+    width: serverBid.w,
+    height: serverBid.h,
+    creativeId: serverBid.adid || serverBid.crid,
+    netRevenue: false,
+    ttl,
+    meta: {
+      advertiserDomains: serverBid.adomain || []
+    }
+  };
+
+  if (vastUrl || vastXml) {
+    bid.mediaType = VIDEO;
+    if (vastUrl) bid.vastUrl = vastUrl;
+    if (vastXml) bid.vastXml = vastXml;
+  } else {
+    bid.ad = ad;
+    bid.adUrl = adUrl;
+  };
+
+  return bid;
+}
+
+export function getRtbBid(tag) {
+  return tag && tag.ads && tag.ads.length && tag.ads.find(ad => ad.rtb);
+}
+
+export function getBannerHtml(vastUrl) {
+  return `
+    
+    
+      
+      
+      
+    
+    
+      

+      
+      
+    
+  `;
+}
+
+export function getAd(bid) {
+  let ad, adUrl, vastXml, vastUrl;
+
+  switch (deepAccess(bid, 'ext.prebid.type')) {
+    case VIDEO:
+      if (bid.adm.substr(0, 4) === 'http') {
+        vastUrl = bid.adm;
+      } else {
+        vastXml = bid.adm;
+      };
+      break;
+    default:
+      if (bid.adm && bid.nurl) {
+        ad = bid.adm;
+        ad += createTrackPixelHtml(decodeURIComponent(bid.nurl));
+      } else if (bid.adm) {
+        ad = bid.adm;
+      } else if (bid.nurl) {
+        adUrl = bid.nurl;
+      };
+  }
+
+  return {ad, adUrl, vastXml, vastUrl};
+}
+
+export function getSyncResponse(syncOptions, gdprConsent, uspConsent, gppConsent, endpoint) {
+  const params = {
+    endpoint
+  };
+
+  // Attaching GDPR Consent Params in UserSync url
+  if (gdprConsent) {
+    params.gdpr = (gdprConsent.gdprApplies ? 1 : 0);
+    params.gdpr_consent = encodeURIComponent(gdprConsent.consentString || '');
+  }
+
+  // CCPA
+  if (uspConsent && typeof uspConsent === 'string') {
+    params.us_privacy = encodeURIComponent(uspConsent);
+  }
+
+  // GPP Consent
+  if (gppConsent?.gppString && gppConsent?.applicableSections?.length) {
+    params.gpp = encodeURIComponent(gppConsent.gppString);
+    params.gpp_sid = encodeURIComponent(gppConsent?.applicableSections?.join(','));
+  }
+
+  const queryParams = Object.keys(params).length > 0 ? formatQS(params) : '';
+  let response = [];
+  if (syncOptions.iframeEnabled) {
+    response = [{
+      type: 'iframe',
+      url: SYNC_URL + 'load-cookie.html?' + queryParams
+    }];
+  }
+
+  return response;
+}
+
+export function getSiteObj() {
+  const refInfo = (getRefererInfo && getRefererInfo()) || {};
+
+  return {
+    page: refInfo.page,
+    ref: refInfo.ref,
+    domain: refInfo.domain
+  }
+}
diff --git a/libraries/targetVideoUtils/constants.js b/libraries/targetVideoUtils/constants.js
new file mode 100644
index 00000000000..33076b71e7d
--- /dev/null
+++ b/libraries/targetVideoUtils/constants.js
@@ -0,0 +1,25 @@
+const SOURCE = 'pbjs';
+const GVLID = 786;
+const MARGIN = 1.35;
+const BIDDER_CODE = 'targetVideo';
+
+const TIME_TO_LIVE = 300;
+const BANNER_ENDPOINT_URL = 'https://ib.adnxs.com/ut/v3/prebid';
+const VIDEO_ENDPOINT_URL = 'https://pbs.prebrid.tv/openrtb2/auction';
+const SYNC_URL = 'https://bppb.link/static/';
+const VIDEO_PARAMS = [
+  'api', 'linearity', 'maxduration', 'mimes', 'minduration',
+  'plcmt', 'playbackmethod', 'protocols', 'startdelay', 'placement'
+];
+
+export {
+  SOURCE,
+  GVLID,
+  MARGIN,
+  BIDDER_CODE,
+  SYNC_URL,
+  TIME_TO_LIVE,
+  BANNER_ENDPOINT_URL,
+  VIDEO_ENDPOINT_URL,
+  VIDEO_PARAMS
+}
diff --git a/libraries/teqblazeUtils/bidderUtils.js b/libraries/teqblazeUtils/bidderUtils.js
new file mode 100644
index 00000000000..f9484ebe5d1
--- /dev/null
+++ b/libraries/teqblazeUtils/bidderUtils.js
@@ -0,0 +1,261 @@
+import { BANNER, NATIVE, VIDEO } from '../../src/mediaTypes.js';
+import { deepAccess } from '../../src/utils.js';
+import { config } from '../../src/config.js';
+
+const PROTOCOL_PATTERN = /^[a-z0-9.+-]+:/i;
+
+const isBidResponseValid = (bid) => {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
+    return false;
+  }
+
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+};
+
+const getBidFloor = (bid) => {
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+
+    return bidFloor?.floor;
+  } catch (err) {
+    return 0;
+  }
+};
+
+const createBasePlacement = (bid) => {
+  const { bidId, mediaTypes, transactionId, userIdAsEids } = bid;
+  const schain = bid.schain || {};
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.plcmt = mediaTypes[VIDEO].plcmt;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  if (transactionId) {
+    placement.ext = placement.ext || {};
+    placement.ext.tid = transactionId;
+  }
+
+  if (userIdAsEids && userIdAsEids.length) {
+    placement.eids = userIdAsEids;
+  }
+
+  return placement;
+};
+
+const defaultPlacementType = (bid, bidderRequest, placement) => {
+  const { placementId, endpointId } = bid.params;
+
+  if (placementId) {
+    placement.placementId = placementId;
+    placement.type = 'publisher';
+  } else if (endpointId) {
+    placement.endpointId = endpointId;
+    placement.type = 'network';
+  }
+};
+
+const checkIfObjectHasKey = (keys, obj, mode = 'some') => {
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    const val = obj[key];
+
+    if (mode === 'some' && val) return true;
+    if (mode === 'every' && !val) return false;
+  }
+
+  return mode === 'every';
+}
+
+export const isBidRequestValid = (keys = ['placementId', 'endpointId'], mode) => (bid = {}) => {
+  const { params, bidId, mediaTypes } = bid;
+  let valid = Boolean(bidId && params && checkIfObjectHasKey(keys, params, mode));
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    valid = valid && Boolean(mediaTypes[NATIVE]);
+  } else {
+    valid = false;
+  }
+
+  return valid;
+};
+
+/**
+ * @param {{ adUrl, validBidRequests, bidderRequest, placementProcessingFunction }} config
+ * @returns {function}
+ */
+export const buildRequestsBase = (config) => {
+  const { adUrl, validBidRequests, bidderRequest } = config;
+  const placementProcessingFunction = config.placementProcessingFunction || buildPlacementProcessingFunction();
+  const device = deepAccess(bidderRequest, 'ortb2.device');
+  const page = deepAccess(bidderRequest, 'refererInfo.page', '');
+
+  const proto = PROTOCOL_PATTERN.exec(page);
+  const protocol = proto?.[0];
+
+  const placements = [];
+  const request = {
+    deviceWidth: device?.w || 0,
+    deviceHeight: device?.h || 0,
+    language: device?.language?.split('-')[0] || '',
+    secure: protocol === 'https:' ? 1 : 0,
+    host: deepAccess(bidderRequest, 'refererInfo.domain', ''),
+    page,
+    placements,
+    coppa: deepAccess(bidderRequest, 'ortb2.regs.coppa') ? 1 : 0,
+    tmax: bidderRequest.timeout
+  };
+
+  if (bidderRequest.uspConsent) {
+    request.ccpa = bidderRequest.uspConsent;
+  }
+
+  if (bidderRequest.gdprConsent) {
+    request.gdpr = {
+      consentString: bidderRequest.gdprConsent.consentString
+    };
+  }
+
+  if (bidderRequest.gppConsent) {
+    request.gpp = bidderRequest.gppConsent.gppString;
+    request.gpp_sid = bidderRequest.gppConsent.applicableSections;
+  } else if (bidderRequest.ortb2?.regs?.gpp) {
+    request.gpp = bidderRequest.ortb2.regs.gpp;
+    request.gpp_sid = bidderRequest.ortb2.regs.gpp_sid;
+  }
+
+  if (bidderRequest?.ortb2?.device) {
+    request.device = bidderRequest.ortb2.device;
+  }
+
+  const len = validBidRequests.length;
+  for (let i = 0; i < len; i++) {
+    const bid = validBidRequests[i];
+    placements.push(placementProcessingFunction(bid, bidderRequest));
+  }
+
+  return {
+    method: 'POST',
+    url: adUrl,
+    data: request
+  };
+};
+
+export const buildRequests = (adUrl) => (validBidRequests = [], bidderRequest = {}) => {
+  const placementProcessingFunction = buildPlacementProcessingFunction();
+
+  return buildRequestsBase({ adUrl, validBidRequests, bidderRequest, placementProcessingFunction });
+};
+
+export function interpretResponseBuilder({addtlBidValidation = (bid) => true} = {}) {
+  return function (serverResponse) {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem) && addtlBidValidation(resItem)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+
+    return response;
+  }
+}
+
+export const interpretResponse = interpretResponseBuilder();
+
+export const getUserSyncs = (syncUrl) => (syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) => {
+  const type = syncOptions.iframeEnabled ? 'iframe' : 'image';
+  let url = syncUrl + `/${type}?pbjs=1`;
+
+  if (gdprConsent && gdprConsent.consentString) {
+    if (typeof gdprConsent.gdprApplies === 'boolean') {
+      url += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+    } else {
+      url += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+    }
+  }
+
+  if (uspConsent && uspConsent.consentString) {
+    url += `&ccpa_consent=${uspConsent.consentString}`;
+  }
+
+  if (gppConsent?.gppString && gppConsent?.applicableSections?.length) {
+    url += '&gpp=' + gppConsent.gppString;
+    url += '&gpp_sid=' + gppConsent.applicableSections.join(',');
+  }
+
+  const coppa = config.getConfig('coppa') ? 1 : 0;
+  url += `&coppa=${coppa}`;
+
+  return [{
+    type,
+    url
+  }];
+};
+
+/**
+ *
+ * @param {{ addPlacementType?: function, addCustomFieldsToPlacement?: function }} [config]
+ * @returns {function(object, object): object}
+ */
+export const buildPlacementProcessingFunction = (config) => (bid, bidderRequest) => {
+  const addPlacementType = config?.addPlacementType ?? defaultPlacementType;
+
+  const placement = createBasePlacement(bid);
+
+  addPlacementType(bid, bidderRequest, placement);
+
+  if (config?.addCustomFieldsToPlacement) {
+    config.addCustomFieldsToPlacement(bid, bidderRequest, placement);
+  }
+
+  return placement;
+};
diff --git a/libraries/timeoutQueue/timeoutQueue.js b/libraries/timeoutQueue/timeoutQueue.js
new file mode 100644
index 00000000000..5046eed150b
--- /dev/null
+++ b/libraries/timeoutQueue/timeoutQueue.js
@@ -0,0 +1,22 @@
+export function timeoutQueue() {
+  const queue = [];
+  return {
+    submit(timeout, onResume, onTimeout) {
+      const item = [
+        onResume,
+        setTimeout(() => {
+          queue.splice(queue.indexOf(item), 1);
+          onTimeout();
+        }, timeout)
+      ];
+      queue.push(item);
+    },
+    resume() {
+      while (queue.length) {
+        const [onResume, timerId] = queue.shift();
+        clearTimeout(timerId);
+        onResume();
+      }
+    }
+  }
+}
diff --git a/libraries/uid1Eids/uid1Eids.js b/libraries/uid1Eids/uid1Eids.js
new file mode 100644
index 00000000000..5bf3dde5c6c
--- /dev/null
+++ b/libraries/uid1Eids/uid1Eids.js
@@ -0,0 +1,16 @@
+export const UID1_EIDS = {
+  'tdid': {
+    source: 'adserver.org',
+    atype: 1,
+    getValue: function(data) {
+      if (data.id) {
+        return data.id;
+      } else {
+        return data;
+      }
+    },
+    getUidExt: function(data) {
+      return {...{rtiPartner: 'TDID'}, ...data.ext}
+    }
+  }
+}
diff --git a/libraries/uid2Eids/uid2Eids.js b/libraries/uid2Eids/uid2Eids.js
new file mode 100644
index 00000000000..ce4f4fa3b2a
--- /dev/null
+++ b/libraries/uid2Eids/uid2Eids.js
@@ -0,0 +1,14 @@
+export const UID2_EIDS = {
+  'uid2': {
+    source: 'uidapi.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  }
+}
diff --git a/libraries/userAgentUtils/index.js b/libraries/userAgentUtils/index.js
new file mode 100644
index 00000000000..7300bbd519a
--- /dev/null
+++ b/libraries/userAgentUtils/index.js
@@ -0,0 +1,58 @@
+import { deviceTypes, browserTypes, osTypes } from './userAgentTypes.enums.js';
+
+/**
+ * Get the approximate device type enum from the user agent
+ * @returns {number}
+ */
+export const getDeviceType = () => {
+  if (
+    /ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(
+      navigator.userAgent.toLowerCase()
+    )
+  ) return deviceTypes.TABLET;
+  if (
+    /iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(
+      navigator.userAgent.toLowerCase()
+    )
+  ) return deviceTypes.MOBILE;
+  return deviceTypes.DESKTOP;
+};
+
+/**
+ * Get the approximate browser type enum from the user agent (or vendor
+ * if available)
+ * @returns {number}
+ */
+export const getBrowser = () => {
+  if (/Edg/.test(navigator.userAgent)) return browserTypes.EDGE;
+  else if (
+    /Chrome/.test(navigator.userAgent) &&
+    /Google Inc/.test(navigator.vendor)
+  ) return browserTypes.CHROME;
+  else if (navigator.userAgent.match('CriOS')) return browserTypes.CHROME;
+  else if (/Firefox/.test(navigator.userAgent)) return browserTypes.FIREFOX;
+  else if (
+    /Safari/.test(navigator.userAgent) &&
+    /Apple Computer/.test(navigator.vendor)
+  ) return browserTypes.SAFARI;
+  else if (
+    /Trident/.test(navigator.userAgent) ||
+    /MSIE/.test(navigator.userAgent)
+  ) return browserTypes.INTERNET_EXPLORER;
+  else return browserTypes.OTHER;
+};
+
+/**
+ * Get the approximate OS enum from the user agent (or app version,
+ * if available)
+ * @returns {number}
+ */
+export const getOS = () => {
+  if (navigator.userAgent.indexOf('Android') != -1) return osTypes.ANDROID;
+  if (navigator.userAgent.indexOf('like Mac') != -1) return osTypes.IOS;
+  if (navigator.userAgent.indexOf('Win') != -1) return osTypes.WINDOWS;
+  if (navigator.userAgent.indexOf('Mac') != -1) return osTypes.MAC;
+  if (navigator.userAgent.indexOf('Linux') != -1) return osTypes.LINUX;
+  if (navigator.appVersion.indexOf('X11') != -1) return osTypes.UNIX;
+  return osTypes.OTHER;
+};
diff --git a/libraries/userAgentUtils/userAgentTypes.enums.js b/libraries/userAgentUtils/userAgentTypes.enums.js
new file mode 100644
index 00000000000..8a0255e88bf
--- /dev/null
+++ b/libraries/userAgentUtils/userAgentTypes.enums.js
@@ -0,0 +1,22 @@
+export const deviceTypes = Object.freeze({
+  DESKTOP: 0,
+  MOBILE: 1,
+  TABLET: 2,
+})
+export const browserTypes = Object.freeze({
+  CHROME: 0,
+  FIREFOX: 1,
+  SAFARI: 2,
+  EDGE: 3,
+  INTERNET_EXPLORER: 4,
+  OTHER: 5
+})
+export const osTypes = Object.freeze({
+  WINDOWS: 0,
+  MAC: 1,
+  LINUX: 2,
+  UNIX: 3,
+  IOS: 4,
+  ANDROID: 5,
+  OTHER: 6
+})
diff --git a/libraries/userSyncUtils/userSyncUtils.js b/libraries/userSyncUtils/userSyncUtils.js
new file mode 100644
index 00000000000..db8c77d307b
--- /dev/null
+++ b/libraries/userSyncUtils/userSyncUtils.js
@@ -0,0 +1,24 @@
+export function getUserSyncParams(gdprConsent, uspConsent, gppConsent) {
+  let params = {};
+
+  if (gdprConsent) {
+    if (typeof gdprConsent.gdprApplies === 'boolean') {
+      params['gdpr'] = Number(gdprConsent.gdprApplies);
+    }
+
+    if (typeof gdprConsent.consentString === 'string') {
+      params['gdpr_consent'] = gdprConsent.consentString;
+    }
+  }
+
+  if (uspConsent) {
+    params['us_privacy'] = encodeURIComponent(uspConsent);
+  }
+
+  if (gppConsent?.gppString) {
+    params['gpp'] = gppConsent.gppString;
+    params['gpp_sid'] = gppConsent.applicableSections?.toString();
+  }
+
+  return params;
+}
diff --git a/libraries/vastTrackers/vastTrackers.js b/libraries/vastTrackers/vastTrackers.js
new file mode 100644
index 00000000000..b8fc829a89a
--- /dev/null
+++ b/libraries/vastTrackers/vastTrackers.js
@@ -0,0 +1,122 @@
+import {addBidResponse} from '../../src/auction.js';
+import {VIDEO} from '../../src/mediaTypes.js';
+import {logError} from '../../src/utils.js';
+import {isActivityAllowed} from '../../src/activities/rules.js';
+import {ACTIVITY_REPORT_ANALYTICS} from '../../src/activities/activities.js';
+import {activityParams} from '../../src/activities/activityParams.js';
+import {auctionManager} from '../../src/auctionManager.js';
+
+const vastTrackers = [];
+let enabled = false;
+
+export function reset() {
+  vastTrackers.length = 0;
+}
+
+export function enable() {
+  if (!enabled) {
+    addBidResponse.before(addTrackersToResponse);
+    enabled = true;
+  }
+}
+
+export function disable() {
+  if (enabled) {
+    addBidResponse.getHooks({hook: addTrackersToResponse}).remove();
+    enabled = false;
+  }
+}
+
+export function responseHook({index = auctionManager.index} = {}) {
+  return function addTrackersToResponse(next, adUnitcode, bidResponse, reject) {
+    if (FEATURES.VIDEO && bidResponse.mediaType === VIDEO) {
+      const vastTrackers = getVastTrackers(bidResponse, {index});
+      if (vastTrackers) {
+        bidResponse.vastXml = insertVastTrackers(vastTrackers, bidResponse.vastXml);
+        const impTrackers = vastTrackers.get('impressions');
+        if (impTrackers) {
+          bidResponse.vastImpUrl = [].concat([...impTrackers]).concat(bidResponse.vastImpUrl).filter(t => t);
+        }
+      }
+    }
+    next(adUnitcode, bidResponse, reject);
+  }
+}
+
+const addTrackersToResponse = responseHook();
+enable();
+
+export function registerVastTrackers(moduleType, moduleName, trackerFn) {
+  if (typeof trackerFn === 'function') {
+    vastTrackers.push({'moduleType': moduleType, 'moduleName': moduleName, 'trackerFn': trackerFn});
+  }
+}
+
+export function insertVastTrackers(trackers, vastXml) {
+  const doc = new DOMParser().parseFromString(vastXml, 'text/xml');
+  const wrappers = doc.querySelectorAll('VAST Ad Wrapper, VAST Ad InLine');
+  try {
+    if (wrappers.length) {
+      wrappers.forEach(wrapper => {
+        if (trackers.get('impressions')) {
+          trackers.get('impressions').forEach(trackingUrl => {
+            const impression = doc.createElement('Impression');
+            impression.appendChild(doc.createCDATASection(trackingUrl));
+            wrapper.appendChild(impression);
+          });
+        }
+      });
+      vastXml = new XMLSerializer().serializeToString(doc);
+    }
+  } catch (error) {
+    logError('an error happened trying to insert trackers in vastXml');
+  }
+  return vastXml;
+}
+
+export function getVastTrackers(bid, {index = auctionManager.index}) {
+  let trackers = [];
+  vastTrackers.filter(
+    ({
+      moduleType,
+      moduleName,
+      trackerFn
+    }) => isActivityAllowed(ACTIVITY_REPORT_ANALYTICS, activityParams(moduleType, moduleName))
+  ).forEach(({trackerFn}) => {
+    const auction = index.getAuction(bid).getProperties();
+    const bidRequest = index.getBidRequest(bid);
+    let trackersToAdd = trackerFn(bid, {auction, bidRequest});
+    trackersToAdd.forEach(trackerToAdd => {
+      if (isValidVastTracker(trackers, trackerToAdd)) {
+        trackers.push(trackerToAdd);
+      }
+    });
+  });
+  const trackersMap = trackersToMap(trackers);
+  return (trackersMap.size ? trackersMap : null);
+};
+
+function isValidVastTracker(trackers, trackerToAdd) {
+  return trackerToAdd.hasOwnProperty('event') && trackerToAdd.hasOwnProperty('url');
+}
+
+function trackersToMap(trackers) {
+  return trackers.reduce((map, {url, event}) => {
+    !map.has(event) && map.set(event, new Set());
+    map.get(event).add(url);
+    return map;
+  }, new Map());
+}
+
+export function addImpUrlToTrackers(bid, trackersMap) {
+  if (bid.vastImpUrl) {
+    if (!trackersMap) {
+      trackersMap = new Map();
+    }
+    if (!trackersMap.get('impressions')) {
+      trackersMap.set('impressions', new Set());
+    }
+    trackersMap.get('impressions').add(bid.vastImpUrl);
+  }
+  return trackersMap;
+}
diff --git a/libraries/vidazooUtils/bidderUtils.js b/libraries/vidazooUtils/bidderUtils.js
new file mode 100644
index 00000000000..df947142a4c
--- /dev/null
+++ b/libraries/vidazooUtils/bidderUtils.js
@@ -0,0 +1,500 @@
+import {
+  _each,
+  deepAccess,
+  formatQS,
+  isArray,
+  isFn,
+  parseSizesInput,
+  parseUrl,
+  triggerPixel,
+  uniques
+} from '../../src/utils.js';
+import {chunk} from '../chunk/chunk.js';
+import {CURRENCY, DEAL_ID_EXPIRY, SESSION_ID_KEY, TTL_SECONDS, UNIQUE_DEAL_ID_EXPIRY} from './constants.js';
+import {bidderSettings} from '../../src/bidderSettings.js';
+import {config} from '../../src/config.js';
+import {BANNER, VIDEO} from '../../src/mediaTypes.js';
+
+export function createSessionId() {
+  return 'wsid_' + parseInt(Date.now() * Math.random());
+}
+
+export function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = parseUrl(window.top.document.URL, {decodeSearchAsString: true});
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
+
+export function extractCID(params) {
+  return params.cId || params.CID || params.cID || params.CId || params.cid || params.ciD || params.Cid || params.CiD;
+}
+
+export function extractPID(params) {
+  return params.pId || params.PID || params.pID || params.PId || params.pid || params.piD || params.Pid || params.PiD;
+}
+
+export function extractSubDomain(params) {
+  return params.subDomain || params.SubDomain || params.Subdomain || params.subdomain || params.SUBDOMAIN || params.subDOMAIN;
+}
+
+export function isBidRequestValid(bid) {
+  const params = bid.params || {};
+  return !!(extractCID(params) && extractPID(params));
+}
+
+export function tryParseJSON(value) {
+  try {
+    return JSON.parse(value);
+  } catch (e) {
+    return value;
+  }
+}
+
+export function setStorageItem(storage, key, value, timestamp) {
+  try {
+    const created = timestamp || Date.now();
+    const data = JSON.stringify({value, created});
+    storage.setDataInLocalStorage(key, data);
+  } catch (e) {
+  }
+}
+
+export function getStorageItem(storage, key) {
+  try {
+    return tryParseJSON(storage.getDataFromLocalStorage(key, null));
+  } catch (e) {
+  }
+
+  return null;
+}
+
+export function getCacheOpt(storage, useKey) {
+  let data = storage.getDataFromLocalStorage(useKey, null);
+  if (!data) {
+    data = String(Date.now());
+    storage.setDataInLocalStorage(useKey, data, null);
+  }
+
+  return data;
+}
+
+export function getUniqueDealId(storage, key, expiry = UNIQUE_DEAL_ID_EXPIRY) {
+  const storageKey = `u_${key}`;
+  const now = Date.now();
+  const data = getStorageItem(storage, storageKey);
+  let uniqueId;
+
+  if (!data || !data.value || now - data.created > expiry) {
+    uniqueId = `${key}_${now.toString()}`;
+    setStorageItem(storage, storageKey, uniqueId);
+  } else {
+    uniqueId = data.value;
+  }
+
+  return uniqueId;
+}
+
+export function getNextDealId(storage, key, expiry = DEAL_ID_EXPIRY) {
+  try {
+    const data = getStorageItem(storage, key);
+    let currentValue = 0;
+    let timestamp;
+
+    if (data && data.value && Date.now() - data.created < expiry) {
+      currentValue = data.value;
+      timestamp = data.created;
+    }
+
+    const nextValue = currentValue + 1;
+    setStorageItem(storage, key, nextValue, timestamp);
+    return nextValue;
+  } catch (e) {
+    return 0;
+  }
+}
+
+export function hashCode(s, prefix = '_') {
+  const l = s.length;
+  let h = 0
+  let i = 0;
+  if (l > 0) {
+    while (i < l) {
+      h = (h << 5) - h + s.charCodeAt(i++) | 0;
+    }
+  }
+  return prefix + h;
+}
+
+export function onBidWon(bid) {
+  if (!bid.nurl) {
+    return;
+  }
+  const wonBid = {
+    adId: bid.adId,
+    creativeId: bid.creativeId,
+    auctionId: bid.auctionId,
+    transactionId: bid.transactionId,
+    adUnitCode: bid.adUnitCode,
+    cpm: bid.cpm,
+    currency: bid.currency,
+    originalCpm: bid.originalCpm,
+    originalCurrency: bid.originalCurrency,
+    netRevenue: bid.netRevenue,
+    mediaType: bid.mediaType,
+    timeToRespond: bid.timeToRespond,
+    status: bid.status,
+  };
+  const qs = formatQS(wonBid);
+  const url = bid.nurl + (bid.nurl.indexOf('?') === -1 ? '?' : '&') + qs;
+  triggerPixel(url);
+}
+
+/**
+ * Create the spec function for getting user syncs
+ *
+ * The options object accepts the following fields:
+ *
+ *  - iframeSyncUrl
+ *  - imageSyncUrl
+ *
+ * @param options
+ */
+export function createUserSyncGetter(options = {
+  iframeSyncUrl: '',
+  imageSyncUrl: ''
+}) {
+  return function getUserSyncs(syncOptions, responses, gdprConsent = {}, uspConsent = '', gppConsent = {}) {
+    const syncs = [];
+    const {iframeEnabled, pixelEnabled} = syncOptions;
+    const {gdprApplies, consentString = ''} = gdprConsent;
+    const {gppString, applicableSections} = gppConsent;
+
+    const cidArr = responses.filter(resp => deepAccess(resp, 'body.cid')).map(resp => resp.body.cid).filter(uniques);
+    let params = `?cid=${encodeURIComponent(cidArr.join(','))}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`;
+
+    if (gppString && applicableSections?.length) {
+      params += '&gpp=' + encodeURIComponent(gppString);
+      params += '&gpp_sid=' + encodeURIComponent(applicableSections.join(','));
+    }
+
+    if (iframeEnabled && options.iframeSyncUrl) {
+      syncs.push({
+        type: 'iframe',
+        url: `${options.iframeSyncUrl}/${params}`
+      });
+    }
+    if (pixelEnabled && options.imageSyncUrl) {
+      syncs.push({
+        type: 'image',
+        url: `${options.imageSyncUrl}/${params}`
+      });
+    }
+    return syncs;
+  }
+}
+
+export function appendUserIdsToRequestPayload(payloadRef, userIds) {
+  let key;
+  _each(userIds, (userId, idSystemProviderName) => {
+    key = `uid.${idSystemProviderName}`;
+
+    switch (idSystemProviderName) {
+      case 'lipb':
+        payloadRef[key] = userId.lipbid;
+        break;
+      case 'id5id':
+        payloadRef[key] = userId.uid;
+        break;
+      default:
+        payloadRef[key] = userId;
+    }
+  });
+}
+
+export function getVidazooSessionId(storage) {
+  return getStorageItem(storage, SESSION_ID_KEY) || '';
+}
+
+export function buildRequestData(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout, storage, bidderVersion, bidderCode, getUniqueRequestData) {
+  const {
+    params,
+    bidId,
+    userId,
+    adUnitCode,
+    schain,
+    mediaTypes,
+    ortb2Imp,
+    bidderRequestId,
+    bidRequestsCount,
+    bidderRequestsCount,
+    bidderWinsCount
+  } = bid;
+  const {ext} = params;
+  let {bidFloor} = params;
+  const hashUrl = hashCode(topWindowUrl);
+  const uniqueRequestData = isFn(getUniqueRequestData) ? getUniqueRequestData(hashUrl, bid) : {};
+  const uniqueDealId = getUniqueDealId(storage, hashUrl);
+  const pId = extractPID(params);
+  const isStorageAllowed = bidderSettings.get(bidderCode, 'storageAllowed');
+
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot', '');
+  const cat = deepAccess(bidderRequest, 'ortb2.site.cat', []);
+  const pagecat = deepAccess(bidderRequest, 'ortb2.site.pagecat', []);
+  const contentData = deepAccess(bidderRequest, 'ortb2.site.content.data', []);
+  const userData = deepAccess(bidderRequest, 'ortb2.user.data', []);
+  const contentLang = deepAccess(bidderRequest, 'ortb2.site.content.language') || document.documentElement.lang;
+  const coppa = deepAccess(bidderRequest, 'ortb2.regs.coppa', 0);
+
+  if (isFn(bid.getFloor)) {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*'
+    });
+
+    if (floorInfo?.currency === 'USD') {
+      bidFloor = floorInfo.floor;
+    }
+  }
+
+  let data = {
+    url: encodeURIComponent(topWindowUrl),
+    uqs: getTopWindowQueryParams(),
+    cb: Date.now(),
+    bidFloor: bidFloor,
+    bidId: bidId,
+    referrer: bidderRequest.refererInfo.ref,
+    adUnitCode: adUnitCode,
+    publisherId: pId,
+    sizes: sizes,
+    uniqueDealId: uniqueDealId,
+    bidderVersion: bidderVersion,
+    prebidVersion: '$prebid.version$',
+    res: `${screen.width}x${screen.height}`,
+    schain: schain,
+    mediaTypes: mediaTypes,
+    isStorageAllowed: isStorageAllowed,
+    gpid: gpid,
+    cat: cat,
+    contentData,
+    contentLang,
+    coppa,
+    userData: userData,
+    pagecat: pagecat,
+    transactionId: ortb2Imp?.ext?.tid,
+    bidderRequestId: bidderRequestId,
+    bidRequestsCount: bidRequestsCount,
+    bidderRequestsCount: bidderRequestsCount,
+    bidderWinsCount: bidderWinsCount,
+    bidderTimeout: bidderTimeout,
+    ...uniqueRequestData
+  };
+
+  appendUserIdsToRequestPayload(data, userId);
+
+  const sua = deepAccess(bidderRequest, 'ortb2.device.sua');
+
+  if (sua) {
+    data.sua = sua;
+  }
+
+  if (bidderRequest.gdprConsent) {
+    if (bidderRequest.gdprConsent.consentString) {
+      data.gdprConsent = bidderRequest.gdprConsent.consentString;
+    }
+    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
+      data.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+    }
+  }
+  if (bidderRequest.uspConsent) {
+    data.usPrivacy = bidderRequest.uspConsent;
+  }
+
+  if (bidderRequest.gppConsent) {
+    data.gppString = bidderRequest.gppConsent.gppString;
+    data.gppSid = bidderRequest.gppConsent.applicableSections;
+  } else if (bidderRequest.ortb2?.regs?.gpp) {
+    data.gppString = bidderRequest.ortb2.regs.gpp;
+    data.gppSid = bidderRequest.ortb2.regs.gpp_sid;
+  }
+
+  if (bidderRequest.paapi?.enabled) {
+    const fledge = deepAccess(bidderRequest, 'ortb2Imp.ext.ae');
+    if (fledge) {
+      data.fledge = fledge;
+    }
+  }
+
+  const api = deepAccess(mediaTypes, 'video.api', []);
+  if (api.includes(7)) {
+    const sourceExt = deepAccess(bidderRequest, 'ortb2.source.ext');
+    if (sourceExt?.omidpv) {
+      data.omidpv = sourceExt.omidpv;
+    }
+    if (sourceExt?.omidpn) {
+      data.omidpn = sourceExt.omidpn;
+    }
+  }
+
+  const dsa = deepAccess(bidderRequest, 'ortb2.regs.ext.dsa');
+  if (dsa) {
+    data.dsa = dsa;
+  }
+
+  _each(ext, (value, key) => {
+    data['ext.' + key] = value;
+  });
+
+  return data;
+}
+
+export function createInterpretResponseFn(bidderCode, allowSingleRequest) {
+  return function interpretResponse(serverResponse, request) {
+    if (!serverResponse || !serverResponse.body) {
+      return [];
+    }
+
+    const singleRequestMode = allowSingleRequest && config.getConfig(`${bidderCode}.singleRequest`);
+    const reqBidId = deepAccess(request, 'data.bidId');
+    const {results} = serverResponse.body;
+
+    let output = [];
+
+    try {
+      results.forEach((result, i) => {
+        const {
+          creativeId,
+          ad,
+          price,
+          exp,
+          width,
+          height,
+          currency,
+          bidId,
+          nurl,
+          advertiserDomains,
+          metaData,
+          mediaType = BANNER
+        } = result;
+        if (!ad || !price) {
+          return;
+        }
+
+        const response = {
+          requestId: (singleRequestMode && bidId) ? bidId : reqBidId,
+          cpm: price,
+          width: width,
+          height: height,
+          creativeId: creativeId,
+          currency: currency || CURRENCY,
+          netRevenue: true,
+          ttl: exp || TTL_SECONDS,
+        };
+
+        if (nurl) {
+          response.nurl = nurl;
+        }
+
+        if (metaData) {
+          Object.assign(response, {
+            meta: metaData
+          })
+        } else {
+          Object.assign(response, {
+            meta: {
+              advertiserDomains: advertiserDomains || []
+            }
+          })
+        }
+
+        if (mediaType === BANNER) {
+          Object.assign(response, {
+            ad: ad,
+          });
+        } else {
+          Object.assign(response, {
+            vastXml: ad,
+            mediaType: VIDEO
+          });
+        }
+        output.push(response);
+      });
+
+      return output;
+    } catch (e) {
+      return [];
+    }
+  }
+}
+
+export function createBuildRequestsFn(createRequestDomain, createUniqueRequestData, storage, bidderCode, bidderVersion, allowSingleRequest) {
+  function buildRequest(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout) {
+    const {params} = bid;
+    const cId = extractCID(params);
+    const subDomain = extractSubDomain(params);
+    const data = buildRequestData(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout, storage, bidderVersion, bidderCode, createUniqueRequestData);
+    const dto = {
+      method: 'POST', url: `${createRequestDomain(subDomain)}/prebid/multi/${cId}`, data: data
+    };
+    return dto;
+  }
+
+  function buildSingleRequest(bidRequests, bidderRequest, topWindowUrl, bidderTimeout) {
+    const {params} = bidRequests[0];
+    const cId = extractCID(params);
+    const subDomain = extractSubDomain(params);
+    const data = bidRequests.map(bid => {
+      const sizes = parseSizesInput(bid.sizes);
+      return buildRequestData(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout, storage, bidderVersion, bidderCode, createUniqueRequestData)
+    });
+    const chunkSize = Math.min(20, config.getConfig(`${bidderCode}.chunkSize`) || 10);
+
+    const chunkedData = chunk(data, chunkSize);
+    return chunkedData.map(chunk => {
+      return {
+        method: 'POST',
+        url: `${createRequestDomain(subDomain)}/prebid/multi/${cId}`,
+        data: {
+          bids: chunk
+        }
+      };
+    });
+  }
+
+  return function buildRequests(validBidRequests, bidderRequest) {
+    const topWindowUrl = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+    const bidderTimeout = bidderRequest.timeout || config.getConfig('bidderTimeout');
+
+    const singleRequestMode = allowSingleRequest && config.getConfig(`${bidderCode}.singleRequest`);
+
+    const requests = [];
+
+    if (singleRequestMode) {
+      // banner bids are sent as a single request
+      const bannerBidRequests = validBidRequests.filter(bid => isArray(bid.mediaTypes) ? bid.mediaTypes.includes(BANNER) : bid.mediaTypes[BANNER] !== undefined);
+      if (bannerBidRequests.length > 0) {
+        const singleRequests = buildSingleRequest(bannerBidRequests, bidderRequest, topWindowUrl, bidderTimeout);
+        requests.push(...singleRequests);
+      }
+
+      // video bids are sent as a single request for each bid
+
+      const videoBidRequests = validBidRequests.filter(bid => bid.mediaTypes[VIDEO] !== undefined);
+      videoBidRequests.forEach(validBidRequest => {
+        const sizes = parseSizesInput(validBidRequest.sizes);
+        const request = buildRequest(validBidRequest, topWindowUrl, sizes, bidderRequest, bidderTimeout);
+        requests.push(request);
+      });
+    } else {
+      validBidRequests.forEach(validBidRequest => {
+        const sizes = parseSizesInput(validBidRequest.sizes);
+        const request = buildRequest(validBidRequest, topWindowUrl, sizes, bidderRequest, bidderTimeout);
+        requests.push(request);
+      });
+    }
+    return requests;
+  }
+}
diff --git a/libraries/vidazooUtils/constants.js b/libraries/vidazooUtils/constants.js
new file mode 100644
index 00000000000..b1056c15899
--- /dev/null
+++ b/libraries/vidazooUtils/constants.js
@@ -0,0 +1,7 @@
+export const CURRENCY = 'USD';
+export const TTL_SECONDS = 60 * 5;
+export const DEAL_ID_EXPIRY = 1000 * 60 * 15;
+export const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 60;
+export const SESSION_ID_KEY = 'vidSid';
+export const OPT_CACHE_KEY = 'vdzwopt';
+export const OPT_TIME_KEY = 'vdzHum';
diff --git a/libraries/video/constants/ortb.js b/libraries/video/constants/ortb.js
index d67c8a5f393..86e7b499774 100644
--- a/libraries/video/constants/ortb.js
+++ b/libraries/video/constants/ortb.js
@@ -1,6 +1,6 @@
 /**
  * @typedef {Object} OrtbParams
- * @property {OrtbVideoParamst} video
+ * @property {OrtbVideoParams} video
  * @property {OrtbContentParams} content
  */
 
@@ -13,7 +13,8 @@
  * @property {number} w - Width of the video player in device independent pixels (DIPS).
  * @property {number} h - Height of the video player in device independent pixels (DIPS).
  * @property {number|undefined} startdelay - Indicates the offset of the ad placement.
- * @property {number|undefined} placement - Placement type for the impression.
+ * @property {number|undefined} placement - Legacy Placement type for the impression.
+ * @property {number|undefined} plcmt - Modern placement type for the impression.
  * @property {number|undefined} linearity - Indicates if the impression must be linear, nonlinear, etc. If omitted, assume all are allowed.
  * @property {number} skip - Indicates if the player can allow the video to be skipped, where 0 is no, 1 is yes.
  * @property {number|undefined} skipmin - Only ad creatives with a duration greater than this value can be skippable; only applicable if the ad is skippable.
@@ -97,6 +98,18 @@ export const PLACEMENT = {
   INTERSTITIAL_SLIDER_FLOATING: 5
 };
 
+/**
+ * ADCOM - https://github.com/InteractiveAdvertisingBureau/AdCOM/blob/develop/AdCOM%20v1.0%20FINAL.md#list_plcmtsubtypesvideo
+ * @enum OrtbVideoParams.plcmt
+ */
+export const PLCMT = {
+  INSTREAM: 1,
+  ACCOMPANYING_CONTENT: 2,
+  INTERSTITIAL: 3,
+  OUTSTREAM: 4,
+  NO_CONTENT: 4
+};
+
 /**
  * ORTB 2.5 section 5.4 - Ad Position
  * @enum OrtbVideoParams.pos
diff --git a/libraries/video/constants/vendorCodes.js b/libraries/video/constants/vendorCodes.js
index 370c151b997..4e3550ce431 100644
--- a/libraries/video/constants/vendorCodes.js
+++ b/libraries/video/constants/vendorCodes.js
@@ -1,6 +1,7 @@
 // Video Vendors
 export const JWPLAYER_VENDOR = 1;
 export const VIDEO_JS_VENDOR = 2;
+export const AD_PLAYER_PRO_VENDOR = 3;
 
 // Ad Server Vendors
 export const GAM_VENDOR = 'gam';
diff --git a/libraries/video/shared/parentModule.js b/libraries/video/shared/parentModule.js
index 06c71ebd75b..b040f39bcb8 100644
--- a/libraries/video/shared/parentModule.js
+++ b/libraries/video/shared/parentModule.js
@@ -47,6 +47,7 @@ export function ParentModule(submoduleBuilder_) {
 }
 
 /**
+ * @typedef {import('../../../modules/videoModule/coreVideo.js').vendorSubmoduleDirectory} vendorSubmoduleDirectory
  * @typedef {Object} SubmoduleBuilder
  * @summary Instantiates submodules
  * @param {vendorSubmoduleDirectory} submoduleDirectory_
diff --git a/libraries/viewport/viewport.js b/libraries/viewport/viewport.js
new file mode 100644
index 00000000000..b385e9a27ec
--- /dev/null
+++ b/libraries/viewport/viewport.js
@@ -0,0 +1,13 @@
+import {getWindowTop} from '../../src/utils.js';
+
+export function getViewportCoordinates() {
+  try {
+    const win = getWindowTop();
+    let { scrollY: top, scrollX: left, innerHeight, innerWidth } = win;
+    innerHeight = innerHeight || win.document.documentElement.clientWidth || win.document.body.clientWidth;
+    innerWidth = innerWidth || win.document.documentElement.clientHeight || win.document.body.clientHeight
+    return { top, right: left + innerWidth, bottom: top + innerHeight, left };
+  } catch (e) {
+    return {};
+  }
+}
diff --git a/libraries/weakStore/weakStore.js b/libraries/weakStore/weakStore.js
new file mode 100644
index 00000000000..09606354dae
--- /dev/null
+++ b/libraries/weakStore/weakStore.js
@@ -0,0 +1,15 @@
+import {auctionManager} from '../../src/auctionManager.js';
+
+export function weakStore(get) {
+  const store = new WeakMap();
+  return function (id, init = {}) {
+    const obj = get(id);
+    if (obj == null) return;
+    if (!store.has(obj)) {
+      store.set(obj, init);
+    }
+    return store.get(obj);
+  };
+}
+
+export const auctionStore = () => weakStore((auctionId) => auctionManager.index.getAuction({auctionId}));
diff --git a/libraries/xeUtils/bidderUtils.js b/libraries/xeUtils/bidderUtils.js
new file mode 100644
index 00000000000..f03c6323d76
--- /dev/null
+++ b/libraries/xeUtils/bidderUtils.js
@@ -0,0 +1,158 @@
+import {deepAccess, getBidIdParameter, isFn, logError, isArray, parseSizesInput, isPlainObject} from '../../src/utils.js';
+import {getAdUnitSizes} from '../sizeUtils/sizeUtils.js';
+import {findIndex} from '../../src/polyfill.js';
+
+export function getBidFloor(bid, currency = 'USD') {
+  if (!isFn(bid.getFloor)) {
+    return null;
+  }
+
+  let floor = bid.getFloor({
+    currency,
+    mediaType: '*',
+    size: '*'
+  });
+
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === currency) {
+    return floor.floor;
+  }
+
+  return null;
+}
+
+export function isBidRequestValid(bid) {
+  if (bid && typeof bid.params !== 'object') {
+    logError('Params is not defined or is incorrect in the bidder settings');
+    return false;
+  }
+
+  if (!getBidIdParameter('env', bid.params) || !getBidIdParameter('pid', bid.params)) {
+    logError('Env or pid is not present in bidder params');
+    return false;
+  }
+
+  if (deepAccess(bid, 'mediaTypes.video') && !isArray(deepAccess(bid, 'mediaTypes.video.playerSize'))) {
+    logError('mediaTypes.video.playerSize is required for video');
+    return false;
+  }
+
+  return true;
+}
+
+export function buildRequests(validBidRequests, bidderRequest, endpoint) {
+  const {refererInfo = {}, gdprConsent = {}, uspConsent} = bidderRequest;
+  const requests = validBidRequests.map(req => {
+    const request = {};
+    request.bidId = req.bidId;
+    request.banner = deepAccess(req, 'mediaTypes.banner');
+    request.auctionId = req.ortb2?.source?.tid;
+    request.transactionId = req.ortb2Imp?.ext?.tid;
+    request.sizes = parseSizesInput(getAdUnitSizes(req));
+    request.schain = req.schain;
+    request.location = {
+      page: refererInfo.page,
+      location: refererInfo.location,
+      domain: refererInfo.domain,
+      whost: window.location.host,
+      ref: refererInfo.ref,
+      isAmp: refererInfo.isAmp
+    };
+    request.device = {
+      ua: navigator.userAgent,
+      lang: navigator.language
+    };
+    request.env = {
+      env: req.params.env,
+      pid: req.params.pid
+    };
+    request.ortb2 = req.ortb2;
+    request.ortb2Imp = req.ortb2Imp;
+    request.tz = new Date().getTimezoneOffset();
+    request.ext = req.params.ext;
+    request.bc = req.bidRequestsCount;
+    request.floor = getBidFloor(req);
+
+    if (req.userIdAsEids && req.userIdAsEids.length !== 0) {
+      request.userEids = req.userIdAsEids;
+    } else {
+      request.userEids = [];
+    }
+    if (gdprConsent.gdprApplies) {
+      request.gdprApplies = Number(gdprConsent.gdprApplies);
+      request.consentString = gdprConsent.consentString;
+    } else {
+      request.gdprApplies = 0;
+      request.consentString = '';
+    }
+    if (uspConsent) {
+      request.usPrivacy = uspConsent;
+    } else {
+      request.usPrivacy = '';
+    }
+    const video = deepAccess(req, 'mediaTypes.video');
+    if (video) {
+      request.sizes = parseSizesInput(deepAccess(req, 'mediaTypes.video.playerSize'));
+      request.video = video;
+    }
+
+    return request;
+  });
+
+  return {
+    method: 'POST',
+    url: endpoint + '/bid',
+    data: JSON.stringify(requests),
+    withCredentials: true,
+    bidderRequest,
+    options: {
+      contentType: 'application/json',
+    }
+  };
+}
+
+export function interpretResponse(serverResponse, {bidderRequest}) {
+  const response = [];
+  if (!isArray(deepAccess(serverResponse, 'body.data'))) {
+    return response;
+  }
+
+  serverResponse.body.data.forEach(serverBid => {
+    const bidIndex = findIndex(bidderRequest.bids, (bidRequest) => {
+      return bidRequest.bidId === serverBid.requestId;
+    });
+
+    if (bidIndex !== -1) {
+      const bid = {
+        requestId: serverBid.requestId,
+        dealId: bidderRequest.dealId || null,
+        ...serverBid
+      };
+      response.push(bid);
+    }
+  });
+
+  return response;
+}
+
+export function getUserSyncs(syncOptions, serverResponses, gdprConsent = {}, uspConsent = '') {
+  const syncs = [];
+  const pixels = deepAccess(serverResponses, '0.body.data.0.ext.pixels');
+
+  if ((syncOptions.iframeEnabled || syncOptions.pixelEnabled) && isArray(pixels) && pixels.length !== 0) {
+    const gdprFlag = `&gdpr=${gdprConsent.gdprApplies ? 1 : 0}`;
+    const gdprString = `&gdpr_consent=${encodeURIComponent((gdprConsent.consentString || ''))}`;
+    const usPrivacy = `us_privacy=${encodeURIComponent(uspConsent)}`;
+
+    pixels.forEach(pixel => {
+      const [type, url] = pixel;
+      const sync = {type, url: `${url}&${usPrivacy}${gdprFlag}${gdprString}`};
+      if (type === 'iframe' && syncOptions.iframeEnabled) {
+        syncs.push(sync)
+      } else if (type === 'image' && syncOptions.pixelEnabled) {
+        syncs.push(sync)
+      }
+    });
+  }
+
+  return syncs;
+}
diff --git a/modules/.submodules.json b/modules/.submodules.json
index fdc79c8b868..6dac11bf0ed 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -4,8 +4,8 @@
       "33acrossIdSystem",
       "admixerIdSystem",
       "adtelligentIdSystem",
+      "adqueryIdSystem",
       "amxIdSystem",
-      "britepoolIdSystem",
       "connectIdSystem",
       "czechAdIdSystem",
       "criteoIdSystem",
@@ -13,9 +13,11 @@
       "deepintentDpesIdSystem",
       "dmdIdSystem",
       "fabrickIdSystem",
+      "freepassIdSystem",
       "hadronIdSystem",
       "id5IdSystem",
       "ftrackIdSystem",
+      "gravitoIdSystem",
       "identityLinkIdSystem",
       "idxIdSystem",
       "imuIdSystem",
@@ -23,63 +25,87 @@
       "justIdSystem",
       "kinessoIdSystem",
       "liveIntentIdSystem",
+      "lmpIdSystem",
+      "lockrAIMIdSystem",
       "lotamePanoramaIdSystem",
       "merkleIdSystem",
       "mwOpenLinkIdSystem",
+      "mygaruIdSystem",
       "naveggIdSystem",
       "netIdSystem",
       "novatiqIdSystem",
       "oneKeyIdSystem",
-      "parrableIdSystem",
+      "operaadsIdSystem",
+      "permutiveIdentityManagerIdSystem",
       "pubProvidedIdSystem",
       "publinkIdSystem",
       "quantcastIdSystem",
+      "rewardedInterestIdSystem",
       "sharedIdSystem",
       "tapadIdSystem",
       "teadsIdSystem",
       "tncIdSystem",
-      "utiqSystem",
+      "utiqIdSystem",
+      "utiqMtpIdSystem",
       "uid2IdSystem",
       "euidIdSystem",
       "unifiedIdSystem",
       "verizonMediaIdSystem",
       "zeotapIdPlusIdSystem",
-      "adqueryIdSystem",
-      "gravitoIdSystem",
-      "freepassIdSystem",
-      "operaadsIdSystem"
+      "yandexIdSystem"
     ],
     "adpod": [
       "freeWheelAdserverVideo",
-      "dfpAdServerVideo"
+      "dfpAdpod"
     ],
     "rtdModule": [
       "1plusXRtdProvider",
+      "51DegreesRtdProvider",
       "a1MediaRtdProvider",
       "aaxBlockmeterRtdProvider",
+      "adagioRtdProvider",
+      "adlooxRtdProvider",
+      "adnuntiusRtdProvider",
       "airgridRtdProvider",
       "akamaiDapRtdProvider",
       "arcspanRtdProvider",
+      "azerionedgeRtdProvider",
       "blueconicRtdProvider",
+      "brandmetricsRtdProvider",
       "browsiRtdProvider",
       "captifyRtdProvider",
+      "mediafilterRtdProvider",
       "confiantRtdProvider",
       "dgkeywordRtdProvider",
+      "experianRtdProvider",
       "geoedgeRtdProvider",
+      "geolocationRtdProvider",
+      "greenbidsRtdProvider",
+      "growthCodeRtdProvider",
       "hadronRtdProvider",
-      "haloRtdProvider",
+      "humansecurityRtdProvider",
       "iasRtdProvider",
+      "idWardRtdProvider",
+      "imRtdProvider",
+      "intersectionRtdProvider",
       "jwplayerRtdProvider",
       "medianetRtdProvider",
       "mgidRtdProvider",
+      "mobianRtdProvider",
+      "neuwoRtdProvider",
       "oneKeyRtdProvider",
       "optimeraRtdProvider",
+      "oxxionRtdProvider",
       "permutiveRtdProvider",
+      "pubxaiRtdProvider",
+      "qortexRtdProvider",
       "reconciliationRtdProvider",
+      "relevadRtdProvider",
       "sirdataRtdProvider",
+      "symitriDapRtdProvider",
       "timeoutRtdProvider",
-      "weboramaRtdProvider", 
-      "zeusPrimeRtdProvider"
+      "weboramaRtdProvider",
+      "wurflRtdProvider"
     ],
     "fpdModule": [
       "validationFpdModule",
@@ -87,7 +113,12 @@
     ],
     "videoModule": [
       "jwplayerVideoProvider",
-      "videojsVideoProvider"
+      "videojsVideoProvider",
+      "adplayerproVideoProvider"
+    ],
+    "paapi": [
+      "paapiForGpt",
+      "topLevelPaapi"
     ]
   }
 }
diff --git a/modules/1plusXRtdProvider.js b/modules/1plusXRtdProvider.js
index c5c4594ff22..88891b14a78 100644
--- a/modules/1plusXRtdProvider.js
+++ b/modules/1plusXRtdProvider.js
@@ -1,5 +1,7 @@
 import { submodule } from '../src/hook.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
 import { ajax } from '../src/ajax.js';
+import { getStorageManager, STORAGE_TYPE_COOKIES, STORAGE_TYPE_LOCALSTORAGE } from '../src/storageManager.js';
 import {
   logMessage, logError,
   deepAccess, deepSetValue, mergeDeep,
@@ -13,6 +15,9 @@ const ORTB2_NAME = '1plusX.com'
 const PAPI_VERSION = 'v1.0';
 const LOG_PREFIX = '[1plusX RTD Module]: ';
 const OPE_FPID = 'ope_fpid'
+
+export const fpidStorage = getStorageManager({ moduleType: MODULE_TYPE_RTD, moduleName: MODULE_NAME });
+
 export const segtaxes = {
   // cf. https://github.com/InteractiveAdvertisingBureau/openrtb/pull/108
   AUDIENCE: 526,
@@ -53,7 +58,19 @@ export const extractConfig = (moduleConfig, reqBidsConfigObj) => {
     throw new Error('No bidRequestConfig bidder found in moduleConfig bidders');
   }
 
-  return { customerId, timeout, bidders };
+  const fpidStorageType = deepAccess(moduleConfig, 'params.fpidStorageType',
+    STORAGE_TYPE_LOCALSTORAGE)
+
+  if (
+    fpidStorageType !== STORAGE_TYPE_COOKIES &&
+    fpidStorageType !== STORAGE_TYPE_LOCALSTORAGE
+  ) {
+    throw new Error(
+      `fpidStorageType must be ${STORAGE_TYPE_LOCALSTORAGE} or ${STORAGE_TYPE_COOKIES}`
+    )
+  }
+
+  return { customerId, timeout, bidders, fpidStorageType };
 }
 
 /**
@@ -81,16 +98,20 @@ export const extractConsent = ({ gdpr }) => {
 }
 
 /**
- * Extracts the OPE first party id field from local storage
+ * Extracts the OPE first party id field
+ * @param {string} fpidStorageType indicates where fpid should be read from
  * @returns fpid string if found, else null
  */
-export const extractFpid = () => {
+export const extractFpid = (fpidStorageType) => {
   try {
-    const fpid = window.localStorage.getItem(OPE_FPID);
-    if (fpid) {
-      return fpid;
+    switch (fpidStorageType) {
+      case STORAGE_TYPE_COOKIES: return fpidStorage.getCookie(OPE_FPID)
+      case STORAGE_TYPE_LOCALSTORAGE: return fpidStorage.getDataFromLocalStorage(OPE_FPID)
+      default: {
+        logError(`Got unknown fpidStorageType ${fpidStorageType}. Aborting...`)
+        return null
+      }
     }
-    return null;
   } catch (error) {
     return null;
   }
@@ -231,10 +252,10 @@ const init = (config, userConsent) => {
 const getBidRequestData = (reqBidsConfigObj, callback, moduleConfig, userConsent) => {
   try {
     // Get the required config
-    const { customerId, bidders } = extractConfig(moduleConfig, reqBidsConfigObj);
+    const { customerId, bidders, fpidStorageType } = extractConfig(moduleConfig, reqBidsConfigObj);
     const { ortb2Fragments: { bidder: biddersOrtb2 } } = reqBidsConfigObj;
     // Get PAPI URL
-    const papiUrl = getPapiUrl(customerId, extractConsent(userConsent) || {}, extractFpid())
+    const papiUrl = getPapiUrl(customerId, extractConsent(userConsent) || {}, extractFpid(fpidStorageType))
     // Call PAPI
     getTargetingDataFromPapi(papiUrl)
       .then((papiResponse) => {
diff --git a/modules/1plusXRtdProvider.md b/modules/1plusXRtdProvider.md
index 6a6211b37cc..c1e5a6f48a4 100644
--- a/modules/1plusXRtdProvider.md
+++ b/modules/1plusXRtdProvider.md
@@ -45,15 +45,16 @@ pbjs.setConfig({
 
 ### Parameters 
 
-| Name              | Type          | Description                                                      | Default           |
-| :---------------- | :------------ | :--------------------------------------------------------------- |:----------------- |
-| name              | String        | Real time data module name                                       | Always '1plusX'   |
-| waitForIt         | Boolean       | Should be `true` if there's an `auctionDelay` defined (optional) | `false`           |
-| params            | Object        |                                                                  |                   |
-| params.customerId | String        | Your 1plusX customer id                                          |                   |
-| params.bidders    | Array | List of bidders for which you would like data to be set          |                   |
-| params.timeout    | Integer       | timeout (ms)                                                     | 1000ms            |
-
+| Name                      | Type          | Description                                                      | Default           |
+| :------------------------ | :------------ | :--------------------------------------------------------------- |:----------------- |
+| name                      | String        | Real time data module name                                       | Always '1plusX'   |
+| waitForIt                 | Boolean       | Should be `true` if there's an `auctionDelay` defined (optional) | `false`           |
+| params                    | Object        |                                                                  |                   |
+| params.customerId         | String        | Your 1plusX customer id                                          |                   |
+| params.bidders            | Array | List of bidders for which you would like data to be set          |                   |
+| params.timeout            | Integer       | timeout (ms)                                                     | 1000ms            |
+| params.fpidStorageType    | String        | Specifies where the 1plusX fpid should be read from. Either      | html5             |
+|                           |               | "html5" (local storage) or "cookie" (first party cookie)         |                   |
 ## Testing 
 
 To view an example of how the 1plusX RTD module works :
diff --git a/modules/33acrossAnalyticsAdapter.js b/modules/33acrossAnalyticsAdapter.js
new file mode 100644
index 00000000000..ec2e669be1a
--- /dev/null
+++ b/modules/33acrossAnalyticsAdapter.js
@@ -0,0 +1,655 @@
+import { deepAccess, logInfo, logWarn, logError, deepClone } from '../src/utils.js';
+import buildAdapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager, { coppaDataHandler, gdprDataHandler, gppDataHandler, uspDataHandler } from '../src/adapterManager.js';
+/**
+ * @typedef {typeof import('../src/constants.js').EVENTS} EVENTS
+ */
+import { EVENTS } from '../src/constants.js';
+import { sendBeacon } from '../src/ajax.js';
+
+/** @typedef {'pending'|'available'|'targetingSet'|'rendered'|'timeout'|'rejected'|'noBid'|'error'} BidStatus */
+/**
+ * @type {Object}
+ */
+const BidStatus = {
+  PENDING: 'pending',
+  AVAILABLE: 'available',
+  TARGETING_SET: 'targetingSet',
+  RENDERED: 'rendered',
+  TIMEOUT: 'timeout',
+  REJECTED: 'rejected',
+  NOBID: 'noBid',
+  ERROR: 'error',
+}
+
+const ANALYTICS_VERSION = '1.0.0';
+const PROVIDER_NAME = '33across';
+const GVLID = 58;
+/** Time to wait for all transactions in an auction to complete before sending the report */
+const DEFAULT_TRANSACTION_TIMEOUT = 10000;
+/** Time to wait after all GAM slots have registered before sending the report */
+export const POST_GAM_TIMEOUT = 500;
+export const DEFAULT_ENDPOINT = 'https://analytics.33across.com/api/v1/event';
+
+export const log = getLogger();
+
+/**
+ * @typedef {Object} AnalyticsReport - Sent when all bids are complete (as determined by `bidWon` and `slotRenderEnded` events)
+ * @property {string} analyticsVersion - Version of the Prebid.js 33Across Analytics Adapter
+ * @property {string} pid - Partner ID
+ * @property {string} src - Source of the report ('pbjs')
+ * @property {string} pbjsVersion - Version of Prebid.js
+ * @property {Auction[]} auctions
+ */
+
+/**
+ * @typedef {Object} AnalyticsCache
+ * @property {string} pid Partner ID
+ * @property {Object} auctions
+ * @property {string} [usPrivacy]
+ */
+
+/**
+ * @typedef {Object} Auction - Parsed auction data
+ * @property {AdUnit[]} adUnits
+ * @property {string} auctionId
+ * @property {string[]} userIds
+ */
+
+/**
+ * @typedef {`${number}x${number}`} AdUnitSize
+ */
+
+/**
+ * @typedef {('banner'|'native'|'video')} AdUnitMediaType
+ */
+
+/**
+ * @typedef {Object} BidResponse
+ * @property {number} cpm
+ * @property {string} cur
+ * @property {number} [cpmOrig]
+ * @property {number} cpmFloor
+ * @property {AdUnitMediaType} mediaType
+ * @property {AdUnitSize} size
+ */
+
+/**
+ * @typedef {Object} Bid - Parsed bid data
+ * @property {string} bidder
+ * @property {string} bidId
+ * @property {string} source
+ * @property {string} status
+ * @property {BidResponse} [bidResponse]
+ * @property {1|0} [hasWon]
+ */
+
+/**
+ * @typedef {Object} AdUnit - Parsed adUnit data
+ * @property {string} transactionId - Primary key for *this* auction/adUnit combination
+ * @property {string} adUnitCode
+ * @property {string} slotId - Equivalent to GPID. (Note that
+ * GPID supports adUnits where multiple units have the same `code` values
+ * by appending a `#UNIQUIFIER`. The value of the UNIQUIFIER is likely to be the div-id,
+ * but, if div-id is randomized / unavailable, may be something else like the media size)
+ * @property {Array} mediaTypes
+ * @property {Array} sizes
+ * @property {Array} bids
+ */
+
+/**
+ * After the first transaction begins, wait until all transactions are complete
+ * before calling `onComplete`. If the timeout is reached before all transactions
+ * are complete, send the report anyway.
+ *
+ * Use this to track all transactions per auction, and send the report as soon
+ * as all adUnits have been won (or after timeout) even if other bid/auction
+ * activity is still happening.
+ */
+class TransactionManager {
+  /**
+   * Milliseconds between activity to allow until this collection automatically completes.
+   * @type {number}
+   */
+  #sendTimeout;
+  #sendTimeoutId;
+  #transactionsPending = new Set();
+  #transactionsCompleted = new Set();
+  #onComplete;
+
+  constructor({ timeout, onComplete }) {
+    this.#sendTimeout = timeout;
+    this.#onComplete = onComplete;
+  }
+
+  status() {
+    return {
+      pending: [...this.#transactionsPending],
+      completed: [...this.#transactionsCompleted],
+    };
+  }
+
+  initiate(transactionId) {
+    this.#transactionsPending.add(transactionId);
+    this.#restartSendTimeout();
+  }
+
+  complete(transactionId) {
+    if (!this.#transactionsPending.has(transactionId)) {
+      log.warn(`transactionId "${transactionId}" was not found. No transaction to mark as complete.`);
+      return;
+    }
+
+    this.#transactionsPending.delete(transactionId);
+    this.#transactionsCompleted.add(transactionId);
+
+    if (this.#transactionsPending.size === 0) {
+      this.#flushTransactions();
+    }
+  }
+
+  #flushTransactions() {
+    this.#clearSendTimeout();
+    this.#transactionsPending = new Set();
+    this.#onComplete();
+  }
+
+  // gulp-eslint is using eslint 6, a version that doesn't support private method syntax
+  // eslint-disable-next-line no-dupe-class-members
+  #clearSendTimeout() {
+    return clearTimeout(this.#sendTimeoutId);
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #restartSendTimeout() {
+    this.#clearSendTimeout();
+
+    this.#sendTimeoutId = setTimeout(() => {
+      if (this.#sendTimeout !== 0) {
+        log.warn(`Timed out waiting for ad transactions to complete. Sending report.`);
+      }
+
+      this.#flushTransactions();
+    }, this.#sendTimeout);
+  }
+}
+
+/**
+ * Initialized during `enableAnalytics`. Exported for testing purposes.
+ */
+export const locals = {
+  /** @type {Object} - one manager per auction */
+  transactionManagers: {},
+  /** @type {AnalyticsCache} */
+  cache: {
+    auctions: {},
+    pid: '',
+  },
+  /** @type {Object} */
+  adUnitMap: {},
+  reset() {
+    this.transactionManagers = {};
+    this.cache = {
+      auctions: {},
+      pid: '',
+    };
+    this.adUnitMap = {};
+  }
+}
+
+/**
+ * @typedef {Object} AnalyticsAdapter
+ * @property {function} track
+ * @property {function} enableAnalytics
+ * @property {function} disableAnalytics
+ * @property {function} [originEnableAnalytics]
+ * @property {function} [originDisableAnalytics]
+ * @property {function} [_oldEnable]
+ */
+
+/**
+ * @type {AnalyticsAdapter}
+ */
+const analyticsAdapter = Object.assign(
+  buildAdapter({ analyticsType: 'endpoint' }),
+  { track: analyticEventHandler }
+);
+
+analyticsAdapter.originEnableAnalytics = analyticsAdapter.enableAnalytics;
+analyticsAdapter.enableAnalytics = enableAnalyticsWrapper;
+
+/**
+ * @typedef {Object} AnalyticsConfig
+ * @property {string} provider - set by pbjs at module registration time
+ * @property {Object} options
+ * @property {string} options.pid - Publisher/Partner ID
+ * @property {string} [options.endpoint=DEFAULT_ENDPOINT] - Endpoint to send analytics data
+ * @property {number} [options.timeout=DEFAULT_TRANSACTION_TIMEOUT] - Timeout for sending analytics data
+ */
+
+/**
+ * @param {AnalyticsConfig} config Analytics module configuration
+ */
+function enableAnalyticsWrapper(config) {
+  const { options } = config;
+
+  const pid = options.pid;
+  if (!pid) {
+    log.error('No partnerId provided for "options.pid". No analytics will be sent.');
+
+    return;
+  }
+
+  const endpoint = calculateEndpoint(options.endpoint);
+  this.getUrl = () => endpoint;
+
+  const timeout = calculateTransactionTimeout(options.timeout);
+  this.getTimeout = () => timeout;
+
+  locals.cache = {
+    pid,
+    auctions: {},
+  };
+
+  window.googletag = window.googletag || { cmd: [] };
+  window.googletag.cmd.push(subscribeToGamSlots);
+
+  analyticsAdapter.originEnableAnalytics(config);
+}
+
+/**
+ * @param {string} [endpoint]
+ * @returns {string}
+ */
+function calculateEndpoint(endpoint = DEFAULT_ENDPOINT) {
+  if (typeof endpoint === 'string' && endpoint.startsWith('http')) {
+    return endpoint;
+  }
+
+  log.info(`Invalid endpoint provided for "options.endpoint". Using default endpoint.`);
+
+  return DEFAULT_ENDPOINT;
+}
+/**
+ * @param {number} [configTimeout]
+ * @returns {number} Transaction Timeout
+ */
+function calculateTransactionTimeout(configTimeout = DEFAULT_TRANSACTION_TIMEOUT) {
+  if (typeof configTimeout === 'number' && configTimeout >= 0) {
+    return configTimeout;
+  }
+
+  log.info(`Invalid timeout provided for "options.timeout". Using default timeout of ${DEFAULT_TRANSACTION_TIMEOUT}ms.`);
+
+  return DEFAULT_TRANSACTION_TIMEOUT;
+}
+
+function subscribeToGamSlots() {
+  window.googletag.pubads().addEventListener('slotRenderEnded', event => {
+    setTimeout(() => {
+      const { transactionId, auctionId } =
+          getAdUnitMetadata(event.slot.getAdUnitPath(), event.slot.getSlotElementId());
+      if (!transactionId || !auctionId) {
+        const slotName = `${event.slot.getAdUnitPath()} - ${event.slot.getSlotElementId()}`;
+        log.warn('Could not find configured ad unit matching GAM render of slot:', { slotName });
+        return;
+      }
+
+      locals.transactionManagers[auctionId] &&
+        locals.transactionManagers[auctionId].complete(transactionId);
+    }, POST_GAM_TIMEOUT);
+  });
+}
+
+function getAdUnitMetadata(adUnitPath, adSlotElementId) {
+  const adUnitMeta = locals.adUnitMap[adUnitPath] || locals.adUnitMap[adSlotElementId];
+  if (adUnitMeta && adUnitMeta.length > 0) {
+    return adUnitMeta[adUnitMeta.length - 1];
+  }
+  return {};
+}
+
+/** necessary for testing */
+analyticsAdapter.originDisableAnalytics = analyticsAdapter.disableAnalytics;
+analyticsAdapter.disableAnalytics = function () {
+  analyticsAdapter._oldEnable = enableAnalyticsWrapper;
+  locals.reset();
+  analyticsAdapter.originDisableAnalytics();
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: analyticsAdapter,
+  code: PROVIDER_NAME,
+  gvlid: GVLID,
+});
+
+export default analyticsAdapter;
+
+/**
+ * @param {AnalyticsCache} analyticsCache
+ * @param {string} completedAuctionId value of auctionId
+ * @return {AnalyticsReport} Analytics report
+ */
+function createReportFromCache(analyticsCache, completedAuctionId) {
+  const { pid, auctions } = analyticsCache;
+
+  const report = {
+    pid,
+    src: 'pbjs',
+    analyticsVersion: ANALYTICS_VERSION,
+    pbjsVersion: '$prebid.version$', // Replaced by build script
+    auctions: [ auctions[completedAuctionId] ],
+  }
+  if (uspDataHandler.getConsentData()) {
+    report.usPrivacy = uspDataHandler.getConsentData();
+  }
+
+  if (gdprDataHandler.getConsentData()) {
+    report.gdpr = Number(Boolean(gdprDataHandler.getConsentData().gdprApplies));
+    report.gdprConsent = gdprDataHandler.getConsentData().consentString || '';
+  }
+
+  if (gppDataHandler.getConsentData()) {
+    report.gpp = gppDataHandler.getConsentData().gppString;
+    report.gppSid = gppDataHandler.getConsentData().applicableSections;
+  }
+
+  if (coppaDataHandler.getCoppa()) {
+    report.coppa = Number(coppaDataHandler.getCoppa());
+  }
+
+  return report;
+}
+
+function getCachedBid(auctionId, bidId) {
+  const auction = locals.cache.auctions[auctionId];
+  for (let adUnit of auction.adUnits) {
+    for (let bid of adUnit.bids) {
+      if (bid.bidId === bidId) {
+        return bid;
+      }
+    }
+  }
+  log.error(`Cannot find bid "${bidId}" in auction "${auctionId}".`);
+};
+
+/**
+ * @param {Object} args
+ * @param {Object} args.args Event data
+ * @param {EVENTS[keyof EVENTS]} args.eventType
+ */
+function analyticEventHandler({ eventType, args }) {
+  if (!locals.cache) {
+    log.error('Something went wrong. Analytics cache is not initialized.');
+    return;
+  }
+
+  switch (eventType) {
+    case EVENTS.AUCTION_INIT:
+      onAuctionInit(args);
+      break;
+    case EVENTS.BID_REQUESTED: // BidStatus.PENDING
+      onBidRequested(args);
+      break;
+    case EVENTS.BID_TIMEOUT:
+      for (let bid of args) {
+        setCachedBidStatus(bid.auctionId, bid.bidId, BidStatus.TIMEOUT);
+      }
+      break;
+    case EVENTS.BID_RESPONSE:
+      onBidResponse(args);
+      break;
+    case EVENTS.BID_REJECTED:
+      onBidRejected(args);
+      break;
+    case EVENTS.NO_BID:
+    case EVENTS.SEAT_NON_BID:
+      setCachedBidStatus(args.auctionId, args.bidId, BidStatus.NOBID);
+      break;
+    case EVENTS.BIDDER_ERROR:
+      if (args.bidderRequest && args.bidderRequest.bids) {
+        for (let bid of args.bidderRequest.bids) {
+          setCachedBidStatus(args.bidderRequest.auctionId, bid.bidId, BidStatus.ERROR);
+        }
+      }
+      break;
+    case EVENTS.AUCTION_END:
+      onAuctionEnd(args);
+      break;
+    case EVENTS.BID_WON: // BidStatus.TARGETING_SET | BidStatus.RENDERED | BidStatus.ERROR
+      onBidWon(args);
+      break;
+    default:
+      break;
+  }
+}
+
+/****************
+ * AUCTION_INIT *
+ ***************/
+function onAuctionInit({ adUnits, auctionId, bidderRequests }) {
+  if (typeof auctionId !== 'string' || !Array.isArray(bidderRequests)) {
+    log.error('Analytics adapter failed to parse auction.');
+    return;
+  }
+
+  locals.cache.auctions[auctionId] = {
+    auctionId,
+    adUnits: adUnits.map(au => {
+      setAdUnitMap(au.code, auctionId, au.transactionId);
+
+      return {
+        transactionId: au.transactionId,
+        adUnitCode: au.code,
+        // Note: GPID supports adUnits that have matching `code` values by appending a `#UNIQUIFIER`.
+        // The value of the UNIQUIFIER is likely to be the div-id,
+        // but, if div-id is randomized / unavailable, may be something else like the media size)
+        slotId: deepAccess(au, 'ortb2Imp.ext.gpid') || deepAccess(au, 'ortb2Imp.ext.data.pbadslot', au.code),
+        mediaTypes: Object.keys(au.mediaTypes),
+        sizes: au.sizes.map(size => size.join('x')),
+        bids: [],
+      }
+    }),
+    userIds: Object.keys(deepAccess(bidderRequests, '0.bids.0.userId', {})),
+  };
+
+  locals.transactionManagers[auctionId] ||=
+    new TransactionManager({
+      timeout: analyticsAdapter.getTimeout(),
+      onComplete() {
+        sendReport(
+          createReportFromCache(locals.cache, auctionId),
+          analyticsAdapter.getUrl()
+        );
+        delete locals.transactionManagers[auctionId];
+      }
+    });
+}
+
+function setAdUnitMap(adUnitCode, auctionId, transactionId) {
+  if (!locals.adUnitMap[adUnitCode]) {
+    locals.adUnitMap[adUnitCode] = [];
+  }
+
+  locals.adUnitMap[adUnitCode].push({ auctionId, transactionId });
+}
+
+/*****************
+ * BID_REQUESTED *
+ ****************/
+function onBidRequested({ auctionId, bids }) {
+  for (let { bidder, bidId, transactionId, src } of bids) {
+    const auction = locals.cache.auctions[auctionId];
+    const adUnit = auction.adUnits.find(adUnit => adUnit.transactionId === transactionId);
+    if (!adUnit) return;
+    adUnit.bids.push({
+      bidder,
+      bidId,
+      status: BidStatus.PENDING,
+      hasWon: 0,
+      source: src,
+    });
+
+    // if there is no manager for this auction, then the auction has already been completed
+    locals.transactionManagers[auctionId] &&
+      locals.transactionManagers[auctionId].initiate(transactionId);
+  }
+}
+
+/****************
+ * BID_RESPONSE *
+ ***************/
+function onBidResponse({ requestId, auctionId, cpm, currency, originalCpm, floorData, mediaType, size, status, source }) {
+  const bid = getCachedBid(auctionId, requestId);
+  if (!bid) return;
+
+  setBidStatus(bid, status);
+  Object.assign(bid,
+    {
+      bidResponse: {
+        cpm,
+        cur: currency,
+        cpmOrig: originalCpm,
+        cpmFloor: floorData?.floorValue,
+        mediaType,
+        size
+      },
+      source
+    }
+  );
+}
+
+/****************
+ * BID_REJECTED *
+ ***************/
+function onBidRejected({ requestId, auctionId, cpm, currency, originalCpm, floorData, mediaType, width, height, source }) {
+  const bid = getCachedBid(auctionId, requestId);
+  if (!bid) return;
+
+  setBidStatus(bid, BidStatus.REJECTED);
+  Object.assign(bid,
+    {
+      bidResponse: {
+        cpm,
+        cur: currency,
+        cpmOrig: originalCpm,
+        cpmFloor: floorData?.floorValue,
+        mediaType,
+        size: `${width}x${height}`
+      },
+      source
+    }
+  );
+}
+
+/***************
+ * AUCTION_END *
+ **************/
+/**
+ * @param {Object} args
+ * @param {{requestId: string, status: string}[]} args.bidsReceived
+ * @param {string} args.auctionId
+ * @returns {void}
+ */
+function onAuctionEnd({ bidsReceived, auctionId }) {
+  for (let bid of bidsReceived) {
+    setCachedBidStatus(auctionId, bid.requestId, bid.status);
+  }
+}
+
+/***********
+ * BID_WON *
+ **********/
+function onBidWon(bidWon) {
+  const { auctionId, requestId, transactionId } = bidWon;
+  const bid = getCachedBid(auctionId, requestId);
+  if (!bid) {
+    return;
+  }
+
+  setBidStatus(bid, bidWon.status ?? BidStatus.ERROR);
+
+  locals.transactionManagers[auctionId] &&
+    locals.transactionManagers[auctionId].complete(transactionId);
+}
+
+/**
+ * @param {Bid} bid
+ * @param {BidStatus} [status]
+ * @returns {void}
+ */
+function setBidStatus(bid, status = BidStatus.AVAILABLE) {
+  const statusStates = {
+    pending: {
+      next: [BidStatus.AVAILABLE, BidStatus.TARGETING_SET, BidStatus.RENDERED, BidStatus.TIMEOUT, BidStatus.REJECTED, BidStatus.NOBID, BidStatus.ERROR],
+    },
+    available: {
+      next: [BidStatus.TARGETING_SET, BidStatus.RENDERED, BidStatus.TIMEOUT, BidStatus.REJECTED, BidStatus.NOBID, BidStatus.ERROR],
+    },
+    targetingSet: {
+      next: [BidStatus.RENDERED, BidStatus.ERROR, BidStatus.TIMEOUT],
+    },
+    rendered: {
+      next: [],
+    },
+    timeout: {
+      next: [],
+    },
+    rejected: {
+      next: [],
+    },
+    noBid: {
+      next: [],
+    },
+    error: {
+      next: [BidStatus.TARGETING_SET, BidStatus.RENDERED, BidStatus.TIMEOUT, BidStatus.REJECTED, BidStatus.NOBID, BidStatus.ERROR],
+    },
+  }
+
+  const winningStatuses = [BidStatus.RENDERED];
+
+  if (statusStates[bid.status].next.includes(status)) {
+    bid.status = status;
+    if (winningStatuses.includes(status)) {
+      // occassionally we can detect a bidWon before prebid reports it as such
+      bid.hasWon = 1;
+    }
+  }
+}
+
+function setCachedBidStatus(auctionId, bidId, status) {
+  const bid = getCachedBid(auctionId, bidId);
+  if (!bid) return;
+  setBidStatus(bid, status);
+}
+
+/**
+ * Guarantees sending of data without waiting for response, even after page is left/closed
+ *
+ * @param {AnalyticsReport} report Request payload
+ * @param {string} endpoint URL
+ */
+function sendReport(report, endpoint) {
+  if (sendBeacon(endpoint, JSON.stringify(report))) {
+    log.info(`Analytics report sent to ${endpoint}`, report);
+
+    return;
+  }
+
+  log.error('Analytics report exceeded User-Agent data limits and was not sent.', report);
+}
+
+/**
+ * Encapsulate certain logger functions and add a prefix to the final messages.
+ *
+ * @return {Object} New logger functions
+ */
+function getLogger() {
+  const LPREFIX = `${PROVIDER_NAME} Analytics: `;
+
+  return {
+    info: (msg, ...args) => logInfo(`${LPREFIX}${msg}`, ...deepClone(args)),
+    warn: (msg, ...args) => logWarn(`${LPREFIX}${msg}`, ...deepClone(args)),
+    error: (msg, ...args) => logError(`${LPREFIX}${msg}`, ...deepClone(args)),
+  }
+}
diff --git a/modules/33acrossAnalyticsAdapter.md b/modules/33acrossAnalyticsAdapter.md
new file mode 100644
index 00000000000..d093434dc97
--- /dev/null
+++ b/modules/33acrossAnalyticsAdapter.md
@@ -0,0 +1,76 @@
+# Overview
+
+```txt
+Module Name: 33Across Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer:  analytics_support@33across.com
+```
+
+#### About
+
+This analytics adapter collects data about the performance of your ad slots
+for each auction run on your site. It also provides insight into how identifiers
+from the
+[33Across User ID Sub-module](https://docs.prebid.org/dev-docs/modules/userid-submodules/33across.html)
+and other user ID sub-modules improve your monetization. The data is sent at
+the earliest opportunity for each auction to provide a more complete picture of
+your ad performance.
+
+The analytics adapter is free to use!
+However, the publisher must work with our account management team to obtain a
+Publisher/Partner ID (PID) and enable Analytics for their account.
+To get a PID and to have the publisher account enabled for Analytics,
+you can reach out to our team at the following email - analytics_support@33across.com
+
+If you are an existing publisher and you already use a 33Across PID,
+you can reach out to analytics_support@33across.com
+to have your account enabled for analytics.
+
+The 33Across privacy policy is at .
+
+#### Analytics Options
+
+| Name      | Scope    | Example | Type     | Description |
+|-----------|----------|---------|----------|-------------|
+| `pid`     | required | abc123  | `string` | 33Across Publisher ID |
+| `timeout` | optional | 10000   | `int`    | Milliseconds to wait after last seen auction transaction before sending report (default 10000). |
+
+#### Configuration
+
+The data is sent at the earliest opportunity for each auction to provide
+a more complete picture of your ad performance, even if the auction is interrupted
+by a page navigation. At the latest, the adapter will always send the report
+when the page is unloaded, at the end of the auction, or after the timeout,
+whichever comes first.
+
+In order to guarantee consistent reports of your ad slot behavior, we recommend
+including the GPT Pre-Auction Module, `gptPreAuction`. This module is included
+by default when Prebid is downloaded. If you are compiling from source,
+this might look something like:
+
+```sh
+gulp bundle --modules=gptPreAuction,consentManagementTcf,consentManagementGpp,consentManagementUsp,tcfControl,33acrossBidAdapter,33acrossIdSystem,33acrossAnalyticsAdapter
+```
+
+Enable the 33Across Analytics Adapter in Prebid.js using the analytics provider `33across`
+and options as seen in the example below.
+
+#### Example Configuration
+
+```js
+pbjs.enableAnalytics({
+    provider: '33across',
+    options: {
+        /**
+         * The 33Across Publisher ID.
+         */
+        pid: 'abc123',
+        /** 
+         * Timeout in milliseconds after which an auction report 
+         * will be sent regardless of auction state.
+         * [optional]
+         */
+        timeout: 10000
+    }
+});
+```
diff --git a/modules/33acrossBidAdapter.js b/modules/33acrossBidAdapter.js
index 0e9beb22013..555d9c8a291 100644
--- a/modules/33acrossBidAdapter.js
+++ b/modules/33acrossBidAdapter.js
@@ -15,7 +15,7 @@ import {
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {isSlotMatchingAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
 
-// **************************** UTILS *************************** //
+// **************************** UTILS ************************** //
 const BIDDER_CODE = '33across';
 const BIDDER_ALIASES = ['33across_mgni'];
 const END_POINT = 'https://ssc.33across.com/api/v1/hb';
@@ -36,6 +36,7 @@ const VIDEO_ORTB_PARAMS = [
   'minduration',
   'maxduration',
   'placement',
+  'plcmt',
   'protocols',
   'startdelay',
   'skip',
@@ -72,9 +73,7 @@ function isBidRequestValid(bid) {
 }
 
 function _validateBasic(bid) {
-  const invalidBidderName = bid.bidder !== BIDDER_CODE && !BIDDER_ALIASES.includes(bid.bidder);
-
-  if (invalidBidderName || !bid.params) {
+  if (!bid.params) {
     return false;
   }
 
@@ -140,10 +139,10 @@ function _validateVideo(bid) {
   }
 
   // If placement if defined, it must be a number
-  if (
-    typeof videoParams.placement !== 'undefined' &&
-    typeof videoParams.placement !== 'number'
-  ) {
+  if ([ videoParams.placement, videoParams.plcmt ].some(value => (
+    typeof value !== 'undefined' &&
+    typeof value !== 'number'
+  ))) {
     return false;
   }
 
@@ -490,12 +489,24 @@ function _buildVideoORTB(bidRequest) {
 
   // Placement Inference Rules:
   // - If no placement is defined then default to 2 (In Banner)
-  // - If product is instream (for instream context) then override placement to 1
-  video.placement = video.placement || 2;
+  // - If the old deprecated field is defined, use its value for the recent placement field
+
+  const calculatePlacementValue = () => {
+    const IN_BANNER_PLACEMENT_VALUE = 2;
+
+    if (video.placement) {
+      logWarn('[33Across Adapter] The ORTB field `placement` is deprecated, please use `plcmt` instead');
+
+      return video.placement;
+    }
+
+    return IN_BANNER_PLACEMENT_VALUE;
+  }
+
+  video.plcmt ??= calculatePlacementValue();
 
   if (product === PRODUCT.INSTREAM) {
     video.startdelay = video.startdelay || 0;
-    video.placement = 1;
   }
 
   // bidfloors
@@ -524,7 +535,7 @@ function _getBidFloors(bidRequest, size, mediaType) {
     size: [ size.w, size.h ]
   });
 
-  if (!isNaN(bidFloors.floor) && (bidFloors.currency === CURRENCY)) {
+  if (!isNaN(bidFloors?.floor) && (bidFloors?.currency === CURRENCY)) {
     return bidFloors.floor;
   }
 }
diff --git a/modules/33acrossIdSystem.js b/modules/33acrossIdSystem.js
index 0f370237e21..8f99846017a 100644
--- a/modules/33acrossIdSystem.js
+++ b/modules/33acrossIdSystem.js
@@ -5,44 +5,68 @@
  * @requires module:modules/userId
  */
 
-import { logMessage, logError } from '../src/utils.js';
+import { logMessage, logError, logWarn } from '../src/utils.js';
 import { ajaxBuilder } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import { uspDataHandler, coppaDataHandler, gppDataHandler } from '../src/adapterManager.js';
+import { getStorageManager, STORAGE_TYPE_COOKIES, STORAGE_TYPE_LOCALSTORAGE } from '../src/storageManager.js';
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+import { domainOverrideToRootDomain } from '../libraries/domainOverrideToRootDomain/index.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
 
 const MODULE_NAME = '33acrossId';
 const API_URL = 'https://lexicon.33across.com/v1/envelope';
 const AJAX_TIMEOUT = 10000;
 const CALLER_NAME = 'pbjs';
+const GVLID = 58;
+
+const STORAGE_FPID_KEY = '33acrossIdFp';
+const STORAGE_TPID_KEY = '33acrossIdTp';
+const DEFAULT_1PID_SUPPORT = true;
+const DEFAULT_TPID_SUPPORT = true;
+
+export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME });
 
-function getEnvelope(response) {
+export const domainUtils = {
+  domainOverride: domainOverrideToRootDomain(storage, MODULE_NAME)
+};
+
+function calculateResponseObj(response) {
   if (!response.succeeded) {
     if (response.error == 'Cookied User') {
       logMessage(`${MODULE_NAME}: Unsuccessful response`.concat(' ', response.error));
     } else {
       logError(`${MODULE_NAME}: Unsuccessful response`.concat(' ', response.error));
     }
-    return;
+    return {};
   }
 
   if (!response.data.envelope) {
     logMessage(`${MODULE_NAME}: No envelope was received`);
 
-    return;
+    return {};
   }
 
-  return response.data.envelope;
+  return {
+    envelope: response.data.envelope,
+    fp: response.data.fp,
+    tp: response.data.tp
+  };
 }
 
-function calculateQueryStringParams(pid, gdprConsentData) {
+function calculateQueryStringParams(pid, gdprConsentData, enabledStorageTypes) {
   const uspString = uspDataHandler.getConsentData();
-  const gdprApplies = Boolean(gdprConsentData?.gdprApplies);
   const coppaValue = coppaDataHandler.getCoppa();
   const gppConsent = gppDataHandler.getConsentData();
 
   const params = {
     pid,
-    gdpr: Number(gdprApplies),
+    gdpr: 0,
     src: CALLER_NAME,
     ver: '$prebid.version$',
     coppa: Number(coppaValue)
@@ -63,9 +87,64 @@ function calculateQueryStringParams(pid, gdprConsentData) {
     params.gdpr_consent = gdprConsentData.consentString;
   }
 
+  const fp = getStoredValue(STORAGE_FPID_KEY, enabledStorageTypes);
+  if (fp) {
+    params.fp = encodeURIComponent(fp);
+  }
+
+  const tp = getStoredValue(STORAGE_TPID_KEY, enabledStorageTypes);
+  if (tp) {
+    params.tp = encodeURIComponent(tp);
+  }
+
   return params;
 }
 
+function deleteFromStorage(key) {
+  if (storage.cookiesAreEnabled()) {
+    const expiredDate = new Date(0).toUTCString();
+
+    storage.setCookie(key, '', expiredDate, 'Lax', domainUtils.domainOverride());
+  }
+
+  storage.removeDataFromLocalStorage(key);
+}
+
+function storeValue(key, value, { enabledStorageTypes, expires }) {
+  enabledStorageTypes.forEach(storageType => {
+    if (storageType === STORAGE_TYPE_COOKIES) {
+      const expirationInMs = 60 * 60 * 24 * 1000 * expires;
+      const expirationTime = new Date(Date.now() + expirationInMs);
+
+      storage.setCookie(key, value, expirationTime.toUTCString(), 'Lax', domainUtils.domainOverride());
+    } else if (storageType === STORAGE_TYPE_LOCALSTORAGE) {
+      storage.setDataInLocalStorage(key, value);
+    }
+  });
+}
+
+function getStoredValue(key, enabledStorageTypes) {
+  let storedValue;
+
+  enabledStorageTypes.find(storageType => {
+    if (storageType === STORAGE_TYPE_COOKIES) {
+      storedValue = storage.getCookie(key);
+    } else if (storageType === STORAGE_TYPE_LOCALSTORAGE) {
+      storedValue = storage.getDataFromLocalStorage(key);
+    }
+
+    return !!storedValue;
+  });
+
+  return storedValue;
+}
+
+function handleSupplementalId(key, id, storageConfig) {
+  id
+    ? storeValue(key, id, storageConfig)
+    : deleteFromStorage(key);
+}
+
 /** @type {Submodule} */
 export const thirthyThreeAcrossIdSubmodule = {
   /**
@@ -74,7 +153,7 @@ export const thirthyThreeAcrossIdSubmodule = {
    */
   name: MODULE_NAME,
 
-  gvlid: 58,
+  gvlid: GVLID,
 
   /**
    * decode the stored id value for passing to bid requests
@@ -96,37 +175,66 @@ export const thirthyThreeAcrossIdSubmodule = {
    * @param {SubmoduleConfig} [config]
    * @returns {IdResponse|undefined}
    */
-  getId({ params = { } }, gdprConsentData) {
+  getId({ params = { }, enabledStorageTypes = [], storage: storageConfig = {} }, gdprConsentData) {
     if (typeof params.pid !== 'string') {
       logError(`${MODULE_NAME}: Submodule requires a partner ID to be defined`);
 
       return;
     }
 
-    const { pid, apiUrl = API_URL } = params;
+    if (gdprConsentData?.gdprApplies === true) {
+      logWarn(`${MODULE_NAME}: Submodule cannot be used where GDPR applies`);
+
+      return;
+    }
+
+    const { pid, storeFpid = DEFAULT_1PID_SUPPORT, storeTpid = DEFAULT_TPID_SUPPORT, apiUrl = API_URL } = params;
 
     return {
       callback(cb) {
         ajaxBuilder(AJAX_TIMEOUT)(apiUrl, {
           success(response) {
-            let envelope;
+            let responseObj = { };
 
             try {
-              envelope = getEnvelope(JSON.parse(response))
+              responseObj = calculateResponseObj(JSON.parse(response));
             } catch (err) {
               logError(`${MODULE_NAME}: ID reading error:`, err);
             }
-            cb(envelope);
+
+            if (!responseObj.envelope) {
+              deleteFromStorage(MODULE_NAME);
+            }
+
+            if (storeFpid) {
+              handleSupplementalId(STORAGE_FPID_KEY, responseObj.fp, {
+                enabledStorageTypes,
+                expires: storageConfig.expires
+              });
+            }
+
+            if (storeTpid) {
+              handleSupplementalId(STORAGE_TPID_KEY, responseObj.tp, {
+                enabledStorageTypes,
+                expires: storageConfig.expires
+              });
+            }
+
+            cb(responseObj.envelope);
           },
           error(err) {
             logError(`${MODULE_NAME}: ID error response`, err);
 
             cb();
           }
-        }, calculateQueryStringParams(pid, gdprConsentData), { method: 'GET', withCredentials: true });
+        }, calculateQueryStringParams(pid, gdprConsentData, enabledStorageTypes), {
+          method: 'GET',
+          withCredentials: true
+        });
       }
     };
   },
+  domainOverride: domainUtils.domainOverride,
   eids: {
     '33acrossId': {
       source: '33across.com',
diff --git a/modules/33acrossIdSystem.md b/modules/33acrossIdSystem.md
index 1e4af89344f..e983c8ab871 100644
--- a/modules/33acrossIdSystem.md
+++ b/modules/33acrossIdSystem.md
@@ -14,8 +14,8 @@ pbjs.setConfig({
         name: "33acrossId",
         storage: {
           name: "33acrossId",
-          type: "html5",
-          expires: 90,
+          type: "cookie&html5",
+          expires: 30,
           refreshInSeconds: 8*3600
         },
         params: {
@@ -40,8 +40,8 @@ The following settings are available for the `storage` property in the `userSync
 | Param name | Scope | Type | Description | Example   |
 | --- | --- | --- | --- | --- |
 | name | Required | String| Name of the cookie or HTML5 local storage where the user ID will be stored | `"33acrossId"` |
-| type | Required | String | `"html5"` (preferred)  or `"cookie"` | `"html5"` |
-| expires | Strongly Recommended | Number | How long (in days) the user ID information will be stored. 33Across recommends `90`. | `90` |
+| type | Required | String | `"cookie&html5"` (preferred)  or `"cookie"` or `"html5"` | `"cookie&html5"` |
+| expires | Strongly Recommended | Number | How long (in days) the user ID information will be stored. 33Across recommends `30`. | `30` |
 | refreshInSeconds | Strongly Recommended | Number | The interval (in seconds) for refreshing the user ID. 33Across recommends no more than 8 hours between refreshes. | `8*3600` |
 
 ### Params
@@ -51,3 +51,5 @@ The following settings are available in the `params` property in `userSync.userI
 | Param name | Scope | Type | Description | Example |
 | --- | --- | --- | --- | --- |
 | pid | Required | String | Partner ID provided by 33Across | `"0010b00002GYU4eBAH"` |
+| storeFpid | Optional | Boolean | Indicates whether a supplemental first-party ID may be stored to improve addressability, this feature is enabled by default | `true` (default) or `false` |
+| storeTpid | Optional | Boolean | Indicates whether a supplemental third-party ID may be stored to improve addressability, this feature is enabled by default | `true` (default) or `false` |
diff --git a/modules/51DegreesRtdProvider.js b/modules/51DegreesRtdProvider.js
new file mode 100644
index 00000000000..8251fd76e28
--- /dev/null
+++ b/modules/51DegreesRtdProvider.js
@@ -0,0 +1,335 @@
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+import {loadExternalScript} from '../src/adloader.js';
+import {submodule} from '../src/hook.js';
+import {
+  deepAccess,
+  deepSetValue,
+  formatQS,
+  mergeDeep,
+  prefixLog,
+} from '../src/utils.js';
+
+const MODULE_NAME = '51Degrees';
+export const LOG_PREFIX = `[${MODULE_NAME} RTD Submodule]:`;
+const {logMessage, logWarn, logError} = prefixLog(LOG_PREFIX);
+
+// ORTB device types
+const ORTB_DEVICE_TYPE = {
+  UNKNOWN: 0,
+  MOBILE_TABLET: 1,
+  PERSONAL_COMPUTER: 2,
+  CONNECTED_TV: 3,
+  PHONE: 4,
+  TABLET: 5,
+  CONNECTED_DEVICE: 6,
+  SET_TOP_BOX: 7,
+  OOH_DEVICE: 8
+};
+
+// Map of 51Degrees device types to ORTB device types. See
+// https://51degrees.com/developers/property-dictionary?item=Device%7CDevice
+// for available properties and values.
+const ORTB_DEVICE_TYPE_MAP = new Map([
+  ['Phone', ORTB_DEVICE_TYPE.PHONE],
+  ['Console', ORTB_DEVICE_TYPE.SET_TOP_BOX],
+  ['Desktop', ORTB_DEVICE_TYPE.PERSONAL_COMPUTER],
+  ['EReader', ORTB_DEVICE_TYPE.PERSONAL_COMPUTER],
+  ['IoT', ORTB_DEVICE_TYPE.CONNECTED_DEVICE],
+  ['Kiosk', ORTB_DEVICE_TYPE.OOH_DEVICE],
+  ['MediaHub', ORTB_DEVICE_TYPE.SET_TOP_BOX],
+  ['Mobile', ORTB_DEVICE_TYPE.MOBILE_TABLET],
+  ['Router', ORTB_DEVICE_TYPE.CONNECTED_DEVICE],
+  ['SmallScreen', ORTB_DEVICE_TYPE.CONNECTED_DEVICE],
+  ['SmartPhone', ORTB_DEVICE_TYPE.MOBILE_TABLET],
+  ['SmartSpeaker', ORTB_DEVICE_TYPE.CONNECTED_DEVICE],
+  ['SmartWatch', ORTB_DEVICE_TYPE.CONNECTED_DEVICE],
+  ['Tablet', ORTB_DEVICE_TYPE.TABLET],
+  ['Tv', ORTB_DEVICE_TYPE.CONNECTED_TV],
+  ['Vehicle Display', ORTB_DEVICE_TYPE.PERSONAL_COMPUTER]
+]);
+
+/**
+ * Extracts the parameters for 51Degrees RTD module from the config object passed at instantiation
+ * @param {Object} moduleConfig Configuration object of the 51Degrees RTD module
+ * @param {Object} reqBidsConfigObj Configuration object for the bidders, currently not used
+ */
+export const extractConfig = (moduleConfig, reqBidsConfigObj) => {
+  // Resource key
+  let resourceKey = deepAccess(moduleConfig, 'params.resourceKey');
+  // On-premise JS URL
+  let onPremiseJSUrl = deepAccess(moduleConfig, 'params.onPremiseJSUrl');
+
+  // Trim the values
+  if (typeof resourceKey === 'string') {
+    resourceKey = resourceKey.trim();
+  }
+  if (typeof onPremiseJSUrl === 'string') {
+    onPremiseJSUrl = onPremiseJSUrl.trim();
+  }
+
+  // If this module is configured via a 3rd party wrapper, both form inputs
+  // might be mandatory. To handle this, 0 can be used as a value to skip
+  // the parameter.
+  if (typeof resourceKey === 'string' && resourceKey.trim() === '0') {
+    resourceKey = undefined;
+  }
+  if (typeof onPremiseJSUrl === 'string' && onPremiseJSUrl.trim() === '0') {
+    onPremiseJSUrl = undefined;
+  }
+
+  // Verify that onPremiseJSUrl is a valid URL: either a full URL, relative
+  // path (/path/to/file.js), or a protocol-relative URL (//example.com/path/to/file.js)
+  if (typeof onPremiseJSUrl === 'string' && onPremiseJSUrl.length && !(
+    onPremiseJSUrl.startsWith('https://') ||
+    onPremiseJSUrl.startsWith('http://') ||
+    onPremiseJSUrl.startsWith('/'))
+  ) {
+    throw new Error(LOG_PREFIX + ' Invalid URL format for onPremiseJSUrl in moduleConfig');
+  }
+
+  // Verify that one of the parameters is provided,
+  // but not both at the same time
+  if (!resourceKey && !onPremiseJSUrl) {
+    throw new Error(LOG_PREFIX + ' Missing parameter resourceKey or onPremiseJSUrl in moduleConfig');
+  } else if (resourceKey && onPremiseJSUrl) {
+    throw new Error(LOG_PREFIX + ' Only one of resourceKey or onPremiseJSUrl should be provided in moduleConfig');
+  }
+
+  // Verify that the resource key is not the one provided as an example
+  if (resourceKey === '') {
+    throw new Error(LOG_PREFIX + ' replace  in configuration with a resource key obtained from https://configure.51degrees.com/HNZ75HT1');
+  }
+
+  return {resourceKey, onPremiseJSUrl};
+}
+
+/**
+ * Gets 51Degrees JS URL
+ * @param {Object} pathData API path data
+ * @param {string} [pathData.resourceKey] Resource key
+ * @param {string} [pathData.onPremiseJSUrl] On-premise JS URL
+ * @param {Object} [pathData.hev] High entropy values
+ * @param {Window} [win] Window object (mainly for testing)
+ * @returns {string} 51Degrees JS URL
+ */
+export const get51DegreesJSURL = (pathData, win) => {
+  const _window = win || window;
+  const baseURL = pathData.onPremiseJSUrl || `https://cloud.51degrees.com/api/v4/${pathData.resourceKey}.js`;
+
+  const queryPrefix = baseURL.includes('?') ? '&' : '?';
+  const qs = {};
+
+  deepSetNotEmptyValue(
+    qs,
+    '51D_GetHighEntropyValues',
+    pathData.hev && Object.keys(pathData.hev).length ? btoa(JSON.stringify(pathData.hev)) : null,
+  );
+  deepSetNotEmptyValue(qs, '51D_ScreenPixelsHeight', _window?.screen?.height);
+  deepSetNotEmptyValue(qs, '51D_ScreenPixelsWidth', _window?.screen?.width);
+  deepSetNotEmptyValue(qs, '51D_PixelRatio', _window?.devicePixelRatio);
+
+  const _qs = formatQS(qs);
+  const _qsString = _qs ? `${queryPrefix}${_qs}` : '';
+
+  return `${baseURL}${_qsString}`;
+}
+
+/**
+ * Retrieves high entropy values from `navigator.userAgentData` if available
+ *
+ * @param {Array} hints - An array of hints indicating which high entropy values to retrieve
+ * @returns {Promise>} A promise that resolves to an object containing high entropy values if supported, or `undefined` if not
+ */
+export const getHighEntropyValues = async (hints) => {
+  return navigator?.userAgentData?.getHighEntropyValues?.(hints);
+};
+
+/**
+ * Check if meta[http-equiv="Delegate-CH"] tag is present in the document head and points to 51Degrees cloud
+ *
+ * The way to delegate processing User-Agent Client Hints to a 3rd party is either
+ * via setting Permissions-Policy + Accept-CH response headers or Delegate-CH meta-http equiv.
+ * Of those two, Delegate-CH meta http-equiv is an easier and more performant option
+ * (client hints are sent on the very first request without a round trip required).
+ * Using the getHighEntropyValues() API is an alternative;
+ * however, Google is likely to restrict it as part of the Privacy Sandbox in future
+ * versions of Chrome, so we want to be future-proof and transparent here.
+ * Hence, a check that would output the warning if the user does not have proper delegation of UA-CH.
+ *
+ * @returns {boolean} True if 51Degrees meta is present
+ * @returns {boolean} False if 51Degrees meta is not present
+ */
+export const is51DegreesMetaPresent = () => {
+  const meta51 = document.head.querySelectorAll('meta[http-equiv="Delegate-CH"]');
+  if (!meta51.length) {
+    return false;
+  }
+  return Array.from(meta51).some(
+    meta => !meta.content
+      ? false
+      : meta.content.includes('cloud.51degrees')
+  );
+}
+
+/**
+ * Sets the value of a key in the ORTB2 object if the value is not empty
+ *
+ * @param {Object} obj The object to set the key in
+ * @param {string} key The key to set
+ * @param {any} value The value to set
+ */
+export const deepSetNotEmptyValue = (obj, key, value) => {
+  if (!key) {
+    throw new Error(LOG_PREFIX + ' Key is required');
+  }
+
+  if (value) {
+    deepSetValue(obj, key, value);
+  }
+}
+
+/**
+ * Converts all 51Degrees data to ORTB2 format
+ *
+ * @param {Object} data51 Response from 51Degrees API
+ * @param {Object} [data51.device] Device data
+ *
+ * @returns {Object} Enriched ORTB2 object
+ */
+export const convert51DegreesDataToOrtb2 = (data51) => {
+  let ortb2Data = {};
+
+  if (!data51) {
+    return ortb2Data;
+  }
+
+  ortb2Data = convert51DegreesDeviceToOrtb2(data51.device);
+
+  // placeholder for the next 51Degrees RTD submodule update
+
+  return ortb2Data;
+};
+
+/**
+ * Converts 51Degrees device data to ORTB2 format
+ *
+ * @param {Object} device 51Degrees device object
+ * @param {string} [device.deviceid] Device ID (unique 51Degrees identifier)
+ * @param {string} [device.devicetype] Device type
+ * @param {string} [device.hardwarevendor] Hardware vendor
+ * @param {string} [device.hardwaremodel] Hardware model
+ * @param {string[]} [device.hardwarename] Hardware name
+ * @param {string} [device.platformname] Platform name
+ * @param {string} [device.platformversion] Platform version
+ * @param {number} [device.screenpixelsheight] Screen height in pixels
+ * @param {number} [device.screenpixelswidth] Screen width in pixels
+ * @param {number} [device.screenpixelsphysicalheight] Screen physical height in pixels
+ * @param {number} [device.screenpixelsphysicalwidth] Screen physical width in pixels
+ * @param {number} [device.pixelratio] Pixel ratio
+ * @param {number} [device.screeninchesheight] Screen height in inches
+ *
+ * @returns {Object} Enriched ORTB2 object
+ */
+export const convert51DegreesDeviceToOrtb2 = (device) => {
+  const ortb2Device = {};
+
+  if (!device) {
+    return ortb2Device;
+  }
+
+  const deviceModel =
+    device.hardwaremodel || (
+      device.hardwarename && device.hardwarename.length
+        ? device.hardwarename.join(',')
+        : null
+    );
+
+  const devicePhysicalPPI = device.screenpixelsphysicalheight && device.screeninchesheight
+    ? Math.round(device.screenpixelsphysicalheight / device.screeninchesheight)
+    : null;
+
+  const devicePPI = device.screenpixelsheight && device.screeninchesheight
+    ? Math.round(device.screenpixelsheight / device.screeninchesheight)
+    : null;
+
+  deepSetNotEmptyValue(ortb2Device, 'devicetype', ORTB_DEVICE_TYPE_MAP.get(device.devicetype));
+  deepSetNotEmptyValue(ortb2Device, 'make', device.hardwarevendor);
+  deepSetNotEmptyValue(ortb2Device, 'model', deviceModel);
+  deepSetNotEmptyValue(ortb2Device, 'os', device.platformname);
+  deepSetNotEmptyValue(ortb2Device, 'osv', device.platformversion);
+  deepSetNotEmptyValue(ortb2Device, 'h', device.screenpixelsphysicalheight || device.screenpixelsheight);
+  deepSetNotEmptyValue(ortb2Device, 'w', device.screenpixelsphysicalwidth || device.screenpixelswidth);
+  deepSetNotEmptyValue(ortb2Device, 'pxratio', device.pixelratio);
+  deepSetNotEmptyValue(ortb2Device, 'ppi', devicePhysicalPPI || devicePPI);
+  deepSetNotEmptyValue(ortb2Device, 'ext.fiftyonedegrees_deviceId', device.deviceid);
+
+  return {device: ortb2Device};
+}
+
+/**
+ * @param {Object} reqBidsConfigObj Bid request configuration object
+ * @param {Function} callback Called on completion
+ * @param {Object} moduleConfig Configuration for 1plusX RTD module
+ * @param {Object} userConsent
+ */
+export const getBidRequestData = (reqBidsConfigObj, callback, moduleConfig, userConsent) => {
+  try {
+    // Get the required config
+    const {resourceKey, onPremiseJSUrl} = extractConfig(moduleConfig, reqBidsConfigObj);
+    logMessage('Resource key: ', resourceKey);
+    logMessage('On-premise JS URL: ', onPremiseJSUrl);
+
+    // Check if 51Degrees meta is present (cloud only)
+    if (resourceKey) {
+      logMessage('Checking if 51Degrees meta is present in the document head');
+      if (!is51DegreesMetaPresent()) {
+        logWarn('Delegate-CH meta tag is not present in the document head');
+      }
+    }
+
+    getHighEntropyValues(['model', 'platform', 'platformVersion', 'fullVersionList']).then((hev) => {
+      // Get 51Degrees JS URL, which is either cloud or on-premise
+      const scriptURL = get51DegreesJSURL({resourceKey, onPremiseJSUrl, hev});
+      logMessage('URL of the script to be injected: ', scriptURL);
+
+      // Inject 51Degrees script, get device data and merge it into the ORTB2 object
+      loadExternalScript(scriptURL, MODULE_TYPE_RTD, MODULE_NAME, () => {
+        logMessage('Successfully injected 51Degrees script');
+        const fod = /** @type {Object} */ (window.fod);
+        // Convert and merge device data in the callback
+        fod.complete((data) => {
+          logMessage('51Degrees raw data: ', data);
+          mergeDeep(
+            reqBidsConfigObj.ortb2Fragments.global,
+            convert51DegreesDataToOrtb2(data),
+          );
+          logMessage('reqBidsConfigObj: ', reqBidsConfigObj);
+          callback();
+        });
+      }, document, {crossOrigin: 'anonymous'});
+    });
+  } catch (error) {
+    // In case of an error, log it and continue
+    logError(error);
+    callback();
+  }
+}
+
+/**
+ * Init
+ * @param {Object} config Module configuration
+ * @param {boolean} userConsent User consent
+ * @returns true
+ */
+const init = (config, userConsent) => {
+  return true;
+}
+
+// 51Degrees RTD submodule object to be registered
+export const fiftyOneDegreesSubmodule = {
+  name: MODULE_NAME,
+  init,
+  getBidRequestData,
+}
+
+submodule('realTimeData', fiftyOneDegreesSubmodule);
diff --git a/modules/51DegreesRtdProvider.md b/modules/51DegreesRtdProvider.md
new file mode 100644
index 00000000000..76fa73803c9
--- /dev/null
+++ b/modules/51DegreesRtdProvider.md
@@ -0,0 +1,162 @@
+# 51Degrees RTD Submodule
+
+## Overview
+
+    Module Name: 51Degrees RTD Provider
+    Module Type: RTD Provider
+    Maintainer: support@51degrees.com
+
+## Description
+
+The 51Degrees module enriches an OpenRTB request with [51Degrees Device Data](https://51degrees.com/documentation/index.html).
+
+The 51Degrees module sets the following fields of the device object: `devicetype`, `make`, `model`, `os`, `osv`, `h`, `w`, `ppi`, `pxratio`. Interested bidder adapters may use these fields as needed. In addition, the module sets `device.ext.fiftyonedegrees_deviceId` to a permanent device ID, which can be rapidly looked up in on-premise data, exposing over 250 properties, including device age, chipset, codec support, price, operating system and app/browser versions, age, and embedded features.
+
+The module supports on-premise and cloud device detection services, with free options for both.
+
+A free resource key for use with 51Degrees cloud service can be obtained from [51Degrees cloud configuration](https://configure.51degrees.com/HNZ75HT1). This is the simplest approach to trial the module.
+
+An interface-compatible self-hosted service can be used with .NET, Java, Node, PHP, and Python. See [51Degrees examples](https://51degrees.com/documentation/_examples__device_detection__getting_started__web__on_premise.html).
+
+Free cloud and on-premise solutions can be expanded to support unlimited requests, additional properties, and automatic daily on-premise data updates via a [subscription](https://51degrees.com/pricing).
+
+## Usage
+
+### Integration
+
+Compile the 51Degrees RTD Module with other modules and adapters into your Prebid.js build:
+
+```
+gulp build --modules=rtdModule,51DegreesRtdProvider,appnexusBidAdapter,...
+```
+
+> Note that the 51Degrees RTD module is dependent on the global real-time data module, `rtdModule`.
+
+### Prerequisites
+
+#### Resource Key
+
+In order to use the module, please first obtain a Resource Key using the [Configurator tool](https://configure.51degrees.com/HNZ75HT1) - choose the following properties:
+
+* DeviceId
+* DeviceType
+* HardwareVendor
+* HardwareName
+* HardwareModel
+* PlatformName
+* PlatformVersion
+* ScreenPixelsHeight
+* ScreenPixelsWidth
+* ScreenPixelsPhysicalHeight
+* ScreenPixelsPhysicalWidth
+* ScreenInchesHeight
+* ScreenInchesWidth
+* PixelRatio
+
+The Cloud API is **free** to integrate and use. To increase limits, please check [51Degrees pricing](https://51degrees.com/pricing).
+
+#### User Agent Client Hint (UA-CH) Permissions
+
+Some UA-CH headers are not available to third parties. To allow the 51Degrees cloud service to access these headers for more accurate detection and lower latency, it is highly recommended to set `Permissions-Policy` in one of two ways:
+
+In the HTML of the publisher's web page where the Prebid.js wrapper is integrated:
+
+```html
+
+```
+
+Or in the Response Headers of the publisher's web server:
+
+```http
+Permissions-Policy: ch-ua-arch=(self "https://cloud.51degrees.com"), ch-ua-full-version=(self "https://cloud.51degrees.com"), ch-ua-full-version-list=(self "https://cloud.51degrees.com"), ch-ua-model=(self "https://cloud.51degrees.com"), ch-ua-platform=(self "https://cloud.51degrees.com"), ch-ua-platform-version=(self "https://cloud.51degrees.com")
+
+Accept-CH: sec-ch-ua-arch, sec-ch-ua-full-version, sec-ch-ua-full-version-list, sec-ch-ua-model, sec-ch-ua-platform, sec-ch-ua-platform-version
+```
+
+See the [51Degrees documentation](https://51degrees.com/documentation/_device_detection__features__u_a_c_h__overview.html) for more information concerning UA-CH and permissions.
+
+##### Why not use the GetHighEntropyValues API instead?
+
+Thanks for asking.
+
+The script this module injects has a fallback to the GetHighEntropyValues API but does not rely on it as a first (or only) choice route. Please see the illustrative cases below. Although it seems easier, the GHEV API is not supported by all browsers (so the decision to call it should be conditional). Also, even in Chrome, this API will likely be subject to the Privacy Budget in the future.
+
+In summary, we recommend using `Delegate-CH` http-equiv as the preferred method of obtaining the necessary evidence because it is the fastest and most future-proof method.
+
+##### Illustrative Cases
+
+* If the device is iPhone/iPad, there is no point in checking for or calling GetHighEntropyValues at the moment because iOS does not support this API. However, this might change in the future. Platforms like iOS require additional techniques to identify the model, which are not covered via a single API call, and change from version to version of the operating system and browser rendering engine. **When used with iOS, 51Degrees resolves the [iPhone/iPad model groups](https://51degrees.com/documentation/4.4/_device_detection__features__apple_device_table.html) using these techniques.** That is one of the benefits the module brings to the Prebid community, as most solutions do not resolve iPhone/iPad model groups. More on Apple Device Detection [here](https://51degrees.com/documentation/4.4/_device_detection__features__apple_detection.html).
+
+* If the browser is Firefox on Android or Desktop, there is similarly no point in requesting GHEV, as the API is not supported.
+
+* If the browser is Chrome, the `Delegate-CH`, if enabled by the publisher, would allow the browser to provide the necessary evidence. However, if this is not implemented, then the dynamic script would fall back to GHEV, which is slower.
+
+### Configuration
+
+This module is configured as part of the `realTimeData.dataProviders`. We recommend setting `auctionDelay` to at least 250 ms and ensuring `waitForIt` is set to `true` for the `51Degrees` RTD provider.
+
+```javascript
+pbjs.setConfig({
+    debug: false, // turn on for testing, remove in production
+    realTimeData: {
+        auctionDelay: 250,
+        dataProviders: [
+            {
+                name: '51Degrees',
+                waitForIt: true, // should be true, otherwise the auctionDelay will be ignored
+                params: {
+                    resourceKey: '',
+                    // Get your resource key from https://configure.51degrees.com/HNZ75HT1
+                    // alternatively, you can use the on-premise version of the 51Degrees service and connect to your chosen endpoint
+                    // onPremiseJSUrl: 'https://localhost/51Degrees.core.js'
+                },
+            },
+        ],
+    },
+});
+```
+
+### Parameters 
+
+> Note that `resourceKey` and `onPremiseJSUrl` are mutually exclusive parameters. Use strictly one of them: either a `resourceKey` for cloud integration or `onPremiseJSUrl` for the on-premise self-hosted integration. 
+
+| Name                  | Type    | Description                                                                                  | Default            |
+|:----------------------|:--------|:---------------------------------------------------------------------------------------------|:-------------------|
+| name                  | String  | Real-time data module name                                                                   | Always '51Degrees' |
+| waitForIt             | Boolean | Should be `true` if there's an `auctionDelay` defined (mandatory)                            | `false`            |
+| params                | Object  |                                                                                              |                    |
+| params.resourceKey    | String  | Your 51Degrees Cloud Resource Key                                                            |                    |
+| params.onPremiseJSUrl | String  | Direct URL to your self-hosted on-premise JS file (e.g. https://localhost/51Degrees.core.js) |                    |
+
+> Note: if you use a third-party Prebid.js wrapper, there might be a chance that the UI will force you to input both `resourceKey` and `onPremiseJSUrl`. In this case, you can set a redundant parameter to a string equal to "0", which will be ignored by the module.
+
+## Example 
+
+> Note: you need to have a valid resource key to run the example.\
+> It should be set in the configuration instead of ``.\
+> It is located in the `integrationExamples/gpt/51DegreesRtdProvider_example.html` file.
+
+If you want to see an example of how the 51Degrees RTD module works,\
+run the following command:
+
+`gulp serve --modules=rtdModule,51DegreesRtdProvider,appnexusBidAdapter`
+
+and then open the following URL in your browser:
+
+`http://localhost:9999/integrationExamples/gpt/51DegreesRtdProvider_example.html`
+
+Open the browser console to see the logs.
+
+## Customer Notices
+
+When using the 51Degrees cloud service, publishers need to reference the 51Degrees [client services privacy policy](https://51degrees.com/terms/client-services-privacy-policy) in their customer notices.
+
+## Optimisation
+
+To reduce latency when loading the 51Degrees cloud service script, it's recommended to preconnect to the 51Degrees domain. This will establish an early connection, allowing the browser to resolve DNS, set up TCP, and perform the TLS handshake ahead of time, speeding up the script download.
+
+To enable `preconnect`, add the following in the `` of your HTML:
+
+```html
+
+```
diff --git a/modules/prebidmanagerAnalyticsAdapter.js b/modules/AsteriobidPbmAnalyticsAdapter.js
similarity index 91%
rename from modules/prebidmanagerAnalyticsAdapter.js
rename to modules/AsteriobidPbmAnalyticsAdapter.js
index b877918d16d..7f56f5064b7 100644
--- a/modules/prebidmanagerAnalyticsAdapter.js
+++ b/modules/AsteriobidPbmAnalyticsAdapter.js
@@ -1,18 +1,18 @@
-import { generateUUID, getParameterByName, logError, parseUrl, logInfo } from '../src/utils.js';
+import { deepClone, generateUUID, getParameterByName, hasNonSerializableProperty, logError, parseUrl, logInfo } from '../src/utils.js';
 import {ajaxBuilder} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import {getStorageManager} from '../src/storageManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
 
 /**
  * prebidmanagerAnalyticsAdapter.js - analytics adapter for prebidmanager
  */
-export const storage = getStorageManager({moduleType: MODULE_TYPE_ANALYTICS, moduleName: 'prebidmanager'});
+export const storage = getStorageManager({moduleType: MODULE_TYPE_ANALYTICS, moduleName: 'asteriobidpbm'});
 const DEFAULT_EVENT_URL = 'https://endpt.prebidmanager.com/endpoint';
 const analyticsType = 'endpoint';
-const analyticsName = 'Prebid Manager Analytics';
+const analyticsName = 'Asteriobid PBM Analytics';
 
 let ajax = ajaxBuilder(0);
 
@@ -199,16 +199,16 @@ function trimBidderRequest(bidderRequest) {
 }
 
 function handleEvent(eventType, eventArgs) {
-  try {
-    eventArgs = eventArgs ? JSON.parse(JSON.stringify(eventArgs)) : {};
-  } catch (e) {
-    // keep eventArgs as is
+  if (eventArgs) {
+    eventArgs = hasNonSerializableProperty(eventArgs) ? eventArgs : deepClone(eventArgs)
+  } else {
+    eventArgs = {}
   }
 
   const pmEvent = {};
 
   switch (eventType) {
-    case CONSTANTS.EVENTS.AUCTION_INIT: {
+    case EVENTS.AUCTION_INIT: {
       pmEvent.auctionId = eventArgs.auctionId;
       pmEvent.timeout = eventArgs.timeout;
       pmEvent.eventType = eventArgs.eventType;
@@ -218,7 +218,7 @@ function handleEvent(eventType, eventArgs) {
       _bidRequestTimeout = pmEvent.timeout;
       break;
     }
-    case CONSTANTS.EVENTS.AUCTION_END: {
+    case EVENTS.AUCTION_END: {
       pmEvent.auctionId = eventArgs.auctionId;
       pmEvent.end = eventArgs.end;
       pmEvent.start = eventArgs.start;
@@ -228,15 +228,15 @@ function handleEvent(eventType, eventArgs) {
       pmEvent.end = Date.now();
       break;
     }
-    case CONSTANTS.EVENTS.BID_ADJUSTMENT: {
+    case EVENTS.BID_ADJUSTMENT: {
       break;
     }
-    case CONSTANTS.EVENTS.BID_TIMEOUT: {
+    case EVENTS.BID_TIMEOUT: {
       pmEvent.bidders = eventArgs && eventArgs.map ? eventArgs.map(trimBid) : eventArgs;
       pmEvent.duration = _bidRequestTimeout;
       break;
     }
-    case CONSTANTS.EVENTS.BID_REQUESTED: {
+    case EVENTS.BID_REQUESTED: {
       pmEvent.auctionId = eventArgs.auctionId;
       pmEvent.bidderCode = eventArgs.bidderCode;
       pmEvent.doneCbCallCount = eventArgs.doneCbCallCount;
@@ -247,7 +247,7 @@ function handleEvent(eventType, eventArgs) {
       pmEvent.timeout = eventArgs.timeout;
       break;
     }
-    case CONSTANTS.EVENTS.BID_RESPONSE: {
+    case EVENTS.BID_RESPONSE: {
       pmEvent.bidderCode = eventArgs.bidderCode;
       pmEvent.width = eventArgs.width;
       pmEvent.height = eventArgs.height;
@@ -266,7 +266,7 @@ function handleEvent(eventType, eventArgs) {
       pmEvent.adserverTargeting = eventArgs.adserverTargeting;
       break;
     }
-    case CONSTANTS.EVENTS.BID_WON: {
+    case EVENTS.BID_WON: {
       pmEvent.auctionId = eventArgs.auctionId;
       pmEvent.adId = eventArgs.adId;
       pmEvent.adserverTargeting = eventArgs.adserverTargeting;
@@ -284,7 +284,7 @@ function handleEvent(eventType, eventArgs) {
       pmEvent.bidder = eventArgs.bidder;
       break;
     }
-    case CONSTANTS.EVENTS.BIDDER_DONE: {
+    case EVENTS.BIDDER_DONE: {
       pmEvent.auctionId = eventArgs.auctionId;
       pmEvent.auctionStart = eventArgs.auctionStart;
       pmEvent.bidderCode = eventArgs.bidderCode;
@@ -297,16 +297,16 @@ function handleEvent(eventType, eventArgs) {
       pmEvent.src = eventArgs.src;
       break;
     }
-    case CONSTANTS.EVENTS.SET_TARGETING: {
+    case EVENTS.SET_TARGETING: {
       break;
     }
-    case CONSTANTS.EVENTS.REQUEST_BIDS: {
+    case EVENTS.REQUEST_BIDS: {
       break;
     }
-    case CONSTANTS.EVENTS.ADD_AD_UNITS: {
+    case EVENTS.ADD_AD_UNITS: {
       break;
     }
-    case CONSTANTS.EVENTS.AD_RENDER_FAILED: {
+    case EVENTS.AD_RENDER_FAILED: {
       pmEvent.bid = eventArgs.bid;
       pmEvent.message = eventArgs.message;
       pmEvent.reason = eventArgs.reason;
@@ -326,7 +326,7 @@ function sendEvent(event) {
   _eventQueue.push(event);
   logInfo(`${analyticsName} Event ${event.eventType}:`, event);
 
-  if (event.eventType === CONSTANTS.EVENTS.AUCTION_END) {
+  if (event.eventType === EVENTS.AUCTION_END) {
     flush();
   }
 }
diff --git a/modules/AsteriobidPbmAnalyticsAdapter.md b/modules/AsteriobidPbmAnalyticsAdapter.md
new file mode 100644
index 00000000000..0331a71b17c
--- /dev/null
+++ b/modules/AsteriobidPbmAnalyticsAdapter.md
@@ -0,0 +1,9 @@
+# Overview
+
+Module Name: Asteriobid PBM Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: admin@prebidmanager.com
+
+# Description
+
+Analytics adapter for Asteriobid PBM. Contact admin@prebidmanager.com for information.
diff --git a/modules/BTBidAdapter.js b/modules/BTBidAdapter.js
new file mode 100644
index 00000000000..7b50b90124b
--- /dev/null
+++ b/modules/BTBidAdapter.js
@@ -0,0 +1,204 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { deepSetValue, isPlainObject, logWarn } from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+
+const BIDDER_CODE = 'blockthrough';
+const GVLID = 815;
+const ENDPOINT_URL = 'https://pbs.btloader.com/openrtb2/auction';
+const SYNC_URL = 'https://cdn.btloader.com/user_sync.html';
+
+const CONVERTER = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 60,
+  },
+  imp,
+  request,
+  bidResponse,
+});
+
+/**
+ * Builds an impression object for the ORTB 2.5 request.
+ *
+ * @param {function} buildImp - The function for building an imp object.
+ * @param {Object} bidRequest - The bid request object.
+ * @param {Object} context - The context object.
+ * @returns {Object} The ORTB 2.5 imp object.
+ */
+function imp(buildImp, bidRequest, context) {
+  const imp = buildImp(bidRequest, context);
+  const { params, ortb2Imp } = bidRequest;
+
+  if (params) {
+    deepSetValue(imp, 'ext', params);
+  }
+  if (ortb2Imp?.ext?.gpid) {
+    deepSetValue(imp, 'ext.gpid', ortb2Imp.ext.gpid);
+  }
+
+  return imp;
+}
+
+/**
+ * Builds a request object for the ORTB 2.5 request.
+ *
+ * @param {function} buildRequest - The function for building a request object.
+ * @param {Array} imps - An array of ORTB 2.5 impression objects.
+ * @param {Object} bidderRequest - The bidder request object.
+ * @param {Object} context - The context object.
+ * @returns {Object} The ORTB 2.5 request object.
+ */
+function request(buildRequest, imps, bidderRequest, context) {
+  const request = buildRequest(imps, bidderRequest, context);
+  deepSetValue(request, 'ext.prebid.channel', {
+    name: 'pbjs',
+    version: '$prebid.version$',
+  });
+
+  if (window.location.href.includes('btServerTest=true')) {
+    request.test = 1;
+  }
+
+  return request;
+}
+
+/**
+ * Processes a bid response using the provided build function, bid, and context.
+ *
+ * @param {Function} buildBidResponse - The function to build the bid response.
+ * @param {Object} bid - The bid object to include in the bid response.
+ * @param {Object} context - The context object containing additional information.
+ * @returns {Object} - The processed bid response.
+ */
+function bidResponse(buildBidResponse, bid, context) {
+  const bidResponse = buildBidResponse(bid, context);
+  const { seat } = context.seatbid || {};
+  bidResponse.btBidderCode = seat;
+
+  return bidResponse;
+}
+
+/**
+ * Checks if a bid request is valid.
+ *
+ * @param {Object} bid - The bid request object.
+ * @returns {boolean} True if the bid request is valid, false otherwise.
+ */
+function isBidRequestValid(bid) {
+  if (!isPlainObject(bid.params) || !Object.keys(bid.params).length) {
+    logWarn('BT Bid Adapter: bid params must be provided.');
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Builds the bid requests for the BT Service.
+ *
+ * @param {Array} validBidRequests - An array of valid bid request objects.
+ * @param {Object} bidderRequest - The bidder request object.
+ * @returns {Array} An array of BT Service bid requests.
+ */
+function buildRequests(validBidRequests, bidderRequest) {
+  const data = CONVERTER.toORTB({
+    bidRequests: validBidRequests,
+    bidderRequest,
+  });
+
+  return [
+    {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data,
+      bids: validBidRequests,
+    },
+  ];
+}
+
+/**
+ * Interprets the server response and maps it to bids.
+ *
+ * @param {Object} serverResponse - The server response object.
+ * @param {Object} request - The request object.
+ * @returns {Array} An array of bid objects.
+ */
+function interpretResponse(serverResponse, request) {
+  if (!serverResponse || !request) {
+    return [];
+  }
+
+  return CONVERTER.fromORTB({
+    response: serverResponse.body,
+    request: request.data,
+  }).bids;
+}
+
+/**
+ * Generates user synchronization data based on provided options and consents.
+ *
+ * @param {Object} syncOptions - Synchronization options.
+ * @param {Object[]} serverResponses - An array of server responses.
+ * @param {Object} gdprConsent - GDPR consent information.
+ * @param {string} uspConsent - US Privacy consent string.
+ * @param {Object} gppConsent - Google Publisher Policies (GPP) consent information.
+ * @returns {Object[]} An array of user synchronization objects.
+ */
+function getUserSyncs(
+  syncOptions,
+  serverResponses,
+  gdprConsent,
+  uspConsent,
+  gppConsent
+) {
+  if (!syncOptions.iframeEnabled || !serverResponses?.length) {
+    return [];
+  }
+
+  const bidderCodes = new Set();
+  serverResponses.forEach((serverResponse) => {
+    if (serverResponse?.body?.ext?.responsetimemillis) {
+      Object.keys(serverResponse.body.ext.responsetimemillis).forEach(
+        bidderCodes.add,
+        bidderCodes
+      );
+    }
+  });
+
+  if (!bidderCodes.size) {
+    return [];
+  }
+
+  const syncs = [];
+  const syncUrl = new URL(SYNC_URL);
+  syncUrl.searchParams.set('bidders', [...bidderCodes].join(','));
+
+  if (gdprConsent) {
+    syncUrl.searchParams.set('gdpr', Number(gdprConsent.gdprApplies));
+    syncUrl.searchParams.set('gdpr_consent', gdprConsent.consentString);
+  }
+  if (gppConsent) {
+    syncUrl.searchParams.set('gpp', gppConsent.gppString);
+    syncUrl.searchParams.set('gpp_sid', gppConsent.applicableSections);
+  }
+  if (uspConsent) {
+    syncUrl.searchParams.set('us_privacy', uspConsent);
+  }
+
+  syncs.push({ type: 'iframe', url: syncUrl.href });
+
+  return syncs;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs,
+};
+
+registerBidder(spec);
diff --git a/modules/BTBidAdapter.md b/modules/BTBidAdapter.md
new file mode 100644
index 00000000000..e29bc688b0c
--- /dev/null
+++ b/modules/BTBidAdapter.md
@@ -0,0 +1,70 @@
+# Overview
+
+**Module Name**: BT Bidder Adapter
+**Module Type**: Bidder Adapter  
+**Maintainer**: engsupport@blockthrough.com
+
+# Description
+
+The BT Bidder Adapter provides an interface to the BT Service. The BT Bidder Adapter sends one request to the BT Service per ad unit. Behind the scenes, the BT Service further disperses requests to various configured exchanges. This operational model closely resembles that of Prebid Server, where a single request is made from the client side, and responses are gathered from multiple exchanges.
+
+The BT adapter requires setup and approval from the Blockthrough team. Please reach out to marketing@blockthrough.com for more information.
+
+# Bid Params
+
+| Key    | Scope    | Type   | Description                                                    |
+| ------ | -------- | ------ | -------------------------------------------------------------- |
+| bidder | Required | Object | Bidder configuration. Could configure several bidders this way |
+
+# Bidder Config
+
+Make sure to set required ab, orgID, websiteID values received after approval using `pbjs.setBidderConfig`.
+
+## Example
+
+```javascript
+pbjs.setBidderConfig({
+  bidders: ['blockthrough'],
+  config: {
+    ortb2: {
+      site: {
+        ext: {
+          blockthrough: {
+            ab: false,
+            orgID: '4829301576428910',
+            websiteID: '5654012389765432',
+          },
+        },
+      },
+    },
+  },
+});
+```
+
+## AdUnits configuration example
+
+```javascript
+var adUnits = [
+  {
+    code: 'banner-div-1',
+    mediaTypes: {
+      banner: {
+        sizes: [[728, 90]],
+      },
+    },
+    bids: [
+      {
+        bidder: 'blockthrough',
+        params: {
+          bidderA: {
+            publisherId: 55555,
+          },
+          bidderB: {
+            zoneId: 12,
+          },
+        },
+      },
+    ],
+  },
+];
+```
diff --git a/modules/a1MediaBidAdapter.js b/modules/a1MediaBidAdapter.js
index 6a137e621c5..d640bbfe2d7 100644
--- a/modules/a1MediaBidAdapter.js
+++ b/modules/a1MediaBidAdapter.js
@@ -1,6 +1,7 @@
 import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
+import { replaceAuctionPrice } from '../src/utils.js';
 
 const BIDDER_CODE = 'a1media';
 const END_POINT = 'https://d11.contentsfeed.com/dsp/breq/a1';
@@ -81,7 +82,21 @@ export const spec = {
   },
 
   interpretResponse: function (serverResponse, bidRequest) {
-    const bids = converter.fromORTB({response: serverResponse.body, request: bidRequest.data}).bids;
+    if (!serverResponse.body) return [];
+    const parsedSeatbid = serverResponse.body.seatbid.map(seatbidItem => {
+      const parsedBid = seatbidItem.bid.map((bidItem) => ({
+        ...bidItem,
+        adm: replaceAuctionPrice(bidItem.adm, bidItem.price),
+        nurl: replaceAuctionPrice(bidItem.nurl, bidItem.price)
+      }));
+      return {...seatbidItem, bid: parsedBid};
+    });
+
+    const responseBody = {...serverResponse.body, seatbid: parsedSeatbid};
+    const bids = converter.fromORTB({
+      response: responseBody,
+      request: bidRequest.data,
+    }).bids;
     return bids;
   },
 
diff --git a/modules/a1MediaRtdProvider.js b/modules/a1MediaRtdProvider.js
index 9fa6b307b6a..1fbe88ecfa0 100644
--- a/modules/a1MediaRtdProvider.js
+++ b/modules/a1MediaRtdProvider.js
@@ -4,6 +4,10 @@ import { submodule } from '../src/hook.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { isEmptyStr, mergeDeep } from '../src/utils.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const REAL_TIME_MODULE = 'realTimeData';
 const MODULE_NAME = 'a1Media';
 const SCRIPT_URL = 'https://linkback.contentsfeed.com/src';
@@ -35,7 +39,7 @@ function loadLbScript(tagname) {
     linkback.l = true;
 
     const scriptUrl = `${SCRIPT_URL}/${tagname}`;
-    loadExternalScript(scriptUrl, MODULE_NAME);
+    loadExternalScript(scriptUrl, MODULE_TYPE_RTD, MODULE_NAME);
   }
 }
 
diff --git a/modules/aaxBlockmeterRtdProvider.js b/modules/aaxBlockmeterRtdProvider.js
index a3b7b4812a7..0a72e4e36f1 100644
--- a/modules/aaxBlockmeterRtdProvider.js
+++ b/modules/aaxBlockmeterRtdProvider.js
@@ -1,6 +1,7 @@
 import {isEmptyStr, isStr, logError, isFn, logWarn} from '../src/utils.js';
 import {submodule} from '../src/hook.js';
 import { loadExternalScript } from '../src/adloader.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
 
 export const _config = {
   MODULE: 'aaxBlockmeter',
@@ -28,7 +29,7 @@ function loadBlockmeter(_rtdConfig) {
   }
 
   const scriptUrl = `https://${url}&${params.join('&')}`;
-  loadExternalScript(scriptUrl, _config.MODULE);
+  loadExternalScript(scriptUrl, MODULE_TYPE_RTD, _config.MODULE);
   return true;
 }
 
diff --git a/modules/ablidaBidAdapter.js b/modules/ablidaBidAdapter.js
index 805a2020fb4..175d5ff7c72 100644
--- a/modules/ablidaBidAdapter.js
+++ b/modules/ablidaBidAdapter.js
@@ -3,6 +3,12 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
 const BIDDER_CODE = 'ablida';
 const ENDPOINT_URL = 'https://bidder.ablida.net/prebid';
 
diff --git a/modules/acuityadsBidAdapter.js b/modules/acuityadsBidAdapter.js
index 5b12eb2133b..bd85d2b3cc0 100644
--- a/modules/acuityadsBidAdapter.js
+++ b/modules/acuityadsBidAdapter.js
@@ -1,216 +1,19 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'acuityads';
 const AD_URL = 'https://prebid.admanmedia.com/pbjs';
 const SYNC_URL = 'https://cs.admanmedia.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  placement.placementId = placementId;
-  placement.type = 'publisher';
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && params.placementId);
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-    // TODO: does the fallback make sense here?
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    // Add GPP consent
-    if (bidderRequest.gppConsent) {
-      request.gpp = bidderRequest.gppConsent.gppString;
-      request.gpp_sid = bidderRequest.gppConsent.applicableSections;
-    } else if (bidderRequest.ortb2?.regs?.gpp) {
-      request.gpp = bidderRequest.ortb2.regs.gpp;
-      request.gpp_sid = bidderRequest.ortb2.regs.gpp_sid;
-    }
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(['placementId']),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/ad2ictionBidAdapter.js b/modules/ad2ictionBidAdapter.js
new file mode 100644
index 00000000000..0f7cea45d14
--- /dev/null
+++ b/modules/ad2ictionBidAdapter.js
@@ -0,0 +1,59 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+export const BIDDER_CODE = 'ad2iction';
+export const SUPPORTED_AD_TYPES = [BANNER];
+export const API_ENDPOINT = 'https://ads.ad2iction.com/html/prebid/';
+export const API_VERSION_NUMBER = 3;
+export const COOKIE_NAME = 'ad2udid';
+
+export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['ad2'],
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: (bid) => {
+    return !!bid.params.id && typeof bid.params.id === 'string';
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const ids = validBidRequests.map((bid) => {
+      return { bannerId: bid.params.id, bidId: bid.bidId };
+    });
+
+    const options = {
+      contentType: 'application/json',
+      withCredentials: false,
+    };
+
+    const udid = storage.cookiesAreEnabled() && storage.getCookie(COOKIE_NAME);
+
+    const data = {
+      ids: JSON.stringify(ids),
+      ortb2: bidderRequest.ortb2,
+      refererInfo: bidderRequest.refererInfo,
+      v: API_VERSION_NUMBER,
+      udid: udid || '',
+      _: Math.round(new Date().getTime()),
+    };
+
+    return {
+      method: 'POST',
+      url: API_ENDPOINT,
+      data,
+      options,
+    };
+  },
+  interpretResponse: (serverResponse, bidRequest) => {
+    if (!Array.isArray(serverResponse.body)) {
+      return [];
+    }
+
+    const bidResponses = serverResponse.body;
+
+    return bidResponses;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/ad2ictionBidAdapter.md b/modules/ad2ictionBidAdapter.md
new file mode 100644
index 00000000000..47e355aa795
--- /dev/null
+++ b/modules/ad2ictionBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+**Module Name**: Ad2iction Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: prebid@ad2iction.com
+
+# Description
+
+The Ad2iction Bidding adapter requires setup before beginning. Please contact us on https://www.ad2iction.com.
+
+# Sample Ad Unit Config
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [336, 280]]
+        }
+      },
+      bids: [{
+         bidder: 'ad2iction',
+         params: {
+           id: 'accepted-uuid'
+         }
+       }]
+   }
+];
+```
diff --git a/modules/adWMGAnalyticsAdapter.js b/modules/adWMGAnalyticsAdapter.js
index dd0340071d1..ed1ac46363c 100644
--- a/modules/adWMGAnalyticsAdapter.js
+++ b/modules/adWMGAnalyticsAdapter.js
@@ -1,20 +1,18 @@
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import { ajax } from '../src/ajax.js';
 const analyticsType = 'endpoint';
 const url = 'https://analytics.wmgroup.us/analytic/collection';
 const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    BID_REQUESTED,
-    BID_WON,
-    BID_TIMEOUT,
-    NO_BID,
-    BID_RESPONSE
-  }
-} = CONSTANTS;
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_REQUESTED,
+  BID_WON,
+  BID_TIMEOUT,
+  NO_BID,
+  BID_RESPONSE
+} = EVENTS;
 
 let timestampInit = null;
 
diff --git a/modules/adagioAnalyticsAdapter.js b/modules/adagioAnalyticsAdapter.js
index f9b79639073..410accc946a 100644
--- a/modules/adagioAnalyticsAdapter.js
+++ b/modules/adagioAnalyticsAdapter.js
@@ -2,70 +2,83 @@
  * Analytics Adapter for Adagio
  */
 
+import { _ADAGIO, getBestWindowForAdagio } from '../libraries/adagioUtils/adagioUtils.js';
+import { deepAccess, logError, logInfo, logWarn, isPlainObject } from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { EVENTS } from '../src/constants.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
 import { ajax } from '../src/ajax.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { getWindowTop, getWindowSelf, deepAccess, logInfo, logError } from '../src/utils.js';
 import { getGlobal } from '../src/prebidGlobal.js';
+import { subscribeToGamSlotRenderEndedEvent, SlotRenderEndedEvent } from '../libraries/gptUtils/gptUtils.js';
 
 const emptyUrl = '';
 const analyticsType = 'endpoint';
-const events = Object.keys(CONSTANTS.EVENTS).map(key => CONSTANTS.EVENTS[key]);
+const events = Object.keys(EVENTS).map(key => EVENTS[key]);
 const ADAGIO_GVLID = 617;
 const VERSION = '3.0.0';
 const PREBID_VERSION = '$prebid.version$';
 const ENDPOINT = 'https://c.4dex.io/pba.gif';
+const CURRENCY_USD = 'USD';
+const ADAGIO_CODE = 'adagio';
+
+export const _internal = {
+  getAdagioNs: function() {
+    return _ADAGIO;
+  },
+  gamSlotCallback
+};
+
 const cache = {
   auctions: {},
   getAuction: function(auctionId, adUnitCode) {
     return this.auctions[auctionId][adUnitCode];
   },
+  getBiddersFromAuction: function(auctionId, adUnitCode) {
+    return this.getAuction(auctionId, adUnitCode).bdrs.split(',');
+  },
+  getAllAdUnitCodes: function(auctionId) {
+    return Object.keys(this.auctions[auctionId]);
+  },
   updateAuction: function(auctionId, adUnitCode, values) {
     this.auctions[auctionId][adUnitCode] = {
       ...this.auctions[auctionId][adUnitCode],
       ...values
     };
-  }
-};
-const enc = window.encodeURIComponent;
+  },
 
-/**
-/* BEGIN ADAGIO.JS CODE
-*/
+  // Map prebid auction id to adagio auction id
+  auctionIdReferences: {},
+  addPrebidAuctionIdRef(auctionId, adagioAuctionId) {
+    this.auctionIdReferences[auctionId] = adagioAuctionId;
+  },
+  getAdagioAuctionId(auctionId) {
+    return this.auctionIdReferences[auctionId];
+  },
 
-function canAccessTopWindow() {
-  try {
-    if (getWindowTop().location.href) {
-      return true;
+  // Map adunitcode with prebid auction ID
+  auctionByAdunit: {},
+  getAuctionIdByAdunit(adUnitPath, adSlotElementId) {
+    if (cache.auctionByAdunit[adUnitPath]) {
+      return { auctionId: cache.auctionByAdunit[adUnitPath], adUnitCode: adUnitPath }
     }
-  } catch (error) {
-    return false;
+    if (cache.auctionByAdunit[adSlotElementId]) {
+      return { auctionId: cache.auctionByAdunit[adSlotElementId], adUnitCode: adSlotElementId }
+    }
+    return { auctionId: null, adUnitCode: null }
   }
 };
 
-function getCurrentWindow() {
-  return currentWindow;
-};
-
-let currentWindow;
-
-const adagioEnqueue = function adagioEnqueue(action, data) {
-  getCurrentWindow().ADAGIO.queue.push({ action, data, ts: Date.now() });
-};
-
-/**
-* END ADAGIO.JS CODE
-*/
+const enc = window.encodeURIComponent;
 
 /**
-* UTILS FUNCTIONS
-*/
+ * UTILS FUNCTIONS
+ */
 
 const guard = {
   adagio: (value) => isAdagio(value),
-  bidTracked: (auctionId, adUnitCode) => deepAccess(cache, `auctions.${auctionId}.${adUnitCode}`, false)
+  bidTracked: (auctionId, adUnitCode) => deepAccess(cache, `auctions.${auctionId}.${adUnitCode}`, false),
+  auctionTracked: (auctionId) => deepAccess(cache, `auctions.${auctionId}`, false)
 };
 
 function removeDuplicates(arr, getKey) {
@@ -76,13 +89,11 @@ function removeDuplicates(arr, getKey) {
   });
 };
 
-function getAdapterNameForAlias(aliasName) {
-  return adapterManager.aliasRegistry[aliasName] || aliasName;
-};
-
-function isAdagio(value) {
-  return value.toLowerCase().includes('adagio') ||
-    getAdapterNameForAlias(value).toLowerCase().includes('adagio');
+function isAdagio(alias) {
+  if (!alias) {
+    return false
+  }
+  return (alias + adapterManager.aliasRegistry[alias]).toLowerCase().includes(ADAGIO_CODE);
 };
 
 function getMediaTypeAlias(mediaType) {
@@ -96,11 +107,48 @@ function getMediaTypeAlias(mediaType) {
   return mediaTypesMap[mediaType] || mediaType;
 };
 
+function addKeyPrefix(obj, prefix) {
+  return Object.keys(obj).reduce((acc, key) => {
+    // We don't want to prefix already prefixed keys.
+    if (key.startsWith(prefix)) {
+      acc[key] = obj[key];
+      return acc;
+    }
+
+    acc[`${prefix}${key}`] = obj[key];
+    return acc;
+  }, {});
+}
+
+function getUsdCpm(cpm, currency) {
+  let netCpm = cpm
+
+  if (typeof currency === 'string' && currency.toUpperCase() !== CURRENCY_USD) {
+    if (typeof getGlobal().convertCurrency === 'function') {
+      netCpm = parseFloat(Number(getGlobal().convertCurrency(cpm, currency, CURRENCY_USD))).toFixed(3);
+    } else {
+      netCpm = null
+    }
+  }
+  return netCpm
+}
+
+function getCurrencyData(bid) {
+  return {
+    netCpm: getUsdCpm(bid.cpm, bid.currency),
+    orginalCpm: getUsdCpm(bid.originalCpm, bid.originalCurrency)
+  }
+}
+
 /**
-* sendRequest to Adagio. It filter null values and encode each query param.
-* @param {Object} qp
-*/
+ * sendRequest to Adagio. It filter null values and encode each query param.
+ * @param {Object} qp
+ */
 function sendRequest(qp) {
+  if (!qp.org_id || !qp.site) {
+    logInfo('request is missing org_id or site, skipping beacon.');
+    return;
+  }
   // Removing null values
   qp = Object.keys(qp).reduce((acc, key) => {
     if (qp[key] !== null) {
@@ -125,52 +173,56 @@ function sendNewBeacon(auctionId, adUnitCode) {
   sendRequest(cache.getAuction(auctionId, adUnitCode));
 };
 
+function getTargetedAuctionId(bid) {
+  return deepAccess(bid, 'latestTargetedAuctionId') || deepAccess(bid, 'auctionId');
+}
+
 /**
  * END UTILS FUNCTIONS
-*/
+ */
 
 /**
  * HANDLERS
  * - handlerAuctionInit
  * - handlerBidResponse
+ * - handlerAuctionEnd
  * - handlerBidWon
  * - handlerAdRender
  *
  * Each handler is called when the event is fired.
-*/
+ */
 
 function handlerAuctionInit(event) {
-  const w = getCurrentWindow();
+  const w = getBestWindowForAdagio();
 
   const prebidAuctionId = event.auctionId;
-  const adUnitCodes = removeDuplicates(event.adUnitCodes, adUnitCode => adUnitCode);
+
+  // adUnitCodes come from `event.bidderRequests` to be sure to keep the ad-units that are valid and will be effectively used during the auction.
+  // This array can be different than `event.adUnitCodes` because of the usage of conditionnal ad-units (see: https://docs.prebid.org/dev-docs/conditional-ad-units.html)
+  const adUnitCodes = new Set(
+    event.bidderRequests
+      .map(br => br.bids.map(bid => bid.adUnitCode))
+      .flat()
+  );
 
   // Check if Adagio is on the bid requests.
-  // If not, we don't need to track the auction.
   const adagioBidRequest = event.bidderRequests.find(bidRequest => isAdagio(bidRequest.bidderCode));
-  if (!adagioBidRequest) {
-    logInfo(`Adagio is not on the bid requests for auction '${prebidAuctionId}'`)
-    return;
-  }
+
+  const rtdUid = deepAccess(event.bidderRequests[0], 'ortb2.site.ext.data.adg_rtd.uid');
+  cache.addPrebidAuctionIdRef(prebidAuctionId, rtdUid);
 
   cache.auctions[prebidAuctionId] = {};
 
   adUnitCodes.forEach(adUnitCode => {
+    // event.adUnits are splitted by mediatypes
+    // having twin ad-unit codes is ok: https://docs.prebid.org/dev-docs/adunit-reference.html#twin-adunit-codes
     const adUnits = event.adUnits.filter(adUnit => adUnit.code === adUnitCode);
 
-    // Get all bidders configures for the ad unit.
-    const bidders = removeDuplicates(
-      adUnits.map(adUnit => adUnit.bids.map(bid => ({bidder: bid.bidder, params: bid.params}))).flat(),
-      bidder => bidder.bidder
-    );
-
-    // Check if Adagio is configured for the ad unit.
-    // If not, we don't need to track the ad unit.
-    const adagioBidder = bidders.find(bidder => isAdagio(bidder.bidder));
-    if (!adagioBidder) {
-      logInfo(`Adagio is not configured for ad unit '${adUnitCode}'`);
-      return;
-    }
+    // Get all bidders configured for the ad unit.
+    // AdUnits with the same code can have a different bidder list, aggregate all of them.
+    const biddersAggregate = adUnits.reduce((bidders, adUnit) => bidders.concat(adUnit.bids.map(bid => bid.bidder)), [])
+    // remove duplicates
+    const bidders = [...new Set(biddersAggregate)];
 
     // Get all media types and banner sizes configured for the ad unit.
     const mediaTypes = adUnits.map(adUnit => adUnit.mediaTypes);
@@ -179,50 +231,69 @@ function handlerAuctionInit(event) {
       mediaTypeKey => mediaTypeKey
     ).map(mediaType => getMediaTypeAlias(mediaType)).sort();
     const bannerSizes = removeDuplicates(
-      mediaTypes.filter(mediaType => mediaType.hasOwnProperty(BANNER))
+      mediaTypes.filter(mediaType => mediaType.hasOwnProperty(BANNER) && mediaType[BANNER].hasOwnProperty('sizes'))
         .map(mediaType => mediaType[BANNER].sizes.map(size => size.join('x')))
         .flat(),
       bannerSize => bannerSize
     ).sort();
 
-    // Get all Adagio bids for the ad unit from the bidRequest.
-    // If no bids, we don't need to track the ad unit.
-    const adagioAdUnitBids = adagioBidRequest.bids.filter(bid => bid.adUnitCode === adUnitCode);
-    if (deepAccess(adagioAdUnitBids, 'length', 0) <= 0) {
-      logInfo(`Adagio is not on the bid requests for ad unit '${adUnitCode}' and auction '${prebidAuctionId}'`)
-      return;
+    const sortedBidderNames = bidders.sort();
+
+    const bidSrcMapper = (bidder) => {
+      // bidderCode in the context of the bidderRequest is the name given to the bidder in the adunit.
+      // It is not always the "true" bidder code, it can also be its alias
+      const request = event.bidderRequests.find(br => br.bidderCode === bidder)
+      return request ? request.bids[0].src : null
     }
-    // Get Adagio params from the first bid.
-    // We assume that all Adagio bids for a same adunit have the same params.
-    const params = adagioAdUnitBids[0].params;
 
-    // Get all media types requested for Adagio.
-    const adagioMediaTypes = removeDuplicates(
-      adagioAdUnitBids.map(bid => Object.keys(bid.mediaTypes)).flat(),
-      mediaTypeKey => mediaTypeKey
-    ).flat().map(mediaType => getMediaTypeAlias(mediaType)).sort();
+    const biddersSrc = sortedBidderNames.map(bidSrcMapper).join(',');
+    const biddersCode = sortedBidderNames.map(bidder => adapterManager.resolveAlias(bidder)).join(',');
+
+    // if adagio was involved in the auction we identified it with rtdUid, if not use the prebid auctionId
+    const auctionId = rtdUid || prebidAuctionId;
+
+    const adgRtdSession = deepAccess(event.bidderRequests[0], 'ortb2.site.ext.data.adg_rtd.session', {});
 
     const qp = {
+      org_id: adagioAdapter.options.organizationId,
+      site: adagioAdapter.options.site,
       v: 0,
       pbjsv: PREBID_VERSION,
-      org_id: params.organizationId,
-      site: params.site,
-      pv_id: params.pageviewId,
-      auct_id: params.adagioAuctionId,
+      pv_id: _internal.getAdagioNs().pageviewId,
+      auct_id: auctionId,
       adu_code: adUnitCode,
       url_dmn: w.location.hostname,
-      dvc: params.environment,
-      pgtyp: params.pagetype,
-      plcmt: params.placement,
-      tname: params.testName || null,
-      tvname: params.testVariationName || null,
       mts: mediaTypesKeys.join(','),
       ban_szs: bannerSizes.join(','),
-      bdrs: bidders.map(bidder => getAdapterNameForAlias(bidder.bidder)).sort().join(','),
-      adg_mts: adagioMediaTypes.join(',')
+      bdrs: sortedBidderNames.join(','),
+      pgtyp: deepAccess(event.bidderRequests[0], 'ortb2.site.ext.data.pagetype', null),
+      plcmt: deepAccess(adUnits[0], 'ortb2Imp.ext.data.placement', null),
+      t_n: adgRtdSession.testName || null,
+      t_v: adgRtdSession.testVersion || null,
+      s_id: adgRtdSession.id || null,
+      s_new: adgRtdSession.new || null,
+      bdrs_src: biddersSrc,
+      bdrs_code: biddersCode,
     };
 
+    if (adagioBidRequest && adagioBidRequest.bids) {
+      const adagioAdUnitBids = adagioBidRequest.bids.filter(bid => bid.adUnitCode === adUnitCode);
+      if (adagioAdUnitBids.length > 0) {
+        // Get all media types requested for Adagio.
+        const adagioMediaTypes = removeDuplicates(
+          adagioAdUnitBids.map(bid => Object.keys(bid.mediaTypes)).flat(),
+          mediaTypeKey => mediaTypeKey
+        ).flat().map(mediaType => getMediaTypeAlias(mediaType)).sort();
+
+        qp.adg_mts = adagioMediaTypes.join(',');
+        // for backward compatibility: if we didn't find organizationId & site but we have a bid from adagio we might still find it in params
+        qp.org_id = qp.org_id || adagioAdUnitBids[0].params.organizationId;
+        qp.site = qp.site || adagioAdUnitBids[0].params.site;
+      }
+    }
+
     cache.auctions[prebidAuctionId][adUnitCode] = qp;
+    cache.auctionByAdunit[adUnitCode] = prebidAuctionId;
     sendNewBeacon(prebidAuctionId, adUnitCode);
   });
 };
@@ -231,7 +302,7 @@ function handlerAuctionInit(event) {
  * handlerBidResponse allow to track the adagio bid response
  * and to update the auction cache with the seat ID.
  * No beacon is sent here.
-*/
+ */
 function handlerBidResponse(event) {
   if (!guard.adagio(event.bidder)) {
     return;
@@ -241,51 +312,92 @@ function handlerBidResponse(event) {
     return;
   }
 
+  if (!event.pba) {
+    return;
+  }
+
   cache.updateAuction(event.auctionId, event.adUnitCode, {
-    adg_sid: event.seatId || null
+    ...addKeyPrefix(event.pba, 'e_')
   });
 };
 
-function handlerBidWon(event) {
-  if (!guard.bidTracked(event.auctionId, event.adUnitCode)) {
+function handlerAuctionEnd(event) {
+  const { auctionId } = event;
+
+  if (!guard.auctionTracked(auctionId)) {
     return;
   }
 
-  let adsCurRateToUSD = (event.currency === 'USD') ? 1 : null;
-  let ogCurRateToUSD = (event.originalCurrency === 'USD') ? 1 : null;
-  try {
-    if (typeof getGlobal().convertCurrency === 'function') {
-      // Currency module is loaded, we can calculate the conversion rate.
-
-      // Get the conversion rate from the original currency to USD.
-      ogCurRateToUSD = getGlobal().convertCurrency(1, event.originalCurrency, 'USD');
-      // Get the conversion rate from the ad server currency to USD.
-      adsCurRateToUSD = getGlobal().convertCurrency(1, event.currency, 'USD');
+  const adUnitCodes = cache.getAllAdUnitCodes(auctionId);
+  adUnitCodes.forEach(adUnitCode => {
+    const bidResponseMapper = (bidder) => {
+      const bid = event.bidsReceived.find(bid => bid.adUnitCode === adUnitCode && bid.bidder === bidder)
+      return bid ? '1' : '0'
     }
-  } catch (error) {
-    logError('Error on Adagio Analytics Adapter - handlerBidWon', error);
+    const bidCpmMapper = (bidder) => {
+      const bid = event.bidsReceived.find(bid => bid.adUnitCode === adUnitCode && bid.bidder === bidder)
+      return bid ? getCurrencyData(bid).netCpm : null
+    }
+
+    const perfNavigation = performance.getEntriesByType('navigation')[0];
+
+    const auction = cache.getAuction(auctionId, adUnitCode);
+    const bdrs = auction.bdrs.split(',');
+    const bdrsTimeout = auction.bdrs_timeout || [];
+
+    cache.updateAuction(auctionId, adUnitCode, {
+      bdrs_bid: cache.getBiddersFromAuction(auctionId, adUnitCode).map(bidResponseMapper).join(','),
+      bdrs_cpm: cache.getBiddersFromAuction(auctionId, adUnitCode).map(bidCpmMapper).join(','),
+      // check timings at the end of the auction to leave time to the browser to update it
+      dom_i: Math.round(perfNavigation['domInteractive']) || null,
+      dom_c: Math.round(perfNavigation['domComplete']) || null,
+      loa_e: Math.round(perfNavigation['loadEventEnd']) || null,
+      bdrs_timeout: bdrs.map(b => bdrsTimeout.includes(b) ? '1' : '0').join(','),
+    });
+
+    sendNewBeacon(auctionId, adUnitCode);
+  });
+}
+
+function handlerBidWon(event) {
+  let auctionId = getTargetedAuctionId(event);
+
+  if (!guard.bidTracked(auctionId, event.adUnitCode)) {
+    return;
   }
 
-  cache.updateAuction(event.auctionId, event.adUnitCode, {
-    win_bdr: getAdapterNameForAlias(event.bidder),
+  const currencyData = getCurrencyData(event)
+
+  const adagioAuctionCacheId = (
+    (event.latestTargetedAuctionId && event.latestTargetedAuctionId !== event.auctionId)
+      ? cache.getAdagioAuctionId(event.auctionId)
+      : null);
+
+  const perfNavigation = performance.getEntriesByType('navigation')[0];
+
+  cache.updateAuction(auctionId, event.adUnitCode, {
+    win_bdr: event.bidder,
     win_mt: getMediaTypeAlias(event.mediaType),
     win_ban_sz: event.mediaType === BANNER ? `${event.width}x${event.height}` : null,
 
-    // ad server currency
-    win_cpm: event.cpm,
-    cur: event.currency,
-    cur_rate: adsCurRateToUSD,
+    win_net_cpm: currencyData.netCpm,
+    win_og_cpm: currencyData.orginalCpm,
+
+    // check timings at the end of the auction to leave time to the browser to update it
+    dom_i: Math.round(perfNavigation['domInteractive']) || null,
+    dom_c: Math.round(perfNavigation['domComplete']) || null,
+    loa_e: Math.round(perfNavigation['loadEventEnd']) || null,
 
-    // original currency from bidder
-    og_cpm: event.originalCpm,
-    og_cur: event.originalCurrency,
-    og_cur_rate: ogCurRateToUSD,
+    // cache bid id
+    auct_id_c: adagioAuctionCacheId,
   });
-  sendNewBeacon(event.auctionId, event.adUnitCode);
+  sendNewBeacon(auctionId, event.adUnitCode);
 };
 
 function handlerAdRender(event, isSuccess) {
-  const { auctionId, adUnitCode } = event.bid;
+  const { adUnitCode } = event.bid;
+  let auctionId = getTargetedAuctionId(event.bid);
+
   if (!guard.bidTracked(auctionId, adUnitCode)) {
     return;
   }
@@ -296,28 +408,108 @@ function handlerAdRender(event, isSuccess) {
   sendNewBeacon(auctionId, adUnitCode);
 };
 
+function handlerBidTimeout(args) {
+  args.forEach(event => {
+    const auction = cache.getAuction(event.auctionId, event.adUnitCode);
+    if (!auction) {
+      logWarn(`bid timeout on auction ${event.auctionId}, with adunitCode ${event.adUnitCode}: could not retrieve auction from cache`);
+      return;
+    }
+
+    // an array of bidder names is first created
+    // in AUCTION_END handler, this array is sorted
+    // and transformed in a comma-separated list.
+    const bdrsTimeout = auction.bdrs_timeout || [];
+    bdrsTimeout.push(event.bidder);
+    auction.bdrs_timeout = bdrsTimeout;
+  });
+};
+
+/**
+ * handlerPbsAnalytics add to the cache data coming from Adagio PBS AdResponse.
+ * The data is retrieved from an AnalyticsTag (set by a custom PBS module named `adg-pba`),
+ * located in the AdResponse at `response.ext.prebid.analytics.tags[].pba`.
+ */
+function handlerPbsAnalytics(event) {
+  const pbaByAdUnit = event.atag.find(e => {
+    return e.module === 'adg-pba'
+  })?.pba;
+
+  if (!pbaByAdUnit) {
+    return;
+  }
+
+  const adUnitCodes = cache.getAllAdUnitCodes(event.auctionId);
+
+  adUnitCodes.forEach(adUnitCode => {
+    const pba = pbaByAdUnit[adUnitCode]
+
+    if (isPlainObject(pba)) {
+      cache.updateAuction(event.auctionId, adUnitCode, {
+        ...addKeyPrefix(pba, 'e_')
+      });
+    }
+  })
+}
+
 /**
  * END HANDLERS
-*/
+ */
+
+/**
+ * @param {SlotRenderEndedEvent} event
+ * @returns {void}
+ */
+function gamSlotCallback(event) {
+  const { auctionId, adUnitCode } = cache.getAuctionIdByAdunit(event.slot.getAdUnitPath(), event.slot.getSlotElementId());
+  if (!auctionId) {
+    const slotName = `${event.slot.getAdUnitPath()} - ${event.slot.getSlotElementId()}`;
+    logWarn('Could not find configured ad unit matching GAM render of slot: ' + slotName);
+    return;
+  }
+
+  cache.updateAuction(auctionId, adUnitCode, {
+    adsrv: 'gam',
+    adsrv_empty: event.isEmpty
+  });
+
+  // This event can be triggered after AUCTION_END
+  // To make sure the data is sent, we must send a new beacon version.
+  const auction = cache.getAuction(auctionId, adUnitCode)
+  if (auction?.loa_e !== undefined) {
+    // loa_e = loadEventEnd
+    // It means the AUCTION_END has already been sent.
+    sendNewBeacon(auctionId, adUnitCode);
+  }
+}
 
 let adagioAdapter = Object.assign(adapter({ emptyUrl, analyticsType }), {
   track: function(event) {
     const { eventType, args } = event;
-
     try {
       switch (eventType) {
-        case CONSTANTS.EVENTS.AUCTION_INIT:
+        case EVENTS.AUCTION_INIT:
           handlerAuctionInit(args);
           break;
-        case CONSTANTS.EVENTS.BID_RESPONSE:
+        case EVENTS.BID_RESPONSE:
           handlerBidResponse(args);
           break;
-        case CONSTANTS.EVENTS.BID_WON:
+        case EVENTS.AUCTION_END:
+          handlerAuctionEnd(args);
+          break;
+        case EVENTS.BID_WON:
           handlerBidWon(args);
           break;
-        case CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED:
-        case CONSTANTS.EVENTS.AD_RENDER_FAILED:
-          handlerAdRender(args, eventType === CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED);
+        // AD_RENDER_SUCCEEDED seems redundant with BID_WON.
+        // case CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED:
+        case EVENTS.AD_RENDER_FAILED:
+          handlerAdRender(args, eventType === EVENTS.AD_RENDER_SUCCEEDED);
+          break;
+        case EVENTS.PBS_ANALYTICS:
+          handlerPbsAnalytics(args);
+          break;
+        case EVENTS.BID_TIMEOUT:
+          handlerBidTimeout(args);
           break;
       }
     } catch (error) {
@@ -326,7 +518,11 @@ let adagioAdapter = Object.assign(adapter({ emptyUrl, analyticsType }), {
 
     try {
       if (typeof args !== 'undefined' && events.indexOf(eventType) !== -1) {
-        adagioEnqueue('pb-analytics-event', { eventName: eventType, args });
+        _internal.getAdagioNs().queue.push({
+          action: 'pb-analytics-event',
+          data: { eventName: eventType, args },
+          ts: Date.now()
+        });
       }
     } catch (error) {
       logError('Error on Adagio Analytics Adapter - adagio.js', error);
@@ -337,20 +533,34 @@ let adagioAdapter = Object.assign(adapter({ emptyUrl, analyticsType }), {
 adagioAdapter.originEnableAnalytics = adagioAdapter.enableAnalytics;
 
 adagioAdapter.enableAnalytics = config => {
-  const w = (canAccessTopWindow()) ? getWindowTop() : getWindowSelf();
-  currentWindow = w;
+  _internal.getAdagioNs().versions.adagioAnalyticsAdapter = VERSION;
 
-  w.ADAGIO = w.ADAGIO || {};
-  w.ADAGIO.queue = w.ADAGIO.queue || [];
-  w.ADAGIO.versions = w.ADAGIO.versions || {};
-  w.ADAGIO.versions.adagioAnalyticsAdapter = VERSION;
+  let modules = getGlobal().installedModules;
+  if (modules && (!modules.length || modules.indexOf('adagioRtdProvider') === -1 || modules.indexOf('rtdModule') === -1)) {
+    logError('Adagio Analytics Adapter requires rtdModule & adagioRtdProvider modules which are not installed. No beacon will be sent');
+    return;
+  }
 
+  adagioAdapter.options = config.options || {};
+  if (!adagioAdapter.options.organizationId) {
+    logWarn('Adagio Analytics Adapter: organizationId is required and is missing will try to fallback on params.');
+  } else {
+    adagioAdapter.options.organizationId = adagioAdapter.options.organizationId.toString(); // allows publisher to pass it as a number
+  }
+  if (!adagioAdapter.options.site) {
+    logWarn('Adagio Analytics Adapter: site is required and is missing will try to fallback on params.');
+  } else if (typeof adagioAdapter.options.site !== 'string') {
+    logWarn('Adagio Analytics Adapter: site should be a string will try to fallback on params.');
+    adagioAdapter.options.site = undefined;
+  }
   adagioAdapter.originEnableAnalytics(config);
+
+  subscribeToGamSlotRenderEndedEvent(gamSlotCallback)
 }
 
 adapterManager.registerAnalyticsAdapter({
   adapter: adagioAdapter,
-  code: 'adagio',
+  code: ADAGIO_CODE,
   gvlid: ADAGIO_GVLID,
 });
 
diff --git a/modules/adagioAnalyticsAdapter.md b/modules/adagioAnalyticsAdapter.md
index 9fc2cb0bb88..916f9ec9c58 100644
--- a/modules/adagioAnalyticsAdapter.md
+++ b/modules/adagioAnalyticsAdapter.md
@@ -13,5 +13,9 @@ Analytics adapter for Adagio
 ```js
   pbjs.enableAnalytics({
     provider: 'adagio',
+    options: {
+      organizationId: '1000', // Required. Provided by Adagio
+      site: 'my-website', // Required. Provided by Adagio
+    }
   });
 ```
diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index 3de584a1195..d44c7e249d6 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -1,267 +1,47 @@
-import {find} from '../src/polyfill.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {
-  _map,
+  canAccessWindowTop,
   cleanObj,
   deepAccess,
   deepClone,
   generateUUID,
   getDNT,
-  getUniqueIdentifierStr,
   getWindowSelf,
-  getWindowTop,
-  inIframe,
   isArray,
   isFn,
-  isInteger,
   isNumber,
-  isArrayOfNums,
+  isStr,
   logError,
   logInfo,
   logWarn,
-  mergeDeep,
-  isStr,
 } from '../src/utils.js';
-import {config} from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {loadExternalScript} from '../src/adloader.js';
-import {verify} from 'criteo-direct-rsa-validate/build/verify.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {getRefererInfo, parseDomain} from '../src/refererDetection.js';
-import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {Renderer} from '../src/Renderer.js';
-import {OUTSTREAM} from '../src/video.js';
-import { getGlobal } from '../src/prebidGlobal.js';
+import { getRefererInfo, parseDomain } from '../src/refererDetection.js';
+import { OUTSTREAM, validateOrtbVideoFields } from '../src/video.js';
+import { Renderer } from '../src/Renderer.js';
+import { _ADAGIO } from '../libraries/adagioUtils/adagioUtils.js';
+import { config } from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { find } from '../src/polyfill.js';
+import { getGptSlotInfoForAdUnitCode } from '../libraries/gptUtils/gptUtils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { userSync } from '../src/userSync.js';
-import {getGptSlotInfoForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
 
 const BIDDER_CODE = 'adagio';
 const LOG_PREFIX = 'Adagio:';
-const FEATURES_VERSION = '1';
 export const ENDPOINT = 'https://mp.4dex.io/prebid';
 const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE, VIDEO];
-const ADAGIO_TAG_URL = 'https://script.4dex.io/localstore.js';
-const ADAGIO_LOCALSTORAGE_KEY = 'adagioScript';
 const GVLID = 617;
-export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 const BB_PUBLICATION = 'adagio';
 const BB_RENDERER_DEFAULT = 'renderer';
 export const BB_RENDERER_URL = `https://${BB_PUBLICATION}.bbvms.com/r/$RENDERER.js`;
 
-const MAX_SESS_DURATION = 30 * 60 * 1000;
-const ADAGIO_PUBKEY = 'AL16XT44Sfp+8SHVF1UdC7hydPSMVLMhsYknKDdwqq+0ToDSJrP0+Qh0ki9JJI2uYm/6VEYo8TJED9WfMkiJ4vf02CW3RvSWwc35bif2SK1L8Nn/GfFYr/2/GG/Rm0vUsv+vBHky6nuuYls20Og0HDhMgaOlXoQ/cxMuiy5QSktp';
-const ADAGIO_PUBKEY_E = 65537;
 const CURRENCY = 'USD';
 
-// This provide a whitelist and a basic validation of OpenRTB 2.6 options used by the Adagio SSP.
-// https://iabtechlab.com/wp-content/uploads/2022/04/OpenRTB-2-6_FINAL.pdf
-export const ORTB_VIDEO_PARAMS = {
-  'mimes': (value) => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
-  'minduration': (value) => isInteger(value),
-  'maxduration': (value) => isInteger(value),
-  'protocols': (value) => isArrayOfNums(value),
-  'w': (value) => isInteger(value),
-  'h': (value) => isInteger(value),
-  'startdelay': (value) => isInteger(value),
-  'placement': (value) => isInteger(value),
-  'linearity': (value) => isInteger(value),
-  'skip': (value) => [1, 0].includes(value),
-  'skipmin': (value) => isInteger(value),
-  'skipafter': (value) => isInteger(value),
-  'sequence': (value) => isInteger(value),
-  'battr': (value) => isArrayOfNums(value),
-  'maxextended': (value) => isInteger(value),
-  'minbitrate': (value) => isInteger(value),
-  'maxbitrate': (value) => isInteger(value),
-  'boxingallowed': (value) => isInteger(value),
-  'playbackmethod': (value) => isArrayOfNums(value),
-  'playbackend': (value) => isInteger(value),
-  'delivery': (value) => isInteger(value),
-  'pos': (value) => isInteger(value),
-  'api': (value) => isArrayOfNums(value)
-};
-
-let currentWindow;
-
-export const GlobalExchange = (function() {
-  let features;
-  let exchangeData = {};
-
-  return {
-    clearFeatures: function() {
-      features = undefined;
-    },
-
-    clearExchangeData: function() {
-      exchangeData = {};
-    },
-
-    getOrSetGlobalFeatures: function () {
-      if (!features) {
-        features = {
-          page_dimensions: getPageDimensions().toString(),
-          viewport_dimensions: getViewPortDimensions().toString(),
-          user_timestamp: getTimestampUTC().toString(),
-          dom_loading: getDomLoadingDuration().toString(),
-        }
-      }
-      return features;
-    },
-
-    prepareExchangeData(storageValue) {
-      const adagioStorage = JSON.parse(storageValue, function(name, value) {
-        if (name.charAt(0) !== '_' || name === '') {
-          return value;
-        }
-      });
-      let random = deepAccess(adagioStorage, 'session.rnd');
-      let newSession = false;
-
-      if (internal.isNewSession(adagioStorage)) {
-        newSession = true;
-        random = Math.random();
-      }
-
-      const data = {
-        session: {
-          new: newSession,
-          rnd: random
-        }
-      }
-
-      mergeDeep(exchangeData, adagioStorage, data);
-
-      internal.enqueue({
-        action: 'session',
-        ts: Date.now(),
-        data: exchangeData
-      });
-    },
-
-    getExchangeData() {
-      return exchangeData
-    }
-  };
-})();
-
-export function adagioScriptFromLocalStorageCb(ls) {
-  try {
-    if (!ls) {
-      logWarn(`${LOG_PREFIX} script not found.`);
-      return;
-    }
-
-    const hashRgx = /^(\/\/ hash: (.+)\n)(.+\n)$/;
-
-    if (!hashRgx.test(ls)) {
-      logWarn(`${LOG_PREFIX} no hash found.`);
-      storage.removeDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY);
-    } else {
-      const r = ls.match(hashRgx);
-      const hash = r[2];
-      const content = r[3];
-
-      if (verify(content, hash, ADAGIO_PUBKEY, ADAGIO_PUBKEY_E)) {
-        logInfo(`${LOG_PREFIX} start script.`);
-        Function(ls)(); // eslint-disable-line no-new-func
-      } else {
-        logWarn(`${LOG_PREFIX} invalid script found.`);
-        storage.removeDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY);
-      }
-    }
-  } catch (err) {
-    logError(LOG_PREFIX, err);
-  }
-}
-
-export function getAdagioScript() {
-  storage.getDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY, (ls) => {
-    internal.adagioScriptFromLocalStorageCb(ls);
-  });
-
-  storage.localStorageIsEnabled(isValid => {
-    if (isValid) {
-      loadExternalScript(ADAGIO_TAG_URL, BIDDER_CODE);
-    } else {
-      // Try-catch to avoid error when 3rd party cookies is disabled (e.g. in privacy mode)
-      try {
-        // ensure adagio removing for next time.
-        // It's an antipattern regarding the TCF2 enforcement logic
-        // but it's the only way to respect the user choice update.
-        window.localStorage.removeItem(ADAGIO_LOCALSTORAGE_KEY);
-        // Extra data from external script.
-        // This key is removed only if localStorage is not accessible.
-        window.localStorage.removeItem('adagio');
-      } catch (e) {
-        logInfo(`${LOG_PREFIX} unable to clear Adagio scripts from localstorage.`);
-      }
-    }
-  });
-}
-
-function canAccessTopWindow() {
-  try {
-    if (getWindowTop().location.href) {
-      return true;
-    }
-  } catch (error) {
-    return false;
-  }
-}
-
-function getCurrentWindow() {
-  return currentWindow || getWindowSelf();
-}
-
-function isSafeFrameWindow() {
-  const ws = getWindowSelf();
-  return !!(ws.$sf && ws.$sf.ext);
-}
-
-function initAdagio() {
-  if (canAccessTopWindow()) {
-    currentWindow = (canAccessTopWindow()) ? getWindowTop() : getWindowSelf();
-  }
-
-  const w = internal.getCurrentWindow();
-
-  w.ADAGIO = w.ADAGIO || {};
-  w.ADAGIO.adUnits = w.ADAGIO.adUnits || {};
-  w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits || [];
-  w.ADAGIO.queue = w.ADAGIO.queue || [];
-  w.ADAGIO.versions = w.ADAGIO.versions || {};
-  w.ADAGIO.versions.pbjs = '$prebid.version$';
-  w.ADAGIO.isSafeFrameWindow = isSafeFrameWindow();
-
-  storage.getDataFromLocalStorage('adagio', (storageData) => {
-    try {
-      GlobalExchange.prepareExchangeData(storageData);
-    } catch (e) {
-      logError(LOG_PREFIX, e);
-    }
-  });
-
-  getAdagioScript();
-}
-
-function enqueue(ob) {
-  const w = internal.getCurrentWindow();
-
-  w.ADAGIO = w.ADAGIO || {};
-  w.ADAGIO.queue = w.ADAGIO.queue || [];
-  w.ADAGIO.queue.push(ob);
-};
-
-function getPageviewId() {
-  const w = internal.getCurrentWindow();
-
-  w.ADAGIO = w.ADAGIO || {};
-  w.ADAGIO.pageviewId = w.ADAGIO.pageviewId || generateUUID();
-
-  return w.ADAGIO.pageviewId;
-};
-
+/**
+ * Returns the window.ADAGIO global object used to store Adagio data.
+ * This object is created in window.top if possible, otherwise in window.self.
+ */
 function getDevice() {
   const language = navigator.language ? 'language' : 'userLanguage';
   return {
@@ -283,30 +63,6 @@ function getSite(bidderRequest) {
   };
 };
 
-function getElementFromTopWindow(element, currentWindow) {
-  try {
-    if (getWindowTop() === currentWindow) {
-      if (!element.getAttribute('id')) {
-        element.setAttribute('id', `adg-${getUniqueIdentifierStr()}`);
-      }
-      return element;
-    } else {
-      const frame = currentWindow.frameElement;
-      const frameClientRect = frame.getBoundingClientRect();
-      const elementClientRect = element.getBoundingClientRect();
-
-      if (frameClientRect.width !== elementClientRect.width || frameClientRect.height !== elementClientRect.height) {
-        return false;
-      }
-
-      return getElementFromTopWindow(frame, currentWindow.parent);
-    }
-  } catch (err) {
-    logWarn(`${LOG_PREFIX}`, err);
-    return false;
-  }
-};
-
 function autoDetectAdUnitElementIdFromGpt(adUnitCode) {
   const autoDetectedAdUnit = getGptSlotInfoForAdUnitCode(adUnitCode);
 
@@ -331,42 +87,28 @@ function isRendererPreferredFromPublisher(bidRequest) {
 }
 
 /**
- *
- * @param {object} adagioStorage
- * @returns {boolean}
+ * Check if the publisher has defined its own video player and uses it for all ad-units.
+ * If not or if the `backupOnly` flag is true, this means we use our own player (BlueBillywig) defined in this adapter.
  */
-function isNewSession(adagioStorage) {
-  const now = Date.now();
-  const { lastActivityTime, vwSmplg } = deepAccess(adagioStorage, 'session', {});
-  return (
-    !isNumber(lastActivityTime) ||
-    !isNumber(vwSmplg) ||
-    (now - lastActivityTime) > MAX_SESS_DURATION
-  )
+function getPlayerName(bidRequest) {
+  return _internal.isRendererPreferredFromPublisher(bidRequest) ? 'other' : 'adagio'; ;
 }
 
-function setPlayerName(bidRequest) {
-  const playerName = (internal.isRendererPreferredFromPublisher(bidRequest)) ? 'other' : 'adagio';
-
-  if (playerName === 'other') {
-    logWarn(`${LOG_PREFIX} renderer.backupOnly has not been set. Adagio recommends to use its own player to get expected behavior.`);
-  }
-
-  return playerName;
-}
+function hasRtd() {
+  const rtdConfigs = config.getConfig('realTimeData.dataProviders') || [];
+  return rtdConfigs.find(provider => provider.name === 'adagio');
+};
 
-export const internal = {
-  enqueue,
-  getPageviewId,
+export const _internal = {
+  canAccessWindowTop,
+  getAdagioNs: function() {
+    return _ADAGIO;
+  },
   getDevice,
   getSite,
-  getElementFromTopWindow,
   getRefererInfo,
-  adagioScriptFromLocalStorageCb,
-  getCurrentWindow,
-  canAccessTopWindow,
+  hasRtd,
   isRendererPreferredFromPublisher,
-  isNewSession
 };
 
 function _getGdprConsent(bidderRequest) {
@@ -399,17 +141,6 @@ function _getUspConsent(bidderRequest) {
   return (deepAccess(bidderRequest, 'uspConsent')) ? { uspConsent: bidderRequest.uspConsent } : false;
 }
 
-function _getGppConsent(bidderRequest) {
-  let gpp = deepAccess(bidderRequest, 'gppConsent.gppString')
-  let gppSid = deepAccess(bidderRequest, 'gppConsent.applicableSections')
-
-  if (!gpp || !gppSid) {
-    gpp = deepAccess(bidderRequest, 'ortb2.regs.gpp', '')
-    gppSid = deepAccess(bidderRequest, 'ortb2.regs.gpp_sid', [])
-  }
-  return { gpp, gppSid }
-}
-
 function _getSchain(bidRequest) {
   return deepAccess(bidRequest, 'schain');
 }
@@ -420,6 +151,12 @@ function _getEids(bidRequest) {
   }
 }
 
+/**
+ * Merge and compute video params set at mediaTypes and bidder params level
+ *
+ * @param {object} bidRequest - copy of the original bidRequest object.
+ * @returns {void}
+ */
 function _buildVideoBidRequest(bidRequest) {
   const videoAdUnitParams = deepAccess(bidRequest, 'mediaTypes.video', {});
   const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
@@ -440,22 +177,11 @@ function _buildVideoBidRequest(bidRequest) {
   };
 
   if (videoParams.context && videoParams.context === OUTSTREAM) {
-    bidRequest.mediaTypes.video.playerName = setPlayerName(bidRequest);
+    videoParams.playerName = getPlayerName(bidRequest);
   }
 
-  // Only whitelisted OpenRTB options need to be validated.
-  // Other options will still remain in the `mediaTypes.video` object
-  // sent in the ad-request, but will be ignored by the SSP.
-  Object.keys(ORTB_VIDEO_PARAMS).forEach(paramName => {
-    if (videoParams.hasOwnProperty(paramName)) {
-      if (ORTB_VIDEO_PARAMS[paramName](videoParams[paramName])) {
-        bidRequest.mediaTypes.video[paramName] = videoParams[paramName];
-      } else {
-        delete bidRequest.mediaTypes.video[paramName];
-        logWarn(`${LOG_PREFIX} The OpenRTB video param ${paramName} has been skipped due to misformating. Please refer to OpenRTB 2.5 spec.`);
-      }
-    }
-  });
+  bidRequest.mediaTypes.video = videoParams;
+  validateOrtbVideoFields(bidRequest);
 }
 
 function _parseNativeBidResponse(bid) {
@@ -569,6 +295,7 @@ function _parseNativeBidResponse(bid) {
   bid.native = native
 }
 
+// bidRequest param must be the `bidRequest` object with the original `auctionId` value.
 function _getFloors(bidRequest) {
   if (!isFn(bidRequest.getFloor)) {
     return false;
@@ -586,7 +313,7 @@ function _getFloors(bidRequest) {
     floors.push(cleanObj({
       mt: mediaType,
       s: isArray(size) ? `${size[0]}x${size[1]}` : undefined,
-      f: (!isNaN(info.floor) && info.currency === CURRENCY) ? info.floor : undefined
+      f: (!isNaN(info?.floor) && info?.currency === CURRENCY) ? info?.floor : undefined
     }));
   }
 
@@ -659,13 +386,14 @@ function autoFillParams(bid) {
     bid.params.site = adgGlobalConf.siteId.split(':')[1];
   }
 
-  // Edge case. Useful when Prebid Manager cannot handle properly params setting…
-  if (adgGlobalConf.useAdUnitCodeAsPlacement === true || bid.params.useAdUnitCodeAsPlacement === true) {
+  // `useAdUnitCodeAsPlacement` is an edge case. Useful when a Prebid Manager cannot handle properly params setting.
+  // In Prebid.js 9, `placement` should be defined in ortb2Imp and the `useAdUnitCodeAsPlacement` param should be removed
+  bid.params.placement = deepAccess(bid, 'ortb2Imp.ext.data.placement', bid.params.placement);
+  if (!bid.params.placement && (adgGlobalConf.useAdUnitCodeAsPlacement === true || bid.params.useAdUnitCodeAsPlacement === true)) {
     bid.params.placement = bid.adUnitCode;
   }
 
-  bid.params.adUnitElementId = deepAccess(bid, 'ortb2Imp.ext.data.elementId', null) || bid.params.adUnitElementId;
-
+  bid.params.adUnitElementId = deepAccess(bid, 'ortb2Imp.ext.data.divId', bid.params.adUnitElementId);
   if (!bid.params.adUnitElementId) {
     if (adgGlobalConf.useAdUnitCodeAsAdUnitElementId === true || bid.params.useAdUnitCodeAsAdUnitElementId === true) {
       bid.params.adUnitElementId = bid.adUnitCode;
@@ -679,213 +407,6 @@ function autoFillParams(bid) {
   setExtraParam(bid, 'category');
 }
 
-function getPageDimensions() {
-  if (isSafeFrameWindow() || !canAccessTopWindow()) {
-    return '';
-  }
-
-  // the page dimension can be computed on window.top only.
-  const wt = getWindowTop();
-  const body = wt.document.querySelector('body');
-
-  if (!body) {
-    return '';
-  }
-  const html = wt.document.documentElement;
-  const pageWidth = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth);
-  const pageHeight = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight);
-
-  return `${pageWidth}x${pageHeight}`;
-}
-
-/**
-* @todo Move to prebid Core as Utils.
-* @returns
-*/
-function getViewPortDimensions() {
-  if (!isSafeFrameWindow() && !canAccessTopWindow()) {
-    return '';
-  }
-
-  const viewportDims = { w: 0, h: 0 };
-
-  if (isSafeFrameWindow()) {
-    const ws = getWindowSelf();
-
-    if (typeof ws.$sf.ext.geom !== 'function') {
-      logWarn(LOG_PREFIX, 'Unable to compute from safeframe api.');
-      return '';
-    }
-
-    const sfGeom = ws.$sf.ext.geom();
-
-    if (!sfGeom || !sfGeom.win) {
-      logWarn(LOG_PREFIX, 'Unable to compute from safeframe api. Missing `geom().win` property');
-      return '';
-    }
-
-    viewportDims.w = Math.round(sfGeom.w);
-    viewportDims.h = Math.round(sfGeom.h);
-  } else {
-    // window.top based computing
-    const wt = getWindowTop();
-    viewportDims.w = wt.innerWidth;
-    viewportDims.h = wt.innerHeight;
-  }
-
-  return `${viewportDims.w}x${viewportDims.h}`;
-}
-
-function getSlotPosition(adUnitElementId) {
-  if (!adUnitElementId) {
-    return '';
-  }
-
-  if (!isSafeFrameWindow() && !canAccessTopWindow()) {
-    return '';
-  }
-
-  const position = { x: 0, y: 0 };
-
-  if (isSafeFrameWindow()) {
-    const ws = getWindowSelf();
-
-    if (typeof ws.$sf.ext.geom !== 'function') {
-      logWarn(LOG_PREFIX, 'Unable to compute from safeframe api.');
-      return '';
-    }
-
-    const sfGeom = ws.$sf.ext.geom();
-
-    if (!sfGeom || !sfGeom.self) {
-      logWarn(LOG_PREFIX, 'Unable to compute from safeframe api. Missing `geom().self` property');
-      return '';
-    }
-
-    position.x = Math.round(sfGeom.t);
-    position.y = Math.round(sfGeom.l);
-  } else if (canAccessTopWindow()) {
-    try {
-      // window.top based computing
-      const wt = getWindowTop();
-      const d = wt.document;
-
-      let domElement;
-
-      if (inIframe() === true) {
-        const ws = getWindowSelf();
-        const currentElement = ws.document.getElementById(adUnitElementId);
-        domElement = internal.getElementFromTopWindow(currentElement, ws);
-      } else {
-        domElement = wt.document.getElementById(adUnitElementId);
-      }
-
-      if (!domElement) {
-        return '';
-      }
-
-      let box = domElement.getBoundingClientRect();
-
-      const docEl = d.documentElement;
-      const body = d.body;
-      const clientTop = d.clientTop || body.clientTop || 0;
-      const clientLeft = d.clientLeft || body.clientLeft || 0;
-      const scrollTop = wt.pageYOffset || docEl.scrollTop || body.scrollTop;
-      const scrollLeft = wt.pageXOffset || docEl.scrollLeft || body.scrollLeft;
-
-      const elComputedStyle = wt.getComputedStyle(domElement, null);
-      const elComputedDisplay = elComputedStyle.display || 'block';
-      const mustDisplayElement = elComputedDisplay === 'none';
-
-      if (mustDisplayElement) {
-        domElement.style = domElement.style || {};
-        const originalDisplay = domElement.style.display;
-        domElement.style.display = 'block';
-        box = domElement.getBoundingClientRect();
-        domElement.style.display = originalDisplay || null;
-      }
-      position.x = Math.round(box.left + scrollLeft - clientLeft);
-      position.y = Math.round(box.top + scrollTop - clientTop);
-    } catch (err) {
-      logError(LOG_PREFIX, err);
-      return '';
-    }
-  } else {
-    return '';
-  }
-
-  return `${position.x}x${position.y}`;
-}
-
-function getTimestampUTC() {
-  // timestamp returned in seconds
-  return Math.floor(new Date().getTime() / 1000) - new Date().getTimezoneOffset() * 60;
-}
-
-function getPrintNumber(adUnitCode, bidderRequest) {
-  if (!bidderRequest.bids || !bidderRequest.bids.length) {
-    return 1;
-  }
-  const adagioBid = find(bidderRequest.bids, bid => bid.adUnitCode === adUnitCode);
-  return adagioBid.bidderRequestsCount || 1;
-}
-
-/**
-  * domLoading feature is computed on window.top if reachable.
-  */
-function getDomLoadingDuration() {
-  let domLoadingDuration = -1;
-  let performance;
-
-  performance = (canAccessTopWindow()) ? getWindowTop().performance : getWindowSelf().performance;
-
-  if (performance && performance.timing && performance.timing.navigationStart > 0) {
-    const val = performance.timing.domLoading - performance.timing.navigationStart;
-    if (val > 0) {
-      domLoadingDuration = val;
-    }
-  }
-
-  return domLoadingDuration;
-}
-
-function storeRequestInAdagioNS(bidRequest) {
-  const w = getCurrentWindow();
-  // Store adUnits config.
-  // If an adUnitCode has already been stored, it will be replaced.
-  w.ADAGIO = w.ADAGIO || {};
-  w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits.filter((adUnit) => adUnit.code !== bidRequest.adUnitCode);
-
-  let printNumber
-  if (bidRequest.features && bidRequest.features.print_number) {
-    printNumber = bidRequest.features.print_number;
-  } else if (bidRequest.params.features && bidRequest.params.features.print_number) {
-    printNumber = bidRequest.params.features.print_number;
-  }
-
-  w.ADAGIO.pbjsAdUnits.push({
-    code: bidRequest.adUnitCode,
-    mediaTypes: bidRequest.mediaTypes || {},
-    sizes: (bidRequest.mediaTypes && bidRequest.mediaTypes.banner && Array.isArray(bidRequest.mediaTypes.banner.sizes)) ? bidRequest.mediaTypes.banner.sizes : bidRequest.sizes,
-    bids: [{
-      bidder: bidRequest.bidder,
-      params: bidRequest.params // use the updated bid.params object with auto-detected params
-    }],
-    auctionId: bidRequest.auctionId, // this auctionId has been generated by adagioBidAdapter
-    pageviewId: internal.getPageviewId(),
-    printNumber,
-    localPbjs: '$$PREBID_GLOBAL$$',
-    localPbjsRef: getGlobal()
-  });
-
-  // (legacy) Store internal adUnit information
-  w.ADAGIO.adUnits[bidRequest.adUnitCode] = {
-    auctionId: bidRequest.auctionId, // this auctionId has been generated by adagioBidAdapter
-    pageviewId: internal.getPageviewId(),
-    printNumber,
-  };
-}
-
 // See https://support.bluebillywig.com/developers/vast-renderer/
 const OUTSTREAM_RENDERER = {
   bootstrapPlayer: function(bid) {
@@ -967,9 +488,9 @@ export const spec = {
 
     autoFillParams(bid);
 
+    // Note: `bid.params.placement` is not related to the video param `placement`.
     if (!(bid.params.organizationId && bid.params.site && bid.params.placement)) {
       logWarn(`${LOG_PREFIX} at least one required param is missing.`);
-      // internal.enqueue(debugData());
       return false;
     }
 
@@ -981,33 +502,37 @@ export const spec = {
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
 
     const secure = (location.protocol === 'https:') ? 1 : 0;
-    const device = internal.getDevice();
-    const site = internal.getSite(bidderRequest);
-    const pageviewId = internal.getPageviewId();
+    const device = _internal.getDevice();
+    const site = _internal.getSite(bidderRequest);
+    const pageviewId = _internal.getAdagioNs().pageviewId;
     const gdprConsent = _getGdprConsent(bidderRequest) || {};
     const uspConsent = _getUspConsent(bidderRequest) || {};
     const coppa = _getCoppa();
-    const gppConsent = _getGppConsent(bidderRequest)
+    const { gpp, gpp_sid: gppSid } = deepAccess(bidderRequest, 'ortb2.regs', {});
     const schain = _getSchain(validBidRequests[0]);
     const eids = _getEids(validBidRequests[0]) || [];
     const syncEnabled = deepAccess(config.getConfig('userSync'), 'syncEnabled')
-    const usIfr = syncEnabled && userSync.canBidderRegisterSync('iframe', 'adagio')
+    const canSyncWithIframe = syncEnabled && userSync.canBidderRegisterSync('iframe', 'adagio')
+
+    // We don't validate the dsa object in adapter and let our server do it.
+    const dsa = deepAccess(bidderRequest, 'ortb2.regs.ext.dsa');
+
+    // If no session data is provided, we always generate a new one.
+    const sessionData = deepAccess(bidderRequest, 'ortb2.site.ext.data.adg_rtd.session', {});
+    if (!Object.keys(sessionData).length) {
+      logInfo(LOG_PREFIX, 'No session data provided. A new session is be generated.')
+      sessionData.new = true;
+      sessionData.rnd = Math.random()
+    }
 
-    const aucId = generateUUID()
+    const aucId = deepAccess(bidderRequest, 'ortb2.site.ext.data.adg_rtd.uid') || generateUUID()
 
-    const adUnits = _map(validBidRequests, (rawBidRequest) => {
+    const adUnits = validBidRequests.map(rawBidRequest => {
       const bidRequest = deepClone(rawBidRequest);
 
       // Fix https://github.com/prebid/Prebid.js/issues/9781
       bidRequest.auctionId = aucId
 
-      const globalFeatures = GlobalExchange.getOrSetGlobalFeatures();
-      const features = {
-        ...globalFeatures,
-        print_number: getPrintNumber(bidRequest.adUnitCode, bidderRequest).toString(),
-        adunit_position: getSlotPosition(bidRequest.params.adUnitElementId) // adUnitElementId à déplacer ???
-      };
-
       // Force the Split Keyword to be a String
       if (bidRequest.params.splitKeyword) {
         if (isStr(bidRequest.params.splitKeyword) || isNumber(bidRequest.params.splitKeyword)) {
@@ -1019,6 +544,9 @@ export const spec = {
         }
       }
 
+      // Enforce the organizationId param to be a string
+      bidRequest.params.organizationId = bidRequest.params.organizationId.toString();
+
       // Force the Data Layer key and value to be a String
       if (bidRequest.params.dataLayer) {
         if (isStr(bidRequest.params.dataLayer) || isNumber(bidRequest.params.dataLayer) || isArray(bidRequest.params.dataLayer) || isFn(bidRequest.params.dataLayer)) {
@@ -1048,26 +576,11 @@ export const spec = {
         }
       }
 
-      Object.keys(features).forEach((prop) => {
-        if (features[prop] === '') {
-          delete features[prop];
-        }
-      });
-
-      bidRequest.features = features;
-
-      internal.enqueue({
-        action: 'features',
-        ts: Date.now(),
-        data: {
-          features: bidRequest.features,
-          params: bidRequest.params,
-          adUnitCode: bidRequest.adUnitCode
-        }
-      });
-
       // Handle priceFloors module
-      const computedFloors = _getFloors(bidRequest);
+      // We need to use `rawBidRequest` as param because:
+      // - adagioBidAdapter generates its own auctionId due to transmitTid activity limitation (see https://github.com/prebid/Prebid.js/pull/10079)
+      // - the priceFloors.getFloor() uses a `_floorDataForAuction` map to store the floors based on the auctionId.
+      const computedFloors = _getFloors(rawBidRequest);
       if (isArray(computedFloors) && computedFloors.length) {
         bidRequest.floors = computedFloors
 
@@ -1111,30 +624,47 @@ export const spec = {
         _buildVideoBidRequest(bidRequest);
       }
 
-      storeRequestInAdagioNS(bidRequest);
+      const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid') || deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
+      if (gpid) {
+        bidRequest.gpid = gpid;
+      }
 
-      // Remove these fields at the very end, so we can still use them before.
-      delete bidRequest.transactionId;
-      delete bidRequest.ortb2Imp;
-      delete bidRequest.ortb2;
-      delete bidRequest.sizes;
+      // features are added by the adagioRtdProvider.
+      const rawFeatures = {
+        ...deepAccess(bidRequest, 'ortb2.site.ext.data.adg_rtd.features', {}),
+        print_number: (bidRequest.bidderRequestsCount || 1).toString(),
+        adunit_position: deepAccess(bidRequest, 'ortb2Imp.ext.data.adg_rtd.adunit_position', null)
+      }
+      // Clean the features object from null or undefined values.
+      bidRequest.features = Object.entries(rawFeatures).reduce((a, [k, v]) => (v == null ? a : (a[k] = v, a)), {})
+
+      // Remove some params that are not needed on the server side.
+      delete bidRequest.params.siteId;
+
+      // whitelist the fields that are allowed to be sent to the server.
+      const adUnit = {
+        adUnitCode: bidRequest.adUnitCode,
+        auctionId: bidRequest.auctionId,
+        bidder: bidRequest.bidder,
+        bidId: bidRequest.bidId,
+        params: bidRequest.params,
+        features: bidRequest.features,
+        gpid: bidRequest.gpid,
+        mediaTypes: bidRequest.mediaTypes,
+        nativeParams: bidRequest.nativeParams,
+        score: bidRequest.score,
+        transactionId: bidRequest.transactionId,
+      }
 
-      return bidRequest;
+      return adUnit;
     });
 
     // Group ad units by organizationId
     const groupedAdUnits = adUnits.reduce((groupedAdUnits, adUnit) => {
-      const adUnitCopy = deepClone(adUnit);
-      adUnitCopy.params.organizationId = adUnitCopy.params.organizationId.toString();
-
-      // remove useless props
-      delete adUnitCopy.floorData;
-      delete adUnitCopy.params.siteId;
-      delete adUnitCopy.userId;
-      delete adUnitCopy.userIdAsEids;
+      const organizationId = adUnit.params.organizationId
 
-      groupedAdUnits[adUnitCopy.params.organizationId] = groupedAdUnits[adUnitCopy.params.organizationId] || [];
-      groupedAdUnits[adUnitCopy.params.organizationId].push(adUnitCopy);
+      groupedAdUnits[organizationId] = groupedAdUnits[organizationId] || [];
+      groupedAdUnits[organizationId].push(adUnit);
 
       return groupedAdUnits;
     }, {});
@@ -1143,38 +673,39 @@ export const spec = {
     // Those params are not sent to the server.
     // They are used for further operations on analytics adapter.
     validBidRequests.forEach(rawBidRequest => {
-      rawBidRequest.params.adagioAuctionId = aucId
       rawBidRequest.params.pageviewId = pageviewId
     });
 
     // Build one request per organizationId
-    const requests = _map(Object.keys(groupedAdUnits), organizationId => {
+    const requests = Object.keys(groupedAdUnits).map(organizationId => {
       return {
         method: 'POST',
         url: ENDPOINT,
         data: {
           organizationId: organizationId,
+          hasRtd: _internal.hasRtd() ? 1 : 0,
           secure: secure,
           device: device,
           site: site,
           pageviewId: pageviewId,
           adUnits: groupedAdUnits[organizationId],
-          data: GlobalExchange.getExchangeData(),
+          data: {
+            session: sessionData
+          },
           regs: {
             gdpr: gdprConsent,
             coppa: coppa,
             ccpa: uspConsent,
-            gpp: gppConsent.gpp,
-            gppSid: gppConsent.gppSid
+            gpp: gpp || '',
+            gppSid: gppSid || [],
+            dsa: dsa // populated if exists
           },
           schain: schain,
           user: {
             eids: eids
           },
           prebidVersion: '$prebid.version$',
-          featuresVersion: FEATURES_VERSION,
-          usIfr: usIfr,
-          adgjs: storage.localStorageIsEnabled()
+          usIfr: canSyncWithIframe
         },
         options: {
           contentType: 'text/plain'
@@ -1191,17 +722,20 @@ export const spec = {
       const response = serverResponse.body;
       if (response) {
         if (response.data) {
-          internal.enqueue({
-            action: 'ssp-data',
-            ts: Date.now(),
-            data: response.data
-          });
+          if (_internal.hasRtd()) {
+            _internal.getAdagioNs().queue.push({
+              action: 'ssp-data',
+              ts: Date.now(),
+              data: response.data
+            });
+          }
         }
         if (response.bids) {
           response.bids.forEach(bidObj => {
             const bidReq = (find(bidRequest.data.adUnits, bid => bid.bidId === bidObj.requestId));
 
             if (bidReq) {
+              // bidObj.meta is the `bidResponse.meta` object according to https://docs.prebid.org/dev-docs/bidder-adaptor.html#interpreting-the-response
               bidObj.meta = deepAccess(bidObj, 'meta', {});
               bidObj.meta.mediaType = bidObj.mediaType;
               bidObj.meta.advertiserDomains = (Array.isArray(bidObj.aDomain) && bidObj.aDomain.length) ? bidObj.aDomain : [];
@@ -1256,22 +790,6 @@ export const spec = {
 
     return syncs;
   },
-
-  /**
-   * Handle custom logic in s2s context
-   *
-   * @param {*} params
-   * @param {boolean} isOrtb Is an s2s context
-   * @param {*} adUnit
-   * @param {*} bidRequests
-   * @returns {object} updated params
-   */
-  transformBidParams(params, isOrtb, adUnit, bidRequests) {
-    // We do not have a prebid server adapter. So let's return unchanged params.
-    return params;
-  }
 };
 
-initAdagio();
-
 registerBidder(spec);
diff --git a/modules/adagioBidAdapter.md b/modules/adagioBidAdapter.md
index 45f39fc6f2d..19673571982 100644
--- a/modules/adagioBidAdapter.md
+++ b/modules/adagioBidAdapter.md
@@ -107,10 +107,11 @@ var adUnits = [
           cpm: 3.00 // default to 1.00
         },
         video: {
-          api: [2, 7], // Required - Your video player must at least support the value 2 and/or 7.
+          api: [2], // Required - Your video player must at least support the value 2
           playbackMethod: [6], // Highly recommended
           skip: 0
-          // OpenRTB video options defined here override ones defined in mediaTypes.
+          // OpenRTB 2.5 video options defined here override ones defined in mediaTypes.
+          // Not supported: 'protocol', 'companionad', 'companiontype', 'ext'
         },
         native: {
           // Optional OpenRTB Native 1.2 request object. Only `context`, `plcmttype` fields are supported.
@@ -193,6 +194,8 @@ If the FPD value is an array, the 1st value of this array will be used.
           placement: 'in_article',
           adUnitElementId: 'article_outstream',
           video: {
+            api: [2],
+            playbackMethod: [6],
             skip: 0
           },
           debug: {
diff --git a/modules/adagioRtdProvider.js b/modules/adagioRtdProvider.js
new file mode 100644
index 00000000000..ee81e1337dd
--- /dev/null
+++ b/modules/adagioRtdProvider.js
@@ -0,0 +1,740 @@
+/**
+ * This module adds the adagio provider to the Real Time Data module (rtdModule).
+ * The {@link module:modules/realTimeData} module is required.
+ * @module modules/adagioRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+import adapterManager from '../src/adapterManager.js';
+import { loadExternalScript } from '../src/adloader.js';
+import { submodule } from '../src/hook.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { getStorageManager } from '../src/storageManager.js';
+import {
+  canAccessWindowTop,
+  deepAccess,
+  deepSetValue,
+  generateUUID,
+  getDomLoadingDuration,
+  getSafeframeGeometry,
+  getUniqueIdentifierStr,
+  getWindowSelf,
+  getWindowTop,
+  inIframe,
+  isNumber,
+  isSafeFrameWindow,
+  isStr,
+  prefixLog
+} from '../src/utils.js';
+import { _ADAGIO, getBestWindowForAdagio } from '../libraries/adagioUtils/adagioUtils.js';
+import { getGptSlotInfoForAdUnitCode } from '../libraries/gptUtils/gptUtils.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ * @typedef {import('../modules/rtdModule/index.js').adUnit} adUnit
+ */
+const SUBMODULE_NAME = 'adagio';
+const ADAGIO_BIDDER_CODE = 'adagio';
+const GVLID = 617;
+const SCRIPT_URL = 'https://script.4dex.io/a/latest/adagio.js';
+const LATEST_ABTEST_VERSION = 2;
+export const PLACEMENT_SOURCES = {
+  ORTB: 'ortb', // implicit default, not used atm.
+  ADUNITCODE: 'code',
+  GPID: 'gpid'
+};
+export const storage = getStorageManager({ moduleType: MODULE_TYPE_RTD, moduleName: SUBMODULE_NAME });
+
+const { logError, logWarn } = prefixLog('AdagioRtdProvider:');
+
+// Guard to avoid storing the same bid data several times.
+const guard = new Set();
+
+/**
+ * Store the sampling data.
+ * This data is used to determine if beacons should be sent to adagio.
+ * The sampling data
+ */
+const _SESSION = (function() {
+  /**
+   * @type {SessionData}
+   */
+  const data = {
+    session: {}
+  };
+
+  return {
+    init: () => {
+      // helper function to determine if the session is new.
+      const isNewSession = (expiry) => {
+        return (!isNumber(expiry) || Date.now() > expiry);
+      };
+
+      storage.getDataFromLocalStorage('adagio', (storageValue) => {
+        // session can be an empty object
+        const { rnd, vwSmplg, vwSmplgNxt, expiry, lastActivityTime, id, pages, testName: legacyTestName, testVersion: legacyTestVersion } = _internal.getSessionFromLocalStorage(storageValue);
+
+        const isNewSess = isNewSession(expiry);
+
+        // if lastActivityTime is defined it means that the website is using the original version of the snippet
+        const v = !lastActivityTime ? LATEST_ABTEST_VERSION : undefined;
+
+        data.session = {
+          v,
+          rnd,
+          pages: pages || 1,
+          new: isNewSess, // legacy: `new` was used but the choosen name is not good.
+          // Don't use values if they are not defined.
+          ...(vwSmplg !== undefined && { vwSmplg }),
+          ...(vwSmplgNxt !== undefined && { vwSmplgNxt }),
+          ...(expiry !== undefined && { expiry }),
+          ...(lastActivityTime !== undefined && { lastActivityTime }), // legacy: used by older version of the snippet
+          ...(id !== undefined && { id }),
+        };
+
+        if (isNewSess) {
+          data.session.new = true;
+          data.session.id = generateUUID();
+          data.session.rnd = Math.random();
+        }
+
+        const { testName, testVersion, expiry: abTestExpiry, sessionId } = _internal.getAbTestFromLocalStorage(storageValue);
+        if (v === LATEST_ABTEST_VERSION) {
+          if (abTestExpiry && abTestExpiry > Date.now() && (!sessionId || sessionId === data.session.id)) { // if AbTest didn't set a session id, it's probably because it's a new one and it didn't retrieve it yet, assume it's okay to get test Name and Version.
+            data.session.testName = testName;
+            data.session.testVersion = testVersion;
+          }
+        } else {
+          data.session.testName = legacyTestName;
+          data.session.testVersion = legacyTestVersion;
+        }
+
+        _internal.getAdagioNs().queue.push({
+          action: 'session',
+          ts: Date.now(),
+          data: {
+            session: {
+              ...data.session
+            }
+          }
+        });
+      });
+    },
+    get: function() {
+      return data.session;
+    }
+  };
+})();
+
+const _FEATURES = (function() {
+  /**
+   * @type {Features}
+   */
+  const features = {
+    initialized: false,
+    data: {},
+  };
+
+  return {
+    // reset is used for testing purpose
+    reset: function() {
+      features.initialized = false;
+      features.data = {};
+    },
+    get: function() {
+      const w = getBestWindowForAdagio();
+
+      if (!features.initialized) {
+        features.data = {
+          page_dimensions: getPageDimensions().toString(),
+          viewport_dimensions: getViewPortDimensions().toString(),
+          user_timestamp: getTimestampUTC().toString(),
+          dom_loading: getDomLoadingDuration(w).toString(),
+        };
+        features.initialized = true;
+      }
+
+      return { ...features.data };
+    }
+  };
+})();
+
+export const _internal = {
+  getAdagioNs: function() {
+    return _ADAGIO;
+  },
+
+  getSession: function() {
+    return _SESSION;
+  },
+
+  getFeatures: function() {
+    return _FEATURES;
+  },
+
+  getGuard: function() {
+    return guard;
+  },
+
+  /**
+   * Ensure that the bidder is Adagio.
+   *
+   * @param {string} alias
+   * @returns {boolean}
+   */
+  isAdagioBidder: function (alias) {
+    if (!alias) {
+      return false;
+    }
+    return (alias + adapterManager.aliasRegistry[alias]).toLowerCase().includes(ADAGIO_BIDDER_CODE);
+  },
+
+  /**
+   * Returns the session data from the localStorage.
+   *
+   * @param {string} storageValue - The value stored in the localStorage.
+   * @returns {Session}
+   */
+  getSessionFromLocalStorage: function(storageValue) {
+    const _default = {
+      new: true,
+      rnd: Math.random()
+    };
+
+    const obj = this.getObjFromStorageValue(storageValue);
+
+    return (!obj || !obj.session) ? _default : obj.session;
+  },
+
+  /**
+   * Returns the abTest data from the localStorage.
+   *
+   * @param {string} storageValue - The value stored in the localStorage.
+   * @returns {AbTest}
+   */
+  getAbTestFromLocalStorage: function(storageValue) {
+    const obj = this.getObjFromStorageValue(storageValue);
+
+    return (!obj || !obj.abTest) ? {} : obj.abTest;
+  },
+
+  /**
+   * Returns the parsed data from the localStorage.
+   *
+   * @param {string} storageValue - The value stored in the localStorage.
+   * @returns {Object}
+   */
+  getObjFromStorageValue: function(storageValue) {
+    return JSON.parse(storageValue, function(name, value) {
+      if (name.charAt(0) !== '_' || name === '') {
+        return value;
+      }
+    });
+  }
+};
+
+function loadAdagioScript(config) {
+  storage.localStorageIsEnabled(isValid => {
+    if (!isValid) {
+      return;
+    }
+
+    loadExternalScript(SCRIPT_URL, MODULE_TYPE_RTD, SUBMODULE_NAME, undefined, undefined, {
+      id: `adagiojs-${getUniqueIdentifierStr()}`,
+      'data-pid': config.params.organizationId
+    });
+  });
+}
+
+/**
+ * Initialize the Adagio RTD Module.
+ * @param {Object} config
+ * @param {Object} _userConsent
+ * @returns {boolean}
+ */
+function init(config, _userConsent) {
+  if (!isStr(config.params?.organizationId) || !isStr(config.params?.site)) {
+    logError('organizationId is required and must be a string.');
+    return false;
+  }
+
+  _internal.getAdagioNs().hasRtd = true;
+
+  _internal.getSession().init();
+
+  registerEventsForAdServers(config);
+
+  loadAdagioScript(config);
+
+  return true;
+}
+
+/**
+ * onBidRequest is called for each bidder during an auction and contains the bids for that bidder.
+ *
+ * @param {*} bidderRequest
+ * @param {*} config
+ * @param {*} _userConsent
+ */
+function onBidRequest(bidderRequest, config, _userConsent) {
+  // setTimeout trick to ensure that the `bidderRequest.params` values updated by a bidder adapter are taken into account.
+  // @todo: Check why we have to do it like this, and if there is a better way. Check how the event is dispatched in rtdModule/index.js
+  setTimeout(() => {
+    bidderRequest.bids.forEach(bid => {
+      const uid = deepAccess(bid, 'ortb2.site.ext.data.adg_rtd.uid');
+      if (!uid) {
+        logError('The `uid` is required to store the request in the ADAGIO namespace.');
+        return;
+      }
+
+      // No need to store the same info several times.
+      // `uid` is unique as it is generated by the RTD module itself for each auction.
+      const key = `${bid.adUnitCode}-${uid}`;
+      if (_internal.getGuard().has(key)) {
+        return;
+      }
+
+      _internal.getGuard().add(key);
+      storeRequestInAdagioNS(bid, config);
+    });
+  }, 1);
+}
+
+/**
+ * onGetBidRequestData is called once per auction.
+ * Update both the `ortb2Fragments` and `ortb2Imp` objects with features computed for Adagio.
+ *
+ * @param {*} bidReqConfig
+ * @param {*} callback
+ * @param {*} config
+ */
+function onGetBidRequestData(bidReqConfig, callback, config) {
+  const configParams = deepAccess(config, 'params', {});
+  const { site: ortb2Site } = bidReqConfig.ortb2Fragments.global;
+  const features = _internal.getFeatures().get();
+  const ext = {
+    uid: generateUUID(),
+    pageviewId: _ADAGIO.pageviewId,
+    features: { ...features },
+    session: { ..._SESSION.get() }
+  };
+
+  deepSetValue(ortb2Site, `ext.data.adg_rtd`, ext);
+
+  const adUnits = bidReqConfig.adUnits || getGlobal().adUnits || [];
+  adUnits.forEach(adUnit => {
+    adUnit.ortb2Imp = adUnit.ortb2Imp || {};
+    const ortb2Imp = deepAccess(adUnit, 'ortb2Imp');
+
+    // A divId is required to compute the slot position and later to track viewability.
+    // If nothing has been explicitly set, we try to get the divId from the GPT slot and fallback to the adUnit code in last resort.
+    let divId = deepAccess(ortb2Imp, 'ext.data.divId')
+    if (!divId) {
+      divId = getGptSlotInfoForAdUnitCode(adUnit.code).divId;
+      deepSetValue(ortb2Imp, `ext.data.divId`, divId || adUnit.code);
+    }
+
+    const slotPosition = getSlotPosition(divId);
+    deepSetValue(ortb2Imp, `ext.data.adg_rtd.adunit_position`, slotPosition);
+
+    // It is expected that the publisher set a `adUnits[].ortb2Imp.ext.data.placement` value.
+    // Btw, We allow fallback sources to programmatically set this value.
+    // The source is defined in the `config.params.placementSource` and the possible values are `code` or `gpid`.
+    // (Please note that this `placement` is not related to the oRTB video property.)
+    if (!deepAccess(ortb2Imp, 'ext.data.placement')) {
+      const { placementSource = '' } = configParams;
+
+      switch (placementSource.toLowerCase()) {
+        case PLACEMENT_SOURCES.ADUNITCODE:
+          deepSetValue(ortb2Imp, 'ext.data.placement', adUnit.code);
+          break;
+        case PLACEMENT_SOURCES.GPID:
+          deepSetValue(ortb2Imp, 'ext.data.placement', deepAccess(ortb2Imp, 'ext.gpid'));
+          break;
+        default:
+          logWarn('`ortb2Imp.ext.data.placement` is missing and `params.definePlacement` is not set in the config.');
+      }
+    }
+
+    // We expect that `pagetype`, `category`, `placement` are defined in FPD `ortb2.site.ext.data` and `adUnits[].ortb2Imp.ext.data` objects.
+    // Btw, we have to ensure compatibility with publishers that use the "legacy" adagio params at the adUnit.params level.
+    const adagioBid = adUnit.bids.find(bid => _internal.isAdagioBidder(bid.bidder));
+    if (adagioBid) {
+      // ortb2 level
+      let mustWarnOrtb2 = false;
+      if (!deepAccess(ortb2Site, 'ext.data.pagetype') && adagioBid.params.pagetype) {
+        deepSetValue(ortb2Site, 'ext.data.pagetype', adagioBid.params.pagetype);
+        mustWarnOrtb2 = true;
+      }
+      if (!deepAccess(ortb2Site, 'ext.data.category') && adagioBid.params.category) {
+        deepSetValue(ortb2Site, 'ext.data.category', adagioBid.params.category);
+        mustWarnOrtb2 = true;
+      }
+
+      // ortb2Imp level
+      let mustWarnOrtb2Imp = false;
+      if (!deepAccess(ortb2Imp, 'ext.data.placement')) {
+        if (adagioBid.params.placement) {
+          deepSetValue(ortb2Imp, 'ext.data.placement', adagioBid.params.placement);
+          mustWarnOrtb2Imp = true;
+        }
+      }
+
+      if (mustWarnOrtb2) {
+        logWarn('`pagetype` and `category` must be defined in the FPD `ortb2.site.ext.data` object. Relying on `adUnits[].bids.adagio.params` is deprecated.');
+      }
+      if (mustWarnOrtb2Imp) {
+        logWarn('`placement` must be defined in the FPD `adUnits[].ortb2Imp.ext.data` object. Relying on `adUnits[].bids.adagio.params` is deprecated.');
+      }
+    }
+  });
+
+  callback();
+}
+
+export const adagioRtdSubmodule = {
+  name: SUBMODULE_NAME,
+  gvlid: GVLID,
+  init: init,
+  getBidRequestData: onGetBidRequestData,
+  onBidRequestEvent: onBidRequest,
+};
+
+submodule('realTimeData', adagioRtdSubmodule);
+
+// ---
+//
+// internal functions moved from adagioBidAdapter.js to adagioRtdProvider.js.
+//
+// Several of these functions could be redistribued in Prebid.js core or in a library
+//
+// ---
+
+/**
+ * storeRequestInAdagioNS store ad-units in the ADAGIO namespace for further usage.
+ * Not all the properties are stored, only the ones that are useful for adagio.js.
+ *
+ * @param {*} bid - The bid object. Correspond to the bidRequest.bids[i] object.
+ * @param {*} config - The RTD module configuration.
+ * @returns {void}
+ */
+function storeRequestInAdagioNS(bid, config) {
+  try {
+    const { bidder, adUnitCode, mediaTypes, params, auctionId, bidderRequestsCount, ortb2, ortb2Imp } = bid;
+
+    const { organizationId, site } = config.params;
+
+    const ortb2Data = deepAccess(ortb2, 'site.ext.data', {});
+    const ortb2ImpData = deepAccess(ortb2Imp, 'ext.data', {});
+
+    // TODO: `bidderRequestsCount` must be incremented with s2s context, actually works only for `client` context
+    // see: https://github.com/prebid/Prebid.js/pull/11295/files#diff-d5c9b255c545e5097d1cd2f49e7dad309b731e34d788f9c28432ad43ebcd7785L114
+    const data = {
+      bidder,
+      adUnitCode,
+      mediaTypes,
+      params,
+      auctionId,
+      bidderRequestsCount,
+      ortb2: ortb2Data,
+      ortb2Imp: ortb2ImpData,
+      localPbjs: '$$PREBID_GLOBAL$$',
+      localPbjsRef: getGlobal(),
+      organizationId,
+      site
+    };
+
+    _internal.getAdagioNs().queue.push({
+      action: 'store',
+      ts: Date.now(),
+      data
+    });
+  } catch (e) {
+    logError(e);
+  }
+}
+
+function getElementFromTopWindow(element, currentWindow) {
+  try {
+    if (getWindowTop() === currentWindow) {
+      if (!element.getAttribute('id')) {
+        element.setAttribute('id', `adg-${getUniqueIdentifierStr()}`);
+      }
+      return element;
+    } else {
+      const frame = currentWindow.frameElement;
+      const frameClientRect = frame.getBoundingClientRect();
+      const elementClientRect = element.getBoundingClientRect();
+
+      if (frameClientRect.width !== elementClientRect.width || frameClientRect.height !== elementClientRect.height) {
+        return false;
+      }
+
+      return getElementFromTopWindow(frame, currentWindow.parent);
+    }
+  } catch (err) {
+    logWarn(err);
+    return false;
+  }
+};
+
+function getSlotPosition(divId) {
+  if (!isSafeFrameWindow() && !canAccessWindowTop()) {
+    return '';
+  }
+
+  const position = { x: 0, y: 0 };
+
+  if (isSafeFrameWindow()) {
+    const { self } = getSafeframeGeometry() || {};
+
+    if (!self) {
+      return '';
+    }
+
+    position.x = Math.round(self.t);
+    position.y = Math.round(self.l);
+  } else {
+    try {
+      // window.top based computing
+      const wt = getWindowTop();
+      const d = wt.document;
+
+      let domElement;
+
+      if (inIframe() === true) {
+        const ws = getWindowSelf();
+        const currentElement = ws.document.getElementById(divId);
+        domElement = getElementFromTopWindow(currentElement, ws);
+      } else {
+        domElement = wt.document.getElementById(divId);
+      }
+
+      if (!domElement) {
+        return '';
+      }
+
+      let box = domElement.getBoundingClientRect();
+
+      const docEl = d.documentElement;
+      const body = d.body;
+      const clientTop = d.clientTop || body.clientTop || 0;
+      const clientLeft = d.clientLeft || body.clientLeft || 0;
+      const scrollTop = wt.pageYOffset || docEl.scrollTop || body.scrollTop;
+      const scrollLeft = wt.pageXOffset || docEl.scrollLeft || body.scrollLeft;
+
+      const elComputedStyle = wt.getComputedStyle(domElement, null);
+      const mustDisplayElement = elComputedStyle.display === 'none';
+
+      if (mustDisplayElement) {
+        logWarn('The element is hidden. The slot position cannot be computed.');
+      }
+
+      position.x = Math.round(box.left + scrollLeft - clientLeft);
+      position.y = Math.round(box.top + scrollTop - clientTop);
+    } catch (err) {
+      logError(err);
+      return '';
+    }
+  }
+
+  return `${position.x}x${position.y}`;
+}
+
+function getPageDimensions() {
+  if (isSafeFrameWindow() || !canAccessWindowTop()) {
+    return '';
+  }
+
+  // the page dimension can be computed on window.top only.
+  const wt = getWindowTop();
+  const body = wt.document.querySelector('body');
+
+  if (!body) {
+    return '';
+  }
+  const html = wt.document.documentElement;
+  const pageWidth = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth);
+  const pageHeight = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight);
+
+  return `${pageWidth}x${pageHeight}`;
+}
+
+function getViewPortDimensions() {
+  if (!isSafeFrameWindow() && !canAccessWindowTop()) {
+    return '';
+  }
+
+  const viewportDims = { w: 0, h: 0 };
+
+  if (isSafeFrameWindow()) {
+    const { win } = getSafeframeGeometry() || {};
+
+    if (!win) {
+      return '';
+    }
+
+    viewportDims.w = Math.round(win.w);
+    viewportDims.h = Math.round(win.h);
+  } else {
+    // window.top based computing
+    const wt = getWindowTop();
+    viewportDims.w = wt.innerWidth;
+    viewportDims.h = wt.innerHeight;
+  }
+
+  return `${viewportDims.w}x${viewportDims.h}`;
+}
+
+function getTimestampUTC() {
+  // timestamp returned in seconds
+  return Math.floor(new Date().getTime() / 1000) - new Date().getTimezoneOffset() * 60;
+}
+
+/**
+ * registerEventsForAdServers bind adagio listeners to ad-server events.
+ * Theses events are used to track the viewability and attention.
+ *
+ * @param {*} config
+ * @returns {void}
+ */
+function registerEventsForAdServers(config) {
+  const GPT_EVENTS = new Set([
+    'impressionViewable',
+    'slotRenderEnded',
+    'slotVisibilityChanged',
+  ]);
+
+  const SAS_EVENTS = new Set([
+    'noad',
+    'setHeaderBiddingWinner',
+  ]);
+
+  const AST_EVENTS = new Set([
+    'adLoaded',
+  ]);
+
+  // Listen to ad-server events in current window
+  // as we can be safe in a Post-Bid scenario.
+  const ws = getWindowSelf();
+
+  // Keep a reference to the window on which the listener is attached.
+  // this is used to avoid to bind event several times.
+  if (!Array.isArray(_internal.getAdagioNs().windows)) {
+    _internal.getAdagioNs().windows = [];
+  }
+
+  let selfStoredWindow = _internal.getAdagioNs().windows.find(_w => _w.self === ws);
+  if (!selfStoredWindow) {
+    selfStoredWindow = { self: ws };
+    _internal.getAdagioNs().windows.push(selfStoredWindow);
+  }
+
+  const register = (namespace, command, selfWindow, adserver, cb) => {
+    try {
+      if (selfWindow.adserver === adserver) {
+        return;
+      }
+      ws[namespace] = ws[namespace] || {};
+      ws[namespace][command] = ws[namespace][command] || [];
+      cb();
+    } catch (e) {
+      logError(e);
+    }
+  };
+
+  register('googletag', 'cmd', ws, 'gpt', () => {
+    ws.googletag.cmd.push(() => {
+      GPT_EVENTS.forEach(eventName => {
+        ws.googletag.pubads().addEventListener(eventName, (args) => {
+          _internal.getAdagioNs().queue.push({
+            action: 'gpt-event',
+            data: { eventName, args, _window: ws },
+            ts: Date.now(),
+          });
+        });
+      });
+      selfStoredWindow.adserver = 'gpt';
+    });
+  });
+
+  register('sas', 'cmd', ws, 'sas', () => {
+    ws.sas.cmd.push(() => {
+      SAS_EVENTS.forEach(eventName => {
+        ws.sas.events.on(eventName, (args) => {
+          _internal.getAdagioNs().queue.push({
+            action: 'sas-event',
+            data: { eventName, args, _window: ws },
+            ts: Date.now(),
+          });
+        });
+      });
+      selfStoredWindow.adserver = 'sas';
+    });
+  });
+
+  // https://learn.microsoft.com/en-us/xandr/seller-tag/on-event
+  register('apntag', 'anq', ws, 'ast', () => {
+    ws.apntag.anq.push(() => {
+      AST_EVENTS.forEach(eventName => {
+        ws.apntag.onEvent(eventName, () => {
+          _internal.getAdagioNs().queue.push({
+            action: 'ast-event',
+            data: { eventName, args: arguments, _window: ws },
+            ts: Date.now(),
+          });
+        });
+      });
+      selfStoredWindow.adserver = 'ast';
+    });
+  });
+};
+
+// --- end of internal functions ----- //
+
+/**
+ * @typedef {Object} AdagioWindow
+ * @property {Window} self
+ * @property {string} adserver - 'gpt', 'sas', 'ast'
+ */
+
+/**
+ * @typedef {Object} AdagioGlobal
+ * @property {Object} adUnits
+ * @property {Array} pbjsAdUnits
+ * @property {Array} queue
+ * @property {Array} windows
+ */
+
+/**
+ * @typedef {Object} Session
+ * @property {string} id - uuid of the session.
+ * @property {boolean} new - True if the session is new.
+ * @property {number} rnd - Random number used to determine if the session is new.
+ * @property {number} vwSmplg - View sampling rate.
+ * @property {number} vwSmplgNxt - Next view sampling rate.
+ * @property {number} expiry - Timestamp after which session should be considered expired.
+ * @property {number} lastActivityTime - Last activity time.
+ * @property {number} pages - current number of pages seen.
+ * @property {string} testName - The test name defined by the publisher. Legacy only present for websites with older abTest snippet.
+ * @property {string} testVersion - 'clt', 'srv'. Legacy only present for websites with older abTest snippet.
+ */
+
+/**
+ * @typedef {Object} AbTest
+ * @property {string} testName - The test name defined by the publisher.
+ * @property {string} testVersion - 'clt', 'srv'.
+ * @property {string} sessionId - uuid of the session.
+ * @property {number} expiry - Timestamp after which session should be considered expired.
+ */
+
+/**
+ * @typedef {Object} SessionData
+ * @property {Session} session - the session data.
+ */
+
+/**
+ * @typedef {Object} Features
+ * @property {boolean} initialized - True if the features are initialized.
+ * @property {Object} data - the features data.
+ */
diff --git a/modules/adagioRtdProvider.md b/modules/adagioRtdProvider.md
new file mode 100644
index 00000000000..a51137d571f
--- /dev/null
+++ b/modules/adagioRtdProvider.md
@@ -0,0 +1,38 @@
+# Overview
+
+Module Name: Adagio Rtd Provider
+Module Type: Rtd Provider
+Maintainer: dev@adagio.io
+
+# Description
+
+This module is exclusively used in combination with Adagio Bidder Adapter (SSP) and/or with Adagio prebid server endpoint, and mandatory for Adagio customers.
+It computes and collects data required to leverage Adagio viewability and attention prediction engine.
+
+Features are computed for the Adagio bidder only and placed into `ortb2.ext` and `AdUnit.ortb2Imp.ext.data`.
+
+To collect data, an external script is loaded by the provider.
+It relies on the listening of ad-server events.
+Supported ad-servers are GAM, Smart Ad Server, Xandr. Custom ad-server can also be used,
+please contact [contact@adagio.io](contact@adagio.io) for more information.
+
+# Integration
+
+```bash
+gulp build --modules=adagioBidAdapter,rtdModule,adagioRtdProvider
+```
+
+```javascript
+pbjs.setConfig({
+  realTimeData: {
+    dataProviders:[{
+      name: 'adagio',
+      params: {
+        organizationId: '1000' // Required. Provided by Adagio
+        site: 'my-site' // Required. Provided by Adagio
+        placementSource: 'ortb' // Optional. Where to find the "placement" value. Possible values: 'ortb' | 'code' | 'gpid'
+      }
+    }]
+  }
+});
+```
diff --git a/modules/adbookpspBidAdapter.js b/modules/adbookpspBidAdapter.js
deleted file mode 100644
index cb03f2ffc17..00000000000
--- a/modules/adbookpspBidAdapter.js
+++ /dev/null
@@ -1,830 +0,0 @@
-import {find, includes} from '../src/polyfill.js';
-import {config} from '../src/config.js';
-import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {
-  deepAccess,
-  deepSetValue,
-  flatten,
-  generateUUID,
-  inIframe,
-  isArray,
-  isEmptyStr,
-  isNumber,
-  isPlainObject,
-  isStr,
-  logError,
-  logWarn,
-  triggerPixel,
-  uniques
-} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
-/**
- * CONSTANTS
- */
-
-export const VERSION = '1.0.0';
-const EXCHANGE_URL = 'https://ex.fattail.com/openrtb2';
-const WIN_TRACKING_URL = 'https://ev.fattail.com/wins';
-const BIDDER_CODE = 'adbookpsp';
-const USER_ID_KEY = 'hb_adbookpsp_uid';
-const USER_ID_COOKIE_EXP = 2592000000; // lasts 30 days
-const BID_TTL = 300;
-const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
-const DEFAULT_CURRENCY = 'USD';
-const VIDEO_PARAMS = [
-  'mimes',
-  'minduration',
-  'maxduration',
-  'protocols',
-  'w',
-  'h',
-  'startdelay',
-  'placement',
-  'linearity',
-  'skip',
-  'skipmin',
-  'skipafter',
-  'sequence',
-  'battr',
-  'maxextended',
-  'minbitrate',
-  'maxbitrate',
-  'boxingallowed',
-  'playbackmethod',
-  'playbackend',
-  'delivery',
-  'pos',
-  'companionad',
-  'api',
-  'companiontype',
-  'ext',
-];
-const TARGETING_VALUE_SEPARATOR = ',';
-
-export const DEFAULT_BIDDER_CONFIG = {
-  bidTTL: BID_TTL,
-  defaultCurrency: DEFAULT_CURRENCY,
-  exchangeUrl: EXCHANGE_URL,
-  winTrackingEnabled: true,
-  winTrackingUrl: WIN_TRACKING_URL,
-  orgId: null,
-};
-
-config.setDefaults({
-  adbookpsp: DEFAULT_BIDDER_CONFIG,
-});
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
-
-  buildRequests,
-  getUserSyncs,
-  interpretResponse,
-  isBidRequestValid,
-  onBidWon,
-};
-
-registerBidder(spec);
-
-/**
- * BID REQUEST
- */
-
-function isBidRequestValid(bidRequest) {
-  return (
-    hasRequiredParams(bidRequest) &&
-    (isValidBannerRequest(bidRequest) || isValidVideoRequest(bidRequest))
-  );
-}
-
-function buildRequests(validBidRequests, bidderRequest) {
-  // convert Native ORTB definition to old-style prebid native definition
-  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-  const requests = [];
-
-  if (validBidRequests.length > 0) {
-    requests.push({
-      method: 'POST',
-      url: getBidderConfig('exchangeUrl'),
-      options: {
-        contentType: 'application/json',
-        withCredentials: true,
-      },
-      data: buildRequest(validBidRequests, bidderRequest),
-    });
-  }
-
-  return requests;
-}
-
-function buildRequest(validBidRequests, bidderRequest) {
-  const request = {
-    id: bidderRequest.bidderRequestId,
-    tmax: bidderRequest.timeout,
-    site: {
-      domain: bidderRequest.refererInfo.domain,
-      page: bidderRequest.refererInfo.page,
-      ref: bidderRequest.refererInfo.ref,
-    },
-    source: buildSource(validBidRequests, bidderRequest),
-    device: buildDevice(),
-    regs: buildRegs(bidderRequest),
-    user: buildUser(bidderRequest),
-    imp: validBidRequests.map(buildImp),
-    ext: {
-      adbook: {
-        config: getBidderConfig(),
-        version: {
-          prebid: '$prebid.version$',
-          adapter: VERSION,
-        },
-      },
-    },
-  };
-
-  return JSON.stringify(request);
-}
-
-function buildDevice() {
-  const { innerWidth, innerHeight } = common.getWindowDimensions();
-
-  const device = {
-    w: innerWidth,
-    h: innerHeight,
-    js: true,
-    ua: navigator.userAgent,
-    dnt:
-      navigator.doNotTrack === 'yes' ||
-      navigator.doNotTrack == '1' ||
-      navigator.msDoNotTrack == '1'
-        ? 1
-        : 0,
-  };
-
-  const deviceConfig = common.getConfig('device');
-
-  if (isPlainObject(deviceConfig)) {
-    return { ...device, ...deviceConfig };
-  }
-
-  return device;
-}
-
-function buildRegs(bidderRequest) {
-  const regs = {
-    coppa: common.getConfig('coppa') === true ? 1 : 0,
-  };
-
-  if (bidderRequest.gdprConsent) {
-    deepSetValue(
-      regs,
-      'ext.gdpr',
-      bidderRequest.gdprConsent.gdprApplies ? 1 : 0
-    );
-    deepSetValue(
-      regs,
-      'ext.gdprConsentString',
-      bidderRequest.gdprConsent.consentString || ''
-    );
-  }
-
-  if (bidderRequest.uspConsent) {
-    deepSetValue(regs, 'ext.us_privacy', bidderRequest.uspConsent);
-  }
-
-  return regs;
-}
-
-function buildSource(bidRequests, bidderRequest) {
-  const source = {
-    fd: 1,
-    tid: bidderRequest.ortb2.source.tid,
-  };
-  const schain = deepAccess(bidRequests, '0.schain');
-
-  if (schain) {
-    deepSetValue(source, 'ext.schain', schain);
-  }
-
-  return source;
-}
-
-function buildUser(bidderRequest) {
-  const user = {
-    id: getUserId(),
-  };
-
-  if (bidderRequest.gdprConsent) {
-    user.gdprConsentString = bidderRequest.gdprConsent.consentString || '';
-  }
-
-  return user;
-}
-
-function buildImp(bidRequest) {
-  let impBase = {
-    id: bidRequest.bidId,
-    tagid: bidRequest.adUnitCode,
-    ext: buildImpExt(bidRequest),
-  };
-
-  return Object.keys(bidRequest.mediaTypes)
-    .filter((mediaType) => includes(SUPPORTED_MEDIA_TYPES, mediaType))
-    .reduce((imp, mediaType) => {
-      return {
-        ...imp,
-        [mediaType]: buildMediaTypeObject(mediaType, bidRequest),
-      };
-    }, impBase);
-}
-
-function buildMediaTypeObject(mediaType, bidRequest) {
-  switch (mediaType) {
-    case BANNER:
-      return buildBannerObject(bidRequest);
-    case VIDEO:
-      return buildVideoObject(bidRequest);
-    default:
-      logWarn(`${BIDDER_CODE}: Unsupported media type ${mediaType}!`);
-  }
-}
-
-function buildBannerObject(bidRequest) {
-  const format = bidRequest.mediaTypes.banner.sizes.map((size) => {
-    const [w, h] = size;
-
-    return { w, h };
-  });
-  const { w, h } = format[0];
-
-  return {
-    pos: 0,
-    topframe: inIframe() ? 0 : 1,
-    format,
-    w,
-    h,
-  };
-}
-
-function buildVideoObject(bidRequest) {
-  const { w, h } = getVideoSize(bidRequest);
-  let videoObj = {
-    w,
-    h,
-  };
-
-  for (const param of VIDEO_PARAMS) {
-    const paramsValue = deepAccess(bidRequest, `params.video.${param}`);
-    const mediaTypeValue = deepAccess(
-      bidRequest,
-      `mediaTypes.video.${param}`
-    );
-
-    if (paramsValue || mediaTypeValue) {
-      videoObj[param] = paramsValue || mediaTypeValue;
-    }
-  }
-
-  return videoObj;
-}
-
-function getVideoSize(bidRequest) {
-  const playerSize = deepAccess(bidRequest, 'mediaTypes.video.playerSize', [[]]);
-  const { w, h } = deepAccess(bidRequest, 'mediaTypes.video', {});
-
-  if (isNumber(w) && isNumber(h)) {
-    return { w, h };
-  }
-
-  return {
-    w: playerSize[0][0],
-    h: playerSize[0][1],
-  }
-}
-
-function buildImpExt(validBidRequest) {
-  const defaultOrgId = getBidderConfig('orgId');
-  const { orgId, placementId } = validBidRequest.params || {};
-  const effectiverOrgId = orgId || defaultOrgId;
-  const ext = {};
-
-  if (placementId) {
-    deepSetValue(ext, 'adbook.placementId', placementId);
-  }
-
-  if (effectiverOrgId) {
-    deepSetValue(ext, 'adbook.orgId', effectiverOrgId);
-  }
-
-  return ext;
-}
-
-/**
- * BID RESPONSE
- */
-
-function interpretResponse(bidResponse, bidderRequest) {
-  const bidderRequestBody = safeJSONparse(bidderRequest.data);
-
-  if (
-    deepAccess(bidderRequestBody, 'id') !=
-    deepAccess(bidResponse, 'body.id')
-  ) {
-    logError(
-      `${BIDDER_CODE}: Bid response id does not match bidder request id`
-    );
-
-    return [];
-  }
-
-  const referrer = deepAccess(bidderRequestBody, 'site.ref', '');
-  const incomingBids = deepAccess(bidResponse, 'body.seatbid', [])
-    .filter((seat) => isArray(seat.bid))
-    .reduce((bids, seat) => bids.concat(seat.bid), [])
-    .filter(validateBid(bidderRequestBody));
-  const targetingMap = buildTargetingMap(incomingBids);
-
-  return impBidsToPrebidBids(
-    incomingBids,
-    bidderRequestBody,
-    bidResponse.body.cur,
-    referrer,
-    targetingMap
-  );
-}
-
-function impBidsToPrebidBids(
-  incomingBids,
-  bidderRequestBody,
-  bidResponseCurrency,
-  referrer,
-  targetingMap
-) {
-  return incomingBids
-    .map(
-      impToPrebidBid(
-        bidderRequestBody,
-        bidResponseCurrency,
-        referrer,
-        targetingMap
-      )
-    )
-    .filter((i) => i !== null);
-}
-
-const impToPrebidBid =
-  (bidderRequestBody, bidResponseCurrency, referrer, targetingMap) => (bid, bidIndex) => {
-    try {
-      const bidRequest = findBidRequest(bidderRequestBody, bid);
-
-      if (!bidRequest) {
-        logError(`${BIDDER_CODE}: Could not match bid to bid request`);
-
-        return null;
-      }
-      const categories = deepAccess(bid, 'cat', []);
-      const mediaType = getMediaType(bid.adm);
-      let prebidBid = {
-        ad: bid.adm,
-        adId: bid.adid,
-        adserverTargeting: targetingMap[bidIndex],
-        adUnitCode: bidRequest.tagid,
-        bidderRequestId: bidderRequestBody.id,
-        bidId: bid.id,
-        cpm: bid.price,
-        creativeId: bid.crid || bid.id,
-        currency: bidResponseCurrency || getBidderConfig('defaultCurrency'),
-        height: bid.h,
-        lineItemId: deepAccess(bid, 'ext.liid'),
-        mediaType,
-        meta: {
-          advertiserDomains: bid.adomain,
-          mediaType,
-          primaryCatId: categories[0],
-          secondaryCatIds: categories.slice(1),
-        },
-        netRevenue: true,
-        nurl: bid.nurl,
-        referrer: referrer,
-        requestId: bid.impid,
-        ttl: getBidderConfig('bidTTL'),
-        width: bid.w,
-      };
-
-      if (mediaType === VIDEO) {
-        prebidBid = {
-          ...prebidBid,
-          ...getVideoSpecificParams(bidRequest, bid),
-        };
-      }
-
-      if (deepAccess(bid, 'ext.pa_win') === true) {
-        prebidBid.auctionWinner = true;
-      }
-      return prebidBid;
-    } catch (error) {
-      logError(`${BIDDER_CODE}: Error while building bid`, error);
-
-      return null;
-    }
-  };
-
-function getVideoSpecificParams(bidRequest, bid) {
-  return {
-    height: bid.h || bidRequest.video.h,
-    vastXml: bid.adm,
-    width: bid.w || bidRequest.video.w,
-  };
-}
-
-function buildTargetingMap(bids) {
-  const impIds = bids.map(({ impid }) => impid).filter(uniques);
-  const values = impIds.reduce((result, id) => {
-    result[id] = {
-      lineItemIds: [],
-      orderIds: [],
-      dealIds: [],
-      adIds: [],
-      adAndOrderIndexes: []
-    };
-
-    return result;
-  }, {});
-
-  bids.forEach((bid, bidIndex) => {
-    let impId = bid.impid;
-    values[impId].lineItemIds.push(bid.ext.liid);
-    values[impId].dealIds.push(bid.dealid);
-    values[impId].adIds.push(bid.adid);
-
-    if (deepAccess(bid, 'ext.ordid')) {
-      values[impId].orderIds.push(bid.ext.ordid);
-      bid.ext.ordid.split(TARGETING_VALUE_SEPARATOR).forEach((ordid, ordIndex) => {
-        let adIdIndex = values[impId].adIds.indexOf(bid.adid);
-        values[impId].adAndOrderIndexes.push(adIdIndex + '_' + ordIndex)
-      })
-    }
-  });
-
-  const targetingMap = {};
-
-  bids.forEach((bid, bidIndex) => {
-    let id = bid.impid;
-
-    targetingMap[bidIndex] = {
-      hb_liid_adbookpsp: values[id].lineItemIds.join(TARGETING_VALUE_SEPARATOR),
-      hb_deal_adbookpsp: values[id].dealIds.join(TARGETING_VALUE_SEPARATOR),
-      hb_ad_ord_adbookpsp: values[id].adAndOrderIndexes.join(TARGETING_VALUE_SEPARATOR),
-      hb_adid_c_adbookpsp: values[id].adIds.join(TARGETING_VALUE_SEPARATOR),
-      hb_ordid_adbookpsp: values[id].orderIds.join(TARGETING_VALUE_SEPARATOR),
-    };
-  })
-  return targetingMap;
-}
-
-/**
- * VALIDATION
- */
-
-function hasRequiredParams(bidRequest) {
-  const value =
-    deepAccess(bidRequest, 'params.placementId') != null ||
-    deepAccess(bidRequest, 'params.orgId') != null ||
-    getBidderConfig('orgId') != null;
-
-  if (!value) {
-    logError(`${BIDDER_CODE}: missing orgId and placementId parameter`);
-  }
-
-  return value;
-}
-
-function isValidBannerRequest(bidRequest) {
-  const value = validateSizes(
-    deepAccess(bidRequest, 'mediaTypes.banner.sizes', [])
-  );
-
-  return value;
-}
-
-function isValidVideoRequest(bidRequest) {
-  const value =
-    isArray(deepAccess(bidRequest, 'mediaTypes.video.mimes')) &&
-    validateVideoSizes(bidRequest);
-
-  return value;
-}
-
-function validateSize(size) {
-  return isArray(size) && size.length === 2 && size.every(isNumber);
-}
-
-function validateSizes(sizes) {
-  return isArray(sizes) && sizes.length > 0 && sizes.every(validateSize);
-}
-
-function validateVideoSizes(bidRequest) {
-  const { w, h } = deepAccess(bidRequest, 'mediaTypes.video', {});
-
-  return (
-    validateSizes(
-      deepAccess(bidRequest, 'mediaTypes.video.playerSize')
-    ) ||
-    (isNumber(w) && isNumber(h))
-  );
-}
-
-function validateBid(bidderRequestBody) {
-  return function (bid) {
-    const mediaType = getMediaType(bid.adm);
-    const bidRequest = findBidRequest(bidderRequestBody, bid);
-    let validators = commonBidValidators;
-
-    if (mediaType === BANNER) {
-      validators = [...commonBidValidators, ...bannerBidValidators];
-    }
-
-    const value = validators.every((validator) => validator(bid, bidRequest));
-
-    if (!value) {
-      logWarn(`${BIDDER_CODE}: Invalid bid`, bid);
-    }
-
-    return value;
-  };
-}
-
-const commonBidValidators = [
-  (bid) => isPlainObject(bid),
-  (bid) => isNonEmptyStr(bid.adid),
-  (bid) => isNonEmptyStr(bid.adm),
-  (bid) => isNonEmptyStr(bid.id),
-  (bid) => isNonEmptyStr(bid.impid),
-  (bid) => isNonEmptyStr(deepAccess(bid, 'ext.liid')),
-  (bid) => isNumber(bid.price),
-];
-
-const bannerBidValidators = [
-  validateBannerDimension('w'),
-  validateBannerDimension('h'),
-];
-
-function validateBannerDimension(dimension) {
-  return function (bid, bidRequest) {
-    if (bid[dimension] == null) {
-      return bannerHasSingleSize(bidRequest);
-    }
-
-    return isNumber(bid[dimension]);
-  };
-}
-
-function bannerHasSingleSize(bidRequest) {
-  return deepAccess(bidRequest, 'banner.format', []).length === 1;
-}
-
-/**
- * USER SYNC
- */
-
-export const storage = getStorageManager({bidderCode: BIDDER_CODE});
-
-function getUserSyncs(syncOptions, responses, gdprConsent, uspConsent) {
-  return responses
-    .map((response) => deepAccess(response, 'body.ext.sync'))
-    .filter(isArray)
-    .reduce(flatten, [])
-    .filter(validateSync(syncOptions))
-    .map(applyConsents(gdprConsent, uspConsent));
-}
-
-const validateSync = (syncOptions) => (sync) => {
-  return (
-    ((sync.type === 'image' && syncOptions.pixelEnabled) ||
-      (sync.type === 'iframe' && syncOptions.iframeEnabled)) &&
-    sync.url
-  );
-};
-
-const applyConsents = (gdprConsent, uspConsent) => (sync) => {
-  const url = getUrlBuilder(sync.url);
-
-  if (gdprConsent) {
-    url.set('gdpr', gdprConsent.gdprApplies ? 1 : 0);
-    url.set('consentString', gdprConsent.consentString || '');
-  }
-  if (uspConsent) {
-    url.set('us_privacy', encodeURIComponent(uspConsent));
-  }
-  if (common.getConfig('coppa') === true) {
-    url.set('coppa', 1);
-  }
-
-  return { ...sync, url: url.toString() };
-};
-
-function getUserId() {
-  const id = getUserIdFromStorage() || common.generateUUID();
-
-  setUserId(id);
-
-  return id;
-}
-
-function getUserIdFromStorage() {
-  const id = storage.localStorageIsEnabled()
-    ? storage.getDataFromLocalStorage(USER_ID_KEY)
-    : storage.getCookie(USER_ID_KEY);
-
-  if (!validateUUID(id)) {
-    return;
-  }
-
-  return id;
-}
-
-function setUserId(userId) {
-  if (storage.localStorageIsEnabled()) {
-    storage.setDataInLocalStorage(USER_ID_KEY, userId);
-  }
-
-  if (storage.cookiesAreEnabled()) {
-    const expires = new Date(Date.now() + USER_ID_COOKIE_EXP).toISOString();
-
-    storage.setCookie(USER_ID_KEY, userId, expires);
-  }
-}
-
-function validateUUID(uuid) {
-  return /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(
-    uuid
-  );
-}
-
-/**
- * EVENT TRACKING
- */
-
-function onBidWon(bid) {
-  if (!getBidderConfig('winTrackingEnabled')) {
-    return;
-  }
-
-  const wurl = buildWinUrl(bid);
-
-  if (wurl !== null) {
-    triggerPixel(wurl);
-  }
-
-  if (isStr(bid.nurl)) {
-    triggerPixel(bid.nurl);
-  }
-}
-
-function buildWinUrl(bid) {
-  try {
-    const url = getUrlBuilder(getBidderConfig('winTrackingUrl'));
-
-    url.set('impId', bid.requestId);
-    url.set('reqId', bid.bidderRequestId);
-    url.set('bidId', bid.bidId);
-
-    return url.toString();
-  } catch (_) {
-    logError(
-      `${BIDDER_CODE}: Could not build win tracking URL with %s`,
-      getBidderConfig('winTrackingUrl')
-    );
-
-    return null;
-  }
-}
-
-/**
- * COMMON
- */
-
-const VAST_REGEXP = /VAST\s+version/;
-
-function getMediaType(adm) {
-  const videoRegex = new RegExp(VAST_REGEXP);
-
-  if (videoRegex.test(adm)) {
-    return VIDEO;
-  }
-
-  const markup = safeJSONparse(adm.replace(/\\/g, ''));
-
-  if (markup && isPlainObject(markup.native)) {
-    return NATIVE;
-  }
-
-  return BANNER;
-}
-
-function safeJSONparse(...args) {
-  try {
-    return JSON.parse(...args);
-  } catch (_) {
-    return undefined;
-  }
-}
-
-function isNonEmptyStr(value) {
-  return isStr(value) && !isEmptyStr(value);
-}
-
-function findBidRequest(bidderRequest, bid) {
-  return find(bidderRequest.imp, (imp) => imp.id === bid.impid);
-}
-
-function getBidderConfig(property) {
-  if (!property) {
-    return common.getConfig(`${BIDDER_CODE}`);
-  }
-
-  return common.getConfig(`${BIDDER_CODE}.${property}`);
-}
-
-const getUrlBase = function (url) {
-  return url.split('?')[0];
-};
-
-const getUrlQuery = function (url) {
-  const query = url.split('?')[1];
-
-  if (!query) {
-    return;
-  }
-
-  return '?' + query.split('#')[0];
-};
-
-const getUrlHash = function (url) {
-  const hash = url.split('#')[1];
-
-  if (!hash) {
-    return;
-  }
-
-  return '#' + hash;
-};
-
-const getUrlBuilder = function (url) {
-  const hash = getUrlHash(url);
-  const base = getUrlBase(url);
-  const query = getUrlQuery(url);
-  const pairs = [];
-
-  function set(key, value) {
-    pairs.push([key, value]);
-
-    return {
-      set,
-      toString,
-    };
-  }
-
-  function toString() {
-    if (!pairs.length) {
-      return url;
-    }
-
-    const queryString = pairs
-      .map(function (pair) {
-        return pair.join('=');
-      })
-      .join('&');
-
-    if (!query) {
-      return base + '?' + queryString + (hash || '');
-    }
-
-    return base + query + '&' + queryString + (hash || '');
-  }
-
-  return {
-    set,
-    toString,
-  };
-};
-
-export const common = {
-  generateUUID: function () {
-    return generateUUID();
-  },
-  getConfig: function (property) {
-    return config.getConfig(property);
-  },
-  getWindowDimensions: function () {
-    return {
-      innerWidth: window.innerWidth,
-      innerHeight: window.innerHeight,
-    };
-  },
-};
diff --git a/modules/adbookpspBidAdapter.md b/modules/adbookpspBidAdapter.md
deleted file mode 100644
index e258b1fd7c3..00000000000
--- a/modules/adbookpspBidAdapter.md
+++ /dev/null
@@ -1,191 +0,0 @@
-### Overview
-
-```
-Module Name: AdbookPSP Bid Adapter
-Module Type: Bidder Adapter
-Maintainer: hbsupport@fattail.com
-```
-
-### Description
-
-Prebid.JS adapter that connects to the AdbookPSP demand sources.
-
-*NOTE*: The AdBookPSP Bidder Adapter requires setup and approval before use. The adapter uses custom targeting keys that require a dedicated Google Ad Manager setup to work. Please reach out to your AdbookPSP representative for more details. 
-
-### Bidder parameters
-
-Each adUnit with `adbookpsp` adapter has to have either `placementId` or `orgId` set.
-
-```js
-var adUnits = [
-  {
-    bids: [
-      {
-        bidder: 'adbookpsp',
-        params: {
-          placementId: 'example-placement-id',
-          orgId: 'example-org-id',
-        },
-      },
-    ],
-  },
-];
-```
-
-Alternatively, `orgId` can be set globally while configuring prebid.js:
-
-```js
-pbjs.setConfig({
-  adbookpsp: {
-    orgId: 'example-org-id',
-  },
-});
-```
-
-*NOTE*: adUnit orgId will take precedence over the globally set orgId.
-
-#### Banner parameters
-
-Required:
-
-- sizes
-
-Example configuration:
-
-```js
-var adUnits = [
-  {
-    code: 'div-1',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250]],
-      },
-    }
-  },
-];
-```
-
-#### Video parameters
-
-Required:
-
-- context
-- mimes
-- playerSize
-
-Additionaly, all `Video` object parameters described in chapter `3.2.7` of the [OpenRTB 2.5 specification](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf) can be passed as bidder params.
-
-Example configuration:
-
-```js
-var adUnits = [
-  {
-    code: 'div-1',
-    mediaTypes: {
-      video: {
-        context: 'outstream',
-        mimes: ['video/mp4', 'video/x-flv'],
-        playerSize: [400, 300],
-        protocols: [2, 3],
-      },
-    },
-    bids: [
-      {
-        bidder: 'adbookpsp',
-        params: {
-          placementId: 'example-placement-id',
-          video: {
-            placement: 2,
-          },
-        },
-      },
-    ],
-  },
-];
-```
-
-*NOTE*: Supporting outstream video requires the publisher to set up a renderer as described [in the Prebid docs](https://docs.prebid.org/dev-docs/show-outstream-video-ads.html).
-
-#### Testing params
-
-To test the adapter, either `placementId: 'example-placement-id'` or `orgId: 'example-org-id'` can be used. 
-
-*NOTE*: If any adUnit uses the testing params, all adUnits will receive testing responses.
-
-Example adUnit configuration:
-
-```js
-var adUnits = [
-  {
-    code: 'div-1',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250]],
-      },
-    },
-    bids: [
-      {
-        bidder: 'adbookpsp',
-        params: {
-          placementId: 'example-placement-id',
-        },
-      },
-    ],
-  },
-];
-```
-
-Example google publisher tag configuration:
-
-```js
-googletag
-  .defineSlot('/22094606581/example-adbookPSP', sizes, 'div-1')
-  .addService(googletag.pubads());
-```
-
-### Configuration
-
-Setting of the `orgId` can be done in the `pbjs.setConfig()` call. If this is the case, both `orgId` and `placementId` become optional. Remember to only call `pbjs.setConfig()` once as each call overwrites anything set in previous calls.
-
-Enabling iframe based user syncs is also encouraged.
-
-```javascript
-pbjs.setConfig({
-  adbookpsp: {
-    orgId: 'example-org-id',
-    winTrackingEnabled: true,
-  },
-  userSync: {
-    filterSettings: {
-      iframe: {
-        bidders: '*',
-        filter: 'include',
-      },
-    },
-  },
-});
-```
-
-### Privacy
-
-GDPR and US Privacy are both supported by default.
-
-#### Event tracking
-
-This adapter tracks win events for it’s bids. This functionality can be disabled by adding `winTrackingEnabled: false` to the adapter configuration:
-
-```js
-pbjs.setConfig({
-  adbookpsp: {
-    winTrackingEnabled: false,
-  },
-});
-```
-
-#### COPPA support
-
-COPPA support can be enabled for all the visitors by changing the config value:
-
-```js
-config.setConfig({ coppa: true });
-```
diff --git a/modules/adbutlerBidAdapter.js b/modules/adbutlerBidAdapter.js
new file mode 100644
index 00000000000..de430a5c916
--- /dev/null
+++ b/modules/adbutlerBidAdapter.js
@@ -0,0 +1,113 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'adbutler';
+
+function getTrackingPixelsMarkup(pixelURLs) {
+  return pixelURLs
+    .map(pixelURL => ``)
+    .join();
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  pageID: Math.floor(Math.random() * 10e6),
+  aliases: ['divreach', 'doceree'],
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid(bid) {
+    return !!(bid.params.accountID && bid.params.zoneID);
+  },
+
+  buildRequests(validBidRequests) {
+    const zoneCounters = {};
+
+    return utils._map(validBidRequests, function (bidRequest) {
+      const zoneID = bidRequest.params?.zoneID;
+
+      zoneCounters[zoneID] ??= 0;
+
+      const domain = bidRequest.params?.domain ?? 'servedbyadbutler.com';
+      const adserveBase = `https://${domain}/adserve`;
+      const params = {
+        ...(bidRequest.params?.extra ?? {}),
+        ID: bidRequest.params?.accountID,
+        type: 'hbr',
+        setID: zoneID,
+        pid: spec.pageID,
+        place: zoneCounters[zoneID],
+        kw: bidRequest.params?.keyword,
+      };
+
+      const paramsString = Object.entries(params).map(([key, value]) => `${key}=${value}`).join(';');
+      const requestURI = `${adserveBase}/;${paramsString};`;
+
+      zoneCounters[zoneID]++;
+
+      return {
+        method: 'GET',
+        url: requestURI,
+        data: {},
+        bidRequest,
+      };
+    });
+  },
+
+  interpretResponse(serverResponse, serverRequest) {
+    const bidObj = serverRequest.bidRequest;
+    const response = serverResponse.body ?? {};
+
+    if (!bidObj || response.status !== 'SUCCESS') {
+      return [];
+    }
+
+    const width = parseInt(response.width);
+    const height = parseInt(response.height);
+
+    const sizeValid = (bidObj.mediaTypes?.banner?.sizes ?? []).some(([w, h]) => w === width && h === height);
+
+    if (!sizeValid) {
+      return [];
+    }
+
+    const cpm = response.cpm;
+    const minCPM = bidObj.params?.minCPM ?? null;
+    const maxCPM = bidObj.params?.maxCPM ?? null;
+
+    if (minCPM !== null && cpm < minCPM) {
+      return [];
+    }
+
+    if (maxCPM !== null && cpm > maxCPM) {
+      return [];
+    }
+
+    let advertiserDomains = [];
+
+    if (response.advertiser?.domain) {
+      advertiserDomains.push(response.advertiser.domain);
+    }
+
+    const bidResponse = {
+      requestId: bidObj.bidId,
+      cpm,
+      currency: 'USD',
+      width,
+      height,
+      ad: response.ad_code + getTrackingPixelsMarkup(response.tracking_pixels),
+      ttl: 360,
+      creativeId: response.placement_id,
+      netRevenue: true,
+      meta: {
+        advertiserId: response.advertiser?.id,
+        advertiserName: response.advertiser?.name,
+        advertiserDomains,
+      },
+    };
+
+    return [bidResponse];
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/adbutlerBidAdapter.md b/modules/adbutlerBidAdapter.md
new file mode 100644
index 00000000000..88b5cf64475
--- /dev/null
+++ b/modules/adbutlerBidAdapter.md
@@ -0,0 +1,31 @@
+# Overview
+
+**Module Name**: AdButler Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: trevor@sparklit.com
+
+# Description
+
+Bid Adapter for creating a bid from an AdButler zone.
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+               code: 'display-div',
+               sizes: [[300, 250]],  // a display size
+               bids: [
+                   {
+                       bidder: "adbutler",
+                       params: {
+                           accountID: '181556',
+                           zoneID: '705374',
+                           keyword: 'red', //optional
+                           minCPM: '1.00', //optional
+                           maxCPM: '5.00' //optional
+                       }
+                   }
+               ]
+           }
+       ];
+```
diff --git a/modules/addefendBidAdapter.js b/modules/addefendBidAdapter.js
index dbb186fdc86..a646400b083 100644
--- a/modules/addefendBidAdapter.js
+++ b/modules/addefendBidAdapter.js
@@ -1,5 +1,4 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 
 const BIDDER_CODE = 'addefend';
 
@@ -17,7 +16,7 @@ export const spec = {
   },
   buildRequests: function(validBidRequests, bidderRequest) {
     let bid = {
-      v: getGlobal().version,
+      v: 'v' + '$prebid.version$',
       auctionId: false,
       pageId: false,
       gdpr_applies: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? bidderRequest.gdprConsent.gdprApplies : 'true',
diff --git a/modules/adfBidAdapter.js b/modules/adfBidAdapter.js
index e5b40f66176..dc2cab498ea 100644
--- a/modules/adfBidAdapter.js
+++ b/modules/adfBidAdapter.js
@@ -3,9 +3,10 @@
 
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {deepAccess, deepClone, deepSetValue, mergeDeep, parseSizesInput} from '../src/utils.js';
+import {deepAccess, deepClone, deepSetValue, mergeDeep, parseSizesInput, setOnAny} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
 
 const { getConfig } = config;
 
@@ -60,10 +61,11 @@ export const spec = {
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
     const tid = bidderRequest.ortb2?.source?.tid;
     const test = setOnAny(validBidRequests, 'params.test');
-    const currency = getConfig('currency.adServerCurrency');
+    const currency = getCurrencyFromBidderRequest(bidderRequest);
     const cur = currency && [ currency ];
     const eids = setOnAny(validBidRequests, 'userIdAsEids');
     const schain = setOnAny(validBidRequests, 'schain');
+    const dsa = commonFpd.regs?.ext?.dsa;
 
     const imp = validBidRequests.map((bid, id) => {
       bid.netRevenue = pt;
@@ -74,9 +76,10 @@ export const spec = {
         mediaType: '*'
       }) : {};
 
-      const bidfloor = floorInfo.floor;
-      const bidfloorcur = floorInfo.currency;
+      const bidfloor = floorInfo?.floor;
+      const bidfloorcur = floorInfo?.currency;
       const { mid, inv, mname } = bid.params;
+      const impExtData = bid.ortb2Imp?.ext?.data;
 
       const imp = {
         id: id + 1,
@@ -84,6 +87,7 @@ export const spec = {
         bidfloor,
         bidfloorcur,
         ext: {
+          data: impExtData,
           bidder: {
             inv,
             mname
@@ -179,6 +183,10 @@ export const spec = {
       deepSetValue(request, 'source.ext.schain', schain);
     }
 
+    if (dsa) {
+      deepSetValue(request, 'regs.ext.dsa', dsa);
+    }
+
     return {
       method: 'POST',
       url: 'https://' + adxDomain + '/adx/openrtb',
@@ -201,6 +209,7 @@ export const spec = {
       const bidResponse = bidResponses[id];
       if (bidResponse) {
         const mediaType = deepAccess(bidResponse, 'ext.prebid.type');
+        const dsa = deepAccess(bidResponse, 'ext.dsa');
         const result = {
           requestId: bid.bidId,
           cpm: bidResponse.price,
@@ -214,7 +223,8 @@ export const spec = {
           dealId: bidResponse.dealid,
           meta: {
             mediaType,
-            advertiserDomains: bidResponse.adomain
+            advertiserDomains: bidResponse.adomain,
+            dsa
           }
         };
 
@@ -223,7 +233,14 @@ export const spec = {
             ortb: bidResponse.native
           };
         } else {
-          result[ mediaType === VIDEO ? 'vastXml' : 'ad' ] = bidResponse.adm;
+          if (mediaType === VIDEO) {
+            result.vastXml = bidResponse.adm;
+            if (bidResponse.nurl) {
+              result.vastUrl = bidResponse.nurl;
+            }
+          } else {
+            result.ad = bidResponse.adm;
+          }
         }
 
         if (!bid.renderer && mediaType === VIDEO && deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
@@ -239,15 +256,6 @@ export const spec = {
 
 registerBidder(spec);
 
-function setOnAny(collection, key) {
-  for (let i = 0, result; i < collection.length; i++) {
-    result = deepAccess(collection[i], key);
-    if (result) {
-      return result;
-    }
-  }
-}
-
 function flatten(arr) {
   return [].concat(...arr);
 }
diff --git a/modules/adfusionBidAdapter.js b/modules/adfusionBidAdapter.js
index b3638159c2a..a206ee5e899 100644
--- a/modules/adfusionBidAdapter.js
+++ b/modules/adfusionBidAdapter.js
@@ -5,6 +5,7 @@ import * as utils from '../src/utils.js';
 
 const adpterVersion = '1.0';
 export const REQUEST_URL = 'https://spicyrtb.com/auction/prebid';
+export const DEFAULT_CURRENCY = 'USD';
 
 export const spec = {
   code: 'adfusion',
@@ -23,6 +24,17 @@ const converter = ortbConverter({
   context: {
     netRevenue: true,
     ttl: 300,
+    currency: DEFAULT_CURRENCY,
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    const floor = getBidFloor(bidRequest);
+    if (floor) {
+      imp.bidfloor = floor;
+      imp.bidfloorcur = DEFAULT_CURRENCY;
+    }
+
+    return imp;
   },
   request(buildRequest, imps, bidderRequest, context) {
     const req = buildRequest(imps, bidderRequest, context);
@@ -88,3 +100,21 @@ function isBannerBid(bid) {
 function interpretResponse(resp, req) {
   return converter.fromORTB({ request: req.data, response: resp.body });
 }
+
+function getBidFloor(bid) {
+  if (utils.isFn(bid.getFloor)) {
+    let floor = bid.getFloor({
+      currency: DEFAULT_CURRENCY,
+      mediaType: '*',
+      size: '*',
+    });
+    if (
+      utils.isPlainObject(floor) &&
+      !isNaN(floor.floor) &&
+      floor.currency === DEFAULT_CURRENCY
+    ) {
+      return floor.floor;
+    }
+  }
+  return null;
+}
diff --git a/modules/adgenerationBidAdapter.js b/modules/adgenerationBidAdapter.js
index b40378c8e35..3ef9e495ea2 100644
--- a/modules/adgenerationBidAdapter.js
+++ b/modules/adgenerationBidAdapter.js
@@ -1,10 +1,18 @@
-import {deepAccess, getBidIdParameter} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, NATIVE} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
-import {tryAppendQueryString} from '../libraries/urlUtils/urlUtils.js';
-import {escapeUnsafeChars} from '../libraries/htmlEscape/htmlEscape.js';
+import { escapeUnsafeChars } from '../libraries/htmlEscape/htmlEscape.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+import { tryAppendQueryString } from '../libraries/urlUtils/urlUtils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { deepAccess, getBidIdParameter } from '../src/utils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
 
 const ADG_BIDDER_CODE = 'adgeneration';
 
@@ -30,7 +38,7 @@ export const spec = {
   buildRequests: function (validBidRequests, bidderRequest) {
     // convert Native ORTB definition to old-style prebid native definition
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-    const ADGENE_PREBID_VERSION = '1.6.2';
+    const ADGENE_PREBID_VERSION = '1.6.3';
     let serverRequests = [];
     for (let i = 0, len = validBidRequests.length; i < len; i++) {
       const validReq = validBidRequests[i];
@@ -53,7 +61,7 @@ export const spec = {
       data = tryAppendQueryString(data, 't', 'json3');
       data = tryAppendQueryString(data, 'transactionid', validReq.ortb2Imp?.ext?.tid);
       data = tryAppendQueryString(data, 'sizes', getSizes(validReq));
-      data = tryAppendQueryString(data, 'currency', getCurrencyType());
+      data = tryAppendQueryString(data, 'currency', getCurrencyType(bidderRequest));
       data = tryAppendQueryString(data, 'pbver', '$prebid.version$');
       data = tryAppendQueryString(data, 'sdkname', 'prebidjs');
       data = tryAppendQueryString(data, 'adapterver', ADGENE_PREBID_VERSION);
@@ -72,12 +80,12 @@ export const spec = {
       }
 
       data = tryAppendQueryString(data, 'tp', bidderRequest.refererInfo.page);
-      if (isIos()) {
-        const hyperId = getHyperId(validReq);
-        if (hyperId != null) {
-          data = tryAppendQueryString(data, 'hyper_id', hyperId);
-        }
+
+      const hyperId = getHyperId(validReq);
+      if (hyperId != null) {
+        data = tryAppendQueryString(data, 'hyper_id', hyperId);
       }
+
       // remove the trailing "&"
       if (data.lastIndexOf('&') === data.length - 1) {
         data = data.substring(0, data.length - 1);
@@ -86,7 +94,8 @@ export const spec = {
         method: 'GET',
         url: url,
         data: data,
-        bidRequest: validBidRequests[i]
+        bidRequest: validBidRequests[i],
+        bidderRequest
       });
     }
     return serverRequests;
@@ -111,7 +120,7 @@ export const spec = {
       height: body.h ? body.h : 1,
       creativeId: body.creativeid || '',
       dealId: body.dealid || '',
-      currency: getCurrencyType(),
+      currency: getCurrencyFromBidderRequest(bidRequests.bidderRequest),
       netRevenue: true,
       ttl: body.ttl || 10,
     };
@@ -296,9 +305,9 @@ function getSizes(validReq) {
 /**
  * @return {?string} USD or JPY
  */
-function getCurrencyType() {
-  if (config.getConfig('currency.adServerCurrency') && config.getConfig('currency.adServerCurrency').toUpperCase() === 'USD') return 'USD';
-  return 'JPY';
+function getCurrencyType(bidderRequest) {
+  const adServerCurrency = getCurrencyFromBidderRequest(bidderRequest) || ''
+  return adServerCurrency.toUpperCase() === 'USD' ? 'USD' : 'JPY'
 }
 
 /**
@@ -329,8 +338,4 @@ function getHyperId(validReq) {
   return null;
 }
 
-function isIos() {
-  return (/(ios|ipod|ipad|iphone)/i).test(window.navigator.userAgent);
-}
-
 registerBidder(spec);
diff --git a/modules/adgridBidAdapter.js b/modules/adgridBidAdapter.js
new file mode 100644
index 00000000000..71c55a54395
--- /dev/null
+++ b/modules/adgridBidAdapter.js
@@ -0,0 +1,189 @@
+import { _each, isEmpty, deepAccess } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER = Object.freeze({
+  CODE: 'adgrid',
+  HOST: 'https://api-prebid.adgrid.io',
+  REQUEST_METHOD: 'POST',
+  REQUEST_ENDPOINT: '/api/v1/auction',
+  SUPPORTED_MEDIA_TYPES: [BANNER, VIDEO],
+});
+
+const CURRENCY = Object.freeze({
+  KEY: 'currency',
+  US_DOLLAR: 'USD',
+});
+
+function isBidRequestValid(bid) {
+  if (!bid || !bid.params) {
+    return false;
+  }
+
+  return !!bid.params.domainId;
+}
+
+/**
+ * Return some extra params
+ */
+function getAudience(validBidRequests, bidderRequest) {
+  const params = {
+    domain: deepAccess(bidderRequest, 'refererInfo.page')
+  };
+
+  if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies')) {
+    params.gdpr = 1;
+    params.gdprConsent = deepAccess(bidderRequest, 'gdprConsent.consentString');
+  }
+
+  if (deepAccess(bidderRequest, 'uspConsent')) {
+    params.usp = deepAccess(bidderRequest, 'uspConsent');
+  }
+
+  if (deepAccess(validBidRequests[0], 'schain')) {
+    params.schain = deepAccess(validBidRequests[0], 'schain');
+  }
+
+  if (deepAccess(validBidRequests[0], 'userId')) {
+    params.userIds = deepAccess(validBidRequests[0], 'userId');
+  }
+
+  if (deepAccess(validBidRequests[0], 'userIdAsEids')) {
+    params.userEids = deepAccess(validBidRequests[0], 'userIdAsEids');
+  }
+
+  if (bidderRequest.gppConsent) {
+    params.gpp = bidderRequest.gppConsent.gppString;
+    params.gppSid = bidderRequest.gppConsent.applicableSections?.toString();
+  } else if (bidderRequest.ortb2?.regs?.gpp) {
+    params.gpp = bidderRequest.ortb2.regs.gpp;
+    params.gppSid = bidderRequest.ortb2.regs.gpp_sid;
+  }
+
+  return params;
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  const currencyObj = config.getConfig(CURRENCY.KEY);
+  const currency = (currencyObj && currencyObj.adServerCurrency) ? currencyObj.adServerCurrency : 'USD';
+  const bids = [];
+
+  _each(validBidRequests, bid => {
+    bids.push(getBidData(bid))
+  });
+
+  const bidsParams = Object.assign({}, {
+    url: window.location.href,
+    timeout: bidderRequest.timeout,
+    ts: new Date().getTime(),
+    device: {
+      size: [
+        window.screen.width,
+        window.screen.height
+      ]
+    },
+    bids
+  });
+
+  // Add currency if not USD
+  if (currency != null && currency != CURRENCY.US_DOLLAR) {
+    bidsParams.cur = currency;
+  }
+
+  bidsParams.audience = getAudience(validBidRequests, bidderRequest);
+
+  // Passing geo location data if found in prebid config
+  bidsParams.geodata = config.getConfig('adgGeodata') || {};
+
+  return Object.assign({}, bidderRequest, {
+    method: BIDDER.REQUEST_METHOD,
+    url: `${BIDDER.HOST}${BIDDER.REQUEST_ENDPOINT}`,
+    data: bidsParams,
+    currency: currency,
+    options: {
+      withCredentials: false,
+      contentType: 'application/json'
+    }
+  });
+}
+
+function interpretResponse(response, bidRequest) {
+  let bids = response.body;
+  const bidResponses = [];
+
+  if (isEmpty(bids)) {
+    return bidResponses;
+  }
+
+  if (typeof bids !== 'object') {
+    return bidResponses;
+  }
+
+  bids = bids.bids;
+
+  bids.forEach((adUnit) => {
+    const bidResponse = {
+      requestId: adUnit.bidId,
+      cpm: Number(adUnit.cpm),
+      width: adUnit.width,
+      height: adUnit.height,
+      ttl: 300,
+      creativeId: adUnit.creativeId,
+      netRevenue: true,
+      currency: adUnit.currency || bidRequest.currency,
+      mediaType: adUnit.mediaType
+    };
+
+    if (adUnit.mediaType == 'video') {
+      if (adUnit.admUrl) {
+        bidResponse.vastUrl = adUnit.admUrl;
+      } else {
+        bidResponse.vastXml = adUnit.adm;
+      }
+    } else {
+      bidResponse.ad = adUnit.ad;
+    }
+
+    bidResponses.push(bidResponse);
+  });
+
+  return bidResponses;
+}
+
+function getBidData(bid) {
+  const bidData = {
+    requestId: bid.bidId,
+    tid: bid.ortb2Imp?.ext?.tid,
+    deviceW: bid.ortb2?.device?.w,
+    deviceH: bid.ortb2?.device?.h,
+    deviceUa: bid.ortb2?.device?.ua,
+    domain: bid.ortb2?.site?.publisher?.domain,
+    domainId: bid.params.domainId,
+    code: bid.adUnitCode
+  };
+
+  if (bid.mediaTypes != null) {
+    if (bid.mediaTypes.banner != null) {
+      bidData.mediaType = 'banner';
+      bidData.sizes = bid.mediaTypes.banner.sizes;
+    } else if (bid.mediaTypes.video != null) {
+      bidData.mediaType = 'video';
+      bidData.sizes = bid.mediaTypes.video.playerSize;
+      bidData.videoData = bid.mediaTypes.video;
+      bidData.videoParams = bid.params.video;
+    }
+  }
+
+  return bidData;
+}
+
+export const spec = {
+  code: BIDDER.CODE,
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  supportedMediaTypes: BIDDER.SUPPORTED_MEDIA_TYPES
+};
+
+registerBidder(spec);
diff --git a/modules/adgridBidAdapter.md b/modules/adgridBidAdapter.md
new file mode 100644
index 00000000000..94eda01e895
--- /dev/null
+++ b/modules/adgridBidAdapter.md
@@ -0,0 +1,45 @@
+# Overview
+
+**Module Name**: AdGrid Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: support@adgrid.io
+
+# Description
+
+The AdGrid Bidding Adapter requires setup and approval before beginning. Please reach out to  for more details.
+
+# Test Parameters
+
+```javascript
+var adUnits = [
+  // Banner adUnit
+  {
+    code: 'test-div-1',
+    mediaTypes:{
+      banner:{
+        sizes: [[300, 250]]
+      }
+    }
+    bids: [{
+      bidder: 'adgrid',
+      params: {
+        domainId: 12345
+      }
+    }]
+  },
+  {
+    code: 'test-div-2',
+    mediaTypes:{
+      banner:{
+        sizes: [[728, 90], [320, 50]]
+      }
+    }
+    bids: [{
+      bidder: 'adgrid',
+      params: {
+        domainId: 67890
+      }
+    }]
+  }
+];
+```
diff --git a/modules/adhashBidAdapter.js b/modules/adhashBidAdapter.js
index 96e93883de6..7eb91dfcd52 100644
--- a/modules/adhashBidAdapter.js
+++ b/modules/adhashBidAdapter.js
@@ -7,6 +7,7 @@ const VERSION = '3.6';
 const BAD_WORD_STEP = 0.1;
 const BAD_WORD_MIN = 0.2;
 const ADHASH_BIDDER_CODE = 'adhash';
+const storage = getStorageManager({ bidderCode: ADHASH_BIDDER_CODE });
 
 /**
  * Function that checks the page where the ads are being served for brand safety.
@@ -120,7 +121,7 @@ function brandSafety(badWords, maxScore) {
       .replaceAll(/\s\s+/g, ' ')
       .toLowerCase()
       .trim();
-    const content = window.top.document.body.innerText.toLowerCase();
+    const content = window.top.document.body.textContent.toLowerCase();
     // \p{L} matches a single unicode code point in the category 'letter'. Matches any kind of letter from any language.
     const regexp = new RegExp('[\\p{L}]+', 'gu');
     const wordsMatched = content.match(regexp);
@@ -171,7 +172,6 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests, bidderRequest) => {
-    const storage = getStorageManager({ bidderCode: ADHASH_BIDDER_CODE });
     const { gdprConsent } = bidderRequest;
     const bidRequests = [];
     const body = document.body;
@@ -199,9 +199,11 @@ export const spec = {
         position: validBidRequests[i].adUnitCode
       };
       let recentAds = [];
+      let recentAdsPrebid = [];
       if (storage.localStorageIsEnabled()) {
         const prefix = validBidRequests[i].params.prefix || 'adHash';
         recentAds = JSON.parse(storage.getDataFromLocalStorage(prefix + 'recentAds') || '[]');
+        recentAdsPrebid = JSON.parse(storage.getDataFromLocalStorage(prefix + 'recentAdsPrebid') || '[]');
       }
 
       // Needed for the ad density calculation
@@ -237,6 +239,7 @@ export const spec = {
           blockedCreatives: [],
           currentTimestamp: (new Date().getTime() / 1000) | 0,
           recentAds: recentAds,
+          recentAdsPrebid: recentAdsPrebid,
           GDPRApplies: gdprConsent ? gdprConsent.gdprApplies : null,
           GDPR: gdprConsent ? gdprConsent.consentString : null,
           servedAdsCount: window.adsCount,
@@ -263,6 +266,19 @@ export const spec = {
       return [];
     }
 
+    if (storage.localStorageIsEnabled()) {
+      const prefix = request.bidRequest.params.prefix || 'adHash';
+      let recentAdsPrebid = JSON.parse(storage.getDataFromLocalStorage(prefix + 'recentAdsPrebid') || '[]');
+      recentAdsPrebid.push([
+        (new Date().getTime() / 1000) | 0,
+        responseBody.creatives[0].advertiserId,
+        responseBody.creatives[0].budgetId,
+        responseBody.creatives[0].expectedHashes.length ? responseBody.creatives[0].expectedHashes[0] : '',
+      ]);
+      let recentAdsPrebidFinal = JSON.stringify(recentAdsPrebid.slice(-100));
+      storage.setDataInLocalStorage(prefix + 'recentAdsPrebid', recentAdsPrebidFinal);
+    }
+
     const publisherURL = JSON.stringify(request.bidRequest.params.platformURL);
     const bidderURL = request.bidRequest.params.bidderURL || 'https://bidder.adhash.com';
     const oneTimeId = request.bidRequest.adUnitCode + Math.random().toFixed(16).replace('0.', '.');
diff --git a/modules/adkernelAdnAnalyticsAdapter.js b/modules/adkernelAdnAnalyticsAdapter.js
index 48897f8516b..a32a97af3c6 100644
--- a/modules/adkernelAdnAnalyticsAdapter.js
+++ b/modules/adkernelAdnAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import {EVENTS} from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import { logError, parseUrl, _each } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
@@ -51,26 +51,26 @@ let analyticsAdapter = Object.assign(adapter({analyticsType: 'endpoint'}),
       }
       let handler = null;
       switch (eventType) {
-        case CONSTANTS.EVENTS.AUCTION_INIT:
+        case EVENTS.AUCTION_INIT:
           if (analyticsAdapter.context.queue) {
             analyticsAdapter.context.queue.init();
           }
           initPrivacy(analyticsAdapter.context.requestTemplate, args.bidderRequests);
           handler = trackAuctionInit;
           break;
-        case CONSTANTS.EVENTS.BID_REQUESTED:
+        case EVENTS.BID_REQUESTED:
           handler = trackBidRequest;
           break;
-        case CONSTANTS.EVENTS.BID_RESPONSE:
+        case EVENTS.BID_RESPONSE:
           handler = trackBidResponse;
           break;
-        case CONSTANTS.EVENTS.BID_WON:
+        case EVENTS.BID_WON:
           handler = trackBidWon;
           break;
-        case CONSTANTS.EVENTS.BID_TIMEOUT:
+        case EVENTS.BID_TIMEOUT:
           handler = trackBidTimeout;
           break;
-        case CONSTANTS.EVENTS.AUCTION_END:
+        case EVENTS.AUCTION_END:
           handler = trackAuctionEnd;
           break;
       }
@@ -79,7 +79,7 @@ let analyticsAdapter = Object.assign(adapter({analyticsType: 'endpoint'}),
         if (analyticsAdapter.context.queue) {
           analyticsAdapter.context.queue.push(events);
         }
-        if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
+        if (eventType === EVENTS.AUCTION_END) {
           sendAll();
         }
       }
diff --git a/modules/adkernelAdnBidAdapter.js b/modules/adkernelAdnBidAdapter.js
index 81067a3efcf..ae5528f2aeb 100644
--- a/modules/adkernelAdnBidAdapter.js
+++ b/modules/adkernelAdnBidAdapter.js
@@ -2,6 +2,7 @@ import {deepAccess, deepSetValue, isArray, isNumber, isStr, logInfo, parseSizesI
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
+import {getBidFloor} from '../libraries/adkernelUtils/adkernelUtils.js'
 
 const DEFAULT_ADKERNEL_DSP_DOMAIN = 'tag.adkernel.com';
 const DEFAULT_MIMES = ['video/mp4', 'video/webm', 'application/x-shockwave-flash', 'application/javascript'];
@@ -143,18 +144,6 @@ function fillBidMeta(bid, tag) {
   }
 }
 
-function getBidFloor(bid, mediaType, sizes) {
-  var floor;
-  var size = sizes.length === 1 ? sizes[0] : '*';
-  if (typeof bid.getFloor === 'function') {
-    const floorInfo = bid.getFloor({currency: 'USD', mediaType, size});
-    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
-      floor = parseFloat(floorInfo.floor);
-    }
-  }
-  return floor;
-}
-
 export const spec = {
   code: 'adkernelAdn',
   gvlid: GVLID,
diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index 9d9da8cb0ab..414d1ca28e9 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -1,6 +1,5 @@
 import {
   _each,
-  cleanObj,
   contains,
   createTrackPixelHtml,
   deepAccess,
@@ -20,22 +19,26 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {find} from '../src/polyfill.js';
 import {config} from '../src/config.js';
-import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
 import {getAdUnitSizes} from '../libraries/sizeUtils/sizeUtils.js';
+import {getBidFloor} from '../libraries/adkernelUtils/adkernelUtils.js'
 
-/*
+/**
  * In case you're AdKernel whitelable platform's client who needs branded adapter to
  * work with Adkernel platform - DO NOT COPY THIS ADAPTER UNDER NEW NAME
  *
- * Please contact prebid@adkernel.com and we'll add your adapter as an alias.
+ * Please contact prebid@adkernel.com and we'll add your adapter as an alias
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
  */
+
 const VIDEO_PARAMS = ['pos', 'context', 'placement', 'plcmt', 'api', 'mimes', 'protocols', 'playbackmethod', 'minduration', 'maxduration',
   'startdelay', 'linearity', 'skip', 'skipmin', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackend', 'boxingallowed'];
 const VIDEO_FPD = ['battr', 'pos'];
 const NATIVE_FPD = ['battr', 'api'];
 const BANNER_PARAMS = ['pos'];
 const BANNER_FPD = ['btype', 'battr', 'pos', 'api'];
-const VERSION = '1.6';
+const VERSION = '1.7';
 const SYNC_IFRAME = 1;
 const SYNC_IMAGE = 2;
 const SYNC_TYPES = {
@@ -44,28 +47,16 @@ const SYNC_TYPES = {
 };
 const GVLID = 14;
 
-const NATIVE_MODEL = [
-  {name: 'title', assetType: 'title'},
-  {name: 'icon', assetType: 'img', type: 1},
-  {name: 'image', assetType: 'img', type: 3},
-  {name: 'body', assetType: 'data', type: 2},
-  {name: 'body2', assetType: 'data', type: 10},
-  {name: 'sponsoredBy', assetType: 'data', type: 1},
-  {name: 'phone', assetType: 'data', type: 8},
-  {name: 'address', assetType: 'data', type: 9},
-  {name: 'price', assetType: 'data', type: 6},
-  {name: 'salePrice', assetType: 'data', type: 7},
-  {name: 'cta', assetType: 'data', type: 12},
-  {name: 'rating', assetType: 'data', type: 3},
-  {name: 'downloads', assetType: 'data', type: 5},
-  {name: 'likes', assetType: 'data', type: 4},
-  {name: 'displayUrl', assetType: 'data', type: 11}
-];
-
-const NATIVE_INDEX = NATIVE_MODEL.reduce((acc, val, idx) => {
-  acc[val.name] = {id: idx, ...val};
-  return acc;
-}, {});
+const MULTI_FORMAT_SUFFIX = '__mf';
+const MULTI_FORMAT_SUFFIX_BANNER = 'b' + MULTI_FORMAT_SUFFIX;
+const MULTI_FORMAT_SUFFIX_VIDEO = 'v' + MULTI_FORMAT_SUFFIX;
+const MULTI_FORMAT_SUFFIX_NATIVE = 'n' + MULTI_FORMAT_SUFFIX;
+
+const MEDIA_TYPES = {
+  BANNER: 1,
+  VIDEO: 2,
+  NATIVE: 4
+};
 
 /**
  * Adapter for requesting bids from AdKernel white-label display platform
@@ -93,7 +84,6 @@ export const spec = {
     {code: 'unibots'},
     {code: 'ergadx'},
     {code: 'turktelekom'},
-    {code: 'felixads'},
     {code: 'motionspots'},
     {code: 'sonic_twist'},
     {code: 'displayioads'},
@@ -102,7 +92,17 @@ export const spec = {
     {code: 'didnadisplay'},
     {code: 'qortex'},
     {code: 'adpluto'},
-    {code: 'headbidder'}
+    {code: 'headbidder'},
+    {code: 'digiad'},
+    {code: 'monetix'},
+    {code: 'hyperbrainz'},
+    {code: 'voisetech'},
+    {code: 'global_sun'},
+    {code: 'rxnetwork'},
+    {code: 'revbid'},
+    {code: 'spinx', gvlid: 1308},
+    {code: 'oppamedia'},
+    {code: 'pixelpluses', gvlid: 1209}
   ],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
@@ -118,7 +118,9 @@ export const spec = {
       !isNaN(Number(bidRequest.params.zoneId)) &&
       bidRequest.params.zoneId > 0 &&
       bidRequest.mediaTypes &&
-      (bidRequest.mediaTypes.banner || bidRequest.mediaTypes.video || (bidRequest.mediaTypes.native && validateNativeAdUnit(bidRequest.mediaTypes.native)));
+      (bidRequest.mediaTypes.banner || bidRequest.mediaTypes.video ||
+        (bidRequest.mediaTypes.native && validateNativeAdUnit(bidRequest.mediaTypes.native))
+      );
   },
 
   /**
@@ -128,9 +130,6 @@ export const spec = {
    * @returns {ServerRequest[]}
    */
   buildRequests: function (bidRequests, bidderRequest) {
-    // convert Native ORTB definition to old-style prebid native definition
-    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
-
     let impGroups = groupImpressionsByHostZone(bidRequests, bidderRequest.refererInfo);
     let requests = [];
     let schain = bidRequests[0].schain;
@@ -173,19 +172,24 @@ export const spec = {
         ttl: 360,
         netRevenue: true
       };
-      if ('banner' in imp) {
+      if (prBid.requestId.endsWith(MULTI_FORMAT_SUFFIX)) {
+        prBid.requestId = stripMultiformatSuffix(prBid.requestId);
+      }
+      if (rtbBid.mtype === MEDIA_TYPES.BANNER) {
         prBid.mediaType = BANNER;
         prBid.width = rtbBid.w;
         prBid.height = rtbBid.h;
         prBid.ad = formatAdMarkup(rtbBid);
-      } else if ('video' in imp) {
+      } else if (rtbBid.mtype === MEDIA_TYPES.VIDEO) {
         prBid.mediaType = VIDEO;
         prBid.vastUrl = rtbBid.nurl;
         prBid.width = imp.video.w;
         prBid.height = imp.video.h;
-      } else if ('native' in imp) {
+      } else if (rtbBid.mtype === MEDIA_TYPES.NATIVE) {
         prBid.mediaType = NATIVE;
-        prBid.native = buildNativeAd(JSON.parse(rtbBid.adm));
+        prBid.native = {
+          ortb: buildNativeAd(rtbBid.adm)
+        };
       }
       if (isStr(rtbBid.dealid)) {
         prBid.dealId = rtbBid.dealid;
@@ -239,86 +243,101 @@ registerBidder(spec);
 function groupImpressionsByHostZone(bidRequests, refererInfo) {
   let secure = (refererInfo && refererInfo.page?.indexOf('https:') === 0);
   return Object.values(
-    bidRequests.map(bidRequest => buildImp(bidRequest, secure))
+    bidRequests.map(bidRequest => buildImps(bidRequest, secure))
       .reduce((acc, curr, index) => {
         let bidRequest = bidRequests[index];
         let {zoneId, host} = bidRequest.params;
         let key = `${host}_${zoneId}`;
         acc[key] = acc[key] || {host: host, zoneId: zoneId, imps: []};
-        acc[key].imps.push(curr);
+        acc[key].imps.push(...curr);
         return acc;
       }, {})
   );
 }
 
-function getBidFloor(bid, mediaType, sizes) {
-  var floor;
-  var size = sizes.length === 1 ? sizes[0] : '*';
-  if (typeof bid.getFloor === 'function') {
-    const floorInfo = bid.getFloor({currency: 'USD', mediaType, size});
-    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
-      floor = parseFloat(floorInfo.floor);
-    }
-  }
-  return floor;
-}
-
 /**
- *  Builds rtb imp object for single adunit
+ *  Builds rtb imp object(s) for single adunit
  *  @param bidRequest {BidRequest}
  *  @param secure {boolean}
  */
-function buildImp(bidRequest, secure) {
-  const imp = {
+function buildImps(bidRequest, secure) {
+  let imp = {
     'id': bidRequest.bidId,
     'tagid': bidRequest.adUnitCode
   };
-  var mediaType;
+  if (secure) {
+    imp.secure = bidRequest.ortb2Imp?.secure ?? 1;
+  }
   var sizes = [];
-
-  if (bidRequest.mediaTypes?.banner) {
+  let mediaTypes = bidRequest.mediaTypes;
+  let isMultiformat = (~~!!mediaTypes?.banner + ~~!!mediaTypes?.video + ~~!!mediaTypes?.native) > 1;
+  let result = [];
+  let typedImp;
+
+  if (mediaTypes?.banner) {
+    if (isMultiformat) {
+      typedImp = {...imp};
+      typedImp.id = imp.id + MULTI_FORMAT_SUFFIX_BANNER;
+    } else {
+      typedImp = imp;
+    }
     sizes = getAdUnitSizes(bidRequest);
-    let pbBanner = bidRequest.mediaTypes.banner;
-    imp.banner = {
+    let pbBanner = mediaTypes.banner;
+    typedImp.banner = {
       ...getDefinedParamsOrEmpty(bidRequest.ortb2Imp, BANNER_FPD),
       ...getDefinedParamsOrEmpty(pbBanner, BANNER_PARAMS),
       format: sizes.map(wh => parseGPTSingleSizeArrayToRtbSize(wh)),
       topframe: 0
     };
-    mediaType = BANNER;
-  } else if (bidRequest.mediaTypes?.video) {
-    let pbVideo = bidRequest.mediaTypes.video;
-    imp.video = {
+    initImpBidfloor(typedImp, bidRequest, sizes, isMultiformat ? '*' : BANNER);
+    result.push(typedImp);
+  }
+
+  if (mediaTypes?.video) {
+    if (isMultiformat) {
+      typedImp = {...imp};
+      typedImp.id = typedImp.id + MULTI_FORMAT_SUFFIX_VIDEO;
+    } else {
+      typedImp = imp;
+    }
+    let pbVideo = mediaTypes.video;
+    typedImp.video = {
       ...getDefinedParamsOrEmpty(bidRequest.ortb2Imp, VIDEO_FPD),
       ...getDefinedParamsOrEmpty(pbVideo, VIDEO_PARAMS)
     };
     if (pbVideo.playerSize) {
       sizes = pbVideo.playerSize[0];
-      imp.video = Object.assign(imp.video, parseGPTSingleSizeArrayToRtbSize(sizes) || {});
+      typedImp.video = Object.assign(typedImp.video, parseGPTSingleSizeArrayToRtbSize(sizes) || {});
     } else if (pbVideo.w && pbVideo.h) {
-      imp.video.w = pbVideo.w;
-      imp.video.h = pbVideo.h;
+      typedImp.video.w = pbVideo.w;
+      typedImp.video.h = pbVideo.h;
     }
-    mediaType = VIDEO;
-  } else if (bidRequest.mediaTypes?.native) {
-    let nativeRequest = buildNativeRequest(bidRequest.mediaTypes.native);
-    imp.native = {
+    initImpBidfloor(typedImp, bidRequest, sizes, isMultiformat ? '*' : VIDEO);
+    result.push(typedImp);
+  }
+
+  if (mediaTypes?.native) {
+    if (isMultiformat) {
+      typedImp = {...imp};
+      typedImp.id = typedImp.id + MULTI_FORMAT_SUFFIX_NATIVE;
+    } else {
+      typedImp = imp;
+    }
+    typedImp.native = {
       ...getDefinedParamsOrEmpty(bidRequest.ortb2Imp, NATIVE_FPD),
-      ver: '1.1',
-      request: JSON.stringify(nativeRequest)
+      request: JSON.stringify(bidRequest.nativeOrtbRequest)
     };
-    mediaType = NATIVE;
-  } else {
-    throw new Error('Unsupported bid received');
-  }
-  let floor = getBidFloor(bidRequest, mediaType, sizes);
-  if (floor) {
-    imp.bidfloor = floor;
+    initImpBidfloor(typedImp, bidRequest, sizes, isMultiformat ? '*' : NATIVE);
+    result.push(typedImp);
   }
-  if (secure) {
-    imp.secure = 1;
+  return result;
+}
+
+function initImpBidfloor(imp, bid, sizes, mediaType) {
+  let bidfloor = getBidFloor(bid, mediaType, sizes);
+  if (bidfloor) {
+    imp.bidfloor = bidfloor;
   }
-  return imp;
 }
 
 function getDefinedParamsOrEmpty(object, params) {
@@ -328,51 +347,6 @@ function getDefinedParamsOrEmpty(object, params) {
   return getDefinedParams(object, params);
 }
 
-/**
- * Builds native request from native adunit
- */
-function buildNativeRequest(nativeReq) {
-  let request = {ver: '1.1', assets: []};
-  for (let k of Object.keys(nativeReq)) {
-    let v = nativeReq[k];
-    let desc = NATIVE_INDEX[k];
-    if (desc === undefined) {
-      continue;
-    }
-    let assetRoot = {
-      id: desc.id,
-      required: ~~v.required,
-    };
-    if (desc.assetType === 'img') {
-      assetRoot[desc.assetType] = buildImageAsset(desc, v);
-    } else if (desc.assetType === 'data') {
-      assetRoot.data = cleanObj({type: desc.type, len: v.len});
-    } else if (desc.assetType === 'title') {
-      assetRoot.title = {len: v.len || 90};
-    } else {
-      return;
-    }
-    request.assets.push(assetRoot);
-  }
-  return request;
-}
-
-/**
- *  Builds image asset request
- */
-function buildImageAsset(desc, val) {
-  let img = {
-    type: desc.type
-  };
-  if (val.sizes) {
-    [img.w, img.h] = val.sizes;
-  } else if (val.aspect_ratios) {
-    img.wmin = val.aspect_ratios[0].min_width;
-    img.hmin = val.aspect_ratios[0].min_height;
-  }
-  return cleanObj(img);
-}
-
 /**
  * Checks if configuration allows specified sync method
  * @param syncRule {Object}
@@ -497,12 +471,11 @@ function makeRegulations(bidderRequest) {
  * @returns
  */
 function makeBaseRequest(bidderRequest, imps, fpd) {
-  let {timeout} = bidderRequest;
   let request = {
     'id': bidderRequest.bidderRequestId,
     'imp': imps,
     'at': 1,
-    'tmax': parseInt(timeout)
+    'tmax': parseInt(bidderRequest.timeout)
   };
   if (!isEmpty(fpd.bcat)) {
     request.bcat = fpd.bcat;
@@ -622,24 +595,17 @@ function validateNativeImageSize(img) {
 }
 
 /**
- * Creates native ad for native 1.1 response
+ * Creates native ad for native 1.2 response
  */
-function buildNativeAd(nativeResp) {
-  const {assets, link, imptrackers, jstracker, privacy} = nativeResp.native;
-  let nativeAd = {
-    clickUrl: link.url,
-    impressionTrackers: imptrackers,
-    javascriptTrackers: jstracker ? [jstracker] : undefined,
-    privacyLink: privacy,
-  };
-  _each(assets, asset => {
-    let assetName = NATIVE_MODEL[asset.id].name;
-    let assetType = NATIVE_MODEL[asset.id].assetType;
-    nativeAd[assetName] = asset[assetType].text || asset[assetType].value || cleanObj({
-      url: asset[assetType].url,
-      width: asset[assetType].w,
-      height: asset[assetType].h
-    });
-  });
-  return cleanObj(nativeAd);
+function buildNativeAd(adm) {
+  let resp = JSON.parse(adm);
+  // temporary workaround for top-level native object wrapper
+  if ('native' in resp) {
+    resp = resp.native;
+  }
+  return resp;
+}
+
+function stripMultiformatSuffix(impid) {
+  return impid.substr(0, impid.length - MULTI_FORMAT_SUFFIX.length - 1);
 }
diff --git a/modules/adlooxAdServerVideo.js b/modules/adlooxAdServerVideo.js
index bd715cb34f3..199fecafd13 100644
--- a/modules/adlooxAdServerVideo.js
+++ b/modules/adlooxAdServerVideo.js
@@ -9,7 +9,7 @@
 import { registerVideoSupport } from '../src/adServerManager.js';
 import { command as analyticsCommand, COMMAND } from './adlooxAnalyticsAdapter.js';
 import { ajax } from '../src/ajax.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import { targeting } from '../src/targeting.js';
 import { logInfo, isFn, logError, isPlainObject, isStr, isBoolean, deepSetValue, deepClone, timestamp, logWarn } from '../src/utils.js';
 
@@ -74,7 +74,7 @@ function track(options, callback) {
   bid.ext.adloox.video.adserver = false;
 
   analyticsCommand(COMMAND.TRACK, {
-    eventType: CONSTANTS.EVENTS.BID_WON,
+    eventType: EVENTS.BID_WON,
     args: bid
   });
 }
diff --git a/modules/adlooxAnalyticsAdapter.js b/modules/adlooxAnalyticsAdapter.js
index 9284d543298..0a953584e26 100644
--- a/modules/adlooxAnalyticsAdapter.js
+++ b/modules/adlooxAnalyticsAdapter.js
@@ -9,7 +9,7 @@ import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import {loadExternalScript} from '../src/adloader.js';
 import {auctionManager} from '../src/auctionManager.js';
 import {AUCTION_COMPLETED} from '../src/auction.js';
-import CONSTANTS from '../src/constants.json';
+import {EVENTS} from '../src/constants.js';
 import {find} from '../src/polyfill.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {
@@ -28,6 +28,7 @@ import {
   parseUrl
 } from '../src/utils.js';
 import {getGptSlotInfoForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
+import { MODULE_TYPE_ANALYTICS } from '../src/activities/modules.js';
 
 const MODULE = 'adlooxAnalyticsAdapter';
 
@@ -220,9 +221,9 @@ analyticsAdapter.url = function(url, args, bid) {
   return url + a2qs(args);
 }
 
-analyticsAdapter[`handle_${CONSTANTS.EVENTS.AUCTION_END}`] = function(auctionDetails) {
+analyticsAdapter[`handle_${EVENTS.AUCTION_END}`] = function(auctionDetails) {
   if (!(auctionDetails.auctionStatus == AUCTION_COMPLETED && auctionDetails.bidsReceived.length > 0)) return;
-  analyticsAdapter[`handle_${CONSTANTS.EVENTS.AUCTION_END}`] = NOOP;
+  analyticsAdapter[`handle_${EVENTS.AUCTION_END}`] = NOOP;
 
   logMessage(MODULE, 'preloading verification JS');
 
@@ -232,10 +233,11 @@ analyticsAdapter[`handle_${CONSTANTS.EVENTS.AUCTION_END}`] = function(auctionDet
   link.setAttribute('href', `${uri.protocol}://${uri.host}${uri.pathname}`);
   link.setAttribute('rel', 'preload');
   link.setAttribute('as', 'script');
+  // TODO fix rules violation
   insertElement(link);
 }
 
-analyticsAdapter[`handle_${CONSTANTS.EVENTS.BID_WON}`] = function(bid) {
+analyticsAdapter[`handle_${EVENTS.BID_WON}`] = function(bid) {
   if (deepAccess(bid, 'ext.adloox.video.adserver')) {
     logMessage(MODULE, `measuring '${bid.mediaType}' ad unit code '${bid.adUnitCode}' via Ad Server module`);
     return;
@@ -261,7 +263,7 @@ analyticsAdapter[`handle_${CONSTANTS.EVENTS.BID_WON}`] = function(bid) {
     [ 'creatype', '%%creatype%%' ]
   ]);
 
-  loadExternalScript(analyticsAdapter.url(`${analyticsAdapter.context.js}#`, params, bid), 'adloox');
+  loadExternalScript(analyticsAdapter.url(`${analyticsAdapter.context.js}#`, params, bid), MODULE_TYPE_ANALYTICS, 'adloox');
 }
 
 adapterManager.registerAnalyticsAdapter({
diff --git a/modules/adlooxRtdProvider.js b/modules/adlooxRtdProvider.js
index 727dc84e399..1545588676d 100644
--- a/modules/adlooxRtdProvider.js
+++ b/modules/adlooxRtdProvider.js
@@ -106,7 +106,7 @@ function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
 
   // buildUrl creates PHP style multi-parameters and includes undefined... (╯°□°)╯ ┻━┻
   const url = buildUrl(mergeDeep(parseUrl(`${API_ORIGIN}/q`), { search: {
-    'v': `pbjs-${getGlobal().version}`,
+    'v': 'pbjs-v' + '$prebid.version$',
     'c': config.params.clientid,
     'p': config.params.platformid,
     't': config.params.tagid,
diff --git a/modules/admanBidAdapter.js b/modules/admanBidAdapter.js
index 2ee6ecfcb56..6778e536a1b 100644
--- a/modules/admanBidAdapter.js
+++ b/modules/admanBidAdapter.js
@@ -1,203 +1,51 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { isFn, deepAccess, logMessage } from '../src/utils.js';
-import {config} from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
+import { deepAccess } from '../src/utils.js';
+import { config } from '../src/config.js';
+import {
+  isBidRequestValid,
+  buildRequestsBase,
+  interpretResponse,
+  getUserSyncs,
+  buildPlacementProcessingFunction
+} from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const GVLID = 149;
 const BIDDER_CODE = 'adman';
 const AD_URL = 'https://pub.admanmedia.com/?c=o&m=multi';
-const URL_SYNC = 'https://sync.admanmedia.com';
+const SYNC_URL = 'https://sync.admanmedia.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency) {
-    return false;
-  }
-  switch (bid['mediaType']) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.title && bid.native.image && bid.native.impressionTrackers);
-    default:
-      return false;
-  }
-}
+const addCustomFieldsToPlacement = (bid, bidderRequest, placement) => {
+  placement.traffic = placement.adFormat;
 
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
+  if (placement.adFormat === VIDEO) {
+    placement.wPlayer = placement.playerSize?.[0]?.[0];
+    placement.hPlayer = placement.playerSize?.[0]?.[1];
   }
+};
 
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
+const placementProcessingFunction = buildPlacementProcessingFunction({ addCustomFieldsToPlacement });
+
+const buildRequests = (validBidRequests = [], bidderRequest = {}) => {
+  const request = buildRequestsBase({ adUrl: AD_URL, validBidRequests, bidderRequest, placementProcessingFunction });
+  const content = deepAccess(bidderRequest, 'ortb2.site.content', config.getAnyConfig('ortb2.site.content'));
 
-function getUserId(eids, id, source, uidExt) {
-  if (id) {
-    var uid = { id };
-    if (uidExt) {
-      uid.ext = uidExt;
-    }
-    eids.push({
-      source,
-      uids: [ uid ]
-    });
+  if (content) {
+    request.data.content = content;
   }
-}
+
+  return request;
+};
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(bid.params.placementId));
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-    const content = deepAccess(bidderRequest, 'ortb2.site.content', config.getAnyConfig('ortb2.site.content'));
-
-    let winTop = window;
-    let location;
-    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
-    try {
-      location = new URL(bidderRequest.refererInfo.page)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
-    let placements = [];
-    let request = {
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'language': (navigator && navigator.language) ? navigator.language : '',
-      'secure': 1,
-      'host': location.host,
-      'page': location.pathname,
-      'placements': placements
-    };
-    request.language.indexOf('-') != -1 && (request.language = request.language.split('-')[0])
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
-      }
-      if (content) {
-        request.content = content;
-      }
-    }
-    const len = validBidRequests.length;
-
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      const { params, bidId, mediaTypes } = bid;
-
-      const placement = {
-        placementId: params.placementId,
-        bidId,
-        eids: [],
-        bidFloor: getBidFloor(bid)
-      }
-
-      if (bid.transactionId) {
-        placement.ext = placement.ext || {};
-        placement.ext.tid = bid.transactionId;
-      }
-
-      if (bid.schain) {
-        placement.schain = bid.schain;
-      }
-
-      if (bid.userId) {
-        getUserId(placement.eids, bid.userId.uid2 && bid.userId.uid2.id, 'uidapi.com');
-        getUserId(placement.eids, bid.userId.lotamePanoramaId, 'lotame.com');
-        getUserId(placement.eids, bid.userId.idx, 'idx.lat');
-      }
-
-      if (mediaTypes?.[BANNER]) {
-        placement.traffic = BANNER;
-        placement.sizes = mediaTypes[BANNER].sizes;
-      } else if (mediaTypes?.[VIDEO]) {
-        placement.traffic = VIDEO;
-        placement.playerSize = mediaTypes[VIDEO].playerSize;
-        placement.minduration = mediaTypes[VIDEO].minduration;
-        placement.maxduration = mediaTypes[VIDEO].maxduration;
-        placement.mimes = mediaTypes[VIDEO].mimes;
-        placement.protocols = mediaTypes[VIDEO].protocols;
-        placement.startdelay = mediaTypes[VIDEO].startdelay;
-        placement.placement = mediaTypes[VIDEO].placement;
-        placement.skip = mediaTypes[VIDEO].skip;
-        placement.skipafter = mediaTypes[VIDEO].skipafter;
-        placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-        placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-        placement.delivery = mediaTypes[VIDEO].delivery;
-        placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-        placement.api = mediaTypes[VIDEO].api;
-        placement.linearity = mediaTypes[VIDEO].linearity;
-      }
-
-      placements.push(placement);
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    serverResponse = serverResponse.body;
-    for (let i = 0; i < serverResponse.length; i++) {
-      let resItem = serverResponse[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = URL_SYNC + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
-
+  isBidRequestValid: isBidRequestValid(['placementId']),
+  buildRequests,
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/admaticBidAdapter.js b/modules/admaticBidAdapter.js
index 52c06318ec0..0287ff3de33 100644
--- a/modules/admaticBidAdapter.js
+++ b/modules/admaticBidAdapter.js
@@ -1,16 +1,34 @@
-import {getValue, logError, isEmpty, deepAccess, isArray, getBidIdParameter} from '../src/utils.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+import { Renderer } from '../src/Renderer.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { deepAccess, formatQS, getBidIdParameter, getValue, isArray, logError } from '../src/utils.js';
+import {getUserSyncParams} from '../libraries/userSyncUtils/userSyncUtils.js';
+import { interpretNativeAd } from '../libraries/precisoUtils/bidNativeUtils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ */
+
 let SYNC_URL = '';
 const BIDDER_CODE = 'admatic';
+const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 1281,
   aliases: [
-    {code: 'pixad'}
+    {code: 'admaticde', gvlid: 1281},
+    {code: 'pixad', gvlid: 1281},
+    {code: 'monetixads', gvlid: 1281},
+    {code: 'netaddiction', gvlid: 1281},
+    {code: 'adt', gvlid: 779}
   ],
-  supportedMediaTypes: [BANNER, VIDEO],
-  /** f
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+  /**
+   * f
    * @param {object} bid
    * @return {boolean}
    */
@@ -33,57 +51,115 @@ export const spec = {
    * @return {ServerRequest}
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    const tmax = bidderRequest.timeout;
     const bids = validBidRequests.map(buildRequestObject);
-    const blacklist = bidderRequest.ortb2;
+    const ortb = bidderRequest.ortb2;
     const networkId = getValue(validBidRequests[0].params, 'networkId');
-    const host = getValue(validBidRequests[0].params, 'host');
-    const currency = config.getConfig('currency.adServerCurrency') || 'TRY';
+    let host = getValue(validBidRequests[0].params, 'host');
+    const currency = getCurrencyFromBidderRequest(bidderRequest) || 'TRY';
     const bidderName = validBidRequests[0].bidder;
 
     const payload = {
-      user: {
-        ua: navigator.userAgent
-      },
-      blacklist: [],
+      ortb,
       site: {
-        page: location.href,
-        ref: location.origin,
+        page: bidderRequest.refererInfo.page,
+        ref: bidderRequest.refererInfo.page,
         publisher: {
-          name: location.hostname,
+          name: bidderRequest.refererInfo.domain,
           publisherId: networkId
         }
       },
       imp: bids,
       ext: {
-        cur: currency,
         bidder: bidderName
-      }
+      },
+      schain: {},
+      regs: {
+        ext: {
+        }
+      },
+      user: {
+        ext: {}
+      },
+      at: 1,
+      tmax: parseInt(tmax)
     };
 
-    if (!isEmpty(blacklist.badv)) {
-      payload.blacklist = blacklist.badv;
-    };
+    payload.ext.cur = currency;
+    if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+      const consentStr = (bidderRequest.gdprConsent.consentString)
+        ? bidderRequest.gdprConsent.consentString.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '') : '';
+      const gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+      payload.regs.ext.gdpr = gdpr;
+      payload.regs.ext.consent = consentStr;
+    }
+
+    if (bidderRequest && bidderRequest.coppa) {
+      payload.regs.ext.coppa = bidderRequest.coppa === true ? 1 : (bidderRequest.coppa === false ? 0 : undefined);
+    }
+
+    if (bidderRequest && bidderRequest.ortb2?.regs?.gpp) {
+      payload.regs.ext.gpp = bidderRequest.ortb2?.regs?.gpp;
+    }
+
+    if (bidderRequest && bidderRequest.ortb2?.regs?.gpp_sid) {
+      payload.regs.ext.gpp_sid = bidderRequest.ortb2?.regs?.gpp_sid;
+    }
+
+    if (bidderRequest && bidderRequest.uspConsent) {
+      payload.regs.ext.uspIab = bidderRequest.uspConsent;
+    }
+
+    if (validBidRequests[0].schain) {
+      const schain = mapSchain(validBidRequests[0].schain);
+      if (schain) {
+        payload.schain = schain;
+      }
+    }
+
+    if (validBidRequests[0].userIdAsEids) {
+      const eids = { eids: validBidRequests[0].userIdAsEids };
+      payload.user.ext = { ...payload.user.ext, ...eids };
+    }
 
     if (payload) {
       switch (bidderName) {
+        case 'netaddiction':
+          SYNC_URL = 'https://static.cdn.netaddiction.tech/netaddiction/sync.html';
+          break;
+        case 'monetixads':
+          SYNC_URL = 'https://static.cdn.monetixads.com/monetixads/sync.html';
+          break;
         case 'pixad':
-          SYNC_URL = 'https://static.pixad.com.tr/sync.html';
+          SYNC_URL = 'https://static.cdn.pixad.com.tr/sync.html';
+          break;
+        case 'admaticde':
+          SYNC_URL = 'https://static.cdn.admatic.de/admaticde/sync.html';
+          break;
+        case 'adt':
+          SYNC_URL = 'https://static.cdn.adtarget.biz/adt/sync.html';
           break;
         default:
-          SYNC_URL = 'https://cdn.serve.admatic.com.tr/showad/sync.html';
+          SYNC_URL = 'https://static.cdn.admatic.com.tr/sync.html';
           break;
       }
 
+      host = host?.replace('https://', '')?.replace('http://', '')?.replace('/', '');
       return { method: 'POST', url: `https://${host}/pb`, data: payload, options: { contentType: 'application/json' } };
     }
   },
 
-  getUserSyncs: function (syncOptions, responses) {
-    if (syncOptions.iframeEnabled) {
-      return [{
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
+    if (!hasSynced && syncOptions.iframeEnabled) {
+      // data is only assigned if params are available to pass to syncEndpoint
+      let params = getUserSyncParams(gdprConsent, uspConsent, gppConsent);
+      params = Object.keys(params).length ? `&${formatQS(params)}` : '';
+
+      hasSynced = true;
+      return {
         type: 'iframe',
-        url: SYNC_URL
-      }];
+        url: SYNC_URL + params
+      };
     }
   },
 
@@ -95,41 +171,86 @@ export const spec = {
   interpretResponse: (response, request) => {
     const body = response.body;
     const bidResponses = [];
+
     if (body && body?.data && isArray(body.data)) {
       body.data.forEach(bid => {
-        const resbid = {
-          requestId: bid.id,
-          cpm: bid.price,
-          width: bid.width,
-          height: bid.height,
-          currency: body.cur || 'TRY',
-          netRevenue: true,
-          creativeId: bid.creative_id,
-          meta: {
-            advertiserDomains: bid && bid.adomain ? bid.adomain : []
-          },
-          bidder: bid.bidder,
-          mediaType: bid.type,
-          ttl: 60
-        };
-
-        if (resbid.mediaType === 'video' && isUrl(bid.party_tag)) {
-          resbid.vastUrl = bid.party_tag;
-          resbid.vastImpUrl = bid.iurl;
-        } else if (resbid.mediaType === 'video') {
-          resbid.vastXml = bid.party_tag;
-          resbid.vastImpUrl = bid.iurl;
-        } else if (resbid.mediaType === 'banner') {
-          resbid.ad = bid.party_tag;
-        };
-
-        bidResponses.push(resbid);
+        const bidRequest = getAssociatedBidRequest(request.data.imp, bid);
+        if (bidRequest) {
+          const resbid = {
+            requestId: bid.id,
+            cpm: bid.price,
+            width: bid.width,
+            height: bid.height,
+            currency: body.cur,
+            netRevenue: true,
+            creativeId: bid.creative_id,
+            meta: {
+              model: bid.mime_type,
+              advertiserDomains: bid && bid.adomain ? bid.adomain : []
+            },
+            bidder: bid.bidder,
+            mediaType: bid.type,
+            ttl: 60
+          };
+
+          if (resbid.mediaType === 'video' && isUrl(bid.party_tag)) {
+            resbid.vastUrl = bid.party_tag;
+          } else if (resbid.mediaType === 'video') {
+            resbid.vastXml = bid.party_tag;
+          } else if (resbid.mediaType === 'banner') {
+            resbid.ad = bid.party_tag;
+          } else if (resbid.mediaType === 'native') {
+            resbid.native = interpretNativeAd(bid.party_tag)
+          };
+
+          const context = deepAccess(bidRequest, 'mediatype.context');
+          if (resbid.mediaType === 'video' && context === 'outstream') {
+            resbid.renderer = createOutstreamVideoRenderer(bid);
+          }
+
+          bidResponses.push(resbid);
+        }
       });
     }
     return bidResponses;
   }
 };
 
+var hasSynced = false;
+
+export function resetUserSync() {
+  hasSynced = false;
+}
+
+/**
+ * @param {object} schain object set by Publisher
+ * @returns {object} OpenRTB SupplyChain object
+ */
+function mapSchain(schain) {
+  if (!schain) {
+    return null;
+  }
+  if (!validateSchain(schain)) {
+    logError('AdMatic: required schain params missing');
+    return null;
+  }
+  return schain;
+}
+
+/**
+ * @param {object} schain object set by Publisher
+ * @returns {object} bool
+ */
+function validateSchain(schain) {
+  if (!schain.nodes) {
+    return false;
+  }
+  const requiredFields = ['asi', 'sid', 'hp'];
+  return schain.nodes.every(node => {
+    return requiredFields.every(field => node[field]);
+  });
+}
+
 function isUrl(str) {
   try {
     URL(str);
@@ -139,6 +260,40 @@ function isUrl(str) {
   }
 };
 
+function outstreamRender (bid) {
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      targetId: bid.adUnitCode,
+      adResponse: bid.adResponse
+    });
+  });
+}
+
+function createOutstreamVideoRenderer(bid) {
+  const renderer = Renderer.install({
+    id: bid.bidId,
+    url: RENDERER_URL,
+    loaded: false
+  });
+
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    logError('Prebid Error calling setRender on renderer' + err);
+  }
+
+  return renderer;
+}
+
+function getAssociatedBidRequest(bidRequests, bid) {
+  for (const request of bidRequests) {
+    if (request.id === bid.id) {
+      return request;
+    }
+  }
+  return undefined;
+}
+
 function enrichSlotWithFloors(slot, bidRequest) {
   try {
     const slotFloors = {};
@@ -156,6 +311,11 @@ function enrichSlotWithFloors(slot, bidRequest) {
         videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = bidRequest.getFloor({ size: videoSize, mediaType: VIDEO }));
       }
 
+      if (bidRequest.mediaTypes?.native) {
+        slotFloors.native = {};
+        slotFloors.native['*'] = bidRequest.getFloor({ size: '*', mediaType: NATIVE });
+      }
+
       if (Object.keys(slotFloors).length > 0) {
         if (!slot) {
           slot = {}
@@ -195,6 +355,11 @@ function buildRequestObject(bid) {
     reqObj.type = 'video';
     reqObj.mediatype = bid.mediaTypes.video;
   }
+  if (bid.mediaTypes?.native) {
+    reqObj.type = 'native';
+    reqObj.size = [{w: 1, h: 1}];
+    reqObj.mediatype = bid.mediaTypes.native;
+  }
 
   if (deepAccess(bid, 'ortb2Imp.ext')) {
     reqObj.ext = bid.ortb2Imp.ext;
@@ -214,10 +379,11 @@ function getSizes(bid) {
 function concatSizes(bid) {
   let playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
   let videoSizes = deepAccess(bid, 'mediaTypes.video.sizes');
+  let nativeSizes = deepAccess(bid, 'mediaTypes.native.sizes');
   let bannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
 
   if (isArray(bannerSizes) || isArray(playerSize) || isArray(videoSizes)) {
-    let mediaTypesSizes = [bannerSizes, videoSizes, playerSize];
+    let mediaTypesSizes = [bannerSizes, videoSizes, nativeSizes, playerSize];
     return mediaTypesSizes
       .reduce(function(acc, currSize) {
         if (isArray(currSize)) {
diff --git a/modules/admediaBidAdapter.js b/modules/admediaBidAdapter.js
index 42593a36159..5ea3e27b0d9 100644
--- a/modules/admediaBidAdapter.js
+++ b/modules/admediaBidAdapter.js
@@ -1,6 +1,12 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
 const BIDDER_CODE = 'admedia';
 const ENDPOINT_URL = 'https://prebid.admedia.com/bidder/';
 
diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index 6cbc36c1dcd..1570a36c5f0 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -1,4 +1,4 @@
-import {isStr, logError} from '../src/utils.js';
+import {isStr, logError, isFn, deepAccess} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
@@ -10,10 +10,10 @@ const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.2.aspx';
 const ALIASES = [
   {code: 'go2net', endpoint: 'https://ads.go2net.com.ua/prebid.1.2.aspx'},
   'adblender',
-  {code: 'adsyield', endpoint: 'https://ads.adsyield.com/prebid.1.2.aspx'},
   {code: 'futureads', endpoint: 'https://ads.futureads.io/prebid.1.2.aspx'},
   {code: 'smn', endpoint: 'https://ads.smn.rs/prebid.1.2.aspx'},
   {code: 'admixeradx', endpoint: 'https://inv-nets.admixer.net/adxprebid.1.2.aspx'},
+  'rtbstack'
 ];
 export const spec = {
   code: BIDDER_CODE,
@@ -23,7 +23,9 @@ export const spec = {
    * Determines whether or not the given bid request is valid.
    */
   isBidRequestValid: function (bid) {
-    return !!bid.params.zone;
+    return bid.bidder === 'rtbstack'
+      ? !!bid.params.tagId
+      : !!bid.params.zone;
   },
   /**
    * Make a server request from the list of BidRequests.
@@ -49,8 +51,12 @@ export const spec = {
     };
     let endpointUrl;
     if (bidderRequest) {
-      const {bidderCode} = bidderRequest;
-      endpointUrl = config.getConfig(`${bidderCode}.endpoint_url`);
+      // checks if there is specified any endpointUrl in bidder config
+      endpointUrl = config.getConfig('bidderURL');
+      if (!endpointUrl && bidderRequest.bidderCode === 'rtbstack') {
+        logError('The bidderUrl config is required for RTB Stack bids. Please set it with setBidderConfig() for "rtbstack".');
+        return;
+      }
       // TODO: is 'page' the right value here?
       if (bidderRequest.refererInfo?.page) {
         payload.referrer = encodeURIComponent(bidderRequest.refererInfo.page);
@@ -65,21 +71,22 @@ export const spec = {
       if (bidderRequest.uspConsent) {
         payload.uspConsent = bidderRequest.uspConsent;
       }
-      let bidFloor = getBidFloor(bidderRequest);
-      if (bidFloor) {
-        payload.bidFloor = bidFloor;
-      }
     }
     validRequest.forEach((bid) => {
       let imp = {};
       Object.keys(bid).forEach(key => imp[key] = bid[key]);
       imp.ortb2 && delete imp.ortb2;
+      let bidFloor = getBidFloor(bid);
+      if (bidFloor) {
+        imp.bidFloor = bidFloor;
+      }
       payload.imps.push(imp);
     });
+
+    let urlForRequest = endpointUrl || getEndpointUrl(bidderRequest.bidderCode)
     return {
       method: 'POST',
-      url:
-        endpointUrl || getEndpointUrl(bidderRequest.bidderCode),
+      url: urlForRequest,
       data: payload,
     };
   },
@@ -110,19 +117,26 @@ export const spec = {
     return pixels;
   }
 };
+
 function getEndpointUrl(code) {
   return find(ALIASES, (val) => val.code === code)?.endpoint || ENDPOINT_URL;
 }
+
 function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.bidFloor', 0);
+  }
+
   try {
     const bidFloor = bid.getFloor({
       currency: 'USD',
       mediaType: '*',
       size: '*',
     });
-    return bidFloor.floor;
+    return bidFloor?.floor;
   } catch (_) {
     return 0;
   }
 }
+
 registerBidder(spec);
diff --git a/modules/admixerBidAdapter.md b/modules/admixerBidAdapter.md
index 682f5629115..097e7feb95e 100644
--- a/modules/admixerBidAdapter.md
+++ b/modules/admixerBidAdapter.md
@@ -50,3 +50,45 @@ Please use ```admixer``` as the bidder code.
            },
        ];
 ```
+
+### RTB Stack Test Parameters
+```
+    var adUnits = [
+           {
+               code: 'desktop-banner-ad-div',
+               sizes: [[300, 250]],  // a display size
+               bids: [
+                   {
+                       bidder: "rtbstack",
+                       params: {
+                           tagId: 41512
+                       }
+                   }
+               ]
+           },{
+               code: 'mobile-banner-ad-div',
+               sizes: [[300, 50]],   // a mobile size
+               bids: [
+                   {
+                       bidder: "rtbstack",
+                       params: {
+                           tagId: 41512
+                       }
+                   }
+               ]
+           },{
+               code: 'video-ad',
+               sizes: [[300, 50]],
+               mediaType: 'video',
+               bids: [
+                   {
+                       bidder: "rtbstack",
+                       params: {
+                           tagId: 41512
+                       }
+                   }
+               ]
+           },
+       ];
+```
+
diff --git a/modules/admixerIdSystem.js b/modules/admixerIdSystem.js
index 0e3a56420a8..cb7248c9537 100644
--- a/modules/admixerIdSystem.js
+++ b/modules/admixerIdSystem.js
@@ -11,6 +11,13 @@ import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const NAME = 'admixerId';
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: NAME});
 
diff --git a/modules/adnowBidAdapter.js b/modules/adnowBidAdapter.js
index f83dbf68a1f..5083f4cc93d 100644
--- a/modules/adnowBidAdapter.js
+++ b/modules/adnowBidAdapter.js
@@ -5,10 +5,14 @@ import {includes} from '../src/polyfill.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adnow';
-const ENDPOINT = 'https://n.ads3-adnow.com/a';
+const ENDPOINT = 'https://n.nnowa.com/a';
 
 /**
  * @typedef {object} CommonBidData
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderSpec} BidderSpec
  *
  * @property {string} requestId The specific BidRequest which this bid is aimed at.
  *   This should match the BidRequest.bidId which this Bid targets.
diff --git a/modules/adnuntiusBidAdapter.js b/modules/adnuntiusBidAdapter.js
index a2b695e55e0..2747000c416 100644
--- a/modules/adnuntiusBidAdapter.js
+++ b/modules/adnuntiusBidAdapter.js
@@ -1,6 +1,6 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { isStr, deepAccess } from '../src/utils.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {isStr, isEmpty, deepAccess, getUnixTimestampFromNow, convertObjectToArray} from '../src/utils.js';
 import { config } from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
 
@@ -12,44 +12,211 @@ const BIDDER_CODE_DEAL_ALIASES = [1, 2, 3, 4, 5].map(num => {
 const ENDPOINT_URL = 'https://ads.adnuntius.delivery/i';
 const ENDPOINT_URL_EUROPE = 'https://europe.delivery.adnuntius.com/i';
 const GVLID = 855;
-const DEFAULT_VAST_VERSION = 'vast4'
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
 const MAXIMUM_DEALS_LIMIT = 5;
 const VALID_BID_TYPES = ['netBid', 'grossBid'];
+const METADATA_KEY = 'adn.metaData';
+const METADATA_KEY_SEPARATOR = '@@@';
 
-const checkSegment = function (segment) {
-  if (isStr(segment)) return segment;
-  if (segment.id) return segment.id
-}
+export const misc = {
+  findHighestPrice: function(arr, bidType) {
+    return arr.reduce((highest, cur) => {
+      const currentBid = cur[bidType];
+      const highestBid = highest[bidType]
+      return currentBid.currency === highestBid.currency && currentBid.amount > highestBid.amount ? cur : highest;
+    }, arr[0]);
+  }
+};
+
+const storageTool = (function () {
+  const storage = getStorageManager({ bidderCode: BIDDER_CODE });
+  let metaInternal;
+
+  const getMetaDataFromLocalStorage = function (pNetwork) {
+    if (!storage.localStorageIsEnabled()) {
+      return [];
+    }
+
+    let parsedJson;
+    try {
+      parsedJson = JSON.parse(storage.getDataFromLocalStorage(METADATA_KEY));
+    } catch (e) {
+      return [];
+    }
+
+    let network = pNetwork;
+    if (Array.isArray(pNetwork)) {
+      network = (pNetwork.find((p) => p.network) || {}).network;
+    }
 
-const getSegmentsFromOrtb = function (ortb2) {
-  const userData = deepAccess(ortb2, 'user.data');
-  let segments = [];
-  if (userData) {
-    userData.forEach(userdat => {
-      if (userdat.segment) {
-        segments.push(...userdat.segment.filter(checkSegment).map(checkSegment));
+    let filteredEntries = parsedJson ? parsedJson.filter((datum) => {
+      if (datum.key === 'voidAuIds' && Array.isArray(datum.value)) {
+        return true;
       }
-    });
-  }
-  return segments
-}
+      return datum.key && datum.value && datum.exp && datum.exp > getUnixTimestampFromNow() && (!network || network === datum.network);
+    }) : [];
+    const voidAuIdsEntry = filteredEntries.find(entry => entry.key === 'voidAuIds');
+    if (voidAuIdsEntry) {
+      const now = getUnixTimestampFromNow();
+      voidAuIdsEntry.value = voidAuIdsEntry.value.filter(voidAuId => voidAuId.auId && voidAuId.exp > now);
+      if (!voidAuIdsEntry.value.length) {
+        filteredEntries = filteredEntries.filter(entry => entry.key !== 'voidAuIds');
+      }
+    }
+    return filteredEntries;
+  };
+
+  const setMetaInternal = function (apiRespMetadata, network) {
+    if (!storage.localStorageIsEnabled()) {
+      return;
+    }
+
+    const updateVoidAuIds = function (currentVoidAuIds, auIdsAsString) {
+      const newAuIds = isStr(auIdsAsString) ? auIdsAsString.split(';') : [];
+      const notNewExistingAuIds = currentVoidAuIds.filter(auIdObj => {
+        return newAuIds.indexOf(auIdObj.value) < -1;
+      }) || [];
+      const oneDayFromNow = getUnixTimestampFromNow(1);
+      const apiIdsArray = newAuIds.map(auId => {
+        return { exp: oneDayFromNow, auId: auId };
+      }) || [];
+      return notNewExistingAuIds.concat(apiIdsArray) || [];
+    }
 
-const handleMeta = function () {
-  const storage = getStorageManager({ bidderCode: BIDDER_CODE })
-  let adnMeta = null
-  if (storage.localStorageIsEnabled()) {
-    adnMeta = JSON.parse(storage.getDataFromLocalStorage('adn.metaData'))
+    // use the metadata key separator to distinguish the same key for different networks.
+    const metaAsObj = getMetaDataFromLocalStorage().reduce((a, entry) => ({ ...a, [entry.key + METADATA_KEY_SEPARATOR + (entry.network ? entry.network : '')]: { value: entry.value, exp: entry.exp, network: entry.network } }), {});
+    for (const key in apiRespMetadata) {
+      if (key !== 'voidAuIds') {
+        metaAsObj[key + METADATA_KEY_SEPARATOR + network] = {
+          value: apiRespMetadata[key],
+          exp: getUnixTimestampFromNow(100),
+          network: network
+        }
+      }
+    }
+    const currentAuIds = updateVoidAuIds(metaAsObj.voidAuIds || [], apiRespMetadata.voidAuIds);
+    if (currentAuIds.length > 0) {
+      metaAsObj.voidAuIds = { value: currentAuIds };
+    }
+    const metaDataForSaving = Object.entries(metaAsObj).map((entrySet) => {
+      if (entrySet.length !== 2) {
+        return {};
+      }
+      const key = entrySet[0].split(METADATA_KEY_SEPARATOR)[0];
+      if (key === 'voidAuIds') {
+        return {
+          key: key,
+          value: entrySet[1].value
+        };
+      }
+      return {
+        key: key,
+        value: entrySet[1].value,
+        exp: entrySet[1].exp,
+        network: entrySet[1].network
+      }
+    }).filter(entry => entry.key);
+    storage.setDataInLocalStorage(METADATA_KEY, JSON.stringify(metaDataForSaving));
+  };
+
+  const getUsi = function (meta, ortb2, bidParams) {
+    // Fetch user id from parameters.
+    for (let i = 0; i < bidParams.length; i++) {
+      const bidParam = bidParams[i];
+      if (bidParam.userId) {
+        return bidParam.userId;
+      }
+    }
+    if (ortb2 && ortb2.user && ortb2.user.id) {
+      return ortb2.user.id
+    }
+    return (meta && meta.usi) ? meta.usi : false
   }
-  return (adnMeta !== null) ? adnMeta.reduce((acc, cur) => { return { ...acc, [cur.key]: cur.value } }, {}) : {}
-}
 
-const getUsi = function (meta, ortb2, bidderRequest) {
-  let usi = (meta !== null && meta.usi) ? meta.usi : false;
-  if (ortb2 && ortb2.user && ortb2.user.id) { usi = ortb2.user.id }
-  return usi
-}
+  return {
+    refreshStorage: function (bidderRequest) {
+      const ortb2 = bidderRequest.ortb2 || {};
+      const bidParams = (bidderRequest.bids || []).map((b) => {
+        return b.params ? b.params : {};
+      });
+      metaInternal = getMetaDataFromLocalStorage(bidParams).reduce((a, entry) => ({ ...a, [entry.key]: entry.value }), {});
+      metaInternal.usi = getUsi(metaInternal, ortb2, bidParams);
+      if (!metaInternal.usi) {
+        delete metaInternal.usi;
+      }
+      if (metaInternal.voidAuIds) {
+        metaInternal.voidAuIdsArray = metaInternal.voidAuIds.map((voidAuId) => {
+          return voidAuId.auId;
+        });
+      }
+    },
+    saveToStorage: function (serverData, network) {
+      setMetaInternal(serverData, network);
+    },
+    getUrlRelatedData: function () {
+      // getting the URL information is theoretically not network-specific
+      const { usi, voidAuIdsArray } = metaInternal;
+      return { usi, voidAuIdsArray };
+    },
+    getPayloadRelatedData: function (network) {
+      // getting the payload data should be network-specific
+      const { segments, usi, userId, voidAuIdsArray, voidAuIds, ...payloadRelatedData } = getMetaDataFromLocalStorage(network).reduce((a, entry) => ({ ...a, [entry.key]: entry.value }), {});
+      return payloadRelatedData;
+    }
+  };
+})();
 
-const validateBidType = function(bidTypeOption) {
+const targetingTool = (function() {
+  const getSegmentsFromOrtb = function(bidderRequest) {
+    const userData = deepAccess(bidderRequest.ortb2 || {}, 'user.data');
+    let segments = [];
+    if (userData) {
+      userData.forEach(userdat => {
+        if (userdat.segment) {
+          segments.push(...userdat.segment.map((segment) => {
+            if (isStr(segment)) return segment;
+            if (isStr(segment.id)) return segment.id;
+          }).filter((seg) => !!seg));
+        }
+      });
+    }
+    return segments
+  };
+
+  const getKvsFromOrtb = function(bidderRequest) {
+    return deepAccess(bidderRequest.ortb2 || {}, 'site.ext.data');
+  };
+
+  return {
+    addSegmentsToUrlData: function (validBids, bidderRequest, existingUrlRelatedData) {
+      let segments = getSegmentsFromOrtb(bidderRequest || {});
+
+      for (let i = 0; i < validBids.length; i++) {
+        const bid = validBids[i];
+        const targeting = bid.params.targeting || {};
+        if (Array.isArray(targeting.segments)) {
+          segments = segments.concat(targeting.segments);
+          delete bid.params.targeting.segments;
+        }
+      }
+
+      existingUrlRelatedData.segments = segments;
+    },
+    mergeKvsFromOrtb: function(bidTargeting, bidderRequest) {
+      const kv = getKvsFromOrtb(bidderRequest || {});
+      if (isEmpty(kv)) {
+        return;
+      }
+      if (bidTargeting.kv && !Array.isArray(bidTargeting.kv)) {
+        bidTargeting.kv = convertObjectToArray(bidTargeting.kv);
+      }
+      bidTargeting.kv = bidTargeting.kv || [];
+      bidTargeting.kv = bidTargeting.kv.concat(convertObjectToArray(kv));
+    }
+  }
+})();
+
+const validateBidType = function (bidTypeOption) {
   return VALID_BID_TYPES.indexOf(bidTypeOption || '') > -1 ? bidTypeOption : 'bid';
 }
 
@@ -59,7 +226,7 @@ export const spec = {
   code: BIDDER_CODE,
   aliases: BIDDER_CODE_DEAL_ALIASES,
   gvlid: GVLID,
-  supportedMediaTypes: [BANNER, VIDEO],
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
   isBidRequestValid: function (bid) {
     // The auId MUST be a hexadecimal string
     const validAuId = AU_ID_REGEX.test(bid.params.auId);
@@ -67,59 +234,104 @@ export const spec = {
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
-    const networks = {};
-    const bidRequests = {};
-    const requests = [];
-    const request = [];
-    const ortb2 = bidderRequest.ortb2 || {};
-    const bidderConfig = config.getConfig();
-
-    const adnMeta = handleMeta()
-    const usi = getUsi(adnMeta, ortb2, bidderRequest)
-    const segments = getSegmentsFromOrtb(ortb2);
-    const tzo = new Date().getTimezoneOffset();
+    const queryParamsAndValues = [];
+    queryParamsAndValues.push('tzo=' + new Date().getTimezoneOffset())
+    queryParamsAndValues.push('format=prebid')
     const gdprApplies = deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
     const consentString = deepAccess(bidderRequest, 'gdprConsent.consentString');
+    if (gdprApplies !== undefined) {
+      const flag = gdprApplies ? '1' : '0'
+      queryParamsAndValues.push('consentString=' + consentString);
+      queryParamsAndValues.push('gdpr=' + flag);
+    }
 
-    request.push('tzo=' + tzo)
-    request.push('format=json')
+    const searchParams = new URLSearchParams(window.location.search);
+    if (searchParams.has('script-override')) {
+      queryParamsAndValues.push('so=' + searchParams.get('script-override'));
+    }
 
-    if (gdprApplies !== undefined) request.push('consentString=' + consentString);
-    if (segments.length > 0) request.push('segments=' + segments.join(','));
-    if (usi) request.push('userId=' + usi);
-    if (bidderConfig.useCookie === false) request.push('noCookies=true');
-    if (bidderConfig.maxDeals > 0) request.push('ds=' + Math.min(bidderConfig.maxDeals, MAXIMUM_DEALS_LIMIT));
-    for (let i = 0; i < validBidRequests.length; i++) {
-      const bid = validBidRequests[i]
-      let network = bid.params.network || 'network';
-      const maxDeals = Math.max(0, Math.min(bid.params.maxDeals || 0, MAXIMUM_DEALS_LIMIT));
-      const targeting = bid.params.targeting || {};
+    storageTool.refreshStorage(bidderRequest);
+
+    const urlRelatedMetaData = storageTool.getUrlRelatedData();
+    targetingTool.addSegmentsToUrlData(validBidRequests, bidderRequest, urlRelatedMetaData);
+    if (urlRelatedMetaData.segments.length > 0) queryParamsAndValues.push('segments=' + urlRelatedMetaData.segments.join(','));
+    if (urlRelatedMetaData.usi) queryParamsAndValues.push('userId=' + urlRelatedMetaData.usi);
 
-      if (bid.mediaTypes && bid.mediaTypes.video && bid.mediaTypes.video.context !== 'outstream') {
-        network += '_video'
+    const bidderConfig = config.getConfig();
+    if (bidderConfig.useCookie === false) queryParamsAndValues.push('noCookies=true');
+    if (bidderConfig.advertiserTransparency === true) queryParamsAndValues.push('advertiserTransparency=true');
+    if (bidderConfig.maxDeals > 0) queryParamsAndValues.push('ds=' + Math.min(bidderConfig.maxDeals, MAXIMUM_DEALS_LIMIT));
+
+    const bidRequests = {};
+    const networks = {};
+
+    for (let i = 0; i < validBidRequests.length; i++) {
+      const bid = validBidRequests[i];
+      if ((urlRelatedMetaData.voidAuIdsArray && (urlRelatedMetaData.voidAuIdsArray.indexOf(bid.params.auId) > -1 || urlRelatedMetaData.voidAuIdsArray.indexOf(bid.params.auId.padStart(16, '0')) > -1))) {
+        // This auId is void. Do NOT waste time and energy sending a request to the server
+        continue;
       }
 
+      let network = bid.params.network || 'network';
       bidRequests[network] = bidRequests[network] || [];
       bidRequests[network].push(bid);
 
       networks[network] = networks[network] || {};
       networks[network].adUnits = networks[network].adUnits || [];
-      if (bidderRequest && bidderRequest.refererInfo) networks[network].context = bidderRequest.refererInfo.page;
-      if (adnMeta) networks[network].metaData = adnMeta;
-      const adUnit = { ...targeting, auId: bid.params.auId, targetId: bid.bidId, maxDeals: maxDeals }
-      if (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) adUnit.dimensions = bid.mediaTypes.banner.sizes
-      networks[network].adUnits.push(adUnit);
+
+      const refererInfo = bidderRequest && bidderRequest.refererInfo ? bidderRequest.refererInfo : {};
+      if (refererInfo.page) {
+        networks[network].context = bidderRequest.refererInfo.page;
+      }
+      if (refererInfo.canonicalUrl) {
+        networks[network].canonical = bidderRequest.refererInfo.canonicalUrl;
+      }
+
+      const payloadRelatedData = storageTool.getPayloadRelatedData(bid.params.network);
+      if (Object.keys(payloadRelatedData).length > 0) {
+        networks[network].metaData = payloadRelatedData;
+      }
+
+      const bidTargeting = {...bid.params.targeting || {}};
+      targetingTool.mergeKvsFromOrtb(bidTargeting, bidderRequest);
+      const mediaTypes = bid.mediaTypes || {};
+      const validMediaTypes = SUPPORTED_MEDIA_TYPES.filter(mt => {
+        return mediaTypes[mt];
+      }) || [];
+      if (validMediaTypes.length === 0) {
+        // banner ads by default if nothing specified, dimensions to be derived from the ad unit within adnuntius system
+        validMediaTypes.push(BANNER);
+      }
+      const isSingleFormat = validMediaTypes.length === 1;
+      validMediaTypes.forEach(mediaType => {
+        const mediaTypeData = mediaTypes[mediaType];
+        if (mediaType === VIDEO && mediaTypeData && mediaTypeData.context === 'outstream') {
+          return;
+        }
+        const targetId = (bid.params.targetId || bid.bidId) + (isSingleFormat || mediaType === BANNER ? '' : ('-' + mediaType));
+        const adUnit = {...bidTargeting, auId: bid.params.auId, targetId: targetId};
+        if (mediaType === VIDEO) {
+          adUnit.adType = 'VAST';
+        }
+        const maxDeals = Math.max(0, Math.min(bid.params.maxDeals || 0, MAXIMUM_DEALS_LIMIT));
+        if (maxDeals > 0) {
+          adUnit.maxDeals = maxDeals;
+        }
+        if (mediaType === BANNER && mediaTypeData && mediaTypeData.sizes) {
+          adUnit.dimensions = mediaTypeData.sizes;
+        }
+        networks[network].adUnits.push(adUnit);
+      });
     }
 
-    const networkKeys = Object.keys(networks)
+    const requests = [];
+    const networkKeys = Object.keys(networks);
     for (let j = 0; j < networkKeys.length; j++) {
       const network = networkKeys[j];
-      const networkRequest = [...request]
-      if (network.indexOf('_video') > -1) { networkRequest.push('tt=' + DEFAULT_VAST_VERSION) }
       const requestURL = gdprApplies ? ENDPOINT_URL_EUROPE : ENDPOINT_URL
       requests.push({
         method: 'POST',
-        url: requestURL + '?' + networkRequest.join('&'),
+        url: requestURL + '?' + queryParamsAndValues.join('&'),
         data: JSON.stringify(networks[network]),
         bid: bidRequests[network]
       });
@@ -129,7 +341,10 @@ export const spec = {
   },
 
   interpretResponse: function (serverResponse, bidRequest) {
-    const adUnits = serverResponse.body.adUnits;
+    if (serverResponse.body.metaData) {
+      storageTool.saveToStorage(serverResponse.body.metaData, serverResponse.body.network);
+    }
+    const responseAdUnits = serverResponse.body.adUnits;
 
     let validatedBidType = validateBidType(config.getConfig().bidType);
     if (bidRequest.bid) {
@@ -141,10 +356,12 @@ export const spec = {
     }
 
     function buildAdResponse(bidderCode, ad, adUnit, dealCount) {
-      const destinationUrls = ad.destinationUrls || {};
-      const advertiserDomains = [];
-      for (const value of Object.values(destinationUrls)) {
-        advertiserDomains.push(value.split('/')[2])
+      const advertiserDomains = ad.advertiserDomains || [];
+      if (advertiserDomains.length === 0) {
+        const destinationUrls = ad.destinationUrls || {};
+        for (const value of Object.values(destinationUrls)) {
+          advertiserDomains.push(value.split('/')[2])
+        }
       }
       const adResponse = {
         bidderCode: bidderCode,
@@ -175,6 +392,35 @@ export const spec = {
       return adResponse;
     }
 
+    const highestYieldingAdUnits = [];
+    if (responseAdUnits.length === 1) {
+      highestYieldingAdUnits.push(responseAdUnits[0]);
+    } else if (responseAdUnits.length > 1) {
+      bidRequest.bid.forEach((resp) => {
+        const multiFormatAdUnits = [];
+        SUPPORTED_MEDIA_TYPES.forEach((mediaType) => {
+          const suffix = mediaType === BANNER ? '' : '-' + mediaType;
+          const targetId = (resp?.params?.targetId || resp.bidId) + suffix;
+
+          const au = responseAdUnits.find((rAu) => {
+            return rAu.targetId === targetId && rAu.matchedAdCount > 0;
+          });
+          if (au) {
+            multiFormatAdUnits.push(au);
+          }
+        });
+        if (multiFormatAdUnits.length > 0) {
+          const highestYield = multiFormatAdUnits.length === 1 ? multiFormatAdUnits[0] : multiFormatAdUnits.reduce((highest, cur) => {
+            const highestBid = misc.findHighestPrice(highest.ads, validatedBidType)[validatedBidType];
+            const curBid = misc.findHighestPrice(cur.ads, validatedBidType)[validatedBidType];
+            return curBid.currency === highestBid.currency && curBid.amount > highestBid.amount ? cur : highest;
+          }, multiFormatAdUnits[0]);
+          highestYield.targetId = resp.bidId;
+          highestYieldingAdUnits.push(highestYield);
+        }
+      });
+    }
+
     const bidsById = bidRequest.bid.reduce((response, bid) => {
       return {
         ...response,
@@ -182,7 +428,7 @@ export const spec = {
       };
     }, {});
 
-    const hasBidAdUnits = adUnits.filter((au) => {
+    const hasBidAdUnits = highestYieldingAdUnits.filter((au) => {
       const bid = bidsById[au.targetId];
       if (bid && bid.bidder && BIDDER_CODE_DEAL_ALIASES.indexOf(bid.bidder) < 0) {
         return au.matchedAdCount > 0;
@@ -192,7 +438,7 @@ export const spec = {
         return false;
       }
     });
-    const hasDealsAdUnits = adUnits.filter((au) => {
+    const hasDealsAdUnits = highestYieldingAdUnits.filter((au) => {
       return au.deals && au.deals.length > 0;
     });
 
diff --git a/modules/adnuntiusRtdProvider.js b/modules/adnuntiusRtdProvider.js
index 9234a30aa33..1d5d639aa55 100644
--- a/modules/adnuntiusRtdProvider.js
+++ b/modules/adnuntiusRtdProvider.js
@@ -5,6 +5,10 @@ import { ajax } from '../src/ajax.js';
 
 import { config as sourceConfig } from '../src/config.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const GVLID = 855;
 
 function init(config, userConsent) {
diff --git a/modules/adomikAnalyticsAdapter.js b/modules/adomikAnalyticsAdapter.js
deleted file mode 100644
index 27a6821d9f5..00000000000
--- a/modules/adomikAnalyticsAdapter.js
+++ /dev/null
@@ -1,262 +0,0 @@
-import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
-import adapterManager from '../src/adapterManager.js';
-import {logInfo} from '../src/utils.js';
-import {find, findIndex} from '../src/polyfill.js';
-
-// Events used in adomik analytics adapter.
-const auctionInit = CONSTANTS.EVENTS.AUCTION_INIT;
-const auctionEnd = CONSTANTS.EVENTS.AUCTION_END;
-const bidRequested = CONSTANTS.EVENTS.BID_REQUESTED;
-const bidResponse = CONSTANTS.EVENTS.BID_RESPONSE;
-const bidWon = CONSTANTS.EVENTS.BID_WON;
-const bidTimeout = CONSTANTS.EVENTS.BID_TIMEOUT;
-const ua = navigator.userAgent;
-
-var _sampled = true;
-
-let adomikAdapter = Object.assign(adapter({}),
-  {
-    // Track every event needed
-    track({ eventType, args }) {
-      switch (eventType) {
-        case auctionInit:
-          adomikAdapter.initializeBucketEvents()
-          adomikAdapter.currentContext.id = args.auctionId
-          break;
-
-        case bidTimeout:
-          adomikAdapter.currentContext.timeouted = true;
-          break;
-
-        case bidResponse:
-          adomikAdapter.saveBidResponse(args);
-          break;
-
-        case bidWon:
-          args.id = args.adId;
-          args.placementCode = args.adUnitCode;
-          adomikAdapter.sendWonEvent(args);
-          break;
-
-        case bidRequested:
-          args.bids.forEach(function(bid) {
-            adomikAdapter.bucketEvents.push({
-              type: 'request',
-              event: {
-                bidder: bid.bidder.toUpperCase(),
-                placementCode: bid.adUnitCode
-              }
-            });
-          });
-          break;
-
-        case auctionEnd:
-          if (adomikAdapter.bucketEvents.length > 0) {
-            adomikAdapter.sendTypedEvent();
-          }
-          break;
-      }
-    }
-  }
-);
-
-adomikAdapter.initializeBucketEvents = function() {
-  adomikAdapter.bucketEvents = [];
-}
-
-adomikAdapter.saveBidResponse = function(args) {
-  let responseSaved = adomikAdapter.bucketEvents.find((bucketEvent) =>
-    bucketEvent.type == 'response' && bucketEvent.event.id == args.id
-  );
-  if (responseSaved) { return true; }
-  adomikAdapter.bucketEvents.push({
-    type: 'response',
-    event: adomikAdapter.buildBidResponse(args)
-  });
-}
-
-adomikAdapter.maxPartLength = function () {
-  return (ua.includes(' MSIE ')) ? 1600 : 60000;
-};
-
-adomikAdapter.sendTypedEvent = function() {
-  let [testId, testValue] = adomikAdapter.getKeyValues();
-  const groupedTypedEvents = adomikAdapter.buildTypedEvents();
-
-  const bulkEvents = {
-    testId: testId,
-    testValue: testValue,
-    uid: adomikAdapter.currentContext.uid,
-    ahbaid: adomikAdapter.currentContext.id,
-    hostname: window.location.hostname,
-    sampling: adomikAdapter.currentContext.sampling,
-    eventsByPlacementCode: groupedTypedEvents.map(function(typedEventsByType) {
-      let sizes = [];
-      const eventKeys = ['request', 'response', 'winner'];
-      let events = {};
-
-      eventKeys.forEach((eventKey) => {
-        events[`${eventKey}s`] = [];
-        if (typedEventsByType[eventKey] !== undefined) {
-          typedEventsByType[eventKey].forEach((typedEvent) => {
-            if (typedEvent.event.size !== undefined) {
-              const size = adomikAdapter.sizeUtils.handleSize(sizes, typedEvent.event.size);
-              if (size !== null) {
-                sizes = [...sizes, size];
-              }
-            }
-            events[`${eventKey}s`] = [...events[`${eventKey}s`], typedEvent.event];
-          });
-        }
-      });
-
-      return {
-        placementCode: typedEventsByType.placementCode,
-        sizes,
-        events
-      };
-    })
-  };
-
-  const stringBulkEvents = JSON.stringify(bulkEvents)
-  logInfo('Events sent to adomik prebid analytic ' + stringBulkEvents);
-
-  const encodedBuf = window.btoa(stringBulkEvents);
-
-  const encodedUri = encodeURIComponent(encodedBuf);
-  const maxLength = adomikAdapter.maxPartLength();
-  const splittedUrl = encodedUri.match(new RegExp(`.{1,${maxLength}}`, 'g'));
-
-  splittedUrl.forEach((split, i) => {
-    const partUrl = `${split}&id=${adomikAdapter.currentContext.id}&part=${i}&on=${splittedUrl.length - 1}`;
-    const img = new Image(1, 1);
-    img.src = 'https://' + adomikAdapter.currentContext.url + '/?q=' + partUrl;
-  })
-};
-
-adomikAdapter.sendWonEvent = function (wonEvent) {
-  let [testId, testValue] = adomikAdapter.getKeyValues();
-  let keyValues = { testId: testId, testValue: testValue };
-  let samplingInfo = { sampling: adomikAdapter.currentContext.sampling };
-  wonEvent = { ...adomikAdapter.buildBidResponse(wonEvent), ...keyValues, ...samplingInfo };
-
-  const stringWonEvent = JSON.stringify(wonEvent);
-  logInfo('Won event sent to adomik prebid analytic ' + stringWonEvent);
-
-  const encodedBuf = window.btoa(stringWonEvent);
-  const encodedUri = encodeURIComponent(encodedBuf);
-  const img = new Image(1, 1);
-  img.src = `https://${adomikAdapter.currentContext.url}/?q=${encodedUri}&id=${adomikAdapter.currentContext.id}&won=true`;
-}
-
-adomikAdapter.buildBidResponse = function (bid) {
-  return {
-    bidder: bid.bidderCode.toUpperCase(),
-    placementCode: bid.adUnitCode,
-    id: bid.adId,
-    status: (bid.statusMessage === 'Bid available') ? 'VALID' : 'EMPTY_OR_ERROR',
-    cpm: parseFloat(bid.cpm),
-    size: {
-      width: Number(bid.width),
-      height: Number(bid.height)
-    },
-    timeToRespond: bid.timeToRespond,
-    afterTimeout: adomikAdapter.currentContext.timeouted
-  };
-}
-
-adomikAdapter.sizeUtils = {
-  sizeAlreadyExists: (sizes, typedEventSize) => {
-    return find(sizes, (size) => size.height === typedEventSize.height && size.width === typedEventSize.width);
-  },
-  formatSize: (typedEventSize) => {
-    return {
-      width: Number(typedEventSize.width),
-      height: Number(typedEventSize.height)
-    };
-  },
-  handleSize: (sizes, typedEventSize) => {
-    let formattedSize = null;
-    if (adomikAdapter.sizeUtils.sizeAlreadyExists(sizes, typedEventSize) === undefined) {
-      formattedSize = adomikAdapter.sizeUtils.formatSize(typedEventSize);
-    }
-    return formattedSize;
-  }
-};
-
-adomikAdapter.buildTypedEvents = function () {
-  const groupedTypedEvents = [];
-  adomikAdapter.bucketEvents.forEach(function(typedEvent, i) {
-    const [placementCode, type] = [typedEvent.event.placementCode, typedEvent.type];
-    let existTypedEvent = findIndex(groupedTypedEvents, (groupedTypedEvent) => groupedTypedEvent.placementCode === placementCode);
-
-    if (existTypedEvent === -1) {
-      groupedTypedEvents.push({
-        placementCode: placementCode,
-        [type]: [typedEvent]
-      });
-      existTypedEvent = groupedTypedEvents.length - 1;
-    }
-
-    if (groupedTypedEvents[existTypedEvent][type]) {
-      groupedTypedEvents[existTypedEvent][type] = [...groupedTypedEvents[existTypedEvent][type], typedEvent];
-    } else {
-      groupedTypedEvents[existTypedEvent][type] = [typedEvent];
-    }
-  });
-
-  return groupedTypedEvents;
-}
-
-adomikAdapter.getKeyValues = function () {
-  let preventTest = sessionStorage.getItem(window.location.hostname + '_NoAdomikTest')
-  let inScope = sessionStorage.getItem(window.location.hostname + '_AdomikTestInScope')
-  let keyValues = JSON.parse(sessionStorage.getItem(window.location.hostname + '_AdomikTest'))
-  let testId;
-  let testValue;
-  if (typeof (keyValues) === 'object' && keyValues != undefined && !preventTest && inScope) {
-    testId = keyValues.testId
-    testValue = keyValues.testOptionLabel
-  }
-  return [testId, testValue]
-}
-
-adomikAdapter.enable = function(options) {
-  adomikAdapter.currentContext = {
-    uid: options.id,
-    url: options.url,
-    id: '',
-    timeouted: false,
-    sampling: options.sampling
-  }
-  logInfo('Adomik Analytics enabled with config', options);
-  adomikAdapter.adapterEnableAnalytics(options);
-};
-
-adomikAdapter.checkOptions = function(options) {
-  if (typeof options !== 'undefined') {
-    if (options.id && options.url) { adomikAdapter.enable(options); } else { logInfo('Adomik Analytics disabled because id and/or url is missing from config', options); }
-  } else { logInfo('Adomik Analytics disabled because config is missing'); }
-};
-
-adomikAdapter.checkSampling = function(options) {
-  _sampled = typeof options === 'undefined' ||
-  typeof options.sampling === 'undefined' ||
-  (options.sampling > 0 && Math.random() < parseFloat(options.sampling));
-  if (_sampled) { adomikAdapter.checkOptions(options) } else { logInfo('Adomik Analytics ignored for sampling', options.sampling); }
-};
-
-adomikAdapter.adapterEnableAnalytics = adomikAdapter.enableAnalytics;
-
-adomikAdapter.enableAnalytics = function ({ provider, options }) {
-  logInfo('Adomik Analytics enableAnalytics', provider);
-  adomikAdapter.checkSampling(options);
-};
-
-adapterManager.registerAnalyticsAdapter({
-  adapter: adomikAdapter,
-  code: 'adomik'
-});
-
-export default adomikAdapter;
diff --git a/modules/adotBidAdapter.js b/modules/adotBidAdapter.js
index c34af4d3d17..3924537061c 100644
--- a/modules/adotBidAdapter.js
+++ b/modules/adotBidAdapter.js
@@ -1,28 +1,70 @@
-import {Renderer} from '../src/Renderer.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {isArray, isBoolean, isFn, isPlainObject, isStr, logError, replaceAuctionPrice} from '../src/utils.js';
-import {find} from '../src/polyfill.js';
-import {config} from '../src/config.js';
-import {OUTSTREAM} from '../src/video.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+import { Renderer } from '../src/Renderer.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { find } from '../src/polyfill.js';
+import { isArray, isBoolean, isFn, isPlainObject, isStr, logError, replaceAuctionPrice } from '../src/utils.js';
+import { OUTSTREAM } from '../src/video.js';
+import { NATIVE_ASSETS_IDS as NATIVE_ID_MAPPING, NATIVE_ASSETS as NATIVE_PLACEMENTS } from '../libraries/braveUtils/nativeAssets.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').MediaType} MediaType
+ * @typedef {import('../src/adapters/bidderFactory.js').Site} Site
+ * @typedef {import('../src/adapters/bidderFactory.js').Device} Device
+ * @typedef {import('../src/adapters/bidderFactory.js').User} User
+ * @typedef {import('../src/adapters/bidderFactory.js').Banner} Banner
+ * @typedef {import('../src/adapters/bidderFactory.js').Video} Video
+ * @typedef {import('../src/adapters/bidderFactory.js').AdUnit} AdUnit
+ * @typedef {import('../src/adapters/bidderFactory.js').Imp} Imp
+ */
+
+/**
+ * @typedef {Object} OpenRtbRequest
+ * @property {string} id - Unique request ID
+ * @property {Array} imp - List of impression objects
+ * @property {Site} site - Site information
+ * @property {Device} device - Device information
+ * @property {User} user - User information
+ * @property {object} regs - Regulatory data, including GDPR and COPPA
+ * @property {object} ext - Additional extensions, such as custom data for the bid request
+ * @property {number} at - Auction type, typically first-price or second-price
+ */
+
+/**
+ * @typedef {Object} OpenRtbBid
+ * @property {string} impid - ID of the impression this bid relates to
+ * @property {number} price - Bid price for the impression
+ * @property {string} adid - Ad ID for the bid
+ * @property {number} [crid] - Creative ID, if available
+ * @property {string} [dealid] - Deal ID if the bid is part of a private marketplace deal
+ * @property {object} [ext] - Additional bid-specific extensions, such as media type
+ * @property {string} [adm] - Ad markup if it’s directly included in the bid response
+ * @property {string} [nurl] - Notification URL to be called when the bid wins
+ */
+
+/**
+ * @typedef {Object} OpenRtbBidResponse
+ * @property {string} id - ID of the bid response
+ * @property {Array<{bid: Array}>} seatbid - Array of seat bids, each containing a list of bids
+ * @property {string} cur - Currency in which bid amounts are expressed
+ */
 
 const BIDDER_CODE = 'adot';
 const ADAPTER_VERSION = 'v2.0.0';
+const GVLID = 272;
 const BID_METHOD = 'POST';
 const BIDDER_URL = 'https://dsp.adotmob.com/headerbidding{PUBLISHER_PATH}/bidrequest';
 const REQUIRED_VIDEO_PARAMS = ['mimes', 'protocols'];
 const FIRST_PRICE = 1;
 const IMP_BUILDER = { banner: buildBanner, video: buildVideo, native: buildNative };
-const NATIVE_PLACEMENTS = {
-  title: { id: 1, name: 'title' },
-  icon: { id: 2, type: 1, name: 'img' },
-  image: { id: 3, type: 3, name: 'img' },
-  sponsoredBy: { id: 4, name: 'data', type: 1 },
-  body: { id: 5, name: 'data', type: 2 },
-  cta: { id: 6, type: 12, name: 'data' }
-};
-const NATIVE_ID_MAPPING = { 1: 'title', 2: 'icon', 3: 'image', 4: 'sponsoredBy', 5: 'body', 6: 'cta' };
 const OUTSTREAM_VIDEO_PLAYER_URL = 'https://adserver.adotmob.com/video/player.min.js';
 const BID_RESPONSE_NET_REVENUE = true;
 const BID_RESPONSE_TTL = 10;
@@ -179,7 +221,7 @@ function buildVideo(video) {
     mimes: video.mimes,
     minduration: video.minduration,
     maxduration: video.maxduration,
-    placement: video.placement,
+    placement: video.plcmt,
     playbackmethod: video.playbackmethod,
     pos: video.position || 0,
     protocols: video.protocols,
@@ -269,7 +311,7 @@ function buildImpFromAdUnit(adUnit, bidderRequest) {
   if (!mediaType) return null;
 
   const media = IMP_BUILDER[mediaType](mediaTypes[mediaType], bidderRequest, adUnit)
-  const currency = config.getConfig('currency.adServerCurrency') || DEFAULT_CURRENCY;
+  const currency = getCurrencyFromBidderRequest(bidderRequest) || DEFAULT_CURRENCY;
   const bidfloor = getMainFloor(adUnit, media.format, mediaType, currency);
 
   return {
@@ -600,7 +642,7 @@ function getFloor(adUnit, size, mediaType, currency) {
 
   const floorResult = adUnit.getFloor({ currency, mediaType, size });
 
-  return floorResult.currency === currency ? floorResult.floor : 0;
+  return floorResult?.currency === currency ? floorResult?.floor : 0;
 }
 
 /**
@@ -635,7 +677,8 @@ export const spec = {
   isBidRequestValid,
   buildRequests,
   interpretResponse,
-  getFloor
+  getFloor,
+  gvlid: GVLID
 };
 
 registerBidder(spec);
diff --git a/modules/adpartnerBidAdapter.js b/modules/adpartnerBidAdapter.js
index 471a0bba64a..504809afa87 100644
--- a/modules/adpartnerBidAdapter.js
+++ b/modules/adpartnerBidAdapter.js
@@ -1,6 +1,5 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { buildUrl } from '../src/utils.js'
-import {ajax} from '../src/ajax.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { buildBidRequestsAndParams, postRequest, buildEndpointUrl } from '../libraries/mediaImpactUtils/index.js';
 
 const BIDDER_CODE = 'adpartner';
 export const ENDPOINT_PROTOCOL = 'https';
@@ -15,74 +14,25 @@ export const spec = {
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
-    // TODO does it make sense to fall back to window.location.href?
     const referer = bidderRequest?.refererInfo?.page || window.location.href;
 
-    let bidRequests = [];
-    let beaconParams = {
-      tag: [],
-      partner: [],
-      sizes: [],
-      referer: ''
-    };
-
-    validBidRequests.forEach(function(validBidRequest) {
-      let bidRequestObject = {
-        adUnitCode: validBidRequest.adUnitCode,
-        sizes: validBidRequest.sizes,
-        bidId: validBidRequest.bidId,
-        referer: referer
-      };
-
-      if (parseInt(validBidRequest.params.unitId)) {
-        bidRequestObject.unitId = parseInt(validBidRequest.params.unitId);
-        beaconParams.tag.push(validBidRequest.params.unitId);
-      }
-
-      if (parseInt(validBidRequest.params.partnerId)) {
-        bidRequestObject.unitId = 0;
-        bidRequestObject.partnerId = parseInt(validBidRequest.params.partnerId);
-        beaconParams.partner.push(validBidRequest.params.partnerId);
-      }
-
-      bidRequests.push(bidRequestObject);
+    // Use the common function to build bidRequests and beaconParams
+    const { bidRequests, beaconParams } = buildBidRequestsAndParams(validBidRequests, referer);
 
-      beaconParams.sizes.push(spec.joinSizesToString(validBidRequest.sizes));
-      beaconParams.referer = encodeURIComponent(referer);
-    });
-
-    if (beaconParams.partner.length > 0) {
-      beaconParams.partner = beaconParams.partner.join(',');
-    } else {
-      delete beaconParams.partner;
-    }
-
-    beaconParams.tag = beaconParams.tag.join(',');
-    beaconParams.sizes = beaconParams.sizes.join(',');
-
-    let adPartnerRequestUrl = buildUrl({
-      protocol: ENDPOINT_PROTOCOL,
-      hostname: ENDPOINT_DOMAIN,
-      pathname: ENDPOINT_PATH,
-      search: beaconParams
-    });
+    const adPartnerRequestUrl = buildEndpointUrl(
+      ENDPOINT_PROTOCOL,
+      ENDPOINT_DOMAIN,
+      ENDPOINT_PATH,
+      beaconParams
+    );
 
     return {
       method: 'POST',
       url: adPartnerRequestUrl,
-      data: JSON.stringify(bidRequests)
+      data: JSON.stringify(bidRequests),
     };
   },
 
-  joinSizesToString: function(sizes) {
-    let res = [];
-    sizes.forEach(function(size) {
-      res.push(size.join('x'));
-    });
-
-    return res.join('|');
-  },
-
   interpretResponse: function (serverResponse, bidRequest) {
     const validBids = JSON.parse(bidRequest.data);
 
@@ -91,15 +41,12 @@ export const spec = {
     }
 
     return validBids
-      .map(bid => ({
-        bid: bid,
-        ad: serverResponse.body[bid.adUnitCode]
-      }))
+      .map(bid => ({ bid: bid, ad: serverResponse.body[bid.adUnitCode] }))
       .filter(item => item.ad)
       .map(item => spec.adResponse(item.bid, item.ad));
   },
 
-  adResponse: function(bid, ad) {
+  adResponse: function (bid, ad) {
     const bidObject = {
       requestId: bid.bidId,
       ad: ad.ad,
@@ -110,38 +57,30 @@ export const spec = {
       creativeId: ad.creativeId,
       netRevenue: ad.netRevenue,
       currency: ad.currency,
-      winNotification: ad.winNotification
-    }
-
-    bidObject.meta = {};
-    if (ad.adomain && ad.adomain.length > 0) {
-      bidObject.meta.advertiserDomains = ad.adomain;
-    }
+      winNotification: ad.winNotification,
+      meta: ad.adomain && ad.adomain.length > 0 ? { advertiserDomains: ad.adomain } : {},
+    };
 
     return bidObject;
   },
 
-  onBidWon: function(data) {
-    data.winNotification.forEach(function(unitWon) {
-      let adPartnerBidWonUrl = buildUrl({
-        protocol: ENDPOINT_PROTOCOL,
-        hostname: ENDPOINT_DOMAIN,
-        pathname: unitWon.path
-      });
+  onBidWon: function (data) {
+    data.winNotification.forEach(function (unitWon) {
+      const adPartnerBidWonUrl = buildEndpointUrl(
+        ENDPOINT_PROTOCOL,
+        ENDPOINT_DOMAIN,
+        unitWon.path
+      );
 
       if (unitWon.method === 'POST') {
-        spec.postRequest(adPartnerBidWonUrl, JSON.stringify(unitWon.data));
+        postRequest(adPartnerBidWonUrl, JSON.stringify(unitWon.data));
       }
     });
 
     return true;
   },
 
-  postRequest(endpoint, data) {
-    ajax(endpoint, null, data, {method: 'POST'});
-  },
-
-  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
     const syncs = [];
 
     if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
@@ -205,7 +144,6 @@ export const spec = {
 
     return syncs;
   },
-
-}
+};
 
 registerBidder(spec);
diff --git a/modules/adplayerproVideoProvider.js b/modules/adplayerproVideoProvider.js
new file mode 100644
index 00000000000..826aee257ec
--- /dev/null
+++ b/modules/adplayerproVideoProvider.js
@@ -0,0 +1,439 @@
+import {
+  API_FRAMEWORKS,
+  PLACEMENT,
+  PLAYBACK_METHODS,
+  PROTOCOLS,
+  VIDEO_MIME_TYPE,
+  VPAID_MIME_TYPE
+} from '../libraries/video/constants/ortb.js';
+import {
+  AD_CLICK,
+  AD_COMPLETE,
+  AD_ERROR,
+  AD_IMPRESSION,
+  AD_LOADED,
+  AD_PAUSE,
+  AD_PLAY,
+  AD_REQUEST,
+  AD_SKIPPED,
+  AD_STARTED,
+  DESTROYED,
+  ERROR,
+  MUTE,
+  PLAYER_RESIZE,
+  SETUP_COMPLETE,
+  SETUP_FAILED,
+  VOLUME
+} from '../libraries/video/constants/events.js';
+import {AD_PLAYER_PRO_VENDOR} from '../libraries/video/constants/vendorCodes.js';
+import {getEventHandler} from '../libraries/video/shared/eventHandler.js';
+import {submodule} from '../src/hook.js';
+
+const setupFailMessage = 'Failed to instantiate the player';
+
+/**
+ * @constructor
+ * @param {Object} config - videoProviderConfig
+ * @param {function} adPlayerPro_
+ * @param {CallbackStorage} callbackStorage_
+ * @param {Object} utils
+ * @returns {Object} - VideoProvider
+ */
+export function AdPlayerProProvider(config, adPlayerPro_, callbackStorage_, utils) {
+  const adPlayerPro = adPlayerPro_;
+  let player = null;
+  let playerVersion = null;
+  const playerConfig = config.playerConfig;
+  const divId = config.divId;
+  let callbackStorage = callbackStorage_;
+  let supportedMediaTypes = null;
+  let setupCompleteCallbacks = [];
+  let setupFailedCallbacks = [];
+  const MEDIA_TYPES = [
+    VIDEO_MIME_TYPE.MP4,
+    VIDEO_MIME_TYPE.OGG,
+    VIDEO_MIME_TYPE.WEBM,
+    VIDEO_MIME_TYPE.AAC,
+    VIDEO_MIME_TYPE.HLS
+  ];
+
+  function init() {
+    if (!adPlayerPro) {
+      triggerSetupFailure(-1, setupFailMessage + ': player not present');
+      return;
+    }
+
+    // if (playerVersion < minimumSupportedPlayerVersion) {
+    //   triggerSetupFailure(-2, setupFailMessage + ': player version not supported');
+    //   return;
+    // }
+
+    if (!document.getElementById(divId)) {
+      triggerSetupFailure(-3, setupFailMessage + ': No div found with id ' + divId);
+      return;
+    }
+
+    if (!playerConfig || !playerConfig.placementId) {
+      triggerSetupFailure(-4, setupFailMessage + ': placementId is required in playerConfig');
+      return;
+    }
+
+    triggerSetupComplete();
+  }
+
+  function getId() {
+    return divId;
+  }
+
+  function getOrtbVideo() {
+    supportedMediaTypes = supportedMediaTypes || utils.getSupportedMediaTypes(MEDIA_TYPES);
+
+    const video = {
+      mimes: supportedMediaTypes,
+      protocols: [
+        PROTOCOLS.VAST_2_0,
+        PROTOCOLS.VAST_3_0,
+        PROTOCOLS.VAST_4_0,
+        PROTOCOLS.VAST_2_0_WRAPPER,
+        PROTOCOLS.VAST_3_0_WRAPPER,
+        PROTOCOLS.VAST_4_0_WRAPPER
+      ],
+      // h: player.getHeight(),
+      // w: player.getWidth(),
+      placement: utils.getPlacement(playerConfig.advertising),
+      maxextended: -1, // extension is allowed, and there is no time limit imposed.
+      boxingallowed: 1,
+      playbackmethod: [utils.getPlaybackMethod(config)],
+      playbackend: 1,
+      api: [
+        API_FRAMEWORKS.VPAID_2_0,
+        API_FRAMEWORKS.OMID_1_0
+      ],
+    };
+
+    return video;
+  }
+
+  function getOrtbContent() {
+  }
+
+  function setAdTagUrl(adTagUrl, options) {
+    setupPlayer(playerConfig, adTagUrl || options.adXml)
+  }
+
+  function onEvent(externalEventName, callback, basePayload) {
+    if (externalEventName === SETUP_COMPLETE) {
+      setupCompleteCallbacks.push(callback);
+      return;
+    }
+
+    if (externalEventName === SETUP_FAILED) {
+      setupFailedCallbacks.push(callback);
+      return;
+    }
+
+    let getEventPayload;
+
+    switch (externalEventName) {
+      case AD_REQUEST:
+      case AD_PLAY:
+      case AD_PAUSE:
+      case AD_LOADED:
+      case AD_STARTED:
+      case AD_IMPRESSION:
+      case AD_CLICK:
+      case AD_SKIPPED:
+      case AD_ERROR:
+      case AD_COMPLETE:
+      case MUTE:
+      case VOLUME:
+      case ERROR:
+      case PLAYER_RESIZE:
+        getEventPayload = e => ({
+          height: player.getAdHeight(),
+          width: player.getAdWidth(),
+        });
+        break;
+      default:
+        return;
+    }
+
+    // eslint-disable-next-line no-unreachable
+    const playerEventName = utils.getPlayerEvent(externalEventName);
+    const eventHandler = getEventHandler(externalEventName, callback, basePayload, getEventPayload)
+    player && player.on(playerEventName, eventHandler);
+    callbackStorage.storeCallback(playerEventName, eventHandler, callback);
+  }
+
+  function offEvent(event, callback) {
+    const playerEventName = utils.getPlayerEvent(event);
+    const eventHandler = callbackStorage.getCallback(playerEventName, callback);
+    if (eventHandler) {
+      player && player.off(playerEventName, eventHandler);
+    } else {
+      player && player.off(playerEventName);
+    }
+    callbackStorage.clearCallback(playerEventName, callback);
+  }
+
+  function destroy() {
+    if (!player) {
+      return;
+    }
+    player.remove();
+    player = null;
+  }
+
+  return {
+    init,
+    getId,
+    getOrtbVideo,
+    getOrtbContent,
+    setAdTagUrl,
+    onEvent,
+    offEvent,
+    destroy
+  };
+
+  function setupPlayer(config, urlOrXml) {
+    if (!config || player) {
+      return;
+    }
+    const playerConfig = utils.getConfig(config, urlOrXml);
+
+    if (!playerConfig) {
+      return;
+    }
+
+    player = adPlayerPro(divId);
+    callbackStorage.addAllCallbacks(player.on);
+    player.on('AdStopped', () => player = null);
+    player.setup(playerConfig);
+  }
+
+  function triggerSetupComplete() {
+    if (!setupCompleteCallbacks.length) {
+      return;
+    }
+
+    const payload = getSetupCompletePayload();
+    setupCompleteCallbacks.forEach(callback => callback(SETUP_COMPLETE, payload));
+    setupCompleteCallbacks = [];
+  }
+
+  function getSetupCompletePayload() {
+    return {
+      divId,
+      playerVersion,
+      type: SETUP_COMPLETE
+    };
+  }
+
+  function triggerSetupFailure(errorCode, msg, sourceError) {
+    if (!setupFailedCallbacks.length) {
+      return;
+    }
+
+    const payload = {
+      divId,
+      playerVersion,
+      type: SETUP_FAILED,
+      errorCode: errorCode,
+      errorMessage: msg,
+      sourceError: sourceError
+    };
+
+    setupFailedCallbacks.forEach(callback => callback(SETUP_FAILED, payload));
+    setupFailedCallbacks = [];
+  }
+}
+
+/**
+ * @param {Object} config - videoProviderConfig
+ * @param {sharedUtils} sharedUtils
+ * @returns {Object} - VideoProvider
+ */
+const adPlayerProSubmoduleFactory = function (config, sharedUtils) {
+  const callbackStorage = callbackStorageFactory();
+  return AdPlayerProProvider(config, window.playerPro, callbackStorage, utils);
+}
+
+adPlayerProSubmoduleFactory.vendorCode = AD_PLAYER_PRO_VENDOR;
+submodule('video', adPlayerProSubmoduleFactory);
+export default adPlayerProSubmoduleFactory;
+
+// HELPERS
+
+export const utils = {
+  getConfig: function (config, urlOrXml) {
+    if (!config || !urlOrXml) {
+      return;
+    }
+
+    const params = config.params || {};
+    params.placementId = config.placementId;
+    params.advertising = params.advertising || {};
+    params.advertising.tag = params.advertising.tag || {};
+
+    params._pType = 'pbjs';
+    params.advertising.tag.url = urlOrXml;
+    return params;
+  },
+
+  getPlayerEvent: function (eventName) {
+    switch (eventName) {
+      case DESTROYED:
+        return 'AdStopped';
+
+      case AD_REQUEST:
+        return 'AdRequest';
+      case AD_LOADED:
+        return 'AdLoaded';
+      case AD_STARTED:
+        return 'AdStarted';
+      case AD_IMPRESSION:
+        return 'AdImpression';
+      case AD_PLAY:
+        return 'AdPlaying';
+      case AD_PAUSE:
+        return 'AdPaused';
+      case AD_CLICK:
+        return 'AdClickThru';
+      case AD_SKIPPED:
+        return 'AdSkipped';
+      case AD_ERROR:
+        return 'AdError';
+      case AD_COMPLETE:
+        return 'AdCompleted';
+      case VOLUME:
+        return 'AdVolumeChange';
+      case PLAYER_RESIZE:
+        return 'AdSizeChange';
+      // case FULLSCREEN:
+      //   return FULLSCREEN;
+      default:
+        return eventName;
+    }
+  },
+
+  getSupportedMediaTypes: function (mediaTypes = []) {
+    const el = document.createElement('video');
+    return mediaTypes
+      .filter(mediaType => el.canPlayType(mediaType))
+      .concat(VPAID_MIME_TYPE); // Always allow VPAIDs.
+  },
+
+  /**
+   * Determine the ad placement
+   * @param {Object} adConfig
+   * @return {PLACEMENT|undefined}
+   */
+  getPlacement: function (adConfig) {
+    adConfig = adConfig || {};
+
+    switch (adConfig.type) {
+      case 'inPage':
+        return PLACEMENT.ARTICLE;
+      case 'rewarded':
+      case 'inView':
+        return PLACEMENT.INTERSTITIAL_SLIDER_FLOATING;
+      default:
+        return PLACEMENT.BANNER;
+    }
+  },
+
+  getPlaybackMethod: function ({autoplay, mute}) {
+    if (autoplay) {
+      return mute ? PLAYBACK_METHODS.AUTOPLAY_MUTED : PLAYBACK_METHODS.AUTOPLAY;
+    }
+    return PLAYBACK_METHODS.CLICK_TO_PLAY;
+  }
+}
+
+/**
+ * Tracks which functions are attached to events
+ * @typedef CallbackStorage
+ * @function storeCallback
+ * @function getCallback
+ * @function clearCallback
+ * @function addAllCallbacks
+ * @function clearStorage
+ */
+
+/**
+ * @returns {CallbackStorage}
+ */
+export function callbackStorageFactory() {
+  let storage = {};
+  let storageHandlers = {};
+
+  function storeCallback(eventType, eventHandler, callback) {
+    let eventHandlers = storage[eventType];
+    if (!eventHandlers) {
+      eventHandlers = storage[eventType] = {};
+    }
+
+    eventHandlers[callback] = eventHandler;
+    addHandler(eventType, eventHandler);
+  }
+
+  function getCallback(eventType, callback) {
+    let eventHandlers = storage[eventType];
+    if (eventHandlers) {
+      return eventHandlers[callback];
+    }
+  }
+
+  function clearCallback(eventType, callback) {
+    if (!callback) {
+      delete storage[eventType];
+      delete storageHandlers[eventType];
+      return;
+    }
+    let eventHandlers = storage[eventType];
+    if (eventHandlers) {
+      const eventHandler = eventHandlers[callback];
+      if (eventHandler) {
+        delete eventHandlers[callback];
+        clearHandler(eventType, eventHandler);
+      }
+    }
+  }
+
+  function clearStorage() {
+    storage = {};
+    storageHandlers = {};
+  }
+
+  function addHandler(eventType, eventHandler) {
+    let eventHandlers = storageHandlers[eventType];
+    if (!eventHandlers) {
+      eventHandlers = storageHandlers[eventType] = [];
+    }
+    eventHandlers.push(eventHandler);
+  }
+
+  function clearHandler(eventType, eventHandler) {
+    let eventHandlers = storageHandlers[eventType];
+    eventHandlers = eventHandlers.filter(handler => handler !== eventHandler);
+    if (eventHandlers.length) {
+      storageHandlers[eventType] = eventHandlers;
+    } else {
+      delete storageHandlers[eventType];
+    }
+  }
+
+  function addAllCallbacks(functionOnPlayer) {
+    for (let eventType in storageHandlers) {
+      storageHandlers[eventType].forEach(handler => functionOnPlayer(eventType, handler));
+    }
+  }
+
+  return {
+    storeCallback,
+    getCallback,
+    clearCallback,
+    addAllCallbacks,
+    clearStorage,
+  }
+}
diff --git a/modules/adplayerproVideoProvider.md b/modules/adplayerproVideoProvider.md
new file mode 100644
index 00000000000..d0b0601afeb
--- /dev/null
+++ b/modules/adplayerproVideoProvider.md
@@ -0,0 +1,54 @@
+# Overview
+
+Module Name: AdPlayer.Pro Video Provider
+Module Type: Video Submodule
+Video Player: AdPlayer.Pro
+Player website: https://adplayer.pro
+Maintainer: support@adplayer.pro
+
+# Description
+
+Video provider to connect the Prebid Video Module to AdPlayer.Pro.
+
+# Requirements
+
+Your page must embed a build of AdPlayer.Pro. 
+i.e.
+```html
+ 
+    
+
+```
+
+# Configuration
+
+The AdPlayer.Pro Video Provider requires the following configuration:
+
+```javascript
+pbjs.setConfig({
+  video: {
+    providers: [{
+      divId: 'player', // required, this is the id of the div element where the player will be placed
+      vendorCode: 3, // AdPlayer.Pro vendorCode
+      playerConfig: {
+        placementId: 'c9gebfehcqjE', // required, this placementId is only for demo purposes
+        params: {
+          'type': 'inView',
+          'muted': true,
+          'autoStart': true,
+          'advertising': {
+            'controls': true,
+            'closeButton': true,
+          },
+          'width': '600',
+          'height': '300'
+        }
+      },
+    }]
+  }
+});
+```
+
+[Additional embed instructions](https://docs.adplayer.pro)
+
+[Obtaining a license](https://adplayer.pro/contacts) 
diff --git a/modules/adpod.js b/modules/adpod.js
index d2fd817ee62..35a78766979 100644
--- a/modules/adpod.js
+++ b/modules/adpod.js
@@ -38,7 +38,7 @@ import {config} from '../src/config.js';
 import {ADPOD} from '../src/mediaTypes.js';
 import {find, arrayFrom as from} from '../src/polyfill.js';
 import {auctionManager} from '../src/auctionManager.js';
-import CONSTANTS from '../src/constants.json';
+import { TARGETING_KEYS } from '../src/constants.js';
 
 const TARGETING_KEY_PB_CAT_DUR = 'hb_pb_cat_dur';
 const TARGETING_KEY_CACHE_ID = 'hb_cache_id';
@@ -319,7 +319,7 @@ export function checkAdUnitSetupHook(fn, adUnits) {
  * @param {Object} videoMediaType 'mediaTypes.video' associated to bidResponse
  * @param {Object} bidResponse incoming bidResponse being evaluated by bidderFactory
  * @returns {boolean} return false if bid duration is deemed invalid as per adUnit configuration; return true if fine
-*/
+ */
 function checkBidDuration(videoMediaType, bidResponse) {
   const buffer = 2;
   let bidDuration = deepAccess(bidResponse, 'video.durationSeconds');
@@ -451,13 +451,12 @@ export function callPrebidCacheAfterAuction(bids, callback) {
 /**
  * Compare function to be used in sorting long-form bids. This will compare bids on price per second.
  * @param {Object} bid
- * @param {Object} bid
  */
 export function sortByPricePerSecond(a, b) {
-  if (a.adserverTargeting[CONSTANTS.TARGETING_KEYS.PRICE_BUCKET] / a.video.durationBucket < b.adserverTargeting[CONSTANTS.TARGETING_KEYS.PRICE_BUCKET] / b.video.durationBucket) {
+  if (a.adserverTargeting[TARGETING_KEYS.PRICE_BUCKET] / a.video.durationBucket < b.adserverTargeting[TARGETING_KEYS.PRICE_BUCKET] / b.video.durationBucket) {
     return 1;
   }
-  if (a.adserverTargeting[CONSTANTS.TARGETING_KEYS.PRICE_BUCKET] / a.video.durationBucket > b.adserverTargeting[CONSTANTS.TARGETING_KEYS.PRICE_BUCKET] / b.video.durationBucket) {
+  if (a.adserverTargeting[TARGETING_KEYS.PRICE_BUCKET] / a.video.durationBucket > b.adserverTargeting[TARGETING_KEYS.PRICE_BUCKET] / b.video.durationBucket) {
     return -1;
   }
   return 0;
@@ -465,10 +464,10 @@ export function sortByPricePerSecond(a, b) {
 
 /**
  * This function returns targeting keyvalue pairs for long-form adserver modules. Freewheel and GAM are currently supporting Prebid long-form
- * @param {Object} options
- * @param {Array[string]} codes
- * @param {function} callback
- * @returns targeting kvs for adUnitCodes
+ * @param {Object} options - Options for targeting.
+ * @param {Array} options.codes - Array of ad unit codes.
+ * @param {function} options.callback - Callback function to handle the targeting key-value pairs.
+ * @returns {Object} Targeting key-value pairs for ad unit codes.
  */
 export function getTargeting({ codes, callback } = {}) {
   if (!callback) {
diff --git a/modules/adprimeBidAdapter.js b/modules/adprimeBidAdapter.js
index 55ee1f0900c..e40d20356af 100644
--- a/modules/adprimeBidAdapter.js
+++ b/modules/adprimeBidAdapter.js
@@ -1,183 +1,46 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { isFn, deepAccess, logMessage } from '../src/utils.js';
-import { config } from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-import {getAllOrtbKeywords} from '../libraries/keywords/keywords.js';
+import { getAllOrtbKeywords } from '../libraries/keywords/keywords.js';
+import {
+  isBidRequestValid,
+  buildRequestsBase,
+  interpretResponse,
+  getUserSyncs,
+  buildPlacementProcessingFunction
+} from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'adprime';
 const AD_URL = 'https://delta.adprime.com/pbjs';
 const SYNC_URL = 'https://sync.adprime.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency || !bid.meta) {
-    return false;
+const addCustomFieldsToPlacement = (bid, bidderRequest, placement) => {
+  if (placement.adFormat === VIDEO) {
+    placement.wPlayer = placement.playerSize?.[0]?.[0];
+    placement.hPlayer = placement.playerSize?.[0]?.[1];
   }
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.title && bid.native.image && bid.native.impressionTrackers);
-    default:
-      return false;
+  if (bid.userId && bid.userId.idl_env) {
+    placement.identeties = {};
+    placement.identeties.identityLink = bid.userId.idl_env;
   }
-}
 
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
+  placement.keywords = getAllOrtbKeywords(bidderRequest.ortb2, bid.params.keywords);
+  placement.audiences = bid.params.audiences || [];
+};
 
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
+const placementProcessingFunction = buildPlacementProcessingFunction({ addCustomFieldsToPlacement });
+
+const buildRequests = (validBidRequests = [], bidderRequest = {}) => {
+  return buildRequestsBase({ adUrl: AD_URL, validBidRequests, bidderRequest, placementProcessingFunction });
+};
 
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && bid.params.placementId);
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let winTop = window;
-    let location;
-    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
-    try {
-      location = new URL(bidderRequest.refererInfo.page)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
-    let placements = [];
-    let request = {
-      deviceWidth: winTop.screen.width,
-      deviceHeight: winTop.screen.height,
-      language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
-      secure: 1,
-      host: location.host,
-      page: location.pathname,
-      placements: placements
-    };
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
-      }
-    }
-    const len = validBidRequests.length;
-
-    for (let i = 0; i < len; i++) {
-      let bid = validBidRequests[i];
-      const { mediaTypes } = bid;
-      const placement = {};
-      let sizes
-      let identeties = {}
-      if (mediaTypes) {
-        if (mediaTypes[BANNER] && mediaTypes[BANNER].sizes) {
-          placement.adFormat = BANNER;
-          sizes = mediaTypes[BANNER].sizes
-        } else if (mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize) {
-          placement.adFormat = VIDEO;
-          sizes = mediaTypes[VIDEO].playerSize
-          placement.minduration = mediaTypes[VIDEO].minduration;
-          placement.maxduration = mediaTypes[VIDEO].maxduration;
-          placement.mimes = mediaTypes[VIDEO].mimes;
-          placement.protocols = mediaTypes[VIDEO].protocols;
-          placement.startdelay = mediaTypes[VIDEO].startdelay;
-          placement.placement = mediaTypes[VIDEO].placement;
-          placement.skip = mediaTypes[VIDEO].skip;
-          placement.skipafter = mediaTypes[VIDEO].skipafter;
-          placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-          placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-          placement.delivery = mediaTypes[VIDEO].delivery;
-          placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-          placement.api = mediaTypes[VIDEO].api;
-          placement.linearity = mediaTypes[VIDEO].linearity;
-        } else {
-          placement.adFormat = NATIVE;
-          placement.native = mediaTypes[NATIVE];
-        }
-      }
-      if (bid.userId && bid.userId.idl_env) {
-        identeties.identityLink = bid.userId.idl_env
-      }
-
-      placements.push({
-        ...placement,
-        placementId: bid.params.placementId,
-        bidId: bid.bidId,
-        sizes: sizes || [],
-        wPlayer: sizes ? sizes[0] : 0,
-        hPlayer: sizes ? sizes[1] : 0,
-        schain: bid.schain || {},
-        keywords: getAllOrtbKeywords(bidderRequest.ortb2, bid.params.keywords),
-        audiences: bid.params.audiences || [],
-        identeties,
-        bidFloor: getBidFloor(bid)
-      });
-    }
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(['placementId']),
+  buildRequests,
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/adqueryBidAdapter.js b/modules/adqueryBidAdapter.js
index 0f445fdfd78..f19cf020ca8 100644
--- a/modules/adqueryBidAdapter.js
+++ b/modules/adqueryBidAdapter.js
@@ -1,12 +1,22 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
-import {buildUrl, logInfo, parseSizesInput, triggerPixel} from '../src/utils.js';
+import {buildUrl, logInfo, logMessage, parseSizesInput, triggerPixel} from '../src/utils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderSpec} BidderSpec
+ * @typedef {import('../src/adapters/bidderFactory.js').TimedOutBid} TimedOutBid
+ */
 
 const ADQUERY_GVLID = 902;
 const ADQUERY_BIDDER_CODE = 'adquery';
 const ADQUERY_BIDDER_DOMAIN_PROTOCOL = 'https';
 const ADQUERY_BIDDER_DOMAIN = 'bidder.adquery.io';
-const ADQUERY_USER_SYNC_DOMAIN = ADQUERY_BIDDER_DOMAIN_PROTOCOL + '://' + ADQUERY_BIDDER_DOMAIN + '/prebid/userSync?1=1';
+const ADQUERY_STATIC_DOMAIN_PROTOCOL = 'https';
+const ADQUERY_STATIC_DOMAIN = 'api.adquery.io';
+const ADQUERY_USER_SYNC_DOMAIN = ADQUERY_BIDDER_DOMAIN;
 const ADQUERY_DEFAULT_CURRENCY = 'PLN';
 const ADQUERY_NET_REVENUE = true;
 const ADQUERY_TTL = 360;
@@ -17,7 +27,7 @@ export const spec = {
   gvlid: ADQUERY_GVLID,
   supportedMediaTypes: [BANNER],
 
-  /** f
+  /**
    * @param {object} bid
    * @return {boolean}
    */
@@ -32,10 +42,18 @@ export const spec = {
    */
   buildRequests: (bidRequests, bidderRequest) => {
     const requests = [];
+
+    let adqueryRequestUrl = buildUrl({
+      protocol: ADQUERY_BIDDER_DOMAIN_PROTOCOL,
+      hostname: ADQUERY_BIDDER_DOMAIN,
+      pathname: '/prebid/bid',
+      // search: params
+    });
+
     for (let i = 0, len = bidRequests.length; i < len; i++) {
       const request = {
         method: 'POST',
-        url: ADQUERY_BIDDER_DOMAIN_PROTOCOL + '://' + ADQUERY_BIDDER_DOMAIN + '/prebid/bid',
+        url: adqueryRequestUrl, // ADQUERY_BIDDER_DOMAIN_PROTOCOL + '://' + ADQUERY_BIDDER_DOMAIN + '/prebid/bid',
         data: buildRequest(bidRequests[i], bidderRequest),
         options: {
           withCredentials: false,
@@ -53,8 +71,8 @@ export const spec = {
    * @return {Bid[]}
    */
   interpretResponse: (response, request) => {
-    logInfo(request);
-    logInfo(response);
+    logMessage(request);
+    logMessage(response);
 
     const res = response && response.body && response.body.data;
     let bidResponses = [];
@@ -116,11 +134,9 @@ export const spec = {
    */
   onBidWon: (bid) => {
     logInfo('onBidWon', bid);
-
-    const bidString = JSON.stringify(bid);
-    let copyOfBid = JSON.parse(bidString);
-    delete copyOfBid.ad;
-    const shortBidString = JSON.stringify(bid);
+    let copyOfBid = { ...bid }
+    delete copyOfBid.ad
+    const shortBidString = JSON.stringify(copyOfBid);
     const encodedBuf = window.btoa(shortBidString);
 
     let params = {
@@ -160,21 +176,48 @@ export const spec = {
     });
     triggerPixel(adqueryRequestUrl);
   },
+  /**
+   * Retrieves user synchronization URLs based on provided options and consents.
+   *
+   * @param {object} syncOptions - Options for synchronization.
+   * @param {object[]} serverResponses - Array of server responses.
+   * @param {object} gdprConsent - GDPR consent object.
+   * @param {object} uspConsent - USP consent object.
+   * @returns {object[]} - Array of synchronization URLs.
+   */
   getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncUrl = ADQUERY_USER_SYNC_DOMAIN;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
+    logMessage('getUserSyncs', syncOptions, serverResponses, gdprConsent, uspConsent);
+    let syncData = {
+      'gdpr': gdprConsent && gdprConsent.gdprApplies ? 1 : 0,
+      'gdpr_consent': gdprConsent && gdprConsent.consentString ? gdprConsent.consentString : '',
+      'ccpa_consent': uspConsent && uspConsent.uspConsent ? uspConsent.uspConsent : '',
+    };
+
+    if (window.qid) { // only for new users (new qid)
+      syncData.qid = window.qid;
     }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+
+    let syncUrlObject = {
+      protocol: ADQUERY_BIDDER_DOMAIN_PROTOCOL,
+      hostname: ADQUERY_USER_SYNC_DOMAIN,
+      pathname: '/prebid/userSync',
+      search: syncData
+    };
+
+    if (syncOptions.iframeEnabled) {
+      syncUrlObject.protocol = ADQUERY_STATIC_DOMAIN_PROTOCOL;
+      syncUrlObject.hostname = ADQUERY_STATIC_DOMAIN;
+      syncUrlObject.pathname = '/user-sync-iframe.html';
+
+      return [{
+        type: 'iframe',
+        url: buildUrl(syncUrlObject)
+      }];
     }
+
     return [{
       type: 'image',
-      url: syncUrl
+      url: buildUrl(syncUrlObject)
     }];
   }
 };
@@ -196,7 +239,7 @@ function buildRequest(validBidRequests, bidderRequest) {
     // onetime User ID
     const ramdomValues = Array.from(window.crypto.getRandomValues(new Uint32Array(4)));
     userId = ramdomValues.map(val => val.toString(36)).join('').substring(0, 20);
-    logInfo('generated onetime User ID: ', userId);
+    logMessage('generated onetime User ID: ', userId);
     window.qid = userId;
   }
 
diff --git a/modules/adqueryIdSystem.js b/modules/adqueryIdSystem.js
index c5d01d7fbed..43795b3caba 100644
--- a/modules/adqueryIdSystem.js
+++ b/modules/adqueryIdSystem.js
@@ -8,9 +8,15 @@
 import {ajax} from '../src/ajax.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {submodule} from '../src/hook.js';
-import {isFn, isPlainObject, isStr, logError, logInfo} from '../src/utils.js';
+import {isFn, isPlainObject, isStr, logError, logInfo, logMessage} from '../src/utils.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'qid';
 const AU_GVLID = 902;
 
@@ -60,7 +66,18 @@ export const adqueryIdSubmodule = {
    * @returns {IdResponse|undefined}
    */
   getId(config) {
-    logInfo('adqueryIdSubmodule getId');
+    logMessage('adqueryIdSubmodule getId');
+
+    let qid = storage.getDataFromLocalStorage('qid');
+
+    if (qid) {
+      return {
+        callback: function (callback) {
+          callback(qid);
+        }
+      }
+    }
+
     if (!isPlainObject(config.params)) {
       config.params = {};
     }
diff --git a/modules/adrelevantisBidAdapter.js b/modules/adrelevantisBidAdapter.js
index 3c9c661b09c..7d18135f2e8 100644
--- a/modules/adrelevantisBidAdapter.js
+++ b/modules/adrelevantisBidAdapter.js
@@ -18,11 +18,14 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {find, includes} from '../src/polyfill.js';
 import {INSTREAM, OUTSTREAM} from '../src/video.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-import {getANKeywordParam, transformBidderParamKeywords} from '../libraries/appnexusUtils/anKeywords.js';
-import {convertCamelToUnderscore} from '../libraries/appnexusUtils/anUtils.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
+import {getANKeywordParam} from '../libraries/appnexusUtils/anKeywords.js';
 import {chunk} from '../libraries/chunk/chunk.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'adrelevantis';
 const URL = 'https://ssp.adrelevantis.com/prebid';
 const VIDEO_TARGETING = ['id', 'mimes', 'minduration', 'maxduration',
@@ -182,28 +185,6 @@ export const spec = {
     }
 
     return bids;
-  },
-
-  transformBidParams: function(params, isOpenRtb) {
-    params = convertTypes({
-      'placementId': 'number',
-      'keywords': transformBidderParamKeywords
-    }, params);
-
-    if (isOpenRtb) {
-      params.use_pmt_rule = (typeof params.usePaymentRule === 'boolean') ? params.usePaymentRule : false;
-      if (params.usePaymentRule) { delete params.usePaymentRule; }
-
-      Object.keys(params).forEach(paramKey => {
-        let convertedKey = convertCamelToUnderscore(paramKey);
-        if (convertedKey !== paramKey) {
-          params[convertedKey] = params[paramKey];
-          delete params[paramKey];
-        }
-      });
-    }
-
-    return params;
   }
 };
 
diff --git a/modules/adriverBidAdapter.js b/modules/adriverBidAdapter.js
index 5bce315f572..7ac8e4fb728 100644
--- a/modules/adriverBidAdapter.js
+++ b/modules/adriverBidAdapter.js
@@ -1,5 +1,5 @@
 // ADRIVER BID ADAPTER for Prebid 1.13
-import {logInfo, getWindowLocation, _each, getBidIdParameter} from '../src/utils.js';
+import {logInfo, getWindowLocation, _each, getBidIdParameter, isPlainObject} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 
@@ -188,12 +188,12 @@ function _getFloor(bid, currencyPar, sizes) {
       size: isSize ? sizes : '*'
     });
 
-    if (typeof floorInfo === 'object' &&
-      !isNaN(parseFloat(floorInfo.floor))) {
+    if (isPlainObject(floorInfo) &&
+      !isNaN(parseFloat(floorInfo?.floor))) {
       floor = floorInfo.floor;
     }
 
-    if (typeof floorInfo === 'object' && floorInfo.currency) {
+    if (isPlainObject(floorInfo) && floorInfo.currency) {
       currencyResult = floorInfo.currency;
     }
   }
diff --git a/modules/adriverIdSystem.js b/modules/adriverIdSystem.js
index c04ebf48028..2dab76b7862 100644
--- a/modules/adriverIdSystem.js
+++ b/modules/adriverIdSystem.js
@@ -11,6 +11,13 @@ import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'adriverId';
 
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
@@ -35,7 +42,6 @@ export const adriverIdSubmodule = {
    * performs action to obtain id and return a value in the callback's response argument
    * @function
    * @param {SubmoduleConfig} [config]
-   * @param {ConsentData} [consentData]
    * @returns {IdResponse|undefined}
    */
   getId(config) {
diff --git a/modules/ads_interactiveBidAdapter.js b/modules/ads_interactiveBidAdapter.js
new file mode 100644
index 00000000000..9a827cb4914
--- /dev/null
+++ b/modules/ads_interactiveBidAdapter.js
@@ -0,0 +1,21 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'ads_interactive';
+const AD_URL = 'https://bntb.adsinteractive.com/pbjs';
+const SYNC_URL = 'https://cstb.adsinteractive.com';
+const GVLID = 1212;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
+};
+
+registerBidder(spec);
diff --git a/modules/ads_interactiveBidAdapter.md b/modules/ads_interactiveBidAdapter.md
new file mode 100755
index 00000000000..43c4727db45
--- /dev/null
+++ b/modules/ads_interactiveBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: AdsInteractive Bidder Adapter
+Module Type: AdsInteractive Bidder Adapter
+Maintainer: it@adsinteractive.com
+```
+
+# Description
+
+Connects to AdsInteractive exchange for bids.
+AdsInteractive bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'ads_interactive',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'ads_interactive',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'ads_interactive',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/adspiritBidAdapter.js b/modules/adspiritBidAdapter.js
new file mode 100644
index 00000000000..c39ceca8600
--- /dev/null
+++ b/modules/adspiritBidAdapter.js
@@ -0,0 +1,124 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+
+const RTB_URL = '/rtb/getbid.php?rtbprovider=prebid';
+const SCRIPT_URL = '/adasync.min.js';
+
+export const spec = {
+
+  code: 'adspirit',
+  aliases: ['twiago'],
+  supportedMediaTypes: [BANNER, NATIVE],
+
+  isBidRequestValid: function (bid) {
+    let host = spec.getBidderHost(bid);
+    if (!host || !bid.params.placementId) {
+      return false;
+    }
+    return true;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let requests = [];
+    for (let i = 0; i < validBidRequests.length; i++) {
+      let bidRequest = validBidRequests[i];
+      bidRequest.adspiritConId = spec.genAdConId(bidRequest);
+      let reqUrl = spec.getBidderHost(bidRequest);
+      let placementId = utils.getBidIdParameter('placementId', bidRequest.params);
+      reqUrl = '//' + reqUrl + RTB_URL + '&pid=' + placementId +
+        '&ref=' + encodeURIComponent(bidderRequest.refererInfo.topmostLocation) +
+        '&scx=' + (screen.width) +
+        '&scy=' + (screen.height) +
+        '&wcx=' + (window.innerWidth || document.documentElement.clientWidth) +
+        '&wcy=' + (window.innerHeight || document.documentElement.clientHeight) +
+        '&async=' + bidRequest.adspiritConId +
+        '&t=' + Math.round(Math.random() * 100000);
+
+      let data = {};
+
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        const gdprConsentString = bidderRequest.gdprConsent.consentString;
+        reqUrl += '&gdpr=' + encodeURIComponent(gdprConsentString);
+      }
+
+      if (bidRequest.schain && bidderRequest.schain) {
+        data.schain = bidRequest.schain;
+      }
+
+      requests.push({
+        method: 'GET',
+        url: reqUrl,
+        data: data,
+        bidRequest: bidRequest
+      });
+    }
+    return requests;
+  },
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+    let bidObj = bidRequest.bidRequest;
+
+    if (!serverResponse || !serverResponse.body || !bidObj) {
+      utils.logWarn(`No valid bids from ${spec.code} bidder!`);
+      return [];
+    }
+
+    let adData = serverResponse.body;
+    let cpm = adData.cpm;
+
+    if (!cpm) {
+      return [];
+    }
+
+    let host = spec.getBidderHost(bidObj);
+
+    const bidResponse = {
+      requestId: bidObj.bidId,
+      cpm: cpm,
+      width: adData.w,
+      height: adData.h,
+      creativeId: bidObj.params.placementId,
+      currency: 'EUR',
+      netRevenue: true,
+      ttl: 300,
+      meta: {
+        advertiserDomains: bidObj && bidObj.adomain ? bidObj.adomain : []
+      }
+    };
+
+    if ('mediaTypes' in bidObj && 'native' in bidObj.mediaTypes) {
+      bidResponse.native = {
+        title: adData.title,
+        body: adData.body,
+        cta: adData.cta,
+        image: { url: adData.image },
+        clickUrl: adData.click,
+        impressionTrackers: [adData.view]
+      };
+      bidResponse.mediaType = NATIVE;
+    } else {
+      let adm = '' + adData.adm;
+      bidResponse.ad = adm;
+      bidResponse.mediaType = BANNER;
+    }
+
+    bidResponses.push(bidResponse);
+    return bidResponses;
+  },
+  getBidderHost: function (bid) {
+    if (bid.bidder === 'adspirit') {
+      return utils.getBidIdParameter('host', bid.params);
+    }
+    if (bid.bidder === 'twiago') {
+      return 'a.twiago.com';
+    }
+    return null;
+  },
+
+  genAdConId: function (bid) {
+    return bid.bidder + Math.round(Math.random() * 100000);
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/adspiritBidAdapter.md b/modules/adspiritBidAdapter.md
new file mode 100644
index 00000000000..698ed9b4a0e
--- /dev/null
+++ b/modules/adspiritBidAdapter.md
@@ -0,0 +1,66 @@
+  # Overview
+  
+  ```
+Module Name:  Adspirit Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:   prebid@adspirit.de
+
+```
+# Description
+
+Connects to Adspirit exchange for bids.
+
+Each adunit with `adspirit` adapter has to have `placementId` and `host`.
+
+
+### Supported Features;
+
+1. Media Types: Banner & native
+2. Multi-format: adUnits
+3. Schain module
+4. Advertiser domains
+
+
+## Sample Banner Ad Unit
+  ```javascript
+		  var adUnits = [
+           {
+               code: 'display-div',
+			 
+                    mediaTypes: {
+                        banner: {
+                            sizes: [[300, 250]]   //a display size
+                        }
+                    },
+    
+               bids: [
+                   {
+                       bidder: "adspirit",
+                       params: {
+                           placementId: '7',    //Please enter your placementID
+                           host: 'test.adspirit.de'   //your host details from Adspirit
+                       }
+                   }
+               ]
+           }
+       ];
+		   
+```
+
+
+### Privacy Policies
+
+General Data Protection Regulation(GDPR) is supported by default.
+
+Complete information on this  URL-- https://support.adspirit.de/hc/en-us/categories/115000453312-General
+
+
+### CMP (Consent Management Provider)
+CMP stands for Consent Management Provider. In simple terms, this is a service provider that obtains and processes the consent of the user, makes it available to the advertisers and, if necessary, logs it for later control. We recommend using a provider with IAB certification or CMP based on the IAB CMP Framework. A list of IAB CMPs can be found at https://iabeurope.eu/cmp-list/. AdSpirit recommends the use of www.consentmanager.de .
+
+### List of functions that require consent
+
+Please visit our page- https://support.adspirit.de/hc/en-us/articles/360014631659-List-of-functions-that-require-consent
+
+
+
diff --git a/modules/adstirBidAdapter.js b/modules/adstirBidAdapter.js
new file mode 100644
index 00000000000..a0c67ddac7e
--- /dev/null
+++ b/modules/adstirBidAdapter.js
@@ -0,0 +1,92 @@
+import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'adstir';
+const ENDPOINT = 'https://ad.ad-stir.com/prebid'
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    return !!(utils.isStr(bid.params.appId) && !utils.isEmptyStr(bid.params.appId) && utils.isInteger(bid.params.adSpaceNo));
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const sua = utils.deepAccess(validBidRequests[0], 'ortb2.device.sua', null);
+
+    const requests = validBidRequests.map((r) => {
+      return {
+        method: 'POST',
+        url: ENDPOINT,
+        data: JSON.stringify({
+          appId: r.params.appId,
+          adSpaceNo: r.params.adSpaceNo,
+          auctionId: r.auctionId,
+          transactionId: r.transactionId,
+          bidId: r.bidId,
+          mediaTypes: r.mediaTypes,
+          sizes: r.sizes,
+          ref: {
+            page: bidderRequest.refererInfo.page,
+            tloc: bidderRequest.refererInfo.topmostLocation,
+            referrer: bidderRequest.refererInfo.ref,
+            topurl: config.getConfig('pageUrl') ? false : bidderRequest.refererInfo.reachedTop,
+          },
+          sua,
+          user: utils.deepAccess(r, 'ortb2.user', null),
+          gdpr: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies', false),
+          usp: (bidderRequest.uspConsent || '1---') !== '1---',
+          eids: utils.deepAccess(r, 'userIdAsEids', []),
+          schain: serializeSchain(utils.deepAccess(r, 'schain', null)),
+          pbVersion: '$prebid.version$',
+        }),
+      }
+    });
+
+    return requests;
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const seatbid = serverResponse.body.seatbid;
+    if (!utils.isArray(seatbid)) {
+      return [];
+    }
+    const bids = [];
+    seatbid.forEach((b) => {
+      const bid = b.bid || null;
+      if (!bid) {
+        return;
+      }
+      bids.push(bid);
+    });
+    return bids;
+  },
+}
+
+function serializeSchain(schain) {
+  if (!schain) {
+    return null;
+  }
+
+  let serializedSchain = `${schain.ver},${schain.complete}`;
+
+  schain.nodes.map(node => {
+    serializedSchain += `!${encodeURIComponentForRFC3986(node.asi || '')},`;
+    serializedSchain += `${encodeURIComponentForRFC3986(node.sid || '')},`;
+    serializedSchain += `${encodeURIComponentForRFC3986(node.hp || '')},`;
+    serializedSchain += `${encodeURIComponentForRFC3986(node.rid || '')},`;
+    serializedSchain += `${encodeURIComponentForRFC3986(node.name || '')},`;
+    serializedSchain += `${encodeURIComponentForRFC3986(node.domain || '')}`;
+  });
+
+  return serializedSchain;
+}
+
+function encodeURIComponentForRFC3986(str) {
+  return encodeURIComponent(str).replace(/[!'()*]/g, c => `%${c.charCodeAt(0).toString(16)}`);
+}
+
+registerBidder(spec);
diff --git a/modules/adstirBidAdapter.md b/modules/adstirBidAdapter.md
new file mode 100644
index 00000000000..5840697a9b0
--- /dev/null
+++ b/modules/adstirBidAdapter.md
@@ -0,0 +1,38 @@
+# Overview
+
+```
+Module Name: adstir Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@ad-stir.com
+```
+
+# Description
+
+Module that connects to adstir's demand sources
+
+Prebid.js version 8.24.0 or above is required to use this adapter.
+
+# Test Parameters
+
+```
+    var adUnits = [
+        // Banner adUnit
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids: [
+                {
+                    bidder: 'adstir',
+                    params: {
+                        appId: 'TEST-MEDIA',
+                        adSpaceNo: 1,
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/adtargetBidAdapter.js b/modules/adtargetBidAdapter.js
index a1dec5a420f..0faf740ac54 100644
--- a/modules/adtargetBidAdapter.js
+++ b/modules/adtargetBidAdapter.js
@@ -12,6 +12,7 @@ const syncsCache = {};
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 779,
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
     return !!deepAccess(bid, 'params.aid');
diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index 04bca21c60f..6d4c0b6ed6a 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -4,9 +4,13 @@ import {ADPOD, BANNER, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
 import {find} from '../src/polyfill.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
 import {chunk} from '../libraries/chunk/chunk.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ */
+
 const subdomainSuffixes = ['', 1, 2];
 const AUCTION_PATH = '/v2/auction/';
 const PROTOCOL = 'https://';
@@ -21,7 +25,7 @@ const HOST_GETTERS = {
   janet: () => 'ghb.bidder.jmgads.com',
   ocm: () => 'ghb.cenarius.orangeclickmedia.com',
   '9dotsmedia': () => 'ghb.platform.audiodots.com',
-  copper6: () => 'ghb.app.copper6.com'
+  indicue: () => 'ghb.console.indicue.com',
 }
 const getUri = function (bidderCode) {
   let bidderWithoutSuffix = bidderCode.split('_')[0];
@@ -43,7 +47,7 @@ export const spec = {
     { code: 'selectmedia', gvlid: 775 },
     { code: 'ocm', gvlid: 1148 },
     '9dotsmedia',
-    'copper6',
+    'indicue',
   ],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
@@ -113,7 +117,7 @@ export const spec = {
   /**
    * Unpack the response from the server into a list of bids
    * @param serverResponse
-   * @param bidderRequest
+   * @param adapterRequest
    * @return {Bid[]} An array of bids which were nested inside the server
    */
   interpretResponse: function (serverResponse, { adapterRequest }) {
@@ -131,11 +135,6 @@ export const spec = {
     return bids;
   },
 
-  transformBidParams(params) {
-    return convertTypes({
-      'aid': 'number',
-    }, params);
-  }
 };
 
 function parseRTBResponse(serverResponse, adapterRequest) {
diff --git a/modules/adtelligentIdSystem.js b/modules/adtelligentIdSystem.js
index 440ed9ade75..76713f29775 100644
--- a/modules/adtelligentIdSystem.js
+++ b/modules/adtelligentIdSystem.js
@@ -8,6 +8,13 @@
 import * as ajax from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const gvlid = 410;
 const moduleName = 'adtelligent';
 const syncUrl = 'https://idrs.adtelligent.com/get';
diff --git a/modules/adtrgtmeBidAdapter.js b/modules/adtrgtmeBidAdapter.js
index 4dc95ce6bc1..18cbd1e6ae7 100644
--- a/modules/adtrgtmeBidAdapter.js
+++ b/modules/adtrgtmeBidAdapter.js
@@ -2,7 +2,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { deepAccess, isFn, isStr, isNumber, isArray, isEmpty, isPlainObject, generateUUID, logWarn } from '../src/utils.js';
 import { config } from '../src/config.js';
-import { hasPurpose1Consent } from '../src/utils/gpdr.js';
+import { hasPurpose1Consent } from '../src/utils/gdpr.js';
 
 const INTEGRATION_METHOD = 'prebid.js';
 const BIDDER_CODE = 'adtrgtme';
@@ -55,7 +55,7 @@ function extractUserSyncUrls(syncOptions, pixels) {
 }
 
 function isSecure(bid) {
-  return deepAccess(bid, 'params.bidOverride.imp.secure') || (document.location.protocol === 'https:') ? 1 : 0;
+  return deepAccess(bid, 'params.bidOverride.imp.secure') ?? deepAccess(bid, 'ortb2Imp.secure') ?? 1;
 };
 
 function getMediaType(bid) {
@@ -90,7 +90,7 @@ function getFloorModuleData(bid) {
     mediaType: BANNER,
     size: '*'
   };
-  return (isFn(bid.getFloor)) ? bid.getFloor(getFloorRequestObject) : false;
+  return (isFn(bid.getFloor)) ? (bid.getFloor(getFloorRequestObject) || {}) : false;
 };
 
 function generateOpenRtbObject(bidderRequest, bid) {
diff --git a/modules/adtrueBidAdapter.js b/modules/adtrueBidAdapter.js
index 389986eb586..a6186d6129f 100644
--- a/modules/adtrueBidAdapter.js
+++ b/modules/adtrueBidAdapter.js
@@ -43,6 +43,7 @@ const VIDEO_CUSTOM_PARAMS = {
   'battr': DATA_TYPES.ARRAY,
   'linearity': DATA_TYPES.NUMBER,
   'placement': DATA_TYPES.NUMBER,
+  'plcmt': DATA_TYPES.NUMBER,
   'minbitrate': DATA_TYPES.NUMBER,
   'maxbitrate': DATA_TYPES.NUMBER
 };
diff --git a/modules/aduptechBidAdapter.js b/modules/aduptechBidAdapter.js
index 49187da2fe2..fdc1249ded4 100644
--- a/modules/aduptechBidAdapter.js
+++ b/modules/aduptechBidAdapter.js
@@ -4,6 +4,11 @@ import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 import {getAdUnitSizes} from '../libraries/sizeUtils/sizeUtils.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ */
+
 export const BIDDER_CODE = 'aduptech';
 export const GVLID = 647;
 export const ENDPOINT_URL_PUBLISHER_PLACEHOLDER = '{PUBLISHER}';
diff --git a/modules/advRedAnalyticsAdapter.js b/modules/advRedAnalyticsAdapter.js
new file mode 100644
index 00000000000..8ad30ed351d
--- /dev/null
+++ b/modules/advRedAnalyticsAdapter.js
@@ -0,0 +1,198 @@
+import {generateUUID, logInfo} from '../src/utils.js'
+import {ajaxBuilder} from '../src/ajax.js'
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js'
+import adapterManager from '../src/adapterManager.js'
+import {EVENTS} from '../src/constants.js'
+import {getRefererInfo} from '../src/refererDetection.js';
+
+/**
+ * advRedAnalyticsAdapter.js - analytics adapter for AdvRed
+ */
+const DEFAULT_EVENT_URL = 'https://api.adv.red/api/event'
+
+let ajax = ajaxBuilder(10000)
+let pwId
+let initOptions
+let flushInterval
+let queue = []
+
+let advRedAnalytics = Object.assign(adapter({url: DEFAULT_EVENT_URL, analyticsType: 'endpoint'}), {
+  track({eventType, args}) {
+    handleEvent(eventType, args)
+  }
+})
+
+function sendEvents() {
+  if (queue.length > 0) {
+    const message = {
+      pwId: pwId,
+      publisherId: initOptions.publisherId,
+      events: queue,
+      pageUrl: getRefererInfo().page
+    }
+    queue = []
+
+    const url = initOptions.url ? initOptions.url : DEFAULT_EVENT_URL
+    ajax(
+      url,
+      () => logInfo('AdvRed Analytics sent ' + queue.length + ' events'),
+      JSON.stringify(message),
+      {
+        method: 'POST',
+        contentType: 'application/json',
+        withCredentials: true
+      }
+    )
+  }
+}
+
+function convertAdUnit(adUnit) {
+  if (!adUnit) return adUnit
+
+  const shortAdUnit = {}
+  shortAdUnit.code = adUnit.code
+  shortAdUnit.sizes = adUnit.sizes
+  return shortAdUnit
+}
+
+function convertBid(bid) {
+  if (!bid) return bid
+
+  const shortBid = {}
+  shortBid.adUnitCode = bid.adUnitCode
+  shortBid.bidder = bid.bidder
+  shortBid.cpm = bid.cpm
+  shortBid.currency = bid.currency
+  shortBid.mediaTypes = bid.mediaTypes
+  shortBid.sizes = bid.sizes
+  shortBid.serverResponseTimeMs = bid.serverResponseTimeMs
+  return shortBid
+}
+
+function convertAuctionInit(origEvent) {
+  let shortEvent = {}
+  shortEvent.auctionId = origEvent.auctionId
+  shortEvent.timeout = origEvent.timeout
+  shortEvent.adUnits = origEvent.adUnits && origEvent.adUnits.map(convertAdUnit)
+  return shortEvent
+}
+
+function convertBidRequested(origEvent) {
+  let shortEvent = {}
+  shortEvent.bidderCode = origEvent.bidderCode
+  shortEvent.bids = origEvent.bids && origEvent.bids.map(convertBid)
+  shortEvent.timeout = origEvent.timeout
+  return shortEvent
+}
+
+function convertBidTimeout(origEvent) {
+  let shortEvent = {}
+  shortEvent.bids = origEvent && origEvent.map ? origEvent.map(convertBid) : origEvent
+  return shortEvent
+}
+
+function convertBidderError(origEvent) {
+  let shortEvent = {}
+  shortEvent.bids = origEvent.bidderRequest && origEvent.bidderRequest.bids && origEvent.bidderRequest.bids.map(convertBid)
+  return shortEvent
+}
+
+function convertAuctionEnd(origEvent) {
+  let shortEvent = {}
+  shortEvent.adUnitCodes = origEvent.adUnitCodes
+  shortEvent.bidsReceived = origEvent.bidsReceived && origEvent.bidsReceived.map(convertBid)
+  shortEvent.noBids = origEvent.noBids && origEvent.noBids.map(convertBid)
+  return shortEvent
+}
+
+function convertBidWon(origEvent) {
+  let shortEvent = {}
+  shortEvent.adUnitCode = origEvent.adUnitCode
+  shortEvent.bidderCode = origEvent.bidderCode
+  shortEvent.mediaType = origEvent.mediaType
+  shortEvent.netRevenue = origEvent.netRevenue
+  shortEvent.cpm = origEvent.cpm
+  shortEvent.size = origEvent.size
+  shortEvent.currency = origEvent.currency
+  return shortEvent
+}
+
+function handleEvent(eventType, origEvent) {
+  try {
+    origEvent = origEvent ? JSON.parse(JSON.stringify(origEvent)) : {}
+  } catch (e) {
+  }
+
+  let shortEvent
+  switch (eventType) {
+    case EVENTS.AUCTION_INIT: {
+      shortEvent = convertAuctionInit(origEvent)
+      break
+    }
+    case EVENTS.BID_REQUESTED: {
+      shortEvent = convertBidRequested(origEvent)
+      break
+    }
+    case EVENTS.BID_TIMEOUT: {
+      shortEvent = convertBidTimeout(origEvent)
+      break
+    }
+    case EVENTS.BIDDER_ERROR: {
+      shortEvent = convertBidderError(origEvent)
+      break
+    }
+    case EVENTS.AUCTION_END: {
+      shortEvent = convertAuctionEnd(origEvent)
+      break
+    }
+    case EVENTS.BID_WON: {
+      shortEvent = convertBidWon(origEvent)
+      break
+    }
+    default:
+      return
+  }
+
+  shortEvent.eventType = eventType
+  shortEvent.auctionId = origEvent.auctionId
+  shortEvent.timestamp = origEvent.timestamp || Date.now()
+
+  sendEvent(shortEvent)
+}
+
+function sendEvent(event) {
+  queue.push(event)
+
+  if (event.eventType === EVENTS.AUCTION_END) {
+    sendEvents()
+  }
+}
+
+advRedAnalytics.originEnableAnalytics = advRedAnalytics.enableAnalytics
+advRedAnalytics.enableAnalytics = function (config) {
+  initOptions = config.options || {}
+  pwId = generateUUID()
+  flushInterval = setInterval(sendEvents, 1000)
+
+  advRedAnalytics.originEnableAnalytics(config)
+}
+
+advRedAnalytics.originDisableAnalytics = advRedAnalytics.disableAnalytics
+advRedAnalytics.disableAnalytics = function () {
+  clearInterval(flushInterval)
+  sendEvents()
+  advRedAnalytics.originDisableAnalytics()
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: advRedAnalytics,
+  code: 'advRed'
+})
+
+advRedAnalytics.getOptions = function () {
+  return initOptions
+}
+
+advRedAnalytics.sendEvents = sendEvents
+
+export default advRedAnalytics
diff --git a/modules/advRedAnalyticsAdapter.md b/modules/advRedAnalyticsAdapter.md
new file mode 100644
index 00000000000..59345dfd01e
--- /dev/null
+++ b/modules/advRedAnalyticsAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+```
+Module Name: AdvRed Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: support@adv.red
+```
+
+### Usage
+
+The AdvRed analytics adapter can be used by all clients after approval. For more information,
+please visit 
+
+### Analytics Options
+| Param enableAnalytics | Scope    | Type   | Description                                          | Example                                |
+|-----------------------|----------|--------|------------------------------------------------------|----------------------------------------|
+| provider              | Required | String | The name of this Adapter.                            | `'advRed'`                             |
+| params                | Required | Object | Details of module params.                            |                                        |
+| params.publisherId    | Required | String | This is the Publisher ID value obtained from AdvRed. | `'123456'`                             |
+| params.url            | Optional | String | Custom URL of the endpoint to collect the events     | `'https://pub1.api.adv.red/api/event'` |
+
+### Example Configuration
+
+```javascript
+pbjs.enableAnalytics({
+    provider: 'advRed',
+    options: {
+        publisherId: '123456'    // change to the Publisher ID you received from AdvRed
+    }
+});
+```
diff --git a/modules/advangelistsBidAdapter.js b/modules/advangelistsBidAdapter.js
index 8e5be83f166..3a571831505 100755
--- a/modules/advangelistsBidAdapter.js
+++ b/modules/advangelistsBidAdapter.js
@@ -1,25 +1,23 @@
-import {deepAccess, generateUUID, isEmpty, isFn, parseSizesInput, parseUrl} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {find, includes} from '../src/polyfill.js';
+import { isEmpty } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { createRequestData, getBannerBidFloor, getBannerBidParam, getBannerSizes, getVideoBidFloor, getVideoBidParam, getVideoSizes, isBannerBidValid, isVideoBid, isVideoBidValid } from '../libraries/advangUtils/index.js';
 
 const ADAPTER_VERSION = '1.0';
 const BIDDER_CODE = 'advangelists';
-
-export const VIDEO_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';// 0cf8d6d643e13d86a5b6374148a4afac';
-export const BANNER_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';// 0cf8d6d643e13d86a5b6374148a4afac';
-export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/loader/outstream.js';
 export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'skip', 'playerSize', 'context'];
-export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
+export const VIDEO_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';
+export const BANNER_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';
+export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/loader/outstream.js';
 
 let pubid = '';
 
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
-
+  aliases: ['saambaa'],
   isBidRequestValid(bidRequest) {
-    if (typeof bidRequest != 'undefined') {
+    if (typeof bidRequest !== 'undefined') {
       if (bidRequest.bidder !== BIDDER_CODE && typeof bidRequest.params === 'undefined') { return false; }
       if (bidRequest === '' || bidRequest.params.placement === '' || bidRequest.params.pubid === '') { return false; }
       return true;
@@ -35,7 +33,7 @@ export const spec = {
       requests.push({
         method: 'POST',
         url: VIDEO_ENDPOINT + pubid,
-        data: createVideoRequestData(bid, bidderRequest),
+        data: createRequestData(bid, bidderRequest, true, getVideoBidParam, getVideoSizes, getVideoBidFloor),
         bidRequest: bid
       });
     });
@@ -45,16 +43,16 @@ export const spec = {
       requests.push({
         method: 'POST',
         url: BANNER_ENDPOINT + pubid,
-        data: createBannerRequestData(bid, bidderRequest),
+        data: createRequestData(bid, bidderRequest, false, getBannerBidParam, getBannerSizes, getBannerBidFloor, BIDDER_CODE, ADAPTER_VERSION),
         bidRequest: bid
       });
     });
     return requests;
   },
 
-  interpretResponse(serverResponse, {bidRequest}) {
+  interpretResponse(serverResponse, { bidRequest }) {
     let response = serverResponse.body;
-    if (response !== null && isEmpty(response) == false) {
+    if (response !== null && isEmpty(response) === false) {
       if (isVideoBid(bidRequest)) {
         let bidResponse = {
           requestId: response.id,
@@ -63,11 +61,11 @@ export const spec = {
           height: response.seatbid[0].bid[0].h,
           ttl: response.seatbid[0].bid[0].ttl || 60,
           creativeId: response.seatbid[0].bid[0].crid,
-          meta: { 'advertiserDomains': response.seatbid[0].bid[0].adomain },
           currency: response.cur,
+          meta: { 'advertiserDomains': response.seatbid[0].bid[0].adomain },
           mediaType: VIDEO,
           netRevenue: true
-        }
+        };
 
         if (response.seatbid[0].bid[0].adm) {
           bidResponse.vastXml = response.seatbid[0].bid[0].adm;
@@ -93,298 +91,10 @@ export const spec = {
           meta: { 'advertiserDomains': response.seatbid[0].bid[0].adomain },
           mediaType: BANNER,
           netRevenue: true
-        }
+        };
       }
     }
   }
 };
 
-function isBannerBid(bid) {
-  return deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
-}
-
-function isVideoBid(bid) {
-  return deepAccess(bid, 'mediaTypes.video');
-}
-
-function getBannerBidFloor(bid) {
-  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'banner', size: '*' }) : {};
-  return floorInfo.floor || getBannerBidParam(bid, 'bidfloor');
-}
-
-function getVideoBidFloor(bid) {
-  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'video', size: '*' }) : {};
-  return floorInfo.floor || getVideoBidParam(bid, 'bidfloor');
-}
-
-function isVideoBidValid(bid) {
-  return isVideoBid(bid) && getVideoBidParam(bid, 'pubid') && getVideoBidParam(bid, 'placement');
-}
-
-function isBannerBidValid(bid) {
-  return isBannerBid(bid) && getBannerBidParam(bid, 'pubid') && getBannerBidParam(bid, 'placement');
-}
-
-function getVideoBidParam(bid, key) {
-  return deepAccess(bid, 'params.video.' + key) || deepAccess(bid, 'params.' + key);
-}
-
-function getBannerBidParam(bid, key) {
-  return deepAccess(bid, 'params.banner.' + key) || deepAccess(bid, 'params.' + key);
-}
-
-function isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
-}
-
-function isConnectedTV() {
-  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
-}
-
-function getDoNotTrack() {
-  return navigator.doNotTrack === '1' || window.doNotTrack === '1' || navigator.msDoNoTrack === '1' || navigator.doNotTrack === 'yes';
-}
-
-function findAndFillParam(o, key, value) {
-  try {
-    if (typeof value === 'function') {
-      o[key] = value();
-    } else {
-      o[key] = value;
-    }
-  } catch (ex) {}
-}
-
-function getOsVersion() {
-  let clientStrings = [
-    { s: 'Android', r: /Android/ },
-    { s: 'iOS', r: /(iPhone|iPad|iPod)/ },
-    { s: 'Mac OS X', r: /Mac OS X/ },
-    { s: 'Mac OS', r: /(MacPPC|MacIntel|Mac_PowerPC|Macintosh)/ },
-    { s: 'Linux', r: /(Linux|X11)/ },
-    { s: 'Windows 10', r: /(Windows 10.0|Windows NT 10.0)/ },
-    { s: 'Windows 8.1', r: /(Windows 8.1|Windows NT 6.3)/ },
-    { s: 'Windows 8', r: /(Windows 8|Windows NT 6.2)/ },
-    { s: 'Windows 7', r: /(Windows 7|Windows NT 6.1)/ },
-    { s: 'Windows Vista', r: /Windows NT 6.0/ },
-    { s: 'Windows Server 2003', r: /Windows NT 5.2/ },
-    { s: 'Windows XP', r: /(Windows NT 5.1|Windows XP)/ },
-    { s: 'UNIX', r: /UNIX/ },
-    { s: 'Search Bot', r: /(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves\/Teoma|ia_archiver)/ }
-  ];
-  let cs = find(clientStrings, cs => cs.r.test(navigator.userAgent));
-  return cs ? cs.s : 'unknown';
-}
-
-function getFirstSize(sizes) {
-  return (sizes && sizes.length) ? sizes[0] : { w: undefined, h: undefined };
-}
-
-function parseSizes(sizes) {
-  return parseSizesInput(sizes).map(size => {
-    let [ width, height ] = size.split('x');
-    return {
-      w: parseInt(width, 10) || undefined,
-      h: parseInt(height, 10) || undefined
-    };
-  });
-}
-
-function getVideoSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
-}
-
-function getBannerSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
-}
-
-function getTopWindowReferrer(bidderRequest) {
-  return bidderRequest?.refererInfo?.ref || '';
-}
-
-function getVideoTargetingParams(bid) {
-  const result = {};
-  const excludeProps = ['playerSize', 'context', 'w', 'h'];
-  Object.keys(Object(bid.mediaTypes.video))
-    .filter(key => !includes(excludeProps, key))
-    .forEach(key => {
-      result[ key ] = bid.mediaTypes.video[ key ];
-    });
-  Object.keys(Object(bid.params.video))
-    .filter(key => includes(VIDEO_TARGETING, key))
-    .forEach(key => {
-      result[ key ] = bid.params.video[ key ];
-    });
-  return result;
-}
-
-function createVideoRequestData(bid, bidderRequest) {
-  let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer(bidderRequest);
-
-  let sizes = getVideoSizes(bid);
-  let firstSize = getFirstSize(sizes);
-  let bidfloor = (getVideoBidFloor(bid) == null || typeof getVideoBidFloor(bid) == 'undefined') ? 2 : getVideoBidFloor(bid);
-  let video = getVideoTargetingParams(bid);
-  const o = {
-    'device': {
-      'langauge': (global.navigator.language).split('-')[0],
-      'dnt': (global.navigator.doNotTrack === 1 ? 1 : 0),
-      'devicetype': isMobile() ? 4 : isConnectedTV() ? 3 : 2,
-      'js': 1,
-      'os': getOsVersion()
-    },
-    'at': 2,
-    'site': {},
-    'tmax': 3000,
-    'cur': ['USD'],
-    'id': bid.bidId,
-    'imp': [],
-    'regs': {
-      'ext': {
-      }
-    },
-    'user': {
-      'ext': {
-      }
-    }
-  };
-
-  o.site['page'] = topLocation.href;
-  o.site['domain'] = topLocation.hostname;
-  o.site['search'] = topLocation.search;
-  o.site['domain'] = topLocation.hostname;
-  o.site['ref'] = topReferrer;
-  o.site['mobile'] = isMobile() ? 1 : 0;
-  const secure = topLocation.protocol.indexOf('https') === 0 ? 1 : 0;
-
-  o.device['dnt'] = getDoNotTrack() ? 1 : 0;
-
-  findAndFillParam(o.site, 'name', function() {
-    return global.top.document.title;
-  });
-
-  findAndFillParam(o.device, 'h', function() {
-    return global.screen.height;
-  });
-  findAndFillParam(o.device, 'w', function() {
-    return global.screen.width;
-  });
-
-  let placement = getVideoBidParam(bid, 'placement');
-
-  for (let j = 0; j < sizes.length; j++) {
-    o.imp.push({
-      'id': '' + j,
-      'displaymanager': '' + BIDDER_CODE,
-      'displaymanagerver': '' + ADAPTER_VERSION,
-      'tagId': placement,
-      'bidfloor': bidfloor,
-      'bidfloorcur': 'USD',
-      'secure': secure,
-      'video': Object.assign({
-        'id': generateUUID(),
-        'pos': 0,
-        'w': firstSize.w,
-        'h': firstSize.h,
-        'mimes': DEFAULT_MIMES
-      }, video)
-
-    });
-  }
-
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    let { gdprApplies, consentString } = bidderRequest.gdprConsent;
-    o.regs.ext = {'gdpr': gdprApplies ? 1 : 0};
-    o.user.ext = {'consent': consentString};
-  }
-
-  return o;
-}
-
-function getTopWindowLocation(bidderRequest) {
-  return parseUrl(bidderRequest?.refererInfo?.page, {decodeSearchAsString: true});
-}
-
-function createBannerRequestData(bid, bidderRequest) {
-  let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer(bidderRequest);
-
-  let sizes = getBannerSizes(bid);
-  let bidfloor = (getBannerBidFloor(bid) == null || typeof getBannerBidFloor(bid) == 'undefined') ? 2 : getBannerBidFloor(bid);
-
-  const o = {
-    'device': {
-      'langauge': (global.navigator.language).split('-')[0],
-      'dnt': (global.navigator.doNotTrack === 1 ? 1 : 0),
-      'devicetype': isMobile() ? 4 : isConnectedTV() ? 3 : 2,
-      'js': 1
-    },
-    'at': 2,
-    'site': {},
-    'tmax': 3000,
-    'cur': ['USD'],
-    'id': bid.bidId,
-    'imp': [],
-    'regs': {
-      'ext': {
-      }
-    },
-    'user': {
-      'ext': {
-      }
-    }
-  };
-
-  o.site['page'] = topLocation.href;
-  o.site['domain'] = topLocation.hostname;
-  o.site['search'] = topLocation.search;
-  o.site['domain'] = topLocation.hostname;
-  o.site['ref'] = topReferrer;
-  o.site['mobile'] = isMobile() ? 1 : 0;
-  const secure = topLocation.protocol.indexOf('https') === 0 ? 1 : 0;
-
-  o.device['dnt'] = getDoNotTrack() ? 1 : 0;
-
-  findAndFillParam(o.site, 'name', function() {
-    return global.top.document.title;
-  });
-
-  findAndFillParam(o.device, 'h', function() {
-    return global.screen.height;
-  });
-  findAndFillParam(o.device, 'w', function() {
-    return global.screen.width;
-  });
-
-  let placement = getBannerBidParam(bid, 'placement');
-  for (let j = 0; j < sizes.length; j++) {
-    let size = sizes[j];
-
-    o.imp.push({
-      'id': '' + j,
-      'displaymanager': '' + BIDDER_CODE,
-      'displaymanagerver': '' + ADAPTER_VERSION,
-      'tagId': placement,
-      'bidfloor': bidfloor,
-      'bidfloorcur': 'USD',
-      'secure': secure,
-      'banner': {
-        'id': generateUUID(),
-        'pos': 0,
-        'w': size['w'],
-        'h': size['h']
-      }
-    });
-  }
-
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    let { gdprApplies, consentString } = bidderRequest.gdprConsent;
-    o.regs.ext = {'gdpr': gdprApplies ? 1 : 0};
-    o.user.ext = {'consent': consentString};
-  }
-
-  return o;
-}
-
 registerBidder(spec);
diff --git a/modules/adverxoBidAdapter.js b/modules/adverxoBidAdapter.js
new file mode 100644
index 00000000000..f293d7e01a6
--- /dev/null
+++ b/modules/adverxoBidAdapter.js
@@ -0,0 +1,356 @@
+import * as utils from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
+import {ortbConverter as OrtbConverter} from '../libraries/ortbConverter/converter.js';
+import {Renderer} from '../src/Renderer.js';
+import {deepAccess, deepSetValue} from '../src/utils.js';
+import {config} from '../src/config.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/auction.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
+const BIDDER_CODE = 'adverxo';
+
+const ALIASES = [
+  {code: 'adport', skipPbsAliasing: true},
+  {code: 'bidsmind', skipPbsAliasing: true},
+  {code: 'mobupps', skipPbsAliasing: true}
+];
+
+const AUCTION_URLS = {
+  adverxo: 'js.pbsadverxo.com',
+  adport: 'diclotrans.com',
+  bidsmind: 'egrevirda.com',
+  mobupps: 'traffhb.com'
+};
+
+const ENDPOINT_URL_AD_UNIT_PLACEHOLDER = '{AD_UNIT}';
+const ENDPOINT_URL_AUTH_PLACEHOLDER = '{AUTH}';
+const ENDPOINT_URL_HOST_PLACEHOLDER = '{HOST}';
+
+const ENDPOINT_URL = `https://${ENDPOINT_URL_HOST_PLACEHOLDER}/pickpbs?id=${ENDPOINT_URL_AD_UNIT_PLACEHOLDER}&auth=${ENDPOINT_URL_AUTH_PLACEHOLDER}`;
+
+const ORTB_MTYPES = {
+  1: BANNER,
+  2: VIDEO,
+  4: NATIVE
+};
+
+const USYNC_TYPES = {
+  IFRAME: 'iframe',
+  REDIRECT: 'image'
+};
+
+const DEFAULT_CURRENCY = 'USD';
+
+const ortbConverter = OrtbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 60,
+  },
+  request: function request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+
+    utils.deepSetValue(request, 'device.ip', 'caller');
+    utils.deepSetValue(request, 'ext.avx_add_vast_url', 1);
+
+    const eids = deepAccess(bidderRequest, 'bids.0.userIdAsEids');
+
+    if (eids && eids.length) {
+      deepSetValue(request, 'user.ext.eids', eids);
+    }
+
+    return request;
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    const floor = adverxoUtils.getBidFloor(bidRequest);
+
+    if (floor) {
+      imp.bidfloor = floor;
+      imp.bidfloorcur = DEFAULT_CURRENCY;
+    }
+
+    return imp;
+  },
+  bidResponse: function (buildBidResponse, bid, context) {
+    bid.adm = bid.adm.replaceAll(`\${AUCTION_PRICE}`, bid.price);
+
+    if (FEATURES.NATIVE && ORTB_MTYPES[bid.mtype] === NATIVE) {
+      if (typeof bid?.adm === 'string') {
+        bid.adm = JSON.parse(bid.adm);
+      }
+
+      if (bid?.adm?.native) {
+        bid.adm = bid.adm.native;
+      }
+    }
+
+    const result = buildBidResponse(bid, context);
+
+    if (FEATURES.VIDEO) {
+      if (bid?.ext?.avx_vast_url) {
+        result.vastUrl = bid.ext.avx_vast_url;
+      }
+
+      if (bid?.ext?.avx_video_renderer_url) {
+        result.avxVideoRendererUrl = bid.ext.avx_video_renderer_url;
+      }
+    }
+
+    return result;
+  }
+});
+
+const userSyncUtils = {
+  buildUsyncParams: function (gdprConsent, uspConsent, gppConsent) {
+    const params = [];
+
+    if (gdprConsent) {
+      params.push('gdpr=' + (gdprConsent.gdprApplies ? 1 : 0));
+      params.push('gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || ''));
+    }
+
+    if (config.getConfig('coppa') === true) {
+      params.push('coppa=1');
+    }
+
+    if (uspConsent) {
+      params.push('us_privacy=' + encodeURIComponent(uspConsent));
+    }
+
+    if (gppConsent?.gppString && gppConsent?.applicableSections?.length) {
+      params.push('gpp=' + encodeURIComponent(gppConsent.gppString));
+      params.push('gpp_sid=' + encodeURIComponent(gppConsent?.applicableSections?.join(',')));
+    }
+
+    return params.length ? params.join('&') : '';
+  }
+};
+
+const videoUtils = {
+  createOutstreamVideoRenderer: function (bid) {
+    const renderer = Renderer.install({
+      id: bid.bidId,
+      url: bid.avxVideoRendererUrl,
+      loaded: false,
+      adUnitCode: bid.adUnitCode
+    });
+
+    try {
+      renderer.setRender(this.outstreamRender.bind(this));
+    } catch (err) {
+      utils.logWarn('Prebid Error calling setRender on renderer', err);
+    }
+
+    return renderer;
+  },
+
+  outstreamRender: function (bid, doc) {
+    bid.renderer.push(() => {
+      const win = (doc) ? doc.defaultView : window;
+
+      win.adxVideoRenderer.renderAd({
+        targetId: bid.adUnitCode,
+        adResponse: {content: bid.vastXml}
+      });
+    });
+  }
+};
+
+const adverxoUtils = {
+  buildAuctionUrl: function (bidderCode, host, adUnitId, adUnitAuth) {
+    const auctionUrl = host || AUCTION_URLS[bidderCode];
+
+    return ENDPOINT_URL
+      .replace(ENDPOINT_URL_HOST_PLACEHOLDER, auctionUrl)
+      .replace(ENDPOINT_URL_AD_UNIT_PLACEHOLDER, adUnitId)
+      .replace(ENDPOINT_URL_AUTH_PLACEHOLDER, adUnitAuth);
+  },
+
+  groupBidRequestsByAdUnit: function (bidRequests) {
+    const groupedBidRequests = new Map();
+
+    bidRequests.forEach(bidRequest => {
+      const adUnit = {
+        host: bidRequest.params.host,
+        id: bidRequest.params.adUnitId,
+        auth: bidRequest.params.auth,
+      };
+
+      if (!groupedBidRequests.get(adUnit)) {
+        groupedBidRequests.set(adUnit, []);
+      }
+
+      groupedBidRequests.get(adUnit).push(bidRequest);
+    });
+
+    return groupedBidRequests;
+  },
+
+  getBidFloor: function (bid) {
+    if (utils.isFn(bid.getFloor)) {
+      const floor = bid.getFloor({
+        currency: DEFAULT_CURRENCY,
+        mediaType: '*',
+        size: '*',
+      });
+
+      if (utils.isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY) {
+        return floor.floor;
+      }
+    }
+
+    return null;
+  }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+  aliases: ALIASES,
+
+  /**
+   * Determines whether the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return {boolean} True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    if (!utils.isPlainObject(bid.params) || !Object.keys(bid.params).length) {
+      utils.logWarn('Adverxo Bid Adapter: bid params must be provided.');
+      return false;
+    }
+
+    if (!bid.params.adUnitId || typeof bid.params.adUnitId !== 'number') {
+      utils.logWarn('Adverxo Bid Adapter: adUnitId bid param is required and must be a number');
+      return false;
+    }
+
+    if (!bid.params.auth || typeof bid.params.auth !== 'string') {
+      utils.logWarn('Adverxo Bid Adapter: auth bid param is required and must be a string');
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests an array of bids
+   * @param {BidderRequest} bidderRequest an array of bids
+   * @return {ServerRequest} Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const result = [];
+
+    const bidRequestsByAdUnit = adverxoUtils.groupBidRequestsByAdUnit(validBidRequests);
+
+    bidRequestsByAdUnit.forEach((adUnitBidRequests, adUnit) => {
+      const ortbRequest = ortbConverter.toORTB({
+        bidRequests: adUnitBidRequests,
+        bidderRequest
+      });
+
+      result.push({
+        method: 'POST',
+        url: adverxoUtils.buildAuctionUrl(bidderRequest.bidderCode, adUnit.host, adUnit.id, adUnit.auth),
+        data: ortbRequest,
+        bids: adUnitBidRequests
+      });
+    });
+
+    return result;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidRequest Adverxo bidRequest
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    if (!serverResponse || !bidRequest) {
+      return [];
+    }
+
+    const bids = ortbConverter.fromORTB({
+      response: serverResponse.body,
+      request: bidRequest.data,
+    }).bids;
+
+    return bids.map((bid) => {
+      const thisRequest = utils.getBidRequest(bid.requestId, [bidRequest]);
+      const context = utils.deepAccess(thisRequest, 'mediaTypes.video.context');
+
+      if (FEATURES.VIDEO && bid.mediaType === 'video' && context === 'outstream') {
+        bid.renderer = videoUtils.createOutstreamVideoRenderer(bid);
+      }
+
+      return bid;
+    });
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} responses List of server's responses.
+   * @param {*} gdprConsent
+   * @param {*} uspConsent
+   * @param {*} gppConsent
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent, gppConsent) => {
+    if (!responses || responses.length === 0 || (!syncOptions.pixelEnabled && !syncOptions.iframeEnabled)) {
+      return [];
+    }
+
+    const privacyParams = userSyncUtils.buildUsyncParams(gdprConsent, uspConsent, gppConsent);
+    const syncType = syncOptions.iframeEnabled ? USYNC_TYPES.IFRAME : USYNC_TYPES.REDIRECT;
+
+    const result = [];
+
+    for (const response of responses) {
+      const syncUrls = response.body?.ext?.avx_usync;
+
+      if (!syncUrls || syncUrls.length === 0) {
+        continue;
+      }
+
+      for (const url of syncUrls) {
+        let finalUrl = url;
+
+        if (!finalUrl.includes('?')) {
+          finalUrl += '?';
+        } else {
+          finalUrl += '&';
+        }
+
+        finalUrl += 'type=' + syncType;
+
+        if (privacyParams.length !== 0) {
+          finalUrl += `&${privacyParams}`;
+        }
+
+        result.push({
+          type: syncType,
+          url: finalUrl
+        });
+      }
+    }
+
+    return result;
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/adverxoBidAdapter.md b/modules/adverxoBidAdapter.md
new file mode 100644
index 00000000000..ae6072d2738
--- /dev/null
+++ b/modules/adverxoBidAdapter.md
@@ -0,0 +1,101 @@
+# Overview
+
+```
+Module Name: Adverxo Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: developer@adverxo.com
+```
+
+# Description
+
+Module that connects to Adverxo to fetch bids.
+Banner, native and video formats are supported.
+
+# Bid Parameters
+
+| Name       | Required? | Description                                                       | Example                                      | Type      |
+|------------|-----------|-------------------------------------------------------------------|----------------------------------------------|-----------|
+| `host`     | No        | Ad network host.                                                  | `prebidTest.adverxo.com`                     | `String`  |
+| `adUnitId` | Yes       | Unique identifier for the ad unit in Adverxo platform.            | `413`                                        | `Integer` |
+| `auth`     | Yes       | Authentication token provided by Adverxo platform for the AdUnit. | `'61336d75e414c77c367ce5c47c2599ce80a8x32b'` | `String`  |
+
+# Test Parameters
+
+```javascript
+var adUnits = [
+    {
+        code: 'banner-ad-div',
+        mediaTypes: {
+            banner: {
+                sizes: [
+                    [400, 300],
+                    [320, 50]
+                ]
+            }
+        },
+        bids: [{
+            bidder: 'adverxo',
+            params: {
+                host: 'example.com',
+                adUnitId: 1,
+                auth: '61336e753414c77c367deac47c2595ce80a8032b'
+            }
+        }]
+    },
+    {
+        code: 'native-ad-div',
+        mediaTypes: {
+            native: {
+                image: {
+                    required: true,
+                    sizes: [400, 300]
+                },
+                title: {
+                    required: true,
+                    len: 75
+                },
+                body: {
+                    required: false,
+                    len: 200
+                },
+                cta: {
+                    required: false,
+                    len: 75
+                },
+                sponsoredBy: {
+                    required: false
+                }
+            }
+        },
+        bids: [{
+            bidder: 'adverxo',
+            params: {
+                host: 'example.com',
+                adUnitId: 2,
+                auth: '9a640dfccc3381e71fxc29ffd4a72wabd29g9d86'
+            }
+        }]
+    },
+    {
+        code: 'video-div',
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480],
+                context: 'outstream',
+                mimes: ['video/mp4'],
+                maxduration: 30,
+                skip: 1
+            }
+        },
+        bids: [{
+            bidder: 'adverxo',
+            params: {
+                host: 'example.com',
+                adUnitId: 3,
+                auth: '1ax23d9621f21da28a2eab6f79bd5fbcf4d037c1'
+            }
+        }]
+    }
+];
+
+```
diff --git a/modules/adxcgAnalyticsAdapter.js b/modules/adxcgAnalyticsAdapter.js
index 21b6c1be783..7538e2962cc 100644
--- a/modules/adxcgAnalyticsAdapter.js
+++ b/modules/adxcgAnalyticsAdapter.js
@@ -2,8 +2,7 @@ import { parseSizesInput, uniques, buildUrl, logError } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
-import {getGlobal} from '../src/prebidGlobal.js';
+import { EVENTS } from '../src/constants.js';
 
 /**
  * Analytics adapter from adxcg.com
@@ -22,29 +21,29 @@ var adxcgAnalyticsAdapter = Object.assign(adapter(
   }), {
   track ({eventType, args}) {
     switch (eventType) {
-      case CONSTANTS.EVENTS.AUCTION_INIT:
+      case EVENTS.AUCTION_INIT:
         adxcgAnalyticsAdapter.context.events.auctionInit = mapAuctionInit(args);
         adxcgAnalyticsAdapter.context.auctionTimestamp = args.timestamp;
         break;
-      case CONSTANTS.EVENTS.BID_REQUESTED:
+      case EVENTS.BID_REQUESTED:
         adxcgAnalyticsAdapter.context.auctionId = args.auctionId;
         adxcgAnalyticsAdapter.context.events.bidRequests.push(mapBidRequested(args));
         break;
-      case CONSTANTS.EVENTS.BID_ADJUSTMENT:
+      case EVENTS.BID_ADJUSTMENT:
         break;
-      case CONSTANTS.EVENTS.BID_TIMEOUT:
+      case EVENTS.BID_TIMEOUT:
         adxcgAnalyticsAdapter.context.events.bidTimeout = args.map(item => item.bidder).filter(uniques);
         break;
-      case CONSTANTS.EVENTS.BIDDER_DONE:
+      case EVENTS.BIDDER_DONE:
         break;
-      case CONSTANTS.EVENTS.BID_RESPONSE:
+      case EVENTS.BID_RESPONSE:
         adxcgAnalyticsAdapter.context.events.bidResponses.push(mapBidResponse(args, eventType));
         break;
-      case CONSTANTS.EVENTS.BID_WON:
+      case EVENTS.BID_WON:
         let outData2 = {bidWons: mapBidWon(args)};
         send(outData2);
         break;
-      case CONSTANTS.EVENTS.AUCTION_END:
+      case EVENTS.AUCTION_END:
         send(adxcgAnalyticsAdapter.context.events);
         break;
     }
@@ -87,7 +86,7 @@ function mapBidResponse (bidResponse, eventType) {
     currency: bidResponse.currency,
     netRevenue: bidResponse.netRevenue,
     timeToRespond: bidResponse.timeToRespond,
-    bidId: eventType === CONSTANTS.EVENTS.BID_TIMEOUT ? bidResponse.bidId : bidResponse.requestId,
+    bidId: eventType === EVENTS.BID_TIMEOUT ? bidResponse.bidId : bidResponse.requestId,
     dealId: bidResponse.dealId,
     status: bidResponse.status,
     creativeId: bidResponse.creativeId.toString()
@@ -123,7 +122,7 @@ function send (data) {
       ats: adxcgAnalyticsAdapter.context.auctionTimestamp,
       aav: adxcgAnalyticsVersion,
       iob: intersectionObserverAvailable(window) ? '1' : '0',
-      pbv: getGlobal().version,
+      pbv: '$prebid.version$',
       sz: window.screen.width + 'x' + window.screen.height
     }
   });
diff --git a/modules/adxcgBidAdapter.js b/modules/adxcgBidAdapter.js
index 5930f3adb67..a0e99572809 100644
--- a/modules/adxcgBidAdapter.js
+++ b/modules/adxcgBidAdapter.js
@@ -1,307 +1,64 @@
 // jshint esversion: 6, es3: false, node: true
-'use strict';
-
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {
-  _map,
-  deepAccess,
-  deepSetValue,
-  getDNT,
   isArray,
-  isPlainObject,
-  isStr,
-  mergeDeep,
-  parseSizesInput,
   replaceAuctionPrice,
-  triggerPixel
+  triggerPixel,
+  logMessage,
+  deepSetValue,
+  getBidIdParameter
 } from '../src/utils.js';
-import {config} from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
-const { getConfig } = config;
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'adxcg';
 const SECURE_BID_URL = 'https://pbc.adxcg.net/rtb/ortb/pbc?adExchangeId=1';
 
-const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
-const NATIVE_PARAMS = {
-  title: {
-    id: 0,
-    name: 'title'
-  },
-  icon: {
-    id: 2,
-    type: 1,
-    name: 'img'
-  },
-  image: {
-    id: 3,
-    type: 3,
-    name: 'img'
-  },
-  sponsoredBy: {
-    id: 5,
-    name: 'data',
-    type: 1
-  },
-  body: {
-    id: 4,
-    name: 'data',
-    type: 2
-  },
-  cta: {
-    id: 1,
-    type: 12,
-    name: 'data'
-  }
-};
+const DEFAULT_CURRENCY = 'EUR';
+const KNOWN_PARAMS = ['battr', 'deals'];
+const DEFAULT_TMAX = 500;
 
+/**
+ * Adxcg Bid Adapter.
+ *
+ */
 export const spec = {
+
   code: BIDDER_CODE,
-  supportedMediaTypes: [ NATIVE, BANNER, VIDEO ],
+
+  aliases: ['mediaopti'],
+
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+
   isBidRequestValid: (bid) => {
+    logMessage('adxcg  - validating isBidRequestValid');
     const params = bid.params || {};
     const { adzoneid } = params;
     return !!(adzoneid);
   },
-  buildRequests: (validBidRequests, bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let app, site;
-
-    const commonFpd = bidderRequest.ortb2 || {};
-    let { user } = commonFpd;
-
-    if (typeof getConfig('app') === 'object') {
-      app = getConfig('app') || {};
-      if (commonFpd.app) {
-        mergeDeep(app, commonFpd.app);
-      }
-    } else {
-      site = getConfig('site') || {};
-      if (commonFpd.site) {
-        mergeDeep(site, commonFpd.site);
-      }
-
-      if (!site.page) {
-        site.page = bidderRequest.refererInfo.page;
-        site.domain = bidderRequest.refererInfo.domain;
-      }
-    }
-
-    const device = getConfig('device') || {};
-    device.w = device.w || window.innerWidth;
-    device.h = device.h || window.innerHeight;
-    device.ua = device.ua || navigator.userAgent;
-    device.dnt = getDNT() ? 1 : 0;
-    device.language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-
-    const tid = bidderRequest.ortb2?.source?.tid;
-    const test = setOnAny(validBidRequests, 'params.test');
-    const currency = getConfig('currency.adServerCurrency');
-    const cur = currency && [ currency ];
-    const eids = setOnAny(validBidRequests, 'userIdAsEids');
-    const schain = setOnAny(validBidRequests, 'schain');
-
-    const imp = validBidRequests.map((bid, id) => {
-      const floorInfo = bid.getFloor ? bid.getFloor({
-        currency: currency || 'USD'
-      }) : {};
-      const bidfloor = floorInfo.floor;
-      const bidfloorcur = floorInfo.currency;
-      const { adzoneid } = bid.params;
-
-      const imp = {
-        id: id + 1,
-        tagid: adzoneid,
-        secure: 1,
-        bidfloor,
-        bidfloorcur,
-        ext: {
-        }
-      };
-
-      const assets = _map(bid.nativeParams, (bidParams, key) => {
-        const props = NATIVE_PARAMS[key];
-        const asset = {
-          required: bidParams.required & 1,
-        };
-        if (props) {
-          asset.id = props.id;
-          let wmin, hmin, w, h;
-          let aRatios = bidParams.aspect_ratios;
-
-          if (aRatios && aRatios[0]) {
-            aRatios = aRatios[0];
-            wmin = aRatios.min_width || 0;
-            hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
-          }
-
-          if (bidParams.sizes) {
-            const sizes = flatten(bidParams.sizes);
-            w = sizes[0];
-            h = sizes[1];
-          }
-
-          asset[props.name] = {
-            len: bidParams.len,
-            type: props.type,
-            wmin,
-            hmin,
-            w,
-            h
-          };
-
-          return asset;
-        }
-      }).filter(Boolean);
-
-      if (assets.length) {
-        imp.native = {
-          request: JSON.stringify({assets: assets})
-        };
-      }
-
-      const bannerParams = deepAccess(bid, 'mediaTypes.banner');
-
-      if (bannerParams && bannerParams.sizes) {
-        const sizes = parseSizesInput(bannerParams.sizes);
-        const format = sizes.map(size => {
-          const [ width, height ] = size.split('x');
-          const w = parseInt(width, 10);
-          const h = parseInt(height, 10);
-          return { w, h };
-        });
-
-        imp.banner = {
-          format
-        };
-      }
-
-      const videoParams = deepAccess(bid, 'mediaTypes.video');
-      if (videoParams) {
-        imp.video = videoParams;
-      }
-
-      return imp;
-    });
-
-    const request = {
-      id: bidderRequest.auctionId,
-      site,
-      app,
-      user,
-      geo: { utcoffset: new Date().getTimezoneOffset() },
-      device,
-      source: { tid, fd: 1 },
-      ext: {
-        prebid: {
-          channel: {
-            name: 'pbjs',
-            version: '$prebid.version$'
-          }
-        }
-      },
-      cur,
-      imp
-    };
-
-    if (test) {
-      request.is_debug = !!test;
-      request.test = 1;
-    }
-    if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies') !== undefined) {
-      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-      deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1);
-    }
-
-    if (bidderRequest.uspConsent) {
-      deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-    }
-
-    if (eids) {
-      deepSetValue(request, 'user.ext.eids', eids);
-    }
-
-    if (schain) {
-      deepSetValue(request, 'source.ext.schain', schain);
-    }
 
+  buildRequests: (bidRequests, bidderRequest) => {
+    const data = converter.toORTB({ bidRequests, bidderRequest });
     return {
       method: 'POST',
       url: SECURE_BID_URL,
-      data: JSON.stringify(request),
+      data,
       options: {
         contentType: 'application/json'
       },
-      bids: validBidRequests
+      bidderRequest
     };
   },
-  interpretResponse: function(serverResponse, { bids }) {
-    if (!serverResponse.body) {
-      return;
-    }
-    const { seatbid, cur } = serverResponse.body;
-
-    const bidResponses = flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
-      result[bid.impid - 1] = bid;
-      return result;
-    }, []);
-
-    return bids.map((bid, id) => {
-      const bidResponse = bidResponses[id];
-      if (bidResponse) {
-        const mediaType = deepAccess(bidResponse, 'ext.crType');
-        const result = {
-          requestId: bid.bidId,
-          cpm: bidResponse.price,
-          creativeId: bidResponse.crid,
-          ttl: bidResponse.ttl ? bidResponse.ttl : 300,
-          netRevenue: bid.netRevenue === 'net',
-          currency: cur,
-          burl: bid.burl || '',
-          mediaType: mediaType,
-          width: bidResponse.w,
-          height: bidResponse.h,
-          dealId: bidResponse.dealid,
-        };
-
-        deepSetValue(result, 'meta.mediaType', mediaType);
-        if (isArray(bidResponse.adomain)) {
-          deepSetValue(result, 'meta.advertiserDomains', bidResponse.adomain);
-        }
 
-        if (isPlainObject(bidResponse.ext)) {
-          if (isStr(bidResponse.ext.mediaType)) {
-            deepSetValue(result, 'meta.mediaType', mediaType);
-          }
-          if (isStr(bidResponse.ext.advertiser_id)) {
-            deepSetValue(result, 'meta.advertiserId', bidResponse.ext.advertiser_id);
-          }
-          if (isStr(bidResponse.ext.advertiser_name)) {
-            deepSetValue(result, 'meta.advertiserName', bidResponse.ext.advertiser_name);
-          }
-          if (isStr(bidResponse.ext.agency_name)) {
-            deepSetValue(result, 'meta.agencyName', bidResponse.ext.agency_name);
-          }
-        }
-        if (mediaType === BANNER) {
-          result.ad = bidResponse.adm;
-        } else if (mediaType === NATIVE) {
-          result.native = parseNative(bidResponse);
-          result.width = 0;
-          result.height = 0;
-        } else if (mediaType === VIDEO) {
-          result.vastUrl = bidResponse.nurl;
-          result.vastXml = bidResponse.adm;
-        }
-
-        return result;
-      }
-    }).filter(Boolean);
+  interpretResponse: (response, request) => {
+    if (response.body) {
+      const bids = converter.fromORTB({ response: response.body, request: request.data }).bids;
+      return bids;
+    }
+    return [];
   },
+
   getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
     const syncs = [];
     let syncUrl = config.getConfig('adxcg.usersyncUrl');
@@ -323,6 +80,7 @@ export const spec = {
     }
     return syncs;
   },
+
   onBidWon: (bid) => {
     // for native requests we put the nurl as an imp tracker, otherwise if the auction takes place on prebid server
     // the server JS adapter puts the nurl in the adm as a tracking pixel and removes the attribute
@@ -332,35 +90,77 @@ export const spec = {
   }
 };
 
-registerBidder(spec);
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 300,
+    currency: 'EUR'
+  },
 
-function parseNative(bid) {
-  const { assets, link, imptrackers, jstracker } = JSON.parse(bid.adm);
-  const result = {
-    clickUrl: link.url,
-    clickTrackers: link.clicktrackers || undefined,
-    impressionTrackers: imptrackers || undefined,
-    javascriptTrackers: jstracker ? [ jstracker ] : undefined
-  };
-  assets.forEach(asset => {
-    const kind = NATIVE_ASSET_IDS[asset.id];
-    const content = kind && asset[NATIVE_PARAMS[kind].name];
-    if (content) {
-      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    // tagid
+    imp.tagid = bidRequest.params.adzoneid.toString();
+    // unknown params
+    const unknownParams = slotUnknownParams(bidRequest);
+    if (imp.ext || unknownParams) {
+      imp.ext = Object.assign({}, imp.ext, unknownParams);
+    }
+    // battr
+    if (bidRequest.params.battr) {
+      ['banner', 'video', 'audio', 'native'].forEach(k => {
+        if (imp[k]) {
+          imp[k].battr = bidRequest.params.battr;
+        }
+      });
+    }
+    // deals
+    if (bidRequest.params.deals && isArray(bidRequest.params.deals)) {
+      imp.pmp = {
+        private_auction: 0,
+        deals: bidRequest.params.deals
+      };
     }
-  });
-  return result;
-}
 
-function setOnAny(collection, key) {
-  for (let i = 0, result; i < collection.length; i++) {
-    result = deepAccess(collection[i], key);
-    if (result) {
-      return result;
+    imp.secure = bidRequest.ortb2Imp?.secure ?? 1;
+
+    if (!imp.bidfloor && bidRequest.params.bidFloor) {
+      imp.bidfloor = bidRequest.params.bidFloor;
+      imp.bidfloorcur = getBidIdParameter('bidFloorCur', bidRequest.params).toUpperCase() || 'USD'
     }
-  }
-}
+    return imp;
+  },
+
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    request.tmax = request.tmax || DEFAULT_TMAX;
+    request.test = config.getConfig('debug') ? 1 : 0;
+    request.at = 1;
+    deepSetValue(request, 'ext.prebid.channel.name', 'pbjs');
+    deepSetValue(request, 'ext.prebid.channel.version', '$prebid.version$');
+    return request;
+  },
 
-function flatten(arr) {
-  return [].concat(...arr);
+  bidResponse(buildBidResponse, bid, context) {
+    const bidResponse = buildBidResponse(bid, context);
+    bidResponse.cur = bid.cur || DEFAULT_CURRENCY;
+    return bidResponse;
+  },
+});
+
+/**
+ * Unknown params are captured and sent on ext
+ */
+function slotUnknownParams(slot) {
+  const ext = {};
+  const knownParamsMap = {};
+  KNOWN_PARAMS.forEach(value => knownParamsMap[value] = 1);
+  Object.keys(slot.params).forEach(key => {
+    if (!knownParamsMap[key]) {
+      ext[key] = slot.params[key];
+    }
+  });
+  return Object.keys(ext).length > 0 ? { prebid: ext } : null;
 }
+
+registerBidder(spec);
diff --git a/modules/adxpremiumAnalyticsAdapter.js b/modules/adxpremiumAnalyticsAdapter.js
index 9161c6338f4..e3f77e96725 100644
--- a/modules/adxpremiumAnalyticsAdapter.js
+++ b/modules/adxpremiumAnalyticsAdapter.js
@@ -2,7 +2,7 @@ import {deepClone, logError, logInfo} from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import {includes} from '../src/polyfill.js';
 
 const analyticsType = 'endpoint';
@@ -12,15 +12,13 @@ let reqCountry = window.reqCountry || null;
 
 // Events needed
 const {
-  EVENTS: {
-    AUCTION_INIT,
-    BID_REQUESTED,
-    BID_TIMEOUT,
-    BID_RESPONSE,
-    BID_WON,
-    AUCTION_END
-  }
-} = CONSTANTS;
+  AUCTION_INIT,
+  BID_REQUESTED,
+  BID_TIMEOUT,
+  BID_RESPONSE,
+  BID_WON,
+  AUCTION_END
+} = EVENTS;
 
 let timeoutBased = false;
 let requestSent = false;
diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
index 8952c3ae2b9..fce5d1ae000 100644
--- a/modules/adyoulikeBidAdapter.js
+++ b/modules/adyoulikeBidAdapter.js
@@ -5,6 +5,12 @@ import {find} from '../src/polyfill.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ */
+
 const VERSION = '1.0';
 const BIDDER_CODE = 'adyoulike';
 const DEFAULT_DC = 'hb-api';
@@ -57,7 +63,8 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {bidRequests} - bidRequests.bids[] is an array of AdUnits and bids
+   * @param {BidRequest} bidRequests is an array of AdUnits and bids
+   * @param {BidderRequest} bidderRequest
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
@@ -153,6 +160,10 @@ export const spec = {
     const bidResponses = [];
     var bidRequests = {};
 
+    if (!serverResponse || !serverResponse.body) {
+      return bidResponses;
+    }
+
     try {
       bidRequests = JSON.parse(request.data).Bids;
     } catch (err) {
@@ -244,7 +255,7 @@ function getFloor(bidRequest, size, mediaType) {
     size: [ size.width, size.height ]
   });
 
-  if (!isNaN(bidFloors.floor) && (bidFloors.currency === CURRENCY)) {
+  if (!isNaN(bidFloors?.floor) && (bidFloors?.currency === CURRENCY)) {
     return bidFloors.floor;
   }
 }
diff --git a/modules/agmaAnalyticsAdapter.js b/modules/agmaAnalyticsAdapter.js
new file mode 100644
index 00000000000..e2e01fb4d03
--- /dev/null
+++ b/modules/agmaAnalyticsAdapter.js
@@ -0,0 +1,224 @@
+import { ajax } from '../src/ajax.js';
+import {
+  generateUUID,
+  logInfo,
+  logError,
+  getPerformanceNow,
+  isEmpty,
+  isEmptyStr,
+} from '../src/utils.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import { EVENTS } from '../src/constants.js';
+import adapterManager, { gdprDataHandler } from '../src/adapterManager.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { config } from '../src/config.js';
+
+const GVLID = 1122;
+const ModuleCode = 'agma';
+const analyticsType = 'endpoint';
+const scriptVersion = '1.8.0';
+const batchDelayInMs = 1000;
+const agmaURL = 'https://pbc.agma-analytics.de/v1';
+const pageViewId = generateUUID();
+
+// Helper functions
+const getScreen = () => {
+  const w = window;
+  const d = document;
+  const e = d.documentElement;
+  const g = d.getElementsByTagName('body')[0];
+  const x = w.innerWidth || e.clientWidth || g.clientWidth;
+  const y = w.innerHeight || e.clientHeight || g.clientHeight;
+  return { x, y };
+};
+
+const getUserIDs = () => {
+  try {
+    return getGlobal().getUserIdsAsEids();
+  } catch (e) {}
+  return [];
+};
+
+export const getOrtb2Data = (options) => {
+  let site = null;
+  let user = null;
+
+  // check if data is provided via config
+  if (options.ortb2) {
+    if (options.ortb2.user) {
+      user = options.ortb2.user;
+    }
+    if (options.ortb2.site) {
+      site = options.ortb2.site;
+    }
+    if (site && user) {
+      return { site, user };
+    }
+  }
+  try {
+    const configData = config.getConfig();
+    // try to fallback to global config
+    if (configData.ortb2) {
+      site = site || configData.ortb2.site;
+      user = user || configData.ortb2.user;
+    }
+  } catch (e) {}
+
+  return { site, user };
+};
+
+export const getTiming = () => {
+  // Timing API V2
+  let ttfb = 0;
+  try {
+    const entry = performance.getEntriesByType('navigation')[0];
+    ttfb = Math.round(entry.responseStart - entry.startTime);
+  } catch (e) {
+    // Timing API V1
+    try {
+      const entry = performance.timing;
+      ttfb = Math.round(entry.responseStart - entry.fetchStart);
+    } catch (e) {
+      // Timing API not available
+      return null;
+    }
+  }
+  const elapsedTime = getPerformanceNow();
+  ttfb = ttfb >= 0 && ttfb <= elapsedTime ? ttfb : 0;
+  return {
+    ttfb,
+    elapsedTime,
+  };
+};
+
+export const getPayload = (auctionIds, options) => {
+  if (!options || !auctionIds || auctionIds.length === 0) {
+    return false;
+  }
+  const consentData = gdprDataHandler.getConsentData();
+  let gdprApplies = true; // we assume gdpr applies
+  let useExtendedPayload = false;
+  if (consentData) {
+    gdprApplies = consentData.gdprApplies;
+    const consents = consentData.vendorData?.vendor?.consents || {};
+    useExtendedPayload = consents[GVLID];
+  }
+  const ortb2 = getOrtb2Data(options);
+  const ri = getRefererInfo() || {};
+
+  let payload = {
+    auctionIds: auctionIds,
+    triggerEvent: options.triggerEvent,
+    pageViewId,
+    domain: ri.domain,
+    gdprApplies,
+    code: options.code,
+    ortb2: { site: ortb2.site },
+    pageUrl: ri.page,
+    prebidVersion: '$prebid.version$',
+    scriptVersion,
+    debug: options.debug,
+    timing: getTiming(),
+  };
+
+  if (useExtendedPayload) {
+    const device = config.getConfig('device') || {};
+    const { x, y } = getScreen();
+    const userIdsAsEids = getUserIDs();
+    payload = {
+      ...payload,
+      ortb2,
+      extended: true,
+      timestamp: Date.now(),
+      gdprConsentString: consentData.consentString,
+      timezoneOffset: new Date().getTimezoneOffset(),
+      language: window.navigator.language,
+      referrer: ri.topmostLocation,
+      pageUrl: ri.page,
+      screenWidth: x,
+      screenHeight: y,
+      deviceWidth: device.w || screen.width,
+      deviceHeight: device.h || screen.height,
+      userIdsAsEids,
+    };
+  }
+  return payload;
+};
+
+const agmaAnalytics = Object.assign(adapter({ analyticsType }), {
+  auctionIds: [],
+  timer: null,
+  track(data) {
+    const { eventType, args } = data;
+    if (eventType === this.options.triggerEvent && args && args.auctionId) {
+      this.auctionIds.push(args.auctionId);
+      if (this.timer === null) {
+        this.timer = setTimeout(() => {
+          this.processBatch();
+        }, batchDelayInMs);
+      }
+    }
+  },
+  processBatch() {
+    const currentBatch = [...this.auctionIds];
+    const payload = getPayload(currentBatch, this.options);
+    this.auctionIds = [];
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+    this.send(payload);
+  },
+  send(payload) {
+    if (!payload) {
+      return;
+    }
+    return ajax(
+      agmaURL,
+      () => {
+        logInfo(ModuleCode, 'flushed', payload);
+      },
+      JSON.stringify(payload),
+      {
+        contentType: 'text/plain',
+        method: 'POST',
+      }
+    );
+  },
+});
+
+agmaAnalytics.originEnableAnalytics = agmaAnalytics.enableAnalytics;
+agmaAnalytics.enableAnalytics = function (config = {}) {
+  const { options } = config;
+
+  if (isEmpty(options)) {
+    logError(ModuleCode, 'Please set options');
+    return false;
+  }
+
+  if (options.site && !options.code) {
+    logError(ModuleCode, 'Please set `code` - `site` is deprecated');
+    options.code = options.site;
+  }
+
+  if (!options.code || isEmptyStr(options.code)) {
+    logError(ModuleCode, 'Please set `code` option - agma Analytics is disabled');
+    return false;
+  }
+
+  agmaAnalytics.options = {
+    triggerEvent: EVENTS.AUCTION_INIT,
+    ...options,
+  };
+
+  agmaAnalytics.originEnableAnalytics(config);
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: agmaAnalytics,
+  code: ModuleCode,
+  gvlid: GVLID,
+});
+
+export default agmaAnalytics;
diff --git a/modules/agmaAnalyticsAdapter.md b/modules/agmaAnalyticsAdapter.md
new file mode 100644
index 00000000000..30c88fb92ec
--- /dev/null
+++ b/modules/agmaAnalyticsAdapter.md
@@ -0,0 +1,28 @@
+# Overview
+    Module Name: Agma Analytics
+    Module Type: Analytics Adapter
+    Maintainer: [www.agma-mmc.de](https://www.agma-mmc.de)
+    Technical Support: [info@mllrsohn.com](mailto:info@mllrsohn.com)
+
+# Description
+
+Agma Analytics adapter. Please contact [team-internet@agma-mmc.de](mailto:team-internet@agma-mmc.de) for signup and access to [futher documentation](https://docs.agma-analytics.de).
+
+# Usage
+
+Add the `agmaAnalyticsAdapter` to your build:
+
+```
+gulp build --modules=...,agmaAnalyticsAdapter...
+```
+
+Configure the analytics module:
+
+```javascript
+pbjs.enableAnalytics({
+    provider: 'agma',
+    options: {
+        code: 'provided-by-agma'    // change to the code you received from agma
+    }
+});
+```
diff --git a/modules/aidemBidAdapter.js b/modules/aidemBidAdapter.js
index c6a5cd96fb6..07aee262baa 100644
--- a/modules/aidemBidAdapter.js
+++ b/modules/aidemBidAdapter.js
@@ -1,4 +1,4 @@
-import {deepAccess, deepSetValue, isBoolean, isNumber, isStr, logError, logInfo} from '../src/utils.js';
+import {deepAccess, deepClone, deepSetValue, isBoolean, isNumber, isStr, logError, logInfo} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
@@ -10,6 +10,7 @@ const BIDDER_CODE = 'aidem';
 const BASE_URL = 'https://zero.aidemsrv.com';
 const LOCAL_BASE_URL = 'http://127.0.0.1:8787';
 
+const GVLID = 1218
 const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
 const REQUIRED_VIDEO_PARAMS = [ 'mimes', 'protocols', 'context' ];
 
@@ -59,7 +60,7 @@ const converter = ortbConverter({
     const request = buildRequest(imps, bidderRequest, context);
     deepSetValue(request, 'at', 1);
     setPrebidRequestEnvironment(request);
-    deepSetValue(request, 'regs', getRegs());
+    deepSetValue(request, 'regs', getRegs(bidderRequest));
     deepSetValue(request, 'site.publisher.id', bidderRequest.bids[0].params.publisherId);
     deepSetValue(request, 'site.id', bidderRequest.bids[0].params.siteId);
     return request;
@@ -106,22 +107,22 @@ function recur(obj) {
   return result;
 }
 
-function getRegs() {
+function getRegs(bidderRequest) {
   let regs = {};
-  const consentManagement = config.getConfig('consentManagement');
+  const euConsentManagement = bidderRequest.gdprConsent;
+  const usConsentManagement = bidderRequest.uspConsent;
   const coppa = config.getConfig('coppa');
-  if (consentManagement && !!(consentManagement.gdpr)) {
-    deepSetValue(regs, 'gdpr_applies', !!consentManagement.gdpr);
+  if (euConsentManagement && euConsentManagement.consentString) {
+    deepSetValue(regs, 'gdpr_applies', !!euConsentManagement.consentString);
   } else {
     deepSetValue(regs, 'gdpr_applies', false);
   }
-  if (consentManagement && deepAccess(consentManagement, 'usp.cmpApi') === 'static') {
-    deepSetValue(regs, 'usp_applies', !!deepAccess(consentManagement, 'usp'));
-    deepSetValue(regs, 'us_privacy', deepAccess(consentManagement, 'usp.consentData.getUSPData.uspString'));
+  if (usConsentManagement) {
+    deepSetValue(regs, 'usp_applies', true);
+    deepSetValue(regs, 'us_privacy', bidderRequest.uspConsent);
   } else {
     deepSetValue(regs, 'usp_applies', false);
   }
-
   if (isBoolean(coppa)) {
     deepSetValue(regs, 'coppa_applies', !!coppa);
   } else {
@@ -132,7 +133,7 @@ function getRegs() {
 }
 
 function setPrebidRequestEnvironment(payload) {
-  const __navigator = JSON.parse(JSON.stringify(recur(navigator)));
+  const __navigator = deepClone(recur(navigator));
   delete __navigator.plugins;
   deepSetValue(payload, 'environment.ri', getRefererInfo());
   deepSetValue(payload, 'environment.hl', window.history.length);
@@ -232,6 +233,7 @@ function hasValidParameters(bidRequest) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
   isBidRequestValid: function(bidRequest) {
     logInfo('bid: ', bidRequest);
diff --git a/modules/airgridRtdProvider.js b/modules/airgridRtdProvider.js
index 7c6cf1f5de0..300744d62fe 100644
--- a/modules/airgridRtdProvider.js
+++ b/modules/airgridRtdProvider.js
@@ -11,6 +11,10 @@ import {getStorageManager} from '../src/storageManager.js';
 import {loadExternalScript} from '../src/adloader.js';
 import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const MODULE_NAME = 'realTimeData';
 const SUBMODULE_NAME = 'airgrid';
 const AG_TCF_ID = 782;
@@ -39,7 +43,7 @@ export function attachScriptTagToDOM(rtdConfig) {
     edktInitializor.apiKey = rtdConfig.params.apiKey;
     edktInitializor.invoked = true;
     const moduleSrc = getModuleUrl(rtdConfig.params.accountId);
-    loadExternalScript(moduleSrc, SUBMODULE_NAME);
+    loadExternalScript(moduleSrc, MODULE_TYPE_RTD, SUBMODULE_NAME);
   }
 }
 
@@ -101,7 +105,7 @@ function init(rtdConfig, userConsent) {
 
 /**
  * Real-time data retrieval from AirGrid
- * @param {Object} reqBidsConfigObj
+ * @param {Object} bidConfig
  * @param {function} onDone
  * @param {Object} rtdConfig
  * @param {Object} userConsent
diff --git a/modules/ajaBidAdapter.js b/modules/ajaBidAdapter.js
index 9049197e565..699dfd6fa04 100644
--- a/modules/ajaBidAdapter.js
+++ b/modules/ajaBidAdapter.js
@@ -1,9 +1,13 @@
-import {createTrackPixelHtml, logError, logWarn, deepAccess, getBidIdParameter} from '../src/utils.js';
-import { Renderer } from '../src/Renderer.js';
+import {createTrackPixelHtml, logError, getBidIdParameter} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { VIDEO, BANNER, NATIVE } from '../src/mediaTypes.js';
+import { BANNER } from '../src/mediaTypes.js';
 import {tryAppendQueryString} from '../libraries/urlUtils/urlUtils.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ */
+
 const BidderCode = 'aja';
 const URL = 'https://ad.as.amanad.adtdp.com/v2/prebid';
 const SDKType = 5;
@@ -25,7 +29,7 @@ const BannerSizeMap = {
 
 export const spec = {
   code: BidderCode,
-  supportedMediaTypes: [VIDEO, BANNER, NATIVE],
+  supportedMediaTypes: [BANNER],
 
   /**
    * Determines whether or not the given bid has all the params needed to make a valid request.
@@ -51,32 +55,22 @@ export const spec = {
 
     for (let i = 0, len = validBidRequests.length; i < len; i++) {
       const bidRequest = validBidRequests[i];
+
       let queryString = '';
 
       const asi = getBidIdParameter('asi', bidRequest.params);
       queryString = tryAppendQueryString(queryString, 'asi', asi);
       queryString = tryAppendQueryString(queryString, 'skt', SDKType);
+      queryString = tryAppendQueryString(queryString, 'gpid', bidRequest.ortb2Imp?.ext?.gpid)
       queryString = tryAppendQueryString(queryString, 'tid', bidRequest.ortb2Imp?.ext?.tid)
+      queryString = tryAppendQueryString(queryString, 'cdep', bidRequest.ortb2?.device?.ext?.cdep)
       queryString = tryAppendQueryString(queryString, 'prebid_id', bidRequest.bidId);
       queryString = tryAppendQueryString(queryString, 'prebid_ver', '$prebid.version$');
+      queryString = tryAppendQueryString(queryString, 'page_url', pageUrl);
+      queryString = tryAppendQueryString(queryString, 'schain', spec.serializeSupplyChain(bidRequest.schain || []))
 
-      if (pageUrl) {
-        queryString = tryAppendQueryString(queryString, 'page_url', pageUrl);
-      }
-
-      const banner = deepAccess(bidRequest, `mediaTypes.${BANNER}`)
-      if (banner) {
-        const adFormatIDs = [];
-        for (const size of banner.sizes || []) {
-          if (size.length !== 2) {
-            continue
-          }
-
-          const adFormatID = BannerSizeMap[`${size[0]}x${size[1]}`];
-          if (adFormatID) {
-            adFormatIDs.push(adFormatID);
-          }
-        }
+      const adFormatIDs = pickAdFormats(bidRequest)
+      if (adFormatIDs && adFormatIDs.length > 0) {
         queryString = tryAppendQueryString(queryString, 'ad_format_ids', adFormatIDs.join(','));
       }
 
@@ -87,7 +81,7 @@ export const spec = {
         }));
       }
 
-      const sua = deepAccess(bidRequest, 'ortb2.device.sua');
+      const sua = bidRequest.ortb2?.device?.sua
       if (sua) {
         queryString = tryAppendQueryString(queryString, 'sua', JSON.stringify(sua));
       }
@@ -110,9 +104,17 @@ export const spec = {
     }
 
     const ad = bidderResponseBody.ad;
+    if (AdType.Banner !== ad.ad_type) {
+      return []
+    }
 
+    const bannerAd = bidderResponseBody.ad.banner;
     const bid = {
       requestId: ad.prebid_id,
+      mediaType: BANNER,
+      ad: bannerAd.tag,
+      width: bannerAd.w,
+      height: bannerAd.h,
       cpm: ad.price,
       creativeId: ad.creative_id,
       dealId: ad.deal_id,
@@ -120,80 +122,16 @@ export const spec = {
       netRevenue: true,
       ttl: 300, // 5 minutes
       meta: {
-        advertiserDomains: []
+        advertiserDomains: bannerAd.adomain,
       },
     }
-
-    if (AdType.Video === ad.ad_type) {
-      const videoAd = bidderResponseBody.ad.video;
-      Object.assign(bid, {
-        vastXml: videoAd.vtag,
-        width: videoAd.w,
-        height: videoAd.h,
-        renderer: newRenderer(bidderResponseBody),
-        adResponse: bidderResponseBody,
-        mediaType: VIDEO
-      });
-
-      Array.prototype.push.apply(bid.meta.advertiserDomains, videoAd.adomain)
-    } else if (AdType.Banner === ad.ad_type) {
-      const bannerAd = bidderResponseBody.ad.banner;
-      Object.assign(bid, {
-        width: bannerAd.w,
-        height: bannerAd.h,
-        ad: bannerAd.tag,
-        mediaType: BANNER
+    try {
+      bannerAd.imps.forEach(impTracker => {
+        const tracker = createTrackPixelHtml(impTracker);
+        bid.ad += tracker;
       });
-      try {
-        bannerAd.imps.forEach(impTracker => {
-          const tracker = createTrackPixelHtml(impTracker);
-          bid.ad += tracker;
-        });
-      } catch (error) {
-        logError('Error appending tracking pixel', error);
-      }
-
-      Array.prototype.push.apply(bid.meta.advertiserDomains, bannerAd.adomain)
-    } else if (AdType.Native === ad.ad_type) {
-      const nativeAds = ad.native.template_and_ads.ads;
-      if (nativeAds.length === 0) {
-        return [];
-      }
-
-      const nativeAd = nativeAds[0];
-      const assets = nativeAd.assets;
-
-      Object.assign(bid, {
-        mediaType: NATIVE
-      });
-
-      bid.native = {
-        title: assets.title,
-        body: assets.description,
-        cta: assets.cta_text,
-        sponsoredBy: assets.sponsor,
-        clickUrl: assets.lp_link,
-        impressionTrackers: nativeAd.imps,
-        privacyLink: assets.adchoice_url
-      };
-
-      if (assets.img_main !== undefined) {
-        bid.native.image = {
-          url: assets.img_main,
-          width: parseInt(assets.img_main_width, 10),
-          height: parseInt(assets.img_main_height, 10)
-        };
-      }
-
-      if (assets.img_icon !== undefined) {
-        bid.native.icon = {
-          url: assets.img_icon,
-          width: parseInt(assets.img_icon_width, 10),
-          height: parseInt(assets.img_icon_height, 10)
-        };
-      }
-
-      Array.prototype.push.apply(bid.meta.advertiserDomains, nativeAd.adomain)
+    } catch (error) {
+      logError('Error appending tracking pixel', error);
     }
 
     return [bid];
@@ -227,36 +165,50 @@ export const spec = {
 
     return syncs;
   },
-}
 
-function newRenderer(bidderResponse) {
-  const renderer = Renderer.install({
-    id: bidderResponse.ad.prebid_id,
-    url: bidderResponse.ad.video.purl,
-    loaded: false,
-  });
+  /**
+   * Serialize supply chain object
+   * @param {Object} supplyChain
+   * @returns {String | undefined}
+   */
+  serializeSupplyChain: function(supplyChain) {
+    if (!supplyChain || !supplyChain.nodes) return undefined
+    const { ver, complete, nodes } = supplyChain
+    return `${ver},${complete}!${spec.serializeSupplyChainNodes(nodes)}`
+  },
 
-  try {
-    renderer.setRender(outstreamRender);
-  } catch (err) {
-    logWarn('Prebid Error calling setRender on newRenderer', err);
+  /**
+   * Serialize each supply chain nodes
+   * @param {Array} nodes
+   * @returns {String}
+   */
+  serializeSupplyChainNodes: function(nodes) {
+    const fields = ['asi', 'sid', 'hp', 'rid', 'name', 'domain']
+    return nodes.map((n) => {
+      return fields.map((f) => {
+        return encodeURIComponent(n[f] || '').replace(/!/g, '%21')
+      }).join(',')
+    }).join('!')
   }
-
-  return renderer;
 }
 
-function outstreamRender(bid) {
-  bid.renderer.push(() => {
-    window['aja_vast_player'].init({
-      vast_tag: bid.adResponse.ad.video.vtag,
-      ad_unit_code: bid.adUnitCode, // target div id to render video
-      width: bid.width,
-      height: bid.height,
-      progress: bid.adResponse.ad.video.progress,
-      loop: bid.adResponse.ad.video.loop,
-      inread: bid.adResponse.ad.video.inread
-    });
-  });
+function pickAdFormats(bidRequest) {
+  let sizes = bidRequest.sizes || []
+  sizes.push(...(bidRequest.mediaTypes?.banner?.sizes || []))
+
+  const adFormatIDs = [];
+  for (const size of sizes) {
+    if (size.length !== 2) {
+      continue
+    }
+
+    const adFormatID = BannerSizeMap[`${size[0]}x${size[1]}`];
+    if (adFormatID) {
+      adFormatIDs.push(adFormatID);
+    }
+  }
+
+  return [...new Set(adFormatIDs)]
 }
 
 registerBidder(spec);
diff --git a/modules/ajaBidAdapter.md b/modules/ajaBidAdapter.md
index 66155875f4d..92ffecaeb9f 100644
--- a/modules/ajaBidAdapter.md
+++ b/modules/ajaBidAdapter.md
@@ -8,7 +8,7 @@ Maintainer: ssp_support@aja-kk.co.jp
 
 # Description
 Connects to Aja exchange for bids.
-Aja bid adapter supports Banner and Outstream Video.
+Aja bid adapter supports Banner.
 
 # Test Parameters
 ```js
@@ -29,64 +29,6 @@ var adUnits = [
         asi: 'tk82gbLmg'
       }
     }]
-  },
-  // Video outstream adUnit
-  {
-    code: 'prebid_video',
-    mediaTypes: {
-      video: {
-        context: 'outstream',
-        playerSize: [300, 250]
-      }
-    },
-    bids: [{
-      bidder: 'aja',
-      params: {
-        asi: '1-KwEG_iR'
-      }
-    }]
-  },
-  // Native adUnit
-  {
-    code: 'prebid_native',
-    mediaTypes: {
-      native: {
-        image: {
-          required: true,
-          sendId: false
-        },
-        title: {
-          required: true,
-          sendId: true
-        },
-        sponsoredBy: {
-          required: false,
-          sendId: true
-        },
-        clickUrl: {
-          required: false,
-          sendId: true
-        },
-        body: {
-          required: false,
-          sendId: true
-        },
-        icon: {
-          required: false,
-          sendId: false
-        },
-        privacyLink: {
-          required: true,
-          sendId: true
-        },
-      }
-    },
-    bids: [{
-      bidder: 'aja',
-      params: {
-        asi: 'qxueUGliR'
-      }
-    }]
   }
 ];
 ```
diff --git a/modules/akamaiDapRtdProvider.js b/modules/akamaiDapRtdProvider.js
index f0bb7eb3a6c..e5a647a90ef 100644
--- a/modules/akamaiDapRtdProvider.js
+++ b/modules/akamaiDapRtdProvider.js
@@ -5,799 +5,23 @@
  * @module modules/akamaiDapRtdProvider
  * @requires module:modules/realTimeData
  */
-import {ajax} from '../src/ajax.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {submodule} from '../src/hook.js';
-import {isPlainObject, mergeDeep, logMessage, logInfo, logError} from '../src/utils.js';
-import { loadExternalScript } from '../src/adloader.js';
-import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
 
-const MODULE_NAME = 'realTimeData';
-const SUBMODULE_NAME = 'dap';
-const MODULE_CODE = 'akamaidap';
-
-export const DAP_TOKEN = 'async_dap_token';
-export const DAP_MEMBERSHIP = 'async_dap_membership';
-export const DAP_ENCRYPTED_MEMBERSHIP = 'encrypted_dap_membership';
-export const DAP_SS_ID = 'dap_ss_id';
-export const DAP_DEFAULT_TOKEN_TTL = 3600; // in seconds
-export const DAP_MAX_RETRY_TOKENIZE = 1;
-export const DAP_CLIENT_ENTROPY = 'dap_client_entropy'
-
-export const storage = getStorageManager({moduleType: MODULE_TYPE_RTD, moduleName: SUBMODULE_NAME});
-let dapRetryTokenize = 0;
-
-/**
- * Lazy merge objects.
- * @param {String} target
- * @param {String} source
- */
-function mergeLazy(target, source) {
-  if (!isPlainObject(target)) {
-    target = {};
-  }
-  if (!isPlainObject(source)) {
-    source = {};
-  }
-  return mergeDeep(target, source);
-}
-
-/**
- * Add real-time data & merge segments.
- * @param {Object} ortb2 destionation object to merge RTD into
- * @param {Object} rtd
- * @param {Object} rtdConfig
- */
-export function addRealTimeData(ortb2, rtd) {
-  logInfo('DEBUG(addRealTimeData) - ENTER');
-  if (isPlainObject(rtd.ortb2)) {
-    logMessage('DEBUG(addRealTimeData): merging original: ', ortb2);
-    logMessage('DEBUG(addRealTimeData): merging in: ', rtd.ortb2);
-    mergeLazy(ortb2, rtd.ortb2);
-  }
-  logInfo('DEBUG(addRealTimeData) - EXIT');
-}
-
-/**
- * Real-time data retrieval from Audigent
- * @param {Object} reqBidsConfigObj
- * @param {function} onDone
- * @param {Object} rtdConfig
- * @param {Object} userConsent
- */
-export function getRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
-  let entropyDict = JSON.parse(storage.getDataFromLocalStorage(DAP_CLIENT_ENTROPY));
-  let loadScriptPromise = new Promise((resolve, reject) => {
-    if (rtdConfig && rtdConfig.params && rtdConfig.params.dapEntropyTimeout && Number.isInteger(rtdConfig.params.dapEntropyTimeout)) {
-      setTimeout(reject, rtdConfig.params.dapEntropyTimeout, Error('DapEntropy script could not be loaded'));
-    }
-    if (entropyDict && entropyDict.expires_at > Math.round(Date.now() / 1000.0)) {
-      logMessage('Using cached entropy');
-      resolve();
-    } else {
-      if (typeof window.dapCalculateEntropy === 'function') {
-        window.dapCalculateEntropy(resolve, reject);
-      } else {
-        if (rtdConfig && rtdConfig.params && dapUtils.isValidHttpsUrl(rtdConfig.params.dapEntropyUrl)) {
-          loadExternalScript(rtdConfig.params.dapEntropyUrl, MODULE_CODE, () => { dapUtils.dapGetEntropy(resolve, reject) });
-        } else {
-          reject(Error('Please check if dapEntropyUrl is specified and is valid under config.params'));
-        }
-      }
-    }
-  });
-  loadScriptPromise
-    .catch((error) => {
-      logError('Entropy could not be calculated due to: ', error.message);
-    })
-    .finally(() => {
-      generateRealTimeData(bidConfig, onDone, rtdConfig, userConsent);
-    });
-}
-
-export function generateRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
-  logInfo('DEBUG(generateRealTimeData) - ENTER');
-  logMessage('  - apiHostname: ' + rtdConfig.params.apiHostname);
-  logMessage('  - apiVersion:  ' + rtdConfig.params.apiVersion);
-  dapRetryTokenize = 0;
-  var jsonData = null;
-  if (rtdConfig && isPlainObject(rtdConfig.params)) {
-    if (rtdConfig.params.segtax == 504) {
-      let encMembership = dapUtils.dapGetEncryptedMembershipFromLocalStorage();
-      if (encMembership) {
-        jsonData = dapUtils.dapGetEncryptedRtdObj(encMembership, rtdConfig.params.segtax)
-      }
-    } else {
-      let membership = dapUtils.dapGetMembershipFromLocalStorage();
-      if (membership) {
-        jsonData = dapUtils.dapGetRtdObj(membership, rtdConfig.params.segtax)
-      }
-    }
-  }
-  if (jsonData) {
-    if (jsonData.rtd) {
-      addRealTimeData(bidConfig.ortb2Fragments?.global, jsonData.rtd);
-      onDone();
-      logInfo('DEBUG(generateRealTimeData) - 1');
-      // Don't return - ensure the data is always fresh.
-    }
-  }
-  // Calling setTimeout to release the main thread so that the bid request could be sent.
-  setTimeout(dapUtils.callDapAPIs, 0, bidConfig, onDone, rtdConfig, userConsent);
-}
-
-/**
- * Module init
- * @param {Object} provider
- * @param {Object} userConsent
- * @return {boolean}
- */
-function init(provider, userConsent) {
-  if (dapUtils.checkConsent(userConsent) === false) {
-    return false;
-  }
-  return true;
-}
-
-/** @type {RtdSubmodule} */
-export const akamaiDapRtdSubmodule = {
-  name: SUBMODULE_NAME,
-  getBidRequestData: getRealTimeData,
-  init: init
-};
-
-submodule(MODULE_NAME, akamaiDapRtdSubmodule);
-export const dapUtils = {
-
-  callDapAPIs: function(bidConfig, onDone, rtdConfig, userConsent) {
-    if (rtdConfig && isPlainObject(rtdConfig.params)) {
-      let config = {
-        api_hostname: rtdConfig.params.apiHostname,
-        api_version: rtdConfig.params.apiVersion,
-        domain: rtdConfig.params.domain,
-        segtax: rtdConfig.params.segtax,
-        identity: {type: rtdConfig.params.identityType}
-      };
-      let refreshMembership = true;
-      let token = dapUtils.dapGetTokenFromLocalStorage();
-      const ortb2 = bidConfig.ortb2Fragments.global;
-      logMessage('token is: ', token);
-      if (token !== null) { // If token is not null then check the membership in storage and add the RTD object
-        if (config.segtax == 504) { // Follow the encrypted membership path
-          dapUtils.dapRefreshEncryptedMembership(ortb2, config, token, onDone) // Get the encrypted membership from server
-          refreshMembership = false;
-        } else {
-          dapUtils.dapRefreshMembership(ortb2, config, token, onDone) // Get the membership from server
-          refreshMembership = false;
-        }
-      }
-      dapUtils.dapRefreshToken(ortb2, config, refreshMembership, onDone) // Refresh Token and membership in all the cases
-    }
-  },
-  dapGetEntropy: function(resolve, reject) {
-    if (typeof window.dapCalculateEntropy === 'function') {
-      window.dapCalculateEntropy(resolve, reject);
-    } else {
-      reject(Error('window.dapCalculateEntropy function is not defined'))
-    }
-  },
-
-  dapGetTokenFromLocalStorage: function(ttl) {
-    let now = Math.round(Date.now() / 1000.0); // in seconds
-    let token = null;
-    let item = JSON.parse(storage.getDataFromLocalStorage(DAP_TOKEN));
-    if (item) {
-      if (now < item.expires_at) {
-        token = item.token;
-      }
-    }
-    return token;
-  },
-
-  dapRefreshToken: function(ortb2, config, refreshMembership, onDone) {
-    dapUtils.dapLog('Token missing or expired, fetching a new one...');
-    // Trigger a refresh
-    let now = Math.round(Date.now() / 1000.0); // in seconds
-    let item = {}
-    let configAsync = {...config};
-    dapUtils.dapTokenize(configAsync, config.identity, onDone,
-      function(token, status, xhr, onDone) {
-        item.expires_at = now + DAP_DEFAULT_TOKEN_TTL;
-        let exp = dapUtils.dapExtractExpiryFromToken(token);
-        if (typeof exp == 'number') {
-          item.expires_at = exp - 10;
-        }
-        item.token = token;
-        storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(item));
-        dapUtils.dapLog('Successfully updated and stored token; expires at ' + item.expires_at);
-        let dapSSID = xhr.getResponseHeader('Akamai-DAP-SS-ID');
-        if (dapSSID) {
-          storage.setDataInLocalStorage(DAP_SS_ID, JSON.stringify(dapSSID));
-        }
-        let deviceId100 = xhr.getResponseHeader('Akamai-DAP-100');
-        if (deviceId100 != null) {
-          storage.setDataInLocalStorage('dap_deviceId100', deviceId100);
-          dapUtils.dapLog('Successfully stored DAP 100 Device ID: ' + deviceId100);
-        }
-        if (refreshMembership) {
-          if (config.segtax == 504) {
-            dapUtils.dapRefreshEncryptedMembership(ortb2, config, token, onDone);
-          } else {
-            dapUtils.dapRefreshMembership(ortb2, config, token, onDone);
-          }
-        }
-      },
-      function(xhr, status, error, onDone) {
-        logError('ERROR(' + error + '): failed to retrieve token! ' + status);
-        onDone()
-      }
-    );
-  },
-
-  dapGetMembershipFromLocalStorage: function() {
-    let now = Math.round(Date.now() / 1000.0); // in seconds
-    let membership = null;
-    let item = JSON.parse(storage.getDataFromLocalStorage(DAP_MEMBERSHIP));
-    if (item) {
-      if (now < item.expires_at) {
-        membership = {
-          said: item.said,
-          cohorts: item.cohorts,
-          attributes: null
-        };
-      }
-    }
-    return membership;
-  },
-
-  dapRefreshMembership: function(ortb2, config, token, onDone) {
-    let now = Math.round(Date.now() / 1000.0); // in seconds
-    let item = {}
-    let configAsync = {...config};
-    dapUtils.dapMembership(configAsync, token, onDone,
-      function(membership, status, xhr, onDone) {
-        item.expires_at = now + DAP_DEFAULT_TOKEN_TTL;
-        let exp = dapUtils.dapExtractExpiryFromToken(membership.said)
-        if (typeof exp == 'number') {
-          item.expires_at = exp - 10;
-        }
-        item.said = membership.said;
-        item.cohorts = membership.cohorts;
-        storage.setDataInLocalStorage(DAP_MEMBERSHIP, JSON.stringify(item));
-        dapUtils.dapLog('Successfully updated and stored membership:');
-        dapUtils.dapLog(item);
-
-        let data = dapUtils.dapGetRtdObj(item, config.segtax)
-        dapUtils.checkAndAddRealtimeData(ortb2, data, config.segtax);
-        onDone();
-      },
-      function(xhr, status, error, onDone) {
-        logError('ERROR(' + error + '): failed to retrieve membership! ' + status);
-        if (status == 403 && dapRetryTokenize < DAP_MAX_RETRY_TOKENIZE) {
-          dapRetryTokenize++;
-          dapUtils.dapRefreshToken(ortb2, config, true, onDone);
-        } else {
-          onDone();
-        }
-      }
-    );
-  },
-
-  dapGetEncryptedMembershipFromLocalStorage: function() {
-    let now = Math.round(Date.now() / 1000.0); // in seconds
-    let encMembership = null;
-    let item = JSON.parse(storage.getDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP));
-    if (item) {
-      if (now < item.expires_at) {
-        encMembership = {
-          encryptedSegments: item.encryptedSegments
-        };
-      }
-    }
-    return encMembership;
-  },
-
-  dapRefreshEncryptedMembership: function(ortb2, config, token, onDone) {
-    let now = Math.round(Date.now() / 1000.0); // in seconds
-    let item = {};
-    let configAsync = {...config};
-    dapUtils.dapEncryptedMembership(configAsync, token, onDone,
-      function(encToken, status, xhr, onDone) {
-        item.expires_at = now + DAP_DEFAULT_TOKEN_TTL;
-        let exp = dapUtils.dapExtractExpiryFromToken(encToken);
-        if (typeof exp == 'number') {
-          item.expires_at = exp - 10;
-        }
-        item.encryptedSegments = encToken;
-        storage.setDataInLocalStorage(DAP_ENCRYPTED_MEMBERSHIP, JSON.stringify(item));
-        dapUtils.dapLog('Successfully updated and stored encrypted membership:');
-        dapUtils.dapLog(item);
-
-        let encData = dapUtils.dapGetEncryptedRtdObj(item, config.segtax);
-        dapUtils.checkAndAddRealtimeData(ortb2, encData, config.segtax);
-        onDone();
-      },
-      function(xhr, status, error, onDone) {
-        logError('ERROR(' + error + '): failed to retrieve encrypted membership! ' + status);
-        if (status == 403 && dapRetryTokenize < DAP_MAX_RETRY_TOKENIZE) {
-          dapRetryTokenize++;
-          dapUtils.dapRefreshToken(ortb2, config, true, onDone);
-        } else {
-          onDone();
-        }
-      }
-    );
-  },
-
-  /**
-   * DESCRIPTION
-   * Extract expiry value from a token
-   */
-  dapExtractExpiryFromToken: function(token) {
-    let exp = null;
-    if (token) {
-      const tokenArray = token.split('..');
-      if (tokenArray && tokenArray.length > 0) {
-        let decode = atob(tokenArray[0])
-        let header = JSON.parse(decode.replace(/"/g, '"'));
-        exp = header.exp;
-      }
-    }
-    return exp
-  },
-
-  /**
-   * DESCRIPTION
-   *
-   *  Convert a DAP membership response to an OpenRTB2 segment object suitable
-   *  for insertion into user.data.segment or site.data.segment and add it to the rtd obj.
-   */
-  dapGetRtdObj: function(membership, segtax) {
-    let segment = {
-      name: 'dap.akamai.com',
-      ext: {
-        'segtax': segtax
-      },
-      segment: []
-    };
-    if (membership != null) {
-      for (const i of membership.cohorts) {
-        segment.segment.push({ id: i });
-      }
-    }
-    let data = {
-      rtd: {
-        ortb2: {
-          user: {
-            data: [
-              segment
-            ]
-          },
-          site: {
-            ext: {
-              data: {
-                dapSAID: membership.said
-              }
-            }
-          }
-        }
-      }
-    };
-    return data;
-  },
-
-  /**
-   * DESCRIPTION
-   *
-   *  Convert a DAP membership response to an OpenRTB2 segment object suitable
-   *  for insertion into user.data.segment or site.data.segment and add it to the rtd obj.
-   */
-  dapGetEncryptedRtdObj: function(encToken, segtax) {
-    let segment = {
-      name: 'dap.akamai.com',
-      ext: {
-        'segtax': segtax
-      },
-      segment: []
-    };
-    if (encToken != null) {
-      segment.segment.push({ id: encToken.encryptedSegments });
-    }
-    let encData = {
-      rtd: {
-        ortb2: {
-          user: {
-            data: [
-              segment
-            ]
-          }
-        }
-      }
-    };
-    return encData;
-  },
-
-  checkAndAddRealtimeData: function(ortb2, data, segtax) {
-    if (data.rtd) {
-      if (segtax == 504 && dapUtils.checkIfSegmentsAlreadyExist(ortb2, data.rtd, 504)) {
-        logMessage('DEBUG(handleInit): rtb Object already added');
-      } else {
-        addRealTimeData(ortb2, data.rtd);
-      }
-      logInfo('DEBUG(checkAndAddRealtimeData) - 1');
-    }
-  },
-
-  checkIfSegmentsAlreadyExist: function(ortb2, rtd, segtax) {
-    let segmentsExist = false
-    if (ortb2.user && ortb2.user.data && ortb2.user.data.length > 0) {
-      for (let i = 0; i < ortb2.user.data.length; i++) {
-        let element = ortb2.user.data[i]
-        if (element.ext && element.ext.segtax == segtax) {
-          segmentsExist = true
-          logMessage('DEBUG(checkIfSegmentsAlreadyExist): rtb Object already added: ', ortb2.user.data);
-          break;
-        }
-      }
-    }
-    return segmentsExist
-  },
-
-  dapLog: function(args) {
-    let css = '';
-    css += 'display: inline-block;';
-    css += 'color: #fff;';
-    css += 'background: #F28B20;';
-    css += 'padding: 1px 4px;';
-    css += 'border-radius: 3px';
-
-    logInfo('%cDAP Client', css, args);
-  },
-
-  isValidHttpsUrl: function(urlString) {
-    let url;
-    try {
-      url = new URL(urlString);
-    } catch (_) {
-      return false;
-    }
-    return url.protocol === 'https:';
-  },
-
-  checkConsent: function(userConsent) {
-    let consent = true;
-
-    if (userConsent && userConsent.gdpr && userConsent.gdpr.gdprApplies) {
-      const gdpr = userConsent.gdpr;
-      const hasGdpr = (gdpr && typeof gdpr.gdprApplies === 'boolean' && gdpr.gdprApplies) ? 1 : 0;
-      const gdprConsentString = hasGdpr ? gdpr.consentString : '';
-      if (hasGdpr && (!gdprConsentString || gdprConsentString === '')) {
-        logError('akamaiDapRtd submodule requires consent string to call API');
-        consent = false;
-      }
-    } else if (userConsent && userConsent.usp) {
-      const usp = userConsent.usp;
-      consent = usp[1] !== 'N' && usp[2] !== 'Y';
-    }
-
-    return consent;
-  },
-
-  /*******************************************************************************
-   *
-   * V2 (And Beyond) API
-   *
-   ******************************************************************************/
-
-  /**
-   * SYNOPSIS
-   *
-   *  dapTokenize( config, identity );
-   *
-   * DESCRIPTION
-   *
-   *  Tokenize an identity into a secure, privacy safe pseudonymiziation.
-   *
-   * PARAMETERS
-   *
-   *  config: an array of system configuration parameters
-   *
-   *  identity: an array of identity parameters passed to the tokenizing system
-   *
-   * EXAMPLE
-   *
-   *  config = {
-   *      api_hostname:   "prebid.dap.akadns.net", // required
-   *      domain:         "prebid.org",            // required
-   *      api_version:    "x1",             // optional, default "x1"
-   *      };
-   *
-   *  token = null;
-   *  identity_email = {
-   *      type:           "email",
-   *      identity:       "obiwan@jedi.com"
-   *      attributes:     { cohorts: [ "100:1641013200", "101:1641013200", "102":3:1641013200" ] },
-   *      };
-   *  dap_x1_tokenize( config, identity_email,
-   *      function( response, status, xhr ) { token = response; },
-   *      function( xhr, status, error ) { ; } // handle error
-   *
-   *  token = null;
-   *  identity_signature = { type: "signature:1.0.0" };
-   *  dap_x1_tokenize( config, identity_signature,
-   *      function( response, status, xhr } { token = response; },
-   *      function( xhr, status, error ) { ; } // handle error
-   */
-  dapTokenize: function(config, identity, onDone, onSuccess = null, onError = null) {
-    if (onError == null) {
-      onError = function(xhr, status, error, onDone) {};
-    }
-
-    if (config == null || typeof (config) == typeof (undefined)) {
-      onError(null, 'Invalid config object', 'ClientError', onDone);
-      return;
-    }
-
-    if (typeof (config.domain) != 'string') {
-      onError(null, 'Invalid config.domain: must be a string', 'ClientError', onDone);
-      return;
-    }
-
-    if (config.domain.length <= 0) {
-      onError(null, 'Invalid config.domain: must have non-zero length', 'ClientError', onDone);
-      return;
-    }
-
-    if (!('api_version' in config) || (typeof (config.api_version) == 'string' && config.api_version.length == 0)) {
-      config.api_version = 'x1';
-    }
-
-    if (typeof (config.api_version) != 'string') {
-      onError(null, "Invalid api_version: must be a string like 'x1', etc.", 'ClientError', onDone);
-      return;
-    }
-
-    if (!(('api_hostname') in config) || typeof (config.api_hostname) != 'string' || config.api_hostname.length == 0) {
-      onError(null, 'Invalid api_hostname: must be a non-empty string', 'ClientError', onDone);
-      return;
-    }
-
-    if (identity == null || typeof (identity) == typeof (undefined)) {
-      onError(null, 'Invalid identity object', 'ClientError', onDone);
-      return;
-    }
-
-    if (!('type' in identity) || typeof (identity.type) != 'string' || identity.type.length <= 0) {
-      onError(null, "Identity must contain a valid 'type' field", 'ClientError', onDone);
-      return;
-    }
-
-    let apiParams = {
-      'type': identity.type,
-    };
-
-    if (typeof (identity.identity) != typeof (undefined)) {
-      apiParams.identity = identity.identity;
-    }
-    if (typeof (identity.attributes) != typeof (undefined)) {
-      apiParams.attributes = identity.attributes;
-    }
-
-    let entropyDict = JSON.parse(storage.getDataFromLocalStorage(DAP_CLIENT_ENTROPY));
-    if (entropyDict && entropyDict.entropy) {
-      apiParams.entropy = entropyDict.entropy;
-    }
-
-    let method;
-    let body;
-    let path;
-    switch (config.api_version) {
-      case 'x1':
-      case 'x1-dev':
-        method = 'POST';
-        path = '/data-activation/' + config.api_version + '/domain/' + config.domain + '/identity/tokenize';
-        body = JSON.stringify(apiParams);
-        break;
-      default:
-        onError(null, 'Invalid api_version: ' + config.api_version, 'ClientError', onDone);
-        return;
-    }
-
-    let customHeaders = {'Content-Type': 'application/json'};
-    let dapSSID = JSON.parse(storage.getDataFromLocalStorage(DAP_SS_ID));
-    if (dapSSID) {
-      customHeaders['Akamai-DAP-SS-ID'] = dapSSID;
-    }
-
-    let url = 'https://' + config.api_hostname + path;
-    let cb = {
-      success: (response, request) => {
-        let token = null;
-        switch (config.api_version) {
-          case 'x1':
-          case 'x1-dev':
-            token = request.getResponseHeader('Akamai-DAP-Token');
-            break;
-        }
-        onSuccess(token, request.status, request, onDone);
-      },
-      error: (request, error) => {
-        onError(request, request.statusText, error, onDone);
-      }
-    };
-
-    ajax(url, cb, body, {
-      method: method,
-      customHeaders: customHeaders
-    });
-  },
-
-  /**
-   * SYNOPSIS
-   *
-   *  dapMembership( config, token, onSuccess, onError );
-   *
-   * DESCRIPTION
-   *
-   *  Return the audience segment membership along with a new Secure Advertising
-   *  ID for this token.
-   *
-   * PARAMETERS
-   *
-   *  config: an array of system configuration parameters
-   *
-   *  token: the token previously returned from the tokenize API
-   *
-   * EXAMPLE
-   *
-   *  config = {
-   *      api_hostname: 'api.dap.akadns.net',
-   *      };
-   *
-   *  // token from dap_tokenize
-   *
-   *  dapMembership( config, token,
-   *      function( membership, status, xhr ) {
-   *          // Run auction with membership.segments and membership.said
-   *      },
-   *      function( xhr, status, error ) {
-   *          // error
-   *      } );
-   *
-   */
-  dapMembership: function(config, token, onDone, onSuccess = null, onError = null) {
-    if (onError == null) {
-      onError = function(xhr, status, error, onDone) {};
-    }
-
-    if (config == null || typeof (config) == typeof (undefined)) {
-      onError(null, 'Invalid config object', 'ClientError', onDone);
-      return;
-    }
-
-    if (!('api_version' in config) || (typeof (config.api_version) == 'string' && config.api_version.length == 0)) {
-      config.api_version = 'x1';
-    }
-
-    if (typeof (config.api_version) != 'string') {
-      onError(null, "Invalid api_version: must be a string like 'x1', etc.", 'ClientError', onDone);
-      return;
-    }
-
-    if (!(('api_hostname') in config) || typeof (config.api_hostname) != 'string' || config.api_hostname.length == 0) {
-      onError(null, 'Invalid api_hostname: must be a non-empty string', 'ClientError', onDone);
-      return;
-    }
-
-    if (token == null || typeof (token) != 'string') {
-      onError(null, 'Invalid token: must be a non-null string', 'ClientError', onDone);
-      return;
-    }
-    let path = '/data-activation/' +
-      config.api_version +
-      '/token/' + token +
-      '/membership';
-
-    let url = 'https://' + config.api_hostname + path;
-
-    let cb = {
-      success: (response, request) => {
-        onSuccess(JSON.parse(response), request.status, request, onDone);
-      },
-      error: (error, request) => {
-        onError(request, request.status, error, onDone);
-      }
-    };
-
-    ajax(url, cb, undefined, {
-      method: 'GET',
-      customHeaders: {}
-    });
-  },
-
-  /**
-   * SYNOPSIS
-   *
-   *  dapEncryptedMembership( config, token, onSuccess, onError );
-   *
-   * DESCRIPTION
-   *
-   *  Return the audience segment membership along with a new Secure Advertising
-   *  ID for this token in encrypted format.
-   *
-   * PARAMETERS
-   *
-   *  config: an array of system configuration parameters
-   *
-   *  token: the token previously returned from the tokenize API
-   *
-   * EXAMPLE
-   *
-   *  config = {
-   *      api_hostname: 'api.dap.akadns.net',
-   *      };
-   *
-   *  // token from dap_tokenize
-   *
-   *  dapEncryptedMembership( config, token,
-   *      function( membership, status, xhr ) {
-   *          // Run auction with membership.segments and membership.said after decryption
-   *      },
-   *      function( xhr, status, error ) {
-   *          // error
-   *      } );
-   *
-   */
-  dapEncryptedMembership: function(config, token, onDone, onSuccess = null, onError = null) {
-    if (onError == null) {
-      onError = function(xhr, status, error, onDone) {};
-    }
-
-    if (config == null || typeof (config) == typeof (undefined)) {
-      onError(null, 'Invalid config object', 'ClientError', onDone);
-      return;
-    }
-
-    if (!('api_version' in config) || (typeof (config.api_version) == 'string' && config.api_version.length == 0)) {
-      config.api_version = 'x1';
-    }
-
-    if (typeof (config.api_version) != 'string') {
-      onError(null, "Invalid api_version: must be a string like 'x1', etc.", 'ClientError', onDone);
-      return;
-    }
-
-    if (!(('api_hostname') in config) || typeof (config.api_hostname) != 'string' || config.api_hostname.length == 0) {
-      onError(null, 'Invalid api_hostname: must be a non-empty string', 'ClientError', onDone);
-      return;
-    }
-
-    if (token == null || typeof (token) != 'string') {
-      onError(null, 'Invalid token: must be a non-null string', 'ClientError', onDone);
-      return;
-    }
-    let path = '/data-activation/' +
-      config.api_version +
-      '/token/' + token +
-      '/membership/encrypt';
-
-    let url = 'https://' + config.api_hostname + path;
-
-    let cb = {
-      success: (response, request) => {
-        let encToken = request.getResponseHeader('Akamai-DAP-Token');
-        onSuccess(encToken, request.status, request, onDone);
-      },
-      error: (error, request) => {
-        onError(request, request.status, error, onDone);
-      }
-    };
-    ajax(url, cb, undefined, {
-      method: 'GET',
-      customHeaders: {
-        'Content-Type': 'application/json',
-        'Pragma': 'akamai-x-get-extracted-values'
-      }
-    });
-  }
-}
+import {
+  createRtdProvider
+} from './symitriDapRtdProvider.js'/* eslint prebid/validate-imports: "off" */
+
+export const {
+  addRealTimeData,
+  getRealTimeData,
+  generateRealTimeData,
+  rtdSubmodule: akamaiDapRtdSubmodule,
+  storage,
+  dapUtils,
+  DAP_TOKEN,
+  DAP_MEMBERSHIP,
+  DAP_ENCRYPTED_MEMBERSHIP,
+  DAP_SS_ID,
+  DAP_DEFAULT_TOKEN_TTL,
+  DAP_MAX_RETRY_TOKENIZE,
+  DAP_CLIENT_ENTROPY
+} = createRtdProvider('dap', 'akamaidap', 'Akamai');
diff --git a/modules/alkimiBidAdapter.js b/modules/alkimiBidAdapter.js
index 81d993e9ac8..3bd995cc112 100644
--- a/modules/alkimiBidAdapter.js
+++ b/modules/alkimiBidAdapter.js
@@ -1,12 +1,15 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {deepAccess, deepClone, getDNT, generateUUID} from '../src/utils.js';
+import {deepAccess, deepClone, getDNT, generateUUID, replaceAuctionPrice} from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import {VIDEO} from '../src/mediaTypes.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {VIDEO, BANNER} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 
 const BIDDER_CODE = 'alkimi';
 const GVLID = 1169;
+const USER_ID_KEY = 'alkimiUserID';
 export const ENDPOINT = 'https://exchange.alkimi-onboarding.com/bid?prebid=true';
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 export const spec = {
   code: BIDDER_CODE,
@@ -43,7 +46,16 @@ export const spec = {
       bidIds.push(bidRequest.bidId)
     })
 
-    const alkimiConfig = config.getConfig('alkimi');
+    const ortb2 = bidderRequest.ortb2
+    const site = ortb2?.site
+
+    const id = getUserId()
+    const alkimiConfig = config.getConfig('alkimi')
+    const fpa = ortb2?.source?.ext?.fpa
+    const source = fpa != undefined ? { ext: { fpa } } : undefined
+    const walletID = alkimiConfig && alkimiConfig.walletID
+    const userParams = alkimiConfig && alkimiConfig.userParams
+    const user = (walletID != undefined || userParams != undefined || id != undefined) ? { id, ext: { walletID, userParams } } : undefined
 
     let payload = {
       requestId: generateUUID(),
@@ -59,12 +71,17 @@ export const spec = {
         h: screen.height
       },
       ortb2: {
+        source,
+        user,
         site: {
-          keywords: bidderRequest.ortb2?.site?.keywords
+          keywords: site?.keywords,
+          sectioncat: site?.sectioncat,
+          pagecat: site?.pagecat,
+          cat: site?.cat
         },
-        at: bidderRequest.ortb2?.at,
-        bcat: bidderRequest.ortb2?.bcat,
-        wseat: bidderRequest.ortb2?.wseat
+        at: ortb2?.at,
+        bcat: ortb2?.bcat,
+        wseat: ortb2?.wseat
       }
     }
 
@@ -105,7 +122,7 @@ export const spec = {
     }
 
     const {prebidResponse} = serverBody;
-    if (!prebidResponse || typeof prebidResponse !== 'object') {
+    if (!Array.isArray(prebidResponse)) {
       return [];
     }
 
@@ -116,7 +133,7 @@ export const spec = {
 
       // banner or video
       if (VIDEO === bid.mediaType) {
-        bid.vastXml = bid.ad;
+        bid.vastUrl = replaceAuctionPrice(bid.winUrl, bid.cpm);
       }
 
       bid.meta = {};
@@ -129,21 +146,30 @@ export const spec = {
   },
 
   onBidWon: function (bid) {
-    let winUrl;
-    if (bid.winUrl || bid.vastUrl) {
-      winUrl = bid.winUrl ? bid.winUrl : bid.vastUrl;
-      winUrl = winUrl.replace(/\$\{AUCTION_PRICE}/, bid.cpm);
-    } else if (bid.ad) {
-      let trackImg = bid.ad.match(/(?!^)/);
-      bid.ad = bid.ad.replace(trackImg[0], '');
-      winUrl = trackImg[0].split('"')[1];
-      winUrl = winUrl.replace(/\$%7BAUCTION_PRICE%7D/, bid.cpm);
-    } else {
-      return false;
+    if (BANNER == bid.mediaType && bid.winUrl) {
+      const winUrl = replaceAuctionPrice(bid.winUrl, bid.cpm);
+      ajax(winUrl, null);
+      return true;
     }
+    return false;
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
+    if (syncOptions.iframeEnabled && serverResponses.length > 0) {
+      const serverBody = serverResponses[0].body;
+      if (!serverBody || typeof serverBody !== 'object') return [];
+
+      const { iframeList } = serverBody;
+      if (!Array.isArray(iframeList)) return [];
+
+      const urls = [];
+      iframeList.forEach(url => {
+        urls.push({type: 'iframe', url});
+      })
 
-    ajax(winUrl, null);
-    return true;
+      return urls;
+    }
+    return [];
   }
 }
 
@@ -178,4 +204,15 @@ const getFormatType = bidRequest => {
   return formats
 }
 
+const getUserId = () => {
+  if (storage.localStorageIsEnabled()) {
+    let userId = storage.getDataFromLocalStorage(USER_ID_KEY)
+    if (!userId) {
+      userId = generateUUID()
+      storage.setDataInLocalStorage(USER_ID_KEY, userId)
+    }
+    return userId
+  }
+}
+
 registerBidder(spec);
diff --git a/modules/ampliffyBidAdapter.js b/modules/ampliffyBidAdapter.js
new file mode 100644
index 00000000000..e79b04ab4c4
--- /dev/null
+++ b/modules/ampliffyBidAdapter.js
@@ -0,0 +1,414 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {logError, logInfo, triggerPixel} from '../src/utils.js';
+
+const BIDDER_CODE = 'ampliffy';
+const GVLID = 1258;
+const DEFAULT_ENDPOINT = 'bidder.ampliffy.com';
+const TTL = 600; // Time-to-Live - how long (in seconds) Prebid can use this bid.
+const LOG_PREFIX = 'AmpliffyBidder: ';
+
+function isBidRequestValid(bid) {
+  logInfo(LOG_PREFIX + 'isBidRequestValid: Code: ' + bid.adUnitCode + ': Param' + JSON.stringify(bid.params), bid.adUnitCode);
+  if (bid.params) {
+    if (!bid.params.placementId || !bid.params.format) return false;
+
+    if (bid.params.format.toLowerCase() !== 'video' && bid.params.format.toLowerCase() !== 'display' && bid.params.format.toLowerCase() !== 'all') return false;
+    if (bid.params.format.toLowerCase() === 'video' && !bid.mediaTypes['video']) return false;
+    if (bid.params.format.toLowerCase() === 'display' && !bid.mediaTypes['banner']) return false;
+
+    if (!bid.params.server || bid.params.server === '') {
+      const server = bid.params.type + bid.params.region + bid.params.adnetwork;
+      if (server && server !== '') bid.params.server = server;
+      else bid.params.server = DEFAULT_ENDPOINT;
+    }
+    return true;
+  }
+  return false;
+}
+
+function manageConsentArguments(bidderRequest) {
+  let consent = null;
+  if (bidderRequest?.gdprConsent) {
+    consent = {
+      gdpr: bidderRequest.gdprConsent.gdprApplies ? '1' : '0',
+    };
+    if (bidderRequest.gdprConsent.consentString) {
+      consent.consent_string = bidderRequest.gdprConsent.consentString;
+    }
+    if (bidderRequest.gdprConsent.addtlConsent && bidderRequest.gdprConsent.addtlConsent.indexOf('~') !== -1) {
+      consent.addtl_consent = bidderRequest.gdprConsent.addtlConsent;
+    }
+  }
+  return consent;
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  const bidRequests = [];
+  for (const bidRequest of validBidRequests) {
+    for (const sizes of bidRequest.sizes) {
+      let extraParams = mergeParams(getDefaultParams(), bidRequest.params.extraParams);
+      // Apply GDPR parameters to request.
+      extraParams = mergeParams(extraParams, manageConsentArguments(bidderRequest));
+      const serverURL = getServerURL(bidRequest.params.server, sizes, bidRequest.params.placementId, extraParams);
+      logInfo(LOG_PREFIX + serverURL, 'requests');
+      extraParams.bidId = bidRequest.bidId;
+      bidRequests.push({
+        method: 'GET',
+        url: serverURL,
+        data: extraParams,
+        bidRequest,
+      });
+    }
+    logInfo(LOG_PREFIX + 'Building request from: ' + bidderRequest.url + ': ' + JSON.stringify(bidRequests), bidRequest.adUnitCode);
+  }
+  return bidRequests;
+}
+export function getDefaultParams() {
+  return {
+    ciu_szs: '1x1',
+    gdfp_req: '1',
+    env: 'vp',
+    output: 'xml_vast4',
+    unviewed_position_start: '1'
+  };
+}
+export function mergeParams(params, extraParams) {
+  if (extraParams) {
+    for (const k in extraParams) {
+      params[k] = extraParams[k];
+    }
+  }
+  return params;
+}
+export function paramsToQueryString(params) {
+  return Object.entries(params).filter(e => typeof e[1] !== 'undefined').map(e => {
+    if (e[1]) return encodeURIComponent(e[0]) + '=' + encodeURIComponent(e[1]);
+    else return encodeURIComponent(e[0]);
+  }).join('&');
+}
+const getCacheBuster = () => Math.floor(Math.random() * (9999999999 - 1000000000));
+
+// For testing purposes
+let currentUrl = null;
+export function getCurrentURL() {
+  if (!currentUrl) currentUrl = top.location.href;
+  return currentUrl;
+}
+export function setCurrentURL(url) {
+  currentUrl = url;
+}
+const getCurrentURLEncoded = () => encodeURIComponent(getCurrentURL());
+function getServerURL(server, sizes, iu, queryParams) {
+  const random = getCacheBuster();
+  const size = sizes[0] + 'x' + sizes[1];
+  let serverURL = '//' + server + '/gampad/ads';
+  queryParams.sz = size;
+  queryParams.iu = iu;
+  queryParams.url = getCurrentURL();
+  queryParams.description_url = getCurrentURL();
+  queryParams.correlator = random;
+
+  return serverURL;
+}
+function interpretResponse(serverResponse, bidRequest) {
+  const bidResponses = [];
+
+  const bidResponse = {};
+  let mediaType = 'video';
+  if (
+    bidRequest.bidRequest?.mediaTypes &&
+    !bidRequest.bidRequest.mediaTypes['video']
+  ) {
+    mediaType = 'banner';
+  }
+  bidResponse.requestId = bidRequest.bidRequest.bidId;
+  bidResponse.width = bidRequest.bidRequest?.sizes[0][0];
+  bidResponse.height = bidRequest.bidRequest?.sizes[0][1];
+  bidResponse.ttl = TTL;
+  bidResponse.creativeId = 'ampCreativeID134';
+  bidResponse.netRevenue = true;
+  bidResponse.mediaType = mediaType;
+  bidResponse.meta = {
+    advertiserDomains: [],
+  };
+  let xmlStr = serverResponse.body;
+  const xml = new window.DOMParser().parseFromString(xmlStr, 'text/xml');
+  const xmlData = parseXML(xml, bidResponse);
+  logInfo(LOG_PREFIX + 'Response from: ' + bidRequest.url + ': ' + JSON.stringify(xmlData), bidRequest.bidRequest.adUnitCode);
+  if (xmlData.cpm < 0 || !xmlData.creativeURL || !xmlData.bidUp) {
+    return [];
+  }
+  bidResponse.cpm = xmlData.cpm;
+  bidResponse.currency = xmlData.currency;
+
+  if (mediaType === 'video') {
+    logInfo(LOG_PREFIX + xmlData.creativeURL, 'requests');
+    bidResponse.vastUrl = xmlData.creativeURL;
+  } else {
+    bidResponse.adUrl = xmlData.creativeURL;
+  }
+  if (xmlData.trackingUrl) {
+    bidResponse.vastImpUrl = xmlData.trackingUrl;
+    bidResponse.trackingUrl = xmlData.trackingUrl;
+  }
+  bidResponses.push(bidResponse);
+  return bidResponses;
+}
+const replaceMacros = (txt, cpm, bid) => {
+  const size = bid.width + 'x' + bid.height;
+  txt = txt.replaceAll('%%CACHEBUSTER%%', getCacheBuster());
+  txt = txt.replaceAll('@@CACHEBUSTER@@', getCacheBuster());
+  txt = txt.replaceAll('%%REFERER%%', getCurrentURLEncoded());
+  txt = txt.replaceAll('@@REFERER@@', getCurrentURLEncoded());
+  txt = txt.replaceAll('%%REFERRER_URL_UNESC%%', getCurrentURLEncoded());
+  txt = txt.replaceAll('@@REFERRER_URL_UNESC@@', getCurrentURLEncoded());
+  txt = txt.replaceAll('%%PRICE_ESC%%', encodePrice(cpm));
+  txt = txt.replaceAll('@@PRICE_ESC@@', encodePrice(cpm));
+  txt = txt.replaceAll('%%SIZES%%', size);
+  txt = txt.replaceAll('@@SIZES@@', size);
+  return txt;
+}
+const encodePrice = (price) => {
+  price = parseFloat(price);
+  const s = 116.54;
+  const c = 1;
+  const a = 1;
+  let encodedPrice = s * Math.log10(price + a) + c;
+  encodedPrice = Math.min(200, encodedPrice);
+  encodedPrice = Math.round(Math.max(1, encodedPrice));
+
+  // Format the encoded price with leading zeros if necessary
+  const formattedEncodedPrice = encodedPrice.toString().padStart(3, '0');
+
+  // Build the encoding key
+  const encodingKey = `H--${formattedEncodedPrice}`;
+
+  return encodeURIComponent(`vch=${encodingKey}`);
+};
+
+function extractCT(xml) {
+  let ct = null;
+  try {
+    try {
+      const vastAdTagURI = xml.getElementsByTagName('VASTAdTagURI')[0]
+      if (vastAdTagURI) {
+        let url = null;
+        for (const childNode of vastAdTagURI.childNodes) {
+          if (childNode.nodeValue.trim().includes('http')) {
+            url = decodeURIComponent(childNode.nodeValue);
+          }
+        }
+        const urlParams = new URLSearchParams(url);
+        ct = urlParams.get('ct')
+      }
+    } catch (e) {
+    }
+    if (!ct) {
+      const geoExtensions = xml.querySelectorAll('Extension[type="geo"]');
+      geoExtensions.forEach((geoExtension) => {
+        const countryElement = geoExtension.querySelector('Country');
+        if (countryElement) {
+          ct = countryElement.textContent;
+        }
+      });
+    }
+  } catch (e) {}
+  return ct;
+}
+
+function extractCPM(htmlContent, ct, cpm) {
+  const cpmMapDiv = htmlContent.querySelectorAll('[cpmMap]')[0];
+  if (cpmMapDiv) {
+    let cpmMapJSON = JSON.parse(cpmMapDiv.getAttribute('cpmMap'));
+    if ((cpmMapJSON)) {
+      if (cpmMapJSON[ct]) {
+        cpm = cpmMapJSON[ct];
+      } else if (cpmMapJSON['default']) {
+        cpm = cpmMapJSON['default'];
+      }
+    }
+  }
+  return cpm;
+}
+
+function extractCurrency(htmlContent, currency) {
+  const currencyDiv = htmlContent.querySelectorAll('[cpmCurrency]')[0];
+  if (currencyDiv) {
+    const currencyValue = currencyDiv.getAttribute('cpmCurrency');
+    if (currencyValue && currencyValue !== '') {
+      currency = currencyValue;
+    }
+  }
+  return currency;
+}
+
+function extractCreativeURL(htmlContent, ct, cpm, bid) {
+  let creativeURL = null;
+  const creativeMap = htmlContent.querySelectorAll('[creativeMap]')[0];
+  if (creativeMap) {
+    const creativeMapString = creativeMap.getAttribute('creativeMap');
+
+    const creativeMapJSON = JSON.parse(creativeMapString);
+    let defaultURL = null;
+    for (const url of Object.keys(creativeMapJSON)) {
+      const geo = creativeMapJSON[url];
+      if (geo.includes(ct)) {
+        creativeURL = replaceMacros(url, cpm, bid);
+      } else if (geo.includes('default')) {
+        defaultURL = url;
+      }
+    }
+    if (!creativeURL && defaultURL) creativeURL = replaceMacros(defaultURL, cpm, bid);
+  }
+  return creativeURL;
+}
+
+function extractSyncs(htmlContent) {
+  let userSyncsJSON = null;
+  const userSyncs = htmlContent.querySelectorAll('[userSyncs]')[0];
+  if (userSyncs) {
+    const userSyncsString = userSyncs.getAttribute('userSyncs');
+
+    userSyncsJSON = JSON.parse(userSyncsString);
+  }
+  return userSyncsJSON;
+}
+
+function extractTrackingURL(htmlContent, ret) {
+  const trackingUrlDiv = htmlContent.querySelectorAll('[bidder-tracking-url]')[0];
+  if (trackingUrlDiv) {
+    const trackingUrl = trackingUrlDiv.getAttribute('bidder-tracking-url');
+    logInfo(LOG_PREFIX + 'parseXML: trackingUrl: ', trackingUrl)
+    ret.trackingUrl = trackingUrl;
+  }
+}
+
+export function parseXML(xml, bid) {
+  const ret = { cpm: 0.001, currency: 'EUR', creativeURL: null, bidUp: false };
+  const ct = extractCT(xml);
+  if (!ct) return ret;
+
+  try {
+    if (ct) {
+      const companion = xml.getElementsByTagName('Companion')[0];
+      const htmlResource = companion.getElementsByTagName('HTMLResource')[0];
+      const htmlContent = document.createElement('html');
+      htmlContent.innerHTML = htmlResource.textContent;
+
+      ret.cpm = extractCPM(htmlContent, ct, ret.cpm);
+      ret.currency = extractCurrency(htmlContent, ret.currency);
+      ret.creativeURL = extractCreativeURL(htmlContent, ct, ret.cpm, bid);
+      extractTrackingURL(htmlContent, ret);
+      ret.bidUp = isAllowedToBidUp(htmlContent, getCurrentURL());
+      ret.userSyncs = extractSyncs(htmlContent);
+    }
+  } catch (e) {
+    logError(LOG_PREFIX + 'Error parsing XML', e);
+  }
+  logInfo(LOG_PREFIX + 'parseXML RET:', ret);
+
+  return ret;
+}
+export function isAllowedToBidUp(html, currentURL) {
+  currentURL = currentURL.split('?')[0]; // Remove parameters
+  let allowedToPush = false;
+  try {
+    const domainsMap = html.querySelectorAll('[domainMap]')[0];
+    if (domainsMap) {
+      let domains = JSON.parse(domainsMap.getAttribute('domainMap'));
+      if (domains.domainMap) {
+        domains = domains.domainMap;
+      }
+      domains.forEach((d) => {
+        if (currentURL.includes(d) || d === 'all' || d === '*') allowedToPush = true;
+      })
+    } else {
+      allowedToPush = true;
+    }
+    if (allowedToPush) {
+      const excludedURL = html.querySelectorAll('[excludedURLs]')[0];
+      if (excludedURL) {
+        const excludedURLsString = domainsMap.getAttribute('excludedURLs');
+        if (excludedURLsString !== '') {
+          let excluded = JSON.parse(excludedURLsString);
+          excluded.forEach((d) => {
+            if (currentURL.includes(d)) allowedToPush = false;
+          })
+        }
+      }
+    }
+  } catch (e) {
+    logError(LOG_PREFIX + 'isAllowedToBidUp', e);
+  }
+  return allowedToPush;
+}
+
+function getSyncData(options, syncs) {
+  const ret = [];
+  if (syncs?.length) {
+    for (const sync of syncs) {
+      if (sync.type === 'syncImage' && options.pixelEnabled) {
+        ret.push({url: sync.url, type: 'image'});
+      } else if (sync.type === 'syncIframe' && options.iframeEnabled) {
+        ret.push({url: sync.url, type: 'iframe'});
+      }
+    }
+  }
+  return ret;
+}
+
+function getUserSyncs(syncOptions, serverResponses) {
+  const userSyncs = [];
+  for (const serverResponse of serverResponses) {
+    if (serverResponse.body) {
+      try {
+        const xmlStr = serverResponse.body;
+        const xml = new window.DOMParser().parseFromString(xmlStr, 'text/xml');
+        const xmlData = parseXML(xml, {});
+        if (xmlData.userSyncs) {
+          userSyncs.push(...getSyncData(syncOptions, xmlData.userSyncs));
+        }
+      } catch (e) {}
+    }
+  }
+  return userSyncs;
+}
+
+function onBidWon(bid) {
+  logInfo(`${LOG_PREFIX} WON AMPLIFFY`);
+  if (bid.trackingUrl) {
+    let url = bid.trackingUrl;
+
+    // Replace macros with URL-encoded bid parameters
+    Object.keys(bid).forEach(key => {
+      const macroKey = `%%${key.toUpperCase()}%%`;
+      const value = encodeURIComponent(JSON.stringify(bid[key]));
+      url = url.split(macroKey).join(value);
+    });
+
+    triggerPixel(url, () => {
+      logInfo(`${LOG_PREFIX} send data success`);
+    },
+    (e) => {
+      logError(`${LOG_PREFIX} send data error`, e);
+    });
+  }
+}
+function onTimeOut() {
+  logInfo(LOG_PREFIX + 'TIMEOUT');
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: ['ampliffy', 'amp', 'videoffy', 'publiffy'],
+  supportedMediaTypes: ['video', 'banner'],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs,
+  onTimeOut,
+  onBidWon,
+};
+
+registerBidder(spec);
diff --git a/modules/ampliffyBidAdapter.md b/modules/ampliffyBidAdapter.md
new file mode 100644
index 00000000000..a425d910582
--- /dev/null
+++ b/modules/ampliffyBidAdapter.md
@@ -0,0 +1,39 @@
+# Overview
+
+```
+Module Name: Ampliffy Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: bidder@ampliffy.com
+```
+
+# Description
+
+Connects to Ampliffy Ad server for bids.
+
+Ampliffy bid adapter supports Video currently, and has initial support for Banner.
+
+For more information about [Ampliffy](https://www.ampliffy.com/en/), please contact [info@ampliffy.com](info@ampliffy.com).
+
+# Sample Ad Unit: For Publishers
+```javascript
+var videoAdUnit = [
+{
+  code: 'video1',
+  mediaTypes: {
+    video: {
+      playerSize: [[640, 480]],
+      context: 'instream'
+    },
+  },
+  bids: [{
+    bidder: 'ampliffy',
+    params: {
+        server: 'bidder.ampliffy.com',
+        placementId: '1213213/example/vrutal_/',
+        format: 'video'
+    }
+  }]
+}];
+```
+
+```
diff --git a/modules/amxBidAdapter.js b/modules/amxBidAdapter.js
index a773ac70559..508c4d6a0c7 100644
--- a/modules/amxBidAdapter.js
+++ b/modules/amxBidAdapter.js
@@ -14,20 +14,31 @@ import {
 } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { fetch } from '../src/ajax.js';
 
 const BIDDER_CODE = 'amx';
 const storage = getStorageManager({ bidderCode: BIDDER_CODE });
 const SIMPLE_TLD_TEST = /\.com?\.\w{2,4}$/;
 const DEFAULT_ENDPOINT = 'https://prebid.a-mo.net/a/c';
-const VERSION = 'pba1.3.3';
+const VERSION = 'pba1.3.4';
 const VAST_RXP = /^\s*<\??(?:vast|xml)/i;
-const TRACKING_ENDPOINT = 'https://1x1.a-mo.net/hbx/';
+const TRACKING_BASE = 'https://1x1.a-mo.net/';
+const TRACKING_ENDPOINT = TRACKING_BASE + 'hbx/';
+const POST_TRACKING_ENDPOINT = TRACKING_BASE + 'e';
 const AMUID_KEY = '__amuidpb';
 
 function getLocation(request) {
   return parseUrl(request.refererInfo?.topmostLocation || window.location.href);
 }
 
+function getTimeoutSize(timeoutData) {
+  if (timeoutData.sizes == null || timeoutData.sizes.length === 0) {
+    return [0, 0];
+  }
+
+  return timeoutData.sizes[0];
+}
+
 const largestSize = (sizes, mediaTypes) => {
   const allSizes = sizes
     .concat(deepAccess(mediaTypes, `${BANNER}.sizes`, []) || [])
@@ -131,7 +142,7 @@ function getFloor(bid) {
       size: '*',
       bidRequest: bid,
     });
-    return floor.floor;
+    return floor?.floor;
   } catch (e) {
     logError('call to getFloor failed: ', e);
     return DEFAULT_MIN_FLOOR;
@@ -149,7 +160,9 @@ function convertRequest(bid) {
   const tid = deepAccess(bid, 'params.tagId');
 
   const au =
-    bid.params != null && typeof bid.params.adUnitId === 'string' && bid.params.adUnitId !== ''
+    bid.params != null &&
+      typeof bid.params.adUnitId === 'string' &&
+      bid.params.adUnitId !== ''
       ? bid.params.adUnitId
       : bid.adUnitCode;
 
@@ -202,7 +215,10 @@ function isSyncEnabled(syncConfigP, syncType) {
     return false;
   }
 
-  if (syncConfig.bidders === '*' || (isArray(syncConfig.bidders) && syncConfig.bidders.indexOf('amx') !== -1)) {
+  if (
+    syncConfig.bidders === '*' ||
+    (isArray(syncConfig.bidders) && syncConfig.bidders.indexOf('amx') !== -1)
+  ) {
     return syncConfig.filter == null || syncConfig.filter === 'include';
   }
 
@@ -219,12 +235,17 @@ function getSyncSettings() {
       d: 0,
       l: 0,
       t: 0,
-      e: true
+      e: true,
     };
   }
 
-  const settings = { d: syncConfig.syncDelay, l: syncConfig.syncsPerBidder, t: 0, e: syncConfig.syncEnabled }
-  const all = isSyncEnabled(syncConfig.filterSettings, 'all')
+  const settings = {
+    d: syncConfig.syncDelay,
+    l: syncConfig.syncsPerBidder,
+    t: 0,
+    e: syncConfig.syncEnabled,
+  };
+  const all = isSyncEnabled(syncConfig.filterSettings, 'all');
 
   if (all) {
     settings.t = SYNC_IMAGE & SYNC_IFRAME;
@@ -256,12 +277,14 @@ function getGpp(bidderRequest) {
     return bidderRequest.gppConsent;
   }
 
-  return bidderRequest?.ortb2?.regs?.gpp ?? { gppString: '', applicableSections: '' };
+  return (
+    bidderRequest?.ortb2?.regs?.gpp ?? { gppString: '', applicableSections: '' }
+  );
 }
 
 function buildReferrerInfo(bidderRequest) {
   if (bidderRequest.refererInfo == null) {
-    return { r: '', t: false, c: '', l: 0, s: [] }
+    return { r: '', t: false, c: '', l: 0, s: [] };
   }
 
   const re = bidderRequest.refererInfo;
@@ -272,7 +295,7 @@ function buildReferrerInfo(bidderRequest) {
     l: re.numIframes,
     s: re.stack,
     c: re.canonicalUrl,
-  }
+  };
 }
 
 const isTrue = (boolValue) =>
@@ -358,28 +381,35 @@ export const spec = {
     return {
       data: payload,
       method: 'POST',
+      browsingTopics: true,
       url: deepAccess(bidRequests[0], 'params.endpoint', DEFAULT_ENDPOINT),
       withCredentials: true,
     };
   },
 
-  getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) {
+  getUserSyncs(
+    syncOptions,
+    serverResponses,
+    gdprConsent,
+    uspConsent,
+    gppConsent
+  ) {
     const qp = {
       gdpr_consent: enc(gdprConsent?.consentString || ''),
       gdpr: enc(gdprConsent?.gdprApplies ? 1 : 0),
       us_privacy: enc(uspConsent || ''),
       gpp: enc(gppConsent?.gppString || ''),
-      gpp_sid: enc(gppConsent?.applicableSections || '')
+      gpp_sid: enc(gppConsent?.applicableSections || ''),
     };
 
     const iframeSync = {
       url: `https://prebid.a-mo.net/isyn?${formatQS(qp)}`,
-      type: 'iframe'
+      type: 'iframe',
     };
 
     if (serverResponses == null || serverResponses.length === 0) {
       if (syncOptions.iframeEnabled) {
-        return [iframeSync]
+        return [iframeSync];
       }
 
       return [];
@@ -394,7 +424,10 @@ export const spec = {
           const pixelType =
             syncPixel.indexOf('__st=iframe') !== -1 ? 'iframe' : 'image';
           if (syncOptions.iframeEnabled || pixelType === 'image') {
-            hasFrame = hasFrame || (pixelType === 'iframe') || (syncPixel.indexOf('cchain') !== -1)
+            hasFrame =
+              hasFrame ||
+              pixelType === 'iframe' ||
+              syncPixel.indexOf('cchain') !== -1;
             output.push({
               url: syncPixel,
               type: pixelType,
@@ -405,7 +438,7 @@ export const spec = {
     });
 
     if (!hasFrame && output.length < 2) {
-      output.push(iframeSync)
+      output.push(iframeSync);
     }
 
     return output;
@@ -421,6 +454,10 @@ export const spec = {
       setUIDSafe(response.am);
     }
 
+    const bidderSettings = config.getConfig('bidderSettings');
+    const settings = bidderSettings?.amx ?? bidderSettings?.standard ?? {};
+    const allowAlternateBidderCodes = !!settings.allowAlternateBidderCodes;
+
     return flatMap(Object.keys(response.r), (bidID) => {
       return flatMap(response.r[bidID], (siteBid) =>
         siteBid.b.map((bid) => {
@@ -433,8 +470,10 @@ export const spec = {
 
           const size = resolveSize(bid, request.data, bidID);
           const defaultExpiration = mediaType === BANNER ? 240 : 300;
+          const { bc: bidderCode, ds: demandSource } = bid.ext ?? {};
 
           return {
+            ...(bidderCode != null && allowAlternateBidderCodes ? { bidderCode } : {}),
             requestId: bidID,
             cpm: bid.price,
             width: size[0],
@@ -446,6 +485,7 @@ export const spec = {
             meta: {
               advertiserDomains: bid.adomain,
               mediaType,
+              ...(demandSource != null ? { demandSource } : {}),
             },
             mediaType,
             ttl: typeof bid.exp === 'number' ? bid.exp : defaultExpiration,
@@ -470,19 +510,58 @@ export const spec = {
       aud: targetingData.requestId,
       a: targetingData.adUnitCode,
       c2: nestedQs(targetingData.adserverTargeting),
+      cn3: targetingData.timeToRespond,
     });
   },
 
   onTimeout(timeoutData) {
-    if (timeoutData == null) {
+    if (timeoutData == null || !timeoutData.length) {
       return;
     }
 
-    trackEvent('pbto', {
-      A: timeoutData.bidder,
-      bid: timeoutData.bidId,
-      a: timeoutData.adUnitCode,
-      cn: timeoutData.timeout,
+    let common = null;
+    const events = timeoutData.map((timeout) => {
+      const params = timeout.params || {};
+      const size = getTimeoutSize(timeout);
+      const { domain, page, ref } =
+        timeout.ortb2 != null && timeout.ortb2.site != null
+          ? timeout.ortb2.site
+          : {};
+
+      if (common == null) {
+        common = {
+          do: domain,
+          u: page,
+          U: getUIDSafe(),
+          re: ref,
+          V: '$prebid.version$',
+          vg: '$$PREBID_GLOBAL$$',
+        };
+      }
+
+      return {
+        A: timeout.bidder,
+        mid: params.tagId,
+        a: params.adunitId || timeout.adUnitCode,
+        bid: timeout.bidId,
+        n: 'g_pbto',
+        aud: timeout.transactionId,
+        w: size[0],
+        h: size[1],
+        cn: timeout.timeout,
+        cn2: timeout.bidderRequestsCount,
+        cn3: timeout.bidderWinsCount,
+      };
+    });
+
+    const payload = JSON.stringify({ c: common, e: events });
+    fetch(POST_TRACKING_ENDPOINT, {
+      body: payload,
+      keepalive: true,
+      withCredentials: true,
+      method: 'POST'
+    }).catch((_e) => {
+      // do nothing; ignore errors
     });
   },
 
diff --git a/modules/anPspParamsConverter.js b/modules/anPspParamsConverter.js
new file mode 100644
index 00000000000..27b90168476
--- /dev/null
+++ b/modules/anPspParamsConverter.js
@@ -0,0 +1,128 @@
+/*
+- register a hook function on the makeBidRequests hook (after the main function ran)
+
+- this hook function will:
+1. verify s2sconfig is defined and we (or our aliases) are included to the config
+2. filter bidRequests that match to our bidderName or any registered aliases
+3. for each request, read the bidderRequests.bids[].params to modify the keys/values
+  a. in particular change the keywords structure, apply underscore casing for keys, adjust use_payment_rule name, and convert certain values' types
+  b. will import some functions from the anKeywords library, but ideally should be kept separate to avoid including this code when it's not needed (strict client-side setups) and avoid the rest of the appnexus adapter's need for inclusion for those strictly server-side setups.
+*/
+
+// import { CONSTANTS } from '../src/cons tants.js';
+import {isArray, isPlainObject, isStr} from '../src/utils.js';
+import {getHook} from '../src/hook.js';
+import {config} from '../src/config.js';
+import {convertCamelToUnderscore, appnexusAliases} from '../libraries/appnexusUtils/anUtils.js';
+import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
+import adapterManager from '../src/adapterManager.js';
+
+// keywords: { 'genre': ['rock', 'pop'], 'pets': ['dog'] } goes to 'genre=rock,genre=pop,pets=dog'
+function convertKeywordsToString(keywords) {
+  let result = '';
+  Object.keys(keywords).forEach(key => {
+    // if 'text' or ''
+    if (isStr(keywords[key])) {
+      if (keywords[key] !== '') {
+        result += `${key}=${keywords[key]},`
+      } else {
+        result += `${key},`;
+      }
+    } else if (isArray(keywords[key])) {
+      if (keywords[key][0] === '') {
+        result += `${key},`
+      } else {
+        keywords[key].forEach(val => {
+          result += `${key}=${val},`
+        });
+      }
+    }
+  });
+
+  // remove last trailing comma
+  result = result.substring(0, result.length - 1);
+  return result;
+}
+
+function digForAppNexusBidder(s2sConfig) {
+  let result = false;
+  // check for plain setup
+  if (s2sConfig?.bidders?.includes('appnexus')) result = true;
+
+  // registered aliases
+  const aliasList = appnexusAliases.map(aliasObj => (aliasObj.code));
+  if (!result && s2sConfig?.bidders?.filter(s2sBidder => aliasList.includes(s2sBidder)).length > 0) result = true;
+
+  // pbjs.aliasBidder
+  if (!result) {
+    result = !!(s2sConfig?.bidders?.find(bidder => (adapterManager.resolveAlias(bidder) === 'appnexus')));
+  }
+
+  return result;
+}
+
+// need a separate check b/c we're checking a specific bidRequest to see if we modify it, not just that we have a server-side bidder somewhere in prebid.js
+// function isThisOurBidderInDisguise(tarBidder, s2sConfig) {
+//   if (tarBidder === 'appnexus') return true;
+
+//   if (isPlainObject(s2sConfig?.extPrebid?.aliases) && !!(Object.entries(s2sConfig?.extPrebid?.aliases).find((pair) => (pair[0] === tarBidder && pair[1] === 'appnexus')))) return true;
+
+//   if (appnexusAliases.map(aliasObj => (aliasObj.code)).includes(tarBidder)) return true;
+
+//   if (adapterManager.resolveAlias(tarBidder) === 'appnexus') return true;
+
+//   return false;
+// }
+
+export function convertAnParams(next, bidderRequests) {
+  // check s2sconfig
+  const s2sConfig = config.getConfig('s2sConfig');
+  let proceed = false;
+
+  if (isPlainObject(s2sConfig)) {
+    proceed = digForAppNexusBidder(s2sConfig);
+  } else if (isArray(s2sConfig)) {
+    s2sConfig.forEach(s2sCfg => {
+      proceed = digForAppNexusBidder(s2sCfg);
+    });
+  }
+
+  if (proceed) {
+    bidderRequests
+      .flatMap(br => br.bids)
+      .filter(bid => bid.src === 's2s' && adapterManager.resolveAlias(bid.bidder) === 'appnexus')
+      .forEach((bid) => {
+        transformBidParams(bid);
+      });
+  }
+
+  next(bidderRequests);
+}
+
+function transformBidParams(bid) {
+  let params = bid.params;
+  if (params) {
+    params = convertTypes({
+      'member': 'string',
+      'invCode': 'string',
+      'placementId': 'number',
+      'keywords': convertKeywordsToString,
+      'publisherId': 'number'
+    }, params);
+
+    Object.keys(params).forEach(paramKey => {
+      let convertedKey = convertCamelToUnderscore(paramKey);
+      if (convertedKey !== paramKey) {
+        params[convertedKey] = params[paramKey];
+        delete params[paramKey];
+      }
+    });
+
+    params.use_pmt_rule = (typeof params.use_payment_rule === 'boolean') ? params.use_payment_rule : false;
+    if (params.use_payment_rule) {
+      delete params.use_payment_rule;
+    }
+  }
+}
+
+getHook('makeBidRequests').after(convertAnParams, 9);
diff --git a/modules/anPspParamsConverter.md b/modules/anPspParamsConverter.md
new file mode 100644
index 00000000000..f341b0a5976
--- /dev/null
+++ b/modules/anPspParamsConverter.md
@@ -0,0 +1,10 @@
+## Quick Summary
+
+This module is a temporary measure for publishers running Prebid.js 9.0+ and using the AppNexus PSP endpoint through their Prebid.js setup.  Please ensure to include this module in your builds of Prebid.js 9.0+, otherwise requests to PSP may not complete successfully.
+
+## Module's purpose
+
+This module replicates certain functionality that was previously stored in the appnexusBidAdapter.js file within a function named transformBidParams.
+
+This transformBidParams was a standard function in all adapters, which helped to change/modify the params and their values to a format that matched the bidder's request structure on the server-side endpoint.  In Prebid.js 9.0, this standard function was removed in all adapter files, so that the whole client-side file (eg appnexusBidAdapter.js) wouldn't have to be included in a prebid.js build file that was meant for server-side bidders.
+
diff --git a/modules/aniviewBidAdapter.js b/modules/aniviewBidAdapter.js
index 84552638421..e5baac1add0 100644
--- a/modules/aniviewBidAdapter.js
+++ b/modules/aniviewBidAdapter.js
@@ -1,317 +1,310 @@
 import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
-import { logError } from '../src/utils.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+import {
+  deepAccess,
+  deepSetValue,
+  mergeDeep,
+  isFn,
+  isStr,
+  isEmptyStr,
+  isPlainObject,
+  getUniqueIdentifierStr
+} from '../src/utils.js';
 
 const BIDDER_CODE = 'aniview';
 const GVLID = 780;
 const TTL = 600;
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_PLAYER_DOMAIN = 'player.aniview.com';
+const SSP_ENDPOINT = 'https://rtb.aniview.com/sspRTB2';
+const RENDERER_FILENAME = 'prebidRenderer.js';
 
-function avRenderer(bid) {
-  bid.renderer.push(function() {
-    let eventCallback = bid && bid.renderer && bid.renderer.handleVideoEvent ? bid.renderer.handleVideoEvent : null;
-    window.aniviewRenderer.renderAd({
-      id: bid.adUnitCode + '_' + bid.adId,
-      debug: window.location.href.indexOf('pbjsDebug') >= 0,
-      placement: bid.adUnitCode,
-      width: bid.width,
-      height: bid.height,
-      vastUrl: bid.vastUrl,
-      vastXml: bid.vastXml,
-      config: bid.params[0].rendererConfig,
-      eventsCallback: eventCallback,
-      bid: bid
-    });
-  });
-}
+const converter = ortbConverter({
+  context: {
+    netRevenue: true, // required
+    ttl: TTL, // required
+    currency: DEFAULT_CURRENCY,
+  },
 
-function newRenderer(bidRequest) {
-  let playerDomain = 'player.aniview.com';
-  const config = {};
+  imp(buildImp, bidRequest, context) {
+    const { mediaType } = context;
+    const imp = buildImp(bidRequest, context);
+    const isBanner = mediaType === BANNER;
+    const { width, height } = getSize(context, bidRequest);
+    const floor = getFloor(bidRequest, { width, height }, mediaType);
 
-  if (bidRequest && bidRequest.bidRequest && bidRequest.bidRequest.params) {
-    const params = bidRequest.bidRequest.params
+    imp.tagid = deepAccess(bidRequest, 'params.AV_CHANNELID');
 
-    if (params.playerDomain) {
-      playerDomain = params.playerDomain;
+    if (floor) {
+      imp.bidfloor = floor;
+      imp.bidfloorcur = DEFAULT_CURRENCY;
     }
 
-    if (params.AV_PUBLISHERID) {
-      config.AV_PUBLISHERID = params.AV_PUBLISHERID;
+    if (isBanner) {
+      // TODO: remove once serving will be fixed
+      deepSetValue(imp, 'banner', { w: width, h: height });
     }
 
-    if (params.AV_CHANNELID) {
-      config.AV_CHANNELID = params.AV_CHANNELID;
-    }
-  }
+    return imp;
+  },
 
-  const renderer = Renderer.install({
-    url: 'https://' + playerDomain + '/script/6.1/prebidRenderer.js',
-    config: config,
-    loaded: false,
-  });
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
 
-  try {
-    renderer.setRender(avRenderer);
-  } catch (err) {
-  }
+    mergeDeep(request, {
+      ext: {
+        [BIDDER_CODE]: {
+          pbjs: 1,
+          pbv: '$prebid.version$',
+        }
+      }
+    })
 
-  return renderer;
-}
+    return request;
+  },
 
-function isBidRequestValid(bid) {
-  if (!bid.params || !bid.params.AV_PUBLISHERID || !bid.params.AV_CHANNELID) { return false; }
+  bidResponse(buildBidResponse, bid, context) {
+    const { bidRequest, mediaType } = context;
+    const { width, height } = getSize(context, bidRequest);
+    const isVideoBid = mediaType === VIDEO;
+    const isBannerBid = mediaType === BANNER;
 
-  return true;
-}
-let irc = 0;
-function buildRequests(validBidRequests, bidderRequest) {
-  let bidRequests = [];
-
-  for (let i = 0; i < validBidRequests.length; i++) {
-    let bidRequest = validBidRequests[i];
-    var sizes = [[640, 480]];
-
-    if (bidRequest.mediaTypes && bidRequest.mediaTypes.video && bidRequest.mediaTypes.video.playerSize) {
-      sizes = bidRequest.mediaTypes.video.playerSize;
-    } else {
-      if (bidRequest.sizes) {
-        sizes = bidRequest.sizes;
-      }
+    if (isVideoBid) {
+      context.vastXml = bid.adm;
     }
-    if (sizes.length === 2 && typeof sizes[0] === 'number') {
-      sizes = [[sizes[0], sizes[1]]];
+
+    const bidResponse = buildBidResponse(bid, context);
+
+    if (isEmptyStr(bidRequest?.bidId) || !bid.adm || bidResponse.cpm <= 0) {
+      return bidResponse;
     }
 
-    for (let j = 0; j < sizes.length; j++) {
-      let size = sizes[j];
-      let playerWidth;
-      let playerHeight;
+    mergeDeep(bidResponse, {
+      width,
+      height,
+      creativeId: bid.crid || 'creativeId',
+      meta: { advertiserDomains: [] },
+      adId: getUniqueIdentifierStr(),
+    });
 
-      if (size && size.length == 2) {
-        playerWidth = size[0];
-        playerHeight = size[1];
+    if (isVideoBid) {
+      if (bidRequest.mediaTypes.video.context === 'outstream') {
+        bidResponse.renderer = createRenderer(bidRequest);
+      }
+    } else if (isBannerBid) {
+      if (bid.adm?.trim().startsWith(' {
+      Object.keys(bidRequest.mediaTypes).forEach((mediaType) => {
+        const endpoint = bidRequest.params.dev?.endpoint || SSP_ENDPOINT;
 
-      bidRequests.push({
-        method: 'GET',
-        url: servingUrl,
-        data: s2sParams,
-        bidRequest
+        requests.push({
+          method: 'POST',
+          url: endpoint,
+          bids: [bidRequest],
+          options: { withCredentials: false },
+          data: converter.toORTB({
+            bidderRequest,
+            bidRequests: [bidRequest],
+            context: { mediaType },
+          }),
+        });
       });
+    });
+
+    return requests;
+  },
+
+  interpretResponse(serverResponse, bidderRequest) {
+    const { bids, data } = bidderRequest;
+    const { body } = serverResponse;
+    const bidResponse = body?.seatbid?.[0]?.bid?.[0];
+
+    if (!bids || !data || !bidResponse) {
+      return [];
     }
-  }
 
-  return bidRequests;
-}
-function getCpmData(xml) {
-  let ret = {cpm: 0, currency: 'USD'};
-  if (xml) {
-    let ext = xml.getElementsByTagName('Extensions');
-    if (ext && ext.length > 0) {
-      ext = ext[0].getElementsByTagName('Extension');
-      if (ext && ext.length > 0) {
-        for (var i = 0; i < ext.length; i++) {
-          if (ext[i].getAttribute('type') == 'ANIVIEW') {
-            let price = ext[i].getElementsByTagName('Cpm');
-            if (price && price.length == 1) {
-              ret.cpm = price[0].textContent;
-            }
-            break;
-          }
+    const response = converter.fromORTB({ response: body, request: data });
+
+    return response.bids.map(bid => {
+      const replacements = {
+        auctionPrice: bid.cpm,
+        auctionId: bid.requestId,
+        auctionBidId: bidResponse.impid,
+        auctionImpId: bidResponse.impid,
+        auctionSeatId: bid.seatBidId,
+        auctionAdId: bid.adId,
+      };
+
+      const bidAdmWithReplacedMacros = replaceMacros(bidResponse.adm, replacements);
+
+      if (bid.mediaType === VIDEO) {
+        bid.vastXml = bidAdmWithReplacedMacros;
+
+        if (bidResponse?.nurl) {
+          bid.vastUrl = replaceMacros(bidResponse.nurl, replacements);
         }
+      } else {
+        bid.ad = bidAdmWithReplacedMacros;
       }
+
+      return bid;
+    });
+  },
+
+  getUserSyncs(syncOptions, serverResponses) {
+    if (!serverResponses?.[0]?.body || serverResponses.error) {
+      return [];
     }
-  }
-  return ret;
+
+    try {
+      const syncs = serverResponses[0].body.ext?.[BIDDER_CODE]?.sync;
+
+      if (syncs) {
+        return getValidSyncs(syncs, syncOptions);
+      }
+    } catch (error) {}
+
+    return [];
+  },
+};
+
+function getValidSyncs(syncs, options) {
+  return syncs
+    .filter(sync => isSyncValid(sync, options))
+    .map(sync => processSync(sync)) || [];
 }
-function buildBanner(xmlStr, bidRequest, bidResponse) {
-  var rendererData = JSON.stringify({
-    id: bidRequest.adUnitCode,
-    debug: window.location.href.indexOf('pbjsDebug') >= 0,
-    placement: bidRequest.bidRequest.adUnitCode,
-    width: bidResponse.width,
-    height: bidResponse.height,
-    vastXml: xmlStr,
-    bid: bidResponse,
-    config: bidRequest.bidRequest.params.rendererConfig
-  });
-  var playerDomain = bidRequest.bidRequest.params.playerDomain || 'player.aniview.com';
-  var ad = '';
-  ad += ''
-  return ad;
+
+function isSyncValid(sync, options) {
+  return isPlainObject(sync) &&
+    isStr(sync.url) &&
+    (sync.e === 'inventory' || sync.e === 'sync') &&
+    ((sync.t === 1 && options?.pixelEnabled) || (sync.t === 3 && options?.iframeEnabled));
 }
-function interpretResponse(serverResponse, bidRequest) {
-  let bidResponses = [];
-  if (serverResponse && serverResponse.body) {
-    if (serverResponse.error) {
-      return bidResponses;
-    } else {
-      try {
-        let bidResponse = {};
-        if (bidRequest && bidRequest.data && bidRequest.data.bidId && bidRequest.data.bidId !== '') {
-          let mediaType = VIDEO;
-          if (bidRequest.bidRequest && bidRequest.bidRequest.mediaTypes && !bidRequest.bidRequest.mediaTypes[VIDEO]) {
-            mediaType = BANNER;
-          }
-          let xmlStr = serverResponse.body;
-          let xml = new window.DOMParser().parseFromString(xmlStr, 'text/xml');
-          if (xml && xml.getElementsByTagName('parsererror').length == 0) {
-            let cpmData = getCpmData(xml);
-            if (cpmData.cpm > 0) {
-              bidResponse.requestId = bidRequest.data.bidId;
-              bidResponse.ad = '';
-              bidResponse.cpm = cpmData.cpm;
-              bidResponse.width = bidRequest.data.AV_WIDTH;
-              bidResponse.height = bidRequest.data.AV_HEIGHT;
-              bidResponse.ttl = TTL;
-              bidResponse.creativeId = xml.getElementsByTagName('Ad') && xml.getElementsByTagName('Ad')[0] && xml.getElementsByTagName('Ad')[0].getAttribute('id') ? xml.getElementsByTagName('Ad')[0].getAttribute('id') : 'creativeId';
-              bidResponse.currency = cpmData.currency;
-              bidResponse.netRevenue = true;
-              bidResponse.mediaType = mediaType;
-              if (mediaType === VIDEO) {
-                try {
-                  var blob = new Blob([xmlStr], {
-                    type: 'application/xml'
-                  });
-                  bidResponse.vastUrl = window.URL.createObjectURL(blob);
-                } catch (ex) {
-                  logError('Aniview Debug create vastXml error:\n\n' + ex);
-                }
-                bidResponse.vastXml = xmlStr;
-                if (bidRequest.bidRequest && bidRequest.bidRequest.mediaTypes && bidRequest.bidRequest.mediaTypes.video && bidRequest.bidRequest.mediaTypes.video.context === 'outstream') {
-                  bidResponse.renderer = newRenderer(bidRequest);
-                }
-              } else {
-                bidResponse.ad = buildBanner(xmlStr, bidRequest, bidResponse);
-              }
-              bidResponse.meta = {
-                advertiserDomains: []
-              };
-
-              bidResponses.push(bidResponse);
-            }
-          } else {}
-        } else {}
-      } catch (e) {}
-    }
-  } else {}
 
-  return bidResponses;
+function processSync(sync) {
+  return { url: sync.url, type: sync.t === 1 ? 'image' : 'iframe' };
 }
 
-function getSyncData(xml, options) {
-  let ret = [];
-  if (xml) {
-    let ext = xml.getElementsByTagName('Extensions');
-    if (ext && ext.length > 0) {
-      ext = ext[0].getElementsByTagName('Extension');
-      if (ext && ext.length > 0) {
-        for (var i = 0; i < ext.length; i++) {
-          if (ext[i].getAttribute('type') == 'ANIVIEW') {
-            let syncs = ext[i].getElementsByTagName('AdServingSync');
-            if (syncs && syncs.length == 1) {
-              try {
-                let data = JSON.parse(syncs[0].textContent);
-                if (data && data.trackers && data.trackers.length) {
-                  data = data.trackers;
-                  for (var j = 0; j < data.length; j++) {
-                    if (typeof data[j] === 'object' &&
-                      typeof data[j].url === 'string' &&
-                      (data[j].e === 'inventory' || data[j].e === 'sync')
-                    ) {
-                      if (data[j].t == 1 && options.pixelEnabled) {
-                        ret.push({url: data[j].url, type: 'image'});
-                      } else {
-                        if (data[j].t == 3 && options.iframeEnabled) {
-                          ret.push({url: data[j].url, type: 'iframe'});
-                        }
-                      }
-                    }
-                  }
-                }
-              } catch (e) {}
-            }
-            break;
-          }
-        }
-      }
-    }
+function getSize(context, bid) {
+  const isVideoBid = context.mediaType === VIDEO;
+  let size = [640, 480];
+
+  if (isVideoBid && bid.mediaTypes?.video?.playerSize?.length) {
+    size = bid.mediaTypes.video.playerSize[0];
+  } else if (bid.sizes?.length) {
+    size = bid.sizes[0];
   }
-  return ret;
+
+  return {
+    width: size[0],
+    height: size[1],
+  };
 }
 
-function getUserSyncs(syncOptions, serverResponses) {
-  if (serverResponses && serverResponses[0] && serverResponses[0].body) {
-    if (serverResponses.error) {
-      return [];
-    } else {
-      try {
-        let xmlStr = serverResponses[0].body;
-        let xml = new window.DOMParser().parseFromString(xmlStr, 'text/xml');
-        if (xml && xml.getElementsByTagName('parsererror').length == 0) {
-          let syncData = getSyncData(xml, syncOptions);
-          return syncData;
-        }
-      } catch (e) {}
+// https://docs.prebid.org/dev-docs/modules/floors.html#example-getfloor-scenarios
+function getFloor(bid, size, mediaType) {
+  if (!isFn(bid?.getFloor)) {
+    return null;
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: DEFAULT_CURRENCY,
+      mediaType, // or '*' for all media types
+      size: [size.width, size.height], // or '*' for all sizes
+    });
+
+    if (isPlainObject(bidFloor) && !isNaN(bidFloor.floor) && bidFloor.currency === DEFAULT_CURRENCY) {
+      return bidFloor.floor;
     }
+  } catch {}
+
+  return null;
+}
+
+function replaceMacros(str, replacements) {
+  if (!replacements || !isStr(str)) {
+    return str;
   }
+
+  return str
+    .replaceAll(`\${AUCTION_PRICE}`, replacements.auctionPrice || '')
+    .replaceAll(`\${AUCTION_ID}`, replacements.auctionId || '')
+    .replaceAll(`\${AUCTION_BID_ID}`, replacements.auctionBidId || '')
+    .replaceAll(`\${AUCTION_IMP_ID}`, replacements.auctionImpId || '')
+    .replaceAll(`\${AUCTION_SEAT_ID}`, replacements.auctionSeatId || '')
+    .replaceAll(`\${AUCTION_AD_ID}`, replacements.auctionAdId || '');
 }
 
-export const spec = {
-  code: BIDDER_CODE,
-  gvlid: GVLID,
-  aliases: ['avantisvideo', 'selectmediavideo', 'vidcrunch', 'openwebvideo', 'didnavideo', 'ottadvisors', 'pgammedia'],
-  supportedMediaTypes: [VIDEO, BANNER],
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  getUserSyncs
-};
+function createRenderer(bidRequest) {
+  const config = {};
+  const { params = {} } = bidRequest;
+  const playerDomain = params.playerDomain || DEFAULT_PLAYER_DOMAIN;
+
+  if (params.AV_PUBLISHERID) {
+    config.AV_PUBLISHERID = params.AV_PUBLISHERID;
+  }
+
+  if (params.AV_CHANNELID) {
+    config.AV_CHANNELID = params.AV_CHANNELID;
+  }
+
+  const renderer = Renderer.install({
+    url: `https://${playerDomain}/script/6.1/${RENDERER_FILENAME}`,
+    config,
+    loaded: false,
+  });
+
+  try {
+    renderer.setRender(avRenderer);
+  } catch (error) {}
+
+  return renderer;
+}
+
+function avRenderer(bid) {
+  bid.renderer.push(function() {
+    const eventsCallback = bid?.renderer?.handleVideoEvent ?? null;
+    const { ad, adId, adUnitCode, vastUrl, vastXml, width, height, params = [] } = bid;
+
+    window.aniviewRenderer.renderAd({
+      id: adUnitCode + '_' + adId,
+      debug: window.location.href.indexOf('pbjsDebug') >= 0,
+      placement: adUnitCode,
+      config: params[0]?.rendererConfig,
+      width,
+      height,
+      vastUrl,
+      vastXml: vastXml || ad,
+      eventsCallback,
+      bid,
+    });
+  });
+}
 
 registerBidder(spec);
diff --git a/modules/aniviewBidAdapter.md b/modules/aniviewBidAdapter.md
index 63c91ca009a..b067166b080 100644
--- a/modules/aniviewBidAdapter.md
+++ b/modules/aniviewBidAdapter.md
@@ -1,16 +1,16 @@
 # Overview
 
 ```
-Module Name: ANIVIEW Bidder Adapter
+Module Name: Aniview Bidder Adapter
 Module Type: Bidder Adapter
 Maintainer: support@aniview.com
 ```
 
 # Description
 
-Connects to ANIVIEW Ad server for bids.
+Connects to Aniview Ad server for bids.
 
-ANIVIEW bid adapter supports Banner and Video currently.
+Aniview bid adapter supports Banner and Video currently.
 
 For more information about [Aniview](http://www.aniview.com), please contact [support@aniview.com](support@aniview.com).
 
@@ -34,5 +34,3 @@ var videoAdUnit = [
   }]
 }];
 ```
-
-```
diff --git a/modules/anonymisedRtdProvider.js b/modules/anonymisedRtdProvider.js
new file mode 100644
index 00000000000..c3bb21ce8a5
--- /dev/null
+++ b/modules/anonymisedRtdProvider.js
@@ -0,0 +1,126 @@
+/**
+ * This module adds the Anonymised RTD provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will populate real-time data from Anonymised
+ * @module modules/anonymisedRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {getStorageManager} from '../src/storageManager.js';
+import {submodule} from '../src/hook.js';
+import {isPlainObject, mergeDeep, logMessage, logError} from '../src/utils.js';
+import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+export function createRtdProvider(moduleName) {
+  const MODULE_NAME = 'realTimeData';
+  const SUBMODULE_NAME = moduleName;
+  const GVLID = 1116;
+
+  const storage = getStorageManager({ moduleType: MODULE_TYPE_RTD, moduleName: SUBMODULE_NAME });
+  /**
+   * Add real-time data & merge segments.
+   * @param ortb2 object to merge into
+   * @param {Object} rtd
+   */
+  function addRealTimeData(ortb2, rtd) {
+    if (isPlainObject(rtd.ortb2)) {
+      logMessage(`${SUBMODULE_NAME}RtdProvider: merging original: `, ortb2);
+      logMessage(`${SUBMODULE_NAME}RtdProvider: merging in: `, rtd.ortb2);
+      mergeDeep(ortb2, rtd.ortb2);
+    }
+  }
+  /**
+   * Try parsing stringified array of segment IDs.
+   * @param {String} data
+   */
+  function tryParse(data) {
+    try {
+      return JSON.parse(data);
+    } catch (err) {
+      logError(`${SUBMODULE_NAME}RtdProvider: failed to parse json:`, data);
+      return null;
+    }
+  }
+  /**
+   * Real-time data retrieval from Anonymised
+   * @param {Object} reqBidsConfigObj
+   * @param {function} onDone
+   * @param {Object} rtdConfig
+   * @param {Object} userConsent
+   */
+  function getRealTimeData(reqBidsConfigObj, onDone, rtdConfig, userConsent) {
+    if (rtdConfig && isPlainObject(rtdConfig.params)) {
+      const cohortStorageKey = rtdConfig.params.cohortStorageKey;
+      const bidders = rtdConfig.params.bidders;
+
+      if (cohortStorageKey !== 'cohort_ids') {
+        logError(`${SUBMODULE_NAME}RtdProvider: 'cohortStorageKey' should be 'cohort_ids'`)
+        return;
+      }
+
+      const jsonData = storage.getDataFromLocalStorage(cohortStorageKey);
+      if (!jsonData) {
+        return;
+      }
+
+      const segments = tryParse(jsonData);
+
+      if (segments) {
+        const udSegment = {
+          name: 'anonymised.io',
+          ext: {
+            segtax: rtdConfig.params.segtax
+          },
+          segment: segments.map(x => ({id: x}))
+        }
+
+        logMessage(`${SUBMODULE_NAME}RtdProvider: user.data.segment: `, udSegment);
+        const data = {
+          rtd: {
+            ortb2: {
+              user: {
+                data: [
+                  udSegment
+                ]
+              }
+            }
+          }
+        };
+
+        if (bidders?.includes('appnexus')) {
+          data.rtd.ortb2.user.keywords = segments.map(x => `perid=${x}`).join(',');
+        }
+
+        addRealTimeData(reqBidsConfigObj.ortb2Fragments?.global, data.rtd);
+        onDone();
+      }
+    }
+  }
+  /**
+   * Module init
+   * @param {Object} provider
+   * @param {Object} userConsent
+   * @return {boolean}
+   */
+  function init(provider, userConsent) {
+    return true;
+  }
+  /** @type {RtdSubmodule} */
+  const rtdSubmodule = {
+    name: SUBMODULE_NAME,
+    gvlid: GVLID,
+    getBidRequestData: getRealTimeData,
+    init: init
+  };
+
+  submodule(MODULE_NAME, rtdSubmodule);
+
+  return {
+    getRealTimeData,
+    rtdSubmodule,
+    storage
+  };
+}
+
+export const { getRealTimeData, rtdSubmodule: anonymisedRtdSubmodule, storage } = createRtdProvider('anonymised');
diff --git a/modules/anonymisedRtdProvider.md b/modules/anonymisedRtdProvider.md
new file mode 100644
index 00000000000..526c75d7fb7
--- /dev/null
+++ b/modules/anonymisedRtdProvider.md
@@ -0,0 +1,54 @@
+### Overview
+
+Anonymised is a data anonymization technology for privacy-preserving advertising. Publishers and advertisers are able to target and retarget custom audience segments covering 100% of consented audiences.
+Anonymised’s Real-time Data Provider automatically obtains segment IDs from the Anonymised on-domain script (via localStorage) and passes them to the bid-stream.
+
+### Integration
+
+ - Build the anonymisedRtd module into the Prebid.js package with:
+
+ ```bash
+ gulp build --modules=rtdModule,anonymisedRtdProvider,...
+ ```
+
+ - Use `setConfig` to instruct Prebid.js to initilaize the anonymisedRtdProvider module, as specified below.
+
+### Configuration
+
+```javascript
+ pbjs.setConfig({
+   realTimeData: {
+     dataProviders: [
+       {
+         name: "anonymised",
+         waitForIt: true,
+         params: {
+           cohortStorageKey: "cohort_ids",
+           bidders: ["appnexus", "onetag", "pubmatic", "smartadserver", ...],
+           segtax: 1000
+         }
+       }
+     ]
+   }
+ });
+ ```
+
+ ### Config Syntax details
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | String | Anonymised Rtd module name | 'anonymised' always|
+| waitForIt | Boolean | Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false |
+| params.cohortStorageKey | String | the `localStorage` key, under which Anonymised Marketing Tag stores the segment IDs | 'cohort_ids' always |
+| params.bidders | Array | Bidders with which to share segment information | Optional |
+| params.segtax | Integer | The taxonomy for Anonymised | '1000' always |
+
+Please note that anonymisedRtdProvider should be integrated into the publisher website along with the [Anonymised Marketing Tag](https://support.anonymised.io/integrate/marketing-tag).
+Please reach out to Anonymised [representative](mailto:support@anonymised.io) if you have any questions or need further help to integrate Prebid, anonymisedRtdProvider, and Anonymised Marketing Tag
+
+### Testing
+To view an example of available segments returned by Anonymised:
+```bash
+gulp serve --modules=rtdModule,anonymisedRtdProvider,pubmaticBidAdapter
+```
+And then point your browser at:
+"http://localhost:9999/integrationExamples/gpt/anonymised_segments_example.html"
diff --git a/modules/anyclipBidAdapter.js b/modules/anyclipBidAdapter.js
new file mode 100644
index 00000000000..8a5906ebc93
--- /dev/null
+++ b/modules/anyclipBidAdapter.js
@@ -0,0 +1,54 @@
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {
+  buildRequests,
+  getUserSyncs,
+  interpretResponse,
+} from '../libraries/xeUtils/bidderUtils.js';
+import {deepAccess, getBidIdParameter, isArray, logError} from '../src/utils.js';
+
+const BIDDER_CODE = 'anyclip';
+const ENDPOINT = 'https://prebid.anyclip.com';
+
+function isBidRequestValid(bid) {
+  if (bid && typeof bid.params !== 'object') {
+    logError('Params is not defined or is incorrect in the bidder settings');
+    return false;
+  }
+
+  if (!getBidIdParameter('publisherId', bid.params) || !getBidIdParameter('supplyTagId', bid.params)) {
+    logError('PublisherId or supplyTagId is not present in bidder params');
+    return false;
+  }
+
+  if (deepAccess(bid, 'mediaTypes.video') && !isArray(deepAccess(bid, 'mediaTypes.video.playerSize'))) {
+    logError('mediaTypes.video.playerSize is required for video');
+    return false;
+  }
+
+  return true;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['anyclip'],
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const builtRequests = buildRequests(validBidRequests, bidderRequest, ENDPOINT)
+    const requests = JSON.parse(builtRequests.data)
+    const updatedRequests = requests.map(req => ({
+      ...req,
+      env: {
+        publisherId: validBidRequests[0].params.publisherId,
+        supplyTagId: validBidRequests[0].params.supplyTagId,
+        floor: req.floor
+      },
+    }))
+    return {...builtRequests, data: JSON.stringify(updatedRequests)}
+  },
+  interpretResponse,
+  getUserSyncs
+}
+
+registerBidder(spec);
diff --git a/modules/anyclipBidAdapter.md b/modules/anyclipBidAdapter.md
new file mode 100644
index 00000000000..ed67c9f6722
--- /dev/null
+++ b/modules/anyclipBidAdapter.md
@@ -0,0 +1,52 @@
+# Overview
+
+```
+Module Name: AnyClip Bidder Adapter  
+Module Type: Bidder Adapter  
+Maintainer: support@anyclip.com
+```
+
+# Description
+
+Connects to AnyClip Marketplace for bids.
+
+For more information about [AnyClip](https://anyclip.com), please contact [support@anyclip.com](support@anyclip.com).
+
+AnyClip bid adapter supports Banner currently*.
+
+Use `anyclip` as bidder.
+
+# Bid Parameters
+
+| Key           | Required | Example                  | Description                           |
+|---------------|----------|--------------------------|---------------------------------------|
+| `publisherId` | Yes      | `'12345'`                | The publisher ID provided by AnyClip  |
+| `supplyTagId` | Yes      | `'-mptNo0BycUG4oCDgGrU'` | The supply tag ID provided by AnyClip |
+| `floor`       | No       | `0.5`                    | Floor price                           |
+
+
+# Sample Ad Unit: For Publishers
+## Sample Banner only Ad Unit
+```js
+var adUnits = [{
+  code: 'adunit1', // ad slot HTML element ID  
+  mediaTypes: {
+    banner: {  
+      sizes: [
+          [300, 250], 
+          [728, 90]
+      ]
+    }   
+  },
+  bids: [{
+    bidder: 'anyclip',
+    params: {
+        publisherId: '12345', // required, string
+        supplyTagId: '-mptNo0BycUG4oCDgGrU', // required, string
+        floor: 0.5 // optional, floor
+    }
+  }]
+}]
+```
+
+
diff --git a/modules/apacdexBidAdapter.js b/modules/apacdexBidAdapter.js
index 834df134c2e..83119052f3a 100644
--- a/modules/apacdexBidAdapter.js
+++ b/modules/apacdexBidAdapter.js
@@ -1,7 +1,7 @@
-import { deepAccess, isPlainObject, isArray, replaceAuctionPrice, isFn, logError } from '../src/utils.js';
+import { deepAccess, isPlainObject, isArray, replaceAuctionPrice, isFn, logError, deepClone } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
 import {parseDomain} from '../src/refererDetection.js';
 const BIDDER_CODE = 'apacdex';
 const ENDPOINT = 'https://useast.quantumdex.io/auction/pbjs'
@@ -85,7 +85,7 @@ export const spec = {
         bidReq.bidFloor = bidFloor;
       }
 
-      bids.push(JSON.parse(JSON.stringify(bidReq)));
+      bids.push(deepClone(bidReq));
     });
 
     const payload = {};
@@ -327,7 +327,7 @@ export function validateGeoObject(geo) {
  * Get bid floor from Price Floors Module
  *
  * @param {Object} bid
- * @returns {float||null}
+ * @returns {?number}
  */
 function getBidFloor(bid) {
   if (!isFn(bid.getFloor)) {
diff --git a/modules/appierAnalyticsAdapter.js b/modules/appierAnalyticsAdapter.js
index b4081feaf92..3664c49c424 100644
--- a/modules/appierAnalyticsAdapter.js
+++ b/modules/appierAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {logError, logInfo, deepClone} from '../src/utils.js';
@@ -12,12 +12,10 @@ export const ANALYTICS_VERSION = '1.0.0';
 const DEFAULT_SERVER = 'https://prebid-analytics.c.appier.net/v1';
 
 const {
-  EVENTS: {
-    AUCTION_END,
-    BID_WON,
-    BID_TIMEOUT
-  }
-} = CONSTANTS;
+  AUCTION_END,
+  BID_WON,
+  BID_TIMEOUT
+} = EVENTS;
 
 export const BIDDER_STATUS = {
   BID: 'bid',
diff --git a/modules/appierBidAdapter.js b/modules/appierBidAdapter.js
index 12346d15130..cf89aeefffa 100644
--- a/modules/appierBidAdapter.js
+++ b/modules/appierBidAdapter.js
@@ -2,6 +2,11 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 export const ADAPTER_VERSION = '1.0.0';
 const SUPPORTED_AD_TYPES = [BANNER];
 
@@ -32,7 +37,7 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {bidRequests[]} - an array of bids
+   * @param {object} bidRequests - an array of bids
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index e6b3441b988..4270b47d91e 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -15,7 +15,8 @@ import {
   logError,
   logInfo,
   logMessage,
-  logWarn
+  logWarn,
+  mergeDeep
 } from '../src/utils.js';
 import {Renderer} from '../src/Renderer.js';
 import {config} from '../src/config.js';
@@ -25,25 +26,29 @@ import {find, includes} from '../src/polyfill.js';
 import {INSTREAM, OUTSTREAM} from '../src/video.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {bidderSettings} from '../src/bidderSettings.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
 import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
 import {APPNEXUS_CATEGORY_MAPPING} from '../libraries/categoryTranslationMapping/index.js';
 import {
   convertKeywordStringToANMap,
   getANKewyordParamFromMaps,
-  getANKeywordParam,
-  transformBidderParamKeywords
+  getANKeywordParam
 } from '../libraries/appnexusUtils/anKeywords.js';
-import {convertCamelToUnderscore, fill} from '../libraries/appnexusUtils/anUtils.js';
+import {convertCamelToUnderscore, fill, appnexusAliases} from '../libraries/appnexusUtils/anUtils.js';
 import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
 import {chunk} from '../libraries/chunk/chunk.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'appnexus';
 const URL = 'https://ib.adnxs.com/ut/v3/prebid';
 const URL_SIMPLE = 'https://ib.adnxs-simple.com/ut/v3/prebid';
 const VIDEO_TARGETING = ['id', 'minduration', 'maxduration',
   'skippable', 'playback_method', 'frameworks', 'context', 'skipoffset'];
-const VIDEO_RTB_TARGETING = ['minduration', 'maxduration', 'skip', 'skipafter', 'playbackmethod', 'api', 'startdelay'];
+const VIDEO_RTB_TARGETING = ['minduration', 'maxduration', 'skip', 'skipafter', 'playbackmethod', 'api', 'startdelay', 'placement', 'plcmt'];
 const USER_PARAMS = ['age', 'externalUid', 'external_uid', 'segments', 'gender', 'dnt', 'language'];
 const APP_DEVICE_PARAMS = ['geo', 'device_id']; // appid is collected separately
 const DEBUG_PARAMS = ['enabled', 'dongle', 'member_id', 'debug_timeout'];
@@ -67,7 +72,12 @@ const VIDEO_MAPPING = {
     'mid_roll': 2,
     'post_roll': 3,
     'outstream': 4,
-    'in-banner': 5
+    'in-banner': 5,
+    'in-feed': 6,
+    'interstitial': 7,
+    'accompanying_content_pre_roll': 8,
+    'accompanying_content_mid_roll': 9,
+    'accompanying_content_post_roll': 10
   }
 };
 const NATIVE_MAPPING = {
@@ -94,23 +104,33 @@ const VIEWABILITY_URL_START = /\/\/cdn\.adnxs\.com\/v|\/\/cdn\.adnxs\-simple\.co
 const VIEWABILITY_FILE_NAME = 'trk.js';
 const GVLID = 32;
 const storage = getStorageManager({bidderCode: BIDDER_CODE});
+// ORTB2 device types according to the OpenRTB specification
+const ORTB2_DEVICE_TYPE = {
+  MOBILE_TABLET: 1,
+  PERSONAL_COMPUTER: 2,
+  CONNECTED_TV: 3,
+  PHONE: 4,
+  TABLET: 5,
+  CONNECTED_DEVICE: 6,
+  SET_TOP_BOX: 7,
+  OOH_DEVICE: 8
+};
+// Map of ORTB2 device types to AppNexus device types
+const ORTB2_DEVICE_TYPE_MAP = new Map([
+  [ORTB2_DEVICE_TYPE.MOBILE_TABLET, 'Mobile/Tablet - General'],
+  [ORTB2_DEVICE_TYPE.PERSONAL_COMPUTER, 'Personal Computer'],
+  [ORTB2_DEVICE_TYPE.CONNECTED_TV, 'Connected TV'],
+  [ORTB2_DEVICE_TYPE.PHONE, 'Phone'],
+  [ORTB2_DEVICE_TYPE.TABLET, 'Tablet'],
+  [ORTB2_DEVICE_TYPE.CONNECTED_DEVICE, 'Connected Device'],
+  [ORTB2_DEVICE_TYPE.SET_TOP_BOX, 'Set Top Box'],
+  [ORTB2_DEVICE_TYPE.OOH_DEVICE, 'OOH Device'],
+]);
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  aliases: [
-    { code: 'appnexusAst', gvlid: 32 },
-    { code: 'emxdigital', gvlid: 183 },
-    { code: 'pagescience', gvlid: 32 },
-    { code: 'gourmetads', gvlid: 32 },
-    { code: 'matomy', gvlid: 32 },
-    { code: 'featureforward', gvlid: 32 },
-    { code: 'oftmedia', gvlid: 32 },
-    { code: 'adasta', gvlid: 32 },
-    { code: 'beintoo', gvlid: 618 },
-    { code: 'projectagora', gvlid: 1032 },
-    { code: 'uol', gvlid: 32 },
-  ],
+  aliases: appnexusAliases,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
@@ -250,6 +270,12 @@ export const spec = {
       payload.app = appIdObj;
     }
 
+    // if present, convert and merge device object from ortb2 into `payload.device`
+    if (bidderRequest?.ortb2?.device) {
+      payload.device = payload.device || {};
+      mergeDeep(payload.device, convertORTB2DeviceDataToAppNexusDeviceObject(bidderRequest.ortb2.device));
+    }
+
     // grab the ortb2 keyword data (if it exists) and convert from the comma list string format to object format
     let ortb2 = deepClone(bidderRequest && bidderRequest.ortb2);
 
@@ -345,6 +371,30 @@ export const spec = {
       }
     }
 
+    if (bidderRequest?.ortb2?.regs?.ext?.dsa) {
+      const pubDsaObj = bidderRequest.ortb2.regs.ext.dsa;
+      const dsaObj = {};
+      ['dsarequired', 'pubrender', 'datatopub'].forEach((dsaKey) => {
+        if (isNumber(pubDsaObj[dsaKey])) {
+          dsaObj[dsaKey] = pubDsaObj[dsaKey];
+        }
+      });
+
+      if (isArray(pubDsaObj.transparency) && pubDsaObj.transparency.every((v) => isPlainObject(v))) {
+        const tpData = [];
+        pubDsaObj.transparency.forEach((tpObj) => {
+          if (isStr(tpObj.domain) && tpObj.domain != '' && isArray(tpObj.dsaparams) && tpObj.dsaparams.every((v) => isNumber(v))) {
+            tpData.push(tpObj);
+          }
+        });
+        if (tpData.length > 0) {
+          dsaObj.transparency = tpData;
+        }
+      }
+
+      if (!isEmpty(dsaObj)) payload.dsa = dsaObj;
+    }
+
     if (tags[0].publisher_id) {
       payload.publisher_id = tags[0].publisher_id;
     }
@@ -402,66 +452,21 @@ export const spec = {
   },
 
   getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
-    function checkGppStatus(gppConsent) {
-      // this is a temporary measure to supress usersync in US-based GPP regions
-      // this logic will be revised when proper signals (akin to purpose1 from TCF2) can be determined for US GPP
-      if (gppConsent && Array.isArray(gppConsent.applicableSections)) {
-        return gppConsent.applicableSections.every(sec => typeof sec === 'number' && sec <= 5);
-      }
-      return true;
-    }
-
-    if (syncOptions.iframeEnabled && hasPurpose1Consent(gdprConsent) && checkGppStatus(gppConsent)) {
+    if (syncOptions.iframeEnabled && hasPurpose1Consent(gdprConsent)) {
       return [{
         type: 'iframe',
         url: 'https://acdn.adnxs.com/dmp/async_usersync.html'
       }];
     }
-  },
-
-  transformBidParams: function (params, isOpenRtb, adUnit, bidRequests) {
-    let conversionFn = transformBidderParamKeywords;
-    if (isOpenRtb === true) {
-      let s2sEndpointUrl = null;
-      let s2sConfig = config.getConfig('s2sConfig');
-
-      if (isPlainObject(s2sConfig)) {
-        s2sEndpointUrl = deepAccess(s2sConfig, 'endpoint.p1Consent');
-      } else if (isArray(s2sConfig)) {
-        s2sConfig.forEach(s2sCfg => {
-          if (includes(s2sCfg.bidders, adUnit.bids[0].bidder)) {
-            s2sEndpointUrl = deepAccess(s2sCfg, 'endpoint.p1Consent');
-          }
-        });
-      }
-
-      if (s2sEndpointUrl && s2sEndpointUrl.match('/openrtb2/prebid')) {
-        conversionFn = convertKeywordsToString;
-      }
-    }
 
-    params = convertTypes({
-      'member': 'string',
-      'invCode': 'string',
-      'placementId': 'number',
-      'keywords': conversionFn,
-      'publisherId': 'number'
-    }, params);
-
-    if (isOpenRtb) {
-      Object.keys(params).forEach(paramKey => {
-        let convertedKey = convertCamelToUnderscore(paramKey);
-        if (convertedKey !== paramKey) {
-          params[convertedKey] = params[paramKey];
-          delete params[paramKey];
-        }
-      });
-
-      params.use_pmt_rule = (typeof params.use_payment_rule === 'boolean') ? params.use_payment_rule : false;
-      if (params.use_payment_rule) { delete params.use_payment_rule; }
+    if (syncOptions.pixelEnabled) {
+      // first attempt using static list
+      const imgList = ['https://px.ads.linkedin.com/setuid?partner=appNexus'];
+      return imgList.map(url => ({
+        type: 'image',
+        url
+      }));
     }
-
-    return params;
   }
 };
 
@@ -584,6 +589,10 @@ function newBid(serverBid, rtbBid, bidderRequest) {
     bid.meta = Object.assign({}, bid.meta, { advertiserId: rtbBid.advertiser_id });
   }
 
+  if (rtbBid.dsa) {
+    bid.meta = Object.assign({}, bid.meta, { dsa: rtbBid.dsa });
+  }
+
   // temporary function; may remove at later date if/when adserver fully supports dchain
   function setupDChain(rtbBid) {
     let dchain = {
@@ -685,19 +694,124 @@ function newBid(serverBid, rtbBid, bidderRequest) {
       javascriptTrackers: jsTrackers
     };
     if (nativeAd.main_img) {
-      bid['native'].image = {
+      bid[NATIVE].image = {
         url: nativeAd.main_img.url,
         height: nativeAd.main_img.height,
         width: nativeAd.main_img.width,
       };
     }
     if (nativeAd.icon) {
-      bid['native'].icon = {
+      bid[NATIVE].icon = {
         url: nativeAd.icon.url,
         height: nativeAd.icon.height,
         width: nativeAd.icon.width,
       };
     }
+
+    // Custom fields
+    bid[NATIVE].ext = {
+      video: nativeAd.video,
+      customImage1: nativeAd.image1 && {
+        url: nativeAd.image1.url,
+        height: nativeAd.image1.height,
+        width: nativeAd.image1.width,
+      },
+      customImage2: nativeAd.image2 && {
+        url: nativeAd.image2.url,
+        height: nativeAd.image2.height,
+        width: nativeAd.image2.width,
+      },
+      customImage3: nativeAd.image3 && {
+        url: nativeAd.image3.url,
+        height: nativeAd.image3.height,
+        width: nativeAd.image3.width,
+      },
+      customImage4: nativeAd.image4 && {
+        url: nativeAd.image4.url,
+        height: nativeAd.image4.height,
+        width: nativeAd.image4.width,
+      },
+      customImage5: nativeAd.image5 && {
+        url: nativeAd.image5.url,
+        height: nativeAd.image5.height,
+        width: nativeAd.image5.width,
+      },
+      customIcon1: nativeAd.icon1 && {
+        url: nativeAd.icon1.url,
+        height: nativeAd.icon1.height,
+        width: nativeAd.icon1.width,
+      },
+      customIcon2: nativeAd.icon2 && {
+        url: nativeAd.icon2.url,
+        height: nativeAd.icon2.height,
+        width: nativeAd.icon2.width,
+      },
+      customIcon3: nativeAd.icon3 && {
+        url: nativeAd.icon3.url,
+        height: nativeAd.icon3.height,
+        width: nativeAd.icon3.width,
+      },
+      customIcon4: nativeAd.icon4 && {
+        url: nativeAd.icon4.url,
+        height: nativeAd.icon4.height,
+        width: nativeAd.icon4.width,
+      },
+      customIcon5: nativeAd.icon5 && {
+        url: nativeAd.icon5.url,
+        height: nativeAd.icon5.height,
+        width: nativeAd.icon5.width,
+      },
+      customSocialIcon1: nativeAd.socialicon1 && {
+        url: nativeAd.socialicon1.url,
+        height: nativeAd.socialicon1.height,
+        width: nativeAd.socialicon1.width,
+      },
+      customSocialIcon2: nativeAd.socialicon2 && {
+        url: nativeAd.socialicon2.url,
+        height: nativeAd.socialicon2.height,
+        width: nativeAd.socialicon2.width,
+      },
+      customSocialIcon3: nativeAd.socialicon3 && {
+        url: nativeAd.socialicon3.url,
+        height: nativeAd.socialicon3.height,
+        width: nativeAd.socialicon3.width,
+      },
+      customSocialIcon4: nativeAd.socialicon4 && {
+        url: nativeAd.socialicon4.url,
+        height: nativeAd.socialicon4.height,
+        width: nativeAd.socialicon4.width,
+      },
+      customSocialIcon5: nativeAd.socialicon5 && {
+        url: nativeAd.socialicon5.url,
+        height: nativeAd.socialicon5.height,
+        width: nativeAd.socialicon5.width,
+      },
+      customTitle1: nativeAd.title1,
+      customTitle2: nativeAd.title2,
+      customTitle3: nativeAd.title3,
+      customTitle4: nativeAd.title4,
+      customTitle5: nativeAd.title5,
+      customBody1: nativeAd.body1,
+      customBody2: nativeAd.body2,
+      customBody3: nativeAd.body3,
+      customBody4: nativeAd.body4,
+      customBody5: nativeAd.body5,
+      customCta1: nativeAd.ctatext1,
+      customCta2: nativeAd.ctatext2,
+      customCta3: nativeAd.ctatext3,
+      customCta4: nativeAd.ctatext4,
+      customCta5: nativeAd.ctatext5,
+      customDisplayUrl1: nativeAd.displayurl1,
+      customDisplayUrl2: nativeAd.displayurl2,
+      customDisplayUrl3: nativeAd.displayurl3,
+      customDisplayUrl4: nativeAd.displayurl4,
+      customDisplayUrl5: nativeAd.displayurl5,
+      customSocialUrl1: nativeAd.socialurl1,
+      customSocialUrl2: nativeAd.socialurl2,
+      customSocialUrl3: nativeAd.socialurl3,
+      customSocialUrl4: nativeAd.socialurl4,
+      customSocialUrl5: nativeAd.socialurl5
+    };
   } else {
     Object.assign(bid, {
       width: rtbBid.rtb.banner.width,
@@ -738,6 +852,18 @@ function bidToTag(bid) {
   } else {
     tag.code = bid.params.inv_code;
   }
+  // Xandr expects GET variable to be in a following format:
+  // page.html?ast_override_div=divId:creativeId,divId2:creativeId2
+  const overrides = getParameterByName('ast_override_div');
+  if (isStr(overrides) && overrides !== '') {
+    const adUnitOverride = decodeURIComponent(overrides).split(',').find((pair) => pair.startsWith(`${bid.adUnitCode}:`));
+    if (adUnitOverride) {
+      const forceCreativeId = adUnitOverride.split(':')[1];
+      if (forceCreativeId) {
+        tag.force_creative_id = parseInt(forceCreativeId, 10);
+      }
+    }
+  }
   tag.allow_smaller_sizes = bid.params.allow_smaller_sizes || false;
   tag.use_pmt_rule = (typeof bid.params.use_payment_rule === 'boolean') ? bid.params.use_payment_rule
     : (typeof bid.params.use_pmt_rule === 'boolean') ? bid.params.use_pmt_rule : false;
@@ -886,15 +1012,15 @@ function bidToTag(bid) {
                 tag['video_frameworks'] = apiTmp;
               }
               break;
-
             case 'startdelay':
+            case 'plcmt':
             case 'placement':
-              const contextKey = 'context';
-              if (typeof tag.video[contextKey] !== 'number') {
+              if (typeof tag.video.context !== 'number') {
+                const plcmt = videoMediaType['plcmt'];
                 const placement = videoMediaType['placement'];
                 const startdelay = videoMediaType['startdelay'];
-                const context = getContextFromPlacement(placement) || getContextFromStartDelay(startdelay);
-                tag.video[contextKey] = VIDEO_MAPPING[contextKey][context];
+                const contextVal = getContextFromPlcmt(plcmt, startdelay) || getContextFromPlacement(placement) || getContextFromStartDelay(startdelay);
+                tag.video.context = VIDEO_MAPPING.context[contextVal];
               }
               break;
           }
@@ -953,8 +1079,12 @@ function getContextFromPlacement(ortbPlacement) {
 
   if (ortbPlacement === 2) {
     return 'in-banner';
-  } else if (ortbPlacement > 2) {
+  } else if (ortbPlacement === 3) {
     return 'outstream';
+  } else if (ortbPlacement === 4) {
+    return 'in-feed';
+  } else if (ortbPlacement === 5) {
+    return 'intersitial';
   }
 }
 
@@ -972,6 +1102,29 @@ function getContextFromStartDelay(ortbStartDelay) {
   }
 }
 
+function getContextFromPlcmt(ortbPlcmt, ortbStartDelay) {
+  if (!ortbPlcmt) {
+    return;
+  }
+
+  if (ortbPlcmt === 2) {
+    if (typeof ortbStartDelay === 'undefined') {
+      return;
+    }
+    if (ortbStartDelay === 0) {
+      return 'accompanying_content_pre_roll';
+    } else if (ortbStartDelay === -1) {
+      return 'accompanying_content_mid_roll';
+    } else if (ortbStartDelay === -2) {
+      return 'accompanying_content_post_roll';
+    }
+  } else if (ortbPlcmt === 3) {
+    return 'interstitial';
+  } else if (ortbPlcmt === 4) {
+    return 'outstream';
+  }
+}
+
 function hasUserInfo(bid) {
   return !!bid.params.user;
 }
@@ -1181,31 +1334,29 @@ function getBidFloor(bid) {
   return null;
 }
 
-// keywords: { 'genre': ['rock', 'pop'], 'pets': ['dog'] } goes to 'genre=rock,genre=pop,pets=dog'
-function convertKeywordsToString(keywords) {
-  let result = '';
-  Object.keys(keywords).forEach(key => {
-    // if 'text' or ''
-    if (isStr(keywords[key])) {
-      if (keywords[key] !== '') {
-        result += `${key}=${keywords[key]},`
-      } else {
-        result += `${key},`;
-      }
-    } else if (isArray(keywords[key])) {
-      if (keywords[key][0] === '') {
-        result += `${key},`
-      } else {
-        keywords[key].forEach(val => {
-          result += `${key}=${val},`
-        });
-      }
-    }
-  });
+// Convert device data to a format that AppNexus expects
+function convertORTB2DeviceDataToAppNexusDeviceObject(ortb2DeviceData) {
+  const _device = {
+    useragent: ortb2DeviceData.ua,
+    devicetype: ORTB2_DEVICE_TYPE_MAP.get(ortb2DeviceData.devicetype),
+    make: ortb2DeviceData.make,
+    model: ortb2DeviceData.model,
+    os: ortb2DeviceData.os,
+    os_version: ortb2DeviceData.osv,
+    w: ortb2DeviceData.w,
+    h: ortb2DeviceData.h,
+    ppi: ortb2DeviceData.ppi,
+    pxratio: ortb2DeviceData.pxratio,
+  };
 
-  // remove last trailing comma
-  result = result.substring(0, result.length - 1);
-  return result;
+  // filter out any empty values and return the object
+  return Object.keys(_device)
+    .reduce((r, key) => {
+      if (_device[key]) {
+        r[key] = _device[key];
+      }
+      return r;
+    }, {});
 }
 
 registerBidder(spec);
diff --git a/modules/appushBidAdapter.js b/modules/appushBidAdapter.js
index 97772b65e45..ec742120582 100644
--- a/modules/appushBidAdapter.js
+++ b/modules/appushBidAdapter.js
@@ -57,6 +57,7 @@ function getPlacementReqData(bid) {
     placement.protocols = mediaTypes[VIDEO].protocols;
     placement.startdelay = mediaTypes[VIDEO].startdelay;
     placement.placement = mediaTypes[VIDEO].placement;
+    placement.plcmt = mediaTypes[VIDEO].plcmt;
     placement.skip = mediaTypes[VIDEO].skip;
     placement.skipafter = mediaTypes[VIDEO].skipafter;
     placement.minbitrate = mediaTypes[VIDEO].minbitrate;
@@ -84,7 +85,7 @@ function getBidFloor(bid) {
       mediaType: '*',
       size: '*',
     });
-    return bidFloor.floor;
+    return bidFloor?.floor;
   } catch (err) {
     logError(err);
     return 0;
diff --git a/modules/apstreamBidAdapter.js b/modules/apstreamBidAdapter.js
index 2856fb02087..37e2bde44c1 100644
--- a/modules/apstreamBidAdapter.js
+++ b/modules/apstreamBidAdapter.js
@@ -292,7 +292,6 @@ function getConsentStringFromPrebid(gdprConsentConfig) {
     return null;
   }
 
-  let isIab = config.getConfig('consentManagement.cmpApi') != 'static';
   let vendorConsents = (
     gdprConsentConfig.vendorData.vendorConsents ||
     (gdprConsentConfig.vendorData.vendor || {}).consents ||
@@ -300,7 +299,7 @@ function getConsentStringFromPrebid(gdprConsentConfig) {
   );
   let isConsentGiven = !!vendorConsents[CONSTANTS.GVLID.toString(10)];
 
-  return isIab && isConsentGiven ? consentString : null;
+  return isConsentGiven ? consentString : null;
 }
 
 function getIabConsentString(bidderRequest) {
diff --git a/modules/arcspanRtdProvider.js b/modules/arcspanRtdProvider.js
index a7ffa059279..3a9e9b175d8 100644
--- a/modules/arcspanRtdProvider.js
+++ b/modules/arcspanRtdProvider.js
@@ -1,6 +1,11 @@
 import { submodule } from '../src/hook.js';
 import { mergeDeep } from '../src/utils.js';
 import {loadExternalScript} from '../src/adloader.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
 
 /** @type {string} */
 const MODULE_NAME = 'realTimeData';
@@ -24,7 +29,7 @@ function init(config, userConsent) {
     } else {
       scriptUrl = 'https://silo' + config.params.silo + '.p7cloud.net/as.js';
     }
-    loadExternalScript(scriptUrl, SUBMODULE_NAME);
+    loadExternalScript(scriptUrl, MODULE_TYPE_RTD, SUBMODULE_NAME);
   }
   return true;
 }
diff --git a/modules/asoBidAdapter.js b/modules/asoBidAdapter.js
index 704cffefb39..08612757de1 100644
--- a/modules/asoBidAdapter.js
+++ b/modules/asoBidAdapter.js
@@ -1,126 +1,54 @@
-import {
-  _each,
-  deepAccess,
-  deepSetValue,
-  getDNT,
-  inIframe,
-  isArray,
-  isFn,
-  logWarn,
-  parseSizesInput
-} from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { Renderer } from '../src/Renderer.js';
-import { parseDomain } from '../src/refererDetection.js';
+import {deepAccess, deepSetValue} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {tryAppendQueryString} from '../libraries/urlUtils/urlUtils.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'aso';
 const DEFAULT_SERVER_URL = 'https://srv.aso1.net';
 const DEFAULT_SERVER_PATH = '/prebid/bidder';
-const OUTSTREAM_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
-const VERSION = '$prebid.version$_1.1';
+const DEFAULT_CURRENCY = 'USD';
+const VERSION = '$prebid.version$_2.0';
 const TTL = 300;
 
 export const spec = {
 
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   aliases: [
     {code: 'bcmint'},
-    {code: 'bidgency'}
+    {code: 'bidgency'},
+    {code: 'kuantyx'}
   ],
 
   isBidRequestValid: bid => {
     return !!bid.params && !!bid.params.zone;
   },
 
-  buildRequests: (validBidRequests, bidderRequest) => {
-    let serverRequests = [];
+  buildRequests: (bidRequests, bidderRequest) => {
+    let requests = [];
 
-    _each(validBidRequests, bidRequest => {
-      const payload = createBasePayload(bidRequest, bidderRequest);
-
-      const bannerParams = deepAccess(bidRequest, 'mediaTypes.banner');
-      const videoParams = deepAccess(bidRequest, 'mediaTypes.video');
-
-      let imp;
-
-      if (bannerParams && videoParams) {
-        logWarn('Please note, multiple mediaTypes are not supported. The only banner will be used.')
-      }
-
-      if (bannerParams) {
-        imp = createBannerImp(bidRequest, bannerParams)
-      } else if (videoParams) {
-        imp = createVideoImp(bidRequest, videoParams)
-      }
-
-      if (imp) {
-        payload.imp.push(imp);
-      } else {
-        return;
-      }
-
-      serverRequests.push({
+    bidRequests.forEach(bid => {
+      const data = converter.toORTB({bidRequests: [bid], bidderRequest});
+      requests.push({
         method: 'POST',
-        url: getEndpoint(bidRequest),
-        data: payload,
+        url: getEndpoint(bid),
+        data,
         options: {
           withCredentials: true,
           crossOrigin: true
         },
-        bidRequest: bidRequest
-      });
+        bidderRequest
+      })
     });
-
-    return serverRequests;
+    return requests;
   },
 
-  interpretResponse: (serverResponse, {bidRequest}) => {
-    const response = serverResponse && serverResponse.body;
-
-    if (!response) {
-      return [];
-    }
-
-    const serverBids = response.seatbid.reduce((acc, seatBid) => acc.concat(seatBid.bid), []);
-    const serverBid = serverBids[0];
-
-    let bids = [];
-
-    const bid = {
-      requestId: serverBid.impid,
-      cpm: serverBid.price,
-      width: serverBid.w,
-      height: serverBid.h,
-      ttl: TTL,
-      creativeId: serverBid.crid,
-      netRevenue: true,
-      currency: response.cur,
-      mediaType: bidRequest.mediaType,
-      meta: {
-        mediaType: bidRequest.mediaType,
-        advertiserDomains: serverBid.adomain ? serverBid.adomain : []
-      }
-    };
-
-    if (bid.mediaType === BANNER) {
-      bid.ad = serverBid.adm;
-    } else if (bid.mediaType === VIDEO) {
-      bid.vastXml = serverBid.adm;
-      if (deepAccess(bidRequest, 'mediaTypes.video.context') === 'outstream') {
-        bid.adResponse = {
-          content: bid.vastXml,
-        };
-        bid.renderer = createRenderer(bidRequest, OUTSTREAM_RENDERER_URL);
-      }
+  interpretResponse: (response, request) => {
+    if (response.body) {
+      return converter.fromORTB({response: response.body, request: request.data}).bids;
     }
-
-    bids.push(bid);
-
-    return bids;
+    return [];
   },
 
   getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
@@ -141,16 +69,25 @@ export const spec = {
         query = tryAppendQueryString(query, 'us_privacy', uspConsent);
       }
 
-      _each(serverResponses, resp => {
+      if (query.slice(-1) === '&') {
+        query = query.slice(0, -1);
+      }
+
+      serverResponses.forEach(resp => {
         const userSyncs = deepAccess(resp, 'body.ext.user_syncs');
         if (!userSyncs) {
           return;
         }
 
-        _each(userSyncs, us => {
+        userSyncs.forEach(us => {
+          let url = us.url;
+          if (query) {
+            url = url + (url.indexOf('?') === -1 ? '?' : '&') + query;
+          }
+
           urls.push({
             type: us.type,
-            url: us.url + (query ? '?' + query : '')
+            url: url
           });
         });
       });
@@ -160,123 +97,50 @@ export const spec = {
   }
 };
 
-function outstreamRender(bid) {
-  bid.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      sizes: [bid.width, bid.height],
-      targetId: bid.adUnitCode,
-      adResponse: bid.adResponse,
-      rendererOptions: bid.renderer.getConfig()
-    });
-  });
-}
-
-function createRenderer(bid, url) {
-  const renderer = Renderer.install({
-    id: bid.bidId,
-    url: url,
-    loaded: false,
-    config: deepAccess(bid, 'renderer.options'),
-    adUnitCode: bid.adUnitCode
-  });
-  renderer.setRender(outstreamRender);
-  return renderer;
-}
-
-function getUrlsInfo(bidderRequest) {
-  const {page, domain, ref} = bidderRequest.refererInfo;
-  return {
-    // TODO: do the fallbacks make sense here?
-    page: page || bidderRequest.refererInfo?.topmostLocation,
-    referrer: ref || '',
-    domain: domain || parseDomain(bidderRequest?.refererInfo?.topmostLocation)
-  }
-}
-
-function getSize(paramSizes) {
-  const parsedSizes = parseSizesInput(paramSizes);
-  const sizes = parsedSizes.map(size => {
-    const [width, height] = size.split('x');
-    const w = parseInt(width, 10);
-    const h = parseInt(height, 10);
-    return {w, h};
-  });
-
-  return sizes[0] || null;
-}
-
-function getBidFloor(bidRequest, size) {
-  if (!isFn(bidRequest.getFloor)) {
-    return null;
-  }
-
-  const bidFloor = bidRequest.getFloor({
-    mediaType: bidRequest.mediaType,
-    size: size ? [size.w, size.h] : '*'
-  });
-
-  if (!isNaN(bidFloor.floor)) {
-    return bidFloor;
-  }
-
-  return null;
-}
-
-function createBaseImp(bidRequest, size) {
-  const imp = {
-    id: bidRequest.bidId,
-    tagid: bidRequest.adUnitCode,
-    secure: 1
-  };
-
-  const bidFloor = getBidFloor(bidRequest, size);
-  if (bidFloor !== null) {
-    imp.bidfloor = bidFloor.floor;
-    imp.bidfloorcur = bidFloor.currency;
-  }
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: TTL
+  },
 
-  return imp;
-}
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
 
-function createBannerImp(bidRequest, bannerParams) {
-  bidRequest.mediaType = BANNER;
+    imp.tagid = bidRequest.adUnitCode;
+    imp.secure = bidRequest.ortb2Imp?.secure ?? 1;
+    return imp;
+  },
 
-  const size = getSize(bannerParams.sizes);
-  const imp = createBaseImp(bidRequest, size);
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
 
-  imp.banner = {
-    w: size.w,
-    h: size.h,
-    topframe: inIframe() ? 0 : 1
-  }
+    if (bidderRequest.gdprConsent) {
+      const consentsIds = getConsentsIds(bidderRequest.gdprConsent);
+      if (consentsIds) {
+        deepSetValue(request, 'user.ext.consents', consentsIds);
+      }
+    }
 
-  return imp;
-}
+    if (!request.cur) {
+      request.cur = [DEFAULT_CURRENCY];
+    }
 
-function createVideoImp(bidRequest, videoParams) {
-  bidRequest.mediaType = VIDEO;
-  const size = getSize(videoParams.playerSize);
-  const imp = createBaseImp(bidRequest, size);
+    return request;
+  },
 
-  imp.video = {
-    mimes: videoParams.mimes,
-    minduration: videoParams.minduration,
-    startdelay: videoParams.startdelay,
-    linearity: videoParams.linearity,
-    maxduration: videoParams.maxduration,
-    skip: videoParams.skip,
-    protocols: videoParams.protocols,
-    skipmin: videoParams.skipmin,
-    api: videoParams.api
-  }
+  bidResponse(buildBidResponse, bid, context) {
+    context.mediaType = deepAccess(bid, 'ext.prebid.type');
+    return buildBidResponse(bid, context);
+  },
 
-  if (size) {
-    imp.video.w = size.w;
-    imp.video.h = size.h;
+  overrides: {
+    request: {
+      // We don't need extra data
+      gdprAddtlConsent(setAddtlConsent, ortbRequest, bidderRequest) {
+      }
+    }
   }
-
-  return imp;
-}
+});
 
 function getEndpoint(bidRequest) {
   const serverUrl = bidRequest.params.server || DEFAULT_SERVER_URL;
@@ -287,7 +151,7 @@ function getConsentsIds(gdprConsent) {
   const consents = deepAccess(gdprConsent, 'vendorData.purpose.consents', []);
   let consentsIds = [];
 
-  Object.keys(consents).forEach(function (key) {
+  Object.keys(consents).forEach(key => {
     if (consents[key] === true) {
       consentsIds.push(key);
     }
@@ -296,61 +160,4 @@ function getConsentsIds(gdprConsent) {
   return consentsIds.join(',');
 }
 
-function createBasePayload(bidRequest, bidderRequest) {
-  const urlsInfo = getUrlsInfo(bidderRequest);
-
-  const payload = {
-    id: bidRequest.bidId,
-    at: 1,
-    tmax: bidderRequest.timeout,
-    site: {
-      id: urlsInfo.domain,
-      domain: urlsInfo.domain,
-      page: urlsInfo.page,
-      ref: urlsInfo.referrer
-    },
-    device: {
-      dnt: getDNT() ? 1 : 0,
-      h: window.innerHeight,
-      w: window.innerWidth,
-    },
-    imp: [],
-    ext: {},
-    user: {}
-  };
-
-  if (bidRequest.params.attr) {
-    deepSetValue(payload, 'site.ext.attr', bidRequest.params.attr);
-  }
-
-  if (bidderRequest.gdprConsent) {
-    deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-    const consentsIds = getConsentsIds(bidderRequest.gdprConsent);
-    if (consentsIds) {
-      deepSetValue(payload, 'user.ext.consents', consentsIds);
-    }
-    deepSetValue(payload, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1);
-  }
-
-  if (bidderRequest.uspConsent) {
-    deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-  }
-
-  if (config.getConfig('coppa')) {
-    deepSetValue(payload, 'regs.coppa', 1);
-  }
-
-  const eids = deepAccess(bidRequest, 'userIdAsEids');
-  if (eids && eids.length) {
-    deepSetValue(payload, 'user.ext.eids', eids);
-  }
-
-  const schainData = deepAccess(bidRequest, 'schain.nodes');
-  if (isArray(schainData) && schainData.length > 0) {
-    deepSetValue(payload, 'source.ext.schain', bidRequest.schain);
-  }
-
-  return payload;
-}
-
 registerBidder(spec);
diff --git a/modules/asoBidAdapter.md b/modules/asoBidAdapter.md
index f187389c5b5..ebf5cfd4614 100644
--- a/modules/asoBidAdapter.md
+++ b/modules/asoBidAdapter.md
@@ -17,7 +17,6 @@ For more information, please visit [Adserver.Online](https://adserver.online).
 | Name      | Scope    | Description             | Example                | Type       |
 |-----------|----------|-------------------------|------------------------|------------|
 | `zone`    | required | Zone ID                 | `73815`                | `Integer`  |
-| `attr`    | optional | Custom targeting params | `{foo: ["a", "b"]}`    | `Object`   |
 | `server`  | optional | Custom bidder endpoint  | `https://endpoint.url` | `String`   |
 
 # Test parameters for banner
@@ -49,6 +48,9 @@ var videoAdUnit = [
         code: 'video1',
         mediaTypes: {
             video: {
+                mimes: [
+                   "video/mp4"
+                ],
                 playerSize: [[640, 480]],
                 context: 'instream' // or 'outstream'
             }
@@ -69,7 +71,6 @@ The Adserver.Online Bid Adapter expects Prebid Cache (for video) to be enabled.
 
 ```
 pbjs.setConfig({
-    usePrebidCache: true,
     cache: {
         url: 'https://prebid.adnxs.com/pbc/v1/cache'
     }
diff --git a/modules/asteriobidAnalyticsAdapter.js b/modules/asteriobidAnalyticsAdapter.js
new file mode 100644
index 00000000000..615293e2641
--- /dev/null
+++ b/modules/asteriobidAnalyticsAdapter.js
@@ -0,0 +1,336 @@
+import { generateUUID, getParameterByName, logError, logInfo, parseUrl, deepClone, hasNonSerializableProperty } from '../src/utils.js'
+import { ajaxBuilder } from '../src/ajax.js'
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js'
+import adapterManager from '../src/adapterManager.js'
+import { getStorageManager } from '../src/storageManager.js'
+import { EVENTS } from '../src/constants.js'
+import { MODULE_TYPE_ANALYTICS } from '../src/activities/modules.js'
+import {getRefererInfo} from '../src/refererDetection.js';
+
+/**
+ * asteriobidAnalyticsAdapter.js - analytics adapter for AsterioBid
+ */
+export const storage = getStorageManager({ moduleType: MODULE_TYPE_ANALYTICS, moduleName: 'asteriobid' })
+const DEFAULT_EVENT_URL = 'https://endpt.asteriobid.com/endpoint'
+const analyticsType = 'endpoint'
+const analyticsName = 'AsterioBid Analytics'
+const utmTags = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content']
+const _VERSION = 1
+
+let ajax = ajaxBuilder(20000)
+let initOptions
+let auctionStarts = {}
+let auctionTimeouts = {}
+let sampling
+let pageViewId
+let flushInterval
+let eventQueue = []
+let asteriobidAnalyticsEnabled = false
+
+let asteriobidAnalytics = Object.assign(adapter({ url: DEFAULT_EVENT_URL, analyticsType }), {
+  track({ eventType, args }) {
+    handleEvent(eventType, args)
+  }
+})
+
+asteriobidAnalytics.originEnableAnalytics = asteriobidAnalytics.enableAnalytics
+asteriobidAnalytics.enableAnalytics = function (config) {
+  initOptions = config.options || {}
+
+  pageViewId = initOptions.pageViewId || generateUUID()
+  sampling = initOptions.sampling || 1
+
+  if (Math.floor(Math.random() * sampling) === 0) {
+    asteriobidAnalyticsEnabled = true
+    flushInterval = setInterval(flush, 1000)
+  } else {
+    logInfo(`${analyticsName} isn't enabled because of sampling`)
+  }
+
+  asteriobidAnalytics.originEnableAnalytics(config)
+}
+
+asteriobidAnalytics.originDisableAnalytics = asteriobidAnalytics.disableAnalytics
+asteriobidAnalytics.disableAnalytics = function () {
+  if (!asteriobidAnalyticsEnabled) {
+    return
+  }
+  flush()
+  clearInterval(flushInterval)
+  asteriobidAnalytics.originDisableAnalytics()
+}
+
+function collectUtmTagData() {
+  let newUtm = false
+  let pmUtmTags = {}
+  try {
+    utmTags.forEach(function (utmKey) {
+      let utmValue = getParameterByName(utmKey)
+      if (utmValue !== '') {
+        newUtm = true
+      }
+      pmUtmTags[utmKey] = utmValue
+    })
+    if (newUtm === false) {
+      utmTags.forEach(function (utmKey) {
+        let itemValue = storage.getDataFromLocalStorage(`pm_${utmKey}`)
+        if (itemValue && itemValue.length !== 0) {
+          pmUtmTags[utmKey] = itemValue
+        }
+      })
+    } else {
+      utmTags.forEach(function (utmKey) {
+        storage.setDataInLocalStorage(`pm_${utmKey}`, pmUtmTags[utmKey])
+      })
+    }
+  } catch (e) {
+    logError(`${analyticsName} Error`, e)
+    pmUtmTags['error_utm'] = 1
+  }
+  return pmUtmTags
+}
+
+function collectPageInfo() {
+  const pageInfo = {
+    domain: window.location.hostname,
+  }
+  if (document.referrer) {
+    pageInfo.referrerDomain = parseUrl(document.referrer).hostname
+  }
+
+  const refererInfo = getRefererInfo()
+  pageInfo.page = refererInfo.page
+  pageInfo.ref = refererInfo.ref
+
+  return pageInfo
+}
+
+function flush() {
+  if (!asteriobidAnalyticsEnabled) {
+    return
+  }
+
+  if (eventQueue.length > 0) {
+    const data = {
+      pageViewId: pageViewId,
+      ver: _VERSION,
+      bundleId: initOptions.bundleId,
+      events: eventQueue,
+      utmTags: collectUtmTagData(),
+      pageInfo: collectPageInfo(),
+      sampling: sampling
+    }
+    eventQueue = []
+
+    if ('version' in initOptions) {
+      data.version = initOptions.version
+    }
+    if ('tcf_compliant' in initOptions) {
+      data.tcf_compliant = initOptions.tcf_compliant
+    }
+    if ('adUnitDict' in initOptions) {
+      data.adUnitDict = initOptions.adUnitDict;
+    }
+    if ('customParam' in initOptions) {
+      data.customParam = initOptions.customParam;
+    }
+
+    const url = initOptions.url ? initOptions.url : DEFAULT_EVENT_URL
+    ajax(
+      url,
+      () => logInfo(`${analyticsName} sent events batch`),
+      _VERSION + ':' + JSON.stringify(data),
+      {
+        contentType: 'text/plain',
+        method: 'POST',
+        withCredentials: true
+      }
+    )
+  }
+}
+
+function trimAdUnit(adUnit) {
+  if (!adUnit) return adUnit
+  const res = {}
+  res.code = adUnit.code
+  res.sizes = adUnit.sizes
+  return res
+}
+
+function trimBid(bid) {
+  if (!bid) return bid
+  const res = {}
+  res.auctionId = bid.auctionId
+  res.bidder = bid.bidder
+  res.bidderRequestId = bid.bidderRequestId
+  res.bidId = bid.bidId
+  res.crumbs = bid.crumbs
+  res.cpm = bid.cpm
+  res.currency = bid.currency
+  res.mediaTypes = bid.mediaTypes
+  res.sizes = bid.sizes
+  res.transactionId = bid.transactionId
+  res.adUnitCode = bid.adUnitCode
+  res.bidRequestsCount = bid.bidRequestsCount
+  res.serverResponseTimeMs = bid.serverResponseTimeMs
+  return res
+}
+
+function trimBidderRequest(bidderRequest) {
+  if (!bidderRequest) return bidderRequest
+  const res = {}
+  res.auctionId = bidderRequest.auctionId
+  res.auctionStart = bidderRequest.auctionStart
+  res.bidderRequestId = bidderRequest.bidderRequestId
+  res.bidderCode = bidderRequest.bidderCode
+  res.bids = bidderRequest.bids && bidderRequest.bids.map(trimBid)
+  return res
+}
+
+function handleEvent(eventType, eventArgs) {
+  if (!asteriobidAnalyticsEnabled) {
+    return
+  }
+
+  if (eventArgs) {
+    eventArgs = hasNonSerializableProperty(eventArgs) ? eventArgs : deepClone(eventArgs)
+  } else {
+    eventArgs = {}
+  }
+
+  const pmEvent = {}
+  pmEvent.timestamp = eventArgs.timestamp || Date.now()
+  pmEvent.eventType = eventType
+
+  switch (eventType) {
+    case EVENTS.AUCTION_INIT: {
+      pmEvent.auctionId = eventArgs.auctionId
+      pmEvent.timeout = eventArgs.timeout
+      pmEvent.adUnits = eventArgs.adUnits && eventArgs.adUnits.map(trimAdUnit)
+      pmEvent.bidderRequests = eventArgs.bidderRequests && eventArgs.bidderRequests.map(trimBidderRequest)
+      auctionStarts[pmEvent.auctionId] = pmEvent.timestamp
+      auctionTimeouts[pmEvent.auctionId] = pmEvent.timeout
+      break
+    }
+    case EVENTS.AUCTION_END: {
+      pmEvent.auctionId = eventArgs.auctionId
+      pmEvent.end = eventArgs.end
+      pmEvent.start = eventArgs.start
+      pmEvent.adUnitCodes = eventArgs.adUnitCodes
+      pmEvent.bidsReceived = eventArgs.bidsReceived && eventArgs.bidsReceived.map(trimBid)
+      pmEvent.start = auctionStarts[pmEvent.auctionId]
+      pmEvent.end = Date.now()
+      break
+    }
+    case EVENTS.BID_ADJUSTMENT: {
+      break
+    }
+    case EVENTS.BID_TIMEOUT: {
+      pmEvent.bidders = eventArgs && eventArgs.map ? eventArgs.map(trimBid) : eventArgs
+      pmEvent.duration = auctionTimeouts[pmEvent.auctionId]
+      break
+    }
+    case EVENTS.BID_REQUESTED: {
+      pmEvent.auctionId = eventArgs.auctionId
+      pmEvent.bidderCode = eventArgs.bidderCode
+      pmEvent.doneCbCallCount = eventArgs.doneCbCallCount
+      pmEvent.start = eventArgs.start
+      pmEvent.bidderRequestId = eventArgs.bidderRequestId
+      pmEvent.bids = eventArgs.bids && eventArgs.bids.map(trimBid)
+      pmEvent.auctionStart = eventArgs.auctionStart
+      pmEvent.timeout = eventArgs.timeout
+      break
+    }
+    case EVENTS.BID_RESPONSE: {
+      pmEvent.bidderCode = eventArgs.bidderCode
+      pmEvent.width = eventArgs.width
+      pmEvent.height = eventArgs.height
+      pmEvent.adId = eventArgs.adId
+      pmEvent.mediaType = eventArgs.mediaType
+      pmEvent.cpm = eventArgs.cpm
+      pmEvent.currency = eventArgs.currency
+      pmEvent.requestId = eventArgs.requestId
+      pmEvent.adUnitCode = eventArgs.adUnitCode
+      pmEvent.auctionId = eventArgs.auctionId
+      pmEvent.timeToRespond = eventArgs.timeToRespond
+      pmEvent.requestTimestamp = eventArgs.requestTimestamp
+      pmEvent.responseTimestamp = eventArgs.responseTimestamp
+      pmEvent.netRevenue = eventArgs.netRevenue
+      pmEvent.size = eventArgs.size
+      pmEvent.adserverTargeting = eventArgs.adserverTargeting
+      break
+    }
+    case EVENTS.BID_WON: {
+      pmEvent.auctionId = eventArgs.auctionId
+      pmEvent.adId = eventArgs.adId
+      pmEvent.adserverTargeting = eventArgs.adserverTargeting
+      pmEvent.adUnitCode = eventArgs.adUnitCode
+      pmEvent.bidderCode = eventArgs.bidderCode
+      pmEvent.height = eventArgs.height
+      pmEvent.mediaType = eventArgs.mediaType
+      pmEvent.netRevenue = eventArgs.netRevenue
+      pmEvent.cpm = eventArgs.cpm
+      pmEvent.requestTimestamp = eventArgs.requestTimestamp
+      pmEvent.responseTimestamp = eventArgs.responseTimestamp
+      pmEvent.size = eventArgs.size
+      pmEvent.width = eventArgs.width
+      pmEvent.currency = eventArgs.currency
+      pmEvent.bidder = eventArgs.bidder
+      break
+    }
+    case EVENTS.BIDDER_DONE: {
+      pmEvent.auctionId = eventArgs.auctionId
+      pmEvent.auctionStart = eventArgs.auctionStart
+      pmEvent.bidderCode = eventArgs.bidderCode
+      pmEvent.bidderRequestId = eventArgs.bidderRequestId
+      pmEvent.bids = eventArgs.bids && eventArgs.bids.map(trimBid)
+      pmEvent.doneCbCallCount = eventArgs.doneCbCallCount
+      pmEvent.start = eventArgs.start
+      pmEvent.timeout = eventArgs.timeout
+      pmEvent.tid = eventArgs.tid
+      pmEvent.src = eventArgs.src
+      break
+    }
+    case EVENTS.SET_TARGETING: {
+      break
+    }
+    case EVENTS.REQUEST_BIDS: {
+      break
+    }
+    case EVENTS.ADD_AD_UNITS: {
+      break
+    }
+    case EVENTS.AD_RENDER_FAILED: {
+      pmEvent.bid = eventArgs.bid
+      pmEvent.message = eventArgs.message
+      pmEvent.reason = eventArgs.reason
+      break
+    }
+    default:
+      return
+  }
+
+  sendEvent(pmEvent)
+}
+
+function sendEvent(event) {
+  eventQueue.push(event)
+  logInfo(`${analyticsName} Event ${event.eventType}:`, event)
+
+  if (event.eventType === EVENTS.AUCTION_END) {
+    flush()
+  }
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: asteriobidAnalytics,
+  code: 'asteriobid'
+})
+
+asteriobidAnalytics.getOptions = function () {
+  return initOptions
+}
+
+asteriobidAnalytics.flush = flush
+
+export default asteriobidAnalytics
diff --git a/modules/asteriobidAnalyticsAdapter.md b/modules/asteriobidAnalyticsAdapter.md
new file mode 100644
index 00000000000..524cf6e2721
--- /dev/null
+++ b/modules/asteriobidAnalyticsAdapter.md
@@ -0,0 +1,41 @@
+# Overview
+
+Module Name: AsterioBid Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: admin@asteriobid.com
+
+# Description
+Analytics adapter for AsterioBid. Contact admin@asteriobid.com for information.
+
+# Test Parameters
+
+```
+pbjs.enableAnalytics({
+    provider: 'asteriobid',
+    options: {
+        bundleId: '04bcf17b-9733-4675-9f67-d475f881ab78'
+    }
+});
+
+```
+
+# Advanced Parameters
+
+```
+pbjs.enableAnalytics({
+    provider: 'asteriobid',
+    options: {
+        bundleId: '04bcf17b-9733-4675-9f67-d475f881ab78',
+        version: 'v1', // configuration version for the comparison
+        adUnitDict: { // provide names of the ad units for better reporting 
+            adunitid1: 'Top Banner',
+            adunitid2: 'Bottom Banner'
+        },
+        customParam: { // provide custom parameters values that you want to collect and report
+            param1: 'value1',
+            param2: 'value2'
+        }
+    }
+});
+
+```
diff --git a/modules/astraoneBidAdapter.js b/modules/astraoneBidAdapter.js
index d7f92bb5fac..216257fb7bc 100644
--- a/modules/astraoneBidAdapter.js
+++ b/modules/astraoneBidAdapter.js
@@ -2,6 +2,13 @@ import { _map } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { BANNER } from '../src/mediaTypes.js'
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'astraone';
 const SSP_ENDPOINT = 'https://ssp.astraone.io/auction/prebid';
 const TTL = 60;
@@ -94,7 +101,7 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
+   * @param {validBidRequests} validBidRequests an array of bids
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests(validBidRequests, bidderRequest) {
diff --git a/modules/atsAnalyticsAdapter.js b/modules/atsAnalyticsAdapter.js
index 8e92146694f..eaeead6a249 100644
--- a/modules/atsAnalyticsAdapter.js
+++ b/modules/atsAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { logError, logInfo } from '../src/utils.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adaptermanager from '../src/adapterManager.js';
 import {ajax} from '../src/ajax.js';
 import {getStorageManager} from '../src/storageManager.js';
@@ -325,7 +325,7 @@ atsAnalyticsAdapter.getUserAgent = function () {
 
 atsAnalyticsAdapter.setSamplingCookie = function (samplRate) {
   const now = new Date();
-  now.setTime(now.getTime() + 86400000);
+  now.setTime(now.getTime() + 604800000);
   storage.setCookie('_lr_sampling_rate', samplRate, now.toUTCString());
 }
 
@@ -346,12 +346,12 @@ atsAnalyticsAdapter.enableAnalytics = function (config) {
 };
 
 atsAnalyticsAdapter.callHandler = function (evtype, args) {
-  if (evtype === CONSTANTS.EVENTS.BID_REQUESTED) {
+  if (evtype === EVENTS.BID_REQUESTED) {
     handlerRequest = handlerRequest.concat(bidRequestedHandler(args));
-  } else if (evtype === CONSTANTS.EVENTS.BID_RESPONSE) {
+  } else if (evtype === EVENTS.BID_RESPONSE) {
     handlerResponse.push(bidResponseHandler(args));
   }
-  if (evtype === CONSTANTS.EVENTS.AUCTION_END) {
+  if (evtype === EVENTS.AUCTION_END) {
     let bidWonTimeout = atsAnalyticsAdapter.context.bidWonTimeout ? atsAnalyticsAdapter.context.bidWonTimeout : 2000;
     let events = [];
     setTimeout(() => {
diff --git a/modules/audiencerunBidAdapter.js b/modules/audiencerunBidAdapter.js
index e716fe94c8b..df3bbda6a53 100644
--- a/modules/audiencerunBidAdapter.js
+++ b/modules/audiencerunBidAdapter.js
@@ -1,3 +1,7 @@
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER } from '../src/mediaTypes.js';
 import {
   _each,
   deepAccess,
@@ -8,9 +12,15 @@ import {
   logError,
   triggerPixel,
 } from '../src/utils.js';
-import {config} from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
 
 const BIDDER_CODE = 'audiencerun';
 const BASE_URL = 'https://d.audiencerun.com';
@@ -38,7 +48,7 @@ function getBidFloor(bid) {
       mediaType: BANNER,
       size: '*',
     });
-    return bidFloor.floor;
+    return bidFloor?.floor;
   } catch (_) {
     return 0;
   }
@@ -127,7 +137,7 @@ export const spec = {
       referer: deepAccess(bidderRequest, 'refererInfo.topmostLocation'),
       // TODO: please do not send internal data structures over the network
       refererInfo: deepAccess(bidderRequest, 'refererInfo.legacy'),
-      currencyCode: config.getConfig('currency.adServerCurrency'),
+      currencyCode: getCurrencyFromBidderRequest(bidderRequest),
       timeout: config.getConfig('bidderTimeout'),
       bids,
     };
diff --git a/modules/automatadAnalyticsAdapter.js b/modules/automatadAnalyticsAdapter.js
index 7d7bd8cb34c..7ed109ab705 100644
--- a/modules/automatadAnalyticsAdapter.js
+++ b/modules/automatadAnalyticsAdapter.js
@@ -4,7 +4,7 @@ import {
   logMessage
 } from '../src/utils.js';
 
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { config } from '../src/config.js'
@@ -14,10 +14,12 @@ import { config } from '../src/config.js'
 const ADAPTER_CODE = 'automatadAnalytics'
 const trialCountMilsMapping = [1500, 3000, 5000, 10000];
 
-var isLoggingEnabled; var queuePointer = 0; var retryCount = 0; var timer = null; var __atmtdAnalyticsQueue = [];
+var isLoggingEnabled; var queuePointer = 0; var retryCount = 0; var timer = null; var __atmtdAnalyticsQueue = []; var qBeingUsed; var qTraversalComplete;
 
 const prettyLog = (level, text, isGroup = false, cb = () => {}) => {
   if (self.isLoggingEnabled === undefined) {
+    // TODO FIX THIS RULES VIOLATION
+    // eslint-disable-next-line prebid/no-global
     if (window.localStorage.getItem('__aggLoggingEnabled')) {
       self.isLoggingEnabled = true
     } else {
@@ -57,49 +59,49 @@ const processEvents = () => {
 
     try {
       switch (eventType) {
-        case CONSTANTS.EVENTS.AUCTION_INIT:
+        case EVENTS.AUCTION_INIT:
           if (window.atmtdAnalytics && window.atmtdAnalytics.auctionInitHandler) {
             window.atmtdAnalytics.auctionInitHandler(args);
           } else {
             shouldTryAgain = true
           }
           break;
-        case CONSTANTS.EVENTS.BID_REQUESTED:
+        case EVENTS.BID_REQUESTED:
           if (window.atmtdAnalytics && window.atmtdAnalytics.bidRequestedHandler) {
             window.atmtdAnalytics.bidRequestedHandler(args);
           }
           break;
-        case CONSTANTS.EVENTS.BID_RESPONSE:
+        case EVENTS.BID_RESPONSE:
           if (window.atmtdAnalytics && window.atmtdAnalytics.bidResponseHandler) {
             window.atmtdAnalytics.bidResponseHandler(args);
           }
           break;
-        case CONSTANTS.EVENTS.BID_REJECTED:
+        case EVENTS.BID_REJECTED:
           if (window.atmtdAnalytics && window.atmtdAnalytics.bidRejectedHandler) {
             window.atmtdAnalytics.bidRejectedHandler(args);
           }
           break;
-        case CONSTANTS.EVENTS.BIDDER_DONE:
+        case EVENTS.BIDDER_DONE:
           if (window.atmtdAnalytics && window.atmtdAnalytics.bidderDoneHandler) {
             window.atmtdAnalytics.bidderDoneHandler(args);
           }
           break;
-        case CONSTANTS.EVENTS.BID_WON:
+        case EVENTS.BID_WON:
           if (window.atmtdAnalytics && window.atmtdAnalytics.bidWonHandler) {
             window.atmtdAnalytics.bidWonHandler(args);
           }
           break;
-        case CONSTANTS.EVENTS.NO_BID:
+        case EVENTS.NO_BID:
           if (window.atmtdAnalytics && window.atmtdAnalytics.noBidHandler) {
             window.atmtdAnalytics.noBidHandler(args);
           }
           break;
-        case CONSTANTS.EVENTS.BID_TIMEOUT:
+        case EVENTS.BID_TIMEOUT:
           if (window.atmtdAnalytics && window.atmtdAnalytics.bidderTimeoutHandler) {
             window.atmtdAnalytics.bidderTimeoutHandler(args);
           }
           break;
-        case CONSTANTS.EVENTS.AUCTION_DEBUG:
+        case EVENTS.AUCTION_DEBUG:
           if (window.atmtdAnalytics && window.atmtdAnalytics.auctionDebugHandler) {
             window.atmtdAnalytics.auctionDebugHandler(args);
           }
@@ -134,6 +136,9 @@ const processEvents = () => {
     if (trialCountMilsMapping[self.retryCount]) self.prettyLog('warn', `Adapter failed to process event as aggregator has not loaded. Retrying in ${trialCountMilsMapping[self.retryCount]}ms ...`);
     setTimeout(self.processEvents, trialCountMilsMapping[self.retryCount])
     self.retryCount = self.retryCount + 1
+  } else {
+    self.qBeingUsed = false
+    self.qTraversalComplete = true
   }
 }
 
@@ -142,22 +147,18 @@ const addGPTHandlers = () => {
   googletag.cmd = googletag.cmd || []
   googletag.cmd.push(() => {
     googletag.pubads().addEventListener('slotRenderEnded', (event) => {
-      if (window.atmtdAnalytics && window.atmtdAnalytics.slotRenderEndedGPTHandler) {
-        if (window.__atmtdAggregatorFirstAuctionInitialized === true) {
-          window.atmtdAnalytics.slotRenderEndedGPTHandler(event)
-          return;
-        }
+      if (window.atmtdAnalytics && window.atmtdAnalytics.slotRenderEndedGPTHandler && !self.qBeingUsed) {
+        window.atmtdAnalytics.slotRenderEndedGPTHandler(event)
+        return;
       }
       self.__atmtdAnalyticsQueue.push(['slotRenderEnded', event])
       self.prettyLog(`warn`, `Aggregator not initialised at auctionInit, exiting slotRenderEnded handler and pushing to que instead`)
     })
 
     googletag.pubads().addEventListener('impressionViewable', (event) => {
-      if (window.atmtdAnalytics && window.atmtdAnalytics.impressionViewableHandler) {
-        if (window.__atmtdAggregatorFirstAuctionInitialized === true) {
-          window.atmtdAnalytics.impressionViewableHandler(event)
-          return;
-        }
+      if (window.atmtdAnalytics && window.atmtdAnalytics.impressionViewableHandler && !self.qBeingUsed) {
+        window.atmtdAnalytics.impressionViewableHandler(event)
+        return;
       }
       self.__atmtdAnalyticsQueue.push(['impressionViewable', event])
       self.prettyLog(`warn`, `Aggregator not initialised at auctionInit, exiting impressionViewable handler and pushing to que instead`)
@@ -167,13 +168,14 @@ const addGPTHandlers = () => {
 
 const initializeQueue = () => {
   self.__atmtdAnalyticsQueue.push = (args) => {
+    self.qBeingUsed = true
     Array.prototype.push.apply(self.__atmtdAnalyticsQueue, [args]);
     if (timer) {
       clearTimeout(timer);
       timer = null;
     }
 
-    if (args[0] === CONSTANTS.EVENTS.AUCTION_INIT) {
+    if (args[0] === EVENTS.AUCTION_INIT) {
       const timeout = parseInt(config.getConfig('bidderTimeout')) + 1500
       timer = setTimeout(() => {
         self.processEvents()
@@ -196,9 +198,10 @@ let atmtdAdapter = Object.assign({}, baseAdapter, {
   },
 
   track({eventType, args}) {
+    const shouldNotPushToQueue = !self.qBeingUsed
     switch (eventType) {
-      case CONSTANTS.EVENTS.AUCTION_INIT:
-        if (window.atmtdAnalytics && window.atmtdAnalytics.auctionInitHandler) {
+      case EVENTS.AUCTION_INIT:
+        if (window.atmtdAnalytics && window.atmtdAnalytics.auctionInitHandler && shouldNotPushToQueue) {
           self.prettyLog('status', 'Aggregator loaded, initialising auction through handlers');
           window.atmtdAnalytics.auctionInitHandler(args);
         } else {
@@ -206,64 +209,64 @@ let atmtdAdapter = Object.assign({}, baseAdapter, {
           self.__atmtdAnalyticsQueue.push([eventType, args])
         }
         break;
-      case CONSTANTS.EVENTS.BID_REQUESTED:
-        if (window.atmtdAnalytics && window.atmtdAnalytics.bidRequestedHandler) {
+      case EVENTS.BID_REQUESTED:
+        if (window.atmtdAnalytics && window.atmtdAnalytics.bidRequestedHandler && shouldNotPushToQueue) {
           window.atmtdAnalytics.bidRequestedHandler(args);
         } else {
           self.prettyLog('warn', `Aggregator not loaded, pushing ${eventType} to que instead ...`);
           self.__atmtdAnalyticsQueue.push([eventType, args])
         }
         break;
-      case CONSTANTS.EVENTS.BID_REJECTED:
-        if (window.atmtdAnalytics && window.atmtdAnalytics.bidRejectedHandler) {
+      case EVENTS.BID_REJECTED:
+        if (window.atmtdAnalytics && window.atmtdAnalytics.bidRejectedHandler && shouldNotPushToQueue) {
           window.atmtdAnalytics.bidRejectedHandler(args);
         } else {
           self.prettyLog('warn', `Aggregator not loaded, pushing ${eventType} to que instead ...`);
           self.__atmtdAnalyticsQueue.push([eventType, args])
         }
         break;
-      case CONSTANTS.EVENTS.BID_RESPONSE:
-        if (window.atmtdAnalytics && window.atmtdAnalytics.bidResponseHandler) {
+      case EVENTS.BID_RESPONSE:
+        if (window.atmtdAnalytics && window.atmtdAnalytics.bidResponseHandler && shouldNotPushToQueue) {
           window.atmtdAnalytics.bidResponseHandler(args);
         } else {
           self.prettyLog('warn', `Aggregator not loaded, pushing ${eventType} to que instead ...`);
           self.__atmtdAnalyticsQueue.push([eventType, args])
         }
         break;
-      case CONSTANTS.EVENTS.BIDDER_DONE:
-        if (window.atmtdAnalytics && window.atmtdAnalytics.bidderDoneHandler) {
+      case EVENTS.BIDDER_DONE:
+        if (window.atmtdAnalytics && window.atmtdAnalytics.bidderDoneHandler && shouldNotPushToQueue) {
           window.atmtdAnalytics.bidderDoneHandler(args);
         } else {
           self.prettyLog('warn', `Aggregator not loaded, pushing ${eventType} to que instead ...`);
           self.__atmtdAnalyticsQueue.push([eventType, args])
         }
         break;
-      case CONSTANTS.EVENTS.BID_WON:
-        if (window.atmtdAnalytics && window.atmtdAnalytics.bidWonHandler) {
+      case EVENTS.BID_WON:
+        if (window.atmtdAnalytics && window.atmtdAnalytics.bidWonHandler && shouldNotPushToQueue) {
           window.atmtdAnalytics.bidWonHandler(args);
         } else {
           self.prettyLog('warn', `Aggregator not loaded, pushing ${eventType} to que instead ...`);
           self.__atmtdAnalyticsQueue.push([eventType, args])
         }
         break;
-      case CONSTANTS.EVENTS.NO_BID:
-        if (window.atmtdAnalytics && window.atmtdAnalytics.noBidHandler) {
+      case EVENTS.NO_BID:
+        if (window.atmtdAnalytics && window.atmtdAnalytics.noBidHandler && shouldNotPushToQueue) {
           window.atmtdAnalytics.noBidHandler(args);
         } else {
           self.prettyLog('warn', `Aggregator not loaded, pushing ${eventType} to que instead ...`);
           self.__atmtdAnalyticsQueue.push([eventType, args])
         }
         break;
-      case CONSTANTS.EVENTS.AUCTION_DEBUG:
-        if (window.atmtdAnalytics && window.atmtdAnalytics.auctionDebugHandler) {
+      case EVENTS.AUCTION_DEBUG:
+        if (window.atmtdAnalytics && window.atmtdAnalytics.auctionDebugHandler && shouldNotPushToQueue) {
           window.atmtdAnalytics.auctionDebugHandler(args);
         } else {
           self.prettyLog('warn', `Aggregator not loaded, pushing ${eventType} to que instead ...`);
           self.__atmtdAnalyticsQueue.push([eventType, args])
         }
         break;
-      case CONSTANTS.EVENTS.BID_TIMEOUT:
-        if (window.atmtdAnalytics && window.atmtdAnalytics.bidderTimeoutHandler) {
+      case EVENTS.BID_TIMEOUT:
+        if (window.atmtdAnalytics && window.atmtdAnalytics.bidderTimeoutHandler && shouldNotPushToQueue) {
           window.atmtdAnalytics.bidderTimeoutHandler(args);
         } else {
           self.prettyLog('warn', `Aggregator not loaded, pushing ${eventType} to que instead ...`);
@@ -304,7 +307,7 @@ atmtdAdapter.enableAnalytics = function (configuration) {
   atmtdAdapter.originEnableAnalytics(configuration)
 };
 
-/// /////////// ADAPTER REGISTRATION //////////////
+/// /////////// ADAPTER REGISTRATION /////////////
 
 adapterManager.registerAnalyticsAdapter({
   adapter: atmtdAdapter,
@@ -319,7 +322,15 @@ export var self = {
   prettyLog,
   queuePointer,
   retryCount,
-  isLoggingEnabled
+  isLoggingEnabled,
+  qBeingUsed,
+  qTraversalComplete
+}
+
+window.__atmtdAnalyticsGlobalObject = {
+  q: self.__atmtdAnalyticsQueue,
+  qBeingUsed: self.qBeingUsed,
+  qTraversalComplete: self.qTraversalComplete
 }
 
 export default atmtdAdapter;
diff --git a/modules/axisBidAdapter.js b/modules/axisBidAdapter.js
index 8d7f2dd04fd..c2ad40b2b94 100644
--- a/modules/axisBidAdapter.js
+++ b/modules/axisBidAdapter.js
@@ -1,189 +1,53 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
+import { deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
+import {
+  isBidRequestValid,
+  buildRequestsBase,
+  interpretResponse,
+  buildPlacementProcessingFunction,
+} from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'axis';
 const AD_URL = 'https://prebid.axis-marketplace.com/pbjs';
 const SYNC_URL = 'https://cs.axis-marketplace.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { integration, token } = params;
-  const bidfloor = getBidFloor(bid);
+const addPlacementType = (bid, bidderRequest, placement) => {
+  placement.integration = bid.params.integration;
+  placement.token = bid.params.token;
+};
 
-  const placement = {
-    integration,
-    token,
-    bidId,
-    schain,
-    bidfloor
-  };
+const addCustomFieldsToPlacement = (bid, bidderRequest, placement) => {
+  const { mediaTypes } = bid;
 
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
+  if (placement.adFormat === BANNER) {
     placement.pos = mediaTypes[BANNER].pos;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
+  } else if (placement.adFormat === VIDEO) {
     placement.pos = mediaTypes[VIDEO].pos;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
     placement.context = mediaTypes[VIDEO].context;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
   }
+};
 
-  return placement;
-}
+const placementProcessingFunction = buildPlacementProcessingFunction({ addPlacementType, addCustomFieldsToPlacement });
 
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
+const buildRequests = (validBidRequests = [], bidderRequest = {}) => {
+  const request = buildRequestsBase({ adUrl: AD_URL, validBidRequests, bidderRequest, placementProcessingFunction });
 
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (e) {
-    logError(e);
-    return 0;
-  }
-}
+  request.data.iabCat = deepAccess(bidderRequest, 'ortb2.site.cat');
+
+  return request;
+};
 
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && params.integration && params.token);
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+  isBidRequestValid: isBidRequestValid(['integration', 'token'], 'every'),
+  buildRequests,
+  interpretResponse,
 
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      iabCat: deepAccess(bidderRequest, 'ortb2.site.cat'),
-      coppa: deepAccess(bidderRequest, 'ortb2.regs.coppa') ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout || 3000,
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) => {
     let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
     let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
     if (gdprConsent && gdprConsent.consentString) {
@@ -197,6 +61,11 @@ export const spec = {
       syncUrl += `&ccpa=${uspConsent.consentString}`;
     }
 
+    if (gppConsent?.gppString && gppConsent?.applicableSections?.length) {
+      syncUrl += '&gpp=' + gppConsent.gppString;
+      syncUrl += '&gpp_sid=' + gppConsent.applicableSections.join(',');
+    }
+
     const coppa = config.getConfig('coppa') ? 1 : 0;
     syncUrl += `&coppa=${coppa}`;
 
@@ -205,6 +74,6 @@ export const spec = {
       url: syncUrl
     }];
   }
-};
+}
 
 registerBidder(spec);
diff --git a/modules/axonixBidAdapter.js b/modules/axonixBidAdapter.js
index 87c3aff444a..2eefb617636 100644
--- a/modules/axonixBidAdapter.js
+++ b/modules/axonixBidAdapter.js
@@ -21,7 +21,7 @@ function getBidFloor(bidRequest) {
     });
   }
 
-  return floorInfo.floor || 0;
+  return floorInfo?.floor || 0;
 }
 
 function getPageUrl(bidRequest, bidderRequest) {
@@ -120,7 +120,7 @@ export const spec = {
         prebidVersion: '$prebid.version$',
         screenHeight: screen.height,
         screenWidth: screen.width,
-        tmax: config.getConfig('bidderTimeout'),
+        tmax: bidderRequest.timeout,
         ua: navigator.userAgent,
       };
 
diff --git a/modules/azerionedgeRtdProvider.js b/modules/azerionedgeRtdProvider.js
new file mode 100644
index 00000000000..7e8a32e6f93
--- /dev/null
+++ b/modules/azerionedgeRtdProvider.js
@@ -0,0 +1,153 @@
+/**
+ * This module adds the Azerion provider to the real time data module of prebid.
+ *
+ * The {@link module:modules/realTimeData} module is required
+ * @module modules/azerionedgeRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import { submodule } from '../src/hook.js';
+import { mergeDeep } from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { loadExternalScript } from '../src/adloader.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('./rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
+const REAL_TIME_MODULE = 'realTimeData';
+const SUBREAL_TIME_MODULE = 'azerionedge';
+export const STORAGE_KEY = 'ht-pa-v1-a';
+
+const IMPROVEDIGITAL_GVLID = '253';
+
+export const storage = getStorageManager({
+  moduleType: MODULE_TYPE_RTD,
+  moduleName: SUBREAL_TIME_MODULE,
+});
+
+/**
+ * Get script url to load
+ *
+ * @param {Object} config
+ *
+ * @return {String}
+ */
+function getScriptURL(config) {
+  const VERSION = 'v1';
+  const key = config.params?.key;
+  const publisherPath = key ? `${key}/` : '';
+  return `https://edge.hyth.io/js/${VERSION}/${publisherPath}azerion-edge.min.js`;
+}
+
+/**
+ * Attach script tag to DOM
+ *
+ * @param {Object} config
+ * @param {Object} userConsent
+ *
+ * @return {void}
+ */
+export function attachScript(config, userConsent) {
+  const script = getScriptURL(config);
+  loadExternalScript(script, MODULE_TYPE_RTD, SUBREAL_TIME_MODULE, () => {
+    if (typeof window.azerionPublisherAudiences === 'function') {
+      const publisherConfig = config.params?.process || {};
+      window.azerionPublisherAudiences({
+        ...publisherConfig,
+        gdprApplies: userConsent?.gdpr?.gdprApplies,
+        gdprConsent: userConsent?.gdpr?.consentString,
+        uspConsent: userConsent?.usp,
+      });
+    }
+  });
+}
+
+/**
+ * Fetch audiences info from localStorage.
+ *
+ * @return {Array} Audience ids.
+ */
+export function getAudiences() {
+  try {
+    const data = storage.getDataFromLocalStorage(STORAGE_KEY);
+    return JSON.parse(data).map(({ id }) => id);
+  } catch (_) {
+    return [];
+  }
+}
+
+/**
+ * Pass audience data to configured bidders, using ORTB2
+ *
+ * @param {Object} reqBidsConfigObj
+ * @param {Object} config
+ * @param {Array} audiences
+ *
+ * @return {void}
+ */
+export function setAudiencesToBidders(reqBidsConfigObj, config, audiences) {
+  const defaultBidders = ['improvedigital'];
+  const bidders = config.params?.bidders || defaultBidders;
+  bidders.forEach((bidderCode) =>
+    mergeDeep(reqBidsConfigObj.ortb2Fragments.bidder, {
+      [bidderCode]: {
+        user: {
+          data: [
+            {
+              name: 'azerionedge',
+              ext: { segtax: 4 },
+              segment: audiences.map((id) => ({ id })),
+            },
+          ],
+        },
+      },
+    })
+  );
+}
+
+/**
+ * Module initialisation.
+ *
+ * @param {Object} config
+ * @param {Object} userConsent
+ *
+ * @return {boolean}
+ */
+function init(config, userConsent) {
+  attachScript(config, userConsent);
+  return true;
+}
+
+/**
+ * Real-time user audiences retrieval
+ *
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
+ * @param {Object} config
+ * @param {Object} userConsent
+ *
+ * @return {void}
+ */
+export function getBidRequestData(
+  reqBidsConfigObj,
+  callback,
+  config,
+  userConsent
+) {
+  const audiences = getAudiences();
+  if (audiences.length > 0) {
+    setAudiencesToBidders(reqBidsConfigObj, config, audiences);
+  }
+  callback();
+}
+
+/** @type {RtdSubmodule} */
+export const azerionedgeSubmodule = {
+  name: SUBREAL_TIME_MODULE,
+  init: init,
+  getBidRequestData: getBidRequestData,
+  gvlid: IMPROVEDIGITAL_GVLID,
+};
+
+submodule(REAL_TIME_MODULE, azerionedgeSubmodule);
diff --git a/modules/azerionedgeRtdProvider.md b/modules/azerionedgeRtdProvider.md
new file mode 100644
index 00000000000..e1bdf792647
--- /dev/null
+++ b/modules/azerionedgeRtdProvider.md
@@ -0,0 +1,97 @@
+---
+layout: page_v2
+title: Azerion Edge RTD Provider
+display_name: Azerion Edge RTD Provider
+description: Client-side contextual cookieless audiences.
+page_type: module
+module_type: rtd
+module_code: azerionedgeRtdProvider
+enable_download: true
+vendor_specific: true
+sidebarType: 1
+---
+
+# Azerion Edge RTD Provider
+
+Client-side contextual cookieless audiences.
+
+Azerion Edge RTD module helps publishers to capture users' interest
+audiences on their site, and attach these into the bid request.
+
+Please contact [edge@azerion.com](edge@azerion.com) for more information.
+
+Maintainer: [azerion.com](https://www.azerion.com/)
+
+{:.no_toc}
+
+- TOC
+  {:toc}
+
+## Integration
+
+Compile the Azerion Edge RTD module (`azerionedgeRtdProvider`) into your Prebid build,
+along with the parent RTD Module (`rtdModule`):
+
+```bash
+gulp build --modules=rtdModule,azerionedgeRtdProvider
+```
+
+Set configuration via `pbjs.setConfig`.
+
+```js
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: 'azerionedge',
+                waitForIt: true,
+                params: {
+                    key: '',
+                    bidders: ['improvedigital'],
+                    process: {}
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### Parameter Description
+
+{: .table .table-bordered .table-striped }
+| Name | Type | Description | Notes |
+| :--- | :------- | :------------------ | :--------------- |
+| name | `String` | RTD sub module name | Always "azerionedge" |
+| waitForIt | `Boolean` | Required to ensure that the auction is delayed for the module to respond. | Optional. Defaults to false but recommended to true. |
+| params.key | `String` | Publisher partner specific key | Mandatory. The key is required for the module to work. If you haven't received one, please reach [support@improvedigital.com](support@improvedigital.com) |
+| params.bidders | `Array` | Bidders with which to share segment information | Optional. Defaults to "improvedigital". |
+| params.process | `Object` | Configuration for the Azerion Edge script. | Optional. Defaults to `{}`. |
+
+## Context
+
+As all data collection is on behalf of the publisher and based on the consent the publisher has
+received from the user, this module does not require a TCF vendor configuration. Consent is
+provided to the module when the user gives the relevant permissions on the publisher website.
+
+As Prebid.js utilizes TCF vendor consent for the RTD module to load, the module needs to be labeled
+within the Vendor Exceptions.
+
+## Testing
+
+To view an example:
+
+```bash
+gulp serve-fast --modules=rtdModule,azerionedgeRtdProvider
+```
+
+Access [http://localhost:9999/integrationExamples/gpt/azerionedgeRtdProvider_example.html](http://localhost:9999/integrationExamples/gpt/azerionedgeRtdProvider_example.html)
+in your browser.
+
+Run the unit tests:
+
+```bash
+npm test -- --file "test/spec/modules/azerionedgeRtdProvider_spec.js"
+```
diff --git a/modules/beachfrontBidAdapter.js b/modules/beachfrontBidAdapter.js
index 658fc30b43b..d05769de010 100644
--- a/modules/beachfrontBidAdapter.js
+++ b/modules/beachfrontBidAdapter.js
@@ -4,18 +4,16 @@ import {
   deepSetValue,
   getUniqueIdentifierStr,
   isArray,
-  isFn,
   logWarn,
-  parseSizesInput,
-  parseUrl,
   formatQS
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {Renderer} from '../src/Renderer.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {find, includes} from '../src/polyfill.js';
+import {find} from '../src/polyfill.js';
+import { getFirstSize, getOsVersion, getVideoSizes, getBannerSizes, isConnectedTV, getDoNotTrack, isMobile, isBannerBid, isVideoBid, getBannerBidFloor, getVideoBidFloor, getVideoTargetingParams, getTopWindowLocation } from '../libraries/advangUtils/index.js';
 
-const ADAPTER_VERSION = '1.20';
+const ADAPTER_VERSION = '1.21';
 const ADAPTER_NAME = 'BFIO_PREBID';
 const OUTSTREAM = 'outstream';
 const CURRENCY = 'USD';
@@ -26,7 +24,7 @@ export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/l
 export const SYNC_IFRAME_ENDPOINT = 'https://sync.bfmio.com/sync_iframe';
 export const SYNC_IMAGE_ENDPOINT = 'https://sync.bfmio.com/syncb';
 
-export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'placement', 'skip', 'skipmin', 'skipafter'];
+export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'placement', 'plcmt', 'skip', 'skipmin', 'skipafter'];
 export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
 
 export const SUPPORTED_USER_IDS = [
@@ -222,69 +220,6 @@ function createRenderer(bidRequest) {
   return renderer;
 }
 
-function getFirstSize(sizes) {
-  return (sizes && sizes.length) ? sizes[0] : { w: undefined, h: undefined };
-}
-
-function parseSizes(sizes) {
-  return parseSizesInput(sizes).map(size => {
-    let [ width, height ] = size.split('x');
-    return {
-      w: parseInt(width, 10) || undefined,
-      h: parseInt(height, 10) || undefined
-    };
-  });
-}
-
-function getVideoSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
-}
-
-function getBannerSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
-}
-
-function getOsVersion() {
-  let clientStrings = [
-    { s: 'Android', r: /Android/ },
-    { s: 'iOS', r: /(iPhone|iPad|iPod)/ },
-    { s: 'Mac OS X', r: /Mac OS X/ },
-    { s: 'Mac OS', r: /(MacPPC|MacIntel|Mac_PowerPC|Macintosh)/ },
-    { s: 'Linux', r: /(Linux|X11)/ },
-    { s: 'Windows 10', r: /(Windows 10.0|Windows NT 10.0)/ },
-    { s: 'Windows 8.1', r: /(Windows 8.1|Windows NT 6.3)/ },
-    { s: 'Windows 8', r: /(Windows 8|Windows NT 6.2)/ },
-    { s: 'Windows 7', r: /(Windows 7|Windows NT 6.1)/ },
-    { s: 'Windows Vista', r: /Windows NT 6.0/ },
-    { s: 'Windows Server 2003', r: /Windows NT 5.2/ },
-    { s: 'Windows XP', r: /(Windows NT 5.1|Windows XP)/ },
-    { s: 'UNIX', r: /UNIX/ },
-    { s: 'Search Bot', r: /(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves\/Teoma|ia_archiver)/ }
-  ];
-  let cs = find(clientStrings, cs => cs.r.test(navigator.userAgent));
-  return cs ? cs.s : 'unknown';
-}
-
-function isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
-}
-
-function isConnectedTV() {
-  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
-}
-
-function getDoNotTrack() {
-  return navigator.doNotTrack === '1' || window.doNotTrack === '1' || navigator.msDoNoTrack === '1' || navigator.doNotTrack === 'yes';
-}
-
-function isVideoBid(bid) {
-  return deepAccess(bid, 'mediaTypes.video');
-}
-
-function isBannerBid(bid) {
-  return deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
-}
-
 function getVideoBidParam(bid, key) {
   return deepAccess(bid, 'params.video.' + key) || deepAccess(bid, 'params.' + key);
 }
@@ -298,16 +233,6 @@ function getPlayerBidParam(bid, key, defaultValue) {
   return param === undefined ? defaultValue : param;
 }
 
-function getBannerBidFloor(bid) {
-  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: CURRENCY, mediaType: 'banner', size: '*' }) : {};
-  return floorInfo.floor || getBannerBidParam(bid, 'bidfloor');
-}
-
-function getVideoBidFloor(bid) {
-  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: CURRENCY, mediaType: 'video', size: '*' }) : {};
-  return floorInfo.floor || getVideoBidParam(bid, 'bidfloor');
-}
-
 function isVideoBidValid(bid) {
   return isVideoBid(bid) && getVideoBidParam(bid, 'appId') && getVideoBidParam(bid, 'bidfloor');
 }
@@ -316,10 +241,6 @@ function isBannerBidValid(bid) {
   return isBannerBid(bid) && getBannerBidParam(bid, 'appId') && getBannerBidParam(bid, 'bidfloor');
 }
 
-function getTopWindowLocation(bidderRequest) {
-  return parseUrl(bidderRequest?.refererInfo?.page, { decodeSearchAsString: true });
-}
-
 function getEids(bid) {
   return SUPPORTED_USER_IDS
     .map(getUserId(bid))
@@ -347,26 +268,10 @@ function formatEid(id, source, rtiPartner, atype) {
   };
 }
 
-function getVideoTargetingParams(bid) {
-  const result = {};
-  const excludeProps = ['playerSize', 'context', 'w', 'h'];
-  Object.keys(Object(bid.mediaTypes.video))
-    .filter(key => !includes(excludeProps, key))
-    .forEach(key => {
-      result[ key ] = bid.mediaTypes.video[ key ];
-    });
-  Object.keys(Object(bid.params.video))
-    .filter(key => includes(VIDEO_TARGETING, key))
-    .forEach(key => {
-      result[ key ] = bid.params.video[ key ];
-    });
-  return result;
-}
-
 function createVideoRequestData(bid, bidderRequest) {
   let sizes = getVideoSizes(bid);
   let firstSize = getFirstSize(sizes);
-  let video = getVideoTargetingParams(bid);
+  let video = getVideoTargetingParams(bid, VIDEO_TARGETING);
   let appId = getVideoBidParam(bid, 'appId');
   let bidfloor = getVideoBidFloor(bid);
   let tagid = getVideoBidParam(bid, 'tagid');
diff --git a/modules/beopBidAdapter.js b/modules/beopBidAdapter.js
index b6b6107ddd0..a24579af9a9 100644
--- a/modules/beopBidAdapter.js
+++ b/modules/beopBidAdapter.js
@@ -1,33 +1,43 @@
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+import { getAllOrtbKeywords } from '../libraries/keywords/keywords.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getRefererInfo } from '../src/refererDetection.js';
 import {
   buildUrl,
-  deepAccess, getBidIdParameter,
+  deepAccess, generateUUID, getBidIdParameter,
   getValue,
   isArray,
+  isPlainObject,
   logInfo,
   logWarn,
   triggerPixel
 } from '../src/utils.js';
-import {getRefererInfo} from '../src/refererDetection.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {config} from '../src/config.js';
-import {getAllOrtbKeywords} from '../libraries/keywords/keywords.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ */
 
 const BIDDER_CODE = 'beop';
 const ENDPOINT_URL = 'https://hb.beop.io/bid';
+const COOKIE_NAME = 'beopid';
 const TCF_VENDOR_ID = 666;
 
 const validIdRegExp = /^[0-9a-fA-F]{24}$/
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: TCF_VENDOR_ID,
   aliases: ['bp'],
   /**
-    * Test if the bid request is valid.
-    *
-    * @param {bid} : The Bid params
-    * @return boolean true if the bid request is valid (aka contains a valid accountId or networkId and is open for BANNER), false otherwise.
-    */
+   * Test if the bid request is valid.
+   *
+   * @param {Bid} bid The Bid params
+   * @return boolean true if the bid request is valid (aka contains a valid accountId or networkId and is open for BANNER), false otherwise.
+   */
   isBidRequestValid: function(bid) {
     const id = bid.params.accountId || bid.params.networkId;
     if (id === null || typeof id === 'undefined') {
@@ -39,14 +49,14 @@ export const spec = {
     return bid.mediaTypes.banner !== null && typeof bid.mediaTypes.banner !== 'undefined';
   },
   /**
-    * Create a BeOp server request from a list of BidRequest
-    *
-    * @param {validBidRequests[], ...} : The array of validated bidRequests
-    * @param {... , bidderRequest} : Common params for each bidRequests
-    * @return ServerRequest Info describing the request to the BeOp's server
-    */
+   * Create a BeOp server request from a list of BidRequest
+   *
+   * @param {validBidRequests} validBidRequests The array of validated bidRequests
+   * @param {BidderRequest} bidderRequest Common params for each bidRequests
+   * @return ServerRequest Info describing the request to the BeOp's server
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
-    const slots = validBidRequests.map(beOpRequestSlotsMaker);
+    const slots = validBidRequests.map((bid) => beOpRequestSlotsMaker(bid, bidderRequest));
     const firstPartyData = bidderRequest.ortb2 || {};
     const psegs = firstPartyData.user?.ext?.permutive || firstPartyData.user?.ext?.data?.permutive || [];
     const userBpSegs = firstPartyData.user?.ext?.bpsegs || firstPartyData.user?.ext?.data?.bpsegs || [];
@@ -57,21 +67,35 @@ export const spec = {
     const kwdsFromRequest = firstSlot.kwds;
     let keywords = getAllOrtbKeywords(bidderRequest.ortb2, kwdsFromRequest);
 
+    let beopid = '';
+    if (storage.cookiesAreEnabled) {
+      beopid = storage.getCookie(COOKIE_NAME, undefined);
+      if (!beopid) {
+        beopid = generateUUID();
+        let expirationDate = new Date();
+        expirationDate.setTime(expirationDate.getTime() + 86400 * 183 * 1000);
+        storage.setCookie(COOKIE_NAME, beopid, expirationDate.toUTCString());
+      }
+    } else {
+      storage.setCookie(COOKIE_NAME, '', 0);
+    }
+
     const payloadObject = {
       at: new Date().toString(),
       nid: firstSlot.nid,
       nptnid: firstSlot.nptnid,
       pid: firstSlot.pid,
-      psegs: psegs,
-      bpsegs: (userBpSegs.concat(siteBpSegs)).map(item => item.toString()),
+      bpsegs: (userBpSegs.concat(siteBpSegs, psegs)).map(item => item.toString()),
       url: pageUrl,
       lang: (window.navigator.language || window.navigator.languages[0]),
       kwds: keywords,
       dbg: false,
+      fg: beopid,
       slts: slots,
       is_amp: deepAccess(bidderRequest, 'referrerInfo.isAmp'),
       gdpr_applies: gdpr ? gdpr.gdprApplies : false,
       tc_string: (gdpr && gdpr.gdprApplies) ? gdpr.consentString : null,
+      eids: firstSlot.eids,
     };
 
     const payloadString = JSON.stringify(payloadObject);
@@ -135,13 +159,13 @@ function buildTrackingParams(data, info, value) {
   };
 }
 
-function beOpRequestSlotsMaker(bid) {
+function beOpRequestSlotsMaker(bid, bidderRequest) {
   const bannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
-  const publisherCurrency = config.getConfig('currency.adServerCurrency') || getValue(bid.params, 'currency') || 'EUR';
+  const publisherCurrency = getCurrencyFromBidderRequest(bidderRequest) || getValue(bid.params, 'currency') || 'EUR';
   let floor;
   if (typeof bid.getFloor === 'function') {
     const floorInfo = bid.getFloor({currency: publisherCurrency, mediaType: 'banner', size: [1, 1]});
-    if (typeof floorInfo === 'object' && floorInfo.currency === publisherCurrency && !isNaN(parseFloat(floorInfo.floor))) {
+    if (isPlainObject(floorInfo) && floorInfo.currency === publisherCurrency && !isNaN(parseFloat(floorInfo.floor))) {
       floor = parseFloat(floorInfo.floor);
     }
   }
@@ -159,6 +183,7 @@ function beOpRequestSlotsMaker(bid) {
     brc: getBidIdParameter('bidRequestsCount', bid),
     bdrc: getBidIdParameter('bidderRequestCount', bid),
     bwc: getBidIdParameter('bidderWinsCount', bid),
+    eids: bid.userIdAsEids,
   }
 }
 
diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index 6883b7cce2c..d2010f22e1a 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -3,6 +3,15 @@ import {parseSizesInput} from '../src/utils.js';
 import {includes} from '../src/polyfill.js';
 import {getAdUnitSizes} from '../libraries/sizeUtils/sizeUtils.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
 const BIDDER_CODE = 'between';
 let ENDPOINT = 'https://ads.betweendigital.com/adjson?t=prebid';
 const CODE_TYPES = ['inpage', 'preroll', 'midroll', 'postroll'];
@@ -23,7 +32,7 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequest?pbjs_debug=trues[]} - an array of bids
+   * @param {validBidRequests} validBidRequests an array of bids
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
diff --git a/modules/beyondmediaBidAdapter.js b/modules/beyondmediaBidAdapter.js
index bbcd972470c..077717c36f4 100644
--- a/modules/beyondmediaBidAdapter.js
+++ b/modules/beyondmediaBidAdapter.js
@@ -1,202 +1,19 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'beyondmedia';
 const AD_URL = 'https://backend.andbeyond.media/pbjs';
 const SYNC_URL = 'https://cookies.andbeyond.media';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  placement.placementId = placementId;
-  placement.type = 'publisher';
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && params.placementId);
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    }
-
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(['placementId']),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/bidResponseFilter/index.js b/modules/bidResponseFilter/index.js
new file mode 100644
index 00000000000..5b138965983
--- /dev/null
+++ b/modules/bidResponseFilter/index.js
@@ -0,0 +1,55 @@
+import { auctionManager } from '../../src/auctionManager.js';
+import { config } from '../../src/config.js';
+import { getHook } from '../../src/hook.js';
+
+export const MODULE_NAME = 'bidResponseFilter';
+export const BID_CATEGORY_REJECTION_REASON = 'Category is not allowed';
+export const BID_ADV_DOMAINS_REJECTION_REASON = 'Adv domain is not allowed';
+export const BID_ATTR_REJECTION_REASON = 'Attr is not allowed';
+
+let moduleConfig;
+let enabled = false;
+
+function init() {
+  config.getConfig(MODULE_NAME, (cfg) => {
+    moduleConfig = cfg[MODULE_NAME];
+    if (enabled && !moduleConfig) {
+      reset();
+    } else if (!enabled && moduleConfig) {
+      enabled = true;
+      getHook('addBidResponse').before(addBidResponseHook);
+    }
+  })
+}
+
+export function reset() {
+  enabled = false;
+  getHook('addBidResponse').getHooks({hook: addBidResponseHook}).remove();
+}
+
+export function addBidResponseHook(next, adUnitCode, bid, reject, index = auctionManager.index) {
+  const {bcat = [], badv = []} = index.getOrtb2(bid) || {};
+  const battr = index.getBidRequest(bid)?.ortb2Imp[bid.mediaType]?.battr || index.getAdUnit(bid)?.ortb2Imp[bid.mediaType]?.battr || [];
+
+  const catConfig = {enforce: true, blockUnknown: true, ...(moduleConfig?.cat || {})};
+  const advConfig = {enforce: true, blockUnknown: true, ...(moduleConfig?.adv || {})};
+  const attrConfig = {enforce: true, blockUnknown: true, ...(moduleConfig?.attr || {})};
+
+  const { primaryCatId, secondaryCatIds = [], advertiserDomains = [], attr: metaAttr } = bid.meta || {};
+
+  // checking if bid fulfills ortb2 fields rules
+  if ((catConfig.enforce && bcat.some(category => [primaryCatId, ...secondaryCatIds].includes(category))) ||
+    (catConfig.blockUnknown && !primaryCatId)) {
+    reject(BID_CATEGORY_REJECTION_REASON);
+  } else if ((advConfig.enforce && badv.some(domain => advertiserDomains.includes(domain))) ||
+    (advConfig.blockUnknown && !advertiserDomains.length)) {
+    reject(BID_ADV_DOMAINS_REJECTION_REASON);
+  } else if ((attrConfig.enforce && battr.includes(metaAttr)) ||
+    (attrConfig.blockUnknown && !metaAttr)) {
+    reject(BID_ATTR_REJECTION_REASON);
+  } else {
+    return next(adUnitCode, bid, reject);
+  }
+}
+
+init();
diff --git a/modules/bidViewability.js b/modules/bidViewability.js
index be18095e369..3bfcd93174a 100644
--- a/modules/bidViewability.js
+++ b/modules/bidViewability.js
@@ -4,11 +4,12 @@
 
 import {config} from '../src/config.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import {EVENTS} from '../src/constants.js';
 import {isFn, logWarn, triggerPixel} from '../src/utils.js';
 import {getGlobal} from '../src/prebidGlobal.js';
-import adapterManager, {gdprDataHandler, uspDataHandler, gppDataHandler} from '../src/adapterManager.js';
+import adapterManager, {gppDataHandler, uspDataHandler} from '../src/adapterManager.js';
 import {find} from '../src/polyfill.js';
+import {gdprParams} from '../libraries/dfpUtils/dfpUtils.js';
 
 const MODULE_NAME = 'bidViewability';
 const CONFIG_ENABLED = 'enabled';
@@ -32,14 +33,7 @@ export let getMatchingWinningBidForGPTSlot = (globalModuleConfig, slot) => {
 
 export let fireViewabilityPixels = (globalModuleConfig, bid) => {
   if (globalModuleConfig[CONFIG_FIRE_PIXELS] === true && bid.hasOwnProperty(BID_VURL_ARRAY)) {
-    let queryParams = {};
-
-    const gdprConsent = gdprDataHandler.getConsentData();
-    if (gdprConsent) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') { queryParams.gdpr = Number(gdprConsent.gdprApplies); }
-      if (gdprConsent.consentString) { queryParams.gdpr_consent = gdprConsent.consentString; }
-      if (gdprConsent.addtlConsent) { queryParams.addtl_consent = gdprConsent.addtlConsent; }
-    }
+    let queryParams = gdprParams();
 
     const uspConsent = uspDataHandler.getConsentData();
     if (uspConsent) { queryParams.us_privacy = uspConsent; }
@@ -67,7 +61,6 @@ export let logWinningBidNotFound = (slot) => {
 
 export let impressionViewableHandler = (globalModuleConfig, slot, event) => {
   let respectiveBid = getMatchingWinningBidForGPTSlot(globalModuleConfig, slot);
-  let respectiveDeferredAdUnit = getGlobal().adUnits.find(adUnit => adUnit.deferBilling && respectiveBid.adUnitCode === adUnit.code);
 
   if (respectiveBid === null) {
     logWinningBidNotFound(slot);
@@ -77,17 +70,17 @@ export let impressionViewableHandler = (globalModuleConfig, slot, event) => {
     // trigger respective bidder's onBidViewable handler
     adapterManager.callBidViewableBidder(respectiveBid.adapterCode || respectiveBid.bidder, respectiveBid);
 
-    if (respectiveDeferredAdUnit) {
-      adapterManager.callBidBillableBidder(respectiveBid);
+    if (respectiveBid.deferBilling) {
+      adapterManager.triggerBilling(respectiveBid);
     }
 
     // emit the BID_VIEWABLE event with bid details, this event can be consumed by bidders and analytics pixels
-    events.emit(CONSTANTS.EVENTS.BID_VIEWABLE, respectiveBid);
+    events.emit(EVENTS.BID_VIEWABLE, respectiveBid);
   }
 };
 
 export let init = () => {
-  events.on(CONSTANTS.EVENTS.AUCTION_INIT, () => {
+  events.on(EVENTS.AUCTION_INIT, () => {
     // read the config for the module
     const globalModuleConfig = config.getConfig(MODULE_NAME) || {};
     // do nothing if module-config.enabled is not set to true
diff --git a/modules/bidViewabilityIO.js b/modules/bidViewabilityIO.js
index ff7ec70e32c..61b8af66bf8 100644
--- a/modules/bidViewabilityIO.js
+++ b/modules/bidViewabilityIO.js
@@ -1,7 +1,7 @@
 import { logMessage } from '../src/utils.js';
 import { config } from '../src/config.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import {EVENTS} from '../src/constants.js';
 
 const MODULE_NAME = 'bidViewabilityIO';
 const CONFIG_ENABLED = 'enabled';
@@ -42,7 +42,7 @@ export let getViewableOptions = (bid) => {
 export let markViewed = (bid, entry, observer) => {
   return () => {
     observer.unobserve(entry.target);
-    events.emit(CONSTANTS.EVENTS.BID_VIEWABLE, bid);
+    events.emit(EVENTS.BID_VIEWABLE, bid);
     _logMessage(`id: ${entry.target.getAttribute('id')} code: ${bid.adUnitCode} was viewed`);
   }
 }
@@ -77,7 +77,7 @@ export let init = () => {
     if (conf[MODULE_NAME][CONFIG_ENABLED] && CLIENT_SUPPORTS_IO) {
       // if the module is enabled and the browser supports Intersection Observer,
       // then listen to AD_RENDER_SUCCEEDED to setup IO's for supported mediaTypes
-      events.on(CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED, ({doc, bid, id}) => {
+      events.on(EVENTS.AD_RENDER_SUCCEEDED, ({doc, bid, id}) => {
         if (isSupportedMediaType(bid)) {
           let viewable = new IntersectionObserver(viewCallbackFactory(bid), getViewableOptions(bid));
           let element = document.getElementById(bid.adUnitCode);
diff --git a/modules/biddoBidAdapter.js b/modules/biddoBidAdapter.js
index 5512ca60f8e..6bfa0ac6ef8 100644
--- a/modules/biddoBidAdapter.js
+++ b/modules/biddoBidAdapter.js
@@ -1,5 +1,11 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
+import { buildBannerRequests, interpretBannerResponse } from '../libraries/biddoInvamiaUtils/index.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
 
 const BIDDER_CODE = 'biddo';
 const ENDPOINT_URL = 'https://ad.adopx.net/delivery/impress';
@@ -7,86 +13,15 @@ const ENDPOINT_URL = 'https://ad.adopx.net/delivery/impress';
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bidRequest The bid request params to validate.
-   * @return boolean True if this is a valid bid request, and false otherwise.
-   */
-  isBidRequestValid: function(bidRequest) {
+  isBidRequestValid: function (bidRequest) {
     return !!bidRequest.params.zoneId;
   },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {Array} validBidRequests an array of bid requests
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(validBidRequests) {
-    let serverRequests = [];
-
-    validBidRequests.forEach(bidRequest => {
-      const sizes = bidRequest.mediaTypes.banner.sizes;
-
-      sizes.forEach(([width, height]) => {
-        bidRequest.params.requestedSizes = [width, height];
-
-        const payload = {
-          ctype: 'div',
-          pzoneid: bidRequest.params.zoneId,
-          width,
-          height,
-        };
-
-        const payloadString = Object.keys(payload).map(k => k + '=' + encodeURIComponent(payload[k])).join('&');
-
-        serverRequests.push({
-          method: 'GET',
-          url: ENDPOINT_URL,
-          data: payloadString,
-          bidderRequest: bidRequest,
-        });
-      });
-    });
-
-    return serverRequests;
+  buildRequests: function (validBidRequests) {
+    return validBidRequests.flatMap((bidRequest) => buildBannerRequests(bidRequest, ENDPOINT_URL));
   },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {ServerResponse} serverResponse A successful response from the server.
-   * @param {BidRequest} bidderRequest A matched bid request for this response.
-   * @return Array An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, {bidderRequest}) {
-    const response = serverResponse.body;
-    const bidResponses = [];
-
-    if (response && response.template && response.template.html) {
-      const {bidId} = bidderRequest;
-      const [width, height] = bidderRequest.params.requestedSizes;
-
-      const bidResponse = {
-        requestId: bidId,
-        cpm: response.hb.cpm,
-        creativeId: response.banner.hash,
-        currency: 'USD',
-        netRevenue: response.hb.netRevenue,
-        ttl: 600,
-        ad: response.template.html,
-        mediaType: 'banner',
-        meta: {
-          advertiserDomains: response.hb.adomains || [],
-        },
-        width,
-        height,
-      };
-
-      bidResponses.push(bidResponse);
-    }
-
-    return bidResponses;
+  interpretResponse: function (serverResponse, { bidderRequest }) {
+    return interpretBannerResponse(serverResponse, bidderRequest);
   },
-}
+};
 
 registerBidder(spec);
diff --git a/modules/bidglassBidAdapter.js b/modules/bidglassBidAdapter.js
index a29976cfcb7..7ae1ccf9217 100644
--- a/modules/bidglassBidAdapter.js
+++ b/modules/bidglassBidAdapter.js
@@ -1,7 +1,14 @@
 import {_each, isArray, deepClone, getUniqueIdentifierStr, getBidIdParameter} from '../src/utils.js';
-// import {config} from 'src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
 const BIDDER_CODE = 'bidglass';
 
 export const spec = {
@@ -19,7 +26,8 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
+   * @param {validBidRequests} validBidRequests an array of bids
+   * @param {BidderRequest} bidderRequest request by bidder
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
diff --git a/modules/bidmaticBidAdapter.js b/modules/bidmaticBidAdapter.js
new file mode 100644
index 00000000000..6c88a3f1932
--- /dev/null
+++ b/modules/bidmaticBidAdapter.js
@@ -0,0 +1,144 @@
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { replaceAuctionPrice, isNumber, deepAccess, isFn } from '../src/utils.js';
+
+const HOST = 'https://adapter.bidmatic.io';
+const BIDDER_CODE = 'bidmatic';
+const DEFAULT_CURRENCY = 'USD';
+export const SYNC_URL = `${HOST}/sync.html`;
+export const END_POINT = `${HOST}/ortb-client`;
+
+export const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 290,
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    const floorInfo = isFn(bidRequest.getFloor) ? bidRequest.getFloor({
+      currency: context.currency || 'USD',
+      size: '*',
+      mediaType: '*'
+    }) : {
+      floor: imp.bidfloor || deepAccess(bidRequest, 'params.bidfloor') || 0,
+      currency: DEFAULT_CURRENCY
+    };
+
+    if (floorInfo) {
+      imp.bidfloor = floorInfo.floor;
+      imp.bidfloorcur = floorInfo.currency;
+    }
+    imp.tagid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid') || bidRequest.adUnitCode;
+
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    if (!request.cur) {
+      request.cur = [DEFAULT_CURRENCY];
+    }
+    return request;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    const { bidRequest } = context;
+
+    let resMediaType;
+    const reqMediaTypes = Object.keys(bidRequest.mediaTypes);
+    if (reqMediaTypes.length === 1) {
+      resMediaType = reqMediaTypes[0];
+    } else {
+      if (bid.adm.search(/^(<\?xml| syncMade === 0)
+      .map(([sourceId]) => {
+        processedSources[sourceId] = 1
+
+        let url = `${SYNC_URL}?aid=${sourceId}`
+        if (gdprConsent && gdprConsent.gdprApplies) {
+          url += `&gdpr=${+(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`
+        }
+        if (uspConsent) {
+          url += `&usp=${uspConsent}`;
+        }
+        if (gppConsent) {
+          url += `&gpp=${gppConsent.gppString}&gpp_sid=${gppConsent.applicableSections?.toString()}`
+        }
+        return {
+          type: 'iframe',
+          url
+        };
+      })
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  gvlid: 1134,
+  isBidRequestValid: function (bid) {
+    return isNumber(deepAccess(bid, 'params.source'))
+  },
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
+    return createUserSyncs(PROCESSED_SOURCES, syncOptions, gdprConsent, uspConsent, gppConsent);
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const requestsBySource = validBidRequests.reduce((acc, bidRequest) => {
+      acc[bidRequest.params.source] = acc[bidRequest.params.source] || [];
+      acc[bidRequest.params.source].push(bidRequest);
+      return acc;
+    }, {});
+
+    return Object.entries(requestsBySource).map(([source, bidRequests]) => {
+      if (!PROCESSED_SOURCES[source]) {
+        PROCESSED_SOURCES[source] = 0;
+      }
+      const data = converter.toORTB({ bidRequests, bidderRequest });
+      const url = new URL(END_POINT);
+      url.searchParams.append('source', source);
+      return {
+        method: 'POST',
+        url: url.toString(),
+        data: data,
+        options: {
+          withCredentials: true,
+        }
+      };
+    });
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    if (!serverResponse || !serverResponse.body) return [];
+    const parsedSeatbid = serverResponse.body.seatbid.map(seatbidItem => {
+      const parsedBid = seatbidItem.bid.map((bidItem) => ({
+        ...bidItem,
+        adm: replaceAuctionPrice(bidItem.adm, bidItem.price),
+        nurl: replaceAuctionPrice(bidItem.nurl, bidItem.price)
+      }));
+      return { ...seatbidItem, bid: parsedBid };
+    });
+    const responseBody = { ...serverResponse.body, seatbid: parsedSeatbid };
+    return converter.fromORTB({
+      response: responseBody,
+      request: bidRequest.data,
+    }).bids;
+  },
+
+};
+registerBidder(spec);
diff --git a/modules/bidmaticBidAdapter.md b/modules/bidmaticBidAdapter.md
new file mode 100644
index 00000000000..242d7d9e77b
--- /dev/null
+++ b/modules/bidmaticBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+```
+Module Name:  Bidmatic Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: mg@bidmatic.io
+```
+
+# Description
+
+Adds access to Bidmatic SSP oRTB service. 
+
+# Sample Ad Unit: For Publishers
+```
+var adUnits = [{
+    code: 'bg-test-rectangle',    
+    sizes: [[300, 250]],     
+    bids: [{
+        bidder: 'bidmatic',
+        params: {
+            source: 886409,
+            bidfloor: 0.1
+        }
+    }]
+}]
+```
+
+
+# Testing 
+```gulp test-only --file=./test/spec/modules/bidmaticBidAdapter_spec.js```
+```gulp test-coverage --file=./test/spec/modules/bidmaticBidAdapter_spec.js```
+```gulp view-coverage```
diff --git a/modules/bidtheatreBidAdapter.js b/modules/bidtheatreBidAdapter.js
new file mode 100644
index 00000000000..8fb3dc2fd3b
--- /dev/null
+++ b/modules/bidtheatreBidAdapter.js
@@ -0,0 +1,117 @@
+import { ortbConverter } from '../libraries/ortbConverter/converter.js'
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { deepSetValue, logError, replaceAuctionPrice } from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const GVLID = 30;
+export const BIDDER_CODE = 'bidtheatre';
+export const ENDPOINT_URL = 'https://prebidjs-bids.bidtheatre.net/prebidjsbid';
+const METHOD = 'POST';
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
+export const DEFAULT_CURRENCY = 'USD';
+const BIDTHEATRE_COOKIE_NAME = '__kuid';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 120,
+    currency: DEFAULT_CURRENCY
+  }
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+  gvlid: GVLID,
+  isBidRequestValid: function (bidRequest) {
+    const isValid = bidRequest &&
+                    bidRequest.params &&
+                    typeof bidRequest.params.publisherId === 'string' &&
+                    bidRequest.params.publisherId.trim().length === 36
+
+    if (!isValid) {
+      logError('Bidtheatre Header Bidding Publisher ID not provided or in incorrect format');
+    }
+
+    return isValid;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const seenUrls = new Set();
+    const syncs = [];
+
+    if (syncOptions.pixelEnabled && serverResponses) {
+      serverResponses.forEach(response => {
+        if (response.body && response.body.seatbid) {
+          response.body.seatbid.forEach(seatbid => {
+            if (seatbid.bid) {
+              seatbid.bid.forEach(bid => {
+                const urls = bid.ext && bid.ext.usersync_urls;
+                if (Array.isArray(urls)) {
+                  urls.forEach(url => {
+                    if (!seenUrls.has(url)) {
+                      seenUrls.add(url);
+                      syncs.push({
+                        type: 'image',
+                        url: url
+                      });
+                    }
+                  });
+                }
+              });
+            }
+          });
+        }
+      });
+    }
+    return syncs;
+  },
+  buildRequests(bidRequests, bidderRequest) {
+    const data = converter.toORTB({bidRequests, bidderRequest});
+
+    const cookieValue = storage.getCookie(BIDTHEATRE_COOKIE_NAME);
+    if (cookieValue) {
+      deepSetValue(data, 'user.buyeruid', cookieValue);
+    }
+
+    data.imp.forEach((impObj, index) => {
+      let publisherId = bidRequests[index].params.publisherId;
+
+      if (publisherId) {
+        deepSetValue(impObj, 'ext.bidder.publisherId', publisherId);
+      }
+    });
+
+    return [{
+      method: METHOD,
+      url: ENDPOINT_URL,
+      data
+    }]
+  },
+  interpretResponse(response, request) {
+    if (!response || !response.body || !response.body.seatbid) {
+      return [];
+    }
+
+    const macroReplacedSeatbid = response.body.seatbid.map(seatbidItem => {
+      const macroReplacedBid = seatbidItem.bid.map((bidItem) => ({
+        ...bidItem,
+        adm: replaceAuctionPrice(bidItem.adm, bidItem.price),
+        nurl: replaceAuctionPrice(bidItem.nurl, bidItem.price)
+      }));
+      return { ...seatbidItem, bid: macroReplacedBid };
+    });
+
+    const macroReplacedResponseBody = { ...response.body, seatbid: macroReplacedSeatbid };
+    const bids = converter.fromORTB({response: macroReplacedResponseBody, request: request.data}).bids;
+    return bids;
+  },
+  onTimeout: function(timeoutData) {},
+  onBidWon: function(bid) {},
+  onSetTargeting: function(bid) {},
+  // onBidderError: function({ error, bidderRequest }) {},
+  onAdRenderSucceeded: function(bid) {}
+}
+
+registerBidder(spec);
diff --git a/modules/bidtheatreBidAdapter.md b/modules/bidtheatreBidAdapter.md
new file mode 100644
index 00000000000..7f9301596aa
--- /dev/null
+++ b/modules/bidtheatreBidAdapter.md
@@ -0,0 +1,111 @@
+# Overview
+
+```
+Module Name : Bidtheatre Bidder Adapter
+Module Type : Bidder Adapter
+Maintainer  : operations@bidtheatre.com
+```
+
+# Description
+
+Module that connects to Bidtheatre's demand sources
+
+About us: https://www.bidtheatre.com
+
+The Bidtheatre Bidding adapter requires manual set up before use. Please contact us at [operations@bidtheatre.com](mailto:operations@bidtheatre.com) if you would like to access Bidtheatre demand.
+
+# Bid params
+| Name          | Scope    | Description                            | Example                              |
+|:--------------| :------- |:---------------------------------------|:-------------------------------------|
+| `publisherId` | required | Manually set up publisher ID | `73b20b3a-12a0-4869-b54e-8d42b55786ee`|
+
+In addition to the required bid param above, Bidtheatre will also enforce the following requirements
+- All ad slots on a page must belong to the same publisher ID
+- The publisher must provide either a client IP and/or explicit geo data in the request
+
+# Test Parameters
+
+## Banner
+
+```javascript
+var displayAdUnits = [
+    {
+        code: 'test-banner',
+        mediaTypes: {
+            banner: {
+                sizes: [[980,240]]
+            }
+        },
+        bids: [
+            {
+                bidder: 'bidtheatre',
+                params: {
+                    publisherId: '73b20b3a-12a0-4869-b54e-8d42b55786ee'
+                }
+            }
+        ]
+    }
+];
+```
+
+## Video
+
+```javascript
+var videoAdUnits = [
+    {
+        code: 'test-video',
+        mediaTypes: {
+            video: {
+                playerSize: [[1280, 720]]
+            }
+        },
+        bids: [
+            {
+                bidder: 'bidtheatre',
+                params: {
+                    publisherId: '73b20b3a-12a0-4869-b54e-8d42b55786ee'
+                }
+            }
+        ]
+    }
+];
+```
+
+## Multiformat
+
+```javascript
+var adUnits = [
+    {
+        code: 'test-banner',
+        mediaTypes: {
+            banner: {
+                sizes: [[980,240]]
+            }
+        },
+        bids: [
+            {
+                bidder: 'bidtheatre',
+                params: {
+                    publisherId: '73b20b3a-12a0-4869-b54e-8d42b55786ee'
+                }
+            }
+        ]
+    },
+    {
+        code: 'test-video',
+        mediaTypes: {
+            video: {
+                playerSize: [[1280, 720]]
+            }
+        },
+        bids: [
+            {
+                bidder: 'bidtheatre',
+                params: {
+                    publisherId: '73b20b3a-12a0-4869-b54e-8d42b55786ee'
+                }
+            }
+        ]
+    }
+];
+```
diff --git a/modules/bidwatchAnalyticsAdapter.js b/modules/bidwatchAnalyticsAdapter.js
index 289e607686f..e385b02fe5f 100644
--- a/modules/bidwatchAnalyticsAdapter.js
+++ b/modules/bidwatchAnalyticsAdapter.js
@@ -1,21 +1,20 @@
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import { ajax } from '../src/ajax.js';
 import { getRefererInfo } from '../src/refererDetection.js';
+import { deepClone } from '../src/utils.js';
 
 const analyticsType = 'endpoint';
 const url = 'URL_TO_SERVER_ENDPOINT';
 
 const {
-  EVENTS: {
-    AUCTION_END,
-    BID_WON,
-    BID_RESPONSE,
-    BID_REQUESTED,
-    BID_TIMEOUT,
-  }
-} = CONSTANTS;
+  AUCTION_END,
+  BID_WON,
+  BID_RESPONSE,
+  BID_REQUESTED,
+  BID_TIMEOUT,
+} = EVENTS;
 
 let saveEvents = {}
 let allEvents = {}
@@ -115,7 +114,7 @@ function addTimeout(args) {
   let stringArgs = JSON.parse(dereferenceWithoutRenderer(args));
   argsDereferenced = stringArgs;
   argsDereferenced.forEach((attr) => {
-    argsCleaned.push(filterAttributes(JSON.parse(JSON.stringify(attr)), false));
+    argsCleaned.push(filterAttributes(deepClone(attr), false));
   });
   if (auctionEnd[eventType] == undefined) { auctionEnd[eventType] = [] }
   auctionEnd[eventType].push(argsCleaned);
diff --git a/modules/big-richmediaBidAdapter.js b/modules/big-richmediaBidAdapter.js
index 8a03aac1ace..858dad2ffde 100644
--- a/modules/big-richmediaBidAdapter.js
+++ b/modules/big-richmediaBidAdapter.js
@@ -3,6 +3,11 @@ import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {spec as baseAdapter} from './appnexusBidAdapter.js'; // eslint-disable-line prebid/validate-imports
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'big-richmedia';
 
 const metadataByRequestId = {};
@@ -107,11 +112,6 @@ export const spec = {
     return baseAdapter.getUserSyncs(syncOptions, responses, gdprConsent);
   },
 
-  transformBidParams: function (params, isOpenRtb) {
-    if (!baseAdapter.transformBidParams) { return params; }
-    return baseAdapter.transformBidParams(params, isOpenRtb);
-  },
-
   /**
    * Add element selector to javascript tracker to improve native viewability
    * @param {Bid} bid
diff --git a/modules/bizzclickBidAdapter.js b/modules/bizzclickBidAdapter.js
deleted file mode 100644
index dc7731231ab..00000000000
--- a/modules/bizzclickBidAdapter.js
+++ /dev/null
@@ -1,322 +0,0 @@
-import {_map, deepAccess, deepSetValue, getDNT, logMessage, logWarn} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
-
-const BIDDER_CODE = 'bizzclick';
-const ACCOUNTID_MACROS = '[account_id]';
-const URL_ENDPOINT = `https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=${ACCOUNTID_MACROS}`;
-const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
-const NATIVE_PARAMS = {
-  title: {
-    id: 0,
-    name: 'title'
-  },
-  icon: {
-    id: 2,
-    type: 1,
-    name: 'img'
-  },
-  image: {
-    id: 3,
-    type: 3,
-    name: 'img'
-  },
-  sponsoredBy: {
-    id: 5,
-    name: 'data',
-    type: 1
-  },
-  body: {
-    id: 4,
-    name: 'data',
-    type: 2
-  },
-  cta: {
-    id: 1,
-    type: 12,
-    name: 'data'
-  }
-};
-const NATIVE_VERSION = '1.2';
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.params.accountId) && Boolean(bid.params.placementId)
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: (validBidRequests, bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    if (validBidRequests && validBidRequests.length === 0) return []
-    let accuontId = validBidRequests[0].params.accountId;
-    const endpointURL = URL_ENDPOINT.replace(ACCOUNTID_MACROS, accuontId);
-    let winTop = window;
-    let location;
-    try {
-      location = new URL(bidderRequest.refererInfo.page)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
-    let bids = [];
-    for (let bidRequest of validBidRequests) {
-      let impObject = prepareImpObject(bidRequest);
-      let data = {
-        id: bidRequest.bidId,
-        test: config.getConfig('debug') ? 1 : 0,
-        at: 1,
-        cur: ['USD'],
-        device: {
-          w: winTop.screen.width,
-          h: winTop.screen.height,
-          dnt: getDNT() ? 1 : 0,
-          language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
-        },
-        site: {
-          page: location.pathname,
-          host: location.host
-        },
-        source: {
-          tid: bidRequest.ortb2Imp?.ext?.tid,
-          ext: {
-            schain: {}
-          }
-        },
-        regs: {
-          coppa: config.getConfig('coppa') === true ? 1 : 0,
-          ext: {}
-        },
-        user: {
-          ext: {}
-        },
-        ext: {
-          ts: Date.now()
-        },
-        tmax: bidRequest.timeout,
-        imp: [impObject],
-      };
-
-      let connection = navigator.connection || navigator.webkitConnection;
-      if (connection && connection.effectiveType) {
-        data.device.connectiontype = connection.effectiveType;
-      }
-      if (bidRequest) {
-        if (bidRequest.schain) {
-          deepSetValue(data, 'source.ext.schain', bidRequest.schain);
-        }
-
-        if (bidRequest.gdprConsent && bidRequest.gdprConsent.gdprApplies) {
-          deepSetValue(data, 'regs.ext.gdpr', bidRequest.gdprConsent.gdprApplies ? 1 : 0);
-          deepSetValue(data, 'user.ext.consent', bidRequest.gdprConsent.consentString);
-        }
-
-        if (bidRequest.uspConsent !== undefined) {
-          deepSetValue(data, 'regs.ext.us_privacy', bidRequest.uspConsent);
-        }
-      }
-      bids.push(data)
-    }
-    return {
-      method: 'POST',
-      url: endpointURL,
-      data: bids
-    };
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: (serverResponse) => {
-    if (!serverResponse || !serverResponse.body) return []
-    let bizzclickResponse = serverResponse.body;
-    let bids = [];
-    for (let response of bizzclickResponse) {
-      let mediaType = response.seatbid[0].bid[0].ext && response.seatbid[0].bid[0].ext.mediaType ? response.seatbid[0].bid[0].ext.mediaType : BANNER;
-      let bid = {
-        requestId: response.id,
-        cpm: response.seatbid[0].bid[0].price,
-        width: response.seatbid[0].bid[0].w,
-        height: response.seatbid[0].bid[0].h,
-        ttl: response.ttl || 1200,
-        currency: response.cur || 'USD',
-        netRevenue: true,
-        creativeId: response.seatbid[0].bid[0].crid,
-        dealId: response.seatbid[0].bid[0].dealid,
-        mediaType: mediaType
-      };
-
-      bid.meta = {};
-      if (response.seatbid[0].bid[0].adomain && response.seatbid[0].bid[0].adomain.length > 0) {
-        bid.meta.advertiserDomains = response.seatbid[0].bid[0].adomain;
-      }
-
-      switch (mediaType) {
-        case VIDEO:
-          bid.vastXml = response.seatbid[0].bid[0].adm
-          bid.vastUrl = response.seatbid[0].bid[0].ext.vastUrl
-          break
-        case NATIVE:
-          bid.native = parseNative(response.seatbid[0].bid[0].adm)
-          break
-        default:
-          bid.ad = response.seatbid[0].bid[0].adm
-      }
-      bids.push(bid);
-    }
-    return bids;
-  },
-};
-/**
- * Determine type of request
- *
- * @param bidRequest
- * @param type
- * @returns {boolean}
- */
-const checkRequestType = (bidRequest, type) => {
-  return (typeof deepAccess(bidRequest, `mediaTypes.${type}`) !== 'undefined');
-}
-const parseNative = admObject => {
-  const { assets, link, imptrackers, jstracker } = admObject.native;
-  const result = {
-    clickUrl: link.url,
-    clickTrackers: link.clicktrackers || undefined,
-    impressionTrackers: imptrackers || undefined,
-    javascriptTrackers: jstracker ? [ jstracker ] : undefined
-  };
-  assets.forEach(asset => {
-    const kind = NATIVE_ASSET_IDS[asset.id];
-    const content = kind && asset[NATIVE_PARAMS[kind].name];
-    if (content) {
-      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
-    }
-  });
-  return result;
-}
-const prepareImpObject = (bidRequest) => {
-  let impObject = {
-    id: bidRequest.transactionId,
-    secure: 1,
-    ext: {
-      placementId: bidRequest.params.placementId
-    }
-  };
-  if (checkRequestType(bidRequest, BANNER)) {
-    impObject.banner = addBannerParameters(bidRequest);
-  }
-  if (checkRequestType(bidRequest, VIDEO)) {
-    impObject.video = addVideoParameters(bidRequest);
-  }
-  if (checkRequestType(bidRequest, NATIVE)) {
-    impObject.native = {
-      ver: NATIVE_VERSION,
-      request: addNativeParameters(bidRequest)
-    };
-  }
-  return impObject
-};
-const addNativeParameters = bidRequest => {
-  let impObject = {
-    // TODO: top-level ID is not in ORTB native 1.2, is this intentional?
-    // (despite the name, this appears to be an ORTB native request - not an imp - object)
-    id: bidRequest.bidId,
-    ver: NATIVE_VERSION,
-  };
-  const assets = _map(bidRequest.mediaTypes.native, (bidParams, key) => {
-    const props = NATIVE_PARAMS[key];
-    const asset = {
-      required: bidParams.required & 1,
-    };
-    if (props) {
-      asset.id = props.id;
-      let wmin, hmin;
-      let aRatios = bidParams.aspect_ratios;
-      if (aRatios && aRatios[0]) {
-        aRatios = aRatios[0];
-        wmin = aRatios.min_width || 0;
-        hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
-      }
-      if (bidParams.sizes) {
-        const sizes = flatten(bidParams.sizes);
-        wmin = sizes[0];
-        hmin = sizes[1];
-      }
-      asset[props.name] = {};
-      if (bidParams.len) asset[props.name]['len'] = bidParams.len;
-      if (props.type) asset[props.name]['type'] = props.type;
-      if (wmin) asset[props.name]['wmin'] = wmin;
-      if (hmin) asset[props.name]['hmin'] = hmin;
-      return asset;
-    }
-  }).filter(Boolean);
-  impObject.assets = assets;
-  return impObject
-}
-const addBannerParameters = (bidRequest) => {
-  let bannerObject = {};
-  const size = parseSizes(bidRequest, 'banner');
-  bannerObject.w = size[0];
-  bannerObject.h = size[1];
-  return bannerObject;
-};
-const parseSizes = (bid, mediaType) => {
-  let mediaTypes = bid.mediaTypes;
-  if (mediaType === 'video') {
-    let size = [];
-    if (mediaTypes.video && mediaTypes.video.w && mediaTypes.video.h) {
-      size = [
-        mediaTypes.video.w,
-        mediaTypes.video.h
-      ];
-    } else if (Array.isArray(deepAccess(bid, 'mediaTypes.video.playerSize')) && bid.mediaTypes.video.playerSize.length === 1) {
-      size = bid.mediaTypes.video.playerSize[0];
-    } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0 && Array.isArray(bid.sizes[0]) && bid.sizes[0].length > 1) {
-      size = bid.sizes[0];
-    }
-    return size;
-  }
-  let sizes = [];
-  if (Array.isArray(mediaTypes.banner.sizes)) {
-    sizes = mediaTypes.banner.sizes[0];
-  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
-    sizes = bid.sizes
-  } else {
-    logWarn('no sizes are setup or found');
-  }
-  return sizes
-}
-const addVideoParameters = (bidRequest) => {
-  let videoObj = {};
-  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity']
-  for (let param of supportParamsList) {
-    if (bidRequest.mediaTypes.video[param] !== undefined) {
-      videoObj[param] = bidRequest.mediaTypes.video[param];
-    }
-  }
-  const size = parseSizes(bidRequest, 'video');
-  videoObj.w = size[0];
-  videoObj.h = size[1];
-  return videoObj;
-}
-const flatten = arr => {
-  return [].concat(...arr);
-}
-registerBidder(spec);
diff --git a/modules/bizzclickBidAdapter.md b/modules/bizzclickBidAdapter.md
deleted file mode 100644
index 6fc1bebf546..00000000000
--- a/modules/bizzclickBidAdapter.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Overview
-
-```
-Module Name: BizzClick SSP Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: support@bizzclick.com
-```
-
-# Description
-
-Module that connects to BizzClick SSP demand sources
-
-# Test Parameters
-```
-    var adUnits = [{
-                code: 'placementId',
-                      mediaTypes: {
-                          banner: {
-                              sizes: [[300, 250], [300,600]]
-                              }
-                              },
-                bids: [{
-                        bidder: 'bizzclick',
-                        params: {
-                            placementId: 'hash',
-                            accountId: 'accountId'
-                        }
-                    }]
-                },
-                {
-                    code: 'native_example',
-                    // sizes: [[1, 1]],
-                    mediaTypes: {
-                      native: {
-                        title: {
-                          required: true,
-                          len: 800
-                        },
-                        image: {
-                          required: true,
-                            len: 80
-                        },
-                        sponsoredBy: {
-                            required: true
-                        },
-                        clickUrl: {
-                            required: true
-                        },
-                        privacyLink: {
-                            required: false
-                        },
-                        body: {
-                            required: true
-                        },
-                        icon: {
-                            required: true,
-                            sizes: [50, 50]
-                        }
-                    }
-
-                    },
-                    bids: [    {
-                            bidder: 'bizzclick',
-                            params: {
-                                  placementId: 'hash',
-                            accountId: 'accountId'
-                            }
-                        }]
-            }, 
-            {
-    code: 'video1',
-    sizes: [640,480],
-    mediaTypes: { video: {
-      minduration:0,
-                maxduration:999,
-                boxingallowed:1,
-                skip:0,
-                mimes:[
-                    'application/javascript',
-                    'video/mp4'
-                ],
-                w:1920,
-                h:1080,
-                protocols:[
-                    2
-                ],
-                linearity:1,
-                api:[
-                    1,
-                    2
-                ]
-    } },
-    bids: [
-    {
-                bidder: 'bizzclick',
-                params: {
-                      placementId: 'hash',
-                            accountId: 'accountId'
-                }
-            }
-    ]
-  }
-            ];
-```
\ No newline at end of file
diff --git a/modules/blastoBidAdapter.js b/modules/blastoBidAdapter.js
new file mode 100644
index 00000000000..0e97c294049
--- /dev/null
+++ b/modules/blastoBidAdapter.js
@@ -0,0 +1,77 @@
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'blasto';
+const SOURCE_ID_MACRO = '[sourceid]';
+const ACCOUNT_ID_MACRO = '[accountid]';
+const HOST_MACRO = '[host]';
+const URL = `https://${HOST_MACRO}.blasto.ai/bid?rtb_seat_id=${SOURCE_ID_MACRO}&secret_key=${ACCOUNT_ID_MACRO}&integration_type=prebidjs`;
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_HOST = 'us-e-node1';
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 20,
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    if (!imp.bidfloor) imp.bidfloor = bidRequest.params.bidfloor || 0;
+    imp.ext = {
+      [BIDDER_CODE]: {
+        accountId: bidRequest.params.accountId,
+        sourceId: bidRequest.params.sourceId,
+        host: bidRequest.params.host || DEFAULT_HOST,
+      }
+    }
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    const bid = context.bidRequests[0];
+    request.test = config.getConfig('debug') ? 1 : 0;
+    if (!request.cur) request.cur = [bid.params.currency || DEFAULT_CURRENCY];
+    return request;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    const bidResponse = buildBidResponse(bid, context);
+    bidResponse.cur = bid.cur || DEFAULT_CURRENCY;
+    return bidResponse;
+  }
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.params.sourceId) && Boolean(bid.params.accountId);
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    if (validBidRequests && validBidRequests.length === 0) return [];
+    const { sourceId, accountId } = validBidRequests[0].params;
+    const host = validBidRequests[0].params.host;
+    const endpointURL = URL.replace(HOST_MACRO, host || DEFAULT_HOST)
+      .replace(ACCOUNT_ID_MACRO, accountId)
+      .replace(SOURCE_ID_MACRO, sourceId);
+    const request = converter.toORTB({ bidRequests: validBidRequests, bidderRequest });
+    return {
+      method: 'POST',
+      url: endpointURL,
+      data: request
+    };
+  },
+
+  interpretResponse: (response, request) => {
+    if (response?.body) {
+      const bids = converter.fromORTB({ response: response.body, request: request.data }).bids;
+      return bids;
+    }
+    return [];
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/blastoBidAdapter.md b/modules/blastoBidAdapter.md
new file mode 100644
index 00000000000..60ebad14764
--- /dev/null
+++ b/modules/blastoBidAdapter.md
@@ -0,0 +1,109 @@
+# Overview
+
+```
+Module Name: Blasto SSP Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@blasto.ai
+```
+
+# Description
+
+Module that connects to Blasto SSP demand sources
+
+# Test Parameters
+
+```js
+const adUnits = [
+  {
+    code: "placementId",
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 600],
+        ],
+      },
+    },
+    bids: [
+      {
+        bidder: "blasto",
+        params: {
+          placementId: "hash",
+          accountId: "accountId",
+          host: "host",
+        },
+      },
+    ],
+  },
+  {
+    code: "native_example",
+    // sizes: [[1, 1]],
+    mediaTypes: {
+      native: {
+        title: {
+          required: true,
+          len: 800,
+        },
+        image: {
+          required: true,
+          len: 80,
+        },
+        sponsoredBy: {
+          required: true,
+        },
+        clickUrl: {
+          required: true,
+        },
+        privacyLink: {
+          required: false,
+        },
+        body: {
+          required: true,
+        },
+        icon: {
+          required: true,
+          sizes: [50, 50],
+        },
+      },
+    },
+    bids: [
+      {
+        bidder: "blasto",
+        params: {
+          placementId: "hash",
+          accountId: "accountId",
+          host: "host",
+        },
+      },
+    ],
+  },
+  {
+    code: "video1",
+    sizes: [640, 480],
+    mediaTypes: {
+      video: {
+        minduration: 0,
+        maxduration: 999,
+        boxingallowed: 1,
+        skip: 0,
+        mimes: ["application/javascript", "video/mp4"],
+        w: 1920,
+        h: 1080,
+        protocols: [2],
+        linearity: 1,
+        api: [1, 2],
+      },
+    },
+    bids: [
+      {
+        bidder: "blasto",
+        params: {
+          placementId: "hash",
+          accountId: "accountId",
+          host: "host",
+        },
+      },
+    ],
+  },
+];
+```
diff --git a/modules/bliinkBidAdapter.js b/modules/bliinkBidAdapter.js
index 6f3f5e21cb8..b66923fd476 100644
--- a/modules/bliinkBidAdapter.js
+++ b/modules/bliinkBidAdapter.js
@@ -1,9 +1,8 @@
-// eslint-disable-next-line prebid/validate-imports
-// eslint-disable-next-line prebid/validate-imports
 import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { config } from '../src/config.js'
-import {_each, deepAccess, deepSetValue} from '../src/utils.js'
+import { _each, canAccessWindowTop, deepAccess, deepSetValue, getDomLoadingDuration, getWindowSelf, getWindowTop } from '../src/utils.js'
 export const BIDDER_CODE = 'bliink'
+export const GVL_ID = 658
 export const BLIINK_ENDPOINT_ENGINE = 'https://engine.bliink.io/prebid'
 
 export const BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME = 'https://tag.bliink.io/usersync.html'
@@ -15,6 +14,7 @@ const BANNER = 'banner'
 window.bliinkBid = window.bliinkBid || {};
 const supportedMediaTypes = [BANNER, VIDEO]
 const aliasBidderCode = ['bk']
+const CURRENCY = 'EUR';
 
 /**
  * @description get coppa value from config
@@ -49,9 +49,8 @@ export function getEffectiveConnectionType() {
  */
 export function getUserIds(validBidRequests) {
   /** @type {Object} */
-  const firstBidRequest = validBidRequests?.[0]
-  if (firstBidRequest?.userIds) {
-    return firstBidRequest.userIds
+  if (validBidRequests?.[0]?.userIdAsEids) {
+    return validBidRequests[0].userIdAsEids;
   }
 }
 export function getMetaList(name) {
@@ -123,7 +122,7 @@ export function getKeywords() {
 }
 
 /**
- * @param bidRequest
+ * @param bidResponse
  * @return {({cpm, netRevenue: boolean, requestId, width: number, currency, ttl: number, creativeId, height: number}&{mediaType: string, vastXml})|null}
  */
 export const buildBid = (bidResponse) => {
@@ -151,7 +150,7 @@ export const buildBid = (bidResponse) => {
   }
   return Object.assign(bid, {
     cpm: bidResponse.price,
-    currency: bidResponse.currency || 'EUR',
+    currency: bidResponse.currency || CURRENCY,
     creativeId: deepAccess(bidResponse, 'extras.deal_id'),
     requestId: deepAccess(bidResponse, 'extras.transaction_id'),
     width: deepAccess(bidResponse, `creative.${bid.mediaType}.width`) || 1,
@@ -180,37 +179,59 @@ export const isBidRequestValid = (bid) => {
  */
 export const buildRequests = (validBidRequests, bidderRequest) => {
   if (!validBidRequests || !bidderRequest || !bidderRequest.bids) return null
-
+  const w = (canAccessWindowTop()) ? getWindowTop() : getWindowSelf();
+  const domLoadingDuration = getDomLoadingDuration(w).toString();
   const tags = bidderRequest.bids.map((bid) => {
+    let bidFloor;
+    const sizes = bid.sizes.map((size) => ({ w: size[0], h: size[1] }));
+    const mediaTypes = Object.keys(bid.mediaTypes)
+    if (typeof bid.getFloor === 'function') {
+      bidFloor = bid.getFloor({
+        currency: CURRENCY,
+        mediaType: mediaTypes[0],
+        size: sizes[0]
+      });
+    }
     const id = bid.params.tagId
-    return {
+    const request = {
       sizes: bid.sizes.map((size) => ({ w: size[0], h: size[1] })),
       id,
       // TODO: bidId is globally unique, is it a good choice for transaction ID (vs ortb2Imp.ext.tid)?
       transactionId: bid.bidId,
-      mediaTypes: Object.keys(bid.mediaTypes),
+      mediaTypes: mediaTypes,
       imageUrl: deepAccess(bid, 'params.imageUrl', ''),
       videoUrl: deepAccess(bid, 'params.videoUrl', ''),
       refresh: (window.bliinkBid[id] = (window.bliinkBid[id] ?? -1) + 1) || undefined,
-    };
+    }
+    if (bidFloor) {
+      request.bidFloor = bidFloor
+    }
+    return request;
   });
 
   let request = {
     tags,
     pageTitle: document.title,
-    pageUrl: deepAccess(bidderRequest, 'refererInfo.page'),
+    pageUrl: deepAccess(bidderRequest, 'refererInfo.page').replace(/\?.*$/, ''),
     pageDescription: getMetaValue(META_DESCRIPTION),
     keywords: getKeywords().join(','),
     ect: getEffectiveConnectionType(),
   };
 
   const schain = deepAccess(validBidRequests[0], 'schain')
-  const userIds = getUserIds(validBidRequests)
+  const eids = getUserIds(validBidRequests)
+  const device = bidderRequest.ortb2?.device
   if (schain) {
     request.schain = schain
   }
-  if (userIds) {
-    request.userIds = userIds
+  if (domLoadingDuration > -1) {
+    request.domLoadingDuration = domLoadingDuration
+  }
+  if (device) {
+    request.device = device
+  }
+  if (eids) {
+    request.eids = eids
   }
   const gdprConsent = deepAccess(bidderRequest, 'gdprConsent');
   if (!!gdprConsent && gdprConsent.gdprApplies) {
@@ -234,7 +255,6 @@ export const buildRequests = (validBidRequests, bidderRequest) => {
  * @description Parse the response (from buildRequests) and generate one or more bid objects.
  *
  * @param serverResponse
- * @param request
  * @return
  */
 const interpretResponse = (serverResponse) => {
@@ -293,6 +313,7 @@ const getUserSyncs = (syncOptions, serverResponses, gdprConsent, uspConsent) =>
  */
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVL_ID,
   aliases: aliasBidderCode,
   supportedMediaTypes: supportedMediaTypes,
   isBidRequestValid,
diff --git a/modules/bluebillywigBidAdapter.js b/modules/bluebillywigBidAdapter.js
deleted file mode 100644
index d4bde9b3f2c..00000000000
--- a/modules/bluebillywigBidAdapter.js
+++ /dev/null
@@ -1,374 +0,0 @@
-import {deepAccess, deepClone, deepSetValue, logError, logWarn} from '../src/utils.js';
-import {find} from '../src/polyfill.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {VIDEO} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import {Renderer} from '../src/Renderer.js';
-
-const DEV_MODE = window.location.search.match(/bbpbs_debug=true/);
-
-// Blue Billywig  Constants
-const BB_CONSTANTS = {
-  BIDDER_CODE: 'bluebillywig',
-  AUCTION_URL: '$$URL_STARTpbs.bluebillywig.com/openrtb2/auction?pub=$$PUBLICATION',
-  SYNC_URL: '$$URL_STARTpbs.bluebillywig.com/static/cookie-sync.html?pub=$$PUBLICATION',
-  RENDERER_URL: 'https://$$PUBLICATION.bbvms.com/r/$$RENDERER.js',
-  DEFAULT_TIMEOUT: 5000,
-  DEFAULT_TTL: 300,
-  DEFAULT_WIDTH: 768,
-  DEFAULT_HEIGHT: 432,
-  DEFAULT_NET_REVENUE: true,
-  VIDEO_PARAMS: ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin',
-    'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad',
-    'api', 'companiontype', 'ext']
-};
-
-// Aliasing
-const getConfig = config.getConfig;
-
-// Helper Functions
-const BB_HELPERS = {
-  addSiteAppDevice: function(request, pageUrl) {
-    if (typeof getConfig('app') === 'object') request.app = getConfig('app');
-    else {
-      request.site = {};
-      if (typeof getConfig('site') === 'object') request.site = getConfig('site');
-      if (pageUrl) request.site.page = pageUrl;
-    }
-
-    if (typeof getConfig('device') === 'object') request.device = getConfig('device');
-    if (!request.device) request.device = {};
-    if (!request.device.w) request.device.w = window.innerWidth;
-    if (!request.device.h) request.device.h = window.innerHeight;
-  },
-  addSchain: function(request, validBidRequests) {
-    const schain = deepAccess(validBidRequests, '0.schain');
-    if (schain) request.source.ext = { schain: schain };
-  },
-  addCurrency: function(request) {
-    const adServerCur = getConfig('currency.adServerCurrency');
-    if (adServerCur && typeof adServerCur === 'string') request.cur = [adServerCur];
-    else if (Array.isArray(adServerCur) && adServerCur.length) request.cur = [adServerCur[0]];
-  },
-  addUserIds: function(request, validBidRequests) {
-    const eids = deepAccess(validBidRequests, '0.userIdAsEids');
-
-    if (eids != null && eids.length) {
-      deepSetValue(request, 'user.ext.eids', eids);
-    }
-  },
-  substituteUrl: function (url, publication, renderer) {
-    return url.replace('$$URL_START', (DEV_MODE) ? 'https://dev.' : 'https://').replace('$$PUBLICATION', publication).replace('$$RENDERER', renderer);
-  },
-  getAuctionUrl: function(publication) {
-    return BB_HELPERS.substituteUrl(BB_CONSTANTS.AUCTION_URL, publication);
-  },
-  getSyncUrl: function(publication) {
-    return BB_HELPERS.substituteUrl(BB_CONSTANTS.SYNC_URL, publication);
-  },
-  getRendererUrl: function(publication, renderer) {
-    return BB_HELPERS.substituteUrl(BB_CONSTANTS.RENDERER_URL, publication, renderer);
-  },
-  transformVideoParams: function(videoParams, videoParamsExt) {
-    videoParams = deepClone(videoParams);
-
-    let playerSize = videoParams.playerSize || [BB_CONSTANTS.DEFAULT_WIDTH, BB_CONSTANTS.DEFAULT_HEIGHT];
-    if (Array.isArray(playerSize[0])) playerSize = playerSize[0];
-
-    videoParams.w = playerSize[0];
-    videoParams.h = playerSize[1];
-    videoParams.placement = 3;
-
-    if (videoParamsExt) videoParams = Object.assign(videoParams, videoParamsExt);
-
-    const videoParamsProperties = Object.keys(videoParams);
-
-    videoParamsProperties.forEach(property => {
-      if (BB_CONSTANTS.VIDEO_PARAMS.indexOf(property) === -1) delete videoParams[property];
-    });
-
-    return videoParams;
-  },
-  transformRTBToPrebidProps: function(bid, serverResponse) {
-    const bidObject = {
-      cpm: bid.price,
-      currency: serverResponse.cur,
-      netRevenue: BB_CONSTANTS.DEFAULT_NET_REVENUE,
-      bidId: bid.impid,
-      requestId: bid.impid,
-      creativeId: bid.crid,
-      mediaType: VIDEO,
-      width: bid.w || BB_CONSTANTS.DEFAULT_WIDTH,
-      height: bid.h || BB_CONSTANTS.DEFAULT_HEIGHT,
-      ttl: BB_CONSTANTS.DEFAULT_TTL
-    };
-
-    const extPrebidTargeting = deepAccess(bid, 'ext.prebid.targeting');
-    const extPrebidCache = deepAccess(bid, 'ext.prebid.cache');
-
-    if (extPrebidCache && typeof extPrebidCache.vastXml === 'object' && extPrebidCache.vastXml.cacheId && extPrebidCache.vastXml.url) {
-      bidObject.videoCacheKey = extPrebidCache.vastXml.cacheId;
-      bidObject.vastUrl = extPrebidCache.vastXml.url;
-    } else if (extPrebidTargeting && extPrebidTargeting.hb_uuid && extPrebidTargeting.hb_cache_host && extPrebidTargeting.hb_cache_path) {
-      bidObject.videoCacheKey = extPrebidTargeting.hb_uuid;
-      bidObject.vastUrl = `https://${extPrebidTargeting.hb_cache_host}${extPrebidTargeting.hb_cache_path}?uuid=${extPrebidTargeting.hb_uuid}`;
-    }
-    if (bid.adm) {
-      bidObject.ad = bid.adm;
-      bidObject.vastXml = bid.adm;
-    }
-    if (!bidObject.vastUrl && bid.nurl && !bid.adm) { // ad markup is on win notice url, and adm is ommited according to OpenRTB 2.5
-      bidObject.vastUrl = bid.nurl;
-    }
-    bidObject.meta = bid.meta || {};
-    if (bid.adomain) { bidObject.meta.advertiserDomains = bid.adomain; }
-    return bidObject;
-  },
-};
-
-// Renderer Functions
-const BB_RENDERER = {
-  bootstrapPlayer: function(bid) {
-    const config = {
-      code: bid.adUnitCode,
-    };
-
-    if (bid.vastXml) config.vastXml = bid.vastXml;
-    else if (bid.vastUrl) config.vastUrl = bid.vastUrl;
-
-    if (!bid.vastXml && !bid.vastUrl) {
-      logWarn(`${BB_CONSTANTS.BIDDER_CODE}: No vastXml or vastUrl on bid, bailing...`);
-      return;
-    }
-
-    if (!(window.bluebillywig && window.bluebillywig.renderers)) {
-      logWarn(`${BB_CONSTANTS.BIDDER_CODE}: renderer code failed to initialize...`);
-      return;
-    }
-
-    const rendererId = BB_RENDERER.getRendererId(bid.publicationName, bid.rendererCode);
-    const ele = document.getElementById(bid.adUnitCode); // NB convention
-    const renderer = find(window.bluebillywig.renderers, r => r._id === rendererId);
-
-    if (renderer) renderer.bootstrap(config, ele, bid.rendererSettings || {});
-    else logWarn(`${BB_CONSTANTS.BIDDER_CODE}: Couldn't find a renderer with ${rendererId}`);
-  },
-  newRenderer: function(rendererUrl, adUnitCode) {
-    const renderer = Renderer.install({
-      url: rendererUrl,
-      loaded: false,
-      adUnitCode
-    });
-
-    try {
-      renderer.setRender(BB_RENDERER.outstreamRender);
-    } catch (err) {
-      logWarn(`${BB_CONSTANTS.BIDDER_CODE}: Error tying to setRender on renderer`, err);
-    }
-
-    return renderer;
-  },
-  outstreamRender: function(bid) {
-    bid.renderer.push(function() { BB_RENDERER.bootstrapPlayer(bid) });
-  },
-  getRendererId: function(pub, renderer) {
-    return `${pub}-${renderer}`; // NB convention!
-  }
-};
-
-// Spec Functions
-// These functions are used to construct the core spec for the adapter
-export const spec = {
-  code: BB_CONSTANTS.BIDDER_CODE,
-  supportedMediaTypes: [VIDEO],
-  syncStore: { bidders: [], },
-  isBidRequestValid(bid) {
-    const publicationNameRegex = /^\w+\.?\w+$/;
-    const rendererRegex = /^[\w+_]+$/;
-
-    if (!bid.params) {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: no params set on bid. Rejecting bid: `, bid);
-      return false;
-    }
-
-    if (!bid.params.hasOwnProperty('publicationName') || typeof bid.params.publicationName !== 'string') {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: no publicationName specified in bid params, or it's not a string. Rejecting bid: `, bid);
-      return false;
-    } else if (!publicationNameRegex.test(bid.params.publicationName)) {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: publicationName must be in format 'publication' or 'publication.environment'. Rejecting bid: `, bid);
-      return false;
-    }
-
-    if ((!bid.params.hasOwnProperty('rendererCode') || typeof bid.params.rendererCode !== 'string')) {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: no rendererCode was specified in bid params. Rejecting bid: `, bid);
-      return false;
-    } else if (!rendererRegex.test(bid.params.rendererCode)) {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: rendererCode must be alphanumeric, including underscores. Rejecting bid: `, bid);
-      return false;
-    }
-
-    if (!bid.params.accountId) {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: no accountId specified in bid params. Rejecting bid: `, bid);
-      return false;
-    }
-
-    if (bid.params.hasOwnProperty('connections')) {
-      if (!Array.isArray(bid.params.connections)) {
-        logError(`${BB_CONSTANTS.BIDDER_CODE}: connections is not of type array. Rejecting bid: `, bid);
-        return false;
-      } else {
-        for (let i = 0; i < bid.params.connections.length; i++) {
-          if (!bid.params.hasOwnProperty(bid.params.connections[i])) {
-            logError(`${BB_CONSTANTS.BIDDER_CODE}: connection specified in params.connections, but not configured in params. Rejecting bid: `, bid);
-            return false;
-          }
-        }
-      }
-    } else {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: no connections specified in bid. Rejecting bid: `, bid);
-      return false;
-    }
-
-    if (bid.params.hasOwnProperty('video') && (bid.params.video === null || typeof bid.params.video !== 'object')) {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: params.video must be of type object. Rejecting bid: `, bid);
-      return false;
-    }
-
-    if (bid.params.hasOwnProperty('rendererSettings') && (bid.params.rendererSettings === null || typeof bid.params.rendererSettings !== 'object')) {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: params.rendererSettings must be of type object. Rejecting bid: `, bid);
-      return false;
-    }
-
-    if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
-      if (!bid.mediaTypes[VIDEO].hasOwnProperty('context')) {
-        logError(`${BB_CONSTANTS.BIDDER_CODE}: no context specified in bid. Rejecting bid: `, bid);
-        return false;
-      }
-
-      if (bid.mediaTypes[VIDEO].context !== 'outstream') {
-        logError(`${BB_CONSTANTS.BIDDER_CODE}: video.context is invalid, must be "outstream". Rejecting bid: `, bid);
-        return false;
-      }
-    } else {
-      logError(`${BB_CONSTANTS.BIDDER_CODE}: mediaTypes or mediaTypes.video is not specified. Rejecting bid: `, bid);
-      return false;
-    }
-
-    return true;
-  },
-  buildRequests(validBidRequests, bidderRequest) {
-    const imps = [];
-
-    validBidRequests.forEach(validBidRequest => {
-      if (!this.syncStore.publicationName) this.syncStore.publicationName = validBidRequest.params.publicationName;
-      if (!this.syncStore.accountId) this.syncStore.accountId = validBidRequest.params.accountId;
-
-      const ext = validBidRequest.params.connections.reduce((extBuilder, connection) => {
-        extBuilder[connection] = validBidRequest.params[connection];
-
-        if (this.syncStore.bidders.indexOf(connection) === -1) this.syncStore.bidders.push(connection);
-
-        return extBuilder;
-      }, {});
-
-      const videoParams = BB_HELPERS.transformVideoParams(deepAccess(validBidRequest, 'mediaTypes.video'), deepAccess(validBidRequest, 'params.video'));
-      imps.push({ id: validBidRequest.bidId, ext, secure: window.location.protocol === 'https' ? 1 : 0, video: videoParams });
-    });
-
-    const request = {
-      id: bidderRequest.bidderRequestId,
-      source: {tid: bidderRequest.ortb2?.source?.tid},
-      tmax: BB_CONSTANTS.DEFAULT_TIMEOUT,
-      imp: imps,
-      test: DEV_MODE ? 1 : 0,
-      ext: {
-        prebid: {
-          targeting: { includewinners: true, includebidderkeys: false }
-        }
-      }
-    };
-
-    // handle privacy settings for GDPR/CCPA/COPPA
-    if (bidderRequest.gdprConsent) {
-      let gdprApplies = 0;
-      if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') gdprApplies = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
-      deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
-      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-    }
-
-    if (bidderRequest.uspConsent) {
-      deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-      this.syncStore.uspConsent = bidderRequest.uspConsent;
-    }
-
-    if (getConfig('coppa') == true) deepSetValue(request, 'regs.coppa', 1);
-
-    // Enrich the request with any external data we may have
-    BB_HELPERS.addSiteAppDevice(request, bidderRequest.refererInfo && bidderRequest.refererInfo.page);
-    BB_HELPERS.addSchain(request, validBidRequests);
-    BB_HELPERS.addCurrency(request);
-    BB_HELPERS.addUserIds(request, validBidRequests);
-
-    return {
-      method: 'POST',
-      url: BB_HELPERS.getAuctionUrl(validBidRequests[0].params.publicationName),
-      data: JSON.stringify(request),
-      bidderRequest: bidderRequest
-    };
-  },
-  interpretResponse(serverResponse, request) {
-    serverResponse = serverResponse.body || {};
-
-    if (!serverResponse.hasOwnProperty('seatbid') || !Array.isArray(serverResponse.seatbid)) {
-      return [];
-    }
-
-    const bids = [];
-
-    serverResponse.seatbid.forEach(seatbid => {
-      if (!seatbid.bid || !Array.isArray(seatbid.bid)) return;
-      seatbid.bid.forEach(bid => {
-        bid = BB_HELPERS.transformRTBToPrebidProps(bid, serverResponse);
-
-        const bidParams = find(request.bidderRequest.bids, bidderRequestBid => bidderRequestBid.bidId === bid.bidId).params;
-        bid.publicationName = bidParams.publicationName;
-        bid.rendererCode = bidParams.rendererCode;
-        bid.accountId = bidParams.accountId;
-        bid.rendererSettings = bidParams.rendererSettings;
-
-        const rendererUrl = BB_HELPERS.getRendererUrl(bid.publicationName, bid.rendererCode);
-        bid.renderer = BB_RENDERER.newRenderer(rendererUrl, bid.adUnitCode);
-
-        bids.push(bid);
-      });
-    });
-
-    return bids;
-  },
-  getUserSyncs(syncOptions, serverResponses, gdpr) {
-    if (!syncOptions.iframeEnabled) return [];
-
-    const queryString = [];
-
-    if (gdpr.gdprApplies) queryString.push(`gdpr=${gdpr.gdprApplies ? 1 : 0}`);
-    if (gdpr.gdprApplies && gdpr.consentString) queryString.push(`gdpr_consent=${gdpr.consentString}`);
-
-    if (this.syncStore.uspConsent) queryString.push(`usp_consent=${this.syncStore.uspConsent}`);
-
-    queryString.push(`accountId=${this.syncStore.accountId}`);
-    queryString.push(`bidders=${btoa(JSON.stringify(this.syncStore.bidders))}`);
-    queryString.push(`cb=${Date.now()}-${Math.random().toString().replace('.', '')}`);
-
-    if (DEV_MODE) queryString.push('bbpbs_debug=true');
-
-    // NB syncUrl by default starts with ?pub=$$PUBLICATION
-    const syncUrl = `${BB_HELPERS.getSyncUrl(this.syncStore.publicationName)}&${queryString.join('&')}`;
-
-    return [{
-      type: 'iframe',
-      url: syncUrl
-    }];
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/bluebillywigBidAdapter.md b/modules/bluebillywigBidAdapter.md
deleted file mode 100644
index 7879697baf5..00000000000
--- a/modules/bluebillywigBidAdapter.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Overview
-
-```
-Module Name: Blue Billywig Adapter
-Module Type: Bidder Adapter
-Maintainer: dev+prebid@bluebillywig.com 
-```
-
-# Description
-
-Prebid Blue Billywig Bidder Adapter
-
-# Test Parameters
-
-```
-            const adUnits = [{
-                code: 'ad-unit',
-                sizes: [[[768,432],[640,480],[640,360]]],
-                mediaTypes: {
-                    video: {
-                        playerSize: [768, 432],
-                        context: 'outstream',
-                        mimes: ['video/mp4'],
-			protocols: [ 2,3,5,6]
-                    }
-                },
-                bids: [{
-                    bidder: 'bluebillywig',
-                    params: {
-			publicationName: "bbprebid",
-			rendererCode: "renderer",
-			accountId: 642,
-  			connections: [ 'bluebillywig' ],
-			bluebillywig: {}
-                    }
-                }]
-            }];
-```
diff --git a/modules/blueconicRtdProvider.js b/modules/blueconicRtdProvider.js
index b6eb9374671..c09fc6ee34c 100644
--- a/modules/blueconicRtdProvider.js
+++ b/modules/blueconicRtdProvider.js
@@ -11,6 +11,10 @@ import {submodule} from '../src/hook.js';
 import {mergeDeep, isPlainObject, logMessage, logError} from '../src/utils.js';
 import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const MODULE_NAME = 'realTimeData';
 const SUBMODULE_NAME = 'blueconic';
 
@@ -19,9 +23,9 @@ export const RTD_LOCAL_NAME = 'bcPrebidData';
 export const storage = getStorageManager({moduleType: MODULE_TYPE_RTD, moduleName: SUBMODULE_NAME});
 
 /**
-* Try parsing stringified array of data.
-* @param {String} data
-*/
+ * Try parsing stringified array of data.
+ * @param {String} data
+ */
 function parseJson(data) {
   try {
     return JSON.parse(data);
@@ -33,9 +37,8 @@ function parseJson(data) {
 
 /**
  * Add real-time data & merge segments.
- * @param {Object} bidConfig
+ * @param {Object} ortb2
  * @param {Object} rtd
- * @param {Object} rtdConfig
  */
 export function addRealTimeData(ortb2, rtd) {
   if (isPlainObject(rtd.ortb2)) {
@@ -78,7 +81,7 @@ export function getRealTimeData(reqBidsConfigObj, onDone, rtdConfig, userConsent
 /**
  * Module init
  * @param {Object} provider
- * @param {Objkect} userConsent
+ * @param {Object} userConsent
  * @return {boolean}
  */
 function init(provider, userConsent) {
diff --git a/modules/boldwinBidAdapter.js b/modules/boldwinBidAdapter.js
index 4d97f830d33..1cf3bf889b7 100644
--- a/modules/boldwinBidAdapter.js
+++ b/modules/boldwinBidAdapter.js
@@ -1,175 +1,38 @@
-import { isFn, deepAccess, logMessage } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {
+  isBidRequestValid,
+  buildRequestsBase,
+  interpretResponse,
+  getUserSyncs,
+  buildPlacementProcessingFunction,
+} from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'boldwin';
 const AD_URL = 'https://ssp.videowalldirect.com/pbjs';
-const SYNC_URL = 'https://cs.videowalldirect.com'
+const SYNC_URL = 'https://sync.videowalldirect.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency) {
-    return false;
+const addCustomFieldsToPlacement = (bid, bidderRequest, placement) => {
+  if (placement.adFormat === VIDEO) {
+    placement.wPlayer = placement.playerSize?.[0]?.[0];
+    placement.hPlayer = placement.playerSize?.[0]?.[1];
   }
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.title && bid.native.image && bid.native.impressionTrackers);
-    default:
-      return false;
-  }
-}
+};
 
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
+const placementProcessingFunction = buildPlacementProcessingFunction({ addCustomFieldsToPlacement });
 
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
+const buildRequests = (validBidRequests = [], bidderRequest = {}) => {
+  return buildRequestsBase({ adUrl: AD_URL, validBidRequests, bidderRequest, placementProcessingFunction });
+};
 
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && (bid.params.placementId || bid.params.endpointId));
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let winTop = window;
-    let location;
-    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
-    try {
-      location = new URL(bidderRequest.refererInfo.page);
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
-    let placements = [];
-    let request = {
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'language': (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
-      'secure': 1,
-      'host': location.host,
-      'page': location.pathname,
-      'placements': placements
-    };
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent;
-      }
-
-      // Add GPP consent
-      if (bidderRequest.gppConsent) {
-        request.gpp = bidderRequest.gppConsent.gppString;
-        request.gpp_sid = bidderRequest.gppConsent.applicableSections;
-      } else if (bidderRequest.ortb2?.regs?.gpp) {
-        request.gpp = bidderRequest.ortb2.regs.gpp;
-        request.gpp_sid = bidderRequest.ortb2.regs.gpp_sid;
-      }
-    }
-    const len = validBidRequests.length;
-
-    for (let i = 0; i < len; i++) {
-      let bid = validBidRequests[i];
-      const { mediaTypes, params } = bid;
-      const placement = {};
-      let sizes;
-      if (mediaTypes) {
-        if (mediaTypes[BANNER] && mediaTypes[BANNER].sizes) {
-          placement.adFormat = BANNER;
-          sizes = mediaTypes[BANNER].sizes;
-        } else if (mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize) {
-          placement.adFormat = VIDEO;
-          sizes = mediaTypes[VIDEO].playerSize;
-          placement.minduration = mediaTypes[VIDEO].minduration;
-          placement.maxduration = mediaTypes[VIDEO].maxduration;
-          placement.mimes = mediaTypes[VIDEO].mimes;
-          placement.protocols = mediaTypes[VIDEO].protocols;
-          placement.startdelay = mediaTypes[VIDEO].startdelay;
-          placement.placement = mediaTypes[VIDEO].placement;
-          placement.skip = mediaTypes[VIDEO].skip;
-          placement.skipafter = mediaTypes[VIDEO].skipafter;
-          placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-          placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-          placement.delivery = mediaTypes[VIDEO].delivery;
-          placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-          placement.api = mediaTypes[VIDEO].api;
-          placement.linearity = mediaTypes[VIDEO].linearity;
-        } else {
-          placement.adFormat = NATIVE;
-          placement.native = mediaTypes[NATIVE];
-        }
-      }
-
-      const { placementId, endpointId } = params;
-      if (placementId) {
-        placement.placementId = placementId;
-        placement.type = 'publisher';
-      } else if (endpointId) {
-        placement.endpointId = endpointId;
-        placement.type = 'network';
-      }
-
-      placements.push({
-        ...placement,
-        bidId: bid.bidId,
-        sizes: sizes || [],
-        wPlayer: sizes ? sizes[0] : 0,
-        hPlayer: sizes ? sizes[1] : 0,
-        schain: bid.schain || {},
-        bidFloor: getBidFloor(bid),
-      });
-    }
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: () => {
-    return [{
-      type: 'image',
-      url: SYNC_URL
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests,
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/brandmetricsRtdProvider.js b/modules/brandmetricsRtdProvider.js
index bd7a33ff037..7502a579745 100644
--- a/modules/brandmetricsRtdProvider.js
+++ b/modules/brandmetricsRtdProvider.js
@@ -5,11 +5,16 @@
  * @module modules/brandmetricsRtdProvider
  * @requires module:modules/realTimeData
  */
-import {submodule} from '../src/hook.js';
-import {deepAccess, deepSetValue, logError, mergeDeep, generateUUID} from '../src/utils.js';
-import {loadExternalScript} from '../src/adloader.js';
+import { submodule } from '../src/hook.js';
+import { deepAccess, deepSetValue, logError, mergeDeep, generateUUID } from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
 
 const MODULE_NAME = 'brandmetrics'
 const MODULE_CODE = MODULE_NAME
@@ -72,10 +77,11 @@ function checkConsent (userConsent) {
 }
 
 /**
-* Add event- listeners to hook in to brandmetrics events
-* @param {Object} reqBidsConfigObj
-* @param {function} callback
-*/
+ * Add event- listeners to hook in to brandmetrics events
+ * @param {Object} reqBidsConfigObj
+ * @param {Object} moduleConfig
+ * @param {function} callback
+ */
 function processBrandmetricsEvents (reqBidsConfigObj, moduleConfig, callback) {
   const callBidTargeting = (event) => {
     if (event.available && event.conf) {
@@ -110,6 +116,7 @@ function processBrandmetricsEvents (reqBidsConfigObj, moduleConfig, callback) {
 /**
  * Sets bid targeting of specific bidders
  * @param {Object} reqBidsConfigObj
+ * @param {Object} moduleConfig
  * @param {string} key Targeting key
  * @param {string} val Targeting value
  */
@@ -134,13 +141,13 @@ function initializeBrandmetrics(scriptId) {
     const file = scriptId + '.js'
     const url = path + file
 
-    loadExternalScript(url, MODULE_CODE)
+    loadExternalScript(url, MODULE_TYPE_RTD, MODULE_CODE)
   }
 }
 
 /**
-* Hook in to brandmetrics creative_in_view- event and emit billable- event for creatives measured by brandmetrics.
-*/
+ * Hook in to brandmetrics creative_in_view- event and emit billable- event for creatives measured by brandmetrics.
+ */
 function initializeBillableEvents() {
   if (!billableEventsInitialized) {
     window._brandmetrics.push({
@@ -150,7 +157,7 @@ function initializeBillableEvents() {
         handler: (ev) => {
           if (ev.source && ev.source.type === 'pbj') {
             const bid = ev.source.data;
-            events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+            events.emit(EVENTS.BILLABLE_EVENT, {
               vendor: 'brandmetrics',
               type: 'creative_in_view',
               measurementId: ev.mid,
@@ -196,7 +203,7 @@ export const brandmetricsSubmodule = {
       logError(e)
     }
   },
-  init: init
+  init
 }
 
 submodule('realTimeData', brandmetricsSubmodule)
diff --git a/modules/braveBidAdapter.js b/modules/braveBidAdapter.js
index d954522ae24..7689aade114 100644
--- a/modules/braveBidAdapter.js
+++ b/modules/braveBidAdapter.js
@@ -1,167 +1,27 @@
-import {isEmpty, isStr, parseUrl, triggerPixel} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
+import { isStr, triggerPixel } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { parseNative } from '../libraries/braveUtils/index.js';
+import { buildRequests, interpretResponse } from '../libraries/braveUtils/buildAndInterpret.js'
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 
 const BIDDER_CODE = 'brave';
 const DEFAULT_CUR = 'USD';
 const ENDPOINT_URL = `https://point.bravegroup.tv/?t=2&partner=hash`;
 
-const NATIVE_ASSETS_IDS = { 1: 'title', 2: 'icon', 3: 'image', 4: 'body', 5: 'sponsoredBy', 6: 'cta' };
-const NATIVE_ASSETS = {
-  title: { id: 1, name: 'title' },
-  icon: { id: 2, type: 1, name: 'img' },
-  image: { id: 3, type: 3, name: 'img' },
-  body: { id: 4, type: 2, name: 'data' },
-  sponsoredBy: { id: 5, type: 1, name: 'data' },
-  cta: { id: 6, type: 12, name: 'data' }
-};
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: (bid) => {
-    return !!(bid.params.placementId && bid.params.placementId.toString().length === 32);
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: (validBidRequests, bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    if (validBidRequests.length === 0 || !bidderRequest) return [];
-
-    const endpointURL = ENDPOINT_URL.replace('hash', validBidRequests[0].params.placementId);
-
-    let imp = validBidRequests.map(br => {
-      let impObject = {
-        id: br.bidId,
-        secure: 1
-      };
-
-      if (br.mediaTypes.banner) {
-        impObject.banner = createBannerRequest(br);
-      } else if (br.mediaTypes.video) {
-        impObject.video = createVideoRequest(br);
-      } else if (br.mediaTypes.native) {
-        impObject.native = {
-          // TODO: `id` is not part of the ORTB native spec, is this intentional?
-          id: br.bidId,
-          ver: '1.2',
-          request: createNativeRequest(br)
-        };
-      }
-      return impObject;
-    });
-
-    // TODO: do these values make sense?
-    let page = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
-    let r = bidderRequest.refererInfo.ref;
-
-    let data = {
-      id: bidderRequest.bidderRequestId,
-      cur: [ DEFAULT_CUR ],
-      device: {
-        w: screen.width,
-        h: screen.height,
-        language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
-        ua: navigator.userAgent,
-      },
-      site: {
-        domain: parseUrl(page).hostname,
-        page: page,
-      },
-      tmax: bidderRequest.timeout,
-      imp
-    };
-
-    if (r) {
-      data.site.ref = r;
-    }
-
-    if (bidderRequest.gdprConsent) {
-      data['regs'] = {'ext': {'gdpr': bidderRequest.gdprConsent.gdprApplies ? 1 : 0}};
-      data['user'] = {'ext': {'consent': bidderRequest.gdprConsent.consentString ? bidderRequest.gdprConsent.consentString : ''}};
-    }
-
-    if (bidderRequest.uspConsent !== undefined) {
-      if (!data['regs'])data['regs'] = {'ext': {}};
-      data['regs']['ext']['us_privacy'] = bidderRequest.uspConsent;
-    }
-
-    if (config.getConfig('coppa') === true) {
-      if (!data['regs'])data['regs'] = {'coppa': 1};
-      else data['regs']['coppa'] = 1;
-    }
-
-    if (validBidRequests[0].schain) {
-      data['source'] = {'ext': {'schain': validBidRequests[0].schain}};
-    }
-
-    return {
-      method: 'POST',
-      url: endpointURL,
-      data: data
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: (serverResponse) => {
-    if (!serverResponse || isEmpty(serverResponse.body)) return [];
-
-    let bids = [];
-    serverResponse.body.seatbid.forEach(response => {
-      response.bid.forEach(bid => {
-        let mediaType = bid.ext && bid.ext.mediaType ? bid.ext.mediaType : 'banner';
-
-        let bidObj = {
-          requestId: bid.impid,
-          cpm: bid.price,
-          width: bid.w,
-          height: bid.h,
-          ttl: 1200,
-          currency: DEFAULT_CUR,
-          netRevenue: true,
-          creativeId: bid.crid,
-          dealId: bid.dealid || null,
-          mediaType: mediaType
-        };
+  isBidRequestValid: (bid) => !!(bid.params.placementId && bid.params.placementId.toString().length === 32),
 
-        switch (mediaType) {
-          case 'video':
-            bidObj.vastUrl = bid.adm;
-            break;
-          case 'native':
-            bidObj.native = parseNative(bid.adm);
-            break;
-          default:
-            bidObj.ad = bid.adm;
-        }
+  buildRequests: (validBidRequests, bidderRequest) => buildRequests(validBidRequests, bidderRequest, ENDPOINT_URL, DEFAULT_CUR),
 
-        bids.push(bidObj);
-      });
-    });
-
-    return bids;
-  },
+  interpretResponse: (serverResponse) => interpretResponse(serverResponse, DEFAULT_CUR, parseNative),
 
   onBidWon: (bid) => {
     if (isStr(bid.nurl) && bid.nurl !== '') {
@@ -170,90 +30,4 @@ export const spec = {
   }
 };
 
-const parseNative = adm => {
-  let bid = {
-    clickUrl: adm.native.link && adm.native.link.url,
-    impressionTrackers: adm.native.imptrackers || [],
-    clickTrackers: (adm.native.link && adm.native.link.clicktrackers) || [],
-    jstracker: adm.native.jstracker || []
-  };
-  adm.native.assets.forEach(asset => {
-    let kind = NATIVE_ASSETS_IDS[asset.id];
-    let content = kind && asset[NATIVE_ASSETS[kind].name];
-    if (content) {
-      bid[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
-    }
-  });
-
-  return bid;
-}
-
-const createNativeRequest = br => {
-  let impObject = {
-    ver: '1.2',
-    assets: []
-  };
-
-  let keys = Object.keys(br.mediaTypes.native);
-
-  for (let key of keys) {
-    const props = NATIVE_ASSETS[key];
-    if (props) {
-      const asset = {
-        required: br.mediaTypes.native[key].required ? 1 : 0,
-        id: props.id,
-        [props.name]: {}
-      };
-
-      if (props.type) asset[props.name]['type'] = props.type;
-      if (br.mediaTypes.native[key].len) asset[props.name]['len'] = br.mediaTypes.native[key].len;
-      if (br.mediaTypes.native[key].sizes && br.mediaTypes.native[key].sizes[0]) {
-        asset[props.name]['w'] = br.mediaTypes.native[key].sizes[0];
-        asset[props.name]['h'] = br.mediaTypes.native[key].sizes[1];
-      }
-
-      impObject.assets.push(asset);
-    }
-  }
-
-  return impObject;
-}
-
-const createBannerRequest = br => {
-  let size = [];
-
-  if (br.mediaTypes.banner.sizes && Array.isArray(br.mediaTypes.banner.sizes)) {
-    if (Array.isArray(br.mediaTypes.banner.sizes[0])) { size = br.mediaTypes.banner.sizes[0]; } else { size = br.mediaTypes.banner.sizes; }
-  } else size = [300, 250];
-
-  return { id: br.transactionId, w: size[0], h: size[1] };
-};
-
-const createVideoRequest = br => {
-  // TODO: `id` is not part of imp.video in ORTB; is this intentional?
-  let videoObj = {id: br.bidId};
-  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'skip', 'minbitrate', 'maxbitrate', 'api', 'linearity'];
-
-  for (let param of supportParamsList) {
-    if (br.mediaTypes.video[param] !== undefined) {
-      videoObj[param] = br.mediaTypes.video[param];
-    }
-  }
-
-  if (br.mediaTypes.video.playerSize && Array.isArray(br.mediaTypes.video.playerSize)) {
-    if (Array.isArray(br.mediaTypes.video.playerSize[0])) {
-      videoObj.w = br.mediaTypes.video.playerSize[0][0];
-      videoObj.h = br.mediaTypes.video.playerSize[0][1];
-    } else {
-      videoObj.w = br.mediaTypes.video.playerSize[0];
-      videoObj.h = br.mediaTypes.video.playerSize[1];
-    }
-  } else {
-    videoObj.w = 640;
-    videoObj.h = 480;
-  }
-
-  return videoObj;
-}
-
 registerBidder(spec);
diff --git a/modules/bridBidAdapter.js b/modules/bridBidAdapter.js
index 8e7c2f166ef..c822f4d5c80 100644
--- a/modules/bridBidAdapter.js
+++ b/modules/bridBidAdapter.js
@@ -1,21 +1,17 @@
-import {createTrackPixelHtml, _each, deepAccess, getDefinedParams, parseGPTSingleSizeArrayToRtbSize} from '../src/utils.js';
+import {_each, deepAccess, getDefinedParams, parseGPTSingleSizeArrayToRtbSize} from '../src/utils.js';
 import {VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {getRefererInfo} from '../src/refererDetection.js';
-
-const SOURCE = 'pbjs';
-const BIDDER_CODE = 'brid';
-const ENDPOINT_URL = 'https://pbs.prebrid.tv/openrtb2/auction';
-const GVLID = 934;
-const TIME_TO_LIVE = 300;
-const VIDEO_PARAMS = [
-  'api', 'linearity', 'maxduration', 'mimes', 'minduration', 'placement',
-  'playbackmethod', 'protocols', 'startdelay'
-];
+import {getAd, getSiteObj, getSyncResponse} from '../libraries/targetVideoUtils/bidderUtils.js'
+import {GVLID, SOURCE, TIME_TO_LIVE, VIDEO_ENDPOINT_URL, VIDEO_PARAMS} from '../libraries/targetVideoUtils/constants.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ */
 export const spec = {
 
-  code: BIDDER_CODE,
+  code: 'brid',
   gvlid: GVLID,
   supportedMediaTypes: [VIDEO],
 
@@ -111,7 +107,7 @@ export const spec = {
 
       requests.push({
         method: 'POST',
-        url: ENDPOINT_URL,
+        url: VIDEO_ENDPOINT_URL,
         data: JSON.stringify(postBody),
         options: {
           withCredentials: true
@@ -132,92 +128,59 @@ export const spec = {
    */
   interpretResponse: function(serverResponse, bidRequest) {
     const response = serverResponse.body;
-    const bidResponses = [];
-
-    _each(response.seatbid, (resp) => {
-      _each(resp.bid, (bid) => {
-        const requestId = bidRequest.bidId;
-        const params = bidRequest.params;
-
-        const {ad, adUrl, vastUrl, vastXml} = getAd(bid);
-
-        const bidResponse = {
-          requestId,
-          params,
-          cpm: bid.price,
-          width: bid.w,
-          height: bid.h,
-          creativeId: bid.adid,
-          currency: response.cur,
-          netRevenue: false,
-          ttl: TIME_TO_LIVE,
-          meta: {
-            advertiserDomains: bid.adomain || []
-          }
-        };
+    let highestBid = null;
+
+    if (response && response.seatbid && response.seatbid.length && response.seatbid[0].bid && response.seatbid[0].bid.length) {
+      _each(response.seatbid, (resp) => {
+        _each(resp.bid, (bid) => {
+          const requestId = bidRequest.bidId;
+          const params = bidRequest.params;
+
+          const {ad, adUrl, vastUrl, vastXml} = getAd(bid);
+
+          const bidResponse = {
+            requestId,
+            params,
+            cpm: bid.price,
+            width: bid.w,
+            height: bid.h,
+            creativeId: bid.crid || bid.adid,
+            currency: response.cur,
+            netRevenue: false,
+            ttl: TIME_TO_LIVE,
+            meta: {
+              advertiserDomains: bid.adomain || []
+            }
+          };
 
-        if (vastUrl || vastXml) {
-          bidResponse.mediaType = VIDEO;
-          if (vastUrl) bidResponse.vastUrl = vastUrl;
-          if (vastXml) bidResponse.vastXml = vastXml;
-        } else {
-          bidResponse.ad = ad;
-          bidResponse.adUrl = adUrl;
-        };
+          if (vastUrl || vastXml) {
+            bidResponse.mediaType = VIDEO;
+            if (vastUrl) bidResponse.vastUrl = vastUrl;
+            if (vastXml) bidResponse.vastXml = vastXml;
+          } else {
+            bidResponse.ad = ad;
+            bidResponse.adUrl = adUrl;
+          };
 
-        bidResponses.push(bidResponse);
+          if (!highestBid || highestBid.cpm < bidResponse.cpm) {
+            highestBid = bidResponse;
+          }
+        });
       });
-    });
+    }
 
-    return bidResponses;
+    return highestBid ? [highestBid] : [];
   },
 
-}
-
-/**
- * Helper function to get ad
- *
- * @param {object} bid The bid.
- * @return {object} ad object.
- */
-function getAd(bid) {
-  let ad, adUrl, vastXml, vastUrl;
-
-  switch (deepAccess(bid, 'ext.prebid.type')) {
-    case VIDEO:
-      if (bid.adm.substr(0, 4) === 'http') {
-        vastUrl = bid.adm;
-      } else {
-        vastXml = bid.adm;
-      };
-      break;
-    default:
-      if (bid.adm && bid.nurl) {
-        ad = bid.adm;
-        ad += createTrackPixelHtml(decodeURIComponent(bid.nurl));
-      } else if (bid.adm) {
-        ad = bid.adm;
-      } else if (bid.nurl) {
-        adUrl = bid.nurl;
-      };
+  /**
+   * Determine the user sync type (either 'iframe' or 'image') based on syncOptions.
+   * Construct the sync URL by appending required query parameters such as gdpr, ccpa, and coppa consents.
+   * Return an array containing an object with the sync type and the constructed URL.
+   */
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) => {
+    return getSyncResponse(syncOptions, gdprConsent, uspConsent, gppConsent, 'brid');
   }
 
-  return {ad, adUrl, vastXml, vastUrl};
-}
-
-/**
- * Helper function to get site object
- *
- * @return {object} siteObj.
- */
-function getSiteObj() {
-  const refInfo = (getRefererInfo && getRefererInfo()) || {};
-
-  return {
-    page: refInfo.page,
-    ref: refInfo.ref,
-    domain: refInfo.domain
-  };
 }
 
 registerBidder(spec);
diff --git a/modules/bridgewellBidAdapter.js b/modules/bridgewellBidAdapter.js
index 6088cefaa55..578acf8a358 100644
--- a/modules/bridgewellBidAdapter.js
+++ b/modules/bridgewellBidAdapter.js
@@ -4,6 +4,11 @@ import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {find} from '../src/polyfill.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'bridgewell';
 const REQUEST_ENDPOINT = 'https://prebid.scupio.com/recweb/prebid.aspx?cb=';
 const BIDDER_VERSION = '1.1.0';
diff --git a/modules/brightMountainMediaBidAdapter.js b/modules/brightMountainMediaBidAdapter.js
index 6db06744c24..5e5b062889d 100644
--- a/modules/brightMountainMediaBidAdapter.js
+++ b/modules/brightMountainMediaBidAdapter.js
@@ -1,4 +1,4 @@
-import { generateUUID, deepAccess, logWarn, deepSetValue } from '../src/utils.js';
+import { generateUUID, deepAccess, logWarn, deepSetValue, isPlainObject } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
@@ -31,7 +31,7 @@ export const spec = {
       site: buildSite(bidderRequest),
       device: buildDevice(),
       cur: [CURRENCY],
-      tmax: 1000,
+      tmax: Math.min(1000, bidderRequest.timeout),
       regs: buildRegs(bidderRequest),
       user: {},
       source: {},
@@ -224,7 +224,7 @@ function getFloor(bid, size) {
       size: size,
     });
 
-    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD') {
+    if (isPlainObject(floorInfo) && floorInfo.currency === 'USD') {
       return parseFloat(floorInfo.floor);
     }
   }
diff --git a/modules/brightcomBidAdapter.js b/modules/brightcomBidAdapter.js
deleted file mode 100644
index 1fa1dac4e95..00000000000
--- a/modules/brightcomBidAdapter.js
+++ /dev/null
@@ -1,303 +0,0 @@
-import {
-  _each,
-  isArray,
-  getWindowTop,
-  getUniqueIdentifierStr,
-  deepSetValue,
-  logError,
-  logWarn,
-  createTrackPixelHtml,
-  getWindowSelf,
-  isFn,
-  isPlainObject,
-  getBidIdParameter
-} from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-
-const BIDDER_CODE = 'brightcom';
-const URL = 'https://brightcombid.marphezis.com/hb';
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-  gvlid: 883,
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  getUserSyncs
-};
-
-function buildRequests(bidReqs, bidderRequest) {
-  try {
-    let referrer = '';
-    if (bidderRequest && bidderRequest.refererInfo) {
-      referrer = bidderRequest.refererInfo.page;
-    }
-    const brightcomImps = [];
-    const publisherId = getBidIdParameter('publisherId', bidReqs[0].params);
-    _each(bidReqs, function (bid) {
-      let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
-      bidSizes = ((isArray(bidSizes) && isArray(bidSizes[0])) ? bidSizes : [bidSizes]);
-      bidSizes = bidSizes.filter(size => isArray(size));
-      const processedSizes = bidSizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}));
-
-      const element = document.getElementById(bid.adUnitCode);
-      const minSize = _getMinSize(processedSizes);
-      const viewabilityAmount = _isViewabilityMeasurable(element)
-        ? _getViewability(element, getWindowTop(), minSize)
-        : 'na';
-      const viewabilityAmountRounded = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
-
-      const imp = {
-        id: bid.bidId,
-        banner: {
-          format: processedSizes,
-          ext: {
-            viewability: viewabilityAmountRounded
-          }
-        },
-        tagid: String(bid.adUnitCode)
-      };
-      const bidFloor = _getBidFloor(bid);
-      if (bidFloor) {
-        imp.bidfloor = bidFloor;
-      }
-      brightcomImps.push(imp);
-    });
-    const brightcomBidReq = {
-      id: getUniqueIdentifierStr(),
-      imp: brightcomImps,
-      site: {
-        domain: bidderRequest?.refererInfo?.domain || '',
-        page: referrer,
-        publisher: {
-          id: publisherId
-        }
-      },
-      device: {
-        devicetype: _getDeviceType(),
-        w: screen.width,
-        h: screen.height
-      },
-      tmax: bidderRequest?.timeout
-    };
-
-    if (bidderRequest && bidderRequest.gdprConsent) {
-      deepSetValue(brightcomBidReq, 'regs.ext.gdpr', +bidderRequest.gdprConsent.gdprApplies);
-      deepSetValue(brightcomBidReq, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-    }
-
-    if (bidderRequest && bidderRequest.uspConsent) {
-      deepSetValue(brightcomBidReq, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-    }
-
-    if (config.getConfig('coppa') === true) {
-      deepSetValue(brightcomBidReq, 'regs.coppa', 1);
-    }
-
-    if (bidReqs[0] && bidReqs[0].schain) {
-      deepSetValue(brightcomBidReq, 'source.ext.schain', bidReqs[0].schain)
-    }
-
-    if (bidReqs[0] && bidReqs[0].userIdAsEids) {
-      deepSetValue(brightcomBidReq, 'user.ext.eids', bidReqs[0].userIdAsEids || [])
-    }
-
-    if (bidReqs[0] && bidReqs[0].userId) {
-      deepSetValue(brightcomBidReq, 'user.ext.ids', bidReqs[0].userId || [])
-    }
-
-    return {
-      method: 'POST',
-      url: URL,
-      data: JSON.stringify(brightcomBidReq),
-    };
-  } catch (e) {
-    logError(e, {bidReqs, bidderRequest});
-  }
-}
-
-function isBidRequestValid(bid) {
-  if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
-    return false;
-  }
-
-  if (typeof bid.params.publisherId === 'undefined') {
-    return false;
-  }
-
-  return true;
-}
-
-function interpretResponse(serverResponse) {
-  if (!serverResponse.body || typeof serverResponse.body != 'object') {
-    logWarn('Brightcom server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
-    return [];
-  }
-  const {body: {id, seatbid}} = serverResponse;
-  try {
-    const brightcomBidResponses = [];
-    if (id &&
-      seatbid &&
-      seatbid.length > 0 &&
-      seatbid[0].bid &&
-      seatbid[0].bid.length > 0) {
-      seatbid[0].bid.map(brightcomBid => {
-        brightcomBidResponses.push({
-          requestId: brightcomBid.impid,
-          cpm: parseFloat(brightcomBid.price),
-          width: parseInt(brightcomBid.w),
-          height: parseInt(brightcomBid.h),
-          creativeId: brightcomBid.crid || brightcomBid.id,
-          currency: 'USD',
-          netRevenue: true,
-          mediaType: BANNER,
-          ad: _getAdMarkup(brightcomBid),
-          ttl: 60,
-          meta: {
-            advertiserDomains: brightcomBid && brightcomBid.adomain ? brightcomBid.adomain : []
-          }
-        });
-      });
-    }
-    return brightcomBidResponses;
-  } catch (e) {
-    logError(e, {id, seatbid});
-  }
-}
-
-// Don't do user sync for now
-function getUserSyncs(syncOptions, responses, gdprConsent) {
-  return [];
-}
-
-function _isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
-}
-
-function _isConnectedTV() {
-  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
-}
-
-function _getDeviceType() {
-  return _isMobile() ? 1 : _isConnectedTV() ? 3 : 2;
-}
-
-function _getAdMarkup(bid) {
-  let adm = bid.adm;
-  if ('nurl' in bid) {
-    adm += createTrackPixelHtml(bid.nurl);
-  }
-  return adm;
-}
-
-function _isViewabilityMeasurable(element) {
-  return !_isIframe() && element !== null;
-}
-
-function _getViewability(element, topWin, {w, h} = {}) {
-  return getWindowTop().document.visibilityState === 'visible'
-    ? _getPercentInView(element, topWin, {w, h})
-    : 0;
-}
-
-function _isIframe() {
-  try {
-    return getWindowSelf() !== getWindowTop();
-  } catch (e) {
-    return true;
-  }
-}
-
-function _getMinSize(sizes) {
-  return sizes.reduce((min, size) => size.h * size.w < min.h * min.w ? size : min);
-}
-
-function _getBoundingBox(element, {w, h} = {}) {
-  let {width, height, left, top, right, bottom} = element.getBoundingClientRect();
-
-  if ((width === 0 || height === 0) && w && h) {
-    width = w;
-    height = h;
-    right = left + w;
-    bottom = top + h;
-  }
-
-  return {width, height, left, top, right, bottom};
-}
-
-function _getIntersectionOfRects(rects) {
-  const bbox = {
-    left: rects[0].left,
-    right: rects[0].right,
-    top: rects[0].top,
-    bottom: rects[0].bottom
-  };
-
-  for (let i = 1; i < rects.length; ++i) {
-    bbox.left = Math.max(bbox.left, rects[i].left);
-    bbox.right = Math.min(bbox.right, rects[i].right);
-
-    if (bbox.left >= bbox.right) {
-      return null;
-    }
-
-    bbox.top = Math.max(bbox.top, rects[i].top);
-    bbox.bottom = Math.min(bbox.bottom, rects[i].bottom);
-
-    if (bbox.top >= bbox.bottom) {
-      return null;
-    }
-  }
-
-  bbox.width = bbox.right - bbox.left;
-  bbox.height = bbox.bottom - bbox.top;
-
-  return bbox;
-}
-
-function _getPercentInView(element, topWin, {w, h} = {}) {
-  const elementBoundingBox = _getBoundingBox(element, {w, h});
-
-  // Obtain the intersection of the element and the viewport
-  const elementInViewBoundingBox = _getIntersectionOfRects([{
-    left: 0,
-    top: 0,
-    right: topWin.innerWidth,
-    bottom: topWin.innerHeight
-  }, elementBoundingBox]);
-
-  let elementInViewArea, elementTotalArea;
-
-  if (elementInViewBoundingBox !== null) {
-    // Some or all of the element is in view
-    elementInViewArea = elementInViewBoundingBox.width * elementInViewBoundingBox.height;
-    elementTotalArea = elementBoundingBox.width * elementBoundingBox.height;
-
-    return ((elementInViewArea / elementTotalArea) * 100);
-  }
-
-  // No overlap between element and the viewport; therefore, the element
-  // lies completely out of view
-  return 0;
-}
-
-function _getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return bid.params.bidFloor ? bid.params.bidFloor : null;
-  }
-
-  let floor = bid.getFloor({
-    currency: 'USD',
-    mediaType: '*',
-    size: '*'
-  });
-  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
-    return floor.floor;
-  }
-  return null;
-}
-
-registerBidder(spec);
diff --git a/modules/brightcomBidAdapter.md b/modules/brightcomBidAdapter.md
deleted file mode 100644
index 9f9aa0e5dd7..00000000000
--- a/modules/brightcomBidAdapter.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Overview
-
-```
-Module Name: Brightcom Bid Adapter
-Module Type: Bidder Adapter
-Maintainer: vladislavy@brightcom.com
-```
-
-# Description
-
-Brightcom's adapter integration to the Prebid library.
-
-# Test Parameters
-
-```
-var adUnits = [
-  {
-    code: 'test-leaderboard',
-    mediaTypes: {
-      banner: {
-        sizes: [[728, 90]]
-      }
-    },
-    bids: [{
-      bidder: 'brightcom',
-      params: {
-        publisherId: 2141020,
-        bidFloor: 0.01
-      }
-    }]
-  }, {
-    code: 'test-banner',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250]]
-      }
-    },
-    bids: [{
-      bidder: 'brightcom',
-      params: {
-        publisherId: 2141020
-      }
-    }]
-  }
-]
-```
diff --git a/modules/britepoolIdSystem.js b/modules/britepoolIdSystem.js
deleted file mode 100644
index b75fe9424b1..00000000000
--- a/modules/britepoolIdSystem.js
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * This module adds BritePoolId to the User ID module
- * The {@link module:modules/userId} module is required
- * @module modules/britepoolIdSystem
- * @requires module:modules/userId
- */
-
-import { isEmpty, triggerPixel, logError } from '../src/utils.js';
-import {ajax} from '../src/ajax.js';
-import {submodule} from '../src/hook.js';
-const PIXEL = 'https://px.britepool.com/new?partner_id=t';
-
-/** @type {Submodule} */
-export const britepoolIdSubmodule = {
-  /**
-   * Used to link submodule with config
-   * @type {string}
-   */
-  name: 'britepoolId',
-  /**
-   * Decode the stored id value for passing to bid requests
-   * @function
-   * @param {string} value
-   * @returns {{britepoolid:string}}
-   */
-  decode(value) {
-    return (value && typeof value['primaryBPID'] === 'string') ? { 'britepoolid': value['primaryBPID'] } : null;
-  },
-  /**
-   * Performs action to obtain id and return a value in the callback's response argument
-   * @function
-   * @param {SubmoduleConfig} [submoduleConfig]
-   * @param {ConsentData|undefined} consentData
-   * @returns {function(callback:function)}
-   */
-  getId(submoduleConfig, consentData) {
-    const submoduleConfigParams = (submoduleConfig && submoduleConfig.params) || {};
-    const { params, headers, url, getter, errors } = britepoolIdSubmodule.createParams(submoduleConfigParams, consentData);
-    let getterResponse = null;
-    if (typeof getter === 'function') {
-      getterResponse = getter(params);
-      // First let's rule out that the response is not a function
-      if (typeof getterResponse !== 'function') {
-        // Optimization to return value from getter
-        return {
-          id: britepoolIdSubmodule.normalizeValue(getterResponse)
-        };
-      }
-    }
-    if (isEmpty(params)) {
-      triggerPixel(PIXEL);
-    }
-    // Return for async operation
-    return {
-      callback: function(callback) {
-        if (errors.length > 0) {
-          errors.forEach(error => logError(error));
-          callback();
-          return;
-        }
-        if (getterResponse) {
-          // Resolve the getter function response
-          try {
-            getterResponse(function(response) {
-              callback(britepoolIdSubmodule.normalizeValue(response));
-            });
-          } catch (error) {
-            if (error !== '') logError(error);
-            callback();
-          }
-        } else {
-          ajax(url, {
-            success: response => {
-              const responseObj = britepoolIdSubmodule.normalizeValue(response);
-              callback(responseObj ? { primaryBPID: responseObj.primaryBPID } : null);
-            },
-            error: error => {
-              if (error !== '') logError(error);
-              callback();
-            }
-          }, JSON.stringify(params), { customHeaders: headers, contentType: 'application/json', method: 'POST', withCredentials: true });
-        }
-      }
-    }
-  },
-  /**
-   * Helper method to create params for our API call
-   * @param {SubmoduleParams} [submoduleConfigParams]
-   * @param {ConsentData|undefined} consentData
-   * @returns {object} Object with parsed out params
-   */
-  createParams(submoduleConfigParams, consentData) {
-    const hasGdprData = consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies;
-    const gdprConsentString = hasGdprData ? consentData.consentString : undefined;
-    let errors = [];
-    const headers = {};
-    const dynamicVars = typeof britepool_pubparams !== 'undefined' ? britepool_pubparams : {}; // eslint-disable-line camelcase, no-undef
-    let params = Object.assign({}, submoduleConfigParams, dynamicVars);
-    if (params.getter) {
-      // Custom getter will not require other params
-      if (typeof params.getter !== 'function') {
-        errors.push(`userIdTargeting - britepoolId submodule requires getter to be a function`);
-        return { errors };
-      }
-    } else {
-      if (params.api_key) {
-        // Add x-api-key into the header
-        headers['x-api-key'] = params.api_key;
-      }
-    }
-    const url = params.url || `https://api.britepool.com/v1/britepool/id${gdprConsentString ? '?gdprString=' + encodeURIComponent(gdprConsentString) : ''}`;
-    const getter = params.getter;
-    delete params.api_key;
-    delete params.url;
-    delete params.getter;
-    return {
-      params,
-      headers,
-      url,
-      getter,
-      errors
-    };
-  },
-  /**
-   * Helper method to normalize a JSON value
-   */
-  normalizeValue(value) {
-    let valueObj = null;
-    if (typeof value === 'object') {
-      valueObj = value;
-    } else if (typeof value === 'string') {
-      try {
-        valueObj = JSON.parse(value);
-      } catch (error) {
-        logError(error);
-      }
-    }
-    return valueObj;
-  },
-  eids: {
-    'britepoolid': {
-      source: 'britepool.com',
-      atype: 3
-    },
-  }
-};
-
-submodule('userId', britepoolIdSubmodule);
diff --git a/modules/britepoolIdSystem.md b/modules/britepoolIdSystem.md
deleted file mode 100644
index 72edbe2324b..00000000000
--- a/modules/britepoolIdSystem.md
+++ /dev/null
@@ -1,42 +0,0 @@
-## BritePool User ID Submodule
-
-BritePool User ID Module. For assistance setting up your module please contact us at [prebid@britepool.com](prebid@britepool.com).
-
-### Prebid Params
-
-Individual params may be set for the BritePool User ID Submodule. 
-```
-pbjs.setConfig({
-    userSync: {
-        userIds: [{
-            name: 'britepoolId',
-            storage: {
-                name: 'britepoolid',
-                type: 'cookie',
-                expires: 30
-            },
-            params: {
-                url: 'https://sandbox-api.britepool.com/v1/britepool/id', // optional
-                api_key: '3fdbe297-3690-4f5c-9e11-ee9186a6d77c', // provided by britepool
-                hash: '31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe970a1e66', // example hash identifier (sha256)
-                ssid: '221aa074-57fc-453b-81f0-6c74f628cd5c' // example identifier
-            }
-        }]
-    }
-});
-```
-## Parameter Descriptions for the `usersync` Configuration Section
-The below parameters apply only to the BritePool User ID Module integration.
-
-| Param under usersync.userIds[] | Scope | Type | Description | Example |
-| --- | --- | --- | --- | --- |
-| name | Required | String | ID value for the BritePool module - `"britepoolId"` | `"britepoolId"` |
-| params | Required | Object | Details for BritePool initialization. | |
-| params.api_key | Required | String |BritePool API Key provided by BritePool | "3fdbe297-3690-4f5c-9e11-ee9186a6d77c" |
-| params.url | Optional | String |BritePool API url | "https://sandbox-api.britepool.com/v1/britepool/id" |
-| params.identifier | Required | String | Where identifier in the params object is the key name. At least one identifier is required. Available Identifiers `aaid` `dtid` `idfa` `ilid` `luid` `mmid` `msid` `mwid` `rida` `ssid` `hash` | `params.ssid` `params.aaid` |
-| storage | Required | Object | The publisher must specify the local storage in which to store the results of the call to get the user ID. This can be either cookie or HTML5 storage. | |
-| storage.type | Required | String | This is where the results of the user ID will be stored. The recommended method is `localStorage` by specifying `html5`. | `"html5"` |
-| storage.name | Required | String | The name of the cookie or html5 local storage where the user ID will be stored. | `"britepoolid"` |
-| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. | `365` |
-| value | Optional | Object | Used only if the page has a separate mechanism for storing the BritePool ID. The value is an object containing the values to be sent to the adapters. In this scenario, no URL is called and nothing is added to local storage | `{"primaryBPID": "eb33b0cb-8d35-4722-b9c0-1a31d4064888"}` |
diff --git a/modules/browsiBidAdapter.js b/modules/browsiBidAdapter.js
index 03b6b2a8f3d..fa1cacaa568 100644
--- a/modules/browsiBidAdapter.js
+++ b/modules/browsiBidAdapter.js
@@ -3,6 +3,11 @@ import {config} from '../src/config.js';
 import {VIDEO} from '../src/mediaTypes.js';
 import {logError, logInfo, isArray, isStr} from '../src/utils.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
 const BIDDER_CODE = 'browsi';
 const DATA = 'brwvidtag';
 const ADAPTER = '__bad';
diff --git a/modules/browsiRtdProvider.js b/modules/browsiRtdProvider.js
index 4a61f40600d..6ac19b39c79 100644
--- a/modules/browsiRtdProvider.js
+++ b/modules/browsiRtdProvider.js
@@ -13,6 +13,7 @@
  * @property {string} pubKey
  * @property {string} url
  * @property {?string} keyName
+ * @property {?string} splitKey
  */
 
 import {deepClone, deepSetValue, isFn, isGptPubadsDefined, isNumber, logError, logInfo, generateUUID} from '../src/utils.js';
@@ -23,11 +24,18 @@ import {getStorageManager} from '../src/storageManager.js';
 import {find, includes} from '../src/polyfill.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import {EVENTS} from '../src/constants.js';
 import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
+import {setKeyValue as setGptKeyValue} from '../libraries/gptUtils/gptUtils.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const MODULE_NAME = 'browsi';
 
 const storage = getStorageManager({moduleType: MODULE_TYPE_RTD, moduleName: MODULE_NAME});
+const RANDOM = Math.floor(Math.random() * 10) + 1;
 
 /** @type {ModuleParams} */
 let _moduleParams = {};
@@ -45,24 +53,27 @@ let _ic = {};
  * @param {Object} data
  */
 export function addBrowsiTag(data) {
-  let script = loadExternalScript(data.u, 'browsi');
+  let script = loadExternalScript(data.u, MODULE_TYPE_RTD, 'browsi');
   script.async = true;
   script.setAttribute('data-sitekey', _moduleParams.siteKey);
   script.setAttribute('data-pubkey', _moduleParams.pubKey);
   script.setAttribute('prebidbpt', 'true');
   script.setAttribute('id', 'browsi-tag');
   script.setAttribute('src', data.u);
-  script.prebidData = deepClone(data);
+  script.prebidData = deepClone(typeof data === 'string' ? Object(data) : data)
+  script.brwRandom = RANDOM;
   if (_moduleParams.keyName) {
     script.prebidData.kn = _moduleParams.keyName;
   }
   return script;
 }
 
+export const setKeyValue = (key) => setGptKeyValue(key, RANDOM.toString());
+
 export function sendPageviewEvent(eventType) {
   if (eventType === 'PAGEVIEW') {
     window.addEventListener('browsi_pageview', () => {
-      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+      events.emit(EVENTS.BILLABLE_EVENT, {
         vendor: 'browsi',
         type: 'pageview',
         billingId: generateUUID()
@@ -88,6 +99,7 @@ export function collectData() {
   let predictorData = {
     ...{
       sk: _moduleParams.siteKey,
+      pk: _moduleParams.pubKey,
       sw: (win.screen && win.screen.width) || -1,
       sh: (win.screen && win.screen.height) || -1,
       url: `${doc.location.protocol}//${doc.location.host}${doc.location.pathname}`,
@@ -134,7 +146,6 @@ function getRTD(auc) {
       const adSlot = getSlotByCode(uc);
       const identifier = adSlot ? getMacroId(_browsiData['pmd'], adSlot) : uc;
       const _pd = _bp[identifier];
-      rp[uc] = getKVObject(-1);
       if (!_pd) {
         return rp
       }
@@ -186,7 +197,6 @@ function getAllSlots() {
 /**
  * get prediction and return valid object for key value set
  * @param {number} p
- * @param {string?} keyName
  * @return {Object} key:value
  */
 function getKVObject(p) {
@@ -275,7 +285,7 @@ function getPredictionsFromServer(url) {
         if (req.status === 200) {
           try {
             const data = JSON.parse(response);
-            if (data && data.p && data.kn) {
+            if (data) {
               setData({p: data.p, kn: data.kn, pmd: data.pmd, bet: data.bet});
             } else {
               setData({});
@@ -359,7 +369,7 @@ function getTargetingData(uc, c, us, a) {
     }
     if (sendAdRequestEvent) {
       const transactionId = a.adUnits.find(adUnit => adUnit.code === auc).transactionId;
-      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+      events.emit(EVENTS.BILLABLE_EVENT, {
         vendor: 'browsi',
         type: 'adRequest',
         billingId: generateUUID(),
@@ -376,6 +386,7 @@ function init(moduleConfig) {
   _moduleParams = moduleConfig.params;
   if (_moduleParams && _moduleParams.siteKey && _moduleParams.pubKey && _moduleParams.url) {
     collectData();
+    setKeyValue(_moduleParams.splitKey);
   } else {
     logError('missing params for Browsi provider');
   }
diff --git a/modules/bucksenseBidAdapter.js b/modules/bucksenseBidAdapter.js
index 7b6c3911ea1..5aa14f2a53b 100644
--- a/modules/bucksenseBidAdapter.js
+++ b/modules/bucksenseBidAdapter.js
@@ -2,12 +2,18 @@ import { logInfo } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const WHO = 'BKSHBID-005';
 const BIDDER_CODE = 'bucksense';
 const URL = 'https://directo.prebidserving.com/prebidjs/';
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 235,
   supportedMediaTypes: [BANNER],
 
   /**
@@ -15,7 +21,7 @@ export const spec = {
    *
    * @param {object} bid The bid to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
-  */
+   */
   isBidRequestValid: function (bid) {
     logInfo(WHO + ' isBidRequestValid() - INPUT bid:', bid);
     if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
@@ -28,10 +34,10 @@ export const spec = {
   },
 
   /**
-    * Make a server request from the list of BidRequests.
-    *
-    * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
-    * @return ServerRequest Info describing the request to the server.
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
     logInfo(WHO + ' buildRequests() - INPUT validBidRequests:', validBidRequests, 'INPUT bidderRequest:', bidderRequest);
@@ -73,7 +79,7 @@ export const spec = {
    *
    * @param {*} serverResponse A successful response from the server.
    * @return {Bid[]} An array of bids which were nested inside the server.
-  */
+   */
   interpretResponse: function (serverResponse, request) {
     logInfo(WHO + ' interpretResponse() - INPUT serverResponse:', serverResponse, 'INPUT request:', request);
 
diff --git a/modules/buzzoolaBidAdapter.js b/modules/buzzoolaBidAdapter.js
index b5ea6227f58..ae77ee159bc 100644
--- a/modules/buzzoolaBidAdapter.js
+++ b/modules/buzzoolaBidAdapter.js
@@ -5,6 +5,12 @@ import {Renderer} from '../src/Renderer.js';
 import {OUTSTREAM} from '../src/video.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
 const BIDDER_CODE = 'buzzoola';
 const ENDPOINT = 'https://exchange.buzzoola.com/ssp/prebidjs';
 const RENDERER_SRC = 'https://tube.buzzoola.com/new/build/buzzlibrary.js';
@@ -47,7 +53,6 @@ export const spec = {
    * Unpack the response from the server into a list of bids.
    *
    * @param {ServerResponse} serverResponse A successful response from the server.
-   * @param bidderRequest
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: function ({body}, {data}) {
diff --git a/modules/byDataAnalyticsAdapter.js b/modules/byDataAnalyticsAdapter.js
index 81fd4388c7d..508a5593f58 100644
--- a/modules/byDataAnalyticsAdapter.js
+++ b/modules/byDataAnalyticsAdapter.js
@@ -3,7 +3,7 @@ import Base64 from 'crypto-js/enc-base64';
 import hmacSHA512 from 'crypto-js/hmac-sha512';
 import enc from 'crypto-js/enc-utf8';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS, BID_STATUS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import {getStorageManager} from '../src/storageManager.js';
 import { auctionManager } from '../src/auctionManager.js';
@@ -12,7 +12,7 @@ import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
 
 const versionCode = '4.4.1'
 const secretKey = 'bydata@123456'
-const { EVENTS: { NO_BID, BID_TIMEOUT, AUCTION_END, AUCTION_INIT, BID_WON } } = CONSTANTS
+const { NO_BID, BID_TIMEOUT, AUCTION_END, AUCTION_INIT, BID_WON } = EVENTS
 const DEFAULT_EVENT_URL = 'https://pbjs-stream.bydata.com/topics/prebid'
 const analyticsType = 'endpoint'
 const isBydata = isKeyInUrl('bydata_debug')
@@ -342,7 +342,7 @@ ascAdapter.dataProcess = function (t) {
     })
   });
 
-  var prebidWinningBids = auctionManager.getBidsReceived().filter(bid => bid.status === CONSTANTS.BID_STATUS.BID_TARGETING_SET);
+  var prebidWinningBids = auctionManager.getBidsReceived().filter(bid => bid.status === BID_STATUS.BID_TARGETING_SET);
   prebidWinningBids && prebidWinningBids.length > 0 && prebidWinningBids.forEach(pbbid => {
     payload['auctionData'] && payload['auctionData'].forEach(rwData => {
       if (rwData['bid'] === pbbid.requestId && rwData['brs'] === pbbid.size) {
diff --git a/modules/c1xBidAdapter.js b/modules/c1xBidAdapter.js
index 8c9407825ba..d1b51dcb27d 100644
--- a/modules/c1xBidAdapter.js
+++ b/modules/c1xBidAdapter.js
@@ -2,6 +2,10 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { logInfo, logError } from '../src/utils.js';
 import { BANNER } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ */
+
 const BIDDER_CODE = 'c1x';
 const URL = 'https://hb-stg.c1exchange.com/ht';
 // const PIXEL_ENDPOINT = '//px.c1exchange.com/pubpixel/';
@@ -181,7 +185,7 @@ function getBidFloor(bidRequest) {
   }
 
   let floor =
-    floorInfo.floor ||
+    floorInfo?.floor ||
     bidRequest.params.bidfloor ||
     bidRequest.params.floorPriceMap ||
     0;
diff --git a/modules/cadentApertureMXBidAdapter.js b/modules/cadentApertureMXBidAdapter.js
index e73564dacdb..fa441a4f4fa 100644
--- a/modules/cadentApertureMXBidAdapter.js
+++ b/modules/cadentApertureMXBidAdapter.js
@@ -230,11 +230,6 @@ export const spec = {
       return false;
     }
 
-    if (bid.bidder !== BIDDER_CODE) {
-      logWarn(BIDDER_CODE + ': Must use "cadent_aperture_mx" as bidder code.');
-      return false;
-    }
-
     if (!bid.params.tagid || !isStr(bid.params.tagid)) {
       logWarn(BIDDER_CODE + ': Missing tagid param or tagid present and not type String.');
       return false;
@@ -282,12 +277,13 @@ export const spec = {
       };
 
       // adding gpid support
-      let gpid = deepAccess(bid, 'ortb2Imp.ext.data.adserver.adslot');
-      if (!gpid) {
-        gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
-      }
+      let gpid =
+        deepAccess(bid, 'ortb2Imp.ext.gpid') ||
+        deepAccess(bid, 'ortb2Imp.ext.data.adserver.adslot') ||
+        deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+
       if (gpid) {
-        data.ext = {gpid: gpid.toString()};
+        data.ext = { gpid: gpid.toString() };
       }
       let typeSpecifics = isVideo ? { video: cadentAdapter.buildVideo(bid) } : { banner: cadentAdapter.buildBanner(bid) };
       let bidfloorObj = bidfloor > 0 ? { bidfloor, bidfloorcur: DEFAULT_CUR } : {};
diff --git a/modules/carodaBidAdapter.js b/modules/carodaBidAdapter.js
index cb7b5fbe7c5..ebe4686630f 100644
--- a/modules/carodaBidAdapter.js
+++ b/modules/carodaBidAdapter.js
@@ -1,16 +1,18 @@
 // jshint esversion: 6, es3: false, node: true
 'use strict'
 
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import {
   deepAccess,
   deepSetValue,
   logError,
   mergeDeep,
-  parseSizesInput
+  sizeTupleToRtbSize,
+  sizesToSizeTuples
 } from '../src/utils.js';
-import { config } from '../src/config.js';
 
 const { getConfig } = config;
 
@@ -44,7 +46,7 @@ export const spec = {
       getFirstWithKey(validBidRequests, 'params.priceType') ||
       'net';
     const test = getFirstWithKey(validBidRequests, 'params.test');
-    const currency = getConfig('currency.adServerCurrency');
+    const currency = getCurrencyFromBidderRequest(bidderRequest);
     const eids = getFirstWithKey(validBidRequests, 'userIdAsEids');
     const schain = getFirstWithKey(validBidRequests, 'schain');
     const request = {
@@ -183,8 +185,8 @@ function getImps (validBidRequests, common) {
     const floorInfo = bid.getFloor
       ? bid.getFloor({ currency: common.currency || 'EUR' })
       : {};
-    const bidfloor = floorInfo.floor;
-    const bidfloorcur = floorInfo.currency;
+    const bidfloor = floorInfo?.floor;
+    const bidfloorcur = floorInfo?.currency;
     const { ctok, placementId } = bid.params;
     const imp = {
       bid_id: bid.bidId,
@@ -195,13 +197,7 @@ function getImps (validBidRequests, common) {
     };
     const bannerParams = deepAccess(bid, 'mediaTypes.banner');
     if (bannerParams && bannerParams.sizes) {
-      const sizes = parseSizesInput(bannerParams.sizes);
-      const format = sizes.map(size => {
-        const [width, height] = size.split('x');
-        const w = parseInt(width, 10);
-        const h = parseInt(height, 10);
-        return { w, h };
-      });
+      const format = sizesToSizeTuples(bannerParams.sizes).map(sizeTupleToRtbSize);
       imp.banner = {
         format
       };
diff --git a/modules/ccxBidAdapter.js b/modules/ccxBidAdapter.js
index b1fcb29e3d0..0a305a651cb 100644
--- a/modules/ccxBidAdapter.js
+++ b/modules/ccxBidAdapter.js
@@ -65,7 +65,7 @@ function _validateSizes (sizeObj, type) {
   return true
 }
 
-function _buildBid (bid) {
+function _buildBid (bid, bidderRequest) {
   let placement = {}
   placement.id = bid.bidId
   placement.secure = 1
@@ -105,6 +105,10 @@ function _buildBid (bid) {
 
   placement.ext = {'pid': bid.params.placementId}
 
+  if (bidderRequest.paapi?.enabled) {
+    placement.ext.ae = bid?.ortb2Imp?.ext?.ae
+  }
+
   return placement
 }
 
@@ -197,7 +201,7 @@ export const spec = {
       }
 
       _each(validBidRequests, function (bid) {
-        requestBody.imp.push(_buildBid(bid))
+        requestBody.imp.push(_buildBid(bid, bidderRequest))
       })
       // Return the server request
       return {
diff --git a/modules/ceeIdSystem.js b/modules/ceeIdSystem.js
new file mode 100644
index 00000000000..30240e3f75f
--- /dev/null
+++ b/modules/ceeIdSystem.js
@@ -0,0 +1,63 @@
+/**
+ * This module adds ceeId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/ceeId
+ * @requires module:modules/userId
+ */
+
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { submodule } from '../src/hook.js';
+import {domainOverrideToRootDomain} from '../libraries/domainOverrideToRootDomain/index.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
+const MODULE_NAME = 'ceeId';
+export const storage = getStorageManager({ moduleName: MODULE_NAME, moduleType: MODULE_TYPE_UID });
+
+/**
+ * Reads the ID token from local storage or cookies.
+ * @returns {string|undefined} The ID token, or undefined if not found.
+ */
+export const readId = tokenName => storage.getDataFromLocalStorage(tokenName) || storage.getCookie(tokenName);
+
+/** @type {Submodule} */
+export const ceeIdSubmodule = {
+  name: MODULE_NAME,
+  gvlid: 676,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function decode
+   * @param {string} value
+   * @returns {(Object|undefined)}
+   */
+  decode(value) {
+    return typeof value === 'string' ? { 'ceeId': value } : undefined;
+  },
+
+  /**
+   * performs action to obtain id and return a value
+   * @function
+   * @returns {(IdResponse|undefined)}
+   */
+  getId(config) {
+    const { params = {} } = config;
+    const { tokenName, value } = params
+    const ceeIdToken = value || readId(tokenName);
+
+    return ceeIdToken ? { id: ceeIdToken } : undefined;
+  },
+  domainOverride: domainOverrideToRootDomain(storage, MODULE_NAME),
+  eids: {
+    'ceeId': {
+      source: 'ceeid.eu',
+      atype: 1
+    },
+  },
+};
+
+submodule('userId', ceeIdSubmodule);
diff --git a/modules/ceeIdSystem.md b/modules/ceeIdSystem.md
new file mode 100644
index 00000000000..fe7a543748d
--- /dev/null
+++ b/modules/ceeIdSystem.md
@@ -0,0 +1,31 @@
+# Overview
+
+Module Name: ceeIdSystem
+Module Type: UserID Module
+Maintainer: pawel.grudzien@grupawp.pl
+
+# Description
+
+User identification system for WPM
+
+### Prebid Params example
+
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'ceeId',
+            storage: {
+                type: 'cookie',
+                name: 'ceeIdToken',
+                expires: 7,
+                refreshInSeconds: 360
+            },
+            params: {
+                tokenName: 'name' // Your custom name of token to read
+                value: 'tokenValue' // Optional param if you want to pass token value directly through setConfig (this param shouldn't be set if token value will be taken from cookie or LS)
+            }
+        }]
+    }
+});
+```
diff --git a/modules/cleanioRtdProvider.js b/modules/cleanioRtdProvider.js
index 7d0f461108b..35751210878 100644
--- a/modules/cleanioRtdProvider.js
+++ b/modules/cleanioRtdProvider.js
@@ -10,7 +10,12 @@ import { submodule } from '../src/hook.js';
 import { loadExternalScript } from '../src/adloader.js';
 import { logError, generateUUID, insertElement } from '../src/utils.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
 
 // ============================ MODULE STATE ===============================
 
@@ -39,6 +44,7 @@ let preloadStatus = 0;
  * @param {string} scriptURL The script URL to preload
  */
 function pageInitStepPreloadScript(scriptURL) {
+  // TODO: this bypasses adLoader
   const linkElement = document.createElement('link');
   linkElement.rel = 'preload';
   linkElement.as = 'script';
@@ -53,7 +59,7 @@ function pageInitStepPreloadScript(scriptURL) {
  * @param {string} scriptURL The script URL to add to the page for protection
  */
 function pageInitStepProtectPage(scriptURL) {
-  loadExternalScript(scriptURL, 'clean.io');
+  loadExternalScript(scriptURL, MODULE_TYPE_RTD, 'clean.io');
 }
 
 /**
@@ -154,8 +160,8 @@ function readConfig(config) {
 let startBillableEvents = function() {
   // Upon clean.io submodule initialization, every winner bid is considered to be protected
   // and therefore, subjected to billing
-  events.on(CONSTANTS.EVENTS.BID_WON, winnerBidResponse => {
-    events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+  events.on(EVENTS.BID_WON, winnerBidResponse => {
+    events.emit(EVENTS.BILLABLE_EVENT, {
       vendor: 'clean.io',
       billingId: generateUUID(),
       type: 'impression',
diff --git a/modules/cleanmedianetBidAdapter.js b/modules/cleanmedianetBidAdapter.js
index 601a237baa8..01178d63872 100644
--- a/modules/cleanmedianetBidAdapter.js
+++ b/modules/cleanmedianetBidAdapter.js
@@ -157,7 +157,7 @@ export const spec = {
               maxduration: bidRequest.mediaTypes.video.maxduration,
               api: bidRequest.mediaTypes.video.api,
               skip: bidRequest.mediaTypes.video.skip || bidRequest.params.video.skip,
-              placement: bidRequest.mediaTypes.video.placement || bidRequest.params.video.placement,
+              plcmt: bidRequest.mediaTypes.video.plcmt || bidRequest.params.video.plcmt,
               minduration: bidRequest.mediaTypes.video.minduration || bidRequest.params.video.minduration,
               playbackmethod: bidRequest.mediaTypes.video.playbackmethod || bidRequest.params.video.playbackmethod,
               startdelay: bidRequest.mediaTypes.video.startdelay || bidRequest.params.video.startdelay
diff --git a/modules/clickforceBidAdapter.js b/modules/clickforceBidAdapter.js
index 92bc9b1bad2..be81ff1885c 100644
--- a/modules/clickforceBidAdapter.js
+++ b/modules/clickforceBidAdapter.js
@@ -2,6 +2,12 @@ import { _each } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'clickforce';
 const ENDPOINT_URL = 'https://ad.holmesmind.com/adserver/prebid.json?cb=' + new Date().getTime() + '&hb=1&ver=1.21';
 
diff --git a/modules/codefuelBidAdapter.js b/modules/codefuelBidAdapter.js
index 2548b20189b..9f85b2b82cb 100644
--- a/modules/codefuelBidAdapter.js
+++ b/modules/codefuelBidAdapter.js
@@ -1,7 +1,16 @@
-import {deepAccess, isArray} from '../src/utils.js';
+import {isArray, setOnAny} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
 const BIDDER_CODE = 'codefuel';
 const CURRENCY = 'USD';
 
@@ -10,11 +19,11 @@ export const spec = {
   supportedMediaTypes: [ BANNER ],
   aliases: ['ex'], // short code
   /**
-         * Determines whether or not the given bid request is valid.
-         *
-         * @param {BidRequest} bid The bid params to validate.
-         * @return boolean True if this is a valid bid, and false otherwise.
-         */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     if (bid.nativeParams) {
       return false;
@@ -22,11 +31,11 @@ export const spec = {
     return !!(bid.params.placementId || (bid.params.member && bid.params.invCode));
   },
   /**
-         * Make a server request from the list of BidRequests.
-         *
-         * @param {validBidRequests[]} - an array of bids
-         * @return ServerRequest Info describing the request to the server.
-         */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests} validBidRequests - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     const page = bidderRequest.refererInfo.page;
     const domain = bidderRequest.refererInfo.domain;
@@ -78,11 +87,11 @@ export const spec = {
     };
   },
   /**
-         * Unpack the response from the server into a list of bids.
-         *
-         * @param {ServerResponse} serverResponse A successful response from the server.
-         * @return {Bid[]} An array of bids which were nested inside the server.
-         */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: (serverResponse, { bids }) => {
     if (!serverResponse.body) {
       return [];
@@ -116,12 +125,12 @@ export const spec = {
   },
 
   /**
-     * Register the user sync pixels which should be dropped after the auction.
-     *
-     * @param {SyncOptions} syncOptions Which user syncs are allowed?
-     * @param {ServerResponse[]} serverResponses List of server's responses.
-     * @return {UserSync[]} The user syncs which should be dropped.
-     */
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
     return [];
   }
@@ -139,15 +148,6 @@ function getDeviceType() {
   return 2; // 'desktop'
 }
 
-function setOnAny(collection, key) {
-  for (let i = 0, result; i < collection.length; i++) {
-    result = deepAccess(collection[i], key);
-    if (result) {
-      return result;
-    }
-  }
-}
-
 function flatten(arr) {
   return [].concat(...arr);
 }
diff --git a/modules/cointrafficBidAdapter.js b/modules/cointrafficBidAdapter.js
index 380e1f5fc77..c626d1f56aa 100644
--- a/modules/cointrafficBidAdapter.js
+++ b/modules/cointrafficBidAdapter.js
@@ -2,6 +2,14 @@ import { parseSizesInput, logError, isEmpty } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js'
 import { config } from '../src/config.js'
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderSpec} BidderSpec
+ */
 
 const BIDDER_CODE = 'cointraffic';
 const ENDPOINT_URL = 'https://apps-pbd.ctraffic.io/pb/tmp';
@@ -38,7 +46,7 @@ export const spec = {
       const sizes = parseSizesInput(bidRequest.params.size || bidRequest.sizes);
       const currency =
         config.getConfig(`currency.bidderCurrencyDefault.${BIDDER_CODE}`) ||
-        config.getConfig('currency.adServerCurrency') ||
+        getCurrencyFromBidderRequest(bidderRequest) ||
         DEFAULT_CURRENCY;
 
       if (ALLOWED_CURRENCIES.indexOf(currency) === -1) {
diff --git a/modules/coinzillaBidAdapter.js b/modules/coinzillaBidAdapter.js
index c7d8fa5797c..9ae2c74547d 100644
--- a/modules/coinzillaBidAdapter.js
+++ b/modules/coinzillaBidAdapter.js
@@ -1,6 +1,12 @@
 import { parseSizesInput } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
 const BIDDER_CODE = 'coinzilla';
 const ENDPOINT_URL = 'https://request.czilladx.com/serve/request.php';
 
diff --git a/modules/colombiaBidAdapter.js b/modules/colombiaBidAdapter.js
new file mode 100644
index 00000000000..0d25ca6cb60
--- /dev/null
+++ b/modules/colombiaBidAdapter.js
@@ -0,0 +1,107 @@
+import * as utils from '../src/utils.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+const BIDDER_CODE = 'colombia';
+const ENDPOINT_URL = 'https://ade.clmbtech.com/cde/prebid.htm';
+const HOST_NAME = document.location.protocol + '//' + window.location.host;
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['clmb'],
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid: function(bid) {
+    return !!(bid.params.placementId);
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    if (validBidRequests.length === 0) {
+      return [];
+    }
+    let payloadArr = []
+    let ctr = 1;
+    validBidRequests = validBidRequests.map(bidRequest => {
+      const params = bidRequest.params;
+      const sizes = utils.parseSizesInput(bidRequest.sizes)[0];
+      const width = sizes.split('x')[0];
+      const height = sizes.split('x')[1];
+      const placementId = params.placementId;
+      const cb = Math.floor(Math.random() * 99999999999);
+      const bidId = bidRequest.bidId;
+      const referrer = (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) ? bidderRequest.refererInfo.referer : '';
+      let mediaTypes = {}
+      let payload = {
+        v: 'hb1',
+        p: placementId,
+        pos: '~' + ctr,
+        w: width,
+        h: height,
+        cb: cb,
+        r: referrer,
+        uid: bidId,
+        t: 'i',
+        d: HOST_NAME,
+        fpc: params.fpc,
+        _u: window.location.href,
+        mediaTypes: Object.assign({}, mediaTypes, bidRequest.mediaTypes)
+      };
+      if (params.keywords) payload.keywords = params.keywords;
+      if (params.category) payload.cat = params.category;
+      if (params.pageType) payload.pgt = params.pageType;
+      if (params.incognito) payload.ic = params.incognito;
+      if (params.dsmi) payload.smi = params.dsmi;
+      if (params.optout) payload.out = params.optout;
+      if (bidRequest && bidRequest.hasOwnProperty('ortb2Imp') && bidRequest.ortb2Imp.hasOwnProperty('ext')) {
+        payload.ext = bidRequest.ortb2Imp.ext;
+        if (bidRequest.ortb2Imp.ext.hasOwnProperty('gpid')) payload.pubAdCode = bidRequest.ortb2Imp.ext.gpid.split('#')[0];
+      }
+      payloadArr.push(payload);
+      ctr++;
+    });
+    return [{
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payloadArr,
+    }]
+  },
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+    const res = serverResponse.body || serverResponse;
+    if (!res || res.length === 0) {
+      return bidResponses;
+    }
+    try {
+      res.forEach(response => {
+        const crid = response.creativeId || 0;
+        const width = response.width || 0;
+        const height = response.height || 0;
+        let cpm = response.cpm || 0;
+        if (cpm <= 0) {
+          return bidResponses;
+        }
+        if (width !== 0 && height !== 0 && cpm !== 0 && crid !== 0) {
+          const dealId = response.dealid || '';
+          const currency = response.currency || 'USD';
+          const netRevenue = (response.netRevenue === undefined) ? true : response.netRevenue;
+          const bidResponse = {
+            requestId: response.requestId,
+            cpm: cpm.toFixed(2),
+            width: response.width,
+            height: response.height,
+            creativeId: crid,
+            dealId: dealId,
+            currency: currency,
+            netRevenue: netRevenue,
+            ttl: config.getConfig('_bidderTimeout') || 300,
+            referrer: bidRequest.data.r,
+            ad: response.ad
+          };
+          bidResponses.push(bidResponse);
+        }
+      });
+    } catch (error) {
+      utils.logError(error);
+    }
+    return bidResponses;
+  }
+}
+registerBidder(spec);
diff --git a/modules/colombiaBidAdapter.md b/modules/colombiaBidAdapter.md
new file mode 100644
index 00000000000..c6ef5e6b749
--- /dev/null
+++ b/modules/colombiaBidAdapter.md
@@ -0,0 +1,31 @@
+# Overview
+
+```
+Module Name: COLOMBIA Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: colombiaonline@timesinteret.in
+```
+
+# Description
+
+Connect to COLOMBIA for bids.
+
+COLOMBIA adapter requires setup and approval from the COLOMBIA team. Please reach out to your account team or colombiaonline@timesinteret.in for more information.
+
+# Test Parameters
+```
+  var adUnits = [{
+    code: 'test-ad-div',
+    mediaTypes: {
+       banner: {
+         sizes: [[300, 250],[728,90],[320,50]]
+       }
+    },
+    bids: [{
+    bidder: 'colombia',
+      params: { 
+        placementId: '540799'
+      }
+    }]
+  }];
+```
\ No newline at end of file
diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index b1ee8875422..2abe9cb94a8 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -5,6 +5,11 @@ import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'colossusssp';
 const G_URL = 'https://colossusssp.com/?c=o&m=multi';
 const G_URL_SYNC = 'https://sync.colossusssp.com';
@@ -135,19 +140,18 @@ export const spec = {
         groupId: bid.params.group_id,
         bidId: bid.bidId,
         tid: bid.ortb2Imp?.ext?.tid,
-        eids: [],
+        eids: bid.userIdAsEids || [],
         floor: {}
       };
 
       if (bid.schain) {
         placement.schain = bid.schain;
       }
-      let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+      let gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
       if (gpid) {
         placement.gpid = gpid;
       }
       if (bid.userId) {
-        getUserId(placement.eids, bid.userId.britepoolid, 'britepool.com');
         getUserId(placement.eids, bid.userId.idl_env, 'identityLink');
         getUserId(placement.eids, bid.userId.id5id, 'id5-sync.com');
         getUserId(placement.eids, bid.userId.uid2 && bid.userId.uid2.id, 'uidapi.com');
@@ -168,7 +172,7 @@ export const spec = {
         placement.mimes = mediaTypes[VIDEO].mimes;
         placement.protocols = mediaTypes[VIDEO].protocols;
         placement.startdelay = mediaTypes[VIDEO].startdelay;
-        placement.placement = mediaTypes[VIDEO].placement;
+        placement.placement = mediaTypes[VIDEO].plcmt;
         placement.skip = mediaTypes[VIDEO].skip;
         placement.skipafter = mediaTypes[VIDEO].skipafter;
         placement.minbitrate = mediaTypes[VIDEO].minbitrate;
diff --git a/modules/compassBidAdapter.js b/modules/compassBidAdapter.js
index addcdfebb27..1a4cc3faeaf 100644
--- a/modules/compassBidAdapter.js
+++ b/modules/compassBidAdapter.js
@@ -1,212 +1,21 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'compass';
+const GVLID = 883;
 const AD_URL = 'https://sa-lb.deliverimp.com/pbjs';
 const SYNC_URL = 'https://sa-cs.deliverimp.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId, endpointId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  if (placementId) {
-    placement.placementId = placementId;
-    placement.type = 'publisher';
-  } else if (endpointId) {
-    placement.endpointId = endpointId;
-    placement.type = 'network';
-  }
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-    // TODO: does the fallback make sense here?
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/conceptxBidAdapter.js b/modules/conceptxBidAdapter.js
index 127b049bc99..87ac96f2131 100644
--- a/modules/conceptxBidAdapter.js
+++ b/modules/conceptxBidAdapter.js
@@ -3,23 +3,23 @@ import { BANNER } from '../src/mediaTypes.js';
 // import { logError, logInfo, logWarn, parseUrl } from '../src/utils.js';
 
 const BIDDER_CODE = 'conceptx';
-let ENDPOINT_URL = 'https://conceptx.cncpt-central.com/openrtb';
+const ENDPOINT_URL = 'https://conceptx.cncpt-central.com/openrtb';
 // const LOG_PREFIX = 'ConceptX: ';
 
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER],
   isBidRequestValid: function (bid) {
-    return !!(bid.bidId);
+    return !!(bid.bidId && bid.params.site && bid.params.adunit);
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
     // logWarn(LOG_PREFIX + 'all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)');
     const requests = [];
-
+    let requestUrl = `${ENDPOINT_URL}`
     if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
-      ENDPOINT_URL += '?gdpr_applies=' + bidderRequest.gdprConsent.gdprApplies;
-      ENDPOINT_URL += '&consentString=' + bidderRequest.gdprConsent.consentString;
+      requestUrl += '?gdpr_applies=' + bidderRequest.gdprConsent.gdprApplies;
+      requestUrl += '&consentString=' + bidderRequest.gdprConsent.consentString;
     }
     for (var i = 0; i < validBidRequests.length; i++) {
       const requestParent = { adUnits: [], meta: {} };
@@ -33,7 +33,7 @@ export const spec = {
       requestParent.adUnits.push(adUnit);
       requests.push({
         method: 'POST',
-        url: ENDPOINT_URL,
+        url: requestUrl,
         options: {
           withCredentials: false,
         },
@@ -51,6 +51,9 @@ export const spec = {
       return bidResponses
     }
     const firstBid = bidResponsesFromServer[0]
+    if (!firstBid) {
+      return bidResponses
+    }
     const firstSeat = firstBid.ads[0]
     const bidResponse = {
       requestId: firstSeat.requestId,
diff --git a/modules/concertAnalyticsAdapter.js b/modules/concertAnalyticsAdapter.js
index 210d1898338..742646960f3 100644
--- a/modules/concertAnalyticsAdapter.js
+++ b/modules/concertAnalyticsAdapter.js
@@ -1,7 +1,7 @@
 import { logMessage } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 
 const analyticsType = 'endpoint';
@@ -13,12 +13,10 @@ const pageIncludedInSample = sampleAnalytics();
 const url = 'https://bids.concert.io/analytics';
 
 const {
-  EVENTS: {
-    BID_RESPONSE,
-    BID_WON,
-    AUCTION_END
-  }
-} = CONSTANTS;
+  BID_RESPONSE,
+  BID_WON,
+  AUCTION_END
+} = EVENTS;
 
 let queue = [];
 
diff --git a/modules/concertBidAdapter.js b/modules/concertBidAdapter.js
index 7042c895bfb..ec65ba11205 100644
--- a/modules/concertBidAdapter.js
+++ b/modules/concertBidAdapter.js
@@ -1,7 +1,14 @@
 import { logWarn, logMessage, debugTurnedOn, generateUUID, deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
-import { hasPurpose1Consent } from '../src/utils/gpdr.js';
+import { hasPurpose1Consent } from '../src/utils/gdpr.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
 
 const BIDDER_CODE = 'concert';
 const CONCERT_ENDPOINT = 'https://bids.concert.io';
@@ -49,6 +56,7 @@ export const spec = {
         uspConsent: bidderRequest.uspConsent,
         gdprConsent: bidderRequest.gdprConsent,
         gppConsent: bidderRequest.gppConsent,
+        tdid: getTdid(bidderRequest, validBidRequests),
       }
     };
 
@@ -120,7 +128,8 @@ export const spec = {
         meta: { advertiserDomains: bid && bid.adomain ? bid.adomain : [] },
         creativeId: bid.creativeId,
         netRevenue: bid.netRevenue,
-        currency: bid.currency
+        currency: bid.currency,
+        ...(bid.dealid && { dealId: bid.dealid }),
       };
     });
 
@@ -263,3 +272,11 @@ function getOffset(el) {
     };
   }
 }
+
+function getTdid(bidderRequest, validBidRequests) {
+  if (hasOptedOutOfPersonalization() || !consentAllowsPpid(bidderRequest)) {
+    return null;
+  }
+
+  return deepAccess(validBidRequests[0], 'userId.tdid') || null;
+}
diff --git a/modules/confiantRtdProvider.js b/modules/confiantRtdProvider.js
index 6b1066a20f1..7aee63472c9 100644
--- a/modules/confiantRtdProvider.js
+++ b/modules/confiantRtdProvider.js
@@ -12,7 +12,8 @@ import { submodule } from '../src/hook.js';
 import { logError, generateUUID } from '../src/utils.js';
 import { loadExternalScript } from '../src/adloader.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
 
 /**
  * Injects the Confiant Inc. configuration script into the page, based on proprtyId provided
@@ -21,7 +22,8 @@ import CONSTANTS from '../src/constants.json';
 function injectConfigScript(propertyId) {
   const scriptSrc = `https://cdn.confiant-integrations.net/${propertyId}/gpt_and_prebid/config.js`;
 
-  loadExternalScript(scriptSrc, 'confiant', () => {});
+  loadExternalScript(scriptSrc, MODULE_TYPE_RTD, 'confiant', () => {
+  });
 }
 
 /**
@@ -89,7 +91,7 @@ function setUpMutationObserver() {
 function getEventHandlerFunction(propertyId) {
   return function reportBillableEvent(e) {
     if (e.data.type.indexOf('cnft:reportBillableEvent:' + propertyId) > -1) {
-      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+      events.emit(EVENTS.BILLABLE_EVENT, {
         auctionId: e.data.auctionId,
         billingId: generateUUID(),
         transactionId: e.data.transactionId,
diff --git a/modules/connatixBidAdapter.js b/modules/connatixBidAdapter.js
index df56ad580bc..ea02b49d8ed 100644
--- a/modules/connatixBidAdapter.js
+++ b/modules/connatixBidAdapter.js
@@ -1,23 +1,46 @@
+import adapterManager from '../src/adapterManager.js';
 import {
   registerBidder
 } from '../src/adapters/bidderFactory.js';
 
+import { percentInView } from '../libraries/percentInView/percentInView.js';
+
+import { config } from '../src/config.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { ajax } from '../src/ajax.js';
 import {
   deepAccess,
-  isFn,
-  logError,
+  deepSetValue,
+  formatQS,
+  getWindowTop,
   isArray,
-  formatQS
+  isFn,
+  isNumber,
+  isStr,
+  logError
 } from '../src/utils.js';
 
 import {
+  ADPOD,
   BANNER,
+  VIDEO,
 } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'connatix';
+
 const AD_URL = 'https://capi.connatix.com/rtb/hba';
 const DEFAULT_MAX_TTL = '3600';
 const DEFAULT_CURRENCY = 'USD';
+const CNX_IDS_LOCAL_STORAGE_COOKIES_KEY = 'cnx_user_ids';
+const CNX_IDS_EXPIRY = 24 * 30 * 60 * 60 * 1000; // 30 days
+export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
+const ALL_PROVIDERS_RESOLVED_EVENT = 'cnx_all_identity_providers_resolved';
+const IDENTITY_PROVIDER_RESOLVED_EVENT = 'cnx_identity_provider_resolved';
+let cnxIdsValues;
+
+const EVENTS_URL = 'https://capi.connatix.com/tr/am';
+
+let context = {};
 
 /*
  * Get the bid floor value from the bid object, either using the getFloor function or by accessing the 'params.bidfloor' property.
@@ -34,17 +57,160 @@ export function getBidFloor(bid) {
       mediaType: '*',
       size: '*',
     });
-    return bidFloor.floor;
+    return bidFloor?.floor;
   } catch (err) {
     logError(err);
     return 0;
   }
 }
 
+export function validateBanner(mediaTypes) {
+  if (!mediaTypes[BANNER]) {
+    return true;
+  }
+
+  const banner = deepAccess(mediaTypes, BANNER, {});
+  return (Boolean(banner.sizes) && isArray(mediaTypes[BANNER].sizes) && mediaTypes[BANNER].sizes.length > 0);
+}
+
+export function validateVideo(mediaTypes) {
+  const video = mediaTypes[VIDEO];
+  if (!video) {
+    return true;
+  }
+
+  return video.context !== ADPOD;
+}
+
+export function _getMinSize(sizes) {
+  if (!sizes || sizes.length === 0) return undefined;
+  return sizes.reduce((minSize, currentSize) => {
+    const minArea = minSize.w * minSize.h;
+    const currentArea = currentSize.w * currentSize.h;
+    return currentArea < minArea ? currentSize : minSize;
+  });
+}
+
+export function _canSelectViewabilityContainer() {
+  try {
+    window.top.document.querySelector('#viewability-container');
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+export function _isViewabilityMeasurable(element) {
+  if (!element) return false;
+  return _canSelectViewabilityContainer(element);
+}
+
+export function _getViewability(element, topWin, { w, h } = {}) {
+  return topWin.document.visibilityState === 'visible'
+    ? percentInView(element, topWin, { w, h })
+    : 0;
+}
+
+export function detectViewability(bid) {
+  const { params, adUnitCode } = bid;
+
+  const viewabilityContainerIdentifier = params.viewabilityContainerIdentifier;
+
+  let element = null;
+  let bidParamSizes = null;
+  let minSize = [];
+
+  if (isStr(viewabilityContainerIdentifier)) {
+    try {
+      element = document.querySelector(viewabilityContainerIdentifier) || window.top.document.querySelector(viewabilityContainerIdentifier);
+      if (element) {
+        bidParamSizes = [element.offsetWidth, element.offsetHeight];
+        minSize = _getMinSize(bidParamSizes)
+      }
+    } catch (e) {
+      logError(`Error while trying to find viewability container element: ${viewabilityContainerIdentifier}`);
+    }
+  }
+
+  if (!element) {
+    // Get the sizes from the mediaTypes object if it exists, otherwise use the sizes array from the bid object
+    bidParamSizes = bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes ? bid.mediaTypes.banner.sizes : bid.sizes;
+    bidParamSizes = typeof bidParamSizes === 'undefined' && bid.mediaType && bid.mediaType.video && bid.mediaType.video.playerSize ? bid.mediaType.video.playerSize : bidParamSizes;
+    bidParamSizes = typeof bidParamSizes === 'undefined' && bid.mediaType && bid.mediaType.video && isNumber(bid.mediaType.video.w) && isNumber(bid.mediaType.h) ? [bid.mediaType.video.w, bid.mediaType.video.h] : bidParamSizes;
+    minSize = _getMinSize(bidParamSizes ?? [])
+    element = document.getElementById(adUnitCode);
+  }
+
+  if (_isViewabilityMeasurable(element)) {
+    const minSizeObj = {
+      w: minSize[0],
+      h: minSize[1]
+    }
+    return Math.round(_getViewability(element, getWindowTop(), minSizeObj))
+  }
+
+  return null;
+}
+
+export function _getBidRequests(validBidRequests) {
+  return validBidRequests.map(bid => {
+    const {
+      bidId,
+      mediaTypes,
+      params,
+      sizes,
+    } = bid;
+    const { placementId, viewabilityContainerIdentifier } = params;
+    let detectedViewabilityPercentage = detectViewability(bid);
+    if (isNumber(detectedViewabilityPercentage)) {
+      detectedViewabilityPercentage = detectedViewabilityPercentage / 100;
+    }
+    return {
+      bidId,
+      mediaTypes,
+      sizes,
+      placementId,
+      floor: getBidFloor(bid),
+      hasViewabilityContainerId: Boolean(viewabilityContainerIdentifier),
+      declaredViewabilityPercentage: bid.params.viewabilityPercentage ?? null,
+      detectedViewabilityPercentage,
+    };
+  });
+}
+
+/**
+ * Get ids from Prebid User ID Modules and add them to the payload
+ */
+function _handleEids(payload, validBidRequests) {
+  let bidUserIdAsEids = deepAccess(validBidRequests, '0.userIdAsEids');
+  if (isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
+    deepSetValue(payload, 'userIdList', bidUserIdAsEids);
+  }
+}
+
+export function saveOnAllStorages(name, value, expirationTimeMs) {
+  const date = new Date();
+  date.setTime(date.getTime() + expirationTimeMs);
+  const expires = `expires=${date.toUTCString()}`;
+  storage.setCookie(name, JSON.stringify(value), expires);
+  storage.setDataInLocalStorage(name, JSON.stringify(value));
+  cnxIdsValues = value;
+}
+
+export function readFromAllStorages(name) {
+  const fromCookie = storage.getCookie(name);
+  const fromLocalStorage = storage.getDataFromLocalStorage(name);
+
+  const parsedCookie = fromCookie ? JSON.parse(fromCookie) : undefined;
+  const parsedLocalStorage = fromLocalStorage ? JSON.parse(fromLocalStorage) : undefined;
+
+  return parsedCookie || parsedLocalStorage || undefined;
+}
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 143,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
 
   /*
    * Validate the bid request.
@@ -55,19 +221,24 @@ export const spec = {
     const bidId = deepAccess(bid, 'bidId');
     const mediaTypes = deepAccess(bid, 'mediaTypes', {});
     const params = deepAccess(bid, 'params', {});
-    const bidder = deepAccess(bid, 'bidder');
-
-    const banner = deepAccess(mediaTypes, BANNER, {});
 
     const hasBidId = Boolean(bidId);
-    const isValidBidder = (bidder === BIDDER_CODE);
-    const isValidSize = (Boolean(banner.sizes) && isArray(mediaTypes[BANNER].sizes) && mediaTypes[BANNER].sizes.length > 0);
-    const hasSizes = mediaTypes[BANNER] ? isValidSize : false;
+    const hasMediaTypes = Boolean(mediaTypes) && (Boolean(mediaTypes[BANNER]) || Boolean(mediaTypes[VIDEO]));
+    const isValidBanner = validateBanner(mediaTypes);
+    const isValidVideo = validateVideo(mediaTypes);
+    const isValidViewability = typeof params.viewabilityPercentage === 'undefined' || (isNumber(params.viewabilityPercentage) && params.viewabilityPercentage >= 0 && params.viewabilityPercentage <= 1);
     const hasRequiredBidParams = Boolean(params.placementId);
 
-    const isValid = isValidBidder && hasBidId && hasSizes && hasRequiredBidParams;
+    const isValid = hasBidId && hasMediaTypes && isValidBanner && isValidVideo && hasRequiredBidParams && isValidViewability;
     if (!isValid) {
-      logError(`Invalid bid request: isValidBidder: ${isValidBidder} hasBidId: ${hasBidId}, hasSizes: ${hasSizes}, hasRequiredBidParams: ${hasRequiredBidParams}`);
+      logError(
+        `Invalid bid request:
+          hasBidId: ${hasBidId}, 
+          hasMediaTypes: ${hasMediaTypes}, 
+          isValidBanner: ${isValidBanner}, 
+          isValidVideo: ${isValidVideo}, 
+          hasRequiredBidParams: ${hasRequiredBidParams}`
+      );
     }
     return isValid;
   },
@@ -78,34 +249,32 @@ export const spec = {
    * Return an object containing the request method, url, and the constructed payload.
    */
   buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    const bidRequests = validBidRequests.map(bid => {
-      const {
-        bidId,
-        mediaTypes,
-        params,
-        sizes,
-      } = bid;
-      return {
-        bidId,
-        mediaTypes,
-        sizes,
-        placementId: params.placementId,
-        floor: getBidFloor(bid),
-      };
-    });
+    const bidRequests = _getBidRequests(validBidRequests);
+    let userIds;
+    try {
+      userIds = readFromAllStorages(CNX_IDS_LOCAL_STORAGE_COOKIES_KEY) || cnxIdsValues;
+    } catch (error) {
+      userIds = cnxIdsValues;
+    }
 
     const requestPayload = {
       ortb2: bidderRequest.ortb2,
       gdprConsent: bidderRequest.gdprConsent,
       uspConsent: bidderRequest.uspConsent,
+      gppConsent: bidderRequest.gppConsent,
       refererInfo: bidderRequest.refererInfo,
+      identityProviderData: userIds,
       bidRequests,
     };
 
+    _handleEids(requestPayload, validBidRequests);
+
+    context = requestPayload;
+
     return {
       method: 'POST',
       url: AD_URL,
-      data: requestPayload
+      data: context
     };
   },
 
@@ -117,25 +286,25 @@ export const spec = {
   interpretResponse: (serverResponse) => {
     const responseBody = serverResponse.body;
     const bids = responseBody.Bids;
-    const playerId = responseBody.PlayerId;
-    const customerId = responseBody.CustomerId;
 
-    if (!isArray(bids) || !playerId || !customerId) {
+    if (!isArray(bids)) {
       return [];
     }
 
+    const referrer = responseBody.Referrer;
     return bids.map(bidResponse => ({
       requestId: bidResponse.RequestId,
       cpm: bidResponse.Cpm,
       ttl: bidResponse.Ttl || DEFAULT_MAX_TTL,
       currency: 'USD',
-      mediaType: BANNER,
+      mediaType: bidResponse.VastXml ? VIDEO : BANNER,
       netRevenue: true,
       width: bidResponse.Width,
       height: bidResponse.Height,
       creativeId: bidResponse.CreativeId,
-      referrer: bidResponse.Referrer,
       ad: bidResponse.Ad,
+      vastXml: bidResponse.VastXml,
+      referrer: referrer,
     }));
   },
 
@@ -171,6 +340,24 @@ export const spec = {
       params['us_privacy'] = encodeURIComponent(uspConsent);
     }
 
+    window.addEventListener('message', function handler(event) {
+      if (!event.data || event.origin !== 'https://cds.connatix.com') {
+        return;
+      }
+
+      if (event.data.type === ALL_PROVIDERS_RESOLVED_EVENT) {
+        this.removeEventListener('message', handler);
+        event.stopImmediatePropagation();
+      }
+
+      if (event.data.type === ALL_PROVIDERS_RESOLVED_EVENT || event.data.type === IDENTITY_PROVIDER_RESOLVED_EVENT) {
+        const response = event.data;
+        if (response.data) {
+          saveOnAllStorages(CNX_IDS_LOCAL_STORAGE_COOKIES_KEY, response.data, CNX_IDS_EXPIRY);
+        }
+      }
+    }, true)
+
     const syncUrl = serverResponses[0].body.UserSyncEndpoint;
     const queryParams = Object.keys(params).length > 0 ? formatQS(params) : '';
 
@@ -179,7 +366,51 @@ export const spec = {
       type: 'iframe',
       url
     }];
-  }
+  },
+
+  isConnatix: (aliasName) => {
+    if (!aliasName) {
+      return false;
+    }
+
+    const originalBidderName = adapterManager.aliasRegistry[aliasName] || aliasName;
+    return originalBidderName === BIDDER_CODE;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if the server response time is greater than auction timeout
+   */
+  onTimeout: (timeoutData) => {
+    const connatixBidRequestTimeout = timeoutData.find(bidderRequest => spec.isConnatix(bidderRequest.bidder));
+
+    // Log only it is a timeout for Connatix
+    // Otherwise it is not relevant for us
+    if (!connatixBidRequestTimeout) {
+      return;
+    }
+    const requestTimeout = connatixBidRequestTimeout.timeout;
+    const timeout = isNumber(requestTimeout) ? requestTimeout : config.getConfig('bidderTimeout');
+    spec.triggerEvent({type: 'Timeout', timeout, context});
+  },
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   */
+  onBidWon(bidWinData) {
+    if (bidWinData == null) {
+      return;
+    }
+    const {bidder, cpm, requestId, bidId, adUnitCode, timeToRespond, auctionId} = bidWinData;
+
+    spec.triggerEvent({type: 'BidWon', bestBidBidder: bidder, bestBidPrice: cpm, requestId, bidId, adUnitCode, timeToRespond, auctionId, context});
+  },
+
+  triggerEvent(data) {
+    ajax(EVENTS_URL, null, JSON.stringify(data), {
+      method: 'POST',
+      withCredentials: false
+    });
+  },
 };
 
 registerBidder(spec);
diff --git a/modules/connatixBidAdapter.md b/modules/connatixBidAdapter.md
index 7ac04a64245..595c294e311 100644
--- a/modules/connatixBidAdapter.md
+++ b/modules/connatixBidAdapter.md
@@ -9,7 +9,24 @@ Maintainer: prebid_integration@connatix.com
 
 # Description
 Connects to Connatix demand source to fetch bids.  
-Please use ```connatix``` as the bidder code. 
+Please use ```connatix``` as the bidder code.
+
+# Configuration
+Connatix requires that ```iframe``` is used for user syncing.
+
+Example configuration:
+```
+pbjs.setConfig({
+  userSync: {
+    filterSettings: {
+      iframe: {
+        bidders: '*', // represents all bidders
+        filter: 'include'
+      }
+    }
+  }
+});
+```
 
 # Test Parameters
 ```
diff --git a/modules/connectIdSystem.js b/modules/connectIdSystem.js
index e1c5b427264..6926c69d453 100644
--- a/modules/connectIdSystem.js
+++ b/modules/connectIdSystem.js
@@ -10,10 +10,17 @@ import {submodule} from '../src/hook.js';
 import {includes} from '../src/polyfill.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {getStorageManager} from '../src/storageManager.js';
-import {formatQS, isPlainObject, logError, parseUrl} from '../src/utils.js';
+import {formatQS, isNumber, isPlainObject, logError, parseUrl} from '../src/utils.js';
 import {uspDataHandler, gppDataHandler} from '../src/adapterManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'connectId';
 const STORAGE_EXPIRY_DAYS = 365;
 const STORAGE_DURATION = 60 * 60 * 24 * 1000 * STORAGE_EXPIRY_DAYS;
@@ -26,6 +33,16 @@ const PLACEHOLDER = '__PIXEL_ID__';
 const UPS_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PLACEHOLDER}/fed`;
 const OVERRIDE_OPT_OUT_KEY = 'connectIdOptOut';
 const INPUT_PARAM_KEYS = ['pixelId', 'he', 'puid'];
+const O_AND_O_DOMAINS = [
+  'yahoo.com',
+  'aol.com',
+  'aol.ca',
+  'aol.de',
+  'aol.co.uk',
+  'engadget.com',
+  'techcrunch.com',
+  'autoblog.com',
+];
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
 
 /**
@@ -104,9 +121,11 @@ function syncLocalStorageToCookie() {
 }
 
 function isStale(storedIdData) {
-  if (isPlainObject(storedIdData) && storedIdData.lastSynced &&
-    (storedIdData.lastSynced + VALID_ID_DURATION) <= Date.now()) {
+  if (isOAndOTraffic()) {
     return true;
+  } else if (isPlainObject(storedIdData) && storedIdData.lastSynced) {
+    const validTTL = storedIdData.ttl || VALID_ID_DURATION;
+    return storedIdData.lastSynced + validTTL <= Date.now();
   }
   return false;
 }
@@ -127,6 +146,17 @@ function getSiteHostname() {
   return pageInfo.hostname;
 }
 
+function isOAndOTraffic() {
+  let referer = getRefererInfo().ref;
+
+  if (referer) {
+    referer = parseUrl(referer).hostname;
+    const subDomains = referer.split('.');
+    referer = subDomains.slice(subDomains.length - 2, subDomains.length).join('.');
+  }
+  return O_AND_O_DOMAINS.indexOf(referer) >= 0;
+}
+
 /** @type {Submodule} */
 export const connectIdSubmodule = {
   /**
@@ -238,6 +268,13 @@ export const connectIdSubmodule = {
                 responseObj.puid = params.puid || responseObj.puid;
                 responseObj.lastSynced = Date.now();
                 responseObj.lastUsed = Date.now();
+                if (isNumber(responseObj.ttl)) {
+                  let validTTLMiliseconds = responseObj.ttl * 60 * 60 * 1000;
+                  if (validTTLMiliseconds > VALID_ID_DURATION) {
+                    validTTLMiliseconds = VALID_ID_DURATION;
+                  }
+                  responseObj.ttl = validTTLMiliseconds;
+                }
                 storeObject(responseObj);
               } else {
                 logError(`${MODULE_NAME} module: UPS response returned an invalid payload ${response}`);
@@ -276,12 +313,16 @@ export const connectIdSubmodule = {
 
   /**
    * Utility function that returns a boolean flag indicating if the user
-   * has opeted out via the Yahoo easy-opt-out mechanism.
+   * has opted out via the Yahoo easy-opt-out mechanism.
    * @returns {Boolean}
    */
   userHasOptedOut() {
     try {
-      return localStorage.getItem(OVERRIDE_OPT_OUT_KEY) === '1';
+      if (storage.localStorageIsEnabled()) {
+        return storage.getDataFromLocalStorage(OVERRIDE_OPT_OUT_KEY) === '1';
+      } else {
+        return true;
+      }
     } catch {
       return false;
     }
diff --git a/modules/connectadBidAdapter.js b/modules/connectadBidAdapter.js
index b40ef30f6bc..982bff22585 100644
--- a/modules/connectadBidAdapter.js
+++ b/modules/connectadBidAdapter.js
@@ -1,9 +1,9 @@
-import { deepSetValue, logWarn } from '../src/utils.js';
+import { deepAccess, deepSetValue, mergeDeep, logWarn, generateUUID } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js'
 import {config} from '../src/config.js';
 import {tryAppendQueryString} from '../libraries/urlUtils/urlUtils.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
+
 const BIDDER_CODE = 'connectad';
 const BIDDER_CODE_ALIAS = 'connectadrealtime';
 const ENDPOINT_URL = 'https://i.connectad.io/api/v2';
@@ -31,25 +31,39 @@ export const spec = {
       return ret;
     }
 
+    const sellerDefinedAudience = deepAccess(bidderRequest, 'ortb2.user.data', config.getAnyConfig('ortb2.user.data'));
+    const sellerDefinedContext = deepAccess(bidderRequest, 'ortb2.site.content.data', config.getAnyConfig('ortb2.site.content.data'));
+
     const data = Object.assign({
       placements: [],
       time: Date.now(),
-      user: {},
-      // TODO: does the fallback to window.location make sense?
-      url: bidderRequest.refererInfo?.page || window.location.href,
+      url: bidderRequest.refererInfo?.page,
       referrer: bidderRequest.refererInfo?.ref,
-      // TODO: please do not send internal data structures over the network
-      referrer_info: bidderRequest.refererInfo?.legacy,
       screensize: getScreenSize(),
       dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
       language: navigator.language,
       ua: navigator.userAgent,
-      pversion: '$prebid.version$'
+      pversion: '$prebid.version$',
+      cur: 'USD',
+      user: {},
+      regs: {},
+      source: {},
+      site: {},
+      sda: sellerDefinedAudience,
+      sdc: sellerDefinedContext,
+    });
+
+    const ortb2Params = bidderRequest?.ortb2 || {};
+    ['site', 'user', 'device', 'bcat', 'badv', 'regs'].forEach(entry => {
+      const ortb2Param = ortb2Params[entry];
+      if (ortb2Param) {
+        mergeDeep(data, { [entry]: ortb2Param });
+      }
     });
 
     // coppa compliance
     if (config.getConfig('coppa') === true) {
-      deepSetValue(data, 'user.coppa', 1);
+      deepSetValue(data, 'regs.coppa', 1);
     }
 
     // adding schain object
@@ -72,24 +86,49 @@ export const spec = {
       deepSetValue(data, 'user.ext.us_privacy', bidderRequest.uspConsent);
     }
 
+    // GPP Support
+    if (bidderRequest?.gppConsent?.gppString) {
+      deepSetValue(data, 'regs.gpp', bidderRequest.gppConsent.gppString);
+      deepSetValue(data, 'regs.gpp_sid', bidderRequest.gppConsent.applicableSections);
+    } else if (bidderRequest?.ortb2?.regs?.gpp) {
+      deepSetValue(data, 'regs.gpp', bidderRequest.ortb2.regs.gpp);
+      deepSetValue(data, 'regs.gpp_sid', bidderRequest.ortb2.regs.gpp_sid);
+    }
+
+    // DSA Support
+    if (bidderRequest?.ortb2?.regs?.ext?.dsa) {
+      deepSetValue(data, 'regs.ext.dsa', bidderRequest.ortb2.regs.ext.dsa);
+    }
+
     // EIDS Support
     if (validBidRequests[0].userIdAsEids) {
       deepSetValue(data, 'user.ext.eids', validBidRequests[0].userIdAsEids);
     }
 
+    const tid = deepAccess(bidderRequest, 'ortb2.source.tid')
+    if (tid) {
+      deepSetValue(data, 'source.tid', tid)
+    }
+    data.tmax = bidderRequest.timeout;
+
     validBidRequests.map(bid => {
       const placement = Object.assign({
-        // TODO: fix transactionId leak: https://github.com/prebid/Prebid.js/issues/9781
-        id: bid.transactionId,
+        id: generateUUID(),
         divName: bid.bidId,
+        tagId: bid.adUnitCode,
         pisze: bid.mediaTypes.banner.sizes[0] || bid.sizes[0],
         sizes: bid.mediaTypes.banner.sizes,
-        adTypes: getSize(bid.mediaTypes.banner.sizes || bid.sizes),
         bidfloor: getBidFloor(bid),
         siteId: bid.params.siteId,
-        networkId: bid.params.networkId
+        networkId: bid.params.networkId,
+        tid: bid.ortb2Imp?.ext?.tid
       });
 
+      const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+      if (gpid) {
+        placement.gpid = gpid;
+      }
+
       if (placement.networkId && placement.siteId) {
         data.placements.push(placement);
       }
@@ -127,12 +166,22 @@ export const spec = {
           bid.width = decision.width;
           bid.height = decision.height;
           bid.dealid = decision.dealid || null;
-          bid.meta = { advertiserDomains: decision && decision.adomain ? decision.adomain : [] };
+          bid.meta = {
+            advertiserDomains: decision && decision.adomain ? decision.adomain : []
+          };
           bid.ad = retrieveAd(decision);
           bid.currency = 'USD';
           bid.creativeId = decision.adId;
           bid.ttl = 360;
           bid.netRevenue = true;
+
+          if (decision.dsa) {
+            bid.meta = Object.assign({}, bid.meta, { dsa: decision.dsa })
+          }
+          if (decision.category) {
+            bid.meta = Object.assign({}, bid.meta, { primaryCatId: decision.category })
+          }
+
           bidResponses.push(bid);
         }
       }
@@ -141,15 +190,15 @@ export const spec = {
     return bidResponses;
   },
 
-  transformBidParams: function (params, isOpenRtb) {
-    return convertTypes({
-      'siteId': 'number',
-      'networkId': 'number'
-    }, params);
-  },
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent, gppConsent) => {
+    let pixelType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncEndpoint;
 
-  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
-    let syncEndpoint = 'https://cdn.connectad.io/connectmyusers.php?';
+    if (pixelType == 'iframe') {
+      syncEndpoint = 'https://sync.connectad.io/iFrameSyncer?';
+    } else {
+      syncEndpoint = 'https://sync.connectad.io/ImageSyncer?';
+    }
 
     if (gdprConsent) {
       syncEndpoint = tryAppendQueryString(syncEndpoint, 'gdpr', (gdprConsent.gdprApplies ? 1 : 0));
@@ -163,73 +212,26 @@ export const spec = {
       syncEndpoint = tryAppendQueryString(syncEndpoint, 'us_privacy', uspConsent);
     }
 
+    if (gppConsent?.gppString && gppConsent?.applicableSections?.length) {
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'gpp', gppConsent.gppString);
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'gpp_sid', gppConsent?.applicableSections?.join(','));
+    }
+
     if (config.getConfig('coppa') === true) {
       syncEndpoint = tryAppendQueryString(syncEndpoint, 'coppa', 1);
     }
 
-    if (syncOptions.iframeEnabled) {
+    if (syncOptions.iframeEnabled || syncOptions.pixelEnabled) {
       return [{
-        type: 'iframe',
+        type: pixelType,
         url: syncEndpoint
       }];
     } else {
-      logWarn('Bidder ConnectAd: Please activate iFrame Sync');
+      logWarn('Bidder ConnectAd: No User-Matching allowed');
     }
   }
 };
 
-const sizeMap = [
-  null,
-  '120x90',
-  '200x200',
-  '468x60',
-  '728x90',
-  '300x250',
-  '160x600',
-  '120x600',
-  '300x100',
-  '180x150',
-  '336x280',
-  '240x400',
-  '234x60',
-  '88x31',
-  '120x60',
-  '120x240',
-  '125x125',
-  '220x250',
-  '250x250',
-  '250x90',
-  '0x0',
-  '200x90',
-  '300x50',
-  '320x50',
-  '320x480',
-  '185x185',
-  '620x45',
-  '300x125',
-  '800x250',
-  '980x120',
-  '980x150',
-  '320x150',
-  '300x300',
-  '200x600',
-  '320x500',
-  '320x320'
-];
-
-sizeMap[77] = '970x90';
-sizeMap[123] = '970x250';
-sizeMap[43] = '300x600';
-sizeMap[286] = '970x66';
-sizeMap[3230] = '970x280';
-sizeMap[429] = '486x60';
-sizeMap[374] = '700x500';
-sizeMap[934] = '300x1050';
-sizeMap[1578] = '320x100';
-sizeMap[331] = '320x250';
-sizeMap[3301] = '320x267';
-sizeMap[2730] = '728x250';
-
 function getBidFloor(bidRequest) {
   let floorInfo = {};
 
@@ -241,22 +243,11 @@ function getBidFloor(bidRequest) {
     });
   }
 
-  let floor = floorInfo.floor || bidRequest.params.bidfloor || bidRequest.params.floorprice || 0;
+  let floor = floorInfo?.floor || bidRequest.params.bidfloor || bidRequest.params.floorprice || 0;
 
   return floor;
 }
 
-function getSize(sizes) {
-  const result = [];
-  sizes.forEach(function(size) {
-    const index = sizeMap.indexOf(size[0] + 'x' + size[1]);
-    if (index >= 0) {
-      result.push(index);
-    }
-  });
-  return result;
-}
-
 function retrieveAd(decision) {
   return decision.contents && decision.contents[0] && decision.contents[0].body;
 }
diff --git a/modules/consentManagementGpp.js b/modules/consentManagementGpp.js
index 8160ee2378c..2d6c6583257 100644
--- a/modules/consentManagementGpp.js
+++ b/modules/consentManagementGpp.js
@@ -7,12 +7,12 @@
 import {deepSetValue, isEmpty, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {gppDataHandler} from '../src/adapterManager.js';
-import {timedAuctionHook} from '../src/utils/perfMetrics.js';
 import {enrichFPD} from '../src/fpd/enrichment.js';
 import {getGlobal} from '../src/prebidGlobal.js';
-import {cmpClient, MODE_CALLBACK, MODE_MIXED, MODE_RETURN} from '../libraries/cmp/cmpClient.js';
-import {GreedyPromise} from '../src/utils/promise.js';
+import {cmpClient, MODE_CALLBACK} from '../libraries/cmp/cmpClient.js';
+import {GreedyPromise, defer} from '../src/utils/promise.js';
 import {buildActivityParams} from '../src/activities/params.js';
+import {consentManagementHook} from '../libraries/consentManagement/cmUtils.js';
 
 const DEFAULT_CMP = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 10000;
@@ -38,9 +38,6 @@ function lookupStaticConsentData(callbacks) {
   return pipeCallbacks(() => processCmpData(staticConsentData), callbacks);
 }
 
-const GPP_10 = '1.0';
-const GPP_11 = '1.1';
-
 class GPPError {
   constructor(message, arg) {
     this.message = message;
@@ -49,99 +46,22 @@ class GPPError {
 }
 
 export class GPPClient {
-  static CLIENTS = {};
-
-  static register(apiVersion, defaultVersion = false) {
-    this.apiVersion = apiVersion;
-    this.CLIENTS[apiVersion] = this;
-    if (defaultVersion) {
-      this.CLIENTS.default = this;
-    }
-  }
-
+  apiVersion = '1.1';
   static INST;
 
-  /**
-   * Ping the CMP to set up an appropriate client for it, and initialize it.
-   *
-   * @param mkCmp
-   * @returns {Promise<[GPPClient,Promise<{}>]>} a promise to two objects:
-   *  - a GPPClient that talks the best GPP dialect we know for the CMP's version;
-   *  - a promise to GPP data.
-   */
-  static init(mkCmp = cmpClient) {
+  static get(mkCmp = cmpClient) {
     if (this.INST == null) {
-      this.INST = this.ping(mkCmp).catch(e => {
-        this.INST = null;
-        throw e;
+      const cmp = mkCmp({
+        apiName: '__gpp',
+        apiArgs: ['command', 'callback', 'parameter'], // do not pass version - not clear what it's for (or what we should use),
+        mode: MODE_CALLBACK
       });
-    }
-    return this.INST.then(([client, pingData]) => [
-      client,
-      client.initialized ? client.refresh() : client.init(pingData)
-    ]);
-  }
-
-  /**
-   * Ping the CMP to determine its version and set up a client appropriate for it.
-   *
-   * @param mkCmp
-   * @returns {Promise<[GPPClient, {}]>} a promise to two objects:
-   *  - a GPPClient that talks the best GPP dialect we know for the CMP's version;
-   *  - the result from pinging the CMP.
-   */
-  static ping(mkCmp = cmpClient) {
-    const cmpOptions = {
-      apiName: '__gpp',
-      apiArgs: ['command', 'callback', 'parameter'], // do not pass version - not clear what it's for (or what we should use)
-    };
-
-    // in 1.0, 'ping' should return pingData but ignore callback;
-    // in 1.1 it should not return anything but run the callback
-    // the following looks for either - but once the version is known, produce a client that knows whether the
-    // rest of the interactions should pick return values or pass callbacks
-
-    const probe = mkCmp({...cmpOptions, mode: MODE_RETURN});
-    return new GreedyPromise((resolve, reject) => {
-      if (probe == null) {
-        reject(new GPPError('GPP CMP not found'));
-        return;
+      if (cmp == null) {
+        throw new GPPError('GPP CMP not found');
       }
-      let done = false; // some CMPs do both return value and callbacks - avoid repeating log messages
-      const pong = (result, success) => {
-        if (done) return;
-        if (success != null && !success) {
-          reject(result);
-          return;
-        }
-        if (result == null) return;
-        done = true;
-        const cmpVersion = result?.gppVersion;
-        const Client = this.getClient(cmpVersion);
-        if (cmpVersion !== Client.apiVersion) {
-          logWarn(`Unrecognized GPP CMP version: ${cmpVersion}. Continuing using GPP API version ${Client}...`);
-        } else {
-          logInfo(`Using GPP version ${cmpVersion}`);
-        }
-        const mode = Client.apiVersion === GPP_10 ? MODE_MIXED : MODE_CALLBACK;
-        const client = new Client(
-          cmpVersion,
-          mkCmp({...cmpOptions, mode})
-        );
-        resolve([client, result]);
-      };
-
-      probe({
-        command: 'ping',
-        callback: pong
-      }).then((res) => pong(res, true), reject);
-    }).finally(() => {
-      probe && probe.close();
-    });
-  }
-
-  static getClient(cmpVersion) {
-    return this.CLIENTS.hasOwnProperty(cmpVersion) ? this.CLIENTS[cmpVersion] : this.CLIENTS.default;
+      this.INST = new this(cmp);
+    }
+    return this.INST;
   }
 
   #resolve;
@@ -150,11 +70,9 @@ export class GPPClient {
 
   initialized = false;
 
-  constructor(cmpVersion, cmp) {
-    this.apiVersion = this.constructor.apiVersion;
-    this.cmpVersion = cmp;
+  constructor(cmp) {
     this.cmp = cmp;
-    [this.#resolve, this.#reject] = [0, 1].map(slot => (result) => {
+    [this.#resolve, this.#reject] = ['resolve', 'reject'].map(slot => (result) => {
       while (this.#pending.length) {
         this.#pending.pop()[slot](result);
       }
@@ -171,6 +89,9 @@ export class GPPClient {
   init(pingData) {
     const ready = this.updateWhenReady(pingData);
     if (!this.initialized) {
+      if (pingData.gppVersion !== this.apiVersion) {
+        logWarn(`Unrecognized GPP CMP version: ${pingData.apiVersion}. Continuing using GPP API version ${this.apiVersion}...`);
+      }
       this.initialized = true;
       this.cmp({
         command: 'addEventListener',
@@ -179,9 +100,18 @@ export class GPPClient {
             this.#reject(new GPPError('Received error response from CMP', event));
           } else if (event?.pingData?.cmpStatus === 'error') {
             this.#reject(new GPPError('CMP status is "error"; please check CMP setup', event));
-          } else if (this.isCMPReady(event?.pingData || {}) && this.events.includes(event?.eventName)) {
+          } else if (this.isCMPReady(event?.pingData || {}) && ['sectionChange', 'signalStatus'].includes(event?.eventName)) {
             this.#resolve(this.updateConsent(event.pingData));
           }
+          // NOTE: according to https://github.com/InteractiveAdvertisingBureau/Global-Privacy-Platform/blob/main/Core/CMP%20API%20Specification.md,
+          // > [signalStatus] Event is called whenever the display status of the CMP changes (e.g. the CMP shows the consent layer).
+          //
+          // however, from real world testing, at least some CMPs only trigger 'cmpDisplayStatus'
+          // other CMPs may do something else yet; here we just look for 'signalStatus: not ready' on any event
+          // to decide if consent data is likely to change
+          if (consentData != null && event?.pingData != null && !this.isCMPReady(event.pingData)) {
+            consentData = null;
+          }
         }
       });
     }
@@ -189,7 +119,7 @@ export class GPPClient {
   }
 
   refresh() {
-    return this.cmp({command: 'ping'}).then(this.updateWhenReady.bind(this));
+    return this.cmp({command: 'ping'}).then(this.init.bind(this));
   }
 
   /**
@@ -199,15 +129,14 @@ export class GPPClient {
    * @returns {Promise<{}>} a promise to GPP consent data
    */
   updateConsent(pingData) {
-    return this.getGPPData(pingData).then((data) => {
-      if (data == null || isEmpty(data)) {
-        throw new GPPError('Received empty response from CMP', data);
+    return new GreedyPromise(resolve => {
+      if (pingData == null || isEmpty(pingData)) {
+        throw new GPPError('Received empty response from CMP', pingData);
       }
-      return processCmpData(data);
-    }).then((data) => {
-      logInfo('Retrieved GPP consent from CMP:', data);
-      return data;
-    });
+      const consentData = processCmpData(pingData);
+      logInfo('Retrieved GPP consent from CMP:', consentData);
+      resolve(consentData);
+    })
   }
 
   /**
@@ -216,9 +145,9 @@ export class GPPClient {
    * @returns {Promise<{}>}
    */
   nextUpdate() {
-    return new GreedyPromise((resolve, reject) => {
-      this.#pending.push([resolve, reject]);
-    });
+    const def = defer();
+    this.#pending.push(def);
+    return def.promise;
   }
 
   /**
@@ -231,79 +160,23 @@ export class GPPClient {
   updateWhenReady(pingData) {
     return this.isCMPReady(pingData) ? this.updateConsent(pingData) : this.nextUpdate();
   }
-}
-
-// eslint-disable-next-line no-unused-vars
-class GPP10Client extends GPPClient {
-  static {
-    super.register(GPP_10);
-  }
-
-  events = ['sectionChange', 'cmpStatus'];
-
-  isCMPReady(pingData) {
-    return pingData.cmpStatus === 'loaded';
-  }
-
-  getGPPData(pingData) {
-    const parsedSections = GreedyPromise.all(
-      (pingData.supportedAPIs || pingData.apiSupport || []).map((api) => this.cmp({
-        command: 'getSection',
-        parameter: api
-      }).catch(err => {
-        logWarn(`Could not retrieve GPP section '${api}'`, err);
-      }).then((section) => [api, section]))
-    ).then(sections => {
-      // parse single section object into [core, gpc] to uniformize with 1.1 parsedSections
-      return Object.fromEntries(
-        sections.filter(([_, val]) => val != null)
-          .map(([api, section]) => {
-            const subsections = [
-              Object.fromEntries(Object.entries(section).filter(([k]) => k !== 'Gpc'))
-            ];
-            if (section.Gpc != null) {
-              subsections.push({
-                SubsectionType: 1,
-                Gpc: section.Gpc
-              });
-            }
-            return [api, subsections];
-          })
-      );
-    });
-    return GreedyPromise.all([
-      this.cmp({command: 'getGPPData'}),
-      parsedSections
-    ]).then(([gppData, parsedSections]) => Object.assign({}, gppData, {parsedSections}));
-  }
-}
-
-// eslint-disable-next-line no-unused-vars
-class GPP11Client extends GPPClient {
-  static {
-    super.register(GPP_11, true);
-  }
-
-  events = ['sectionChange', 'signalStatus'];
 
   isCMPReady(pingData) {
     return pingData.signalStatus === 'ready';
   }
-
-  getGPPData(pingData) {
-    return GreedyPromise.resolve(pingData);
-  }
 }
 
 /**
  * This function handles interacting with an IAB compliant CMP to obtain the consent information of the user.
  * Given the async nature of the CMP's API, we pass in acting success/error callback functions to exit this function
  * based on the appropriate result.
- * @param {function({})} onSuccess acts as a success callback when CMP returns a value; pass along consentObjectfrom CMP
- * @param {function(string, ...{}?)} cmpError acts as an error callback while interacting with CMP; pass along an error message (string) and any extra error arguments (purely for logging)
+ * @param {Object} options - An object containing the callbacks.
+ * @param {function(Object): void} options.onSuccess - Acts as a success callback when CMP returns a value; pass along consentObject from CMP.
+ * @param {function(string, ...Object?): void} options.onError - Acts as an error callback while interacting with CMP; pass along an error message (string) and any extra error arguments (purely for logging).
+ * @param {function(): Object} [mkCmp=cmpClient] - A function to create the CMP client. Defaults to `cmpClient`.
  */
 export function lookupIabConsent({onSuccess, onError}, mkCmp = cmpClient) {
-  pipeCallbacks(() => GPPClient.init(mkCmp).then(([client, gppDataPm]) => gppDataPm), {onSuccess, onError});
+  pipeCallbacks(() => GPPClient.get(mkCmp).refresh(), {onSuccess, onError});
 }
 
 // add new CMPs here, with their dedicated lookup function
@@ -364,20 +237,6 @@ function loadConsentData(cb) {
   }
 }
 
-/**
- * Like `loadConsentData`, but cache and re-use previously loaded data.
- * @param cb
- */
-function loadIfMissing(cb) {
-  if (consentData) {
-    logInfo('User consent information already known.  Pulling internally stored information...');
-    // eslint-disable-next-line standard/no-callback-literal
-    cb(false);
-  } else {
-    loadConsentData(cb);
-  }
-}
-
 /**
  * If consentManagement module is enabled (ie included in setConfig), this hook function will attempt to fetch the
  * user's encoded consent string from the supported CMP.  Once obtained, the module will store this
@@ -386,29 +245,7 @@ function loadIfMissing(cb) {
  * @param {object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export const requestBidsHook = timedAuctionHook('gpp', function requestBidsHook(fn, reqBidsConfigObj) {
-  loadIfMissing(function (shouldCancelAuction, errMsg, ...extraArgs) {
-    if (errMsg) {
-      let log = logWarn;
-      if (shouldCancelAuction) {
-        log = logError;
-        errMsg = `${errMsg} Canceling auction as per consentManagement config.`;
-      }
-      log(errMsg, ...extraArgs);
-    }
-
-    if (shouldCancelAuction) {
-      fn.stopTiming();
-      if (typeof reqBidsConfigObj.bidsBackHandler === 'function') {
-        reqBidsConfigObj.bidsBackHandler();
-      } else {
-        logError('Error executing bidsBackHandler');
-      }
-    } else {
-      fn.call(this, reqBidsConfigObj);
-    }
-  });
-});
+export const requestBidsHook = consentManagementHook('gpp', () => consentData, loadConsentData);
 
 function processCmpData(consentData) {
   if (
@@ -418,13 +255,17 @@ function processCmpData(consentData) {
   ) {
     throw new GPPError('CMP returned unexpected value during lookup process.', consentData);
   }
+  ['usnatv1', 'uscav1'].forEach(section => {
+    if (consentData?.parsedSections?.[section]) {
+      logWarn(`Received invalid section from cmp: '${section}'. Some functionality may not work as expected`, consentData);
+    }
+  });
   return storeConsentData(consentData);
 }
 
 /**
  * Stores CMP data locally in module to make information available in adaptermanager.js for later in the auction
  * @param {{}} gppData the result of calling a CMP's `getGPPData` (or equivalent)
- * @param {{}} sectionData map from GPP section name to the result of calling a CMP's `getSection` (or equivalent)
  */
 export function storeConsentData(gppData = {}) {
   consentData = {
@@ -450,7 +291,7 @@ export function resetConsentData() {
 
 /**
  * A configuration function that initializes some module variables, as well as add a hook into the requestBids function
- * @param {{cmp:string, timeout:number, allowAuctionWithoutConsent:boolean, defaultGdprScope:boolean}} config required; consentManagement module config settings; cmp (string), timeout (int), allowAuctionWithoutConsent (boolean)
+ * @param {{cmp:string, timeout:number, defaultGdprScope:boolean}} config required; consentManagement module config settings; cmp (string), timeout (int))
  */
 export function setConsentConfig(config) {
   config = config && config.gpp;
diff --git a/modules/consentManagement.js b/modules/consentManagementTcf.js
similarity index 85%
rename from modules/consentManagement.js
rename to modules/consentManagementTcf.js
index 05447a890cb..7de273c1380 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagementTcf.js
@@ -8,11 +8,11 @@ import {deepSetValue, isNumber, isPlainObject, isStr, logError, logInfo, logWarn
 import {config} from '../src/config.js';
 import {gdprDataHandler} from '../src/adapterManager.js';
 import {includes} from '../src/polyfill.js';
-import {timedAuctionHook} from '../src/utils/perfMetrics.js';
 import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
 import {enrichFPD} from '../src/fpd/enrichment.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {cmpClient} from '../libraries/cmp/cmpClient.js';
+import {consentManagementHook} from '../libraries/consentManagement/cmUtils.js';
 
 const DEFAULT_CMP = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 10000;
@@ -22,6 +22,7 @@ export let userCMP;
 export let consentTimeout;
 export let gdprScope;
 export let staticConsentData;
+let dsaPlatform = false;
 let actionTimeout;
 
 let consentData;
@@ -35,7 +36,9 @@ const cmpCallMap = {
 
 /**
  * This function reads the consent string from the config to obtain the consent information of the user.
- * @param {function({})} onSuccess acts as a success callback when the value is read from config; pass along consentObject from CMP
+ * @param {Object} options - An object containing the callbacks.
+ * @param {function(Object): void} options.onSuccess - Acts as a success callback when the value is read from config; pass along consentObject from CMP.
+ * @param {function(string, ...Object?): void} [options.onError] - Acts as an error callback while interacting with CMP; pass along an error message (string) and any extra error arguments (purely for logging). Optional.
  */
 function lookupStaticConsentData({onSuccess, onError}) {
   processCmpData(staticConsentData, {onSuccess, onError})
@@ -45,8 +48,10 @@ function lookupStaticConsentData({onSuccess, onError}) {
  * This function handles interacting with an IAB compliant CMP to obtain the consent information of the user.
  * Given the async nature of the CMP's API, we pass in acting success/error callback functions to exit this function
  * based on the appropriate result.
- * @param {function({})} onSuccess acts as a success callback when CMP returns a value; pass along consentObjectfrom CMP
- * @param {function(string, ...{}?)} cmpError acts as an error callback while interacting with CMP; pass along an error message (string) and any extra error arguments (purely for logging)
+ * @param {Object} options - An object containing the callbacks.
+ * @param {function(Object): void} options.onSuccess - Acts as a success callback when CMP returns a value; pass along consentObject from CMP.
+ * @param {function(string, ...Object?): void} options.onError - Acts as an error callback while interacting with CMP; pass along an error message (string) and any extra error arguments (purely for logging).
+ * @param {function(Object): void} options.onEvent - Acts as an event callback for processing TCF data events from CMP.
  */
 function lookupIabConsent({onSuccess, onError, onEvent}) {
   function cmpResponseCallback(tcfData, success) {
@@ -152,20 +157,6 @@ function loadConsentData(cb) {
   }
 }
 
-/**
- * Like `loadConsentData`, but cache and re-use previously loaded data.
- * @param cb
- */
-function loadIfMissing(cb) {
-  if (consentData) {
-    logInfo('User consent information already known.  Pulling internally stored information...');
-    // eslint-disable-next-line standard/no-callback-literal
-    cb(false);
-  } else {
-    loadConsentData(cb);
-  }
-}
-
 /**
  * If consentManagement module is enabled (ie included in setConfig), this hook function will attempt to fetch the
  * user's encoded consent string from the supported CMP.  Once obtained, the module will store this
@@ -174,29 +165,7 @@ function loadIfMissing(cb) {
  * @param {object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export const requestBidsHook = timedAuctionHook('gdpr', function requestBidsHook(fn, reqBidsConfigObj) {
-  loadIfMissing(function (shouldCancelAuction, errMsg, ...extraArgs) {
-    if (errMsg) {
-      let log = logWarn;
-      if (shouldCancelAuction) {
-        log = logError;
-        errMsg = `${errMsg} Canceling auction as per consentManagement config.`;
-      }
-      log(errMsg, ...extraArgs);
-    }
-
-    if (shouldCancelAuction) {
-      fn.stopTiming();
-      if (typeof reqBidsConfigObj.bidsBackHandler === 'function') {
-        reqBidsConfigObj.bidsBackHandler();
-      } else {
-        logError('Error executing bidsBackHandler');
-      }
-    } else {
-      fn.call(this, reqBidsConfigObj);
-    }
-  });
-});
+export const requestBidsHook = consentManagementHook('gdpr', () => consentData, loadConsentData);
 
 /**
  * This function checks the consent data provided by CMP to ensure it's in an expected state.
@@ -250,7 +219,7 @@ export function resetConsentData() {
 
 /**
  * A configuration function that initializes some module variables, as well as add a hook into the requestBids function
- * @param {{cmp:string, timeout:number, allowAuctionWithoutConsent:boolean, defaultGdprScope:boolean}} config required; consentManagement module config settings; cmp (string), timeout (int), allowAuctionWithoutConsent (boolean)
+ * @param {{cmp:string, timeout:number, defaultGdprScope:boolean}} config required; consentManagement module config settings; cmp (string), timeout (int))
  */
 export function setConsentConfig(config) {
   // if `config.gdpr`, `config.usp` or `config.gpp` exist, assume new config format.
@@ -278,6 +247,7 @@ export function setConsentConfig(config) {
 
   // if true, then gdprApplies should be set to true
   gdprScope = config.defaultGdprScope === true;
+  dsaPlatform = !!config.dsaPlatform;
 
   logInfo('consentManagement module has been activated...');
 
@@ -311,6 +281,9 @@ export function enrichFPDHook(next, fpd) {
       }
       deepSetValue(ortb2, 'user.ext.consent', consent.consentString);
     }
+    if (dsaPlatform) {
+      deepSetValue(ortb2, 'regs.ext.dsa.dsarequired', 3);
+    }
     return ortb2;
   }));
 }
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index fb65a76c87b..29a67af0631 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -90,7 +90,7 @@ function lookupUspConsent({onSuccess, onError}) {
 
   cmp({
     command: 'registerDeletion',
-    callback: adapterManager.callDataDeletionRequest
+    callback: (res, success) => (success == null || success) && adapterManager.callDataDeletionRequest(res)
   }).catch(e => {
     logError('Error invoking CMP `registerDeletion`:', e);
   });
@@ -163,10 +163,12 @@ export const requestBidsHook = timedAuctionHook('usp', function requestBidsHook(
 /**
  * This function checks the consent data provided by USPAPI to ensure it's in an expected state.
  * If it's bad, we exit the module depending on config settings.
- * If it's good, then we store the value and exits the module.
- * @param {object} consentObject required; object returned by USPAPI that contains user's consent choices
- * @param {function(string)} onSuccess callback accepting the resolved consent USP consent string
- * @param {function(string, ...{}?)} onError callback accepting error message and any extra error arguments (used purely for logging)
+ * If it's good, then we store the value and exit the module.
+ *
+ * @param {Object} consentObject - The object returned by USPAPI that contains the user's consent choices.
+ * @param {Object} callbacks - An object containing the callback functions.
+ * @param {function(string): void} callbacks.onSuccess - Callback accepting the resolved USP consent string.
+ * @param {function(string, ...Object?): void} callbacks.onError - Callback accepting an error message and any extra error arguments (used purely for logging).
  */
 function processUspData(consentObject, {onSuccess, onError}) {
   const valid = !!(consentObject && consentObject.usPrivacy);
@@ -202,7 +204,7 @@ export function resetConsentData() {
 
 /**
  * A configuration function that initializes some module variables, as well as add a hook into the requestBids function
- * @param {object} config required; consentManagementUSP module config settings; usp (string), timeout (int), allowAuctionWithoutConsent (boolean)
+ * @param {object} config required; consentManagementUSP module config settings; usp (string), timeout (int)
  */
 export function setConsentConfig(config) {
   config = config && config.usp;
diff --git a/modules/consumableBidAdapter.js b/modules/consumableBidAdapter.js
index c78ff7cdf51..cb802508de9 100644
--- a/modules/consumableBidAdapter.js
+++ b/modules/consumableBidAdapter.js
@@ -3,6 +3,12 @@ import {config} from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'consumable';
 
 const BASE_URI = 'https://e.serverbid.com/api/v2';
@@ -55,7 +61,8 @@ export const spec = {
       source: [{
         'name': 'prebidjs',
         'version': '$prebid.version$'
-      }]
+      }],
+      lang: bidderRequest.ortb2.device.language,
     }, validBidRequests[0].params);
 
     if (bidderRequest && bidderRequest.gdprConsent) {
@@ -191,17 +198,20 @@ export const spec = {
     if (syncOptions.iframeEnabled) {
       if (gdprConsent && gdprConsent.consentString) {
         if (typeof gdprConsent.gdprApplies === 'boolean') {
-          syncUrl = appendUrlParam(syncUrl, `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`);
+          syncUrl = appendUrlParam(syncUrl, `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${encodeURIComponent(gdprConsent.consentString) || ''}`);
         } else {
-          syncUrl = appendUrlParam(syncUrl, `gdpr=0&gdpr_consent=${gdprConsent.consentString}`);
+          syncUrl = appendUrlParam(syncUrl, `gdpr=0&gdpr_consent=${encodeURIComponent(gdprConsent.consentString) || ''}`);
         }
       }
       if (gppConsent && gppConsent.gppString) {
-        syncUrl = appendUrlParam(syncUrl, `gpp=${gppConsent.gppString}&gpp_sid=${gppConsent.applicableSections}`);
+        syncUrl = appendUrlParam(syncUrl, `gpp=${encodeURIComponent(gppConsent.gppString)}`);
+        if (gppConsent.applicableSections && gppConsent.applicableSections.length > 0) {
+          syncUrl = appendUrlParam(syncUrl, `gpp_sid=${encodeURIComponent(gppConsent.applicableSections.join(','))}`);
+        }
       }
 
-      if (uspConsent && uspConsent.consentString) {
-        syncUrl = appendUrlParam(syncUrl, `us_privacy=${uspConsent.consentString}`);
+      if (uspConsent) {
+        syncUrl = appendUrlParam(syncUrl, `us_privacy=${encodeURIComponent(uspConsent)}`);
       }
 
       if (!serverResponses || serverResponses.length === 0 || !serverResponses[0].body.bdr || serverResponses[0].body.bdr !== 'cx') {
diff --git a/modules/contentexchangeBidAdapter.js b/modules/contentexchangeBidAdapter.js
index be5900407ea..96a55d657d2 100644
--- a/modules/contentexchangeBidAdapter.js
+++ b/modules/contentexchangeBidAdapter.js
@@ -1,214 +1,21 @@
-import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'contentexchange';
 const AD_URL = 'https://eu2.adnetwork.agency/pbjs';
 const SYNC_URL = 'https://sync2.adnetwork.agency';
-
-function isBidResponseValid (bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency || !bid.meta) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData (bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId, adFormat } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    placementId,
-    bidId,
-    adFormat,
-    schain,
-    bidfloor
-  };
-
-  switch (adFormat) {
-    case BANNER:
-      placement.sizes = mediaTypes[BANNER].sizes;
-      break;
-    case VIDEO:
-      placement.playerSize = mediaTypes[VIDEO].playerSize;
-      placement.minduration = mediaTypes[VIDEO].minduration;
-      placement.maxduration = mediaTypes[VIDEO].maxduration;
-      placement.mimes = mediaTypes[VIDEO].mimes;
-      placement.protocols = mediaTypes[VIDEO].protocols;
-      placement.startdelay = mediaTypes[VIDEO].startdelay;
-      placement.placement = mediaTypes[VIDEO].placement;
-      placement.skip = mediaTypes[VIDEO].skip;
-      placement.skipafter = mediaTypes[VIDEO].skipafter;
-      placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-      placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-      placement.delivery = mediaTypes[VIDEO].delivery;
-      placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-      placement.api = mediaTypes[VIDEO].api;
-      placement.linearity = mediaTypes[VIDEO].linearity;
-      break;
-    case NATIVE:
-      placement.native = mediaTypes[NATIVE];
-      break;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
+const GVLID = 864;
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId &&
-      params &&
-      params.placementId &&
-      params.adFormat
-    );
-    switch (params.adFormat) {
-      case BANNER:
-        valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-        break;
-      case VIDEO:
-        valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-        break;
-      case NATIVE:
-        valid = valid && Boolean(mediaTypes[NATIVE]);
-        break;
-      default:
-        valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-
-    // TODO: does the fallback to 'window.location' make sense?
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/contxtfulBidAdapter.js b/modules/contxtfulBidAdapter.js
new file mode 100644
index 00000000000..acd9811b871
--- /dev/null
+++ b/modules/contxtfulBidAdapter.js
@@ -0,0 +1,216 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { _each, buildUrl, isStr, isEmptyStr, logInfo, logError } from '../src/utils.js';
+import { sendBeacon, ajax } from '../src/ajax.js';
+import { config as pbjsConfig } from '../src/config.js';
+import {
+  isBidRequestValid,
+  interpretResponse,
+  getUserSyncs as getUserSyncsLib,
+} from '../libraries/teqblazeUtils/bidderUtils.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
+
+// Constants
+const BIDDER_CODE = 'contxtful';
+const BIDDER_ENDPOINT = 'prebid.receptivity.io';
+const MONITORING_ENDPOINT = 'monitoring.receptivity.io';
+const DEFAULT_NET_REVENUE = true;
+const DEFAULT_TTL = 300;
+const PREBID_VERSION = '$prebid.version$';
+
+// ORTB conversion
+const converter = ortbConverter({
+  context: {
+    netRevenue: DEFAULT_NET_REVENUE,
+    ttl: DEFAULT_TTL
+  },
+  imp(buildImp, bidRequest, context) {
+    let imp = buildImp(bidRequest, context);
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const reqData = buildRequest(imps, bidderRequest, context);
+    return reqData;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    const bidResponse = buildBidResponse(bid, context);
+    return bidResponse;
+  }
+});
+
+// Get Bid Floor
+const _getRequestBidFloor = (mediaTypes, paramsBidFloor, bid) => {
+  const bidMediaType = Object.keys(mediaTypes)[0] || 'banner';
+  const bidFloor = { floor: 0, currency: 'USD' };
+
+  if (typeof bid.getFloor === 'function') {
+    const { currency, floor } = bid.getFloor({
+      mediaType: bidMediaType,
+      size: '*'
+    });
+    floor && (bidFloor.floor = floor);
+    currency && (bidFloor.currency = currency);
+  } else if (paramsBidFloor) {
+    bidFloor.floor = paramsBidFloor
+  }
+
+  return bidFloor;
+}
+
+// Get Parameters from the config.
+const extractParameters = (config) => {
+  const version = config?.contxtful?.version;
+  if (!isStr(version) || isEmptyStr(version)) {
+    throw Error(`contxfulBidAdapter: contxtful.version should be a non-empty string`);
+  }
+
+  const customer = config?.contxtful?.customer;
+  if (!isStr(customer) || isEmptyStr(customer)) {
+    throw Error(`contxfulBidAdapter: contxtful.customer should be a non-empty string`);
+  }
+
+  return { version, customer };
+}
+
+// Construct the Payload towards the Bidding endpoint
+const buildRequests = (validBidRequests = [], bidderRequest = {}) => {
+  const ortb2 = converter.toORTB({bidderRequest: bidderRequest, bidRequests: validBidRequests});
+
+  const bidRequests = [];
+  _each(validBidRequests, bidRequest => {
+    const {
+      mediaTypes = {},
+      params = {},
+    } = bidRequest;
+    bidRequest.bidFloor = _getRequestBidFloor(mediaTypes, params.bidfloor, bidRequest);
+    bidRequests.push(bidRequest)
+  });
+  const config = pbjsConfig.getConfig();
+  config.pbjsVersion = PREBID_VERSION;
+  const {version, customer} = extractParameters(config)
+  const adapterUrl = buildUrl({
+    protocol: 'https',
+    host: BIDDER_ENDPOINT,
+    pathname: `/${version}/prebid/${customer}/bid`,
+  });
+
+  // https://docs.prebid.org/dev-docs/bidder-adaptor.html
+  let req = {
+    url: adapterUrl,
+    method: 'POST',
+    data: {
+      ortb2,
+      bidRequests,
+      bidderRequest,
+      config,
+    },
+  };
+
+  return req;
+};
+
+// Prepare a sync object compatible with getUserSyncs.
+const constructUrl = (userSyncsDefault, userSyncServer) => {
+  const urlSyncServer = (userSyncServer?.url ?? '').split('?');
+  const userSyncUrl = userSyncsDefault?.url || '';
+  const baseSyncUrl = urlSyncServer[0] || '';
+
+  let url = `${baseSyncUrl}${userSyncUrl}`;
+
+  if (urlSyncServer.length > 1) {
+    const urlParams = urlSyncServer[1];
+    url += url.includes('?') ? `&${urlParams}` : `?${urlParams}`;
+  }
+
+  return {
+    ...userSyncsDefault,
+    url,
+  };
+};
+
+// Returns the list of user synchronization objects.
+const getUserSyncs = (syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) => {
+  // Get User Sync Defaults from pbjs lib
+  const userSyncsDefaultLib = getUserSyncsLib('')(syncOptions, null, gdprConsent, uspConsent, gppConsent);
+  const userSyncsDefault = userSyncsDefaultLib?.find(item => item.url !== undefined);
+
+  // Map Server Responses to User Syncs list
+  const serverSyncsData = serverResponses?.flatMap(response => response.body || [])
+    .map(data => data.syncs)
+    .find(syncs => Array.isArray(syncs) && syncs.length > 0) || [];
+  const userSyncs = serverSyncsData
+    .map(sync => constructUrl(userSyncsDefault, sync))
+    .filter(Boolean); // Filter out nulls
+  return userSyncs;
+};
+
+// Retrieve the sampling rate for events
+const getSamplingRate = (bidderConfig, eventType) => {
+  const entry = Object.entries(bidderConfig?.contxtful?.sampling ?? {}).find(([key, value]) => key.toLowerCase() === eventType.toLowerCase());
+  return entry ? entry[1] : 0.001;
+};
+
+// Handles the logging of events
+const logEvent = (eventType, data) => {
+  try {
+    // Log event
+    logInfo(BIDDER_CODE, `[${eventType}] ${JSON.stringify(data)}`);
+
+    // Get Config
+    const bidderConfig = pbjsConfig.getConfig();
+    const {version, customer} = extractParameters(bidderConfig);
+
+    // Sampled monitoring
+    if (['onBidBillable', 'onAdRenderSucceeded'].includes(eventType)) {
+      const randomNumber = Math.random();
+      const samplingRate = getSamplingRate(bidderConfig, eventType);
+      if (randomNumber >= samplingRate) {
+        return; // Don't sample
+      }
+    } else if (!['onTimeout', 'onBidderError', 'onBidWon'].includes(eventType)) {
+      // Unsupported event type.
+      return;
+    }
+
+    const payload = { type: eventType, data };
+    const eventUrl = buildUrl({
+      protocol: 'https',
+      host: MONITORING_ENDPOINT,
+      pathname: `/${version}/prebid/${customer}/log/${eventType}`,
+    });
+
+    // Try sending a beacon
+    if (sendBeacon(eventUrl, JSON.stringify(payload))) {
+      logInfo(BIDDER_CODE, `[${eventType}] Logging data sent using Beacon and payload: ${JSON.stringify(data)}`);
+    } else {
+      // Fallback to using ajax
+      ajax(eventUrl, null, JSON.stringify(payload), {
+        method: 'POST',
+        contentType: 'application/json',
+        withCredentials: true,
+      });
+      logInfo(BIDDER_CODE, `[${eventType}] Logging data sent using Ajax and payload: ${JSON.stringify(data)}`);
+    }
+  } catch (error) {
+    logError(BIDDER_CODE, `Failed to log event: ${eventType}`);
+  }
+};
+
+// Bidder public specification
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs,
+  onBidWon: function(bid) { logEvent('onBidWon', bid); },
+  onBidBillable: function(bid) { logEvent('onBidBillable', bid); },
+  onAdRenderSucceeded: function(bid) { logEvent('onAdRenderSucceeded', bid); },
+  onSetTargeting: function(bid) { },
+  onTimeout: function(timeoutData) { logEvent('onTimeout', timeoutData); },
+  onBidderError: function({ error, bidderRequest }) { logEvent('onBidderError', { error, bidderRequest }); },
+};
+
+registerBidder(spec);
diff --git a/modules/contxtfulBidAdapter.md b/modules/contxtfulBidAdapter.md
new file mode 100644
index 00000000000..87a78c38a85
--- /dev/null
+++ b/modules/contxtfulBidAdapter.md
@@ -0,0 +1,98 @@
+# Overview
+
+```
+Module Name: Contxtful Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: contact@contxtful.com
+```
+
+# Description
+
+The Contxtful Bidder Adapter supports all mediatypes and connects to demand sources for bids.
+ 
+# Configuration
+## Global Configuration
+Contxtful uses the global configuration to store params once instead of duplicating for each ad unit.
+Also, enabling user syncing greatly increases match rates and monetization. 
+Be sure to call `pbjs.setConfig()` only once.
+
+```javascript
+pbjs.setConfig({
+   debug: false,
+   contxtful: {
+      customer: '', // Required
+      version: '', // Required
+   },
+   userSync: {
+      filterSettings: {
+        iframe: {
+          bidders: ['contxtful'],
+          filter: 'include'
+        }
+      }
+   }
+   // [...]
+});
+```
+
+## Bidder Setting
+Contxtful leverages local storage for user syncing.
+
+```javascript
+pbjs.bidderSettings = {
+   contxtful: {
+      storageAllowed: true
+   }
+}
+```
+
+# Example Ad-units configuration
+```javascript
+var adUnits = [
+   {
+      code: 'adunit1',
+      mediaTypes: {
+         banner: {
+            sizes: [ [300, 250], [320, 50] ],
+         }
+      },
+      bids: [{
+         bidder: 'contxtful',
+      }]
+   },
+   {
+      code: 'addunit2',
+         mediaTypes: {
+            video: {
+               playerSize: [ [640, 480] ],
+               context: 'instream',
+               minduration: 5,
+               maxduration: 60,
+            }
+         },
+         bids: [{
+            bidder: 'contxtful',
+         }]
+   },
+   {
+      code: 'addunit3',
+      mediaTypes: {
+         native: {
+            title: {
+               required: true
+            },
+            body: {
+               required: true
+            },
+            icon: {
+               required: true,
+               size: [64, 64]
+            }
+         }
+      },
+      bids: [{
+         bidder: 'contxtful',
+      }]
+   }
+];
+```
diff --git a/modules/contxtfulRtdProvider.js b/modules/contxtfulRtdProvider.js
new file mode 100644
index 00000000000..55623c00591
--- /dev/null
+++ b/modules/contxtfulRtdProvider.js
@@ -0,0 +1,376 @@
+/**
+ * Contxtful Technologies Inc.
+ * This RTD module provides receptivity that can be accessed using the
+ * getTargetingData and getBidRequestData functions. The receptivity enriches ad units
+ * and bid requests.
+ */
+
+import { submodule } from '../src/hook.js';
+import {
+  logInfo,
+  logError,
+  isStr,
+  mergeDeep,
+  isEmptyStr,
+  isEmpty,
+  buildUrl,
+  isArray,
+} from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+const MODULE_NAME = 'contxtful';
+const MODULE = `${MODULE_NAME}RtdProvider`;
+
+const CONTXTFUL_HOSTNAME_DEFAULT = 'api.receptivity.io';
+const CONTXTFUL_DEFER_DEFAULT = 0;
+
+const storageManager = getStorageManager({
+  moduleType: MODULE_TYPE_RTD,
+  moduleName: MODULE_NAME,
+});
+
+let rxApi = null;
+let isFirstBidRequestCall = true;
+
+/**
+ * Return current receptivity value for the requester.
+ * @param { String } requester
+ * @return { { Object } }
+ */
+function getRxEngineReceptivity(requester) {
+  return rxApi?.receptivity(requester);
+}
+
+function getItemFromSessionStorage(key) {
+  try {
+    return storageManager.getDataFromSessionStorage(key);
+  } catch (error) {
+    logError(MODULE, error);
+  }
+}
+
+function loadSessionReceptivity(requester) {
+  let sessionStorageValue = getItemFromSessionStorage(requester);
+  if (!sessionStorageValue) {
+    return null;
+  }
+
+  try {
+    // Check expiration of the cached value
+    let sessionStorageReceptivity = JSON.parse(sessionStorageValue);
+    let expiration = parseInt(sessionStorageReceptivity?.exp);
+    if (expiration < new Date().getTime()) {
+      return null;
+    }
+
+    let rx = sessionStorageReceptivity?.rx;
+    return rx;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Prepare a receptivity batch
+ * @param {Array.} requesters
+ * @param {Function} method
+ * @returns A batch
+ */
+function prepareBatch(requesters, method) {
+  return requesters.reduce((acc, requester) => {
+    const receptivity = method(requester);
+    if (!isEmpty(receptivity)) {
+      return { ...acc, [requester]: receptivity };
+    } else {
+      return acc;
+    }
+  }, {});
+}
+
+/**
+ * Init function used to start sub module
+ * @param { { params: { version: String, customer: String, hostname: String } } } config
+ * @return { Boolean }
+ */
+function init(config) {
+  logInfo(MODULE, 'init', config);
+  rxApi = null;
+
+  try {
+    initCustomer(config);
+
+    observeLastCursorPosition();
+
+    return true;
+  } catch (error) {
+    logError(MODULE, error);
+    return false;
+  }
+}
+
+/**
+ * Extract required configuration for the sub module.
+ * validate that all required configuration are present and are valid.
+ * Throws an error if any config is missing of invalid.
+ * @param { { params: { version: String, customer: String, hostname: String } } } config
+ * @return { { version: String, customer: String, hostname: String } }
+ * @throws params.{name} should be a non-empty string
+ */
+export function extractParameters(config) {
+  const version = config?.params?.version;
+  if (!isStr(version) || isEmptyStr(version)) {
+    throw Error(`${MODULE}: params.version should be a non-empty string`);
+  }
+
+  const customer = config?.params?.customer;
+  if (!isStr(customer) || isEmptyStr(customer)) {
+    throw Error(`${MODULE}: params.customer should be a non-empty string`);
+  }
+
+  const hostname = config?.params?.hostname || CONTXTFUL_HOSTNAME_DEFAULT;
+  const defer = config?.params?.defer || CONTXTFUL_DEFER_DEFAULT;
+
+  return { version, customer, hostname, defer };
+}
+
+/**
+ * Initialize sub module for a customer.
+ * This will load the external resources for the sub module.
+ * @param { String } config
+ */
+function initCustomer(config) {
+  const { version, customer, hostname, defer } = extractParameters(config);
+  const CONNECTOR_URL = buildUrl({
+    protocol: 'https',
+    host: hostname,
+    pathname: `/${version}/prebid/${customer}/connector/rxConnector.js`,
+  });
+
+  addConnectorEventListener(customer, config);
+
+  const loadScript = () => loadExternalScript(CONNECTOR_URL, MODULE_TYPE_RTD, MODULE_NAME);
+  // Optionally defer the loading of the script
+  if (Number.isFinite(defer) && defer > 0) {
+    setTimeout(loadScript, defer);
+  } else {
+    loadScript();
+  }
+}
+
+/**
+ * Add event listener to the script tag for the expected events from the external script.
+ * @param { String } tagId
+ * @param { String } prebidConfig
+ */
+function addConnectorEventListener(tagId, prebidConfig) {
+  window.addEventListener(
+    'rxConnectorIsReady',
+    async ({ detail: { [tagId]: rxConnector } }) => {
+      if (!rxConnector) {
+        return;
+      }
+      // Fetch the customer configuration
+      const { rxApiBuilder, fetchConfig } = rxConnector;
+      let config = await fetchConfig(tagId);
+      if (!config) {
+        return;
+      }
+      config['prebid'] = prebidConfig || {};
+      rxApi = await rxApiBuilder(config);
+
+      // Remove listener now that we can use rxApi.
+      removeListeners();
+    }
+  );
+}
+
+/**
+ * Set targeting data for ad server
+ * @param { [String] } adUnits
+ * @param {*} config
+ * @param {*} _userConsent
+ * @return {{ code: { ReceptivityState: String } }}
+ */
+function getTargetingData(adUnits, config, _userConsent) {
+  try {
+    if (String(config?.params?.adServerTargeting) === 'false') {
+      return {};
+    }
+    logInfo(MODULE, 'getTargetingData');
+
+    const requester = config?.params?.customer;
+    const rx =
+      getRxEngineReceptivity(requester) ||
+      loadSessionReceptivity(requester) ||
+      {};
+
+    if (isEmpty(rx)) {
+      return {};
+    }
+
+    return adUnits.reduce((targets, code) => {
+      targets[code] = rx;
+      return targets;
+    }, {});
+  } catch (error) {
+    logError(MODULE, error);
+    return {};
+  }
+}
+
+/**
+ * @param {Object} reqBidsConfigObj Bid request configuration object
+ * @param {Function} onDone Called on completion
+ * @param {Object} config Configuration for Contxtful RTD module
+ * @param {Object} userConsent
+ */
+function getBidRequestData(reqBidsConfigObj, onDone, config, userConsent) {
+  function onReturn() {
+    if (isFirstBidRequestCall) {
+      isFirstBidRequestCall = false;
+    }
+    onDone();
+  }
+
+  logInfo(MODULE, 'getBidRequestData');
+  const bidders = config?.params?.bidders || [];
+  if (isEmpty(bidders) || !isArray(bidders)) {
+    onReturn();
+    return;
+  }
+
+  let fromApi = rxApi?.receptivityBatched?.(bidders) || {};
+  let fromStorage = prepareBatch(bidders, (bidder) => loadSessionReceptivity(`${config?.params?.customer}_${bidder}`));
+
+  let sources = [fromStorage, fromApi];
+  if (isFirstBidRequestCall) {
+    sources.reverse();
+  }
+
+  let rxBatch = Object.assign(...sources);
+
+  let singlePointEvents;
+  if (isEmpty(rxBatch)) {
+    singlePointEvents = btoa(JSON.stringify({ ui: getUiEvents() }));
+  }
+
+  bidders
+    .forEach(bidderCode => {
+      const ortb2 = {
+        user: {
+          data: [
+            {
+              name: MODULE_NAME,
+              ext: {
+                rx: rxBatch[bidderCode],
+                events: singlePointEvents,
+                params: {
+                  ev: config.params?.version,
+                  ci: config.params?.customer,
+                },
+              },
+            },
+          ],
+        },
+      };
+
+      mergeDeep(reqBidsConfigObj.ortb2Fragments?.bidder, {
+        [bidderCode]: ortb2,
+      });
+    });
+
+  onReturn();
+}
+
+function getUiEvents() {
+  return {
+    position: lastCursorPosition,
+    screen: getScreen(),
+  };
+}
+
+function getScreen() {
+  function getInnerSize() {
+    let w = window?.innerWidth;
+    let h = window?.innerHeight;
+
+    if (w && h) {
+      return [w, h];
+    }
+  }
+
+  function getDocumentSize() {
+    let body = window?.document?.body;
+    let w = body.clientWidth;
+    let h = body.clientHeight;
+
+    if (w && h) {
+      return [w, h];
+    }
+  }
+
+  // If we cannot access or cast the window dimensions, we get None.
+  // If we cannot collect the size from the window we try to use the root document dimensions
+  let [width, height] = getInnerSize() || getDocumentSize() || [0, 0];
+  let topLeft = { x: window.scrollX, y: window.scrollY };
+
+  return {
+    topLeft,
+    width,
+    height,
+    timestampMs: performance.now(),
+  };
+}
+
+let lastCursorPosition;
+
+function observeLastCursorPosition() {
+  function pointerEventToPosition(event) {
+    lastCursorPosition = {
+      x: event.clientX,
+      y: event.clientY,
+      timestampMs: performance.now()
+    };
+  }
+
+  function touchEventToPosition(event) {
+    let touch = event.touches.item(0);
+    if (!touch) {
+      return;
+    }
+
+    lastCursorPosition = {
+      x: touch.clientX,
+      y: touch.clientY,
+      timestampMs: performance.now()
+    };
+  }
+
+  addListener('pointermove', pointerEventToPosition);
+  addListener('touchmove', touchEventToPosition);
+}
+
+let listeners = {};
+function addListener(name, listener) {
+  listeners[name] = listener;
+
+  window.addEventListener(name, listener);
+}
+
+function removeListeners() {
+  for (const name in listeners) {
+    window.removeEventListener(name, listeners[name]);
+    delete listeners[name];
+  }
+}
+
+export const contxtfulSubmodule = {
+  name: MODULE_NAME,
+  init,
+  getTargetingData,
+  getBidRequestData,
+};
+
+submodule('realTimeData', contxtfulSubmodule);
diff --git a/modules/contxtfulRtdProvider.md b/modules/contxtfulRtdProvider.md
new file mode 100644
index 00000000000..de2376e782d
--- /dev/null
+++ b/modules/contxtfulRtdProvider.md
@@ -0,0 +1,105 @@
+# Overview
+
+**Module Name:** Contxtful RTD Provider  
+**Module Type:** RTD Provider  
+**Maintainer:** [contact@contxtful.com](mailto:contact@contxtful.com)
+
+# Description
+
+The Contxtful RTD module offers a unique feature—Receptivity. Receptivity is an efficiency metric, enabling the qualification of any instant in a session in real time based on attention. The core idea is straightforward: the likelihood of an ad’s success increases when it grabs attention and is presented in the right context at the right time.
+
+To utilize this module, you need to register for an account with [Contxtful](https://contxtful.com). For inquiries, please reach out to  [contact@contxtful.com](mailto:contact@contxtful.com).
+
+## Build Instructions
+
+To incorporate this module into your `prebid.js`, compile the module using the following command:
+
+```sh
+gulp build --modules=rtdModule,contxtfulRtdProvider,
+```
+
+## Testing
+
+To run the test server locally:
+```sh
+gulp serve --modules=rtdModule,contxtfulRtdProvider, --fix --nolint --notest
+chrome http://localhost:9999/integrationExamples/gpt/contxtfulRtdProvider_example.html
+```
+
+To run the unit tests:
+
+```bash
+gulp test
+```
+
+To run the unit tests for a particular file:
+```bash
+gulp test --file "test/spec/modules/contxtfulRtdProvider_spec.js" --nolint
+```
+
+## Configuration
+
+Configure the `contxtfulRtdProvider` by passing the required settings through the `setConfig` function in `prebid.js`.
+
+```js
+import pbjs from 'prebid.js';
+
+pbjs.setConfig({
+  "realTimeData": {
+    "auctionDelay": 1000,
+    "dataProviders": [
+      {
+        "name": "contxtful",
+        "waitForIt": true,
+        "params": {
+          "version": "Contact contact@contxtful.com for the API version",
+          "customer": "Contact contact@contxtful.com for the customer ID",
+          "hostname": "api.receptivity.io", // Optional, default: "api.receptivity.io"
+          "bidders": ["bidderCode1", "bidderCode", "..."], // list of bidders
+          "adServerTargeting": true, // Optional, default: true
+        }
+      }
+    ]
+  }
+});
+```
+
+## Parameters
+
+| Name                | Type     | Scope    | Description                                |
+|---------------------|----------|----------|--------------------------------------------|
+| `version`           | `String` | Required | Specifies the version of the Contxtful Receptivity API.  |
+| `customer`          | `String` | Required | Your unique customer identifier.           |
+| `hostname`          | `String` | Optional | Target URL for CONTXTFUL external JavaScript file. Default is "api.receptivity.io". Changing default behaviour is not recommended. Please reach out to contact@contxtful.com if you experience issues. |
+| `adServerTargeting` | `Boolean`| Optional | Enables the `getTargetingData` to inject targeting value in ad units. Setting to true enables the feature, false disables the feature. Default is true      |
+| `bidders`           | `Array`  | Optional | Setting this array enables Receptivity in the `ortb2` object through `getBidRequestData` for all the listed `bidders`. Default is `[]` (an empty array). RECOMMENDED : Add all the active bidders like this `["bidderCode1", "bidderCode", "..."]` |
+
+## Usage: Injection in Ad Servers
+
+The `contxtfulRtdProvider` module loads an external JavaScript file and authenticates with Contxtful APIs. The `getTargetingData` function then adds a `ReceptivityState` to each ad slot, which can have one of two values: `Receptive` or `NonReceptive`.
+
+```json
+{
+  "adUnitCode1": { "ReceptivityState": "Receptive" },
+  "adUnitCode2": { "ReceptivityState": "Receptive" }
+}
+```
+
+This module also integrates seamlessly with Google Ad Manager, ensuring that the `ReceptivityState` is available as early as possible in the ad serving process.
+
+## Usage: Injection in ortb2 for bidders
+
+Setting the `bidders` field in the configuration parameters enables Receptivity in the `ortb2` object through `getBidRequestData` for all the listed bidders.
+On a Bid Request Event, all bidders in the configuration will inherit the Receptivity data through `ortb2`
+Default is `[]` (an empty array)
+
+RECOMMENDED : Add all the bidders active like this `["bidderCode1", "bidderCode", "..."]`
+
+## Links
+
+- [Basic Prebid.js Example](https://docs.prebid.org/dev-docs/examples/basic-example.html)
+- [How Bid Adapters Should Read First Party Data](https://docs.prebid.org/features/firstPartyData.html#how-bid-adapters-should-read-first-party-data)
+- [getBidRequestData](https://docs.prebid.org/dev-docs/add-rtd-submodule.html#getbidrequestdata)
+- [getTargetingData](https://docs.prebid.org/dev-docs/add-rtd-submodule.html#gettargetingdata)
+- [Contxtful Documentation](https://documentation.contxtful.com/)
+
diff --git a/modules/conversantAnalyticsAdapter.js b/modules/conversantAnalyticsAdapter.js
index 0c58402ca87..520735d4e73 100644
--- a/modules/conversantAnalyticsAdapter.js
+++ b/modules/conversantAnalyticsAdapter.js
@@ -1,16 +1,13 @@
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
-import {getGlobal} from '../src/prebidGlobal.js';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import {logInfo, logWarn, logError, logMessage, deepAccess, isInteger} from '../src/utils.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 
 // Maintainer: mediapsr@epsilon.com
 
-const {
-  EVENTS: { AUCTION_END, AD_RENDER_FAILED, BID_TIMEOUT, BID_WON, BIDDER_ERROR }
-} = CONSTANTS;
+const { AUCTION_END, AD_RENDER_FAILED, BID_TIMEOUT, BID_WON, BIDDER_ERROR } = EVENTS;
 // STALE_RENDER, TCF2_ENFORCEMENT would need to add extra calls for these as they likely occur after AUCTION_END?
 const GVLID = 24;
 const ANALYTICS_TYPE = 'endpoint';
@@ -517,7 +514,7 @@ cnvrHelper.createPayload = function(payloadType, auctionId, timestamp) {
     cnvrSampleRate: initOptions.cnvr_sample_rate,
     auction: {
       auctionId: auctionId,
-      preBidVersion: getGlobal().version,
+      preBidVersion: '$prebid.version$',
       sid: initOptions.site_id,
       auctionTimestamp: timestamp
     },
diff --git a/modules/conversantBidAdapter.js b/modules/conversantBidAdapter.js
index bef65a43616..ea8488cf361 100644
--- a/modules/conversantBidAdapter.js
+++ b/modules/conversantBidAdapter.js
@@ -1,32 +1,128 @@
 import {
-  logWarn,
-  isStr,
+  buildUrl,
   deepAccess,
-  isArray,
   deepSetValue,
-  isEmpty,
-  _each,
-  parseUrl,
-  mergeDeep,
-  buildUrl,
-  _map,
-  logError,
+  getBidIdParameter,
+  isArray,
   isFn,
-  isPlainObject, getBidIdParameter,
+  isPlainObject,
+  isStr,
+  logError,
+  logWarn,
+  mergeDeep,
+  parseUrl,
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {getStorageManager} from '../src/storageManager.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
+import {ORTB_MTYPES} from '../libraries/ortbConverter/processors/mediaType.js';
 
 // Maintainer: mediapsr@epsilon.com
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Device} Device
+ */
+
 const GVLID = 24;
 
 const BIDDER_CODE = 'conversant';
 export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 const URL = 'https://web.hb.ad.cpe.dotomi.com/cvx/client/hb/ortb/25';
 
+function setSiteId(bidRequest, request) {
+  if (bidRequest.params.site_id) {
+    if (request.site) {
+      request.site.id = bidRequest.params.site_id;
+    }
+    if (request.app) {
+      request.app.id = bidRequest.params.site_id;
+    }
+  }
+}
+
+function setPubcid(bidRequest, request) {
+  // Add common id if available
+  const pubcid = getPubcid(bidRequest);
+  if (pubcid) {
+    deepSetValue(request, 'user.ext.fpc', pubcid);
+  }
+}
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 300
+  },
+  request: function (buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    request.at = 1;
+    request.cur = ['USD'];
+    if (context.bidRequests) {
+      const bidRequest = context.bidRequests[0];
+      setSiteId(bidRequest, request);
+      setPubcid(bidRequest, request);
+    }
+
+    return request;
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    const data = {
+      secure: 1,
+      bidfloor: getBidFloor(bidRequest) || 0,
+      displaymanager: 'Prebid.js',
+      displaymanagerver: '$prebid.version$'
+    };
+    copyOptProperty(bidRequest.params.tag_id, data, 'tagid');
+    mergeDeep(imp, data, imp);
+    return imp;
+  },
+  bidResponse: function (buildBidResponse, bid, context) {
+    if (!bid.price) return;
+
+    // ensure that context.mediaType is set to banner or video otherwise
+    if (!context.mediaType && context.bidRequest.mediaTypes) {
+      const [type] = Object.keys(context.bidRequest.mediaTypes);
+      if (Object.values(ORTB_MTYPES).includes(type)) {
+        context.mediaType = type;
+      }
+    }
+    const bidResponse = buildBidResponse(bid, context);
+    return bidResponse;
+  },
+  response(buildResponse, bidResponses, ortbResponse, context) {
+    const response = buildResponse(bidResponses, ortbResponse, context);
+    return response;
+  },
+  overrides: {
+    imp: {
+      banner(fillBannerImp, imp, bidRequest, context) {
+        if (bidRequest.mediaTypes && !bidRequest.mediaTypes.banner) return;
+        if (bidRequest.params.position) {
+          // fillBannerImp looks for mediaTypes.banner.pos so put it under the right name here
+          mergeDeep(bidRequest, {mediaTypes: {banner: {pos: bidRequest.params.position}}});
+        }
+        fillBannerImp(imp, bidRequest, context);
+      },
+      video(fillVideoImp, imp, bidRequest, context) {
+        if (bidRequest.mediaTypes && !bidRequest.mediaTypes.video) return;
+        const videoData = {};
+        copyOptProperty(bidRequest.params?.position, videoData, 'pos');
+        copyOptProperty(bidRequest.params?.mimes, videoData, 'mimes');
+        copyOptProperty(bidRequest.params?.maxduration, videoData, 'maxduration');
+        copyOptProperty(bidRequest.params?.protocols, videoData, 'protocols');
+        copyOptProperty(bidRequest.params?.api, videoData, 'api');
+        imp.video = mergeDeep(videoData, imp.video);
+        fillVideoImp(imp, bidRequest, context);
+      }
+    },
+  }
+});
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
@@ -64,148 +160,14 @@ export const spec = {
     return true;
   },
 
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests - an array of bids
-   * @param bidderRequest
-   * @return {ServerRequest} Info describing the request to the server.
-   */
-  buildRequests: function(validBidRequests, bidderRequest) {
-    const page = (bidderRequest && bidderRequest.refererInfo) ? bidderRequest.refererInfo.page : '';
-    let siteId = '';
-    let pubcid = null;
-    let pubcidName = '_pubcid';
-    let bidurl = URL;
-
-    const conversantImps = validBidRequests.map(function(bid) {
-      const bidfloor = getBidFloor(bid);
-
-      siteId = getBidIdParameter('site_id', bid.params) || siteId;
-      pubcidName = getBidIdParameter('pubcid_name', bid.params) || pubcidName;
-
-      const imp = {
-        id: bid.bidId,
-        secure: 1,
-        bidfloor: bidfloor || 0,
-        displaymanager: 'Prebid.js',
-        displaymanagerver: '$prebid.version$'
-      };
-      if (bid.ortb2Imp) {
-        mergeDeep(imp, bid.ortb2Imp);
-      }
-
-      copyOptProperty(bid.params.tag_id, imp, 'tagid');
-
-      if (isVideoRequest(bid)) {
-        const videoData = deepAccess(bid, 'mediaTypes.video') || {};
-        const format = convertSizes(videoData.playerSize || bid.sizes);
-        const video = {};
-
-        if (format && format[0]) {
-          copyOptProperty(format[0].w, video, 'w');
-          copyOptProperty(format[0].h, video, 'h');
-        }
-
-        copyOptProperty(bid.params.position || videoData.pos, video, 'pos');
-        copyOptProperty(bid.params.mimes || videoData.mimes, video, 'mimes');
-        copyOptProperty(bid.params.maxduration || videoData.maxduration, video, 'maxduration');
-        copyOptProperty(bid.params.protocols || videoData.protocols, video, 'protocols');
-        copyOptProperty(bid.params.api || videoData.api, video, 'api');
-
-        imp.video = video;
-      } else {
-        const bannerData = deepAccess(bid, 'mediaTypes.banner') || {};
-        const format = convertSizes(bannerData.sizes || bid.sizes);
-        const banner = {format: format};
-
-        copyOptProperty(bid.params.position || bannerData.pos, banner, 'pos');
-
-        imp.banner = banner;
-      }
-
-      if (bid.userId && bid.userId.pubcid) {
-        pubcid = bid.userId.pubcid;
-      } else if (bid.crumbs && bid.crumbs.pubcid) {
-        pubcid = bid.crumbs.pubcid;
-      }
-      if (bid.params.white_label_url) {
-        bidurl = bid.params.white_label_url;
-      }
-
-      return imp;
-    });
-
-    const payload = {
-      id: bidderRequest.bidderRequestId,
-      imp: conversantImps,
-      source: {
-        tid: bidderRequest.ortb2?.source?.tid,
-      },
-      site: {
-        id: siteId,
-        mobile: document.querySelector('meta[name="viewport"][content*="width=device-width"]') !== null ? 1 : 0,
-        page: page
-      },
-      device: getDevice(),
-      at: 1
-    };
-
-    let userExt = {};
-
-    // pass schain object if it is present
-    const schain = deepAccess(validBidRequests, '0.schain');
-    if (schain) {
-      deepSetValue(payload, 'source.ext.schain', schain);
-    }
-
-    if (bidderRequest) {
-      if (bidderRequest.timeout) {
-        deepSetValue(payload, 'tmax', bidderRequest.timeout);
-      }
-
-      // Add GDPR flag and consent string
-      if (bidderRequest.gdprConsent) {
-        userExt.consent = bidderRequest.gdprConsent.consentString;
-
-        if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') {
-          deepSetValue(payload, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
-        }
-      }
-
-      if (bidderRequest.uspConsent) {
-        deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-      }
-    }
-
-    if (!pubcid) {
-      pubcid = readStoredValue(pubcidName);
-    }
-
-    // Add common id if available
-    if (pubcid) {
-      userExt.fpc = pubcid;
-    }
-
-    // Add Eids if available
-    const eids = collectEids(validBidRequests);
-    if (eids.length > 0) {
-      userExt.eids = eids;
-    }
-
-    // Only add the user object if it's not empty
-    if (!isEmpty(userExt)) {
-      payload.user = {ext: userExt};
-    }
-
-    const firstPartyData = bidderRequest.ortb2 || {};
-    mergeDeep(payload, firstPartyData);
-
-    return {
+  buildRequests: function(bidRequests, bidderRequest) {
+    const payload = converter.toORTB({bidderRequest, bidRequests});
+    const result = {
       method: 'POST',
-      url: bidurl,
+      url: makeBidUrl(bidRequests[0]),
       data: payload,
     };
+    return result;
   },
   /**
    * Unpack the response from the server into a list of bids.
@@ -215,73 +177,8 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: function(serverResponse, bidRequest) {
-    const bidResponses = [];
-    const requestMap = {};
-    serverResponse = serverResponse.body;
-
-    if (bidRequest && bidRequest.data && bidRequest.data.imp) {
-      _each(bidRequest.data.imp, imp => requestMap[imp.id] = imp);
-    }
-
-    if (serverResponse && isArray(serverResponse.seatbid)) {
-      _each(serverResponse.seatbid, function(bidList) {
-        _each(bidList.bid, function(conversantBid) {
-          const responseCPM = parseFloat(conversantBid.price);
-          if (responseCPM > 0.0 && conversantBid.impid) {
-            const responseAd = conversantBid.adm || '';
-            const responseNurl = conversantBid.nurl || '';
-            const request = requestMap[conversantBid.impid];
-
-            const bid = {
-              requestId: conversantBid.impid,
-              currency: serverResponse.cur || 'USD',
-              cpm: responseCPM,
-              creativeId: conversantBid.crid || '',
-              ttl: 300,
-              netRevenue: true
-            };
-            bid.meta = {};
-            if (conversantBid.adomain && conversantBid.adomain.length > 0) {
-              bid.meta.advertiserDomains = conversantBid.adomain;
-            }
-
-            if (request.video) {
-              if (responseAd.charAt(0) === '<') {
-                bid.vastXml = responseAd;
-              } else {
-                bid.vastUrl = responseAd;
-              }
-
-              bid.mediaType = 'video';
-              bid.width = request.video.w;
-              bid.height = request.video.h;
-            } else {
-              bid.ad = responseAd + '';
-              bid.width = conversantBid.w;
-              bid.height = conversantBid.h;
-            }
-
-            bidResponses.push(bid);
-          }
-        })
-      });
-    }
-
-    return bidResponses;
-  },
-
-  /**
-   * Covert bid param types for S2S
-   * @param {Object} params bid params
-   * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
-   * @return {Object} params bid params
-   */
-  transformBidParams: function(params, isOpenRtb) {
-    return convertTypes({
-      'site_id': 'string',
-      'secure': 'number',
-      'mobile': 'number'
-    }, params);
+    const ortbBids = converter.fromORTB({request: bidRequest.data, response: serverResponse.body});
+    return ortbBids;
   },
 
   /**
@@ -327,51 +224,18 @@ export const spec = {
   }
 };
 
-/**
- * Determine do-not-track state
- *
- * @returns {boolean}
- */
-function getDNT() {
-  return navigator.doNotTrack === '1' || window.doNotTrack === '1' || navigator.msDoNoTrack === '1' || navigator.doNotTrack === 'yes';
-}
-
-/**
- * Return openrtb device object that includes ua, width, and height.
- *
- * @returns {Device} Openrtb device object
- */
-function getDevice() {
-  const language = navigator.language ? 'language' : 'userLanguage';
-  return {
-    h: screen.height,
-    w: screen.width,
-    dnt: getDNT() ? 1 : 0,
-    language: navigator[language].split('-')[0],
-    make: navigator.vendor ? navigator.vendor : '',
-    ua: navigator.userAgent
-  };
-}
-
-/**
- * Convert arrays of widths and heights to an array of objects with w and h properties.
- *
- * [[300, 250], [300, 600]] => [{w: 300, h: 250}, {w: 300, h: 600}]
- *
- * @param {Array.>} bidSizes - arrays of widths and heights
- * @returns {object[]} Array of objects with w and h
- */
-function convertSizes(bidSizes) {
-  let format;
-  if (Array.isArray(bidSizes)) {
-    if (bidSizes.length === 2 && typeof bidSizes[0] === 'number' && typeof bidSizes[1] === 'number') {
-      format = [{w: bidSizes[0], h: bidSizes[1]}];
-    } else {
-      format = _map(bidSizes, d => { return {w: d[0], h: d[1]}; });
-    }
+function getPubcid(bidRequest) {
+  let pubcid = null;
+  if (bidRequest.userId && bidRequest.userId.pubcid) {
+    pubcid = bidRequest.userId.pubcid;
+  } else if (bidRequest.crumbs && bidRequest.crumbs.pubcid) {
+    pubcid = bidRequest.crumbs.pubcid;
   }
-
-  return format;
+  if (!pubcid) {
+    const pubcidName = getBidIdParameter('pubcid_name', bidRequest.params) || '_pubcid';
+    pubcid = readStoredValue(pubcidName);
+  }
+  return pubcid;
 }
 
 /**
@@ -397,33 +261,6 @@ function copyOptProperty(src, dst, dstName) {
   }
 }
 
-/**
- * Collect IDs from validBidRequests and store them as an extended id array
- * @param bidRequests valid bid requests
- */
-function collectEids(bidRequests) {
-  const request = bidRequests[0]; // bidRequests have the same userId object
-  const eids = [];
-  if (isArray(request.userIdAsEids) && request.userIdAsEids.length > 0) {
-    // later following white-list can be converted to block-list if needed
-    const requiredSourceValues = {
-      'epsilon.com': 1,
-      'adserver.org': 1,
-      'liveramp.com': 1,
-      'criteo.com': 1,
-      'id5-sync.com': 1,
-      'parrable.com': 1,
-      'liveintent.com': 1
-    };
-    request.userIdAsEids.forEach(function(eid) {
-      if (requiredSourceValues.hasOwnProperty(eid.source)) {
-        eids.push(eid);
-      }
-    });
-  }
-  return eids;
-}
-
 /**
  * Look for a stored value from both cookie and local storage and return the first value found.
  * @param key Key for the search
@@ -479,4 +316,12 @@ function getBidFloor(bid) {
   return floor
 }
 
+function makeBidUrl(bid) {
+  let bidurl = URL;
+  if (bid.params.white_label_url) {
+    bidurl = bid.params.white_label_url;
+  }
+  return bidurl;
+}
+
 registerBidder(spec);
diff --git a/modules/copper6sspBidAdapter.js b/modules/copper6sspBidAdapter.js
new file mode 100644
index 00000000000..e05ed241cc6
--- /dev/null
+++ b/modules/copper6sspBidAdapter.js
@@ -0,0 +1,21 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'copper6ssp';
+const AD_URL = 'https://endpoint.copper6.com/pbjs';
+const SYNC_URL = 'https://сsync.copper6.com';
+const GVLID = 1356;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
+};
+
+registerBidder(spec);
diff --git a/modules/copper6sspBidAdapter.md b/modules/copper6sspBidAdapter.md
new file mode 100755
index 00000000000..a414187022d
--- /dev/null
+++ b/modules/copper6sspBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: Copper6SSP Bidder Adapter
+Module Type: Copper6SSP Bidder Adapter
+Maintainer: info@copper6.com
+```
+
+# Description
+
+Connects to Copper6SSP exchange for bids.
+Copper6SSP bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'copper6ssp',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'copper6ssp',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'copper6ssp',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/cpmstarBidAdapter.js b/modules/cpmstarBidAdapter.js
index e076fb4b0bb..772cb8c537c 100755
--- a/modules/cpmstarBidAdapter.js
+++ b/modules/cpmstarBidAdapter.js
@@ -1,8 +1,8 @@
 import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import {getBidIdParameter} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { VIDEO, BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 
 const BIDDER_CODE = 'cpmstar';
 
@@ -12,15 +12,18 @@ const ENDPOINT_PRODUCTION = 'https://server.cpmstar.com/view.aspx';
 
 const DEFAULT_TTL = 300;
 const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_NET_REVENUE = true;
 
-function fixedEncodeURIComponent(str) {
-  return encodeURIComponent(str).replace(/[!'()*]/g, function(c) {
-    return '%' + c.charCodeAt(0).toString(16);
-  });
-}
+export const converter = ortbConverter({
+  context: {
+    ttl: DEFAULT_TTL,
+    netRevenue: DEFAULT_NET_REVENUE
+  }
+});
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 1317,
   supportedMediaTypes: [BANNER, VIDEO],
   pageID: Math.floor(Math.random() * 10e6),
 
@@ -43,22 +46,30 @@ export const spec = {
 
   buildRequests: function (validBidRequests, bidderRequest) {
     var requests = [];
-    // This reference to window.top can cause issues when loaded in an iframe if not protected with a try/catch.
 
     for (var i = 0; i < validBidRequests.length; i++) {
       var bidRequest = validBidRequests[i];
-      var referer = bidderRequest.refererInfo.page ? bidderRequest.refererInfo.page : bidderRequest.refererInfo.domain;
-      referer = encodeURIComponent(referer);
-      var e = getBidIdParameter('endpoint', bidRequest.params);
-      var ENDPOINT = e == 'dev' ? ENDPOINT_DEV : e == 'staging' ? ENDPOINT_STAGING : ENDPOINT_PRODUCTION;
-      var mediaType = spec.getMediaType(bidRequest);
-      var playerSize = spec.getPlayerSize(bidRequest);
-      var videoArgs = '&fv=0' + (playerSize ? ('&w=' + playerSize[0] + '&h=' + playerSize[1]) : '');
-      var url = ENDPOINT + '?media=' + mediaType + (mediaType == VIDEO ? videoArgs : '') +
-        '&json=c_b&mv=1&poolid=' + getBidIdParameter('placementId', bidRequest.params) +
-        '&reachedTop=' + encodeURIComponent(bidderRequest.refererInfo.reachedTop) +
-        '&requestid=' + bidRequest.bidId +
-        '&referer=' + encodeURIComponent(referer);
+      const referer = bidderRequest.refererInfo.page ? bidderRequest.refererInfo.page : bidderRequest.refererInfo.domain;
+      const e = utils.getBidIdParameter('endpoint', bidRequest.params);
+      const ENDPOINT = e == 'dev' ? ENDPOINT_DEV : e == 'staging' ? ENDPOINT_STAGING : ENDPOINT_PRODUCTION;
+      const url = new URL(ENDPOINT);
+      const body = {};
+      const mediaType = spec.getMediaType(bidRequest);
+      const playerSize = spec.getPlayerSize(bidRequest);
+      url.searchParams.set('media', mediaType);
+      if (mediaType == VIDEO) {
+        url.searchParams.set('fv', 0);
+        if (playerSize) {
+          url.searchParams.set('w', playerSize?.[0]);
+          url.searchParams.set('h', playerSize?.[1]);
+        }
+      }
+      url.searchParams.set('json', 'c_b');
+      url.searchParams.set('mv', 1);
+      url.searchParams.set('poolid', utils.getBidIdParameter('placementId', bidRequest.params));
+      url.searchParams.set('reachedTop', bidderRequest.refererInfo.reachedTop);
+      url.searchParams.set('requestid', bidRequest.bidId);
+      url.searchParams.set('referer', referer);
 
       if (bidRequest.schain && bidRequest.schain.nodes) {
         var schain = bidRequest.schain;
@@ -67,45 +78,49 @@ export const spec = {
         for (var i2 = 0; i2 < schain.nodes.length; i2++) {
           var node = schain.nodes[i2];
           schainString += '!' +
-            fixedEncodeURIComponent(node.asi || '') + ',' +
-            fixedEncodeURIComponent(node.sid || '') + ',' +
-            fixedEncodeURIComponent(node.hp || '') + ',' +
-            fixedEncodeURIComponent(node.rid || '') + ',' +
-            fixedEncodeURIComponent(node.name || '') + ',' +
-            fixedEncodeURIComponent(node.domain || '');
+            (node.asi || '') + ',' +
+            (node.sid || '') + ',' +
+            (node.hp || '') + ',' +
+            (node.rid || '') + ',' +
+            (node.name || '') + ',' +
+            (node.domain || '');
         }
-        url += '&schain=' + schainString;
+        url.searchParams.set('schain', schainString);
       }
 
       if (bidderRequest.gdprConsent) {
         if (bidderRequest.gdprConsent.consentString != null) {
-          url += '&gdpr_consent=' + bidderRequest.gdprConsent.consentString;
+          url.searchParams.set('gdpr_consent', bidderRequest.gdprConsent.consentString);
         }
         if (bidderRequest.gdprConsent.gdprApplies != null) {
-          url += '&gdpr=' + (bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
+          url.searchParams.set('gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
         }
       }
 
       if (bidderRequest.uspConsent != null) {
-        url += '&us_privacy=' + bidderRequest.uspConsent;
+        url.searchParams.set('us_privacy', bidderRequest.uspConsent);
       }
 
       if (config.getConfig('coppa')) {
-        url += '&tfcd=' + (config.getConfig('coppa') ? 1 : 0);
+        url.searchParams.set('tfcd', (config.getConfig('coppa') ? 1 : 0));
       }
 
-      let body = {};
       let adUnitCode = bidRequest.adUnitCode;
       if (adUnitCode) {
         body.adUnitCode = adUnitCode;
       }
       if (mediaType == VIDEO) {
         body.video = utils.deepAccess(bidRequest, 'mediaTypes.video');
+      } else if (mediaType == BANNER) {
+        body.banner = utils.deepAccess(bidRequest, 'mediaTypes.banner');
       }
 
+      const ortb = converter.toORTB({ bidderRequest, bidRequests: [bidRequest] });
+      Object.assign(body, ortb);
+
       requests.push({
         method: 'POST',
-        url: url,
+        url: url.toString(),
         bidRequest: bidRequest,
         data: body
       });
@@ -144,7 +159,7 @@ export const spec = {
         width: rawBid.width || 0,
         height: rawBid.height || 0,
         currency: rawBid.currency ? rawBid.currency : DEFAULT_CURRENCY,
-        netRevenue: rawBid.netRevenue ? rawBid.netRevenue : true,
+        netRevenue: rawBid.netRevenue ? rawBid.netRevenue : DEFAULT_NET_REVENUE,
         ttl: rawBid.ttl ? rawBid.ttl : DEFAULT_TTL,
         creativeId: rawBid.creativeid || 0,
         meta: {
@@ -191,4 +206,5 @@ export const spec = {
   }
 
 };
+
 registerBidder(spec);
diff --git a/modules/cpmstarBidAdapter.md b/modules/cpmstarBidAdapter.md
index c227f19bfaf..66f13479c05 100755
--- a/modules/cpmstarBidAdapter.md
+++ b/modules/cpmstarBidAdapter.md
@@ -3,10 +3,7 @@
 ```
 Module Name: Cpmstar Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: josh@cpmstar.com
-gdpr_supported: true
-usp_supported: true
-coppa_supported: true
+Maintainer: prebid@cpmstar.com
 ```
 
 # Description
diff --git a/modules/craftBidAdapter.js b/modules/craftBidAdapter.js
index a2a054d7659..3e24a68b946 100644
--- a/modules/craftBidAdapter.js
+++ b/modules/craftBidAdapter.js
@@ -1,15 +1,13 @@
-import {getBidRequest, logError} from '../src/utils.js';
+import {getBidRequest} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {auctionManager} from '../src/auctionManager.js';
 import {find, includes} from '../src/polyfill.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {ajax} from '../src/ajax.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
 import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
-import {getANKeywordParam, transformBidderParamKeywords} from '../libraries/appnexusUtils/anKeywords.js';
-import {convertCamelToUnderscore} from '../libraries/appnexusUtils/anUtils.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
+import {getANKeywordParam} from '../libraries/appnexusUtils/anKeywords.js';
+import {interpretResponseUtil} from '../libraries/interpretResponseUtils/index.js';
 
 const BIDDER_CODE = 'craft';
 const URL_BASE = 'https://gacraft.jp/prebid-v3';
@@ -71,55 +69,20 @@ export const spec = {
 
   interpretResponse: function(serverResponse, {bidderRequest}) {
     try {
-      serverResponse = serverResponse.body;
-      const bids = [];
-      if (!serverResponse) {
-        return [];
-      }
-      if (serverResponse.error) {
-        let errorMessage = `in response for ${bidderRequest.bidderCode} adapter`;
-        if (serverResponse.error) {
-          errorMessage += `: ${serverResponse.error}`;
+      const bids = interpretResponseUtil(serverResponse, {bidderRequest}, serverBid => {
+        const rtbBid = getRtbBid(serverBid);
+        if (rtbBid && rtbBid.cpm !== 0 && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
+          const bid = newBid(serverBid, rtbBid, bidderRequest);
+          bid.mediaType = parseMediaType(rtbBid);
+          return bid;
         }
-        logError(errorMessage);
-        return bids;
-      }
-      if (serverResponse.tags) {
-        serverResponse.tags.forEach(serverBid => {
-          const rtbBid = getRtbBid(serverBid);
-          if (rtbBid) {
-            if (rtbBid.cpm !== 0 && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
-              const bid = newBid(serverBid, rtbBid, bidderRequest);
-              bid.mediaType = parseMediaType(rtbBid);
-              bids.push(bid);
-            }
-          }
-        });
-      }
+      });
       return bids;
     } catch (e) {
       return [];
     }
   },
 
-  transformBidParams: function(params, isOpenRtb) {
-    params = convertTypes({
-      'sitekey': 'string',
-      'placementId': 'string',
-      'keywords': transformBidderParamKeywords,
-    }, params);
-    if (isOpenRtb) {
-      Object.keys(params).forEach(paramKey => {
-        let convertedKey = convertCamelToUnderscore(paramKey);
-        if (convertedKey !== paramKey) {
-          params[convertedKey] = params[paramKey];
-          delete params[paramKey];
-        }
-      });
-    }
-    return params;
-  },
-
   onBidWon: function(bid) {
     ajax(bid._prebidWon, null, null, {
       method: 'POST',
@@ -157,7 +120,7 @@ function newBid(serverBid, rtbBid, bidderRequest) {
     ad: rtbBid.rtb.banner.content,
     ttl: TTL,
     creativeId: rtbBid.creative_id,
-    netRevenue: false, // ???
+    netRevenue: true,
     dealId: rtbBid.deal_id,
     meta: null,
     _adUnitCode: bidRequest.adUnitCode,
@@ -186,12 +149,9 @@ function bidToTag(bid) {
   if (keywords.length) {
     tag.keywords = keywords;
   }
-  // TODO: why does this need to iterate through every ad unit?
-  let adUnit = find(auctionManager.getAdUnits(), au => bid.transactionId === au.transactionId);
-  if (adUnit && adUnit.mediaTypes && adUnit.mediaTypes.banner) {
+  if (bid.mediaTypes?.banner) {
     tag.ad_types.push(BANNER);
   }
-
   if (tag.ad_types.length === 0) {
     delete tag.ad_types;
   }
diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 9ff6b540467..b01e7361e3f 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -1,57 +1,225 @@
-import { deepAccess, generateUUID, isArray, logError, logInfo, logWarn, parseUrl } from '../src/utils.js';
-import { loadExternalScript } from '../src/adloader.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { verify } from 'criteo-direct-rsa-validate/build/verify.js'; // ref#2
-import { getStorageManager } from '../src/storageManager.js';
-import { getRefererInfo } from '../src/refererDetection.js';
-import { hasPurpose1Consent } from '../src/utils/gpdr.js';
-import { Renderer } from '../src/Renderer.js';
-import { OUTSTREAM } from '../src/video.js';
-import { ajax } from '../src/ajax.js';
+import {deepSetValue, isArray, logError, logWarn, parseUrl, triggerPixel} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
+import {Renderer} from '../src/Renderer.js';
+import {OUTSTREAM} from '../src/video.js';
+import {ajax} from '../src/ajax.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
+import {ortb25Translator} from '../libraries/ortb2.5Translator/translator.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderSpec} BidderSpec
+ * @typedef {import('../src/adapters/bidderFactory.js').TimedOutBid} TimedOutBid
+ */
 
 const GVLID = 91;
-export const ADAPTER_VERSION = 36;
+export const ADAPTER_VERSION = 37;
 const BIDDER_CODE = 'criteo';
-const CDB_ENDPOINT = 'https://bidder.criteo.com/cdb';
+const CDB_ENDPOINT = 'https://grid-bidder.criteo.com/openrtb_2_5/pbjs/auction/request';
 const PROFILE_ID_INLINE = 207;
-export const PROFILE_ID_PUBLISHERTAG = 185;
 export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
 const LOG_PREFIX = 'Criteo: ';
+const TRANSLATOR = ortb25Translator();
 
-/*
-  If you don't want to use the FastBid adapter feature, you can lighten criteoBidAdapter size by :
-  1. commenting the tryGetCriteoFastBid function inner content (see ref#1)
-  2. removing the line 'verify' function import line (see ref#2)
-
-  Unminified source code can be found in the privately shared repo: https://github.com/Prebid-org/prebid-js-external-js-criteo/blob/master/dist/prod.js
-*/
-const FAST_BID_VERSION_PLACEHOLDER = '%FAST_BID_VERSION%';
-export const FAST_BID_VERSION_CURRENT = 139;
-const FAST_BID_VERSION_LATEST = 'latest';
-const FAST_BID_VERSION_NONE = 'none';
-const PUBLISHER_TAG_URL_TEMPLATE = 'https://static.criteo.net/js/ld/publishertag.prebid' + FAST_BID_VERSION_PLACEHOLDER + '.js';
 const PUBLISHER_TAG_OUTSTREAM_SRC = 'https://static.criteo.net/js/ld/publishertag.renderer.js'
-const FAST_BID_PUBKEY_E = 65537;
-const FAST_BID_PUBKEY_N = 'ztQYwCE5BU7T9CDM5he6rKoabstXRmkzx54zFPZkWbK530dwtLBDeaWBMxHBUT55CYyboR/EZ4efghPi3CoNGfGWezpjko9P6p2EwGArtHEeS4slhu/SpSIFMjG6fdrpRoNuIAMhq1Z+Pr/+HOd1pThFKeGFr2/NhtAg+TXAzaU=';
-
 const OPTOUT_COOKIE_NAME = 'cto_optout';
 const BUNDLE_COOKIE_NAME = 'cto_bundle';
 const GUID_RETENTION_TIME_HOUR = 24 * 30 * 13; // 13 months
 const OPTOUT_RETENTION_TIME_HOUR = 5 * 12 * 30 * 24; // 5 years
 
+/**
+ * Defines the generic oRTB converter and all customization functions.
+ */
+const CONVERTER = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 60
+  },
+  imp,
+  request,
+  bidResponse,
+  response
+});
+
+/**
+ * Builds an impression object for the ORTB 2.5 request.
+ *
+ * @param {function} buildImp - The function for building an imp object.
+ * @param {Object} bidRequest - The bid request object.
+ * @param {Object} context - The context object.
+ * @returns {Object} The ORTB 2.5 imp object.
+ */
+function imp(buildImp, bidRequest, context) {
+  let imp = buildImp(bidRequest, context);
+  const params = bidRequest.params;
+
+  imp.tagid = bidRequest.adUnitCode;
+  deepSetValue(imp, 'ext', {
+    ...bidRequest.params.ext,
+    ...imp.ext,
+    rwdd: imp.rwdd,
+    floors: getFloors(bidRequest),
+    bidder: {
+      publishersubid: params?.publisherSubId,
+      zoneid: params?.zoneId,
+      uid: params?.uid,
+    },
+  });
+
+  delete imp.rwdd // oRTB 2.6 field moved to ext
+
+  if (!context.fledgeEnabled && imp.ext.igs?.ae) {
+    delete imp.ext.igs.ae;
+  }
+
+  if (hasVideoMediaType(bidRequest)) {
+    const paramsVideo = bidRequest.params.video;
+    if (paramsVideo !== undefined) {
+      deepSetValue(imp, 'video', {
+        ...imp.video,
+        skip: imp.video.skip || paramsVideo.skip || 0,
+        placement: imp.video.placement || paramsVideo.placement,
+        minduration: imp.video.minduration || paramsVideo.minduration,
+        playbackmethod: imp.video.playbackmethod || paramsVideo.playbackmethod,
+        startdelay: imp.video.startdelay || paramsVideo.startdelay || 0,
+      })
+    }
+    deepSetValue(imp, 'video.ext', {
+      context: bidRequest.mediaTypes.video.context,
+      playersizes: parseSizes(bidRequest?.mediaTypes?.video?.playerSize, parseSize),
+      plcmt: bidRequest.mediaTypes.video.plcmt,
+      poddur: bidRequest.mediaTypes.video.adPodDurationSec,
+      rqddurs: bidRequest.mediaTypes.video.durationRangeSec,
+    })
+  }
+
+  if (imp.native && typeof imp.native.request !== 'undefined') {
+    let requestNative = JSON.parse(imp.native.request);
+
+    // We remove the native asset requirements if we used the bypass to generate the imp
+    const hasAssetRequirements = requestNative.assets &&
+      (requestNative.assets.length !== 1 || Object.keys(requestNative.assets[0]).length);
+    if (!hasAssetRequirements) {
+      delete requestNative.assets;
+    }
+
+    deepSetValue(imp, 'native.request_native', requestNative);
+    delete imp.native.request;
+  }
+
+  return imp;
+}
+
+/**
+ * Builds a request object for the ORTB 2.5 request.
+ *
+ * @param {function} buildRequest - The function for building a request object.
+ * @param {Array} imps - An array of ORTB 2.5 impression objects.
+ * @param {Object} bidderRequest - The bidder request object.
+ * @param {Object} context - The context object.
+ * @returns {Object} The ORTB 2.5 request object.
+ */
+function request(buildRequest, imps, bidderRequest, context) {
+  let request = buildRequest(imps, bidderRequest, context);
+
+  // params.pubid should override publisher id
+  if (typeof context.publisherId !== 'undefined') {
+    if (typeof request.app !== 'undefined') {
+      deepSetValue(request, 'app.publisher.id', context.publisherId);
+    } else {
+      deepSetValue(request, 'site.publisher.id', context.publisherId);
+    }
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    deepSetValue(request, 'regs.ext.gdprversion', bidderRequest.gdprConsent.apiVersion);
+  }
+
+  // Translate 2.6 OpenRTB request into 2.5 OpenRTB request
+  request = TRANSLATOR(request);
+
+  return request;
+}
+
+/**
+ * Build bid from oRTB 2.5 bid.
+ *
+ * @param buildBidResponse
+ * @param bid
+ * @param context
+ * @returns {*}
+ */
+function bidResponse(buildBidResponse, bid, context) {
+  context.mediaType = bid?.ext?.mediatype;
+  if (context.mediaType === NATIVE && typeof bid.adm_native !== 'undefined') {
+    bid.adm = bid.adm_native;
+    delete bid.adm_native;
+  }
+
+  let bidResponse = buildBidResponse(bid, context);
+  const {bidRequest} = context;
+
+  bidResponse.currency = bid?.ext?.cur;
+
+  if (typeof bid?.ext?.meta !== 'undefined') {
+    deepSetValue(bidResponse, 'meta', {
+      ...bidResponse.meta,
+      ...bid.ext.meta
+    });
+  }
+  if (typeof bid?.ext?.paf?.content_id !== 'undefined') {
+    deepSetValue(bidResponse, 'meta.paf.content_id', bid.ext.paf.content_id)
+  }
+
+  if (bidResponse.mediaType === VIDEO) {
+    bidResponse.vastUrl = bid.ext?.displayurl;
+    // if outstream video, add a default render for it.
+    if (bidRequest?.mediaTypes?.video?.context === OUTSTREAM) {
+      bidResponse.renderer = createOutstreamVideoRenderer(bid);
+    }
+  }
+
+  return bidResponse;
+}
+
+/**
+ * Builds bid response from the oRTB 2.5 bid response.
+ *
+ * @param buildResponse
+ * @param bidResponses
+ * @param ortbResponse
+ * @param context
+ * @returns *
+ */
+function response(buildResponse, bidResponses, ortbResponse, context) {
+  let response = buildResponse(bidResponses, ortbResponse, context);
+
+  const pafTransmission = ortbResponse?.ext?.paf?.transmission;
+  response.bids.forEach(bid => {
+    if (typeof pafTransmission !== 'undefined' && typeof bid?.meta?.paf?.content_id !== 'undefined') {
+      deepSetValue(bid, 'meta.paf.transmission', pafTransmission);
+    } else {
+      delete bid.meta.paf;
+    }
+  });
+
+  return response;
+}
+
 /** @type {BidderSpec} */
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  getUserSyncs: function (syncOptions, _, gdprConsent, uspConsent) {
-    const fastBidVersion = config.getConfig('criteo.fastBidVersion');
-    if (canFastBid(fastBidVersion)) {
-      return [];
-    }
+  getUserSyncs: function (syncOptions, _, gdprConsent, uspConsent, gppConsent = {}) {
+    let { gppString = '', applicableSections = [] } = gppConsent;
 
     const refererInfo = getRefererInfo();
     const origin = 'criteoPrebidAdapter';
@@ -71,6 +239,12 @@ export const spec = {
       if (uspConsent) {
         queryParams.push(`us_privacy=${uspConsent}`);
       }
+      queryParams.push(`gpp=${gppString}`);
+      if (Array.isArray(applicableSections)) {
+        for (const applicableSection of applicableSections) {
+          queryParams.push(`gpp_sid=${applicableSection}`);
+        }
+      }
 
       const requestId = Math.random().toString();
 
@@ -104,10 +278,14 @@ export const spec = {
         if (response.optout) {
           deleteFromAllStorages(BUNDLE_COOKIE_NAME);
 
-          saveOnAllStorages(OPTOUT_COOKIE_NAME, true, OPTOUT_RETENTION_TIME_HOUR);
+          saveOnAllStorages(OPTOUT_COOKIE_NAME, true, OPTOUT_RETENTION_TIME_HOUR, refererInfo.domain);
         } else {
           if (response.bundle) {
-            saveOnAllStorages(BUNDLE_COOKIE_NAME, response.bundle, GUID_RETENTION_TIME_HOUR);
+            saveOnAllStorages(BUNDLE_COOKIE_NAME, response.bundle, GUID_RETENTION_TIME_HOUR, refererInfo.domain);
+          }
+
+          if (response.callbacks) {
+            response.callbacks.forEach(triggerPixel);
           }
         }
       }, true);
@@ -118,11 +296,38 @@ export const spec = {
         type: 'iframe',
         url: `https://gum.criteo.com/syncframe?${queryParams.join('&')}#${jsonHashSerialized}`
       }];
+    } else if (syncOptions.pixelEnabled && hasPurpose1Consent(gdprConsent)) {
+      const queryParams = [];
+      queryParams.push(`profile=207`);
+      if (gdprConsent) {
+        if (gdprConsent.gdprApplies === true) {
+          queryParams.push(`gdprapplies=true`);
+        }
+        if (gdprConsent.consentString) {
+          queryParams.push(`gdpr=${gdprConsent.consentString}`);
+        }
+      }
+      if (uspConsent) {
+        queryParams.push(`ccpa=${uspConsent}`);
+      }
+      queryParams.push(`gpp=${gppString}`);
+      if (Array.isArray(applicableSections)) {
+        for (const applicableSection of applicableSections) {
+          queryParams.push(`gpp_sid=${applicableSection}`);
+        }
+      }
+      // gpp
+      // gpp_sid
+      return [{
+        type: 'image',
+        url: `https://ssp-sync.criteo.com/user-sync/redirect?${queryParams.join('&')}`
+      }];
     }
     return [];
   },
 
-  /** f
+  /**
+   * f
    * @param {object} bid
    * @return {boolean}
    */
@@ -148,50 +353,25 @@ export const spec = {
    * @return {ServerRequest}
    */
   buildRequests: (bidRequests, bidderRequest) => {
-    let url;
-    let data;
-    let fpd = bidderRequest.ortb2 || {};
-
-    Object.assign(bidderRequest, {
-      publisherExt: fpd.site?.ext,
-      userExt: fpd.user?.ext,
-      ceh: config.getConfig('criteo.ceh'),
-      coppa: config.getConfig('coppa')
-    });
-
-    // If publisher tag not already loaded try to get it from fast bid
-    const fastBidVersion = config.getConfig('criteo.fastBidVersion');
-    const canLoadPublisherTag = canFastBid(fastBidVersion);
-    if (!publisherTagAvailable() && canLoadPublisherTag) {
-      window.Criteo = window.Criteo || {};
-      window.Criteo.usePrebidEvents = false;
-
-      tryGetCriteoFastBid();
+    bidRequests.forEach(bidRequest => {
+      if (hasNativeMediaType(bidRequest)) {
+        if (!checkNativeSendId(bidRequest)) {
+          logWarn(LOG_PREFIX + 'all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)');
+        }
 
-      const fastBidUrl = getFastBidUrl(fastBidVersion);
-      // Reload the PublisherTag after the timeout to ensure FastBid is up-to-date and tracking done properly
-      setTimeout(() => {
-        loadExternalScript(fastBidUrl, BIDDER_CODE);
-      }, bidderRequest.timeout);
-    }
+        // We support native request without assets requirements because we can fill them later on.
+        // This is a trick to fool oRTB converter isOpenRTBBidRequestValid(ortb) fn because it needs
+        // nativeOrtbRequest.assets to be non-empty.
+        if (bidRequest?.nativeOrtbRequest?.assets == null) {
+          logWarn(LOG_PREFIX + 'native asset requirements are missing');
+          deepSetValue(bidRequest, 'nativeOrtbRequest.assets', [{}]);
+        }
+      }
+    });
 
-    if (publisherTagAvailable()) {
-      // eslint-disable-next-line no-undef
-      const adapter = new Criteo.PubTag.Adapters.Prebid(
-        PROFILE_ID_PUBLISHERTAG,
-        ADAPTER_VERSION,
-        bidRequests,
-        bidderRequest,
-        '$prebid.version$',
-        { createOutstreamVideoRenderer: createOutstreamVideoRenderer }
-      );
-      url = adapter.buildCdbUrl();
-      data = adapter.buildCdbRequest();
-    } else {
-      const context = buildContext(bidRequests, bidderRequest);
-      url = buildCdbUrl(context);
-      data = buildCdbRequest(context, bidRequests, bidderRequest);
-    }
+    const context = buildContext(bidRequests, bidderRequest);
+    const url = buildCdbUrl(context);
+    const data = CONVERTER.toORTB({bidderRequest, bidRequests, context});
 
     if (data) {
       return { method: 'POST', url, data, bidRequests };
@@ -201,112 +381,26 @@ export const spec = {
   /**
    * @param {*} response
    * @param {ServerRequest} request
-   * @return {Bid[]}
+   * @return {Bid[] | {bids: Bid[], fledgeAuctionConfigs: object[]}}
    */
   interpretResponse: (response, request) => {
-    const body = response.body || response;
-
-    if (publisherTagAvailable()) {
-      // eslint-disable-next-line no-undef
-      const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(request);
-      if (adapter) {
-        return adapter.interpretResponse(body, request);
-      }
+    if (typeof response?.body == 'undefined') {
+      return []; // no bid
     }
 
-    const bids = [];
-
-    if (body && body.slots && isArray(body.slots)) {
-      body.slots.forEach(slot => {
-        const bidRequest = getAssociatedBidRequest(request.bidRequests, slot);
-        if (bidRequest) {
-          const bidId = bidRequest.bidId;
-          const bid = {
-            requestId: bidId,
-            cpm: slot.cpm,
-            currency: slot.currency,
-            netRevenue: true,
-            ttl: slot.ttl || 60,
-            creativeId: slot.creativecode,
-            width: slot.width,
-            height: slot.height,
-            dealId: slot.deal,
-          };
-          if (body.ext?.paf?.transmission && slot.ext?.paf?.content_id) {
-            const pafResponseMeta = {
-              content_id: slot.ext.paf.content_id,
-              transmission: response.ext.paf.transmission
-            };
-            bid.meta = Object.assign({}, bid.meta, { paf: pafResponseMeta });
-          }
-          if (slot.adomain) {
-            bid.meta = Object.assign({}, bid.meta, { advertiserDomains: [slot.adomain].flat() });
-          }
-          if (slot.ext?.meta?.networkName) {
-            bid.meta = Object.assign({}, bid.meta, { networkName: slot.ext.meta.networkName })
-          }
-          if (slot.native) {
-            if (bidRequest.params.nativeCallback) {
-              bid.ad = createNativeAd(bidId, slot.native, bidRequest.params.nativeCallback);
-            } else {
-              bid.native = createPrebidNativeAd(slot.native);
-              bid.mediaType = NATIVE;
-            }
-          } else if (slot.video) {
-            bid.vastUrl = slot.displayurl;
-            bid.mediaType = VIDEO;
-            const context = deepAccess(bidRequest, 'mediaTypes.video.context');
-            // if outstream video, add a default render for it.
-            if (context === OUTSTREAM) {
-              bid.renderer = createOutstreamVideoRenderer(slot);
-            }
-          } else {
-            bid.ad = slot.creative;
-          }
-          bids.push(bid);
-        }
-      });
-    }
+    const interpretedResponse = CONVERTER.fromORTB({response: response.body, request: request.data});
+    const bids = interpretedResponse.bids || [];
 
-    return bids;
-  },
-  /**
-   * @param {TimedOutBid} timeoutData
-   */
-  onTimeout: (timeoutData) => {
-    if (publisherTagAvailable() && Array.isArray(timeoutData)) {
-      var auctionsIds = [];
-      timeoutData.forEach((bid) => {
-        if (auctionsIds.indexOf(bid.auctionId) === -1) {
-          auctionsIds.push(bid.auctionId);
-          // eslint-disable-next-line no-undef
-          const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(bid.auctionId);
-          adapter.handleBidTimeout();
-        }
-      });
-    }
-  },
-
-  /**
-   * @param {Bid} bid
-   */
-  onBidWon: (bid) => {
-    if (publisherTagAvailable() && bid) {
-      // eslint-disable-next-line no-undef
-      const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(bid.auctionId);
-      adapter.handleBidWon(bid);
+    const fledgeAuctionConfigs = response.body?.ext?.igi?.filter(igi => isArray(igi?.igs))
+      .flatMap(igi => igi.igs);
+    if (fledgeAuctionConfigs?.length) {
+      return {
+        bids,
+        paapi: fledgeAuctionConfigs,
+      };
     }
-  },
 
-  /**
-   * @param {Bid} bid
-   */
-  onSetTargeting: (bid) => {
-    if (publisherTagAvailable()) {
-      // eslint-disable-next-line no-undef
-      const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(bid.auctionId);
-      adapter.handleSetTargeting(bid);
-    }
+    return bids;
   },
 
   /**
@@ -334,12 +428,29 @@ function readFromAllStorages(name) {
   return fromCookie || fromLocalStorage || undefined;
 }
 
-function saveOnAllStorages(name, value, expirationTimeHours) {
+function saveOnAllStorages(name, value, expirationTimeHours, domain) {
   const date = new Date();
   date.setTime(date.getTime() + (expirationTimeHours * 60 * 60 * 1000));
   const expires = `expires=${date.toUTCString()}`;
 
-  storage.setCookie(name, value, expires);
+  const subDomains = domain.split('.');
+  for (let i = 0; i < subDomains.length; ++i) {
+    // Try to write the cookie on this subdomain (we want it to be stored only on the TLD+1)
+    const domain = subDomains.slice(subDomains.length - i - 1, subDomains.length).join('.');
+
+    try {
+      storage.setCookie(name, value, expires, null, '.' + domain);
+
+      // Try to read the cookie to check if we wrote it
+      const check = storage.getCookie(name);
+      if (check && check === value) {
+        break;
+      }
+    } catch (error) {
+
+    }
+  }
+
   storage.setDataInLocalStorage(name, value);
 }
 
@@ -348,43 +459,26 @@ function deleteFromAllStorages(name) {
   storage.removeDataFromLocalStorage(name);
 }
 
-/**
- * @return {boolean}
- */
-function publisherTagAvailable() {
-  // eslint-disable-next-line no-undef
-  return typeof Criteo !== 'undefined' && Criteo.PubTag && Criteo.PubTag.Adapters && Criteo.PubTag.Adapters.Prebid;
-}
-
 /**
  * @param {BidRequest[]} bidRequests
  * @param bidderRequest
  */
 function buildContext(bidRequests, bidderRequest) {
-  let referrer = '';
-  if (bidderRequest && bidderRequest.refererInfo) {
-    referrer = bidderRequest.refererInfo.page;
-  }
   const queryString = parseUrl(bidderRequest?.refererInfo?.topmostLocation).search;
 
-  const context = {
-    url: referrer,
+  return {
+    url: bidderRequest?.refererInfo?.page || '',
     debug: queryString['pbt_debug'] === '1',
     noLog: queryString['pbt_nolog'] === '1',
-    amp: false,
+    fledgeEnabled: bidderRequest.paapi?.enabled,
+    amp: bidRequests.some(bidRequest => bidRequest.params.integrationMode === 'amp'),
+    networkId: bidRequests.find(bidRequest => bidRequest.params?.networkId)?.params.networkId,
+    publisherId: bidRequests.find(bidRequest => bidRequest.params?.pubid)?.params.pubid,
   };
-
-  bidRequests.forEach(bidRequest => {
-    if (bidRequest.params.integrationMode === 'amp') {
-      context.amp = true;
-    }
-  });
-
-  return context;
 }
 
 /**
- * @param {CriteoContext} context
+ * @param {Object} context
  * @return {string}
  */
 function buildCdbUrl(context) {
@@ -420,6 +514,10 @@ function buildCdbUrl(context) {
     url += `&optout=1`;
   }
 
+  if (context.networkId) {
+    url += `&networkId=` + context.networkId;
+  }
+
   return url;
 }
 
@@ -435,154 +533,6 @@ function checkNativeSendId(bidRequest) {
     ));
 }
 
-/**
- * @param {CriteoContext} context
- * @param {BidRequest[]} bidRequests
- * @param bidderRequest
- * @return {*}
- */
-function buildCdbRequest(context, bidRequests, bidderRequest) {
-  let networkId;
-  let schain;
-  let userIdAsEids;
-  const request = {
-    id: generateUUID(),
-    publisher: {
-      url: context.url,
-      ext: bidderRequest.publisherExt,
-    },
-    regs: {
-      coppa: bidderRequest.coppa === true ? 1 : (bidderRequest.coppa === false ? 0 : undefined),
-      gpp: bidderRequest.ortb2?.regs?.gpp,
-      gpp_sid: bidderRequest.ortb2?.regs?.gpp_sid
-    },
-    slots: bidRequests.map(bidRequest => {
-      if (!userIdAsEids) {
-        userIdAsEids = bidRequest.userIdAsEids;
-      }
-      networkId = bidRequest.params.networkId || networkId;
-      schain = bidRequest.schain || schain;
-      const slot = {
-        slotid: bidRequest.bidId,
-        impid: bidRequest.adUnitCode,
-        transactionid: bidRequest.ortb2Imp?.ext?.tid
-      };
-      if (bidRequest.params.zoneId) {
-        slot.zoneid = bidRequest.params.zoneId;
-      }
-      if (deepAccess(bidRequest, 'ortb2Imp.ext')) {
-        slot.ext = bidRequest.ortb2Imp.ext;
-      }
-
-      if (deepAccess(bidRequest, 'ortb2Imp.rwdd')) {
-        slot.rwdd = bidRequest.ortb2Imp.rwdd;
-      }
-
-      if (bidRequest.params.ext) {
-        slot.ext = Object.assign({}, slot.ext, bidRequest.params.ext);
-      }
-      if (bidRequest.nativeOrtbRequest?.assets) {
-        slot.ext = Object.assign({}, slot.ext, { assets: bidRequest.nativeOrtbRequest.assets });
-      }
-      if (bidRequest.params.publisherSubId) {
-        slot.publishersubid = bidRequest.params.publisherSubId;
-      }
-
-      if (bidRequest.params.nativeCallback || hasNativeMediaType(bidRequest)) {
-        slot.native = true;
-        if (!checkNativeSendId(bidRequest)) {
-          logWarn(LOG_PREFIX + 'all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)');
-        }
-      }
-
-      if (hasBannerMediaType(bidRequest)) {
-        slot.sizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'), parseSize);
-      } else {
-        slot.sizes = [];
-      }
-
-      if (hasVideoMediaType(bidRequest)) {
-        const video = {
-          playersizes: parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'), parseSize),
-          mimes: bidRequest.mediaTypes.video.mimes,
-          protocols: bidRequest.mediaTypes.video.protocols,
-          maxduration: bidRequest.mediaTypes.video.maxduration,
-          api: bidRequest.mediaTypes.video.api,
-          skip: bidRequest.mediaTypes.video.skip,
-          placement: bidRequest.mediaTypes.video.placement,
-          minduration: bidRequest.mediaTypes.video.minduration,
-          playbackmethod: bidRequest.mediaTypes.video.playbackmethod,
-          startdelay: bidRequest.mediaTypes.video.startdelay,
-          plcmt: bidRequest.mediaTypes.video.plcmt
-        };
-        const paramsVideo = bidRequest.params.video;
-        if (paramsVideo !== undefined) {
-          video.skip = video.skip || paramsVideo.skip || 0;
-          video.placement = video.placement || paramsVideo.placement;
-          video.minduration = video.minduration || paramsVideo.minduration;
-          video.playbackmethod = video.playbackmethod || paramsVideo.playbackmethod;
-          video.startdelay = video.startdelay || paramsVideo.startdelay || 0;
-        }
-
-        slot.video = video;
-      }
-
-      enrichSlotWithFloors(slot, bidRequest);
-
-      return slot;
-    }),
-  };
-  if (networkId) {
-    request.publisher.networkid = networkId;
-  }
-
-  request.source = {
-    tid: bidderRequest.ortb2?.source?.tid
-  };
-
-  if (schain) {
-    request.source.ext = {
-      schain: schain
-    };
-  };
-  request.user = bidderRequest.ortb2?.user || {};
-  request.site = bidderRequest.ortb2?.site || {};
-  if (bidderRequest && bidderRequest.ceh) {
-    request.user.ceh = bidderRequest.ceh;
-  }
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    request.gdprConsent = {};
-    if (typeof bidderRequest.gdprConsent.gdprApplies !== 'undefined') {
-      request.gdprConsent.gdprApplies = !!(bidderRequest.gdprConsent.gdprApplies);
-    }
-    request.gdprConsent.version = bidderRequest.gdprConsent.apiVersion;
-    if (typeof bidderRequest.gdprConsent.consentString !== 'undefined') {
-      request.gdprConsent.consentData = bidderRequest.gdprConsent.consentString;
-    }
-  }
-  if (bidderRequest && bidderRequest.uspConsent) {
-    request.user.uspIab = bidderRequest.uspConsent;
-  }
-  if (bidderRequest && bidderRequest.ortb2?.device?.sua) {
-    request.user.ext = request.user.ext || {};
-    request.user.ext.sua = bidderRequest.ortb2?.device?.sua || {};
-  }
-  if (userIdAsEids) {
-    request.user.ext = request.user.ext || {};
-    request.user.ext.eids = [...userIdAsEids];
-  }
-  if (bidderRequest && bidderRequest.ortb2?.bcat) {
-    request.bcat = bidderRequest.ortb2.bcat;
-  }
-  if (bidderRequest && bidderRequest.ortb2?.badv) {
-    request.badv = bidderRequest.ortb2.badv;
-  }
-  if (bidderRequest && bidderRequest.ortb2?.bapp) {
-    request.bapp = bidderRequest.ortb2.bapp;
-  }
-  return request;
-}
-
 function parseSizes(sizes, parser = s => s) {
   if (sizes == undefined) {
     return [];
@@ -598,15 +548,11 @@ function parseSize(size) {
 }
 
 function hasVideoMediaType(bidRequest) {
-  return deepAccess(bidRequest, 'mediaTypes.video') !== undefined;
-}
-
-function hasBannerMediaType(bidRequest) {
-  return deepAccess(bidRequest, 'mediaTypes.banner') !== undefined;
+  return bidRequest?.mediaTypes?.video !== undefined;
 }
 
 function hasNativeMediaType(bidRequest) {
-  return deepAccess(bidRequest, 'mediaTypes.native') !== undefined;
+  return bidRequest?.mediaTypes?.native !== undefined;
 }
 
 function hasValidVideoMediaType(bidRequest) {
@@ -615,71 +561,20 @@ function hasValidVideoMediaType(bidRequest) {
   var requiredMediaTypesParams = ['mimes', 'playerSize', 'maxduration', 'protocols', 'api', 'skip', 'placement', 'playbackmethod'];
 
   requiredMediaTypesParams.forEach(function (param) {
-    if (deepAccess(bidRequest, 'mediaTypes.video.' + param) === undefined && deepAccess(bidRequest, 'params.video.' + param) === undefined) {
-      isValid = false;
-      logError('Criteo Bid Adapter: mediaTypes.video.' + param + ' is required');
+    if (param === 'placement') {
+      if (bidRequest?.mediaTypes?.video?.[param] === undefined && bidRequest?.params?.video?.[param] === undefined && bidRequest?.mediaTypes?.video?.plcmt === undefined && bidRequest?.params?.video?.plcmt === undefined) {
+        isValid = false;
+        logError('Criteo Bid Adapter: mediaTypes.video.' + param + ' or mediaTypes.video.plcmt is required');
+      }
+    } else {
+      if (bidRequest?.mediaTypes?.video?.[param] === undefined && bidRequest?.params?.video?.[param] === undefined) {
+        isValid = false;
+        logError('Criteo Bid Adapter: mediaTypes.video.' + param + ' is required');
+      }
     }
   });
 
-  if (isValid) {
-    const videoPlacement = bidRequest.mediaTypes.video.placement || bidRequest.params.video.placement;
-    // We do not support long form for now, also we have to check that context & placement are consistent
-    if (bidRequest.mediaTypes.video.context == 'instream' && videoPlacement === 1) {
-      return true;
-    } else if (bidRequest.mediaTypes.video.context == 'outstream' && videoPlacement !== 1) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-/**
- * Create prebid compatible native ad with native payload
- * @param {*} payload
- * @returns prebid native ad assets
- */
-function createPrebidNativeAd(payload) {
-  return {
-    sendTargetingKeys: false, // no key is added to KV by default
-    title: payload.products[0].title,
-    body: payload.products[0].description,
-    sponsoredBy: payload.advertiser.description,
-    icon: payload.advertiser.logo,
-    image: payload.products[0].image,
-    clickUrl: payload.products[0].click_url,
-    privacyLink: payload.privacy.optout_click_url,
-    privacyIcon: payload.privacy.optout_image_url,
-    cta: payload.products[0].call_to_action,
-    price: payload.products[0].price,
-    impressionTrackers: payload.impression_pixels.map(pix => pix.url)
-  };
-}
-
-/**
- * @param {string} id
- * @param {*} payload
- * @param {*} callback
- * @return {string}
- */
-function createNativeAd(id, payload, callback) {
-  // Store the callback and payload in a global object to be later accessed from the creative
-  var slotsName = 'criteo_prebid_native_slots';
-  window[slotsName] = window[slotsName] || {};
-  window[slotsName][id] = { callback, payload };
-
-  // The creative is in an iframe so we have to get the callback and payload
-  // from the parent window (doesn't work with safeframes)
-  return `
-`;
+  return isValid;
 }
 
 function pickAvailableGetFloorFunc(bidRequest) {
@@ -700,87 +595,58 @@ function pickAvailableGetFloorFunc(bidRequest) {
   return undefined;
 }
 
-function enrichSlotWithFloors(slot, bidRequest) {
+function getFloors(bidRequest) {
   try {
-    const slotFloors = {};
+    const floors = {};
 
     const getFloor = pickAvailableGetFloorFunc(bidRequest);
 
     if (getFloor) {
       if (bidRequest.mediaTypes?.banner) {
-        slotFloors.banner = {};
-        const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
-        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = getFloor.call(bidRequest, { size: bannerSize, mediaType: BANNER }));
+        floors.banner = {};
+        const bannerSizes = parseSizes(bidRequest?.mediaTypes?.banner?.sizes)
+        bannerSizes.forEach(bannerSize => floors.banner[parseSize(bannerSize).toString()] = getFloor.call(bidRequest, { size: bannerSize, mediaType: BANNER }));
       }
 
       if (bidRequest.mediaTypes?.video) {
-        slotFloors.video = {};
-        const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
-        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = getFloor.call(bidRequest, { size: videoSize, mediaType: VIDEO }));
+        floors.video = {};
+        const videoSizes = parseSizes(bidRequest?.mediaTypes?.video?.playerSize)
+        videoSizes.forEach(videoSize => floors.video[parseSize(videoSize).toString()] = getFloor.call(bidRequest, { size: videoSize, mediaType: VIDEO }));
       }
 
       if (bidRequest.mediaTypes?.native) {
-        slotFloors.native = {};
-        slotFloors.native['*'] = getFloor.call(bidRequest, { size: '*', mediaType: NATIVE });
+        floors.native = {};
+        floors.native['*'] = getFloor.call(bidRequest, { size: '*', mediaType: NATIVE });
       }
 
-      if (Object.keys(slotFloors).length > 0) {
-        if (!slot.ext) {
-          slot.ext = {}
-        }
-        Object.assign(slot.ext, {
-          floors: slotFloors
-        });
-      }
+      return floors;
     }
   } catch (e) {
     logError('Could not parse floors from Prebid: ' + e);
   }
 }
 
-export function canFastBid(fastBidVersion) {
-  return fastBidVersion !== FAST_BID_VERSION_NONE;
-}
-
-export function getFastBidUrl(fastBidVersion) {
-  let version;
-  if (fastBidVersion === FAST_BID_VERSION_LATEST) {
-    version = '';
-  } else if (fastBidVersion) {
-    let majorVersion = String(fastBidVersion).split('.')[0];
-    if (majorVersion < 102) {
-      logWarn('Specifying a Fastbid version which is not supporting version selection.')
-    }
-    version = '.' + fastBidVersion;
-  } else {
-    version = '.' + FAST_BID_VERSION_CURRENT;
-  }
-
-  return PUBLISHER_TAG_URL_TEMPLATE.replace(FAST_BID_VERSION_PLACEHOLDER, version);
-}
-
-function createOutstreamVideoRenderer(slot) {
-  if (slot.ext.videoPlayerConfig === undefined || slot.ext.videoPlayerType === undefined) {
+function createOutstreamVideoRenderer(bid) {
+  if (bid.ext?.videoPlayerConfig === undefined || bid.ext?.videoPlayerType === undefined) {
     return undefined;
   }
 
   const config = {
-    documentResolver: (bid, sourceDocument, renderDocument) => {
+    documentResolver: (_, sourceDocument, renderDocument) => {
       return renderDocument ?? sourceDocument;
     }
   }
 
-  const render = (bid, renderDocument) => {
+  const render = (_, renderDocument) => {
     let payload = {
-      slotid: slot.impid,
-      vastUrl: slot.displayurl,
-      vastXml: slot.creative,
+      slotid: bid.id,
+      vastUrl: bid.ext?.displayurl,
+      vastXml: bid.adm,
       documentContext: renderDocument,
     };
 
-    let outstreamConfig = slot.ext.videoPlayerConfig;
-
-    window.CriteoOutStream[slot.ext.videoPlayerType].play(payload, outstreamConfig)
+    let outstreamConfig = bid.ext.videoPlayerConfig;
+    window.CriteoOutStream[bid.ext.videoPlayerType].play(payload, outstreamConfig)
   };
 
   const renderer = Renderer.install({ url: PUBLISHER_TAG_OUTSTREAM_SRC, config: config });
@@ -788,60 +654,4 @@ function createOutstreamVideoRenderer(slot) {
   return renderer;
 }
 
-function getAssociatedBidRequest(bidRequests, slot) {
-  for (const request of bidRequests) {
-    if (request.adUnitCode === slot.impid) {
-      if (request.params.zoneId && parseInt(request.params.zoneId) === slot.zoneid) {
-        return request;
-      } else if (slot.native) {
-        if (request.mediaTypes?.native || request.nativeParams) {
-          return request;
-        }
-      } else if (slot.video) {
-        if (request.mediaTypes?.video) {
-          return request;
-        }
-      } else if (request.mediaTypes?.banner || request.sizes) {
-        return request;
-      }
-    }
-  }
-  return undefined;
-}
-
-export function tryGetCriteoFastBid() {
-  // begin ref#1
-  try {
-    const fastBidStorageKey = 'criteo_fast_bid';
-    const hashPrefix = '// Hash: ';
-    const fastBidFromStorage = storage.getDataFromLocalStorage(fastBidStorageKey);
-
-    if (fastBidFromStorage !== null) {
-      // The value stored must contain the file's encrypted hash as first line
-      const firstLineEndPosition = fastBidFromStorage.indexOf('\n');
-      const firstLine = fastBidFromStorage.substr(0, firstLineEndPosition).trim();
-
-      if (firstLine.substr(0, hashPrefix.length) !== hashPrefix) {
-        logWarn('No hash found in FastBid');
-        storage.removeDataFromLocalStorage(fastBidStorageKey);
-      } else {
-        // Remove the hash part from the locally stored value
-        const publisherTagHash = firstLine.substr(hashPrefix.length);
-        const publisherTag = fastBidFromStorage.substr(firstLineEndPosition + 1);
-
-        if (verify(publisherTag, publisherTagHash, FAST_BID_PUBKEY_N, FAST_BID_PUBKEY_E)) {
-          logInfo('Using Criteo FastBid');
-          eval(publisherTag); // eslint-disable-line no-eval
-        } else {
-          logWarn('Invalid Criteo FastBid found');
-          storage.removeDataFromLocalStorage(fastBidStorageKey);
-        }
-      }
-    }
-  } catch (e) {
-    // Unable to get fast bid
-  }
-  // end ref#1
-}
-
 registerBidder(spec);
diff --git a/modules/criteoIdSystem.js b/modules/criteoIdSystem.js
index ee343d9b16a..0c42858a0fb 100644
--- a/modules/criteoIdSystem.js
+++ b/modules/criteoIdSystem.js
@@ -13,6 +13,12 @@ import { getStorageManager } from '../src/storageManager.js';
 import { MODULE_TYPE_UID } from '../src/activities/modules.js';
 import { gdprDataHandler, uspDataHandler, gppDataHandler } from '../src/adapterManager.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ */
+
 const gvlid = 91;
 const bidderCode = 'criteo';
 export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: bidderCode });
@@ -22,6 +28,9 @@ const bundleStorageKey = 'cto_bundle';
 const dnaBundleStorageKey = 'cto_dna_bundle';
 const cookiesMaxAge = 13 * 30 * 24 * 60 * 60 * 1000;
 
+const STORAGE_TYPE_LOCALSTORAGE = 'html5';
+const STORAGE_TYPE_COOKIES = 'cookie';
+
 const pastDateString = new Date(0).toString();
 const expirationString = new Date(timestamp() + cookiesMaxAge).toString();
 
@@ -32,14 +41,26 @@ function extractProtocolHost(url, returnOnlyHost = false) {
     : `${parsedUrl.protocol}://${parsedUrl.hostname}${parsedUrl.port ? ':' + parsedUrl.port : ''}/`;
 }
 
-function getFromAllStorages(key) {
+function getFromStorage(submoduleConfig, key) {
+  if (submoduleConfig?.storage?.type === STORAGE_TYPE_LOCALSTORAGE) {
+    return storage.getDataFromLocalStorage(key);
+  } else if (submoduleConfig?.storage?.type === STORAGE_TYPE_COOKIES) {
+    return storage.getCookie(key);
+  }
+
   return storage.getCookie(key) || storage.getDataFromLocalStorage(key);
 }
 
-function saveOnAllStorages(key, value, hostname) {
+function saveOnStorage(submoduleConfig, key, value, hostname) {
   if (key && value) {
-    storage.setDataInLocalStorage(key, value);
-    setCookieOnAllDomains(key, value, expirationString, hostname, true);
+    if (submoduleConfig?.storage?.type === STORAGE_TYPE_LOCALSTORAGE) {
+      storage.setDataInLocalStorage(key, value);
+    } else if (submoduleConfig?.storage?.type === STORAGE_TYPE_COOKIES) {
+      setCookieOnAllDomains(key, value, expirationString, hostname, true);
+    } else {
+      storage.setDataInLocalStorage(key, value);
+      setCookieOnAllDomains(key, value, expirationString, hostname, true);
+    }
   }
 }
 
@@ -70,11 +91,11 @@ function deleteFromAllStorages(key, hostname) {
   storage.removeDataFromLocalStorage(key);
 }
 
-function getCriteoDataFromAllStorages() {
+function getCriteoDataFromStorage(submoduleConfig) {
   return {
-    bundle: getFromAllStorages(bundleStorageKey),
-    dnaBundle: getFromAllStorages(dnaBundleStorageKey),
-    bidId: getFromAllStorages(bididStorageKey),
+    bundle: getFromStorage(submoduleConfig, bundleStorageKey),
+    dnaBundle: getFromStorage(submoduleConfig, dnaBundleStorageKey),
+    bidId: getFromStorage(submoduleConfig, bididStorageKey),
   }
 }
 
@@ -108,7 +129,7 @@ function buildCriteoUsersyncUrl(topUrl, domain, bundle, dnaBundle, areCookiesWri
   return url;
 }
 
-function callSyncPixel(domain, pixel) {
+function callSyncPixel(submoduleConfig, domain, pixel) {
   if (pixel.writeBundleInStorage && pixel.bundlePropertyName && pixel.storageKeyName) {
     ajax(
       pixel.pixelUrl,
@@ -117,7 +138,7 @@ function callSyncPixel(domain, pixel) {
           if (response) {
             const jsonResponse = JSON.parse(response);
             if (jsonResponse && jsonResponse[pixel.bundlePropertyName]) {
-              saveOnAllStorages(pixel.storageKeyName, jsonResponse[pixel.bundlePropertyName], domain);
+              saveOnStorage(submoduleConfig, pixel.storageKeyName, jsonResponse[pixel.bundlePropertyName], domain);
             }
           }
         },
@@ -133,9 +154,9 @@ function callSyncPixel(domain, pixel) {
   }
 }
 
-function callCriteoUserSync(parsedCriteoData, callback) {
-  const cw = storage.cookiesAreEnabled();
-  const lsw = storage.localStorageIsEnabled();
+function callCriteoUserSync(submoduleConfig, parsedCriteoData, callback) {
+  const cw = (submoduleConfig?.storage?.type === undefined || submoduleConfig?.storage?.type === STORAGE_TYPE_COOKIES) && storage.cookiesAreEnabled();
+  const lsw = (submoduleConfig?.storage?.type === undefined || submoduleConfig?.storage?.type === STORAGE_TYPE_LOCALSTORAGE) && storage.localStorageIsEnabled();
   const topUrl = extractProtocolHost(getRefererInfo().page);
   // TODO: should domain really be extracted from the current frame?
   const domain = extractProtocolHost(document.location.href, true);
@@ -156,18 +177,18 @@ function callCriteoUserSync(parsedCriteoData, callback) {
       const jsonResponse = JSON.parse(response);
 
       if (jsonResponse.pixels) {
-        jsonResponse.pixels.forEach(pixel => callSyncPixel(domain, pixel));
+        jsonResponse.pixels.forEach(pixel => callSyncPixel(submoduleConfig, domain, pixel));
       }
 
       if (jsonResponse.acwsUrl) {
         const urlsToCall = typeof jsonResponse.acwsUrl === 'string' ? [jsonResponse.acwsUrl] : jsonResponse.acwsUrl;
         urlsToCall.forEach(url => triggerPixel(url));
       } else if (jsonResponse.bundle) {
-        saveOnAllStorages(bundleStorageKey, jsonResponse.bundle, domain);
+        saveOnStorage(submoduleConfig, bundleStorageKey, jsonResponse.bundle, domain);
       }
 
       if (jsonResponse.bidId) {
-        saveOnAllStorages(bididStorageKey, jsonResponse.bidId, domain);
+        saveOnStorage(submoduleConfig, bididStorageKey, jsonResponse.bidId, domain);
         const criteoId = { criteoId: jsonResponse.bidId };
         callback(criteoId);
       } else {
@@ -207,10 +228,10 @@ export const criteoIdSubmodule = {
    * @param {ConsentData} [consentData]
    * @returns {{id: {criteoId: string} | undefined}}}
    */
-  getId() {
-    let localData = getCriteoDataFromAllStorages();
+  getId(submoduleConfig) {
+    let localData = getCriteoDataFromStorage(submoduleConfig);
 
-    const result = (callback) => callCriteoUserSync(localData, callback);
+    const result = (callback) => callCriteoUserSync(submoduleConfig, localData, callback);
 
     return {
       id: localData.bidId ? { criteoId: localData.bidId } : undefined,
diff --git a/modules/currency.js b/modules/currency.js
index 3da0cfe73e8..b149a1934c3 100644
--- a/modules/currency.js
+++ b/modules/currency.js
@@ -1,38 +1,40 @@
-import {logError, logInfo, logMessage, logWarn} from '../src/utils.js';
+import {deepSetValue, logError, logInfo, logMessage, logWarn} from '../src/utils.js';
 import {getGlobal} from '../src/prebidGlobal.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS, REJECTION_REASON } from '../src/constants.js';
 import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
 import {getHook} from '../src/hook.js';
 import {defer} from '../src/utils/promise.js';
 import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
-import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
+import {timedAuctionHook, timedBidResponseHook} from '../src/utils/perfMetrics.js';
+import {on as onEvent, off as offEvent} from '../src/events.js';
+import { enrichFPD } from '../src/fpd/enrichment.js';
+import { timeoutQueue } from '../libraries/timeoutQueue/timeoutQueue.js';
 
 const DEFAULT_CURRENCY_RATE_URL = 'https://cdn.jsdelivr.net/gh/prebid/currency-file@1/latest.json?date=$$TODAY$$';
 const CURRENCY_RATE_PRECISION = 4;
+const MODULE_NAME = 'currency';
 
-var bidResponseQueue = [];
-var conversionCache = {};
-var currencyRatesLoaded = false;
-var needToCallForCurrencyFile = true;
-var adServerCurrency = 'USD';
+let ratesURL;
+let bidResponseQueue = [];
+let conversionCache = {};
+let currencyRatesLoaded = false;
+let needToCallForCurrencyFile = true;
+let adServerCurrency = 'USD';
 
 export var currencySupportEnabled = false;
 export var currencyRates = {};
-var bidderCurrencyDefault = {};
-var defaultRates;
+let bidderCurrencyDefault = {};
+let defaultRates;
 
-export const ready = (() => {
-  let ctl;
-  function reset() {
-    ctl = defer();
-  }
-  reset();
-  return {done: () => ctl.resolve(), reset, promise: () => ctl.promise}
-})();
+export let responseReady = defer();
+
+const delayedAuctions = timeoutQueue();
+let auctionDelay = 0;
 
 /**
  * Configuration function for currency
+ * @param {object} config
  * @param  {string} [config.adServerCurrency = 'USD']
  *  ISO 4217 3-letter currency code that represents the target currency. (e.g. 'EUR').  If this value is present,
  *  the currency conversion feature is activated.
@@ -64,15 +66,15 @@ export const ready = (() => {
  *  there is an error loading the config.conversionRateFile.
  */
 export function setConfig(config) {
-  let url = DEFAULT_CURRENCY_RATE_URL;
+  ratesURL = DEFAULT_CURRENCY_RATE_URL;
 
-  if (typeof config.rates === 'object') {
+  if (config.rates !== null && typeof config.rates === 'object') {
     currencyRates.conversions = config.rates;
     currencyRatesLoaded = true;
     needToCallForCurrencyFile = false; // don't call if rates are already specified
   }
 
-  if (typeof config.defaultRates === 'object') {
+  if (config.defaultRates !== null && typeof config.defaultRates === 'object') {
     defaultRates = config.defaultRates;
 
     // set up the default rates to be used if the rate file doesn't get loaded in time
@@ -81,19 +83,20 @@ export function setConfig(config) {
   }
 
   if (typeof config.adServerCurrency === 'string') {
+    auctionDelay = config.auctionDelay;
     logInfo('enabling currency support', arguments);
 
     adServerCurrency = config.adServerCurrency;
     if (config.conversionRateFile) {
       logInfo('currency using override conversionRateFile:', config.conversionRateFile);
-      url = config.conversionRateFile;
+      ratesURL = config.conversionRateFile;
     }
 
     // see if the url contains a date macro
     // this is a workaround to the fact that jsdelivr doesn't currently support setting a 24-hour HTTP cache header
     // So this is an approach to let the browser cache a copy of the file each day
     // We should remove the macro once the CDN support a day-level HTTP cache setting
-    const macroLocation = url.indexOf('$$TODAY$$');
+    const macroLocation = ratesURL.indexOf('$$TODAY$$');
     if (macroLocation !== -1) {
       // get the date to resolve the macro
       const d = new Date();
@@ -104,12 +107,13 @@ export function setConfig(config) {
       const todaysDate = `${d.getFullYear()}${month}${day}`;
 
       // replace $$TODAY$$ with todaysDate
-      url = `${url.substring(0, macroLocation)}${todaysDate}${url.substring(macroLocation + 9, url.length)}`;
+      ratesURL = `${ratesURL.substring(0, macroLocation)}${todaysDate}${ratesURL.substring(macroLocation + 9, ratesURL.length)}`;
     }
 
-    initCurrency(url);
+    initCurrency();
   } else {
     // currency support is disabled, setting defaults
+    auctionDelay = 0;
     logInfo('disabling currency support');
     resetCurrency();
   }
@@ -128,20 +132,11 @@ function errorSettingsRates(msg) {
   }
 }
 
-function initCurrency(url) {
-  conversionCache = {};
-  currencySupportEnabled = true;
-
-  logInfo('Installing addBidResponse decorator for currency module', arguments);
-
-  // Adding conversion function to prebid global for external module and on page use
-  getGlobal().convertCurrency = (cpm, fromCurrency, toCurrency) => parseFloat(cpm) * getCurrencyConversion(fromCurrency, toCurrency);
-  getHook('addBidResponse').before(addBidResponseHook, 100);
-
-  // call for the file if we haven't already
+function loadRates() {
   if (needToCallForCurrencyFile) {
     needToCallForCurrencyFile = false;
-    ajax(url,
+    currencyRatesLoaded = false;
+    ajax(ratesURL,
       {
         success: function (response) {
           try {
@@ -150,35 +145,64 @@ function initCurrency(url) {
             conversionCache = {};
             currencyRatesLoaded = true;
             processBidResponseQueue();
-            ready.done();
+            delayedAuctions.resume();
           } catch (e) {
             errorSettingsRates('Failed to parse currencyRates response: ' + response);
           }
         },
         error: function (...args) {
           errorSettingsRates(...args);
-          ready.done();
+          currencyRatesLoaded = true;
+          processBidResponseQueue();
+          delayedAuctions.resume();
+          needToCallForCurrencyFile = true;
         }
       }
     );
   } else {
-    ready.done();
+    processBidResponseQueue();
   }
 }
 
-function resetCurrency() {
-  logInfo('Uninstalling addBidResponse decorator for currency module', arguments);
+function initCurrency() {
+  conversionCache = {};
+  if (!currencySupportEnabled) {
+    currencySupportEnabled = true;
+    // Adding conversion function to prebid global for external module and on page use
+    getGlobal().convertCurrency = (cpm, fromCurrency, toCurrency) => parseFloat(cpm) * getCurrencyConversion(fromCurrency, toCurrency);
+    getHook('addBidResponse').before(addBidResponseHook, 100);
+    getHook('responsesReady').before(responsesReadyHook);
+    enrichFPD.before(enrichFPDHook);
+    getHook('requestBids').before(requestBidsHook, 50);
+    onEvent(EVENTS.AUCTION_TIMEOUT, rejectOnAuctionTimeout);
+    onEvent(EVENTS.AUCTION_INIT, loadRates);
+    loadRates();
+  }
+}
 
-  getHook('addBidResponse').getHooks({hook: addBidResponseHook}).remove();
-  delete getGlobal().convertCurrency;
+export function resetCurrency() {
+  if (currencySupportEnabled) {
+    getHook('addBidResponse').getHooks({hook: addBidResponseHook}).remove();
+    getHook('responsesReady').getHooks({hook: responsesReadyHook}).remove();
+    enrichFPD.getHooks({hook: enrichFPDHook}).remove();
+    getHook('requestBids').getHooks({hook: requestBidsHook}).remove();
+    offEvent(EVENTS.AUCTION_TIMEOUT, rejectOnAuctionTimeout);
+    offEvent(EVENTS.AUCTION_INIT, loadRates);
+    delete getGlobal().convertCurrency;
+
+    adServerCurrency = 'USD';
+    conversionCache = {};
+    currencySupportEnabled = false;
+    currencyRatesLoaded = false;
+    needToCallForCurrencyFile = true;
+    currencyRates = {};
+    bidderCurrencyDefault = {};
+    responseReady = defer();
+  }
+}
 
-  adServerCurrency = 'USD';
-  conversionCache = {};
-  currencySupportEnabled = false;
-  currencyRatesLoaded = false;
-  needToCallForCurrencyFile = true;
-  currencyRates = {};
-  bidderCurrencyDefault = {};
+function responsesReadyHook(next, ready) {
+  next(ready.then(() => responseReady.promise));
 }
 
 export const addBidResponseHook = timedBidResponseHook('currency', function addBidResponseHook(fn, adUnitCode, bid, reject) {
@@ -211,24 +235,25 @@ export const addBidResponseHook = timedBidResponseHook('currency', function addB
   if (bid.currency === adServerCurrency) {
     return fn.call(this, adUnitCode, bid, reject);
   }
-
-  bidResponseQueue.push(wrapFunction(fn, this, [adUnitCode, bid, reject]));
+  bidResponseQueue.push([fn, this, adUnitCode, bid, reject]);
   if (!currencySupportEnabled || currencyRatesLoaded) {
     processBidResponseQueue();
-  } else {
-    fn.untimed.bail(ready.promise());
   }
 });
 
-function processBidResponseQueue() {
-  while (bidResponseQueue.length > 0) {
-    (bidResponseQueue.shift())();
-  }
+function rejectOnAuctionTimeout({auctionId}) {
+  bidResponseQueue = bidResponseQueue.filter(([fn, ctx, adUnitCode, bid, reject]) => {
+    if (bid.auctionId === auctionId) {
+      reject(REJECTION_REASON.CANNOT_CONVERT_CURRENCY)
+    } else {
+      return true;
+    }
+  });
 }
 
-function wrapFunction(fn, context, params) {
-  return function() {
-    let bid = params[1];
+function processBidResponseQueue() {
+  while (bidResponseQueue.length > 0) {
+    const [fn, ctx, adUnitCode, bid, reject] = bidResponseQueue.shift();
     if (bid !== undefined && 'currency' in bid && 'cpm' in bid) {
       let fromCurrency = bid.currency;
       try {
@@ -239,12 +264,13 @@ function wrapFunction(fn, context, params) {
         }
       } catch (e) {
         logWarn('getCurrencyConversion threw error: ', e);
-        params[2](CONSTANTS.REJECTION_REASON.CANNOT_CONVERT_CURRENCY);
-        return;
+        reject(REJECTION_REASON.CANNOT_CONVERT_CURRENCY);
+        continue;
       }
     }
-    return fn.apply(context, params);
-  };
+    fn.call(ctx, adUnitCode, bid, reject);
+  }
+  responseReady.resolve();
 }
 
 function getCurrencyConversion(fromCurrency, toCurrency = adServerCurrency) {
@@ -323,3 +349,23 @@ export function setOrtbCurrency(ortbRequest, bidderRequest, context) {
 }
 
 registerOrtbProcessor({type: REQUEST, name: 'currency', fn: setOrtbCurrency});
+
+function enrichFPDHook(next, fpd) {
+  return next(fpd.then(ortb2 => {
+    deepSetValue(ortb2, 'ext.prebid.adServerCurrency', adServerCurrency);
+    return ortb2;
+  }))
+}
+
+export const requestBidsHook = timedAuctionHook('currency', function requestBidsHook(fn, reqBidsConfigObj) {
+  const continueAuction = ((that) => () => fn.call(that, reqBidsConfigObj))(this);
+
+  if (!currencyRatesLoaded && auctionDelay > 0) {
+    delayedAuctions.submit(auctionDelay, continueAuction, () => {
+      logWarn(`${MODULE_NAME}: Fetch attempt did not return in time for auction ${reqBidsConfigObj.auctionId}`)
+      continueAuction();
+    });
+  } else {
+    continueAuction();
+  }
+});
diff --git a/modules/cwireBidAdapter.js b/modules/cwireBidAdapter.js
index f158e16a64e..16370c6e911 100644
--- a/modules/cwireBidAdapter.js
+++ b/modules/cwireBidAdapter.js
@@ -2,7 +2,14 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {generateUUID, getParameterByName, isNumber, logError, logInfo} from '../src/utils.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
+import { sendBeacon } from '../src/ajax.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
 
 // ------------------------------------
 const BIDDER_CODE = 'cwire';
@@ -10,6 +17,7 @@ const CWID_KEY = 'cw_cwid';
 
 export const BID_ENDPOINT = 'https://prebid.cwi.re/v1/bid';
 export const EVENT_ENDPOINT = 'https://prebid.cwi.re/v1/event';
+export const GVL_ID = 1081;
 
 /**
  * Allows limiting ad impressions per site render. Unique per prebid instance ID.
@@ -134,6 +142,7 @@ function getCwExtension() {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVL_ID,
   supportedMediaTypes: [BANNER],
 
   /**
@@ -143,14 +152,18 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
-    if (!bid.params?.placementId || !isNumber(bid.params.placementId)) {
-      logError('placementId not provided or not a number');
-      return false;
-    }
+    if (!bid.params?.domainId || !isNumber(bid.params.domainId)) {
+      logError('domainId not provided or not a number');
+      if (!bid.params?.placementId || !isNumber(bid.params.placementId)) {
+        logError('placementId not provided or not a number');
+        return false;
+      }
 
-    if (!bid.params?.pageId || !isNumber(bid.params.pageId)) {
-      logError('pageId not provided or not a number');
-      return false;
+      if (!bid.params?.pageId || !isNumber(bid.params.pageId)) {
+        logError('pageId not provided or not a number');
+        return false;
+      }
+      return true;
     }
     return true;
   },
@@ -168,8 +181,8 @@ export const spec = {
     // process bid requests
     let processed = validBidRequests
       .map(bid => slotDimensions(bid))
-      // Flattens the pageId and placement Id for backwards compatibility.
-      .map((bid) => ({...bid, pageId: bid.params?.pageId, placementId: bid.params?.placementId}));
+      // Flattens the pageId, domainId and placement Id for backwards compatibility.
+      .map((bid) => ({...bid, pageId: bid.params?.pageId, domainId: bid.params?.domainId, placementId: bid.params?.placementId}));
 
     const extensions = getCwExtension();
     const payload = {
@@ -216,7 +229,7 @@ export const spec = {
         bid: bid
       }
     }
-    navigator.sendBeacon(EVENT_ENDPOINT, JSON.stringify(event))
+    sendBeacon(EVENT_ENDPOINT, JSON.stringify(event))
   },
 
   onBidderError: function (error, bidderRequest) {
@@ -228,7 +241,7 @@ export const spec = {
         bidderRequest: bidderRequest
       }
     }
-    navigator.sendBeacon(EVENT_ENDPOINT, JSON.stringify(event))
+    sendBeacon(EVENT_ENDPOINT, JSON.stringify(event))
   },
 
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
diff --git a/modules/cwireBidAdapter.md b/modules/cwireBidAdapter.md
index 9804250b906..1d4f3c039c8 100644
--- a/modules/cwireBidAdapter.md
+++ b/modules/cwireBidAdapter.md
@@ -14,14 +14,15 @@ Prebid.js Adapter for C-Wire.
 
 Below, the list of C-WIRE params and where they can be set.
 
-| Param name  | URL parameter | AdUnit config |   Type   |   Required    |
-|-------------|:-------------:|:-------------:|:--------:|:-------------:|
-| pageId      |               |       x       |  number  |      YES      |
-| placementId |               |       x       |  number  |      YES      |
-| cwgroups    |       x       |               |  string  |      NO       |
-| cwcreative  |       x       |               |  string  |      NO       |
-| cwdebug     |       x       |               | boolean  |      NO       |
-| cwfeatures  |       x       |               |  string  |      NO       |
+| Param name  | URL parameter | AdUnit config |   Type   | Required |
+|-------------|:-------------:|:-------------:|:--------:|:--------:|
+| pageId      |               |       x       |  number  |    NO    |
+| domainId    |               |       x       |  number  |   YES    |
+| placementId |               |       x       |  number  |    NO    |
+| cwgroups    |       x       |               |  string  |    NO    |
+| cwcreative  |       x       |               |  string  |    NO    |
+| cwdebug     |       x       |               | boolean  |    NO    |
+| cwfeatures  |       x       |               |  string  |    NO    |
 
 
 ### adUnit configuration
@@ -38,12 +39,30 @@ var adUnits = [
         }
       },
       params: {
-        pageId: 1422,                 // required - number
-        placementId: 2211521,         // required - number
+        domainId: 1422,               // required - number
+        placementId: 2211521,         // optional - number
       }
     }]
   }
 ];
+// old version for the compatibility
+var adUnits = [
+    {
+        code: 'target_div_id', // REQUIRED
+        bids: [{
+            bidder: 'cwire',
+            mediaTypes: {
+                banner: {
+                    sizes: [[400, 600]],
+                }
+            },
+            params: {
+                pageId: 1422,               // required - number
+                placementId: 2211521,       // required - number
+            }
+        }]
+    }
+];
 ```
 
 ### URL parameters
diff --git a/modules/czechAdIdSystem.js b/modules/czechAdIdSystem.js
index ae958aae198..7fdf462183a 100644
--- a/modules/czechAdIdSystem.js
+++ b/modules/czechAdIdSystem.js
@@ -9,6 +9,11 @@ import { submodule } from '../src/hook.js'
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 // Returns StorageManager
 export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: 'czechAdId' })
 
diff --git a/modules/dailyhuntBidAdapter.js b/modules/dailyhuntBidAdapter.js
index f96e07b71bf..fd7a5c137a7 100644
--- a/modules/dailyhuntBidAdapter.js
+++ b/modules/dailyhuntBidAdapter.js
@@ -129,7 +129,7 @@ const createOrtbPublisherObj = (validBidRequests) => ({ ...extractKeyInfo(validB
 // get bidFloor Function for different creatives
 function getBidFloor(bid, creative) {
   let floorInfo = typeof (bid.getFloor) == 'function' ? bid.getFloor({ currency: 'USD', mediaType: creative, size: '*' }) : {};
-  return Math.floor(floorInfo.floor || (bid.params.bidfloor ? bid.params.bidfloor : 0.0));
+  return Math.floor(floorInfo?.floor || (bid.params.bidfloor ? bid.params.bidfloor : 0.0));
 }
 
 const createOrtbImpObj = (bid) => {
diff --git a/modules/dailymotionBidAdapter.js b/modules/dailymotionBidAdapter.js
new file mode 100644
index 00000000000..791fbccda5f
--- /dev/null
+++ b/modules/dailymotionBidAdapter.js
@@ -0,0 +1,298 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { VIDEO } from '../src/mediaTypes.js';
+import { deepAccess } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { userSync } from '../src/userSync.js';
+
+const DAILYMOTION_VENDOR_ID = 573;
+
+/**
+ * Get video metadata from bid request
+ *
+ * @param {BidRequest} bidRequest A valid bid requests that should be sent to the Server.
+ * @return video metadata
+ */
+function getVideoMetadata(bidRequest, bidderRequest) {
+  const videoParams = deepAccess(bidRequest, 'params.video', {});
+
+  // As per oRTB 2.5 spec, "A bid request must not contain both an App and a Site object."
+  // See section 3.2.14
+  const siteOrAppObj = deepAccess(bidderRequest, 'ortb2.site')
+    ? deepAccess(bidderRequest, 'ortb2.site')
+    : deepAccess(bidderRequest, 'ortb2.app');
+  // Content object is either from Object: Site or Object: App
+  const contentObj = deepAccess(siteOrAppObj, 'content')
+
+  const parsedContentData = {
+    // Store as object keys to ensure uniqueness
+    iabcat1: {},
+    iabcat2: {},
+  };
+
+  deepAccess(contentObj, 'data', []).forEach((data) => {
+    if ([4, 5, 6, 7].includes(data?.ext?.segtax)) {
+      (Array.isArray(data.segment) ? data.segment : []).forEach((segment) => {
+        if (typeof segment.id === 'string') {
+          // See https://docs.prebid.org/features/firstPartyData.html#segments-and-taxonomy
+          // Only take IAB cats of taxonomy V1
+          if (data.ext.segtax === 4) {
+            parsedContentData.iabcat1[segment.id] = 1;
+          } else {
+            // Only take IAB cats of taxonomy V2 or higher
+            parsedContentData.iabcat2[segment.id] = 1;
+          }
+        }
+      });
+    }
+  });
+
+  const videoMetadata = {
+    description: videoParams.description || '',
+    duration: videoParams.duration || deepAccess(contentObj, 'len', 0),
+    iabcat1: Array.isArray(videoParams.iabcat1)
+      ? videoParams.iabcat1
+      : Array.isArray(deepAccess(contentObj, 'cat'))
+        ? contentObj.cat
+        : Object.keys(parsedContentData.iabcat1),
+    iabcat2: Array.isArray(videoParams.iabcat2)
+      ? videoParams.iabcat2
+      : Object.keys(parsedContentData.iabcat2),
+    id: videoParams.id || deepAccess(contentObj, 'id', ''),
+    lang: videoParams.lang || deepAccess(contentObj, 'language', ''),
+    livestream: typeof videoParams.livestream === 'number'
+      ? !!videoParams.livestream
+      : !!deepAccess(contentObj, 'livestream', 0),
+    private: videoParams.private || false,
+    tags: videoParams.tags || deepAccess(contentObj, 'keywords', ''),
+    title: videoParams.title || deepAccess(contentObj, 'title', ''),
+    url: videoParams.url || deepAccess(contentObj, 'url', ''),
+    topics: videoParams.topics || '',
+    isCreatedForKids: typeof videoParams.isCreatedForKids === 'boolean'
+      ? videoParams.isCreatedForKids
+      : null,
+    context: {
+      siteOrAppCat: deepAccess(siteOrAppObj, 'cat', []),
+      siteOrAppContentCat: deepAccess(contentObj, 'cat', []),
+      videoViewsInSession: (
+        typeof videoParams.videoViewsInSession === 'number' &&
+        videoParams.videoViewsInSession >= 0
+      )
+        ? videoParams.videoViewsInSession
+        : null,
+      autoplay: typeof videoParams.autoplay === 'boolean'
+        ? videoParams.autoplay
+        : null,
+      playerName: videoParams.playerName || deepAccess(contentObj, 'playerName', ''),
+      playerVolume: (
+        typeof videoParams.playerVolume === 'number' &&
+        videoParams.playerVolume >= 0 &&
+        videoParams.playerVolume <= 10
+      )
+        ? videoParams.playerVolume
+        : null,
+    },
+  };
+
+  return videoMetadata;
+}
+
+/**
+ * Check if user sync is enabled for Dailymotion
+ *
+ * @return boolean True if user sync is enabled
+ */
+function isUserSyncEnabled() {
+  const syncEnabled = deepAccess(config.getConfig('userSync'), 'syncEnabled');
+
+  if (!syncEnabled) return false;
+
+  const canSyncWithIframe = userSync.canBidderRegisterSync('iframe', 'dailymotion');
+  const canSyncWithPixel = userSync.canBidderRegisterSync('image', 'dailymotion');
+
+  return !!(canSyncWithIframe || canSyncWithPixel);
+}
+
+export const spec = {
+  code: 'dailymotion',
+  gvlid: DAILYMOTION_VENDOR_ID,
+  supportedMediaTypes: [VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   * The only mandatory parameter for a bid to be valid is the API key.
+   * Other parameters are optional.
+   *
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    if (bid?.params) {
+      // We only accept video adUnits
+      if (!bid?.mediaTypes?.[VIDEO]) return false;
+
+      // As `context`, `placement` & `plcmt` are optional (although recommended)
+      // values, we check the 3 of them to see if we are in an instream video context
+      const isInstream = bid.mediaTypes[VIDEO].context === 'instream' ||
+        bid.mediaTypes[VIDEO].placement === 1 ||
+        bid.mediaTypes[VIDEO].plcmt === 1;
+
+      // We only accept instream video context
+      if (!isInstream) return false;
+
+      // We need API key
+      return typeof bid.params.apiKey === 'string' && bid.params.apiKey.length > 10;
+    }
+
+    return false;
+  },
+
+  /**
+   * Make a server request from the list of valid BidRequests (that already passed the isBidRequestValid call)
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @param {BidderRequest} bidderRequest
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests = [], bidderRequest) {
+    // check consent to be able to read user cookie
+    const allowCookieReading =
+      // No GDPR applies
+      !deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ||
+      // OR GDPR applies and we have global consent
+      deepAccess(bidderRequest, 'gdprConsent.vendorData.hasGlobalConsent') === true ||
+      (
+        // Vendor consent
+        deepAccess(bidderRequest, `gdprConsent.vendorData.vendor.consents.${DAILYMOTION_VENDOR_ID}`) === true &&
+
+        // Purposes with legal basis "consent". These are not flexible, so if publisher requires legitimate interest (2) it cancels them
+        [1, 3, 4].every(v =>
+          deepAccess(bidderRequest, `gdprConsent.vendorData.publisher.restrictions.${v}.${DAILYMOTION_VENDOR_ID}`) !== 0 &&
+          deepAccess(bidderRequest, `gdprConsent.vendorData.publisher.restrictions.${v}.${DAILYMOTION_VENDOR_ID}`) !== 2 &&
+          deepAccess(bidderRequest, `gdprConsent.vendorData.purpose.consents.${v}`) === true
+        ) &&
+
+        // Purposes with legal basis "legitimate interest" (default) or "consent" (when specified as such by publisher)
+        [2, 7, 9, 10].every(v =>
+          deepAccess(bidderRequest, `gdprConsent.vendorData.publisher.restrictions.${v}.${DAILYMOTION_VENDOR_ID}`) !== 0 &&
+          (deepAccess(bidderRequest, `gdprConsent.vendorData.publisher.restrictions.${v}.${DAILYMOTION_VENDOR_ID}`) === 1
+            ? deepAccess(bidderRequest, `gdprConsent.vendorData.purpose.consents.${v}`) === true
+            : deepAccess(bidderRequest, `gdprConsent.vendorData.purpose.legitimateInterests.${v}`) === true)
+        )
+      );
+
+    return validBidRequests.map(bid => ({
+      method: 'POST',
+      url: 'https://pb.dmxleo.com',
+      data: {
+        pbv: '$prebid.version$',
+        bidder_request: {
+          gdprConsent: {
+            apiVersion: deepAccess(bidderRequest, 'gdprConsent.apiVersion', 1),
+            consentString: deepAccess(bidderRequest, 'gdprConsent.consentString', ''),
+            // Cast boolean in any case (eg: if value is int) to ensure type
+            gdprApplies: !!deepAccess(bidderRequest, 'gdprConsent.gdprApplies'),
+          },
+          refererInfo: {
+            page: deepAccess(bidderRequest, 'refererInfo.page', ''),
+          },
+          uspConsent: deepAccess(bidderRequest, 'uspConsent', ''),
+          gppConsent: {
+            gppString: deepAccess(bidderRequest, 'gppConsent.gppString') ||
+          deepAccess(bidderRequest, 'ortb2.regs.gpp', ''),
+            applicableSections: deepAccess(bidderRequest, 'gppConsent.applicableSections') ||
+          deepAccess(bidderRequest, 'ortb2.regs.gpp_sid', []),
+          },
+        },
+        config: {
+          api_key: bid.params.apiKey,
+          ts: bid.params.dmTs,
+        },
+        // Cast boolean in any case (value should be 0 or 1) to ensure type
+        coppa: !!deepAccess(bidderRequest, 'ortb2.regs.coppa'),
+        // In app context, we need to retrieve additional informations
+        ...(!deepAccess(bidderRequest, 'ortb2.site') && !!deepAccess(bidderRequest, 'ortb2.app') ? {
+          appBundle: deepAccess(bidderRequest, 'ortb2.app.bundle', ''),
+          appStoreUrl: deepAccess(bidderRequest, 'ortb2.app.storeurl', ''),
+        } : {}),
+        ...(deepAccess(bidderRequest, 'ortb2.device') ? {
+          device: {
+            lmt: deepAccess(bidderRequest, 'ortb2.device.lmt', null),
+            ifa: deepAccess(bidderRequest, 'ortb2.device.ifa', ''),
+            atts: deepAccess(bidderRequest, 'ortb2.device.ext.atts', 0),
+          },
+        } : {}),
+        userSyncEnabled: isUserSyncEnabled(),
+        request: {
+          adUnitCode: deepAccess(bid, 'adUnitCode', ''),
+          auctionId: deepAccess(bid, 'auctionId', ''),
+          bidId: deepAccess(bid, 'bidId', ''),
+          mediaTypes: {
+            video: {
+              api: bid.mediaTypes?.[VIDEO]?.api || [],
+              mimes: bid.mediaTypes?.[VIDEO]?.mimes || [],
+              minduration: bid.mediaTypes?.[VIDEO]?.minduration || 0,
+              maxduration: bid.mediaTypes?.[VIDEO]?.maxduration || 0,
+              playbackmethod: bid.mediaTypes?.[VIDEO]?.playbackmethod || [],
+              plcmt: bid.mediaTypes?.[VIDEO]?.plcmt,
+              protocols: bid.mediaTypes?.[VIDEO]?.protocols || [],
+              skip: bid.mediaTypes?.[VIDEO]?.skip || 0,
+              skipafter: bid.mediaTypes?.[VIDEO]?.skipafter || 0,
+              skipmin: bid.mediaTypes?.[VIDEO]?.skipmin || 0,
+              startdelay: bid.mediaTypes?.[VIDEO]?.startdelay,
+              w: bid.mediaTypes?.[VIDEO]?.w || 0,
+              h: bid.mediaTypes?.[VIDEO]?.h || 0,
+            },
+          },
+          sizes: bid.sizes || [],
+        },
+        video_metadata: getVideoMetadata(bid, bidderRequest),
+      },
+      options: {
+        withCredentials: allowCookieReading,
+        crossOrigin: true,
+      },
+    }));
+  },
+
+  /**
+   * Map the response from the server into a list of bids.
+   * As dailymotion prebid server returns an entry with the correct Prebid structure,
+   * we directly include it as the only bid in the response.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: serverResponse => serverResponse?.body ? [serverResponse.body] : [],
+
+  /**
+   * Retrieves user synchronization URLs based on provided options and consents.
+   *
+   * @param {object} syncOptions - Options for synchronization.
+   * @param {object[]} serverResponses - Array of server responses.
+   * @returns {object[]} - Array of synchronization URLs.
+   */
+  getUserSyncs: (syncOptions, serverResponses) => {
+    if (!!serverResponses?.length && (syncOptions.iframeEnabled || syncOptions.pixelEnabled)) {
+      const iframeSyncs = [];
+      const pixelSyncs = [];
+
+      serverResponses.forEach((response) => {
+        (response?.body?.userSyncs || []).forEach((syncUrl) => {
+          if (syncUrl.type === 'image') {
+            pixelSyncs.push({ url: syncUrl.url, type: 'image' });
+          }
+
+          if (syncUrl.type === 'iframe') {
+            iframeSyncs.push({ url: syncUrl.url, type: 'iframe' });
+          }
+        });
+      });
+
+      if (syncOptions.iframeEnabled) return iframeSyncs;
+      return pixelSyncs;
+    }
+
+    return [];
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/dailymotionBidAdapter.md b/modules/dailymotionBidAdapter.md
new file mode 100644
index 00000000000..21cc6c49205
--- /dev/null
+++ b/modules/dailymotionBidAdapter.md
@@ -0,0 +1,221 @@
+### Overview
+
+```
+Module Name: Dailymotion Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: ad-leo-engineering@dailymotion.com
+```
+
+### Description
+
+Dailymotion prebid adapter.
+Supports video ad units in instream context.
+
+### Configuration options
+
+Before calling this adapter, you need to at least set a video adUnit in an instream context and the API key in the bid parameters:
+
+```javascript
+const adUnits = [
+  {
+    bids: [{
+      bidder: 'dailymotion',
+      params: {
+        apiKey: 'fake_api_key'
+      },
+    }],
+    code: 'test-ad-unit',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+      },
+    },
+  }
+];
+```
+
+`apiKey` is your publisher API key. For testing purpose, you can use "dailymotion-testing".
+
+#### User Sync
+
+To enable user synchronization, add the following code. Dailymotion highly recommends using iframes and/or pixels for user syncing. This feature enhances DSP user match rates, resulting in higher bid rates and bid prices. Ensure that `pbjs.setConfig()` is called only once.
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    syncEnabled: true,
+    filterSettings: {
+      iframe: {
+        bidders: '*', // Or add dailymotion to your list included bidders
+        filter: 'include'
+      },
+      image: {
+        bidders: '*', // Or add dailymotion to your list of included bidders
+        filter: 'include'
+      },
+    },
+  },
+});
+```
+
+### Test Parameters
+
+By setting the following bid parameters, you'll get a constant response to any request, to validate your adapter integration:
+
+```javascript
+const adUnits = [
+  {
+    bids: [{
+      bidder: 'dailymotion',
+      params: {
+        apiKey: 'dailymotion-testing',
+      },
+    }],
+    code: 'test-ad-unit',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+      },
+    },
+  }
+];
+```
+
+Please note that failing to set these will result in the adapter not bidding at all.
+
+### Sample video AdUnit
+
+To allow better targeting, you should provide as much context about the video as possible.
+There are three ways of doing this depending on if you're using Dailymotion player or a third party one.
+
+If you are using the Dailymotion player, you must provide the video `xid` in the `video.id` field of your ad unit, example:
+
+```javascript
+const adUnits = [
+  {
+    bids: [{
+      bidder: 'dailymotion',
+      params: {
+        apiKey: 'dailymotion-testing',
+        video: {
+          id: 'x123456'     // Dailymotion infrastructure unique video ID
+          autoplay: false,
+          playerName: 'dailymotion',
+          playerVolume: 8
+        },
+      }
+    }],
+    code: 'test-ad-unit',
+    mediaTypes: {
+      video: {
+        api: [2, 7],
+        context: 'instream',
+        startdelay: 0,
+        w: 1280,
+        h: 720,
+      },
+    }
+  }
+];
+```
+
+This will automatically fetch the most up-to-date information about the video.
+Please note that if you provide any video metadata not listed above, they will be replaced by the ones fetched from the `video.id`.
+
+If you are using a third party video player, you should fill the following members:
+
+```javascript
+const adUnits = [
+  {
+    bids: [{
+      bidder: 'dailymotion',
+      params: {
+        apiKey: 'dailymotion-testing',
+        video: {
+          description: 'this is a video description',
+          duration: 556,
+          iabcat1: ['IAB-2'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          livestream: 0,
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          topics: 'topic_1, topic_2',
+          isCreatedForKids: false,
+          videoViewsInSession: 1,
+          autoplay: false,
+          playerName: 'video.js',
+          playerVolume: 8
+        }
+      }
+    }],
+    code: 'test-ad-unit',
+    mediaTypes: {
+      video: {
+        api: [2, 7],
+        context: 'instream',
+        mimes: ['video/mp4'],
+        minduration: 5,
+        maxduration: 30,
+        playbackmethod: [3],
+        plcmt: 1,
+        protocols: [7, 8, 11, 12, 13, 14]
+        startdelay: 0,
+        w: 1280,
+        h: 720,
+      },
+    }
+  }
+];
+```
+
+Each of the following video metadata fields can be added in bids.params.video.
+
+* `description` - Video description
+* `duration` - Video duration in seconds
+* `iabcat1` - List of IAB category IDs from the [1.0 taxonomy](https://github.com/InteractiveAdvertisingBureau/Taxonomies/blob/main/Content%20Taxonomies/Content%20Taxonomy%201.0.tsv)
+* `iabcat2` - List of IAB category IDs from the [2.0 taxonomy](https://github.com/InteractiveAdvertisingBureau/Taxonomies/blob/main/Content%20Taxonomies/Content%20Taxonomy%202.0.tsv) and above
+* `id` - Video unique ID in host video infrastructure
+* `lang` - ISO 639-1 code for main language used in the video
+* `livestream` - 0 = not live, 1 = content is live
+* `private` - True if video is not publicly available
+* `tags` - Tags for the video, comma separated
+* `title` - Video title
+* `url` - URL of the content
+* `topics` - Main topics for the video, comma separated
+* `isCreatedForKids` - [The content is created for children as primary audience](https://faq.dailymotion.com/hc/en-us/articles/360020920159-Content-created-for-kids)
+
+The following contextual information can also be added in bids.params.video.
+
+* `autoplay` - Playback was launched without user interaction
+* `playerName` - Name of the player used to display the video
+* `playerVolume` - Player volume between 0 (muted, 0%) and 10 (100%)
+* `videoViewsInSession` - Number of videos viewed within the current user session
+
+If you already specify [First-Party data](https://docs.prebid.org/features/firstPartyData.html) through the `ortb2` object when calling [`pbjs.requestBids(requestObj)`](https://docs.prebid.org/dev-docs/publisher-api-reference/requestBids.html), we will collect the following values and fallback to bids.params.video values when applicable. See the mapping below.
+
+| From ortb2                                                                      | Metadata fields |
+|---------------------------------------------------------------------------------|-----------------|
+| `ortb2.site.content.cat` OR `ortb2.site.content.data` where `ext.segtax` is `4` | `iabcat1`       |
+| `ortb2.site.content.data` where `ext.segtax` is `5`, `6` or `7`                 | `iabcat2`       |
+| `ortb2.site.content.id`                                                         | `id`            |
+| `ortb2.site.content.language`                                                   | `lang`          |
+| `ortb2.site.content.livestream`                                                 | `livestream`    |
+| `ortb2.site.content.keywords`                                                   | `tags`          |
+| `ortb2.site.content.title`                                                      | `title`         |
+| `ortb2.site.content.url`                                                        | `url`           |
+| `ortb2.app.bundle`                                                              | N/A             |
+| `ortb2.app.storeurl`                                                            | N/A             |
+| `ortb2.device.lmt`                                                              | N/A             |
+| `ortb2.device.ifa`                                                              | N/A             |
+| `ortb2.device.ext.atts`                                                         | N/A             |
+
+### Integrating the adapter
+
+To use the adapter with any non-test request, you first need to ask an API key from Dailymotion. Please contact us through **DailymotionPrebid.js@dailymotion.com**.
+
+You will then be able to use it within the bid parameters before making a bid request.
+
+This API key will ensure proper identification of your inventory and allow you to get real bids.
diff --git a/modules/datablocksBidAdapter.js b/modules/datablocksBidAdapter.js
index 395706994fe..088dfd32979 100644
--- a/modules/datablocksBidAdapter.js
+++ b/modules/datablocksBidAdapter.js
@@ -417,7 +417,7 @@ export const spec = {
   // INITIATE USER SYNCING
   getUserSyncs: function(options, rtbResponse, gdprConsent) {
     const syncs = [];
-    let bidResponse = rtbResponse[0].body;
+    let bidResponse = rtbResponse?.[0]?.body ?? null;
     let scope = this;
 
     // LISTEN FOR SYNC DATA FROM IFRAME TYPE SYNC
diff --git a/modules/datawrkzBidAdapter.js b/modules/datawrkzBidAdapter.js
index 127e7893ec5..2f8e397d959 100644
--- a/modules/datawrkzBidAdapter.js
+++ b/modules/datawrkzBidAdapter.js
@@ -12,9 +12,14 @@ import { Renderer } from '../src/Renderer.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { createBid } from '../src/bidfactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import CONSTANTS from '../src/constants.json';
+import { STATUS } from '../src/constants.js';
 import { OUTSTREAM, INSTREAM } from '../src/video.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'datawrkz';
 const ALIASES = [];
 const ENDPOINT_URL = 'https://at.datawrkz.com/exchange/openrtb23/';
@@ -222,7 +227,6 @@ function buildVideoRequest(bidRequest, bidderRequest) {
     maxbitrate: deepAccess(bidRequest, 'mediaTypes.video.maxbitrate'),
     delivery: deepAccess(bidRequest, 'mediaTypes.video.delivery'),
     linearity: deepAccess(bidRequest, 'mediaTypes.video.linearity'),
-    placement: deepAccess(bidRequest, 'mediaTypes.video.placement'),
     skip: deepAccess(bidRequest, 'mediaTypes.video.skip'),
     skipafter: deepAccess(bidRequest, 'mediaTypes.video.skipafter')
   };
@@ -411,7 +415,7 @@ function buildBannerResponse(bidRequest, bidResponse) {
     if (bidRequest) {
       let bidResponse = createBid(1);
       placementCode = bidRequest.placementCode;
-      bidRequest.status = CONSTANTS.STATUS.GOOD;
+      bidRequest.status = STATUS.GOOD;
       responseCPM = parseFloat(bidderBid.price);
       if (responseCPM === 0 || isNaN(responseCPM)) {
         let bid = createBid(2);
@@ -452,7 +456,7 @@ function buildNativeResponse(bidRequest, response) {
     if (bidRequest) {
       let bidResponse = createBid(1);
       placementCode = bidRequest.placementCode;
-      bidRequest.status = CONSTANTS.STATUS.GOOD;
+      bidRequest.status = STATUS.GOOD;
       responseCPM = parseFloat(bidderBid.price);
       if (responseCPM === 0 || isNaN(responseCPM)) {
         let bid = createBid(2);
@@ -501,7 +505,7 @@ function buildVideoResponse(bidRequest, response) {
     if (bidRequest) {
       let bidResponse = createBid(1);
       placementCode = bidRequest.placementCode;
-      bidRequest.status = CONSTANTS.STATUS.GOOD;
+      bidRequest.status = STATUS.GOOD;
       responseCPM = parseFloat(bidderBid.price);
       if (responseCPM === 0 || isNaN(responseCPM)) {
         let bid = createBid(2);
diff --git a/modules/debugging/bidInterceptor.js b/modules/debugging/bidInterceptor.js
index 775f8fc3da2..102d1723eec 100644
--- a/modules/debugging/bidInterceptor.js
+++ b/modules/debugging/bidInterceptor.js
@@ -1,9 +1,9 @@
 import {
   deepAccess,
   deepClone,
-  deepEqual,
   delayExecution,
-  mergeDeep
+  mergeDeep,
+  hasNonSerializableProperty
 } from '../../src/utils.js';
 
 /**
@@ -22,9 +22,9 @@ Object.assign(BidInterceptor.prototype, {
   },
   serializeConfig(ruleDefs) {
     const isSerializable = (ruleDef, i) => {
-      const serializable = deepEqual(ruleDef, JSON.parse(JSON.stringify(ruleDef)), {checkTypes: true});
+      const serializable = !hasNonSerializableProperty(ruleDef);
       if (!serializable && !deepAccess(ruleDef, 'options.suppressWarnings')) {
-        this.logger.logWarn(`Bid interceptor rule definition #${i + 1} is not serializable and will be lost after a refresh. Rule definition: `, ruleDef);
+        this.logger.logWarn(`Bid interceptor rule definition #${i + 1} contains non-serializable properties and will be lost after a refresh. Rule definition: `, ruleDef);
       }
       return serializable;
     }
@@ -54,8 +54,9 @@ Object.assign(BidInterceptor.prototype, {
     return {
       no: ruleNo,
       match: this.matcher(ruleDef.when, ruleNo),
-      replace: this.replacer(ruleDef.then || {}, ruleNo),
+      replace: this.replacer(ruleDef.then, ruleNo),
       options: Object.assign({}, this.DEFAULT_RULE_OPTIONS, ruleDef.options),
+      paapi: this.paapiReplacer(ruleDef.paapi || [], ruleNo)
     }
   },
   /**
@@ -114,6 +115,10 @@ Object.assign(BidInterceptor.prototype, {
    * @return {ReplacerFn}
    */
   replacer(replDef, ruleNo) {
+    if (replDef === null) {
+      return () => null
+    }
+    replDef = replDef || {};
     let replFn;
     if (typeof replDef === 'function') {
       replFn = ({args}) => replDef(...args);
@@ -145,6 +150,24 @@ Object.assign(BidInterceptor.prototype, {
       return response;
     }
   },
+
+  paapiReplacer(paapiDef, ruleNo) {
+    function wrap(configs = []) {
+      return configs.map(config => {
+        return Object.keys(config).some(k => !['config', 'igb'].includes(k))
+          ? {config}
+          : config
+      });
+    }
+    if (Array.isArray(paapiDef)) {
+      return () => wrap(paapiDef);
+    } else if (typeof paapiDef === 'function') {
+      return (...args) => wrap(paapiDef(...args))
+    } else {
+      this.logger.logError(`Invalid 'paapi' definition for debug bid interceptor (in rule #${ruleNo})`);
+    }
+  },
+
   responseDefaults(bid) {
     return {
       requestId: bid.bidId,
@@ -198,11 +221,12 @@ Object.assign(BidInterceptor.prototype, {
    * @param {{}[]} bids?
    * @param {BidRequest} bidRequest
    * @param {function(*)} addBid called once for each mock response
+   * @param addPaapiConfig called once for each mock PAAPI config
    * @param {function()} done called once after all mock responses have been run through `addBid`
    * @returns {{bids: {}[], bidRequest: {}} remaining bids that did not match any rule (this applies also to
    * bidRequest.bids)
    */
-  intercept({bids, bidRequest, addBid, done}) {
+  intercept({bids, bidRequest, addBid, addPaapiConfig, done}) {
     if (bids == null) {
       bids = bidRequest.bids;
     }
@@ -211,10 +235,12 @@ Object.assign(BidInterceptor.prototype, {
       const callDone = delayExecution(done, matches.length);
       matches.forEach((match) => {
         const mockResponse = match.rule.replace(match.bid, bidRequest);
+        const mockPaapi = match.rule.paapi(match.bid, bidRequest);
         const delay = match.rule.options.delay;
-        this.logger.logMessage(`Intercepted bid request (matching rule #${match.rule.no}), mocking response in ${delay}ms. Request, response:`, match.bid, mockResponse)
+        this.logger.logMessage(`Intercepted bid request (matching rule #${match.rule.no}), mocking response in ${delay}ms. Request, response, PAAPI configs:`, match.bid, mockResponse, mockPaapi)
         this.setTimeout(() => {
-          addBid(mockResponse, match.bid);
+          mockResponse && addBid(mockResponse, match.bid);
+          mockPaapi.forEach(cfg => addPaapiConfig(cfg, match.bid, bidRequest));
           callDone();
         }, delay)
       });
diff --git a/modules/debugging/debugging.js b/modules/debugging/debugging.js
index 8a4ad7a9545..803d7ee5cd7 100644
--- a/modules/debugging/debugging.js
+++ b/modules/debugging/debugging.js
@@ -31,6 +31,7 @@ export function disableDebugging({hook, logger}) {
   }
 }
 
+// eslint-disable-next-line prebid/no-global
 function saveDebuggingConfig(debugConfig, {sessionStorage = window.sessionStorage, DEBUG_KEY} = {}) {
   if (!debugConfig.enabled) {
     try {
@@ -49,6 +50,7 @@ function saveDebuggingConfig(debugConfig, {sessionStorage = window.sessionStorag
   }
 }
 
+// eslint-disable-next-line prebid/no-global
 export function getConfig(debugging, {getStorage = () => window.sessionStorage, DEBUG_KEY, config, hook, logger} = {}) {
   if (debugging == null) return;
   let sessionStorage;
@@ -70,6 +72,7 @@ export function getConfig(debugging, {getStorage = () => window.sessionStorage,
 export function sessionLoader({DEBUG_KEY, storage, config, hook, logger}) {
   let overrides;
   try {
+    // eslint-disable-next-line prebid/no-global
     storage = storage || window.sessionStorage;
     overrides = JSON.parse(storage.getItem(DEBUG_KEY));
   } catch (e) {
@@ -99,8 +102,16 @@ function registerBidInterceptor(getHookFn, interceptor) {
 
 export function bidderBidInterceptor(next, interceptBids, spec, bids, bidRequest, ajax, wrapCallback, cbs) {
   const done = delayExecution(cbs.onCompletion, 2);
-  ({bids, bidRequest} = interceptBids({bids, bidRequest, addBid: cbs.onBid, done}));
+  ({bids, bidRequest} = interceptBids({
+    bids,
+    bidRequest,
+    addBid: wrapCallback(cbs.onBid),
+    addPaapiConfig: wrapCallback((config, bidRequest) => cbs.onPaapi({bidId: bidRequest.bidId, ...config})),
+    done
+  }));
   if (bids.length === 0) {
+    // eslint-disable-next-line no-unused-expressions
+    cbs.onResponse?.({}); // trigger onResponse so that the bidder may be marked as "timely" if necessary
     done();
   } else {
     next(spec, bids, bidRequest, ajax, wrapCallback, {...cbs, onCompletion: done});
diff --git a/modules/debugging/pbsInterceptor.js b/modules/debugging/pbsInterceptor.js
index 1ca13eb4927..c514031ad0e 100644
--- a/modules/debugging/pbsInterceptor.js
+++ b/modules/debugging/pbsInterceptor.js
@@ -1,11 +1,12 @@
 import {deepClone, delayExecution} from '../../src/utils.js';
-import CONSTANTS from '../../src/constants.json';
+import { STATUS } from '../../src/constants.js';
 
 export function makePbsInterceptor({createBid}) {
   return function pbsBidInterceptor(next, interceptBids, s2sBidRequest, bidRequests, ajax, {
     onResponse,
     onError,
-    onBid
+    onBid,
+    onFledge,
   }) {
     let responseArgs;
     const done = delayExecution(() => onResponse(...responseArgs), bidRequests.length + 1)
@@ -16,11 +17,23 @@ export function makePbsInterceptor({createBid}) {
     function addBid(bid, bidRequest) {
       onBid({
         adUnit: bidRequest.adUnitCode,
-        bid: Object.assign(createBid(CONSTANTS.STATUS.GOOD, bidRequest), bid)
+        bid: Object.assign(createBid(STATUS.GOOD, bidRequest), bid)
       })
     }
     bidRequests = bidRequests
-      .map((req) => interceptBids({bidRequest: req, addBid, done}).bidRequest)
+      .map((req) => interceptBids({
+        bidRequest: req,
+        addBid,
+        addPaapiConfig(config, bidRequest, bidderRequest) {
+          onFledge({
+            adUnitCode: bidRequest.adUnitCode,
+            ortb2: bidderRequest.ortb2,
+            ortb2Imp: bidRequest.ortb2Imp,
+            ...config
+          })
+        },
+        done
+      }).bidRequest)
       .filter((req) => req.bids.length > 0)
 
     if (bidRequests.length > 0) {
diff --git a/modules/deepintentBidAdapter.js b/modules/deepintentBidAdapter.js
index e062686b320..9c67eb02fa9 100644
--- a/modules/deepintentBidAdapter.js
+++ b/modules/deepintentBidAdapter.js
@@ -1,37 +1,21 @@
-import { generateUUID, deepSetValue, deepAccess, isArray, isInteger, logError, logWarn } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import { generateUUID, deepSetValue, deepAccess, isArray, isFn, isPlainObject, logError, logWarn } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { COMMON_ORTB_VIDEO_PARAMS, formatResponse } from '../libraries/deepintentUtils/index.js';
 const BIDDER_CODE = 'deepintent';
+const GVL_ID = 541;
 const BIDDER_ENDPOINT = 'https://prebid.deepintent.com/prebid';
 const USER_SYNC_URL = 'https://cdn.deepintent.com/syncpixel.html';
 const DI_M_V = '1.0.0';
 export const ORTB_VIDEO_PARAMS = {
-  'mimes': (value) => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
-  'minduration': (value) => isInteger(value),
-  'maxduration': (value) => isInteger(value),
-  'protocols': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 10),
-  'w': (value) => isInteger(value),
-  'h': (value) => isInteger(value),
-  'startdelay': (value) => isInteger(value),
-  'placement': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 5),
-  'linearity': (value) => [1, 2].indexOf(value) !== -1,
-  'skip': (value) => [0, 1].indexOf(value) !== -1,
-  'skipmin': (value) => isInteger(value),
-  'skipafter': (value) => isInteger(value),
-  'sequence': (value) => isInteger(value),
-  'battr': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 17),
-  'maxextended': (value) => isInteger(value),
-  'minbitrate': (value) => isInteger(value),
-  'maxbitrate': (value) => isInteger(value),
-  'boxingallowed': (value) => [0, 1].indexOf(value) !== -1,
-  'playbackmethod': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6),
-  'playbackend': (value) => [1, 2, 3].indexOf(value) !== -1,
+  ...COMMON_ORTB_VIDEO_PARAMS,
+  'plcmt': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 5),
   'delivery': (value) => [1, 2, 3].indexOf(value) !== -1,
   'pos': (value) => [0, 1, 2, 3, 4, 5, 6, 7].indexOf(value) !== -1,
-  'api': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6)
 };
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVL_ID,
   supportedMediaTypes: [BANNER, VIDEO],
   aliases: [],
 
@@ -96,6 +80,20 @@ export const spec = {
       deepSetValue(openRtbBidRequest, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
     }
 
+    // GPP Consent
+    if (bidderRequest?.gppConsent?.gppString) {
+      deepSetValue(openRtbBidRequest, 'regs.gpp', bidderRequest.gppConsent.gppString);
+      deepSetValue(openRtbBidRequest, 'regs.gpp_sid', bidderRequest.gppConsent.applicableSections);
+    } else if (bidderRequest?.ortb2?.regs?.gpp) {
+      deepSetValue(openRtbBidRequest, 'regs.gpp', bidderRequest.ortb2.regs.gpp);
+      deepSetValue(openRtbBidRequest, 'regs.gpp_sid', bidderRequest.ortb2.regs.gpp_sid);
+    }
+
+    // coppa compliance
+    if (bidderRequest?.ortb2?.regs?.coppa) {
+      deepSetValue(openRtbBidRequest, 'regs.coppa', 1);
+    }
+
     injectEids(openRtbBidRequest, validBidRequests);
 
     return {
@@ -139,29 +137,13 @@ function clean(obj) {
   }
 }
 
-function formatResponse(bid) {
-  return {
-    requestId: bid && bid.impid ? bid.impid : undefined,
-    cpm: bid && bid.price ? bid.price : 0.0,
-    width: bid && bid.w ? bid.w : 0,
-    height: bid && bid.h ? bid.h : 0,
-    ad: bid && bid.adm ? bid.adm : '',
-    meta: {
-      advertiserDomains: bid && bid.adomain ? bid.adomain : []
-    },
-    creativeId: bid && bid.crid ? bid.crid : undefined,
-    netRevenue: false,
-    currency: bid && bid.cur ? bid.cur : 'USD',
-    ttl: 300,
-    dealId: bid && bid.dealId ? bid.dealId : undefined
-  }
-}
-
 function buildImpression(bid) {
   let impression = {};
+  const floor = getFloor(bid);
   impression = {
     id: bid.bidId,
     tagid: bid.params.tagId || '',
+    ...(!isNaN(floor) && { bidfloor: floor }),
     secure: window.location.protocol === 'https:' ? 1 : 0,
     displaymanager: 'di_prebid',
     displaymanagerver: DI_M_V,
@@ -176,6 +158,23 @@ function buildImpression(bid) {
   return impression;
 }
 
+function getFloor(bidRequest) {
+  if (!isFn(bidRequest.getFloor)) {
+    return bidRequest.params?.bidfloor;
+  }
+
+  let floor = bidRequest.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 function _buildVideo(bid) {
   const videoObj = {};
   const videoAdUnitParams = deepAccess(bid, 'mediaTypes.video', {});
diff --git a/modules/deepintentBidAdapter.md b/modules/deepintentBidAdapter.md
index 84c375d69a4..73f1918085e 100644
--- a/modules/deepintentBidAdapter.md
+++ b/modules/deepintentBidAdapter.md
@@ -15,64 +15,70 @@ Module that connects to Deepintent's demand sources.
 # Banner Test Request
 ```
   var adUnits = [
-    {
-      code: 'di_adUnit1',
-      mediaTypes: {
-        banner: {
-            sizes: [[300, 250]],  // a display size, only first one will be picked up since multiple ad sizes are not supported yet 
-        }
-      }
-      bids: [
-        {
-            bidder: 'deepintent',
-            params: {
-                tagId: '1300',  // Required parameter
-                w: 300,   // Width and Height here will override sizes in mediatype
-                h: 250,
-                pos: 1,
-                custom: {              // Custom parameters in form of key value pairs
-                    user_min_age: 18
-                }
-            }
-        }
-      ]
-    }
-  ];
+		{
+			code: 'di_adUnit1',
+			mediaTypes: {
+				banner: {
+					sizes: [[300, 250]], // a display size, only first one will be picked up since multiple ad sizes are not supported yet
+				},
+			},
+			bids: [
+				{
+					bidder: 'deepintent',
+					params: {
+						tagId: '1300', // Required parameter
+            bidfloor: 1.5, // optional
+						w: 300, // Width and Height here will override sizes in mediatype
+						h: 250,
+						pos: 1,
+						custom: {
+							// Custom parameters in form of key value pairs
+							user_min_age: 18,
+						},
+					},
+				},
+			],
+		},
+	];
 ```
 
 # Sample Video Ad Unit
 ```
-var adVideoAdUnits = [
-{
-    code: 'test-div-video',
-    mediaTypes: {
-        video: {
-            playerSize: [640, 480],           // required
-            context: 'instream'               //required
-        }
-    },
-    bids: [{
-      bidder: 'deepintent',
-      params: {
-        tagId: '1300',  // Required parameter                 // required
-        video: {
-          mimes: ['video/mp4','video/x-flv'],   // required
-          skippable: true,                      // optional
-          minduration: 5,                       // optional
-          maxduration: 30,                      // optional
-          startdelay: 5,                        // optional
-          playbackmethod: [1,3],                // optional
-          api: [ 1, 2 ],                        // optional
-          protocols: [ 2, 3 ],                  // optional
-          battr: [ 13, 14 ],                    // optional
-          linearity: 1,                         // optional
-          placement: 2,                         // optional
-          minbitrate: 10,                       // optional
-          maxbitrate: 10                        // optional
-        }
-      }
-    }]
-}]
+  var adVideoAdUnits = [
+		{
+			code: 'test-div-video',
+			mediaTypes: {
+				video: {
+					playerSize: [640, 480], // required
+					context: 'instream', //required
+				},
+			},
+			bids: [
+				{
+					bidder: 'deepintent',
+					params: {
+						tagId: '1300', // Required parameter                 // required
+            bidfloor: 1.5, // optional
+						video: {
+							mimes: ['video/mp4', 'video/x-flv'], // required
+							skippable: true, // optional
+							minduration: 5, // optional
+							maxduration: 30, // optional
+							startdelay: 5, // optional
+							playbackmethod: [1, 3], // optional
+							api: [1, 2], // optional
+							protocols: [2, 3], // optional
+							battr: [13, 14], // optional
+							linearity: 1, // optional
+							plcmt: 2, // optional
+							minbitrate: 10, // optional
+							maxbitrate: 10, // optional
+						},
+					},
+				},
+			],
+		},
+	];
 ```
 
 ###Recommended User Sync Configuration
@@ -84,6 +90,4 @@ pbjs.setConfig({
     enabledBidders: ['deepintent'],
     syncDelay: 3000
  }});
-
-
 ```
diff --git a/modules/deepintentDpesIdSystem.js b/modules/deepintentDpesIdSystem.js
index 4d685592c04..a1f1e29a4ce 100644
--- a/modules/deepintentDpesIdSystem.js
+++ b/modules/deepintentDpesIdSystem.js
@@ -8,6 +8,13 @@
 import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
+import {isPlainObject} from '../src/utils.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ */
 
 const MODULE_NAME = 'deepintentId';
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
@@ -43,7 +50,13 @@ export const deepintentDpesSubmodule = {
   eids: {
     'deepintentId': {
       source: 'deepintent.com',
-      atype: 3
+      atype: 3,
+      getValue: (userIdData) => {
+        if (isPlainObject(userIdData) && userIdData?.id) {
+          return userIdData.id;
+        }
+        return userIdData;
+      }
     },
   },
 };
diff --git a/modules/deltaprojectsBidAdapter.js b/modules/deltaprojectsBidAdapter.js
index c66e381b8f1..2111643b344 100644
--- a/modules/deltaprojectsBidAdapter.js
+++ b/modules/deltaprojectsBidAdapter.js
@@ -1,5 +1,6 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
 import {
   _each,
   _map,
@@ -8,15 +9,15 @@ import {
   isFn,
   isNumber,
   logError,
-  logWarn
+  logWarn,
+  setOnAny
 } from '../src/utils.js';
-import {config} from '../src/config.js';
 
 export const BIDDER_CODE = 'deltaprojects';
 export const BIDDER_ENDPOINT_URL = 'https://d5p.de17a.com/dogfight/prebid';
 export const USERSYNC_URL = 'https://userservice.de17a.com/getuid/prebid';
 
-/** -- isBidRequestValid --**/
+/** -- isBidRequestValid -- */
 function isBidRequestValid(bid) {
   if (!bid) return false;
 
@@ -32,9 +33,9 @@ function isBidRequestValid(bid) {
   return true;
 }
 
-/** -- Build requests --**/
+/** -- Build requests -- */
 function buildRequests(validBidRequests, bidderRequest) {
-  /** == shared ==**/
+  /** == shared == */
   // -- build id
   const id = bidderRequest.bidderRequestId;
 
@@ -73,7 +74,7 @@ function buildRequests(validBidRequests, bidderRequest) {
 
   // build bid specific
   return validBidRequests.map(validBidRequest => {
-    const openRTBRequest = buildOpenRTBRequest(validBidRequest, id, site, device, user, tmax, regs);
+    const openRTBRequest = buildOpenRTBRequest(validBidRequest, bidderRequest, id, site, device, user, tmax, regs);
     return {
       method: 'POST',
       url: BIDDER_ENDPOINT_URL,
@@ -84,9 +85,9 @@ function buildRequests(validBidRequests, bidderRequest) {
   });
 }
 
-function buildOpenRTBRequest(validBidRequest, id, site, device, user, tmax, regs) {
+function buildOpenRTBRequest(validBidRequest, bidderRequest, id, site, device, user, tmax, regs) {
   // build cur
-  const currency = config.getConfig('currency.adServerCurrency') || deepAccess(validBidRequest, 'params.currency');
+  const currency = getCurrencyFromBidderRequest(bidderRequest) || deepAccess(validBidRequest, 'params.currency');
   const cur = currency && [currency];
 
   // build impression
@@ -146,7 +147,7 @@ function buildImpressionBanner(bid, bannerMediaType) {
   };
 }
 
-/** -- Interpret response --**/
+/** -- Interpret response -- */
 function interpretResponse(serverResponse) {
   if (!serverResponse.body) {
     logWarn('Response body is invalid, return !!');
@@ -189,7 +190,7 @@ function interpretResponse(serverResponse) {
   return bidResponses;
 }
 
-/** -- On Bid Won -- **/
+/** -- On Bid Won -- */
 function onBidWon(bid) {
   let cpm = bid.cpm;
   if (bid.currency && bid.currency !== bid.originalCurrency && typeof bid.getCpmInNewCurrency === 'function') {
@@ -200,7 +201,7 @@ function onBidWon(bid) {
   bid.ad = bid.ad.replace(wonPriceMacroPatten, wonPrice);
 }
 
-/** -- Get user syncs --**/
+/** -- Get user syncs -- */
 function getUserSyncs(syncOptions, serverResponses, gdprConsent) {
   const syncs = []
 
@@ -223,27 +224,17 @@ function getUserSyncs(syncOptions, serverResponses, gdprConsent) {
   return syncs;
 }
 
-/** -- Get bid floor --**/
+/** -- Get bid floor -- */
 export function getBidFloor(bid, mediaType, size, currency) {
   if (isFn(bid.getFloor)) {
     const bidFloorCurrency = currency || 'USD';
     const bidFloor = bid.getFloor({currency: bidFloorCurrency, mediaType: mediaType, size: size});
-    if (isNumber(bidFloor.floor)) {
+    if (isNumber(bidFloor?.floor)) {
       return bidFloor;
     }
   }
 }
 
-/** -- Helper methods --**/
-function setOnAny(collection, key) {
-  for (let i = 0, result; i < collection.length; i++) {
-    result = deepAccess(collection[i], key);
-    if (result) {
-      return result;
-    }
-  }
-}
-
 /** -- Register -- */
 export const spec = {
   code: BIDDER_CODE,
diff --git a/modules/dexertoBidAdapter.js b/modules/dexertoBidAdapter.js
new file mode 100644
index 00000000000..af06341e9e6
--- /dev/null
+++ b/modules/dexertoBidAdapter.js
@@ -0,0 +1,31 @@
+import {
+  BANNER
+} from '../src/mediaTypes.js';
+import {
+  registerBidder
+} from '../src/adapters/bidderFactory.js';
+import {
+  getBannerRequest,
+  getBannerResponse,
+} from '../libraries/audUtils/bidderUtils.js';
+
+const ENDPOINT_URL = 'https://rtb.dexerto.media/hb/dexerto';
+// Export const spec
+export const spec = {
+  code: 'dexerto',
+  supportedMediaTypes: BANNER,
+  // Determines whether or not the given bid request is valid
+  isBidRequestValid: (bid) => {
+    return !!(bid.params.placement_id);
+  },
+  // Make a server request from the list of BidRequests
+  buildRequests: (bidRequests, bidderRequest) => {
+    return getBannerRequest(bidRequests, bidderRequest, ENDPOINT_URL);
+  },
+  // Unpack the response from the server into a list of bids.
+  interpretResponse: (bidResponse, bidRequest) => {
+    return getBannerResponse(bidResponse, BANNER);
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/dexertoBidAdapter.md b/modules/dexertoBidAdapter.md
new file mode 100644
index 00000000000..ad4d7bb42eb
--- /dev/null
+++ b/modules/dexertoBidAdapter.md
@@ -0,0 +1,38 @@
+# Overview
+
+```
+Module Name: Dexerto Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: niels.claes@dexerto.com
+```
+
+# Description
+
+Dexerto currently supports the BANNER type ads through prebid js
+
+Module that connects to dexerto's demand sources.
+
+# Banner Test Request
+```
+  var adUnits = [
+    {
+      code: 'display-ad',
+      mediaTypes: {
+        banner: {
+            sizes: [[300, 250]], 
+        }
+      }
+      bids: [
+        {
+            bidder: 'dexerto',
+            params: {
+                placement_id: 110003,  // Required parameter
+                width: 300,   // Optional parameter 
+                height: 250, // Optional parameter
+                bid_floor: 0.1 // Optional parameter
+            }
+        }
+      ]
+    }
+  ];
+```
diff --git a/modules/dfpAdServerVideo.js b/modules/dfpAdServerVideo.js
index 3394fd8b3f4..87ead9fe980 100644
--- a/modules/dfpAdServerVideo.js
+++ b/modules/dfpAdServerVideo.js
@@ -2,18 +2,26 @@
  * This module adds [DFP support]{@link https://www.doubleclickbygoogle.com/} for Video to Prebid.
  */
 
+import { getSignals } from '../libraries/gptUtils/gptUtils.js';
 import { registerVideoSupport } from '../src/adServerManager.js';
-import { targeting } from '../src/targeting.js';
-import { deepAccess, isEmpty, logError, parseSizesInput, formatQS, parseUrl, buildUrl } from '../src/utils.js';
-import { config } from '../src/config.js';
-import { getHook, submodule } from '../src/hook.js';
+import { getPPID } from '../src/adserver.js';
 import { auctionManager } from '../src/auctionManager.js';
-import { gdprDataHandler, uspDataHandler, gppDataHandler } from '../src/adapterManager.js';
+import { config } from '../src/config.js';
+import { EVENTS } from '../src/constants.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
-import {getPPID} from '../src/adserver.js';
-import {getRefererInfo} from '../src/refererDetection.js';
-
+import { getHook } from '../src/hook.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { targeting } from '../src/targeting.js';
+import {
+  buildUrl,
+  formatQS,
+  isEmpty,
+  isNumber,
+  logError,
+  parseSizesInput,
+  parseUrl
+} from '../src/utils.js';
+import {DEFAULT_DFP_PARAMS, DFP_ENDPOINT, gdprParams} from '../libraries/dfpUtils/dfpUtils.js';
 /**
  * @typedef {Object} DfpVideoParams
  *
@@ -43,16 +51,6 @@ import {getRefererInfo} from '../src/refererDetection.js';
  * @param {string} [url] video adserver url
  */
 
-/** Safe defaults which work on pretty much all video calls. */
-const defaultParamConstants = {
-  env: 'vp',
-  gdfp_req: 1,
-  output: 'vast',
-  unviewed_position_start: 1,
-};
-
-export const adpodUtils = {};
-
 export const dep = {
   ri: getRefererInfo
 }
@@ -91,7 +89,7 @@ export function buildDfpVideoUrl(options) {
 
   const derivedParams = {
     correlator: Date.now(),
-    sz: parseSizesInput(deepAccess(adUnit, 'mediaTypes.video.playerSize')).join('|'),
+    sz: parseSizesInput(adUnit?.mediaTypes?.video?.playerSize).join('|'),
     url: encodeURIComponent(location.href),
   };
 
@@ -104,31 +102,17 @@ export function buildDfpVideoUrl(options) {
   let encodedCustomParams = getCustParams(bid, options, urlSearchComponent && urlSearchComponent.cust_params);
 
   const queryParams = Object.assign({},
-    defaultParamConstants,
+    DEFAULT_DFP_PARAMS,
     urlComponents.search,
     derivedParams,
     options.params,
-    { cust_params: encodedCustomParams }
+    { cust_params: encodedCustomParams },
+    gdprParams()
   );
 
   const descriptionUrl = getDescriptionUrl(bid, options, 'params');
   if (descriptionUrl) { queryParams.description_url = descriptionUrl; }
 
-  const gdprConsent = gdprDataHandler.getConsentData();
-  if (gdprConsent) {
-    if (typeof gdprConsent.gdprApplies === 'boolean') { queryParams.gdpr = Number(gdprConsent.gdprApplies); }
-    if (gdprConsent.consentString) { queryParams.gdpr_consent = gdprConsent.consentString; }
-    if (gdprConsent.addtlConsent) { queryParams.addtl_consent = gdprConsent.addtlConsent; }
-  }
-
-  const uspConsent = uspDataHandler.getConsentData();
-  if (uspConsent) { queryParams.us_privacy = uspConsent; }
-
-  const gppConsent = gppDataHandler.getConsentData();
-  if (gppConsent) {
-    // TODO - need to know what to set here for queryParams...
-  }
-
   if (!queryParams.ppid) {
     const ppid = getPPID();
     if (ppid != null) {
@@ -136,120 +120,79 @@ export function buildDfpVideoUrl(options) {
     }
   }
 
-  return buildUrl(Object.assign({
-    protocol: 'https',
-    host: 'securepubads.g.doubleclick.net',
-    pathname: '/gampad/ads'
-  }, urlComponents, { search: queryParams }));
-}
-
-export function notifyTranslationModule(fn) {
-  fn.call(this, 'dfp');
-}
-
-if (config.getConfig('brandCategoryTranslation.translationFile')) { getHook('registerAdserver').before(notifyTranslationModule); }
-
-/**
- * @typedef {Object} DfpAdpodOptions
- *
- * @param {string} code Ad Unit code
- * @param {Object} params Query params which should be set on the DFP request.
- * These will override this module's defaults whenever they conflict.
- * @param {function} callback Callback function to execute when master tag is ready
- */
-
-/**
- * Creates master tag url for long-form
- * @param {DfpAdpodOptions} options
- * @returns {string} A URL which calls DFP with custom adpod targeting key values to compete with rest of the demand in DFP
- */
-export function buildAdpodVideoUrl({code, params, callback} = {}) {
-  if (!params || !callback) {
-    logError(`A params object and a callback is required to use pbjs.adServers.dfp.buildAdpodVideoUrl`);
-    return;
-  }
-
-  const derivedParams = {
-    correlator: Date.now(),
-    sz: getSizeForAdUnit(code),
-    url: encodeURIComponent(location.href),
-  };
-
-  function getSizeForAdUnit(code) {
-    let adUnit = auctionManager.getAdUnits()
-      .filter((adUnit) => adUnit.code === code)
-    let sizes = deepAccess(adUnit[0], 'mediaTypes.video.playerSize');
-    return parseSizesInput(sizes).join('|');
-  }
-
-  adpodUtils.getTargeting({
-    'codes': [code],
-    'callback': createMasterTag
-  });
-
-  function createMasterTag(err, targeting) {
-    if (err) {
-      callback(err, null);
-      return;
+  const video = options.adUnit?.mediaTypes?.video;
+  Object.entries({
+    plcmt: () => video?.plcmt,
+    min_ad_duration: () => isNumber(video?.minduration) ? video.minduration * 1000 : null,
+    max_ad_duration: () => isNumber(video?.maxduration) ? video.maxduration * 1000 : null,
+    vpos() {
+      const startdelay = video?.startdelay;
+      if (isNumber(startdelay)) {
+        if (startdelay === -2) return 'postroll';
+        if (startdelay === -1 || startdelay > 0) return 'midroll';
+        return 'preroll';
+      }
+    },
+    vconp: () => Array.isArray(video?.playbackmethod) && video.playbackmethod.every(m => m === 7) ? '2' : undefined,
+    vpa() {
+      // playbackmethod = 3 is play on click; 1, 2, 4, 5, 6 are autoplay
+      if (Array.isArray(video?.playbackmethod)) {
+        const click = video.playbackmethod.some(m => m === 3);
+        const auto = video.playbackmethod.some(m => [1, 2, 4, 5, 6].includes(m));
+        if (click && !auto) return 'click';
+        if (auto && !click) return 'auto';
+      }
+    },
+    vpmute() {
+      // playbackmethod = 2, 6 are muted; 1, 3, 4, 5 are not
+      if (Array.isArray(video?.playbackmethod)) {
+        const muted = video.playbackmethod.some(m => [2, 6].includes(m));
+        const talkie = video.playbackmethod.some(m => [1, 3, 4, 5].includes(m));
+        if (muted && !talkie) return '1';
+        if (talkie && !muted) return '0';
+      }
     }
-
-    let initialValue = {
-      [adpodUtils.TARGETING_KEY_PB_CAT_DUR]: undefined,
-      [adpodUtils.TARGETING_KEY_CACHE_ID]: undefined
-    };
-    let customParams = {};
-    if (targeting[code]) {
-      customParams = targeting[code].reduce((acc, curValue) => {
-        if (Object.keys(curValue)[0] === adpodUtils.TARGETING_KEY_PB_CAT_DUR) {
-          acc[adpodUtils.TARGETING_KEY_PB_CAT_DUR] = (typeof acc[adpodUtils.TARGETING_KEY_PB_CAT_DUR] !== 'undefined') ? acc[adpodUtils.TARGETING_KEY_PB_CAT_DUR] + ',' + curValue[adpodUtils.TARGETING_KEY_PB_CAT_DUR] : curValue[adpodUtils.TARGETING_KEY_PB_CAT_DUR];
-        } else if (Object.keys(curValue)[0] === adpodUtils.TARGETING_KEY_CACHE_ID) {
-          acc[adpodUtils.TARGETING_KEY_CACHE_ID] = curValue[adpodUtils.TARGETING_KEY_CACHE_ID]
-        }
-        return acc;
-      }, initialValue);
+  }).forEach(([param, getter]) => {
+    if (!queryParams.hasOwnProperty(param)) {
+      const val = getter();
+      if (val != null) {
+        queryParams[param] = val;
+      }
     }
+  });
+  const fpd = auctionManager.index.getBidRequest(options.bid || {})?.ortb2 ??
+    auctionManager.index.getAuction(options.bid || {})?.getFPD()?.global;
 
-    let encodedCustomParams = encodeURIComponent(formatQS(customParams));
-
-    const queryParams = Object.assign({},
-      defaultParamConstants,
-      derivedParams,
-      params,
-      { cust_params: encodedCustomParams }
-    );
-
-    const gdprConsent = gdprDataHandler.getConsentData();
-    if (gdprConsent) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') { queryParams.gdpr = Number(gdprConsent.gdprApplies); }
-      if (gdprConsent.consentString) { queryParams.gdpr_consent = gdprConsent.consentString; }
-      if (gdprConsent.addtlConsent) { queryParams.addtl_consent = gdprConsent.addtlConsent; }
-    }
+  const signals = getSignals(fpd);
 
-    const uspConsent = uspDataHandler.getConsentData();
-    if (uspConsent) { queryParams.us_privacy = uspConsent; }
+  if (signals.length) {
+    queryParams.ppsj = btoa(JSON.stringify({
+      PublisherProvidedTaxonomySignals: signals
+    }))
+  }
 
-    const masterTag = buildUrl({
-      protocol: 'https',
-      host: 'securepubads.g.doubleclick.net',
-      pathname: '/gampad/ads',
-      search: queryParams
-    });
+  return buildUrl(Object.assign({}, DFP_ENDPOINT, urlComponents, { search: queryParams }));
+}
 
-    callback(null, masterTag);
-  }
+export function notifyTranslationModule(fn) {
+  fn.call(this, 'dfp');
 }
 
+if (config.getConfig('brandCategoryTranslation.translationFile')) { getHook('registerAdserver').before(notifyTranslationModule); }
+
 /**
  * Builds a video url from a base dfp video url and a winning bid, appending
  * Prebid-specific key-values.
  * @param {Object} components base video adserver url parsed into components object
- * @param {AdapterBidResponse} bid winning bid object to append parameters from
+ * @param {Object} bid winning bid object to append parameters from
  * @param {Object} options Options which should be used to construct the URL (used for custom params).
  * @return {string} video url
  */
 function buildUrlFromAdserverUrlComponents(components, bid, options) {
   const descriptionUrl = getDescriptionUrl(bid, components, 'search');
-  if (descriptionUrl) { components.search.description_url = descriptionUrl; }
+  if (descriptionUrl) {
+    components.search.description_url = descriptionUrl;
+  }
 
   components.search.cust_params = getCustParams(bid, options, components.search.cust_params);
   return buildUrl(components);
@@ -258,18 +201,18 @@ function buildUrlFromAdserverUrlComponents(components, bid, options) {
 /**
  * Returns the encoded vast url if it exists on a bid object, only if prebid-cache
  * is disabled, and description_url is not already set on a given input
- * @param {AdapterBidResponse} bid object to check for vast url
+ * @param {Object} bid object to check for vast url
  * @param {Object} components the object to check that description_url is NOT set on
  * @param {string} prop the property of components that would contain description_url
  * @return {string | undefined} The encoded vast url if it exists, or undefined
  */
 function getDescriptionUrl(bid, components, prop) {
-  return deepAccess(components, `${prop}.description_url`) || dep.ri().page;
+  return components?.[prop]?.description_url || encodeURIComponent(dep.ri().page);
 }
 
 /**
  * Returns the encoded `cust_params` from the bid.adserverTargeting and adds the `hb_uuid`, and `hb_cache_id`. Optionally the options.params.cust_params
- * @param {AdapterBidResponse} bid
+ * @param {Object} bid
  * @param {Object} options this is the options passed in from the `buildDfpVideoUrl` function
  * @return {Object} Encoded key value pairs for cust_params
  */
@@ -293,10 +236,10 @@ function getCustParams(bid, options, urlCustParams) {
   );
 
   // TODO: WTF is this? just firing random events, guessing at the argument, hoping noone notices?
-  events.emit(CONSTANTS.EVENTS.SET_TARGETING, {[adUnit.code]: prebidTargetingSet});
+  events.emit(EVENTS.SET_TARGETING, {[adUnit.code]: prebidTargetingSet});
 
   // merge the prebid + publisher targeting sets
-  const publisherTargetingSet = deepAccess(options, 'params.cust_params');
+  const publisherTargetingSet = options?.params?.cust_params;
   const targetingSet = Object.assign({}, prebidTargetingSet, publisherTargetingSet);
   let encodedParams = encodeURIComponent(formatQS(targetingSet));
   if (urlCustParams) {
@@ -308,8 +251,4 @@ function getCustParams(bid, options, urlCustParams) {
 
 registerVideoSupport('dfp', {
   buildVideoUrl: buildDfpVideoUrl,
-  buildAdpodVideoUrl: buildAdpodVideoUrl,
-  getAdpodTargeting: (args) => adpodUtils.getTargeting(args)
 });
-
-submodule('adpod', adpodUtils);
diff --git a/modules/dfpAdpod.js b/modules/dfpAdpod.js
new file mode 100644
index 00000000000..d443e770d87
--- /dev/null
+++ b/modules/dfpAdpod.js
@@ -0,0 +1,95 @@
+import {submodule} from '../src/hook.js';
+import {buildUrl, deepAccess, formatQS, logError, parseSizesInput} from '../src/utils.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {DEFAULT_DFP_PARAMS, DFP_ENDPOINT, gdprParams} from '../libraries/dfpUtils/dfpUtils.js';
+import {registerVideoSupport} from '../src/adServerManager.js';
+
+export const adpodUtils = {};
+
+/**
+ * @typedef {Object} DfpAdpodOptions
+ *
+ * @param {string} code Ad Unit code
+ * @param {Object} params Query params which should be set on the DFP request.
+ * These will override this module's defaults whenever they conflict.
+ * @param {function} callback Callback function to execute when master tag is ready
+ */
+
+/**
+ * Creates master tag url for long-form
+ * @param {DfpAdpodOptions} options
+ * @returns {string} A URL which calls DFP with custom adpod targeting key values to compete with rest of the demand in DFP
+ */
+export function buildAdpodVideoUrl({code, params, callback} = {}) {
+  // TODO: the public API for this does not take in enough info to fill all DFP params (adUnit/bid),
+  // and is marked "alpha": https://docs.prebid.org/dev-docs/publisher-api-reference/adServers.dfp.buildAdpodVideoUrl.html
+  if (!params || !callback) {
+    logError(`A params object and a callback is required to use pbjs.adServers.dfp.buildAdpodVideoUrl`);
+    return;
+  }
+
+  const derivedParams = {
+    correlator: Date.now(),
+    sz: getSizeForAdUnit(code),
+    url: encodeURIComponent(location.href),
+  };
+
+  function getSizeForAdUnit(code) {
+    let adUnit = auctionManager.getAdUnits()
+      .filter((adUnit) => adUnit.code === code)
+    let sizes = deepAccess(adUnit[0], 'mediaTypes.video.playerSize');
+    return parseSizesInput(sizes).join('|');
+  }
+
+  adpodUtils.getTargeting({
+    'codes': [code],
+    'callback': createMasterTag
+  });
+
+  function createMasterTag(err, targeting) {
+    if (err) {
+      callback(err, null);
+      return;
+    }
+
+    let initialValue = {
+      [adpodUtils.TARGETING_KEY_PB_CAT_DUR]: undefined,
+      [adpodUtils.TARGETING_KEY_CACHE_ID]: undefined
+    };
+    let customParams = {};
+    if (targeting[code]) {
+      customParams = targeting[code].reduce((acc, curValue) => {
+        if (Object.keys(curValue)[0] === adpodUtils.TARGETING_KEY_PB_CAT_DUR) {
+          acc[adpodUtils.TARGETING_KEY_PB_CAT_DUR] = (typeof acc[adpodUtils.TARGETING_KEY_PB_CAT_DUR] !== 'undefined') ? acc[adpodUtils.TARGETING_KEY_PB_CAT_DUR] + ',' + curValue[adpodUtils.TARGETING_KEY_PB_CAT_DUR] : curValue[adpodUtils.TARGETING_KEY_PB_CAT_DUR];
+        } else if (Object.keys(curValue)[0] === adpodUtils.TARGETING_KEY_CACHE_ID) {
+          acc[adpodUtils.TARGETING_KEY_CACHE_ID] = curValue[adpodUtils.TARGETING_KEY_CACHE_ID]
+        }
+        return acc;
+      }, initialValue);
+    }
+
+    let encodedCustomParams = encodeURIComponent(formatQS(customParams));
+
+    const queryParams = Object.assign({},
+      DEFAULT_DFP_PARAMS,
+      derivedParams,
+      params,
+      { cust_params: encodedCustomParams },
+      gdprParams(),
+    );
+
+    const masterTag = buildUrl({
+      ...DFP_ENDPOINT,
+      search: queryParams
+    });
+
+    callback(null, masterTag);
+  }
+}
+
+registerVideoSupport('dfp', {
+  buildAdpodVideoUrl: buildAdpodVideoUrl,
+  getAdpodTargeting: (args) => adpodUtils.getTargeting(args)
+});
+
+submodule('adpod', adpodUtils);
diff --git a/modules/dgkeywordRtdProvider.js b/modules/dgkeywordRtdProvider.js
index 99df3b18a39..c97296f6982 100644
--- a/modules/dgkeywordRtdProvider.js
+++ b/modules/dgkeywordRtdProvider.js
@@ -6,12 +6,15 @@
  * @module modules/dgkeywordProvider
  * @requires module:modules/realTimeData
  */
-
-import {logMessage, deepSetValue, logError, logInfo, mergeDeep} from '../src/utils.js';
+import { logMessage, deepSetValue, logError, logInfo, isStr, isArray } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import { getGlobal } from '../src/prebidGlobal.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 /**
  * get keywords from api server. and set keywords.
  * @param {Object} reqBidsConfigObj
@@ -57,20 +60,12 @@ export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, us
             if (Object.keys(keywords).length > 0) {
               const targetBidKeys = {};
               for (let bid of setKeywordTargetBidders) {
-                // set keywords to params
-                bid.params.keywords = keywords;
+                // set keywords to ortb2Imp
+                deepSetValue(bid, 'ortb2Imp.ext.data.keywords', convertKeywordsToString(keywords));
                 if (!targetBidKeys[bid.bidder]) {
                   targetBidKeys[bid.bidder] = true;
                 }
               }
-
-              if (!reqBidsConfigObj._ignoreSetOrtb2) {
-                // set keywrods to ortb2
-                let addOrtb2 = {};
-                deepSetValue(addOrtb2, 'site.keywords', keywords);
-                deepSetValue(addOrtb2, 'user.keywords', keywords);
-                mergeDeep(reqBidsConfigObj.ortb2Fragments.bidder, Object.fromEntries(Object.keys(targetBidKeys).map(bidder => [bidder, addOrtb2])));
-              }
             }
           }
           isFinish = true;
@@ -106,6 +101,8 @@ export function getProfileApiUrl(customeUrl, enableReadFpid) {
 
 export function readFpidFromLocalStrage() {
   try {
+    // TODO: use storageManager
+    // eslint-disable-next-line prebid/no-global
     const fpid = window.localStorage.getItem('ope_fpid');
     if (fpid) {
       return fpid;
@@ -156,4 +153,37 @@ function init(moduleConfig) {
 function registerSubModule() {
   submodule('realTimeData', dgkeywordSubmodule);
 }
+
+// keywords: { 'genre': ['rock', 'pop'], 'pets': ['dog'] } goes to 'genre=rock,genre=pop,pets=dog'
+export function convertKeywordsToString(keywords) {
+  let result = '';
+  Object.keys(keywords).forEach(key => {
+    // if 'text' or ''
+    if (isStr(keywords[key])) {
+      if (keywords[key] !== '') {
+        result += `${key}=${keywords[key]},`
+      } else {
+        result += `${key},`;
+      }
+    } else if (isArray(keywords[key])) {
+      let isValSet = false
+      keywords[key].forEach(val => {
+        if (isStr(val) && val) {
+          result += `${key}=${val},`
+          isValSet = true
+        }
+      });
+      if (!isValSet) {
+        result += `${key},`
+      }
+    } else {
+      result += `${key},`
+    }
+  });
+
+  // remove last trailing comma
+  result = result.substring(0, result.length - 1);
+  return result;
+}
+
 registerSubModule();
diff --git a/modules/dianomiBidAdapter.js b/modules/dianomiBidAdapter.js
index d4b2a4a5da5..3e90a76cf9e 100644
--- a/modules/dianomiBidAdapter.js
+++ b/modules/dianomiBidAdapter.js
@@ -10,10 +10,13 @@ import {
   parseSizesInput,
   deepSetValue,
   formatQS,
+  setOnAny
 } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+import {getUserSyncParams} from '../libraries/userSyncUtils/userSyncUtils.js';
 
 const { getConfig } = config;
 
@@ -113,7 +116,7 @@ export const spec = {
       setOnAny(validBidRequests, 'params.priceType') ||
       'net';
     const tid = bidderRequest.ortb2?.source?.tid;
-    const currency = getConfig('currency.adServerCurrency');
+    const currency = getCurrencyFromBidderRequest(bidderRequest);
     const cur = currency && [currency];
     const eids = setOnAny(validBidRequests, 'userIdAsEids');
     const schain = setOnAny(validBidRequests, 'schain');
@@ -126,8 +129,8 @@ export const spec = {
           currency: currency || 'USD',
         })
         : {};
-      const bidfloor = floorInfo.floor;
-      const bidfloorcur = floorInfo.currency;
+      const bidfloor = floorInfo?.floor;
+      const bidfloorcur = floorInfo?.currency;
       const { smartadId } = bid.params;
 
       const imp = {
@@ -301,19 +304,8 @@ export const spec = {
       .filter(Boolean);
   },
   getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
-    const params = {};
-    if (gdprConsent) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        params['gdpr'] = Number(gdprConsent.gdprApplies);
-      }
-      if (typeof gdprConsent.consentString === 'string') {
-        params['gdpr_consent'] = gdprConsent.consentString;
-      }
-    }
+    const params = getUserSyncParams(gdprConsent, uspConsent);
 
-    if (uspConsent) {
-      params['us_privacy'] = encodeURIComponent(uspConsent);
-    }
     if (syncOptions.iframeEnabled) {
       // data is only assigned if params are available to pass to syncEndpoint
       return {
@@ -355,15 +347,6 @@ function parseNative(bid) {
   return result;
 }
 
-function setOnAny(collection, key) {
-  for (let i = 0, result; i < collection.length; i++) {
-    result = deepAccess(collection[i], key);
-    if (result) {
-      return result;
-    }
-  }
-}
-
 function flatten(arr) {
   return [].concat(...arr);
 }
diff --git a/modules/digitalMatterBidAdapter.js b/modules/digitalMatterBidAdapter.js
new file mode 100644
index 00000000000..77df1af3886
--- /dev/null
+++ b/modules/digitalMatterBidAdapter.js
@@ -0,0 +1,210 @@
+import {deepAccess, deepSetValue, getDNT, inIframe, logWarn, parseSizesInput} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
+
+const BIDDER_CODE = 'digitalMatter';
+const GVLID = 1345;
+const ENDPOINT_URL = 'https://adx.digitalmatter.services/'
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+  aliases: ['dichange', 'digitalmatter'],
+  bidParameters: ['accountId', 'siteId'],
+  isBidRequestValid: function (bid) {
+    if (typeof bid.params !== 'object') {
+      return false;
+    }
+    if (!hasBannerMediaType(bid)) {
+      logWarn('Invalid bid request: missing required mediaType - banner');
+      return false;
+    }
+
+    return !!(bid.params.accountId && bid.params.siteId)
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const common = bidderRequest.ortb2 || {};
+    const site = common.site;
+    const tid = common?.source?.tid;
+    const {user} = common || {};
+
+    if (!site.page) {
+      site.page = bidderRequest.refererInfo.page;
+    }
+
+    const device = getDevice(common.device);
+    const schain = getByKey(validBidRequests, 'schain');
+    const eids = getByKey(validBidRequests, 'userIdAsEids');
+    const currency = config.getConfig('currency')
+    const cur = currency && [currency];
+
+    const imp = validBidRequests.map((bid, id) => {
+      const {accountId, siteId} = bid.params;
+      const bannerParams = deepAccess(bid, 'mediaTypes.banner');
+      const position = deepAccess(bid, 'mediaTypes.banner.pos') ?? 0;
+
+      return {
+        id: bid.adUnitCode,
+        bidId: bid.bidId,
+        accountId: accountId,
+        adUnitCode: bid.adUnitCode,
+        siteId: siteId,
+        banner: {
+          pos: position,
+          topframe: inIframe() ? 0 : 1,
+          format: bannerParams.sizes.map(sizeArr => ({
+            w: sizeArr[0],
+            h: sizeArr[1]
+          }))
+        },
+        sizes: parseSizesInput(bannerParams.sizes),
+      };
+    });
+
+    const ext = {
+      prebid: {
+        targeting: {
+          includewinners: true,
+          includebidderkeys: false
+        }
+      }
+    };
+
+    const payload = {
+      id: bidderRequest.bidderRequestId,
+      tid,
+      site,
+      device,
+      user,
+      cur,
+      imp,
+      test: config.getConfig('debug') ? 1 : 0,
+      tmax: bidderRequest.timeout,
+      start: bidderRequest.auctionStart,
+      ext
+    };
+
+    if (schain) {
+      deepSetValue(payload, 'source.ext.schain', schain);
+    }
+
+    if (eids) {
+      deepSetValue(payload, 'user.ext.eids', eids);
+    }
+
+    if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies') !== undefined) {
+      deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(payload, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1);
+    }
+
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL + 'openrtb2/auction',
+      data: payloadString,
+    };
+  },
+  interpretResponse: function (serverResponse) {
+    const body = serverResponse.body || serverResponse;
+    const {cur} = body;
+    const bids = [];
+
+    if (body && body.bids && Array.isArray(body.bids)) {
+      body.bids.forEach(bidItem => {
+        const bid = {
+          requestId: bidItem.bidid,
+          adomain: bidItem.adomain,
+          cpm: bidItem.cpm,
+          currency: cur,
+          netRevenue: true,
+          ttl: bidItem.ttl || 300,
+          creativeId: bidItem.creativeid,
+          width: bidItem.width,
+          height: bidItem.height,
+          dealId: bidItem.dealid,
+          ad: bidItem.ad,
+          meta: bidItem.meta,
+        };
+
+        bids.push(bid);
+      });
+    }
+
+    return bids
+  },
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
+    if (usersSynced) {
+      return [];
+    }
+
+    const userSyncs = [];
+
+    function checkGppStatus(gppConsent) {
+      if (gppConsent && Array.isArray(gppConsent.applicableSections)) {
+        return gppConsent.applicableSections.every(sec => typeof sec === 'number' && sec <= 5);
+      }
+      return true;
+    }
+
+    if (hasPurpose1Consent(gdprConsent) && checkGppStatus(gppConsent)) {
+      responses.forEach(response => {
+        if (response.body.ext && response.body.ext.usersync) {
+          try {
+            const userSync = response.body.ext.usersync;
+
+            userSync.forEach((element) => {
+              let url = element.url;
+              let type = element.type;
+
+              if (url) {
+                if ((type === 'image' || type === 'redirect') && syncOptions.pixelEnabled) {
+                  userSyncs.push({type: 'image', url: url});
+                } else if (type === 'iframe' && syncOptions.iframeEnabled) {
+                  userSyncs.push({type: 'iframe', url: url});
+                }
+              }
+            })
+          } catch (e) {
+            //
+          }
+        }
+      });
+    }
+
+    return userSyncs;
+  }
+}
+
+let usersSynced = false;
+
+function hasBannerMediaType(bidRequest) {
+  return !!deepAccess(bidRequest, 'mediaTypes.banner');
+}
+
+function getDevice(data) {
+  let dnt = data.dnt;
+  if (!dnt) {
+    dnt = getDNT() ? 1 : 0;
+  }
+  return {
+    w: data.w || window.innerWidth,
+    h: data.h || window.innerHeight,
+    ua: data.ua || navigator.userAgent,
+    dnt: dnt,
+    language: data.language || navigator.language,
+  }
+}
+
+function getByKey(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/digitalMatterBidAdapter.md b/modules/digitalMatterBidAdapter.md
new file mode 100644
index 00000000000..19c0ecd631a
--- /dev/null
+++ b/modules/digitalMatterBidAdapter.md
@@ -0,0 +1,38 @@
+# Overview
+
+```
+Module Name: Digital Matter Bid Adapter
+Module Type: Digital Matter Bid Adapter
+Maintainer: prebid@digitalmatter.ai
+```
+
+# Description
+
+Module that connects to Digital Matter demand sources
+
+# Banner Test Parameters
+
+```js
+var adUnits = [
+  {
+    code: "test-banner",
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 600]
+        ]
+      }
+    },
+    bids: [
+      {
+        bidder: "digitalMatter",
+        params: {
+          accountId: "1_demo_1", // string, required
+          siteId: "1-demo-1" // string, required
+        }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/discoveryBidAdapter.js b/modules/discoveryBidAdapter.js
index 7ad75f64215..0dbb1a3a6cb 100644
--- a/modules/discoveryBidAdapter.js
+++ b/modules/discoveryBidAdapter.js
@@ -2,18 +2,39 @@ import * as utils from '../src/utils.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { getPageTitle, getPageDescription, getPageKeywords, getConnectionDownLink, getReferrer } from '../libraries/fpdUtils/pageInfo.js';
+import { getDevice, getScreenSize } from '../libraries/fpdUtils/deviceInfo.js';
+import { getBidFloor } from '../libraries/currencyUtils/floor.js';
+import { transformSizes, normalAdSize } from '../libraries/sizeUtils/tranformSize.js';
+import { getHLen } from '../libraries/navigatorData/navigatorData.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
 
 const BIDDER_CODE = 'discovery';
 const ENDPOINT_URL = 'https://rtb-jp.mediago.io/api/bid?tn=';
 const TIME_TO_LIVE = 500;
-const storage = getStorageManager({bidderCode: BIDDER_CODE});
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 let globals = {};
 let itemMaps = {};
 const MEDIATYPE = [BANNER, NATIVE];
 
 /* ----- _ss_pp_id:start ------ */
 const COOKIE_KEY_SSPPID = '_ss_pp_id';
-const COOKIE_KEY_MGUID = '__mguid_';
+export const COOKIE_KEY_MGUID = '__mguid_';
+const COOKIE_KEY_PMGUID = '__pmguid_';
+const COOKIE_KEY_PBUID = 'pub_pp_tag';
+const STORAGE_KEY_FTUID = 'fluct_ppUUIDv4';
+const STORAGE_KEY_IMUID = '__im_ppid';
+const COOKIE_RETENTION_TIME = 365 * 24 * 60 * 60 * 1000; // 1 year
+const COOKY_SYNC_IFRAME_URL = 'https://asset.popin.cc/js/cookieSync.html';
+export const THIRD_PARTY_COOKIE_ORIGIN = 'https://asset.popin.cc';
+
+const UTM_KEY = '_ss_pp_utm';
+let UTMValue = {};
 
 const NATIVERET = {
   id: 'id',
@@ -55,24 +76,22 @@ const NATIVERET = {
 };
 
 /**
- * 获取用户id
+ * get pmg uid
+ * 获取并生成用户的id
  * @return {string}
  */
-const getUserID = () => {
-  let idd = storage.getCookie(COOKIE_KEY_SSPPID);
-  let idm = storage.getCookie(COOKIE_KEY_MGUID);
-
-  if (idd && !idm) {
-    idm = idd;
-  } else if (idm && !idd) {
-    idd = idm;
-  } else if (!idd && !idm) {
-    const uuid = utils.generateUUID();
-    storage.setCookie(COOKIE_KEY_MGUID, uuid);
-    storage.setCookie(COOKIE_KEY_SSPPID, uuid);
-    return uuid;
+export const getPmgUID = () => {
+  if (!storage.cookiesAreEnabled()) return;
+
+  let pmgUid = storage.getCookie(COOKIE_KEY_PMGUID);
+  if (!pmgUid) {
+    pmgUid = utils.generateUUID();
   }
-  return idd;
+  // Extend the expiration time of pmguid
+  try {
+    storage.setCookie(COOKIE_KEY_PMGUID, pmgUid, getCookieTimeToUTCString());
+  } catch (e) {}
+  return pmgUid;
 };
 
 /* ----- _ss_pp_id:end ------ */
@@ -96,121 +115,53 @@ function getKv(obj, ...keys) {
   return o;
 }
 
-/**
- * get device
- * @return {boolean}
- */
-function getDevice() {
-  let check = false;
-  (function (a) {
-    let reg1 = new RegExp(
-      [
-        '(android|bbd+|meego)',
-        '.+mobile|avantgo|bada/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)',
-        '|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone',
-        '|p(ixi|re)/|plucker|pocket|psp|series(4|6)0|symbian|treo|up.(browser|link)|vodafone|wap',
-        '|windows ce|xda|xiino|android|ipad|playbook|silk',
-      ].join(''),
-      'i'
-    );
-    let reg2 = new RegExp(
-      [
-        '1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)',
-        '|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )',
-        '|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55/|capi|ccwa|cdm-|cell',
-        '|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)',
-        '|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene',
-        '|gf-5|g-mo|go(.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c',
-        '|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|/)|ibro|idea|ig01|ikom',
-        '|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc-|kyo(c|k)',
-        '|le(no|xi)|lg( g|/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)',
-        '|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]',
-        '|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)',
-        '|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio',
-        '|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms',
-        '|ny|va)|sc(01|h-|oo|p-)|sdk/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al',
-        '|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)',
-        '|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(.b|g1|si)|utst|',
-        'v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)',
-        '|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-',
-        '|your|zeto|zte-',
-      ].join(''),
-      'i'
-    );
-    if (reg1.test(a) || reg2.test(a.substr(0, 4))) {
-      check = true;
-    }
-  })(navigator.userAgent || navigator.vendor || window.opera);
-  return check;
-}
+// Support sizes
+const popInAdSize = normalAdSize;
 
 /**
- * get BidFloor
- * @param {*} bid
- * @param {*} mediaType
- * @param {*} sizes
- * @returns
+ * get cookie time to UTC string
+ * @returns utc string
  */
-function getBidFloor(bid) {
-  if (!utils.isFn(bid.getFloor)) {
-    return utils.deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0;
-  }
+export function getCookieTimeToUTCString() {
+  const date = new Date();
+  date.setTime(date.getTime() + COOKIE_RETENTION_TIME);
+  return date.toUTCString();
 }
 
 /**
- * get sizes for rtb
- * @param  {Array|Object} requestSizes
- * @return {Object}
+ * format imp ad test ext params
+ *
+ * @param validBidRequest sigleBidRequest
+ * @param bidderRequest
  */
-function transformSizes(requestSizes) {
-  let sizes = [];
-  let sizeObj = {};
-
-  if (
-    utils.isArray(requestSizes) &&
-    requestSizes.length === 2 &&
-    !utils.isArray(requestSizes[0])
-  ) {
-    sizeObj.width = parseInt(requestSizes[0], 10);
-    sizeObj.height = parseInt(requestSizes[1], 10);
-    sizes.push(sizeObj);
-  } else if (typeof requestSizes === 'object') {
-    for (let i = 0; i < requestSizes.length; i++) {
-      let size = requestSizes[i];
-      sizeObj = {};
-      sizeObj.width = parseInt(size[0], 10);
-      sizeObj.height = parseInt(size[1], 10);
-      sizes.push(sizeObj);
-    }
-  }
-
-  return sizes;
+function addImpExtParams(bidRequest = {}, bidderRequest = {}) {
+  const { deepAccess } = utils;
+  const { params = {}, adUnitCode, bidId } = bidRequest;
+  const ext = {
+    bidId: bidId || '',
+    adUnitCode: adUnitCode || '',
+    token: params.token || '',
+    siteId: params.siteId || '',
+    zoneId: params.zoneId || '',
+    publisher: params.publisher || '',
+    p_pos: params.position || '',
+    screenSize: getScreenSize(),
+    referrer: getReferrer(bidRequest, bidderRequest),
+    stack: deepAccess(bidRequest, 'refererInfo.stack', []),
+    b_pos: deepAccess(bidRequest, 'mediaTypes.banner.pos', '', ''),
+    ortbUser: deepAccess(bidRequest, 'ortb2.user', {}, {}),
+    ortbSite: deepAccess(bidRequest, 'ortb2.site', {}, {}),
+    tid: deepAccess(bidRequest, 'ortb2Imp.ext.tid', '', ''),
+    browsiViewability: deepAccess(bidRequest, 'ortb2Imp.ext.data.browsi.browsiViewability', '', ''),
+    adserverName: deepAccess(bidRequest, 'ortb2Imp.ext.data.adserver.name', '', ''),
+    adslot: deepAccess(bidRequest, 'ortb2Imp.ext.data.adserver.adslot', '', ''),
+    keywords: deepAccess(bidRequest, 'ortb2Imp.ext.data.keywords', '', ''),
+    gpid: deepAccess(bidRequest, 'ortb2Imp.ext.gpid', '', ''),
+    pbadslot: deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot', '', ''),
+  };
+  return ext;
 }
 
-// Support sizes
-const popInAdSize = [
-  { w: 300, h: 250 },
-  { w: 300, h: 600 },
-  { w: 728, h: 90 },
-  { w: 970, h: 250 },
-  { w: 320, h: 50 },
-  { w: 160, h: 600 },
-  { w: 320, h: 180 },
-  { w: 320, h: 100 },
-  { w: 336, h: 280 },
-];
-
 /**
  * get aditem setting
  * @param {Array}  validBidRequests an an array of bids
@@ -244,9 +195,8 @@ function getItems(validBidRequests, bidderRequest) {
         }
       }
       if (!matchSize) {
-        matchSize = sizes[0]
-          ? { h: sizes[0].height || 0, w: sizes[0].width || 0 }
-          : { h: 0, w: 0 };
+        const { height = 0, width = 0 } = sizes[0] || {};
+        matchSize = { h: height, w: width };
       }
       ret = {
         id: id,
@@ -261,6 +211,11 @@ function getItems(validBidRequests, bidderRequest) {
         tagid: req.params && req.params.tagid
       };
     }
+
+    try {
+      ret.ext = addImpExtParams(req, bidderRequest);
+    } catch (e) {}
+
     itemMaps[id] = {
       req,
       ret,
@@ -270,6 +225,20 @@ function getItems(validBidRequests, bidderRequest) {
   return items;
 }
 
+export const buildUTMTagData = (url) => {
+  if (!storage.cookiesAreEnabled()) return;
+  const urlParams = utils.parseUrl(url).search || {};
+  const UTMParams = {};
+  Object.keys(urlParams).forEach(key => {
+    if (/^utm_/.test(key)) {
+      UTMParams[key] = urlParams[key];
+    }
+  });
+  UTMValue = JSON.parse(storage.getCookie(UTM_KEY) || '{}');
+  Object.assign(UTMValue, UTMParams);
+  storage.setCookie(UTM_KEY, JSON.stringify(UTMValue), getCookieTimeToUTCString());
+}
+
 /**
  * get rtb qequest params
  *
@@ -278,10 +247,10 @@ function getItems(validBidRequests, bidderRequest) {
  * @return {Object}
  */
 function getParam(validBidRequests, bidderRequest) {
-  const pubcid = utils.deepAccess(validBidRequests[0], 'crumbs.pubcid');
   const sharedid =
     utils.deepAccess(validBidRequests[0], 'userId.sharedid.id') ||
-    utils.deepAccess(validBidRequests[0], 'userId.pubcid');
+    utils.deepAccess(validBidRequests[0], 'userId.pubcid') ||
+    utils.deepAccess(validBidRequests[0], 'crumbs.pubcid');
   const eids = validBidRequests[0].userIdAsEids || validBidRequests[0].userId;
 
   let isMobile = getDevice() ? 1 : 0;
@@ -298,6 +267,36 @@ function getParam(validBidRequests, bidderRequest) {
   const page = utils.deepAccess(bidderRequest, 'refererInfo.page');
   const referer = utils.deepAccess(bidderRequest, 'refererInfo.ref');
   const firstPartyData = bidderRequest.ortb2;
+  const tpData = utils.deepAccess(bidderRequest, 'ortb2.user.data') || undefined;
+  const title = getPageTitle();
+  const desc = getPageDescription();
+  const keywords = getPageKeywords();
+  let ext = {};
+  try {
+    ext = {
+      eids,
+      firstPartyData,
+      ssppid: storage.getCookie(COOKIE_KEY_SSPPID) || undefined,
+      pmguid: getPmgUID(),
+      ssftUid: storage.getDataFromLocalStorage(STORAGE_KEY_FTUID) || undefined,
+      ssimUid: storage.getDataFromLocalStorage(STORAGE_KEY_IMUID) || undefined,
+      sspbid: storage.getCookie(COOKIE_KEY_PBUID) || undefined,
+      tpData,
+      utm: storage.getCookie(UTM_KEY),
+      page: {
+        title: title ? title.slice(0, 150) : undefined,
+        desc: desc ? desc.slice(0, 300) : undefined,
+        keywords: keywords ? keywords.slice(0, 100) : undefined,
+        hLen: getHLen(),
+      },
+      device: {
+        nbw: getConnectionDownLink(),
+      }
+    }
+  } catch (error) {}
+  try {
+    buildUTMTagData(page);
+  } catch (error) { }
 
   if (items && items.length) {
     let c = {
@@ -315,15 +314,11 @@ function getParam(validBidRequests, bidderRequest) {
         ua: navigator.userAgent,
         language: /en/.test(navigator.language) ? 'en' : navigator.language,
       },
-      ext: {
-        eids,
-        firstPartyData,
-      },
+      ext,
       user: {
-        buyeruid: getUserID(),
-        id: sharedid || pubcid,
+        buyeruid: storage.getCookie(COOKIE_KEY_MGUID) || undefined,
+        id: sharedid,
       },
-      eids,
       tmax: timeout,
       site: {
         name: domain,
@@ -372,7 +367,7 @@ export const spec = {
     if (bid.params.badv) {
       globals['badv'] = Array.isArray(bid.params.badv) ? bid.params.badv : [];
     }
-    return !!(bid.params.token && bid.params.publisher && bid.params.tagid);
+    return true;
   },
 
   /**
@@ -383,12 +378,15 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    let payload = getParam(validBidRequests, bidderRequest);
+    const pbToken = globals['token'];
+    if (!pbToken) return;
 
+    let payload = getParam(validBidRequests, bidderRequest);
     const payloadString = JSON.stringify(payload);
+
     return {
       method: 'POST',
-      url: ENDPOINT_URL + globals['token'],
+      url: `${ENDPOINT_URL}${pbToken}`,
       data: payloadString,
     };
   },
@@ -485,6 +483,45 @@ export const spec = {
     return bidResponses;
   },
 
+  getUserSyncs: function (syncOptions, serverResponse, gdprConsent, uspConsent, gppConsent) {
+    const origin = encodeURIComponent(location.origin || `https://${location.host}`);
+    let syncParamUrl = `dm=${origin}`;
+
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncParamUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncParamUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncParamUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    if (syncOptions.iframeEnabled) {
+      window.addEventListener('message', function handler(event) {
+        if (!event.data || event.origin != THIRD_PARTY_COOKIE_ORIGIN) {
+          return;
+        }
+
+        this.removeEventListener('message', handler);
+
+        event.stopImmediatePropagation();
+
+        const response = event.data;
+        if (!response.optout && response.mguid) {
+          storage.setCookie(COOKIE_KEY_MGUID, response.mguid, getCookieTimeToUTCString());
+        }
+      }, true);
+      return [
+        {
+          type: 'iframe',
+          url: `${COOKY_SYNC_IFRAME_URL}?${syncParamUrl}`
+        }
+      ];
+    }
+  },
+
   /**
    * Register bidder specific code, which will execute if bidder timed out after an auction
    * @param {data} Containing timeout specific data
diff --git a/modules/djaxBidAdapter.js b/modules/djaxBidAdapter.js
new file mode 100644
index 00000000000..7a9e359f520
--- /dev/null
+++ b/modules/djaxBidAdapter.js
@@ -0,0 +1,113 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import * as utils from '../src/utils.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import { ajax } from '../src/ajax.js';
+import {Renderer} from '../src/Renderer.js';
+
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+const BIDDER_CODE = 'djax';
+const DOMAIN = 'https://revphpe.djaxbidder.com/header_bidding_vast/';
+const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+
+function outstreamRender(bidAd) {
+  bidAd.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      sizes: [bidAd.width, bidAd.height],
+      width: bidAd.width,
+      height: bidAd.height,
+      targetId: bidAd.adUnitCode,
+      adResponse: bidAd.adResponse,
+      rendererOptions: {
+        showVolume: false,
+        allowFullscreen: false
+      }
+    });
+  });
+}
+
+function createRenderer(bidAd, rendererParams, adUnitCode) {
+  const renderer = Renderer.install({
+    id: rendererParams.id,
+    url: rendererParams.url,
+    loaded: false,
+    config: {'player_height': bidAd.height, 'player_width': bidAd.width},
+    adUnitCode
+  });
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    utils.logWarn('Prebid Error calling setRender on renderer', err);
+  }
+  return renderer;
+}
+
+function sendResponseToServer(data) {
+  ajax(DOMAIN + 'www/admin/plugins/Prebid/tracking/track.php', null, JSON.stringify(data), {
+    withCredentials: false,
+    method: 'POST',
+    crossOrigin: true
+  });
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+
+  isBidRequestValid: function(bid) {
+    return (typeof bid.params !== 'undefined' && parseInt(utils.getValue(bid.params, 'publisherId')) > 0);
+  },
+
+  buildRequests: function(validBidRequests) {
+    return {
+      method: 'POST',
+      url: DOMAIN + 'www/admin/plugins/Prebid/getAd.php',
+      options: {
+        withCredentials: false,
+        crossOrigin: true
+      },
+      data: validBidRequests,
+    };
+  },
+
+  interpretResponse: function(serverResponse, request) {
+    const response = serverResponse.body;
+    const bidResponses = [];
+    var bidRequestResponses = [];
+
+    utils._each(response, function(bidAd) {
+      bidAd.adResponse = {
+        content: bidAd.vastXml,
+        height: bidAd.height,
+        width: bidAd.width
+      };
+
+      bidAd.renderer = bidAd.context === 'outstream' ? createRenderer(bidAd, {
+        id: bidAd.adUnitCode,
+        url: RENDERER_URL
+      }, bidAd.adUnitCode) : undefined;
+      bidResponses.push(bidAd);
+    });
+
+    bidRequestResponses.push({
+      function: 'saveResponses',
+      request: request,
+      response: bidResponses
+    });
+    sendResponseToServer(bidRequestResponses);
+    return bidResponses;
+  },
+
+  onBidWon: function(bid) {
+    let wonBids = [];
+    wonBids.push(bid);
+    wonBids[0].function = 'onBidWon';
+    sendResponseToServer(wonBids);
+  },
+
+  onTimeout: function(details) {
+    details.unshift({ 'function': 'onTimeout' });
+    sendResponseToServer(details);
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/djaxBidAdapter.md b/modules/djaxBidAdapter.md
new file mode 100644
index 00000000000..d36a92de458
--- /dev/null
+++ b/modules/djaxBidAdapter.md
@@ -0,0 +1,51 @@
+# Overview
+
+```
+Module Name: Djax Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@djaxtech.com
+```
+
+# Description
+
+Module that connects to Djax
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+               {
+                   bidder: "djax",
+                   params: {
+                        publisherId: '2' // string - required
+                    }
+               }
+           ]
+        }
+    ];
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                video: {
+                   playerSize: [[480, 320]],  // a display size
+                }
+            },
+            bids: [
+               {
+                   bidder: "djax",
+                   params: {
+                        publisherId: '12' // string - required
+                    }
+               }
+           ]
+        }
+    ];
\ No newline at end of file
diff --git a/modules/dmdIdSystem.js b/modules/dmdIdSystem.js
index 2f910a8bd92..3575e658a2a 100644
--- a/modules/dmdIdSystem.js
+++ b/modules/dmdIdSystem.js
@@ -9,6 +9,13 @@ import { logError, getWindowLocation } from '../src/utils.js';
 import { submodule } from '../src/hook.js';
 import { ajax } from '../src/ajax.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'dmdId';
 
 /** @type {Submodule} */
diff --git a/modules/docereeAdManagerBidAdapter.js b/modules/docereeAdManagerBidAdapter.js
new file mode 100644
index 00000000000..e26045c8f1f
--- /dev/null
+++ b/modules/docereeAdManagerBidAdapter.js
@@ -0,0 +1,154 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER } from '../src/mediaTypes.js';
+const BIDDER_CODE = 'docereeadmanager';
+const END_POINT = 'https://dai.doceree.com/drs/quest';
+
+export const spec = {
+  code: BIDDER_CODE,
+  url: '',
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: (bid) => {
+    const { placementId } = bid.params;
+    return !!placementId;
+  },
+  isGdprConsentPresent: (bid) => {
+    const { gdpr, gdprconsent } = bid.params;
+    if (gdpr == '1') {
+      return !!gdprconsent;
+    }
+    return true;
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const serverRequests = [];
+    const { data } = config.getConfig('docereeadmanager.user') || {};
+
+    validBidRequests.forEach(function (validBidRequest) {
+      const payload = getPayload(validBidRequest, data, bidderRequest);
+
+      if (!payload) {
+        return;
+      }
+
+      serverRequests.push({
+        method: 'POST',
+        url: END_POINT,
+        data: JSON.stringify(payload.data),
+        options: {
+          contentType: 'application/json',
+          withCredentials: true,
+        },
+      });
+    });
+
+    return serverRequests;
+  },
+  interpretResponse: (serverResponse) => {
+    const responseJson = serverResponse ? serverResponse.body : {};
+    const bidResponse = {
+      ad: responseJson.ad,
+      width: Number(responseJson.width),
+      height: Number(responseJson.height),
+      requestId: responseJson.requestId,
+      netRevenue: true,
+      ttl: 30,
+      cpm: responseJson.cpm,
+      currency: responseJson.currency,
+      mediaType: BANNER,
+      creativeId: responseJson.creativeId,
+      meta: {
+        advertiserDomains:
+          Array.isArray(responseJson.meta.advertiserDomains) &&
+          responseJson.meta.advertiserDomains.length > 0
+            ? responseJson.meta.advertiserDomains
+            : [],
+      },
+    };
+
+    return [bidResponse];
+  },
+};
+
+export function getPageUrl() {
+  let url = '';
+  try {
+    url = window.location.href;
+  } catch (error) {
+  }
+  return url;
+}
+
+export function getPayload(bid, userData, bidderRequest) {
+  if (!userData || !bid) {
+    return false;
+  }
+
+  const { bidId, params } = bid;
+  const { placementId, publisherUrl } = params;
+  const {
+    userid,
+    email,
+    firstname,
+    lastname,
+    hcpid,
+    dob,
+    specialization,
+    gender,
+    city,
+    state,
+    zipcode,
+    hashedNPI,
+    hashedhcpid,
+    hashedemail,
+    hashedmobile,
+    country,
+    organization,
+    platformUid,
+    mobile
+  } = userData;
+
+  const data = {
+    userid: platformUid || userid || '',
+    email: email || '',
+    firstname: firstname || '',
+    lastname: lastname || '',
+    specialization: specialization || '',
+    hcpid: hcpid || '',
+    gender: gender || '',
+    city: city || '',
+    state: state || '',
+    zipcode: zipcode || '',
+    hashedNPI: hashedNPI || '',
+    pb: 1,
+    adunit: placementId || '',
+    requestId: bidId || '',
+    hashedhcpid: hashedhcpid || '',
+    hashedemail: hashedemail || '',
+    hashedmobile: hashedmobile || '',
+    country: country || '',
+    organization: organization || '',
+    dob: dob || '',
+    userconsent: 1,
+    mobile: mobile || '',
+    pageurl: publisherUrl || getPageUrl() || ''
+  };
+
+  try {
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      const { gdprApplies, consentString } = bidderRequest.gdprConsent;
+      data['consent'] = {
+        'gdpr': gdprApplies ? 1 : 0,
+        'gdprstr': consentString || '',
+      }
+    }
+  } catch (error) {
+
+  }
+
+  return {
+    data,
+  };
+}
+
+registerBidder(spec);
diff --git a/modules/docereeAdManagerBidAdapter.md b/modules/docereeAdManagerBidAdapter.md
new file mode 100644
index 00000000000..bedbf57b179
--- /dev/null
+++ b/modules/docereeAdManagerBidAdapter.md
@@ -0,0 +1,68 @@
+# Overview
+
+```
+Module Name: Doceree AdManager Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: tech.stack@doceree.com
+```
+
+
+
+Connects to Doceree demand source to fetch bids.  
+Please use `docereeadmanager` as the bidder code.
+
+# Test Parameters
+
+```
+var adUnits = [
+   {
+       code: 'DOC-397-1',
+       sizes: [
+          [300, 250]
+       ],
+       bids: [
+           {
+               bidder: 'docereeadmanager',
+               params: {
+                    placementId: 'DOC-19-1', //required
+                    publisherUrl: document.URL || window.location.href, //optional
+                    gdpr: '1', //optional
+                    gdprconsent:'CPQfU1jPQfU1jG0AAAENAwCAAAAAAAAAAAAAAAAAAAAA.IGLtV_T9fb2vj-_Z99_tkeYwf95y3p-wzhheMs-8NyZeH_B4Wv2MyvBX4JiQKGRgksjLBAQdtHGlcTQgBwIlViTLMYk2MjzNKJrJEilsbO2dYGD9Pn8HT3ZCY70-vv__7v3ff_3g', //optional
+               }
+            }
+       ]
+   }
+];
+```
+
+```javascript
+pbjs.setBidderConfig({
+  bidders: ['docereeadmanager'],
+  config: {
+    docereeadmanager: {
+      user: {
+        data: {
+          email: 'XXX.XXX@GMAIL.COM',
+          firstname: 'DR. XXX',
+          lastname: 'XXX',
+          mobile: '981234XXXX',
+          specialization: 'Internal Medicine',
+          organization: 'Max Lifecare',
+          hcpid: '199291XXXX',
+          dob: '1987-08-27',
+          gender: 'Female',
+          city: 'Oildale',
+          state: 'California',
+          country: 'California',
+          hashedhcpid: '',
+          hashedemail: '',
+          hashedmobile: '',
+          userid: '7d26d8ca-233a-46c2-9d36-7c5d261e151d',
+          zipcode: '',
+          userconsent: '1',
+        },
+      },
+    },
+  },
+});
+```
diff --git a/modules/docereeBidAdapter.js b/modules/docereeBidAdapter.js
index fa4446ede47..2731e1ff397 100644
--- a/modules/docereeBidAdapter.js
+++ b/modules/docereeBidAdapter.js
@@ -1,9 +1,11 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { triggerPixel } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { BANNER } from '../src/mediaTypes.js';
 import {tryAppendQueryString} from '../libraries/urlUtils/urlUtils.js';
 const BIDDER_CODE = 'doceree';
 const END_POINT = 'https://bidder.doceree.com'
+const TRACKING_END_POINT = 'https://tracking.doceree.com'
 
 export const spec = {
   code: BIDDER_CODE,
@@ -69,6 +71,33 @@ export const spec = {
       }
     };
     return [bidResponse];
+  },
+  onTimeout: function(timeoutData) {
+    if (timeoutData == null || !timeoutData.length) {
+      return;
+    }
+    timeoutData.forEach(td => {
+      const encodedBuf = window.btoa(encodeURIComponent(JSON.stringify({
+        bidId: td.bidId,
+        timeout: td.timeout,
+      })));
+      triggerPixel(TRACKING_END_POINT + '/v1/hbTimeout?adp=prebidjs&data=' + encodedBuf);
+    })
+  },
+  onBidWon: function (bidWon) {
+    if (bidWon == null) {
+      return;
+    }
+    const encodedBuf = window.btoa(encodeURIComponent(JSON.stringify({
+      requestId: bidWon.requestId,
+      cpm: bidWon.cpm,
+      adId: bidWon.adId,
+      currency: bidWon.currency,
+      netRevenue: bidWon.netRevenue,
+      status: bidWon.status,
+      hb_pb: bidWon.adserverTargeting && bidWon.adserverTargeting.hb_pb,
+    })));
+    triggerPixel(TRACKING_END_POINT + '/v1/hbBidWon?adp=prebidjs&data=' + encodedBuf);
   }
 };
 
diff --git a/modules/driftpixelBidAdapter.js b/modules/driftpixelBidAdapter.js
new file mode 100644
index 00000000000..5dd0d3a5835
--- /dev/null
+++ b/modules/driftpixelBidAdapter.js
@@ -0,0 +1,18 @@
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {buildRequests, getUserSyncs, interpretResponse, isBidRequestValid} from '../libraries/xeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'driftpixel';
+const ENDPOINT = 'https://pbjs.driftpixel.live';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['driftpixel'],
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests: (validBidRequests, bidderRequest) => buildRequests(validBidRequests, bidderRequest, ENDPOINT),
+  interpretResponse,
+  getUserSyncs
+}
+
+registerBidder(spec);
diff --git a/modules/driftpixelBidAdapter.md b/modules/driftpixelBidAdapter.md
new file mode 100644
index 00000000000..277c363bbf0
--- /dev/null
+++ b/modules/driftpixelBidAdapter.md
@@ -0,0 +1,54 @@
+# Overview
+
+```
+Module Name: Driftpixel Bidder Adapter
+Module Type: Driftpixel Bidder Adapter
+Maintainer: developer@driftpixel.ai
+```
+
+# Description
+
+Module that connects to driftpixel.com demand sources
+
+# Test Parameters
+```
+var adUnits = [
+    {
+        code: 'test-banner',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]],
+            }
+        },
+        bids: [
+            {
+                bidder: 'driftpixel',
+                params: {
+                    env: 'driftpixel',
+                    pid: '40',
+                    ext: {}
+                }
+            }
+        ]
+    },
+    {
+        code: 'test-video',
+        sizes: [ [ 640, 480 ] ],
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480],
+                context: 'instream',
+                skipppable: true
+            }
+        },
+        bids: [{
+            bidder: 'driftpixel',
+            params: {
+                env: 'driftpixel',
+                pid: '40',
+                ext: {}
+            }
+        }]
+    }
+];
+```
diff --git a/modules/dsaControl.js b/modules/dsaControl.js
new file mode 100644
index 00000000000..73a1dd19cd4
--- /dev/null
+++ b/modules/dsaControl.js
@@ -0,0 +1,67 @@
+import {config} from '../src/config.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
+import { REJECTION_REASON } from '../src/constants.js';
+import {getHook} from '../src/hook.js';
+import {logInfo, logWarn} from '../src/utils.js';
+
+let expiryHandle;
+let dsaAuctions = {};
+
+export const addBidResponseHook = timedBidResponseHook('dsa', function (fn, adUnitCode, bid, reject) {
+  if (!dsaAuctions.hasOwnProperty(bid.auctionId)) {
+    dsaAuctions[bid.auctionId] = auctionManager.index.getAuction(bid)?.getFPD?.()?.global?.regs?.ext?.dsa;
+  }
+  const dsaRequest = dsaAuctions[bid.auctionId];
+  let rejectReason;
+  if (dsaRequest) {
+    if (!bid.meta?.dsa) {
+      if (dsaRequest.dsarequired === 1) {
+        // request says dsa is supported; response does not have dsa info; warn about it
+        logWarn(`dsaControl: ${REJECTION_REASON.DSA_REQUIRED}; will still be accepted as regs.ext.dsa.dsarequired = 1`, bid);
+      } else if ([2, 3].includes(dsaRequest.dsarequired)) {
+        // request says dsa is required; response does not have dsa info; reject it
+        rejectReason = REJECTION_REASON.DSA_REQUIRED;
+      }
+    } else {
+      if (dsaRequest.pubrender === 0 && bid.meta.dsa.adrender === 0) {
+        // request says publisher can't render; response says advertiser won't; reject it
+        rejectReason = REJECTION_REASON.DSA_MISMATCH;
+      } else if (dsaRequest.pubrender === 2 && bid.meta.dsa.adrender === 1) {
+        // request says publisher will render; response says advertiser will; reject it
+        rejectReason = REJECTION_REASON.DSA_MISMATCH;
+      }
+    }
+  }
+  if (rejectReason) {
+    reject(rejectReason);
+  } else {
+    return fn.call(this, adUnitCode, bid, reject);
+  }
+});
+
+function toggleHooks(enabled) {
+  if (enabled && expiryHandle == null) {
+    getHook('addBidResponse').before(addBidResponseHook);
+    expiryHandle = auctionManager.onExpiry(auction => {
+      delete dsaAuctions[auction.getAuctionId()];
+    });
+    logInfo('dsaControl: DSA bid validation is enabled')
+  } else if (!enabled && expiryHandle != null) {
+    getHook('addBidResponse').getHooks({hook: addBidResponseHook}).remove();
+    expiryHandle();
+    expiryHandle = null;
+    logInfo('dsaControl: DSA bid validation is disabled')
+  }
+}
+
+export function reset() {
+  toggleHooks(false);
+  dsaAuctions = {};
+}
+
+toggleHooks(true);
+
+config.getConfig('consentManagement', (cfg) => {
+  toggleHooks(cfg.consentManagement?.dsa?.validateBids ?? true);
+});
diff --git a/modules/dsp_genieeBidAdapter.js b/modules/dsp_genieeBidAdapter.js
new file mode 100644
index 00000000000..f97c13379f3
--- /dev/null
+++ b/modules/dsp_genieeBidAdapter.js
@@ -0,0 +1,134 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+import { deepAccess, deepSetValue } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
+const BIDDER_CODE = 'dsp_geniee';
+const ENDPOINT_URL = 'https://rt.gsspat.jp/prebid_auction';
+const ENDPOINT_URL_UNCOMFORTABLE = 'https://rt.gsspat.jp/prebid_uncomfortable';
+const ENDPOINT_USERSYNC = 'https://rt.gsspat.jp/prebid_cs';
+const VALID_CURRENCIES = ['USD', 'JPY'];
+const converter = ortbConverter({
+  context: { ttl: 300, netRevenue: true },
+  // set optional parameters
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    deepSetValue(imp, 'ext', bidRequest.params);
+    return imp;
+  }
+});
+
+function USPConsent(consent) {
+  return typeof consent === 'string' && consent[0] === '1' && consent.toUpperCase()[2] === 'Y';
+}
+
+function invalidCurrency(currency) {
+  return typeof currency === 'string' && VALID_CURRENCIES.indexOf(currency.toUpperCase()) === -1;
+}
+
+function hasTest(imp) {
+  if (typeof imp !== 'object') {
+    return false;
+  }
+  for (let i = 0; i < imp.length; i++) {
+    if (deepAccess(imp[i], 'ext.test') === 1) {
+      return true;
+    }
+  }
+  return false;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} _ The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (_) {
+    return true;
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests} validBidRequests - an array of bids
+   * @param {BidderRequest} bidderRequest - the master bidRequest object
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies') || // gdpr
+            USPConsent(bidderRequest.uspConsent) || // usp
+            config.getConfig('coppa') || // coppa
+            invalidCurrency(getCurrencyFromBidderRequest(bidderRequest)) // currency validation
+    ) {
+      return {
+        method: 'GET',
+        url: ENDPOINT_URL_UNCOMFORTABLE
+      };
+    }
+
+    const payload = converter.toORTB({ validBidRequests, bidderRequest });
+
+    if (hasTest(deepAccess(payload, 'imp'))) {
+      deepSetValue(payload, 'test', 1);
+    }
+
+    deepSetValue(payload, 'at', 1); // first price auction only
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payload
+    };
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidRequest - the master bidRequest object
+   * @return {bids} - An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    if (!serverResponse.body) { // empty response (no bids)
+      return [];
+    }
+    const bids = converter.fromORTB({ response: serverResponse.body, request: bidRequest.data }).bids;
+    return bids;
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+    // gdpr & usp
+    if (deepAccess(gdprConsent, 'gdprApplies') || USPConsent(uspConsent)) {
+      return syncs;
+    }
+    if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: ENDPOINT_USERSYNC
+      });
+    }
+    return syncs;
+  }
+};
+registerBidder(spec);
diff --git a/modules/dsp_genieeBidAdapter.md b/modules/dsp_genieeBidAdapter.md
new file mode 100644
index 00000000000..d51d66884af
--- /dev/null
+++ b/modules/dsp_genieeBidAdapter.md
@@ -0,0 +1,39 @@
+# Overview
+
+```markdown
+Module Name:  Geniee Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:   dsp_back@geniee.co.jp
+```
+
+# Description
+This is [Geniee](https://geniee.co.jp) Bidder Adapter for Prebid.js.
+
+Please contact us before using the adapter.
+
+We will provide ads when satisfy the following conditions:
+
+- There are a certain number bid requests by zone
+- The request is a Banner ad
+- Payment is possible in Japanese yen or US dollars
+- The request is not for GDPR or COPPA users
+
+Thus, even if the following test, it will be no bids if the request does not reach a certain requests.
+
+# Test AdUnits
+```javascript
+var adUnits={
+    code: 'geniee-test-ad',
+    bids: [{
+        bidder: 'dsp_geniee',
+        params: {
+            test: 1,
+        }
+    }],
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250]]
+        }
+    }
+};
+```
diff --git a/modules/dspxBidAdapter.js b/modules/dspxBidAdapter.js
index b8e812f581a..acb5fb64d81 100644
--- a/modules/dspxBidAdapter.js
+++ b/modules/dspxBidAdapter.js
@@ -1,14 +1,31 @@
-import {deepAccess, getBidIdParameter, isFn, logError, logMessage, logWarn} from '../src/utils.js';
+import {deepAccess, logMessage, getBidIdParameter, logError, logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {Renderer} from '../src/Renderer.js';
 import {includes} from '../src/polyfill.js';
+import {
+  fillUsersIds,
+  handleSyncUrls,
+  objectToQueryString,
+  isBannerRequest,
+  getVideoContext,
+  convertMediaInfoForRequest,
+  getMediaTypesInfo,
+  getBidFloor,
+  siteContentToString,
+  assignDefinedValues,
+  extractUserSegments,
+  interpretResponse
+} from '../libraries/dspxUtils/bidderUtils.js';
+import {Renderer} from '../src/Renderer.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ */
 const BIDDER_CODE = 'dspx';
 const ENDPOINT_URL = 'https://buyer.dspx.tv/request/';
 const ENDPOINT_URL_DEV = 'https://dcbuyer.dspx.tv/request/';
 const GVLID = 602;
-const VIDEO_ORTB_PARAMS = ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin',
+const VIDEO_ORTB_PARAMS = ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'plcmt', 'linearity', 'skip', 'skipmin',
   'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad',
   'api', 'companiontype', 'ext'];
 
@@ -59,24 +76,18 @@ export const spec = {
         rnd: rnd,
         ref: referrer,
         bid_id: bidId,
-        pbver: '$prebid.version$'
+        pbver: '$prebid.version$',
       };
 
+      payload.pfilter = {};
       if (params.pfilter !== undefined) {
         payload.pfilter = params.pfilter;
       }
 
       if (bidderRequest && bidderRequest.gdprConsent) {
-        if (payload.pfilter !== undefined) {
-          if (!payload.pfilter.gdpr_consent) {
-            payload.pfilter.gdpr_consent = bidderRequest.gdprConsent.consentString;
-            payload.pfilter.gdpr = bidderRequest.gdprConsent.gdprApplies;
-          }
-        } else {
-          payload.pfilter = {
-            'gdpr_consent': bidderRequest.gdprConsent.consentString,
-            'gdpr': bidderRequest.gdprConsent.gdprApplies
-          };
+        if (!payload.pfilter.gdpr_consent) {
+          payload.pfilter.gdpr_consent = bidderRequest.gdprConsent.consentString;
+          payload.pfilter.gdpr = bidderRequest.gdprConsent.gdprApplies;
         }
       }
 
@@ -90,48 +101,10 @@ export const spec = {
         payload.prebidDevMode = 1;
       }
 
-      // fill userId params
-      if (bidRequest.userId) {
-        if (bidRequest.userId.netId) {
-          payload.did_netid = bidRequest.userId.netId;
-        }
-        if (bidRequest.userId.id5id) {
-          payload.did_id5 = bidRequest.userId.id5id.uid || '0';
-          if (bidRequest.userId.id5id.ext.linkType !== undefined) {
-            payload.did_id5_linktype = bidRequest.userId.id5id.ext.linkType;
-          }
-        }
-        let uId2 = deepAccess(bidRequest, 'userId.uid2.id');
-        if (uId2) {
-          payload.did_uid2 = uId2;
-        }
-        let sharedId = deepAccess(bidRequest, 'userId.sharedid.id');
-        if (sharedId) {
-          payload.did_sharedid = sharedId;
-        }
-        let pubcId = deepAccess(bidRequest, 'userId.pubcid');
-        if (pubcId) {
-          payload.did_pubcid = pubcId;
-        }
-        let crumbsPubcid = deepAccess(bidRequest, 'crumbs.pubcid');
-        if (crumbsPubcid) {
-          payload.did_cpubcid = crumbsPubcid;
-        }
-      }
-
-      if (bidRequest.schain) {
-        payload.schain = bidRequest.schain;
-      }
-
-      if (payload.pfilter === undefined || !payload.pfilter.floorprice) {
+      if (!payload.pfilter.floorprice) {
         let bidFloor = getBidFloor(bidRequest);
         if (bidFloor > 0) {
-          if (payload.pfilter !== undefined) {
-            payload.pfilter.floorprice = bidFloor;
-          } else {
-            payload.pfilter = { 'floorprice': bidFloor };
-          }
-          // payload.bidFloor = bidFloor;
+          payload.pfilter.floorprice = bidFloor;
         }
       }
 
@@ -142,6 +115,7 @@ export const spec = {
         payload.pbcode = pbcode;
       }
 
+      // media types
       payload.media_types = convertMediaInfoForRequest(mediaTypesInfo);
       if (mediaTypesInfo[VIDEO] !== undefined) {
         payload.vctx = getVideoContext(bidRequest);
@@ -155,6 +129,33 @@ export const spec = {
           .forEach(key => payload.vpl[key] = videoParams[key]);
       }
 
+      // iab content
+      let content = deepAccess(bidderRequest, 'ortb2.site.content');
+      if (content) {
+        let stringContent = siteContentToString(content);
+        if (stringContent) {
+          payload.pfilter.iab_content = stringContent;
+        }
+      }
+
+      // Google Topics
+      const segments = extractUserSegments(bidderRequest);
+      if (segments) {
+        assignDefinedValues(payload, {
+          segtx: segments.segtax,
+          segcl: segments.segclass,
+          segs: segments.segments
+        });
+      }
+
+      // schain
+      if (bidRequest.schain) {
+        payload.schain = bidRequest.schain;
+      }
+
+      // fill userId params
+      fillUsersIds(bidRequest, payload);
+
       return {
         method: 'GET',
         url: endpoint,
@@ -165,273 +166,11 @@ export const spec = {
   interpretResponse: function(serverResponse, bidRequest) {
     logMessage('DSPx: serverResponse', serverResponse);
     logMessage('DSPx: bidRequest', bidRequest);
-    const bidResponses = [];
-    const response = serverResponse.body;
-    const crid = response.crid || 0;
-    const cpm = response.cpm / 1000000 || 0;
-    if (cpm !== 0 && crid !== 0) {
-      const dealId = response.dealid || '';
-      const currency = response.currency || 'EUR';
-      const netRevenue = (response.netRevenue === undefined) ? true : response.netRevenue;
-      const bidResponse = {
-        requestId: response.bid_id,
-        cpm: cpm,
-        width: response.width,
-        height: response.height,
-        creativeId: crid,
-        dealId: dealId,
-        currency: currency,
-        netRevenue: netRevenue,
-        type: response.type,
-        ttl: 60,
-        meta: {
-          advertiserDomains: response.adomain || []
-        }
-      };
-
-      if (response.vastUrl) {
-        bidResponse.vastUrl = response.vastUrl;
-        bidResponse.mediaType = 'video';
-      }
-      if (response.vastXml) {
-        bidResponse.vastXml = response.vastXml;
-        bidResponse.mediaType = 'video';
-      }
-      if (response.renderer) {
-        bidResponse.renderer = newRenderer(bidRequest, response);
-      }
-
-      if (response.videoCacheKey) {
-        bidResponse.videoCacheKey = response.videoCacheKey;
-      }
-
-      if (response.adTag) {
-        bidResponse.ad = response.adTag;
-      }
-
-      if (response.bid_appendix) {
-        Object.keys(response.bid_appendix).forEach(fieldName => {
-          bidResponse[fieldName] = response.bid_appendix[fieldName];
-        });
-      }
-
-      bidResponses.push(bidResponse);
-    }
-    return bidResponses;
+    return interpretResponse(serverResponse, bidRequest, (bidRequest, response) => newRenderer(bidRequest, response));
   },
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
-    if (!serverResponses || serverResponses.length === 0) {
-      return [];
-    }
-
-    const syncs = []
-
-    let gdprParams = '';
-    if (gdprConsent) {
-      if ('gdprApplies' in gdprConsent && typeof gdprConsent.gdprApplies === 'boolean') {
-        gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        gdprParams = `gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-
-    if (serverResponses.length > 0 && serverResponses[0].body.userSync) {
-      if (syncOptions.iframeEnabled) {
-        serverResponses[0].body.userSync.iframeUrl.forEach((url) => syncs.push({
-          type: 'iframe',
-          url: appendToUrl(url, gdprParams)
-        }));
-      }
-      if (syncOptions.pixelEnabled) {
-        serverResponses[0].body.userSync.imageUrl.forEach((url) => syncs.push({
-          type: 'image',
-          url: appendToUrl(url, gdprParams)
-        }));
-      }
-    }
-    return syncs;
-  }
-}
-
-function appendToUrl(url, what) {
-  if (!what) {
-    return url;
-  }
-  return url + (url.indexOf('?') !== -1 ? '&' : '?') + what;
-}
-
-function objectToQueryString(obj, prefix) {
-  let str = [];
-  let p;
-  for (p in obj) {
-    if (obj.hasOwnProperty(p)) {
-      let k = prefix ? prefix + '[' + p + ']' : p;
-      let v = obj[p];
-      str.push((v !== null && typeof v === 'object')
-        ? objectToQueryString(v, k)
-        : encodeURIComponent(k) + '=' + encodeURIComponent(v));
-    }
-  }
-  return str.join('&');
-}
-
-/**
- * Check if it's a banner bid request
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {boolean} True if it's a banner bid
- */
-function isBannerRequest(bid) {
-  return bid.mediaType === 'banner' || !!deepAccess(bid, 'mediaTypes.banner') || !isVideoRequest(bid);
-}
-
-/**
- * Check if it's a video bid request
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {boolean} True if it's a video bid
- */
-function isVideoRequest(bid) {
-  return bid.mediaType === 'video' || !!deepAccess(bid, 'mediaTypes.video');
-}
-
-/**
- * Get video sizes
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {object}
- */
-function getVideoSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
-}
-
-/**
- * Get video context
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {object}
- */
-function getVideoContext(bid) {
-  return deepAccess(bid, 'mediaTypes.video.context') || 'unknown';
-}
-
-/**
- * Get banner sizes
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {object} True if it's a video bid
- */
-function getBannerSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
-}
-
-/**
- * Parse size
- * @param sizes
- * @returns {width: number, h: height}
- */
-function parseSize(size) {
-  let sizeObj = {}
-  sizeObj.width = parseInt(size[0], 10);
-  sizeObj.height = parseInt(size[1], 10);
-  return sizeObj;
-}
-
-/**
- * Parse sizes
- * @param sizes
- * @returns {{width: number , height: number }[]}
- */
-function parseSizes(sizes) {
-  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
-    return sizes.map(size => parseSize(size));
-  }
-  return [parseSize(sizes)]; // or a single one ? (ie. [728,90])
-}
-
-/**
- * Get MediaInfo object for server request
- *
- * @param mediaTypesInfo
- * @returns {*}
- */
-function convertMediaInfoForRequest(mediaTypesInfo) {
-  let requestData = {};
-  Object.keys(mediaTypesInfo).forEach(mediaType => {
-    requestData[mediaType] = mediaTypesInfo[mediaType].map(size => {
-      return size.width + 'x' + size.height;
-    }).join(',');
-  });
-  return requestData;
-}
-
-/**
- * Get media types info
- *
- * @param bid
- */
-function getMediaTypesInfo(bid) {
-  let mediaTypesInfo = {};
-
-  if (bid.mediaTypes) {
-    Object.keys(bid.mediaTypes).forEach(mediaType => {
-      if (mediaType === BANNER) {
-        mediaTypesInfo[mediaType] = getBannerSizes(bid);
-      }
-      if (mediaType === VIDEO) {
-        mediaTypesInfo[mediaType] = getVideoSizes(bid);
-      }
-    });
-  } else {
-    mediaTypesInfo[BANNER] = getBannerSizes(bid);
+    return handleSyncUrls(syncOptions, serverResponses, gdprConsent);
   }
-  return mediaTypesInfo;
-}
-
-/**
- * Get Bid Floor
- * @param bid
- * @returns {number|*}
- */
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'EUR',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
-
-/**
- * Create a new renderer
- *
- * @param bidRequest
- * @param response
- * @returns {Renderer}
- */
-function newRenderer(bidRequest, response) {
-  logMessage('DSPx: newRenderer', bidRequest, response);
-  const renderer = Renderer.install({
-    id: response.renderer.id || response.bid_id,
-    url: (bidRequest.params && bidRequest.params.rendererUrl) || response.renderer.url,
-    config: response.renderer.options || deepAccess(bidRequest, 'renderer.options'),
-    loaded: false
-  });
-
-  try {
-    renderer.setRender(outstreamRender);
-  } catch (err) {
-    logWarn('Prebid Error calling setRender on renderer', err);
-  }
-  return renderer;
 }
 
 /**
@@ -440,7 +179,7 @@ function newRenderer(bidRequest, response) {
  * @param bid
  */
 function outstreamRender(bid) {
-  logMessage('DSPx: outstreamRender bid:', bid);
+  logMessage('[DSPx][outstreamRender] bid:', bid);
   const embedCode = createOutstreamEmbedCode(bid);
   try {
     const inIframe = getBidIdParameter('iframe', bid.renderer.config);
@@ -451,7 +190,7 @@ function outstreamRender(bid) {
       if (typeof window.dspxRender === 'function') {
         window.dspxRender(bid);
       } else {
-        logError('[dspx][renderer] Error: dspxRender function is not found');
+        logError('[DSPx][outstreamRender] Error: dspxRender function is not found');
       }
       return;
     }
@@ -462,13 +201,13 @@ function outstreamRender(bid) {
       if (typeof window.dspxRender === 'function') {
         window.dspxRender(bid);
       } else {
-        logError('[dspx][renderer] Error: dspxRender function is not found');
+        logError('[DSPx][outstreamRender] Error: dspxRender function is not found');
       }
     } else if (slot) {
-      logError('[dspx][renderer] Error: slot not found');
+      logError('[DSPx][outstreamRender] Error: slot not found');
     }
   } catch (err) {
-    logError('[dspx][renderer] Error:' + err.message)
+    logError('[DSPx][outstreamRender] Error:' + err.message)
   }
 }
 
@@ -504,4 +243,28 @@ function createOutstreamEmbedCode(bid) {
   return fragment;
 }
 
+/**
+ * Create a new renderer
+ *
+ * @param bidRequest
+ * @param response
+ * @returns {Renderer}
+ */
+function newRenderer(bidRequest, response) {
+  logMessage('[DSPx] newRenderer', bidRequest, response);
+  const renderer = Renderer.install({
+    id: response.renderer.id || response.bid_id,
+    url: (bidRequest.params && bidRequest.params.rendererUrl) || response.renderer.url,
+    config: response.renderer.options || deepAccess(bidRequest, 'renderer.options'),
+    loaded: false
+  });
+
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    logWarn('[DSPx]Prebid Error calling setRender on renderer', err);
+  }
+  return renderer;
+}
+
 registerBidder(spec);
diff --git a/modules/dxkultureBidAdapter.js b/modules/dxkultureBidAdapter.js
index 2e6f6c77b85..d803c476b6d 100644
--- a/modules/dxkultureBidAdapter.js
+++ b/modules/dxkultureBidAdapter.js
@@ -1,49 +1,102 @@
 import {
-  deepSetValue,
   logInfo,
-  deepAccess,
+  logWarn,
   logError,
-  isFn,
-  isPlainObject,
-  isStr,
-  isNumber,
-  isArray, logMessage
+  logMessage,
+  deepAccess,
+  deepSetValue,
+  mergeDeep
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import { Renderer } from '../src/Renderer.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js'
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 
 const BIDDER_CODE = 'dxkulture';
 const DEFAULT_BID_TTL = 300;
-const DEFAULT_CURRENCY = 'USD';
 const DEFAULT_NET_REVENUE = true;
-const DEFAULT_NETWORK_ID = 1;
-const OPENRTB_VIDEO_PARAMS = [
-  'mimes',
-  'minduration',
-  'maxduration',
-  'placement',
-  'protocols',
-  'startdelay',
-  'skip',
-  'skipafter',
-  'minbitrate',
-  'maxbitrate',
-  'delivery',
-  'playbackmethod',
-  'api',
-  'linearity'
-];
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_OUTSTREAM_RENDERER_URL = 'https://cdn.dxkulture.com/players/dxOutstreamPlayer.js';
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: DEFAULT_NET_REVENUE,
+    ttl: DEFAULT_BID_TTL
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+
+    if (!imp.bidfloor) {
+      imp.bidfloor = bidRequest.params.bidfloor || 0;
+      imp.bidfloorcur = bidRequest.params.currency || DEFAULT_CURRENCY;
+    }
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const req = buildRequest(imps, bidderRequest, context);
+    mergeDeep(req, {
+      ext: {
+        hb: 1,
+        prebidver: '$prebid.version$',
+        adapterver: '1.0.0',
+      }
+    })
+
+    // Attaching GDPR Consent Params
+    if (bidderRequest.gdprConsent) {
+      deepSetValue(req, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(req, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    // CCPA
+    if (bidderRequest.uspConsent) {
+      deepSetValue(req, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    return req;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    let resMediaType;
+    const {bidRequest} = context;
+
+    if (bid.adm?.trim().startsWith(' 0) {
-      deepSetValue(openrtbRequest, 'user.ext.eids', eids);
-    }
+    const data = converter.toORTB({ bidRequests: validBidRequests, bidderRequest, context: {contextMediaType} });
 
     let publisherId = validBidRequests[0].params.publisherId;
     let placementId = validBidRequests[0].params.placementId;
-    const networkId = validBidRequests[0].params.networkId || DEFAULT_NETWORK_ID;
 
     if (validBidRequests[0].params.e2etest) {
-      logMessage('E2E test mode enabled');
+      logMessage('dxkulture: E2E test mode enabled');
       publisherId = 'e2etest'
     }
     let baseEndpoint = spec.ENDPOINT + '?pid=' + publisherId;
@@ -110,35 +128,20 @@ export const spec = {
     if (placementId) {
       baseEndpoint += '&placementId=' + placementId
     }
-    if (networkId) {
-      baseEndpoint += '&nId=' + networkId
-    }
 
-    const payloadString = JSON.stringify(openrtbRequest);
     return {
       method: 'POST',
       url: baseEndpoint,
-      data: payloadString,
+      data: data
     };
   },
 
-  interpretResponse: function (serverResponse) {
-    const bidResponses = [];
-    const response = (serverResponse || {}).body;
-    // response is always one seat (exchange) with (optional) bids for each impression
-    if (response && response.seatbid && response.seatbid.length === 1 && response.seatbid[0].bid && response.seatbid[0].bid.length) {
-      response.seatbid[0].bid.forEach(bid => {
-        if (bid.adm && bid.price) {
-          bidResponses.push(_createBidResponse(bid));
-        }
-      })
-    } else {
-      logInfo('dxkulture.interpretResponse :: no valid responses to interpret');
-    }
-    return bidResponses;
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bids = converter.fromORTB({response: serverResponse.body, request: bidRequest.data}).bids;
+    return bids;
   },
 
-  getUserSyncs: function (syncOptions, serverResponses) {
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
     logInfo('dxkulture.getUserSyncs', 'syncOptions', syncOptions, 'serverResponses', serverResponses);
     let syncs = [];
 
@@ -157,17 +160,30 @@ export const spec = {
           }
         });
         syncDetails.forEach(syncDetails => {
+          let queryParamStrings = [];
+          let syncUrl = syncDetails.url;
+
+          if (syncDetails.type === 'iframe') {
+            if (gdprConsent) {
+              queryParamStrings.push('gdpr=' + (gdprConsent.gdprApplies ? 1 : 0));
+              queryParamStrings.push('gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || ''));
+            }
+            if (uspConsent) {
+              queryParamStrings.push('us_privacy=' + encodeURIComponent(uspConsent));
+            }
+            syncUrl = `${syncDetails.url}${queryParamStrings.length > 0 ? '?' + queryParamStrings.join('&') : ''}`
+          }
+
           syncs.push({
             type: syncDetails.type === 'iframe' ? 'iframe' : 'image',
-            url: syncDetails.url
+            url: syncUrl
           });
         });
 
-        if (!syncOptions.iframeEnabled) {
-          syncs = syncs.filter(s => s.type !== 'iframe')
-        }
-        if (!syncOptions.pixelEnabled) {
-          syncs = syncs.filter(s => s.type !== 'image')
+        if (syncOptions.iframeEnabled) {
+          syncs = syncs.filter(s => s.type == 'iframe');
+        } else if (syncOptions.pixelEnabled) {
+          syncs = syncs.filter(s => s.type == 'image');
         }
       }
     });
@@ -177,20 +193,49 @@ export const spec = {
 
 };
 
+function outstreamRenderer(bid) {
+  const rendererConfig = {
+    width: bid.width,
+    height: bid.height,
+    vastTimeout: 5000,
+    maxAllowedVastTagRedirects: 3,
+    allowVpaid: false,
+    autoPlay: true,
+    preload: true,
+    mute: false
+  }
+
+  const renderer = Renderer.install({
+    id: bid.adId,
+    url: DEFAULT_OUTSTREAM_RENDERER_URL,
+    config: rendererConfig,
+    loaded: false,
+    targetId: bid.adUnitCode,
+    adUnitCode: bid.adUnitCode
+  });
+
+  try {
+    renderer.setRender(function (bid) {
+      bid.renderer.push(() => {
+        const { id, config } = bid.renderer;
+        window.dxOutstreamPlayer(bid, id, config);
+      });
+    });
+  } catch (err) {
+    logWarn('dxkulture: Prebid Error calling setRender on renderer', err);
+  }
+
+  return renderer;
+}
+
 /* =======================================
  * Util Functions
  *======================================= */
 
-/**
- * @param {BidRequest} bidRequest bid request
- */
 function hasBannerMediaType(bidRequest) {
   return !!deepAccess(bidRequest, 'mediaTypes.banner');
 }
 
-/**
- * @param {BidRequest} bidRequest bid request
- */
 function hasVideoMediaType(bidRequest) {
   return !!deepAccess(bidRequest, 'mediaTypes.video');
 }
@@ -205,12 +250,12 @@ function _validateParams(bidRequest) {
   }
 
   if (!bidRequest.params.publisherId) {
-    logError('Validation failed: publisherId not declared');
+    logError('dxkulture: Validation failed: publisherId not declared');
     return false;
   }
 
   if (!bidRequest.params.placementId) {
-    logError('Validation failed: placementId not declared');
+    logError('dxkulture: Validation failed: placementId not declared');
     return false;
   }
 
@@ -224,7 +269,7 @@ function _validateParams(bidRequest) {
 
 /**
  * Validates banner bid request. If it is not banner media type returns true.
- * @param {object} bid, bid to validate
+ * @param {BidRequest} bidRequest bid to validate
  * @return boolean, true if valid, otherwise false
  */
 function _validateBanner(bidRequest) {
@@ -242,7 +287,7 @@ function _validateBanner(bidRequest) {
 
 /**
  * Validates video bid request. If it is not video media type returns true.
- * @param {object} bid, bid to validate
+ * @param {BidRequest} bidRequest, bid to validate
  * @return boolean, true if valid, otherwise false
  */
 function _validateVideo(bidRequest) {
@@ -265,208 +310,31 @@ function _validateVideo(bidRequest) {
   };
 
   if (!Array.isArray(videoParams.mimes) || videoParams.mimes.length === 0) {
-    logError('Validation failed: mimes are invalid');
+    logError('dxkulture: Validation failed: mimes are invalid');
     return false;
   }
 
   if (!Array.isArray(videoParams.protocols) || videoParams.protocols.length === 0) {
-    logError('Validation failed: protocols are invalid');
+    logError('dxkulture: Validation failed: protocols are invalid');
     return false;
   }
 
   if (!videoParams.context) {
-    logError('Validation failed: context id not declared');
+    logError('dxkulture: Validation failed: context id not declared');
     return false;
   }
 
   if (videoParams.context !== 'instream') {
-    logError('Validation failed: only context instream is supported ');
+    logError('dxkulture: Validation failed: only context instream is supported ');
     return false;
   }
 
   if (typeof videoParams.playerSize === 'undefined' || !Array.isArray(videoParams.playerSize) || !Array.isArray(videoParams.playerSize[0])) {
-    logError('Validation failed: player size not declared or is not in format [[w,h]]');
+    logError('dxkulture: Validation failed: player size not declared or is not in format [[w,h]]');
     return false;
   }
 
   return true;
 }
 
-/**
- * Prepares video request data.
- *
- * @param bidRequest
- * @param bidderRequest
- * @returns openrtbRequest
- */
-function buildVideoRequestData(bidRequest, bidderRequest) {
-  const {params} = bidRequest;
-
-  const videoAdUnit = deepAccess(bidRequest, 'mediaTypes.video', {});
-  const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
-
-  const videoParams = {
-    ...videoAdUnit,
-    ...videoBidderParams // Bidder Specific overrides
-  };
-
-  if (bidRequest.params && bidRequest.params.e2etest) {
-    videoParams.playerSize = [[640, 480]]
-    videoParams.conext = 'instream'
-  }
-
-  const video = {
-    w: parseInt(videoParams.playerSize[0][0], 10),
-    h: parseInt(videoParams.playerSize[0][1], 10),
-  }
-
-  // Obtain all ORTB params related video from Ad Unit
-  OPENRTB_VIDEO_PARAMS.forEach((param) => {
-    if (videoParams.hasOwnProperty(param)) {
-      video[param] = videoParams[param];
-    }
-  });
-
-  // Placement Inference Rules:
-  // - If no placement is defined then default to 1 (In Stream)
-  video.placement = video.placement || 2;
-
-  // - If product is instream (for instream context) then override placement to 1
-  if (params.context === 'instream') {
-    video.startdelay = video.startdelay || 0;
-    video.placement = 1;
-  }
-
-  // bid floor
-  const bidFloorRequest = {
-    currency: bidRequest.params.cur || 'USD',
-    mediaType: 'video',
-    size: '*'
-  };
-  let floorData = bidRequest.params
-  if (isFn(bidRequest.getFloor)) {
-    floorData = bidRequest.getFloor(bidFloorRequest);
-  } else {
-    if (params.bidfloor) {
-      floorData = {floor: params.bidfloor, currency: params.currency || 'USD'};
-    }
-  }
-
-  const openrtbRequest = {
-    id: bidRequest.bidId,
-    imp: [
-      {
-        id: '1',
-        video: video,
-        secure: isSecure() ? 1 : 0,
-        bidfloor: floorData.floor,
-        bidfloorcur: floorData.currency
-      }
-    ],
-    site: {
-      domain: bidderRequest.refererInfo.domain,
-      page: bidderRequest.refererInfo.page,
-      ref: bidderRequest.refererInfo.ref,
-    },
-    ext: {
-      hb: 1,
-      prebidver: '$prebid.version$',
-      adapterver: spec.VERSION,
-    },
-  };
-
-  // content
-  if (videoParams.content && isPlainObject(videoParams.content)) {
-    openrtbRequest.site.content = {};
-    const contentStringKeys = ['id', 'title', 'series', 'season', 'genre', 'contentrating', 'language', 'url'];
-    const contentNumberkeys = ['episode', 'prodq', 'context', 'livestream', 'len'];
-    const contentArrayKeys = ['cat'];
-    const contentObjectKeys = ['ext'];
-    for (const contentKey in videoBidderParams.content) {
-      if (
-        (contentStringKeys.indexOf(contentKey) > -1 && isStr(videoParams.content[contentKey])) ||
-        (contentNumberkeys.indexOf(contentKey) > -1 && isNumber(videoParams.content[contentKey])) ||
-        (contentObjectKeys.indexOf(contentKey) > -1 && isPlainObject(videoParams.content[contentKey])) ||
-        (contentArrayKeys.indexOf(contentKey) > -1 && isArray(videoParams.content[contentKey]) &&
-          videoParams.content[contentKey].every(catStr => isStr(catStr)))) {
-        openrtbRequest.site.content[contentKey] = videoParams.content[contentKey];
-      } else {
-        logMessage('DXKulture bid adapter validation error: ', contentKey, ' is either not supported is OpenRTB V2.5 or value is undefined');
-      }
-    }
-  }
-
-  return openrtbRequest;
-}
-
-/**
- * Prepares video request data.
- *
- * @param bidRequest
- * @param bidderRequest
- * @returns openrtbRequest
- */
-function buildBannerRequestData(bidRequests, bidderRequest) {
-  const impr = bidRequests.map(bidRequest => ({
-    id: bidRequest.bidId,
-    banner: {
-      format: bidRequest.mediaTypes.banner.sizes.map(sizeArr => ({
-        w: sizeArr[0],
-        h: sizeArr[1]
-      }))
-    },
-    ext: {
-      exchange: {
-        placementId: bidRequest.params.placementId
-      }
-    }
-  }));
-
-  const openrtbRequest = {
-    id: bidderRequest.auctionId,
-    imp: impr,
-    site: {
-      domain: bidderRequest.refererInfo?.domain,
-      page: bidderRequest.refererInfo?.page,
-      ref: bidderRequest.refererInfo?.ref,
-    },
-    ext: {}
-  };
-  return openrtbRequest;
-}
-
-function _createBidResponse(bid) {
-  const isADomainPresent =
-    bid.adomain && bid.adomain.length;
-  const bidResponse = {
-    requestId: bid.impid,
-    bidderCode: spec.code,
-    cpm: bid.price,
-    width: bid.w,
-    height: bid.h,
-    ad: bid.adm,
-    ttl: typeof bid.exp === 'number' ? bid.exp : DEFAULT_BID_TTL,
-    creativeId: bid.crid,
-    netRevenue: DEFAULT_NET_REVENUE,
-    currency: DEFAULT_CURRENCY,
-    mediaType: deepAccess(bid, 'ext.prebid.type', BANNER)
-  }
-
-  if (isADomainPresent) {
-    bidResponse.meta = {
-      advertiserDomains: bid.adomain
-    };
-  }
-
-  if (bidResponse.mediaType === VIDEO) {
-    bidResponse.vastXml = bid.adm;
-  }
-
-  return bidResponse;
-}
-
-function isSecure() {
-  return document.location.protocol === 'https:';
-}
-
 registerBidder(spec);
diff --git a/modules/dxkultureBidAdapter.md b/modules/dxkultureBidAdapter.md
index e934aee3301..e31794ef6c6 100644
--- a/modules/dxkultureBidAdapter.md
+++ b/modules/dxkultureBidAdapter.md
@@ -30,7 +30,8 @@ var adUnits = [
             params: {
                 placementId: 'test',
                 publisherId: 'test',
-                networkId: '123'
+                bidfloor: 2.7,
+                bidfloorcur: 'USD'
             }
         }]
     }
@@ -43,7 +44,7 @@ We support the following OpenRTB params that can be specified in `mediaTypes.vid
 - 'mimes',
 - 'minduration',
 - 'maxduration',
-- 'placement',
+- 'plcmt',
 - 'protocols',
 - 'startdelay',
 - 'skip',
@@ -74,7 +75,7 @@ We support the following OpenRTB params that can be specified in `mediaTypes.vid
                   delivery: [2],
                   minduration: 10,
                   maxduration: 30,
-                  placement: 1,
+                  plcmt: 1,
                   playbackmethod: [1,5],
             }
           },
@@ -84,8 +85,7 @@ We support the following OpenRTB params that can be specified in `mediaTypes.vid
               params: {
                 bidfloor: 0.5,
                 publisherId: '12345',
-                placementId: '6789',
-                networkId" '123'
+                placementId: '6789'
               }
             }
           ]
diff --git a/modules/dynamicAdBoostRtdProvider.js b/modules/dynamicAdBoostRtdProvider.js
new file mode 100644
index 00000000000..a68567b1ca3
--- /dev/null
+++ b/modules/dynamicAdBoostRtdProvider.js
@@ -0,0 +1,119 @@
+/**
+ * The {@link module:modules/realTimeData} module is required
+ * @module modules/dynamicAdBoost
+ * @requires module:modules/realTimeData
+ */
+
+import { submodule } from '../src/hook.js'
+import { loadExternalScript } from '../src/adloader.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { deepAccess, deepSetValue, isEmptyStr } from '../src/utils.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
+const MODULE_NAME = 'dynamicAdBoost';
+const SCRIPT_URL = 'https://adxbid.info';
+const CLIENT_SUPPORTS_IO = window.IntersectionObserver && window.IntersectionObserverEntry && window.IntersectionObserverEntry.prototype &&
+    'intersectionRatio' in window.IntersectionObserverEntry.prototype;
+// Options for the Intersection Observer
+const dabOptions = {
+  threshold: 0.5 // Trigger callback when 50% of the element is visible
+};
+let observer;
+let dabStartDate;
+let dabStartTime;
+
+// Array of div IDs to track
+let dynamicAdBoostAdUnits = {};
+
+function init(config, userConsent) {
+  dabStartDate = new Date();
+  dabStartTime = dabStartDate.getTime();
+  if (!CLIENT_SUPPORTS_IO) {
+    return false;
+  }
+  // Create an Intersection Observer instance
+  observer = new IntersectionObserver(dabHandleIntersection, dabOptions);
+  if (config.params.keyId) {
+    let keyId = config.params.keyId;
+    if (keyId && !isEmptyStr(keyId)) {
+      let dabDivIdsToTrack = config.params.adUnits;
+      let dabInterval = setInterval(function() {
+        // Observe each div by its ID
+        dabDivIdsToTrack.forEach(divId => {
+          let div = document.getElementById(divId);
+          if (div) {
+            observer.observe(div);
+          }
+        });
+
+        let dabDateNow = new Date();
+        let dabTimeNow = dabDateNow.getTime();
+        let dabElapsedSeconds = Math.floor((dabTimeNow - dabStartTime) / 1000);
+        let elapsedThreshold = 30;
+        if (config.params.threshold) {
+          elapsedThreshold = config.params.threshold;
+        }
+        if (dabElapsedSeconds >= elapsedThreshold) {
+          clearInterval(dabInterval); // Stop
+          loadLmScript(keyId);
+        }
+      }, 1000);
+
+      return true;
+    }
+  }
+  return false;
+}
+
+function loadLmScript(keyId) {
+  let viewableAdUnits = Object.keys(dynamicAdBoostAdUnits);
+  let viewableAdUnitsCSV = viewableAdUnits.join(',');
+  const scriptUrl = `${SCRIPT_URL}/${keyId}.js?viewableAdUnits=${viewableAdUnitsCSV}`;
+  loadExternalScript(scriptUrl, MODULE_TYPE_RTD, MODULE_NAME);
+  observer.disconnect();
+}
+
+function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
+  const reqAdUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+
+  if (Array.isArray(reqAdUnits)) {
+    reqAdUnits.forEach(adunit => {
+      let gptCode = deepAccess(adunit, 'code');
+      if (dynamicAdBoostAdUnits.hasOwnProperty(gptCode)) {
+        // AdUnits has reached target viewablity at some point
+        deepSetValue(adunit, `ortb2Imp.ext.data.${MODULE_NAME}.${gptCode}`, dynamicAdBoostAdUnits[gptCode]);
+      }
+    });
+  }
+  callback();
+}
+
+let markViewed = (entry, observer) => {
+  return () => {
+    observer.unobserve(entry.target);
+  }
+}
+
+// Callback function when an observed element becomes visible
+function dabHandleIntersection(entries) {
+  entries.forEach(entry => {
+    if (entry.isIntersecting && entry.intersectionRatio > 0.5) {
+      dynamicAdBoostAdUnits[entry.target.id] = entry.intersectionRatio;
+      markViewed(entry, observer)
+    }
+  });
+}
+
+/** @type {RtdSubmodule} */
+export const subModuleObj = {
+  name: MODULE_NAME,
+  init,
+  getBidRequestData,
+  markViewed
+};
+
+submodule('realTimeData', subModuleObj);
diff --git a/modules/dynamicAdBoostRtdProvider.md b/modules/dynamicAdBoostRtdProvider.md
new file mode 100644
index 00000000000..93efe3b3f97
--- /dev/null
+++ b/modules/dynamicAdBoostRtdProvider.md
@@ -0,0 +1,40 @@
+# Overview
+
+Module Name: Dynamic Ad Boost
+Module Type: Track when a adunit is viewable
+Maintainer: info@luponmedia.com
+
+# Description
+
+Enhance your revenue with the cutting-edge DynamicAdBoost module! By seamlessly integrating the powerful LuponMedia technology, our module retrieves adunits viewability data, providing publishers with valuable insights to optimize their revenue streams. To unlock the full potential of this technology, we provide a customized LuponMedia module tailored to your specific site requirements. Boost your ad revenue and gain unprecedented visibility into your performance with our advanced solution.
+
+In order to utilize this module, it is essential to collaborate with [LuponMedia](https://www.luponmedia.com/) to create an account and obtain detailed guidelines on configuring your sites. Working hand in hand with LuponMedia will ensure a smooth integration process, enabling you to fully leverage the capabilities of this module on your website. Take the first step towards optimizing your ad revenue and enhancing your site's performance by partnering with LuponMedia for a seamless experience.
+Contact info@luponmedia.com for information.
+
+## Building Prebid with Real-time Data Support
+
+First, make sure to add the Dynamic AdBoost submodule to your Prebid.js package with:
+
+`gulp build --modules=rtdModule,dynamicAdBoostRtdProvider`
+
+The following configuration parameters are available:
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 2000,
+        dataProviders: [
+            {
+                name: "dynamicAdBoost",
+                params: {
+                    keyId: "[PROVIDED_KEY]", // Your provided Dynamic AdBoost keyId
+                    adUnits: ["allowedAdUnit1", "allowedAdUnit2"],
+                    threshold: 35 // optional
+                }
+            }
+        ]
+    }
+    ...
+}
+```
diff --git a/modules/e_volutionBidAdapter.js b/modules/e_volutionBidAdapter.js
index 5f1b46ff9eb..e87e39599a0 100644
--- a/modules/e_volutionBidAdapter.js
+++ b/modules/e_volutionBidAdapter.js
@@ -1,181 +1,19 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { isFn, deepAccess, logMessage } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { isBidRequestValid, buildRequests, interpretResponse } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'e_volution';
+const GVLID = 957;
 const AD_URL = 'https://service.e-volution.ai/?c=o&m=multi';
-const URL_SYNC = 'https://service.e-volution.ai/?c=o&m=sync';
-const NO_SYNC = true;
-
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency) {
-    return false;
-  }
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.title && bid.native.image && bid.native.impressionTrackers);
-    default:
-      return false;
-  }
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
-
-function getUserId(eids, id, source, uidExt) {
-  if (id) {
-    var uid = { id };
-    if (uidExt) {
-      uid.ext = uidExt;
-    }
-    eids.push({
-      source,
-      uids: [ uid ]
-    });
-  }
-}
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-  noSync: NO_SYNC,
-
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(parseInt(bid.params.placementId)));
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let winTop = window;
-    let location;
-    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
-    try {
-      location = new URL(bidderRequest.refererInfo.page);
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
-    let placements = [];
-    let request = {
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'language': (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
-      'secure': 1,
-      'host': location.host,
-      'page': location.pathname,
-      'placements': placements
-    };
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent;
-      }
-    }
-    const len = validBidRequests.length;
-
-    for (let i = 0; i < len; i++) {
-      let bid = validBidRequests[i];
-
-      const placement = {
-        placementId: bid.params.placementId,
-        bidId: bid.bidId,
-        bidfloor: getBidFloor(bid),
-        eids: []
-      };
-
-      if (bid.userId) {
-        getUserId(placement.eids, bid.userId.id5id, 'id5-sync.com');
-      }
-
-      if (bid.mediaTypes && bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
-        placement.traffic = BANNER;
-        placement.sizes = bid.mediaTypes[BANNER].sizes;
-      } else if (bid.mediaTypes && bid.mediaTypes[VIDEO] && bid.mediaTypes[VIDEO].playerSize) {
-        placement.traffic = VIDEO;
-        placement.wPlayer = bid.mediaTypes[VIDEO].playerSize[0];
-        placement.hPlayer = bid.mediaTypes[VIDEO].playerSize[1];
-        placement.minduration = bid.mediaTypes[VIDEO].minduration;
-        placement.maxduration = bid.mediaTypes[VIDEO].maxduration;
-        placement.mimes = bid.mediaTypes[VIDEO].mimes;
-        placement.protocols = bid.mediaTypes[VIDEO].protocols;
-        placement.startdelay = bid.mediaTypes[VIDEO].startdelay;
-        placement.placement = bid.mediaTypes[VIDEO].placement;
-        placement.skip = bid.mediaTypes[VIDEO].skip;
-        placement.skipafter = bid.mediaTypes[VIDEO].skipafter;
-        placement.minbitrate = bid.mediaTypes[VIDEO].minbitrate;
-        placement.maxbitrate = bid.mediaTypes[VIDEO].maxbitrate;
-        placement.delivery = bid.mediaTypes[VIDEO].delivery;
-        placement.playbackmethod = bid.mediaTypes[VIDEO].playbackmethod;
-        placement.api = bid.mediaTypes[VIDEO].api;
-        placement.linearity = bid.mediaTypes[VIDEO].linearity;
-      } else if (bid.mediaTypes && bid.mediaTypes[NATIVE]) {
-        placement.traffic = NATIVE;
-        placement.native = bid.mediaTypes[NATIVE];
-      }
-
-      if (bid.schain) {
-        placements.schain = bid.schain;
-      }
-
-      placements.push(placement);
-    }
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses) => {
-    if (NO_SYNC) {
-      return false
-    } else {
-      return [{
-        type: 'image',
-        url: URL_SYNC
-      }];
-    }
-  }
 
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse
 };
 
 registerBidder(spec);
diff --git a/modules/ebdrBidAdapter.js b/modules/ebdrBidAdapter.js
deleted file mode 100644
index e830f8a94f7..00000000000
--- a/modules/ebdrBidAdapter.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import {getBidIdParameter, logInfo} from '../src/utils.js';
-import { VIDEO, BANNER } from '../src/mediaTypes.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-const BIDDER_CODE = 'ebdr';
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [ BANNER, VIDEO ],
-  isBidRequestValid: function(bid) {
-    return !!(bid && bid.params && bid.params.zoneid);
-  },
-  buildRequests: function(bids) {
-    const rtbServerDomain = 'dsp.bnmla.com';
-    let domain = window.location.host;
-    let page = window.location.pathname + location.search + location.hash;
-    let ebdrImps = [];
-    const ebdrReq = {};
-    let ebdrParams = {};
-    let zoneid = '';
-    let requestId = '';
-    bids.forEach(bid => {
-      logInfo('Log bid', bid);
-      let bidFloor = getBidIdParameter('bidfloor', bid.params);
-      let whArr = getWidthAndHeight(bid);
-      let _mediaTypes = (bid.mediaTypes && bid.mediaTypes.video) ? VIDEO : BANNER;
-      zoneid = getBidIdParameter('zoneid', bid.params);
-      requestId = bid.bidderRequestId;
-      ebdrImps.push({
-        id: bid.bidId,
-        [_mediaTypes]: {
-          w: whArr[0],
-          h: whArr[1]
-        },
-        bidfloor: bidFloor
-      });
-      ebdrReq[bid.bidId] = {mediaTypes: _mediaTypes,
-        w: whArr[0],
-        h: whArr[1]
-      };
-      // TODO: fix lat and long to only come from request
-      ebdrParams['latitude'] = '0';
-      ebdrParams['longitude'] = '0';
-      ebdrParams['ifa'] = (getBidIdParameter('IDFA', bid.params).length > getBidIdParameter('ADID', bid.params).length) ? getBidIdParameter('IDFA', bid.params) : getBidIdParameter('ADID', bid.params);
-    });
-    let ebdrBidReq = {
-      id: requestId,
-      imp: ebdrImps,
-      site: {
-        domain: domain,
-        page: page
-      },
-      device: {
-        geo: {
-          lat: ebdrParams.latitude,
-          log: ebdrParams.longitude
-        },
-        ifa: ebdrParams.ifa
-      }
-    };
-    return {
-      method: 'GET',
-      url: 'https://' + rtbServerDomain + '/hb?' + '&zoneid=' + zoneid + '&br=' + encodeURIComponent(JSON.stringify(ebdrBidReq)),
-      bids: ebdrReq
-    };
-  },
-  interpretResponse: function(serverResponse, bidRequest) {
-    logInfo('Log serverResponse', serverResponse);
-    logInfo('Log bidRequest', bidRequest);
-    let ebdrResponseImps = [];
-    const ebdrResponseObj = serverResponse.body;
-    if (!ebdrResponseObj || !ebdrResponseObj.seatbid || ebdrResponseObj.seatbid.length === 0 || !ebdrResponseObj.seatbid[0].bid || ebdrResponseObj.seatbid[0].bid.length === 0) {
-      return [];
-    }
-    ebdrResponseObj.seatbid[0].bid.forEach(ebdrBid => {
-      let responseCPM;
-      responseCPM = parseFloat(ebdrBid.price);
-      let adm;
-      let type;
-      let _mediaTypes;
-      let vastURL;
-      if (bidRequest.bids[ebdrBid.id].mediaTypes == BANNER) {
-        adm = decodeURIComponent(ebdrBid.adm)
-        type = 'ad';
-        _mediaTypes = BANNER;
-      } else {
-        adm = ebdrBid.adm
-        type = 'vastXml'
-        _mediaTypes = VIDEO;
-        if (ebdrBid.nurl) {
-          vastURL = ebdrBid.nurl;
-        }
-      }
-      let response = {
-        requestId: ebdrBid.id,
-        [type]: adm,
-        mediaType: _mediaTypes,
-        creativeId: ebdrBid.crid,
-        cpm: responseCPM,
-        width: ebdrBid.w,
-        height: ebdrBid.h,
-        currency: 'USD',
-        netRevenue: true,
-        ttl: 3600,
-        meta: {
-          advertiserDomains: ebdrBid.adomain || []
-        }
-      };
-      if (vastURL) {
-        response.vastUrl = vastURL;
-      }
-      ebdrResponseImps.push(response);
-    });
-    return ebdrResponseImps;
-  },
-  getUserSyncs: function(syncOptions, serverResponses) {
-    const syncs = []
-    if (syncOptions.pixelEnabled) {
-      const ebdrResponseObj = serverResponses.body;
-      if (!ebdrResponseObj || !ebdrResponseObj.seatbid || ebdrResponseObj.seatbid.length === 0 || !ebdrResponseObj.seatbid[0].bid || ebdrResponseObj.seatbid[0].bid.length === 0) {
-        return [];
-      }
-      ebdrResponseObj.seatbid[0].bid.forEach(ebdrBid => {
-        if (ebdrBid.iurl && ebdrBid.iurl.length > 0) {
-          syncs.push({
-            type: 'image',
-            url: ebdrBid.iurl
-          });
-        }
-      });
-    }
-    return syncs;
-  }
-}
-function getWidthAndHeight(bid) {
-  let adW = null;
-  let adH = null;
-  // Handing old bidder only has size object
-  if (bid.sizes && bid.sizes.length) {
-    let sizeArrayLength = bid.sizes.length;
-    if (sizeArrayLength === 2 && typeof bid.sizes[0] === 'number' && typeof bid.sizes[1] === 'number') {
-      adW = bid.sizes[0];
-      adH = bid.sizes[1];
-    }
-  }
-  let _mediaTypes = bid.mediaTypes && bid.mediaTypes.video ? VIDEO : BANNER;
-  if (bid.mediaTypes && bid.mediaTypes[_mediaTypes]) {
-    if (_mediaTypes == BANNER && bid.mediaTypes[_mediaTypes].sizes && bid.mediaTypes[_mediaTypes].sizes[0] && bid.mediaTypes[_mediaTypes].sizes[0].length === 2) {
-      adW = bid.mediaTypes[_mediaTypes].sizes[0][0];
-      adH = bid.mediaTypes[_mediaTypes].sizes[0][1];
-    } else if (_mediaTypes == VIDEO && bid.mediaTypes[_mediaTypes].playerSize && bid.mediaTypes[_mediaTypes].playerSize.length === 2) {
-      adW = bid.mediaTypes[_mediaTypes].playerSize[0];
-      adH = bid.mediaTypes[_mediaTypes].playerSize[1];
-    }
-  }
-  return [adW, adH];
-}
-registerBidder(spec);
diff --git a/modules/ebdrBidAdapter.md b/modules/ebdrBidAdapter.md
deleted file mode 100644
index 64483797b25..00000000000
--- a/modules/ebdrBidAdapter.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Overview
-
-```
-Module Name:  EngageBDR Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer:	  tech@engagebdr.com 
-```
-
-# Description
-
-Adapter that connects to EngageBDR's demand sources.
-
-# Test Parameters
-```
-    var adUnits = [{
-        code: 'div-gpt-ad-1460505748561-0',
-        mediaTypes: {
-            banner: {
-                sizes: [[300, 250], [300,600]],
-            }
-        },
-        bids: [{
-            bidder: 'ebdr',
-            params: {
-               zoneid: '99999',
-               bidfloor: '1.00',
-               IDFA:'xxx-xxx',
-               ADID:'xxx-xxx',
-               latitude:'34.089811',
-               longitude:'-118.392805'
-            }
-        }]
-    },{
-        code: 'test-video',
-        mediaTypes: {
-            video: {
-                context: 'instream',
-                playerSize: [300, 250]
-            }
-        },
-         bids: [{
-            bidder: 'ebdr',
-            params: {
-               zoneid: '99998',
-               bidfloor: '1.00',
-               IDFA:'xxx-xxx',
-               ADID:'xxx-xxx',
-               latitude:'34.089811',
-               longitude:'-118.392805'
-            }
-        }]
-    }];
-```
diff --git a/modules/eclickadsBidAdapter.js b/modules/eclickadsBidAdapter.js
new file mode 100644
index 00000000000..27e3926afe3
--- /dev/null
+++ b/modules/eclickadsBidAdapter.js
@@ -0,0 +1,80 @@
+import { NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getDevice } from '../libraries/fpdUtils/deviceInfo.js';
+
+// ***** ECLICKADS ADAPTER *****
+export const BIDDER_CODE = 'eclickads';
+const DEFAULT_CURRENCY = ['USD'];
+const DEFAULT_TTL = 1000;
+export const ENDPOINT = 'https://g.eclick.vn/rtb_hb_request?fosp_uid=';
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [NATIVE],
+  isBidRequestValid: (bid) => {
+    return !!bid && !!bid.params && !!bid.bidder && !!bid.params.zid;
+  },
+  buildRequests: (validBidRequests = [], bidderRequest) => {
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    const ortb2ConfigFPD = bidderRequest.ortb2.site.ext?.data || {};
+    const ortb2Device = bidderRequest.ortb2.device;
+    const ortb2Site = bidderRequest.ortb2.site;
+
+    const isMobile = getDevice();
+    const imp = [];
+    const fENDPOINT = ENDPOINT + (ortb2ConfigFPD.fosp_uid || '');
+    const request = {
+      deviceWidth: ortb2Device.w,
+      deviceHeight: ortb2Device.h,
+      ua: ortb2Device.ua,
+      language: ortb2Device.language,
+      device: isMobile ? 'mobile' : 'desktop',
+      host: ortb2Site.domain,
+      page: ortb2Site.page,
+      imp,
+      myvne_id: ortb2ConfigFPD.myvne_id || '',
+      orig_aid: ortb2ConfigFPD.orig_aid,
+      fosp_aid: ortb2ConfigFPD.fosp_aid,
+      fosp_uid: ortb2ConfigFPD.fosp_uid,
+      id: ortb2ConfigFPD.id,
+    };
+
+    validBidRequests.map((bid) => {
+      imp.push({
+        requestId: bid.bidId,
+        adUnitCode: bid.adUnitCode,
+        zid: bid.params.zid,
+      });
+    });
+
+    return {
+      method: 'POST',
+      url: fENDPOINT,
+      data: request,
+    };
+  },
+  interpretResponse: (serverResponse) => {
+    const seatbid = serverResponse.body?.seatbid || [];
+    return seatbid.reduce((bids, bid) => {
+      return [
+        ...bids,
+        {
+          id: bid.id,
+          impid: bid.impid,
+          adUnitCode: bid.adUnitCode,
+          cpm: bid.cpm,
+          ttl: bid.ttl || DEFAULT_TTL,
+          requestId: bid.requestId,
+          creativeId: bid.creativeId,
+          netRevenue: bid.netRevenue,
+          currency: bid.currency || DEFAULT_CURRENCY,
+          adserverTargeting: {
+            hb_ad_eclickads: bid.ad,
+          },
+        },
+      ];
+    }, []);
+  },
+};
+registerBidder(spec);
diff --git a/modules/eclickadsBidAdapter.md b/modules/eclickadsBidAdapter.md
new file mode 100644
index 00000000000..39ba19d5249
--- /dev/null
+++ b/modules/eclickadsBidAdapter.md
@@ -0,0 +1,55 @@
+# Overview
+
+Module Name: EClickAds Bid Adapter
+Type: Bidder Adapter
+Maintainer: vietlv14@fpt.com
+
+# Description
+
+This module connects to EClickAds exchange for bidding NATIVE ADS via prebid.js
+
+# Test Parameters
+
+```
+var adUnits = [{
+    code: 'test-div',
+    mediaTypes: {
+        native: {
+            title: {
+                required: true,
+                len: 50
+            },
+            body: {
+                required: true,
+                len: 350
+            },
+            url: {
+                required: true
+            },
+            image: {
+                required: true,
+                sizes : [300, 175]
+            },
+            sponsoredBy: {
+                required: true
+            }
+        }
+    },
+    bids: [{
+        bidder: 'eclickads',
+        params: {
+	    	zid:"7096"
+        }
+    }]
+}];
+```
+
+# Notes:
+
+- EClickAdsBidAdapter need serveral params inside bidder config as following
+  - user.myvne_id
+  - site.orig_aid
+  - site.fosp_aid
+  - site.id
+  - site.orig_aid
+- EClickAdsBidAdapter will set bid.adserverTargeting.hb_ad_eclickads targeting key while submitting bid to AdServer
diff --git a/modules/edge226BidAdapter.js b/modules/edge226BidAdapter.js
new file mode 100644
index 00000000000..ae235f02f64
--- /dev/null
+++ b/modules/edge226BidAdapter.js
@@ -0,0 +1,17 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { isBidRequestValid, buildRequests, interpretResponse } from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'edge226';
+const AD_URL = 'https://ssp.dauup.com/pbjs';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse
+};
+
+registerBidder(spec);
diff --git a/modules/edge226BidAdapter.md b/modules/edge226BidAdapter.md
new file mode 100644
index 00000000000..b38ff67065f
--- /dev/null
+++ b/modules/edge226BidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: Edge226 Bidder Adapter
+Module Type: Edge226 Bidder Adapter
+Maintainer: audit@edge226.com 
+```
+
+# Description
+
+Connects to Edge226 exchange for bids.
+Edge226 bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'edge226',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'edge226',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'edge226',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/ehealthcaresolutionsBidAdapter.js b/modules/ehealthcaresolutionsBidAdapter.js
new file mode 100644
index 00000000000..9df4c38e4f2
--- /dev/null
+++ b/modules/ehealthcaresolutionsBidAdapter.js
@@ -0,0 +1,41 @@
+import {
+  BANNER,
+  NATIVE
+} from '../src/mediaTypes.js';
+import {
+  registerBidder
+} from '../src/adapters/bidderFactory.js';
+import {
+  getBannerRequest,
+  getBannerResponse,
+  getNativeResponse,
+} from '../libraries/audUtils/bidderUtils.js';
+
+const ENDPOINT_URL = 'https://rtb.ehealthcaresolutions.com/hb';
+// Export const spec
+export const spec = {
+  code: 'ehealthcaresolutions',
+  supportedMediaTypes: [BANNER, NATIVE],
+  // Determines whether or not the given bid request is valid
+  isBidRequestValid: (bParam) => {
+    return !!(bParam.params.placement_id);
+  },
+  // Make a server request from the list of BidRequests
+  buildRequests: (bidRequests, serverRequest) => {
+    // Get Requests based on media types
+    return getBannerRequest(bidRequests, serverRequest, ENDPOINT_URL);
+  },
+  // Unpack the response from the server into a list of bids.
+  interpretResponse: (bResponse, bRequest) => {
+    let Response = {};
+    const mediaType = JSON.parse(bRequest.data)[0].MediaType;
+    if (mediaType == BANNER) {
+      Response = getBannerResponse(bResponse, BANNER);
+    } else if (mediaType == NATIVE) {
+      Response = getNativeResponse(bResponse, bRequest, NATIVE);
+    }
+    return Response;
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/ehealthcaresolutionsBidAdapter.md b/modules/ehealthcaresolutionsBidAdapter.md
new file mode 100644
index 00000000000..fdf859404d2
--- /dev/null
+++ b/modules/ehealthcaresolutionsBidAdapter.md
@@ -0,0 +1,61 @@
+# Overview
+
+```
+Module Name: eHealthcareSolutions Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: info@ehsmail.com
+```
+
+# Description
+
+eHealthcareSolutions currently supports the BANNER and NATIVE type ads through prebid js
+
+Module that connects to eHealthcareSolutions's demand sources.
+
+# Test Request
+```
+  var adUnits = [
+    {
+      code: 'display-ad',
+      mediaTypes: {
+        banner: {
+            sizes: [[300, 250]], 
+        }
+      }
+      bids: [
+        {
+            bidder: 'ehealthcaresolutions',
+            params: {
+                placement_id: 111519,  // Required parameter
+                width: 300,   // Optional parameter 
+                height: 250, // Optional parameter
+                bid_floor: 0.5 // Optional parameter
+            }
+        }
+      ]
+    },
+    {
+      code: 'native-ad-container',
+      mediaTypes: {
+        native: {
+          title: { required: true, len: 100 },
+          image: { required: true, sizes: [300, 250] },
+          sponsored: { required: false },
+          clickUrl: { required: true },
+          desc: { required: true },
+          icon: { required: false, sizes: [50, 50] },
+          cta: { required: false }
+        }
+      },
+      bids: [
+        {
+          bidder: 'eHealthcareSolutions',
+          params: {
+            placement_id: 111519, // Required parameter
+			      bid_floor: 1 // Optional parameter
+          }
+        }
+      ]
+    }
+  ];
+```
diff --git a/modules/eightPodAnalyticsAdapter.js b/modules/eightPodAnalyticsAdapter.js
new file mode 100644
index 00000000000..e91f9412ef5
--- /dev/null
+++ b/modules/eightPodAnalyticsAdapter.js
@@ -0,0 +1,205 @@
+import {logError, logInfo, logMessage} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import { EVENTS } from '../src/constants.js';
+import adapterManager from '../src/adapterManager.js';
+import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js'
+import {getStorageManager} from '../src/storageManager.js';
+
+const analyticsType = 'endpoint';
+const MODULE_NAME = `eightPod`;
+const MODULE = `${MODULE_NAME}AnalyticProvider`;
+
+/**
+ * Custom tracking server that gets internal events from EightPod's ad unit
+ */
+const trackerUrl = 'https://demo.8pod.com/tracker/track';
+export const storage = getStorageManager({moduleType: MODULE_TYPE_ANALYTICS, moduleName: MODULE_NAME})
+
+const {
+  BID_WON
+} = EVENTS;
+
+export let queue = [];
+let context = {};
+
+/**
+ * Create eightPod Analytic adapter
+ */
+let eightPodAnalytics = Object.assign(adapter({url: trackerUrl, analyticsType}), {
+  /**
+   * Execute on bid won - setup basic settings, save context about EightPod's bid. We will send it with our events later
+   */
+  track({ eventType, args }) {
+    switch (eventType) {
+      case BID_WON:
+        if (args.bidder === 'eightPod') {
+          context[args.adUnitCode] = makeContext(args);
+
+          eightPodAnalytics.setupPage(args);
+          break;
+        }
+    }
+  },
+
+  /**
+   * Execute on bid won upload events from local storage
+   */
+  setupPage() {
+    queue = this.getEventFromLocalStorage();
+  },
+
+  /**
+   * Subscribe on internal ad unit tracking events
+   */
+  eventSubscribe() {
+    window.addEventListener('message', async (event) => {
+      const data = event.data;
+
+      const frameElement = event.source?.frameElement;
+      const parentElement = frameElement?.parentElement;
+      const adUnitCode = parentElement?.id;
+
+      trackEvent(data, adUnitCode);
+    });
+
+    if (!this._interval) {
+      this._interval = setInterval(sendEvents, 10_000);
+    }
+  },
+  resetQueue() {
+    queue = [];
+  },
+  getContext() {
+    return context;
+  },
+  resetContext() {
+    context = {};
+  },
+  getEventFromLocalStorage,
+});
+
+/**
+ * Create context of event, who emits it
+ */
+function makeContext(args) {
+  const params = args?.params?.[0];
+  return {
+    bidId: args.seatBidId,
+    variantId: args.creativeId || '',
+    campaignId: args.cid || '',
+    publisherId: params.publisherId,
+    placementId: params.placementId,
+  };
+}
+
+/**
+ * Create event, add context and push it to queue
+ */
+export function trackEvent(event, adUnitCode) {
+  if (!event.detail) {
+    return;
+  }
+
+  const fullEvent = {
+    context: eightPodAnalytics.getContext()[adUnitCode],
+    eventType: event.detail.type,
+    eventClass: 'adunit',
+    timestamp: new Date().getTime(),
+    eventName: event.detail.name,
+    payload: event.detail.payload
+  };
+
+  logMessage(fullEvent);
+  addEvent(fullEvent);
+}
+
+/**
+ * Push event to queue, save event list in local storage
+ */
+function addEvent(eventPayload) {
+  queue.push(eventPayload);
+  storage.setDataInLocalStorage(`EIGHT_POD_EVENTS`, JSON.stringify(queue), null);
+}
+
+/**
+ * Gets previously saved event that has not been sent
+ */
+function getEventFromLocalStorage() {
+  const storedEvents = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage('EIGHT_POD_EVENTS') : null;
+
+  if (storedEvents) {
+    return JSON.parse(storedEvents);
+  } else {
+    return [];
+  }
+}
+
+/**
+ * Send event to our custom tracking server and reset queue
+ */
+function sendEvents() {
+  eightPodAnalytics.eventsStorage = queue;
+
+  if (queue.length) {
+    try {
+      sendEventsApi(queue, {
+        success: () => {
+          resetLocalStorage();
+          eightPodAnalytics.resetQueue();
+        },
+        error: (e) => {
+          logError(MODULE, 'Cant send events', e);
+        }
+      })
+    } catch (e) {
+      logError(MODULE, 'Cant send events', e);
+    }
+  }
+}
+
+/**
+ * Send event to our custom tracking server
+ */
+function sendEventsApi(eventList, callbacks) {
+  ajax(trackerUrl, callbacks, JSON.stringify(eventList), {keepalive: true});
+}
+
+/**
+ * Remove saved events in success scenario
+ */
+const resetLocalStorage = () => {
+  storage.setDataInLocalStorage(`EIGHT_POD_EVENTS`, JSON.stringify([]), null);
+}
+
+// save the base class function
+eightPodAnalytics.originEnableAnalytics = eightPodAnalytics.enableAnalytics;
+eightPodAnalytics.eventsStorage = [];
+
+// override enableAnalytics so we can get access to the config passed in from the page
+// Subscribe on events from adUnit
+eightPodAnalytics.enableAnalytics = function (config) {
+  eightPodAnalytics.originEnableAnalytics(config);
+  logInfo(MODULE, 'init', config);
+  eightPodAnalytics.eventSubscribe();
+};
+
+eightPodAnalytics.disableAnalytics = ((orig) => {
+  return function () {
+    if (this._interval) {
+      clearInterval(this._interval);
+      this._interval = null;
+    }
+    return orig.apply(this, arguments);
+  }
+})(eightPodAnalytics.disableAnalytics)
+
+/**
+ * Register Analytics Adapter
+ */
+adapterManager.registerAnalyticsAdapter({
+  adapter: eightPodAnalytics,
+  code: MODULE_NAME
+});
+
+export default eightPodAnalytics;
diff --git a/modules/eightPodAnalyticsAdapter.md b/modules/eightPodAnalyticsAdapter.md
new file mode 100644
index 00000000000..fe37bf34459
--- /dev/null
+++ b/modules/eightPodAnalyticsAdapter.md
@@ -0,0 +1,19 @@
+# Overview
+Module Name: 8pod Analytics by 8Pod
+
+Module Type: Analytics Adapter
+
+Maintainer: bianca@8pod.com
+
+# Description
+
+Analytics adapter for prebid provided by 8pod. It gets events from eightPod's ad unit and send it to our tracking server to improve user experience.
+Please, use it ONLY with eightPodBidAdapter.
+
+# Analytics Adapter configuration example
+
+```
+{
+  provider: 'eightPod'
+}
+```
diff --git a/modules/eightPodBidAdapter.js b/modules/eightPodBidAdapter.js
new file mode 100644
index 00000000000..536bc4b4036
--- /dev/null
+++ b/modules/eightPodBidAdapter.js
@@ -0,0 +1,249 @@
+import { ortbConverter } from '../libraries/ortbConverter/converter.js'
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import { BANNER } from '../src/mediaTypes.js'
+import * as utils from '../src/utils.js'
+
+export const BIDDER_CODE = 'eightPod'
+const url = 'https://demo.8pod.com/bidder/rtb/eightpod_exchange/bid';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  isBannerBid,
+  isVideoBid,
+  onBidWon
+}
+
+registerBidder(spec)
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 300,
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const req = buildRequest(imps, bidderRequest, context)
+    return req
+  },
+  response(buildResponse, bidResponses, ortbResponse, context) {
+    const response = buildResponse(bidResponses, ortbResponse, context)
+    return response.bids
+  },
+  imp(buildImp, bidRequest, context) {
+    return buildImp(bidRequest, context)
+  },
+  bidResponse
+})
+
+function hasRequiredParams(bidRequest) {
+  return !!bidRequest?.params?.placementId
+}
+
+function isBidRequestValid(bidRequest) {
+  return hasRequiredParams(bidRequest)
+}
+
+function buildRequests(bids, bidderRequest) {
+  let bannerBids = bids.filter((bid) => isBannerBid(bid))
+  let requests = bannerBids.length
+    ? createRequest(bannerBids, bidderRequest, BANNER)
+    : []
+
+  return requests
+}
+
+function bidResponse(buildBidResponse, bid, context) {
+  bid.nurl = replacePriceInUrl(bid.nurl, bid.price);
+
+  const bidResponse = buildBidResponse(bid, context);
+
+  bidResponse.height = context?.imp?.banner?.format?.[0].h;
+  bidResponse.width = context?.imp?.banner?.format?.[0].w;
+  bidResponse.cid = bid.cid;
+
+  bidResponse.burl = replacePriceInUrl(bid.burl, bidResponse.originalCpm || bidResponse.cpm);
+
+  return bidResponse;
+}
+
+function onBidWon(bid) {
+  if (bid.burl) {
+    utils.triggerPixel(bid.burl)
+  }
+}
+function replacePriceInUrl(url, price) {
+  return url.replace(/\${AUCTION_PRICE}/, price)
+}
+
+export function parseUserAgent() {
+  const ua = navigator.userAgent.toLowerCase();
+
+  // Check if it's iOS
+  if (/iphone|ipad|ipod/.test(ua)) {
+    // Extract iOS version and device type
+    const iosInfo = /(iphone|ipad|ipod) os (\d+[._]\d+)|((iphone|ipad|ipod)(\D+cpu) os (\d+(?:[._\s]\d+)?))/.exec(ua);
+    return {
+      platform: 'ios',
+      version: iosInfo ? iosInfo[1] : '',
+      device: iosInfo ? iosInfo[2].replace('_', '.') : ''
+    };
+  } else if (/android/.test(ua)) {
+    // Check if it's Android
+    // Extract Android version
+    const androidVersion = /android (\d+([._]\d+)?)/.exec(ua);
+    return {
+      platform: 'android',
+      version: androidVersion ? androidVersion[1].replace('_', '.') : '',
+      device: ''
+    };
+  } else {
+    // If neither iOS nor Android, return unknown
+    return {
+      platform: 'Unknown',
+      version: '',
+      device: ''
+    };
+  }
+}
+
+export function getPageKeywords(win = window) {
+  let element;
+
+  try {
+    element = win.top.document.querySelector('meta[name="keywords"]');
+  } catch (e) {
+    element = document.querySelector('meta[name="keywords"]');
+  }
+
+  return ((element && element.content) || '').replaceAll(' ', '');
+}
+
+function createRequest(bidRequests, bidderRequest, mediaType) {
+  const requests = bidRequests.map((bidRequest) => {
+    const data = converter.toORTB({
+      bidRequests: [bidRequest],
+      bidderRequest,
+      context: { mediaType },
+    });
+
+    data.adSlotPositionOnScreen = 'ABOVE_THE_FOLD';
+    data.at = 1;
+
+    const userId =
+      utils.deepAccess(bidRequest, 'userId.unifiedId.id') ||
+      utils.deepAccess(bidRequest, 'userId.id5id.uid') ||
+      utils.deepAccess(bidRequest, 'userId.idl_env');
+
+    const params = getBidderParams(bidRequest);
+    data.device = {
+      ...data.device,
+      devicetype: 4,
+      geo: {
+        country: params.country || 'GRB'
+      },
+      language: params.language || data.device.language,
+    }
+    data.site = {
+      ...data.site,
+      keywords: getPageKeywords(window),
+      publisher: {
+        id: params.publisherId
+      }
+    }
+    data.imp = [
+      {
+        ...data.imp?.[0],
+        secure: 1,
+        pmp: params.dealId
+          ? {
+            ...data.pmp,
+            deals: [
+              {
+                id: params.dealId,
+              },
+            ],
+            private_auction: 1,
+          }
+          : data.pmp,
+      }
+    ]
+    data.adSlotPlacementId = params.placementId;
+
+    if (userId) {
+      data.user = {
+        id: userId
+      }
+    }
+
+    const req = {
+      method: 'POST',
+      url: url && params.trace ? url + '?trace=true' : url,
+      options: { withCredentials: false },
+      data
+    }
+    return req
+  })
+
+  return requests;
+}
+
+function getBidderParams(bid) {
+  return bid?.params ? bid.params : undefined;
+}
+
+function isVideoBid(bid) {
+  return utils.deepAccess(bid, 'mediaTypes.video')
+}
+
+function isBannerBid(bid) {
+  return utils.deepAccess(bid, 'mediaTypes.banner')
+}
+
+function interpretResponse(resp, req) {
+  const impressionId = resp.body.seatbid[0].bid[0].impid;
+  const bidResponses = converter.fromORTB({ request: req.data, response: resp.body });
+  const ad = bidResponses[0].ad;
+  const trackingTag = `
+        
+        
+
+        
+        `
+
+  bidResponses[0].ad = ad.replace('', trackingTag + '');
+  return bidResponses;
+}
diff --git a/modules/eightPodBidAdapter.md b/modules/eightPodBidAdapter.md
new file mode 100644
index 00000000000..afefd5717de
--- /dev/null
+++ b/modules/eightPodBidAdapter.md
@@ -0,0 +1,36 @@
+# Overview
+Module Name: 8pod Bidder Adapter 
+
+Module Type: Bidder Adapter
+
+Maintainer: bianca@8pod.com
+
+# Description
+
+Connect to 8pod for bids.
+
+This adapter requires setup and approval from the 8pod team.
+
+Please add eightPodAnalytics to collect user behavior and improve user experience as well.
+
+# Bidder Adapter configuration example
+
+```
+var adUnits = [{
+        code: 'something',
+        mediaTypes: {
+            banner: {
+                sizes: [[350, 550]],
+            },
+        },
+        bids: [
+            {
+                bidder: 'eightPod',
+                params: {
+                    placementId: 13144370,
+                    publisherId: 'publisherID-488864646',
+                },
+            },
+        ],
+    }];
+```
diff --git a/modules/emtvBidAdapter.js b/modules/emtvBidAdapter.js
index 7a2fdae8adf..822fa683d9e 100644
--- a/modules/emtvBidAdapter.js
+++ b/modules/emtvBidAdapter.js
@@ -1,211 +1,19 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'emtv';
 const AD_URL = 'https://us-east-ep.engagemedia.tv/pbjs';
 const SYNC_URL = 'https://cs.engagemedia.tv';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId, endpointId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  if (placementId) {
-    placement.placementId = placementId;
-    placement.type = 'publisher';
-  } else if (endpointId) {
-    placement.endpointId = endpointId;
-    placement.type = 'network';
-  }
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/engageyaBidAdapter.js b/modules/engageyaBidAdapter.js
index a66e825e5df..2d2fadfe4ca 100644
--- a/modules/engageyaBidAdapter.js
+++ b/modules/engageyaBidAdapter.js
@@ -81,7 +81,7 @@ function parseBannerResponse(rec, response) {
   const title = rec.title && rec.title.trim() ? `` : '';
   const displayName = rec.displayName && title ? `` : '';
   const trackers = getImpressionTrackers(rec, response)
-    .map(createTrackPixelHtml)
+    .map((url) => createTrackPixelHtml(url))
     .join('');
   return `${style}`;
 }
diff --git a/modules/enrichmentFpdModule.js b/modules/enrichmentFpdModule.js
deleted file mode 100644
index 59d5d326109..00000000000
--- a/modules/enrichmentFpdModule.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Logic from this module was moved into core since approx. 7.27
-// TODO: remove this in v8
diff --git a/modules/eplanningAnalyticsAdapter.js b/modules/eplanningAnalyticsAdapter.js
deleted file mode 100644
index 9eb701b8ecc..00000000000
--- a/modules/eplanningAnalyticsAdapter.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import { logError } from '../src/utils.js';
-import {ajax} from '../src/ajax.js';
-import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
-
-const analyticsType = 'endpoint';
-const EPL_HOST = 'https://ads.us.e-planning.net/hba/1/';
-
-function auctionEndHandler(args) {
-  return {auctionId: args.auctionId};
-}
-
-function auctionInitHandler(args) {
-  return {
-    auctionId: args.auctionId,
-    time: args.timestamp
-  };
-}
-
-function bidRequestedHandler(args) {
-  return {
-    auctionId: args.auctionId,
-    time: args.start,
-    bidder: args.bidderCode,
-    bids: args.bids.map(function(bid) {
-      return {
-        time: bid.startTime,
-        bidder: bid.bidder,
-        placementCode: bid.placementCode,
-        auctionId: bid.auctionId,
-        sizes: bid.sizes
-      };
-    }),
-  };
-}
-
-function bidResponseHandler(args) {
-  return {
-    bidder: args.bidder,
-    size: args.size,
-    auctionId: args.auctionId,
-    cpm: args.cpm,
-    time: args.responseTimestamp,
-  };
-}
-
-function bidWonHandler(args) {
-  return {
-    auctionId: args.auctionId,
-    size: args.width + 'x' + args.height,
-  };
-}
-
-function bidTimeoutHandler(args) {
-  return args.map(function(bid) {
-    return {
-      bidder: bid.bidder,
-      auctionId: bid.auctionId
-    };
-  })
-}
-
-function callHandler(evtype, args) {
-  let handler = null;
-
-  if (evtype === CONSTANTS.EVENTS.AUCTION_INIT) {
-    handler = auctionInitHandler;
-    eplAnalyticsAdapter.context.events = [];
-  } else if (evtype === CONSTANTS.EVENTS.AUCTION_END) {
-    handler = auctionEndHandler;
-  } else if (evtype === CONSTANTS.EVENTS.BID_REQUESTED) {
-    handler = bidRequestedHandler;
-  } else if (evtype === CONSTANTS.EVENTS.BID_RESPONSE) {
-    handler = bidResponseHandler
-  } else if (evtype === CONSTANTS.EVENTS.BID_TIMEOUT) {
-    handler = bidTimeoutHandler;
-  } else if (evtype === CONSTANTS.EVENTS.BID_WON) {
-    handler = bidWonHandler;
-  }
-
-  if (handler) {
-    eplAnalyticsAdapter.context.events.push({ec: evtype, p: handler(args)});
-  }
-}
-
-var eplAnalyticsAdapter = Object.assign(adapter(
-  {
-    EPL_HOST,
-    analyticsType
-  }),
-{
-  track({eventType, args}) {
-    if (typeof args !== 'undefined') {
-      callHandler(eventType, args);
-    }
-
-    if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
-      try {
-        let strjson = JSON.stringify(eplAnalyticsAdapter.context.events);
-        ajax(eplAnalyticsAdapter.context.host + eplAnalyticsAdapter.context.ci + '?d=' + encodeURIComponent(strjson));
-      } catch (err) {}
-    }
-  }
-}
-);
-
-eplAnalyticsAdapter.originEnableAnalytics = eplAnalyticsAdapter.enableAnalytics;
-
-eplAnalyticsAdapter.enableAnalytics = function (config) {
-  if (!config.options.ci) {
-    logError('Client ID (ci) option is not defined. Analytics won\'t work');
-    return;
-  }
-
-  eplAnalyticsAdapter.context = {
-    events: [],
-    host: config.options.host || EPL_HOST,
-    ci: config.options.ci
-  };
-
-  eplAnalyticsAdapter.originEnableAnalytics(config);
-};
-
-adapterManager.registerAnalyticsAdapter({
-  adapter: eplAnalyticsAdapter,
-  code: 'eplanning'
-});
-
-export default eplAnalyticsAdapter;
diff --git a/modules/eplanningBidAdapter.js b/modules/eplanningBidAdapter.js
index d57804c04e6..1fe5cb09c10 100644
--- a/modules/eplanningBidAdapter.js
+++ b/modules/eplanningBidAdapter.js
@@ -274,7 +274,7 @@ function getFloorStr(bid) {
       currency: DOLLAR_CODE,
       mediaType: '*',
       size: '*'
-    });
+    }) || {};
 
     if (bidFloor.floor) {
       return '|' + encodeURIComponent(bidFloor.floor);
diff --git a/modules/equativBidAdapter.js b/modules/equativBidAdapter.js
new file mode 100644
index 00000000000..646a54b6418
--- /dev/null
+++ b/modules/equativBidAdapter.js
@@ -0,0 +1,174 @@
+
+import { getBidFloor } from '../libraries/equativUtils/equativUtils.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { deepAccess, deepSetValue, logError, logWarn, mergeDeep } from '../src/utils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ */
+
+const BIDDER_CODE = 'equativ';
+const COOKIE_SYNC_ORIGIN = 'https://apps.smartadserver.com';
+const COOKIE_SYNC_URL = `${COOKIE_SYNC_ORIGIN}/diff/templates/asset/csync.html`;
+const LOG_PREFIX = 'Equativ:';
+const PID_COOKIE_NAME = 'eqt_pid';
+
+/**
+ * Evaluates impressions for validity.  The entry evaluated is considered valid if NEITHER of these conditions are met:
+ * 1) it has a `video` property defined for `mediaTypes.video` which is an empty object
+ * 2) it has a `native` property defined for `mediaTypes.native` which is an empty object
+ * @param {*} bidReq A bid request object to evaluate
+ * @returns boolean
+ */
+function isValid(bidReq) {
+  return !(bidReq.mediaTypes.video && JSON.stringify(bidReq.mediaTypes.video) === '{}') && !(bidReq.mediaTypes.native && JSON.stringify(bidReq.mediaTypes.native) === '{}');
+}
+
+export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: 45,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * @param bidRequests
+   * @param bidderRequest
+   * @returns {ServerRequest[]}
+   */
+  buildRequests: (bidRequests, bidderRequest) => {
+    if (bidRequests.filter(isValid).length === 0) {
+      logError(`${LOG_PREFIX} No useful bid requests to process. No requests will be sent.`, bidRequests);
+      return undefined;
+    }
+
+    const requests = [];
+
+    bidRequests.forEach(bid => {
+      const data = converter.toORTB({bidRequests: [bid], bidderRequest});
+      requests.push({
+        data,
+        method: 'POST',
+        url: 'https://ssb-global.smartadserver.com/api/bid?callerId=169',
+      })
+    });
+
+    return requests;
+  },
+
+  /**
+   * @param serverResponse
+   * @param bidRequest
+   * @returns {Bid[]}
+   */
+  interpretResponse: (serverResponse, bidRequest) =>
+    converter.fromORTB({
+      request: bidRequest.data,
+      response: serverResponse.body,
+    }),
+
+  /**
+   * @param bidRequest
+   * @returns {boolean}
+   */
+  isBidRequestValid: (bidRequest) => {
+    return !!(
+      deepAccess(bidRequest, 'params.networkId') ||
+      deepAccess(bidRequest, 'ortb2.site.publisher.id') ||
+      deepAccess(bidRequest, 'ortb2.app.publisher.id') ||
+      deepAccess(bidRequest, 'ortb2.dooh.publisher.id')
+    );
+  },
+
+  /**
+   * @param syncOptions
+   * @returns {{type: string, url: string}[]}
+   */
+  getUserSyncs: (syncOptions) => {
+    if (syncOptions.iframeEnabled) {
+      window.addEventListener('message', function handler(event) {
+        if (event.origin === COOKIE_SYNC_ORIGIN && event.data.pid) {
+          const exp = new Date();
+          exp.setTime(Date.now() + 31536000000); // in a year
+          storage.setCookie(PID_COOKIE_NAME, event.data.pid, exp.toUTCString());
+          this.removeEventListener('message', handler);
+        }
+      });
+
+      return [{ type: 'iframe', url: COOKIE_SYNC_URL }];
+    }
+
+    return [];
+  }
+};
+
+export const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 300,
+  },
+
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    const mediaType = deepAccess(bidRequest, 'mediaTypes.video') ? VIDEO : BANNER;
+    const { siteId, pageId, formatId } = bidRequest.params;
+
+    delete imp.dt;
+
+    imp.bidfloor = imp.bidfloor || getBidFloor(bidRequest, config.getConfig('currency.adServerCurrency'), mediaType);
+    imp.secure = 1;
+    imp.tagid = bidRequest.adUnitCode;
+
+    if (!deepAccess(bidRequest, 'ortb2Imp.rwdd') && deepAccess(bidRequest, 'mediaTypes.video.ext.rewarded')) {
+      mergeDeep(imp, { rwdd: bidRequest.mediaTypes.video.ext.rewarded });
+    }
+
+    const bidder = { ...(siteId && { siteId }), ...(pageId && { pageId }), ...(formatId && { formatId }) };
+    if (Object.keys(bidder).length) {
+      mergeDeep(imp.ext, { bidder });
+    }
+
+    return imp;
+  },
+
+  request(buildRequest, imps, bidderRequest, context) {
+    const bid = context.bidRequests[0];
+    const req = buildRequest(imps, bidderRequest, context);
+
+    let env = ['ortb2.site.publisher', 'ortb2.app.publisher', 'ortb2.dooh.publisher'].find(propPath => deepAccess(bid, propPath)) || 'ortb2.site.publisher';
+    deepSetValue(req, env.replace('ortb2.', '') + '.id', deepAccess(bid, env + '.id') || bid.params.networkId);
+
+    if (deepAccess(bid, 'mediaTypes.video')) {
+      ['mimes', 'placement'].forEach(prop => {
+        if (!bid.mediaTypes.video[prop]) {
+          logWarn(`${LOG_PREFIX} Property "${prop}" is missing from request`, bid);
+        }
+      });
+    }
+
+    // "assets" is not included as a property to check here because the
+    // ortbConverter library checks for it already and will skip processing
+    // the request if it is missing
+    if (deepAccess(bid, 'mediaTypes.native')) {
+      ['privacy', 'plcmttype', 'eventtrackers'].forEach(prop => {
+        if (!bid.mediaTypes.native.ortb[prop]) {
+          logWarn(`${LOG_PREFIX} Property "${prop}" is missing from request.  Request will proceed, but the use of ${prop} for native requests is strongly encouraged.`, bid);
+        }
+      });
+    }
+
+    const pid = storage.getCookie(PID_COOKIE_NAME);
+    if (pid) {
+      deepSetValue(req, 'user.buyeruid', pid);
+    }
+
+    return req;
+  }
+});
+
+registerBidder(spec);
diff --git a/modules/equativBidAdapter.md b/modules/equativBidAdapter.md
new file mode 100644
index 00000000000..ceee6d19bdc
--- /dev/null
+++ b/modules/equativBidAdapter.md
@@ -0,0 +1,40 @@
+# Overview
+
+```
+Module Name: Equativ Bidder Adapter (beta)
+Module Type: Bidder Adapter
+Maintainer: support@equativ.com
+```
+
+# Description
+
+Connect to Equativ for bids.
+
+The Equativ adapter requires setup and approval from the Equativ team. Please reach out to your technical account manager for more information.
+
+# Test Parameters
+
+## Web or In-app
+```javascript
+var adUnits = [
+    {
+        code: '/589236/banner_1',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [
+            {
+                bidder: 'equativ',
+                params: {
+                    networkId: 13,  // mandatory if no ortb2.(site or app).publisher.id set
+                    siteId: 20743,  // optional
+                    pageId: 89653,  // optional
+                    formatId: 291,  // optional
+                }
+            }
+        ]
+    }
+];
+```
\ No newline at end of file
diff --git a/modules/eskimiBidAdapter.js b/modules/eskimiBidAdapter.js
index 81b8c5d8058..8b1beba09c3 100644
--- a/modules/eskimiBidAdapter.js
+++ b/modules/eskimiBidAdapter.js
@@ -2,12 +2,15 @@ import {ortbConverter} from '../libraries/ortbConverter/converter.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import * as utils from '../src/utils.js';
-import {getBidIdParameter} from '../src/utils.js';
+import {getBidIdParameter, logInfo, mergeDeep} from '../src/utils.js';
 
-const BIDDER_CODE = 'eskimi';
-// const ENDPOINT = 'https://hb.eskimi.com/bids'
-const ENDPOINT = 'https://sspback.eskimi.com/bid-request'
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
 
+const BIDDER_CODE = 'eskimi';
 const DEFAULT_BID_TTL = 30;
 const DEFAULT_CURRENCY = 'USD';
 const DEFAULT_NET_REVENUE = true;
@@ -17,7 +20,7 @@ const VIDEO_ORTB_PARAMS = [
   'mimes',
   'minduration',
   'maxduration',
-  'placement',
+  'plcmt',
   'protocols',
   'startdelay',
   'skip',
@@ -33,7 +36,13 @@ const VIDEO_ORTB_PARAMS = [
 
 const BANNER_ORTB_PARAMS = [
   'battr'
-]
+];
+
+const REGION_SUBDOMAIN_SUFFIX = {
+  EU: '',
+  US: '-us-e',
+  APAC: '-asia'
+};
 
 export const spec = {
   code: BIDDER_CODE,
@@ -42,15 +51,23 @@ export const spec = {
   isBidRequestValid,
   buildRequests,
   interpretResponse,
+  getUserSyncs,
   /**
    * Register bidder specific code, which will execute if a bid from this bidder won the auction
    * @param {Bid} bid The bid that won the auction
    */
   onBidWon: function (bid) {
+    logInfo('Bid won: ', bid);
     if (bid.burl) {
       utils.triggerPixel(bid.burl);
     }
-  }
+  },
+  onTimeout: function (timeoutData) {
+    logInfo('Timeout: ', timeoutData);
+  },
+  onBidderError: function ({error, bidderRequest}) {
+    logInfo('Error: ', error, bidderRequest);
+  },
 }
 
 registerBidder(spec);
@@ -63,7 +80,7 @@ const CONVERTER = ortbConverter({
   },
   imp(buildImp, bidRequest, context) {
     let imp = buildImp(bidRequest, context);
-    imp.secure = Number(window.location.protocol === 'https:');
+    imp.secure = bidRequest.ortb2Imp?.secure ?? 1;
     if (!imp.bidfloor && bidRequest.params.bidFloor) {
       imp.bidfloor = bidRequest.params.bidFloor;
       imp.bidfloorcur = getBidIdParameter('bidFloorCur', bidRequest.params).toUpperCase() || 'USD'
@@ -76,7 +93,24 @@ const CONVERTER = ortbConverter({
     }
 
     return imp;
-  }
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const req = buildRequest(imps, bidderRequest, context);
+    mergeDeep(req, {
+      at: 1,
+      ext: {
+        pv: '$prebid.version$'
+      }
+    })
+    const bid = context.bidRequests[0];
+    if (bid.params.coppa) {
+      utils.deepSetValue(req, 'regs.coppa', 1);
+    }
+    if (bid.params.test) {
+      req.test = 1
+    }
+    return req;
+  },
 });
 
 function isBidRequestValid(bidRequest) {
@@ -84,7 +118,7 @@ function isBidRequestValid(bidRequest) {
 }
 
 function isPlacementIdValid(bidRequest) {
-  return utils.isNumber(bidRequest.params.placementId);
+  return !!parseInt(bidRequest.params.placementId);
 }
 
 function isValidBannerRequest(bidRequest) {
@@ -98,9 +132,17 @@ function isValidVideoRequest(bidRequest) {
   return utils.isArray(videoSizes) && videoSizes.length > 0 && videoSizes.every(size => utils.isNumber(size[0]) && utils.isNumber(size[1]));
 }
 
-function buildRequests(validBids, bidderRequest) {
-  let videoBids = validBids.filter(bid => isVideoBid(bid));
-  let bannerBids = validBids.filter(bid => isBannerBid(bid));
+/**
+ * Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
+ * Make a server request from the list of BidRequests.
+ *
+ * @param {*} validBidRequests
+ * @param {*} bidderRequest
+ * @return ServerRequest Info describing the request to the server.
+ */
+function buildRequests(validBidRequests, bidderRequest) {
+  let videoBids = validBidRequests.filter(bid => isVideoBid(bid));
+  let bannerBids = validBidRequests.filter(bid => isBannerBid(bid));
   let requests = [];
 
   bannerBids.forEach(bid => {
@@ -115,14 +157,14 @@ function buildRequests(validBids, bidderRequest) {
 }
 
 function interpretResponse(response, request) {
-  return CONVERTER.fromORTB({ request: request.data, response: response.body }).bids;
+  return CONVERTER.fromORTB({request: request.data, response: response.body}).bids;
 }
 
 function buildVideoImp(bidRequest, imp) {
   const videoAdUnitParams = utils.deepAccess(bidRequest, `mediaTypes.${VIDEO}`, {});
   const videoBidderParams = utils.deepAccess(bidRequest, `params.${VIDEO}`, {});
 
-  const videoParams = { ...videoAdUnitParams, ...videoBidderParams };
+  const videoParams = {...videoAdUnitParams, ...videoBidderParams};
 
   const videoSizes = (videoAdUnitParams && videoAdUnitParams.playerSize) || [];
 
@@ -138,17 +180,17 @@ function buildVideoImp(bidRequest, imp) {
   });
 
   if (imp.video && videoParams?.context === 'outstream') {
-    imp.video.placement = imp.video.placement || 4;
+    imp.video.plcmt = imp.video.plcmt || 4;
   }
 
-  return { ...imp };
+  return {...imp};
 }
 
 function buildBannerImp(bidRequest, imp) {
   const bannerAdUnitParams = utils.deepAccess(bidRequest, `mediaTypes.${BANNER}`, {});
   const bannerBidderParams = utils.deepAccess(bidRequest, `params.${BANNER}`, {});
 
-  const bannerParams = { ...bannerAdUnitParams, ...bannerBidderParams };
+  const bannerParams = {...bannerAdUnitParams, ...bannerBidderParams};
 
   let sizes = bidRequest.mediaTypes.banner.sizes;
 
@@ -163,15 +205,15 @@ function buildBannerImp(bidRequest, imp) {
     }
   });
 
-  return { ...imp };
+  return {...imp};
 }
 
 function createRequest(bidRequests, bidderRequest, mediaType) {
-  const data = CONVERTER.toORTB({ bidRequests, bidderRequest, context: { mediaType } })
+  const data = CONVERTER.toORTB({bidRequests, bidderRequest, context: {mediaType}})
 
   const bid = bidRequests.find((b) => b.params.placementId)
   if (!data.site) data.site = {}
-  data.site.ext = { placementId: bid.params.placementId }
+  data.site.ext = {placementId: parseInt(bid.params.placementId)}
 
   if (bidderRequest.gdprConsent) {
     if (!data.user) data.user = {};
@@ -188,9 +230,9 @@ function createRequest(bidRequests, bidderRequest, mediaType) {
 
   return {
     method: 'POST',
-    url: ENDPOINT,
+    url: getBidRequestUrlByRegion(),
     data: data,
-    options: { contentType: 'application/json;charset=UTF-8', withCredentials: false }
+    options: {contentType: 'application/json;charset=UTF-8', withCredentials: false}
   }
 }
 
@@ -201,3 +243,84 @@ function isVideoBid(bid) {
 function isBannerBid(bid) {
   return utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
 }
+
+/**
+ * @param syncOptions
+ * @param responses
+ * @param gdprConsent
+ * @param uspConsent
+ * @param gppConsent
+ * @return {{type: (string), url: (*|string)}[]}
+ */
+function getUserSyncs(syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
+  if ((syncOptions.iframeEnabled || syncOptions.pixelEnabled)) {
+    let pixelType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let query = [];
+    let syncUrl = getUserSyncUrlByRegion();
+    // GDPR Consent Params in UserSync url
+    if (gdprConsent) {
+      query.push('gdpr=' + (gdprConsent.gdprApplies & 1));
+      query.push('gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || ''));
+    }
+    // US Privacy Consent
+    if (uspConsent) {
+      query.push('us_privacy=' + encodeURIComponent(uspConsent));
+    }
+    // Global Privacy Platform Consent
+    if (gppConsent?.gppString && gppConsent?.applicableSections?.length) {
+      query.push('gpp=' + encodeURIComponent(gppConsent.gppString));
+      query.push('gpp_sid=' + encodeURIComponent(gppConsent.applicableSections.join(',')));
+    }
+    return [{
+      type: pixelType,
+      url: `${syncUrl}${query.length > 0 ? '&' + query.join('&') : ''}`
+    }];
+  }
+}
+
+/**
+ * Get Bid Request endpoint url by region
+ * @return {string}
+ */
+function getBidRequestUrlByRegion() {
+  return `https://ittr${getRegionSubdomainSuffix()}.eskimi.com/prebidjs`;
+}
+
+/**
+ * Get User Sync endpoint url by region
+ * @return {string}
+ */
+function getUserSyncUrlByRegion() {
+  return `https://ittpx${getRegionSubdomainSuffix()}.eskimi.com/sync?sp_id=137`;
+}
+
+/**
+ * Get subdomain URL suffix by region
+ * @return {string}
+ */
+function getRegionSubdomainSuffix() {
+  try {
+    const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    const region = timezone.split('/')[0];
+
+    switch (region) {
+      case 'Europe':
+      case 'Africa':
+      case 'Atlantic':
+      case 'Arctic':
+        return REGION_SUBDOMAIN_SUFFIX['EU'];
+      case 'Asia':
+      case 'Australia':
+      case 'Antarctica':
+      case 'Pacific':
+      case 'Indian':
+        return REGION_SUBDOMAIN_SUFFIX['APAC'];
+      case 'America':
+        return REGION_SUBDOMAIN_SUFFIX['US'];
+      default:
+        return REGION_SUBDOMAIN_SUFFIX['EU'];
+    }
+  } catch (err) {
+    return REGION_SUBDOMAIN_SUFFIX['EU'];
+  }
+}
diff --git a/modules/eskimiBidAdapter.md b/modules/eskimiBidAdapter.md
index b3494a217eb..30db251b7a8 100644
--- a/modules/eskimiBidAdapter.md
+++ b/modules/eskimiBidAdapter.md
@@ -48,6 +48,35 @@ Banner and video formats are supported.
 
 Where:
 
-* placementId - Placement ID of the ad unit (required)
-* bcat, badv, bapp, battr - ORTB blocking parameters as specified by OpenRTB 2.5
+* `placementId` - Placement ID of the ad unit (required)
+* `bcat`, `badv`, `bapp`, `battr` - ORTB blocking parameters as specified by OpenRTB 2.5
 
+# ## Configuration
+
+Eskimi recommends the UserSync configuration below. Without it, the Eskimi adapter will not able to perform user syncs, which lowers match rate and reduces monetization.
+
+```javascript
+pbjs.setConfig({
+   userSync: {
+       filterSettings: {
+           iframe: {
+               bidders: ['eskimi'], 
+               filter: 'include'
+           }
+       }, 
+       syncDelay: 6000
+ }});
+```
+
+### Bidder Settings
+
+The Eskimi bid adapter uses browser local storage. Since Prebid.js 7.x, the access to it must be explicitly set.
+
+```js
+// https://docs.prebid.org/dev-docs/publisher-api-reference/bidderSettings.html
+pbjs.bidderSettings = {
+    eskimi: {
+        storageAllowed: true
+    }
+}
+```
diff --git a/modules/etargetBidAdapter.js b/modules/etargetBidAdapter.js
index cced180e061..1653d849297 100644
--- a/modules/etargetBidAdapter.js
+++ b/modules/etargetBidAdapter.js
@@ -1,8 +1,9 @@
-import { deepSetValue, isFn, isPlainObject } from '../src/utils.js';
+import { deepClone, deepSetValue, isFn, isPlainObject } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'etarget';
+const GVL_ID = 29;
 const countryMap = {
   1: 'sk',
   2: 'cz',
@@ -19,6 +20,7 @@ const countryMap = {
 }
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVL_ID,
   supportedMediaTypes: [ BANNER, VIDEO ],
   isBidRequestValid: function (bid) {
     return !!(bid.params.refid && bid.params.country);
@@ -26,7 +28,7 @@ export const spec = {
   buildRequests: function (validBidRequests, bidderRequest) {
     var i, l, bid, reqParams, netRevenue, gdprObject;
     var request = [];
-    var bids = JSON.parse(JSON.stringify(validBidRequests));
+    var bids = deepClone(validBidRequests);
     var lastCountry = 'sk';
     var floors = [];
     for (i = 0, l = bids.length; i < l; i++) {
diff --git a/modules/euidIdSystem.js b/modules/euidIdSystem.js
index 6a3a0869c0e..281fa04a12a 100644
--- a/modules/euidIdSystem.js
+++ b/modules/euidIdSystem.js
@@ -12,7 +12,14 @@ import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
 // RE below lint exception: UID2 and EUID are separate modules, but the protocol is the same and shared code makes sense here.
 // eslint-disable-next-line prebid/validate-imports
-import { Uid2GetId, Uid2CodeVersion } from './uid2IdSystem_shared.js';
+import { Uid2GetId, Uid2CodeVersion, extractIdentityFromParams } from './uid2IdSystem_shared.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
 
 const MODULE_NAME = 'euid';
 const MODULE_REVISION = Uid2CodeVersion;
@@ -75,9 +82,9 @@ export const euidIdSubmodule = {
   /**
    * performs action to obtain id and return a value.
    * @function
-   * @param {SubmoduleConfig} [configparams]
+   * @param {SubmoduleConfig} [config]
    * @param {ConsentData|undefined} consentData
-   * @returns {euidId}
+   * @returns {IdResponse}
    */
   getId(config, consentData) {
     if (consentData?.gdprApplies !== true) {
@@ -99,6 +106,14 @@ export const euidIdSubmodule = {
       internalStorage: ADVERTISING_COOKIE
     };
 
+    if (FEATURES.UID2_CSTG) {
+      mappedConfig.cstg = {
+        serverPublicKey: config?.params?.serverPublicKey,
+        subscriptionId: config?.params?.subscriptionId,
+        ...extractIdentityFromParams(config?.params ?? {})
+      }
+    }
+    _logInfo(`EUID configuration loaded and mapped.`, mappedConfig);
     const result = Uid2GetId(mappedConfig, storage, _logInfo, _logWarn);
     _logInfo(`EUID getId returned`, result);
     return result;
@@ -120,6 +135,10 @@ function decodeImpl(value) {
     const result = { euid: { id: value } };
     return result;
   }
+  if (value.latestToken === 'optout') {
+    _logInfo('Found optout token.  Refresh is unavailable for this token.');
+    return { euid: { optout: true } };
+  }
   if (Date.now() < value.latestToken.identity_expires) {
     return { euid: { id: value.latestToken.advertising_token } };
   }
diff --git a/modules/euidIdSystem.md b/modules/euidIdSystem.md
index e3e16bce89d..9c3f730da83 100644
--- a/modules/euidIdSystem.md
+++ b/modules/euidIdSystem.md
@@ -1,9 +1,59 @@
 ## EUID User ID Submodule
 
-EUID requires initial tokens to be generated server-side. The EUID module handles storing, providing, and optionally refreshing them. The module can operate in one of two different modes: *Client Refresh* mode or *Server Only* mode.
+The EUID module handles storing, providing, and optionally refreshing tokens. While initial tokens traditionally required server-side generation, the introduction of the *Client-Side Token Generation (CSTG)* mode offers publishers the flexibility to generate EUID tokens directly from the module, eliminating this need. Publishers can choose to operate the module in one of three distinct modes: *Client Refresh* mode, *Server Only* mode and *Client-Side Token Generation* mode.
 
 *Server Only* mode was originally referred to as *legacy mode*, but it is a popular mode for new integrations where publishers prefer to handle token refresh server-side.
 
+*Client-Side Token Generation* mode is included in EUID module by default. However, it's important to note that this mode was created and made available recently. For publishers who do not intend to use it, you have the option to instruct the build to exclude the code related to this feature:
+
+```
+    $ gulp build --modules=euidIdSystem --disable UID2_CSTG
+```
+If you do plan to use Client-Side Token Generation (CSTG) mode, please consult the EUID Team first as they will provide required configuration values for you to use (see the Client-Side Token Generation (CSTG) mode section below for details)
+
+**This mode is created and made available recently. Please consult EUID Team first as they will provide required configuration values for you to use.**
+
+For publishers seeking a purely client-side integration without the complexities of server-side involvement, the CSTG mode is highly recommended. This mode requires the provision of a public key, subscription ID and [directly identifying information (DII)](https://unifiedid.com/docs/ref-info/glossary-uid#gl-dii) - either emails or phone numbers. In the CSTG mode, the module takes on the responsibility of encrypting the DII, generating the EUID token, and handling token refreshes when necessary.
+
+To configure the module to use this mode, you must:
+1. Set `parmas.serverPublicKey`  and `params.subscriptionId` (please reach out to the UID2 team to obtain these values)
+2. Provide **ONLY ONE DII** by setting **ONLY ONE** of `params.email`/`params.phone`/`params.emailHash`/`params.phoneHash`
+
+Below is a table that provides guidance on when to use each directly identifying information (DII) parameter, along with information on whether normalization and hashing are required by the publisher for each parameter.
+
+| DII param        | When to use it                                        | Normalization required by publisher? | Hashing required by publisher? |
+|------------------|-------------------------------------------------------|--------------------------------------|--------------------------------|
+| params.email     | When you have users' email address                    | No                                   | No                             |
+| params.phone     | When you have user's phone number                     | Yes                                  | No                             |
+| params.emailHash | When you have user's hashed, normalized email address | Yes                                  | Yes                            |
+| params.phoneHash | When you have user's hashed, normalized phone number  | Yes                                  | Yes                            |
+
+
+*Note that setting params.email will normalize email addresses, but params.phone requires phone numbers to be normalized.*
+
+Refer to [Normalization and Encoding](#normalization-and-encoding) for details on email address normalization, SHA-256 hashing and Base64 encoding.
+
+### CSTG example
+
+Configuration:
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'euid',
+            params: {
+               serverPublicKey: '...server public key...',
+               subscriptionId: '...subcription id...',
+               email: 'user@email.com',
+               //phone: '+0000000',
+               //emailHash: '...email hash...',
+               //phoneHash: '...phone hash ...'
+            }
+        }]
+    }
+});
+```
+
 ## Client Refresh mode
 
 This is the recommended mode for most scenarios. In this mode, the full response body from the EUID Token Generate or Token Refresh endpoint must be provided to the module. As long as the refresh token remains valid, the module will refresh the advertising token as needed.
@@ -107,6 +157,11 @@ The module stores a number of internal values. By default, all values are stored
 
 `{`
  `"advertising_token": "...",`
  `"refresh_token": "...",`
  `"identity_expires": 1633643601000,`
  `"refresh_from": 1633643001000,`
  `"refresh_expires": 1636322000000,`
  `"refresh_response_key": "wR5t6HKMfJ2r4J7fEGX9Gw=="`
`}`
 
+## Optout response
+
+`{`
  `"optout": "true",`
`}`
+
+
 ### Notes
 
 If you are trying to limit the size of cookies, provide the token in configuration and use the default option of local storage.
diff --git a/modules/exadsBidAdapter.js b/modules/exadsBidAdapter.js
new file mode 100644
index 00000000000..e50c141f4b0
--- /dev/null
+++ b/modules/exadsBidAdapter.js
@@ -0,0 +1,514 @@
+import * as utils from '../src/utils.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER = 'exads';
+
+const PARTNERS = {
+  ORTB_2_4: 'ortb_2_4'
+};
+
+const GVL_ID = 1084;
+
+const htmlImageOutput = 'html';
+const htmlVideoOutput = 'html';
+
+const adPartnerHandlers = {
+  [PARTNERS.ORTB_2_4]: {
+    request: handleReqORTB2Dot4,
+    response: handleResORTB2Dot4,
+    validation: handleValidORTB2Dot4
+  }
+};
+
+function handleReqORTB2Dot4(validBidRequest, endpointUrl, bidderRequest) {
+  utils.logInfo(`Calling endpoint for ortb_2_4:`, endpointUrl);
+  const gdprConsent = getGdprConsentChoice(bidderRequest);
+  const envParams = getEnvParams();
+
+  // Make a dynamic bid request to the ad partner's endpoint
+  let bidRequestData = {
+    'id': validBidRequest.bidId, // NOT bid.bidderRequestId or bid.auctionId
+    'at': 1,
+    'imp': [],
+    'bcat': validBidRequest.params.bcat,
+    'badv': validBidRequest.params.badv,
+    'site': {
+      'id': validBidRequest.params.siteId,
+      'name': validBidRequest.params.siteName,
+      'domain': envParams.domain,
+      'page': envParams.page,
+      'keywords': validBidRequest.params.keywords
+    },
+    'device': {
+      'ua': envParams.userAgent,
+      'ip': validBidRequest.params.userIp,
+      'geo': {
+        'country': validBidRequest.params.country
+      },
+      'language': envParams.lang,
+      'os': envParams.osName,
+      'js': 0,
+      'ext': {
+        'accept_language': envParams.language
+      }
+    },
+    'user': {
+      'id': validBidRequest.params.userId,
+    },
+    'ext': {
+      'sub': 0,
+      'prebid': {
+        'channel': {
+          'name': 'pbjs',
+          'version': '$prebid.version$'
+        }
+      }
+    }
+  };
+
+  if (gdprConsent && gdprConsent.gdprApplies) {
+    bidRequestData.user['ext'] = {
+      consent: gdprConsent.consentString
+    }
+  }
+
+  if (validBidRequest.params.dsa && (
+    hasValue(validBidRequest.params.dsa.dsarequired) ||
+    hasValue(validBidRequest.params.dsa.pubrender) ||
+    hasValue(validBidRequest.params.dsa.datatopub))) {
+    bidRequestData.regs = {
+      'ext': {
+        'dsa': {
+          'dsarequired': validBidRequest.params.dsa.dsarequired,
+          'pubrender': validBidRequest.params.dsa.pubrender,
+          'datatopub': validBidRequest.params.dsa.datatopub
+        }
+      }
+    }
+  }
+
+  const impData = imps.get(validBidRequest.params.impressionId);
+
+  // Banner setup
+  const bannerMediaType = utils.deepAccess(validBidRequest, 'mediaTypes.banner');
+  if (bannerMediaType != null) {
+    impData.mediaType = BANNER;
+    bidRequestData.imp = bannerMediaType.sizes.map(size => {
+      return ({
+        'id': validBidRequest.params.impressionId,
+        'bidfloor': validBidRequest.params.bidfloor,
+        'bidfloorcur': validBidRequest.params.bidfloorcur,
+        'banner': {
+          'w': size[0],
+          'h': size[1],
+          'mimes': validBidRequest.params.mimes ? validBidRequest.params.mimes : undefined,
+          'ext': {
+            image_output: htmlImageOutput,
+            video_output: htmlVideoOutput,
+          }
+        },
+      });
+    });
+  }
+
+  const nativeMediaType = utils.deepAccess(validBidRequest, 'mediaTypes.native');
+
+  if (nativeMediaType != null) {
+    impData.mediaType = NATIVE;
+    const nativeVersion = '1.2';
+
+    const native = {
+      'native': {
+        'ver': nativeVersion,
+        'plcmttype': 4,
+        'plcmtcnt': validBidRequest.params.native.plcmtcnt
+      }
+    };
+
+    native.native.assets = bidRequestData.imp = nativeMediaType.ortb.assets.map(asset => {
+      const newAsset = asset;
+      if (newAsset.img != null) {
+        newAsset.img.wmin = newAsset.img.h;
+        newAsset.img.hmin = newAsset.img.w;
+      }
+      return newAsset;
+    });
+
+    const imp = [{
+      'id': validBidRequest.params.impressionId,
+      'bidfloor': validBidRequest.params.bidfloor,
+      'bidfloorcur': validBidRequest.params.bidfloorcur,
+      'native': {
+        'request': JSON.stringify(native),
+        'ver': nativeVersion
+      },
+    }];
+
+    bidRequestData.imp = imp;
+  };
+
+  const videoMediaType = utils.deepAccess(validBidRequest, 'mediaTypes.video');
+
+  if (videoMediaType != null) {
+    impData.mediaType = VIDEO;
+    const imp = [{
+      'id': validBidRequest.params.impressionId,
+      'bidfloor': validBidRequest.params.bidfloor,
+      'bidfloorcur': validBidRequest.params.bidfloorcur,
+      'video': {
+        'mimes': videoMediaType.mimes,
+        'protocols': videoMediaType.protocols,
+      },
+      'ext': validBidRequest.params.imp.ext
+    }];
+
+    bidRequestData.imp = imp;
+  }
+
+  utils.logInfo('PAYLOAD', bidRequestData, JSON.stringify(bidRequestData));
+  utils.logInfo('FINAL URL', endpointUrl);
+
+  return makeBidRequest(endpointUrl, bidRequestData);
+};
+
+function handleResORTB2Dot4(serverResponse, request, adPartner) {
+  utils.logInfo('on handleResORTB2Dot4 -> request:', request);
+  utils.logInfo('on handleResORTB2Dot4 -> request json data:', JSON.parse(request.data));
+  utils.logInfo('on handleResORTB2Dot4 -> serverResponse:', serverResponse);
+
+  let bidResponses = [];
+  const bidRq = JSON.parse(request.data);
+
+  if (serverResponse.hasOwnProperty('body') && serverResponse.body.hasOwnProperty('id')) {
+    utils.logInfo('Ad server response', serverResponse.body.id);
+
+    const requestId = serverResponse.body.id;
+    const currency = serverResponse.body.cur;
+
+    serverResponse.body.seatbid.forEach((seatbid, seatIndex) => {
+      seatbid.bid.forEach((bidData, bidIndex) => {
+        utils.logInfo('serverResponse.body.seatbid[' + seatIndex + '].bid[' + bidIndex + ']', bidData);
+
+        const bidResponseAd = bidData.adm;
+        const bannerInfo = utils.deepAccess(bidRq.imp[0], 'banner');
+        const nativeInfo = utils.deepAccess(bidRq.imp[0], 'native');
+        const videoInfo = utils.deepAccess(bidRq.imp[0], 'video');
+
+        let w; let h = 0;
+        let mediaType = '';
+        const native = {};
+
+        if (bannerInfo != null) {
+          w = bidRq.imp[0].banner.w;
+          h = bidRq.imp[0].banner.h;
+          mediaType = BANNER;
+        } else if (nativeInfo != null) {
+          const responseADM = JSON.parse(bidResponseAd);
+          responseADM.native.assets.forEach(asset => {
+            if (asset.img != null) {
+              const imgAsset = JSON.parse(bidRq.imp[0].native.request)
+                .native.assets.filter(asset => asset.img != null).map(asset => asset.img);
+              w = imgAsset[0].w;
+              h = imgAsset[0].h;
+              native.image = {
+                url: asset.img.url,
+                height: h,
+                width: w
+              }
+            } else if (asset.title != null) {
+              native.title = asset.title.text;
+            } else if (asset.data != null) {
+              native.body = asset.data.value;
+            } else {
+              utils.logWarn('bidResponse->', 'wrong asset type or null');
+            }
+          });
+
+          if (responseADM.native) {
+            if (responseADM.native.link) {
+              native.clickUrl = responseADM.native.link.url;
+            }
+            if (responseADM.native.eventtrackers) {
+              native.impressionTrackers = [];
+
+              responseADM.native.eventtrackers.forEach(tracker => {
+                if (tracker.method == 1) {
+                  native.impressionTrackers.push(tracker.url);
+                }
+              });
+            }
+          }
+          mediaType = NATIVE;
+        } else if (videoInfo != null) {
+          mediaType = VIDEO;
+        }
+
+        const metaData = {};
+
+        if (hasValue(bidData.ext.dsa)) {
+          metaData.dsa = bidData.ext.dsa;
+        }
+
+        const bidResponse = {
+          requestId: requestId,
+          currency: currency,
+          ad: bidData.adm,
+          cpm: bidData.price,
+          creativeId: bidData.crid,
+          cid: bidData.cid,
+          width: w,
+          ttl: 360,
+          height: h,
+          netRevenue: true,
+          mediaType: mediaType,
+          meta: metaData,
+          nurl: bidData.nurl.replace(/^http:\/\//i, 'https://')
+        };
+
+        if (mediaType == 'native') {
+          bidResponse.native = native;
+        }
+
+        if (mediaType == 'video') {
+          bidResponse.vastXml = bidData.adm;
+          bidResponse.width = bidData.w;
+          bidResponse.height = bidData.h;
+        }
+
+        utils.logInfo('bidResponse->', bidResponse);
+
+        bidResponses.push(bidResponse);
+      });
+    });
+  } else {
+    imps.delete(bidRq.imp[0].id);
+    utils.logInfo('NO Ad server response ->', serverResponse.body.id);
+  }
+
+  utils.logInfo('interpretResponse -> bidResponses:', bidResponses);
+
+  return bidResponses;
+}
+
+function makeBidRequest(url, data) {
+  const payloadString = JSON.stringify(data);
+
+  return {
+    method: 'POST',
+    url: url,
+    data: payloadString
+  }
+}
+
+function getUrl(adPartner, bid) {
+  let endpointUrlMapping = {
+    [PARTNERS.ORTB_2_4]: bid.params.endpoint + '?idzone=' + bid.params.zoneId + '&fid=' + bid.params.fid
+  };
+
+  return endpointUrlMapping[adPartner] ? endpointUrlMapping[adPartner] : 'defaultEndpoint';
+}
+
+function getEnvParams() {
+  const envParams = {
+    lang: '',
+    userAgent: '',
+    osName: '',
+    page: '',
+    domain: '',
+    language: ''
+  };
+
+  // TODO: all of this is already in first party data
+  envParams.domain = window.location.hostname;
+  envParams.page = window.location.protocol + '//' + window.location.host + window.location.pathname;
+  envParams.lang = navigator.language.indexOf('-') > -1
+    ? navigator.language.split('-')[0]
+    : navigator.language;
+  envParams.userAgent = navigator.userAgent;
+  if (envParams.userAgent.match(/Windows/i)) {
+    envParams.osName = 'Windows';
+  } else if (envParams.userAgent.match(/Mac OS|Macintosh/i)) {
+    envParams.osName = 'MacOS';
+  } else if (envParams.userAgent.match(/Unix/i)) {
+    envParams.osName = 'Unix';
+  } else if (envParams.userAgent.match(/Android/i)) {
+    envParams.osName = 'Android';
+  } else if (envParams.userAgent.match(/iPhone|iPad|iPod/i)) {
+    envParams.osName = 'iOS';
+  } else if (envParams.userAgent.match(/Linux/i)) {
+    envParams.osName = 'Linux';
+  } else {
+    envParams.osName = 'Unknown';
+  }
+
+  let browserLanguage = navigator.language || navigator.userLanguage;
+  let acceptLanguage = browserLanguage.replace('_', '-');
+
+  envParams.language = acceptLanguage;
+
+  utils.logInfo('Domain -> ', envParams.domain);
+  utils.logInfo('Page -> ', envParams.page);
+  utils.logInfo('Lang -> ', envParams.lang);
+  utils.logInfo('OS -> ', envParams.osName);
+  utils.logInfo('User Agent -> ', envParams.userAgent);
+  utils.logInfo('Primary Language -> ', envParams.language);
+
+  return envParams;
+}
+
+export const imps = new Map();
+
+/*
+  Common mandatory parameters:
+  - endpoint
+  - userIp
+  - userIp - the minimum constraint is having the propery, empty or not
+  - zoneId
+  - partner
+  - fid
+  - siteId
+  - impressionId
+  - country
+  - mediaTypes?.banner or mediaTypes?.native or mediaTypes?.video
+
+  for native parameters
+  - assets - it should contain the img property
+
+  for video parameters
+  - mimes - it has to contain one mime type at least
+  - procols - it should contain one protocol at least
+
+*/
+function handleValidORTB2Dot4(bid) {
+  const bannerInfo = bid.mediaTypes?.banner;
+  const nativeInfo = bid.mediaTypes?.native;
+  const videoInfo = bid.mediaTypes?.video;
+  const isValid = (
+    hasValue(bid.params.endpoint) &&
+    hasValue(bid.params.userIp) &&
+    bid.params.hasOwnProperty('userIp') &&
+    hasValue(bid.params.zoneId) &&
+    hasValue(bid.params.partner) &&
+    hasValue(bid.params.fid) &&
+    hasValue(bid.params.siteId) &&
+    hasValue(bid.params.impressionId) &&
+    hasValue(bid.params.country) &&
+    hasValue(bid.params.country.length > 0) &&
+    ((!hasValue(bid.params.bcat) ||
+      bid.params.bcat.length > 0)) &&
+    ((!hasValue(bid.params.badv) ||
+        bid.params.badv.length > 0)) &&
+    (bannerInfo || nativeInfo || videoInfo) &&
+    (nativeInfo ? bid.params.native &&
+      nativeInfo.ortb.assets &&
+      nativeInfo.ortb.assets.some(asset => !!asset.img) : true) &&
+    (videoInfo ? (videoInfo.mimes &&
+      videoInfo.mimes.length > 0 &&
+      videoInfo.protocols &&
+      videoInfo.protocols.length > 0) : true));
+  if (!isValid) {
+    utils.logError('Validation Error');
+  }
+
+  return isValid;
+}
+
+function hasValue(value) {
+  return (
+    value !== undefined &&
+    value !== null
+  );
+}
+
+function getGdprConsentChoice(bidderRequest) {
+  const hasGdprConsent =
+    hasValue(bidderRequest) &&
+    hasValue(bidderRequest.gdprConsent);
+
+  if (hasGdprConsent) {
+    return bidderRequest.gdprConsent;
+  }
+
+  return null;
+}
+
+export const spec = {
+  aliases: ['exads'], // short code
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+  isBidRequestValid: function (bid) {
+    utils.logInfo('on isBidRequestValid -> bid:', bid);
+
+    if (!bid.params.partner) {
+      utils.logError('Validation Error', 'bid.params.partner missed');
+      return false;
+    } else if (!Object.values(PARTNERS).includes(bid.params.partner)) {
+      utils.logError('Validation Error', 'bid.params.partner is not valid');
+      return false;
+    }
+
+    let adPartner = bid.params.partner;
+
+    if (adPartnerHandlers[adPartner] && adPartnerHandlers[adPartner]['validation']) {
+      return adPartnerHandlers[adPartner]['validation'](bid);
+    } else {
+      // Handle unknown or unsupported ad partners
+      return false;
+    }
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    utils.logInfo('on buildRequests -> validBidRequests:', validBidRequests);
+    utils.logInfo('on buildRequests -> bidderRequest:', bidderRequest);
+
+    return validBidRequests.map(bid => {
+      let adPartner = bid.params.partner;
+
+      imps.set(bid.params.impressionId, { adPartner: adPartner, mediaType: null });
+
+      let endpointUrl = getUrl(adPartner, bid);
+
+      // Call the handler for the ad partner, passing relevant parameters
+      if (adPartnerHandlers[adPartner]['request']) {
+        return adPartnerHandlers[adPartner]['request'](bid, endpointUrl, bidderRequest);
+      } else {
+        // Handle unknown or unsupported ad partners
+        return null;
+      }
+    });
+  },
+  interpretResponse: function (serverResponse, request) {
+    const bid = JSON.parse(request.data);
+    const impData = imps.get(bid.imp[0].id);
+    const adPartner = impData.adPartner;
+
+    // Call the handler for the ad partner, passing relevant parameters
+    if (adPartnerHandlers[adPartner]['response']) {
+      return adPartnerHandlers[adPartner]['response'](serverResponse, request, adPartner);
+    } else {
+      // Handle unknown or unsupported ad partners
+      return null;
+    }
+  },
+  onTimeout: function (timeoutData) {
+    utils.logWarn(`onTimeout -> timeoutData:`, timeoutData);
+  },
+  onBidWon: function (bid) {
+    utils.logInfo(`onBidWon -> bid:`, bid);
+    if (bid.nurl) {
+      utils.triggerPixel(bid.nurl);
+    }
+  },
+  onSetTargeting: function (bid) {
+    utils.logInfo(`onSetTargeting -> bid:`, bid);
+  },
+  onBidderError: function (bid) {
+    imps.delete(bid.bidderRequest.bids[0].params.impressionId);
+    utils.logInfo('onBidderError -> bid:', bid);
+  },
+};
+
+registerBidder({
+  code: BIDDER,
+  gvlid: GVL_ID,
+  ...spec
+});
diff --git a/modules/exadsBidAdapter.md b/modules/exadsBidAdapter.md
new file mode 100644
index 00000000000..4c8eedffdd0
--- /dev/null
+++ b/modules/exadsBidAdapter.md
@@ -0,0 +1,484 @@
+# Overview
+
+**Module Name**: Exads Bidder Adapter
+
+**Module Type**: Bidder Adapter
+
+**Maintainer**: 
+
+## Description
+
+Module that connects to EXADS' bidder for bids.
+
+## Build
+
+If you don't need to use the prebidJS video module, please remove the videojsVideoProvider module.
+
+```bash
+gulp build --modules=consentManagement,exadsBidAdapter,videojsVideoProvider 
+```
+
+### Configuration
+
+Use `setConfig` to instruct Prebid.js to initilize the exadsBidAdapter, as specified below.
+
+* Set "debug" as true if you need to read logs;
+* Set "gdprApplies" as true if you need to pass gdpr consent string;
+* The tcString is the iabtcf consent string for gdpr;
+* Uncomment the cache instruction if you need to configure a cache server (e.g. for instream video)
+
+```js
+pbjs.setConfig({
+    debug: false,
+    //cache: { url: "https://prebid.adnxs.com/pbc/v1/cache" },
+    consentManagement: {
+        gdpr: {
+            cmpApi: 'static',
+            timeout: 1000000,
+            defaultGdprScope: true,
+            consentData: {
+                getTCData: {
+                    tcString: consentString,
+                    gdprApplies: false // set to true to pass the gdpr consent string
+                }
+            }
+        }
+    }
+});
+```
+
+Add the `video` config if you need to render videos using the video module.
+For more info navigate to .
+
+```js
+pbjs.setConfig({
+    video: {
+        providers: [{
+            divId: 'player', // the id related to the videojs tag in your body
+            vendorCode: 2, // videojs, 
+            playerConfig: {
+                params: {
+                    adPluginConfig: {
+                        numRedirects: 10
+                    },
+                    vendorConfig: {
+                        controls: true,
+                        autoplay: true,
+                        preload: "auto",
+                    }
+                }
+            }
+        },]
+    },
+});
+```
+
+### Test Parameters
+
+Now you will find the different parameters to set, based on publisher website. They are optional unless otherwise specified.
+
+#### RTB Banner 2.4
+
+* **zoneId** (required) - you can get it from the endpoint created after configuring the zones (integer)
+* **fid** (required) - you can get it from the endpoint created after configuring the zones (string)
+* **partner** (required) - currently we support rtb 2.4 ("ortb_2_4") only (string)
+* **siteId** (recommended) - unique Site ID (string)
+* **siteName** site name (string)
+* **banner.sizes** (required) - one integer array - [width, height]
+* **userIp** (required) - IP address of the user, ipv4 or ipv6 (string)
+* **userId** (*required) - unique user ID (string).*If you cannot generate a user ID, you can leave it empty (""). The request will get a response as long as "user" object is included in the request
+* **country** - country ISO3
+* **impressionId** (required) - unique impression ID within this bid request (string)
+* **keywords** - keywords can be used to ensure ad zones get the right type of advertising. Keywords should be a string of comma-separated words
+* **bidfloor** - minimum bid for this impression (CPM) / click (CPC) and account currency (float)
+* **bidfloorcur** - currency for minimum bid value specified using ISO-4217 alpha codes (string)
+* **bcat** - blocked advertiser categories using the IAB content categories (string array)
+* **badv** - block list of advertisers by their domains (string array)
+* **mimes** - list of supported mime types. We support: image/jpeg, image/jpg, image/png, image/png, image/gif, image/webp, video/mp4 (string array)
+* **dsa** - DSA transparency information
+  * **dsarequired** - flag to indicate if DSA information should be made available (integer)
+        *0 - Not required
+        * 1 - Supported, bid responses with or without DSA object will be accepted
+        *2 - Required, bid responses without DSA object will not be accepted
+        * 3 - Required, bid responses without DSA object will not be accepted, Publisher is an Online Platform
+    * **pubrender** - flag to indicate if the publisher will render the DSA Transparency info (integer)
+      * 0 - Publisher can't render
+        * 1 - Publisher could render depending on adrender
+        * 2 - Publisher will render
+    * **datatopub** - independent of pubrender, the publisher may need the transparency data for audit purposes (integer)
+      * 0 - do not send transparency data
+        * 1 - optional to send transparency data
+        * 2 - send transparency data
+* **endpoint** (required) - EXADS endpoint (URL)
+
+##### RTB Banner 2.4 (Image)
+
+```js
+
+adUnits = 
+    [{  code: 'postbid_iframe', // the frame where to render the creative
+        mediaTypes: {
+            banner: {
+                sizes: [300, 250]
+            }
+        },
+        bids: [{
+            bidder: 'exads',
+            params: {
+                    zoneId: 12345,
+                    fid: '829a896f011475d50da0d82cfdd1af8d9cdb07ff',
+                    partner: 'ortb_2_4',
+                    siteId: '123',
+                    siteName: 'test.com',
+                    userIp: '0.0.0.0',
+                    userId: '1234',
+                    country: 'IRL',
+                    impressionId: impression_id.toString(),
+                    keywords: 'lifestyle, humour',
+                    bidfloor: 0.00000011,
+                    bidfloorcur: 'EUR',
+                    bcat: ['IAB25', 'IAB7-39','IAB8-18','IAB8-5','IAB9-9'],
+                    badv: ['first.com', 'second.com'],
+                    mimes: ['image/jpg'],
+                    dsa: {
+                        dsarequired: 3, 
+                        pubrender: 0,
+                        datatopub: 2
+                    },
+                    endpoint: 'https://your-ad-network.com/rtb.php'
+                }
+            }]
+        }];
+```
+
+##### RTB Banner 2.4 (Video)
+
+```js
+adUnits = 
+    [{  code: 'postbid_iframe', // the frame where to render the creative
+        mediaTypes: {
+            banner: {
+                sizes: [900, 250]
+            }
+        },
+        bids: [{
+            bidder: 'exads',
+            params: {
+                    zoneId: 12345,
+                    fid: '829a896f011475d50da0d82cfdd1af8d9cdb07ff',
+                    partner: 'ortb_2_4',
+                    siteId: '123',
+                    siteName: 'test.com',
+                    userIp: '0.0.0.0',
+                    userId: '1234',
+                    country: 'IRL',
+                    impressionId: '1234',
+                    keywords: 'lifestyle, humour',
+                    bidfloor: 0.00000011,
+                    bidfloorcur: 'EUR',
+                    bcat: ['IAB25', 'IAB7-39','IAB8-18','IAB8-5','IAB9-9'],
+                    badv: ['first.com', 'second.com'],                      
+                    mimes: ['image/jpg'],
+                    dsa: {
+                        dsarequired: 3, 
+                        pubrender: 0,
+                        datatopub: 2
+                    },
+                    endpoint: 'https://your-ad-network.com/rtb.php'
+                }
+            }]
+        }];
+```
+
+#### RTB 2.4 Video (Instream/OutStream/Video Slider) - VAST XML or VAST TAG (url)
+
+* **zoneId** (required) - you can get it from the endpoint created after configuring the zones (integer)
+* **fid** (required) - you can get it from the endpoint created after configuring the zones (string)
+* **partner** (required) - currently we support rtb 2.4 ("ortb_2_4") only (string)
+* **siteId** (recommended) - unique Site ID (string)
+* **siteName** site name (string)
+* **userIp** (required) - IP address of the user, ipv4 or ipv6 (string)
+* **userId** (required) - unique user ID (string). *If you cannot generate a user ID, you can leave it empty (""). The request will get a response as long as "user" object is included in the request
+* **country** - Country ISO3 (string)
+* **impressionId** (required) - unique impression ID within this bid request (string)
+* **keywords** - keywords can be used to ensure ad zones get the right type of advertising. Keywords should be a string of comma-separated words
+* **bidfloor** - minimum bid for this impression (CPM) / click (CPC) and account currency (float)
+* **bidfloorcur** - currency for minimum bid value specified using ISO-4217 alpha codes (string)
+* **bcat** - blocked advertiser categories using the IAB content categories (string array)
+* **badv** - block list of advertisers by their domains (string array)
+* **mediaTypes.video** (required)
+  * **mimes** (required) - list of supported mime types (string array)
+    * **protocols** (required) - list of supported video bid response protocols (integer array)
+    * **context** - (recommended) - the video context, either 'instream', 'outstream'. Defaults to ‘instream’ (string)
+* **dsa** - DSA transparency information
+  * **dsarequired** - flag to indicate if DSA information should be made available (integer)
+        *0 - Not required
+        * 1 - Supported, bid responses with or without DSA object will be accepted
+        *2 - Required, bid responses without DSA object will not be accepted
+        * 3 - Required, bid responses without DSA object will not be accepted, Publisher is an Online Platform
+    * **pubrender** - flag to indicate if the publisher will render the DSA Transparency info (integer)
+      * 0 - Publisher can't render
+        * 1 - Publisher could render depending on adrender
+        * 2 - Publisher will render
+    * **datatopub** - independent of pubrender, the publisher may need the transparency data for audit purposes (integer)
+      * 0 - do not send transparency data
+        * 1 - optional to send transparency data
+        * 2 - send transparency data
+* **endpoint** (required) - EXADS endpoint (URL)
+
+```js
+adUnits = [{
+    code: 'postbid_iframe',
+    mediaTypes: {
+        video: {
+            mimes: ['video/mp4'],
+            context: 'instream',
+            protocols: [3, 6]
+        }
+    },
+    bids: [{
+        bidder: 'exads',
+        params: {
+            zoneId: 12345,
+            fid: '829a896f011475d50da0d82cfdd1af8d9cdb07ff',
+            partner: 'ortb_2_4',
+            siteId: '123',
+            siteName: 'test.com',
+            userIp: '0.0.0.0',
+            userId: '1234',
+            impressionId: '1234',
+            imp: {
+                ext: {
+                    video_cta: 0
+                }
+            },
+            dsa: {
+                dsarequired: 3, 
+                pubrender: 0,
+                datatopub: 2
+            },
+            country: 'IRL',
+            keywords: 'lifestyle, humour',
+            bidfloor: 0.00000011,
+            bidfloorcur: 'EUR',
+            bcat: ['IAB25', 'IAB7-39','IAB8-18','IAB8-5','IAB9-9'],
+            badv: ['first.com', 'second.com'],            
+            endpoint: 'https://your-ad-network.com/rtb.php'
+        }
+    }]
+}];
+```
+
+#### RTB 2.4 Native
+
+* **zoneId** (required) - you can get it from the endpoint created after configuring the zones (integer)
+* **fid** (required) - you can get it from the endpoint created after configuring the zones (string)
+* **partner** (required) - currently we support rtb 2.4 ("ortb_2_4") only (string)
+* **siteId** (recommended) - unique Site ID (string)
+* **siteName** site name (string)
+* **userIp** (required) - IP address of the user, ipv4 or ipv6 (string)
+* **userId** (*required) - unique user ID (string).*If you cannot generate a user ID, you can leave it empty (""). The request will get a response as long as "user" object is included in the request
+* **country** - country ISO3 (string)
+* **impressionId** (required) - unique impression ID within this bid request (string)
+* **keywords** - keywords can be used to ensure ad zones get the right type of advertising. Keywords should be a string of comma-separated words
+* **bidfloor** - minimum bid for this impression (CPM) / click (CPC) and account currency (float)
+* **bidfloorcur** - currency for minimum bid value specified using ISO-4217 alpha codes (string)
+* **bcat** - blocked advertiser categories using the IAB content categories (string array)
+* **badv** - block list of advertisers by their domains (string array)
+* **dsa** - DSA transparency information
+  * **dsarequired** - flag to indicate if DSA information should be made available (integer)
+        *0 - Not required
+        * 1 - Supported, bid responses with or without DSA object will be accepted
+        *2 - Required, bid responses without DSA object will not be accepted
+        * 3 - Required, bid responses without DSA object will not be accepted, Publisher is an Online Platform
+    * **pubrender** - flag to indicate if the publisher will render the DSA Transparency info (integer)
+      * 0 - Publisher can't render
+        * 1 - Publisher could render depending on adrender
+        * 2 - Publisher will render
+    * **datatopub** - independent of pubrender, the publisher may need the transparency data for audit purposes (integer)
+      * 0 - do not send transparency data
+        * 1 - optional to send transparency data
+        * 2 - send transparency data
+* **native.plcmtcnt** - the number of identical placements in this Layout (integer)
+* **assets (title)**
+  * **id** - unique asset ID, assigned by exchange. Typically a counter for the array (integer):
+        *1 - image asset ID
+        * 2 - title asset ID
+        * 3 - description asset ID
+    * **required** - set to 1 if asset is required or 0 if asset is optional (integer)
+    * **title**
+      * len (required) - maximum length of the text in the title element (integer)
+* **assets (data)**
+  * **id** - unique asset ID, assigned by exchange. Typically a counter for the array (integer):
+        *1 - image asset ID
+        * 2 - title asset ID
+        * 3 - description asset ID
+    * **data**
+      * **type** - type ID of the element supported by the publisher (integer). We support:
+            *1 - sponsored - sponsored By message where response should contain the brand name of the sponsor
+            * 2 - desc - descriptive text associated with the product or service being advertised
+        * **len** - maximum length of the text in the element’s response (integer)
+* **assets (img)**
+  * **id** - unique asset ID, assigned by exchange. Typically a counter for the array (integer):
+        *1 - image asset ID
+        * 2 - title asset ID
+        * 3 - description asset ID
+    * **required** - set to 1 if asset is required or 0 if asset is optional (integer)
+    * **img**
+      * **type** - type ID of the image element supported by the publisher. We support:
+            *1 - icon image (integer)
+            * 3 - large image preview for the ad (integer)
+        * **w** - width of the image in pixels, optional (integer)
+        * **h** - height of the image in pixels, optional (integer)
+* **endpoint** (required) - EXADS endpoint (URL)
+
+```js
+adUnits = [{
+    code: 'postbid_iframe',
+    mediaTypes: {
+        native: {
+            ortb: {
+                assets: [{
+                    id: 2,
+                    required: 1,
+                    title: {
+                        len: 124
+                    }
+                },
+                {
+                    id: 3,
+                    data: {
+                        type: 1,
+                        len: 50
+                    }
+                },
+                {
+                    id: 1,
+                    required: 1,
+                    img: {
+                        type: 3,
+                        w: 300,
+                        h: 300
+                    }
+                }]
+            }
+        }
+    },
+    bids: [{
+        bidder: 'exads',
+        params: {
+                zoneId: 12345,
+                fid: '829a896f011475d50da0d82cfdd1af8d9cdb07ff',
+                partner: 'ortb_2_4',
+                siteId: '123',
+                siteName: 'test.com',
+                userIp: '0.0.0.0',
+                userId: '1234',
+                impressionId: '1234',
+                native: {
+                    plcmtcnt: 4
+                },
+                dsa: {
+                    dsarequired: 3, 
+                    pubrender: 0,
+                    datatopub: 2
+                },
+                country: 'IRL',
+                keywords: 'lifestyle, humour',
+                bidfloor: 0.00000011,
+                bidfloorcur: 'EUR',
+                bcat: ['IAB25', 'IAB7-39','IAB8-18','IAB8-5','IAB9-9'],
+                badv: ['first.com', 'second.com'],                
+                endpoint: 'https://your-ad-network.com/rtb.php'
+            }
+        }]
+}];
+```
+
+## DSA Transparency
+
+All DSA information, returned by the ad server, can be found into the **meta** tag of the response. As:
+
+```js
+"meta": {
+    "dsa": {
+        "behalf": "...",
+        "paid": "...",
+        "transparency": [
+            {
+                "params": [
+                    ...
+                ]
+            }
+        ],
+        "adrender": ...
+    }
+}
+```
+
+For more information navigate to .
+
+## Tools and suggestions
+
+This section contains some suggestions that allow to set some parameters automatically.
+
+### User Ip / Country
+
+In order to detect the current user ip there are different approaches. An example is using public web services as ```https://api.ipify.org```.
+
+Example of usage (to add to the publisher websites):
+
+```html
+
+```
+
+The same service gives the possibility to detect the country as well. Check the official web page about possible limitations of the free licence.
+
+### Impression Id
+
+Each advertising request has to be identified uniquely by an id.
+One possible approach is using a classical hash function.
+
+```html
+
+```
+
+### User Id
+
+The approach used for impression id could be used for generating a unique user id.
+Also, it is recommended to store the id locally, e.g. by the browser localStorage.
+
+```html
+
+```
diff --git a/modules/excoBidAdapter.js b/modules/excoBidAdapter.js
new file mode 100644
index 00000000000..150d467a08a
--- /dev/null
+++ b/modules/excoBidAdapter.js
@@ -0,0 +1,37 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {
+  isBidRequestValid, createUserSyncGetter, createInterpretResponseFn, createBuildRequestsFn
+} from '../libraries/vidazooUtils/bidderUtils.js';
+
+const DEFAULT_SUB_DOMAIN = 'rtb';
+const BIDDER_CODE = 'exco';
+const BIDDER_VERSION = '1.0.0';
+const GVLID = 444;
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
+  return `https://${subDomain}.exco-pb.com`;
+}
+
+const buildRequests = createBuildRequestsFn(createDomain, null, storage, BIDDER_CODE, BIDDER_VERSION, false);
+
+const interpretResponse = createInterpretResponseFn(BIDDER_CODE, false);
+
+const getUserSyncs = createUserSyncGetter({
+  iframeSyncUrl: 'https://cs.exco-pb.com/api/sync/iframe', imageSyncUrl: 'https://cs.exco-pb.com/api/sync/image'
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: [BANNER, VIDEO],
+  gvlid: GVLID,
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs
+};
+
+registerBidder(spec);
diff --git a/modules/excoBidAdapter.md b/modules/excoBidAdapter.md
new file mode 100644
index 00000000000..f171de73883
--- /dev/null
+++ b/modules/excoBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+**Module Name:** Exco Bid Adapter
+
+**Module Type:** Bidder Adapter
+
+**Maintainer:** Itadmin@ex.co
+
+# Description
+
+Module that connects to Exco's demand sources.
+
+# Test Parameters
+  ```js
+var adUnits = [
+  {
+    code: 'test-ad',
+    sizes: [[300, 250]],
+    bids: [
+      {
+        bidder: 'exco',
+        params: {
+          cId: '562524b21b1c1f08117fc7f9',
+          pId: '59ac17c192832d0011283fe3',
+          bidFloor: 0.0001,
+          ext: {
+            param1: 'loremipsum',
+            param2: 'dolorsitamet'
+          }
+        }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/experianRtdProvider.js b/modules/experianRtdProvider.js
index e18296342de..cd415d4b32c 100644
--- a/modules/experianRtdProvider.js
+++ b/modules/experianRtdProvider.js
@@ -12,6 +12,12 @@ import {
 } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ * @typedef {import('../modules/rtdModule/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/rtdModule/index.js').UserConsentData} UserConsentData
+ */
+
 export const SUBMODULE_NAME = 'experian_rtid';
 export const EXPERIAN_RTID_DATA_KEY = 'experian_rtid_data';
 export const EXPERIAN_RTID_EXPIRATION_KEY = 'experian_rtid_expiration';
diff --git a/modules/fabrickIdSystem.js b/modules/fabrickIdSystem.js
index bc9c30cb479..f62bafcf637 100644
--- a/modules/fabrickIdSystem.js
+++ b/modules/fabrickIdSystem.js
@@ -10,6 +10,13 @@ import { ajax } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 /** @type {Submodule} */
 export const fabrickIdSubmodule = {
   /**
diff --git a/modules/fanAdapter.js b/modules/fanAdapter.js
new file mode 100644
index 00000000000..cdcc8d19889
--- /dev/null
+++ b/modules/fanAdapter.js
@@ -0,0 +1,176 @@
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
+const BIDDER_CODE = 'freedomadnetwork';
+const BASE_URL = 'https://srv.freedomadnetwork.com';
+
+/**
+ * Build OpenRTB request from bidRequest and bidderRequest
+ *
+ * @param {BidRequest} bid
+ * @param {BidderRequest} bidderRequest
+ * @returns {Request}
+ */
+function buildBidRequest(bid, bidderRequest) {
+  const payload = {
+    id: bid.bidId,
+    tmax: bidderRequest.timeout,
+    placements: [bid.params.placementId],
+    at: 1,
+    user: {}
+  }
+
+  const gdprConsent = utils.deepAccess(bidderRequest, 'gdprConsent');
+  if (!!gdprConsent && gdprConsent.gdprApplies) {
+    payload.user.gdpr = 1;
+    payload.user.consent = gdprConsent.consentString;
+  }
+
+  const uspConsent = utils.deepAccess(bidderRequest, 'uspConsent');
+  if (uspConsent) {
+    payload.user.usp = uspConsent;
+  }
+
+  return {
+    method: 'POST',
+    url: BASE_URL + '/pb/req',
+    data: JSON.stringify(payload),
+    options: {
+      contentType: 'application/json',
+      withCredentials: false,
+      customHeaders: {
+        'Accept-Language': 'en;q=10',
+      },
+    },
+    originalBidRequest: bid
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  isBidRequestValid: function(bid) {
+    if (!bid) {
+      utils.logWarn(BIDDER_CODE, 'Invalid bid', bid);
+
+      return false;
+    }
+
+    if (!bid.params) {
+      utils.logWarn(BIDDER_CODE, 'bid.params is required');
+
+      return false;
+    }
+
+    if (!bid.params.placementId) {
+      utils.logWarn(BIDDER_CODE, 'bid.params.placementId is required');
+
+      return false;
+    }
+
+    var banner = utils.deepAccess(bid, 'mediaTypes.banner');
+    if (banner === undefined) {
+      return false;
+    }
+
+    return true;
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    return validBidRequests.map(bid => buildBidRequest(bid, bidderRequest));
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const serverBody = serverResponse.body;
+    let bidResponses = [];
+
+    if (!serverBody) {
+      return bidResponses;
+    }
+
+    serverBody.forEach((response) => {
+      const bidResponse = {
+        requestId: response.id,
+        bidid: response.bidid,
+        impid: response.impid,
+        userId: response.userId,
+        cpm: response.cpm,
+        currency: response.currency,
+        width: response.width,
+        height: response.height,
+        ad: response.payload,
+        ttl: response.ttl,
+        creativeId: response.crid,
+        netRevenue: response.netRevenue,
+        trackers: response.trackers,
+        meta: {
+          mediaType: response.mediaType,
+          advertiserDomains: response.domains,
+        }
+      };
+
+      bidResponses.push(bidResponse);
+    });
+
+    return bidResponses;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   *
+   * @param {Bid} bid The bid that won the auction
+   */
+  onBidWon: function (bid) {
+    if (!bid) {
+      return;
+    }
+
+    const payload = {
+      id: bid.bidid,
+      impid: bid.impid,
+      t: bid.cpm,
+      u: bid.userId,
+    }
+
+    ajax(BASE_URL + '/pb/imp', null, JSON.stringify(payload), {
+      method: 'POST',
+      customHeaders: {
+        'Accept-Language': 'en;q=10',
+      },
+    });
+
+    if (bid.trackers && bid.trackers.length > 0) {
+      for (var i = 0; i < bid.trackers.length; i++) {
+        if (bid.trackers[i].type == 0) {
+          utils.triggerPixel(bid.trackers[i].url);
+        }
+      }
+    }
+  },
+  onSetTargeting: function(bid) {},
+  onBidderError: function(error) {
+    utils.logError(`${BIDDER_CODE} bidder error`, error);
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+    return syncs;
+  },
+  onTimeout: function(timeoutData) {},
+  supportedMediaTypes: [BANNER, NATIVE]
+}
+
+registerBidder(spec);
diff --git a/modules/fanAdapter.md b/modules/fanAdapter.md
new file mode 100644
index 00000000000..caa18ca8552
--- /dev/null
+++ b/modules/fanAdapter.md
@@ -0,0 +1,40 @@
+# Freedom Ad Network Bidder Adapter
+
+# Overview
+
+```
+Module Name: Freedom Ad Network Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: info@freedomadnetwork.com
+```
+
+## Description
+
+Module that connects to FAN's demand sources.
+
+## Bid Parameters
+
+| Name          | Scope    | Type               | Description                             | Example                                         |
+|---------------|----------|--------------------|-----------------------------------------|-------------------------------------------------|
+| `placementId` | required | String             | The Placement Id provided by FAN. | `e6203f1e-bd6d-4f42-9895-d1a19cdb83c8`                                |
+
+## Example
+
+### Banner Ads
+
+```javascript
+var adUnits = [{
+  code: 'banner-ad-div',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250]]
+    }
+  },
+  bids: [{
+    bidder: 'freedomadnetwork',
+    params: {
+      placementId: 'e6203f1e-bd6d-4f42-9895-d1a19cdb83c8'
+    }
+  }]
+}];
+```
diff --git a/modules/feedadBidAdapter.js b/modules/feedadBidAdapter.js
index 7b41f0fcc03..5ee9906b5df 100644
--- a/modules/feedadBidAdapter.js
+++ b/modules/feedadBidAdapter.js
@@ -3,6 +3,15 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {ajax} from '../src/ajax.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderSpec} BidderSpec
+ * @typedef {import('../src/adapters/bidderFactory.js').MediaType} MediaType
+ */
+
 /**
  * Version of the FeedAd bid adapter
  * @type {string}
diff --git a/modules/finativeBidAdapter.js b/modules/finativeBidAdapter.js
index 87580a209bb..0cdcae15e61 100644
--- a/modules/finativeBidAdapter.js
+++ b/modules/finativeBidAdapter.js
@@ -3,9 +3,9 @@
 
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {NATIVE} from '../src/mediaTypes.js';
-import {_map, deepAccess, deepSetValue, isEmpty} from '../src/utils.js';
-import {config} from '../src/config.js';
+import {_map, deepSetValue, isEmpty, setOnAny} from '../src/utils.js';
 import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
 
 const BIDDER_CODE = 'finative';
 const DEFAULT_CUR = 'EUR';
@@ -64,7 +64,7 @@ export const spec = {
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
     const tid = bidderRequest.ortb2?.source?.tid;
-    const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
+    const cur = [getCurrencyFromBidderRequest(bidderRequest) || DEFAULT_CUR];
     let url = bidderRequest.refererInfo.referer;
 
     const imp = validBidRequests.map((bid, id) => {
@@ -224,15 +224,6 @@ function parseNative(bid) {
   return result;
 }
 
-function setOnAny(collection, key) {
-  for (let i = 0, result; i < collection.length; i++) {
-    result = deepAccess(collection[i], key);
-    if (result) {
-      return result;
-    }
-  }
-}
-
 function flatten(arr) {
   return [].concat(...arr);
 }
diff --git a/modules/fintezaAnalyticsAdapter.js b/modules/fintezaAnalyticsAdapter.js
index be661c96061..78777cd6478 100644
--- a/modules/fintezaAnalyticsAdapter.js
+++ b/modules/fintezaAnalyticsAdapter.js
@@ -3,7 +3,7 @@ import { ajax } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import {getStorageManager} from '../src/storageManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
 
 const MODULE_CODE = 'finteza';
@@ -70,7 +70,8 @@ function initFirstVisit() {
   let cookies;
 
   try {
-    cookies = parseCookies(document.cookie);
+    // TODO: commented out because of rule violations
+    cookies = {} // parseCookies(document.cookie);
   } catch (a) {
     cookies = {};
   }
@@ -91,7 +92,8 @@ function initFirstVisit() {
 
   return visitDate;
 }
-
+// TODO: commented out because of rule violations
+/*
 function trim(string) {
   if (string.trim) {
     return string.trim();
@@ -130,6 +132,7 @@ function parseCookies(cookie) {
 
   return values;
 }
+*/
 
 function getRandAsStr(digits) {
   let str = '';
@@ -172,7 +175,8 @@ function initSession() {
   let isNew = false;
 
   try {
-    cookies = parseCookies(document.cookie);
+    // TODO: commented out because of rule violations
+    cookies = {} // parseCookies(document.cookie);
   } catch (a) {
     cookies = {};
   }
@@ -263,7 +267,8 @@ function getTrackRequestLastTime() {
       );
     }
 
-    cookie = parseCookies(document.cookie);
+    // TODO: commented out because of rule violations
+    cookie = {} // parseCookies(document.cookie);
     cookie = cookie[ TRACK_TIME_KEY ];
     if (cookie) {
       return parseInt(cookie, 10);
@@ -330,16 +335,16 @@ function prepareTrackData(evtype, args) {
   let prepareParams = null;
 
   switch (evtype) {
-    case CONSTANTS.EVENTS.BID_REQUESTED:
+    case EVENTS.BID_REQUESTED:
       prepareParams = prepareBidRequestedParams;
       break;
-    case CONSTANTS.EVENTS.BID_RESPONSE:
+    case EVENTS.BID_RESPONSE:
       prepareParams = prepareBidResponseParams;
       break;
-    case CONSTANTS.EVENTS.BID_WON:
+    case EVENTS.BID_WON:
       prepareParams = prepareBidWonParams;
       break;
-    case CONSTANTS.EVENTS.BID_TIMEOUT:
+    case EVENTS.BID_TIMEOUT:
       prepareParams = prepareBidTimeoutParams;
       break;
   }
diff --git a/modules/fledgeForGpt.js b/modules/fledgeForGpt.js
deleted file mode 100644
index fd29c41210c..00000000000
--- a/modules/fledgeForGpt.js
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Fledge modules is responsible for registering fledged auction configs into the GPT slot;
- * GPT is resposible to run the fledge auction.
- */
-import { config } from '../src/config.js';
-import { getHook } from '../src/hook.js';
-import {deepSetValue, logInfo, logWarn, mergeDeep} from '../src/utils.js';
-import {IMP, PBS, registerOrtbProcessor, RESPONSE} from '../src/pbjsORTB.js';
-import * as events from '../src/events.js'
-import CONSTANTS from '../src/constants.json';
-import {currencyCompare} from '../libraries/currencyUtils/currency.js';
-import {maximum, minimum} from '../src/utils/reducers.js';
-import {getGptSlotForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
-
-const MODULE = 'fledgeForGpt'
-const PENDING = {};
-
-export let isEnabled = false;
-
-config.getConfig('fledgeForGpt', config => init(config.fledgeForGpt));
-
-/**
-  * Module init.
-  */
-export function init(cfg) {
-  if (cfg && cfg.enabled === true) {
-    if (!isEnabled) {
-      getHook('addComponentAuction').before(addComponentAuctionHook);
-      getHook('makeBidRequests').after(markForFledge);
-      events.on(CONSTANTS.EVENTS.AUCTION_INIT, onAuctionInit);
-      events.on(CONSTANTS.EVENTS.AUCTION_END, onAuctionEnd);
-      isEnabled = true;
-    }
-    logInfo(`${MODULE} enabled (browser ${isFledgeSupported() ? 'supports' : 'does NOT support'} fledge)`, cfg);
-  } else {
-    if (isEnabled) {
-      getHook('addComponentAuction').getHooks({hook: addComponentAuctionHook}).remove();
-      getHook('makeBidRequests').getHooks({hook: markForFledge}).remove()
-      events.off(CONSTANTS.EVENTS.AUCTION_INIT, onAuctionInit);
-      events.off(CONSTANTS.EVENTS.AUCTION_END, onAuctionEnd);
-      isEnabled = false;
-    }
-    logInfo(`${MODULE} disabled`, cfg);
-  }
-}
-
-function setComponentAuction(adUnitCode, auctionConfigs) {
-  const gptSlot = getGptSlotForAdUnitCode(adUnitCode);
-  if (gptSlot && gptSlot.setConfig) {
-    gptSlot.setConfig({
-      componentAuction: auctionConfigs.map(cfg => ({
-        configKey: cfg.seller,
-        auctionConfig: cfg
-      }))
-    });
-    logInfo(MODULE, `register component auction configs for: ${adUnitCode}: ${gptSlot.getAdUnitPath()}`, auctionConfigs);
-  } else {
-    logWarn(MODULE, `unable to register component auction config for ${adUnitCode}`, auctionConfigs);
-  }
-}
-
-function onAuctionInit({auctionId}) {
-  PENDING[auctionId] = {};
-}
-
-function getSlotSignals(bidsReceived = [], bidRequests = []) {
-  let bidfloor, bidfloorcur;
-  if (bidsReceived.length > 0) {
-    const bestBid = bidsReceived.reduce(maximum(currencyCompare(bid => [bid.cpm, bid.currency])));
-    bidfloor = bestBid.cpm;
-    bidfloorcur = bestBid.currency;
-  } else {
-    const floors = bidRequests.map(bid => typeof bid.getFloor === 'function' && bid.getFloor()).filter(f => f);
-    const minFloor = floors.length && floors.reduce(minimum(currencyCompare(floor => [floor.floor, floor.currency])))
-    bidfloor = minFloor?.floor;
-    bidfloorcur = minFloor?.currency;
-  }
-  const cfg = {};
-  if (bidfloor) {
-    deepSetValue(cfg, 'auctionSignals.prebid.bidfloor', bidfloor);
-    bidfloorcur && deepSetValue(cfg, 'auctionSignals.prebid.bidfloorcur', bidfloorcur);
-  }
-  return cfg;
-}
-
-function onAuctionEnd({auctionId, bidsReceived, bidderRequests}) {
-  try {
-    const allReqs = bidderRequests?.flatMap(br => br.bids);
-    Object.entries(PENDING[auctionId]).forEach(([adUnitCode, auctionConfigs]) => {
-      const forThisAdUnit = (bid) => bid.adUnitCode === adUnitCode;
-      const slotSignals = getSlotSignals(bidsReceived?.filter(forThisAdUnit), allReqs?.filter(forThisAdUnit));
-      setComponentAuction(adUnitCode, auctionConfigs.map(cfg => mergeDeep({}, slotSignals, cfg)))
-    })
-  } finally {
-    delete PENDING[auctionId];
-  }
-}
-
-export function addComponentAuctionHook(next, auctionId, adUnitCode, componentAuctionConfig) {
-  if (PENDING.hasOwnProperty(auctionId)) {
-    !PENDING[auctionId].hasOwnProperty(adUnitCode) && (PENDING[auctionId][adUnitCode] = []);
-    PENDING[auctionId][adUnitCode].push(componentAuctionConfig);
-  } else {
-    logWarn(MODULE, `Received component auction config for auction that has closed (auction '${auctionId}', adUnit '${adUnitCode}')`, componentAuctionConfig)
-  }
-  next(auctionId, adUnitCode, componentAuctionConfig);
-}
-
-function isFledgeSupported() {
-  return 'runAdAuction' in navigator && 'joinAdInterestGroup' in navigator
-}
-
-export function markForFledge(next, bidderRequests) {
-  if (isFledgeSupported()) {
-    const globalFledgeConfig = config.getConfig('fledgeForGpt');
-    const bidders = globalFledgeConfig?.bidders ?? [];
-    bidderRequests.forEach((req) => {
-      const useGlobalConfig = globalFledgeConfig?.enabled && (bidders.length == 0 || bidders.includes(req.bidderCode));
-      Object.assign(req, config.runWithBidder(req.bidderCode, () => {
-        return {
-          fledgeEnabled: config.getConfig('fledgeEnabled') ?? (useGlobalConfig ? globalFledgeConfig.enabled : undefined),
-          defaultForSlots: config.getConfig('defaultForSlots') ?? (useGlobalConfig ? globalFledgeConfig?.defaultForSlots : undefined)
-        }
-      }));
-    });
-  }
-  next(bidderRequests);
-}
-
-export function setImpExtAe(imp, bidRequest, context) {
-  if (context.bidderRequest.fledgeEnabled) {
-    imp.ext = Object.assign(imp.ext || {}, {
-      ae: imp.ext?.ae ?? context.bidderRequest.defaultForSlots
-    })
-  } else {
-    delete imp.ext?.ae;
-  }
-}
-registerOrtbProcessor({type: IMP, name: 'impExtAe', fn: setImpExtAe});
-
-// to make it easier to share code between the PBS adapter and adapters whose backend is PBS, break up
-// fledge response processing in two steps: first aggregate all the auction configs by their imp...
-
-export function parseExtPrebidFledge(response, ortbResponse, context) {
-  (ortbResponse.ext?.prebid?.fledge?.auctionconfigs || []).forEach((cfg) => {
-    const impCtx = context.impContext[cfg.impid];
-    if (!impCtx?.imp?.ext?.ae) {
-      logWarn('Received fledge auction configuration for an impression that was not in the request or did not ask for it', cfg, impCtx?.imp);
-    } else {
-      impCtx.fledgeConfigs = impCtx.fledgeConfigs || [];
-      impCtx.fledgeConfigs.push(cfg);
-    }
-  })
-}
-registerOrtbProcessor({type: RESPONSE, name: 'extPrebidFledge', fn: parseExtPrebidFledge, dialects: [PBS]});
-
-// ...then, make them available in the adapter's response. This is the client side version, for which the
-// interpretResponse api is {fledgeAuctionConfigs: [{bidId, config}]}
-
-export function setResponseFledgeConfigs(response, ortbResponse, context) {
-  const configs = Object.values(context.impContext)
-    .flatMap((impCtx) => (impCtx.fledgeConfigs || []).map(cfg => ({bidId: impCtx.bidRequest.bidId, config: cfg.config})));
-  if (configs.length > 0) {
-    response.fledgeAuctionConfigs = configs;
-  }
-}
-registerOrtbProcessor({type: RESPONSE, name: 'fledgeAuctionConfigs', priority: -1, fn: setResponseFledgeConfigs, dialects: [PBS]})
diff --git a/modules/flippBidAdapter.js b/modules/flippBidAdapter.js
index dfe8141170d..95fd67c779b 100644
--- a/modules/flippBidAdapter.js
+++ b/modules/flippBidAdapter.js
@@ -3,7 +3,17 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import {getStorageManager} from '../src/storageManager.js';
 
-const NETWORK_ID = 11090;
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
+const NETWORK_ID = 10922;
 const AD_TYPES = [4309, 641];
 const DTX_TYPES = [5061];
 const TARGET_NAME = 'inline';
@@ -15,6 +25,7 @@ const DEFAULT_CREATIVE_TYPE = 'NativeX';
 const VALID_CREATIVE_TYPES = ['DTX', 'NativeX'];
 const FLIPP_USER_KEY = 'flipp-uid';
 const COMPACT_DEFAULT_HEIGHT = 600;
+const STANDARD_DEFAULT_HEIGHT = 1800;
 
 let userKey = null;
 export const storage = getStorageManager({bidderCode: BIDDER_CODE});
@@ -25,13 +36,16 @@ export function getUserKey(options = {}) {
   }
 
   // If the partner provides the user key use it, otherwise fallback to cookies
-  if (options.userKey && isValidUserKey(options.userKey)) {
-    userKey = options.userKey;
-    return options.userKey;
+  if ('userKey' in options && options.userKey) {
+    if (isValidUserKey(options.userKey)) {
+      userKey = options.userKey;
+      return options.userKey;
+    }
   }
+
   // Grab from Cookie
-  const foundUserKey = storage.cookiesAreEnabled() && storage.getCookie(FLIPP_USER_KEY);
-  if (foundUserKey) {
+  const foundUserKey = storage.cookiesAreEnabled(null) && storage.getCookie(FLIPP_USER_KEY, null);
+  if (foundUserKey && isValidUserKey(foundUserKey)) {
     return foundUserKey;
   }
 
@@ -47,7 +61,7 @@ export function getUserKey(options = {}) {
 }
 
 function isValidUserKey(userKey) {
-  return !userKey.startsWith('#');
+  return typeof userKey === 'string' && !userKey.startsWith('#') && userKey.length > 0;
 }
 
 const generateUUID = () => {
@@ -94,7 +108,7 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {BidRequest[]} validBidRequests[] an array of bids
+   * @param {validBidRequests} validBidRequests an array of bids
    * @param {BidderRequest} bidderRequest master bidRequest object
    * @return ServerRequest Info describing the request to the server.
    */
@@ -153,7 +167,10 @@ export const spec = {
     if (!isEmpty(res) && !isEmpty(res.decisions) && !isEmpty(res.decisions.inline)) {
       return res.decisions.inline.map(decision => {
         const placement = placements.find(p => p.prebid.requestId === decision.prebid?.requestId);
-        const height = placement.options?.startCompact ? COMPACT_DEFAULT_HEIGHT : decision.height;
+        const customData = decision.contents[0]?.data?.customData;
+        const height = placement.options?.startCompact
+          ? customData?.compactHeight ?? COMPACT_DEFAULT_HEIGHT
+          : customData?.standardHeight ?? STANDARD_DEFAULT_HEIGHT;
         return {
           bidderCode: BIDDER_CODE,
           requestId: decision.prebid?.requestId,
diff --git a/modules/flippBidAdapter.md b/modules/flippBidAdapter.md
index 810b883e3f9..e823432a60f 100644
--- a/modules/flippBidAdapter.md
+++ b/modules/flippBidAdapter.md
@@ -32,9 +32,10 @@ var adUnits = [
                     publisherNameIdentifier: 'wishabi-test-publisher', // Required
                     siteId: 1192075, // Required
                     zoneIds: [260678], // Optional
-                    userKey: "", // Optional
+                    userKey: ``, // Optional, but recommended for better user experience. Can be a cookie, session id or any other user identifier
                     options: {
-                        startCompact: true // Optional, default to true
+                        startCompact: true, // Optional. Height of the experience will be reduced. Default to true
+                        dwellExpand: true // Optional. Auto expand the experience after a certain time passes. Default to true
                     }
                 }
             }
diff --git a/modules/fluctBidAdapter.js b/modules/fluctBidAdapter.js
index b566769c00e..c0ae55efc89 100644
--- a/modules/fluctBidAdapter.js
+++ b/modules/fluctBidAdapter.js
@@ -2,6 +2,12 @@ import { _each, deepSetValue, isEmpty } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'fluct';
 const END_POINT = 'https://hb.adingo.jp/prebid';
 const VERSION = '1.2';
@@ -25,8 +31,8 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids.
-   * @param {bidderRequest} bidderRequest bidder request object.
+   * @param {validBidRequests} validBidRequests an array of bids.
+   * @param {BidderRequest} bidderRequest bidder request object.
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
diff --git a/modules/fpdModule/index.md b/modules/fpdModule/index.md
index 238881db96b..42ae663b090 100644
--- a/modules/fpdModule/index.md
+++ b/modules/fpdModule/index.md
@@ -44,6 +44,5 @@ pbjs.setConfig({
 
 At least one of the submodules must be included in order to successfully run the corresponding above operations.
 
-enrichmentFpdModule
 validationFpdModule
-topicsFpdModule
\ No newline at end of file
+topicsFpdModule
diff --git a/modules/freewheel-sspBidAdapter.js b/modules/freewheel-sspBidAdapter.js
index cd4785cdc78..fc85edc483b 100644
--- a/modules/freewheel-sspBidAdapter.js
+++ b/modules/freewheel-sspBidAdapter.js
@@ -3,7 +3,13 @@ import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'freewheel-ssp';
+const GVL_ID = 285;
 
 const PROTOCOL = getProtocol();
 const FREEWHEEL_ADSSETUP = PROTOCOL + '://ads.stickyadstv.com/www/delivery/swfIndex.php';
@@ -70,7 +76,7 @@ function getPricing(xmlNode) {
     var priceNode = pricingExtNode.querySelector('Price');
     princingData = {
       currency: priceNode.getAttribute('currency'),
-      price: priceNode.textContent || priceNode.innerText
+      price: priceNode.textContent
     };
   } else {
     logWarn('PREBID - ' + BIDDER_CODE + ': No bid received or missing pricing extension.');
@@ -104,7 +110,7 @@ function getAdvertiserDomain(xmlNode) {
   // Currently we only return one Domain
   if (brandExtNode) {
     var domainNode = brandExtNode.querySelector('Domain');
-    domain.push(domainNode.textContent || domainNode.innerText);
+    domain.push(domainNode.textContent);
   } else {
     logWarn('PREBID - ' + BIDDER_CODE + ': No bid received or missing StickyBrand extension.');
   }
@@ -182,8 +188,8 @@ function getCampaignId(xmlNode) {
 }
 
 /**
-* returns the top most accessible window
-*/
+ * returns the top most accessible window
+ */
 function getTopMostWindow() {
   var res = window;
 
@@ -225,7 +231,7 @@ function getBidFloor(bid, config) {
       mediaType: typeof bid.mediaTypes['banner'] == 'object' ? 'banner' : 'video',
       size: '*',
     });
-    return bidFloor.floor;
+    return bidFloor?.floor;
   } catch (e) {
     return -1;
   }
@@ -314,24 +320,25 @@ var getOutstreamScript = function(bid) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVL_ID,
   supportedMediaTypes: [BANNER, VIDEO],
   aliases: ['stickyadstv', 'freewheelssp'], //  aliases for freewheel-ssp
   /**
-  * Determines whether or not the given bid request is valid.
-  *
-  * @param {object} bid The bid to validate.
-  * @return boolean True if this is a valid bid, and false otherwise.
-  */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     return !!(bid.params.zoneId);
   },
 
   /**
-  * Make a server request from the list of BidRequests.
-  *
-  * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
-  * @return ServerRequest Info describing the request to the server.
-  */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(bidRequests, bidderRequest) {
     // var currency = config.getConfig(currency);
 
@@ -382,6 +389,15 @@ export const spec = {
         requestParams.gpp_sid = bidderRequest.ortb2.regs.gpp_sid;
       }
 
+      // Add content object
+      if (bidderRequest && bidderRequest.ortb2 && bidderRequest.ortb2.site && bidderRequest.ortb2.site.content && typeof bidderRequest.ortb2.site.content === 'object') {
+        try {
+          requestParams._fw_prebid_content = JSON.stringify(bidderRequest.ortb2.site.content);
+        } catch (error) {
+          logWarn('PREBID - ' + BIDDER_CODE + ': Unable to stringify the content object: ' + error);
+        }
+      }
+
       // Add schain object
       var schain = currentBidRequest.schain;
       if (schain) {
@@ -463,12 +479,12 @@ export const spec = {
   },
 
   /**
-  * Unpack the response from the server into a list of bids.
-  *
-  * @param {*} serverResponse A successful response from the server.
-  * @param {object} request: the built request object containing the initial bidRequest.
-  * @return {Bid[]} An array of bids which were nested inside the server.
-  */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @param {object} request the built request object containing the initial bidRequest.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, request) {
     var bidrequest = request.bidRequest;
     var playerSize = [];
@@ -532,10 +548,11 @@ export const spec = {
       };
 
       if (bidrequest.mediaTypes.video) {
-        bidResponse.vastXml = serverResponse;
         bidResponse.mediaType = 'video';
       }
 
+      bidResponse.vastXml = serverResponse;
+
       bidResponse.ad = formatAdHTML(bidrequest, playerSize);
       bidResponses.push(bidResponse);
     }
diff --git a/modules/ftrackIdSystem.js b/modules/ftrackIdSystem.js
index 809f1311c42..fa6c7d4050c 100644
--- a/modules/ftrackIdSystem.js
+++ b/modules/ftrackIdSystem.js
@@ -12,6 +12,13 @@ import {uspDataHandler} from '../src/adapterManager.js';
 import {loadExternalScript} from '../src/adloader.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'ftrackId';
 const LOG_PREFIX = 'FTRACK - ';
 const LOCAL_STORAGE_EXP_DAYS = 30;
@@ -135,7 +142,7 @@ export const ftrackIdSubmodule = {
         }
 
         // Creates an async script element and appends it to the document
-        loadExternalScript(config.params.url, MODULE_NAME);
+        loadExternalScript(config.params.url, MODULE_TYPE_UID, MODULE_NAME);
       }
     };
   },
diff --git a/modules/gameraRtdProvider.js b/modules/gameraRtdProvider.js
new file mode 100644
index 00000000000..96c4bac5f87
--- /dev/null
+++ b/modules/gameraRtdProvider.js
@@ -0,0 +1,107 @@
+import { submodule } from '../src/hook.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import {
+  isPlainObject,
+  logError,
+  mergeDeep,
+  deepClone,
+} from '../src/utils.js';
+
+const MODULE_NAME = 'gamera';
+const MODULE = `${MODULE_NAME}RtdProvider`;
+
+/**
+ * Initialize the Gamera RTD Module.
+ * @param {Object} config
+ * @param {Object} userConsent
+ * @returns {boolean}
+ */
+function init(config, userConsent) {
+  return true;
+}
+
+/**
+ * Modify bid request data before auction
+ * @param {Object} reqBidsConfigObj - The bid request config object
+ * @param {function} callback - Callback function to execute after data handling
+ * @param {Object} config - Module configuration
+ * @param {Object} userConsent - User consent data
+ */
+function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
+  // Check if window.gamera.getPrebidSegments is available
+  if (typeof window.gamera?.getPrebidSegments !== 'function') {
+    window.gamera = window.gamera || {};
+    window.gamera.cmd = window.gamera.cmd || [];
+    window.gamera.cmd.push(function () {
+      enrichAuction(reqBidsConfigObj, callback, config, userConsent);
+    });
+    return;
+  }
+
+  enrichAuction(reqBidsConfigObj, callback, config, userConsent);
+}
+
+/**
+ * Enriches the auction with user and content segments from Gamera's on-page script
+ * @param {Object} reqBidsConfigObj - The bid request config object
+ * @param {Function} callback - Callback function to execute after data handling
+ * @param {Object} config - Module configuration
+ * @param {Object} userConsent - User consent data
+ */
+function enrichAuction(reqBidsConfigObj, callback, config, userConsent) {
+  try {
+    /**
+     * @function external:"window.gamera".getPrebidSegments
+     * @description Retrieves user and content segments from Gamera's on-page script
+     * @param {Function|null} onSegmentsUpdateCallback - Callback for segment updates (not used here)
+     * @param {Object} config - Module configuration
+     * @param {Object} userConsent - User consent data
+     * @returns {Object|undefined} segments - The targeting segments object containing:
+     *   @property {Object} [user] - User-level attributes to merge into ortb2.user
+     *   @property {Object} [site] - Site-level attributes to merge into ortb2.site
+     *   @property {Object.} [adUnits] - Ad unit specific attributes, keyed by adUnitCode,
+     *                                                   to merge into each ad unit's ortb2Imp
+     */
+    const segments = window.gamera.getPrebidSegments(null, deepClone(config || {}), deepClone(userConsent || {})) || {};
+
+    // Initialize ortb2Fragments and its nested objects
+    reqBidsConfigObj.ortb2Fragments = reqBidsConfigObj.ortb2Fragments || {};
+    reqBidsConfigObj.ortb2Fragments.global = reqBidsConfigObj.ortb2Fragments.global || {};
+
+    // Add user-level data
+    if (segments.user && isPlainObject(segments.user)) {
+      reqBidsConfigObj.ortb2Fragments.global.user = reqBidsConfigObj.ortb2Fragments.global.user || {};
+      mergeDeep(reqBidsConfigObj.ortb2Fragments.global.user, segments.user);
+    }
+
+    // Add site-level data
+    if (segments.site && isPlainObject(segments.site)) {
+      reqBidsConfigObj.ortb2Fragments.global.site = reqBidsConfigObj.ortb2Fragments.global.site || {};
+      mergeDeep(reqBidsConfigObj.ortb2Fragments.global.site, segments.site);
+    }
+
+    // Add adUnit-level data
+    const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits || [];
+    adUnits.forEach(adUnit => {
+      const gameraData = segments.adUnits && segments.adUnits[adUnit.code];
+      if (!gameraData || !isPlainObject(gameraData)) {
+        return;
+      }
+
+      adUnit.ortb2Imp = adUnit.ortb2Imp || {};
+      mergeDeep(adUnit.ortb2Imp, gameraData);
+    });
+  } catch (error) {
+    logError(MODULE, 'Error getting segments:', error);
+  }
+
+  callback();
+}
+
+export const subModuleObj = {
+  name: MODULE_NAME,
+  init: init,
+  getBidRequestData: getBidRequestData,
+};
+
+submodule('realTimeData', subModuleObj);
diff --git a/modules/gameraRtdProvider.md b/modules/gameraRtdProvider.md
new file mode 100644
index 00000000000..44260b88d1f
--- /dev/null
+++ b/modules/gameraRtdProvider.md
@@ -0,0 +1,51 @@
+# Overview
+
+Module Name: Gamera Rtd Provider
+Module Type: Rtd Provider
+Maintainer: aleksa@gamera.ai
+
+# Description
+
+RTD provider for Gamera.ai that enriches bid requests with real-time data, by populating the [First Party Data](https://docs.prebid.org/features/firstPartyData.html) attributes.
+The module integrates with Gamera's AI-powered audience segmentation system to provide enhanced bidding capabilities.
+The Gamera RTD Provider works in conjunction with the Gamera script, which must be available on the page for the module to enrich bid requests. To learn more about the Gamera script, please visit the [Gamera website](https://gamera.ai/).
+
+ORTB2 enrichments that gameraRtdProvider can provide:
+ * `ortb2.site`
+ * `ortb2.user`
+ * `AdUnit.ortb2Imp`
+
+# Integration
+
+## Build
+
+Include the Gamera RTD module in your Prebid.js build:
+
+```bash
+gulp build --modules=rtdModule,gameraRtdProvider
+```
+
+## Configuration
+
+Configure the module in your Prebid.js configuration:
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'gamera',
+            params: {
+                // Optional configuration parameters
+            }
+        }]
+    }
+});
+```
+
+### Configuration Parameters
+
+The module currently supports basic initialization without required parameters. Future versions may include additional configuration options.
+
+## Support
+
+For more information or support, please contact gareth@gamera.ai.
diff --git a/modules/gammaBidAdapter.js b/modules/gammaBidAdapter.js
index 279eb78812e..dadfe2ab14b 100644
--- a/modules/gammaBidAdapter.js
+++ b/modules/gammaBidAdapter.js
@@ -1,8 +1,17 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
-const ENDPOINT = 'https://hb.gammaplatform.com';
-const ENDPOINT_USERSYNC = 'https://cm-supply-web.gammaplatform.com';
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'gamma';
+const ENDPOINTS = {
+  SGP: 'https://hb.gammaplatform.com',
+  JPN: 'https://hb-jp.gammaplatform.com',
+  US_WEST: 'https://hb-us.gammaplatform.com',
+  EU: 'https://hb-eu.gammaplatform.com'
+}
 
 export const spec = {
   code: BIDDER_CODE,
@@ -28,8 +37,10 @@ export const spec = {
   buildRequests: function(bidRequests, bidderRequest) {
     const serverRequests = [];
     const bidderRequestReferer = bidderRequest?.refererInfo?.page || '';
+    let ENDPOINT;
     for (var i = 0, len = bidRequests.length; i < len; i++) {
       const gaxObjParams = bidRequests[i];
+      ENDPOINT = getAdUrlByRegion(gaxObjParams);
       serverRequests.push({
         method: 'GET',
         url: ENDPOINT + '/adx/request?wid=' + gaxObjParams.params.siteId + '&zid=' + gaxObjParams.params.zoneId + '&hb=pbjs&bidid=' + gaxObjParams.bidId + '&urf=' + encodeURIComponent(bidderRequestReferer)
@@ -55,16 +66,45 @@ export const spec = {
     }
 
     return bids;
-  },
+  }
+}
+
+/**
+ * Get endpoint url by region
+ * @param bid
+ * @return aUrl
+ */
+function getAdUrlByRegion(bid) {
+  let ENDPOINT;
+
+  if (bid.params.region && ENDPOINTS[bid.params.region]) {
+    ENDPOINT = ENDPOINTS[bid.params.region];
+  } else {
+    try {
+      const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+      const region = timezone.split('/')[0];
 
-  getUserSyncs: function(syncOptions) {
-    if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: ENDPOINT_USERSYNC + '/adx/usersync'
-      }];
+      switch (region) {
+        case 'Europe':
+          ENDPOINT = ENDPOINTS['EU'];
+          break;
+        case 'Australia':
+          ENDPOINT = ENDPOINTS['JPN'];
+          break;
+        case 'Asia':
+          ENDPOINT = ENDPOINTS['SGP'];
+          break;
+        case 'America':
+          ENDPOINT = ENDPOINTS['US_WEST'];
+          break;
+        default: ENDPOINT = ENDPOINTS['SGP'];
+      }
+    } catch (err) {
+      ENDPOINT = ENDPOINTS['SGP'];
     }
   }
+
+  return ENDPOINT;
 }
 
 /**
diff --git a/modules/gammaBidAdapter.md b/modules/gammaBidAdapter.md
index 2902be78492..bcb26d0b86e 100644
--- a/modules/gammaBidAdapter.md
+++ b/modules/gammaBidAdapter.md
@@ -12,6 +12,14 @@ Connects to Gamma exchange for bids.
 
 Gamma bid adapter supports Banner, Video.
 
+# Parameters
+
+| Name          | Scope    | Description               | Example              |
+| :------------ | :------- | :------------------------ | :------------------- |
+| `zoneId`      | required                     | Zone ID | "1398219417" |
+| `siteId`      | required                     | Website ID | "1398219351" |
+| `region`      | optional (for prebid.js)     | Prefix of the region to which prebid must send requests. Possible values: "SGP", "JPN", "US_WEST", "EU" | "SGP" |
+
 # Test Parameters: For Banner
 ```
 var adUnits = [{
@@ -22,8 +30,9 @@ var adUnits = [{
           bids: [{
 			bidder: 'gamma',
             params: {
-				siteId: '1465446377',
-				zoneId: '1515999290'
+				siteId: '1398219351',
+				zoneId: '1398219417',
+				region: 'SGP'	
             }
           }]
   
@@ -39,8 +48,9 @@ var adUnits = [{
           bids: [{
 			bidder: 'gamma',
             params: {
-				siteId: '1465446377',
-				zoneId: '1493280341'
+				siteId: '1398219351',
+				zoneId: '1614755846',
+				region: 'SGP'
             }
           }]
   
@@ -59,8 +69,9 @@ In order to receive bids please map localhost to (any) test domain.
         bids: [{
 		bidder: 'gamma',
             params: {
-		siteId: '1465446377',
-		zoneId: '1515999290'
+		siteId: '1398219351',
+		zoneId: '1398219417',
+		region: 'SGP'
             }
           }]
     }];
diff --git a/modules/gamoshiBidAdapter.js b/modules/gamoshiBidAdapter.js
index 1c279cdb9b8..cfc2e32ca67 100644
--- a/modules/gamoshiBidAdapter.js
+++ b/modules/gamoshiBidAdapter.js
@@ -157,7 +157,7 @@ export const spec = {
               maxduration: bidRequest.mediaTypes.video.maxduration,
               api: bidRequest.mediaTypes.video.api,
               skip: bidRequest.mediaTypes.video.skip || bidRequest.params.video.skip,
-              placement: bidRequest.mediaTypes.video.placement || bidRequest.params.video.placement,
+              plcmt: bidRequest.mediaTypes.video.plcmt || bidRequest.params.video.plcmt,
               minduration: bidRequest.mediaTypes.video.minduration || bidRequest.params.video.minduration,
               playbackmethod: bidRequest.mediaTypes.video.playbackmethod || bidRequest.params.video.playbackmethod,
               startdelay: bidRequest.mediaTypes.video.startdelay || bidRequest.params.video.startdelay
diff --git a/modules/genericAnalyticsAdapter.js b/modules/genericAnalyticsAdapter.js
index b52cb7e5464..ce37e5c02fe 100644
--- a/modules/genericAnalyticsAdapter.js
+++ b/modules/genericAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import AnalyticsAdapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import {prefixLog, isPlainObject} from '../src/utils.js';
-import * as CONSTANTS from '../src/constants.json';
+import {has as hasEvent} from '../src/events.js';
 import adapterManager from '../src/adapterManager.js';
 import {ajaxBuilder} from '../src/ajax.js';
 
@@ -48,12 +48,12 @@ export function GenericAnalytics() {
         return false;
       }
       for (const [event, handler] of Object.entries(options.events)) {
-        if (!CONSTANTS.EVENTS.hasOwnProperty(event)) {
+        if (!hasEvent(event)) {
           logWarn(`options.events.${event} does not match any known Prebid event`);
-          if (typeof handler !== 'function') {
-            logError(`options.events.${event} must be a function`);
-            return false;
-          }
+        }
+        if (typeof handler !== 'function') {
+          logError(`options.events.${event} must be a function`);
+          return false;
         }
       }
     }
@@ -142,7 +142,7 @@ export function defaultHandler({url, method, batchSize, ajax = ajaxBuilder()}) {
   const serialize = method === 'GET' ? (data) => ({data: JSON.stringify(data)}) : (data) => JSON.stringify(data);
 
   return function (events) {
-    ajax(url, callbacks, serialize(extract(events)), {method})
+    ajax(url, callbacks, serialize(extract(events)), {method, keepalive: true})
   }
 }
 
diff --git a/modules/geoedgeRtdProvider.js b/modules/geoedgeRtdProvider.js
index 646d2f4e786..09e717a112f 100644
--- a/modules/geoedgeRtdProvider.js
+++ b/modules/geoedgeRtdProvider.js
@@ -17,11 +17,17 @@
 
 import { submodule } from '../src/hook.js';
 import { ajax } from '../src/ajax.js';
-import { generateUUID, insertElement, isEmpty, logError } from '../src/utils.js';
+import { generateUUID, createInvisibleIframe, insertElement, isEmpty, logError } from '../src/utils.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import { loadExternalScript } from '../src/adloader.js';
 import { auctionManager } from '../src/auctionManager.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
 
 /** @type {string} */
 const SUBMODULE_NAME = 'geoedge';
@@ -48,10 +54,14 @@ export let wrapper
 let wrapperReady;
 /** @type {boolean} */;
 let preloaded;
+/** @type {object} */;
+let refererInfo = getRefererInfo();
+/** @type {object} */;
+let overrides = window.grumi?.overrides;
 
 /**
  * fetches the creative wrapper
- * @param {function} sucess - success callback
+ * @param {function} success - success callback
  */
 export function fetchWrapper(success) {
   if (wrapperReady) {
@@ -69,17 +79,37 @@ export function setWrapper(responseText) {
   wrapper = responseText;
 }
 
+export function getInitialParams(key) {
+  let params = {
+    wver: '1.1.1',
+    wtype: 'pbjs-module',
+    key,
+    meta: {
+      topUrl: refererInfo.page
+    },
+    site: refererInfo.domain,
+    pimp: PV_ID,
+    fsRan: true,
+    frameApi: true
+  };
+  return params;
+}
+
+export function markAsLoaded() {
+  preloaded = true;
+}
+
 /**
  * preloads the client
-  * @param {string} key
+ * @param {string} key
  */
 export function preloadClient(key) {
-  let link = document.createElement('link');
-  link.rel = 'preload';
-  link.as = 'script';
-  link.href = getClientUrl(key);
-  link.onload = () => { preloaded = true };
-  insertElement(link);
+  let iframe = createInvisibleIframe();
+  iframe.id = 'grumiFrame';
+  insertElement(iframe);
+  iframe.contentWindow.grumi = getInitialParams(key);
+  let url = getClientUrl(key);
+  loadExternalScript(url, MODULE_TYPE_RTD, SUBMODULE_NAME, markAsLoaded, iframe.contentDocument);
 }
 
 /**
@@ -103,7 +133,7 @@ export function wrapHtml(wrapper, html) {
  * @param {string} key
  * @return {Object}
  */
-function getMacros(bid, key) {
+export function getMacros(bid, key) {
   return {
     '${key}': key,
     '%%ADUNIT%%': bid.adUnitCode,
@@ -115,8 +145,10 @@ function getMacros(bid, key) {
     '%_hbcid!': bid.creativeId || '',
     '%_hbadomains': bid.meta && bid.meta.advertiserDomains,
     '%%PATTERN:hb_pb%%': bid.pbHg,
-    '%%SITE%%': location.hostname,
-    '%_pimp%': PV_ID
+    '%%SITE%%': overrides?.site || refererInfo.domain,
+    '%_pimp%': PV_ID,
+    '%_hbCpm!': bid.cpm,
+    '%_hbCurrency!': bid.currency
   };
 }
 
@@ -209,7 +241,7 @@ function fireBillableEventsForApplicableBids(params) {
     let data = message.data;
     if (isBillingMessage(data, params)) {
       let winningBid = auctionManager.findBidByAdId(data.adId);
-      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+      events.emit(EVENTS.BILLABLE_EVENT, {
         vendor: SUBMODULE_NAME,
         billingId: data.impressionId,
         type: winningBid ? 'impression' : data.type,
@@ -228,7 +260,7 @@ function fireBillableEventsForApplicableBids(params) {
 function setupInPage(params) {
   window.grumi = params;
   window.grumi.fromPrebid = true;
-  loadExternalScript(getInPageUrl(params.key), SUBMODULE_NAME);
+  loadExternalScript(getInPageUrl(params.key), MODULE_TYPE_RTD, SUBMODULE_NAME);
 }
 
 function init(config, userConsent) {
@@ -250,9 +282,9 @@ function init(config, userConsent) {
 /** @type {RtdSubmodule} */
 export const geoedgeSubmodule = {
   /**
-     * used to link submodule with realTimeData
-     * @type {string}
-     */
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
   name: SUBMODULE_NAME,
   init,
   onBidResponseEvent: conditionallyWrap
diff --git a/modules/geolocationRtdProvider.js b/modules/geolocationRtdProvider.js
index b46a25e9246..6bfed7ee934 100644
--- a/modules/geolocationRtdProvider.js
+++ b/modules/geolocationRtdProvider.js
@@ -4,6 +4,7 @@ import { ACTIVITY_TRANSMIT_PRECISE_GEO } from '../src/activities/activities.js';
 import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
 import { isActivityAllowed } from '../src/activities/rules.js';
 import { activityParams } from '../src/activities/activityParams.js';
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 
 let permissionsAvailable = true;
 let geolocation;
@@ -54,6 +55,7 @@ function init(moduleConfig) {
 }
 export const geolocationSubmodule = {
   name: 'geolocation',
+  gvlid: VENDORLESS_GVLID,
   getBidRequestData: getGeolocationData,
   init: init,
 };
diff --git a/modules/getintentBidAdapter.js b/modules/getintentBidAdapter.js
index 2b6ea1c2c2a..67a0e1e91be 100644
--- a/modules/getintentBidAdapter.js
+++ b/modules/getintentBidAdapter.js
@@ -1,6 +1,11 @@
 import {getBidIdParameter, isFn, isInteger} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'getintent';
 const IS_NET_REVENUE = true;
 const BID_HOST = 'px.adhigh.net';
@@ -38,7 +43,7 @@ export const spec = {
    *
    * @param {BidRequest} bid The bid to validate.
    * @return {boolean} True if this is a valid bid, and false otherwise.
-   * */
+   */
   isBidRequestValid: function(bid) {
     return !!(bid && bid.params && bid.params.pid && bid.params.tid);
   },
@@ -106,9 +111,9 @@ function buildUrl(bid) {
 /**
  * Builds GI bid request from BidRequest.
  *
- * @param {BidRequest} bidRequest.
- * @return {object} GI bid request.
- * */
+ * @param {BidRequest} bidRequest
+ * @return {object} GI bid request
+ */
 function buildGiBidRequest(bidRequest) {
   let giBidRequest = {
     bid_id: bidRequest.bidId,
@@ -147,7 +152,7 @@ function getBidFloor(bidRequest, currency) {
       currency: currency || DEFAULT_CURRENCY,
       mediaType: bidRequest.mediaType,
       size: bidRequest.sizes || '*'
-    });
+    }) || {};
   }
 
   return {
@@ -191,7 +196,7 @@ function addOptional(params, request, props) {
 /**
  * @param {String} s The string representing a size (e.g. "300x250").
  * @return {Number[]} An array with two elements: [width, height] (e.g.: [300, 250]).
- * */
+ */
 function parseSize(s) {
   return s.split('x').map(Number);
 }
@@ -200,7 +205,7 @@ function parseSize(s) {
  * @param {Array} sizes An array of sizes/numbers to be joined into single string.
  *                      May be an array (e.g. [300, 250]) or array of arrays (e.g. [[300, 250], [640, 480]].
  * @return {String} The string with sizes, e.g. array of sizes [[50, 50], [80, 80]] becomes "50x50,80x80" string.
- * */
+ */
 function produceSize (sizes) {
   function sizeToStr(s) {
     if (Array.isArray(s) && s.length === 2 && isInteger(s[0]) && isInteger(s[1])) {
diff --git a/modules/gjirafaBidAdapter.js b/modules/gjirafaBidAdapter.js
index 91ed5c9b3fb..ef19a097062 100644
--- a/modules/gjirafaBidAdapter.js
+++ b/modules/gjirafaBidAdapter.js
@@ -2,6 +2,14 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'gjirafa';
 const ENDPOINT_URL = 'https://central.gjirafa.com/bid';
 const DIMENSION_SEPARATOR = 'x';
@@ -26,7 +34,8 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
+   * @param {validBidRequests} validBidRequests an array of bids
+   * @param {BidderRequest} bidderRequest
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
@@ -116,11 +125,11 @@ export const spec = {
 };
 
 /**
-* Generate size param for bid request using sizes array
-*
-* @param {Array} sizes Possible sizes for the ad unit.
-* @return {string} Processed sizes param to be used for the bid request.
-*/
+ * Generate size param for bid request using sizes array
+ *
+ * @param {Array} sizes Possible sizes for the ad unit.
+ * @return {string} Processed sizes param to be used for the bid request.
+ */
 function generateSizeParam(sizes) {
   return sizes.map(size => size.join(DIMENSION_SEPARATOR)).join(SIZE_SEPARATOR);
 }
diff --git a/modules/globalsunBidAdapter.js b/modules/globalsunBidAdapter.js
index 5b5d97c2cac..1684509b7b9 100644
--- a/modules/globalsunBidAdapter.js
+++ b/modules/globalsunBidAdapter.js
@@ -1,212 +1,19 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'globalsun';
 const AD_URL = 'https://endpoint.globalsun.io/pbjs';
 const SYNC_URL = 'https://cs.globalsun.io';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId, endpointId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  if (placementId) {
-    placement.placementId = placementId;
-    placement.type = 'publisher';
-  } else if (endpointId) {
-    placement.endpointId = endpointId;
-    placement.type = 'network';
-  }
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-    // TODO: does the fallback make sense here?
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/gmosspBidAdapter.js b/modules/gmosspBidAdapter.js
index 559f9f77aaf..e0a5861f40c 100644
--- a/modules/gmosspBidAdapter.js
+++ b/modules/gmosspBidAdapter.js
@@ -1,3 +1,7 @@
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+import { tryAppendQueryString } from '../libraries/urlUtils/urlUtils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
 import {
   createTrackPixelHtml,
   deepAccess,
@@ -7,10 +11,16 @@ import {
   isEmpty,
   logError
 } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {config} from '../src/config.js';
-import {BANNER} from '../src/mediaTypes.js';
-import {tryAppendQueryString} from '../libraries/urlUtils/urlUtils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
 
 const BIDDER_CODE = 'gmossp';
 const ENDPOINT = 'https://sp.gmossp-sp.jp/hb/prebid/query.ad';
@@ -32,14 +42,15 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
+   * @param {validBidRequests} validBidRequests an array of bids
+   * @param {BidderRequest} bidderRequest
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
     const bidRequests = [];
 
     const urlInfo = getUrlInfo(bidderRequest.refererInfo);
-    const cur = getCurrencyType();
+    const cur = getCurrencyType(bidderRequest);
     const dnt = getDNT() ? '1' : '0';
 
     for (let i = 0; i < validBidRequests.length; i++) {
@@ -145,11 +156,8 @@ export const spec = {
 
 };
 
-function getCurrencyType() {
-  if (config.getConfig('currency.adServerCurrency')) {
-    return config.getConfig('currency.adServerCurrency');
-  }
-  return 'JPY';
+function getCurrencyType(bidderRequest) {
+  return getCurrencyFromBidderRequest(bidderRequest) || 'JPY';
 }
 
 function getUrlInfo(refererInfo) {
diff --git a/modules/gnetBidAdapter.js b/modules/gnetBidAdapter.js
index 38e96c183b9..1bcc774e351 100644
--- a/modules/gnetBidAdapter.js
+++ b/modules/gnetBidAdapter.js
@@ -4,6 +4,13 @@ import { BANNER } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
 import {ajax} from '../src/ajax.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'gnet';
 const ENDPOINT = 'https://service.gnetrtb.com/api';
 const storage = getStorageManager({bidderCode: BIDDER_CODE});
@@ -25,7 +32,8 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
+   * @param {validBidRequests} validBidRequests an array of bids
+   * @param {BidderRequest} bidderRequest
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
diff --git a/modules/goldbachBidAdapter.js b/modules/goldbachBidAdapter.js
index 8892df130df..07ad6b2fa97 100644
--- a/modules/goldbachBidAdapter.js
+++ b/modules/goldbachBidAdapter.js
@@ -19,17 +19,20 @@ import {
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {ADPOD, BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {auctionManager} from '../src/auctionManager.js';
 import {find, includes} from '../src/polyfill.js';
 import {INSTREAM, OUTSTREAM} from '../src/video.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
 import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
 import {APPNEXUS_CATEGORY_MAPPING} from '../libraries/categoryTranslationMapping/index.js';
-import {getANKeywordParam, transformBidderParamKeywords} from '../libraries/appnexusUtils/anKeywords.js';
+import {getANKeywordParam} from '../libraries/appnexusUtils/anKeywords.js';
 import {convertCamelToUnderscore, fill} from '../libraries/appnexusUtils/anUtils.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
 import {chunk} from '../libraries/chunk/chunk.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'goldbach';
 const URL = 'https://ib.adnxs.com/ut/v3/prebid';
 const PRICING_URL = 'https://templates.da-services.ch/01_universal/burda_prebid/1.0/json/sizeCPMMapping.json';
@@ -382,31 +385,6 @@ export const spec = {
     }
   },
 
-  transformBidParams: function (params, isOpenRtb) {
-    params = convertTypes({
-      'member': 'string',
-      'invCode': 'string',
-      'placementId': 'number',
-      'keywords': transformBidderParamKeywords,
-      'publisherId': 'number'
-    }, params);
-
-    if (isOpenRtb) {
-      params.use_pmt_rule = (typeof params.usePaymentRule === 'boolean') ? params.usePaymentRule : false;
-      if (params.usePaymentRule) { delete params.usePaymentRule; }
-
-      Object.keys(params).forEach(paramKey => {
-        let convertedKey = convertCamelToUnderscore(paramKey);
-        if (convertedKey !== paramKey) {
-          params[convertedKey] = params[paramKey];
-          delete params[paramKey];
-        }
-      });
-    }
-
-    return params;
-  },
-
   /**
    * Add element selector to javascript tracker to improve native viewability
    * @param {Bid} bid
@@ -764,7 +742,7 @@ function bidToTag(bid) {
   }
   tag.keywords = getANKeywordParam(bid.ortb2, bid.params.keywords);
 
-  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
   if (gpid) {
     tag.gpid = gpid;
   }
@@ -877,9 +855,7 @@ function bidToTag(bid) {
     tag['banner_frameworks'] = bid.params.frameworks;
   }
 
-  // TODO: why does this need to iterate through every ad unit?
-  let adUnit = find(auctionManager.getAdUnits(), au => bid.transactionId === au.transactionId);
-  if (adUnit && adUnit.mediaTypes && adUnit.mediaTypes.banner) {
+  if (bid.mediaTypes?.banner) {
     tag.ad_types.push(BANNER);
   }
 
diff --git a/modules/goldfishAdsRtdProvider.js b/modules/goldfishAdsRtdProvider.js
new file mode 100755
index 00000000000..c595e361968
--- /dev/null
+++ b/modules/goldfishAdsRtdProvider.js
@@ -0,0 +1,198 @@
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { deepAccess } from '../src/utils.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
+export const MODULE_NAME = 'goldfishAdsRtd';
+export const MODULE_TYPE = 'realTimeData';
+export const ENDPOINT_URL = 'https://prebid.goldfishads.com/iab-segments';
+export const DATA_STORAGE_KEY = 'goldfishads_data';
+export const DATA_STORAGE_TTL = 1800 * 1000// TTL in seconds
+
+export const ADAPTER_VERSION = '1.0';
+
+export const storage = getStorageManager({
+  gvlid: null,
+  moduleName: MODULE_NAME,
+  moduleType: MODULE_TYPE,
+});
+
+/**
+ *
+ * @param {{response: string[]} } response
+ * @returns
+ */
+export const manageCallbackResponse = (response) => {
+  try {
+    const foo = JSON.parse(response.response);
+    if (!Array.isArray(foo)) throw new Error('Invalid response');
+    const enrichedResponse = {
+      ext: {
+        segtax: 4
+      },
+      segment: foo.map((segment) => { return { id: segment } }),
+    };
+    const output = {
+      name: 'goldfishads.com',
+      ...enrichedResponse,
+    };
+    return output;
+  } catch (e) {
+    throw e;
+  };
+};
+
+/**
+ * @param {string} key
+ * @returns { Promise<{name: 'goldfishads.com', ext: { segtag: 4 }, segment: string[]}> }
+ */
+
+const getTargetingDataFromApi = (key) => {
+  return new Promise((resolve, reject) => {
+    const requestOptions = {
+      customHeaders: {
+        'Accept': 'application/json'
+      }
+    }
+    const callbacks = {
+      success(responseText, response) {
+        try {
+          const output = manageCallbackResponse(response);
+          resolve(output);
+        } catch (e) {
+          reject(e);
+        }
+      },
+      error(error) {
+        reject(error);
+      }
+    };
+    ajax(`${ENDPOINT_URL}?key=${key}`, callbacks, null, requestOptions)
+  })
+};
+
+/**
+ * @returns {{
+ *    name: 'golfishads.com',
+ *   ext: { segtax: 4},
+ *   segment: string[]
+ * } | null }
+ */
+export const getStorageData = () => {
+  const now = new Date();
+  const data = storage.getDataFromLocalStorage(DATA_STORAGE_KEY);
+  if (data === null) return null;
+  try {
+    const foo = JSON.parse(data);
+    if (now.getTime() > foo.expiry) return null;
+    return foo.targeting;
+  } catch (e) {
+    return null;
+  }
+};
+
+/**
+ * @param { { key: string } } payload
+ * @returns {Promise<{
+ *  name: string,
+ *  ext: { segtax: 4},
+ *  segment: string[]
+ * }> | null
+ * }
+ */
+
+const getTargetingData = (payload) => new Promise((resolve) => {
+  const targeting = getStorageData();
+  if (targeting === null) {
+    getTargetingDataFromApi(payload.key)
+      .then((response) => {
+        const now = new Date()
+        const data = {
+          targeting: response,
+          expiry: now.getTime() + DATA_STORAGE_TTL,
+        };
+        storage.setDataInLocalStorage(DATA_STORAGE_KEY, JSON.stringify(data));
+        resolve(response);
+      })
+      .catch((e) => {
+        resolve(null);
+      });
+  } else {
+    resolve(targeting);
+  }
+})
+
+/**
+ *
+ * @param {*} config
+ * @param {*} userConsent
+ * @returns {boolean}
+ */
+
+const init = (config, userConsent) => {
+  if (!config.params || !config.params.key) return false;
+  // return { type: (typeof config.params.key === 'string') };
+  if (!(typeof config.params.key === 'string')) return false;
+  return true;
+};
+
+/**
+ *
+ * @param {{
+ *  name: string,
+ *  ext: { segtax: 4},
+ *  segment: {id: string}[]
+ * } | null } userData
+ * @param {*} reqBidsConfigObj
+ * @returns
+ */
+export const updateUserData = (userData, reqBidsConfigObj) => {
+  if (userData === null) return;
+  const bidders = ['appnexus', 'rubicon', 'nexx360'];
+  for (let i = 0; i < bidders.length; i++) {
+    const bidderCode = bidders[i];
+    const originalConfig = deepAccess(reqBidsConfigObj, `ortb2Fragments.bidder[${bidderCode}].user.data`) || [];
+    const userConfig = [
+      ...originalConfig,
+      userData,
+    ];
+    reqBidsConfigObj.ortb2Fragments = reqBidsConfigObj.ortb2Fragments || {};
+    reqBidsConfigObj.ortb2Fragments.bidder = reqBidsConfigObj.ortb2Fragments.bidder || {};
+    reqBidsConfigObj.ortb2Fragments.bidder[bidderCode] = reqBidsConfigObj.ortb2Fragments.bidder[bidderCode] || {};
+    reqBidsConfigObj.ortb2Fragments.bidder[bidderCode].user = reqBidsConfigObj.ortb2Fragments.bidder[bidderCode].user = {};
+    reqBidsConfigObj.ortb2Fragments.bidder[bidderCode].user.data = reqBidsConfigObj.ortb2Fragments.bidder[bidderCode].user.data || userConfig;
+  }
+  return reqBidsConfigObj;
+}
+
+/**
+ *
+ * @param {*} reqBidsConfigObj
+ * @param {*} callback
+ * @param {*} moduleConfig
+ * @param {*} userConsent
+ * @returns {void}
+ */
+const getBidRequestData = (reqBidsConfigObj, callback, moduleConfig, userConsent) => {
+  const payload = {
+    key: moduleConfig.params.key,
+  };
+  getTargetingData(payload)
+    .then((userData) => {
+      updateUserData(userData, reqBidsConfigObj);
+      callback();
+    });
+};
+
+/** @type {RtdSubmodule} */
+export const goldfishAdsSubModule = {
+  name: MODULE_NAME,
+  init,
+  getBidRequestData,
+};
+
+submodule(MODULE_TYPE, goldfishAdsSubModule);
diff --git a/modules/goldfishAdsRtdProvider.md b/modules/goldfishAdsRtdProvider.md
new file mode 100755
index 00000000000..9a6fd939bd1
--- /dev/null
+++ b/modules/goldfishAdsRtdProvider.md
@@ -0,0 +1,48 @@
+# Goldfish Ads Real-time Data Submodule
+
+## Overview
+
+    Module Name: Goldfish Ads Rtd Provider
+    Module Type: Rtd Provider
+    Maintainer: keith@goldfishads.com
+
+## Description
+
+This RTD module provides access to the Goldfish Ads Geograph, which leverages geographic and temporal data on a privacy-first platform. This module works without using cookies, PII, emails, or device IDs across all website traffic, including unauthenticated users, and adds audience data into bid requests to increase scale and yields.
+
+## Usage
+
+### Build
+```
+gulp build --modules="rtdModule,goldfishAdsRtdProvider,appnexusBidAdapter,..."
+```
+
+> Note that the global RTD module, `rtdModule`, is a prerequisite of the Goldfish Ads RTD module.
+
+### Configuration
+
+Use `setConfig` to instruct Prebid.js to initialize the Goldfish Ads RTD module, as specified below.
+
+This module is configured as part of the `realTimeData.dataProviders`
+
+```javascript
+pbjs.setConfig({
+  realTimeData: {
+    auctionDelay: 300,
+    dataProviders: [{
+      name: 'goldfishAds',
+      waitForIt: true,
+      params: {
+       key: 'testkey'
+      }
+    }]
+  }
+})
+```
+
+### Parameters
+| Name             | Type                                    | Description                                                                  | Default                |
+|:-----------------|:----------------------------------------|:-----------------------------------------------------------------------------|:-----------------------|
+| name             | String                                  | Real time data module name                                                   | Always 'goldfishAds'   |
+| waitForIt        | Boolean                                 | Set to true to maximize chance for bidder enrichment, used with auctionDelay | `false`                |
+| params.key       | String                                  | Your key id issued by Goldfish Ads                                            |                        |
diff --git a/modules/gothamadsBidAdapter.js b/modules/gothamadsBidAdapter.js
index 9f44a54460f..bcd382e507a 100644
--- a/modules/gothamadsBidAdapter.js
+++ b/modules/gothamadsBidAdapter.js
@@ -1,9 +1,14 @@
-import { logMessage, deepSetValue, deepAccess, _map, logWarn } from '../src/utils.js';
+import { deepSetValue, deepAccess, _map, logWarn } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'gothamads';
 const ACCOUNTID_MACROS = '[account_id]';
 const URL_ENDPOINT = `https://us-e-node1.gothamads.com/bid?pass=${ACCOUNTID_MACROS}&integration=prebidjs`;
@@ -75,18 +80,9 @@ export const spec = {
     if (validBidRequests && validBidRequests.length === 0) return []
     let accuontId = validBidRequests[0].params.accountId;
     const endpointURL = URL_ENDPOINT.replace(ACCOUNTID_MACROS, accuontId);
-
     let winTop = window;
     let location;
-    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
-    try {
-      location = new URL(bidderRequest.refererInfo.page)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
-
+    location = bidderRequest?.refererInfo ?? null;
     let bids = [];
     for (let bidRequest of validBidRequests) {
       let impObject = prepareImpObject(bidRequest);
@@ -100,8 +96,8 @@ export const spec = {
           language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
         },
         site: {
-          page: location.pathname,
-          host: location.host
+          page: location?.page,
+          host: location?.domain
         },
         source: {
           tid: bidderRequest?.ortb2?.source?.tid,
@@ -327,7 +323,7 @@ const parseSizes = (bid, mediaType) => {
 
 const addVideoParameters = (bidRequest) => {
   let videoObj = {};
-  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity']
+  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity']
 
   for (let param of supportParamsList) {
     if (bidRequest.mediaTypes.video[param] !== undefined) {
diff --git a/modules/gptPreAuction.js b/modules/gptPreAuction.js
index bf5b4a55dbb..a6495e3570e 100644
--- a/modules/gptPreAuction.js
+++ b/modules/gptPreAuction.js
@@ -1,19 +1,68 @@
+import { getSignals as getSignalsFn, getSegments as getSegmentsFn, taxonomies } from '../libraries/gptUtils/gptUtils.js';
+import { auctionManager } from '../src/auctionManager.js';
+import { config } from '../src/config.js';
+import { TARGETING_KEYS } from '../src/constants.js';
+import { getHook } from '../src/hook.js';
+import { find } from '../src/polyfill.js';
 import {
   deepAccess,
+  deepSetValue,
   isAdUnitCodeMatchingSlot,
   isGptPubadsDefined,
   logInfo,
+  logWarn,
   pick,
-  deepSetValue
+  uniques
 } from '../src/utils.js';
-import {config} from '../src/config.js';
-import {getHook} from '../src/hook.js';
-import {find} from '../src/polyfill.js';
 
 const MODULE_NAME = 'GPT Pre-Auction';
 export let _currentConfig = {};
 let hooksAdded = false;
 
+export function getSegments(fpd, sections, segtax) {
+  return getSegmentsFn(fpd, sections, segtax);
+}
+
+export function getSignals(fpd) {
+  return getSignalsFn(fpd);
+}
+
+export function getSignalsArrayByAuctionsIds(auctionIds, index = auctionManager.index) {
+  const signals = auctionIds
+    .map(auctionId => index.getAuction({ auctionId })?.getFPD()?.global)
+    .map(getSignals)
+    .filter(fpd => fpd);
+
+  return signals;
+}
+
+export function getSignalsIntersection(signals) {
+  const result = {};
+  taxonomies.forEach((taxonomy) => {
+    const allValues = signals
+      .flatMap(x => x)
+      .filter(x => x.taxonomy === taxonomy)
+      .map(x => x.values);
+    result[taxonomy] = allValues.length ? (
+      allValues.reduce((commonElements, subArray) => {
+        return commonElements.filter(element => subArray.includes(element));
+      })
+    ) : []
+    result[taxonomy] = { values: result[taxonomy] };
+  })
+  return result;
+}
+
+export function getAuctionsIdsFromTargeting(targeting, am = auctionManager) {
+  return Object.values(targeting)
+    .flatMap(x => Object.entries(x))
+    .filter((entry) => entry[0] === TARGETING_KEYS.AD_ID || entry[0].startsWith(TARGETING_KEYS.AD_ID + '_'))
+    .flatMap(entry => entry[1])
+    .map(adId => am.findBidByAdId(adId)?.auctionId)
+    .filter(id => id != null)
+    .filter(uniques);
+}
+
 export const appendGptSlots = adUnits => {
   const { customGptSlotMatching } = _currentConfig;
 
@@ -27,21 +76,25 @@ export const appendGptSlots = adUnits => {
     return acc;
   }, {});
 
+  const adUnitPaths = {};
+
   window.googletag.pubads().getSlots().forEach(slot => {
     const matchingAdUnitCode = find(Object.keys(adUnitMap), customGptSlotMatching
       ? customGptSlotMatching(slot)
       : isAdUnitCodeMatchingSlot(slot));
 
     if (matchingAdUnitCode) {
+      const path = adUnitPaths[matchingAdUnitCode] = slot.getAdUnitPath();
       const adserver = {
         name: 'gam',
-        adslot: sanitizeSlotPath(slot.getAdUnitPath())
+        adslot: sanitizeSlotPath(path)
       };
       adUnitMap[matchingAdUnitCode].forEach((adUnit) => {
         deepSetValue(adUnit, 'ortb2Imp.ext.data.adserver', Object.assign({}, adUnit.ortb2Imp?.ext?.data?.adserver, adserver));
       });
     }
   });
+  return adUnitPaths;
 };
 
 const sanitizeSlotPath = (path) => {
@@ -54,7 +107,7 @@ const sanitizeSlotPath = (path) => {
   return path;
 }
 
-const defaultPreAuction = (adUnit, adServerAdSlot) => {
+const defaultPreAuction = (adUnit, adServerAdSlot, adUnitPath) => {
   const context = adUnit.ortb2Imp.ext.data;
 
   // use pbadslot if supplied
@@ -68,7 +121,7 @@ const defaultPreAuction = (adUnit, adServerAdSlot) => {
   }
 
   // find all GPT slots with this name
-  var gptSlots = window.googletag.pubads().getSlots().filter(slot => slot.getAdUnitPath() === adServerAdSlot);
+  var gptSlots = window.googletag.pubads().getSlots().filter(slot => slot.getAdUnitPath() === adUnitPath);
 
   if (gptSlots.length === 0) {
     return; // should never happen
@@ -113,8 +166,12 @@ export const appendPbAdSlot = adUnit => {
   return true;
 };
 
+function warnDeprecation(adUnit) {
+  logWarn(`pbadslot is deprecated and will soon be removed, use gpid instead`, adUnit)
+}
+
 export const makeBidRequestsHook = (fn, adUnits, ...args) => {
-  appendGptSlots(adUnits);
+  const adUnitPaths = appendGptSlots(adUnits);
   const { useDefaultPreAuction, customPreAuction } = _currentConfig;
   adUnits.forEach(adUnit => {
     // init the ortb2Imp if not done yet
@@ -122,21 +179,24 @@ export const makeBidRequestsHook = (fn, adUnits, ...args) => {
     adUnit.ortb2Imp.ext = adUnit.ortb2Imp.ext || {};
     adUnit.ortb2Imp.ext.data = adUnit.ortb2Imp.ext.data || {};
     const context = adUnit.ortb2Imp.ext;
-
     // if neither new confs set do old stuff
     if (!customPreAuction && !useDefaultPreAuction) {
+      warnDeprecation(adUnit);
       const usedAdUnitCode = appendPbAdSlot(adUnit);
       // gpid should be set to itself if already set, or to what pbadslot was (as long as it was not adUnit code)
       if (!context.gpid && !usedAdUnitCode) {
         context.gpid = context.data.pbadslot;
       }
     } else {
+      if (context.data?.pbadslot) {
+        warnDeprecation(adUnit);
+      }
       let adserverSlot = deepAccess(context, 'data.adserver.adslot');
       let result;
       if (customPreAuction) {
-        result = customPreAuction(adUnit, adserverSlot);
+        result = customPreAuction(adUnit, adserverSlot, adUnitPaths?.[adUnit.code]);
       } else if (useDefaultPreAuction) {
-        result = defaultPreAuction(adUnit, adserverSlot);
+        result = defaultPreAuction(adUnit, adserverSlot, adUnitPaths?.[adUnit.code]);
       }
       if (result) {
         context.gpid = context.data.pbadslot = result;
@@ -146,6 +206,14 @@ export const makeBidRequestsHook = (fn, adUnits, ...args) => {
   return fn.call(this, adUnits, ...args);
 };
 
+const setPpsConfigFromTargetingSet = (next, targetingSet) => {
+  // set gpt config
+  const auctionsIds = getAuctionsIdsFromTargeting(targetingSet);
+  const signals = getSignalsIntersection(getSignalsArrayByAuctionsIds(auctionsIds));
+  window.googletag.setConfig && window.googletag.setConfig({pps: { taxonomies: signals }});
+  next(targetingSet);
+};
+
 const handleSetGptConfig = moduleConfig => {
   _currentConfig = pick(moduleConfig, [
     'enabled', enabled => enabled !== false,
@@ -153,18 +221,20 @@ const handleSetGptConfig = moduleConfig => {
       typeof customGptSlotMatching === 'function' && customGptSlotMatching,
     'customPbAdSlot', customPbAdSlot => typeof customPbAdSlot === 'function' && customPbAdSlot,
     'customPreAuction', customPreAuction => typeof customPreAuction === 'function' && customPreAuction,
-    'useDefaultPreAuction', useDefaultPreAuction => useDefaultPreAuction === true,
+    'useDefaultPreAuction', useDefaultPreAuction => useDefaultPreAuction ?? true,
   ]);
 
   if (_currentConfig.enabled) {
     if (!hooksAdded) {
       getHook('makeBidRequests').before(makeBidRequestsHook);
+      getHook('targetingDone').after(setPpsConfigFromTargetingSet)
       hooksAdded = true;
     }
   } else {
     logInfo(`${MODULE_NAME}: Turning off module`);
     _currentConfig = {};
     getHook('makeBidRequests').getHooks({hook: makeBidRequestsHook}).remove();
+    getHook('targetingDone').getHooks({hook: setPpsConfigFromTargetingSet}).remove();
     hooksAdded = false;
   }
 };
diff --git a/modules/gravitoIdSystem.js b/modules/gravitoIdSystem.js
index 70031ebd06e..cc02c6a103e 100644
--- a/modules/gravitoIdSystem.js
+++ b/modules/gravitoIdSystem.js
@@ -16,16 +16,16 @@ export const cookieKey = 'gravitompId';
 
 export const gravitoIdSystemSubmodule = {
   /**
-  * used to link submodule with config
-  * @type {string}
-  */
+   * used to link submodule with config
+   * @type {string}
+   */
   name: MODULE_NAME,
 
   /**
-  * performs action to obtain id
-  * @function
-  * @returns { {id: {gravitompId: string}} | undefined }
-  */
+   * performs action to obtain id
+   * @function
+   * @returns { {id: {gravitompId: string}} | undefined }
+   */
   getId: function() {
     const newId = storage.getCookie(cookieKey);
     if (!newId) {
@@ -38,11 +38,11 @@ export const gravitoIdSystemSubmodule = {
   },
 
   /**
-  * decode the stored id value for passing to bid requests
-  * @function
-  * @param { {gravitompId: string} } value
-  * @returns { {gravitompId: {string} } | undefined }
-  */
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param { {gravitompId: string} } value
+   * @returns { {gravitompId: {string} } | undefined }
+   */
   decode: function(value) {
     if (value && typeof value === 'object') {
       var result = {};
diff --git a/modules/greenbidsAnalyticsAdapter.js b/modules/greenbidsAnalyticsAdapter.js
index edc0c9c6c5c..99ce89ee4d1 100644
--- a/modules/greenbidsAnalyticsAdapter.js
+++ b/modules/greenbidsAnalyticsAdapter.js
@@ -1,21 +1,29 @@
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
-import {deepClone, logError, logInfo} from '../src/utils.js';
+import {deepClone, generateUUID, logError, logInfo, logWarn, getParameterByName} from '../src/utils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
+/**
+ * @typedef {object} Message Payload message sent to the Greenbids API
+ */
 
 const analyticsType = 'endpoint';
 
-export const ANALYTICS_VERSION = '1.0.0';
+export const ANALYTICS_VERSION = '2.3.2';
 
 const ANALYTICS_SERVER = 'https://a.greenbids.ai';
 
 const {
-  EVENTS: {
-    AUCTION_END,
-    BID_TIMEOUT,
-  }
-} = CONSTANTS;
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_TIMEOUT,
+  BILLABLE_EVENT,
+} = EVENTS;
 
 export const BIDDER_STATUS = {
   BID: 'bid',
@@ -25,28 +33,69 @@ export const BIDDER_STATUS = {
 
 const analyticsOptions = {};
 
-export const parseBidderCode = function (bid) {
-  let bidderCode = bid.bidderCode || bid.bidder;
-  return bidderCode.toLowerCase();
-};
+export const isSampled = function(greenbidsId, samplingRate, exploratorySamplingSplit) {
+  const isSamplingForced = getParameterByName('greenbids_force_sampling');
+  if (isSamplingForced) {
+    logInfo('Greenbids Analytics: sampling flag detected, forcing analytics');
+    return true;
+  }
+  if (samplingRate < 0 || samplingRate > 1) {
+    logWarn('Sampling rate must be between 0 and 1');
+    return true;
+  }
+  const exploratorySamplingRate = samplingRate * exploratorySamplingSplit;
+  const throttledSamplingRate = samplingRate * (1.0 - exploratorySamplingSplit);
+  const hashInt = parseInt(greenbidsId.slice(-4), 16);
+  const isPrimarySampled = hashInt < exploratorySamplingRate * (0xFFFF + 1);
+  if (isPrimarySampled) return true;
+  const isExtraSampled = hashInt >= (1 - throttledSamplingRate) * (0xFFFF + 1);
+  return isExtraSampled;
+}
 
 export const greenbidsAnalyticsAdapter = Object.assign(adapter({ANALYTICS_SERVER, analyticsType}), {
 
   cachedAuctions: {},
+  exploratorySamplingSplit: 0.9,
 
   initConfig(config) {
+    analyticsOptions.options = deepClone(config.options);
     /**
      * Required option: pbuid
      * @type {boolean}
      */
-    analyticsOptions.options = deepClone(config.options);
-    if (typeof config.options.pbuid !== 'string' || config.options.pbuid.length < 1) {
+    if (typeof analyticsOptions.options.pbuid !== 'string' || analyticsOptions.options.pbuid.length < 1) {
       logError('"options.pbuid" is required.');
       return false;
     }
 
+    /**
+     *  Deprecate use of integerated 'sampling' config
+     *  replace by greenbidsSampling
+     */
+    if (typeof analyticsOptions.options.sampling === 'number') {
+      logWarn('"options.sampling" is deprecated, please use "greenbidsSampling" instead.');
+      analyticsOptions.options.greenbidsSampling = analyticsOptions.options.sampling;
+    }
+
+    /**
+     *  Discourage unsampled analytics
+     */
+    if (typeof analyticsOptions.options.greenbidsSampling !== 'number' || analyticsOptions.options.greenbidsSampling >= 1) {
+      logWarn('"options.greenbidsSampling" is not set or >=1, using this analytics module unsampled is discouraged.');
+      analyticsOptions.options.greenbidsSampling = 1;
+    }
+
+    /**
+     *  Add optional debug parameter to override exploratorySamplingSplit
+     */
+    if (typeof analyticsOptions.options.exploratorySamplingSplit === 'number') {
+      logInfo('Greenbids Analytics: Overriding "exploratorySamplingSplit".');
+      this.exploratorySamplingSplit = analyticsOptions.options.exploratorySamplingSplit;
+    }
+
     analyticsOptions.pbuid = config.options.pbuid
     analyticsOptions.server = ANALYTICS_SERVER;
+
     return true;
   },
   sendEventMessage(endPoint, data) {
@@ -56,24 +105,46 @@ export const greenbidsAnalyticsAdapter = Object.assign(adapter({ANALYTICS_SERVER
       contentType: 'application/json'
     });
   },
+  /**
+   *
+   * @param {string} auctionId
+   * @returns {Message}
+   */
   createCommonMessage(auctionId) {
+    const cachedAuction = this.getCachedAuction(auctionId);
     return {
       version: ANALYTICS_VERSION,
       auctionId: auctionId,
       referrer: window.location.href,
-      sampling: analyticsOptions.options.sampling,
+      sampling: analyticsOptions.options.greenbidsSampling,
       prebid: '$prebid.version$',
+      greenbidsId: cachedAuction.greenbidsId,
       pbuid: analyticsOptions.pbuid,
+      billingId: cachedAuction.billingId,
       adUnits: [],
     };
   },
+  /**
+   * @param {Bid} bid
+   * @param {BIDDER_STATUS} status
+   */
   serializeBidResponse(bid, status) {
     return {
       bidder: bid.bidder,
       isTimeout: (status === BIDDER_STATUS.TIMEOUT),
       hasBid: (status === BIDDER_STATUS.BID),
+      params: (bid.params && Object.keys(bid.params).length > 0) ? bid.params : {},
+      ...(status === BIDDER_STATUS.BID ? {
+        cpm: bid.cpm,
+        currency: bid.currency
+      } : {}),
     };
   },
+  /**
+   * @param {*} message Greenbids API payload
+   * @param {Bid} bid Bid to add to the payload
+   * @param {BIDDER_STATUS} status Bidding status
+   */
   addBidResponseToMessage(message, bid, status) {
     const adUnitCode = bid.adUnitCode.toLowerCase();
     const adUnitIndex = message.adUnits.findIndex((adUnit) => {
@@ -89,29 +160,34 @@ export const greenbidsAnalyticsAdapter = Object.assign(adapter({ANALYTICS_SERVER
     if (bidderIndex === -1) {
       message.adUnits[adUnitIndex].bidders.push(this.serializeBidResponse(bid, status));
     } else {
+      message.adUnits[adUnitIndex].bidders[bidderIndex].params = (bid.params && Object.keys(bid.params).length > 0) ? bid.params : {};
       if (status === BIDDER_STATUS.BID) {
         message.adUnits[adUnitIndex].bidders[bidderIndex].hasBid = true;
+        message.adUnits[adUnitIndex].bidders[bidderIndex].cpm = bid.cpm;
+        message.adUnits[adUnitIndex].bidders[bidderIndex].currency = bid.currency;
       } else if (status === BIDDER_STATUS.TIMEOUT) {
         message.adUnits[adUnitIndex].bidders[bidderIndex].isTimeout = true;
       }
     }
   },
-  createBidMessage(auctionEndArgs, timeoutBids) {
-    logInfo(auctionEndArgs)
+  createBidMessage(auctionEndArgs) {
     const {auctionId, timestamp, auctionEnd, adUnits, bidsReceived, noBids} = auctionEndArgs;
+    const cachedAuction = this.getCachedAuction(auctionId);
     const message = this.createCommonMessage(auctionId);
+    const timeoutBids = cachedAuction.timeoutBids || [];
 
     message.auctionElapsed = (auctionEnd - timestamp);
 
     adUnits.forEach((adUnit) => {
-      const adUnitCode = adUnit.code.toLowerCase();
+      const adUnitCode = adUnit.code?.toLowerCase() || 'unknown_adunit_code';
       message.adUnits.push({
         code: adUnitCode,
         mediaTypes: {
-          ...(adUnit.mediaTypes.banner !== undefined) && {banner: adUnit.mediaTypes.banner},
-          ...(adUnit.mediaTypes.video !== undefined) && {video: adUnit.mediaTypes.video},
-          ...(adUnit.mediaTypes.native !== undefined) && {native: adUnit.mediaTypes.native}
+          ...(adUnit.mediaTypes?.banner !== undefined) && {banner: adUnit.mediaTypes.banner},
+          ...(adUnit.mediaTypes?.video !== undefined) && {video: adUnit.mediaTypes.video},
+          ...(adUnit.mediaTypes?.native !== undefined) && {native: adUnit.mediaTypes.native}
         },
+        ortb2Imp: adUnit.ortb2Imp || {},
         bidders: [],
       });
     });
@@ -129,14 +205,30 @@ export const greenbidsAnalyticsAdapter = Object.assign(adapter({ANALYTICS_SERVER
   getCachedAuction(auctionId) {
     this.cachedAuctions[auctionId] = this.cachedAuctions[auctionId] || {
       timeoutBids: [],
+      greenbidsId: null,
+      billingId: null,
+      isSampled: true,
     };
     return this.cachedAuctions[auctionId];
   },
+  handleAuctionInit(auctionInitArgs) {
+    const cachedAuction = this.getCachedAuction(auctionInitArgs.auctionId);
+    try {
+      cachedAuction.greenbidsId = auctionInitArgs.adUnits[0].ortb2Imp.ext.greenbids.greenbidsId;
+    } catch (e) {
+      logInfo("Couldn't find Greenbids RTD info, assuming analytics only");
+      cachedAuction.greenbidsId = generateUUID();
+    }
+    cachedAuction.isSampled = isSampled(cachedAuction.greenbidsId, analyticsOptions.options.greenbidsSampling, this.exploratorySamplingSplit);
+  },
   handleAuctionEnd(auctionEndArgs) {
     const cachedAuction = this.getCachedAuction(auctionEndArgs.auctionId);
-    this.sendEventMessage('/',
-      this.createBidMessage(auctionEndArgs, cachedAuction.timeoutBids)
-    );
+    const isFilteringForced = getParameterByName('greenbids_force_filtering');
+    if (!isFilteringForced) {
+      this.sendEventMessage('/',
+        this.createBidMessage(auctionEndArgs, cachedAuction)
+      )
+    };
   },
   handleBidTimeout(timeoutBids) {
     timeoutBids.forEach((bid) => {
@@ -144,14 +236,34 @@ export const greenbidsAnalyticsAdapter = Object.assign(adapter({ANALYTICS_SERVER
       cachedAuction.timeoutBids.push(bid);
     });
   },
+  handleBillable(billableArgs) {
+    const cachedAuction = this.getCachedAuction(billableArgs.auctionId);
+    /* Filter Greenbids Billable Events only */
+    if (billableArgs.vendor === 'greenbidsRtdProvider') {
+      cachedAuction.billingId = billableArgs.billingId || 'unknown_billing_id';
+    }
+  },
   track({eventType, args}) {
-    switch (eventType) {
-      case BID_TIMEOUT:
-        this.handleBidTimeout(args);
-        break;
-      case AUCTION_END:
-        this.handleAuctionEnd(args);
-        break;
+    try {
+      if (eventType === AUCTION_INIT) {
+        this.handleAuctionInit(args);
+      }
+
+      if (this.getCachedAuction(args?.auctionId)?.isSampled ?? true) {
+        switch (eventType) {
+          case BID_TIMEOUT:
+            this.handleBidTimeout(args);
+            break;
+          case AUCTION_END:
+            this.handleAuctionEnd(args);
+            break;
+          case BILLABLE_EVENT:
+            this.handleBillable(args);
+            break;
+        }
+      }
+    } catch (e) {
+      logWarn('There was an error handling event ' + eventType);
     }
   },
   getAnalyticsOptions() {
@@ -163,6 +275,10 @@ greenbidsAnalyticsAdapter.originEnableAnalytics = greenbidsAnalyticsAdapter.enab
 
 greenbidsAnalyticsAdapter.enableAnalytics = function(config) {
   this.initConfig(config);
+  if (typeof config.options.sampling === 'number') {
+    // Set sampling to 1 to prevent prebid analytics integrated sampling to happen
+    config.options.sampling = 1;
+  }
   logInfo('loading greenbids analytics');
   greenbidsAnalyticsAdapter.originEnableAnalytics(config);
 };
diff --git a/modules/greenbidsAnalyticsAdapter.md b/modules/greenbidsAnalyticsAdapter.md
index 46e3af2c5e2..1be2c1741ed 100644
--- a/modules/greenbidsAnalyticsAdapter.md
+++ b/modules/greenbidsAnalyticsAdapter.md
@@ -1,23 +1,24 @@
-# Overview
+#### Registration
 
-```
-Module Name: Greenbids Analytics Adapter
-Module Type: Analytics Adapter
-Maintainer: jb@greenbids.ai
-```
+The Greenbids Analytics adapter requires setup and approval from the
+Greenbids team. Please reach out to our team for more information [greenbids.ai](https://greenbids.ai).
 
-# Description
+#### Analytics Options
 
-Analytics adapter for Greenbids
+{: .table .table-bordered .table-striped }
+| Name         | Scope              | Description                                                                                                                 | Example                                                                             | Type             |
+|-------------|---------|--------------------|-----------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------|------------------|
+| pbuid | required  | The Greenbids Publisher ID | greenbids-publisher-1  | string |
+| greenbidsSampling | optional  | sampling factor [0-1] (a value of 0.1 will filter 90% of the traffic) | 1.0  | float |
 
-# Test Parameters
+### Example Configuration
 
-```
-{
-  provider: 'greenbids',
-  options: {
-    pbuid: "PBUID_FROM_GREENBIDS"
-    sampling: 1.0
-  }
-}
-```
+```javascript
+    pbjs.enableAnalytics({
+        provider: 'greenbids',
+        options: {
+            pbuid: "greenbids-publisher-1" // please contact Greenbids to get a pbuid for yourself
+            greenbidsSampling: 1.0
+        }
+    });
+```
\ No newline at end of file
diff --git a/modules/greenbidsRtdProvider.js b/modules/greenbidsRtdProvider.js
index b3d79f05996..e350cebb33e 100644
--- a/modules/greenbidsRtdProvider.js
+++ b/modules/greenbidsRtdProvider.js
@@ -1,12 +1,13 @@
-import { logError } from '../src/utils.js';
+import { logError, logInfo, logWarn, logMessage, deepClone, generateUUID, deepSetValue, deepAccess, getParameterByName } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
+import * as events from '../src/events.js';
+import { EVENTS } from '../src/constants.js';
 
 const MODULE_NAME = 'greenbidsRtdProvider';
-const MODULE_VERSION = '1.0.0';
+const MODULE_VERSION = '2.0.1';
 const ENDPOINT = 'https://t.greenbids.ai';
 
-const auctionInfo = {};
 const rtdOptions = {};
 
 function init(moduleConfig) {
@@ -16,56 +17,91 @@ function init(moduleConfig) {
     return false;
   } else {
     rtdOptions.pbuid = params?.pbuid;
-    rtdOptions.targetTPR = params?.targetTPR || 0.99;
     rtdOptions.timeout = params?.timeout || 200;
     return true;
   }
 }
 
 function onAuctionInitEvent(auctionDetails) {
-  auctionInfo.auctionId = auctionDetails.auctionId;
+  /* Emitting one billing event per auction */
+  let defaultId = 'default_id';
+  let greenbidsId = deepAccess(auctionDetails.adUnits[0], 'ortb2Imp.ext.greenbids.greenbidsId', defaultId);
+  /* greenbids was successfully called so we emit the event */
+  if (greenbidsId !== defaultId) {
+    events.emit(EVENTS.BILLABLE_EVENT, {
+      type: 'auction',
+      billingId: generateUUID(),
+      auctionId: auctionDetails.auctionId,
+      vendor: MODULE_NAME
+    });
+  }
 }
 
 function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
-  let promise = createPromise(reqBidsConfigObj);
+  let greenbidsId = generateUUID();
+  let promise = createPromise(reqBidsConfigObj, greenbidsId);
   promise.then(callback);
 }
 
-function createPromise(reqBidsConfigObj) {
+function createPromise(reqBidsConfigObj, greenbidsId) {
   return new Promise((resolve) => {
     const timeoutId = setTimeout(() => {
+      logWarn('GreenbidsRtdProvider: Greenbids API timeout, skipping shaping');
       resolve(reqBidsConfigObj);
     }, rtdOptions.timeout);
     ajax(
       ENDPOINT,
       {
         success: (response) => {
-          processSuccessResponse(response, timeoutId, reqBidsConfigObj);
+          processSuccessResponse(response, timeoutId, reqBidsConfigObj, greenbidsId);
           resolve(reqBidsConfigObj);
         },
         error: () => {
           clearTimeout(timeoutId);
+          logWarn('GreenbidsRtdProvider: Greenbids API response error, skipping shaping');
           resolve(reqBidsConfigObj);
         },
       },
-      createPayload(reqBidsConfigObj),
-      { contentType: 'application/json' }
+      createPayload(reqBidsConfigObj, greenbidsId),
+      {
+        contentType: 'application/json',
+        customHeaders: {
+          'Greenbids-Pbuid': rtdOptions.pbuid
+        }
+      }
     );
   });
 }
 
-function processSuccessResponse(response, timeoutId, reqBidsConfigObj) {
+function processSuccessResponse(response, timeoutId, reqBidsConfigObj, greenbidsId) {
   clearTimeout(timeoutId);
-  const responseAdUnits = JSON.parse(response);
-
-  updateAdUnitsBasedOnResponse(reqBidsConfigObj.adUnits, responseAdUnits);
+  try {
+    const responseAdUnits = JSON.parse(response);
+    updateAdUnitsBasedOnResponse(reqBidsConfigObj.adUnits, responseAdUnits, greenbidsId);
+  } catch (e) {
+    logWarn('GreenbidsRtdProvider: Greenbids API response parsing error, skipping shaping');
+  }
 }
 
-function updateAdUnitsBasedOnResponse(adUnits, responseAdUnits) {
+function updateAdUnitsBasedOnResponse(adUnits, responseAdUnits, greenbidsId) {
+  const isFilteringForced = getParameterByName('greenbids_force_filtering');
+  const isFilteringDisabled = getParameterByName('greenbids_disable_filtering');
   adUnits.forEach((adUnit) => {
     const matchingAdUnit = findMatchingAdUnit(responseAdUnits, adUnit.code);
     if (matchingAdUnit) {
-      removeFalseBidders(adUnit, matchingAdUnit);
+      deepSetValue(adUnit, 'ortb2Imp.ext.greenbids', {
+        greenbidsId: greenbidsId,
+        keptInAuction: matchingAdUnit.bidders,
+        isExploration: matchingAdUnit.isExploration
+      });
+      if (matchingAdUnit.isExploration || isFilteringDisabled) {
+        logMessage('Greenbids Rtd: either exploration traffic, or disabled filtering flag detected');
+      } else if (isFilteringForced) {
+        adUnit.bids = [];
+        logInfo('Greenbids Rtd: filtering flag detected, forcing filtering of Rtd module.');
+      } else {
+        removeFalseBidders(adUnit, matchingAdUnit);
+      }
     }
   });
 }
@@ -85,14 +121,24 @@ function getFalseBidders(bidders) {
     .map(([bidder]) => bidder);
 }
 
-function createPayload(reqBidsConfigObj) {
+function stripAdUnits(adUnits) {
+  const stripedAdUnits = deepClone(adUnits);
+  return stripedAdUnits.map(adUnit => {
+    adUnit.bids = adUnit.bids.map(bid => {
+      return { bidder: bid.bidder };
+    });
+    return adUnit;
+  });
+}
+
+function createPayload(reqBidsConfigObj, greenbidsId) {
   return JSON.stringify({
-    auctionId: auctionInfo.auctionId,
     version: MODULE_VERSION,
+    ...rtdOptions,
     referrer: window.location.href,
     prebid: '$prebid.version$',
-    rtdOptions: rtdOptions,
-    adUnits: reqBidsConfigObj.adUnits,
+    greenbidsId: greenbidsId,
+    adUnits: stripAdUnits(reqBidsConfigObj.adUnits),
   });
 }
 
@@ -105,6 +151,7 @@ export const greenbidsSubmodule = {
   findMatchingAdUnit: findMatchingAdUnit,
   removeFalseBidders: removeFalseBidders,
   getFalseBidders: getFalseBidders,
+  stripAdUnits: stripAdUnits,
 };
 
 submodule('realTimeData', greenbidsSubmodule);
diff --git a/modules/greenbidsRtdProvider.md b/modules/greenbidsRtdProvider.md
index 85b8f5a7859..ab8105a4537 100644
--- a/modules/greenbidsRtdProvider.md
+++ b/modules/greenbidsRtdProvider.md
@@ -2,6 +2,7 @@
 
 ```
 Module Name: Greenbids RTD Provider
+Module Version: 2.0.0
 Module Type: RTD Provider
 Maintainer: jb@greenbids.ai
 ```
@@ -21,7 +22,6 @@ This module is configured as part of the `realTimeData.dataProviders` object.
 | `waitForIt `     | required (mandatory true value) | Tells prebid auction to wait for the result of this module | `'true'`   | `boolean` |
 | `params`      | required |  | | `Object` |
 | `params.pbuid`      | required | The client site id provided by Greenbids. | `'TEST_FROM_GREENBIDS'` | `string` |
-| `params.targetTPR`      | optional (default 0.95) | Target True positive rate for the throttling model | `0.99` | `[0-1]` |
 | `params.timeout`      | optional (default 200) | Maximum amount of milliseconds allowed for module to finish working (has to be <= to the realTimeData.auctionDelay property) | `200` | `number` |
 
 #### Example
diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index aa00a84273c..4f3dfb94747 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -7,7 +7,8 @@ import {
   mergeDeep,
   logWarn,
   isNumber,
-  isStr
+  isStr,
+  isPlainObject
 } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
@@ -15,10 +16,17 @@ import { Renderer } from '../src/Renderer.js';
 import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { getBidFromResponse } from '../libraries/processResponse/index.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ */
 
 const BIDDER_CODE = 'grid';
 const ENDPOINT_URL = 'https://grid.bidswitch.net/hbjson';
-const USP_DELETE_DATA_HANDLER = 'https://media.grid.bidswitch.net/uspapi_delete'
+const USP_DELETE_DATA_HANDLER = 'https://media.grid.bidswitch.net/uspapi_delete_c2s'
 
 const SYNC_URL = 'https://x.bidswitch.net/sync?ssp=themediagrid';
 const TIME_TO_LIVE = 360;
@@ -268,6 +276,11 @@ export const spec = {
         userExt.device = { ...ortb2UserExtDevice };
       }
 
+      // if present, add device data object from ortb2 to the request
+      if (bidderRequest?.ortb2?.device) {
+        request.device = bidderRequest.ortb2.device;
+      }
+
       if (userIdAsEids && userIdAsEids.length) {
         userExt = userExt || {};
         userExt.eids = [...userIdAsEids];
@@ -355,6 +368,16 @@ export const spec = {
         request.regs.coppa = 1;
       }
 
+      if (ortb2Regs?.ext?.dsa) {
+        if (!request.regs) {
+          request.regs = {ext: {}};
+        }
+        if (!request.regs.ext) {
+          request.regs.ext = {};
+        }
+        request.regs.ext.dsa = ortb2Regs.ext.dsa;
+      }
+
       const site = deepAccess(bidderRequest, 'ortb2.site');
       if (site) {
         const pageCategory = [...(site.cat || []), ...(site.pagecat || [])].filter((category) => {
@@ -425,7 +448,7 @@ export const spec = {
 
     if (!errorMessage && serverResponse.seatbid) {
       serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidRequest, bidResponses, RendererConst, bidderCode);
+        _addBidResponse(getBidFromResponse(respItem, LOG_ERROR_MESS), bidRequest, bidResponses, RendererConst, bidderCode);
       });
     }
     if (errorMessage) logError(errorMessage);
@@ -460,20 +483,12 @@ export const spec = {
   },
 
   ajaxCall: function(url, cb, data, options) {
+    options.browsingTopics = false;
     return ajax(url, cb, data, options);
   },
 
   onDataDeletionRequest: function(data) {
-    const uids = [];
-    const aliases = [spec.code, ...spec.aliases.map((alias) => alias.code || alias)];
-    data.forEach(({ bids }) => bids && bids.forEach(({ bidder, params }) => {
-      if (aliases.includes(bidder) && params && params.uid) {
-        uids.push(params.uid);
-      }
-    }));
-    if (uids.length) {
-      spec.ajaxCall(USP_DELETE_DATA_HANDLER, () => {}, JSON.stringify({ uids }), {contentType: 'application/json', method: 'POST'});
-    }
+    spec.ajaxCall(USP_DELETE_DATA_HANDLER, null, null, {method: 'GET'});
   }
 };
 
@@ -494,7 +509,7 @@ function _getFloor (mediaTypes, bid) {
       size: bid.sizes.map(([w, h]) => ({w, h}))
     });
 
-    if (typeof floorInfo === 'object' &&
+    if (isPlainObject(floorInfo) &&
       floorInfo.currency === 'USD' &&
       !isNaN(parseFloat(floorInfo.floor))) {
       floor = Math.max(floor, parseFloat(floorInfo.floor));
@@ -504,17 +519,6 @@ function _getFloor (mediaTypes, bid) {
   return floor;
 }
 
-function _getBidFromResponse(respItem) {
-  if (!respItem) {
-    logError(LOG_ERROR_MESS.emptySeatbid);
-  } else if (!respItem.bid) {
-    logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
-  } else if (!respItem.bid[0]) {
-    logError(LOG_ERROR_MESS.noBid);
-  }
-  return respItem && respItem.bid && respItem.bid[0];
-}
-
 function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst, bidderCode) {
   if (!serverBid) return;
   let errorMessage;
@@ -534,7 +538,7 @@ function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst, bid
         netRevenue: true,
         ttl: TIME_TO_LIVE,
         meta: {
-          advertiserDomains: serverBid.adomain ? serverBid.adomain : []
+          advertiserDomains: serverBid.adomain ? serverBid.adomain : [],
         },
         dealId: serverBid.dealid
       };
@@ -546,6 +550,10 @@ function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst, bid
         bidResponse.meta.demandSource = serverBid.ext.bidder.grid.demandSource;
       }
 
+      if (serverBid.ext && serverBid.ext.dsa) {
+        bidResponse.meta.dsa = serverBid.ext.dsa;
+      }
+
       if (serverBid.content_type === 'video') {
         if (serverBid.adm) {
           bidResponse.vastXml = serverBid.adm;
diff --git a/modules/growthCodeAnalyticsAdapter.js b/modules/growthCodeAnalyticsAdapter.js
index 5c7cc254f1d..0b1f343e4dc 100644
--- a/modules/growthCodeAnalyticsAdapter.js
+++ b/modules/growthCodeAnalyticsAdapter.js
@@ -5,7 +5,7 @@ import { ajax } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import * as utils from '../src/utils.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {logError, logInfo} from '../src/utils.js';
@@ -31,74 +31,74 @@ let analyticsType = 'endpoint';
 
 let growthCodeAnalyticsAdapter = Object.assign(adapter({url: url, analyticsType}), {
   track({eventType, args}) {
-    let eventData = args ? JSON.parse(JSON.stringify(args)) : {};
+    let eventData = args ? utils.deepClone(args) : {};
     let data = {};
     if (!trackEvents.includes(eventType)) return;
     switch (eventType) {
-      case CONSTANTS.EVENTS.AUCTION_INIT: {
+      case EVENTS.AUCTION_INIT: {
         data = eventData;
         startAuction = data.timestamp;
         bidRequestTimeout = data.timeout;
         break;
       }
 
-      case CONSTANTS.EVENTS.AUCTION_END: {
+      case EVENTS.AUCTION_END: {
         data = eventData;
         data.start = startAuction;
         data.end = Date.now();
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_ADJUSTMENT: {
+      case EVENTS.BID_ADJUSTMENT: {
         data.bidders = eventData;
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_TIMEOUT: {
+      case EVENTS.BID_TIMEOUT: {
         data.bidders = eventData;
         data.duration = bidRequestTimeout;
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_REQUESTED: {
+      case EVENTS.BID_REQUESTED: {
         data = eventData;
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_RESPONSE: {
+      case EVENTS.BID_RESPONSE: {
         data = eventData;
         delete data.ad;
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_WON: {
+      case EVENTS.BID_WON: {
         data = eventData;
         delete data.ad;
         delete data.adUrl;
         break;
       }
 
-      case CONSTANTS.EVENTS.BIDDER_DONE: {
+      case EVENTS.BIDDER_DONE: {
         data = eventData;
         break;
       }
 
-      case CONSTANTS.EVENTS.SET_TARGETING: {
+      case EVENTS.SET_TARGETING: {
         data.targetings = eventData;
         break;
       }
 
-      case CONSTANTS.EVENTS.REQUEST_BIDS: {
+      case EVENTS.REQUEST_BIDS: {
         data = eventData;
         break;
       }
 
-      case CONSTANTS.EVENTS.ADD_AD_UNITS: {
+      case EVENTS.ADD_AD_UNITS: {
         data = eventData;
         break;
       }
 
-      case CONSTANTS.EVENTS.NO_BID: {
+      case EVENTS.NO_BID: {
         data = eventData
         break;
       }
@@ -140,7 +140,7 @@ function logToServer() {
   if (pid === DEFAULT_PID) return;
   if (eventQueue.length >= 1) {
     // Get the correct GCID
-    let gcid = localStorage.getItem('gcid')
+    let gcid = storage.getDataFromLocalStorage('gcid');
 
     let data = {
       session: sessionId,
@@ -170,7 +170,7 @@ function sendEvent(event) {
   eventQueue.push(event);
   logInfo(MODULE_NAME + 'Analytics Event: ' + event);
 
-  if ((event.eventType === CONSTANTS.EVENTS.AUCTION_END) || (event.eventType === CONSTANTS.EVENTS.BID_WON)) {
+  if ((event.eventType === EVENTS.AUCTION_END) || (event.eventType === EVENTS.BID_WON)) {
     logToServer();
   }
 }
diff --git a/modules/growthCodeIdSystem.js b/modules/growthCodeIdSystem.js
index e50a4e73019..be20ab89130 100644
--- a/modules/growthCodeIdSystem.js
+++ b/modules/growthCodeIdSystem.js
@@ -5,81 +5,20 @@
  * @requires module:modules/userId
  */
 
-import {logError, logInfo, pick} from '../src/utils.js';
-import {ajax} from '../src/ajax.js';
 import { submodule } from '../src/hook.js'
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
-import {tryAppendQueryString} from '../libraries/urlUtils/urlUtils.js';
-
-const MODULE_NAME = 'growthCodeId';
-const GC_DATA_KEY = '_gc_data';
-const GCID_KEY = 'gcid';
-const ENDPOINT_URL = 'https://p2.gcprivacy.com/v1/pb?'
-
-export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME });
 
 /**
- * Read GrowthCode data from cookie or local storage
- * @param key
- * @return {string}
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
  */
-export function readData(key) {
-  try {
-    let payload
-    if (storage.cookiesAreEnabled(null)) {
-      payload = tryParse(storage.getCookie(key, null))
-    }
-    if (storage.hasLocalStorage()) {
-      payload = tryParse(storage.getDataFromLocalStorage(key, null))
-    }
-    if (payload !== undefined) {
-      if (payload.expire_at > (Date.now() / 1000)) {
-        return payload
-      }
-    }
-  } catch (error) {
-    logError(error);
-  }
-}
-
-/**
- * Store GrowthCode data in either cookie or local storage
- * expiration date: 45 days
- * @param key
- * @param {string} value
- */
-function storeData(key, value) {
-  try {
-    logInfo(MODULE_NAME + ': storing data: key=' + key + ' value=' + value);
 
-    if (value) {
-      if (storage.hasLocalStorage(null)) {
-        storage.setDataInLocalStorage(key, value, null);
-      }
-    }
-  } catch (error) {
-    logError(error);
-  }
-}
+const MODULE_NAME = 'growthCodeId';
+const GCID_KEY = 'gcid';
 
-/**
- * Parse json if possible, else return null
- * @param data
- * @param {object|null}
- */
-function tryParse(data) {
-  let payload;
-  try {
-    payload = JSON.parse(data);
-    if (payload == null) {
-      return undefined
-    }
-    return payload
-  } catch (err) {
-    return undefined;
-  }
-}
+export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME });
 
 /** @type {Submodule} */
 export const growthCodeIdSubmodule = {
@@ -97,96 +36,40 @@ export const growthCodeIdSubmodule = {
   decode(value) {
     return value && value !== '' ? { 'growthCodeId': value } : undefined;
   },
+
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function
    * @param {SubmoduleConfig} [config]
    * @returns {IdResponse|undefined}
    */
-  getId(config, consentData) {
+  getId(config) {
     const configParams = (config && config.params) || {};
-    if (!configParams || typeof configParams.pid !== 'string') {
-      logError('User ID - GrowthCodeID submodule requires a valid Partner ID to be defined');
-      return;
-    }
 
-    const gdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
-    const consentString = gdpr ? consentData.consentString : '';
-    if (gdpr && !consentString) {
-      logInfo('Consent string is required to call GrowthCode id.');
-      return;
-    }
+    let ids = [];
+    let gcid = storage.getDataFromLocalStorage(GCID_KEY, null)
 
-    let publisherId = configParams.publisher_id ? configParams.publisher_id : '_sharedID';
+    if (gcid !== null) {
+      const gcEid = {
+        source: 'growthcode.io',
+        uids: [{
+          id: gcid,
+          atype: 3,
+        }]
+      }
 
-    let sharedId;
-    if (configParams.publisher_id_storage === 'html5') {
-      sharedId = storage.getDataFromLocalStorage(publisherId, null) ? (storage.getDataFromLocalStorage(publisherId, null)) : null;
-    } else {
-      sharedId = storage.getCookie(publisherId, null) ? (storage.getCookie(publisherId, null)) : null;
-    }
-    if (!sharedId) {
-      logError('User ID - Publisher ID is not correctly setup.');
+      ids = ids.concat(gcEid)
     }
 
-    const resp = function(callback) {
-      let gcData = readData(GC_DATA_KEY);
-      if (gcData) {
-        callback(gcData);
-      } else {
-        let segment = window.location.pathname.substr(1).replace(/\/+$/, '');
-        if (segment === '') {
-          segment = 'home';
-        }
-
-        let url = configParams.url ? configParams.url : ENDPOINT_URL;
-        url = tryAppendQueryString(url, 'pid', configParams.pid);
-        url = tryAppendQueryString(url, 'uid', sharedId);
-        url = tryAppendQueryString(url, 'u', window.location.href);
-        url = tryAppendQueryString(url, 'h', window.location.hostname);
-        url = tryAppendQueryString(url, 's', segment);
-        url = tryAppendQueryString(url, 'r', document.referrer);
+    let additionalEids = storage.getDataFromLocalStorage(configParams.customerEids, null)
+    if (additionalEids !== null) {
+      let data = JSON.parse(additionalEids)
+      ids = ids.concat(data)
+    }
 
-        ajax(url, {
-          success: response => {
-            let respJson = tryParse(response);
-            // If response is a valid json and should save is true
-            if (respJson) {
-              storeData(GC_DATA_KEY, JSON.stringify(respJson))
-              storeData(GCID_KEY, respJson.gc_id);
-              callback(respJson);
-            } else {
-              callback();
-            }
-          },
-          error: error => {
-            logError(MODULE_NAME + ': ID fetch encountered an error', error);
-            callback();
-          }
-        }, undefined, {method: 'GET', withCredentials: true})
-      }
-    };
-    return { callback: resp };
+    return {id: ids}
   },
-  eids: {
-    'growthCodeId': {
-      getValue: function(data) {
-        return data.gc_id
-      },
-      source: 'growthcode.io',
-      atype: 1,
-      getUidExt: function(data) {
-        const extendedData = pick(data, [
-          'h1',
-          'h2',
-          'h3',
-        ]);
-        if (Object.keys(extendedData).length) {
-          return extendedData;
-        }
-      }
-    },
-  }
+
 };
 
 submodule('userId', growthCodeIdSubmodule);
diff --git a/modules/growthCodeIdSystem.md b/modules/growthCodeIdSystem.md
index f804686a7a9..de5344e966b 100644
--- a/modules/growthCodeIdSystem.md
+++ b/modules/growthCodeIdSystem.md
@@ -18,20 +18,38 @@ pbjs.setConfig({
     userIds: [{
       name: 'growthCodeId',
       params: {
-          pid: 'TEST01', // Set your Partner ID here for production (obtained from Growthcode)
-          publisher_id: '_sharedID',
-          publisher_id_storage: 'html5'
+          customerEids: 'customerEids', 
       }
     }]
   }
 });
 ```
 
-| Param under userSync.userIds[] | Scope    | Type   | Description | Example         |
-|--------------------------------|----------|--------| --- |-----------------|
-| name                           | Required | String | The name of this module. | `"growthCodeId"` |
-| params                         | Required | Object | Details of module params. |                 |
-| params.pid                     | Required | String | This is the Parter ID value obtained from GrowthCode | `"TEST01"`        |
-| params.url | Optional | String | Custom URL for server | |
-| params.publisher_id | Optional | String | Name if the variable that holds your publisher ID | `"_sharedID"` |
-| params.publisher_id_storage | Optional | String | Publisher ID storage (cookie, html5) | `"html5"` |
+### Sample Eids
+Below is an example of the EIDs stored in Local Store (customerEids)
+```json
+[
+   {
+      "source":"domain.com",
+      "uids":[
+         {
+            "id":"8212212191539393121",
+            "ext":{
+               "stype":"ppuid"
+            }
+         }
+      ]
+   },
+   {
+      "source":"example.com",
+      "uids":[
+         {
+            "id":"e06e9e5a-273c-46f8-aace-6f62cf13ea71",
+            "ext":{
+               "stype":"ppuid"
+            }
+         }
+      ]
+   }
+]
+```
diff --git a/modules/growthCodeRtdProvider.js b/modules/growthCodeRtdProvider.js
index ef5c7906ad7..a8893b9648e 100644
--- a/modules/growthCodeRtdProvider.js
+++ b/modules/growthCodeRtdProvider.js
@@ -60,7 +60,11 @@ function init(config, userConsent) {
 
   items = tryParse(storage.getDataFromLocalStorage(RTD_CACHE_KEY, null));
 
-  return callServer(configParams, items, expiresAt, userConsent);
+  if (configParams.pid === undefined) {
+    return true; // Die gracefully
+  } else {
+    return callServer(configParams, items, expiresAt, userConsent);
+  }
 }
 function callServer(configParams, items, expiresAt, userConsent) {
   // Expire Cache
@@ -71,14 +75,14 @@ function callServer(configParams, items, expiresAt, userConsent) {
     storage.removeDataFromLocalStorage(RTD_EXPIRE_KEY, null)
   }
   if ((items === null) && (isNaN(expiresAt))) {
-    let gcid = localStorage.getItem('gcid')
+    let gcid = storage.getDataFromLocalStorage('gcid')
 
     let url = configParams.url ? configParams.url : ENDPOINT_URL;
     url = tryAppendQueryString(url, 'pid', configParams.pid);
     url = tryAppendQueryString(url, 'u', window.location.href);
     url = tryAppendQueryString(url, 'gcid', gcid);
-    if ((userConsent !== null) && (userConsent.gdpr !== null) && (userConsent.gdpr.consentData.getTCData.tcString)) {
-      url = tryAppendQueryString(url, 'tcf', userConsent.gdpr.consentData.getTCData.tcString)
+    if ((userConsent !== null) && (userConsent.gdpr !== null) && (userConsent.gdpr.consentString)) {
+      url = tryAppendQueryString(url, 'tcf', userConsent.gdpr.consentString)
     }
 
     ajax.ajaxBuilder()(url, {
diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
index d050af4ac8f..2911522c89b 100644
--- a/modules/gumgumBidAdapter.js
+++ b/modules/gumgumBidAdapter.js
@@ -6,6 +6,15 @@ import {getStorageManager} from '../src/storageManager.js';
 import {includes} from '../src/polyfill.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'gumgum';
 const storage = getStorageManager({bidderCode: BIDDER_CODE});
 const ALIAS_BIDDER_CODE = ['gg'];
@@ -14,18 +23,20 @@ const JCSI = { t: 0, rq: 8, pbv: '$prebid.version$' }
 const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
 const TIME_TO_LIVE = 60;
 const DELAY_REQUEST_TIME = 1800000; // setting to 30 mins
+const pubProvidedIdSources = ['dac.co.jp', 'audigent.com', 'id5-sync.com', 'liveramp.com', 'intentiq.com', 'liveintent.com', 'crwdcntrl.net', 'quantcast.com', 'adserver.org', 'yahoo.com']
 
 let invalidRequestIds = {};
 let pageViewId = null;
 
 // TODO: potential 0 values for browserParams sent to ad server
-function _getBrowserParams(topWindowUrl) {
+function _getBrowserParams(topWindowUrl, mosttopLocation) {
   const paramRegex = paramName => new RegExp(`[?#&](${paramName}=(.*?))($|&)`, 'i');
 
   let browserParams = {};
   let topWindow;
   let topScreen;
   let topUrl;
+  let mosttopURL
   let ggad;
   let ggdeal;
   let ns;
@@ -64,6 +75,7 @@ function _getBrowserParams(topWindowUrl) {
     topWindow = global.top;
     topScreen = topWindow.screen;
     topUrl = topWindowUrl || '';
+    mosttopURL = mosttopLocation || '';
   } catch (error) {
     logError(error);
     return browserParams;
@@ -75,6 +87,7 @@ function _getBrowserParams(topWindowUrl) {
     sw: topScreen.width,
     sh: topScreen.height,
     pu: stripGGParams(topUrl),
+    tpl: mosttopURL,
     ce: storage.cookiesAreEnabled(),
     dpr: topWindow.devicePixelRatio || 1,
     jcsi: JSON.stringify(JCSI),
@@ -175,6 +188,7 @@ function _getVidParams(attributes) {
     linearity: li,
     startdelay: sd,
     placement: pt,
+    plcmt,
     protocols = [],
     playerSize = []
   } = attributes;
@@ -186,7 +200,7 @@ function _getVidParams(attributes) {
     pr = protocols.join(',');
   }
 
-  return {
+  const result = {
     mind,
     maxd,
     li,
@@ -196,14 +210,20 @@ function _getVidParams(attributes) {
     viw,
     vih
   };
+    // Add vplcmt property to the result object if plcmt is available
+  if (plcmt !== undefined && plcmt !== null) {
+    result.vplcmt = plcmt;
+  }
+  return result;
 }
 
 /**
- * Gets bidfloor
- * @param {Object} mediaTypes
- * @param {Number} bidfloor
- * @param {Object} bid
- * @returns {Number} floor
+ * Retrieves the bid floor value, which is the minimum acceptable bid for an ad unit.
+ * This function calculates the bid floor based on the given media types and other bidding parameters.
+ * @param {Object} mediaTypes - The media types specified for the bid, which might influence floor calculations.
+ * @param {number} staticBidFloor - The default or static bid floor set for the bid.
+ * @param {Object} bid - The bid object which may contain a method to get dynamic floor values.
+ * @returns {Object} An object containing the calculated bid floor and its currency.
  */
 function _getFloor(mediaTypes, staticBidFloor, bid) {
   const curMediaType = Object.keys(mediaTypes)[0] || 'banner';
@@ -213,7 +233,7 @@ function _getFloor(mediaTypes, staticBidFloor, bid) {
     const { currency, floor } = bid.getFloor({
       mediaType: curMediaType,
       size: '*'
-    });
+    }) || {};
     floor && (bidFloor.floor = floor);
     currency && (bidFloor.currency = currency);
 
@@ -227,6 +247,41 @@ function _getFloor(mediaTypes, staticBidFloor, bid) {
   return bidFloor;
 }
 
+/**
+ * Retrieves the device data from the ORTB2 object
+ * @param {Object} ortb2Data ORTB2 object
+ * @returns {Object} Device data
+ */
+function _getDeviceData(ortb2Data) {
+  const _device = deepAccess(ortb2Data, 'device') || {};
+
+  // set device data params from ortb2
+  const _deviceRequestParams = {
+    ip: _device.ip,
+    ipv6: _device.ipv6,
+    ua: _device.ua,
+    dnt: _device.dnt,
+    os: _device.os,
+    osv: _device.osv,
+    dt: _device.devicetype,
+    lang: _device.language,
+    make: _device.make,
+    model: _device.model,
+    ppi: _device.ppi,
+    pxratio: _device.pxratio,
+    foddid: _device?.ext?.fiftyonedegrees_deviceId,
+  };
+
+  // return device data params with only non-empty values
+  return Object.keys(_deviceRequestParams)
+    .reduce((r, key) => {
+      if (_deviceRequestParams[key] !== undefined) {
+        r[key] = _deviceRequestParams[key];
+      }
+      return r;
+    }, {});
+}
+
 /**
  * loops through bannerSizes array to get greatest slot dimensions
  * @param {number[][]} sizes
@@ -274,10 +329,10 @@ function getEids(userId) {
 }
 
 /**
- * Make a server request from the list of BidRequests.
- *
- * @param {validBidRequests[]} - an array of bids
- * @return ServerRequest Info describing the request to the server.
+ * Builds requests for bids.
+ * @param {validBidRequests[]} validBidRequests - An array of valid bid requests.
+ * @param {Object} bidderRequest - The bidder's request information.
+ * @returns {Object[]} An array of server requests.
  */
 function buildRequests(validBidRequests, bidderRequest) {
   const bids = [];
@@ -287,6 +342,7 @@ function buildRequests(validBidRequests, bidderRequest) {
   const timeout = bidderRequest && bidderRequest.timeout
   const coppa = config.getConfig('coppa') === true ? 1 : 0;
   const topWindowUrl = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+  const mosttopLocation = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.topmostLocation
   _each(validBidRequests, bidRequest => {
     const {
       bidId,
@@ -299,10 +355,12 @@ function buildRequests(validBidRequests, bidderRequest) {
     } = bidRequest;
     const { currency, floor } = _getFloor(mediaTypes, params.bidfloor, bidRequest);
     const eids = getEids(userId);
-    const gpid = deepAccess(ortb2Imp, 'ext.data.pbadslot') || deepAccess(ortb2Imp, 'ext.data.adserver.adslot');
+    const gpid = deepAccess(ortb2Imp, 'ext.gpid') || deepAccess(ortb2Imp, 'ext.data.pbadslot');
+    const paapiEligible = deepAccess(ortb2Imp, 'ext.ae') === 1
     let sizes = [1, 1];
     let data = {};
-
+    data.displaymanager = 'Prebid.js - gumgum';
+    data.displaymanagerver = '$prebid.version$';
     const date = new Date();
     const lt = date.getTime();
     const to = date.getTimezoneOffset();
@@ -310,7 +368,23 @@ function buildRequests(validBidRequests, bidderRequest) {
     // ADTS-174 Removed unnecessary checks to fix failing test
     data.lt = lt;
     data.to = to;
-
+    function jsoStringifynWithMaxLength(data, maxLength) {
+      let jsonString = JSON.stringify(data);
+      if (jsonString.length <= maxLength) {
+        return jsonString;
+      } else {
+        const truncatedData = data.slice(0, Math.floor(data.length * (maxLength / jsonString.length)));
+        jsonString = JSON.stringify(truncatedData);
+        return jsonString;
+      }
+    }
+    // Send filtered pubProvidedId's
+    if (userId && userId.pubProvidedId) {
+      let filteredData = userId.pubProvidedId.filter(item => pubProvidedIdSources.includes(item.source));
+      let maxLength = 1800; // replace this with your desired maximum length
+      let truncatedJsonString = jsoStringifynWithMaxLength(filteredData, maxLength);
+      data.pubProvidedId = truncatedJsonString
+    }
     // ADJS-1286 Read id5 id linktype field
     if (userId && userId.id5id && userId.id5id.uid && userId.id5id.ext) {
       data.id5Id = userId.id5id.uid || null
@@ -322,9 +396,6 @@ function buildRequests(validBidRequests, bidderRequest) {
     // ADTS-134 Retrieve ID envelopes
     for (const eid in eids) data[eid] = eids[eid];
 
-    // ADJS-1024 & ADSS-1297 & ADTS-175
-    gpid && (data.gpid = gpid);
-
     if (mediaTypes.banner) {
       sizes = mediaTypes.banner.sizes;
     } else if (mediaTypes.video) {
@@ -332,6 +403,9 @@ function buildRequests(validBidRequests, bidderRequest) {
       data = _getVidParams(mediaTypes.video);
     }
 
+    // ADJS-1024 & ADSS-1297 & ADTS-175
+    gpid && (data.gpid = gpid);
+
     if (pageViewId) {
       data.pv = pageViewId;
     }
@@ -340,15 +414,12 @@ function buildRequests(validBidRequests, bidderRequest) {
       data.fp = floor;
       data.fpc = currency;
     }
-
+    if (bidderRequest && bidderRequest.ortb2 && bidderRequest.ortb2.site) {
+      setIrisId(data, bidderRequest.ortb2.site, params);
+    }
     if (params.iriscat && typeof params.iriscat === 'string') {
       data.iriscat = params.iriscat;
     }
-
-    if (params.irisid && typeof params.irisid === 'string') {
-      data.irisid = params.irisid;
-    }
-
     if (params.zone || params.pubId) {
       params.zone ? (data.t = params.zone) : (data.pubId = params.pubId);
 
@@ -372,7 +443,9 @@ function buildRequests(validBidRequests, bidderRequest) {
     } else { // legacy params
       data = { ...data, ...handleLegacyParams(params, sizes) };
     }
-
+    if (paapiEligible) {
+      data.ae = paapiEligible
+    }
     if (gdprConsent) {
       data.gdprApplies = gdprConsent.gdprApplies ? 1 : 0;
     }
@@ -383,15 +456,15 @@ function buildRequests(validBidRequests, bidderRequest) {
       data.uspConsent = uspConsent;
     }
     if (gppConsent) {
-      data.gppConsent = {
-        gppString: bidderRequest.gppConsent.gppString,
-        gpp_sid: bidderRequest.gppConsent.applicableSections
-      }
+      data.gppString = bidderRequest.gppConsent.gppString ? bidderRequest.gppConsent.gppString : ''
+      data.gppSid = Array.isArray(bidderRequest.gppConsent.applicableSections) ? bidderRequest.gppConsent.applicableSections.join(',') : ''
     } else if (!gppConsent && bidderRequest?.ortb2?.regs?.gpp) {
-      data.gppConsent = {
-        gppString: bidderRequest.ortb2.regs.gpp,
-        gpp_sid: bidderRequest.ortb2.regs.gpp_sid
-      };
+      data.gppString = bidderRequest.ortb2.regs.gpp
+      data.gppSid = Array.isArray(bidderRequest.ortb2.regs.gpp_sid) ? bidderRequest.ortb2.regs.gpp_sid.join(',') : ''
+    }
+    const dsa = deepAccess(bidderRequest, 'ortb2.regs.ext.dsa');
+    if (dsa) {
+      data.dsa = JSON.stringify(dsa)
     }
     if (coppa) {
       data.coppa = coppa;
@@ -399,6 +472,11 @@ function buildRequests(validBidRequests, bidderRequest) {
     if (schain && schain.nodes) {
       data.schain = _serializeSupplyChainObj(schain);
     }
+    Object.assign(
+      data,
+      _getBrowserParams(topWindowUrl, mosttopLocation),
+      _getDeviceData(bidderRequest?.ortb2),
+    );
 
     bids.push({
       id: bidId,
@@ -409,11 +487,32 @@ function buildRequests(validBidRequests, bidderRequest) {
       sizes,
       url: BID_ENDPOINT,
       method: 'GET',
-      data: Object.assign(data, _getBrowserParams(topWindowUrl))
+      data
     });
   });
   return bids;
 }
+export function getCids(site) {
+  if (site.content && Array.isArray(site.content.data)) {
+    for (const dataItem of site.content.data) {
+      if (dataItem.name.includes('iris.com') || dataItem.name.includes('iris.tv')) {
+        return dataItem.ext.cids.join(',');
+      }
+    }
+  }
+  return null;
+}
+export function setIrisId(data, site, params) {
+  let irisID = getCids(site);
+  if (irisID) {
+    data.irisid = irisID;
+  } else {
+    // Just adding this chechk for safty and if needed  we can remove
+    if (params.irisid && typeof params.irisid === 'string') {
+      data.irisid = params.irisid;
+    }
+  }
+}
 
 function handleLegacyParams(params, sizes) {
   const data = {};
@@ -520,15 +619,15 @@ function interpretResponse(serverResponse, bidRequest) {
     mediaType: type || mediaType
   };
   let sizes = parseSizesInput(bidRequest.sizes);
-
   if (maxw && maxh) {
     sizes = [`${maxw}x${maxh}`];
   } else if (product === 5 && includes(sizes, '1x1')) {
     sizes = ['1x1'];
-  } else if (product === 2 && includes(sizes, '1x1')) {
+  // added logic for in-slot multi-szie
+  } else if ((product === 2 && includes(sizes, '1x1')) || product === 3) {
     const requestSizesThatMatchResponse = (bidRequest.sizes && bidRequest.sizes.reduce((result, current) => {
       const [ width, height ] = current;
-      if (responseWidth === width || responseHeight === height) result.push(current.join('x'));
+      if (responseWidth === width && responseHeight === height) result.push(current.join('x'));
       return result
     }, [])) || [];
     sizes = requestSizesThatMatchResponse.length ? requestSizesThatMatchResponse : parseSizesInput(bidRequest.sizes)
diff --git a/modules/hadronAnalyticsAdapter.js b/modules/hadronAnalyticsAdapter.js
index e4c09c5b6c9..95a1dfaa5e2 100644
--- a/modules/hadronAnalyticsAdapter.js
+++ b/modules/hadronAnalyticsAdapter.js
@@ -2,7 +2,7 @@ import { ajax } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import * as utils from '../src/utils.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
@@ -53,74 +53,74 @@ let analyticsType = 'endpoint';
 
 let hadronAnalyticsAdapter = Object.assign(adapter({url: HADRON_ANALYTICS_URL, analyticsType}), {
   track({eventType, args}) {
-    args = args ? JSON.parse(JSON.stringify(args)) : {};
+    args = args ? utils.deepClone(args) : {};
     var data = {};
     if (!eventsToTrack.includes(eventType)) return;
     switch (eventType) {
-      case CONSTANTS.EVENTS.AUCTION_INIT: {
+      case EVENTS.AUCTION_INIT: {
         data = args;
         startAuction = data.timestamp;
         bidRequestTimeout = data.timeout;
         break;
       }
 
-      case CONSTANTS.EVENTS.AUCTION_END: {
+      case EVENTS.AUCTION_END: {
         data = args;
         data.start = startAuction;
         data.end = Date.now();
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_ADJUSTMENT: {
+      case EVENTS.BID_ADJUSTMENT: {
         data.bidders = args;
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_TIMEOUT: {
+      case EVENTS.BID_TIMEOUT: {
         data.bidders = args;
         data.duration = bidRequestTimeout;
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_REQUESTED: {
+      case EVENTS.BID_REQUESTED: {
         data = args;
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_RESPONSE: {
+      case EVENTS.BID_RESPONSE: {
         data = args;
         delete data.ad;
         break;
       }
 
-      case CONSTANTS.EVENTS.BID_WON: {
+      case EVENTS.BID_WON: {
         data = args;
         delete data.ad;
         delete data.adUrl;
         break;
       }
 
-      case CONSTANTS.EVENTS.BIDDER_DONE: {
+      case EVENTS.BIDDER_DONE: {
         data = args;
         break;
       }
 
-      case CONSTANTS.EVENTS.SET_TARGETING: {
+      case EVENTS.SET_TARGETING: {
         data.targetings = args;
         break;
       }
 
-      case CONSTANTS.EVENTS.REQUEST_BIDS: {
+      case EVENTS.REQUEST_BIDS: {
         data = args;
         break;
       }
 
-      case CONSTANTS.EVENTS.ADD_AD_UNITS: {
+      case EVENTS.ADD_AD_UNITS: {
         data = args;
         break;
       }
 
-      case CONSTANTS.EVENTS.AD_RENDER_FAILED: {
+      case EVENTS.AD_RENDER_FAILED: {
         data = args;
         break;
       }
@@ -186,7 +186,7 @@ function sendEvent(event) {
   eventQueue.push(event);
   utils.logInfo(`HADRON_ANALYTICS_EVENT ${event.eventType} `, event);
 
-  if (event.eventType === CONSTANTS.EVENTS.AUCTION_END) {
+  if (event.eventType === EVENTS.AUCTION_END) {
     flush();
   }
 }
diff --git a/modules/hadronIdSystem.js b/modules/hadronIdSystem.js
index c60f0f812a4..ccd63bc0184 100644
--- a/modules/hadronIdSystem.js
+++ b/modules/hadronIdSystem.js
@@ -9,14 +9,23 @@ import {ajax} from '../src/ajax.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {submodule} from '../src/hook.js';
 import {isFn, isStr, isPlainObject, logError, logInfo} from '../src/utils.js';
+import { config } from '../src/config.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
+import { gdprDataHandler, uspDataHandler, gppDataHandler } from '../src/adapterManager.js';
 
-const HADRONID_LOCAL_NAME = 'auHadronId';
-const MODULE_NAME = 'hadronId';
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
+export const MODULE_NAME = 'hadronId';
+const LOG_PREFIX = `[${MODULE_NAME}System]`;
+export const LS_TAM_KEY = 'auHadronId';
 const AU_GVLID = 561;
 const DEFAULT_HADRON_URL_ENDPOINT = 'https://id.hadron.ad.gt/api/v1/pbhid';
 
-export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: 'hadron'});
+export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
 
 /**
  * Param or default.
@@ -42,6 +51,8 @@ const urlAddParams = (url, params) => {
   return url + (url.indexOf('?') > -1 ? '&' : '?') + params
 }
 
+const isDebug = config.getConfig('debug') || false;
+
 /** @type {Submodule} */
 export const hadronIdSubmodule = {
   /**
@@ -57,11 +68,9 @@ export const hadronIdSubmodule = {
    * @returns {Object}
    */
   decode(value) {
-    const hadronId = storage.getDataFromLocalStorage(HADRONID_LOCAL_NAME);
-    if (isStr(hadronId)) {
-      return {hadronId: hadronId};
+    return {
+      hadronId: isStr(value) ? value : value.hasOwnProperty('id') ? value.id[MODULE_NAME] : value[MODULE_NAME]
     }
-    return (value && typeof value['hadronId'] === 'string') ? {'hadronId': value['hadronId']} : undefined;
   },
   /**
    * performs action to obtain id and return a value in the callback's response argument
@@ -70,14 +79,19 @@ export const hadronIdSubmodule = {
    * @returns {IdResponse|undefined}
    */
   getId(config) {
+    logInfo(LOG_PREFIX, `getId is called`, config);
     if (!isPlainObject(config.params)) {
       config.params = {};
     }
-    const partnerId = config.params.partnerId | 0;
-    let hadronId = storage.getDataFromLocalStorage(HADRONID_LOCAL_NAME);
-    if (isStr(hadronId)) {
-      return {id: {hadronId}};
+    let hadronId = '';
+    // at this point hadronId was not found by prebid, let check if it is in the webpage by other ways
+    hadronId = storage.getDataFromLocalStorage(LS_TAM_KEY);
+    if (isStr(hadronId) && hadronId.length > 0) {
+      logInfo(LOG_PREFIX, `${LS_TAM_KEY} found in localStorage = ${hadronId}`)
+      // return {callback: function(cb) { cb(hadronId) }};
+      return {id: hadronId}
     }
+    const partnerId = config.params.partnerId | 0;
     const resp = function (callback) {
       let responseObj = {};
       const callbacks = {
@@ -87,11 +101,13 @@ export const hadronIdSubmodule = {
               responseObj = JSON.parse(response);
             } catch (error) {
               logError(error);
+              callback();
             }
-            logInfo(`Response from backend is ${responseObj}`);
-            hadronId = responseObj['hadronId'];
-            storage.setDataInLocalStorage(HADRONID_LOCAL_NAME, hadronId);
-            responseObj = {id: {hadronId}};
+            logInfo(LOG_PREFIX, `Response from backend is ${response}`, responseObj);
+            if (isPlainObject(responseObj) && responseObj.hasOwnProperty(MODULE_NAME)) {
+              hadronId = responseObj[MODULE_NAME];
+            }
+            responseObj = hadronId; // {id: {hadronId: hadronId}};
           }
           callback(responseObj);
         },
@@ -100,13 +116,34 @@ export const hadronIdSubmodule = {
           callback();
         }
       };
-      logInfo('HadronId not found in storage, calling backend...');
-      const url = urlAddParams(
+      let url = urlAddParams(
         // config.params.url and config.params.urlArg are not documented
         // since their use is for debugging purposes only
         paramOrDefault(config.params.url, DEFAULT_HADRON_URL_ENDPOINT, config.params.urlArg),
-        `partner_id=${partnerId}&_it=prebid`
+        `partner_id=${partnerId}&_it=prebid&t=1&src=id&domain=${document.location.hostname}` // src=id => the backend was called from getId
       );
+      if (isDebug) {
+        url += '&debug=1'
+      }
+      const gdprConsent = gdprDataHandler.getConsentData()
+      if (gdprConsent) {
+        url += `${gdprConsent.consentString ? '&gdprString=' + encodeURIComponent(gdprConsent.consentString) : ''}`;
+        url += `&gdpr=${gdprConsent.gdprApplies === true ? 1 : 0}`;
+      }
+
+      const usPrivacyString = uspDataHandler.getConsentData();
+      if (usPrivacyString) {
+        url += `&us_privacy=${encodeURIComponent(usPrivacyString)}`;
+      }
+
+      const gppConsent = gppDataHandler.getConsentData();
+      if (gppConsent) {
+        url += `${gppConsent.gppString ? '&gpp=' + encodeURIComponent(gppConsent.gppString) : ''}`;
+        url += `${gppConsent.applicableSections ? '&gpp_sid=' + encodeURIComponent(gppConsent.applicableSections) : ''}`;
+      }
+
+      logInfo(LOG_PREFIX, `${MODULE_NAME} not found, calling home (${url})`);
+
       ajax(url, callbacks, undefined, {method: 'GET'});
     };
     return {callback: resp};
diff --git a/modules/hadronIdSystem.md b/modules/hadronIdSystem.md
index 212030cbcd9..f58cd46ef61 100644
--- a/modules/hadronIdSystem.md
+++ b/modules/hadronIdSystem.md
@@ -12,7 +12,7 @@ pbjs.setConfig({
         userIds: [{
             name: 'hadronId',
             params: {
-                partnerId: 1234   // change it to the Partner ID you'll get from Audigent
+                partnerId: 1234   // change it to the Partner ID you got from Audigent
             },
             storage: {
                 name: 'hadronId',
@@ -25,14 +25,13 @@ pbjs.setConfig({
 ## Parameter Descriptions for the `usersync` Configuration Section
 The below parameters apply only to the HadronID User ID Module integration.
 
-| Param under usersync.userIds[] | Scope    | Type    | Description                                                                                                                                                                                                                 | Example                                                |
-|--------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------|
-| name                           | Required | String  | ID value for the HadronID module - `"hadronId"`                                                                                                                                                                             | `"hadronId"`                                           |
-| storage                        | Required | Object  | The publisher must specify the local storage in which to store the results of the call to get the user ID. This can be either cookie or HTML5 storage.                                                                      |                                                        |
-| storage.type                   | Required | String  | This is where the results of the user ID will be stored. The recommended method is `localStorage` by specifying `html5`.                                                                                                    | `"html5"`                                              |
-| storage.name                   | Required | String  | The name of the cookie or html5 local storage where the user ID will be stored.                                                                                                                                             | `"hadronid"`                                           |
-| storage.expires                | Optional | Integer | How long (in days) the user ID information will be stored.                                                                                                                                                                  | `365`                                                  |
-| value                          | Optional | Object  | Used only if the page has a separate mechanism for storing the Hadron ID. The value is an object containing the values to be sent to the adapters. In this scenario, no URL is called and nothing is added to local storage | `{"hadronId": "eb33b0cb-8d35-4722-b9c0-1a31d4064888"}` |
+| Param under usersync.userIds[] | Scope    | Type    | Description                                                                                                                                                                                                                 | Example                                                                     |
+|--------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
+| name                           | Required | String  | ID value for the HadronID module - `"hadronId"`                                                                                                                                                                             | `"hadronId"`                                                                |
+| storage                        | Required | Object  | The publisher must specify the local storage in which to store the results of the call to get the user ID. This can be either cookie or HTML5 storage.                                                                      |                                                                             |
+| storage.type                   | Required | String  | This is where the the user ID will be stored. The recommended method is `localStorage` by specifying `html5`.                                                                                                               | `"html5"`                                                                   |
+| storage.name                   | Required | String  | The name of the cookie or html5 local storage where the user ID will be stored. The recommended value is `hadronId`.                                                                                                        | `"auHadronId"`                                                              |
+| storage.expires                | Optional | Integer | How long (in days) the user ID information will be stored. The recommended value is 14 days.                                                                                                                                | `14`                                                                        |
+| value                          | Optional | Object  | Used only if the page has a separate mechanism for storing the Hadron ID. The value is an object containing the values to be sent to the adapters. In this scenario, no URL is called and nothing is added to local storage | `{"hadronId": "0aRSTUAackg79ijgd8e8j6kah9ed9j6hdfgb6cl00volopxo00npzjmmb"}` |
 | params                         | Optional | Object  | Used to store params for the id system                                                                                                                                                                                      |
-| params.partnerId               | Required | Number  | This is the Audigent Partner ID obtained from Audigent.                                                                                                                                                                     | `1234`                                                 |
-                                                                                                                                                                                    |
+| params.partnerId               | Required | Number  | This is the Audigent Partner ID obtained from Audigent.                                                                                                                                                                     | `1234`                                                                      |
diff --git a/modules/hadronRtdProvider.js b/modules/hadronRtdProvider.js
index 6fb982815c1..56f4861b41b 100644
--- a/modules/hadronRtdProvider.js
+++ b/modules/hadronRtdProvider.js
@@ -5,23 +5,25 @@
  * @module modules/hadronRtdProvider
  * @requires module:modules/realTimeData
  */
-import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {submodule} from '../src/hook.js';
-import {isFn, isStr, isArray, deepEqual, isPlainObject, logError, logInfo} from '../src/utils.js';
+import {isFn, isStr, isArray, deepEqual, isPlainObject, logInfo} from '../src/utils.js';
 import {loadExternalScript} from '../src/adloader.js';
 import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
 
-const LOG_PREFIX = 'User ID - HadronRtdProvider submodule: ';
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
+const LOG_PREFIX = '[HadronRtdProvider] ';
 const MODULE_NAME = 'realTimeData';
 const SUBMODULE_NAME = 'hadron';
 const AU_GVLID = 561;
-const HADRON_ID_DEFAULT_URL = 'https://id.hadron.ad.gt/api/v1/hadronid?_it=prebid';
-const HADRON_SEGMENT_URL = 'https://id.hadron.ad.gt/api/v1/rtd';
-export const HALOID_LOCAL_NAME = 'auHadronId';
-export const RTD_LOCAL_NAME = 'auHadronRtd';
+const HADRON_JS_URL = 'https://cdn.hadronid.net/hadron.js';
+const LS_TAM_KEY = 'auHadronId';
+const RTD_LOCAL_NAME = 'auHadronRtd';
 export const storage = getStorageManager({moduleType: MODULE_TYPE_RTD, moduleName: SUBMODULE_NAME});
 
 /**
@@ -33,19 +35,6 @@ const urlAddParams = (url, params) => {
   return url + (url.indexOf('?') > -1 ? '&' : '?') + params
 };
 
-/**
- * Deep set an object unless value present.
- * @param {Object} obj
- * @param {String} path
- * @param {Object} val
- */
-function set(obj, path, val) {
-  const keys = path.split('.');
-  const lastKey = keys.pop();
-  const lastObj = keys.reduce((obj, key) => obj[key] = obj[key] || {}, obj);
-  lastObj[lastKey] = lastObj[lastKey] || val;
-}
-
 /**
  * Deep object merging with array deduplication.
  * @param {Object} target
@@ -58,11 +47,11 @@ function mergeDeep(target, ...sources) {
   if (isPlainObject(target) && isPlainObject(source)) {
     for (const key in source) {
       if (isPlainObject(source[key])) {
-        if (!target[key]) Object.assign(target, { [key]: {} });
+        if (!target[key]) Object.assign(target, {[key]: {}});
         mergeDeep(target[key], source[key]);
       } else if (isArray(source[key])) {
         if (!target[key]) {
-          Object.assign(target, { [key]: source[key] });
+          Object.assign(target, {[key]: source[key]});
         } else if (isArray(target[key])) {
           source[key].forEach(obj => {
             let e = 1;
@@ -78,7 +67,7 @@ function mergeDeep(target, ...sources) {
           });
         }
       } else {
-        Object.assign(target, { [key]: source[key] });
+        Object.assign(target, {[key]: source[key]});
       }
     }
   }
@@ -128,7 +117,6 @@ export function addRealTimeData(bidConfig, rtd, rtdConfig) {
   if (rtdConfig.params && rtdConfig.params.handleRtd) {
     rtdConfig.params.handleRtd(bidConfig, rtd, rtdConfig, config);
   } else {
-    // TODO: this and haloRtdProvider are a copy-paste of each other
     if (isPlainObject(rtd.ortb2)) {
       mergeLazy(bidConfig.ortb2Fragments?.global, rtd.ortb2);
     }
@@ -147,6 +135,17 @@ export function addRealTimeData(bidConfig, rtd, rtdConfig) {
  * @param {Object} userConsent
  */
 export function getRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
+  if (!storage.getDataFromLocalStorage(LS_TAM_KEY)) {
+    const partnerId = rtdConfig.params.partnerId | 0;
+    const hadronIdUrl = rtdConfig.params && rtdConfig.params.hadronIdUrl;
+    const scriptUrl = urlAddParams(
+      paramOrDefault(hadronIdUrl, HADRON_JS_URL, {}),
+      `partner_id=${partnerId}&_it=prebid`
+    );
+    loadExternalScript(scriptUrl, SUBMODULE_NAME, () => {
+      logInfo(LOG_PREFIX, 'hadronId JS snippet loaded', scriptUrl);
+    })
+  }
   if (rtdConfig && isPlainObject(rtdConfig.params) && rtdConfig.params.segmentCache) {
     let jsonData = storage.getDataFromLocalStorage(RTD_LOCAL_NAME);
 
@@ -161,83 +160,21 @@ export function getRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
     }
   }
 
-  const userIds = typeof getGlobal().getUserIds === 'function' ? (getGlobal()).getUserIds() : {};
+  const userIds = {};
 
-  let hadronId = storage.getDataFromLocalStorage(HALOID_LOCAL_NAME);
-  if (isStr(hadronId)) {
-    if (typeof getGlobal().refreshUserIds === 'function') {
-      (getGlobal()).refreshUserIds({submoduleNames: 'hadronId'});
-    }
-    userIds.hadronId = hadronId;
-    getRealTimeDataAsync(bidConfig, onDone, rtdConfig, userConsent, userIds);
+  const allUserIds = getGlobal().getUserIds();
+  if (allUserIds.hasOwnProperty('hadronId')) {
+    userIds['hadronId'] = allUserIds.hadronId;
+    logInfo(LOG_PREFIX, 'hadronId user module found', allUserIds.hadronId);
   } else {
-    window.pubHadronCb = (hadronId) => {
-      userIds.hadronId = hadronId;
-      getRealTimeDataAsync(bidConfig, onDone, rtdConfig, userConsent, userIds);
+    let hadronId = storage.getDataFromLocalStorage(LS_TAM_KEY);
+    if (isStr(hadronId) && hadronId.length > 0) {
+      userIds['hadronId'] = hadronId;
+      logInfo(LOG_PREFIX, 'hadronId TAM found', hadronId);
     }
-    const partnerId = rtdConfig.params.partnerId | 0;
-    const hadronIdUrl = rtdConfig.params && rtdConfig.params.hadronIdUrl;
-    const scriptUrl = urlAddParams(
-      paramOrDefault(hadronIdUrl, HADRON_ID_DEFAULT_URL, userIds),
-      `partner_id=${partnerId}&_it=prebid`
-    );
-    loadExternalScript(scriptUrl, 'hadron', () => {
-      logInfo(LOG_PREFIX, 'hadronIdTag loaded', scriptUrl);
-    })
   }
 }
 
-/**
- * Async rtd retrieval from Audigent
- * @param {Object} bidConfig
- * @param {function} onDone
- * @param {Object} rtdConfig
- * @param {Object} userConsent
- * @param {Object} userIds
- */
-export function getRealTimeDataAsync(bidConfig, onDone, rtdConfig, userConsent, userIds) {
-  let reqParams = {};
-
-  if (isPlainObject(rtdConfig)) {
-    set(rtdConfig, 'params.requestParams.ortb2', bidConfig.ortb2Fragments.global);
-    reqParams = rtdConfig.params.requestParams;
-  }
-
-  if (isPlainObject(window.pubHadronPm)) {
-    reqParams.pubHadronPm = window.pubHadronPm;
-  }
-
-  ajax(HADRON_SEGMENT_URL, {
-    success: function (response, req) {
-      if (req.status === 200) {
-        try {
-          const data = JSON.parse(response);
-          if (data && data.rtd) {
-            addRealTimeData(bidConfig, data.rtd, rtdConfig);
-            onDone();
-            storage.setDataInLocalStorage(RTD_LOCAL_NAME, JSON.stringify(data));
-          } else {
-            onDone();
-          }
-        } catch (err) {
-          logError('unable to parse audigent segment data');
-          onDone();
-        }
-      } else if (req.status === 204) {
-        // unrecognized partner config
-        onDone();
-      }
-    },
-    error: function () {
-      onDone();
-      logError('unable to get audigent segment data');
-    }
-  },
-  JSON.stringify({'userIds': userIds, 'config': reqParams}),
-  {contentType: 'application/json'}
-  );
-}
-
 /**
  * Module init
  * @param {Object} provider
diff --git a/modules/holidBidAdapter.js b/modules/holidBidAdapter.js
index fbcbb9492c7..90bc0c78212 100644
--- a/modules/holidBidAdapter.js
+++ b/modules/holidBidAdapter.js
@@ -5,8 +5,6 @@ import {
   logMessage,
   triggerPixel,
 } from '../src/utils.js';
-import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
 import {BANNER} from '../src/mediaTypes.js';
 
 import {registerBidder} from '../src/adapters/bidderFactory.js';
@@ -19,8 +17,6 @@ const TIME_TO_LIVE = 300
 const TMAX = 500
 let wurlMap = {}
 
-events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler)
-
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
@@ -97,13 +93,13 @@ export const spec = {
     }
 
     const bidders = getBidders(serverResponse)
-
-    if (optionsType.iframeEnabled && bidders) {
+    // note this only does the iframe sync when gdpr consent object exists to match previous behavior (generate error on gdprconsent not existing)
+    if (optionsType.iframeEnabled && bidders && gdprConsent) {
       const queryParams = []
 
       queryParams.push('bidders=' + bidders)
-      queryParams.push('gdpr=' + +gdprConsent.gdprApplies)
-      queryParams.push('gdpr_consent=' + gdprConsent.consentString)
+      queryParams.push('gdpr=' + +gdprConsent?.gdprApplies)
+      queryParams.push('gdpr_consent=' + gdprConsent?.consentString)
       queryParams.push('usp_consent=' + (uspConsent || ''))
 
       let strQueryParams = queryParams.join('&')
@@ -120,6 +116,15 @@ export const spec = {
 
     return syncs
   },
+
+  onBidWon(bid) {
+    const wurl = getWurl(bid.requestId)
+    if (wurl) {
+      logMessage(`Invoking image pixel for wurl on BID_WIN: "${wurl}"`)
+      triggerPixel(wurl)
+      removeWurl(bid.requestId)
+    }
+  }
 }
 
 function getImp(bid) {
@@ -176,13 +181,4 @@ function getWurl(requestId) {
   }
 }
 
-function bidWonHandler(bid) {
-  const wurl = getWurl(bid.requestId)
-  if (wurl) {
-    logMessage(`Invoking image pixel for wurl on BID_WIN: "${wurl}"`)
-    triggerPixel(wurl)
-    removeWurl(bid.requestId)
-  }
-}
-
 registerBidder(spec)
diff --git a/modules/humansecurityRtdProvider.js b/modules/humansecurityRtdProvider.js
new file mode 100644
index 00000000000..aeb872beb8d
--- /dev/null
+++ b/modules/humansecurityRtdProvider.js
@@ -0,0 +1,180 @@
+/**
+ * This module adds humansecurity provider to the real time data module
+ *
+ * The {@link module:modules/realTimeData} module is required
+ * The module will inject the HUMAN Security script into the context where Prebid.js is initialized, enriching bid requests with specific data to provide advanced protection against ad fraud and spoofing.
+ * @module modules/humansecurityRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import { submodule } from '../src/hook.js';
+import {
+  prefixLog,
+  mergeDeep,
+  generateUUID,
+  getWindowSelf,
+} from '../src/utils.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { loadExternalScript } from '../src/adloader.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ * @typedef {import('../modules/rtdModule/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/rtdModule/index.js').UserConsentData} UserConsentData
+ */
+
+const SUBMODULE_NAME = 'humansecurity';
+const SCRIPT_URL = 'https://sonar.script.ac/prebid/rtd.js';
+
+const { logInfo, logWarn, logError } = prefixLog(`[${SUBMODULE_NAME}]:`);
+
+/** @type {string} */
+let clientId = '';
+
+/** @type {boolean} */
+let verbose = false;
+
+/** @type {string} */
+let sessionId = '';
+
+/** @type {Object} */
+let hmnsData = { };
+
+/**
+ * Submodule registration
+ */
+function main() {
+  submodule('realTimeData', /** @type {RtdSubmodule} */ ({
+    name: SUBMODULE_NAME,
+
+    //
+    init: (config, userConsent) => {
+      try {
+        load(config);
+        return true;
+      } catch (err) {
+        logError('init', err.message);
+        return false;
+      }
+    },
+
+    getBidRequestData: onGetBidRequestData
+  }));
+}
+
+/**
+ * Injects HUMAN Security script on the page to facilitate pre-bid signal collection.
+ * @param {SubmoduleConfig} config
+ */
+function load(config) {
+  // By default, this submodule loads the generic implementation script
+  // only identified by the referrer information. In the future, if publishers
+  // want to have analytics where their websites are grouped, they can request
+  // Client ID from HUMAN, pass it here, and it will enable advanced reporting
+  clientId = config?.params?.clientId || '';
+  if (clientId && (typeof clientId !== 'string' || !/^\w{3,16}$/.test(clientId))) {
+    throw new Error(`The 'clientId' parameter must be a short alphanumeric string`);
+  }
+
+  // Load/reset the state
+  verbose = !!config?.params?.verbose;
+  sessionId = generateUUID();
+  hmnsData = {};
+
+  // We rely on prebid implementation to get the best domain possible here
+  // In some cases, it still might be null, though
+  const refDomain = getRefererInfo().domain || '';
+
+  // Once loaded, the implementation script will publish an API using
+  // the session ID value it was given in data attributes
+  const scriptAttrs = { 'data-sid': sessionId };
+  const scriptUrl = `${SCRIPT_URL}?r=${refDomain}${clientId ? `&c=${clientId}` : ''}`;
+
+  loadExternalScript(scriptUrl, MODULE_TYPE_RTD, SUBMODULE_NAME, onImplLoaded, null, scriptAttrs);
+}
+
+/**
+ * The callback to loadExternalScript
+ * Establishes the bridge between this RTD submodule and the loaded implementation
+ */
+function onImplLoaded() {
+  // We then get a hold on this script using the knowledge of this session ID
+  const wnd = getWindowSelf();
+  const impl = wnd[`sonar_${sessionId}`];
+  if (typeof impl !== 'object' || typeof impl.connect !== 'function') {
+    verbose && logWarn('onload', 'Unable to access the implementation script');
+    return;
+  }
+
+  // And set up a bridge between the RTD submodule and the implementation.
+  // The first argument is used to identify the caller.
+  // The callback might be called multiple times to update the signals
+  // once more precise information is available.
+  impl.connect(getGlobal(), onImplMessage);
+}
+
+/**
+ * The bridge function will be called by the implementation script
+ * to update the token information or report errors
+ * @param {Object} msg
+ */
+function onImplMessage(msg) {
+  if (typeof msg !== 'object') {
+    return;
+  }
+
+  switch (msg.type) {
+    case 'hmns': {
+      hmnsData = mergeDeep({}, msg.data || {});
+      break;
+    }
+    case 'error': {
+      logError('impl', msg.data || '');
+      break;
+    }
+    case 'warn': {
+      verbose && logWarn('impl', msg.data || '');
+      break;
+    }
+    case 'info': {
+      verbose && logInfo('impl', msg.data || '');
+      break;
+    }
+  }
+}
+
+/**
+ * onGetBidRequestData is called once per auction.
+ * Update the `ortb2Fragments` object with the data from the injected script.
+ *
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ */
+function onGetBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
+  // Add device.ext.hmns to the global ORTB data for all vendors to use
+  // At the time of writing this submodule, "hmns" is an object defined
+  // internally by humansecurity, and it currently contains "v1" field
+  // with a token that contains collected signals about this session.
+  mergeDeep(reqBidsConfigObj.ortb2Fragments.global, { device: { ext: { hmns: hmnsData } } });
+  callback();
+}
+
+/**
+ * Exporting local (and otherwise encapsulated to this module) functions
+ * for testing purposes
+ */
+export const __TEST__ = {
+  SUBMODULE_NAME,
+  SCRIPT_URL,
+  main,
+  load,
+  onImplLoaded,
+  onImplMessage,
+  onGetBidRequestData
+};
+
+main();
diff --git a/modules/humansecurityRtdProvider.md b/modules/humansecurityRtdProvider.md
new file mode 100644
index 00000000000..6722319cbb5
--- /dev/null
+++ b/modules/humansecurityRtdProvider.md
@@ -0,0 +1,223 @@
+# Overview
+
+```
+Module Name: HUMAN Security Rtd provider
+Module Type: Rtd Provider
+Maintainer: alexey@humansecurity.com
+```
+
+## What is it?
+
+The HUMAN Security RTD submodule offers publishers a mechanism to integrate pre-bid signal collection
+for the purpose of providing real-time protection against all sorts of invalid traffic,
+such as bot-generated ad interactions or sophisticated ad fraud schemes.
+
+## How does it work?
+
+HUMAN Security RTD submodule generates a HUMAN Security token, which then can be consumed by adapters,
+sent within bid requests, and used for bot detection on the backend.
+
+## Key Facts about the HUMAN Security RTD Submodule
+
+* Enriches bid requests with IVT signal, historically done post-bid
+* No incremental signals collected beyond existing HUMAN post-bid solution
+* Offsets negative impact from loss of granularity in IP and User Agent at bid time
+* Does not expose collected IVT signal to any party who doesn’t otherwise already have access to the same signal collected post-bid
+* Does not introduce meaningful latency, as demonstrated in the Latency section
+* Comes at no additional cost to collect IVT signal and make it available at bid time
+* Leveraged to differentiate the invalid bid requests at device level, and cannot be used to identify a user or a device, thus preserving privacy.
+
+# Build
+
+First, make sure to add the HUMAN Security submodule to your Prebid.js package with:
+
+```bash
+gulp build --modules="rtdModule,humansecurityRtdProvider,..."
+```
+
+> `rtdModule` is a required module to use HUMAN Security RTD module.
+
+# Configuration
+
+This module is configured as part of the `realTimeData.dataProviders` object.
+Please refer to [Prebid Documentation](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-realTimeData)
+on RTD module configuration for details on required and optional parameters of `realTimeData`.
+
+By default, using this submodule *does not require any prior communication with HUMAN, nor any special configuration*,
+besides just indicating that it should be loaded:
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'humansecurity'
+        }]
+    }
+});
+```
+
+It can be optionally parameterized, for example, to include client ID obtained from HUMAN,
+should any advanced reporting be needed, or to have verbose output for troubleshooting:
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'humansecurity',
+            params: {
+                clientId: 'ABC123',
+                verbose: true
+            }
+        }]
+    }
+});
+```
+
+## Supported parameters
+
+| Name             |Type           | Description                                                         | Required |
+| :--------------- | :------------ | :------------------------------------------------------------------ |:---------|
+| `clientId`  | String | Should you need advanced reporting, contact [prebid@humansecurity.com](prebid@humansecurity.com) to receive client ID. | No |
+| `verbose`   | Boolean | Only set to `true` if troubleshooting issues. | No |
+
+## Logging, latency and troubleshooting
+
+The optional `verbose` parameter can be especially helpful to troubleshoot any issues and/or monitor latency.
+
+By default, the submodule may, in case of unexpected issues, invoke `logError`, emitting `auctionDebug` events
+of type `ERROR`. With `verbose` parameter set to `true`, it may additionally:
+
+* Call `logWarning`, resulting in `auctionDebug` events of type `WARNING`,
+* Call `logInfo` with latency information.
+  * To observe these messages in console, Prebid.js must be run in
+    [debug mode](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#debugging) -
+    either by adding `?pbjs_debug=true` to your page's URL, or by configuring with `pbjs.setConfig({ debug: true });`
+
+Example output of the latency information:
+
+```
+INFO: [humansecurity]: impl JS time to init (ms): 6.
+INFO: [humansecurity]: impl JS time to collect (ms): 13.
+```
+
+Here, the two reported metrics are how much time the signal collection script spent blocking on initialization,
+and the total time required to obtain the signals, respectively. Note that "time to collect" metric accounts
+for all the time spent since the script has started initializing until the signals were made available to the bidders,
+therefore it includes "time to init", and typically some non-blocking time spent waiting for signals. Only “time to init” is blocking.
+
+# How can I contribute?
+
+Prebid has launched a Measurement Taskforce to address signal deprecation and measurement in the current environment,
+which has become a publisher-level issue. Without a solution, granularity of measurement disappears.
+If you would like to participate to help identify and develop solutions to these problems such as the one tackled
+by this submodule, please consider joining the [Measurement Taskforce](https://prebid.org/project-management-committees/).
+
+# Notes
+
+## Operation model
+
+Following is the expected data flow:
+
+* Prebid.js gets initialized, including the HUMAN RTD submodule.
+* The submodule loads the signal collection implementation script from a high-performance, low latency endpoint.
+* This script starts collecting the signals, and makes them available to the RTD submodule as soon as possible.
+* The RTD submodule places the collected signals into the ORTB structure for bid adapters to pick up.
+* Bid adapters are expected to retrieve the `ortb2.device.ext.hmns` object and incorporate it into their bid requests.
+* Bid requests having the `ortb2.device.ext.hmns` data allow their backend to make more informative requests to HUMAN Ad Fraud Defense.
+  * Should bid requests be passed to other platforms during the bidding process, adapter developers are
+    encouraged to keep `ortb2.device.ext.hmns` so that, for example, a downstream DSP can also have this data passed to HUMAN.
+
+## Remarks on the collected signals
+
+There are a few points that are worth being mentioned separately, to avoid confusion and unnecessary suspicion:
+
+* The nature of the collected signals is exactly the same as those already collected in analytics scripts
+  that arrive in the ads via existing post-bid processes.
+* The signals themselves are even less verbose than those HUMAN normally collects post-bid, because of timing / performance requirements.
+* No signals attempt to identify users. Their only purpose is to classify traffic into valid / invalid.
+* The signal collection script is external to Prebid.js. This ensures that it can be constantly kept up to date with
+  the ever-evolving nature of the threat landscape without the publishers having to rebuild their Prebid.js frequently.
+  * The signal collection script is also obfuscated, as a defense-in-depth measure in order to complicate tampering by
+    bad actors, as are all similar scripts in the industry, which is something that cannot be accommodated by Prebid.js itself.
+
+## Why is this approach an innovation?
+
+Historically, IVT protection is achieved via dropping analytics scripts and/or pixels in the ads, which enriches impression data with collected signals.
+Those signals, when analyzed by IVT protection vendors, allow distinguishing valid from invalid traffic, but only retroactively -
+after the impression was served, and all the participant infrastructures have already participated in serving the request.
+
+This not only leads to unnecessary infrastructure costs, but to uncomfortable and often difficult processes of reconciliation
+and reimbursement, or claw-back. When handled only at the post-bid stage, the true bad actors have already achieved their objectives,
+and legitimate advertisers, platforms, and publishers are left holding the bag.
+
+HUMAN’s Ad Fraud Defense solves this problem by making predictions at the pre-bid stage about whether the traffic is fraudulent,
+allowing the platforms to knowingly not participate in the IVT-generated auctions.
+
+However, the challenge in making those predictions is that even these prebid predictions rely primarily on historical data,
+which not only introduces lag, but typically might be less accurate than direct decision making (were it possible) using
+the high-quality signals obtained from the pixels and/or JS analytics scripts delivered in the ads.
+
+The HUMAN Security RTD submodule bridges the gap by introducing a new innovation: it **facilitates the very same signal
+collection that is typically performed post-bid, but at the pre-bid stage, and makes the signals available during bidding.**
+This not only permits for accurate invalid traffic detection at the earliest stages of the auction process, but diminishes
+the impacts of signal deprecation such as the loss of IP and User Agent on effective fraud mitigation.
+
+## Why is this good for publishers?
+
+In the process of Invalid Traffic reconciliation, publishers are often the last to know, as they are informed by their downstream
+partners that the inventory they had provided in good faith has been detected as invalid traffic. This is most painful when it
+happens via post-bid detection when publishers are often the last party in the chain from whom the others can collect clawbacks,
+and the publishers themselves are left with little recourse. And when invalid traffic is blocked by platforms prebid, it is after
+the fact of publishers having sent out bid requests, thus harming fill rates, revenue opportunities, and overall auction and bidding
+efficiencies. And of course, invalid traffic whether detected post-bid or pre-bid is damaging to the publisher’s reputation
+with its demand partners.
+
+The HUMAN Security RTD submodule creates a more efficient integration for the process of invalid traffic mitigation.
+Invalid traffic detection and filtration is being done already with or without the participation of publishers, and measurement
+will be done on the ad inventory because advertisers need it to manage their own ad spend. The HUMAN Security RTD submodule gives
+publishers a direct seat, and in fact the first seat, in the invalid traffic detection process, allowing it to be done effectively,
+directly, and in a way that provides the publisher with more direct insight.
+
+Existing models of signal deprecation suggest that IP protection is going to be 100 times or more less granular.
+This would normally be expected to significantly reduce the ability to do prebid publisher-side predictions. This in turn would prevent
+the ability to see if specific impressions are bad and instead potentially result in the whole publisher being identified as being
+invalid traffic by a buyer. It is important to note that the purpose of data collection by the HUMAN Security RTD submodule is
+specifically for invalid traffic detection and filtration. It will not be used for unrelated and unauthorized purposes
+like targeting audiences, etc.
+
+The HUMAN Security RTD submodule makes sure to have the best integration possible to avoid revenue loss.
+It will help publishers avoid painful clawbacks. Currently, clawbacks are based on opaque measurement processes downstream from
+publishers where the information is controlled and withheld. The HUMAN Security RTD submodule will make publishers a more direct
+party to the measurement and verification process and help make sure the origin and the recipient match.
+
+Importantly, the effective use of the HUMAN Security RTD submodule signifies to SSPs and buyers that the publisher
+is a joint partner in ensuring quality ad delivery, and demonstrates that the publisher is a premium supply source.
+
+Finally, the HUMAN Security RTD submodule sets the ecosystem up for a future where publisher level reporting is facilitated.
+This will allow for increased transparency about what is happening with publisher inventory, further enhancing and
+ensuring the value of the inventory.
+
+## FAQ
+
+### Is latency an issue?
+
+The HUMAN Security RTD submodule is designed to minimize any latency in the auction within normal SLAs.
+
+### Do publishers get any insight into how the measurement is judged?
+
+Having the The HUMAN Security RTD submodule be part of the prebid process will allow the publisher to have insight
+into the invalid traffic metrics as they are determined and provide confidence that they are delivering quality
+inventory to the buyer.
+
+### How are privacy concerns addressed?
+
+The HUMAN Security RTD submodule seeks to reduce the impacts from signal deprecation that are inevitable without
+compromising privacy by avoiding re-identification. Each bid request is enriched with just enough signal
+to identify if the traffic is invalid or not.
+
+By having the The HUMAN Security RTD submodule operate at the Prebid level, data can be controlled
+and not as freely passed through the bidstream where it may be accessible to various unknown parties.
+
+Note: anti-fraud use cases typically have carve outs in laws and regulations to permit data collection
+essential for effective fraud mitigation, but this does not constitute legal advice and you should
+consult your attorney when making data access decisions.
diff --git a/modules/hybridBidAdapter.js b/modules/hybridBidAdapter.js
index f746e69cbba..01d29ee0126 100644
--- a/modules/hybridBidAdapter.js
+++ b/modules/hybridBidAdapter.js
@@ -1,10 +1,16 @@
 import {_map, deepAccess, isArray, logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {auctionManager} from '../src/auctionManager.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
 import {find} from '../src/polyfill.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'hybrid';
 const DSP_ENDPOINT = 'https://hbe198.hybrid.ai/prebidhb';
 const TRAFFIC_TYPE_WEB = 1;
@@ -88,16 +94,13 @@ function buildBid(bidData) {
     bid.vastXml = bidData.content;
     bid.mediaType = VIDEO;
 
-    // TODO: why does this need to iterate through every ad unit?
-    let adUnit = find(auctionManager.getAdUnits(), function (unit) {
-      return unit.transactionId === bidData.transactionId;
-    });
+    const video = bidData.mediaTypes?.video;
 
-    if (adUnit) {
-      bid.width = adUnit.mediaTypes.video.playerSize[0][0];
-      bid.height = adUnit.mediaTypes.video.playerSize[0][1];
+    if (video) {
+      bid.width = video.playerSize[0][0];
+      bid.height = video.playerSize[0][1];
 
-      if (adUnit.mediaTypes.video.context === 'outstream') {
+      if (video.context === 'outstream') {
         bid.renderer = createRenderer(bid);
       }
     }
diff --git a/modules/hypelabBidAdapter.js b/modules/hypelabBidAdapter.js
index a625c7299a6..14a4758bd27 100644
--- a/modules/hypelabBidAdapter.js
+++ b/modules/hypelabBidAdapter.js
@@ -1,6 +1,6 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
-import { generateUUID } from '../src/utils.js';
+import { generateUUID, isFn, isPlainObject } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 
 export const BIDDER_CODE = 'hypelab';
@@ -12,7 +12,7 @@ export const REPORTING_ROUTE = '';
 
 const PREBID_VERSION = '$prebid.version$';
 const PROVIDER_NAME = 'prebid';
-const PROVIDER_VERSION = '0.0.1';
+const PROVIDER_VERSION = '0.0.2';
 
 const url = (route) => ENDPOINT_URL + route;
 
@@ -38,18 +38,24 @@ function buildRequests(validBidRequests, bidderRequest) {
 
     const uuid = uids[0] ? uids[0] : generateTemporaryUUID();
 
+    const floor = getBidFloor(request, request.sizes || []);
+
+    const dpr = typeof window != 'undefined' ? window.devicePixelRatio : 1;
+
     const payload = {
       property_slug: request.params.property_slug,
       placement_slug: request.params.placement_slug,
       provider_version: PROVIDER_VERSION,
       provider_name: PROVIDER_NAME,
-      referrer:
+      location:
         bidderRequest.refererInfo?.page || typeof window != 'undefined'
           ? window.location.href
           : '',
       sdk_version: PREBID_VERSION,
       sizes: request.sizes,
       wids: [],
+      floor,
+      dpr,
       uuid,
       bidRequestsCount: request.bidRequestsCount,
       bidderRequestsCount: request.bidderRequestsCount,
@@ -79,6 +85,26 @@ function generateTemporaryUUID() {
   return 'tmp_' + generateUUID();
 }
 
+function getBidFloor(bid, sizes) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.bidFloor ? bid.params.bidFloor : null;
+  }
+
+  let floor;
+
+  let floorInfo = bid.getFloor({
+    currency: 'USD',
+    mediaType: 'banner',
+    size: sizes.length === 1 ? sizes[0] : '*'
+  });
+
+  if (isPlainObject(floorInfo) && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+    floor = parseFloat(floorInfo.floor);
+  }
+
+  return floor;
+}
+
 function interpretResponse(serverResponse, bidRequest) {
   const { data } = serverResponse.body;
 
@@ -94,12 +120,12 @@ function interpretResponse(serverResponse, bidRequest) {
     creativeId: data.creative_set_slug,
     currency: data.currency,
     netRevenue: true,
-    referrer: bidRequest.data.referrer,
+    referrer: bidRequest.data.location,
     ttl: data.ttl,
     ad: data.html,
     mediaType: serverResponse.body.data.media_type,
     meta: {
-      advertiserDomains: data.advertiserDomains || [],
+      advertiserDomains: data.advertiser_domains || [],
     },
   };
 
diff --git a/modules/id5AnalyticsAdapter.js b/modules/id5AnalyticsAdapter.js
index d0f3198e03d..10fe8d82ef4 100644
--- a/modules/id5AnalyticsAdapter.js
+++ b/modules/id5AnalyticsAdapter.js
@@ -1,20 +1,17 @@
 import buildAdapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import { ajax } from '../src/ajax.js';
 import { logInfo, logError } from '../src/utils.js';
 import * as events from '../src/events.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 
 const {
-  EVENTS: {
-    AUCTION_END,
-    TCF2_ENFORCEMENT,
-    BID_WON,
-    BID_VIEWABLE,
-    AD_RENDER_FAILED
-  }
-} = CONSTANTS
+  AUCTION_END,
+  TCF2_ENFORCEMENT,
+  BID_WON,
+  BID_VIEWABLE,
+  AD_RENDER_FAILED
+} = EVENTS
 
 const GVLID = 131;
 
@@ -35,7 +32,7 @@ const FLUSH_EVENTS = [
 
 const CONFIG_URL_PREFIX = 'https://api.id5-sync.com/analytics'
 const TZ = new Date().getTimezoneOffset();
-const PBJS_VERSION = getGlobal().version;
+const PBJS_VERSION = 'v' + '$prebid.version$';
 const ID5_REDACTED = '__ID5_REDACTED__';
 const isArray = Array.isArray;
 
diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index e12aea5f8d1..65e9be46a56 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -10,33 +10,101 @@ import {
   deepSetValue,
   isEmpty,
   isEmptyStr,
+  isPlainObject,
   logError,
   logInfo,
-  logWarn,
-  safeJSONParse
+  logWarn
 } from '../src/utils.js';
-import {ajax} from '../src/ajax.js';
+import {fetch} from '../src/ajax.js';
 import {submodule} from '../src/hook.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {getStorageManager} from '../src/storageManager.js';
-import {uspDataHandler} from '../src/adapterManager.js';
+import {gppDataHandler, uspDataHandler} from '../src/adapterManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
+import {GreedyPromise} from '../src/utils/promise.js';
+import {loadExternalScript} from '../src/adloader.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
 
 const MODULE_NAME = 'id5Id';
 const GVLID = 131;
-const NB_EXP_DAYS = 30;
 export const ID5_STORAGE_NAME = 'id5id';
-export const ID5_PRIVACY_STORAGE_NAME = `${ID5_STORAGE_NAME}_privacy`;
-const LOCAL_STORAGE = 'html5';
 const LOG_PREFIX = 'User ID - ID5 submodule: ';
 const ID5_API_CONFIG_URL = 'https://id5-sync.com/api/config/prebid';
-
-// order the legacy cookie names in reverse priority order so the last
-// cookie in the array is the most preferred to use
-const LEGACY_COOKIE_NAMES = ['pbjs-id5id', 'id5id.1st', 'id5id'];
+const ID5_DOMAIN = 'id5-sync.com';
+const TRUE_LINK_SOURCE = 'true-link-id5-sync.com';
 
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
 
+/**
+ * @typedef {Object} IdResponse
+ * @property {string} [universal_uid] - The encrypted ID5 ID to pass to bidders
+ * @property {Object} [ext] - The extensions object to pass to bidders
+ * @property {Object} [ab_testing] - A/B testing configuration
+ */
+
+/**
+ * @typedef {Object} FetchCallConfig
+ * @property {string} [url] - The URL for the fetch endpoint
+ * @property {Object} [overrides] - Overrides to apply to fetch parameters
+ */
+
+/**
+ * @typedef {Object} ExtensionsCallConfig
+ * @property {string} [url] - The URL for the extensions endpoint
+ * @property {string} [method] - Overrides the HTTP method to use to make the call
+ * @property {Object} [body] - Specifies a body to pass to the extensions endpoint
+ */
+
+/**
+ * @typedef {Object} DynamicConfig
+ * @property {FetchCallConfig} [fetchCall] - The fetch call configuration
+ * @property {ExtensionsCallConfig} [extensionsCall] - The extensions call configuration
+ */
+
+/**
+ * @typedef {Object} ABTestingConfig
+ * @property {boolean} enabled - Tells whether A/B testing is enabled for this instance
+ * @property {number} controlGroupPct - A/B testing probability
+ */
+
+/**
+ * @typedef {Object} Multiplexing
+ * @property {boolean} [disabled] - Disable multiplexing (instance will work in single mode)
+ */
+
+/**
+ * @typedef {Object} Diagnostics
+ * @property {boolean} [publishingDisabled] - Disable diagnostics publishing
+ * @property {number} [publishAfterLoadInMsec] - Delay in ms after script load after which collected diagnostics are published
+ * @property {boolean} [publishBeforeWindowUnload] - When true, diagnostics publishing is triggered on Window 'beforeunload' event
+ * @property {number} [publishingSampleRatio] - Diagnostics publishing sample ratio
+ */
+
+/**
+ * @typedef {Object} Segment
+ * @property {string} [destination] - GVL ID or ID5-XX Partner ID. Mandatory
+ * @property {Array} [ids] - The segment IDs to push. Must contain at least one segment ID.
+ */
+
+/**
+ * @typedef {Object} Id5PrebidConfig
+ * @property {number} partner - The ID5 partner ID
+ * @property {string} pd - The ID5 partner data string
+ * @property {ABTestingConfig} abTesting - The A/B testing configuration
+ * @property {boolean} disableExtensions - Disabled extensions call
+ * @property {string} [externalModuleUrl] - URL for the id5 prebid external module
+ * @property {Multiplexing} [multiplexing] - Multiplexing options. Only supported when loading the external module.
+ * @property {Diagnostics} [diagnostics] - Diagnostics options. Supported only in multiplexing
+ * @property {Array} [segments] - A list of segments to push to partners. Supported only in multiplexing.
+ * @property {boolean} [disableUaHints] - When true, look up of high entropy values through user agent hints is disabled.
+ */
+
 /** @type {Submodule} */
 export const id5IdSubmodule = {
   /**
@@ -59,12 +127,13 @@ export const id5IdSubmodule = {
    * @returns {(Object|undefined)}
    */
   decode(value, config) {
-    let universalUid;
+    let universalUid, publisherTrueLinkId;
     let ext = {};
 
     if (value && typeof value.universal_uid === 'string') {
       universalUid = value.universal_uid;
       ext = value.ext || ext;
+      publisherTrueLinkId = value.publisherTrueLinkId;
     } else {
       return undefined;
     }
@@ -76,6 +145,20 @@ export const id5IdSubmodule = {
       }
     };
 
+    if (isPlainObject(ext.euid)) {
+      responseObj.euid = {
+        uid: ext.euid.uids[0].id,
+        source: ext.euid.source,
+        ext: {provider: ID5_DOMAIN}
+      };
+    }
+
+    if (publisherTrueLinkId) {
+      responseObj.trueLinkId = {
+        uid: publisherTrueLinkId,
+      };
+    }
+
     const abTestingResult = deepAccess(value, 'ab_testing.result');
     switch (abTestingResult) {
       case 'control':
@@ -113,14 +196,15 @@ export const id5IdSubmodule = {
     }
 
     if (!hasWriteConsentToLocalStorage(consentData)) {
-      logInfo(LOG_PREFIX + 'Skipping ID5 local storage write because no consent given.')
+      logInfo(LOG_PREFIX + 'Skipping ID5 local storage write because no consent given.');
       return undefined;
     }
 
     const resp = function (cbFunction) {
-      new IdFetchFlow(submoduleConfig, consentData, cacheIdObj, uspDataHandler.getConsentData()).execute()
+      const fetchFlow = new IdFetchFlow(submoduleConfig, consentData, cacheIdObj, uspDataHandler.getConsentData(), gppDataHandler.getConsentData());
+      fetchFlow.execute()
         .then(response => {
-          cbFunction(response)
+          cbFunction(response);
         })
         .catch(error => {
           logError(LOG_PREFIX + 'getId fetch encountered an error', error);
@@ -139,121 +223,170 @@ export const id5IdSubmodule = {
    * @param {SubmoduleConfig} config
    * @param {ConsentData|undefined} consentData
    * @param {Object} cacheIdObj - existing id, if any
-   * @return {(IdResponse|function(callback:function))} A response object that contains id and/or callback.
+   * @return {IdResponse} A response object that contains id.
    */
   extendId(config, consentData, cacheIdObj) {
     if (!hasWriteConsentToLocalStorage(consentData)) {
-      logInfo(LOG_PREFIX + 'No consent given for ID5 local storage writing, skipping nb increment.')
+      logInfo(LOG_PREFIX + 'No consent given for ID5 local storage writing, skipping nb increment.');
       return cacheIdObj;
     }
 
-    const partnerId = validateConfig(config) ? config.params.partner : 0;
-    incrementNb(partnerId);
-
     logInfo(LOG_PREFIX + 'using cached ID', cacheIdObj);
+    if (cacheIdObj) {
+      cacheIdObj.nbPage = incrementNb(cacheIdObj)
+    }
     return cacheIdObj;
   },
+  primaryIds: ['id5id', 'trueLinkId'],
   eids: {
     'id5id': {
-      getValue: function(data) {
-        return data.uid
+      getValue: function (data) {
+        return data.uid;
       },
-      source: 'id5-sync.com',
+      source: ID5_DOMAIN,
       atype: 1,
-      getUidExt: function(data) {
+      getUidExt: function (data) {
         if (data.ext) {
           return data.ext;
         }
       }
     },
-  },
+    'euid': {
+      getValue: function (data) {
+        return data.uid;
+      },
+      getSource: function (data) {
+        return data.source;
+      },
+      atype: 3,
+      getUidExt: function (data) {
+        if (data.ext) {
+          return data.ext;
+        }
+      }
+    },
+    'trueLinkId': {
+      getValue: function (data) {
+        return data.uid;
+      },
+      getSource: function (data) {
+        return TRUE_LINK_SOURCE;
+      },
+      atype: 1,
+      getUidExt: function (data) {
+        if (data.ext) {
+          return data.ext;
+        }
+      }
+    }
+
+  }
 };
 
-class IdFetchFlow {
-  constructor(submoduleConfig, gdprConsentData, cacheIdObj, usPrivacyData) {
-    this.submoduleConfig = submoduleConfig
-    this.gdprConsentData = gdprConsentData
-    this.cacheIdObj = cacheIdObj
-    this.usPrivacyData = usPrivacyData
+export class IdFetchFlow {
+  constructor(submoduleConfig, gdprConsentData, cacheIdObj, usPrivacyData, gppData) {
+    this.submoduleConfig = submoduleConfig;
+    this.gdprConsentData = gdprConsentData;
+    this.cacheIdObj = cacheIdObj;
+    this.usPrivacyData = usPrivacyData;
+    this.gppData = gppData;
   }
 
-  execute() {
-    return this.#callForConfig(this.submoduleConfig)
-      .then(fetchFlowConfig => {
-        return this.#callForExtensions(fetchFlowConfig.extensionsCall)
-          .then(extensionsData => {
-            return this.#callId5Fetch(fetchFlowConfig.fetchCall, extensionsData)
-          })
-      })
-      .then(fetchCallResponse => {
-        try {
-          resetNb(this.submoduleConfig.params.partner);
-          if (fetchCallResponse.privacy) {
-            storeInLocalStorage(ID5_PRIVACY_STORAGE_NAME, JSON.stringify(fetchCallResponse.privacy), NB_EXP_DAYS);
-          }
-        } catch (error) {
-          logError(LOG_PREFIX + error);
-        }
-        return fetchCallResponse;
-      })
+  /**
+   * Calls the ID5 Servers to fetch an ID5 ID
+   * @returns {Promise} The result of calling the server side
+   */
+  async execute() {
+    const configCallPromise = this.#callForConfig();
+    if (this.#isExternalModule()) {
+      try {
+        return await this.#externalModuleFlow(configCallPromise);
+      } catch (error) {
+        logError(LOG_PREFIX + 'Error while performing ID5 external module flow. Continuing with regular flow.', error);
+        return this.#regularFlow(configCallPromise);
+      }
+    } else {
+      return this.#regularFlow(configCallPromise);
+    }
   }
 
-  #ajaxPromise(url, data, options) {
-    return new Promise((resolve, reject) => {
-      ajax(url,
-        {
-          success: function (res) {
-            resolve(res)
-          },
-          error: function (err) {
-            reject(err)
-          }
-        }, data, options)
-    })
+  #isExternalModule() {
+    return typeof this.submoduleConfig.params.externalModuleUrl === 'string';
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  async #externalModuleFlow(configCallPromise) {
+    await loadExternalModule(this.submoduleConfig.params.externalModuleUrl);
+    const fetchFlowConfig = await configCallPromise;
+
+    return this.#getExternalIntegration().fetchId5Id(fetchFlowConfig, this.submoduleConfig.params, getRefererInfo(), this.gdprConsentData, this.usPrivacyData, this.gppData);
   }
 
   // eslint-disable-next-line no-dupe-class-members
-  #callForConfig(submoduleConfig) {
-    let url = submoduleConfig.params.configUrl || ID5_API_CONFIG_URL; // override for debug/test purposes only
-    return this.#ajaxPromise(url, JSON.stringify(submoduleConfig), {method: 'POST'})
-      .then(response => {
-        let responseObj = JSON.parse(response);
-        logInfo(LOG_PREFIX + 'config response received from the server', responseObj);
-        return responseObj;
-      });
+  #getExternalIntegration() {
+    return window.id5Prebid && window.id5Prebid.integration;
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  async #regularFlow(configCallPromise) {
+    const fetchFlowConfig = await configCallPromise;
+    const extensionsData = await this.#callForExtensions(fetchFlowConfig.extensionsCall);
+    const fetchCallResponse = await this.#callId5Fetch(fetchFlowConfig.fetchCall, extensionsData);
+    return this.#processFetchCallResponse(fetchCallResponse);
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  async #callForConfig() {
+    let url = this.submoduleConfig.params.configUrl || ID5_API_CONFIG_URL; // override for debug/test purposes only
+    const response = await fetch(url, {
+      method: 'POST',
+      body: JSON.stringify({
+        ...this.submoduleConfig,
+        bounce: true
+      }),
+      credentials: 'include'
+    });
+    if (!response.ok) {
+      throw new Error('Error while calling config endpoint: ', response);
+    }
+    const dynamicConfig = await response.json();
+    logInfo(LOG_PREFIX + 'config response received from the server', dynamicConfig);
+    return dynamicConfig;
   }
 
   // eslint-disable-next-line no-dupe-class-members
-  #callForExtensions(extensionsCallConfig) {
+  async #callForExtensions(extensionsCallConfig) {
     if (extensionsCallConfig === undefined) {
-      return Promise.resolve(undefined)
+      return undefined;
+    }
+    const extensionsUrl = extensionsCallConfig.url;
+    const method = extensionsCallConfig.method || 'GET';
+    const body = method === 'GET' ? undefined : JSON.stringify(extensionsCallConfig.body || {});
+    const response = await fetch(extensionsUrl, {method, body});
+    if (!response.ok) {
+      throw new Error('Error while calling extensions endpoint: ', response);
     }
-    let extensionsUrl = extensionsCallConfig.url
-    let method = extensionsCallConfig.method || 'GET'
-    let data = method === 'GET' ? undefined : JSON.stringify(extensionsCallConfig.body || {})
-    return this.#ajaxPromise(extensionsUrl, data, {'method': method})
-      .then(response => {
-        let responseObj = JSON.parse(response);
-        logInfo(LOG_PREFIX + 'extensions response received from the server', responseObj);
-        return responseObj;
-      })
+    const extensions = await response.json();
+    logInfo(LOG_PREFIX + 'extensions response received from the server', extensions);
+    return extensions;
   }
 
   // eslint-disable-next-line no-dupe-class-members
-  #callId5Fetch(fetchCallConfig, extensionsData) {
-    let url = fetchCallConfig.url;
-    let additionalData = fetchCallConfig.overrides || {};
-    let data = {
+  async #callId5Fetch(fetchCallConfig, extensionsData) {
+    const fetchUrl = fetchCallConfig.url;
+    const additionalData = fetchCallConfig.overrides || {};
+    const body = JSON.stringify({
       ...this.#createFetchRequestData(),
       ...additionalData,
       extensions: extensionsData
-    };
-    return this.#ajaxPromise(url, JSON.stringify(data), {method: 'POST', withCredentials: true})
-      .then(response => {
-        let responseObj = JSON.parse(response);
-        logInfo(LOG_PREFIX + 'fetch response received from the server', responseObj);
-        return responseObj;
-      });
+    });
+    const response = await fetch(fetchUrl, {method: 'POST', body, credentials: 'include'});
+    if (!response.ok) {
+      throw new Error('Error while calling fetch endpoint: ', response);
+    }
+    const fetchResponse = await response.json();
+    logInfo(LOG_PREFIX + 'fetch response received from the server', fetchResponse);
+    return fetchResponse;
   }
 
   // eslint-disable-next-line no-dupe-class-members
@@ -261,8 +394,10 @@ class IdFetchFlow {
     const params = this.submoduleConfig.params;
     const hasGdpr = (this.gdprConsentData && typeof this.gdprConsentData.gdprApplies === 'boolean' && this.gdprConsentData.gdprApplies) ? 1 : 0;
     const referer = getRefererInfo();
-    const signature = (this.cacheIdObj && this.cacheIdObj.signature) ? this.cacheIdObj.signature : getLegacyCookieSignature();
-    const nbPage = incrementNb(params.partner);
+    const signature = this.cacheIdObj ? this.cacheIdObj.signature : undefined;
+    const nbPage = incrementNb(this.cacheIdObj);
+    const trueLinkInfo = window.id5Bootstrap ? window.id5Bootstrap.getTrueLinkInfo() : {booted: false};
+
     const data = {
       'partner': params.partner,
       'gdpr': hasGdpr,
@@ -275,7 +410,8 @@ class IdFetchFlow {
       'u': referer.stack[0] || window.location.href,
       'v': '$prebid.version$',
       'storage': this.submoduleConfig.storage,
-      'localStorage': storage.localStorageIsEnabled() ? 1 : 0
+      'localStorage': storage.localStorageIsEnabled() ? 1 : 0,
+      'true_link': trueLinkInfo
     };
 
     // pass in optional data, but only if populated
@@ -285,6 +421,11 @@ class IdFetchFlow {
     if (this.usPrivacyData !== undefined && !isEmpty(this.usPrivacyData) && !isEmptyStr(this.usPrivacyData)) {
       data.us_privacy = this.usPrivacyData;
     }
+    if (this.gppData) {
+      data.gpp_string = this.gppData.gppString;
+      data.gpp_sid = this.gppData.applicableSections;
+    }
+
     if (signature !== undefined && !isEmptyStr(signature)) {
       data.s = signature;
     }
@@ -303,6 +444,35 @@ class IdFetchFlow {
     }
     return data;
   }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #processFetchCallResponse(fetchCallResponse) {
+    try {
+      if (fetchCallResponse.privacy) {
+        if (window.id5Bootstrap && window.id5Bootstrap.setPrivacy) {
+          window.id5Bootstrap.setPrivacy(fetchCallResponse.privacy);
+        }
+      }
+    } catch (error) {
+      logError(LOG_PREFIX + 'Error while writing privacy info into local storage.', error);
+    }
+    return fetchCallResponse;
+  }
+}
+
+async function loadExternalModule(url) {
+  return new GreedyPromise((resolve, reject) => {
+    if (window.id5Prebid) {
+      // Already loaded
+      resolve();
+    } else {
+      try {
+        loadExternalScript(url, MODULE_TYPE_UID, 'id5', resolve);
+      } catch (error) {
+        reject(error);
+      }
+    }
+  });
 }
 
 function validateConfig(config) {
@@ -311,7 +481,7 @@ function validateConfig(config) {
     return false;
   }
 
-  const partner = config.params.partner
+  const partner = config.params.partner;
   if (typeof partner === 'string' || partner instanceof String) {
     let parsedPartnerId = parseInt(partner);
     if (isNaN(parsedPartnerId) || parsedPartnerId < 0) {
@@ -329,87 +499,19 @@ function validateConfig(config) {
     logError(LOG_PREFIX + 'storage required to be set');
     return false;
   }
-
-  // in a future release, we may return false if storage type or name are not set as required
-  if (config.storage.type !== LOCAL_STORAGE) {
-    logWarn(LOG_PREFIX + `storage type recommended to be '${LOCAL_STORAGE}'. In a future release this may become a strict requirement`);
-  }
-  // in a future release, we may return false if storage type or name are not set as required
   if (config.storage.name !== ID5_STORAGE_NAME) {
-    logWarn(LOG_PREFIX + `storage name recommended to be '${ID5_STORAGE_NAME}'. In a future release this may become a strict requirement`);
+    logWarn(LOG_PREFIX + `storage name recommended to be '${ID5_STORAGE_NAME}'.`);
   }
 
   return true;
 }
 
-export function expDaysStr(expDays) {
-  return (new Date(Date.now() + (1000 * 60 * 60 * 24 * expDays))).toUTCString();
-}
-
-export function nbCacheName(partnerId) {
-  return `${ID5_STORAGE_NAME}_${partnerId}_nb`;
-}
-
-export function storeNbInCache(partnerId, nb) {
-  storeInLocalStorage(nbCacheName(partnerId), nb, NB_EXP_DAYS);
-}
-
-export function getNbFromCache(partnerId) {
-  let cacheNb = getFromLocalStorage(nbCacheName(partnerId));
-  return (cacheNb) ? parseInt(cacheNb) : 0;
-}
-
-function incrementNb(partnerId) {
-  const nb = (getNbFromCache(partnerId) + 1);
-  storeNbInCache(partnerId, nb);
-  return nb;
-}
-
-function resetNb(partnerId) {
-  storeNbInCache(partnerId, 0);
-}
-
-function getLegacyCookieSignature() {
-  let legacyStoredValue;
-  LEGACY_COOKIE_NAMES.forEach(function (cookie) {
-    if (storage.getCookie(cookie)) {
-      legacyStoredValue = safeJSONParse(storage.getCookie(cookie)) || legacyStoredValue;
-    }
-  });
-  return (legacyStoredValue && legacyStoredValue.signature) || '';
-}
-
-/**
- * This will make sure we check for expiration before accessing local storage
- * @param {string} key
- */
-export function getFromLocalStorage(key) {
-  const storedValueExp = storage.getDataFromLocalStorage(`${key}_exp`);
-  // empty string means no expiration set
-  if (storedValueExp === '') {
-    return storage.getDataFromLocalStorage(key);
-  } else if (storedValueExp) {
-    if ((new Date(storedValueExp)).getTime() - Date.now() > 0) {
-      return storage.getDataFromLocalStorage(key);
-    }
+function incrementNb(cachedObj) {
+  if (cachedObj && cachedObj.nbPage !== undefined) {
+    return cachedObj.nbPage + 1;
+  } else {
+    return 1;
   }
-  // if we got here, then we have an expired item or we didn't set an
-  // expiration initially somehow, so we need to remove the item from the
-  // local storage
-  storage.removeDataFromLocalStorage(key);
-  return null;
-}
-
-/**
- * Ensure that we always set an expiration in local storage since
- * by default it's not required
- * @param {string} key
- * @param {any} value
- * @param {integer} expDays
- */
-export function storeInLocalStorage(key, value, expDays) {
-  storage.setDataInLocalStorage(`${key}_exp`, expDaysStr(expDays));
-  storage.setDataInLocalStorage(`${key}`, value);
 }
 
 /**
@@ -419,8 +521,8 @@ export function storeInLocalStorage(key, value, expDays) {
  */
 function hasWriteConsentToLocalStorage(consentData) {
   const hasGdpr = consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies;
-  const localstorageConsent = deepAccess(consentData, `vendorData.purpose.consents.1`)
-  const id5VendorConsent = deepAccess(consentData, `vendorData.vendor.consents.${GVLID.toString()}`)
+  const localstorageConsent = deepAccess(consentData, `vendorData.purpose.consents.1`);
+  const id5VendorConsent = deepAccess(consentData, `vendorData.vendor.consents.${GVLID.toString()}`);
   if (hasGdpr && (!localstorageConsent || !id5VendorConsent)) {
     return false;
   }
diff --git a/modules/id5IdSystem.md b/modules/id5IdSystem.md
index 927fa10f87b..a2782b70559 100644
--- a/modules/id5IdSystem.md
+++ b/modules/id5IdSystem.md
@@ -25,6 +25,7 @@ pbjs.setConfig({
       name: 'id5Id',
       params: {
         partner: 173,            // change to the Partner Number you received from ID5
+        externalModuleUrl: "https://cdn.id5-sync.com/api/1.0/id5PrebidModule.js" // optional but recommended
         pd: 'MT1iNTBjY...',      // optional, see table below for a link to how to generate this
         abTesting: {             // optional
           enabled: true,         // false by default
@@ -36,7 +37,7 @@ pbjs.setConfig({
         type: 'html5',           // "html5" is the required storage type
         name: 'id5id',           // "id5id" is the required storage name
         expires: 90,             // storage lasts for 90 days
-        refreshInSeconds: 8*3600 // refresh ID every 8 hours to ensure it's fresh
+        refreshInSeconds: 7200   // refresh ID every 2 hours to ensure it's fresh
       }
     }],
     auctionDelay: 50             // 50ms maximum auction delay, applies to all userId modules
@@ -49,6 +50,7 @@ pbjs.setConfig({
 | name | Required | String | The name of this module: `"id5Id"`                                                                                                                                                                                                                                             | `"id5Id"` |
 | params | Required | Object | Details for the ID5 ID.                                                                                                                                                                                                                                                        | |
 | params.partner | Required | Number | This is the ID5 Partner Number obtained from registering with ID5.                                                                                                                                                                                                             | `173` |
+| params.externalModuleUrl | Optional | String | The URL for the id5-prebid external module. It is recommended to use the latest version at the URL in the example. Source code available [here](https://github.com/id5io/id5-api.js/blob/master/src/id5PrebidModule.js). | https://cdn.id5-sync.com/api/1.0/id5PrebidModule.js
 | params.pd | Optional | String | Partner-supplied data used for linking ID5 IDs across domains. See [our documentation](https://wiki.id5.io/en/identitycloud/retrieve-id5-ids/passing-partner-data-to-id5) for details on generating the string. Omit the parameter or leave as an empty string if no data to supply     | `"MT1iNTBjY..."` |
 | params.provider | Optional | String | An identifier provided by ID5 to technology partners who manage Prebid setups on behalf of publishers. Reach out to [ID5](mailto:prebid@id5.io) if you have questions about this parameter                                                                                     | `pubmatic-identity-hub` |
 | params.abTesting | Optional | Object | Allows publishers to easily run an A/B Test. If enabled and the user is in the Control Group, the ID5 ID will NOT be exposed to bid adapters for that request                                                                                                                  | Disabled by default |
@@ -59,7 +61,7 @@ pbjs.setConfig({
 | storage.type | Required | String | This is where the results of the user ID will be stored. ID5 **requires** `"html5"`.                                                                                                                                                                                           | `"html5"` |
 | storage.name | Required | String | The name of the local storage where the user ID will be stored. ID5 **requires** `"id5id"`.                                                                                                                                                                                    | `"id5id"` |
 | storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. ID5 recommends `90`.                                                                                                                                                                                                | `90` |
-| storage.refreshInSeconds | Optional | Integer | How many seconds until the ID5 ID will be refreshed. ID5 strongly recommends 8 hours between refreshes                                                                                                                                                                         | `8*3600` |
+| storage.refreshInSeconds | Optional | Integer | How many seconds until the ID5 ID will be refreshed. ID5 strongly recommends 2 hours between refreshes                                                                                                                                                                         | `7200` |
 
 **ATTENTION:** As of Prebid.js v4.14.0, ID5 requires `storage.type` to be `"html5"` and `storage.name` to be `"id5id"`. Using other values will display a warning today, but in an upcoming release, it will prevent the ID5 module from loading. This change is to ensure the ID5 module in Prebid.js interoperates properly with the [ID5 API](https://github.com/id5io/id5-api.js) and to reduce the size of publishers' first-party cookies that are sent to their web servers. If you have any questions, please reach out to us at [prebid@id5.io](mailto:prebid@id5.io).
 
@@ -71,3 +73,68 @@ To turn on A/B Testing, simply edit the configuration (see above table) to enabl
 
 ### A Note on Using Multiple Wrappers
 If you or your monetization partners are deploying multiple Prebid wrappers on your websites, you should make sure you add the ID5 ID User ID module to *every* wrapper. Only the bidders configured in the Prebid wrapper where the ID5 ID User ID module is installed and configured will be able to pick up the ID5 ID. Bidders from other Prebid instances will not be able to pick up the ID5 ID.
+
+### Provided eids
+The module provides following eids:
+
+```
+[
+  {
+    source: 'id5-sync.com',
+    uids: [
+      {
+        id: 'some-random-id-value',
+        atype: 1,
+        ext: {
+          linkType: 2,
+          abTestingControlGroup: false
+        }
+      }
+    ]
+  },
+  {
+    source: 'true-link-id5-sync.com',
+    uids: [
+      {
+        id: 'some-publisher-true-link-id',
+        atype: 1
+      }
+    ]
+  },
+  {
+    source: 'uidapi.com',
+    uids: [
+      {
+        id: 'some-uid2',
+        atype: 3,
+        ext: {
+          provider: 'id5-sync.com'
+        }
+      }
+    ]
+  }
+]
+```
+
+The id from `id5-sync.com` should be always present (though the id provided will be '0' in case of no consent or optout)
+
+The id from `true-link-id5-sync.com` will be available if the page is integrated with TrueLink (if you are an ID5 partner you can learn more at https://wiki.id5.io/en/identitycloud/retrieve-id5-ids/true-link-integration)
+
+The id from `uidapi.com` will be available if the partner that is used in ID5 user module has the EUID2 integration enabled (it has to be enabled on the ID5 side)
+
+
+### Providing TrueLinkId as a Google PPID
+
+TrueLinkId can be provided as a PPID - to use, it the `true-link-id5-sync.com` needs to be provided as a ppid source in prebid userSync configuration:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    ppid: 'true-link-id5-sync.com',
+    userIds: [],  //userIds modules should be configured here
+  }
+});
+```
+
+
+
diff --git a/modules/idImportLibrary.js b/modules/idImportLibrary.js
index e1847edfce4..8cfa7e47c7c 100644
--- a/modules/idImportLibrary.js
+++ b/modules/idImportLibrary.js
@@ -1,15 +1,19 @@
-import { logInfo, logError } from '../src/utils.js';
-import {getGlobal} from '../src/prebidGlobal.js';
-import {ajax} from '../src/ajax.js';
-import {config} from '../src/config.js';
 import MD5 from 'crypto-js/md5.js';
+import { ACTIVITY_ENRICH_UFPD } from '../src/activities/activities.js';
+import { activityParams } from '../src/activities/activityParams.js';
+import { MODULE_TYPE_PREBID } from '../src/activities/modules.js';
+import { isActivityAllowed } from '../src/activities/rules.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { logError, logInfo } from '../src/utils.js';
 
 let email;
 let conf;
 const LOG_PRE_FIX = 'ID-Library: ';
 const CONF_DEFAULT_OBSERVER_DEBOUNCE_MS = 250;
-const CONF_DEFAULT_FULL_BODY_SCAN = false;
-const CONF_DEFAULT_INPUT_SCAN = false;
+export const CONF_DEFAULT_FULL_BODY_SCAN = false;
+export const CONF_DEFAULT_INPUT_SCAN = false;
 const OBSERVER_CONFIG = {
   subtree: true,
   attributes: true,
@@ -155,7 +159,7 @@ function handleTargetElement() {
 
   const targetElement = document.getElementById(conf.target);
   if (targetElement) {
-    email = targetElement.innerText;
+    email = targetElement.textContent;
 
     if (!email) {
       _logInfo('Finding the email with observer');
@@ -257,6 +261,10 @@ export function setConfig(config) {
     _logError('The required url is not configured');
     return;
   }
+  if (!isActivityAllowed(ACTIVITY_ENRICH_UFPD, activityParams(MODULE_TYPE_PREBID, 'idImportLibrary'))) {
+    _logError('Permission for id import was denied by CMP');
+    return;
+  }
   if (typeof config.debounce !== 'number') {
     config.debounce = CONF_DEFAULT_OBSERVER_DEBOUNCE_MS;
     _logInfo('Set default observer debounce to ' + CONF_DEFAULT_OBSERVER_DEBOUNCE_MS);
diff --git a/modules/idWardRtdProvider.js b/modules/idWardRtdProvider.js
deleted file mode 100644
index 29dda216fdc..00000000000
--- a/modules/idWardRtdProvider.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * This module adds the ID Ward RTD provider to the real time data module
- * The {@link module:modules/realTimeData} module is required
- * The module will poulate real-time data from ID Ward
- * @module modules/idWardRtdProvider
- * @requires module:modules/realTimeData
- */
-import {getStorageManager} from '../src/storageManager.js';
-import {submodule} from '../src/hook.js';
-import {isPlainObject, mergeDeep, logMessage, logError} from '../src/utils.js';
-import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
-
-const MODULE_NAME = 'realTimeData';
-const SUBMODULE_NAME = 'idWard';
-
-export const storage = getStorageManager({moduleType: MODULE_TYPE_RTD, moduleName: SUBMODULE_NAME});
-/**
- * Add real-time data & merge segments.
- * @param ortb2 object to merge into
- * @param {Object} rtd
- */
-function addRealTimeData(ortb2, rtd) {
-  if (isPlainObject(rtd.ortb2)) {
-    logMessage('idWardRtdProvider: merging original: ', ortb2);
-    logMessage('idWardRtdProvider: merging in: ', rtd.ortb2);
-    mergeDeep(ortb2, rtd.ortb2);
-  }
-}
-
-/**
-  * Try parsing stringified array of segment IDs.
-  * @param {String} data
-  */
-function tryParse(data) {
-  try {
-    return JSON.parse(data);
-  } catch (err) {
-    logError(`idWardRtdProvider: failed to parse json:`, data);
-    return null;
-  }
-}
-
-/**
-  * Real-time data retrieval from ID Ward
-  * @param {Object} reqBidsConfigObj
-  * @param {function} onDone
-  * @param {Object} rtdConfig
-  * @param {Object} userConsent
-  */
-export function getRealTimeData(reqBidsConfigObj, onDone, rtdConfig, userConsent) {
-  if (rtdConfig && isPlainObject(rtdConfig.params)) {
-    const jsonData = storage.getDataFromLocalStorage(rtdConfig.params.cohortStorageKey)
-
-    if (!jsonData) {
-      return;
-    }
-
-    const segments = tryParse(jsonData);
-
-    if (segments) {
-      const udSegment = {
-        name: 'id-ward.com',
-        ext: {
-          segtax: rtdConfig.params.segtax
-        },
-        segment: segments.map(x => ({id: x}))
-      }
-
-      logMessage('idWardRtdProvider: user.data.segment: ', udSegment);
-      const data = {
-        rtd: {
-          ortb2: {
-            user: {
-              data: [
-                udSegment
-              ]
-            }
-          }
-        }
-      };
-      addRealTimeData(reqBidsConfigObj.ortb2Fragments?.global, data.rtd);
-      onDone();
-    }
-  }
-}
-
-/**
-  * Module init
-  * @param {Object} provider
-  * @param {Object} userConsent
-  * @return {boolean}
-  */
-function init(provider, userConsent) {
-  return true;
-}
-
-/** @type {RtdSubmodule} */
-export const idWardRtdSubmodule = {
-  name: SUBMODULE_NAME,
-  getBidRequestData: getRealTimeData,
-  init: init
-};
-
-submodule(MODULE_NAME, idWardRtdSubmodule);
diff --git a/modules/idWardRtdProvider.md b/modules/idWardRtdProvider.md
deleted file mode 100644
index 5a44bfa49f3..00000000000
--- a/modules/idWardRtdProvider.md
+++ /dev/null
@@ -1,44 +0,0 @@
-### Overview
-
-ID Ward is a data anonymization technology for privacy-preserving advertising. Publishers and advertisers are able to target and retarget custom audience segments covering 100% of consented audiences. 
-ID Ward’s Real-time Data Provider automatically obtains segment IDs from the ID Ward on-domain script (via localStorage) and passes them to the bid-stream.
-
-### Integration
-
- 1) Build the idWardRtd module into the Prebid.js package with:
-
- ```
- gulp build --modules=idWardRtdProvider,...
- ```
-
- 2) Use `setConfig` to instruct Prebid.js to initilaize the idWardRtdProvider module, as specified below.
-
-### Configuration
-
-```
- pbjs.setConfig({
-   realTimeData: {
-     dataProviders: [
-       {
-         name: "idWard",
-         waitForIt: true,
-         params: {
-           cohortStorageKey: "cohort_ids",
-           segtax: ,           
-         }
-       }
-     ]
-   }
- });
- ```
-
-Please note that idWardRtdProvider should be integrated into the publisher website along with the [ID Ward Pixel](https://publishers-web.id-ward.com/pixel-integration).
-Please reach out to Id Ward representative(support@id-ward.com) if you have any questions or need further help to integrate Prebid, idWardRtdProvider, and Id Ward Pixel
-
-### Testing
-To view an example of available segments returned by Id Ward:
-```
-‘gulp serve --modules=rtdModule,idWardRtdProvider,pubmaticBidAdapter
-```
-and then point your browser at:
-"http://localhost:9999/integrationExamples/gpt/idward_segments_example.html"
diff --git a/modules/identityLinkIdSystem.js b/modules/identityLinkIdSystem.js
index ba794df1a9c..a9d88110308 100644
--- a/modules/identityLinkIdSystem.js
+++ b/modules/identityLinkIdSystem.js
@@ -10,6 +10,14 @@ import { ajax } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
+import { gppDataHandler } from '../src/adapterManager.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
 
 const MODULE_NAME = 'identityLink';
 
@@ -53,18 +61,21 @@ export const identityLinkSubmodule = {
     }
     const hasGdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
     const gdprConsentString = hasGdpr ? consentData.consentString : '';
-    const tcfPolicyV2 = utils.deepAccess(consentData, 'vendorData.tcfPolicyVersion') === 2;
     // use protocol relative urls for http or https
     if (hasGdpr && (!gdprConsentString || gdprConsentString === '')) {
       utils.logInfo('identityLink: Consent string is required to call envelope API.');
       return;
     }
-    const url = `https://api.rlcdn.com/api/identity/envelope?pid=${configParams.pid}${hasGdpr ? (tcfPolicyV2 ? '&ct=4&cv=' : '&ct=1&cv=') + gdprConsentString : ''}`;
+    const gppData = gppDataHandler.getConsentData();
+    const gppString = gppData && gppData.gppString ? gppData.gppString : false;
+    const gppSectionId = gppData && gppData.gppString && gppData.applicableSections.length > 0 && gppData.applicableSections[0] !== -1 ? gppData.applicableSections[0] : false;
+    const hasGpp = gppString && gppSectionId;
+    const url = `https://api.rlcdn.com/api/identity/envelope?pid=${configParams.pid}${hasGdpr ? '&ct=4&cv=' + gdprConsentString : ''}${hasGpp ? '&gpp=' + gppString + '&gpp_sid=' + gppSectionId : ''}`;
     let resp;
     resp = function (callback) {
       // Check ats during callback so it has a chance to initialise.
       // If ats library is available, use it to retrieve envelope. If not use standard third party endpoint
-      if (window.ats) {
+      if (window.ats && window.ats.retrieveEnvelope) {
         utils.logInfo('identityLink: ATS exists!');
         window.ats.retrieveEnvelope(function (envelope) {
           if (envelope) {
@@ -121,6 +132,8 @@ function getEnvelope(url, callback, configParams) {
     utils.logInfo('identityLink: A 3P retrieval is attempted!');
     setEnvelopeSource(false);
     ajax(url, callbacks, undefined, { method: 'GET', withCredentials: true });
+  } else {
+    callback()
   }
 }
 
diff --git a/modules/idxBidAdapter.js b/modules/idxBidAdapter.js
index 48739275788..12adb4058ae 100644
--- a/modules/idxBidAdapter.js
+++ b/modules/idxBidAdapter.js
@@ -1,6 +1,7 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { BANNER } from '../src/mediaTypes.js'
 import { isArray, isNumber } from '../src/utils.js'
+import { interpretResponse } from '../libraries/precisoUtils/bidUtils.js';
 
 const BIDDER_CODE = 'idx'
 const ENDPOINT_URL = 'https://dev-event.dxmdp.com/rest/api/v1/bid'
@@ -49,32 +50,7 @@ export const spec = {
       }
     }
   },
-  interpretResponse: function (serverResponse) {
-    const response = serverResponse.body
-
-    const bids = []
-
-    response.seatbid.forEach(seat => {
-      seat.bid.forEach(bid => {
-        bids.push({
-          requestId: bid.impid,
-          cpm: bid.price,
-          width: bid.w,
-          height: bid.h,
-          creativeId: bid.crid,
-          ad: bid.adm,
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 300,
-          meta: {
-            advertiserDomains: bid.adomain || [],
-          },
-        })
-      })
-    })
-
-    return bids
-  },
+  interpretResponse,
 }
 
 registerBidder(spec)
diff --git a/modules/idxIdSystem.js b/modules/idxIdSystem.js
index bf807f199a6..db545eecd8c 100644
--- a/modules/idxIdSystem.js
+++ b/modules/idxIdSystem.js
@@ -9,6 +9,11 @@ import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ */
+
 const IDX_MODULE_NAME = 'idx';
 const IDX_COOKIE_NAME = '_idx';
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: IDX_MODULE_NAME});
diff --git a/modules/illuminBidAdapter.js b/modules/illuminBidAdapter.js
new file mode 100644
index 00000000000..0e76e471f4b
--- /dev/null
+++ b/modules/illuminBidAdapter.js
@@ -0,0 +1,37 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {
+  isBidRequestValid, createUserSyncGetter, createInterpretResponseFn, createBuildRequestsFn
+} from '../libraries/vidazooUtils/bidderUtils.js';
+
+const DEFAULT_SUB_DOMAIN = 'exchange';
+const BIDDER_CODE = 'illumin';
+const BIDDER_VERSION = '1.0.0';
+const GVLID = 149;
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
+  return `https://${subDomain}.illumin.com`;
+}
+
+const buildRequests = createBuildRequestsFn(createDomain, null, storage, BIDDER_CODE, BIDDER_VERSION, false);
+
+const interpretResponse = createInterpretResponseFn(BIDDER_CODE, false);
+
+const getUserSyncs = createUserSyncGetter({
+  iframeSyncUrl: 'https://sync.illumin.com/api/sync/iframe', imageSyncUrl: 'https://sync.illumin.com/api/sync/image'
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: [BANNER, VIDEO],
+  gvlid: GVLID,
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs
+};
+
+registerBidder(spec);
diff --git a/modules/minutemediaplusBidAdapter.md b/modules/illuminBidAdapter.md
similarity index 72%
rename from modules/minutemediaplusBidAdapter.md
rename to modules/illuminBidAdapter.md
index 410c00e7017..8ca656230e4 100644
--- a/modules/minutemediaplusBidAdapter.md
+++ b/modules/illuminBidAdapter.md
@@ -1,15 +1,15 @@
 # Overview
 
-**Module Name:** MinuteMediaPlus Bidder Adapter
+**Module Name:** Illumin Bid Adapter
 
 **Module Type:** Bidder Adapter
 
-**Maintainer:** hb@minutemedia.com
+**Maintainer:** integrations@illumin.com
 
 # Description
 
-Module that connects to MinuteMediaPlus's demand sources.
- 
+Module that connects to Illumin's demand sources.
+
 # Test Parameters
 ```js
 var adUnits = [
@@ -18,7 +18,7 @@ var adUnits = [
     sizes: [[300, 250]],
     bids: [
       {
-        bidder: 'mmplus',
+        bidder: 'illumin',
         params: {
           cId: '562524b21b1c1f08117fc7f9',
           pId: '59ac17c192832d0011283fe3',
diff --git a/modules/imRtdProvider.js b/modules/imRtdProvider.js
index 26d49c49f8c..78681c2beda 100644
--- a/modules/imRtdProvider.js
+++ b/modules/imRtdProvider.js
@@ -20,6 +20,10 @@ import {
 import {submodule} from '../src/hook.js';
 import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 export const imUidLocalName = '__im_uid';
 export const imVidCookieName = '_im_vid';
 export const imRtdLocalName = '__im_sids';
@@ -50,8 +54,8 @@ function getSegments(segments, moduleConfig) {
 }
 
 /**
-* @param {string} bidderName
-*/
+ * @param {string} bidderName
+ */
 export function getBidderFunction(bidderName) {
   const biddersFunction = {
     pubmatic: function (bid, data, moduleConfig) {
diff --git a/modules/imdsBidAdapter.js b/modules/imdsBidAdapter.js
index 122662feb8a..0a0514df205 100644
--- a/modules/imdsBidAdapter.js
+++ b/modules/imdsBidAdapter.js
@@ -11,7 +11,7 @@ const BID_SCHEME = 'https://';
 const BID_DOMAIN = 'technoratimedia.com';
 const USER_SYNC_IFRAME_URL = 'https://ad-cdn.technoratimedia.com/html/usersync.html';
 const USER_SYNC_PIXEL_URL = 'https://sync.technoratimedia.com/services';
-const VIDEO_PARAMS = [ 'minduration', 'maxduration', 'startdelay', 'placement', 'linearity', 'mimes', 'protocols', 'api' ];
+const VIDEO_PARAMS = [ 'minduration', 'maxduration', 'startdelay', 'placement', 'plcmt', 'linearity', 'mimes', 'protocols', 'api' ];
 const BLOCKED_AD_SIZES = [
   '1x1',
   '1x2'
@@ -224,7 +224,6 @@ export const spec = {
     };
 
     if (!serverResponse.body || typeof serverResponse.body != 'object') {
-      logWarn('IMDS: server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
       return;
     }
     const {id, seatbid: seatbids} = serverResponse.body;
@@ -324,7 +323,7 @@ export const spec = {
       });
     } else if (syncOptions.pixelEnabled) {
       syncs.push({
-        type: 'pixel',
+        type: 'image',
         url: `${USER_SYNC_PIXEL_URL}?srv=cs&${queryParams.join('&')}`
       });
     }
diff --git a/modules/imdsBidAdapter.md b/modules/imdsBidAdapter.md
index 15fb407e7ef..2a50868d726 100644
--- a/modules/imdsBidAdapter.md
+++ b/modules/imdsBidAdapter.md
@@ -11,11 +11,11 @@ Maintainer: eng-demand@imds.tv
 The iMedia Digital Services adapter requires setup and approval from iMedia Digital Services.
 Please reach out to your account manager for more information.
 
-### DFP Video Creative
-To use video, setup a `VAST redirect` creative within Google AdManager (DFP) with the following VAST tag URL:
+### Google Ad Manager Video Creative
+To use video, setup a `VAST redirect` creative within Google Ad Manager with the following VAST tag URL:
 
-```
-https://track.technoratimedia.com/openrtb/tags?ID=%%PATTERN:hb_cache_id_synacorm%%&AUCTION_PRICE=%%PATTERN:hb_pb_synacormedia%%
+```text
+https://track.technoratimedia.com/openrtb/tags?ID=%%PATTERN:hb_uuid_imds%%&AUCTION_PRICE=%%PATTERN:hb_pb_imds%%
 ```
 
 # Test Parameters
diff --git a/modules/impactifyBidAdapter.js b/modules/impactifyBidAdapter.js
index f2bf9aaddcb..fcd9360d973 100644
--- a/modules/impactifyBidAdapter.js
+++ b/modules/impactifyBidAdapter.js
@@ -1,7 +1,18 @@
-import {deepAccess, deepSetValue, generateUUID} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {config} from '../src/config.js';
-import {ajax} from '../src/ajax.js';
+'use strict';
+
+import { deepAccess, deepSetValue, generateUUID, isPlainObject } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { ajax } from '../src/ajax.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
 
 const BIDDER_CODE = 'impactify';
 const BIDDER_ALIAS = ['imp'];
@@ -10,58 +21,126 @@ const DEFAULT_VIDEO_WIDTH = 640;
 const DEFAULT_VIDEO_HEIGHT = 360;
 const ORIGIN = 'https://sonic.impactify.media';
 const LOGGER_URI = 'https://logger.impactify.media';
-const AUCTIONURI = '/bidder';
-const COOKIESYNCURI = '/static/cookie_sync.html';
-const GVLID = 606;
-const GETCONFIG = config.getConfig;
-
-const getDeviceType = () => {
-  // OpenRTB Device type
-  if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(navigator.userAgent.toLowerCase()))) {
-    return 5;
-  }
-  if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(navigator.userAgent.toLowerCase()))) {
-    return 4;
-  }
-  return 2;
-};
+const LOGGER_JS_URI = 'https://log.impactify.it'
+const AUCTION_URI = '/bidder';
+const COOKIE_SYNC_URI = '/static/cookie_sync.html';
+const GVL_ID = 606;
+const GET_CONFIG = config.getConfig;
+export const STORAGE = getStorageManager({ gvlid: GVL_ID, bidderCode: BIDDER_CODE });
+export const STORAGE_KEY = '_im_str'
+
+/**
+ * Helpers object
+ * @type {{getExtParamsFromBid(*): {impactify: {appId}}, createOrtbImpVideoObj(*): {context: string, playerSize: [number,number], id: string, mimes: [string]}, getDeviceType(): (number), createOrtbImpBannerObj(*, *): {format: [], id: string}}}
+ */
+const helpers = {
+  getExtParamsFromBid(bid) {
+    let ext = {
+      impactify: {
+        appId: bid.params.appId
+      },
+    };
 
-const getFloor = (bid) => {
-  const floorInfo = bid.getFloor({
-    currency: DEFAULT_CURRENCY,
-    mediaType: '*',
-    size: '*'
-  });
-  if (typeof floorInfo === 'object' && floorInfo.currency === DEFAULT_CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
-    return parseFloat(floorInfo.floor);
+    if (typeof bid.params.format == 'string') {
+      ext.impactify.format = bid.params.format;
+    }
+
+    if (typeof bid.params.style == 'string') {
+      ext.impactify.style = bid.params.style;
+    }
+
+    if (typeof bid.params.container == 'string') {
+      ext.impactify.container = bid.params.container;
+    }
+
+    if (typeof bid.params.size == 'string') {
+      ext.impactify.size = bid.params.size;
+    }
+
+    return ext;
+  },
+
+  getDeviceType() {
+    // OpenRTB Device type
+    if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(navigator.userAgent.toLowerCase()))) {
+      return 5;
+    }
+    if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(navigator.userAgent.toLowerCase()))) {
+      return 4;
+    }
+    return 2;
+  },
+
+  createOrtbImpBannerObj(bid, size) {
+    let sizes = size.split('x');
+
+    return {
+      id: 'banner-' + bid.bidId,
+      format: [{
+        w: parseInt(sizes[0]),
+        h: parseInt(sizes[1])
+      }]
+    }
+  },
+
+  createOrtbImpVideoObj(bid) {
+    return {
+      id: 'video-' + bid.bidId,
+      playerSize: [DEFAULT_VIDEO_WIDTH, DEFAULT_VIDEO_HEIGHT],
+      context: 'outstream',
+      mimes: ['video/mp4'],
+    }
+  },
+
+  getFloor(bid) {
+    const floorInfo = bid.getFloor({
+      currency: DEFAULT_CURRENCY,
+      mediaType: '*',
+      size: '*'
+    });
+    if (isPlainObject(floorInfo) && floorInfo.currency === DEFAULT_CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
+      return parseFloat(floorInfo.floor);
+    }
+    return null;
+  },
+
+  getImStrFromLocalStorage() {
+    return STORAGE.localStorageIsEnabled(false) ? STORAGE.getDataFromLocalStorage(STORAGE_KEY, false) : '';
   }
-  return null;
+
 }
 
-const createOpenRtbRequest = (validBidRequests, bidderRequest) => {
+/**
+ * Create an OpenRTB formated object from prebid payload
+ * @param validBidRequests
+ * @param bidderRequest
+ * @returns {{cur: string[], validBidRequests, id, source: {tid}, imp: *[]}}
+ */
+function createOpenRtbRequest(validBidRequests, bidderRequest) {
   // Create request and set imp bids inside
   let request = {
     id: bidderRequest.bidderRequestId,
     validBidRequests,
     cur: [DEFAULT_CURRENCY],
     imp: [],
-    source: {tid: bidderRequest.ortb2?.source?.tid}
+    source: { tid: bidderRequest.ortb2?.source?.tid }
   };
 
   // Get the url parameters
   const queryString = window.location.search;
   const urlParams = new URLSearchParams(queryString);
   const checkPrebid = urlParams.get('_checkPrebid');
-  // Force impactify debugging parameter
+
+  // Force impactify debugging parameter if present
   if (checkPrebid != null) {
     request.test = Number(checkPrebid);
   }
 
-  // Set Schain in request
+  // Set SChain in request
   let schain = deepAccess(validBidRequests, '0.schain');
   if (schain) request.source.ext = { schain: schain };
 
-  // Set eids
+  // Set Eids
   let eids = deepAccess(validBidRequests, '0.userIdAsEids');
   if (eids && eids.length) {
     deepSetValue(request, 'user.ext.eids', eids);
@@ -73,13 +152,13 @@ const createOpenRtbRequest = (validBidRequests, bidderRequest) => {
   request.device = {
     w: window.innerWidth,
     h: window.innerHeight,
-    devicetype: getDeviceType(),
+    devicetype: helpers.getDeviceType(),
     ua: navigator.userAgent,
     js: 1,
     dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
     language: ((navigator.language || navigator.userLanguage || '').split('-'))[0] || 'en',
   };
-  request.site = {page: bidderRequest.refererInfo.page};
+  request.site = { page: bidderRequest.refererInfo.page };
 
   // Handle privacy settings for GDPR/CCPA/COPPA
   let gdprApplies = 0;
@@ -89,11 +168,7 @@ const createOpenRtbRequest = (validBidRequests, bidderRequest) => {
   }
   deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
 
-  if (bidderRequest.uspConsent) {
-    deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-  }
-
-  if (GETCONFIG('coppa') == true) deepSetValue(request, 'regs.coppa', 1);
+  if (GET_CONFIG('coppa') == true) deepSetValue(request, 'regs.coppa', 1);
 
   if (bidderRequest.uspConsent) {
     deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
@@ -104,42 +179,47 @@ const createOpenRtbRequest = (validBidRequests, bidderRequest) => {
 
   // Create imps with bids
   validBidRequests.forEach((bid) => {
+    let bannerObj = deepAccess(bid.mediaTypes, `banner`);
+
     let imp = {
       id: bid.bidId,
       bidfloor: bid.params.bidfloor ? bid.params.bidfloor : 0,
-      ext: {
-        impactify: {
-          appId: bid.params.appId,
-          format: bid.params.format,
-          style: bid.params.style
-        },
-      },
-      video: {
-        playerSize: [DEFAULT_VIDEO_WIDTH, DEFAULT_VIDEO_HEIGHT],
-        context: 'outstream',
-        mimes: ['video/mp4'],
-      },
+      ext: helpers.getExtParamsFromBid(bid)
     };
-    if (bid.params.container) {
-      imp.ext.impactify.container = bid.params.container;
+
+    if (bannerObj && typeof imp.ext.impactify.size == 'string') {
+      imp.banner = {
+        ...helpers.createOrtbImpBannerObj(bid, imp.ext.impactify.size)
+      }
+    } else {
+      imp.video = {
+        ...helpers.createOrtbImpVideoObj(bid)
+      }
     }
+
     if (typeof bid.getFloor === 'function') {
-      const floor = getFloor(bid);
+      const floor = helpers.getFloor(bid);
       if (floor) {
         imp.bidfloor = floor;
       }
     }
+
     request.imp.push(imp);
   });
 
   return request;
-};
+}
 
+/**
+ * Export BidderSpec type object and register it to Prebid
+ * @type {{supportedMediaTypes: string[], interpretResponse: ((function(ServerResponse, *): Bid[])|*), code: string, aliases: string[], getUserSyncs: ((function(SyncOptions, ServerResponse[], *, *): UserSync[])|*), buildRequests: (function(*, *): {method: string, data: string, url}), onTimeout: (function(*): boolean), gvlid: number, isBidRequestValid: ((function(BidRequest): (boolean))|*), onBidWon: (function(*): boolean)}}
+ */
 export const spec = {
   code: BIDDER_CODE,
-  gvlid: GVLID,
+  gvlid: GVL_ID,
   supportedMediaTypes: ['video', 'banner'],
   aliases: BIDDER_ALIAS,
+  storageAllowed: true,
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -148,13 +228,16 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
-    if (!bid.params.appId || typeof bid.params.appId != 'string' || !bid.params.format || typeof bid.params.format != 'string' || !bid.params.style || typeof bid.params.style != 'string') {
+    if (typeof bid.params.appId != 'string' || !bid.params.appId) {
       return false;
     }
-    if (bid.params.format != 'screen' && bid.params.format != 'display') {
+    if (typeof bid.params.format != 'string' || typeof bid.params.style != 'string' || !bid.params.format || !bid.params.style) {
       return false;
     }
-    if (bid.params.style != 'inline' && bid.params.style != 'impact' && bid.params.style != 'static') {
+    if (bid.params.format !== 'screen' && bid.params.format !== 'display') {
+      return false;
+    }
+    if (bid.params.style !== 'inline' && bid.params.style !== 'impact' && bid.params.style !== 'static') {
       return false;
     }
 
@@ -171,11 +254,20 @@ export const spec = {
   buildRequests: function (validBidRequests, bidderRequest) {
     // Create a clean openRTB request
     let request = createOpenRtbRequest(validBidRequests, bidderRequest);
+    const imStr = helpers.getImStrFromLocalStorage();
+    const options = {}
+
+    if (imStr) {
+      options.customHeaders = {
+        'x-impact': imStr
+      };
+    }
 
     return {
       method: 'POST',
-      url: ORIGIN + AUCTIONURI,
+      url: ORIGIN + AUCTION_URI,
       data: JSON.stringify(request),
+      options
     };
   },
 
@@ -265,16 +357,16 @@ export const spec = {
 
     return [{
       type: 'iframe',
-      url: ORIGIN + COOKIESYNCURI + params
+      url: ORIGIN + COOKIE_SYNC_URI + params
     }];
   },
 
   /**
    * Register bidder specific code, which will execute if a bid from this bidder won the auction
    * @param {Bid} The bid that won the auction
-  */
-  onBidWon: function(bid) {
-    ajax(`${LOGGER_URI}/log/bidder/won`, null, JSON.stringify(bid), {
+   */
+  onBidWon: function (bid) {
+    ajax(`${LOGGER_URI}/prebid/won`, null, JSON.stringify(bid), {
       method: 'POST',
       contentType: 'application/json'
     });
@@ -285,14 +377,27 @@ export const spec = {
   /**
    * Register bidder specific code, which will execute if bidder timed out after an auction
    * @param {data} Containing timeout specific data
-  */
-  onTimeout: function(data) {
-    ajax(`${LOGGER_URI}/log/bidder/timeout`, null, JSON.stringify(data[0]), {
+   */
+  onTimeout: function (data) {
+    ajax(`${LOGGER_URI}/prebid/timeout`, null, JSON.stringify(data[0]), {
       method: 'POST',
       contentType: 'application/json'
     });
 
     return true;
-  }
+  },
+
+  /**
+   * Register bidder specific code, which will execute if the bid request failed
+   * @param {*} param0
+   */
+  onBidderError: function ({ error, bidderRequest }) {
+    ajax(`${LOGGER_JS_URI}/logger`, null, JSON.stringify({ error, bidderRequest }), {
+      method: 'POST',
+      contentType: 'application/json'
+    });
+
+    return true;
+  },
 };
 registerBidder(spec);
diff --git a/modules/impactifyBidAdapter.md b/modules/impactifyBidAdapter.md
index 3de9a8cfb84..e08f2f3ce01 100644
--- a/modules/impactifyBidAdapter.md
+++ b/modules/impactifyBidAdapter.md
@@ -3,21 +3,29 @@
 ```
 Module Name: Impactify Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: thomas.destefano@impactify.io
+Maintainer: programmatic@impactify.io
 ```
 
 # Description
 
 Module that connects to the Impactify solution.
 The impactify bidder need 3 parameters:
-    - appId : This is your unique publisher identifier
-    - format : This is the ad format needed, can be : screen or display
-    - style : This is the ad style needed, can be : inline, impact or static
+- appId : This is your unique publisher identifier
+- format : This is the ad format needed, can be : screen or display (Only for video media type)
+- style : This is the ad style needed, can be : inline, impact or static (Only for video media type)
+
+Note : Impactify adapter need storage access to work properly (Do not forget to set storageAllowed to true).
 
 # Test Parameters
 ```
-    var adUnits = [{
-      code: 'your-slot-div-id', // This is your slot div id
+    pbjs.bidderSettings = {
+        impactify: {
+            storageAllowed: true // Mandatory
+        }
+    };
+    
+    var adUnitsVideo = [{
+      code: 'your-slot-div-id-video', // This is your slot div id
       mediaTypes: {
           video: {
               context: 'outstream'
@@ -32,4 +40,24 @@ The impactify bidder need 3 parameters:
           }
       }]
     }];
+    
+    var adUnitsBanner = [{
+      code: 'your-slot-div-id-banner', // This is your slot div id
+      mediaTypes: {
+          banner: {
+            sizes: [
+                [728, 90]
+            ]
+         }
+      },
+      bids: [{
+          bidder: 'impactify',
+          params: {
+              appId: 'example.com',
+              format: 'display',
+              size: '728x90',
+              style: 'static'
+          }
+      }]
+    }];
 ```
diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index b56cc56a186..33ba08e8fd2 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -3,9 +3,25 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
 import {ortbConverter} from '../libraries/ortbConverter/converter.js';
+import {convertCurrency} from '../libraries/currencyUtils/currency.js';
+/**
+ * See https://github.com/prebid/Prebid.js/pull/8827 for details on linting exception
+ * ImproveDigital only imports after winning a bid and only if the creative cannot reach top
+ * Also see https://github.com/prebid/Prebid.js/issues/11656
+ */
+// eslint-disable-next-line no-restricted-imports
 import {loadExternalScript} from '../src/adloader.js';
+import { MODULE_TYPE_BIDDER } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
 
 const BIDDER_CODE = 'improvedigital';
 const CREATIVE_TTL = 300;
@@ -15,13 +31,10 @@ const BASIC_ADS_BASE_URL = 'https://ad.360yield-basic.com';
 const PB_ENDPOINT = 'pb';
 const EXTEND_URL = 'https://pbs.360yield.com/openrtb2/auction';
 const IFRAME_SYNC_URL = 'https://hb.360yield.com/prebid-universal-creative/load-cookie.html';
+const DEFAULT_CURRENCY = 'USD';
 
 const VIDEO_PARAMS = {
-  DEFAULT_MIMES: ['video/mp4'],
-  PLACEMENT_TYPE: {
-    INSTREAM: 1,
-    OUTSTREAM: 3,
-  }
+  DEFAULT_MIMES: ['video/mp4']
 };
 
 export const spec = {
@@ -38,7 +51,7 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid(bid) {
-    return !!(bid && bid.params && (bid.params.placementId || (bid.params.placementKey && bid.params.publisherId)));
+    return !!(bid && bid.params && bid.params.placementId && bid.params.publisherId);
   },
 
   /**
@@ -114,6 +127,21 @@ export const spec = {
 
 registerBidder(spec);
 
+const convertBidFloorCurrency = (imp) => {
+  try {
+    const bidFloor = convertCurrency(
+      imp.bidfloor,
+      imp.bidfloorcur,
+      DEFAULT_CURRENCY,
+      false,
+    );
+    imp.bidfloor = bidFloor;
+    imp.bidfloorcur = DEFAULT_CURRENCY;
+  } catch (err) {
+    logWarn(`Failed to convert bid floor to ${DEFAULT_CURRENCY}. Passing floor price in its original currency.`, err);
+  }
+};
+
 export const CONVERTER = ortbConverter({
   context: {
     ttl: CREATIVE_TTL,
@@ -125,21 +153,22 @@ export const CONVERTER = ortbConverter({
   },
   imp(buildImp, bidRequest, context) {
     const imp = buildImp(bidRequest, context);
-    imp.secure = Number(window.location.protocol === 'https:');
+    imp.secure = bidRequest.ortb2Imp?.secure ?? 1;
     if (!imp.bidfloor && bidRequest.params.bidFloor) {
       imp.bidfloor = bidRequest.params.bidFloor;
-      imp.bidfloorcur = getBidIdParameter('bidFloorCur', bidRequest.params).toUpperCase() || 'USD'
+      imp.bidfloorcur = getBidIdParameter('bidFloorCur', bidRequest.params).toUpperCase() || DEFAULT_CURRENCY;
+    }
+
+    if (imp.bidfloor && imp.bidfloorcur && imp.bidfloorcur !== DEFAULT_CURRENCY) {
+      convertBidFloorCurrency(imp);
     }
     const bidderParamsPath = context.extendMode ? 'ext.prebid.bidder.improvedigital' : 'ext.bidder';
     const placementId = bidRequest.params.placementId;
-    if (placementId) {
-      deepSetValue(imp, `${bidderParamsPath}.placementId`, placementId);
-      if (context.extendMode) {
-        deepSetValue(imp, 'ext.prebid.storedrequest.id', '' + placementId);
-      }
-    } else {
-      deepSetValue(imp, `${bidderParamsPath}.publisherId`, getBidIdParameter('publisherId', bidRequest.params));
-      deepSetValue(imp, `${bidderParamsPath}.placementKey`, getBidIdParameter('placementKey', bidRequest.params));
+    const publisherId = bidRequest.params.publisherId;
+    deepSetValue(imp, `${bidderParamsPath}.placementId`, placementId);
+    deepSetValue(imp, `${bidderParamsPath}.publisherId`, publisherId);
+    if (context.extendMode) {
+      deepSetValue(imp, 'ext.prebid.storedrequest.id', '' + placementId);
     }
     deepSetValue(imp, `${bidderParamsPath}.keyValues`, getBidIdParameter('keyValues', bidRequest.params) || undefined);
 
@@ -182,6 +211,10 @@ export const CONVERTER = ortbConverter({
     })();
     const bidResponse = buildBidResponse(bid, context);
     const idExt = deepAccess(bid, `ext.${BIDDER_CODE}`, {});
+    // Programmatic guaranteed flag
+    if (idExt.pg === 1) {
+      bidResponse.adserverTargeting = { hb_deal_type_improve: 'pg' };
+    }
     Object.assign(bidResponse, {
       dealId: (typeof idExt.buying_type === 'string' && idExt.buying_type !== 'rtb') ? idExt.line_item_id : undefined,
       netRevenue: idExt.is_net || false,
@@ -198,9 +231,9 @@ export const CONVERTER = ortbConverter({
   overrides: {
     imp: {
       banner(fillImpBanner, imp, bidRequest, context) {
-        // override to disregard banner.sizes if usePrebidSizes is not set
+        // override to disregard banner.sizes if usePrebidSizes is false
         if (!bidRequest.mediaTypes[BANNER]) return;
-        if (config.getConfig('improvedigital.usePrebidSizes') !== true) {
+        if (config.getConfig('improvedigital.usePrebidSizes') === false) {
           const banner = Object.assign({}, bidRequest.mediaTypes[BANNER], {sizes: null});
           bidRequest = {...bidRequest, mediaTypes: {[BANNER]: banner}}
         }
@@ -220,33 +253,6 @@ export const CONVERTER = ortbConverter({
           context
         );
         deepSetValue(imp, 'ext.is_rewarded_inventory', (video.rewarded === 1 || deepAccess(video, 'ext.rewarded') === 1) || undefined);
-        if (!imp.video.placement && ID_REQUEST.isOutstreamVideo(bidRequest)) {
-          // fillImpVideo will have already set placement = 1 for instream
-          imp.video.placement = VIDEO_PARAMS.PLACEMENT_TYPE.OUTSTREAM;
-        }
-      }
-    },
-    request: {
-      gdprAddtlConsent(setAddtlConsent, ortbRequest, bidderRequest) {
-        const additionalConsent = bidderRequest?.gdprConsent?.addtlConsent;
-        if (!additionalConsent) {
-          return;
-        }
-        if (spec.syncStore.extendMode) {
-          setAddtlConsent(ortbRequest, bidderRequest);
-          return;
-        }
-        if (additionalConsent && additionalConsent.indexOf('~') !== -1) {
-          // Google Ad Tech Provider IDs
-          const atpIds = additionalConsent.substring(additionalConsent.indexOf('~') + 1);
-          if (atpIds) {
-            deepSetValue(
-              ortbRequest,
-              'user.ext.consented_providers_settings.consented_providers',
-              atpIds.split('.').map(id => parseInt(id, 10))
-            );
-          }
-        }
       }
     }
   }
@@ -379,7 +385,8 @@ const ID_RAZR = {
 
     const cfgStr = JSON.stringify(cfg).replace(/<\/script>/ig, '\\x3C/script>');
     const s = ``;
-    bid.ad = bid.ad.replace(/]*>/, match => match + s);
+    // prepend RAZR config to ad markup:
+    bid.ad = s + bid.ad;
 
     this.installListener();
   },
@@ -411,7 +418,7 @@ const ID_RAZR = {
       ns.q.push(data);
 
       if (!ns.loaded) {
-        loadExternalScript(ID_RAZR.RENDERER_URL, BIDDER_CODE);
+        loadExternalScript(ID_RAZR.RENDERER_URL, MODULE_TYPE_BIDDER, BIDDER_CODE);
       }
     });
 
diff --git a/modules/improvedigitalBidAdapter.md b/modules/improvedigitalBidAdapter.md
index 15602d11038..7206dd8ba7b 100644
--- a/modules/improvedigitalBidAdapter.md
+++ b/modules/improvedigitalBidAdapter.md
@@ -17,6 +17,7 @@ Module that connects to Improve Digital's demand sources
                     {
                         bidder: 'improvedigital',
                         params: {
+                            publisherId: 123,
                             placementId:1053688
                         }
                     }
@@ -27,6 +28,7 @@ Module that connects to Improve Digital's demand sources
                 bids: [{
                     bidder: 'improvedigital',
                     params: {
+                        publisherId: 123,
                         placementId:1053689,
                         keyValues: {
                             testKey: ["testValue"]
@@ -39,6 +41,7 @@ Module that connects to Improve Digital's demand sources
                 bids: [{
                     bidder: 'improvedigital',
                     params: {
+                        publisherId: 123,
                         placementId:1053687,
                         size: {
                             w:300,
@@ -47,4 +50,4 @@ Module that connects to Improve Digital's demand sources
                     }
                 }]
             }];
-```
\ No newline at end of file
+```
diff --git a/modules/imuIdSystem.js b/modules/imuIdSystem.js
index 38870c9403b..3e9904c526f 100644
--- a/modules/imuIdSystem.js
+++ b/modules/imuIdSystem.js
@@ -11,6 +11,11 @@ import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ */
+
 const MODULE_NAME = 'imuid';
 
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
@@ -161,6 +166,7 @@ export const imuIdSubmodule = {
       }
     };
   },
+  primaryIds: ['imppid', 'imuid'],
   eids: {
     'imppid': {
       source: 'ppid.intimatemerger.com',
diff --git a/modules/incrxBidAdapter.js b/modules/incrxBidAdapter.js
index d054309ee40..92059f18149 100644
--- a/modules/incrxBidAdapter.js
+++ b/modules/incrxBidAdapter.js
@@ -1,6 +1,13 @@
 import { parseSizesInput, isEmpty } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js'
+import { BANNER, VIDEO } from '../src/mediaTypes.js'
+import { OUTSTREAM } from '../src/video.js';
+import { Renderer } from '../src/Renderer.js';
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
 
 const BIDDER_CODE = 'incrementx';
 const ENDPOINT_URL = 'https://hb.incrementxserv.com/vzhbidder/bid';
@@ -9,39 +16,53 @@ const CREATIVE_TTL = 300;
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
 
   /**
-  * Determines whether or not the given bid request is valid.
-  *
-  * @param {BidRequest} bid The bid params to validate.
-  * @return boolean True if this is a valid bid, and false otherwise.
-  */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function (bid) {
     return !!(bid.params.placementId);
   },
-
+  hasTypeVideo(bid) {
+    return typeof bid.mediaTypes !== 'undefined' && typeof bid.mediaTypes.video !== 'undefined';
+  },
   /**
-  * Make a server request from the list of BidRequests.
-  *
-  * @param validBidRequests
-  * @param bidderRequest
-  * @return Array Info describing the request to the server.
-  */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param validBidRequests
+   * @param bidderRequest
+   * @return Array Info describing the request to the server.
+   */
   buildRequests: function (validBidRequests, bidderRequest) {
     return validBidRequests.map(bidRequest => {
       const sizes = parseSizesInput(bidRequest.params.size || bidRequest.sizes);
-
+      let mdType = 0;
+      if (bidRequest.mediaTypes[BANNER]) {
+        mdType = 1;
+      } else {
+        mdType = 2;
+      }
       const requestParams = {
         _vzPlacementId: bidRequest.params.placementId,
         sizes: sizes,
         _slotBidId: bidRequest.bidId,
-        // TODO: is 'page' the right value here?
         _rqsrc: bidderRequest.refererInfo.page,
+        mChannel: mdType
       };
-
-      const payload = {
-        q: encodeURI(JSON.stringify(requestParams))
+      let payload;
+      if (mdType === 1) { // BANNER
+        payload = {
+          q: encodeURI(JSON.stringify(requestParams))
+        };
+      } else { // VIDEO or other types
+        payload = {
+          q: encodeURI(JSON.stringify(requestParams)),
+          bidderRequestData: encodeURI(JSON.stringify(bidderRequest))
+        };
       }
 
       return {
@@ -53,35 +74,86 @@ export const spec = {
   },
 
   /**
-  * Unpack the response from the server into a list of bids.
-  *
-  * @param {ServerResponse} serverResponse A successful response from the server.
-  * @return {Bid[]} An array of bids which were nested inside the server.
-  */
-  interpretResponse: function (serverResponse) {
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidderRequest) {
     const response = serverResponse.body;
     const bids = [];
     if (isEmpty(response)) {
       return bids;
     }
+    let decodedBidderRequestData;
+    if (typeof bidderRequest.data.bidderRequestData === 'string') {
+      decodedBidderRequestData = JSON.parse(decodeURI(bidderRequest.data.bidderRequestData));
+    } else {
+      decodedBidderRequestData = bidderRequest.data.bidderRequestData;
+    }
     const responseBid = {
       requestId: response.slotBidId,
-      cpm: response.cpm,
+      cpm: response.cpm > 0 ? response.cpm : 0,
       currency: response.currency || DEFAULT_CURRENCY,
       adType: response.adType || '1',
       settings: response.settings,
-      width: response.adWidth,
-      height: response.adHeight,
+      width: response.adWidth || 300,
+      height: response.adHeight || 250,
       ttl: CREATIVE_TTL,
       creativeId: response.creativeId || 0,
       netRevenue: response.netRevenue || false,
+      mediaType: response.mediaType || BANNER,
       meta: {
-        mediaType: response.mediaType || BANNER,
+        mediaType: response.mediaType,
         advertiserDomains: response.advertiserDomains || []
       },
-      ad: response.ad
+
     };
+    if (response.mediaType === BANNER) {
+      responseBid.ad = response.ad || '';
+    } else if (response.mediaType === VIDEO) {
+      let context, adUnitCode;
+      for (let i = 0; i < decodedBidderRequestData.bids.length; i++) {
+        const item = decodedBidderRequestData.bids[i];
+        if (item.bidId === response.slotBidId) {
+          context = item.mediaTypes.video.context;
+          adUnitCode = item.adUnitCode;
+          break;
+        }
+      }
+      if (context === OUTSTREAM) {
+        responseBid.vastXml = response.ad || '';
+        if (response.rUrl) {
+          responseBid.renderer = createRenderer({ ...response, adUnitCode });
+        }
+      }
+    }
     bids.push(responseBid);
+    function createRenderer(bid, rendererOptions = {}) {
+      const renderer = Renderer.install({
+        id: bid.slotBidId,
+        url: bid.rUrl,
+        config: rendererOptions,
+        adUnitCode: bid.adUnitCode,
+        loaded: false
+      });
+      try {
+        renderer.setRender(({ renderer, width, height, vastXml, adUnitCode }) => {
+          renderer.push(() => {
+            window.onetag.Player.init({
+              ...bid,
+              width,
+              height,
+              vastXml,
+              nodeId: adUnitCode,
+              config: renderer.getConfig()
+            });
+          });
+        });
+      } catch (e) {
+      }
+      return renderer;
+    }
     return bids;
   }
 
diff --git a/modules/incrxBidAdapter.md b/modules/incrxBidAdapter.md
new file mode 100644
index 00000000000..b37d1e6b566
--- /dev/null
+++ b/modules/incrxBidAdapter.md
@@ -0,0 +1,45 @@
+# Overview
+
+```
+Module Name: IncrementX Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid-team@vertoz.com
+```
+
+# Description
+
+IncrementX Bid Adapter supports banner and video at present.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: "banner-space",
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]]
+                }
+            },
+            bids: [{
+                bidder: "incrementx",
+                params: {
+                    placementId: "your_placementId" // required,
+                }
+            }]
+        },  {
+            code: 'video-outstream-space',
+            mediaTypes: {
+                video: {
+                    context: "outstream",
+                    playerSize: [640,480]
+                }
+            },
+            bids: [{
+                bidder: "incrementx",
+                params: {
+                    placementId: "your_placement_id" // required,
+                }
+            }]
+        }];
+    
+```
diff --git a/modules/inmobiBidAdapter.js b/modules/inmobiBidAdapter.js
new file mode 100644
index 00000000000..910c53bf838
--- /dev/null
+++ b/modules/inmobiBidAdapter.js
@@ -0,0 +1,347 @@
+import { deepAccess, deepSetValue, isFn } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+import { ortb25Translator } from '../libraries/ortb2.5Translator/translator.js';
+import { tryAppendQueryString } from '../libraries/urlUtils/urlUtils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderSpec} BidderSpec
+ * @typedef {import('../src/adapters/bidderFactory.js').TimedOutBid} TimedOutBid
+ */
+
+const GVLID = 333;
+export const ADAPTER_VERSION = 1.0;
+const BIDDER_CODE = 'inmobi';
+const BID_ENDPOINT = 'https://api.w.inmobi.com/openrtb/bidder/prebidjs';
+export const EVENT_ENDPOINT = 'https://sync.inmobi.com';
+export const SYNC_ENDPOINT = 'https://sync.inmobi.com/prebidjs?';
+const TRANSLATOR = ortb25Translator();
+const CURRENCY = 'USD';
+const POST_METHOD = 'POST';
+const PLAIN_CONTENT_TYPE = 'text/plain';
+
+/**
+ * Defines the core oRTB converter inherited from converter library and all customization functions.
+ */
+const CONVERTER = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 3600,
+    currency: CURRENCY
+  },
+  imp,
+  request,
+  bidResponse,
+  response
+});
+
+/**
+ * Builds an impression object for oRTB 2.5 requests based on the bid request.
+ *
+ * @param {function} buildImp - Function to build the imp object.
+ * @param {Object} bidRequest - The request containing bid details.
+ * @param {Object} context - Context for the impression.
+ * @returns {Object} The constructed impression object.
+ */
+function imp(buildImp, bidRequest, context) {
+  let imp = buildImp(bidRequest, context);
+  const params = bidRequest.params;
+
+  imp.tagid = bidRequest.adUnitCode;
+  let floorInfo = {};
+
+  if (isFn(bidRequest.getFloor)) {
+    floorInfo = bidRequest.getFloor({
+      currency: CURRENCY,
+      size: '*',
+      mediaType: '*'
+    });
+  }
+
+  // if floor price module is not set reading from bidRequest.params
+  if (!imp.bidfloor && bidRequest.params.bidfloor) {
+    imp.bidfloor = bidRequest.params.bidfloor;
+    imp.bidfloorcur = CURRENCY;
+  }
+
+  deepSetValue(imp, 'ext', {
+    ...imp.ext,
+    params: bidRequest.params,
+    bidder: {
+      plc: params?.plc,
+    },
+    moduleFloors: floorInfo
+  });
+  imp.secure = Number(window.location.protocol === 'https:');
+
+  return imp;
+}
+
+/**
+ * Constructs the oRTB 2.5 request object.
+ *
+ * @param {function} buildRequest - Function to build the request.
+ * @param {Array} imps - Array of impression objects.
+ * @param {Object} bidderRequest - Object containing bidder request information.
+ * @param {Object} context - Additional context.
+ * @returns {Object} The complete oRTB request object.
+ */
+function request(buildRequest, imps, bidderRequest, context) {
+  let request = buildRequest(imps, bidderRequest, context);
+
+  deepSetValue(request, 'ext.prebid.channel.name', 'pbjs_InMobi');
+  deepSetValue(request, 'ext.prebid.channel.pbjsversion', '$prebid.version$');
+  deepSetValue(request, 'ext.prebid.channel.adapterversion', ADAPTER_VERSION);
+
+  request = TRANSLATOR(request);
+  return request;
+}
+
+/**
+ * Transforms an oRTB 2.5 bid into a bid response format for Prebid.js.
+ *
+ * @param {function} buildBidResponse - Function to build a bid response.
+ * @param {Object} bid - The bid to be transformed.
+ * @param {Object} context - Context for the bid.
+ * @returns {Object} Formatted bid response.
+ */
+function bidResponse(buildBidResponse, bid, context) {
+  context.mtype = deepAccess(bid, 'mtype');
+  if (context.mtype === 4) {
+    const admJson = JSON.parse(bid.adm);
+    bid.adm = JSON.stringify(admJson.native);
+  }
+  let bidResponse = buildBidResponse(bid, context);
+
+  if (typeof deepAccess(bid, 'ext') !== 'undefined') {
+    deepSetValue(bidResponse, 'meta', {
+      ...bidResponse.meta,
+      ...bid.ext,
+    });
+  }
+
+  return bidResponse;
+}
+
+/**
+ * Converts the oRTB 2.5 bid response into the format required by Prebid.js.
+ *
+ * @param {function} buildResponse - Function to build the response.
+ * @param {Array} bidResponses - List of bid responses.
+ * @param {Object} ortbResponse - Original oRTB response data.
+ * @param {Object} context - Additional context.
+ * @returns {Object} Prebid.js compatible bid response.
+ */
+function response(buildResponse, bidResponses, ortbResponse, context) {
+  let response = buildResponse(bidResponses, ortbResponse, context);
+
+  return response;
+}
+
+/** @type {BidderSpec} */
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines user sync options based on consent and supported sync types.
+   *
+   * @param {Object} syncOptions - Options for user syncing (iframe, pixel).
+   * @param {Array} responses - List of bid responses.
+   * @param {Object} gdprConsent - GDPR consent details.
+   * @param {Object} uspConsent - CCPA consent details.
+   * @param {Object} gppConsent - GPP consent details.
+   * @returns {Array} List of user sync URLs.
+   */
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent, gppConsent) => {
+    const urls = [];
+    if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
+      return urls;
+    }
+    const pixelType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+
+    let query = '';
+    if (gdprConsent) {
+      query = tryAppendQueryString(query, 'gdpr', (gdprConsent.gdprApplies ? 1 : 0));
+    }
+    if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+      query = tryAppendQueryString(query, 'gdpr_consent', gdprConsent.consentString);
+    }
+    if (uspConsent) {
+      query = tryAppendQueryString(query, 'us_privacy', uspConsent);
+    }
+    if (gppConsent?.gppString && gppConsent?.applicableSections?.length) {
+      query = tryAppendQueryString(query, 'gpp', gppConsent.gppString);
+      query = tryAppendQueryString(query, 'gpp_sid', gppConsent?.applicableSections?.join(','));
+    }
+    if (query.slice(-1) === '&') {
+      query = query.slice(0, -1);
+    }
+
+    if (pixelType === 'iframe' || (!responses || responses.length === 0)) {
+      return [{
+        type: pixelType,
+        url: SYNC_ENDPOINT + query
+      }];
+    } else {
+      responses.forEach(resp => {
+        const userSyncs = deepAccess(resp, 'body.ext.prebidjs.urls');
+        if (!userSyncs) {
+          return;
+        }
+
+        userSyncs.forEach(us => {
+          let url = us.url;
+          if (query) {
+            url = url + (url.indexOf('?') === -1 ? '?' : '&') + query;
+          }
+
+          urls.push({
+            type: pixelType,
+            url: url
+          });
+        });
+      });
+      return urls;
+    }
+  },
+
+  /**
+   * Validates if a bid request contains the required parameters for InMobi.
+   *
+   * @param {Object} bid - Bid request to validate.
+   * @returns {boolean} True if the bid request is valid, otherwise false.
+   */
+  isBidRequestValid: (bid) => {
+    if (!(bid && bid.params && bid.params.plc)) {
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Builds the server request from bid requests for InMobi.
+   *
+   * @param {BidRequest[]} bidRequests - Array of bid requests.
+   * @param {Object} bidderRequest - Additional request details.
+   * @returns {ServerRequest} The server request for bidding.
+   */
+  buildRequests: (bidRequests, bidderRequest) => {
+    const data = CONVERTER.toORTB({ bidderRequest, bidRequests });
+
+    if (data) {
+      const requestPayload = {
+        method: POST_METHOD,
+        url: BID_ENDPOINT,
+        data: data,
+        options: {
+          contentType: PLAIN_CONTENT_TYPE,
+          crossOrigin: true,
+          withCredentials: true
+        }
+      };
+      return requestPayload;
+    }
+  },
+
+  /**
+   * Interprets the server response and formats it into bids.
+   *
+   * @param {Object} response - Response from the server.
+   * @param {ServerRequest} request - Original bid request.
+   * @returns {Bid[]} Parsed bids or configurations.
+   */
+  interpretResponse: (response, request) => {
+    if (typeof response?.body == 'undefined') {
+      return [];
+    }
+
+    const interpretedResponse = CONVERTER.fromORTB({ response: response.body, request: request.data });
+    const bids = interpretedResponse.bids || [];
+
+    return bids;
+  },
+
+  /**
+   * Callback to report timeout event.
+   *
+   * @param {TimedOutBid[]} timeoutData - Array of timeout details.
+   */
+  onTimeout: (timeoutData) => {
+    report('onTimeout', timeoutData);
+  },
+
+  /**
+   * Callback to report targeting event.
+   *
+   * @param {Bid} bid - The bid object
+   */
+  onSetTargeting: (bid) => {
+    report('onSetTargeting', bid?.meta);
+  },
+
+  /**
+   * Callback to report successful ad render event.
+   *
+   * @param {Bid} bid - The bid that successfully rendered.
+   */
+  onAdRenderSucceeded: (bid) => {
+    report('onAdRenderSucceeded', bid?.meta);
+  },
+
+  /**
+   * Callback to report bidder error event.
+   *
+   * @param {Object} errorData - Details about the error.
+   */
+  onBidderError: (errorData) => {
+    report('onBidderError', errorData);
+  },
+
+  /**
+   * Callback to report bid won event.
+   *
+   * @param {Bid} bid - The bid that won the auction.
+   */
+  onBidWon: (bid) => {
+    report('onBidWon', bid?.meta);
+  }
+
+};
+
+function isReportingAllowed(loggingPercentage) {
+  return loggingPercentage != 0;
+}
+
+function report(type, data) {
+  if (!data) {
+    return;
+  }
+  if (['onBidWon', 'onAdRenderSucceeded', 'onSetTargeting'].includes(type) && !isReportingAllowed(data.loggingPercentage)) {
+    return;
+  }
+  const payload = JSON.stringify({
+    domain: location.hostname,
+    eventPayload: data
+  });
+
+  fetch(`${EVENT_ENDPOINT}/report/${type}`, {
+    body: payload,
+    keepalive: true,
+    credentials: 'include',
+    method: POST_METHOD,
+    headers: {
+      'Content-Type': PLAIN_CONTENT_TYPE
+    }
+  }).catch((_e) => {
+    // do nothing; ignore errors
+  });
+}
+
+registerBidder(spec);
diff --git a/modules/inmobiBidAdapter.md b/modules/inmobiBidAdapter.md
new file mode 100644
index 00000000000..bf309fcb01d
--- /dev/null
+++ b/modules/inmobiBidAdapter.md
@@ -0,0 +1,87 @@
+# Overview
+
+Module Name: InMobi Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid-support@inmobi.com
+
+# Description
+
+Module that connects to InMobi's demand sources.
+
+# Bid Params
+
+| Name       | Scope    | Description  |  Example  | Type     |
+|------------|----------|--------------|-----------|--------  |
+| `plc`      | required | Placement ID | `'1234'`  | `string` |
+| `bidfloor` | optional | Bid Floor    | `1.2`     | `float`  |
+
+
+# Test Parameters
+
+## Banner
+```
+    var adUnits = [{
+            code: 'div-gpt-ad-1460505748561-0',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+
+            bids: [{
+                bidder: 'inmobi',
+                params: {
+                    plc: '1719108420057' // Mandatory
+                }
+            }]
+
+    }];
+```
+
+## Video
+```
+    var adUnits = [{
+            code: 'div-gpt-ad-1460505748561-0',
+            mediaTypes: {
+                video: {
+                    playerSize : [300,250],
+                    mimes :  ["video/x-ms-wmv", "video/mp4"],
+                    minduration : 0,
+                    maxduration: 30,
+                    protocols : [1,2],
+                    api: [1, 2, 4, 6],
+                    protocols: [3, 4, 7, 8, 10],
+                    placement: 1,
+                    plcmt: 1
+                }
+            },
+
+            // Replace this object to test a new Adapter!
+            bids: [{
+                bidder: 'inmobi',
+                params: {
+                    plc: '1443164204446401' //Mandatory
+                }
+            }]
+    }];
+```
+
+## Native
+```
+    var adUnits = [{
+            code: 'div-gpt-ad-1460505748561-0',
+            mediaTypes: {
+                native: {
+                        type: 'image'
+                }
+            },
+
+            bids: [{
+                bidder: 'inmobi',
+                params: {
+                    plc: '10000033152',
+                    bidfloor: 0.9
+                }
+            }]
+    }];
+```        
\ No newline at end of file
diff --git a/modules/innityBidAdapter.js b/modules/innityBidAdapter.js
index 99eec210193..9bd0538ff0a 100644
--- a/modules/innityBidAdapter.js
+++ b/modules/innityBidAdapter.js
@@ -38,6 +38,9 @@ export const spec = {
   },
   interpretResponse: function(serverResponse, request) {
     const res = serverResponse.body;
+    if (Object.keys(res).length === 0) {
+      return [];
+    }
     const bidResponse = {
       requestId: res.callback_uid,
       cpm: parseFloat(res.cpm) / 100,
diff --git a/modules/insticatorBidAdapter.js b/modules/insticatorBidAdapter.js
index c770ac69dbe..4ab7f5927f9 100644
--- a/modules/insticatorBidAdapter.js
+++ b/modules/insticatorBidAdapter.js
@@ -1,7 +1,7 @@
 import {config} from '../src/config.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {deepAccess, generateUUID, logError, isArray} from '../src/utils.js';
+import {deepAccess, generateUUID, logError, isArray, isInteger, isArrayOfNums, deepSetValue, isFn, logWarn} from '../src/utils.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {find} from '../src/polyfill.js';
 
@@ -12,6 +12,37 @@ const USER_ID_COOKIE_EXP = 2592000000; // 30 days
 const BID_TTL = 300; // 5 minutes
 const GVLID = 910;
 
+export const OPTIONAL_VIDEO_PARAMS = {
+  'minduration': (value) => isInteger(value),
+  'maxduration': (value) => isInteger(value),
+  'protocols': (value) => isArrayOfNums(value), // protocols values supported by Inticator, according to the OpenRTB spec
+  'startdelay': (value) => isInteger(value),
+  'linearity': (value) => isInteger(value) && [1].includes(value),
+  'skip': (value) => isInteger(value) && [1, 0].includes(value),
+  'skipmin': (value) => isInteger(value),
+  'skipafter': (value) => isInteger(value),
+  'sequence': (value) => isInteger(value),
+  'battr': (value) => isArrayOfNums(value),
+  'maxextended': (value) => isInteger(value),
+  'minbitrate': (value) => isInteger(value),
+  'maxbitrate': (value) => isInteger(value),
+  'playbackmethod': (value) => isArrayOfNums(value),
+  'playbackend': (value) => isInteger(value) && [1, 2, 3].includes(value),
+  'delivery': (value) => isArrayOfNums(value),
+  'pos': (value) => isInteger(value) && [0, 1, 2, 3, 4, 5, 6, 7].includes(value),
+  'api': (value) => isArrayOfNums(value),
+};
+
+const ORTB_SITE_FIRST_PARTY_DATA = {
+  'cat': v => Array.isArray(v) && v.every(c => typeof c === 'string'),
+  'sectioncat': v => Array.isArray(v) && v.every(c => typeof c === 'string'),
+  'pagecat': v => Array.isArray(v) && v.every(c => typeof c === 'string'),
+  'search': v => typeof v === 'string',
+  'mobile': v => isInteger(),
+  'content': v => typeof v === 'object',
+  'keywords': v => typeof v === 'string',
+}
+
 export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 config.setDefaults({
@@ -68,17 +99,53 @@ function buildBanner(bidRequest) {
 }
 
 function buildVideo(bidRequest) {
-  const w = deepAccess(bidRequest, 'mediaTypes.video.w');
-  const h = deepAccess(bidRequest, 'mediaTypes.video.h');
+  let w = deepAccess(bidRequest, 'mediaTypes.video.w');
+  let h = deepAccess(bidRequest, 'mediaTypes.video.h');
   const mimes = deepAccess(bidRequest, 'mediaTypes.video.mimes');
-  const placement = deepAccess(bidRequest, 'mediaTypes.video.placement') || 3;
+  const placement = deepAccess(bidRequest, 'mediaTypes.video.placement');
+  const plcmt = deepAccess(bidRequest, 'mediaTypes.video.plcmt') || undefined;
+  const playerSize = deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+  const context = deepAccess(bidRequest, 'mediaTypes.video.context');
 
-  return {
-    placement,
+  if (!h && !w && playerSize) {
+    ({w, h} = parsePlayerSizeToWidthHeight(playerSize, w, h));
+  }
+
+  const bidRequestVideo = deepAccess(bidRequest, 'mediaTypes.video');
+  const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
+
+  let optionalParams = {};
+  for (const param in OPTIONAL_VIDEO_PARAMS) {
+    if (bidRequestVideo[param] && OPTIONAL_VIDEO_PARAMS[param](bidRequestVideo[param])) {
+      optionalParams[param] = bidRequestVideo[param];
+    }
+    // remove invalid optional params from bidder specific overrides
+    if (videoBidderParams[param] && !OPTIONAL_VIDEO_PARAMS[param](videoBidderParams[param])) {
+      delete videoBidderParams[param];
+    }
+  }
+
+  if (placement && typeof placement !== 'undefined' && typeof placement === 'number') {
+    optionalParams['placement'] = placement;
+  }
+
+  if (plcmt) {
+    optionalParams['plcmt'] = plcmt;
+  }
+
+  if (context !== undefined) {
+    optionalParams['context'] = context;
+  }
+
+  let videoObj = {
     mimes,
     w,
     h,
+    ...optionalParams,
+    ...videoBidderParams // bidder specific overrides for video
   }
+
+  return videoObj
 }
 
 function buildImpression(bidRequest) {
@@ -95,6 +162,27 @@ function buildImpression(bidRequest) {
     },
   }
 
+  if (bidRequest?.params?.adUnitId) {
+    deepSetValue(imp, 'ext.prebid.bidder.insticator.adUnitId', bidRequest.params.adUnitId);
+  }
+
+  if (bidRequest?.params?.publisherId) {
+    deepSetValue(imp, 'ext.prebid.bidder.insticator.publisherId', bidRequest.params.publisherId);
+  }
+
+  let bidFloor = parseFloat(deepAccess(bidRequest, 'params.floor'));
+
+  if (!isNaN(bidFloor)) {
+    imp.bidfloor = deepAccess(bidRequest, 'params.floor');
+    imp.bidfloorcur = 'USD';
+    const bidfloorcur = deepAccess(bidRequest, 'params.bidfloorcur')
+    if (bidfloorcur && bidfloorcur !== 'USD') {
+      delete imp.bidfloor;
+      delete imp.bidfloorcur;
+      logWarn('insticator: bidfloorcur supported by insticator is USD only. ignoring bidfloor and bidfloorcur params');
+    }
+  }
+
   if (deepAccess(bidRequest, 'mediaTypes.banner')) {
     imp.banner = buildBanner(bidRequest);
   }
@@ -103,15 +191,60 @@ function buildImpression(bidRequest) {
     imp.video = buildVideo(bidRequest);
   }
 
+  if (isFn(bidRequest.getFloor)) {
+    let moduleBidFloor;
+
+    const mediaType = deepAccess(bidRequest, 'mediaTypes.banner') ? 'banner' : deepAccess(bidRequest, 'mediaTypes.video') ? 'video' : undefined;
+
+    let _mediaType = mediaType;
+    let _size = '*';
+
+    if (mediaType && ['banner', 'video'].includes(mediaType)) {
+      if (mediaType === 'banner') {
+        const { w: width, h: height } = imp[mediaType];
+        if (width && height) {
+          _size = [width, height];
+        } else {
+          const sizes = deepAccess(bidRequest, 'mediaTypes.banner.format');
+          if (sizes && sizes.length > 0) {
+            const {w: width, h: height} = sizes[0];
+            _size = [width, height];
+          }
+        }
+      } else if (mediaType === 'video') {
+        const { w: width, h: height } = imp[mediaType];
+        _mediaType = mediaType;
+        _size = [width, height];
+      }
+    }
+    try {
+      moduleBidFloor = bidRequest.getFloor({
+        currency: 'USD',
+        mediaType: _mediaType,
+        size: _size
+      });
+    } catch (err) {
+      // continue with no module floors
+      logWarn('priceFloors module call getFloor failed, error : ', err);
+    }
+
+    if (moduleBidFloor) {
+      imp.bidfloor = moduleBidFloor.floor;
+      imp.bidfloorcur = moduleBidFloor.currency;
+    }
+  }
+
   return imp;
 }
 
-function buildDevice() {
-  const deviceConfig = config.getConfig('device');
+function buildDevice(bidRequest) {
+  const ortb2Data = bidRequest?.ortb2 || {};
+  const deviceConfig = ortb2Data?.device || {}
+
   const device = {
     w: window.innerWidth,
     h: window.innerHeight,
-    js: true,
+    js: 1,
     ext: {
       localStorage: storage.localStorageIsEnabled(),
       cookies: storage.cookiesAreEnabled(),
@@ -125,31 +258,102 @@ function buildDevice() {
   return device;
 }
 
+function _getCoppa(bidderRequest) {
+  const coppa = deepAccess(bidderRequest, 'ortb2.regs.coppa');
+
+  // If coppa is defined in the request, use it
+  if (coppa !== undefined) {
+    return coppa;
+  }
+  return config.getConfig('coppa') === true ? 1 : 0;
+}
+
+function _getGppConsent(bidderRequest) {
+  let gpp = deepAccess(bidderRequest, 'gppConsent.gppString')
+  let gppSid = deepAccess(bidderRequest, 'gppConsent.applicableSections')
+
+  if (!gpp || !gppSid) {
+    gpp = deepAccess(bidderRequest, 'ortb2.regs.gpp', '')
+    gppSid = deepAccess(bidderRequest, 'ortb2.regs.gpp_sid', [])
+  }
+  return { gpp, gppSid }
+}
+
+function _getUspConsent(bidderRequest) {
+  return (deepAccess(bidderRequest, 'uspConsent')) ? { uspConsent: bidderRequest.uspConsent } : false;
+}
+
 function buildRegs(bidderRequest) {
+  let regs = {
+    ext: {},
+  };
   if (bidderRequest.gdprConsent) {
-    return {
-      ext: {
-        gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
-        gdprConsentString: bidderRequest.gdprConsent.consentString,
-      },
-    };
+    regs.ext.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+    regs.ext.gdprConsentString = bidderRequest.gdprConsent.consentString;
+  }
+
+  regs.coppa = _getCoppa(bidderRequest);
+
+  const { gpp, gppSid } = _getGppConsent(bidderRequest);
+
+  if (gpp) {
+    regs.ext.gpp = gpp;
+  }
+
+  if (gppSid) {
+    regs.ext.gppSid = gppSid;
+  }
+
+  const usp = _getUspConsent(bidderRequest);
+
+  if (usp) {
+    regs.ext.us_privacy = usp.uspConsent;
+    regs.ext.ccpa = usp.uspConsent
   }
 
-  return {};
+  const dsa = deepAccess(bidderRequest, 'ortb2.regs.ext.dsa');
+  if (dsa) {
+    regs.ext.dsa = dsa;
+  }
+
+  return regs;
 }
 
 function buildUser(bid) {
   const userId = getUserId() || generateUUID();
   const yob = deepAccess(bid, 'params.user.yob')
   const gender = deepAccess(bid, 'params.user.gender')
+  const keywords = deepAccess(bid, 'params.user.keywords')
+  const data = deepAccess(bid, 'params.user.data')
+  const ext = deepAccess(bid, 'params.user.ext')
 
   setUserId(userId);
 
-  return {
+  const userData = {
     id: userId,
-    yob,
-    gender,
-  };
+  }
+
+  if (yob) {
+    userData.yob = yob;
+  }
+
+  if (gender) {
+    userData.gender = gender;
+  }
+
+  if (keywords) {
+    userData.keywords = keywords;
+  }
+
+  if (data) {
+    userData.data = data;
+  }
+
+  if (ext) {
+    userData.ext = ext;
+  }
+
+  return userData
 }
 
 function extractSchain(bids, requestId) {
@@ -184,7 +388,7 @@ function buildRequest(validBidRequests, bidderRequest) {
       page: bidderRequest.refererInfo.page,
       ref: bidderRequest.refererInfo.ref,
     },
-    device: buildDevice(),
+    device: buildDevice(bidderRequest),
     regs: buildRegs(bidderRequest),
     user: buildUser(validBidRequests[0]),
     imp: validBidRequests.map((bidRequest) => buildImpression(bidRequest)),
@@ -218,6 +422,24 @@ function buildRequest(validBidRequests, bidderRequest) {
     req.user.ext = { eids };
   }
 
+  const ortb2SiteData = deepAccess(bidderRequest, 'ortb2.site');
+  if (ortb2SiteData) {
+    for (const key in ORTB_SITE_FIRST_PARTY_DATA) {
+      const value = ortb2SiteData[key];
+      if (value && ORTB_SITE_FIRST_PARTY_DATA[key](value)) {
+        req.site[key] = value;
+      }
+    }
+  }
+
+  if (bidderRequest.gdprConsent) {
+    deepSetValue(req, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+  }
+
+  if (validBidRequests[0]?.params?.publisherId) {
+    deepSetValue(req, 'site.publisher.id', validBidRequests[0].params.publisherId);
+  }
+
   return req;
 }
 
@@ -233,7 +455,11 @@ function buildBid(bid, bidderRequest) {
     meta.advertiserDomains = bid.adomain
   }
 
-  return {
+  let mediaType = 'banner';
+  if (bid.adm && bid.adm.includes(' 0 ? {meta} : {})
   };
+
+  if (mediaType === 'video') {
+    bidResponse.vastXml = bid.adm;
+  }
+
+  // Inticator bid adaptor only returns `vastXml` for video bids. No VastUrl or videoCache.
+  if (!bidResponse.vastUrl && bidResponse.vastXml) {
+    bidResponse.vastUrl = 'data:text/xml;charset=utf-8;base64,' + window.btoa(bidResponse.vastXml.replace(/\\"/g, '"'));
+  }
+
+  if (bid.ext && bid.ext.dsa) {
+    bidResponse.ext = {
+      ...bidResponse.ext,
+      dsa: bid.ext.dsa,
+    }
+  }
+
+  return bidResponse;
 }
 
 function buildBidSet(seatbid, bidderRequest) {
@@ -307,16 +551,27 @@ function validateBanner(bid) {
 }
 
 function validateVideo(bid) {
-  const video = deepAccess(bid, 'mediaTypes.video');
+  const videoParams = deepAccess(bid, 'mediaTypes.video');
+  const videoBidderParams = deepAccess(bid, 'params.video');
+  let video = {
+    ...videoParams,
+    ...videoBidderParams // bidder specific overrides for video
+  }
 
-  if (video === undefined) {
+  // Check if the video object is undefined
+  if (videoParams === undefined) {
     return true;
   }
 
-  const videoSize = [
-    deepAccess(bid, 'mediaTypes.video.w'),
-    deepAccess(bid, 'mediaTypes.video.h'),
-  ];
+  let w = deepAccess(bid, 'mediaTypes.video.w');
+  let h = deepAccess(bid, 'mediaTypes.video.h');
+  const playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
+
+  if (!h && !w && playerSize) {
+    ({w, h} = parsePlayerSizeToWidthHeight(playerSize, w, h));
+  }
+
+  const videoSize = [w, h];
 
   if (
     !validateSize(videoSize)
@@ -332,16 +587,48 @@ function validateVideo(bid) {
     return false;
   }
 
-  const placement = deepAccess(bid, 'mediaTypes.video.placement');
+  const plcmt = deepAccess(bid, 'mediaTypes.video.plcmt');
 
-  if (typeof placement !== 'undefined' && typeof placement !== 'number') {
-    logError('insticator: video placement is not a number');
+  if (typeof plcmt !== 'undefined' && typeof plcmt !== 'number') {
+    logError('insticator: video plcmt is not a number');
+    return false;
+  }
+
+  for (const param in OPTIONAL_VIDEO_PARAMS) {
+    if (video[param]) {
+      if (!OPTIONAL_VIDEO_PARAMS[param](video[param])) {
+        logError(`insticator: video ${param} is invalid or not supported by insticator`);
+      }
+    }
+  }
+
+  if (video.minduration && video.maxduration && video.minduration > video.maxduration) {
+    logError('insticator: video minduration is greater than maxduration');
     return false;
   }
 
   return true;
 }
 
+function parsePlayerSizeToWidthHeight(playerSize, w, h) {
+  if (!w && playerSize) {
+    if (Array.isArray(playerSize[0])) {
+      w = parseInt(playerSize[0][0], 10);
+    } else if (typeof playerSize[0] === 'number' && !isNaN(playerSize[0])) {
+      w = parseInt(playerSize[0], 10);
+    }
+  }
+  if (!h && playerSize) {
+    if (Array.isArray(playerSize[0])) {
+      h = parseInt(playerSize[0][1], 10);
+    } else if (typeof playerSize[1] === 'number' && !isNaN(playerSize[1])) {
+      h = parseInt(playerSize[1], 10);
+    }
+  }
+
+  return { w, h };
+}
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
@@ -361,6 +648,13 @@ export const spec = {
     let endpointUrl = config.getConfig('insticator.endpointUrl') || ENDPOINT;
     endpointUrl = endpointUrl.replace(/^http:/, 'https:');
 
+    // Use the first bid request's bid_request_url if it exists ( for updating server url)
+    if (validBidRequests.length > 0) {
+      if (deepAccess(validBidRequests[0], 'params.bid_endpoint_request_url')) {
+        endpointUrl = deepAccess(validBidRequests[0], 'params.bid_endpoint_request_url').replace(/^http:/, 'https:');
+      }
+    }
+
     if (validBidRequests.length > 0) {
       requests.push({
         method: 'POST',
@@ -380,7 +674,6 @@ export const spec = {
   interpretResponse: function (serverResponse, request) {
     const bidderRequest = request.bidderRequest;
     const body = serverResponse.body;
-
     if (!body || body.id !== bidderRequest.bidderRequestId) {
       logError('insticator: response id does not match bidderRequestId');
       return [];
diff --git a/modules/instreamTracking.js b/modules/instreamTracking.js
index ff8305c7fed..909c21b29bd 100644
--- a/modules/instreamTracking.js
+++ b/modules/instreamTracking.js
@@ -3,11 +3,17 @@ import { config } from '../src/config.js';
 import { auctionManager } from '../src/auctionManager.js';
 import { INSTREAM } from '../src/video.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json'
+import { EVENTS, TARGETING_KEYS, BID_STATUS } from '../src/constants.js'
 
-const {CACHE_ID, UUID} = CONSTANTS.TARGETING_KEYS;
-const {BID_WON, AUCTION_END} = CONSTANTS.EVENTS;
-const {RENDERED} = CONSTANTS.BID_STATUS;
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').AdUnit} AdUnit
+ */
+
+const { CACHE_ID, UUID } = TARGETING_KEYS;
+const { BID_WON, AUCTION_END } = EVENTS;
+const { RENDERED } = BID_STATUS;
 
 const INSTREAM_TRACKING_DEFAULT_CONFIG = {
   enabled: false,
@@ -35,9 +41,10 @@ const whitelistedResources = /video|fetch|xmlhttprequest|other/;
  *
  * Note: this is a workaround till a better approach is engineered.
  *
- * @param {Array} adUnits
- * @param {Array} bidsReceived
- * @param {Array} bidderRequests
+ * @param {object} config
+ * @param {Array} config.adUnits
+ * @param {Array} config.bidsReceived
+ * @param {Array} config.bidderRequests
  *
  * @return {boolean} returns TRUE if tracking started
  */
diff --git a/modules/integr8BidAdapter.js b/modules/integr8BidAdapter.js
index a85e9b0a55c..949483ea7bf 100644
--- a/modules/integr8BidAdapter.js
+++ b/modules/integr8BidAdapter.js
@@ -3,13 +3,20 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'integr8';
-const ENDPOINT_URL = 'https://integr8.central.gjirafa.tech/bid';
+const DEFAULT_ENDPOINT_URL = 'https://central.sea.integr8.digital/bid';
 const DIMENSION_SEPARATOR = 'x';
 const SIZE_SEPARATOR = ';';
-const BISKO_ID = 'biskoId';
+const BISKO_ID = 'integr8Id';
 const STORAGE_ID = 'bisko-sid';
-const SEGMENTS = 'biskoSegments';
+const SEGMENTS = 'integr8Segments';
 const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 export const spec = {
@@ -31,6 +38,7 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    let deliveryUrl = '';
     const storageId = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(STORAGE_ID) || '' : '';
     const biskoId = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(BISKO_ID) || '' : '';
     const segments = storage.localStorageIsEnabled() ? JSON.parse(storage.getDataFromLocalStorage(SEGMENTS)) || [] : [];
@@ -55,6 +63,9 @@ export const spec = {
       if (!pageViewGuid) { pageViewGuid = bidRequest.params.pageViewGuid || ''; }
       if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents; }
       if (!Object.keys(data).length && bidRequest.params.data && Object.keys(bidRequest.params.data).length) { data = bidRequest.params.data; }
+      if (!deliveryUrl && bidRequest.params && typeof bidRequest.params.deliveryUrl === 'string') {
+        deliveryUrl = bidRequest.params.deliveryUrl;
+      }
 
       return {
         sizes: generateSizeParam(bidRequest.sizes),
@@ -67,6 +78,10 @@ export const spec = {
       };
     });
 
+    if (!deliveryUrl) {
+      deliveryUrl = DEFAULT_ENDPOINT_URL;
+    }
+
     let body = {
       propertyId: propertyId,
       pageViewGuid: pageViewGuid,
@@ -82,7 +97,7 @@ export const spec = {
 
     return [{
       method: 'POST',
-      url: ENDPOINT_URL,
+      url: deliveryUrl,
       data: body
     }];
   },
@@ -120,11 +135,11 @@ export const spec = {
 };
 
 /**
-* Generate size param for bid request using sizes array
-*
-* @param {Array} sizes Possible sizes for the ad unit.
-* @return {string} Processed sizes param to be used for the bid request.
-*/
+ * Generate size param for bid request using sizes array
+ *
+ * @param {Array} sizes Possible sizes for the ad unit.
+ * @return {string} Processed sizes param to be used for the bid request.
+ */
 function generateSizeParam(sizes) {
   return sizes.map(size => size.join(DIMENSION_SEPARATOR)).join(SIZE_SEPARATOR);
 }
diff --git a/modules/integr8BidAdapter.md b/modules/integr8BidAdapter.md
index eadab7acdb3..da52a2164c6 100644
--- a/modules/integr8BidAdapter.md
+++ b/modules/integr8BidAdapter.md
@@ -3,7 +3,7 @@ Module Name: Integr8 Bidder Adapter Module
 
 Type: Bidder Adapter
 
-Maintainer: arditb@gjirafa.com
+Maintainer: myhedin@gjirafa.com
 
 # Description
 Integr8 Bidder Adapter for Prebid.js.
@@ -23,8 +23,9 @@ var adUnits = [
         bids: [{
             bidder: 'integr8',
             params: {
-                propertyId: '105109',   //Required
-                placementId: '846835',  //Required
+                propertyId: '105135',   //Required
+                placementId: '846837',  //Required,
+                deliveryUrl: 'https://central.sea.integr8.digital/bid', //Optional
                 data: {                 //Optional
                     catalogs: [{
                         catalogId: "699229",
@@ -48,8 +49,9 @@ var adUnits = [
         bids: [{
             bidder: 'integr8',
             params: {
-                propertyId: '105109',  //Required
-                placementId: '846830', //Required
+                propertyId: '105135',  //Required
+                placementId: '846835', //Required,
+                deliveryUrl: 'https://central.sea.integr8.digital/bid', //Optional
                 data: {                //Optional
                     catalogs: [{
                         catalogId: "699229",
diff --git a/modules/intentIqAnalyticsAdapter.js b/modules/intentIqAnalyticsAdapter.js
new file mode 100644
index 00000000000..1cf270117b7
--- /dev/null
+++ b/modules/intentIqAnalyticsAdapter.js
@@ -0,0 +1,324 @@
+import {logError, logInfo} from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import {ajax} from '../src/ajax.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {config} from '../src/config.js';
+import {EVENTS} from '../src/constants.js';
+import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
+import {detectBrowser} from '../libraries/intentIqUtils/detectBrowserUtils.js';
+import {appendVrrefAndFui, getReferrer} from '../libraries/intentIqUtils/getRefferer.js';
+import {getGppValue} from '../libraries/intentIqUtils/getGppValue.js';
+import {CLIENT_HINTS_KEY, FIRST_PARTY_KEY, VERSION} from '../libraries/intentIqConstants/intentIqConstants.js';
+
+const MODULE_NAME = 'iiqAnalytics'
+const analyticsType = 'endpoint';
+const defaultUrl = 'https://reports.intentiq.com/report';
+const storage = getStorageManager({moduleType: MODULE_TYPE_ANALYTICS, moduleName: MODULE_NAME});
+const prebidVersion = '$prebid.version$';
+export const REPORTER_ID = Date.now() + '_' + getRandom(0, 1000);
+
+const PARAMS_NAMES = {
+  abTestGroup: 'abGroup',
+  pbPauseUntil: 'pbPauseUntil',
+  pbMonitoringEnabled: 'pbMonitoringEnabled',
+  isInTestGroup: 'isInTestGroup',
+  enhanceRequests: 'enhanceRequests',
+  wasSubscribedForPrebid: 'wasSubscribedForPrebid',
+  hadEids: 'hadEids',
+  ABTestingConfigurationSource: 'ABTestingConfigurationSource',
+  lateConfiguration: 'lateConfiguration',
+  jsversion: 'jsversion',
+  eidsNames: 'eidsNames',
+  requestRtt: 'rtt',
+  clientType: 'clientType',
+  adserverDeviceType: 'AdserverDeviceType',
+  terminationCause: 'terminationCause',
+  callCount: 'callCount',
+  manualCallCount: 'mcc',
+  pubprovidedidsFailedToregister: 'ppcc',
+  noDataCount: 'noDataCount',
+  profile: 'profile',
+  isProfileDeterministic: 'pidDeterministic',
+  siteId: 'sid',
+  hadEidsInLocalStorage: 'idls',
+  auctionStartTime: 'ast',
+  eidsReadTime: 'eidt',
+  agentId: 'aid',
+  auctionEidsLength: 'aeidln',
+  wasServerCalled: 'wsrvcll',
+  referrer: 'vrref',
+  isInBrowserBlacklist: 'inbbl',
+  prebidVersion: 'pbjsver',
+  partnerId: 'partnerId',
+  firstPartyId: 'pcid',
+  placementId: 'placementId'
+};
+
+let iiqAnalyticsAnalyticsAdapter = Object.assign(adapter({defaultUrl, analyticsType}), {
+  initOptions: {
+    lsValueInitialized: false,
+    partner: null,
+    fpid: null,
+    currentGroup: null,
+    dataInLs: null,
+    eidl: null,
+    lsIdsInitialized: false,
+    manualWinReportEnabled: false,
+    domainName: null
+  },
+  track({eventType, args}) {
+    switch (eventType) {
+      case BID_WON:
+        bidWon(args);
+        break;
+      case BID_REQUESTED:
+        defineGlobalVariableName();
+        break;
+      default:
+        break;
+    }
+  }
+});
+
+// Events needed
+const {
+  BID_WON,
+  BID_REQUESTED
+} = EVENTS;
+
+function readData(key) {
+  try {
+    if (storage.hasLocalStorage()) {
+      return storage.getDataFromLocalStorage(key);
+    }
+    if (storage.cookiesAreEnabled()) {
+      return storage.getCookie(key);
+    }
+  } catch (error) {
+    logError(error);
+  }
+}
+
+function initLsValues() {
+  if (iiqAnalyticsAnalyticsAdapter.initOptions.lsValueInitialized) return;
+  let iiqArr = config.getConfig('userSync.userIds').filter(m => m.name == 'intentIqId');
+  if (iiqArr && iiqArr.length > 0) iiqAnalyticsAnalyticsAdapter.initOptions.lsValueInitialized = true;
+  if (!iiqArr) iiqArr = [];
+  if (iiqArr.length == 0) {
+    iiqArr.push({
+      'params': {
+        'partner': -1,
+        'group': 'U'
+      }
+    })
+  }
+  if (iiqArr && iiqArr.length > 0) {
+    if (iiqArr[0].params && iiqArr[0].params.partner && !isNaN(iiqArr[0].params.partner)) {
+      iiqAnalyticsAnalyticsAdapter.initOptions.partner = iiqArr[0].params.partner;
+    }
+    iiqAnalyticsAnalyticsAdapter.initOptions.browserBlackList = typeof iiqArr[0].params.browserBlackList === 'string' ? iiqArr[0].params.browserBlackList.toLowerCase() : '';
+    iiqAnalyticsAnalyticsAdapter.initOptions.manualWinReportEnabled = iiqArr[0].params.manualWinReportEnabled || false;
+    iiqAnalyticsAnalyticsAdapter.initOptions.domainName = iiqArr[0].params.domainName || '';
+  }
+}
+
+function initReadLsIds() {
+  try {
+    iiqAnalyticsAnalyticsAdapter.initOptions.dataInLs = null;
+    iiqAnalyticsAnalyticsAdapter.initOptions.fpid = JSON.parse(readData(FIRST_PARTY_KEY));
+    if (iiqAnalyticsAnalyticsAdapter.initOptions.fpid) {
+      iiqAnalyticsAnalyticsAdapter.initOptions.currentGroup = iiqAnalyticsAnalyticsAdapter.initOptions.fpid.group;
+    }
+    const partnerData = readData(FIRST_PARTY_KEY + '_' + iiqAnalyticsAnalyticsAdapter.initOptions.partner);
+    const clientsHints = readData(CLIENT_HINTS_KEY) || '';
+
+    if (partnerData) {
+      iiqAnalyticsAnalyticsAdapter.initOptions.lsIdsInitialized = true;
+      let pData = JSON.parse(partnerData);
+      iiqAnalyticsAnalyticsAdapter.initOptions.terminationCause = pData.terminationCause
+      iiqAnalyticsAnalyticsAdapter.initOptions.dataInLs = pData.data;
+      iiqAnalyticsAnalyticsAdapter.initOptions.eidl = pData.eidl || -1;
+      iiqAnalyticsAnalyticsAdapter.initOptions.ct = pData.ct || null;
+      iiqAnalyticsAnalyticsAdapter.initOptions.siteId = pData.siteId || null;
+      iiqAnalyticsAnalyticsAdapter.initOptions.wsrvcll = pData.wsrvcll || false;
+      iiqAnalyticsAnalyticsAdapter.initOptions.rrtt = pData.rrtt || null;
+    }
+
+    iiqAnalyticsAnalyticsAdapter.initOptions.clientsHints = clientsHints
+  } catch (e) {
+    logError(e)
+  }
+}
+
+function bidWon(args, isReportExternal) {
+  if (!iiqAnalyticsAnalyticsAdapter.initOptions.lsValueInitialized) {
+    initLsValues();
+  }
+
+  if (isNaN(iiqAnalyticsAnalyticsAdapter.initOptions.partner) || iiqAnalyticsAnalyticsAdapter.initOptions.partner == -1) return;
+
+  const currentBrowserLowerCase = detectBrowser();
+  if (iiqAnalyticsAnalyticsAdapter.initOptions.browserBlackList?.includes(currentBrowserLowerCase)) {
+    logError('IIQ ANALYTICS -> Browser is in blacklist!');
+    return;
+  }
+
+  if (iiqAnalyticsAnalyticsAdapter.initOptions.lsValueInitialized && !iiqAnalyticsAnalyticsAdapter.initOptions.lsIdsInitialized) {
+    initReadLsIds();
+  }
+  if ((isReportExternal && iiqAnalyticsAnalyticsAdapter.initOptions.manualWinReportEnabled) || (!isReportExternal && !iiqAnalyticsAnalyticsAdapter.initOptions.manualWinReportEnabled)) {
+    ajax(constructFullUrl(preparePayload(args, true)), undefined, null, {method: 'GET'});
+    logInfo('IIQ ANALYTICS -> BID WON')
+    return true;
+  }
+  return false;
+}
+
+function defineGlobalVariableName() {
+  function reportExternalWin(args) {
+    return bidWon(args, true)
+  }
+
+  let partnerId = 0
+  const userConfig = config.getConfig('userSync.userIds')
+
+  if (userConfig) {
+    const iiqArr = userConfig.filter(m => m.name == 'intentIqId');
+    if (iiqArr.length) partnerId = iiqArr[0].params.partner
+  }
+
+  window[`intentIqAnalyticsAdapter_${partnerId}`] = {reportExternalWin: reportExternalWin}
+}
+
+function getRandom(start, end) {
+  return Math.floor((Math.random() * (end - start + 1)) + start);
+}
+
+export function preparePayload(data) {
+  let result = getDefaultDataObject();
+  readData(FIRST_PARTY_KEY + '_' + iiqAnalyticsAnalyticsAdapter.initOptions.partner);
+  result[PARAMS_NAMES.partnerId] = iiqAnalyticsAnalyticsAdapter.initOptions.partner;
+  result[PARAMS_NAMES.prebidVersion] = prebidVersion;
+  result[PARAMS_NAMES.referrer] = getReferrer();
+  result[PARAMS_NAMES.terminationCause] = iiqAnalyticsAnalyticsAdapter.initOptions.terminationCause;
+  result[PARAMS_NAMES.abTestGroup] = iiqAnalyticsAnalyticsAdapter.initOptions.currentGroup;
+  result[PARAMS_NAMES.clientType] = iiqAnalyticsAnalyticsAdapter.initOptions.ct;
+  result[PARAMS_NAMES.siteId] = iiqAnalyticsAnalyticsAdapter.initOptions.siteId;
+  result[PARAMS_NAMES.wasServerCalled] = iiqAnalyticsAnalyticsAdapter.initOptions.wsrvcll;
+  result[PARAMS_NAMES.requestRtt] = iiqAnalyticsAnalyticsAdapter.initOptions.rrtt;
+
+  result[PARAMS_NAMES.isInTestGroup] = iiqAnalyticsAnalyticsAdapter.initOptions.currentGroup == 'A';
+
+  result[PARAMS_NAMES.agentId] = REPORTER_ID;
+  if (iiqAnalyticsAnalyticsAdapter.initOptions.fpid?.pcid) result[PARAMS_NAMES.firstPartyId] = encodeURIComponent(iiqAnalyticsAnalyticsAdapter.initOptions.fpid.pcid);
+  if (iiqAnalyticsAnalyticsAdapter.initOptions.fpid?.pid) result[PARAMS_NAMES.profile] = encodeURIComponent(iiqAnalyticsAnalyticsAdapter.initOptions.fpid.pid)
+
+  prepareData(data, result);
+
+  fillEidsData(result);
+
+  return result;
+}
+
+function fillEidsData(result) {
+  if (iiqAnalyticsAnalyticsAdapter.initOptions.lsIdsInitialized) {
+    result[PARAMS_NAMES.hadEidsInLocalStorage] = iiqAnalyticsAnalyticsAdapter.initOptions.eidl && iiqAnalyticsAnalyticsAdapter.initOptions.eidl > 0;
+    result[PARAMS_NAMES.auctionEidsLength] = iiqAnalyticsAnalyticsAdapter.initOptions.eidl || -1;
+  }
+}
+
+function prepareData (data, result) {
+  if (data.bidderCode) {
+    result.bidderCode = data.bidderCode;
+  }
+  if (data.cpm) {
+    result.cpm = data.cpm;
+  }
+  if (data.currency) {
+    result.currency = data.currency;
+  }
+  if (data.originalCpm) {
+    result.originalCpm = data.originalCpm;
+  }
+  if (data.originalCurrency) {
+    result.originalCurrency = data.originalCurrency;
+  }
+  if (data.status) {
+    result.status = data.status;
+  }
+  if (data.auctionId) {
+    result.prebidAuctionId = data.auctionId;
+  }
+  if (data.placementId) {
+    result.placementId = data.placementId;
+  } else {
+    // Simplified placementId determination
+    let placeIdFound = false;
+    if (data.params && Array.isArray(data.params)) {
+      for (let i = 0; i < data.params.length; i++) {
+        const param = data.params[i];
+        if (param.placementId) {
+          result.placementId = param.placementId;
+          placeIdFound = true;
+          break;
+        }
+      }
+    }
+    if (!placeIdFound && data.adUnitCode) {
+      result.placementId = data.adUnitCode;
+    }
+  }
+
+  result.biddingPlatformId = 1;
+  result.partnerAuctionId = 'BW';
+}
+
+function getDefaultDataObject() {
+  return {
+    'inbbl': false,
+    'pbjsver': prebidVersion,
+    'partnerAuctionId': 'BW',
+    'reportSource': 'pbjs',
+    'abGroup': 'U',
+    'jsversion': VERSION,
+    'partnerId': -1,
+    'biddingPlatformId': 1,
+    'idls': false,
+    'ast': -1,
+    'aeidln': -1
+  }
+}
+
+function constructFullUrl(data) {
+  let report = [];
+  data = btoa(JSON.stringify(data));
+  report.push(data);
+  const gppData = getGppValue();
+
+  let url = defaultUrl + '?pid=' + iiqAnalyticsAnalyticsAdapter.initOptions.partner +
+    '&mct=1' +
+    ((iiqAnalyticsAnalyticsAdapter.initOptions?.fpid)
+      ? '&iiqid=' + encodeURIComponent(iiqAnalyticsAnalyticsAdapter.initOptions.fpid.pcid) : '') +
+    '&agid=' + REPORTER_ID +
+    '&jsver=' + VERSION +
+    '&source=pbjs' +
+    '&payload=' + JSON.stringify(report) +
+    '&uh=' + iiqAnalyticsAnalyticsAdapter.initOptions.clientsHints +
+    (gppData.gppString ? '&gpp=' + encodeURIComponent(gppData.gppString) : '');
+
+  url = appendVrrefAndFui(url, iiqAnalyticsAnalyticsAdapter.initOptions.domainName);
+  return url;
+}
+
+iiqAnalyticsAnalyticsAdapter.originEnableAnalytics = iiqAnalyticsAnalyticsAdapter.enableAnalytics;
+
+iiqAnalyticsAnalyticsAdapter.enableAnalytics = function (myConfig) {
+  iiqAnalyticsAnalyticsAdapter.originEnableAnalytics(myConfig); // call the base class function
+};
+adapterManager.registerAnalyticsAdapter({
+  adapter: iiqAnalyticsAnalyticsAdapter,
+  code: MODULE_NAME
+});
+
+export default iiqAnalyticsAnalyticsAdapter;
diff --git a/modules/intentIqAnalyticsAdapter.md b/modules/intentIqAnalyticsAdapter.md
new file mode 100644
index 00000000000..2a3eece0576
--- /dev/null
+++ b/modules/intentIqAnalyticsAdapter.md
@@ -0,0 +1,85 @@
+# Overview
+
+Module Name: iiqAnalytics
+Module Type: Analytics Adapter
+Maintainer: julian@intentiq.com
+
+# Description
+
+By using this Intent IQ adapter, you will be able to obtain comprehensive analytics and metrics regarding the performance of the Intent IQ Unified ID module. This includes how the module impacts your revenue, CPMs, and fill rates related to bidders and domains.
+
+## Intent IQ Universal ID Registration
+
+No registration for this module is required.
+
+## Intent IQ Universal IDConfiguration
+
+IMPORTANT: only effective when Intent IQ Universal ID module is installed and configured. [(How-To)](https://docs.prebid.org/dev-docs/modules/userid-submodules/intentiq.html)
+
+#### Example Configuration
+
+```js
+pbjs.enableAnalytics({
+    provider: 'iiqAnalytics'
+});
+```
+
+
+### Manual Report Trigger with reportExternalWin
+
+The reportExternalWin function allows for manual reporting, meaning that reports will not be sent automatically but only when triggered manually.
+
+To enable this manual reporting functionality, you must set the manualWinReportEnabled parameter in Intent IQ Unified ID module configuration is true. Once enabled, reports can be manually triggered using the reportExternalWin function.
+
+
+### Calling the reportExternalWin Function
+
+To call the reportExternalWin function, you need to pass the partner_id parameter as shown in the example below:
+
+```js
+window.intentIqAnalyticsAdapter_[partner_id].reportExternalWin()
+```
+Example use with Partner ID = 123455
+
+```js
+window.intentIqAnalyticsAdapter_123455.reportExternalWin()
+```
+
+### Function Parameters
+
+The reportExternalWin function takes an object containing auction win data. Below is an example of the object:
+
+```js
+var reportData = {
+biddingPlatformId: 1, // Platform ID. The value 1 corresponds to PreBid.
+partnerAuctionId: '[YOUR_AUCTION_ID_IF_EXISTS]', // Auction ID, if available.
+bidderCode: 'xxxxxxxx', // Bidder code.
+prebidAuctionId: '3d4xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx8e', // PreBid auction ID.
+cpm: 1.5, // Cost per thousand impressions (CPM).
+currency: 'USD', // Currency for the CPM value.
+originalCpm: 1.5, // Original CPM value.
+originalCurrency: 'USD', // Original currency.
+status: 'rendered', // Auction status, e.g., 'rendered'.
+placementId: 'div-1' // ID of the ad placement.
+}
+```
+
+| Field              | Data Type | Description                                                                                                                                      | Example                       | Mandatory |
+|--------------------|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------|-----------|
+| biddingPlatformId   | Integer   | Specify the platform in which this ad impression was rendered – 1 – Prebid, 2 – Amazon, 3 – Google, 4 – Open RTB (including your local Prebid server) | 1                             | Yes       |
+| partnerAuctionId    | String    | Use this when you are running multiple auction solutions across your assets and have a unified identifier for auctions                            | 3d44542d-xx-4662-xxxx-4xxxx3d8e | No        |
+| bidderCode          | String    | Specifies the name of the bidder that won the auction as reported by Prebid and all other bidding platforms                                       | newAppnexus                   | Yes       |
+| prebidAuctionId     | String    | Specifies the identifier of the Prebid auction. Leave empty or undefined if Prebid is not the bidding platform                                   |                               |         |
+| cpm                 | Decimal   | Cost per mille of the impression as received from the demand-side auction (without modifications or reductions)                                   | 5.62                          | Yes       |
+| currency            | String    | Currency of the auction                                                                                                                          | USD                           | Yes       |
+| originalCpm         | Decimal   | Leave empty or undefined if Prebid is not the bidding platform                                                                                    | 5.5                           | No        |
+| originalCurrency    | String    | Currency of the original auction                                                                                                                 | USD                           | No        |
+| status              | String    | Status of the impression. Leave empty or undefined if Prebid is not the bidding platform                                                          | rendered                      | No        |
+| placementId         | String    | Unique identifier of the ad unit on the webpage that showed this ad                                                                               | div-1                         | No        |
+
+
+To report the auction win, call the function as follows:
+
+```js
+window.intentIqAnalyticsAdapter_[partner_id].reportExternalWin(reportData)
+```
diff --git a/modules/intentIqIdSystem.js b/modules/intentIqIdSystem.js
index 5164080c317..4a7d0f47b18 100644
--- a/modules/intentIqIdSystem.js
+++ b/modules/intentIqIdSystem.js
@@ -5,21 +5,53 @@
  * @requires module:modules/userId
  */
 
-import { logError, logInfo } from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
-import { submodule } from '../src/hook.js'
-import { getStorageManager } from '../src/storageManager.js';
-import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+import {logError, logInfo} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js'
+import {getStorageManager} from '../src/storageManager.js';
+import {MODULE_TYPE_UID} from '../src/activities/modules.js';
+import {uspDataHandler} from '../src/consentHandler.js';
+import AES from 'crypto-js/aes.js';
+import Utf8 from 'crypto-js/enc-utf8.js';
+import {detectBrowser} from '../libraries/intentIqUtils/detectBrowserUtils.js';
+import {appendVrrefAndFui} from '../libraries/intentIqUtils/getRefferer.js';
+import {getGppValue} from '../libraries/intentIqUtils/getGppValue.js';
+import {
+  FIRST_PARTY_KEY,
+  WITH_IIQ, WITHOUT_IIQ,
+  NOT_YET_DEFINED,
+  OPT_OUT,
+  BLACK_LIST,
+  CLIENT_HINTS_KEY,
+  EMPTY,
+  VERSION
+} from '../libraries/intentIqConstants/intentIqConstants.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
 
 const PCID_EXPIRY = 365;
 
 const MODULE_NAME = 'intentIqId';
-export const FIRST_PARTY_KEY = '_iiq_fdata';
-export var FIRST_PARTY_DATA_KEY = '_iiq_fdata';
-
-export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME });
 
+const encoderCH = {
+  brands: 0,
+  mobile: 1,
+  platform: 2,
+  architecture: 3,
+  bitness: 4,
+  model: 5,
+  platformVersion: 6,
+  wow64: 7,
+  fullVersionList: 8
+};
 const INVALID_ID = 'INVALID_ID';
+const SUPPORTED_TYPES = ['html5', 'cookie']
+
+export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
 
 /**
  * Generate standard UUID string
@@ -36,16 +68,35 @@ function generateGUID() {
 }
 
 /**
- * Read Intent IQ data from cookie or local storage
+ * Encrypts plaintext.
+ * @param {string} plainText The plaintext to encrypt.
+ * @returns {string} The encrypted text as a base64 string.
+ */
+export function encryptData(plainText) {
+  return AES.encrypt(plainText, MODULE_NAME).toString();
+}
+
+/**
+ * Decrypts ciphertext.
+ * @param {string} encryptedText The encrypted text as a base64 string.
+ * @returns {string} The decrypted plaintext.
+ */
+export function decryptData(encryptedText) {
+  const bytes = AES.decrypt(encryptedText, MODULE_NAME);
+  return bytes.toString(Utf8);
+}
+
+/**
+ * Read Intent IQ data from local storage or cookie
  * @param key
  * @return {string}
  */
-export function readData(key) {
+export function readData(key, allowedStorage) {
   try {
-    if (storage.hasLocalStorage()) {
+    if (storage.hasLocalStorage() && allowedStorage.includes('html5')) {
       return storage.getDataFromLocalStorage(key);
     }
-    if (storage.cookiesAreEnabled()) {
+    if (storage.cookiesAreEnabled() && allowedStorage.includes('cookie')) {
       return storage.getCookie(key);
     }
   } catch (error) {
@@ -54,21 +105,20 @@ export function readData(key) {
 }
 
 /**
- * Store Intent IQ data in either cookie or local storage
+ * Store Intent IQ data in cookie, local storage or both of them
  * expiration date: 365 days
  * @param key
  * @param {string} value IntentIQ ID value to sintentIqIdSystem_spec.jstore
  */
-function storeData(key, value, cookieStorageEnabled = false) {
+export function storeData(key, value, allowedStorage) {
   try {
     logInfo(MODULE_NAME + ': storing data: key=' + key + ' value=' + value);
-
     if (value) {
-      if (storage.hasLocalStorage()) {
+      if (storage.hasLocalStorage() && allowedStorage.includes('html5')) {
         storage.setDataInLocalStorage(key, value);
       }
-      const expiresStr = (new Date(Date.now() + (PCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
-      if (storage.cookiesAreEnabled() && cookieStorageEnabled) {
+      if (storage.cookiesAreEnabled() && allowedStorage.includes('cookie')) {
+        const expiresStr = (new Date(Date.now() + (PCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
         storage.setCookie(key, value, expiresStr, 'LAX');
       }
     }
@@ -77,10 +127,28 @@ function storeData(key, value, cookieStorageEnabled = false) {
   }
 }
 
+/**
+ * Remove Intent IQ data from cookie or local storage
+ * @param key
+ */
+
+export function removeDataByKey(key, allowedStorage) {
+  try {
+    if (storage.hasLocalStorage() && allowedStorage.includes('html5')) {
+      storage.removeDataFromLocalStorage(key);
+    }
+    if (storage.cookiesAreEnabled() && allowedStorage.includes('cookie')) {
+      const expiredDate = new Date(0).toUTCString();
+      storage.setCookie(key, '', expiredDate, 'LAX');
+    }
+  } catch (error) {
+    logError(error);
+  }
+}
+
 /**
  * Parse json if possible, else return null
  * @param data
- * @param {object|null}
  */
 function tryParse(data) {
   try {
@@ -91,6 +159,38 @@ function tryParse(data) {
   }
 }
 
+/**
+ * Processes raw client hints data into a structured format.
+ * @param {object} clientHints - Raw client hints data
+ * @return {string} A JSON string of processed client hints or an empty string if no hints
+ */
+export function handleClientHints(clientHints) {
+  const chParams = {};
+  for (const key in clientHints) {
+    if (clientHints.hasOwnProperty(key) && clientHints[key] !== '') {
+      if (['brands', 'fullVersionList'].includes(key)) {
+        let handledParam = '';
+        clientHints[key].forEach((element, index) => {
+          const isNotLast = index < clientHints[key].length - 1;
+          handledParam += `"${element.brand}";v="${element.version}"${isNotLast ? ', ' : ''}`;
+        });
+        chParams[encoderCH[key]] = handledParam;
+      } else if (typeof clientHints[key] === 'boolean') {
+        chParams[encoderCH[key]] = `?${clientHints[key] ? 1 : 0}`;
+      } else {
+        chParams[encoderCH[key]] = `"${clientHints[key]}"`;
+      }
+    }
+  }
+  return Object.keys(chParams).length ? JSON.stringify(chParams) : '';
+}
+
+function defineStorageType(params) {
+  if (!params || !Array.isArray(params)) return ['html5']; // use locale storage be default
+  const filteredArr = params.filter(item => SUPPORTED_TYPES.includes(item));
+  return filteredArr.length ? filteredArr : ['html5'];
+}
+
 /** @type {Submodule} */
 export const intentIqIdSubmodule = {
   /**
@@ -105,7 +205,7 @@ export const intentIqIdSubmodule = {
    * @returns {{intentIqId: {string}}|undefined}
    */
   decode(value) {
-    return value && value != '' && INVALID_ID != value ? { 'intentIqId': value } : undefined;
+    return value && value != '' && INVALID_ID != value ? {'intentIqId': value} : undefined;
   },
   /**
    * performs action to obtain id and return a value in the callback's response argument
@@ -114,25 +214,144 @@ export const intentIqIdSubmodule = {
    * @returns {IdResponse|undefined}
    */
   getId(config) {
-    const configParams = (config && config.params) || {};
-    if (!configParams || typeof configParams.partner !== 'number') {
+    const configParams = (config?.params) || {};
+    let decryptedData, callbackTimeoutID;
+    let callbackFired = false;
+    let runtimeEids = { eids: [] };
+
+    const allowedStorage = defineStorageType(config.enabledStorageTypes);
+
+    let firstPartyData = tryParse(readData(FIRST_PARTY_KEY, allowedStorage));
+    const isGroupB = firstPartyData?.group === WITHOUT_IIQ;
+
+    const firePartnerCallback = () => {
+      if (configParams.callback && !callbackFired) {
+        callbackFired = true;
+        if (callbackTimeoutID) clearTimeout(callbackTimeoutID);
+        if (isGroupB) runtimeEids = { eids: [] };
+        configParams.callback(runtimeEids, firstPartyData?.group || NOT_YET_DEFINED);
+      }
+    }
+
+    callbackTimeoutID = setTimeout(() => {
+      firePartnerCallback();
+    }, configParams.timeoutInMillis || 500
+    );
+
+    if (typeof configParams.partner !== 'number') {
       logError('User ID - intentIqId submodule requires a valid partner to be defined');
+      firePartnerCallback()
       return;
     }
-    const cookieStorageEnabled = typeof configParams.enableCookieStorage === 'boolean' ? configParams.enableCookieStorage : false
-    if (!FIRST_PARTY_DATA_KEY.includes(configParams.partner)) { FIRST_PARTY_DATA_KEY += '_' + configParams.partner; }
+
+    const FIRST_PARTY_DATA_KEY = `_iiq_fdata_${configParams.partner}`;
+
     let rrttStrtTime = 0;
+    let partnerData = {};
+    let shouldCallServer = false
 
-    // Read Intent IQ 1st party id or generate it if none exists
-    let firstPartyData = tryParse(readData(FIRST_PARTY_KEY));
-    if (!firstPartyData || !firstPartyData.pcid || firstPartyData.pcidDate) {
+    const currentBrowserLowerCase = detectBrowser();
+    const browserBlackList = typeof configParams.browserBlackList === 'string' ? configParams.browserBlackList.toLowerCase() : '';
+
+    // Check if current browser is in blacklist
+    if (browserBlackList?.includes(currentBrowserLowerCase)) {
+      logError('User ID - intentIqId submodule: browser is in blacklist!');
+      if (configParams.callback) configParams.callback('', BLACK_LIST);
+      return;
+    }
+
+    // Get consent information
+    const cmpData = {};
+    const uspData = uspDataHandler.getConsentData();
+    const gppData = getGppValue();
+
+    if (uspData) {
+      cmpData.us_privacy = uspData;
+    }
+
+    cmpData.gpp = gppData.gppString;
+    cmpData.gpi = gppData.gpi;
+
+    // Read client hints from storage
+    let clientHints = readData(CLIENT_HINTS_KEY, allowedStorage);
+
+    // Get client hints and save to storage
+    if (navigator.userAgentData) {
+      navigator.userAgentData
+        .getHighEntropyValues([
+          'brands',
+          'mobile',
+          'bitness',
+          'wow64',
+          'architecture',
+          'model',
+          'platform',
+          'platformVersion',
+          'fullVersionList'
+        ])
+        .then(ch => {
+          clientHints = handleClientHints(ch);
+          storeData(CLIENT_HINTS_KEY, clientHints, allowedStorage)
+        });
+    }
+
+    if (!firstPartyData?.pcid) {
       const firstPartyId = generateGUID();
-      firstPartyData = { 'pcid': firstPartyId, 'pcidDate': Date.now() };
-      storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData), cookieStorageEnabled);
+      firstPartyData = {
+        pcid: firstPartyId,
+        pcidDate: Date.now(),
+        group: NOT_YET_DEFINED,
+        cttl: 0,
+        uspapi_value: EMPTY,
+        gpp_value: EMPTY,
+        date: Date.now()
+      };
+      storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData), allowedStorage);
+    } else if (!firstPartyData.pcidDate) {
+      firstPartyData.pcidDate = Date.now();
+      storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData), allowedStorage);
     }
 
-    let partnerData = tryParse(readData(FIRST_PARTY_DATA_KEY));
-    if (!partnerData) partnerData = {};
+    const savedData = tryParse(readData(FIRST_PARTY_DATA_KEY, allowedStorage))
+    if (savedData) {
+      partnerData = savedData;
+
+      if (partnerData.wsrvcll) {
+        partnerData.wsrvcll = false;
+        storeData(FIRST_PARTY_DATA_KEY, JSON.stringify(partnerData), allowedStorage);
+      }
+    }
+
+    if (partnerData.data) {
+      if (partnerData.data.length) { // encrypted data
+        decryptedData = tryParse(decryptData(partnerData.data));
+        runtimeEids = decryptedData;
+      }
+    }
+
+    if (!firstPartyData.cttl || Date.now() - firstPartyData.date > firstPartyData.cttl || firstPartyData.uspapi_value !== cmpData.us_privacy || firstPartyData.gpp_string_value !== cmpData.gpp) {
+      firstPartyData.uspapi_value = cmpData.us_privacy;
+      firstPartyData.gpp_string_value = cmpData.gpp;
+      firstPartyData.isOptedOut = false
+      firstPartyData.cttl = 0
+      shouldCallServer = true;
+      partnerData.data = {}
+      partnerData.eidl = -1
+      storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData), allowedStorage);
+      storeData(FIRST_PARTY_DATA_KEY, JSON.stringify(partnerData), allowedStorage);
+    } else if (firstPartyData.isOptedOut) {
+      firePartnerCallback()
+    }
+
+    if (firstPartyData.group === WITHOUT_IIQ || (firstPartyData.group !== WITHOUT_IIQ && runtimeEids?.eids?.length)) {
+      firePartnerCallback()
+    }
+
+    if (!shouldCallServer) {
+      if (isGroupB) runtimeEids = { eids: [] };
+      firePartnerCallback();
+      return { id: runtimeEids.eids };
+    }
 
     // use protocol relative urls for http or https
     let url = `https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=${configParams.partner}&pt=17&dpn=1`;
@@ -143,61 +362,146 @@ export const intentIqIdSubmodule = {
     url += (partnerData.cttl) ? '&cttl=' + encodeURIComponent(partnerData.cttl) : '';
     url += (partnerData.rrtt) ? '&rrtt=' + encodeURIComponent(partnerData.rrtt) : '';
     url += firstPartyData.pcidDate ? '&iiqpciddate=' + encodeURIComponent(firstPartyData.pcidDate) : '';
+    url += cmpData.us_privacy ? '&pa=' + encodeURIComponent(cmpData.us_privacy) : '';
+    url += cmpData.gpp ? '&gpp=' + encodeURIComponent(cmpData.gpp) : '';
+    url += cmpData.gpi ? '&gpi=' + cmpData.gpi : '';
+    url += clientHints ? '&uh=' + encodeURIComponent(clientHints) : '';
+    url += VERSION ? '&jsver=' + VERSION : '';
+    url += firstPartyData?.group ? '&testGroup=' + encodeURIComponent(firstPartyData.group) : '';
+
+    // Add vrref and fui to the URL
+    url = appendVrrefAndFui(url, configParams.domainName);
+
+    const storeFirstPartyData = () => {
+      partnerData.eidl = runtimeEids?.eids?.length || -1
+      storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData), allowedStorage);
+      storeData(FIRST_PARTY_DATA_KEY, JSON.stringify(partnerData), allowedStorage);
+    }
 
     const resp = function (callback) {
       const callbacks = {
         success: response => {
           let respJson = tryParse(response);
           // If response is a valid json and should save is true
-          if (respJson && respJson.ls) {
-            // Store pid field if found in response json
-            let shouldUpdateLs = false;
-            if ('pid' in respJson) {
-              firstPartyData.pid = respJson.pid;
-              shouldUpdateLs = true;
+          if (respJson) {
+            partnerData.date = Date.now();
+            firstPartyData.date = Date.now();
+            const defineEmptyDataAndFireCallback = () => {
+              respJson.data = partnerData.data = runtimeEids = { eids: [] };
+              storeFirstPartyData()
+              firePartnerCallback()
+              callback(runtimeEids)
             }
+            if (callbackTimeoutID) clearTimeout(callbackTimeoutID)
             if ('cttl' in respJson) {
-              partnerData.cttl = respJson.cttl;
-              shouldUpdateLs = true;
+              firstPartyData.cttl = respJson.cttl;
+            } else firstPartyData.cttl = 86400000;
+
+            if ('tc' in respJson) {
+              partnerData.terminationCause = respJson.tc;
+              if (respJson.tc == 41) {
+                firstPartyData.group = WITHOUT_IIQ;
+                storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData), allowedStorage);
+                defineEmptyDataAndFireCallback();
+                return
+              } else {
+                firstPartyData.group = WITH_IIQ;
+              }
             }
-            // If should save and data is empty, means we should save as INVALID_ID
-            if (respJson.data == '') {
-              respJson.data = INVALID_ID;
-            } else {
+            if ('isOptedOut' in respJson) {
+              if (respJson.isOptedOut !== firstPartyData.isOptedOut) {
+                firstPartyData.isOptedOut = respJson.isOptedOut;
+              }
+              if (respJson.isOptedOut === true) {
+                firstPartyData.group = OPT_OUT;
+                storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData), allowedStorage);
+                defineEmptyDataAndFireCallback()
+                return
+              }
+            }
+            if ('pid' in respJson) {
+              firstPartyData.pid = respJson.pid;
+            }
+            if ('ls' in respJson) {
+              if (respJson.ls === false) {
+                defineEmptyDataAndFireCallback()
+                return
+              }
+              // If data is empty, means we should save as INVALID_ID
+              if (respJson.data == '') {
+                respJson.data = INVALID_ID;
+              } else {
+                // If data is a single string, assume it is an id with source intentiq.com
+                if (respJson.data && typeof respJson.data === 'string') {
+                  respJson.data = {eids: [respJson.data]}
+                }
+              }
               partnerData.data = respJson.data;
-              shouldUpdateLs = true;
             }
+
+            if ('ct' in respJson) {
+              partnerData.ct = respJson.ct;
+            }
+
+            if ('sid' in respJson) {
+              partnerData.siteId = respJson.sid;
+            }
+
             if (rrttStrtTime && rrttStrtTime > 0) {
               partnerData.rrtt = Date.now() - rrttStrtTime;
-              shouldUpdateLs = true;
             }
-            if (shouldUpdateLs === true) {
-              partnerData.date = Date.now();
-              storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData), cookieStorageEnabled);
-              storeData(FIRST_PARTY_DATA_KEY, JSON.stringify(partnerData), cookieStorageEnabled);
+
+            if (respJson.data?.eids) {
+              runtimeEids = respJson.data
+              callback(respJson.data.eids);
+              firePartnerCallback()
+              const encryptedData = encryptData(JSON.stringify(respJson.data))
+              partnerData.data = encryptedData;
+            } else {
+              callback(runtimeEids);
+              firePartnerCallback()
             }
-            callback(respJson.data);
+            storeFirstPartyData();
           } else {
-            callback();
+            callback(runtimeEids);
+            firePartnerCallback()
           }
         },
         error: error => {
           logError(MODULE_NAME + ': ID fetch encountered an error', error);
-          callback();
+          callback(runtimeEids);
         }
       };
-      if (partnerData.date && partnerData.cttl && partnerData.data &&
-        Date.now() - partnerData.date < partnerData.cttl) { callback(partnerData.data); } else {
-        rrttStrtTime = Date.now();
-        ajax(url, callbacks, undefined, { method: 'GET', withCredentials: true });
-      }
+      rrttStrtTime = Date.now();
+
+      partnerData.wsrvcll = true;
+      storeData(FIRST_PARTY_DATA_KEY, JSON.stringify(partnerData), allowedStorage);
+      ajax(url, callbacks, undefined, {method: 'GET', withCredentials: true});
     };
-    return { callback: resp };
+    const respObj = {callback: resp};
+
+    if (runtimeEids?.eids?.length) respObj.id = runtimeEids.eids;
+    return respObj
   },
   eids: {
     'intentIqId': {
       source: 'intentiq.com',
-      atype: 1
+      atype: 1,
+      getSource: function (data) {
+        return data.source;
+      },
+      getValue: function (data) {
+        if (data?.uids?.length) {
+          return data.uids[0].id
+        }
+        return null
+      },
+      getUidExt: function (data) {
+        if (data?.uids?.length) {
+          return data.uids[0].ext;
+        }
+        return null
+      }
     },
   }
 };
diff --git a/modules/intentIqIdSystem.md b/modules/intentIqIdSystem.md
new file mode 100644
index 00000000000..34fd495d625
--- /dev/null
+++ b/modules/intentIqIdSystem.md
@@ -0,0 +1,71 @@
+```
+Module Name: IntentIQ Id System
+Module Type: Id System
+Maintainer: julian@intentiq.com, dmytro.piskun@intentiq.com
+usp_supported: true
+gpp_sids: usnat
+```
+
+# Intent IQ Universal ID module
+
+By leveraging the Intent IQ identity graph, our module helps publishers, SSPs, and DSPs overcome the challenges of monetizing cookie-less inventory and preparing for a future without 3rd-party cookies. Our solution implements 1st-party data clustering and provides Intent IQ person IDs with over 90% coverage and unmatched accuracy in supported countries while remaining privacy-friendly and CCPA compliant. This results in increased CPMs, higher fill rates, and, ultimately, lifting overall revenue
+
+# All you need is a few basic steps to start using our solution.
+
+## Registration
+
+Navigate to [our portal ](https://www.intentiq.com/) and contact our team for partner ID.
+check our [documentation](https://pbmodule.documents.intentiq.com/) to get more information about our solution and how utilze it's full potential
+
+## Integration
+
+```
+gulp build –modules=intentIqIdSystem
+```
+
+We recommend including the Intent IQ Analytics adapter module for improved visibility
+
+## Configuration
+
+### Parameters
+
+Please find below list of paramters that could be used in configuring Intent IQ Universal ID module
+
+| Param under userSync.userIds[] | Scope    | Type     | Description                                                                                                                                                                                                                                                                                                                               | Example                                       |
+| ------------------------------ | -------- |----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------|
+| name                           | Required | String   | The name of this module: "intentIqId"                                                                                                                                                                                                                                                                                                     | `"intentIqId"`                                |
+| params                         | Required | Object   | Details for IntentIqId initialization.                                                                                                                                                                                                                                                                                                    |                                               |
+| params.partner                 | Required | Number   | This is the partner ID value obtained from registering with IntentIQ.                                                                                                                                                                                                                                                                     | `1177538`                                     |
+| params.pcid                    | Optional | String   | This is the partner cookie ID, it is a dynamic value attached to the request.                                                                                                                                                                                                                                                             | `"g3hC52b"`                                   |
+| params.pai                     | Optional | String   | This is the partner customer ID / advertiser ID, it is a dynamic value attached to the request.                                                                                                                                                                                                                                           | `"advertiser1"`                               |
+| params.callback                | Required | Function | This is a callback which is trigered with data and AB group                                                                                                                                                                                                                                                                               | `(data, group) => console.log({ data, group })` |
+| params.timeoutInMillis         | Optional | Number   | This is the timeout in milliseconds, which defines the maximum duration before the callback is triggered. The default value is 500.                                                                                                                                                                                                       | `450`                                         |
+| params.browserBlackList        | Optional |  String  | This is the name of a browser that can be added to a blacklist.                                                                                                                                                                                                                                                                           | `"chrome"`                                    |
+| params.manualWinReportEnabled  | Optional | Boolean  | This variable determines whether the bidWon event is triggered automatically. If set to false, the event will occur automatically, and manual reporting with reportExternalWin will be disabled. If set to true, the event will not occur automatically, allowing manual reporting through reportExternalWin. The default value is false. | `true`|
+| params.domainName              | Optional | String   | Specifies the domain of the page in which the IntentIQ object is currently running and serving the impression. This domain will be used later in the revenue reporting breakdown by domain. For example, cnn.com. It identifies the primary source of requests to the IntentIQ servers, even within nested web pages.                     | `"currentDomain.com"`                         |
+
+### Configuration example
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: "intentIqId",
+            params: {
+                partner: 123456,     // valid partner id
+                timeoutInMillis: 500,
+                browserBlackList: "chrome",
+                callback: (data, group) => window.pbjs.requestBids(),
+                manualWinReportEnabled: true,
+                domainName: "currentDomain.com"
+            },
+            storage: {
+                type: "html5",
+                name: "intentIqId",    // set localstorage with this name
+                expires: 0,
+                refreshInSeconds: 0
+            }
+        }]
+    }
+});
+```
diff --git a/modules/interactiveOffersBidAdapter.js b/modules/interactiveOffersBidAdapter.js
index feb576fbb02..bb27239fef4 100644
--- a/modules/interactiveOffersBidAdapter.js
+++ b/modules/interactiveOffersBidAdapter.js
@@ -1,4 +1,4 @@
-import {isNumber, logWarn} from '../src/utils.js';
+import {deepClone, isNumber, logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 
@@ -79,8 +79,7 @@ function parseRequestPrebidjsToOpenRTB(prebidRequest, bidderRequest) {
   // TODO: these should probably look at refererInfo
   let pageURL = window.location.href;
   let domain = window.location.hostname;
-  let secure = (window.location.protocol == 'https:' ? 1 : 0);
-  let openRTBRequest = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequest']));
+  let openRTBRequest = deepClone(DEFAULT['OpenRTBBidRequest']);
   openRTBRequest.id = bidderRequest.bidderRequestId;
   openRTBRequest.ext = {
     // TODO: please do not send internal data structures over the network
@@ -89,38 +88,38 @@ function parseRequestPrebidjsToOpenRTB(prebidRequest, bidderRequest) {
     auctionId: prebidRequest.auctionId
   };
 
-  openRTBRequest.site = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSite']));
+  openRTBRequest.site = deepClone(DEFAULT['OpenRTBBidRequestSite']);
   openRTBRequest.site.id = domain;
   openRTBRequest.site.name = domain;
   openRTBRequest.site.domain = domain;
   openRTBRequest.site.page = pageURL;
   openRTBRequest.site.ref = prebidRequest.refererInfo.ref;
 
-  openRTBRequest.site.publisher = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSitePublisher']));
+  openRTBRequest.site.publisher = deepClone(DEFAULT['OpenRTBBidRequestSitePublisher']);
   openRTBRequest.site.publisher.id = 0;
   openRTBRequest.site.publisher.name = prebidRequest.refererInfo.domain;
   openRTBRequest.site.publisher.domain = domain;
   openRTBRequest.site.publisher.domain = domain;
 
-  openRTBRequest.site.content = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSiteContent']));
+  openRTBRequest.site.content = deepClone(DEFAULT['OpenRTBBidRequestSiteContent']);
 
-  openRTBRequest.source = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSource']));
+  openRTBRequest.source = deepClone(DEFAULT['OpenRTBBidRequestSource']);
   openRTBRequest.source.fd = 0;
   openRTBRequest.source.tid = prebidRequest.ortb2?.source?.tid;
   openRTBRequest.source.pchain = '';
 
-  openRTBRequest.device = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestDevice']));
+  openRTBRequest.device = deepClone(DEFAULT['OpenRTBBidRequestDevice']);
 
-  openRTBRequest.user = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestUser']));
+  openRTBRequest.user = deepClone(DEFAULT['OpenRTBBidRequestUser']);
 
   openRTBRequest.imp = [];
   prebidRequest.bids.forEach(function(bid) {
     if (!ret.partnerId) {
       ret.partnerId = bid.params.partnerId;
     }
-    let imp = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestImp']));
+    let imp = deepClone(DEFAULT['OpenRTBBidRequestImp']);
     imp.id = bid.bidId;
-    imp.secure = secure;
+    imp.secure = bid.ortb2Imp?.secure ?? 1;
     imp.tagid = bid.adUnitCode;
     imp.ext = {
       rawdata: bid
@@ -131,7 +130,7 @@ function parseRequestPrebidjsToOpenRTB(prebidRequest, bidderRequest) {
 
     Object.keys(bid.mediaTypes).forEach(function(mediaType) {
       if (mediaType == 'banner') {
-        imp.banner = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestImpBanner']));
+        imp.banner = deepClone(DEFAULT['OpenRTBBidRequestImpBanner']);
         imp.banner.w = 0;
         imp.banner.h = 0;
         imp.banner.format = [];
@@ -156,7 +155,7 @@ function parseResponseOpenRTBToPrebidjs(openRTBResponse) {
       response.seatbid.forEach(function(seatbid) {
         if (seatbid.bid && seatbid.bid.forEach) {
           seatbid.bid.forEach(function(bid) {
-            let prebid = JSON.parse(JSON.stringify(DEFAULT['PrebidBid']));
+            let prebid = deepClone(DEFAULT['PrebidBid']);
             prebid.requestId = bid.impid;
             prebid.ad = bid.adm;
             prebid.creativeId = bid.crid;
diff --git a/modules/invamiaBidAdapter.js b/modules/invamiaBidAdapter.js
index 2d36fb77e16..7f9a40e1473 100644
--- a/modules/invamiaBidAdapter.js
+++ b/modules/invamiaBidAdapter.js
@@ -1,5 +1,11 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
+import { buildBannerRequests, interpretBannerResponse } from '../libraries/biddoInvamiaUtils/index.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
 
 const BIDDER_CODE = 'invamia';
 const ENDPOINT_URL = 'https://ad.invamia.com/delivery/impress';
@@ -7,86 +13,15 @@ const ENDPOINT_URL = 'https://ad.invamia.com/delivery/impress';
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bidRequest The bid request params to validate.
-   * @return boolean True if this is a valid bid request, and false otherwise.
-   */
-  isBidRequestValid: function(bidRequest) {
+  isBidRequestValid: function (bidRequest) {
     return !!bidRequest.params.zoneId;
   },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {Array} validBidRequests an array of bid requests
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(validBidRequests) {
-    let serverRequests = [];
-
-    validBidRequests.forEach(bidRequest => {
-      const sizes = bidRequest.mediaTypes.banner.sizes;
-
-      sizes.forEach(([width, height]) => {
-        bidRequest.params.requestedSizes = [width, height];
-
-        const payload = {
-          ctype: 'div',
-          pzoneid: bidRequest.params.zoneId,
-          width,
-          height,
-        };
-
-        const payloadString = Object.keys(payload).map(k => k + '=' + encodeURIComponent(payload[k])).join('&');
-
-        serverRequests.push({
-          method: 'GET',
-          url: ENDPOINT_URL,
-          data: payloadString,
-          bidderRequest: bidRequest,
-        });
-      });
-    });
-
-    return serverRequests;
+  buildRequests: function (validBidRequests) {
+    return validBidRequests.flatMap((bidRequest) => buildBannerRequests(bidRequest, ENDPOINT_URL));
   },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {ServerResponse} serverResponse A successful response from the server.
-   * @param {BidRequest} bidderRequest A matched bid request for this response.
-   * @return Array An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, {bidderRequest}) {
-    const response = serverResponse.body;
-    const bidResponses = [];
-
-    if (response && response.template && response.template.html) {
-      const {bidId} = bidderRequest;
-      const [width, height] = bidderRequest.params.requestedSizes;
-
-      const bidResponse = {
-        requestId: bidId,
-        cpm: response.hb.cpm,
-        creativeId: response.banner.hash,
-        currency: 'USD',
-        netRevenue: response.hb.netRevenue,
-        ttl: 600,
-        ad: response.template.html,
-        mediaType: 'banner',
-        meta: {
-          advertiserDomains: response.hb.adomains || [],
-        },
-        width,
-        height,
-      };
-
-      bidResponses.push(bidResponse);
-    }
-
-    return bidResponses;
+  interpretResponse: function (serverResponse, { bidderRequest }) {
+    return interpretBannerResponse(serverResponse, bidderRequest);
   },
-}
+};
 
 registerBidder(spec);
diff --git a/modules/invibesBidAdapter.js b/modules/invibesBidAdapter.js
index 0c0d1cdef87..35c1a12ff5e 100644
--- a/modules/invibesBidAdapter.js
+++ b/modules/invibesBidAdapter.js
@@ -2,6 +2,11 @@ import {logInfo} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {getStorageManager} from '../src/storageManager.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const CONSTANTS = {
   BIDDER_CODE: 'invibes',
   BID_ENDPOINT: '.videostep.com/Bid/VideoAdContent',
@@ -9,7 +14,7 @@ const CONSTANTS = {
   SYNC_ENDPOINT: 'https://k.r66net.com/GetUserSync',
   TIME_TO_LIVE: 300,
   DEFAULT_CURRENCY: 'EUR',
-  PREBID_VERSION: 10,
+  PREBID_VERSION: 13,
   METHOD: 'GET',
   INVIBES_VENDOR_ID: 436,
   USERID_PROVIDERS: ['pubcid', 'pubProvidedId', 'uid2', 'zeotapIdPlus', 'id5id'],
@@ -17,7 +22,7 @@ const CONSTANTS = {
   DISABLE_USER_SYNC: true
 };
 
-const storage = getStorageManager({bidderCode: CONSTANTS.BIDDER_CODE});
+export const storage = getStorageManager({bidderCode: CONSTANTS.BIDDER_CODE});
 
 export const spec = {
   code: CONSTANTS.BIDDER_CODE,
@@ -35,7 +40,7 @@ export const spec = {
   buildRequests: buildRequest,
   /**
    * @param {*} responseObj
-   * @param {requestParams} bidRequests
+   * @param {*} requestParams
    * @return {Bid[]} An array of bids which
    */
   interpretResponse: function (responseObj, requestParams) {
@@ -49,14 +54,36 @@ registerBidder(spec);
 // some state info is required: cookie info, unique user visit id
 const topWin = getTopMostWindow();
 let invibes = topWin.invibes = topWin.invibes || {};
-invibes.purposes = invibes.purposes || [false, false, false, false, false, false, false, false, false, false];
-invibes.legitimateInterests = invibes.legitimateInterests || [false, false, false, false, false, false, false, false, false, false];
+invibes.purposes = invibes.purposes || [false, false, false, false, false, false, false, false, false, false, false];
+invibes.legitimateInterests = invibes.legitimateInterests || [false, false, false, false, false, false, false, false, false, false, false];
 invibes.placementBids = invibes.placementBids || [];
 invibes.pushedCids = invibes.pushedCids || {};
 let preventPageViewEvent = false;
+let isInfiniteScrollPage = false;
+let isPlacementRefresh = false;
 let _customUserSync;
 let _disableUserSyncs;
 
+function updateInfiniteScrollFlag() {
+  const { scrollHeight } = document.documentElement;
+
+  if (invibes.originalURL === undefined) {
+    invibes.originalURL = window.location.href;
+    return;
+  }
+
+  if (invibes.originalScrollHeight === undefined) {
+    invibes.originalScrollHeight = scrollHeight;
+    return;
+  }
+
+  const currentURL = window.location.href;
+
+  if (scrollHeight > invibes.originalScrollHeight && invibes.originalURL !== currentURL) {
+    isInfiniteScrollPage = true;
+  }
+}
+
 function isBidRequestValid(bid) {
   if (typeof bid.params !== 'object') {
     return false;
@@ -87,10 +114,23 @@ function buildRequest(bidRequests, bidderRequest) {
   const _placementIds = [];
   const _adUnitCodes = [];
   let _customEndpoint, _userId, _domainId;
-  let _ivAuctionStart = bidderRequest.auctionStart || Date.now();
+  let _ivAuctionStart = Date.now();
+  window.invibes = window.invibes || {};
+  window.invibes.placementIds = window.invibes.placementIds || [];
+
+  if (isInfiniteScrollPage == false) {
+    updateInfiniteScrollFlag();
+  }
 
   bidRequests.forEach(function (bidRequest) {
     bidRequest.startTime = new Date().getTime();
+
+    if (window.invibes.placementIds.includes(bidRequest.params.placementId)) {
+      isPlacementRefresh = true;
+    }
+
+    window.invibes.placementIds.push(bidRequest.params.placementId);
+
     _placementIds.push(bidRequest.params.placementId);
     _adUnitCodes.push(bidRequest.adUnitCode);
     _domainId = _domainId || bidRequest.params.domainId;
@@ -100,7 +140,7 @@ function buildRequest(bidRequests, bidderRequest) {
     _userId = _userId || bidRequest.userId;
   });
 
-  invibes.optIn = invibes.optIn || readGdprConsent(bidderRequest.gdprConsent);
+  invibes.optIn = invibes.optIn || readGdprConsent(bidderRequest.gdprConsent, bidderRequest.uspConsent);
 
   invibes.visitId = invibes.visitId || generateRandomId();
 
@@ -136,10 +176,22 @@ function buildRequest(bidRequests, bidderRequest) {
     li: invibes.legitimateInterests.toString(),
 
     tc: invibes.gdpr_consent,
+    uspc: bidderRequest.uspConsent,
     isLocalStorageEnabled: storage.hasLocalStorage(),
     preventPageViewEvent: preventPageViewEvent,
+    isPlacementRefresh: isPlacementRefresh,
+    isInfiniteScrollPage: isInfiniteScrollPage
   };
 
+  if (bidderRequest.refererInfo && bidderRequest.refererInfo.ref) {
+    data.pageReferrer = bidderRequest.refererInfo.ref.substring(0, 300);
+  }
+
+  let hid = invibes.getCookie('handIid');
+  if (hid) {
+    data.handIid = hid;
+  }
+
   let lid = readFromLocalStorage('ivbsdid');
   if (!lid) {
     let str = invibes.getCookie('ivbsdid');
@@ -368,7 +420,9 @@ function addMeta(bidModelMeta) {
 }
 
 function generateRandomId() {
-  return (Math.round(Math.random() * 1e12)).toString(36).substring(0, 10);
+  return '10000000100040008000100000000000'.replace(/[018]/g, c =>
+    (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+  );
 }
 
 function getDocumentLocation(bidderRequest) {
@@ -445,7 +499,7 @@ function renderCreative(bidModel) {
 }
 
 function readFromLocalStorage(key) {
-  if (invibes.GdprModuleInstalled && (!invibes.optIn || !invibes.purposes[0])) {
+  if ((invibes.GdprModuleInstalled || invibes.UspModuleInstalled) && (!invibes.optIn || !invibes.purposes[0])) {
     return;
   }
 
@@ -539,20 +593,15 @@ function buildSyncUrl() {
   return syncUrl;
 }
 
-function readGdprConsent(gdprConsent) {
+function readGdprConsent(gdprConsent, usConsent) {
+  invibes.GdprModuleInstalled = false;
+  invibes.UspModuleInstalled = false;
   if (gdprConsent && gdprConsent.vendorData) {
     invibes.GdprModuleInstalled = true;
     invibes.gdpr_consent = getVendorConsentData(gdprConsent.vendorData);
 
     if (!gdprConsent.vendorData.gdprApplies || gdprConsent.vendorData.hasGlobalConsent) {
-      var index;
-      for (index = 0; index < invibes.purposes.length; ++index) {
-        invibes.purposes[index] = true;
-      }
-
-      for (index = 0; index < invibes.legitimateInterests.length; ++index) {
-        invibes.legitimateInterests[index] = true;
-      }
+      setAllPurposesAndLegitimateInterests(true);
       return 2;
     }
 
@@ -568,7 +617,7 @@ function readGdprConsent(gdprConsent) {
     }
 
     let legitimateInterests = getLegitimateInterests(gdprConsent.vendorData);
-    tryCopyValueToArray(legitimateInterests, invibes.legitimateInterests, 10);
+    tryCopyValueToArray(legitimateInterests, invibes.legitimateInterests, purposesLength);
 
     let invibesVendorId = CONSTANTS.INVIBES_VENDOR_ID.toString(10);
     let vendorConsents = getVendorConsents(gdprConsent.vendorData);
@@ -582,12 +631,29 @@ function readGdprConsent(gdprConsent) {
     }
 
     return 2;
+  } else if (usConsent && usConsent.length > 2) {
+    invibes.UspModuleInstalled = true;
+    if (usConsent[2] == 'N') {
+      setAllPurposesAndLegitimateInterests(true);
+      return 2;
+    }
   }
 
-  invibes.GdprModuleInstalled = false;
+  setAllPurposesAndLegitimateInterests(false);
   return 0;
 }
 
+function setAllPurposesAndLegitimateInterests(value) {
+  var index;
+  for (index = 0; index < invibes.purposes.length; ++index) {
+    invibes.purposes[index] = value;
+  }
+
+  for (index = 0; index < invibes.legitimateInterests.length; ++index) {
+    invibes.legitimateInterests[index] = value;
+  }
+}
+
 function tryCopyValueToArray(value, target, length) {
   if (value instanceof Array) {
     for (let i = 0; i < length && i < value.length; i++) {
@@ -621,6 +687,10 @@ function tryCopyValueToArray(value, target, length) {
 
 function getPurposeConsentsCounter(vendorData) {
   if (vendorData.purpose && vendorData.purpose.consents) {
+    if (vendorData.tcfPolicyVersion >= 4) {
+      return 11;
+    }
+
     return 10;
   }
 
@@ -694,7 +764,7 @@ invibes.getCookie = function (name) {
     return;
   }
 
-  if (invibes.GdprModuleInstalled && (!invibes.optIn || !invibes.purposes[0])) {
+  if ((invibes.GdprModuleInstalled || invibes.UspModuleInstalled) && (!invibes.optIn || !invibes.purposes[0])) {
     return;
   }
 
diff --git a/modules/invisiblyAnalyticsAdapter.js b/modules/invisiblyAnalyticsAdapter.js
index a4f4eba271c..af21b1470f6 100644
--- a/modules/invisiblyAnalyticsAdapter.js
+++ b/modules/invisiblyAnalyticsAdapter.js
@@ -5,8 +5,8 @@ import { ajaxBuilder } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
-import { generateUUID, logInfo } from '../src/utils.js';
-import CONSTANTS from '../src/constants.json';
+import { deepClone, hasNonSerializableProperty, generateUUID, logInfo } from '../src/utils.js';
+import { EVENTS } from '../src/constants.js';
 
 const DEFAULT_EVENT_URL = 'https://api.pymx5.com/v1/' + 'sites/events';
 const analyticsType = 'endpoint';
@@ -15,22 +15,20 @@ const ajax = ajaxBuilder(0);
 
 // Events needed
 const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    BID_ADJUSTMENT,
-    BID_TIMEOUT,
-    BID_REQUESTED,
-    BID_RESPONSE,
-    NO_BID,
-    BID_WON,
-    BIDDER_DONE,
-    SET_TARGETING,
-    REQUEST_BIDS,
-    ADD_AD_UNITS,
-    AD_RENDER_FAILED,
-  },
-} = CONSTANTS;
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_ADJUSTMENT,
+  BID_TIMEOUT,
+  BID_REQUESTED,
+  BID_RESPONSE,
+  NO_BID,
+  BID_WON,
+  BIDDER_DONE,
+  SET_TARGETING,
+  REQUEST_BIDS,
+  ADD_AD_UNITS,
+  AD_RENDER_FAILED,
+} = EVENTS;
 
 const _VERSION = 1;
 const _pageViewId = generateUUID();
@@ -135,7 +133,12 @@ function flush() {
 }
 
 function handleEvent(eventType, eventArgs) {
-  eventArgs = eventArgs ? JSON.parse(JSON.stringify(eventArgs)) : {};
+  if (eventArgs) {
+    eventArgs = hasNonSerializableProperty(eventArgs) ? eventArgs : deepClone(eventArgs)
+  } else {
+    eventArgs = {}
+  }
+
   let invisiblyEvent = {};
 
   switch (eventType) {
diff --git a/modules/ipromBidAdapter.js b/modules/ipromBidAdapter.js
index eaf20ad3ad3..1188af471a7 100644
--- a/modules/ipromBidAdapter.js
+++ b/modules/ipromBidAdapter.js
@@ -3,13 +3,15 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'iprom';
 const ENDPOINT_URL = 'https://core.iprom.net/programmatic';
-const VERSION = 'v1.0.2';
+const VERSION = 'v1.0.3';
 const DEFAULT_CURRENCY = 'EUR';
 const DEFAULT_NETREVENUE = true;
 const DEFAULT_TTL = 360;
+const IAB_GVL_ID = 811;
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: IAB_GVL_ID,
   isBidRequestValid: function ({ bidder, params = {} } = {}) {
     // id parameter checks
     if (!params.id) {
diff --git a/modules/iqmBidAdapter.js b/modules/iqmBidAdapter.js
deleted file mode 100644
index c3808afd225..00000000000
--- a/modules/iqmBidAdapter.js
+++ /dev/null
@@ -1,273 +0,0 @@
-import {_each, deepAccess, getBidIdParameter, isArray} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {INSTREAM} from '../src/video.js';
-
-const BIDDER_CODE = 'iqm';
-const VERSION = 'v.1.0.0';
-const VIDEO_ORTB_PARAMS = [
-  'mimes',
-  'minduration',
-  'maxduration',
-  'placement',
-  'protocols',
-  'startdelay'
-];
-var ENDPOINT_URL = 'https://pbd.bids.iqm.com';
-
-export const spec = {
-  supportedMediaTypes: [BANNER, VIDEO],
-  code: BIDDER_CODE,
-  aliases: ['iqm'],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function (bid) {
-    const banner = deepAccess(bid, 'mediaTypes.banner');
-    const videoMediaType = deepAccess(bid, 'mediaTypes.video');
-    const context = deepAccess(bid, 'mediaTypes.video.context');
-    if ((videoMediaType && context === INSTREAM)) {
-      const videoBidderParams = deepAccess(bid, 'params.video', {});
-
-      if (!Array.isArray(videoMediaType.playerSize)) {
-        return false;
-      }
-
-      if (!videoMediaType.context) {
-        return false;
-      }
-
-      const videoParams = {
-        ...videoMediaType,
-        ...videoBidderParams
-      };
-
-      if (!Array.isArray(videoParams.mimes) || videoParams.mimes.length === 0) {
-        return false;
-      }
-
-      if (!Array.isArray(videoParams.protocols) || videoParams.protocols.length === 0) {
-        return false;
-      }
-
-      if (
-        typeof videoParams.placement !== 'undefined' &&
-        typeof videoParams.placement !== 'number'
-      ) {
-        return false;
-      }
-      if (
-        videoMediaType.context === INSTREAM &&
-        typeof videoParams.startdelay !== 'undefined' &&
-        typeof videoParams.startdelay !== 'number'
-      ) {
-        return false;
-      }
-
-      return !!(bid && bid.params && bid.params.publisherId && bid.params.placementId);
-    } else {
-      if (banner === 'undefined') {
-        return false;
-      }
-      return !!(bid && bid.params && bid.params.publisherId && bid.params.placementId);
-    }
-  },
-  /**
-   * Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
-   *It prepares a bid request with the required information for the DSP side and sends this request to alloted endpoint
-   * parameter{validBidRequests, bidderRequest} bidderRequest object is useful because it carries a couple of bid parameters that are global to all the bids.
-   */
-  buildRequests: function (validBidRequests, bidderRequest) {
-    return validBidRequests.map(bid => {
-      var finalRequest = {};
-      let bidfloor = getBidIdParameter('bidfloor', bid.params);
-
-      const imp = {
-        id: bid.bidId,
-        secure: 1,
-        bidfloor: bidfloor || 0,
-        displaymanager: 'Prebid.js',
-        displaymanagerver: VERSION,
-
-      }
-      if (deepAccess(bid, 'mediaTypes.banner')) {
-        imp.banner = getSize(bid.sizes);
-        imp.mediatype = 'banner';
-      } else if (deepAccess(bid, 'mediaTypes.video')) {
-        imp.video = _buildVideoORTB(bid);
-        imp.mediatype = 'video';
-      }
-      const site = getSite(bidderRequest);
-      let device = getDevice(bid.params);
-      finalRequest = {
-        sizes: bid.sizes,
-        id: bid.bidId,
-        publisherId: getBidIdParameter('publisherId', bid.params),
-        placementId: getBidIdParameter('placementId', bid.params),
-        device: device,
-        site: site,
-        imp: imp,
-        // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-        auctionId: bid.auctionId,
-        adUnitCode: bid.adUnitCode,
-        bidderRequestId: bid.bidderRequestId,
-        uuid: bid.bidId,
-        // TODO: please do not send internal data structures over the network
-        // I am not going to attempt to accommodate this, no way this is usable on their end, it changes way too frequently
-        bidderRequest
-      }
-      const request = {
-        method: 'POST',
-        url: ENDPOINT_URL,
-        data: finalRequest,
-        options: {
-          withCredentials: false
-        },
-
-      }
-      return request;
-    });
-  },
-  /**
-   * Takes Response from server as input and request.
-   *It parses the response from server side and generates bidresponses for with required rendering paramteres
-   * parameter{serverResponse, bidRequest} serverReponse: Response from the server side with ad creative.
-   */
-  interpretResponse: function (serverResponse, bidRequest) {
-    const bidResponses = [];
-    serverResponse = serverResponse.body;
-    if (serverResponse && isArray(serverResponse.seatbid)) {
-      _each(serverResponse.seatbid, function (bidList) {
-        _each(bidList.bid, function (bid) {
-          const responseCPM = parseFloat(bid.price);
-          if (responseCPM > 0.0 && bid.impid) {
-            const bidResponse = {
-              requestId: bidRequest.data.id,
-              currency: serverResponse.cur || 'USD',
-              cpm: responseCPM,
-              netRevenue: true,
-              creativeId: bid.crid || '',
-              adUnitCode: bidRequest.data.adUnitCode,
-              auctionId: bidRequest.data.auctionId,
-              mediaType: bidRequest.data.imp.mediatype,
-
-              ttl: bid.ttl || 60
-            };
-
-            if (bidRequest.data.imp.mediatype === VIDEO) {
-              bidResponse.width = bid.w || bidRequest.data.imp.video.w;
-              bidResponse.height = bid.h || bidRequest.data.imp.video.h;
-              bidResponse.adResponse = {
-                content: bid.adm,
-                height: bidRequest.data.imp.video.h,
-                width: bidRequest.data.imp.video.w
-              };
-
-              if (bidRequest.data.imp.video.context === INSTREAM) {
-                bidResponse.vastUrl = bid.adm;
-              }
-            } else if (bidRequest.data.imp.mediatype === BANNER) {
-              bidResponse.ad = bid.adm;
-              bidResponse.width = bid.w || bidRequest.data.imp.banner.w;
-              bidResponse.height = bid.h || bidRequest.data.imp.banner.h;
-            }
-            bidResponses.push(bidResponse);
-          }
-        })
-      });
-    }
-    return bidResponses;
-  },
-
-};
-
-let getDevice = function (bidparams) {
-  const language = navigator.language ? 'language' : 'userLanguage';
-  return {
-    geo: bidparams.geo,
-    h: screen.height,
-    w: screen.width,
-    dnt: _getDNT() ? 1 : 0,
-    language: navigator[language].split('-')[0],
-    make: navigator.vendor ? navigator.vendor : '',
-    ua: navigator.userAgent,
-    devicetype: _isMobile() ? 1 : _isConnectedTV() ? 3 : 2
-  };
-};
-
-let _getDNT = function () {
-  return navigator.doNotTrack === '1' || window.doNotTrack === '1' || navigator.msDoNotTrack === '1' || navigator.doNotTrack === 'yes';
-};
-
-let getSize = function (sizes) {
-  let sizeMap;
-  if (sizes.length === 2 && typeof sizes[0] === 'number' && typeof sizes[1] === 'number') {
-    sizeMap = {w: sizes[0], h: sizes[1]};
-  } else {
-    sizeMap = {w: sizes[0][0], h: sizes[0][1]};
-  }
-  return sizeMap;
-};
-
-function _isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(global.navigator.userAgent);
-}
-
-function _isConnectedTV() {
-  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(global.navigator.userAgent);
-}
-
-function getSite(bidderRequest) {
-  let domain = '';
-  let page = '';
-  let referrer = '';
-  const Id = 1;
-
-  const {refererInfo} = bidderRequest;
-
-  // TODO: are these the right refererInfo values?
-  domain = refererInfo.domain;
-  page = refererInfo.page;
-  referrer = refererInfo.ref;
-
-  return {
-    domain,
-    page,
-    Id,
-    referrer
-  };
-};
-
-function _buildVideoORTB(bidRequest) {
-  const videoAdUnit = deepAccess(bidRequest, 'mediaTypes.video');
-  const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
-  const video = {};
-
-  const videoParams = {
-    ...videoAdUnit,
-    ...videoBidderParams // Bidder Specific overrides
-  };
-  video.context = 1;
-  const {w, h} = getSize(videoParams.playerSize[0]);
-  video.w = w;
-  video.h = h;
-
-  VIDEO_ORTB_PARAMS.forEach((param) => {
-    if (videoParams.hasOwnProperty(param)) {
-      video[param] = videoParams[param];
-    }
-  });
-
-  video.placement = video.placement || 2;
-
-  video.startdelay = video.startdelay || 0;
-  video.placement = 1;
-  video.context = INSTREAM;
-
-  return video;
-}
-registerBidder(spec);
diff --git a/modules/iqxBidAdapter.js b/modules/iqxBidAdapter.js
new file mode 100644
index 00000000000..e859dfd2c01
--- /dev/null
+++ b/modules/iqxBidAdapter.js
@@ -0,0 +1,18 @@
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {buildRequests, getUserSyncs, interpretResponse, isBidRequestValid} from '../libraries/xeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'iqx';
+const ENDPOINT = 'https://pbjs.iqzonertb.live';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['iqx'],
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests: (validBidRequests, bidderRequest) => buildRequests(validBidRequests, bidderRequest, ENDPOINT),
+  interpretResponse,
+  getUserSyncs
+}
+
+registerBidder(spec);
diff --git a/modules/iqxBidAdapter.md b/modules/iqxBidAdapter.md
new file mode 100644
index 00000000000..c48864c4306
--- /dev/null
+++ b/modules/iqxBidAdapter.md
@@ -0,0 +1,54 @@
+# Overview
+
+```
+Module Name: IQX Bidder Adapter
+Module Type: IQX Bidder Adapter
+Maintainer: it@iqzone.com
+```
+
+# Description
+
+Module that connects to iqx.com demand sources
+
+# Test Parameters
+```
+var adUnits = [
+    {
+        code: 'test-banner',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]],
+            }
+        },
+        bids: [
+            {
+                bidder: 'iqx',
+                params: {
+                    env: 'iqx',
+                    pid: '40',
+                    ext: {}
+                }
+            }
+        ]
+    },
+    {
+        code: 'test-video',
+        sizes: [ [ 640, 480 ] ],
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480],
+                context: 'instream',
+                skipppable: true
+            }
+        },
+        bids: [{
+            bidder: 'iqx',
+            params: {
+                env: 'iqx',
+                pid: '40',
+                ext: {}
+            }
+        }]
+    }
+];
+```
diff --git a/modules/iqzoneBidAdapter.js b/modules/iqzoneBidAdapter.js
index 52f3be7e4b4..9603a509ac5 100644
--- a/modules/iqzoneBidAdapter.js
+++ b/modules/iqzoneBidAdapter.js
@@ -1,211 +1,19 @@
-import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'iqzone';
 const AD_URL = 'https://smartssp-us-east.iqzone.com/pbjs';
-const SYNC_URL = 'https://cs.smartssp.iqzone.com';
-
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-        !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId, endpointId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  if (placementId) {
-    placement.placementId = placementId;
-    placement.type = 'publisher';
-  } else if (endpointId) {
-    placement.endpointId = endpointId;
-    placement.type = 'network';
-  }
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
+const SYNC_URL = 'https://cs.iqzone.com';
 
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/ivsBidAdapter.js b/modules/ivsBidAdapter.js
index 6f4c024f09f..3deebf9bff3 100644
--- a/modules/ivsBidAdapter.js
+++ b/modules/ivsBidAdapter.js
@@ -4,6 +4,13 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO } from '../src/mediaTypes.js';
 import { INSTREAM } from '../src/video.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'ivs';
 const ENDPOINT_URL = 'https://a.ivstracker.net/prod/openrtb/2.5';
 
diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 6c5f90b7a2a..0ec60b51ca2 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -8,6 +8,9 @@ import {
   isEmpty,
   isFn,
   isInteger,
+  isNumber,
+  isStr,
+  isPlainObject,
   logError,
   logWarn,
   mergeDeep,
@@ -15,18 +18,14 @@ import {
 } from '../src/utils.js';
 import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
-import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
-import * as events from '../src/events.js';
 import { find } from '../src/polyfill.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { INSTREAM, OUTSTREAM } from '../src/video.js';
 import { Renderer } from '../src/Renderer.js';
 import {getGptSlotInfoForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
 
 const BIDDER_CODE = 'ix';
-const ALIAS_BIDDER_CODE = 'roundel';
 const GLOBAL_VENDOR_ID = 10;
 const SECURE_BID_URL = 'https://htlb.casalemedia.com/openrtb/pbjs';
 const SUPPORTED_AD_TYPES = [BANNER, VIDEO, NATIVE];
@@ -38,6 +37,7 @@ const VIDEO_TIME_TO_LIVE = 3600; // 1hr
 const NATIVE_TIME_TO_LIVE = 3600; // Since native can have video, use ttl same as video
 const NET_REVENUE = true;
 const MAX_REQUEST_LIMIT = 4;
+const MAX_EID_SOURCES = 50;
 const OUTSTREAM_MINIMUM_PLAYER_SIZE = [144, 144];
 const PRICE_TO_DOLLAR_FACTOR = {
   JPY: 1
@@ -45,17 +45,6 @@ const PRICE_TO_DOLLAR_FACTOR = {
 const IFRAME_USER_SYNC_URL = 'https://js-sec.indexww.com/um/ixmatch.html';
 const FLOOR_SOURCE = { PBJS: 'p', IX: 'x' };
 const IMG_USER_SYNC_URL = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid';
-export const ERROR_CODES = {
-  BID_SIZE_INVALID_FORMAT: 1,
-  BID_SIZE_NOT_INCLUDED: 2,
-  PROPERTY_NOT_INCLUDED: 3,
-  SITE_ID_INVALID_VALUE: 4,
-  BID_FLOOR_INVALID_FORMAT: 5,
-  IX_FPD_EXCEEDS_MAX_SIZE: 6,
-  EXCEEDS_MAX_SIZE: 7,
-  PB_FPD_EXCEEDS_MAX_SIZE: 8,
-  VIDEO_DURATION_INVALID: 9
-};
 const FIRST_PARTY_DATA = {
   SITE: [
     'id', 'name', 'domain', 'cat', 'sectioncat', 'pagecat', 'page', 'ref', 'search', 'mobile',
@@ -69,20 +58,9 @@ const SOURCE_RTI_MAPPING = {
   'neustar.biz': 'fabrickId',
   'zeotap.com': 'zeotapIdPlus',
   'uidapi.com': 'UID2',
-  'adserver.org': 'TDID',
-  'id5-sync.com': '', // ID5 Universal ID, configured as id5Id
-  'crwdcntrl.net': '', // Lotame Panorama ID, lotamePanoramaId
-  'epsilon.com': '', // Publisher Link, publinkId
-  'audigent.com': '', // Hadron ID from Audigent, hadronId
-  'pubcid.org': '', // SharedID, pubcid
-  'utiq.com': '', // Utiq
-  'intimatemerger.com': '',
-  '33across.com': '',
-  'liveintent.indexexchange.com': '',
-  'google.com': ''
+  'adserver.org': 'TDID'
 };
 const PROVIDERS = [
-  'britepoolid',
   'lipbid',
   'criteoId',
   'merkleId',
@@ -104,12 +82,12 @@ const VIDEO_PARAMS_ALLOW_LIST = [
 ];
 const LOCAL_STORAGE_KEY = 'ixdiag';
 export const LOCAL_STORAGE_FEATURE_TOGGLES_KEY = `${BIDDER_CODE}_features`;
-let hasRegisteredHandler = false;
 export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
 export const FEATURE_TOGGLES = {
   // Update with list of CFTs to be requested from Exchange
   REQUESTED_FEATURE_TOGGLES: [
-    'pbjs_enable_multiformat'
+    'pbjs_enable_multiformat',
+    'pbjs_allow_all_eids'
   ],
 
   featureToggles: {},
@@ -236,7 +214,10 @@ export function bidToVideoImp(bid) {
 
   imp.video = videoParamRef ? deepClone(bid.params.video) : {};
   // populate imp level transactionId
-  imp.ext.tid = deepAccess(bid, 'ortb2Imp.ext.tid');
+  let tid = deepAccess(bid, 'ortb2Imp.ext.tid');
+  if (tid) {
+    deepSetValue(imp, 'ext.tid', tid);
+  }
 
   setDisplayManager(imp, bid);
 
@@ -252,8 +233,7 @@ export function bidToVideoImp(bid) {
 
   if (imp.video.minduration > imp.video.maxduration) {
     logError(
-      `IX Bid Adapter: video minduration [${imp.video.minduration}] cannot be greater than video maxduration [${imp.video.maxduration}]`,
-      { bidder: BIDDER_CODE, code: ERROR_CODES.VIDEO_DURATION_INVALID }
+      `IX Bid Adapter: video minduration [${imp.video.minduration}] cannot be greater than video maxduration [${imp.video.maxduration}]`
     );
     return {};
   }
@@ -326,7 +306,10 @@ export function bidToNativeImp(bid) {
   };
 
   // populate imp level transactionId
-  imp.ext.tid = deepAccess(bid, 'ortb2Imp.ext.tid');
+  let tid = deepAccess(bid, 'ortb2Imp.ext.tid');
+  if (tid) {
+    deepSetValue(imp, 'ext.tid', tid);
+  }
 
   // AdUnit-Specific First Party Data
   addAdUnitFPD(imp, bid)
@@ -346,26 +329,30 @@ function bidToImp(bid, mediaType) {
 
   imp.id = bid.bidId;
 
-  imp.ext = {};
+  if (isExchangeIdConfigured() && deepAccess(bid, `params.externalId`)) {
+    deepSetValue(imp, 'ext.externalID', bid.params.externalId);
+  }
   if (deepAccess(bid, `params.${mediaType}.siteId`) && !isNaN(Number(bid.params[mediaType].siteId))) {
     switch (mediaType) {
       case BANNER:
-        imp.ext.siteID = bid.params.banner.siteId.toString();
+        deepSetValue(imp, 'ext.siteID', bid.params.banner.siteId.toString());
         break;
       case VIDEO:
-        imp.ext.siteID = bid.params.video.siteId.toString();
+        deepSetValue(imp, 'ext.siteID', bid.params.video.siteId.toString());
         break;
       case NATIVE:
-        imp.ext.siteID = bid.params.native.siteId.toString();
+        deepSetValue(imp, 'ext.siteID', bid.params.native.siteId.toString());
         break;
     }
   } else {
-    imp.ext.siteID = bid.params.siteId.toString();
+    if (bid.params.siteId) {
+      deepSetValue(imp, 'ext.siteID', bid.params.siteId.toString());
+    }
   }
 
   // populate imp level sid
   if (bid.params.hasOwnProperty('id') && (typeof bid.params.id === 'string' || typeof bid.params.id === 'number')) {
-    imp.ext.sid = String(bid.params.id);
+    deepSetValue(imp, 'ext.sid', String(bid.params.id));
   }
 
   return imp;
@@ -411,12 +398,12 @@ function _applyFloor(bid, imp, mediaType) {
   if (moduleFloor) {
     imp.bidfloor = moduleFloor.floor;
     imp.bidfloorcur = moduleFloor.currency;
-    imp.ext.fl = FLOOR_SOURCE.PBJS;
+    deepSetValue(imp, 'ext.fl', FLOOR_SOURCE.PBJS);
     setFloor = true;
   } else if (adapterFloor) {
     imp.bidfloor = adapterFloor.floor;
     imp.bidfloorcur = adapterFloor.currency;
-    imp.ext.fl = FLOOR_SOURCE.IX;
+    deepSetValue(imp, 'ext.fl', FLOOR_SOURCE.IX);
     setFloor = true;
   }
 
@@ -506,6 +493,9 @@ function parseBid(rawBid, currency, bidRequest) {
   if (rawBid.adomain && rawBid.adomain.length > 0) {
     bid.meta.advertiserDomains = rawBid.adomain;
   }
+  if (rawBid.ext?.dsa) {
+    bid.meta.dsa = rawBid.ext.dsa
+  }
   return bid;
 }
 
@@ -523,7 +513,7 @@ function isValidSize(size) {
  * Determines whether or not the given size object is an element of the size
  * array.
  *
- * @param  {array}  sizeArray The size array.
+ * @param  {Array}  sizeArray The size array.
  * @param  {object} size      The size object.
  * @return {boolean}          True if the size object is an element of the size array, and false
  *                            otherwise.
@@ -578,7 +568,7 @@ function checkVideoParams(mediaTypeVideoRef, paramsVideoRef) {
  * Get One size from Size Array
  * [[250,350]] -> [250, 350]
  * [250, 350]  -> [250, 350]
- * @param {array} sizes array of sizes
+ * @param {Array} sizes array of sizes
  */
 function getFirstSize(sizes = []) {
   if (isValidSize(sizes)) {
@@ -595,7 +585,7 @@ function getFirstSize(sizes = []) {
  *
  * @param  {number}  bidFloor    The bidFloor parameter inside bid request config.
  * @param  {number}  bidFloorCur The bidFloorCur parameter inside bid request config.
- * @return {bool}                True if this is a valid bidFloor parameters format, and false
+ * @return {boolean}                True if this is a valid bidFloor parameters format, and false
  *                               otherwise.
  */
 function isValidBidFloorParams(bidFloor, bidFloorCur) {
@@ -618,7 +608,7 @@ function nativeMediaTypeValid(bid) {
  * Get bid request object with the associated id.
  *
  * @param  {*}      id          Id of the impression.
- * @param  {array}  impressions List of impressions sent in the request.
+ * @param  {Array}  impressions List of impressions sent in the request.
  * @return {object}             The impression with the associated id.
  */
 function getBidRequest(id, impressions, validBidRequests) {
@@ -636,7 +626,7 @@ function getBidRequest(id, impressions, validBidRequests) {
 /**
  * From the userIdAsEids array, filter for the ones our adserver can use, and modify them
  * for our purposes, e.g. add rtiPartner
- * @param {array} allEids userIdAsEids passed in by prebid
+ * @param {Array} allEids userIdAsEids passed in by prebid
  * @return {object} contains toSend (eids to send to the adserver) and seenSources (used to filter
  *                  identity info from IX Library)
  */
@@ -645,15 +635,21 @@ function getEidInfo(allEids) {
   let seenSources = {};
   if (isArray(allEids)) {
     for (const eid of allEids) {
-      if (SOURCE_RTI_MAPPING.hasOwnProperty(eid.source) && deepAccess(eid, 'uids.0')) {
+      const isSourceMapped = SOURCE_RTI_MAPPING.hasOwnProperty(eid.source);
+      const hasUids = deepAccess(eid, 'uids.0');
+
+      if (hasUids) {
         seenSources[eid.source] = true;
-        if (SOURCE_RTI_MAPPING[eid.source] != '') {
+
+        if (isSourceMapped && SOURCE_RTI_MAPPING[eid.source] !== '') {
           eid.uids[0].ext = {
             rtiPartner: SOURCE_RTI_MAPPING[eid.source]
           };
         }
-        delete eid.uids[0].atype;
         toSend.push(eid);
+        if (toSend.length >= MAX_EID_SOURCES) {
+          break;
+        }
       }
     }
   }
@@ -664,11 +660,11 @@ function getEidInfo(allEids) {
 /**
  * Builds a request object to be sent to the ad server based on bid requests.
  *
- * @param  {array}  validBidRequests A list of valid bid request config objects.
+ * @param  {Array}  validBidRequests A list of valid bid request config objects.
  * @param  {object} bidderRequest    An object containing other info like gdprConsent.
  * @param  {object} impressions      An object containing a list of impression objects describing the bids for each transaction
- * @param  {array}  version          Endpoint version denoting banner, video or native.
- * @return {array}                   List of objects describing the request to the server.
+ * @param  {Array}  version          Endpoint version denoting banner, video or native.
+ * @return {Array}                   List of objects describing the request to the server.
  *
  */
 function buildRequest(validBidRequests, bidderRequest, impressions, version) {
@@ -684,11 +680,6 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     addRTI(userEids, eidInfo);
   }
 
-  // If `roundel` alias bidder, only send requests if liveramp ids exist.
-  if (bidderRequest && bidderRequest.bidderCode === ALIAS_BIDDER_CODE && !eidInfo.seenSources['liveramp.com']) {
-    return [];
-  }
-
   const requests = [];
   let r = createRequest(validBidRequests);
 
@@ -696,8 +687,9 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   r = addRequestedFeatureToggles(r, FEATURE_TOGGLES.REQUESTED_FEATURE_TOGGLES)
 
   // getting ixdiags for adunits of the video, outstream & multi format (MF) style
-  let ixdiag = buildIXDiag(validBidRequests);
-  for (var key in ixdiag) {
+  const fledgeEnabled = deepAccess(bidderRequest, 'paapi.enabled')
+  let ixdiag = buildIXDiag(validBidRequests, fledgeEnabled);
+  for (let key in ixdiag) {
     r.ext.ixdiag[key] = ixdiag[key];
   }
 
@@ -706,8 +698,10 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   r = applyRegulations(r, bidderRequest);
 
   let payload = {};
-  siteID = validBidRequests[0].params.siteId;
-  payload.s = siteID;
+  if (validBidRequests[0].params.siteId) {
+    siteID = validBidRequests[0].params.siteId;
+    payload.s = siteID;
+  }
 
   const impKeys = Object.keys(impressions);
   let isFpdAdded = false;
@@ -743,9 +737,19 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     r = removeSiteIDs(r);
 
     if (isLastAdUnit) {
+      let exchangeUrl = `${baseUrl}?`;
+
+      if (siteID !== 0) {
+        exchangeUrl += `s=${siteID}`;
+      }
+
+      if (isExchangeIdConfigured()) {
+        exchangeUrl += siteID !== 0 ? '&' : '';
+        exchangeUrl += `p=${config.getConfig('exchangeId')}`;
+      }
       requests.push({
         method: 'POST',
-        url: baseUrl + '?s=' + siteID,
+        url: exchangeUrl,
         data: deepClone(r),
         option: {
           contentType: 'text/plain',
@@ -764,13 +768,16 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
 /**
  * addRTI adds RTI info of the partner to retrieved user IDs from prebid ID module.
  *
- * @param {array} userEids userEids info retrieved from prebid
- * @param {array} eidInfo eidInfo info from prebid
+ * @param {Array} userEids userEids info retrieved from prebid
+ * @param {Array} eidInfo eidInfo info from prebid
  */
 function addRTI(userEids, eidInfo) {
   let identityInfo = window.headertag.getIdentityInfo();
   if (identityInfo && typeof identityInfo === 'object') {
     for (const partnerName in identityInfo) {
+      if (userEids.length >= MAX_EID_SOURCES) {
+        return
+      }
       if (identityInfo.hasOwnProperty(partnerName)) {
         let response = identityInfo[partnerName];
         if (!response.responsePending && response.data && typeof response.data === 'object' &&
@@ -784,7 +791,7 @@ function addRTI(userEids, eidInfo) {
 
 /**
  * createRequest creates the base request object
- * @param  {array}  validBidRequests A list of valid bid request config objects.
+ * @param  {Array}  validBidRequests A list of valid bid request config objects.
  * @return {object}                  Object describing the request to the server.
  */
 function createRequest(validBidRequests) {
@@ -824,9 +831,9 @@ function addRequestedFeatureToggles(r, requestedFeatureToggles) {
  *
  * @param  {object} r                Base reuqest object.
  * @param  {object} bidderRequest    An object containing other info like gdprConsent.
- * @param  {array}  impressions      A list of impressions to be added to the request.
- * @param  {array}  validBidRequests A list of valid bid request config objects.
- * @param  {array}  userEids         User ID info retrieved from Prebid ID module.
+ * @param  {Array}  impressions      A list of impressions to be added to the request.
+ * @param  {Array}  validBidRequests A list of valid bid request config objects.
+ * @param  {Array}  userEids         User ID info retrieved from Prebid ID module.
  * @return {object}                  Enriched object describing the request to the server.
  */
 function enrichRequest(r, bidderRequest, impressions, validBidRequests, userEids) {
@@ -839,13 +846,6 @@ function enrichRequest(r, bidderRequest, impressions, validBidRequests, userEids
     r.ext.ixdiag.syncsPerBidder = config.getConfig('userSync').syncsPerBidder;
   }
 
-  // Get cached errors stored in LocalStorage
-  const cachedErrors = getCachedErrors();
-
-  if (!isEmpty(cachedErrors)) {
-    r.ext.ixdiag.err = cachedErrors;
-  }
-
   // Add number of available imps to ixDiag.
   r.ext.ixdiag.imps = Object.keys(impressions).length;
 
@@ -933,10 +933,10 @@ function applyRegulations(r, bidderRequest) {
 /**
  * addImpressions adds impressions to request object
  *
- * @param  {array}  impressions        List of impressions to be added to the request.
- * @param  {array}  impKeys            List of impression keys.
+ * @param  {Array}  impressions        List of impressions to be added to the request.
+ * @param  {Array}  impKeys            List of impression keys.
  * @param  {object} r                  Reuqest object.
- * @param  {int}    adUnitIndex        Index of the current add unit
+ * @param  {number}    adUnitIndex        Index of the current add unit
  * @return {object}                    Reqyest object with added impressions describing the request to the server.
  */
 function addImpressions(impressions, impKeys, r, adUnitIndex) {
@@ -952,6 +952,8 @@ function addImpressions(impressions, impKeys, r, adUnitIndex) {
   const dfpAdUnitCode = impressions[impKeys[adUnitIndex]].dfp_ad_unit_code;
   const tid = impressions[impKeys[adUnitIndex]].tid;
   const sid = impressions[impKeys[adUnitIndex]].sid;
+  const auctionEnvironment = impressions[impKeys[adUnitIndex]].ae;
+  const paapi = impressions[impKeys[adUnitIndex]].paapi;
   const bannerImpressions = impressionObjects.filter(impression => BANNER in impression);
   const otherImpressions = impressionObjects.filter(impression => !(BANNER in impression));
 
@@ -966,6 +968,7 @@ function addImpressions(impressions, impKeys, r, adUnitIndex) {
     for (const impId in bannerImpsKeyed) {
       const bannerImps = bannerImpsKeyed[impId];
       const { id, banner: { topframe } } = bannerImps[0];
+      let externalID = deepAccess(bannerImps[0], 'ext.externalID');
       const _bannerImpression = {
         id,
         banner: {
@@ -975,15 +978,24 @@ function addImpressions(impressions, impKeys, r, adUnitIndex) {
       };
 
       for (let i = 0; i < _bannerImpression.banner.format.length; i++) {
-        // We add sid in imp.ext.sid therefore, remove from banner.format[].ext
-        if (_bannerImpression.banner.format[i].ext != null && _bannerImpression.banner.format[i].ext.sid != null) {
-          delete _bannerImpression.banner.format[i].ext.sid;
+        // We add sid and externalID in imp.ext therefore, remove from banner.format[].ext
+        if (_bannerImpression.banner.format[i].ext != null) {
+          if (_bannerImpression.banner.format[i].ext.sid != null) {
+            delete _bannerImpression.banner.format[i].ext.sid;
+          }
+          if (_bannerImpression.banner.format[i].ext.externalID != null) {
+            delete _bannerImpression.banner.format[i].ext.externalID;
+          }
         }
 
         // add floor per size
         if ('bidfloor' in bannerImps[i]) {
           _bannerImpression.banner.format[i].ext.bidfloor = bannerImps[i].bidfloor;
         }
+
+        if (JSON.stringify(_bannerImpression.banner.format[i].ext) === '{}') {
+          delete _bannerImpression.banner.format[i].ext;
+        }
       }
 
       const position = impressions[impKeys[adUnitIndex]].pos;
@@ -991,12 +1003,20 @@ function addImpressions(impressions, impKeys, r, adUnitIndex) {
         _bannerImpression.banner.pos = position;
       }
 
-      if (dfpAdUnitCode || gpid || tid || sid) {
+      if (dfpAdUnitCode || gpid || tid || sid || auctionEnvironment || externalID || paapi) {
         _bannerImpression.ext = {};
+
         _bannerImpression.ext.dfp_ad_unit_code = dfpAdUnitCode;
         _bannerImpression.ext.gpid = gpid;
         _bannerImpression.ext.tid = tid;
         _bannerImpression.ext.sid = sid;
+        _bannerImpression.ext.externalID = externalID;
+
+        // enable fledge auction
+        if (auctionEnvironment == 1) {
+          _bannerImpression.ext.ae = 1;
+          _bannerImpression.ext.paapi = paapi;
+        }
       }
 
       if ('bidfloor' in bannerImps[0]) {
@@ -1020,7 +1040,9 @@ function addImpressions(impressions, impKeys, r, adUnitIndex) {
     // Removes imp.ext.bidfloor
     // Sets imp.ext.siteID to one of the other [video/native].ext.siteid if imp.ext.siteID doesnt exist
     otherImpressions.forEach(imp => {
-      deepSetValue(imp, 'ext.gpid', gpid);
+      if (gpid) {
+        deepSetValue(imp, 'ext.gpid', gpid);
+      }
       if (r.imp.length > 0) {
         let matchFound = false;
         r.imp.forEach((rImp, index) => {
@@ -1068,7 +1090,7 @@ This function retrieves the page URL and appends first party data query paramete
 to it without adding duplicate query parameters. Returns original referer URL if no IX FPD exists.
 @param {Object} bidderRequest - The bidder request object containing information about the bid and the page.
 @returns {string} - The modified page URL with first party data query parameters appended.
-*/
+ */
 function getIxFirstPartyDataPageUrl (bidderRequest) {
   // Parse additional runtime configs.
   const bidderCode = (bidderRequest && bidderRequest.bidderCode) || 'ix';
@@ -1098,7 +1120,7 @@ This function appends the provided query parameters to the given URL without add
 @param {string} url - The base URL to which query parameters will be appended.
 @param {Object} params - An object containing key-value pairs of query parameters to append.
 @returns {string} - The modified URL with the provided query parameters appended.
-*/
+ */
 function appendIXQueryParams(bidderRequest, url, params) {
   let urlObj;
   try {
@@ -1154,6 +1176,7 @@ function addFPD(bidderRequest, r, fpd, site, user) {
     }
   }
 
+  // regulations from ortb2
   if (fpd.hasOwnProperty('regs') && !bidderRequest.gppConsent) {
     if (fpd.regs.hasOwnProperty('gpp') && typeof fpd.regs.gpp == 'string') {
       deepSetValue(r, 'regs.gpp', fpd.regs.gpp)
@@ -1162,6 +1185,30 @@ function addFPD(bidderRequest, r, fpd, site, user) {
     if (fpd.regs.hasOwnProperty('gpp_sid') && Array.isArray(fpd.regs.gpp_sid)) {
       deepSetValue(r, 'regs.gpp_sid', fpd.regs.gpp_sid)
     }
+
+    if (fpd.regs.ext?.dsa) {
+      const pubDsaObj = fpd.regs.ext.dsa;
+      const dsaObj = {};
+      ['dsarequired', 'pubrender', 'datatopub'].forEach((dsaKey) => {
+        if (isNumber(pubDsaObj[dsaKey])) {
+          dsaObj[dsaKey] = pubDsaObj[dsaKey];
+        }
+      });
+
+      if (isArray(pubDsaObj.transparency)) {
+        const tpData = [];
+        pubDsaObj.transparency.forEach((tpObj) => {
+          if (isPlainObject(tpObj) && isStr(tpObj.domain) && tpObj.domain != '' && isArray(tpObj.dsaparams) && tpObj.dsaparams.every((v) => isNumber(v))) {
+            tpData.push(tpObj);
+          }
+        });
+        if (tpData.length > 0) {
+          dsaObj.transparency = tpData;
+        }
+      }
+
+      if (!isEmpty(dsaObj)) deepSetValue(r, 'regs.ext.dsa', dsaObj);
+    }
   }
 
   return r;
@@ -1183,10 +1230,10 @@ function addAdUnitFPD(imp, bid) {
 /**
  * addIdentifiersInfo adds indentifier info to ixDaig.
  *
- * @param  {array}  impressions        List of impressions to be added to the request.
+ * @param  {Array}  impressions        List of impressions to be added to the request.
  * @param  {object} r                  Reuqest object.
- * @param  {array}  impKeys            List of impression keys.
- * @param  {int}    adUnitIndex        Index of the current add unit
+ * @param  {Array}  impKeys            List of impression keys.
+ * @param  {number}    adUnitIndex        Index of the current add unit
  * @param  {object} payload            Request payload object.
  * @param  {string} baseUrl            Base exchagne URL.
  * @return {object}                    Reqyest object with added indentigfier info to ixDiag.
@@ -1209,7 +1256,7 @@ function addIdentifiersInfo(impressions, r, impKeys, adUnitIndex, payload, baseU
 /**
  * Return an object of user IDs stored by Prebid User ID module
  *
- * @returns {array} ID providers that are present in userIds
+ * @returns {Array} ID providers that are present in userIds
  */
 function _getUserIds(bidRequest) {
   const userIds = bidRequest.userId || {};
@@ -1220,15 +1267,17 @@ function _getUserIds(bidRequest) {
 /**
  * Calculates IX diagnostics values and packages them into an object
  *
- * @param {array} validBidRequests  The valid bid requests from prebid
+ * @param {Array} validBidRequests - The valid bid requests from prebid
+ * @param {boolean} fledgeEnabled - Flag indicating if protected audience (fledge) is enabled
  * @return {Object} IX diag values for ad units
  */
-function buildIXDiag(validBidRequests) {
+function buildIXDiag(validBidRequests, fledgeEnabled) {
   var adUnitMap = validBidRequests
     .map(bidRequest => bidRequest.adUnitCode)
     .filter((value, index, arr) => arr.indexOf(value) === index);
 
-  var ixdiag = {
+  let allEids = deepAccess(validBidRequests, '0.userIdAsEids', [])
+  let ixdiag = {
     mfu: 0,
     bu: 0,
     iu: 0,
@@ -1239,12 +1288,14 @@ function buildIXDiag(validBidRequests) {
     version: '$prebid.version$',
     userIds: _getUserIds(validBidRequests[0]),
     url: window.location.href.split('?')[0],
-    vpd: defaultVideoPlacement
+    vpd: defaultVideoPlacement,
+    ae: fledgeEnabled,
+    eidLength: allEids.length
   };
 
   // create ad unit map and collect the required diag properties
-  for (let i = 0; i < adUnitMap.length; i++) {
-    var bid = validBidRequests.filter(bidRequest => bidRequest.adUnitCode === adUnitMap[i])[0];
+  for (let adUnit of adUnitMap) {
+    let bid = validBidRequests.filter(bidRequest => bidRequest.adUnitCode === adUnit)[0];
 
     if (deepAccess(bid, 'mediaTypes')) {
       if (Object.keys(bid.mediaTypes).length > 1) {
@@ -1280,8 +1331,8 @@ function buildIXDiag(validBidRequests) {
 
 /**
  *
- * @param  {array}   bannerSizeList list of banner sizes
- * @param  {array}   bannerSize the size to be removed
+ * @param  {Array}   bannerSizeList list of banner sizes
+ * @param  {Array}   bannerSize the size to be removed
  * @return {boolean} true if successfully removed, false if not found
  */
 
@@ -1350,7 +1401,7 @@ function createVideoImps(validBidRequest, videoImps) {
  * @param {object}  missingBannerSizes reference to missing banner config sizes
  * @param {object}  bannerImps reference to created banner impressions
  */
-function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
+function createBannerImps(validBidRequest, missingBannerSizes, bannerImps, bidderRequest) {
   let imp = bidToBannerImp(validBidRequest);
 
   const bannerSizeDefined = includesSize(deepAccess(validBidRequest, 'mediaTypes.banner.sizes'), deepAccess(validBidRequest, 'params.size'));
@@ -1366,6 +1417,23 @@ function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
   bannerImps[validBidRequest.adUnitCode].tagId = deepAccess(validBidRequest, 'params.tagId');
   bannerImps[validBidRequest.adUnitCode].pos = deepAccess(validBidRequest, 'mediaTypes.banner.pos');
 
+  // Add Fledge flag if enabled
+  const fledgeEnabled = deepAccess(bidderRequest, 'paapi.enabled')
+  if (fledgeEnabled) {
+    const auctionEnvironment = deepAccess(validBidRequest, 'ortb2Imp.ext.ae')
+    const paapi = deepAccess(validBidRequest, 'ortb2Imp.ext.paapi')
+    if (paapi) {
+      bannerImps[validBidRequest.adUnitCode].paapi = paapi
+    }
+    if (auctionEnvironment) {
+      if (isInteger(auctionEnvironment)) {
+        bannerImps[validBidRequest.adUnitCode].ae = auctionEnvironment;
+      } else {
+        logWarn('error setting auction environment flag - must be an integer')
+      }
+    }
+  }
+
   // AdUnit-Specific First Party Data
   const adUnitFPD = deepAccess(validBidRequest, 'ortb2Imp.ext.data');
   if (adUnitFPD) {
@@ -1425,7 +1493,7 @@ function updateMissingSizes(validBidRequest, missingBannerSizes, imp) {
 /**
  * @param  {object} bid      ValidBidRequest object, used to adjust floor
  * @param  {object} imp      Impression object to be modified
- * @param  {array}  newSize  The new size to be applied
+ * @param  {Array}  newSize  The new size to be applied
  * @return {object} newImp   Updated impression object
  */
 function createMissingBannerImp(bid, imp, newSize) {
@@ -1438,104 +1506,6 @@ function createMissingBannerImp(bid, imp, newSize) {
   return newImp;
 }
 
-/**
- * @typedef {Array[message: string, err: Object]} ErrorData
- * @property {string} message - The error message.
- * @property {object} err - The error object.
- * @property {string} err.bidder - The bidder of the error.
- * @property {string} err.code - The error code.
- */
-
-/**
- * Error Event handler that receives type and arguments in a data object.
- *
- * @param {ErrorData} data
- */
-function storeErrorEventData(data) {
-  if (!storage.localStorageIsEnabled()) {
-    return;
-  }
-
-  let currentStorage;
-
-  try {
-    currentStorage = JSON.parse(storage.getDataFromLocalStorage(LOCAL_STORAGE_KEY) || '{}');
-  } catch (e) {
-    logWarn('ix can not read ixdiag from localStorage.');
-  }
-
-  const todayDate = new Date();
-
-  Object.keys(currentStorage).map((errorDate) => {
-    const date = new Date(errorDate);
-
-    if (date.setDate(date.getDate() + 7) - todayDate < 0) {
-      delete currentStorage[errorDate];
-    }
-  });
-
-  if (data.type === 'ERROR' && data.arguments && data.arguments[1] && data.arguments[1].bidder === BIDDER_CODE) {
-    const todayString = todayDate.toISOString().slice(0, 10);
-
-    const errorCode = data.arguments[1].code;
-
-    if (errorCode) {
-      currentStorage[todayString] = currentStorage[todayString] || {};
-
-      if (!Number(currentStorage[todayString][errorCode])) {
-        currentStorage[todayString][errorCode] = 0;
-      }
-
-      currentStorage[todayString][errorCode]++;
-    };
-  }
-
-  storage.setDataInLocalStorage(LOCAL_STORAGE_KEY, JSON.stringify(currentStorage));
-}
-
-/**
- * Event handler for storing data into local storage. It will only store data if
- * local storage premissions are avaliable
- */
-function localStorageHandler(data) {
-  if (data.type === 'ERROR' && data.arguments && data.arguments[1] && data.arguments[1].bidder === BIDDER_CODE) {
-    storeErrorEventData(data);
-  }
-}
-
-/**
- * Get ixdiag stored in LocalStorage and format to be added to request payload
- *
- * @returns {Object} Object with error codes and counts
- */
-function getCachedErrors() {
-  if (!storage.localStorageIsEnabled()) {
-    return;
-  }
-
-  const errors = {};
-  let currentStorage;
-
-  try {
-    currentStorage = JSON.parse(storage.getDataFromLocalStorage(LOCAL_STORAGE_KEY) || '{}');
-  } catch (e) {
-    logError('ix can not read ixdiag from localStorage.');
-    return null;
-  }
-
-  Object.keys(currentStorage).forEach((date) => {
-    Object.keys(currentStorage[date]).forEach((code) => {
-      if (typeof currentStorage[date][code] === 'number') {
-        errors[code] = errors[code]
-          ? errors[code] + currentStorage[date][code]
-          : currentStorage[date][code];
-      }
-    });
-  });
-
-  return errors;
-}
-
 /**
  *
  * Initialize IX Outstream Renderer
@@ -1601,15 +1571,21 @@ function isIndexRendererPreferred(bid) {
   return !isValid || renderer.backupOnly;
 }
 
+function isExchangeIdConfigured() {
+  let exchangeId = config.getConfig('exchangeId');
+  if (typeof exchangeId === 'number' && isFinite(exchangeId)) {
+    return true;
+  }
+  if (typeof exchangeId === 'string' && exchangeId.trim() !== '' && isFinite(Number(exchangeId))) {
+    return true;
+  }
+  return false;
+}
+
 export const spec = {
 
   code: BIDDER_CODE,
   gvlid: GLOBAL_VENDOR_ID,
-  aliases: [{
-    code: ALIAS_BIDDER_CODE,
-    gvlid: GLOBAL_VENDOR_ID,
-    skipPbsAliasing: false
-  }],
   supportedMediaTypes: SUPPORTED_AD_TYPES,
 
   /**
@@ -1619,12 +1595,6 @@ export const spec = {
    * @return {boolean}     True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
-    if (!hasRegisteredHandler) {
-      events.on(CONSTANTS.EVENTS.AUCTION_DEBUG, localStorageHandler);
-      events.on(CONSTANTS.EVENTS.AD_RENDER_FAILED, localStorageHandler);
-      hasRegisteredHandler = true;
-    }
-
     const paramsVideoRef = deepAccess(bid, 'params.video');
     const paramsSize = deepAccess(bid, 'params.size');
     const mediaTypeBannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
@@ -1646,31 +1616,38 @@ export const spec = {
       // since there is an ix bidder level size, make sure its valid
       const ixSize = getFirstSize(paramsSize);
       if (!ixSize) {
-        logError('IX Bid Adapter: size has invalid format.', { bidder: BIDDER_CODE, code: ERROR_CODES.BID_SIZE_INVALID_FORMAT });
+        logError('IX Bid Adapter: size has invalid format.');
         return false;
       }
       // check if the ix bidder level size, is present in ad unit level
       if (!includesSize(bid.sizes, ixSize) &&
         !(includesSize(mediaTypeVideoPlayerSize, ixSize)) &&
         !(includesSize(mediaTypeBannerSizes, ixSize))) {
-        logError('IX Bid Adapter: bid size is not included in ad unit sizes or player size.', { bidder: BIDDER_CODE, code: ERROR_CODES.BID_SIZE_NOT_INCLUDED });
+        logError('IX Bid Adapter: bid size is not included in ad unit sizes or player size.');
         return false;
       }
     }
 
-    if (typeof bid.params.siteId !== 'string' && typeof bid.params.siteId !== 'number') {
-      logError('IX Bid Adapter: siteId must be string or number type.', { bidder: BIDDER_CODE, code: ERROR_CODES.SITE_ID_INVALID_VALUE });
+    if (!isExchangeIdConfigured() && bid.params.siteId == undefined) {
+      logError('IX Bid Adapter: Invalid configuration - either siteId or exchangeId must be configured.');
       return false;
     }
 
-    if (typeof bid.params.siteId !== 'string' && isNaN(Number(bid.params.siteId))) {
-      logError('IX Bid Adapter: siteId must valid value', { bidder: BIDDER_CODE, code: ERROR_CODES.SITE_ID_INVALID_VALUE });
-      return false;
+    if (bid.params.siteId !== undefined) {
+      if (typeof bid.params.siteId !== 'string' && typeof bid.params.siteId !== 'number') {
+        logError('IX Bid Adapter: siteId must be string or number type.');
+        return false;
+      }
+
+      if (typeof bid.params.siteId !== 'string' && isNaN(Number(bid.params.siteId))) {
+        logError('IX Bid Adapter: siteId must valid value');
+        return false;
+      }
     }
 
     if (hasBidFloor || hasBidFloorCur) {
       if (!(hasBidFloor && hasBidFloorCur && isValidBidFloorParams(bid.params.bidFloor, bid.params.bidFloorCur))) {
-        logError('IX Bid Adapter: bidFloor / bidFloorCur parameter has invalid format.', { bidder: BIDDER_CODE, code: ERROR_CODES.BID_FLOOR_INVALID_FORMAT });
+        logError('IX Bid Adapter: bidFloor / bidFloorCur parameter has invalid format.');
         return false;
       }
     }
@@ -1689,7 +1666,7 @@ export const spec = {
 
       if (errorList.length) {
         errorList.forEach((err) => {
-          logError(err, { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
+          logError(err);
         });
         return false;
       }
@@ -1698,10 +1675,15 @@ export const spec = {
     return nativeMediaTypeValid(bid);
   },
 
+  // For testing only - resets the siteID to 0 so that it can be set again
+  resetSiteID: function () {
+    siteID = 0;
+  },
+
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param  {array}  validBidRequests A list of valid bid request config objects.
+   * @param  {Array}  validBidRequests A list of valid bid request config objects.
    * @param  {object} bidderRequest    A object contains bids and other info like gdprConsent.
    * @return {object}                  Info describing the request to the server.
    */
@@ -1720,7 +1702,7 @@ export const spec = {
       for (const type in adUnitMediaTypes) {
         switch (adUnitMediaTypes[type]) {
           case BANNER:
-            createBannerImps(validBidRequest, missingBannerSizes, bannerImps);
+            createBannerImps(validBidRequest, missingBannerSizes, bannerImps, bidderRequest);
             break;
           case VIDEO:
             createVideoImps(validBidRequest, videoImps)
@@ -1789,19 +1771,24 @@ export const spec = {
    *
    * @param  {object} serverResponse A successful response from the server.
    * @param  {object} bidderRequest  The bid request sent to the server.
-   * @return {array}                 An array of bids which were nested inside the server.
+   * @return {Array}                 An array of bids which were nested inside the server.
    */
   interpretResponse: function (serverResponse, bidderRequest) {
     const bids = [];
     let bid = null;
 
-    if (!serverResponse.hasOwnProperty('body') || !serverResponse.body.hasOwnProperty('seatbid')) {
-      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+    // Extract the FLEDGE auction configuration list from the response
+    let fledgeAuctionConfigs = deepAccess(serverResponse, 'body.ext.protectedAudienceAuctionConfigs') || [];
+
+    FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+
+    if (!serverResponse.hasOwnProperty('body')) {
       return bids;
     }
 
     const responseBody = serverResponse.body;
-    const seatbid = responseBody.seatbid;
+    const seatbid = responseBody.seatbid || [];
+
     for (let i = 0; i < seatbid.length; i++) {
       if (!seatbid[i].hasOwnProperty('bid')) {
         continue;
@@ -1837,27 +1824,35 @@ export const spec = {
       }
     }
 
-    FEATURE_TOGGLES.setFeatureToggles(serverResponse);
-    return bids;
-  },
+    if (Array.isArray(fledgeAuctionConfigs) && fledgeAuctionConfigs.length > 0) {
+      // Validate and filter fledgeAuctionConfigs
+      fledgeAuctionConfigs = fledgeAuctionConfigs.filter(config => {
+        if (!isValidAuctionConfig(config)) {
+          logWarn('Malformed auction config detected:', config);
+          return false;
+        }
+        return true;
+      });
 
-  /**
-   * Covert bid param types for S2S
-   * @param {Object} params bid params
-   * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
-   * @return {Object} params bid params
-   */
-  transformBidParams: function (params, isOpenRtb) {
-    return convertTypes({
-      'siteID': 'number'
-    }, params);
+      try {
+        return {
+          bids,
+          paapi: fledgeAuctionConfigs,
+        };
+      } catch (error) {
+        logWarn('Error attaching AuctionConfigs', error);
+        return bids;
+      }
+    } else {
+      return bids;
+    }
   },
 
   /**
    * Determine which user syncs should occur
    * @param {object} syncOptions
-   * @param {array} serverResponses
-   * @returns {array} User sync pixels
+   * @param {Array} serverResponses
+   * @returns {Array} User sync pixels
    */
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
@@ -1898,11 +1893,11 @@ export const spec = {
 };
 
 /**
-   * Build img user sync url
-   * @param {int} syncsPerBidder number of syncs Per Bidder
-   * @param {int} index index to pass
-   * @returns {string} img user sync url
-   */
+ * Build img user sync url
+ * @param {number} syncsPerBidder number of syncs Per Bidder
+ * @param {number} index index to pass
+ * @returns {string} img user sync url
+ */
 function buildImgSyncUrl(syncsPerBidder, index) {
   let consentString = '';
   let gdprApplies = '0';
@@ -1912,13 +1907,14 @@ function buildImgSyncUrl(syncsPerBidder, index) {
   if (gdprConsent && gdprConsent.hasOwnProperty('consentString')) {
     consentString = gdprConsent.consentString || '';
   }
+  let siteIdParam = siteID !== 0 ? '&site_id=' + siteID.toString() : '';
 
-  return IMG_USER_SYNC_URL + '&site_id=' + siteID.toString() + '&p=' + syncsPerBidder.toString() + '&i=' + index.toString() + '&gdpr=' + gdprApplies + '&gdpr_consent=' + consentString + '&us_privacy=' + (usPrivacy || '');
+  return IMG_USER_SYNC_URL + siteIdParam + '&p=' + syncsPerBidder.toString() + '&i=' + index.toString() + '&gdpr=' + gdprApplies + '&gdpr_consent=' + consentString + '&us_privacy=' + (usPrivacy || '');
 }
 
 /**
  * Combines all imps into a single object
- * @param {array} imps array of imps
+ * @param {Array} imps array of imps
  * @returns object
  */
 export function combineImps(imps) {
@@ -2059,6 +2055,15 @@ function getFormatCount(imp) {
   return formatCount;
 }
 
+/**
+ * Checks if auction config is valid
+ * @param {object} config
+ * @returns bool
+ */
+function isValidAuctionConfig(config) {
+  return typeof config === 'object' && config !== null;
+}
+
 /**
  * Adds device.w / device.h info
  * @param {object} r
diff --git a/modules/ixBidAdapter.md b/modules/ixBidAdapter.md
index 638cb11c5ab..f2f6d97daf9 100644
--- a/modules/ixBidAdapter.md
+++ b/modules/ixBidAdapter.md
@@ -469,6 +469,11 @@ pbjs.setConfig({
 
 The timeout value must be a positive whole number in milliseconds.
 
+Protected Audience API (FLEDGE)
+===========================
+
+In order to enable receiving [Protected Audience API](https://developer.chrome.com/en/docs/privacy-sandbox/fledge/) traffic, follow Prebid's documentation on [paapiForGpt](https://docs.prebid.org/dev-docs/modules/paapiForGpt.html) module to build and enable Fledge.
+
 Additional Information
 ======================
 
diff --git a/modules/jixieBidAdapter.js b/modules/jixieBidAdapter.js
index 103c925a2f9..1e07ce6b5d8 100644
--- a/modules/jixieBidAdapter.js
+++ b/modules/jixieBidAdapter.js
@@ -1,4 +1,4 @@
-import {deepAccess, getDNT, isArray, logWarn, isFn, isPlainObject} from '../src/utils.js';
+import {deepAccess, getDNT, isArray, logWarn, isFn, isPlainObject, logError, logInfo} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {getStorageManager} from '../src/storageManager.js';
@@ -7,9 +7,11 @@ import {ajax} from '../src/ajax.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {Renderer} from '../src/Renderer.js';
 
+const ADAPTER_VERSION = '2.1.0';
+const PREBID_VERSION = '$prebid.version$';
+
 const BIDDER_CODE = 'jixie';
 export const storage = getStorageManager({bidderCode: BIDDER_CODE});
-const EVENTS_URL = 'https://hbtra.jixie.io/sync/hb?';
 const JX_OUTSTREAM_RENDERER_URL = 'https://scripts.jixie.media/jxhbrenderer.1.1.min.js';
 const REQUESTS_URL = 'https://hb.jixie.io/v2/hbpost';
 const sidTTLMins_ = 30;
@@ -59,7 +61,18 @@ function setIds_(clientId, sessionId) {
   } catch (error) {}
 }
 
-function fetchIds_() {
+/**
+ * fetch some ids from cookie, LS.
+ * @returns
+ */
+const defaultGenIds_ = [
+  { id: '_jxtoko' },
+  { id: '_jxifo' },
+  { id: '_jxtdid' },
+  { id: '_jxcomp' }
+];
+
+function fetchIds_(cfg) {
   let ret = {
     client_id_c: '',
     client_id_ls: '',
@@ -77,9 +90,11 @@ function fetchIds_() {
     if (tmp) ret.client_id_ls = tmp;
     tmp = storage.getDataFromLocalStorage('_jxxs');
     if (tmp) ret.session_id_ls = tmp;
-    ['_jxtoko', '_jxifo', '_jxtdid', '_jxcomp'].forEach(function(n) {
-      tmp = storage.getCookie(n);
-      if (tmp) ret.jxeids[n] = tmp;
+
+    let arr = cfg.genids ? cfg.genids : defaultGenIds_;
+    arr.forEach(function(o) {
+      tmp = storage.getCookie(o.ck ? o.ck : o.id);
+      if (tmp) ret.jxeids[o.id] = tmp;
     });
   } catch (error) {}
   return ret;
@@ -97,14 +112,6 @@ function getDevice_() {
   return device;
 }
 
-function pingTracking_(endpointOverride, qpobj) {
-  internal.ajax((endpointOverride || EVENTS_URL), null, qpobj, {
-    withCredentials: true,
-    method: 'GET',
-    crossOrigin: true
-  });
-}
-
 function jxOutstreamRender_(bidAd) {
   bidAd.renderer.push(() => {
     window.JixieOutstreamVideo.init({
@@ -166,7 +173,6 @@ export const internal = {
 
 export const spec = {
   code: BIDDER_CODE,
-  EVENTS_URL: EVENTS_URL,
   supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bid) {
     if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
@@ -198,29 +204,23 @@ export const spec = {
       }
       bids.push(tmp);
     });
-    let jixieCfgBlob = config.getConfig('jixie');
-    if (!jixieCfgBlob) {
-      jixieCfgBlob = {};
-    }
+    let jxCfg = config.getConfig('jixie') || {};
 
-    let ids = fetchIds_();
+    let ids = fetchIds_(jxCfg);
     let eids = [];
     let miscDims = internal.getMiscDims();
     let schain = deepAccess(validBidRequests[0], 'schain');
 
-    let eids1 = validBidRequests[0].userIdAsEids
+    let eids1 = validBidRequests[0].userIdAsEids;
     // all available user ids are sent to our backend in the standard array layout:
     if (eids1 && eids1.length) {
       eids = eids1;
     }
     // we want to send this blob of info to our backend:
-    let pg = config.getConfig('priceGranularity');
-    if (!pg) {
-      pg = {};
-    }
     let transformedParams = Object.assign({}, {
       // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-      auctionid: bidderRequest.auctionId,
+      auctionid: bidderRequest.auctionId || '',
+      aid: jxCfg.aid || '',
       timeout: bidderRequest.timeout,
       currency: currency,
       timestamp: (new Date()).getTime(),
@@ -231,8 +231,10 @@ export const spec = {
       bids: bids,
       eids: eids,
       schain: schain,
-      pricegranularity: pg,
-      cfg: jixieCfgBlob
+      pricegranularity: (config.getConfig('priceGranularity') || {}),
+      ver: ADAPTER_VERSION,
+      pbjsver: PREBID_VERSION,
+      cfg: jxCfg
     }, ids);
     return Object.assign({}, {
       method: 'POST',
@@ -243,48 +245,20 @@ export const spec = {
   },
 
   onTimeout: function(timeoutData) {
-    let jxCfgBlob = config.getConfig('jixie');
-    if (jxCfgBlob && jxCfgBlob.onTimeout == 'off') {
-      return;
-    }
-    let url = null;// default
-    if (jxCfgBlob && jxCfgBlob.onTimeoutUrl && typeof jxCfgBlob.onTimeoutUrl == 'string') {
-      url = jxCfgBlob.onTimeoutUrl;
-    }
-    let miscDims = internal.getMiscDims();
-    pingTracking_(url, // no overriding ping URL . just use default
-      {
-        action: 'hbtimeout',
-        device: miscDims.device,
-        pageurl: encodeURIComponent(miscDims.pageurl),
-        domain: encodeURIComponent(miscDims.domain),
-        auctionid: deepAccess(timeoutData, '0.auctionId'),
-        timeout: deepAccess(timeoutData, '0.timeout'),
-        count: timeoutData.length
-      });
+    logError('jixie adapter timed out for the auction.', timeoutData);
   },
 
   onBidWon: function(bid) {
-    if (bid.notrack) {
-      return;
-    }
     if (bid.trackingUrl) {
-      pingTracking_(bid.trackingUrl, {});
-    } else {
-      let miscDims = internal.getMiscDims();
-      pingTracking_((bid.trackingUrlBase ? bid.trackingUrlBase : null), {
-        action: 'hbbidwon',
-        device: miscDims.device,
-        pageurl: encodeURIComponent(miscDims.pageurl),
-        domain: encodeURIComponent(miscDims.domain),
-        cid: bid.cid,
-        cpid: bid.cpid,
-        jxbidid: bid.jxBidId,
-        auctionid: bid.auctionId,
-        cpm: bid.cpm,
-        requestid: bid.requestId
+      internal.ajax(bid.trackingUrl, null, {}, {
+        withCredentials: true,
+        method: 'GET',
+        crossOrigin: true
       });
     }
+    logInfo(
+      `jixie adapter won the auction. Bid id: ${bid.bidId}, Ad Unit Id: ${bid.adUnitId}`
+    );
   },
 
   interpretResponse: function(response, bidRequest) {
@@ -292,7 +266,6 @@ export const spec = {
       const bidResponses = [];
       response.body.bids.forEach(function(oneBid) {
         let bnd = {};
-
         Object.assign(bnd, oneBid);
         if (oneBid.osplayer) {
           bnd.adResponse = {
@@ -322,6 +295,21 @@ export const spec = {
       }
       return bidResponses;
     } else { return []; }
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses) {
+    if (!serverResponses.length || !serverResponses[0].body || !serverResponses[0].body.userSyncs) {
+      return false;
+    }
+    let syncs = [];
+    serverResponses[0].body.userSyncs.forEach(function(sync) {
+      if (syncOptions.iframeEnabled) {
+        syncs.push(sync.uf ? { url: sync.uf, type: 'iframe' } : { url: sync.up, type: 'image' });
+      } else if (syncOptions.pixelEnabled && sync.up) {
+        syncs.push({url: sync.up, type: 'image'})
+      }
+    })
+    return syncs;
   }
 }
 
diff --git a/modules/justIdSystem.js b/modules/justIdSystem.js
index 26e9275bbab..e4f1828c573 100644
--- a/modules/justIdSystem.js
+++ b/modules/justIdSystem.js
@@ -9,6 +9,14 @@ import * as utils from '../src/utils.js'
 import { submodule } from '../src/hook.js'
 import { loadExternalScript } from '../src/adloader.js'
 import {includes} from '../src/polyfill.js';
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
 
 const MODULE_NAME = 'justId';
 const EXTERNAL_SCRIPT_MODULE_CODE = 'justtag';
@@ -147,7 +155,7 @@ const CombinedUidProvider = function(configWrapper, consentData, cacheIdObj) {
   const url = configWrapper.getUrl();
 
   this.getUid = function(idCallback, errCallback) {
-    const scriptTag = loadExternalScript(url, EXTERNAL_SCRIPT_MODULE_CODE, () => {
+    const scriptTag = loadExternalScript(url, MODULE_TYPE_UID, EXTERNAL_SCRIPT_MODULE_CODE, () => {
       utils.logInfo(LOG_PREFIX, 'script loaded', url);
 
       const eventDetails = {
diff --git a/modules/jwplayerBidAdapter.js b/modules/jwplayerBidAdapter.js
new file mode 100644
index 00000000000..c58eed8ffb8
--- /dev/null
+++ b/modules/jwplayerBidAdapter.js
@@ -0,0 +1,412 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { VIDEO } from '../src/mediaTypes.js';
+import { isArray, isFn, deepAccess, deepSetValue, getDNT, logError, logWarn } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { hasPurpose1Consent } from '../src/utils/gdpr.js';
+
+const BIDDER_CODE = 'jwplayer';
+const BASE_URL = 'https://vpb-server.jwplayer.com/';
+const AUCTION_URL = BASE_URL + 'openrtb2/auction';
+const USER_SYNC_URL = BASE_URL + 'setuid';
+const GVLID = 1046;
+const SUPPORTED_AD_TYPES = [VIDEO];
+
+const VIDEO_ORTB_PARAMS = [
+  'pos',
+  'w',
+  'h',
+  'playbackend',
+  'mimes',
+  'minduration',
+  'maxduration',
+  'protocols',
+  'startdelay',
+  'placement',
+  'plcmt',
+  'skip',
+  'skipafter',
+  'minbitrate',
+  'maxbitrate',
+  'delivery',
+  'playbackmethod',
+  'api',
+  'linearity'
+];
+
+function getBidAdapter() {
+  function isBidRequestValid(bid) {
+    const params = bid && bid.params;
+    if (!params) {
+      return false;
+    }
+
+    return !!params.placementId && !!params.publisherId && !!params.siteId;
+  }
+
+  function buildRequests(bidRequests, bidderRequest) {
+    if (!bidRequests) {
+      return;
+    }
+
+    if (!hasContentUrl(bidderRequest.ortb2)) {
+      logError(`${BIDDER_CODE}: cannot bid without a valid Content URL. Please populate ortb2.site.content.url`);
+      return;
+    }
+
+    const warnings = getWarnings(bidderRequest);
+    warnings.forEach(warning => {
+      logWarn(`${BIDDER_CODE}: ${warning}`);
+    });
+
+    return bidRequests.map(bidRequest => {
+      const payload = buildRequest(bidRequest, bidderRequest);
+
+      return {
+        method: 'POST',
+        url: AUCTION_URL,
+        data: payload
+      }
+    });
+  }
+
+  function interpretResponse(serverResponse) {
+    const outgoingBidResponses = [];
+    const serverResponseBody = serverResponse.body;
+
+    logResponseWarnings(serverResponseBody);
+
+    const seatBids = serverResponseBody && serverResponseBody.seatbid;
+    if (!isArray(seatBids)) {
+      return outgoingBidResponses;
+    }
+
+    const cur = serverResponseBody.cur;
+
+    seatBids.forEach(seatBid => {
+      seatBid.bid.forEach(bid => {
+        const bidResponse = {
+          requestId: serverResponseBody.id,
+          cpm: bid.price,
+          currency: cur,
+          width: bid.w,
+          height: bid.h,
+          ad: bid.adm,
+          vastXml: bid.adm,
+          ttl: bid.ttl || 3600,
+          netRevenue: false,
+          creativeId: bid.adid,
+          dealId: bid.dealid,
+          meta: {
+            advertiserDomains: bid.adomain,
+            mediaType: VIDEO,
+            primaryCatId: bid.cat,
+          }
+        };
+
+        outgoingBidResponses.push(bidResponse);
+      });
+    });
+
+    return outgoingBidResponses;
+  }
+
+  function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    if (!hasPurpose1Consent(gdprConsent)) {
+      return [];
+    }
+
+    const userSyncs = [];
+    const consentQueryParams = getUserSyncConsentQueryParams(gdprConsent);
+    const url = `https://ib.adnxs.com/getuid?${USER_SYNC_URL}?bidder=jwplayer&uid=$UID&f=i` + consentQueryParams
+
+    if (syncOptions.iframeEnabled) {
+      userSyncs.push({
+        type: 'iframe',
+        url
+      });
+    }
+
+    if (syncOptions.pixelEnabled) {
+      userSyncs.push({
+        type: 'image',
+        url
+      });
+    }
+
+    return userSyncs;
+  }
+
+  return {
+    code: BIDDER_CODE,
+    gvlid: GVLID,
+    supportedMediaTypes: SUPPORTED_AD_TYPES,
+    isBidRequestValid,
+    buildRequests,
+    interpretResponse,
+    getUserSyncs
+  }
+
+  function getUserSyncConsentQueryParams(gdprConsent) {
+    if (!gdprConsent) {
+      return '';
+    }
+
+    const consentString = gdprConsent.consentString;
+    if (!consentString) {
+      return '';
+    }
+
+    let gdpr = 0;
+    const gdprApplies = gdprConsent.gdprApplies;
+    if (typeof gdprApplies === 'boolean') {
+      gdpr = Number(gdprApplies)
+    }
+
+    return `&gdpr=${gdpr}&gdpr_consent=${consentString}`;
+  }
+
+  function buildRequest(bidRequest, bidderRequest) {
+    const openrtbRequest = {
+      id: bidRequest.bidId,
+      imp: getRequestImpressions(bidRequest, bidderRequest),
+      site: getRequestSite(bidRequest, bidderRequest),
+      device: getRequestDevice(bidderRequest.ortb2),
+      user: getRequestUser(bidderRequest.ortb2),
+    };
+
+    // GDPR Consent Params
+    if (bidderRequest.gdprConsent) {
+      deepSetValue(openrtbRequest, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(openrtbRequest, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    // CCPA
+    if (bidderRequest.uspConsent) {
+      deepSetValue(openrtbRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    if (bidRequest.schain) {
+      deepSetValue(openrtbRequest, 'source.schain', bidRequest.schain);
+    }
+
+    openrtbRequest.tmax = bidderRequest.timeout || 200;
+
+    return JSON.stringify(openrtbRequest);
+  }
+
+  function getRequestImpressions(bidRequest) {
+    const impressionObject = {
+      id: bidRequest.adUnitCode,
+    };
+
+    impressionObject.video = getImpressionVideo(bidRequest);
+
+    const bidFloorData = getBidFloorData(bidRequest);
+    if (bidFloorData) {
+      impressionObject.bidfloor = bidFloorData.floor;
+      impressionObject.bidfloorcur = bidFloorData.currency;
+    }
+
+    impressionObject.ext = getImpressionExtension(bidRequest);
+
+    return [impressionObject];
+  }
+
+  function getImpressionVideo(bidRequest) {
+    const videoParams = deepAccess(bidRequest, 'mediaTypes.video', {});
+
+    const video = {};
+
+    VIDEO_ORTB_PARAMS.forEach((param) => {
+      if (videoParams.hasOwnProperty(param)) {
+        video[param] = videoParams[param];
+      }
+    });
+
+    setPlayerSize(video, videoParams);
+
+    if (!videoParams.plcmt) {
+      logWarn(`${BIDDER_CODE}: Please set a value to mediaTypes.video.plcmt`);
+    }
+
+    return video;
+  }
+
+  function getImpressionExtension(bidRequest) {
+    return {
+      prebid: {
+        bidder: {
+          jwplayer: {
+            placementId: bidRequest.params.placementId
+          }
+        }
+      }
+    };
+  }
+
+  function setPlayerSize(videoImp, videoParams) {
+    if (videoImp.w !== undefined && videoImp.h !== undefined) {
+      return;
+    }
+
+    const playerSize = getNormalizedPlayerSize(videoParams.playerSize);
+    if (!playerSize.length) {
+      logWarn(logWarn(`${BIDDER_CODE}: Video size has not been set. Please set values in video.h and video.w`));
+      return;
+    }
+
+    if (videoImp.w === undefined) {
+      videoImp.w = playerSize[0];
+    }
+
+    if (videoImp.h === undefined) {
+      videoImp.h = playerSize[1];
+    }
+  }
+
+  function getNormalizedPlayerSize(playerSize) {
+    if (!Array.isArray(playerSize)) {
+      return [];
+    }
+
+    if (Array.isArray(playerSize[0])) {
+      playerSize = playerSize[0];
+    }
+
+    if (playerSize.length < 2) {
+      return [];
+    }
+
+    return playerSize;
+  }
+
+  function getBidFloorData(bidRequest) {
+    const { params } = bidRequest;
+    const currency = params.currency || 'USD';
+
+    let floorData;
+    if (isFn(bidRequest.getFloor)) {
+      const bidFloorRequest = {
+        currency: currency,
+        mediaType: VIDEO,
+        size: '*'
+      };
+      floorData = bidRequest.getFloor(bidFloorRequest);
+    } else if (params.bidFloor) {
+      floorData = { floor: params.bidFloor, currency: currency };
+    }
+
+    return floorData;
+  }
+
+  function getRequestSite(bidRequest, bidderRequest) {
+    const site = bidderRequest.ortb2.site || {};
+
+    site.domain = site.domain || config.publisherDomain || window.location.hostname;
+    site.page = site.page || config.pageUrl || window.location.href;
+
+    const referer = bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
+    if (!site.ref && referer) {
+      site.ref = referer;
+    }
+
+    const jwplayerPublisherExtChain = 'publisher.ext.jwplayer.';
+
+    deepSetValue(site, jwplayerPublisherExtChain + 'publisherId', bidRequest.params.publisherId);
+    deepSetValue(site, jwplayerPublisherExtChain + 'siteId', bidRequest.params.siteId);
+
+    return site;
+  }
+
+  function getRequestDevice(ortb2) {
+    const device = Object.assign({
+      h: screen.height,
+      w: screen.width,
+      ua: navigator.userAgent,
+      dnt: getDNT() ? 1 : 0,
+      js: 1
+    }, ortb2.device || {})
+
+    const language = getLanguage();
+    if (!device.language && language) {
+      device.language = language;
+    }
+
+    return device;
+  }
+
+  function getLanguage() {
+    const navigatorLanguage = navigator.language;
+    if (!navigatorLanguage) {
+      return;
+    }
+
+    const languageCodeSegments = navigatorLanguage.split('-');
+    if (!languageCodeSegments.length) {
+      return;
+    }
+
+    return languageCodeSegments[0];
+  }
+
+  function getRequestUser(ortb2) {
+    const user = ortb2.user || {};
+    if (config.getConfig('coppa') === true) {
+      user.coppa = true;
+    }
+
+    return user;
+  }
+
+  function hasContentUrl(ortb2) {
+    const site = ortb2.site;
+    const content = site && site.content;
+    return !!(content && content.url);
+  }
+
+  function getWarnings(bidderRequest) {
+    const content = bidderRequest.ortb2.site.content;
+    const contentChain = 'ortb2.site.content.';
+    const warnings = [];
+    if (!content.id) {
+      warnings.push(getMissingFieldMessage(contentChain + 'id'));
+    }
+
+    if (!content.title) {
+      warnings.push(getMissingFieldMessage(contentChain + 'title'));
+    }
+
+    if (!content.ext || !content.ext.description) {
+      warnings.push(getMissingFieldMessage(contentChain + 'ext.description'));
+    }
+
+    return warnings;
+  }
+
+  function getMissingFieldMessage(fieldName) {
+    return `Optional field ${fieldName} is not populated; we recommend populating for maximum performance.`
+  }
+
+  function logResponseWarnings(serverResponseBody) {
+    const warningPayload = deepAccess(serverResponseBody, 'ext.warnings');
+    if (!warningPayload) {
+      return;
+    }
+
+    const warningCategories = Object.keys(warningPayload);
+    warningCategories.forEach(category => {
+      const warnings = warningPayload[category];
+      if (!isArray(warnings)) {
+        return;
+      }
+
+      warnings.forEach(warning => {
+        logWarn(`${BIDDER_CODE}: [Bid Response][Warning Code: ${warning.code}] ${warning.message}`);
+      });
+    });
+  }
+}
+
+export const spec = getBidAdapter();
+
+registerBidder(spec);
diff --git a/modules/jwplayerBidAdapter.md b/modules/jwplayerBidAdapter.md
new file mode 100644
index 00000000000..620f8657e50
--- /dev/null
+++ b/modules/jwplayerBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name:  JWPlayer Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: boost-engineering@jwplayer.com
+```
+
+# Description
+
+Connects to JWPlayer's demand sources.
+
+JWPlayer bid adapter supports Video (instream and outstream).
+
+# Sample Ad Unit
+
+```markdown
+const adUnit = {
+    code: 'test-ad-unit',
+    mediaTypes: {
+    video: {
+        pos: 0,
+        w: 640,
+        h: 480,
+        mimes :  ['video/x-ms-wmv', 'video/mp4'],
+        minduration : 0,
+        maxduration: 60,
+        protocols : [2,3,7,5,6,8],
+        startdelay: 0,
+        placement: 1,
+        plcmt: 1,
+        skip: 1,
+        skipafter: 10,
+        playbackmethod: [3],
+        api: [2],
+        linearity: 1
+    }
+    },
+    bids: [{
+        bidder: 'jwplayer',
+        params: {
+            publisherId: 'test-publisher-id',
+            siteId: 'test-site-id',
+            placementId: 'test-placement-id'
+        }
+    }]
+};
+```
+
+# Sample ortb2 config
+
+```markdown
+pbjs.setConfig({
+    ortb2: {
+        site: {
+            publisher: {
+                id: 'test-publisher-id'
+            },
+            content: {
+                id: 'test-media-id',
+                url: 'test.mp4',
+                title: 'title of my media',
+                ext: {
+                    description: 'description of my media'
+                }
+            },
+            domain: 'test-domain.com',
+            page: 'https://www.test-domain.com/test.html',
+        }
+    }
+}
+```
diff --git a/modules/jwplayerRtdProvider.js b/modules/jwplayerRtdProvider.js
index b79843dccfd..78c26cbda6a 100644
--- a/modules/jwplayerRtdProvider.js
+++ b/modules/jwplayerRtdProvider.js
@@ -12,30 +12,43 @@
 import {submodule} from '../src/hook.js';
 import {config} from '../src/config.js';
 import {ajaxBuilder} from '../src/ajax.js';
-import {deepAccess, logError} from '../src/utils.js';
+import { deepAccess, logError, logWarn } from '../src/utils.js'
 import {find} from '../src/polyfill.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ * @typedef {import('../modules/rtdModule/index.js').adUnit} adUnit
+ */
+
 const SUBMODULE_NAME = 'jwplayer';
 const JWPLAYER_DOMAIN = SUBMODULE_NAME + '.com';
-const segCache = {};
+const ENRICH_ALWAYS = 'always';
+const ENRICH_WHEN_EMPTY = 'whenEmpty';
+const ENRICH_NEVER = 'never';
+const overrideValidationRegex = /^(always|never|whenEmpty)$/;
+const playlistItemCache = {};
 const pendingRequests = {};
 let activeRequestCount = 0;
 let resumeBidRequest;
+let overrideContentId = ENRICH_WHEN_EMPTY;
+let overrideContentUrl = ENRICH_WHEN_EMPTY;
+let overrideContentTitle = ENRICH_WHEN_EMPTY;
+let overrideContentDescription = ENRICH_WHEN_EMPTY;
 
 /** @type {RtdSubmodule} */
 export const jwplayerSubmodule = {
   /**
-     * used to link submodule with realTimeData
-     * @type {string}
-     */
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
   name: SUBMODULE_NAME,
   /**
-     * add targeting data to bids and signal completion to realTimeData module
-     * @function
-     * @param {Obj} bidReqConfig
-     * @param {function} onDone
-     */
+   * add targeting data to bids and signal completion to realTimeData module
+   * @function
+   * @param {object} bidReqConfig
+   * @param {function} onDone
+   */
   getBidRequestData: enrichBidRequest,
   init
 };
@@ -48,6 +61,7 @@ config.getConfig('realTimeData', ({realTimeData}) => {
     return;
   }
   fetchTargetingInformation(params);
+  setOverrides(params);
 });
 
 submodule('realTimeData', jwplayerSubmodule);
@@ -66,15 +80,30 @@ export function fetchTargetingInformation(jwTargeting) {
   });
 }
 
+export function setOverrides(params) {
+  overrideContentId = sanitizeOverrideParam(params.overrideContentId, ENRICH_WHEN_EMPTY);
+  overrideContentUrl = sanitizeOverrideParam(params.overrideContentUrl, ENRICH_WHEN_EMPTY);
+  overrideContentTitle = sanitizeOverrideParam(params.overrideContentTitle, ENRICH_WHEN_EMPTY);
+  overrideContentDescription = sanitizeOverrideParam(params.overrideContentDescription, ENRICH_WHEN_EMPTY);
+}
+
+function sanitizeOverrideParam(overrideParam, defaultValue) {
+  if (overrideValidationRegex.test(overrideParam)) {
+    return overrideParam;
+  }
+
+  return defaultValue;
+}
+
 export function fetchTargetingForMediaId(mediaId) {
   const ajax = ajaxBuilder();
   // TODO: Avoid checking undefined vs null by setting a callback to pendingRequests.
   pendingRequests[mediaId] = null;
   ajax(`https://cdn.${JWPLAYER_DOMAIN}/v2/media/${mediaId}`, {
     success: function (response) {
-      const segment = parseSegment(response);
-      cacheSegments(segment, mediaId);
-      onRequestCompleted(mediaId, !!segment);
+      const item = parsePlaylistItem(response);
+      cachePlaylistItem(item, mediaId);
+      onRequestCompleted(mediaId, !!item);
     },
     error: function () {
       logError('failed to retrieve targeting information');
@@ -83,8 +112,8 @@ export function fetchTargetingForMediaId(mediaId) {
   });
 }
 
-function parseSegment(response) {
-  let segment;
+function parsePlaylistItem(response) {
+  let item;
   try {
     const data = JSON.parse(response);
     if (!data) {
@@ -96,16 +125,16 @@ function parseSegment(response) {
       throw ('Empty playlist');
     }
 
-    segment = playlist[0].jwpseg;
+    item = playlist[0];
   } catch (err) {
     logError(err);
   }
-  return segment;
+  return item;
 }
 
-function cacheSegments(jwpseg, mediaId) {
-  if (jwpseg && mediaId) {
-    segCache[mediaId] = jwpseg;
+function cachePlaylistItem(playlistItem, mediaId) {
+  if (playlistItem && mediaId) {
+    playlistItemCache[mediaId] = playlistItem;
   }
 }
 
@@ -162,7 +191,7 @@ export function enrichAdUnits(adUnits, ortb2Fragments = {}) {
       const contentData = getContentData(mediaId, contentSegments);
       const targeting = formatTargetingResponse(vat);
       enrichBids(adUnit.bids, targeting, contentId, contentData);
-      addOrtbSiteContent(ortb2Fragments.global, contentId, contentData);
+      addOrtbSiteContent(ortb2Fragments.global, contentId, contentData, vat.title, vat.description, vat.mediaUrl);
     };
     loadVat(jwTargeting, onVatResponse);
   });
@@ -187,18 +216,22 @@ export function extractPublisherParams(adUnit, fallback) {
 }
 
 function loadVat(params, onCompletion) {
-  const { playerID, mediaID } = params;
+  let { playerID, playerDivId, mediaID } = params;
+  if (!playerDivId) {
+    playerDivId = playerID;
+  }
+
   if (pendingRequests[mediaID] !== undefined) {
-    loadVatForPendingRequest(playerID, mediaID, onCompletion);
+    loadVatForPendingRequest(playerDivId, mediaID, onCompletion);
     return;
   }
 
-  const vat = getVatFromCache(mediaID) || getVatFromPlayer(playerID, mediaID) || { mediaID };
+  const vat = getVatFromCache(mediaID) || getVatFromPlayer(playerDivId, mediaID) || { mediaID };
   onCompletion(vat);
 }
 
-function loadVatForPendingRequest(playerID, mediaID, callback) {
-  const vat = getVatFromPlayer(playerID, mediaID);
+function loadVatForPendingRequest(playerDivId, mediaID, callback) {
+  const vat = getVatFromPlayer(playerDivId, mediaID);
   if (vat) {
     callback(vat);
   } else {
@@ -208,20 +241,29 @@ function loadVatForPendingRequest(playerID, mediaID, callback) {
 }
 
 export function getVatFromCache(mediaID) {
-  const segments = segCache[mediaID];
+  const item = playlistItemCache[mediaID];
 
-  if (!segments) {
+  if (!item) {
     return null;
   }
 
+  const mediaUrl = item.file ?? getFileFromSources(item);
+
   return {
-    segments,
+    segments: item.jwpseg,
+    title: item.title,
+    description: item.description,
+    mediaUrl,
     mediaID
   };
 }
 
-export function getVatFromPlayer(playerID, mediaID) {
-  const player = getPlayer(playerID);
+function getFileFromSources(playlistItem) {
+  return playlistItem.sources?.find?.(source => !!source.file)?.file;
+}
+
+export function getVatFromPlayer(playerDivId, mediaID) {
+  const player = getPlayer(playerDivId);
   if (!player) {
     return null;
   }
@@ -232,12 +274,18 @@ export function getVatFromPlayer(playerID, mediaID) {
   }
 
   mediaID = mediaID || item.mediaid;
+  const title = item.title;
+  const description = item.description;
+  const mediaUrl = item.file;
   const segments = item.jwpseg;
-  cacheSegments(segments, mediaID)
+  cachePlaylistItem(item, mediaID)
 
   return {
     segments,
-    mediaID
+    mediaID,
+    title,
+    mediaUrl,
+    description
   };
 }
 
@@ -304,11 +352,7 @@ export function getContentData(mediaId, segments) {
   return contentData;
 }
 
-export function addOrtbSiteContent(ortb2, contentId, contentData) {
-  if (!contentId && !contentData) {
-    return;
-  }
-
+export function addOrtbSiteContent(ortb2, contentId, contentData, contentTitle, contentDescription, contentUrl) {
   if (ortb2 == null) {
     ortb2 = {};
   }
@@ -316,11 +360,24 @@ export function addOrtbSiteContent(ortb2, contentId, contentData) {
   let site = ortb2.site = ortb2.site || {};
   let content = site.content = site.content || {};
 
-  if (contentId) {
+  if (shouldOverride(content.id, contentId, overrideContentId)) {
     content.id = contentId;
   }
 
-  const currentData = content.data = content.data || [];
+  if (shouldOverride(content.url, contentUrl, overrideContentUrl)) {
+    content.url = contentUrl;
+  }
+
+  if (shouldOverride(content.title, contentTitle, overrideContentTitle)) {
+    content.title = contentTitle;
+  }
+
+  if (shouldOverride(content.ext && content.ext.description, contentDescription, overrideContentDescription)) {
+    content.ext = content.ext || {};
+    content.ext.description = contentDescription;
+  }
+
+  const currentData = content.data || [];
   // remove old jwplayer data
   const data = currentData.filter(datum => datum.name !== JWPLAYER_DOMAIN);
 
@@ -328,11 +385,26 @@ export function addOrtbSiteContent(ortb2, contentId, contentData) {
     data.push(contentData);
   }
 
-  content.data = data;
+  if (data.length) {
+    content.data = data;
+  }
 
   return ortb2;
 }
 
+function shouldOverride(currentValue, newValue, configValue) {
+  switch (configValue) {
+    case ENRICH_ALWAYS:
+      return !!newValue;
+    case ENRICH_NEVER:
+      return false;
+    case ENRICH_WHEN_EMPTY:
+      return !!newValue && currentValue === undefined;
+    default:
+      return false;
+  }
+}
+
 function enrichBids(bids, targeting, contentId, contentData) {
   if (!bids) {
     return;
@@ -357,17 +429,37 @@ export function addTargetingToBid(bid, targeting) {
   bid.rtd = Object.assign({}, rtd, jwRtd);
 }
 
-function getPlayer(playerID) {
+export function getPlayer(playerDivId) {
   const jwplayer = window.jwplayer;
   if (!jwplayer) {
     logError(SUBMODULE_NAME + '.js was not found on page');
     return;
   }
 
-  const player = jwplayer(playerID);
-  if (!player || !player.getPlaylist) {
-    logError('player ID did not match any players');
+  let player = jwplayer(playerDivId);
+  if (player && player.getPlaylist) {
+    return player;
+  }
+
+  const playerOnPageCount = document.getElementsByClassName('jwplayer').length;
+  if (playerOnPageCount === 0) {
+    logError('No JWPlayer instances have been detected on the page');
     return;
   }
-  return player;
+
+  let errorMessage = `player Div ID ${playerDivId} did not match any players.`;
+
+  // If there are multiple instances on the page, we cannot guess which one should be targeted.
+  if (playerOnPageCount > 1) {
+    logError(errorMessage);
+    return;
+  }
+
+  player = jwplayer();
+  if (player && player.getPlaylist) {
+    logWarn(`${errorMessage} Targeting player Div ID ${player.id} instead`);
+    return player;
+  }
+
+  logError(errorMessage);
 }
diff --git a/modules/jwplayerRtdProvider.md b/modules/jwplayerRtdProvider.md
index 479829196ed..44d696eea6d 100644
--- a/modules/jwplayerRtdProvider.md
+++ b/modules/jwplayerRtdProvider.md
@@ -12,16 +12,20 @@ Publishers must register JW Player as a real time data provider by setting up a
 following structure:
 
 ```javascript
-const jwplayerDataProvider = {
-  name: "jwplayer"
-};
-
 pbjs.setConfig({
     ...,
     realTimeData: {
-      dataProviders: [
-          jwplayerDataProvider
-      ]
+      dataProviders: [{
+        name: 'jwplayer',
+        waitForIt: true,
+        params: {
+          mediaIDs: ['abc', 'def', 'ghi', 'jkl'],
+          overrideContentId: 'always',
+          overrideContentUrl: 'always',
+          overrideContentTitle: 'always',
+          overrideContentDescription: 'always'
+        }
+      }]
     }
 });
 ```
@@ -36,7 +40,7 @@ const adUnit = {
       data: {
         jwTargeting: {
           // Note: the following Ids are placeholders and should be replaced with your Ids.
-          playerID: 'abcd',
+          playerDivId: 'abcd',
           mediaID: '1234'
         }
       }
@@ -51,7 +55,7 @@ pbjs.que.push(function() {
     });
 });
 ``` 
-**Note**: The player ID is the ID of the HTML div element used when instantiating the player. 
+**Note**: The player Div ID is the ID of the HTML div element used when instantiating the player. 
 You can retrieve this ID by calling `player.id`, where player is the JW Player instance variable.
 
 **Note**: You may also include `jwTargeting` information in the prebid config's `ortb2.site.ext.data`. Information provided in the adUnit will always supersede, and information in the config will be used as a fallback.
@@ -78,6 +82,19 @@ realTimeData = {
 };
 ```
 
+## Configuration syntax
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | String | Real time data module name | Always 'jwplayer' |
+| waitForIt | Boolean | Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false |
+| params | Object | | |
+| params.mediaIDs | Array of Strings | Media Ids for prefetching | Optional |
+| params.overrideContentId | String enum: 'always', 'whenEmpty' or 'never' | Determines when the module should update the oRTB site.content.id  | Defaults to 'whenEmpty' |
+| params.overrideContentUrl | String enum: 'always', 'whenEmpty' or 'never' | Determines when the module should update the oRTB site.content.url | Defaults to 'whenEmpty' |
+| params.overrideContentTitle | String enum: 'always', 'whenEmpty' or 'never' | Determines when the module should update the oRTB site.content.title | Defaults to 'whenEmpty' |
+| params.overrideContentDescription | String enum: 'always', 'whenEmpty' or 'never' | Determines when the module should update the oRTB site.content.ext.description | Defaults to 'whenEmpty' |
+
 # Usage for Bid Adapters:
 
 Implement the `buildRequests` function. When it is called, the `bidRequests` param will be an array of bids.
@@ -94,6 +111,8 @@ Example:
         site: {
             content: {
                 id: 'jw_abc123',
+                title: 'media title',
+                url: 'https:www.cdn.com/media.mp4',
                 data: [{
                     name: 'jwplayer.com',
                     ext: {
@@ -105,7 +124,10 @@ Example:
                     }, { 
                         id: '456'
                     }]
-                }]
+                }],
+                ext: {
+                  description: 'media description'
+              }
             }
         }   
     }
@@ -116,7 +138,10 @@ where:
 - `ortb2` is an object containing first party data
   - `site` is an object containing page specific information
     - `content` is an object containing metadata for the media. It may contain the following information: 
-      - `id` is a unique identifier for the specific media asset
+      - `id` is a unique identifier for the specific media asset,
+      - `title` is the title of the media content
+      - `url` is the url of the media asset
+      - `ext.description` is the description of the media content
       - `data` is an array containing segment taxonomy objects that have the following parameters:
         - `name` is the `jwplayer.com` string indicating the provider name
         - `ext.segtax` whose `502` value is the unique identifier for JW Player's proprietary taxonomy
@@ -134,7 +159,7 @@ To view an example:
 
 - in your browser, navigate to:
 
-`http://localhost:9999/integrationExamples/gpt/jwplayerRtdProvider_example.html`
+`http://localhost:9999/integrationExamples/realTimeData/jwplayerRtdProvider_example.html`
 
 **Note:** the mediaIds in the example are placeholder values; replace them with your existing IDs.
 
diff --git a/modules/jwplayerVideoProvider.js b/modules/jwplayerVideoProvider.js
index ed6b69d756a..54de1949e6f 100644
--- a/modules/jwplayerVideoProvider.js
+++ b/modules/jwplayerVideoProvider.js
@@ -12,6 +12,12 @@ import stateFactory from '../libraries/video/shared/state.js';
 import { JWPLAYER_VENDOR } from '../libraries/video/constants/vendorCodes.js';
 import { getEventHandler } from '../libraries/video/shared/eventHandler.js';
 import { submodule } from '../src/hook.js';
+/**
+ * @typedef {import('../libraries/video/constants/ortb.js').OrtbVideoParams} OrtbVideoParams
+ * @typedef {import('../libraries/video/shared/state.js').State} State
+ * @typedef {import('../modules/videoModule/coreVideo.js').VideoProvider} VideoProvider
+ * @typedef {import('../modules/videoModule/coreVideo.js').videoProviderConfig} videoProviderConfig
+ */
 
 /**
  * @constructor
diff --git a/modules/kargoAnalyticsAdapter.js b/modules/kargoAnalyticsAdapter.js
index 652e105167d..f8b088eefe8 100644
--- a/modules/kargoAnalyticsAdapter.js
+++ b/modules/kargoAnalyticsAdapter.js
@@ -2,7 +2,7 @@ import { logError } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 
 const EVENT_URL = 'https://krk.kargo.com/api/v1/event';
 const KARGO_BIDDER_CODE = 'kargo';
@@ -23,11 +23,11 @@ var kargoAnalyticsAdapter = Object.assign(
   adapter({ analyticsType }), {
     track({ eventType, args }) {
       switch (eventType) {
-        case CONSTANTS.EVENTS.AUCTION_INIT: {
+        case EVENTS.AUCTION_INIT: {
           _logBidResponseData.auctionTimeout = args.timeout;
           break;
         }
-        case CONSTANTS.EVENTS.BID_RESPONSE: {
+        case EVENTS.BID_RESPONSE: {
           handleBidResponseData(args);
           break;
         }
diff --git a/modules/kargoBidAdapter.js b/modules/kargoBidAdapter.js
index 1dde4453222..9416e6a0411 100644
--- a/modules/kargoBidAdapter.js
+++ b/modules/kargoBidAdapter.js
@@ -1,4 +1,4 @@
-import { _each, isEmpty, buildUrl, deepAccess, pick, triggerPixel } from '../src/utils.js';
+import { _each, isEmpty, buildUrl, deepAccess, pick, logError, isPlainObject } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
@@ -24,6 +24,7 @@ const CURRENCY = Object.freeze({
 });
 
 const REQUEST_KEYS = Object.freeze({
+  USER_DATA: 'ortb2.user.data',
   SOCIAL_CANVAS: 'params.socialCanvas',
   SUA: 'ortb2.device.sua',
   TDID_ADAPTER: 'userId.tdid',
@@ -47,7 +48,7 @@ const SUA_ATTRIBUTES = [
 
 const CERBERUS = Object.freeze({
   KEY: 'krg_crb',
-  SYNC_URL: 'https://crb.kargo.com/api/v1/initsyncrnd/{UUID}?seed={SEED}&idx={INDEX}&gdpr={GDPR}&gdpr_consent={GDPR_CONSENT}&us_privacy={US_PRIVACY}&gpp={GPP_STRING}&gpp_sid={GPP_SID}',
+  SYNC_URL: 'https://crb.kargo.com/api/v1/initsyncrnd/{UUID}?seed={SEED}&gdpr={GDPR}&gdpr_consent={GDPR_CONSENT}&us_privacy={US_PRIVACY}&gpp={GPP_STRING}&gpp_sid={GPP_SID}',
   SYNC_COUNT: 5,
   PAGE_VIEW_ID: 'pageViewId',
   PAGE_VIEW_TIMESTAMP: 'pageViewTimestamp',
@@ -95,17 +96,28 @@ function buildRequests(validBidRequests, bidderRequest) {
     },
     imp: impressions,
     user: getUserIds(tdidAdapter, bidderRequest.uspConsent, bidderRequest.gdprConsent, firstBidRequest.userIdAsEids, bidderRequest.gppConsent),
+    ext: getExtensions(firstBidRequest.ortb2, bidderRequest?.refererInfo)
   });
 
+  // Add site.cat if it exists
+  if (firstBidRequest.ortb2?.site?.cat != null) {
+    krakenParams.site = { cat: firstBidRequest.ortb2.site.cat };
+  }
+
+  // Add schain
   if (firstBidRequest.schain && firstBidRequest.schain.nodes) {
     krakenParams.schain = firstBidRequest.schain
   }
 
+  // Add user data object if available
+  krakenParams.user.data = deepAccess(firstBidRequest, REQUEST_KEYS.USER_DATA) || [];
+
   const reqCount = getRequestCount()
   if (reqCount != null) {
     krakenParams.requestCount = reqCount;
   }
 
+  // Add currency if not USD
   if (currency != null && currency != CURRENCY.US_DOLLAR) {
     krakenParams.cur = currency;
   }
@@ -171,6 +183,10 @@ function buildRequests(validBidRequests, bidderRequest) {
     krakenParams.page = page;
   }
 
+  if (krakenParams.ext && Object.keys(krakenParams.ext).length === 0) {
+    delete krakenParams.ext;
+  }
+
   return Object.assign({}, bidderRequest, {
     method: BIDDER.REQUEST_METHOD,
     url: `https://${BIDDER.HOST}${BIDDER.REQUEST_ENDPOINT}`,
@@ -180,25 +196,20 @@ function buildRequests(validBidRequests, bidderRequest) {
 }
 
 function interpretResponse(response, bidRequest) {
-  let bids = response.body;
+  const bids = response.body;
+  const fledgeAuctionConfigs = [];
   const bidResponses = [];
 
-  if (isEmpty(bids)) {
-    return bidResponses;
-  }
-
-  if (typeof bids !== 'object') {
+  if (isEmpty(bids) || typeof bids !== 'object') {
     return bidResponses;
   }
 
-  Object.entries(bids).forEach((entry) => {
-    const [bidID, adUnit] = entry;
-
+  for (const [bidID, adUnit] of Object.entries(bids)) {
     let meta = {
       mediaType: adUnit.mediaType && BIDDER.SUPPORTED_MEDIA_TYPES.includes(adUnit.mediaType) ? adUnit.mediaType : BANNER
     };
 
-    if (adUnit.metadata && adUnit.metadata.landingPageDomain) {
+    if (adUnit.metadata?.landingPageDomain) {
       meta.clickUrl = adUnit.metadata.landingPageDomain[0];
       meta.advertiserDomains = adUnit.metadata.landingPageDomain;
     }
@@ -209,7 +220,7 @@ function interpretResponse(response, bidRequest) {
       width: adUnit.width,
       height: adUnit.height,
       ttl: 300,
-      creativeId: adUnit.id,
+      creativeId: adUnit.creativeID,
       dealId: adUnit.targetingCustom,
       netRevenue: true,
       currency: adUnit.currency || bidRequest.currency,
@@ -228,9 +239,23 @@ function interpretResponse(response, bidRequest) {
     }
 
     bidResponses.push(bidResponse);
-  })
 
-  return bidResponses;
+    if (adUnit.auctionConfig) {
+      fledgeAuctionConfigs.push({
+        bidId: bidID,
+        config: adUnit.auctionConfig
+      })
+    }
+  }
+
+  if (fledgeAuctionConfigs.length > 0) {
+    return {
+      bids: bidResponses,
+      paapi: fledgeAuctionConfigs
+    }
+  } else {
+    return bidResponses;
+  }
 }
 
 function getUserSyncs(syncOptions, _, gdprConsent, usPrivacy, gppConsent) {
@@ -249,19 +274,16 @@ function getUserSyncs(syncOptions, _, gdprConsent, usPrivacy, gppConsent) {
     return syncs;
   }
   if (syncOptions.iframeEnabled && seed && clientId) {
-    for (let i = 0; i < CERBERUS.SYNC_COUNT; i++) {
-      syncs.push({
-        type: 'iframe',
-        url: CERBERUS.SYNC_URL.replace('{UUID}', clientId)
-          .replace('{SEED}', seed)
-          .replace('{INDEX}', i)
-          .replace('{GDPR}', gdpr)
-          .replace('{GDPR_CONSENT}', gdprConsentString)
-          .replace('{US_PRIVACY}', usPrivacy || '')
-          .replace('{GPP_STRING}', gppString)
-          .replace('{GPP_SID}', gppApplicableSections)
-      });
-    }
+    syncs.push({
+      type: 'iframe',
+      url: CERBERUS.SYNC_URL.replace('{UUID}', clientId)
+        .replace('{SEED}', seed)
+        .replace('{GDPR}', gdpr)
+        .replace('{GDPR_CONSENT}', gdprConsentString)
+        .replace('{US_PRIVACY}', usPrivacy || '')
+        .replace('{GPP_STRING}', gppString)
+        .replace('{GPP_SID}', gppApplicableSections)
+    })
   }
   return syncs;
 }
@@ -276,6 +298,13 @@ function onTimeout(timeoutData) {
   });
 }
 
+function getExtensions(ortb2, refererInfo) {
+  const ext = {};
+  if (ortb2) ext.ortb2 = ortb2;
+  if (refererInfo) ext.refererInfo = refererInfo;
+  return ext;
+}
+
 function _generateRandomUUID() {
   try {
     // crypto.getRandomValues is supported everywhere but Opera Mini for years
@@ -344,56 +373,57 @@ function getUserIds(tdidAdapter, usp, gdpr, eids, gpp) {
     crbIDs: crb.syncIds || {}
   };
 
-  // Pull Trade Desk ID from adapter
-  if (tdidAdapter) {
-    userIds.tdID = tdidAdapter;
-  }
-
-  // Pull Trade Desk ID from our storage
+  // Pull Trade Desk ID
   if (!tdidAdapter && crb.tdID) {
     userIds.tdID = crb.tdID;
+  } else if (tdidAdapter) {
+    userIds.tdID = tdidAdapter;
   }
 
+  // USP
   if (usp) {
     userIds.usp = usp;
   }
 
-  try {
-    if (gdpr) {
-      userIds['gdpr'] = {
-        consent: gdpr.consentString || '',
-        applies: !!gdpr.gdprApplies,
-      }
-    }
-  } catch (e) {
+  // GDPR
+  if (gdpr) {
+    userIds.gdpr = {
+      consent: gdpr.consentString || '',
+      applies: !!gdpr.gdprApplies,
+    };
   }
 
+  // Kargo ID
   if (crb.lexId != null) {
     userIds.kargoID = crb.lexId;
   }
 
+  // Client ID
   if (crb.clientId != null) {
     userIds.clientID = crb.clientId;
   }
 
+  // Opt Out
   if (crb.optOut != null) {
     userIds.optOut = crb.optOut;
   }
 
+  // User ID Sub-Modules (userIdAsEids)
   if (eids != null) {
     userIds.sharedIDEids = eids;
   }
 
+  // GPP
   if (gpp) {
-    const parsedGPP = {}
-    if (gpp && gpp.consentString) {
-      parsedGPP.gppString = gpp.consentString
+    const parsedGPP = {};
+    if (gpp.consentString) {
+      parsedGPP.gppString = gpp.consentString;
     }
-    if (gpp && gpp.applicableSections) {
-      parsedGPP.applicableSections = gpp.applicableSections
+    if (gpp.applicableSections) {
+      parsedGPP.applicableSections = gpp.applicableSections;
     }
     if (!isEmpty(parsedGPP)) {
-      userIds.gpp = parsedGPP
+      userIds.gpp = parsedGPP;
     }
   }
 
@@ -422,21 +452,20 @@ function getRequestCount() {
 }
 
 function sendTimeoutData(auctionId, auctionTimeout) {
-  let params = {
-    aid: auctionId,
-    ato: auctionTimeout
-  };
-
-  try {
-    let timeoutRequestUrl = buildUrl({
-      protocol: 'https',
-      hostname: BIDDER.HOST,
-      pathname: BIDDER.TIMEOUT_ENDPOINT,
-      search: params
-    });
+  const params = { aid: auctionId, ato: auctionTimeout };
+  const timeoutRequestUrl = buildUrl({
+    protocol: 'https',
+    hostname: BIDDER.HOST,
+    pathname: BIDDER.TIMEOUT_ENDPOINT,
+    search: params,
+  });
 
-    triggerPixel(timeoutRequestUrl);
-  } catch (e) {}
+  fetch(timeoutRequestUrl, {
+    method: 'GET',
+    keepalive: true,
+  }).catch((e) => {
+    logError('Kargo: sendTimeoutData/fetch threw an error: ', e);
+  });
 }
 
 function getImpression(bid) {
@@ -447,10 +476,6 @@ function getImpression(bid) {
     code: bid.adUnitCode
   };
 
-  if (bid.floorData != null && bid.floorData.floorMin > 0) {
-    imp.floor = bid.floorData.floorMin;
-  }
-
   if (bid.bidRequestsCount > 0) {
     imp.bidRequestCount = bid.bidRequestsCount;
   }
@@ -463,51 +488,49 @@ function getImpression(bid) {
     imp.bidderWinCount = bid.bidderWinsCount;
   }
 
-  const gpid = getGPID(bid)
-  if (gpid != null && gpid != '') {
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  if (gpid) {
     imp.fpd = {
       gpid: gpid
     }
   }
 
-  if (bid.mediaTypes != null) {
-    if (bid.mediaTypes.banner != null) {
-      imp.banner = bid.mediaTypes.banner;
-    }
+  // Add full ortb2Imp object as backup
+  if (bid.ortb2Imp) {
+    imp.ext = { ortb2Imp: bid.ortb2Imp };
+  }
 
-    if (bid.mediaTypes.video != null) {
-      imp.video = bid.mediaTypes.video;
-    }
+  if (bid.mediaTypes) {
+    const { banner, video, native } = bid.mediaTypes;
 
-    if (bid.mediaTypes.native != null) {
-      imp.native = bid.mediaTypes.native;
+    if (banner) {
+      imp.banner = banner;
     }
-  }
 
-  return imp
-}
-
-function getGPID(bid) {
-  if (bid.ortb2Imp != null) {
-    if (bid.ortb2Imp.gpid != null && bid.ortb2Imp.gpid != '') {
-      return bid.ortb2Imp.gpid;
+    if (video) {
+      imp.video = video;
     }
 
-    if (bid.ortb2Imp.ext != null && bid.ortb2Imp.ext.data != null) {
-      if (bid.ortb2Imp.ext.data.pbAdSlot != null && bid.ortb2Imp.ext.data.pbAdSlot != '') {
-        return bid.ortb2Imp.ext.data.pbAdSlot;
-      }
+    if (native) {
+      imp.native = native;
+    }
 
-      if (bid.ortb2Imp.ext.data.adServer != null && bid.ortb2Imp.ext.data.adServer.adSlot != null && bid.ortb2Imp.ext.data.adServer.adSlot != '') {
-        return bid.ortb2Imp.ext.data.adServer.adSlot;
+    if (typeof bid.getFloor === 'function') {
+      let floorInfo;
+      try {
+        floorInfo = bid.getFloor({
+          currency: 'USD',
+          mediaType: '*',
+          size: '*'
+        });
+      } catch (e) {
+        logError('Kargo: getFloor threw an error: ', e);
       }
+      imp.floor = isPlainObject(floorInfo) && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? floorInfo.floor : undefined;
     }
   }
 
-  if (bid.adUnitCode != null && bid.adUnitCode != '') {
-    return bid.adUnitCode;
-  }
-  return '';
+  return imp
 }
 
 export const spec = {
diff --git a/modules/kimberliteBidAdapter.js b/modules/kimberliteBidAdapter.js
new file mode 100644
index 00000000000..fbb9974d52d
--- /dev/null
+++ b/modules/kimberliteBidAdapter.js
@@ -0,0 +1,102 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js'
+import { deepSetValue, replaceMacros } from '../src/utils.js';
+import {ORTB_MTYPES} from '../libraries/ortbConverter/processors/mediaType.js';
+
+const VERSION = '1.1.0';
+
+const BIDDER_CODE = 'kimberlite';
+const METHOD = 'POST';
+export const ENDPOINT_URL = 'https://kimberlite.io/rtb/bid/pbjs';
+
+const VERSION_INFO = {
+  ver: '$prebid.version$',
+  adapterVer: `${VERSION}`
+};
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 300
+  },
+
+  request(buildRequest, imps, bidderRequest, context) {
+    const bidRequest = buildRequest(imps, bidderRequest, context);
+    deepSetValue(bidRequest, 'site.publisher.domain', bidderRequest.refererInfo.domain);
+    deepSetValue(bidRequest, 'site.page', bidderRequest.refererInfo.page);
+    deepSetValue(bidRequest, 'ext.prebid.ver', VERSION_INFO.ver);
+    deepSetValue(bidRequest, 'ext.prebid.adapterVer', VERSION_INFO.adapterVer);
+    bidRequest.at = 1;
+    return bidRequest;
+  },
+
+  imp (buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    imp.tagid = bidRequest.params.placementId;
+    return imp;
+  },
+
+  bidResponse: function (buildBidResponse, bid, context) {
+    if (!bid.price) return;
+
+    const [type] = Object.keys(context.bidRequest.mediaTypes);
+    if (Object.values(ORTB_MTYPES).includes(type)) {
+      context.mediaType = type;
+    }
+
+    bid.adm = expandAuctionMacros(bid.adm, bid.price, context.ortbResponse.cur);
+
+    if (bid.nurl && bid.nurl != '') {
+      bid.nurl = expandAuctionMacros(bid.nurl, bid.price, context.ortbResponse.cur);
+    }
+
+    const bidResponse = buildBidResponse(bid, context);
+    return bidResponse;
+  },
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid: (bidRequest = {}) => {
+    const { params, mediaTypes } = bidRequest;
+    let isValid = Boolean(params && params.placementId);
+    if (mediaTypes && mediaTypes[BANNER]) {
+      isValid = isValid && Boolean(mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      isValid = isValid && Boolean(mediaTypes[VIDEO].mimes);
+    } else {
+      isValid = false;
+    }
+
+    return isValid;
+  },
+
+  buildRequests: function (bidRequests, bidderRequest) {
+    return {
+      method: METHOD,
+      url: ENDPOINT_URL,
+      data: converter.toORTB({
+        bidRequests,
+        bidderRequest
+      })
+    }
+  },
+
+  interpretResponse(serverResponse, bidRequest) {
+    const bids = converter.fromORTB({response: serverResponse.body, request: bidRequest.data}).bids;
+    return bids;
+  }
+};
+
+export function expandAuctionMacros(str, price, currency) {
+  if (!str) return;
+
+  const defaultCurrency = 'RUB';
+
+  return replaceMacros(str, {AUCTION_PRICE: price, AUCTION_CURRENCY: currency || defaultCurrency});
+};
+
+registerBidder(spec);
diff --git a/modules/kimberliteBidAdapter.md b/modules/kimberliteBidAdapter.md
new file mode 100644
index 00000000000..06749f2c8e0
--- /dev/null
+++ b/modules/kimberliteBidAdapter.md
@@ -0,0 +1,65 @@
+# Overview
+
+```markdown
+Module Name: Kimberlite Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: dev@solta.io
+```
+
+# Description
+
+Kimberlite exchange adapter.
+
+# Test Parameters
+
+## Banner AdUnit
+
+```javascript
+var adUnits = [
+  {
+    code: 'test-div',
+    mediaTypes: {
+      banner: {
+        sizes: [[320, 250], [640, 480]], // Required.
+      }
+    },
+    bids: [
+      {
+        bidder: "kimberlite",
+        params: {
+          placementId: 'testBanner'
+        }
+      }
+    ]
+  }
+]
+```
+
+## Video AdUnit
+
+```javascript
+var adUnits = [
+  {
+    code: 'test-div',
+    mediaTypes: {
+      video: {
+        // ORTB 2.5 options.
+        mimes: ['video/mp4'], // Required.
+        // Other options are optional.
+        placement: 1,
+        protocols: [3, 6],
+        linearity: 1,
+        startdelay: 0
+      }
+    },
+    bids: [
+      {
+        bidder: "kimberlite",
+        params: {
+          placementId: 'testVideo'
+        }
+      }
+    ]
+  }
+]
+```
diff --git a/modules/kinessoIdSystem.js b/modules/kinessoIdSystem.js
index c13ed3976d3..35b8dcc182d 100644
--- a/modules/kinessoIdSystem.js
+++ b/modules/kinessoIdSystem.js
@@ -10,6 +10,12 @@ import {ajax} from '../src/ajax.js';
 import {submodule} from '../src/hook.js';
 import {coppaDataHandler, uspDataHandler} from '../src/adapterManager.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ */
+
 const MODULE_NAME = 'kpuid';
 const ID_SVC = 'https://id.knsso.com/id';
 // These values should NEVER change. If
diff --git a/modules/kiviadsBidAdapter.js b/modules/kiviadsBidAdapter.js
index 13739d57cb2..161ddad470f 100644
--- a/modules/kiviadsBidAdapter.js
+++ b/modules/kiviadsBidAdapter.js
@@ -1,212 +1,19 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'kiviads';
 const AD_URL = 'https://lb.kiviads.com/pbjs';
 const SYNC_URL = 'https://sync.kiviads.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId, endpointId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  if (placementId) {
-    placement.placementId = placementId;
-    placement.type = 'publisher';
-  } else if (endpointId) {
-    placement.endpointId = endpointId;
-    placement.type = 'network';
-  }
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: bidderRequest.coppa === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      gpp: bidderRequest.gppConsent || undefined,
-      tmax: bidderRequest.bidderTimeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/koblerBidAdapter.js b/modules/koblerBidAdapter.js
index 596e5b2695f..a5c14e7bce1 100644
--- a/modules/koblerBidAdapter.js
+++ b/modules/koblerBidAdapter.js
@@ -1,5 +1,6 @@
 import {
   deepAccess,
+  generateUUID,
   getWindowSelf,
   isArray,
   isStr,
@@ -7,10 +8,24 @@ import {
   replaceAuctionPrice,
   triggerPixel
 } from '../src/utils.js';
-import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {getRefererInfo} from '../src/refererDetection.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+
+const additionalData = new WeakMap();
+
+export const pageViewId = generateUUID();
+
+export function setAdditionalData(obj, key, value) {
+  const prevValue = additionalData.get(obj) || {};
+  additionalData.set(obj, { ...prevValue, [key]: value });
+}
+
+export function getAdditionalData(obj, key) {
+  const data = additionalData.get(obj) || {};
+  return data[key];
+}
 
 const BIDDER_CODE = 'kobler';
 const BIDDER_ENDPOINT = 'https://bid.essrtb.com/bid/prebid_rtb_call';
@@ -36,17 +51,18 @@ export const buildRequests = function (validBidRequests, bidderRequest) {
     data: buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest),
     options: {
       contentType: 'application/json'
-    }
+    },
+    bidderRequest
   };
 };
 
-export const interpretResponse = function (serverResponse) {
+export const interpretResponse = function (serverResponse, request) {
   const res = serverResponse.body;
   const bids = []
   if (res) {
     res.seatbid.forEach(sb => {
       sb.bid.forEach(b => {
-        bids.push({
+        const bid = {
           requestId: b.impid,
           cpm: b.price,
           currency: res.cur,
@@ -61,20 +77,24 @@ export const interpretResponse = function (serverResponse) {
           meta: {
             advertiserDomains: b.adomain
           }
-        })
+        }
+        setAdditionalData(bid, 'adServerCurrency', getCurrencyFromBidderRequest(request.bidderRequest));
+        bids.push(bid);
       })
     });
   }
+
   return bids;
 };
 
 export const onBidWon = function (bid) {
+  const adServerCurrency = getAdditionalData(bid, 'adServerCurrency');
   // We intentionally use the price set by the publisher to replace the ${AUCTION_PRICE} macro
   // instead of the `originalCpm` here. This notification is not used for billing, only for extra logging.
   const publisherPrice = bid.cpm || 0;
-  const publisherCurrency = bid.currency || config.getConfig('currency.adServerCurrency') || SUPPORTED_CURRENCY;
+  const publisherCurrency = bid.currency || adServerCurrency || SUPPORTED_CURRENCY;
   const adServerPrice = deepAccess(bid, 'adserverTargeting.hb_pb', 0);
-  const adServerPriceCurrency = config.getConfig('currency.adServerCurrency') || SUPPORTED_CURRENCY;
+  const adServerPriceCurrency = adServerCurrency || SUPPORTED_CURRENCY;
   if (isStr(bid.nurl) && bid.nurl !== '') {
     const winNotificationUrl = replaceAuctionPrice(bid.nurl, publisherPrice)
       .replace(/\${AUCTION_PRICE_CURRENCY}/g, publisherCurrency)
@@ -90,8 +110,6 @@ export const onTimeout = function (timeoutDataArray) {
     timeoutDataArray.forEach(timeoutData => {
       const query = parseQueryStringParameters({
         ad_unit_code: timeoutData.adUnitCode,
-        // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-        auction_id: timeoutData.auctionId,
         bid_id: timeoutData.bidId,
         timeout: timeoutData.timeout,
         page_url: pageUrl,
@@ -103,13 +121,6 @@ export const onTimeout = function (timeoutDataArray) {
 };
 
 function getPageUrlFromRequest(validBidRequest, bidderRequest) {
-  // pageUrl is considered only when testing to ensure that non-test requests always contain the correct URL
-  if (isTest(validBidRequest) && config.getConfig('pageUrl')) {
-    // TODO: it's not clear what the intent is here - but all adapters should always respect pageUrl.
-    // With prebid 7, using `refererInfo.page` will do that automatically.
-    return config.getConfig('pageUrl');
-  }
-
   return (bidderRequest.refererInfo && bidderRequest.refererInfo.page)
     ? bidderRequest.refererInfo.page
     : window.location.href;
@@ -125,7 +136,26 @@ function getPageUrlFromRefererInfo() {
 function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
   const imps = validBidRequests.map(buildOpenRtbImpObject);
   const timeout = bidderRequest.timeout;
-  const pageUrl = getPageUrlFromRequest(validBidRequests[0], bidderRequest)
+  const pageUrl = getPageUrlFromRequest(validBidRequests[0], bidderRequest);
+  // Kobler, a contextual advertising provider, does not process any personal data itself, so it is not part of TCF/GVL.
+  // However, it supports using select third-party creatives in its platform, some of which require certain permissions
+  // in order to be shown. Kobler's bidder checks if necessary permissions are present to avoid bidding
+  // with ineligible creatives.
+  let purpose2Given;
+  let purpose3Given;
+  if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.vendorData) {
+    const vendorData = bidderRequest.gdprConsent.vendorData
+    const purposeData = vendorData.purpose;
+    const restrictions = vendorData.publisher ? vendorData.publisher.restrictions : null;
+    const restrictionForPurpose2 = restrictions ? (restrictions[2] ? Object.values(restrictions[2])[0] : null) : null;
+    purpose2Given = restrictionForPurpose2 === 1 ? (
+      purposeData && purposeData.consents && purposeData.consents[2]
+    ) : (
+      restrictionForPurpose2 === 0
+        ? false : (purposeData && purposeData.legitimateInterests && purposeData.legitimateInterests[2])
+    );
+    purpose3Given = purposeData && purposeData.consents && purposeData.consents[3];
+  }
   const request = {
     id: bidderRequest.bidderRequestId,
     at: 1,
@@ -138,7 +168,14 @@ function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
     site: {
       page: pageUrl,
     },
-    test: getTestAsNumber(validBidRequests[0])
+    test: getTestAsNumber(validBidRequests[0]),
+    ext: {
+      kobler: {
+        tcf_purpose_2_given: purpose2Given,
+        tcf_purpose_3_given: purpose3Given,
+        page_view_id: pageViewId
+      }
+    }
   };
 
   return JSON.stringify(request);
@@ -147,7 +184,7 @@ function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
 function buildOpenRtbImpObject(validBidRequest) {
   const sizes = getSizes(validBidRequest);
   const mainSize = sizes[0];
-  const floorInfo = getFloorInfo(validBidRequest, mainSize);
+  const floorInfo = getFloorInfo(validBidRequest, mainSize) || {};
 
   return {
     id: validBidRequest.bidId,
diff --git a/modules/konduitAnalyticsAdapter.js b/modules/konduitAnalyticsAdapter.js
index a1a586b25db..5316d5b22a4 100644
--- a/modules/konduitAnalyticsAdapter.js
+++ b/modules/konduitAnalyticsAdapter.js
@@ -4,7 +4,7 @@ import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { targeting } from '../src/targeting.js';
 import { config } from '../src/config.js';
-import CONSTANTS from '../src/constants.json';
+import {EVENTS} from '../src/constants.js';
 
 const TRACKER_HOST = 'tracker.konduit.me';
 const KONDUIT_PREBID_MODULE_VERSION = '1.0.0';
@@ -12,13 +12,13 @@ const KONDUIT_PREBID_MODULE_VERSION = '1.0.0';
 const analyticsType = 'endpoint';
 
 const eventDataComposerMap = {
-  [CONSTANTS.EVENTS.AUCTION_INIT]: obtainAuctionInfo,
-  [CONSTANTS.EVENTS.AUCTION_END]: obtainAuctionInfo,
-  [CONSTANTS.EVENTS.BID_REQUESTED]: obtainBidRequestsInfo,
-  [CONSTANTS.EVENTS.BID_TIMEOUT]: obtainBidTimeoutInfo,
-  [CONSTANTS.EVENTS.BID_RESPONSE]: obtainBidResponseInfo,
-  [CONSTANTS.EVENTS.BID_WON]: obtainWinnerBidInfo,
-  [CONSTANTS.EVENTS.NO_BID]: obtainNoBidInfo,
+  [EVENTS.AUCTION_INIT]: obtainAuctionInfo,
+  [EVENTS.AUCTION_END]: obtainAuctionInfo,
+  [EVENTS.BID_REQUESTED]: obtainBidRequestsInfo,
+  [EVENTS.BID_TIMEOUT]: obtainBidTimeoutInfo,
+  [EVENTS.BID_RESPONSE]: obtainBidResponseInfo,
+  [EVENTS.BID_WON]: obtainWinnerBidInfo,
+  [EVENTS.NO_BID]: obtainNoBidInfo,
 };
 
 // This function is copy from prebid core
@@ -43,7 +43,7 @@ function buildUrl(obj) {
 
 const getWinnerBidFromAggregatedEvents = () => {
   return konduitAnalyticsAdapter.context.aggregatedEvents
-    .filter(evt => evt.eventType === CONSTANTS.EVENTS.BID_WON)[0];
+    .filter(evt => evt.eventType === EVENTS.BID_WON)[0];
 };
 
 const isWinnerBidDetected = () => {
@@ -57,7 +57,7 @@ const konduitAnalyticsAdapter = Object.assign(
   adapter({ analyticsType }),
   {
     track ({ eventType, args }) {
-      if (CONSTANTS.EVENTS.AUCTION_INIT === eventType) {
+      if (EVENTS.AUCTION_INIT === eventType) {
         konduitAnalyticsAdapter.context.aggregatedEvents.splice(0);
       }
 
@@ -68,12 +68,12 @@ const konduitAnalyticsAdapter = Object.assign(
         });
       }
 
-      if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
+      if (eventType === EVENTS.AUCTION_END) {
         if (!isWinnerBidDetected() && isWinnerBidExist()) {
-          const bidWonData = eventDataComposerMap[CONSTANTS.EVENTS.BID_WON](targeting.getWinningBids()[0]);
+          const bidWonData = eventDataComposerMap[EVENTS.BID_WON](targeting.getWinningBids()[0]);
 
           konduitAnalyticsAdapter.context.aggregatedEvents.push({
-            eventType: CONSTANTS.EVENTS.BID_WON,
+            eventType: EVENTS.BID_WON,
             data: bidWonData,
           });
         }
diff --git a/modules/krushmediaBidAdapter.js b/modules/krushmediaBidAdapter.js
index 876f0ebabc6..255e3670254 100644
--- a/modules/krushmediaBidAdapter.js
+++ b/modules/krushmediaBidAdapter.js
@@ -1,163 +1,40 @@
-import { isFn, deepAccess, logMessage } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {
+  isBidRequestValid,
+  buildRequestsBase,
+  interpretResponse,
+  getUserSyncs,
+  buildPlacementProcessingFunction,
+} from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'krushmedia';
 const AD_URL = 'https://ads4.krushmedia.com/?c=rtb&m=hb';
-const SYNC_URL = 'https://cs.krushmedia.com/html?src=pbjs'
-
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency) {
-    return false;
-  }
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers);
-    default:
-      return false;
+const SYNC_URL = 'https://cs.krushmedia.com';
+
+const addCustomFieldsToPlacement = (bid, bidderRequest, placement) => {
+  placement.key = bid.params.key;
+  placement.traffic = placement.adFormat;
+  if (placement.adFormat === VIDEO) {
+    placement.wPlayer = placement.playerSize?.[0]?.[0];
+    placement.hPlayer = placement.playerSize?.[0]?.[1];
   }
-}
+};
 
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
+const placementProcessingFunction = buildPlacementProcessingFunction({ addCustomFieldsToPlacement });
 
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
+const buildRequests = (validBidRequests = [], bidderRequest = {}) => {
+  return buildRequestsBase({ adUrl: AD_URL, validBidRequests, bidderRequest, placementProcessingFunction });
+};
 
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(parseInt(bid.params.key)));
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let winTop = window;
-    let location;
-    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
-    try {
-      location = new URL(bidderRequest.refererInfo.page);
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
-
-    const placements = [];
-    const request = {
-      deviceWidth: winTop.screen.width,
-      deviceHeight: winTop.screen.height,
-      language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
-      secure: 1,
-      host: location.host,
-      page: location.pathname,
-      placements: placements
-    };
-
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent;
-      }
-    }
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      const placement = {
-        key: bid.params.key,
-        bidId: bid.bidId,
-        traffic: bid.params.traffic || BANNER,
-        schain: bid.schain || {},
-        bidFloor: getBidFloor(bid)
-      };
-
-      if (bid.mediaTypes && bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
-        placement.sizes = bid.mediaTypes[BANNER].sizes;
-      } else if (bid.mediaTypes && bid.mediaTypes[VIDEO] && bid.mediaTypes[VIDEO].playerSize) {
-        placement.wPlayer = bid.mediaTypes[VIDEO].playerSize[0];
-        placement.hPlayer = bid.mediaTypes[VIDEO].playerSize[1];
-        placement.minduration = bid.mediaTypes[VIDEO].minduration;
-        placement.maxduration = bid.mediaTypes[VIDEO].maxduration;
-        placement.mimes = bid.mediaTypes[VIDEO].mimes;
-        placement.protocols = bid.mediaTypes[VIDEO].protocols;
-        placement.startdelay = bid.mediaTypes[VIDEO].startdelay;
-        placement.placement = bid.mediaTypes[VIDEO].placement;
-        placement.skip = bid.mediaTypes[VIDEO].skip;
-        placement.skipafter = bid.mediaTypes[VIDEO].skipafter;
-        placement.minbitrate = bid.mediaTypes[VIDEO].minbitrate;
-        placement.maxbitrate = bid.mediaTypes[VIDEO].maxbitrate;
-        placement.delivery = bid.mediaTypes[VIDEO].delivery;
-        placement.playbackmethod = bid.mediaTypes[VIDEO].playbackmethod;
-        placement.api = bid.mediaTypes[VIDEO].api;
-        placement.linearity = bid.mediaTypes[VIDEO].linearity;
-      } else if (bid.mediaTypes && bid.mediaTypes[NATIVE]) {
-        placement.native = bid.mediaTypes[NATIVE];
-      }
-      placements.push(placement);
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncUrl = SYNC_URL
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-    return [{
-      type: 'iframe',
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(['key']),
+  buildRequests,
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/kubientBidAdapter.js b/modules/kubientBidAdapter.js
index 57cbe6acd07..8ccfa4ab059 100644
--- a/modules/kubientBidAdapter.js
+++ b/modules/kubientBidAdapter.js
@@ -1,4 +1,4 @@
-import { isArray, deepAccess } from '../src/utils.js';
+import { isArray, deepAccess, isPlainObject } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
@@ -33,7 +33,7 @@ export const spec = {
         const mediaType = (Object.keys(bid.mediaTypes).length == 1) ? Object.keys(bid.mediaTypes)[0] : '*';
         const sizes = bid.sizes || '*';
         const floorInfo = bid.getFloor({currency: 'USD', mediaType: mediaType, size: sizes});
-        if (typeof floorInfo === 'object' && floorInfo.currency === 'USD') {
+        if (isPlainObject(floorInfo) && floorInfo.currency === 'USD') {
           let floor = parseFloat(floorInfo.floor)
           if (!isNaN(floor) && floor > 0) {
             adSlot.floor = parseFloat(floorInfo.floor);
diff --git a/modules/kueezBidAdapter.js b/modules/kueezBidAdapter.js
index 5a5536e0c1a..f11d71f3318 100644
--- a/modules/kueezBidAdapter.js
+++ b/modules/kueezBidAdapter.js
@@ -155,7 +155,7 @@ function getFloorPrice(bid, mediaType) {
       currency: MAIN_CURRENCY,
       mediaType: mediaType,
       size: '*'
-    });
+    }) || {};
     floor = floorResult.currency === MAIN_CURRENCY && floorResult.floor ? floorResult.floor : 0;
   }
 
@@ -417,6 +417,7 @@ function populateVideoParams(params, bid) {
   const maxDuration = deepAccess(bid, `mediaTypes.video.maxduration`);
   const minDuration = deepAccess(bid, `mediaTypes.video.minduration`);
   const placement = deepAccess(bid, `mediaTypes.video.placement`);
+  const plcmt = deepAccess(bid, `mediaTypes.video.plcmt`);
   const playbackMethod = getPlaybackMethod(bid);
   const skip = deepAccess(bid, `mediaTypes.video.skip`);
 
@@ -435,7 +436,9 @@ function populateVideoParams(params, bid) {
   if (placement) {
     params.placement = placement;
   }
-
+  if (plcmt) {
+    params.plcmt = plcmt;
+  }
   if (playbackMethod) {
     params.playbackMethod = playbackMethod;
   }
diff --git a/modules/kueezRtbBidAdapter.js b/modules/kueezRtbBidAdapter.js
index 9a336b16136..c0fb17672af 100644
--- a/modules/kueezRtbBidAdapter.js
+++ b/modules/kueezRtbBidAdapter.js
@@ -1,338 +1,43 @@
-import {_each, deepAccess, parseSizesInput, parseUrl, uniques, isFn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {getStorageManager} from '../src/storageManager.js';
-import {config} from '../src/config.js';
+import {
+  createBuildRequestsFn,
+  createInterpretResponseFn,
+  createUserSyncGetter,
+  isBidRequestValid
+} from '../libraries/vidazooUtils/bidderUtils.js';
 
 const GVLID = 1165;
 const DEFAULT_SUB_DOMAIN = 'exchange';
 const BIDDER_CODE = 'kueezrtb';
 const BIDDER_VERSION = '1.0.0';
-const CURRENCY = 'USD';
-const TTL_SECONDS = 60 * 5;
-const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 15;
-const storage = getStorageManager({bidderCode: BIDDER_CODE});
-
-function getTopWindowQueryParams() {
-  try {
-    const parsedUrl = parseUrl(window.top.document.URL, {decodeSearchAsString: true});
-    return parsedUrl.search;
-  } catch (e) {
-    return '';
-  }
-}
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
   return `https://${subDomain}.kueezrtb.com`;
 }
 
-export function extractCID(params) {
-  return params.cId || params.CID || params.cID || params.CId || params.cid || params.ciD || params.Cid || params.CiD;
-}
-
-export function extractPID(params) {
-  return params.pId || params.PID || params.pID || params.PId || params.pid || params.piD || params.Pid || params.PiD;
-}
-
-export function extractSubDomain(params) {
-  return params.subDomain || params.SubDomain || params.Subdomain || params.subdomain || params.SUBDOMAIN || params.subDOMAIN;
-}
-
-function isBidRequestValid(bid) {
-  const params = bid.params || {};
-  return !!(extractCID(params) && extractPID(params));
-}
-
-function buildRequest(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout) {
+function createUniqueRequestData(hashUrl, bid) {
   const {
-    params,
-    bidId,
-    userId,
-    adUnitCode,
-    schain,
-    mediaTypes,
     auctionId,
     transactionId,
-    bidderRequestId,
-    bidRequestsCount,
-    bidderRequestsCount,
-    bidderWinsCount
   } = bid;
-  let {bidFloor, ext} = params;
-  const hashUrl = hashCode(topWindowUrl);
-  const uniqueDealId = getUniqueDealId(hashUrl);
-  const cId = extractCID(params);
-  const pId = extractPID(params);
-  const subDomain = extractSubDomain(params);
-
-  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid', deepAccess(bid, 'ortb2Imp.ext.data.pbadslot', ''));
-
-  if (isFn(bid.getFloor)) {
-    const floorInfo = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*'
-    });
-
-    if (floorInfo.currency === 'USD') {
-      bidFloor = floorInfo.floor;
-    }
-  }
 
-  let data = {
-    url: encodeURIComponent(topWindowUrl),
-    uqs: getTopWindowQueryParams(),
-    cb: Date.now(),
-    bidFloor: bidFloor,
-    bidId: bidId,
-    referrer: bidderRequest.refererInfo.ref,
-    adUnitCode: adUnitCode,
-    publisherId: pId,
-    sizes: sizes,
-    uniqueDealId: uniqueDealId,
-    bidderVersion: BIDDER_VERSION,
-    prebidVersion: '$prebid.version$',
-    res: `${screen.width}x${screen.height}`,
-    schain: schain,
-    mediaTypes: mediaTypes,
-    gpid: gpid,
-    // TODO: fix auctionId/transactionId leak: https://github.com/prebid/Prebid.js/issues/9781
-    auctionId: auctionId,
-    transactionId: transactionId,
-    bidderRequestId: bidderRequestId,
-    bidRequestsCount: bidRequestsCount,
-    bidderRequestsCount: bidderRequestsCount,
-    bidderWinsCount: bidderWinsCount,
-    bidderTimeout: bidderTimeout
-  };
-
-  appendUserIdsToRequestPayload(data, userId);
-
-  const sua = deepAccess(bidderRequest, 'ortb2.device.sua');
-
-  if (sua) {
-    data.sua = sua;
-  }
-
-  if (bidderRequest.gdprConsent) {
-    if (bidderRequest.gdprConsent.consentString) {
-      data.gdprConsent = bidderRequest.gdprConsent.consentString;
-    }
-    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
-      data.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
-    }
-  }
-  if (bidderRequest.uspConsent) {
-    data.usPrivacy = bidderRequest.uspConsent;
-  }
-
-  if (bidderRequest.gppConsent) {
-    data.gppString = bidderRequest.gppConsent.gppString;
-    data.gppSid = bidderRequest.gppConsent.applicableSections;
-  } else if (bidderRequest.ortb2?.regs?.gpp) {
-    data.gppString = bidderRequest.ortb2.regs.gpp;
-    data.gppSid = bidderRequest.ortb2.regs.gpp_sid;
-  }
-
-  const dto = {
-    method: 'POST',
-    url: `${createDomain(subDomain)}/prebid/multi/${cId}`,
-    data: data
+  return {
+    auctionId,
+    transactionId,
   };
-
-  _each(ext, (value, key) => {
-    dto.data['ext.' + key] = value;
-  });
-
-  return dto;
 }
 
-function appendUserIdsToRequestPayload(payloadRef, userIds) {
-  let key;
-  _each(userIds, (userId, idSystemProviderName) => {
-    key = `uid.${idSystemProviderName}`;
+const buildRequests = createBuildRequestsFn(createDomain, createUniqueRequestData, storage, BIDDER_CODE, BIDDER_VERSION, false);
 
-    switch (idSystemProviderName) {
-      case 'digitrustid':
-        payloadRef[key] = deepAccess(userId, 'data.id');
-        break;
-      case 'lipb':
-        payloadRef[key] = userId.lipbid;
-        break;
-      case 'parrableId':
-        payloadRef[key] = userId.eid;
-        break;
-      case 'id5id':
-        payloadRef[key] = userId.uid;
-        break;
-      default:
-        payloadRef[key] = userId;
-    }
-  });
-}
+const interpretResponse = createInterpretResponseFn(BIDDER_CODE, false);
 
-function buildRequests(validBidRequests, bidderRequest) {
-  const topWindowUrl = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
-  const bidderTimeout = config.getConfig('bidderTimeout');
-  const requests = [];
-  validBidRequests.forEach(validBidRequest => {
-    const sizes = parseSizesInput(validBidRequest.sizes);
-    const request = buildRequest(validBidRequest, topWindowUrl, sizes, bidderRequest, bidderTimeout);
-    requests.push(request);
-  });
-  return requests;
-}
-
-function interpretResponse(serverResponse, request) {
-  if (!serverResponse || !serverResponse.body) {
-    return [];
-  }
-  const {bidId} = request.data;
-  const {results} = serverResponse.body;
-
-  let output = [];
-
-  try {
-    results.forEach(result => {
-      const {
-        creativeId,
-        ad,
-        price,
-        exp,
-        width,
-        height,
-        currency,
-        metaData,
-        advertiserDomains,
-        mediaType = BANNER
-      } = result;
-      if (!ad || !price) {
-        return;
-      }
-
-      const response = {
-        requestId: bidId,
-        cpm: price,
-        width: width,
-        height: height,
-        creativeId: creativeId,
-        currency: currency || CURRENCY,
-        netRevenue: true,
-        ttl: exp || TTL_SECONDS,
-      };
-
-      if (metaData) {
-        Object.assign(response, {
-          meta: metaData
-        })
-      } else {
-        Object.assign(response, {
-          meta: {
-            advertiserDomains: advertiserDomains || []
-          }
-        })
-      }
-
-      if (mediaType === BANNER) {
-        Object.assign(response, {
-          ad: ad,
-        });
-      } else {
-        Object.assign(response, {
-          vastXml: ad,
-          mediaType: VIDEO
-        });
-      }
-      output.push(response);
-    });
-    return output;
-  } catch (e) {
-    return [];
-  }
-}
-
-function getUserSyncs(syncOptions, responses, gdprConsent = {}, uspConsent = '', gppConsent = {}) {
-  let syncs = [];
-  const {iframeEnabled, pixelEnabled} = syncOptions;
-  const {gdprApplies, consentString = ''} = gdprConsent;
-  const {gppString, applicableSections} = gppConsent;
-
-  const cidArr = responses.filter(resp => deepAccess(resp, 'body.cid')).map(resp => resp.body.cid).filter(uniques);
-  let params = `?cid=${encodeURIComponent(cidArr.join(','))}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`
-
-  if (gppString && applicableSections?.length) {
-    params += '&gpp=' + encodeURIComponent(gppString);
-    params += '&gpp_sid=' + encodeURIComponent(applicableSections.join(','));
-  }
-
-  if (iframeEnabled) {
-    syncs.push({
-      type: 'iframe',
-      url: `https://sync.kueezrtb.com/api/sync/iframe/${params}`
-    });
-  }
-  if (pixelEnabled) {
-    syncs.push({
-      type: 'image',
-      url: `https://sync.kueezrtb.com/api/sync/image/${params}`
-    });
-  }
-  return syncs;
-}
-
-export function hashCode(s, prefix = '_') {
-  const l = s.length;
-  let h = 0
-  let i = 0;
-  if (l > 0) {
-    while (i < l) {
-      h = (h << 5) - h + s.charCodeAt(i++) | 0;
-    }
-  }
-  return prefix + h;
-}
-
-export function getUniqueDealId(key, expiry = UNIQUE_DEAL_ID_EXPIRY) {
-  const storageKey = `u_${key}`;
-  const now = Date.now();
-  const data = getStorageItem(storageKey);
-  let uniqueId;
-
-  if (!data || !data.value || now - data.created > expiry) {
-    uniqueId = `${key}_${now.toString()}`;
-    setStorageItem(storageKey, uniqueId);
-  } else {
-    uniqueId = data.value;
-  }
-
-  return uniqueId;
-}
-
-export function getStorageItem(key) {
-  try {
-    return tryParseJSON(storage.getDataFromLocalStorage(key));
-  } catch (e) {
-  }
-
-  return null;
-}
-
-export function setStorageItem(key, value, timestamp) {
-  try {
-    const created = timestamp || Date.now();
-    const data = JSON.stringify({value, created});
-    storage.setDataInLocalStorage(key, data);
-  } catch (e) {
-  }
-}
-
-export function tryParseJSON(value) {
-  try {
-    return JSON.parse(value);
-  } catch (e) {
-    return value;
-  }
-}
+const getUserSyncs = createUserSyncGetter({
+  iframeSyncUrl: 'https://sync.kueezrtb.com/api/sync/iframe',
+  imageSyncUrl: 'https://sync.kueezrtb.com/api/sync/image'
+});
 
 export const spec = {
   code: BIDDER_CODE,
diff --git a/modules/lassoBidAdapter.js b/modules/lassoBidAdapter.js
index e1f9636e4f1..dc36cb4af23 100644
--- a/modules/lassoBidAdapter.js
+++ b/modules/lassoBidAdapter.js
@@ -37,7 +37,6 @@ export const spec = {
         url: encodeURIComponent(window.location.href),
         bidderRequestId: bidRequest.bidderRequestId,
         adUnitCode: bidRequest.adUnitCode,
-        // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
         auctionId: bidRequest.auctionId,
         bidId: bidRequest.bidId,
         transactionId: bidRequest.ortb2Imp?.ext?.tid,
@@ -45,14 +44,25 @@ export const spec = {
         sizes,
         aimXR,
         uid: '$UID',
+        npi: bidRequest.params.npi || '',
+        npi_hash: bidRequest.params.npiHash || '',
         params: JSON.stringify(bidRequest.params),
         crumbs: JSON.stringify(bidRequest.crumbs),
         prebidVersion: '$prebid.version$',
-        version: 3,
+        version: 4,
         coppa: config.getConfig('coppa') == true ? 1 : 0,
         ccpa: bidderRequest.uspConsent || undefined
       }
 
+      if (
+        bidderRequest &&
+        bidderRequest.gppConsent &&
+        bidderRequest.gppConsent.gppString
+      ) {
+        payload.gpp = bidderRequest.gppConsent.gppString;
+        payload.gppSid = bidderRequest.gppConsent.applicableSections;
+      }
+
       return {
         method: 'GET',
         url: getBidRequestUrl(aimXR, bidRequest.params),
@@ -74,6 +84,7 @@ export const spec = {
 
     const bidResponse = {
       requestId: response.bidid,
+      bidId: response.bidid,
       cpm: response.bid.price,
       currency: response.cur,
       width: response.bid.w,
@@ -119,10 +130,10 @@ function getBidRequestUrl(aimXR, params) {
   if (params && params.dtc) {
     path = '/dtc-request';
   }
-  if (!aimXR) {
-    return GET_IUD_URL + ENDPOINT_URL + path;
+  if (aimXR || params.npi || params.npiHash) {
+    return ENDPOINT_URL + path;
   }
-  return ENDPOINT_URL + path;
+  return GET_IUD_URL + ENDPOINT_URL + path;
 }
 
 function getDeviceData() {
diff --git a/modules/lemmaDigitalBidAdapter.js b/modules/lemmaDigitalBidAdapter.js
index 9fa3081a47e..f2d677f14db 100644
--- a/modules/lemmaDigitalBidAdapter.js
+++ b/modules/lemmaDigitalBidAdapter.js
@@ -3,6 +3,15 @@ import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 var BIDDER_CODE = 'lemmadigital';
 var LOG_WARN_PREFIX = 'LEMMADIGITAL: ';
 var ENDPOINT = 'https://bid.lemmadigital.com/lemma/servad';
@@ -26,7 +35,7 @@ export var spec = {
    *
    * @param {BidRequest} bid The bid params to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
-   **/
+   */
   isBidRequestValid: (bid) => {
     if (!bid || !bid.params) {
       utils.logError(LOG_WARN_PREFIX, 'nil/empty bid object');
@@ -51,11 +60,11 @@ export var spec = {
   },
 
   /**
-  * Make a server request from the list of BidRequests.
-  *
-  * @param {validBidRequests[]} - an array of bids
-  * @return ServerRequest Info describing the request to the server.
-  **/
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: (validBidRequests, bidderRequest) => {
     if (validBidRequests.length === 0) {
       return;
@@ -79,11 +88,11 @@ export var spec = {
   },
 
   /**
-  * Unpack the response from the server into a list of bids.
-  *
-  * @param {ServerResponse} response A successful response from the server.
-  * @return {Bid[]} An array of bids which were nested inside the server.
-  **/
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} response A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: (response, request) => {
     return spec._parseRTBResponse(request, response.body);
   },
@@ -93,7 +102,7 @@ export var spec = {
    * @param {SyncOptions} syncOptions Which user syncs are allowed?
    * @param {ServerResponse[]} serverResponses List of server's responses.
    * @return {UserSync[]} The user syncs which should be dropped.
-   **/
+   */
   getUserSyncs: (syncOptions, serverResponses) => {
     let syncurl = USER_SYNC + 'pid=' + pubId;
     if (syncOptions.iframeEnabled) {
@@ -115,7 +124,7 @@ export var spec = {
 
   /**
    * parse object
-   **/
+   */
   _parseJSON: function (rawPayload) {
     try {
       if (rawPayload) {
@@ -155,7 +164,7 @@ export var spec = {
 
   /**
    * create IAB standard OpenRTB bid request
-   **/
+   */
   _createoRTBRequest: (bidRequests, conf) => {
     var oRTBObject = {};
     try {
@@ -202,7 +211,7 @@ export var spec = {
 
   /**
    * create impression array objects
-   **/
+   */
   _getImpressionArray: (request) => {
     var impArray = [];
     var map = request.map(bid => spec._getImpressionObject(bid));
@@ -218,7 +227,7 @@ export var spec = {
 
   /**
    * create impression (single) object
-   **/
+   */
   _getImpressionObject: (bid) => {
     var impression = {};
     var bObj;
@@ -277,8 +286,8 @@ export var spec = {
   },
 
   /**
-  * set bid floor
-  **/
+   * set bid floor
+   */
   _setFloor: (impObj, bid) => {
     let bidFloor = -1;
     // get lowest floor from floorModule
@@ -286,7 +295,7 @@ export var spec = {
       [BANNER, VIDEO].forEach(mediaType => {
         if (impObj.hasOwnProperty(mediaType)) {
           let floorInfo = bid.getFloor({ currency: impObj.bidfloorcur, mediaType: mediaType, size: '*' });
-          if (typeof floorInfo === 'object' && floorInfo.currency === impObj.bidfloorcur && !isNaN(parseInt(floorInfo.floor))) {
+          if (utils.isPlainObject(floorInfo) && floorInfo.currency === impObj.bidfloorcur && !isNaN(parseInt(floorInfo.floor))) {
             let mediaTypeFloor = parseFloat(floorInfo.floor);
             bidFloor = (bidFloor == -1 ? mediaTypeFloor : Math.min(mediaTypeFloor, bidFloor));
           }
@@ -304,8 +313,8 @@ export var spec = {
   },
 
   /**
-  * parse Open RTB response
-  **/
+   * parse Open RTB response
+   */
   _parseRTBResponse: (request, response) => {
     var bidResponses = [];
     try {
@@ -358,8 +367,8 @@ export var spec = {
   },
 
   /**
-  * get bid request api end point url
-  **/
+   * get bid request api end point url
+   */
   _endPointURL: (request) => {
     var params = request && request[0].params ? request[0].params : null;
     if (params) {
@@ -371,8 +380,8 @@ export var spec = {
   },
 
   /**
-  * get domain name from url
-  **/
+   * get domain name from url
+   */
   _getDomain: (url) => {
     var a = document.createElement('a');
     a.setAttribute('href', url);
@@ -380,8 +389,8 @@ export var spec = {
   },
 
   /**
-  * create the site object
-  **/
+   * create the site object
+   */
   _getSiteObject: (request, conf) => {
     var params = request && request.params ? request.params : null;
     if (params) {
@@ -406,8 +415,8 @@ export var spec = {
   },
 
   /**
-  * create the app object
-  **/
+   * create the app object
+   */
   _getAppObject: (request) => {
     var params = request && request.params ? request.params : null;
     if (params) {
@@ -432,8 +441,8 @@ export var spec = {
   },
 
   /**
-  * create the device object
-  **/
+   * create the device object
+   */
   _getDeviceObject: (request) => {
     var params = request && request.params ? request.params : null;
     if (params) {
@@ -481,8 +490,8 @@ export var spec = {
   },
 
   /**
-  * get request ad sizes
-  **/
+   * get request ad sizes
+   */
   _getSizes: (request) => {
     if (request && request.sizes && utils.isArray(request.sizes[0]) && request.sizes[0].length > 0) {
       return request.sizes[0];
@@ -491,8 +500,8 @@ export var spec = {
   },
 
   /**
-  * create the banner object
-  **/
+   * create the banner object
+   */
   _getBannerRequest: (bid) => {
     var bObj;
     var adFormat = [];
@@ -531,8 +540,8 @@ export var spec = {
   },
 
   /**
-  * create the video object
-  **/
+   * create the video object
+   */
   _getVideoRequest: (bid) => {
     var vObj;
     if (utils.deepAccess(bid, 'mediaTypes.video')) {
@@ -554,8 +563,8 @@ export var spec = {
   },
 
   /**
-  * check media type
-  **/
+   * check media type
+   */
   _checkMediaType: (adm, newBid) => {
     // Create a regex here to check the strings
     var videoRegex = new RegExp(/VAST.*version/);
diff --git a/modules/lifestreetBidAdapter.js b/modules/lifestreetBidAdapter.js
index 6a8b783ce21..5b5eb639fcf 100644
--- a/modules/lifestreetBidAdapter.js
+++ b/modules/lifestreetBidAdapter.js
@@ -2,6 +2,10 @@ import { isInteger } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ */
+
 const BIDDER_CODE = 'lifestreet';
 const ADAPTER_VERSION = '$prebid.version$';
 
diff --git a/modules/limelightDigitalBidAdapter.js b/modules/limelightDigitalBidAdapter.js
index 0eb9e900160..f69ae8f76eb 100644
--- a/modules/limelightDigitalBidAdapter.js
+++ b/modules/limelightDigitalBidAdapter.js
@@ -3,6 +3,12 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { ajax } from '../src/ajax.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
 const BIDDER_CODE = 'limelightDigital';
 
 /**
@@ -26,7 +32,7 @@ function isBidResponseValid(bid) {
 
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['pll', 'iionads', 'apester'],
+  aliases: ['pll', 'iionads', 'apester', 'adsyield', 'tgm'],
   supportedMediaTypes: [BANNER, VIDEO],
 
   /**
@@ -56,7 +62,7 @@ export const spec = {
     }
     const placements = groupBy(validBidRequests.map(bidRequest => buildPlacement(bidRequest)), 'host')
     return Object.keys(placements)
-      .map(host => buildRequest(winTop, host, placements[host].map(placement => placement.adUnit)));
+      .map(host => buildRequest(winTop, host, placements[host].map(placement => placement.adUnit), bidderRequest));
   },
 
   /**
@@ -113,7 +119,7 @@ export const spec = {
 
 registerBidder(spec);
 
-function buildRequest(winTop, host, adUnits) {
+function buildRequest(winTop, host, adUnits, bidderRequest) {
   return {
     method: 'POST',
     url: `https://${host}/hb`,
@@ -121,7 +127,11 @@ function buildRequest(winTop, host, adUnits) {
       secure: (location.protocol === 'https:'),
       deviceWidth: winTop.screen.width,
       deviceHeight: winTop.screen.height,
-      adUnits: adUnits
+      adUnits: adUnits,
+      ortb2: bidderRequest?.ortb2,
+      refererInfo: bidderRequest?.refererInfo,
+      sua: bidderRequest?.ortb2?.device?.sua,
+      page: bidderRequest?.ortb2?.site?.page || bidderRequest?.refererInfo?.page
     }
   }
 }
@@ -156,6 +166,7 @@ function buildPlacement(bidRequest) {
         }
       }),
       type: bidRequest.params.adUnitType.toUpperCase(),
+      ortb2Imp: bidRequest.ortb2Imp,
       publisherId: bidRequest.params.publisherId,
       userIdAsEids: bidRequest.userIdAsEids,
       supplyChain: bidRequest.schain,
diff --git a/modules/liveIntentAnalyticsAdapter.js b/modules/liveIntentAnalyticsAdapter.js
index ffe4f8f58b0..04b9e333e8a 100644
--- a/modules/liveIntentAnalyticsAdapter.js
+++ b/modules/liveIntentAnalyticsAdapter.js
@@ -1,7 +1,7 @@
 import {ajax} from '../src/ajax.js';
 import { generateUUID, logInfo, logWarn } from '../src/utils.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import { auctionManager } from '../src/auctionManager.js';
 import { getRefererInfo } from '../src/refererDetection.js';
@@ -10,11 +10,8 @@ const ANALYTICS_TYPE = 'endpoint';
 const URL = 'https://wba.liadm.com/analytic-events';
 const GVL_ID = 148;
 const ADAPTER_CODE = 'liveintent';
-const DEFAULT_SAMPLING = 0.1;
 const DEFAULT_BID_WON_TIMEOUT = 2000;
-const { EVENTS: { AUCTION_END } } = CONSTANTS;
-let initOptions = {};
-let isSampled;
+const { AUCTION_END } = EVENTS;
 let bidWonTimeout;
 
 function handleAuctionEnd(args) {
@@ -123,19 +120,15 @@ function ignoreUndefined(data) {
 
 let liAnalytics = Object.assign(adapter({URL, ANALYTICS_TYPE}), {
   track({ eventType, args }) {
-    if (eventType == AUCTION_END && args && isSampled) { handleAuctionEnd(args); }
+    if (eventType == AUCTION_END && args) { handleAuctionEnd(args); }
   }
 });
 
 // save the base class function
 liAnalytics.originEnableAnalytics = liAnalytics.enableAnalytics;
-
 // override enableAnalytics so we can get access to the config passed in from the page
 liAnalytics.enableAnalytics = function (config) {
-  initOptions = config.options;
-  const sampling = (initOptions && initOptions.sampling) ?? DEFAULT_SAMPLING;
-  isSampled = Math.random() < parseFloat(sampling);
-  bidWonTimeout = (initOptions && initOptions.bidWonTimeout) ?? DEFAULT_BID_WON_TIMEOUT;
+  bidWonTimeout = config?.options?.bidWonTimeout ?? DEFAULT_BID_WON_TIMEOUT;
   liAnalytics.originEnableAnalytics(config); // call the base class function
 };
 
diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js
index 8fab266ecce..2ccbb911478 100644
--- a/modules/liveIntentIdSystem.js
+++ b/modules/liveIntentIdSystem.js
@@ -1,317 +1,14 @@
-/**
- * This module adds LiveIntentId to the User ID module
- * The {@link module:modules/userId} module is required
- * @module modules/liveIntentIdSystem
- * @requires module:modules/userId
- */
-import { triggerPixel, logError } from '../src/utils.js';
-import { ajaxBuilder } from '../src/ajax.js';
-import { submodule } from '../src/hook.js';
-import { LiveConnect } from 'live-connect-js'; // eslint-disable-line prebid/validate-imports
-import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {MODULE_TYPE_UID} from '../src/activities/modules.js';
-
-const DEFAULT_AJAX_TIMEOUT = 5000
-const EVENTS_TOPIC = 'pre_lips'
-const MODULE_NAME = 'liveIntentId';
-const LI_PROVIDER_DOMAIN = 'liveintent.com';
-export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
-const defaultRequestedAttributes = {'nonId': true}
-const calls = {
-  ajaxGet: (url, onSuccess, onError, timeout) => {
-    ajaxBuilder(timeout)(
-      url,
-      {
-        success: onSuccess,
-        error: onError
-      },
-      undefined,
-      {
-        method: 'GET',
-        withCredentials: true
-      }
-    )
-  },
-  pixelGet: (url, onload) => triggerPixel(url, onload)
-}
-
-let eventFired = false;
-let liveConnect = null;
-
-/**
- * This function is used in tests
- */
-export function reset() {
-  if (window && window.liQ_instances) {
-    window.liQ_instances.forEach(i => i.eventBus.off(EVENTS_TOPIC, setEventFiredFlag))
-    window.liQ_instances = [];
-  }
-  liveIntentIdSubmodule.setModuleMode(null)
-  eventFired = false;
-  liveConnect = null;
-}
-
-/**
- * This function is also used in tests
- */
-export function setEventFiredFlag() {
-  eventFired = true;
-}
-
-function parseLiveIntentCollectorConfig(collectConfig) {
-  const config = {};
-  collectConfig = collectConfig || {}
-  collectConfig.appId && (config.appId = collectConfig.appId);
-  collectConfig.fpiStorageStrategy && (config.storageStrategy = collectConfig.fpiStorageStrategy);
-  collectConfig.fpiExpirationDays && (config.expirationDays = collectConfig.fpiExpirationDays);
-  collectConfig.collectorUrl && (config.collectorUrl = collectConfig.collectorUrl);
-  config.ajaxTimeout = collectConfig.ajaxTimeout || DEFAULT_AJAX_TIMEOUT;
-  return config;
-}
-
-/**
- * Create requestedAttributes array to pass to liveconnect
- * @function
- * @param {Object} overrides - object with boolean values that will override defaults { 'foo': true, 'bar': false }
- * @returns {Array}
- */
-function parseRequestedAttributes(overrides) {
-  function createParameterArray(config) {
-    return Object.entries(config).flatMap(([k, v]) => (typeof v === 'boolean' && v) ? [k] : []);
-  }
-  if (typeof overrides === 'object') {
-    return createParameterArray({...defaultRequestedAttributes, ...overrides})
+function loadModule() {
+  // Load appropriate module based on the build flag. Constant folding ensures
+  // that the other one will not be included in the bundle.
+  // eslint-disable-next-line no-constant-condition
+  if ('$$LIVE_INTENT_MODULE_MODE$$' === 'external') {
+    // eslint-disable-next-line no-restricted-globals
+    return require('../libraries/liveIntentId/externalIdSystem.js')
   } else {
-    return createParameterArray(defaultRequestedAttributes);
+    // eslint-disable-next-line no-restricted-globals
+    return require('../libraries/liveIntentId/idSystem.js')
   }
 }
 
-function initializeLiveConnect(configParams) {
-  configParams = configParams || {};
-  if (liveConnect) {
-    return liveConnect;
-  }
-
-  const publisherId = configParams.publisherId || 'any';
-  const identityResolutionConfig = {
-    publisherId: publisherId,
-    requestedAttributes: parseRequestedAttributes(configParams.requestedAttributesOverrides)
-  };
-  if (configParams.url) {
-    identityResolutionConfig.url = configParams.url
-  }
-
-  identityResolutionConfig.ajaxTimeout = configParams.ajaxTimeout || DEFAULT_AJAX_TIMEOUT;
-
-  const liveConnectConfig = parseLiveIntentCollectorConfig(configParams.liCollectConfig);
-
-  if (!liveConnectConfig.appId && configParams.distributorId) {
-    liveConnectConfig.distributorId = configParams.distributorId;
-    identityResolutionConfig.source = configParams.distributorId;
-  } else {
-    identityResolutionConfig.source = configParams.partner || 'prebid'
-  }
-
-  liveConnectConfig.wrapperName = 'prebid';
-  liveConnectConfig.identityResolutionConfig = identityResolutionConfig;
-  liveConnectConfig.identifiersToResolve = configParams.identifiersToResolve || [];
-  liveConnectConfig.fireEventDelay = configParams.fireEventDelay;
-  const usPrivacyString = uspDataHandler.getConsentData();
-  if (usPrivacyString) {
-    liveConnectConfig.usPrivacyString = usPrivacyString;
-  }
-  const gdprConsent = gdprDataHandler.getConsentData()
-  if (gdprConsent) {
-    liveConnectConfig.gdprApplies = gdprConsent.gdprApplies;
-    liveConnectConfig.gdprConsent = gdprConsent.consentString;
-  }
-
-  // The second param is the storage object, LS & Cookie manipulation uses PBJS
-  // The third param is the ajax and pixel object, the ajax and pixel use PBJS
-  liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls);
-  if (configParams.emailHash) {
-    liveConnect.push({ hash: configParams.emailHash })
-  }
-  return liveConnect;
-}
-
-function tryFireEvent() {
-  if (!eventFired && liveConnect) {
-    const eventDelay = liveConnect.config.fireEventDelay || 500
-    setTimeout(() => {
-      const instances = window.liQ_instances
-      instances.forEach(i => i.eventBus.once(EVENTS_TOPIC, setEventFiredFlag))
-      if (!eventFired && liveConnect) {
-        liveConnect.fire();
-      }
-    }, eventDelay)
-  }
-}
-
-/** @type {Submodule} */
-export const liveIntentIdSubmodule = {
-  moduleMode: process.env.LiveConnectMode,
-  /**
-   * used to link submodule with config
-   * @type {string}
-   */
-  name: MODULE_NAME,
-
-  setModuleMode(mode) {
-    this.moduleMode = mode
-  },
-  getInitializer() {
-    return (liveConnectConfig, storage, calls) => LiveConnect(liveConnectConfig, storage, calls, this.moduleMode)
-  },
-
-  /**
-   * decode the stored id value for passing to bid requests. Note that lipb object is a wrapper for everything, and
-   * internally it could contain more data other than `lipbid`(e.g. `segments`) depending on the `partner` and
-   * `publisherId` params.
-   * @function
-   * @param {{unifiedId:string}} value
-   * @param {SubmoduleConfig|undefined} config
-   * @returns {{lipb:Object}}
-   */
-  decode(value, config) {
-    const configParams = (config && config.params) || {};
-    function composeIdObject(value) {
-      const result = {};
-
-      // old versions stored lipbid in unifiedId. Ensure that we can still read the data.
-      const lipbid = value.nonId || value.unifiedId
-      if (lipbid) {
-        value.lipbid = lipbid
-        delete value.unifiedId
-        result.lipb = value
-      }
-
-      // Lift usage of uid2 by exposing uid2 if we were asked to resolve it.
-      // As adapters are applied in lexicographical order, we will always
-      // be overwritten by the 'proper' uid2 module if it is present.
-      if (value.uid2) {
-        result.uid2 = { 'id': value.uid2, ext: { provider: LI_PROVIDER_DOMAIN } }
-      }
-
-      if (value.bidswitch) {
-        result.bidswitch = { 'id': value.bidswitch, ext: { provider: LI_PROVIDER_DOMAIN } }
-      }
-
-      if (value.medianet) {
-        result.medianet = { 'id': value.medianet, ext: { provider: LI_PROVIDER_DOMAIN } }
-      }
-
-      if (value.magnite) {
-        result.magnite = { 'id': value.magnite, ext: { provider: LI_PROVIDER_DOMAIN } }
-      }
-
-      if (value.index) {
-        result.index = { 'id': value.index, ext: { provider: LI_PROVIDER_DOMAIN } }
-      }
-
-      return result
-    }
-
-    if (!liveConnect) {
-      initializeLiveConnect(configParams);
-    }
-    tryFireEvent();
-
-    return composeIdObject(value);
-  },
-
-  /**
-   * performs action to obtain id and return a value in the callback's response argument
-   * @function
-   * @param {SubmoduleConfig} [config]
-   * @returns {IdResponse|undefined}
-   */
-  getId(config) {
-    const configParams = (config && config.params) || {};
-    const liveConnect = initializeLiveConnect(configParams);
-    if (!liveConnect) {
-      return;
-    }
-    tryFireEvent();
-    const result = function(callback) {
-      liveConnect.resolve(
-        response => {
-          callback(response);
-        },
-        error => {
-          logError(`${MODULE_NAME}: ID fetch encountered an error: `, error);
-          callback();
-        }
-      )
-    }
-
-    return { callback: result };
-  },
-  eids: {
-    'lipb': {
-      getValue: function(data) {
-        return data.lipbid;
-      },
-      source: 'liveintent.com',
-      atype: 3,
-      getEidExt: function(data) {
-        if (Array.isArray(data.segments) && data.segments.length) {
-          return {
-            segments: data.segments
-          };
-        }
-      }
-    },
-    'bidswitch': {
-      source: 'bidswitch.net',
-      atype: 3,
-      getValue: function(data) {
-        return data.id;
-      },
-      getUidExt: function(data) {
-        if (data.ext) {
-          return data.ext;
-        }
-      }
-    },
-    'medianet': {
-      source: 'media.net',
-      atype: 3,
-      getValue: function(data) {
-        return data.id;
-      },
-      getUidExt: function(data) {
-        if (data.ext) {
-          return data.ext;
-        }
-      }
-    },
-    'magnite': {
-      source: 'rubiconproject.com',
-      atype: 3,
-      getValue: function(data) {
-        return data.id;
-      },
-      getUidExt: function(data) {
-        if (data.ext) {
-          return data.ext;
-        }
-      }
-    },
-    'index': {
-      source: 'liveintent.indexexchange.com',
-      atype: 3,
-      getValue: function(data) {
-        return data.id;
-      },
-      getUidExt: function(data) {
-        if (data.ext) {
-          return data.ext;
-        }
-      }
-    }
-  }
-};
-
-submodule('userId', liveIntentIdSubmodule);
+export const liveIntentIdSubmodule = loadModule()
diff --git a/modules/livewrappedAnalyticsAdapter.js b/modules/livewrappedAnalyticsAdapter.js
index f3ee81cae7a..ec8fea42bac 100644
--- a/modules/livewrappedAnalyticsAdapter.js
+++ b/modules/livewrappedAnalyticsAdapter.js
@@ -1,7 +1,7 @@
-import { timestamp, logInfo, getWindowTop } from '../src/utils.js';
+import { timestamp, logInfo } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS, STATUS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import { getGlobal } from '../src/prebidGlobal.js';
 
@@ -28,11 +28,11 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
     logInfo('LIVEWRAPPED_EVENT:', [eventType, args]);
 
     switch (eventType) {
-      case CONSTANTS.EVENTS.AUCTION_INIT:
+      case EVENTS.AUCTION_INIT:
         logInfo('LIVEWRAPPED_AUCTION_INIT:', args);
         cache.auctions[args.auctionId] = {bids: {}, bidAdUnits: {}};
         break;
-      case CONSTANTS.EVENTS.BID_REQUESTED:
+      case EVENTS.BID_REQUESTED:
         logInfo('LIVEWRAPPED_BID_REQUESTED:', args);
         cache.auctions[args.auctionId].timeStamp = args.start;
 
@@ -73,18 +73,19 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
         });
         logInfo(livewrappedAnalyticsAdapter.requestEvents);
         break;
-      case CONSTANTS.EVENTS.BID_RESPONSE:
+      case EVENTS.BID_RESPONSE:
         logInfo('LIVEWRAPPED_BID_RESPONSE:', args);
 
         let bidResponse = cache.auctions[args.auctionId].bids[args.requestId];
-        bidResponse.isBid = args.getStatusCode() === CONSTANTS.STATUS.GOOD;
+        if (bidResponse.cpm > args.cpm) break; // For now we only store the highest bid
+        bidResponse.isBid = args.getStatusCode() === STATUS.GOOD;
         bidResponse.width = args.width;
         bidResponse.height = args.height;
         bidResponse.cpm = args.cpm;
         bidResponse.originalCpm = prebidGlobal.convertCurrency(args.originalCpm, args.originalCurrency, args.currency);
         bidResponse.ttr = args.timeToRespond;
         bidResponse.readyToSend = 1;
-        bidResponse.mediaType = args.mediaType == 'native' ? 2 : (args.mediaType == 'video' ? 4 : 1);
+        bidResponse.mediaType = getMediaTypeEnum(args.mediaType);
         bidResponse.floorData = args.floorData;
         bidResponse.meta = args.meta;
 
@@ -101,7 +102,7 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
             };
         }
         break;
-      case CONSTANTS.EVENTS.BIDDER_DONE:
+      case EVENTS.BIDDER_DONE:
         logInfo('LIVEWRAPPED_BIDDER_DONE:', args);
         args.bids.forEach(doneBid => {
           let bid = cache.auctions[doneBid.auctionId].bids[doneBid.bidId || doneBid.requestId];
@@ -111,10 +112,15 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
           bid.readyToSend = 1;
         });
         break;
-      case CONSTANTS.EVENTS.BID_WON:
+      case EVENTS.BID_WON:
         logInfo('LIVEWRAPPED_BID_WON:', args);
         let wonBid = cache.auctions[args.auctionId].bids[args.requestId];
         wonBid.won = true;
+        wonBid.width = args.width;
+        wonBid.height = args.height;
+        wonBid.cpm = args.cpm;
+        wonBid.originalCpm = prebidGlobal.convertCurrency(args.originalCpm, args.originalCurrency, args.currency);
+        wonBid.mediaType = getMediaTypeEnum(args.mediaType);
         wonBid.floorData = args.floorData;
         wonBid.rUp = args.rUp;
         wonBid.meta = args.meta;
@@ -123,7 +129,7 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
           livewrappedAnalyticsAdapter.sendEvents();
         }
         break;
-      case CONSTANTS.EVENTS.AD_RENDER_FAILED:
+      case EVENTS.AD_RENDER_FAILED:
         logInfo('LIVEWRAPPED_AD_RENDER_FAILED:', args);
         let adRenderFailedBid = cache.auctions[args.bid.auctionId].bids[args.bid.requestId];
         adRenderFailedBid.adRenderFailed = true;
@@ -133,13 +139,13 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
           livewrappedAnalyticsAdapter.sendEvents();
         }
         break;
-      case CONSTANTS.EVENTS.BID_TIMEOUT:
+      case EVENTS.BID_TIMEOUT:
         logInfo('LIVEWRAPPED_BID_TIMEOUT:', args);
         args.forEach(timeout => {
           cache.auctions[timeout.auctionId].bids[timeout.bidId].timeout = true;
         });
         break;
-      case CONSTANTS.EVENTS.AUCTION_END:
+      case EVENTS.AUCTION_END:
         logInfo('LIVEWRAPPED_AUCTION_END:', args);
         setTimeout(() => {
           livewrappedAnalyticsAdapter.sendEvents();
@@ -171,7 +177,7 @@ livewrappedAnalyticsAdapter.sendEvents = function() {
     timeouts: getTimeouts(sentRequests.gdpr, sentRequests.auctionIds),
     bidAdUnits: getbidAdUnits(),
     rf: getAdRenderFailed(sentRequests.auctionIds),
-    rcv: getAdblockerRecovered()
+    ext: initOptions.ext
   };
 
   if (events.requests.length == 0 &&
@@ -185,10 +191,8 @@ livewrappedAnalyticsAdapter.sendEvents = function() {
   ajax(initOptions.endpoint || URL, undefined, JSON.stringify(events), {method: 'POST'});
 };
 
-function getAdblockerRecovered() {
-  try {
-    return getWindowTop().I12C && getWindowTop().I12C.Morph === 1;
-  } catch (e) {}
+function getMediaTypeEnum(mediaType) {
+  return mediaType == 'native' ? 2 : (mediaType == 'video' ? 4 : 1);
 }
 
 function getSentRequests() {
diff --git a/modules/livewrappedBidAdapter.js b/modules/livewrappedBidAdapter.js
index 82affe40e03..203996c9fb5 100644
--- a/modules/livewrappedBidAdapter.js
+++ b/modules/livewrappedBidAdapter.js
@@ -4,7 +4,12 @@ import {config} from '../src/config.js';
 import {find} from '../src/polyfill.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {getStorageManager} from '../src/storageManager.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 
 const BIDDER_CODE = 'livewrapped';
 export const storage = getStorageManager({bidderCode: BIDDER_CODE});
@@ -47,9 +52,6 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(bidRequests, bidderRequest) {
-    // convert Native ORTB definition to old-style prebid native definition
-    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
-
     const userId = find(bidRequests, hasUserId);
     const pubcid = find(bidRequests, hasPubcid);
     const publisherId = find(bidRequests, hasPublisherId);
@@ -68,7 +70,7 @@ export const spec = {
     bidUrl = bidUrl ? bidUrl.params.bidUrl : URL;
     url = url ? url.params.url : (getAppDomain() || getTopWindowLocation(bidderRequest));
     test = test ? test.params.test : undefined;
-    const currency = config.getConfig('currency.adServerCurrency') || 'USD';
+    const currency = getCurrencyFromBidderRequest(bidderRequest) || 'USD';
     var adRequests = bidRequests.map(b => bidToAdRequest(b, currency));
     const adRequestsContainFloors = adRequests.some(r => r.flr !== undefined);
 
@@ -231,9 +233,9 @@ function bidToAdRequest(bid, currency) {
     adUnitId: bid.params.adUnitId,
     callerAdUnitId: bid.params.adUnitName || bid.adUnitCode || bid.placementCode,
     bidId: bid.bidId,
-    transactionId: bid.ortb2Imp?.ext?.tid,
     formats: getSizes(bid).map(sizeToFormat),
     flr: getBidFloor(bid, currency),
+    rtbData: bid.ortb2Imp,
     options: bid.params.options
   };
 
diff --git a/modules/lkqdBidAdapter.js b/modules/lkqdBidAdapter.js
index 1dbe89f5a49..6c97f64e6a8 100644
--- a/modules/lkqdBidAdapter.js
+++ b/modules/lkqdBidAdapter.js
@@ -47,7 +47,7 @@ export const spec = {
       const GDPR = BIDDER_GDPR || bid.params.gdpr || null;
       const GDPRS = BIDDER_GDPRS || bid.params.gdprs || null;
       const DNT = bid.params.dnt || null;
-      const BID_FLOOR = bid.params.flrd > bid.params.flrmp ? bid.params.flrd : bid.params.flrmp;
+      const BID_FLOOR = 0;
       const VIDEO_BID = bid.video ? bid.video : {};
 
       const requestData = {
@@ -67,7 +67,7 @@ export const spec = {
         },
         test: 0,
         at: 2,
-        tmax: bid.params.timeout || config.getConfig('bidderTimeout') || 100,
+        tmax: bidderRequest.timeout,
         cur: ['USD'],
         regs: {
           ext: {
@@ -157,7 +157,6 @@ export const spec = {
             h: sizes[1],
             skip: VIDEO_BID.skip || 0,
             playbackmethod: VIDEO_BID.playbackmethod || [1],
-            placement: (bid.params.execution === 'outstream' || VIDEO_BID.context === 'outstream') ? 5 : 1,
             ext: {
               lkqdcustomparameters: {}
             },
diff --git a/modules/lm_kiviadsBidAdapter.js b/modules/lm_kiviadsBidAdapter.js
new file mode 100644
index 00000000000..7295eb33258
--- /dev/null
+++ b/modules/lm_kiviadsBidAdapter.js
@@ -0,0 +1,18 @@
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {buildRequests, getUserSyncs, interpretResponse, isBidRequestValid} from '../libraries/xeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'lm_kiviads';
+const ENDPOINT = 'https://pbjs.kiviads.live';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['kivi'],
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests: (validBidRequests, bidderRequest) => buildRequests(validBidRequests, bidderRequest, ENDPOINT),
+  interpretResponse,
+  getUserSyncs
+}
+
+registerBidder(spec);
diff --git a/modules/lm_kiviadsBidAdapter.md b/modules/lm_kiviadsBidAdapter.md
new file mode 100644
index 00000000000..fc1b05d1ef7
--- /dev/null
+++ b/modules/lm_kiviadsBidAdapter.md
@@ -0,0 +1,54 @@
+# Overview
+
+```
+Module Name: lm_kiviads Bidder Adapter
+Module Type: lm_kiviads Bidder Adapter
+Maintainer: pavlo@xe.works
+```
+
+# Description
+
+Module that connects to kiviads.com demand sources
+
+# Test Parameters
+```
+var adUnits = [
+    {
+        code: 'test-banner',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]],
+            }
+        },
+        bids: [
+            {
+                bidder: 'lm_kiviads',
+                params: {
+                    env: 'lm_kiviads',
+                    pid: '40',
+                    ext: {}
+                }
+            }
+        ]
+    },
+    {
+        code: 'test-video',
+        sizes: [ [ 640, 480 ] ],
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480],
+                context: 'instream',
+                skipppable: true
+            }
+        },
+        bids: [{
+            bidder: 'lm_kiviads',
+            params: {
+                env: 'lm_kiviads',
+                pid: '40',
+                ext: {}
+            }
+        }]
+    }
+];
+```
diff --git a/modules/lmpIdSystem.js b/modules/lmpIdSystem.js
new file mode 100644
index 00000000000..b6dcae3118b
--- /dev/null
+++ b/modules/lmpIdSystem.js
@@ -0,0 +1,61 @@
+/**
+ * This module adds lmpId support to the User ID module
+ * The {@link module:modules/userId} module is required.
+ * @module modules/lmpIdSystem
+ * @requires module:modules/userId
+ */
+
+import { submodule } from '../src/hook.js';
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'lmpid';
+const STORAGE_KEY = '__lmpid';
+export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME });
+
+function readFromLocalStorage() {
+  return storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(STORAGE_KEY) : null;
+}
+
+function getLmpid() {
+  return window[STORAGE_KEY] || readFromLocalStorage();
+}
+
+/** @type {Submodule} */
+export const lmpIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param { string | undefined } value
+   * @return { {lmpid: string} | undefined }
+   */
+  decode(value) {
+    return value ? { lmpid: value } : undefined;
+  },
+
+  /**
+   * Retrieve the LMPID
+   * @function
+   * @param {SubmoduleConfig} config
+   * @return {{id: string | undefined} | undefined}
+   */
+  getId(config) {
+    const id = getLmpid();
+    return id ? { id } : undefined;
+  },
+
+  eids: {
+    'lmpid': {
+      source: 'loblawmedia.ca',
+      atype: 3
+    },
+  }
+};
+
+submodule('userId', lmpIdSubmodule);
diff --git a/modules/lmpIdSystem.md b/modules/lmpIdSystem.md
new file mode 100644
index 00000000000..a56c9dbb3d6
--- /dev/null
+++ b/modules/lmpIdSystem.md
@@ -0,0 +1,27 @@
+# LMPID
+
+The Loblaw Media Private ID (LMPID) is the Loblaw Advance identity solution deployed by its media partners. LMPID leverages encrypted user registration information to provide a privacy-conscious, secure, and reliable identifier to power Loblaw Advance's digital advertising ecosystem.
+
+## LMPID Registration
+
+If you're a media company looking to partner with Loblaw Advance, please reach out to us through our [Contact page](https://www.loblawadvance.ca/contact-us)
+
+## LMPID Configuration
+
+First, make sure to add the LMPID submodule to your Prebid.js package with:
+
+```
+gulp build --modules=lmpIdSystem,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'lmpid'
+    }]
+  }
+});
+```
diff --git a/modules/lockrAIMIdSystem.js b/modules/lockrAIMIdSystem.js
new file mode 100644
index 00000000000..de0435a2255
--- /dev/null
+++ b/modules/lockrAIMIdSystem.js
@@ -0,0 +1,165 @@
+/**
+ * This module adds lockr AIM ID support to the User ID module
+ * The {@link module:modules/userId} module is required.
+ * @module modules/lockrAIMIdSystem
+ * @requires module:modules/userId
+ */
+
+import { submodule } from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
+import { logInfo, logWarn } from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+import { gppDataHandler } from '../src/adapterManager.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').lockrAIMId} lockrAIMId
+ */
+
+const MODULE_NAME = 'lockrAIMId'
+const LOG_PRE_FIX = 'lockr-AIM: ';
+
+const AIM_PROD_URL = 'https://identity.loc.kr';
+
+export const lockrAIMCodeVersion = '1.0';
+
+export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME })
+
+function createLogger(logger, prefix) {
+  return function (...strings) {
+    logger(prefix + ' ', ...strings);
+  }
+}
+
+const _logInfo = createLogger(logInfo, LOG_PRE_FIX);
+const _logWarn = createLogger(logWarn, LOG_PRE_FIX);
+
+/** @type {Submodule} */
+export const lockrAIMSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  init() {
+    _logInfo('lockrAIM Initialization complete');
+  },
+
+  /**
+   * performs action to obtain id and return a value.
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData|undefined} consentData
+   * @returns {lockrAIMId}
+   */
+  getId(config, consentData) {
+    if (consentData?.gdprApplies === true) {
+      _logWarn('lockrAIM is not intended for use where GDPR applies. The lockrAIM module will not run');
+      return undefined;
+    }
+
+    const gppConsent = gppDataHandler.getConsentData();
+    let gppString = '';
+    if (gppConsent) {
+      gppString = gppConsent.gppString;
+    }
+    const mappedConfig = {
+      appID: config?.params?.appID,
+      email: config?.params?.email,
+      baseUrl: AIM_PROD_URL,
+    };
+
+    _logInfo('lockr AIM configurations loaded and mapped.', mappedConfig);
+    if (!mappedConfig.appID || !mappedConfig.email) {
+      return undefined;
+    }
+    const tokenGenerator = new LockrAIMApiClient(mappedConfig, _logInfo, _logWarn, storage, gppString);
+    const result = tokenGenerator.generateToken();
+    _logInfo('lockr AIM results generated');
+    return result;
+  }
+}
+
+class LockrAIMApiClient {
+  static expiryDateKeys = [];
+  static canRefreshToken = false;
+
+  constructor(opts, logInfo, logWarn, prebidStorageManager, gppString) {
+    this._baseUrl = opts.baseUrl;
+    this._appID = opts.appID;
+    this._email = opts.email;
+    this._logInfo = logInfo;
+    this._logWarn = logWarn;
+    this._gppString = gppString;
+    this.prebidStorageManager = prebidStorageManager;
+    LockrAIMApiClient.expiryDateKeys = this.prebidStorageManager.getDataFromLocalStorage('lockr_expiry_keys') ? JSON.parse(this.prebidStorageManager.getDataFromLocalStorage('lockr_expiry_keys')) : []
+    this.initializeRefresher();
+  }
+
+  async generateToken(type = 'email', value) {
+    const url = this._baseUrl + '/publisher/app/v1/identityLockr/generate-tokens';
+    let rejectPromise;
+    const promise = new Promise((resolve, reject) => {
+      rejectPromise = reject;
+    });
+    const requestBody = {
+      appID: this._appID,
+      data: {
+        type: type,
+        value: value ?? this._email,
+        gppString: this._gppString,
+      }
+    }
+    this._logInfo('Sending the token generation request')
+    ajax(url, {
+      success: (responseText) => {
+        try {
+          const response = JSON.parse(responseText);
+          LockrAIMApiClient.canRefreshToken = false;
+          const token = response.lockrMappingToken;
+          this.prebidStorageManager.setDataInLocalStorage('ilui', token);
+          response.data.forEach(cookieitem => {
+            const settings = cookieitem?.settings;
+            this.prebidStorageManager.setDataInLocalStorage(`${cookieitem.key_name}_expiry`, cookieitem.identity_expires);
+            if (!LockrAIMApiClient.expiryDateKeys.includes(`${cookieitem.key_name}_expiry`)) {
+              LockrAIMApiClient.expiryDateKeys.push(`${cookieitem.key_name}_expiry`);
+            }
+            this.prebidStorageManager.setDataInLocalStorage('lockr_expiry_keys', JSON.stringify(LockrAIMApiClient.expiryDateKeys));
+            if (!settings?.dropLocalStorage) {
+              this.prebidStorageManager.setDataInLocalStorage(cookieitem.key_name, cookieitem.advertising_token);
+            }
+            if (!settings?.dropCookie) {
+              this.prebidStorageManager.setCookie(cookieitem.key_name, cookieitem.advertising_token);
+            }
+          });
+          LockrAIMApiClient.canRefreshToken = true;
+          return;
+        } catch (_err) {
+          this._logWarn(_err);
+          rejectPromise(responseText);
+          LockrAIMApiClient.canRefreshToken = true;
+        }
+      }
+    }, JSON.stringify(requestBody), { method: 'POST', contentType: 'application/json;charset=UTF-8' });
+    return promise;
+  }
+
+  async initializeRefresher() {
+    setInterval(() => {
+      LockrAIMApiClient.expiryDateKeys.forEach(expiryItem => {
+        const currentMillis = new Date().getTime();
+        const dateMillis = this.prebidStorageManager.getDataFromLocalStorage(expiryItem);
+        if (currentMillis > dateMillis && dateMillis !== null && this.prebidStorageManager.getDataFromLocalStorage('ilui') && LockrAIMApiClient.canRefreshToken) {
+          this.generateToken('refresh', this.prebidStorageManager.getDataFromLocalStorage('ilui'));
+        }
+      })
+    }, 1000);
+  }
+}
+
+// Register submodule for userId
+submodule('userId', lockrAIMSubmodule);
diff --git a/modules/lockrAIMIdSystem.md b/modules/lockrAIMIdSystem.md
new file mode 100644
index 00000000000..95eee5bc5e3
--- /dev/null
+++ b/modules/lockrAIMIdSystem.md
@@ -0,0 +1,165 @@
+## **lockr AIM**
+
+Alternative Identity Manager (AIM) is a unified container for identity and data management.
+With AIM’s self-service platform, publishers seamlessly integrate and activate alternative IDs like LiveRamp’s Authenticated Traffic Solution (ATS), Unified ID 2.0 (UID2), ID5 and more. The burden of due diligence and maintenance, coupled with the benefits of server-side calls result in the adoption of multiple alternative IDs, clean rooms like InfoSum and CDPs like Blueconic based on their specific needs.
+
+### **Account Creation | AIM**
+
+Sign up for an [Identity lockr account.](https://sso.loc.kr/console/signup)
+Setup your app and activate the AIM library.
+Compile Prebid with the appropriate configurations, and deploy.
+
+### **Configuration | AIM**
+
+First, make sure to add the lockr’s AIM submodule to your Prebid.js package with:
+The following configuration parameters are available:
+AIM supports all Single Sign On functions, newsletter registrations, UTM parameters, etc. For the sake of clarity, a few examples are shared below.
+**Google oAuth: **
+If you are using Google oAuth (_as an example_), the onSignIn function will subsequently call window.lockr.setAdditionalData function and include a raw email.
+
+```
+function onSignIn(googleUser) {
+   pbjs.setConfig({
+      userSync: {
+         userIds: [{
+            name: 'lockrAIMId',
+            params: {
+               email: 'john@example.com',
+               appID: 'e84afc5f-4adf-4144-949f-1de5bd151fcc'
+            }
+         }]
+      }
+    });
+}
+```
+
+**Facebook oAuth:**
+If you are using Facebook Login (_as an example_), the statusChangeCallback function will subsequently call window.lockr.setAdditionalData function and include a raw email.
+
+```
+function statusChangeCallback(response) {
+   console.log('statusChangeCallback');
+   console.log(response);
+   if(response.status === 'connected'){
+     pbjs.setConfig({
+        userSync: {
+           userIds: [{
+              name: 'lockrAIMId',
+              params: {
+                 email: 'john@example.com',
+                 appID: 'e84afc5f-4adf-4144-949f-1de5bd151fcc'
+              }
+           }]
+        }
+      });
+   }else{
+     document.getElementById('status').innerHTML = 'Please login';
+   }
+}
+```
+
+**Note:** The above code can be triggered from anywhere on the domain (i.e. a subscription form).
+
+
+  
+   
+   
+   
+   
+   
+  
+  
+   
+   
+   
+   
+   
+  
+  
+   
+   
+   
+   
+   
+  
+  
+   
+   
+   
+   
+   
+  
+  
+   
+   
+   
+   
+   
+  
+
Param
+   Scope
+   Type
+   Description
+   Example
+   
name
+   Required
+   String
+   The name of this module: "lockrAIMId"
+   "lockrAIMId"
+   
params
+   Required
+   Object
+   Details for the configuration.
+   
+   
params.email
+   Required
+   String
+   Email address for identity tokens.
+   test@example.com
+   
params.appID
+   Required
+   String
+   Identity lockr appID
+   test@example.com
+   

+
+**lockr AIM Example**
+
+```
+pbjs.setConfig({
+    userSync: {
+       userIds: [{
+          name: 'lockrAIMId',
+          params: {
+             email: 'test@example.com',
+             appID: 'e84afc5f-4adf-4144-949f-1de5bd151fcc'
+          }
+       }]
+    }
+});
+```
+
+_Note_: lockr’s AIM self-service interface empowers publishers with the ability to pass the alternative IDs activated back to the client as local storage or as a first party cookie. Each Identity Provider can be individually set to restrict from client-side delivery and instead be retained as an authentication event within Identity lockr. In this case no data is lost, but instead maintained for automated or manual sharing to any Data Endpoint.
+
+**Troubleshooting and Error handling:**
+
+1. Navigate to the domain where Prebid.js Library is integrated.
+2. Go to the 'Network' tab of your Developer Tools. Search for “prebid.js”
+3. In the application tab, you can confirm any activated Identity Provider (if client-side storage is turned on in AIM’s Identity Provider settings).
+4. Debugging:
+   Enable the debug flag to true in the setConfig call:
+
+```
+pbjs.setConfig({
+    debug: true,
+    userSync: {
+       userIds: [{
+          name: 'lockrAIMId',
+          params: {
+             email: 'test@example.com',
+             appID: 'e84afc5f-4adf-4144-949f-1de5bd151fcc'
+          }
+       }]
+    }
+});
+```
diff --git a/modules/loganBidAdapter.js b/modules/loganBidAdapter.js
index 7aa82e3046c..4e2652e452f 100644
--- a/modules/loganBidAdapter.js
+++ b/modules/loganBidAdapter.js
@@ -1,54 +1,18 @@
-import { isFn, deepAccess, getWindowTop } from '../src/utils.js';
+import { getWindowTop } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { buildUserSyncs, interpretResponse, isBidRequestValid, getBidFloor, consentCheck } from '../libraries/precisoUtils/bidUtilsCommon.js';
 
 const BIDDER_CODE = 'logan';
 const AD_URL = 'https://USeast2.logan.ai/pbjs';
-const SYNC_URL = 'https://ssp-cookie.logan.ai'
-
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency || !bid.meta) {
-    return false;
-  }
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastXml || bid.vastUrl);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers);
-    default:
-      return false;
-  }
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
+const SYNC_URL = 'https://ssp-cookie.logan.ai';
 
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && bid.params.placementId);
-  },
+  isBidRequestValid: isBidRequestValid,
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
     // convert Native ORTB definition to old-style prebid native definition
@@ -67,14 +31,7 @@ export const spec = {
       placements: placements
     };
 
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent;
-      }
-    }
+    consentCheck(bidderRequest, request);
 
     const len = validBidRequests.length;
     for (let i = 0; i < len; i++) {
@@ -99,6 +56,7 @@ export const spec = {
         placement.protocols = mediaType[VIDEO].protocols;
         placement.startdelay = mediaType[VIDEO].startdelay;
         placement.placement = mediaType[VIDEO].placement;
+        placement.plcmt = mediaType[VIDEO].plcmt;
         placement.skip = mediaType[VIDEO].skip;
         placement.skipafter = mediaType[VIDEO].skipafter;
         placement.minbitrate = mediaType[VIDEO].minbitrate;
@@ -122,42 +80,11 @@ export const spec = {
     };
   },
 
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
+  interpretResponse: interpretResponse,
   getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
+    return buildUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent, SYNC_URL);
   }
+
 };
 
 registerBidder(spec);
diff --git a/modules/logicadBidAdapter.js b/modules/logicadBidAdapter.js
index 07f9b893887..e7c5300d072 100644
--- a/modules/logicadBidAdapter.js
+++ b/modules/logicadBidAdapter.js
@@ -31,13 +31,25 @@ export const spec = {
   },
   interpretResponse: function (serverResponse, bidderRequest) {
     serverResponse = serverResponse.body;
+
     const bids = [];
+
     if (!serverResponse || serverResponse.error) {
       return bids;
     }
+
     serverResponse.seatbid.forEach(function (seatbid) {
       bids.push(seatbid.bid);
     })
+
+    const fledgeAuctionConfigs = deepAccess(serverResponse, 'ext.fledgeAuctionConfigs') || [];
+    if (fledgeAuctionConfigs.length) {
+      return {
+        bids,
+        paapi: fledgeAuctionConfigs,
+      };
+    }
+
     return bids;
   },
   getUserSyncs: function (syncOptions, serverResponses) {
@@ -52,32 +64,42 @@ export const spec = {
   },
 };
 
-function newBidRequest(bid, bidderRequest) {
+function newBidRequest(bidRequest, bidderRequest) {
+  const bid = {
+    adUnitCode: bidRequest.adUnitCode,
+    bidId: bidRequest.bidId,
+    transactionId: bidRequest.ortb2Imp?.ext?.tid,
+    sizes: bidRequest.sizes,
+    params: bidRequest.params,
+    mediaTypes: bidRequest.mediaTypes,
+  }
+
+  const fledgeEnabled = deepAccess(bidderRequest, 'paapi.enabled')
+  if (fledgeEnabled) {
+    const ae = deepAccess(bidRequest, 'ortb2Imp.ext.ae');
+    if (ae) {
+      bid.ae = ae;
+    }
+  }
+
   const data = {
     // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-    auctionId: bid.auctionId,
-    bidderRequestId: bid.bidderRequestId,
-    bids: [{
-      adUnitCode: bid.adUnitCode,
-      bidId: bid.bidId,
-      transactionId: bid.ortb2Imp?.ext?.tid,
-      sizes: bid.sizes,
-      params: bid.params,
-      mediaTypes: bid.mediaTypes
-    }],
+    auctionId: bidRequest.auctionId,
+    bidderRequestId: bidRequest.bidderRequestId,
+    bids: [bid],
     prebidJsVersion: '$prebid.version$',
     // TODO: is 'page' the right value here?
     referrer: bidderRequest.refererInfo.page,
     auctionStartTime: bidderRequest.auctionStart,
-    eids: bid.userIdAsEids,
+    eids: bidRequest.userIdAsEids,
   };
 
-  const sua = deepAccess(bid, 'ortb2.device.sua');
+  const sua = deepAccess(bidRequest, 'ortb2.device.sua');
   if (sua) {
     data.sua = sua;
   }
 
-  const userData = deepAccess(bid, 'ortb2.user.data');
+  const userData = deepAccess(bidRequest, 'ortb2.user.data');
   if (userData) {
     data.userData = userData;
   }
diff --git a/modules/lotamePanoramaIdSystem.js b/modules/lotamePanoramaIdSystem.js
index 808a67492b0..3be7b261723 100644
--- a/modules/lotamePanoramaIdSystem.js
+++ b/modules/lotamePanoramaIdSystem.js
@@ -11,15 +11,20 @@ import {
   isBoolean,
   buildUrl,
   isEmpty,
-  isArray,
-  isEmptyStr
+  isArray
 } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
-import { uspDataHandler } from '../src/adapterManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const KEY_ID = 'panoramaId';
 const KEY_EXPIRY = `${KEY_ID}_expiry`;
 const KEY_PROFILE = '_cc_id';
@@ -31,16 +36,24 @@ const MISSING_CORE_CONSENT = 111;
 const GVLID = 95;
 const ID_HOST = 'id.crwdcntrl.net';
 const ID_HOST_COOKIELESS = 'c.ltmsphrcl.net';
+const DO_NOT_HONOR_CONFIG = false;
 
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
 let cookieDomain;
+let appliedConfig = {
+  name: 'lotamePanoramaId',
+  storage: {
+    type: 'cookie&html5',
+    name: 'panoramaId'
+  }
+};
 
 /**
  * Set the Lotame First Party Profile ID in the first party namespace
  * @param {String} profileId
  */
 function setProfileId(profileId) {
-  if (storage.cookiesAreEnabled()) {
+  if (cookiesAreEnabled()) {
     let expirationDate = new Date(timestamp() + NINE_MONTHS_MS).toUTCString();
     storage.setCookie(
       KEY_PROFILE,
@@ -51,7 +64,7 @@ function setProfileId(profileId) {
       undefined
     );
   }
-  if (storage.hasLocalStorage()) {
+  if (localStorageIsEnabled()) {
     storage.setDataInLocalStorage(KEY_PROFILE, profileId, undefined);
   }
 }
@@ -61,10 +74,10 @@ function setProfileId(profileId) {
  */
 function getProfileId() {
   let profileId;
-  if (storage.cookiesAreEnabled()) {
+  if (cookiesAreEnabled(DO_NOT_HONOR_CONFIG)) {
     profileId = storage.getCookie(KEY_PROFILE, undefined);
   }
-  if (!profileId && storage.hasLocalStorage()) {
+  if (!profileId && localStorageIsEnabled(DO_NOT_HONOR_CONFIG)) {
     profileId = storage.getDataFromLocalStorage(KEY_PROFILE, undefined);
   }
   return profileId;
@@ -76,21 +89,11 @@ function getProfileId() {
  */
 function getFromStorage(key) {
   let value = null;
-  if (storage.cookiesAreEnabled()) {
+  if (cookiesAreEnabled(DO_NOT_HONOR_CONFIG)) {
     value = storage.getCookie(key, undefined);
   }
-  if (storage.hasLocalStorage() && value === null) {
-    const storedValueExp = storage.getDataFromLocalStorage(
-      `${key}_exp`, undefined
-    );
-
-    if (storedValueExp === '' || storedValueExp === null) {
-      value = storage.getDataFromLocalStorage(key, undefined);
-    } else if (storedValueExp) {
-      if ((new Date(parseInt(storedValueExp, 10))).getTime() - Date.now() > 0) {
-        value = storage.getDataFromLocalStorage(key, undefined);
-      }
-    }
+  if (value === null && localStorageIsEnabled(DO_NOT_HONOR_CONFIG)) {
+    value = storage.getDataFromLocalStorage(key, undefined);
   }
   return value;
 }
@@ -108,7 +111,7 @@ function saveLotameCache(
 ) {
   if (key && value) {
     let expirationDate = new Date(expirationTimestamp).toUTCString();
-    if (storage.cookiesAreEnabled()) {
+    if (cookiesAreEnabled()) {
       storage.setCookie(
         key,
         value,
@@ -118,12 +121,7 @@ function saveLotameCache(
         undefined
       );
     }
-    if (storage.hasLocalStorage()) {
-      storage.setDataInLocalStorage(
-        `${key}_exp`,
-        String(expirationTimestamp),
-        undefined
-      );
+    if (localStorageIsEnabled()) {
       storage.setDataInLocalStorage(key, value, undefined);
     }
   }
@@ -165,7 +163,7 @@ function getLotameLocalCache(clientId = undefined) {
  */
 function clearLotameCache(key) {
   if (key) {
-    if (storage.cookiesAreEnabled()) {
+    if (cookiesAreEnabled(DO_NOT_HONOR_CONFIG)) {
       let expirationDate = new Date(0).toUTCString();
       storage.setCookie(
         key,
@@ -176,11 +174,50 @@ function clearLotameCache(key) {
         undefined
       );
     }
-    if (storage.hasLocalStorage()) {
+    if (localStorageIsEnabled(DO_NOT_HONOR_CONFIG)) {
       storage.removeDataFromLocalStorage(key, undefined);
     }
   }
 }
+/**
+ * @param {boolean} honorConfig - false to override for reading or deleting old cookies
+ * @returns {boolean} for whether we can write the cookie
+ */
+function cookiesAreEnabled(honorConfig = true) {
+  if (honorConfig) {
+    return storage.cookiesAreEnabled() && appliedConfig.storage.type.includes('cookie');
+  }
+  return storage.cookiesAreEnabled();
+}
+/**
+ * @param {boolean} honorConfig - false to override for reading or deleting old stored items
+ * @returns {boolean} for whether we can write the cookie
+ */
+function localStorageIsEnabled(honorConfig = true) {
+  if (honorConfig) {
+    return storage.hasLocalStorage() && appliedConfig.storage.type.includes('html5');
+  }
+  return storage.hasLocalStorage();
+}
+/**
+ * @param {SubmoduleConfig} config
+ * @returns {null|string} - string error if it finds one, null otherwise.
+ */
+function checkConfigHasErrorsAndReport(config) {
+  let error = null;
+  if (typeof config.storage !== 'undefined') {
+    Object.assign(appliedConfig.storage, appliedConfig.storage, config.storage);
+    const READABLE_MODULE_NAME = 'Lotame ID module';
+    const PERMITTED_STORAGE_TYPES = ['cookie', 'html5', 'cookie&html5'];
+    if (typeof config.storage.name !== 'undefined' && config.storage.name !== KEY_ID) {
+      logError(`Misconfigured ${READABLE_MODULE_NAME}, "storage.name" is expected to be "${KEY_ID}", actual is "${config.storage.name}"`);
+      error = true;
+    } else if (config.storage.type !== 'undefined' && !PERMITTED_STORAGE_TYPES.includes(config.storage.type)) {
+      logError(`Misconfigured ${READABLE_MODULE_NAME}, "storage.type" is expected to be one of "${PERMITTED_STORAGE_TYPES.join(', ')}", actual is "${config.storage.type}"`);
+    }
+  }
+  return error;
+}
 /** @type {Submodule} */
 export const lotamePanoramaIdSubmodule = {
   /**
@@ -215,6 +252,9 @@ export const lotamePanoramaIdSubmodule = {
    * @returns {IdResponse|undefined}
    */
   getId(config, consentData, cacheIdObj) {
+    if (checkConfigHasErrorsAndReport(config)) {
+      return;
+    }
     cookieDomain = lotamePanoramaIdSubmodule.findRootDomain();
     const configParams = (config && config.params) || {};
     const clientId = configParams.clientId;
@@ -242,18 +282,6 @@ export const lotamePanoramaIdSubmodule = {
 
     const storedUserId = getProfileId();
 
-    // Add CCPA Consent data handling
-    const usp = uspDataHandler.getConsentData();
-
-    let usPrivacy;
-    if (typeof usp !== 'undefined' && !isEmpty(usp) && !isEmptyStr(usp)) {
-      usPrivacy = usp;
-    }
-    if (!usPrivacy) {
-      // fallback to 1st party cookie
-      usPrivacy = getFromStorage('us_privacy');
-    }
-
     const getRequestHost = function() {
       if (navigator.userAgent && navigator.userAgent.indexOf('Safari') != -1 && navigator.userAgent.indexOf('Chrome') == -1) {
         return ID_HOST_COOKIELESS;
@@ -274,22 +302,10 @@ export const lotamePanoramaIdSubmodule = {
         }
         consentString = consentData.consentString;
       }
-      // If no consent string, try to read it from 1st party cookies
-      if (!consentString) {
-        consentString = getFromStorage('eupubconsent-v2');
-      }
-      if (!consentString) {
-        consentString = getFromStorage('euconsent-v2');
-      }
       if (consentString) {
         queryParams.gdpr_consent = consentString;
       }
 
-      // Add usPrivacy to the url
-      if (usPrivacy) {
-        queryParams.us_privacy = usPrivacy;
-      }
-
       // Add clientId to the url
       if (hasCustomClientId) {
         queryParams.c = clientId;
diff --git a/modules/lotamePanoramaIdSystem.md b/modules/lotamePanoramaIdSystem.md
index e960f4b5695..1fbc3f561c7 100644
--- a/modules/lotamePanoramaIdSystem.md
+++ b/modules/lotamePanoramaIdSystem.md
@@ -17,9 +17,32 @@ Retrieve the Lotame Panorama Id
     pbjs.setConfig({                
         usersync: {
             userIds: [
-            {
-                name: 'lotamePanoramaId' // The only parameter that is needed
-            }],
+                {
+                    name: 'lotamePanoramaId',
+                    storage: {
+                        name: 'panoramaId',
+                        type: 'cookie&html5',
+                        expires: 7
+                    }
+                }
+            ],
         }
     });
-```            
\ No newline at end of file
+```
+
+| Parameters under `userSync.userIds[]` | Scope | Type | Description | Example |
+| ---| --- | --- | --- | --- |
+| name | Required | String | Name for the Lotame ID submodule | `"lotamePanoramaId"` |
+| storage | Optional | Object | Configures how to cache User IDs locally in the browser | See [storage settings](#storage-settings) |
+
+
+### Storage Settings
+
+The following settings are available for the `storage` property in the `userSync.userIds[]` object. Please note that inclusion of the `storage` property is optional, but if provided, all three attributes listed below *must* be specified:
+
+| Param name | Scope | Type | Description | Example   |
+| --- | --- | --- | --- | --- |
+| name | Required | String| Name of the cookie or localStorage where the user ID will be stored; *must* be `"panoramaId"` | `"panoramaId"` |
+| type | Required | String | `"cookie&html5"` (preferred)  or `"cookie"` or `"html5"` | `"cookie&html5"` |
+| expires | Required | Number | How long (in days) the user ID information will be stored. Lotame recommends `7`. | `7` |
+
diff --git a/modules/loyalBidAdapter.js b/modules/loyalBidAdapter.js
new file mode 100644
index 00000000000..e34ec89cf35
--- /dev/null
+++ b/modules/loyalBidAdapter.js
@@ -0,0 +1,17 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { isBidRequestValid, buildRequests, interpretResponse } from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'loyal';
+const AD_URL = 'https://us-east-1.loyal.app/pbjs';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse
+};
+
+registerBidder(spec);
diff --git a/modules/loyalBidAdapter.md b/modules/loyalBidAdapter.md
new file mode 100644
index 00000000000..db77c04c34f
--- /dev/null
+++ b/modules/loyalBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: Loyal Bidder Adapter
+Module Type: Loyal Bidder Adapter
+Maintainer: hello@loyal.app
+```
+
+# Description
+
+Connects to Loyal exchange for bids.
+Loyal bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'loyal',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'loyal',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'loyal',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/luceadBidAdapter.js b/modules/luceadBidAdapter.js
new file mode 100755
index 00000000000..ffc2307bcb8
--- /dev/null
+++ b/modules/luceadBidAdapter.js
@@ -0,0 +1,193 @@
+/**
+ * @module modules/luceadBidAdapter
+ */
+
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getUniqueIdentifierStr, deepSetValue, logInfo} from '../src/utils.js';
+import {fetch} from '../src/ajax.js';
+
+const gvlid = 1309;
+const bidderCode = 'lucead';
+const defaultCurrency = 'EUR';
+const defaultTtl = 500;
+const aliases = ['adliveplus'];
+const defaultRegion = 'eu';
+const domain = 'lucead.com'
+let baseUrl = `https://${domain}`;
+let staticUrl = `https://s.${domain}`;
+let endpointUrl = baseUrl;
+
+function isDevEnv() {
+  return location.hash.includes('prebid-dev');
+}
+
+function isBidRequestValid(bidRequest) {
+  return !!bidRequest?.params?.placementId;
+}
+
+function buildRequests(bidRequests, bidderRequest) {
+  const region = bidRequests[0]?.params?.region || defaultRegion;
+  endpointUrl = `https://${region}.${domain}`;
+
+  if (isDevEnv()) {
+    baseUrl = location.origin;
+    staticUrl = baseUrl;
+    endpointUrl = `${baseUrl}`;
+  }
+
+  logInfo('buildRequests', {
+    bidRequests,
+    bidderRequest,
+  });
+
+  const companionData = {
+    base_url: baseUrl,
+    static_url: staticUrl,
+    endpoint_url: endpointUrl,
+    request_id: bidderRequest.bidderRequestId,
+    prebid_version: '$prebid.version$',
+    bidRequests,
+    bidderRequest,
+    getUniqueIdentifierStr,
+    ortbConverter,
+    deepSetValue,
+    is_sra: true,
+    region,
+  };
+
+  window.lucead_prebid_data = companionData;
+  const fn = window.lucead_prebid;
+
+  if (fn && typeof fn === 'function') {
+    fn(companionData);
+  }
+
+  return {
+    method: 'POST',
+    url: `${endpointUrl}/go/prebid/sra`,
+    data: JSON.stringify({
+      request_id: bidderRequest.bidderRequestId,
+      domain: location.hostname,
+      bid_requests: bidRequests.map(bidRequest => {
+        return {
+          bid_id: bidRequest.bidId,
+          sizes: bidRequest.sizes,
+          media_types: bidRequest.mediaTypes,
+          placement_id: bidRequest.params.placementId,
+          schain: bidRequest.schain,
+        };
+      }),
+    }),
+    options: {
+      contentType: 'text/plain',
+      withCredentials: false
+    },
+  };
+}
+
+function interpretResponse(serverResponse, bidRequest) {
+  // @see required fields https://docs.prebid.org/dev-docs/bidder-adaptor.html
+  const response = serverResponse?.body;
+  const bidRequestData = JSON.parse(bidRequest?.data);
+
+  const bids = (response?.bids || []).map(bid => ({
+    requestId: bid?.bid_id || '1', // bid request id, the bid id
+    cpm: bid?.cpm || 0,
+    width: (bid?.size && bid?.size?.width) || 300,
+    height: (bid?.size && bid?.size?.height) || 250,
+    currency: bid?.currency || defaultCurrency,
+    ttl: bid?.ttl || defaultTtl,
+    creativeId: bid?.ssp ? `ssp:${bid.ssp}` : `${bid?.ad_id || 0}:${bid?.ig_id || 0}`,
+    netRevenue: bid?.net_revenue || true,
+    ad: bid?.ad || '',
+    meta: {
+      advertiserDomains: bid?.advertiser_domains || [],
+    },
+  }));
+
+  logInfo('interpretResponse', {serverResponse, bidRequest, bidRequestData, bids});
+
+  if (response?.enable_pa === false) { return bids; }
+
+  const fledgeAuctionConfigs = (response.bids || []).map(bid => ({
+    bidId: bid?.bid_id,
+    config: {
+      seller: baseUrl,
+      decisionLogicUrl: `${baseUrl}/js/ssp.js`,
+      interestGroupBuyers: [baseUrl],
+      requestedSize: bid?.size,
+      auctionSignals: {
+        size: bid?.size,
+      },
+      perBuyerSignals: {
+        [baseUrl]: {
+          prebid_paapi: true,
+          prebid_bid_id: bid?.bid_id,
+          prebid_request_id: bidRequestData.request_id,
+          placement_id: bid.placement_id,
+          // floor,
+          is_sra: true,
+          endpoint_url: endpointUrl,
+        },
+      }
+    }
+  }));
+
+  return {bids, paapi: fledgeAuctionConfigs};
+}
+
+function report(type, data) {
+  // noinspection JSCheckFunctionSignatures
+  return fetch(`${endpointUrl}/go/report/${type}`, {
+    body: JSON.stringify({
+      ...data,
+      domain: location.hostname,
+    }),
+    method: 'POST',
+    contentType: 'text/plain',
+  });
+}
+
+function onBidWon(bid) {
+  logInfo('Bid won', bid);
+
+  let data = {
+    bid_id: bid?.bidId,
+    placement_id: bid.params ? (bid?.params[0]?.placementId || '0') : '0',
+    spent: bid?.cpm,
+    currency: bid?.currency,
+  };
+
+  if (bid?.creativeId) {
+    const parts = bid.creativeId.toString().split(':');
+
+    if (parts[0] === 'ssp') {
+      data.ssp = parts[1];
+    } else {
+      data.ad_id = parts[0]
+      data.ig_id = parts[1]
+    }
+  }
+
+  return report('impression', data);
+}
+
+function onTimeout(timeoutData) {
+  logInfo('Timeout from adapter', timeoutData);
+}
+
+export const spec = {
+  code: bidderCode,
+  gvlid,
+  aliases,
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  onBidWon,
+  onTimeout,
+  isDevEnv,
+};
+
+// noinspection JSCheckFunctionSignatures
+registerBidder(spec);
diff --git a/modules/luceadBidAdapter.md b/modules/luceadBidAdapter.md
new file mode 100755
index 00000000000..41e3730897a
--- /dev/null
+++ b/modules/luceadBidAdapter.md
@@ -0,0 +1,41 @@
+# Lucead Bid Adapter
+
+- Module Name: Lucead Bidder Adapter
+- Module Type: Bidder Adapter
+- Maintainer: prebid@lucead.com
+
+## Description
+
+Module that connects to Lucead demand source.
+
+## Adapter configuration
+
+## Ad units parameters
+
+### Type definition
+
+```typescript
+type Params = {
+    placementId: string;
+    region?: 'eu' | 'us' | 'ap';
+};
+```
+
+### Example code
+```javascript
+const adUnits=[
+    {
+        code:'test-div',
+        sizes:[[300,250]],
+        bids:[
+            {
+                bidder: 'lucead',
+                params:{
+                    placementId: '1',
+                    region: 'us', // optional: 'eu', 'us', 'ap'
+                }
+            }
+        ]
+    }
+];
+```
diff --git a/modules/lunamediahbBidAdapter.js b/modules/lunamediahbBidAdapter.js
index 66838014e18..6ad42a4f3ca 100644
--- a/modules/lunamediahbBidAdapter.js
+++ b/modules/lunamediahbBidAdapter.js
@@ -1,140 +1,19 @@
-import { logMessage } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'lunamediahb';
 const AD_URL = 'https://balancer.lmgssp.com/?c=o&m=multi';
 const SYNC_URL = 'https://cookie.lmgssp.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency) {
-    return false;
-  }
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl) || Boolean(bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers);
-    default:
-      return false;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(parseInt(bid.params.placementId)));
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let winTop = window;
-    let location;
-    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
-    try {
-      location = new URL(bidderRequest.refererInfo.page)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
-
-    const placements = [];
-    const request = {
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'language': (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
-      'secure': 1,
-      'host': location.host,
-      'page': location.pathname,
-      'placements': placements
-    };
-
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
-      }
-    }
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      const placement = {
-        placementId: bid.params.placementId,
-        bidId: bid.bidId,
-        schain: bid.schain || {},
-      };
-      const mediaType = bid.mediaTypes
-
-      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
-        placement.sizes = mediaType[BANNER].sizes;
-        placement.traffic = BANNER;
-      } else if (mediaType && mediaType[VIDEO]) {
-        if (mediaType[VIDEO].playerSize) {
-          placement.wPlayer = mediaType[VIDEO].playerSize[0];
-          placement.hPlayer = mediaType[VIDEO].playerSize[1];
-        }
-        placement.traffic = VIDEO;
-        placement.videoContext = mediaType[VIDEO].context || 'instream'
-      } else if (mediaType && mediaType[NATIVE]) {
-        placement.native = mediaType[NATIVE];
-        placement.traffic = NATIVE;
-      }
-      placements.push(placement);
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(['placementId']),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/luponmediaBidAdapter.js b/modules/luponmediaBidAdapter.js
index 20fa601bade..63435437967 100755
--- a/modules/luponmediaBidAdapter.js
+++ b/modules/luponmediaBidAdapter.js
@@ -6,15 +6,17 @@ import {
   isArray,
   isEmpty,
   isFn,
+  isPlainObject,
   logError,
   logMessage,
   logWarn,
-  parseSizesInput
+  parseSizesInput,
+  sizeTupleToRtbSize,
+  sizesToSizeTuples
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER} from '../src/mediaTypes.js';
-import {ajax} from '../src/ajax.js';
 
 const BIDDER_CODE = 'luponmedia';
 const ENDPOINT_URL = 'https://rtb.adxpremium.services/openrtb2/auction';
@@ -220,19 +222,6 @@ export const spec = {
 
     hasSynced = true;
     return allUserSyncs;
-  },
-  onBidWon: bid => {
-    const bidString = JSON.stringify(bid);
-    spec.sendWinningsToServer(bidString);
-  },
-  sendWinningsToServer: data => {
-    let mutation = `mutation {createWin(input: {win: {eventData: "${window.btoa(data)}"}}) {win {createTime } } }`;
-    let dataToSend = JSON.stringify({ query: mutation });
-
-    ajax('https://analytics.adxpremium.services/graphql', null, dataToSend, {
-      contentType: 'application/json',
-      method: 'POST'
-    });
   }
 };
 
@@ -285,16 +274,8 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
   let bannerSizes = [];
 
   if (bannerParams && bannerParams.sizes) {
-    const sizes = parseSizesInput(bannerParams.sizes);
-
     // get banner sizes in form [{ w: , h:  }, ...]
-    const format = sizes.map(size => {
-      const [ width, height ] = size.split('x');
-      const w = parseInt(width, 10);
-      const h = parseInt(height, 10);
-      return { w, h };
-    });
-
+    const format = sizesToSizeTuples(bannerParams.sizes).map(sizeTupleToRtbSize);
     bannerSizes = format;
   }
 
@@ -340,7 +321,7 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
     } catch (e) {
       logError('LuponMedia: getFloor threw an error: ', e);
     }
-    bidFloor = typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? parseFloat(floorInfo.floor) : undefined;
+    bidFloor = isPlainObject(floorInfo) && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? parseFloat(floorInfo.floor) : undefined;
   } else {
     bidFloor = parseFloat(deepAccess(bidRequest, 'params.floor'));
   }
@@ -469,9 +450,7 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
     deepSetValue(data, 'ext.prebid.bidderconfig.0', bidderData);
   }
 
-  // TODO: bidRequest.fpd is not the right place for pbadslot - who's filling that in, if anyone?
-  // is this meant to be bidRequest.ortb2Imp.ext.data.pbadslot?
-  const pbAdSlot = deepAccess(bidRequest, 'fpd.context.pbAdSlot');
+  const pbAdSlot = deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
   if (typeof pbAdSlot === 'string' && pbAdSlot) {
     deepSetValue(data.imp[0].ext, 'context.data.adslot', pbAdSlot);
   }
diff --git a/modules/mabidderBidAdapter.js b/modules/mabidderBidAdapter.js
index 632403c6643..6df68bda269 100644
--- a/modules/mabidderBidAdapter.js
+++ b/modules/mabidderBidAdapter.js
@@ -1,9 +1,11 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
-import {getGlobal} from '../src/prebidGlobal.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 
 const BIDDER_CODE = 'mabidder';
 export const baseUrl = 'https://prebid.ecdrsvc.com/bid';
+const converter = ortbConverter({})
+
 export const spec = {
   supportedMediaTypes: [BANNER],
   code: BIDDER_CODE,
@@ -14,7 +16,8 @@ export const spec = {
     return !!(bid.params.ppid && bid.sizes && Array.isArray(bid.sizes) && Array.isArray(bid.sizes[0]))
   },
   buildRequests: function(validBidRequests, bidderRequest) {
-    const fpd = bidderRequest.ortb2;
+    const fpd = converter.toORTB({ bidRequests: validBidRequests, bidderRequest: bidderRequest });
+
     const bids = [];
     validBidRequests.forEach(bidRequest => {
       const sizes = [];
@@ -35,7 +38,7 @@ export const spec = {
       url: baseUrl,
       method: 'POST',
       data: {
-        v: getGlobal().version,
+        v: 'v' + '$prebid.version$',
         bids: bids,
         url: bidderRequest.refererInfo.page || '',
         referer: bidderRequest.refererInfo.ref || '',
diff --git a/modules/madvertiseBidAdapter.js b/modules/madvertiseBidAdapter.js
index 457ff2409b8..9fc7ceb68aa 100644
--- a/modules/madvertiseBidAdapter.js
+++ b/modules/madvertiseBidAdapter.js
@@ -1,7 +1,11 @@
 import { parseSizesInput, _each } from '../src/utils.js';
-import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 // use protocol relative urls for http or https
 const MADVERTISE_ENDPOINT = 'https://mobile.mng-ads.com/';
 
@@ -22,9 +26,6 @@ export const spec = {
     if (sizes.length > 0 && sizes[0] === undefined) {
       return false;
     }
-    if (typeof bid.params.floor == 'undefined' || parseFloat(bid.params.floor) < 0.01) {
-      bid.params.floor = 0.01;
-    }
 
     return typeof bid.params.s != 'undefined';
   },
@@ -53,7 +54,7 @@ export const spec = {
       }
 
       if (bidderRequest && bidderRequest.gdprConsent) {
-        src = src + '&gdpr=' + (bidderRequest.gdprConsent.gdprApplies ? '1' : '0') + '&consent[0][format]=' + config.getConfig('consentManagement.cmpApi') + '&consent[0][value]=' + bidderRequest.gdprConsent.consentString;
+        src = src + '&gdpr=' + (bidderRequest.gdprConsent.gdprApplies ? '1' : '0') + '&consent[0][format]=iab&consent[0][value]=' + bidderRequest.gdprConsent.consentString;
       }
 
       return {
diff --git a/modules/magniteAnalyticsAdapter.js b/modules/magniteAnalyticsAdapter.js
index b9665b93494..7eb20439f5f 100644
--- a/modules/magniteAnalyticsAdapter.js
+++ b/modules/magniteAnalyticsAdapter.js
@@ -19,12 +19,13 @@ import {
 } from '../src/utils.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS, REJECTION_REASON } from '../src/constants.js';
 import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
+import { getHook } from '../src/hook.js';
 
 const RUBICON_GVL_ID = 52;
 export const storage = getStorageManager({ moduleType: MODULE_TYPE_ANALYTICS, moduleName: 'magnite' });
@@ -33,6 +34,7 @@ const LAST_SEEN_EXPIRE_TIME = 1800000; // 30 mins
 const END_EXPIRE_TIME = 21600000; // 6 hours
 const MODULE_NAME = 'Magnite Analytics';
 const BID_REJECTED_IPF = 'rejected-ipf';
+const DEFAULT_INTEGRATION = 'pbjs';
 
 // List of known rubicon aliases
 // This gets updated on auction init to account for any custom aliases present
@@ -46,21 +48,26 @@ const pbsErrorMap = {
   999: 'generic-error'
 }
 
+let browser;
+let pageReferer;
+let auctionIndex = 0; // count of auctions on page
+let accountId;
+let endpoint;
+let cookieless;
+
 let prebidGlobal = getGlobal();
 const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    BID_REQUESTED,
-    BID_RESPONSE,
-    BIDDER_DONE,
-    BID_TIMEOUT,
-    BID_WON,
-    BILLABLE_EVENT,
-    SEAT_NON_BID,
-    BID_REJECTED
-  }
-} = CONSTANTS;
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_REQUESTED,
+  BID_RESPONSE,
+  BIDDER_DONE,
+  BID_TIMEOUT,
+  BID_WON,
+  BILLABLE_EVENT,
+  PBS_ANALYTICS,
+  BID_REJECTED
+} = EVENTS;
 
 // The saved state of rubicon specific setConfig controls
 export let rubiConf;
@@ -75,7 +82,8 @@ const resetConfs = () => {
     pendingEvents: {},
     eventPending: false,
     elementIdMap: {},
-    sessionData: {}
+    sessionData: {},
+    bidsCachedClientSide: new WeakSet()
   }
   rubiConf = {
     pvid: generateUUID().slice(0, 8),
@@ -104,8 +112,6 @@ config.getConfig('s2sConfig', ({ s2sConfig }) => {
   serverConfig = s2sConfig;
 });
 
-const DEFAULT_INTEGRATION = 'pbjs';
-
 const adUnitIsOnlyInstream = adUnit => {
   return adUnit.mediaTypes && Object.keys(adUnit.mediaTypes).length === 1 && deepAccess(adUnit, 'mediaTypes.video.context') === 'instream';
 }
@@ -308,8 +314,6 @@ const addFloorData = floorData => {
   }
 }
 
-let pageReferer;
-
 const getTopLevelDetails = () => {
   let payload = {
     channel: 'web',
@@ -330,10 +334,14 @@ const getTopLevelDetails = () => {
 
   // Add DM wrapper details
   if (rubiConf.wrapperName) {
+    let rule = rubiConf.rule_name;
+    if (cookieless) {
+      rule = rule ? rule.concat('_cookieless') : 'cookieless';
+    }
     payload.wrapper = {
       name: rubiConf.wrapperName,
       family: rubiConf.wrapperFamily,
-      rule: rubiConf.rule_name
+      rule
     }
   }
 
@@ -640,9 +648,6 @@ export const detectBrowserFromUa = userAgent => {
   return 'OTHER';
 }
 
-let accountId;
-let endpoint;
-
 let magniteAdapter = adapter({ analyticsType: 'endpoint' });
 
 magniteAdapter.originEnableAnalytics = magniteAdapter.enableAnalytics;
@@ -671,8 +676,20 @@ function enableMgniAnalytics(config = {}) {
     window.googletag.cmd = window.googletag.cmd || [];
     window.googletag.cmd.push(() => subscribeToGamSlots());
   }
+
+  // Edge case handler for client side video caching
+  getHook('callPrebidCache').before(callPrebidCacheHook);
 };
 
+/*
+  We want to know if a bid was cached client side
+    And if it was we will use the actual bidId instead of the pbsBidId override in our BID_RESPONSE handler
+*/
+export function callPrebidCacheHook(fn, auctionInstance, bidResponse, afterBidAdded, videoMediaType) {
+  cache.bidsCachedClientSide.add(bidResponse);
+  fn.call(this, auctionInstance, bidResponse, afterBidAdded, videoMediaType);
+}
+
 const handleBidWon = args => {
   const bidWon = formatBidWon(args);
   addEventToQueue({ bidsWon: [bidWon] }, bidWon.renderAuctionId, 'bidWon');
@@ -686,7 +703,10 @@ magniteAdapter.disableAnalytics = function () {
   magniteAdapter._oldEnable = enableMgniAnalytics;
   endpoint = undefined;
   accountId = undefined;
+  cookieless = undefined;
+  auctionIndex = 0;
   resetConfs();
+  getHook('callPrebidCache').getHooks({ hook: callPrebidCacheHook }).remove();
   magniteAdapter.originDisableAnalytics();
 };
 
@@ -749,7 +769,7 @@ const handleBidResponse = (args, bidStatus) => {
 
   // if pbs gave us back a bidId, we need to use it and update our bidId to PBA
   const pbsBidId = (args.pbsBidId == 0 ? generateUUID() : args.pbsBidId) || (args.seatBidId == 0 ? generateUUID() : args.seatBidId);
-  if (pbsBidId) {
+  if (pbsBidId && !cache.bidsCachedClientSide.has(args)) {
     bid.pbsBidId = pbsBidId;
   }
 }
@@ -773,10 +793,10 @@ const getLatencies = (args, auctionStart) => {
   }
 }
 
-let browser;
 magniteAdapter.track = ({ eventType, args }) => {
   switch (eventType) {
     case AUCTION_INIT:
+      auctionIndex += 1;
       // Update session
       cache.sessionData = storage.localStorageIsEnabled() && updateRpaCookie();
       // set the rubicon aliases
@@ -792,6 +812,7 @@ magniteAdapter.track = ({ eventType, args }) => {
         'timeout as clientTimeoutMillis',
       ]);
       auctionData.accountId = accountId;
+      auctionData.auctionIndex = auctionIndex;
 
       // get browser
       if (!browser) {
@@ -808,6 +829,15 @@ magniteAdapter.track = ({ eventType, args }) => {
         auctionData.floors = addFloorData(floorData);
       }
 
+      // Identify chrome cookieless trafic
+      if (!cookieless) {
+        const cdep = deepAccess(args, 'bidderRequests.0.ortb2.device.ext.cdep');
+        if (cdep && (cdep.indexOf('treatment') !== -1 || cdep.indexOf('control_2') !== -1)) {
+          cookieless = 1;
+          auctionData.cdep = 1;
+        }
+      }
+
       // GDPR info
       const gdprData = deepAccess(args, 'bidderRequests.0.gdprConsent');
       if (gdprData) {
@@ -878,6 +908,8 @@ magniteAdapter.track = ({ eventType, args }) => {
           'source', () => bid.src === 's2s' ? 'server' : 'client',
           'status', () => 'no-bid'
         ]);
+        // add a pbs flag if one of the bids has a server source
+        if (adUnit.bids[bid.bidId].source === 'server') adUnit.pbsRequest = 1;
         // set acct site zone id on adunit
         if ((!adUnit.siteId || !adUnit.zoneId) && rubiconAliases.indexOf(bid.bidder) !== -1) {
           if (deepAccess(bid, 'params.accountId') == accountId) {
@@ -892,11 +924,11 @@ magniteAdapter.track = ({ eventType, args }) => {
       handleBidResponse(args, 'success');
       break;
     case BID_REJECTED:
-      const bidStatus = args.rejectionReason === CONSTANTS.REJECTION_REASON.FLOOR_NOT_MET ? BID_REJECTED_IPF : 'rejected';
+      const bidStatus = args.rejectionReason === REJECTION_REASON.FLOOR_NOT_MET ? BID_REJECTED_IPF : 'rejected';
       handleBidResponse(args, bidStatus);
       break;
-    case SEAT_NON_BID:
-      handleNonBidEvent(args);
+    case PBS_ANALYTICS:
+      handlePbsAnalytics(args);
       break;
     case BIDDER_DONE:
       const serverError = deepAccess(args, 'serverErrors.0');
@@ -987,8 +1019,27 @@ magniteAdapter.track = ({ eventType, args }) => {
   }
 };
 
-const handleNonBidEvent = function(args) {
-  const {seatnonbid, auctionId} = args;
+const handlePbsAnalytics = function (args) {
+  const {seatnonbid, auctionId, atag} = args;
+  if (seatnonbid) {
+    handleNonBidEvent(seatnonbid, auctionId);
+  }
+  if (atag) {
+    handleAtagEvent(atag, auctionId);
+  }
+}
+
+const handleAtagEvent = function (atag, auctionId) {
+  const tags = findTimeoutOptimization(atag)
+  tags.forEach(tag => {
+    tag.activities.forEach(activity => {
+      if (activity.name === 'optimize-tmax' && activity.status === 'success') {
+        setAnalyticsTagData(activity.results[0]?.values, deepAccess(cache, `auctions.${auctionId}.auction`))
+      }
+    })
+  });
+}
+const handleNonBidEvent = function(seatnonbid, auctionId) {
   const auction = deepAccess(cache, `auctions.${auctionId}.auction`);
   // if no auction just bail
   if (!auction) {
@@ -1018,6 +1069,28 @@ const handleNonBidEvent = function(args) {
   });
 };
 
+const findTimeoutOptimization = (atag) => {
+  let timeoutOpt;
+  atag.forEach(tag => {
+    if (tag.module === 'mgni-timeout-optimization') {
+      timeoutOpt = tag.analyticstags;
+    }
+  })
+  return timeoutOpt;
+}
+const setAnalyticsTagData = (values, auction) => {
+  let data = {
+    name: values.scenario,
+    rule: values.rule,
+    value: values.tmax
+  }
+
+  const experiments = deepAccess(auction, 'experiments') || [];
+  experiments.push(data);
+
+  deepSetValue(auction, 'experiments', experiments);
+}
+
 const statusMap = {
   0: {
     status: 'no-bid'
diff --git a/modules/malltvAnalyticsAdapter.js b/modules/malltvAnalyticsAdapter.js
index af903795e49..b4fad0976fb 100644
--- a/modules/malltvAnalyticsAdapter.js
+++ b/modules/malltvAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import {ajax} from '../src/ajax.js'
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js'
-import CONSTANTS from '../src/constants.json'
+import { EVENTS } from '../src/constants.js'
 import adapterManager from '../src/adapterManager.js'
 import {getGlobal} from '../src/prebidGlobal.js'
 import {logInfo, logError, deepClone} from '../src/utils.js'
@@ -10,11 +10,9 @@ export const ANALYTICS_VERSION = '1.0.0'
 export const DEFAULT_SERVER = 'https://central.mall.tv/analytics'
 
 const {
-  EVENTS: {
-    AUCTION_END,
-    BID_TIMEOUT
-  }
-} = CONSTANTS
+  AUCTION_END,
+  BID_TIMEOUT
+} = EVENTS
 
 export const BIDDER_STATUS = {
   BID: 1,
diff --git a/modules/malltvBidAdapter.js b/modules/malltvBidAdapter.js
index 5ac50936ed6..67c8a4aec07 100644
--- a/modules/malltvBidAdapter.js
+++ b/modules/malltvBidAdapter.js
@@ -2,6 +2,13 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'malltv';
 const ENDPOINT_URL = 'https://central.mall.tv/bid';
 const DIMENSION_SEPARATOR = 'x';
@@ -124,11 +131,11 @@ export const spec = {
 };
 
 /**
-* Generate size param for bid request using sizes array
-*
-* @param {Array} sizes Possible sizes for the ad unit.
-* @return {string} Processed sizes param to be used for the bid request.
-*/
+ * Generate size param for bid request using sizes array
+ *
+ * @param {Array} sizes Possible sizes for the ad unit.
+ * @return {string} Processed sizes param to be used for the bid request.
+ */
 function generateSizeParam(sizes) {
   return sizes.map(size => size.join(DIMENSION_SEPARATOR)).join(SIZE_SEPARATOR);
 }
diff --git a/modules/marsmediaAnalyticsAdapter.js b/modules/marsmediaAnalyticsAdapter.js
deleted file mode 100644
index f1e53a3c20c..00000000000
--- a/modules/marsmediaAnalyticsAdapter.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import {ajax} from '../src/ajax.js';
-import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import adapterManager from '../src/adapterManager.js';
-import {getGlobal} from '../src/prebidGlobal.js';
-
-/****
- * Mars Media Analytics
- * Contact: prebid@m-m-g.com‏
- * Developer: Chen Saadia
- */
-
-const MARS_BIDDER_CODE = 'marsmedia';
-const analyticsType = 'endpoint';
-const MARS_VERSION = '1.0.1';
-const MARS_ANALYTICS_URL = 'https://prebid_stats.mars.media/prebidjs/api/analytics.php';
-var events = {};
-
-var marsmediaAnalyticsAdapter = Object.assign(adapter(
-  {
-    MARS_ANALYTICS_URL,
-    analyticsType
-  }),
-{
-  track({eventType, args}) {
-    if (typeof args !== 'undefined' && args.bidderCode === MARS_BIDDER_CODE) {
-      events[eventType] = args;
-    }
-
-    if (eventType === 'auctionEnd') {
-      setTimeout(function() {
-        ajax(
-          MARS_ANALYTICS_URL,
-          {
-            success: function() {},
-            error: function() {}
-          },
-          JSON.stringify({act: 'prebid_analytics', params: events, 'pbjs': getGlobal().getBidResponses(), ver: MARS_VERSION}),
-          {
-            method: 'POST'
-          }
-        );
-      }, 3000);
-    }
-  }
-}
-);
-
-adapterManager.registerAnalyticsAdapter({
-  adapter: marsmediaAnalyticsAdapter,
-  code: 'marsmedia'
-});
-
-export default marsmediaAnalyticsAdapter;
diff --git a/modules/marsmediaBidAdapter.js b/modules/marsmediaBidAdapter.js
index 82a25af60d1..1d322a23a77 100644
--- a/modules/marsmediaBidAdapter.js
+++ b/modules/marsmediaBidAdapter.js
@@ -1,6 +1,6 @@
 
 'use strict';
-import { deepAccess, getDNT, parseSizesInput, isArray, getWindowTop, deepSetValue, triggerPixel, getWindowSelf } from '../src/utils.js';
+import { deepAccess, getDNT, parseSizesInput, isArray, getWindowTop, deepSetValue, triggerPixel, getWindowSelf, isPlainObject } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
@@ -341,7 +341,7 @@ function MarsmediaAdapter() {
         size: '*'
       });
 
-      if (typeof floorInfo === 'object' &&
+      if (isPlainObject(floorInfo) &&
         floorInfo.currency === 'USD' &&
         !isNaN(parseFloat(floorInfo.floor))) {
         floor = floorInfo.floor;
diff --git a/modules/mathildeadsBidAdapter.js b/modules/mathildeadsBidAdapter.js
index 929cee8f3c0..0ecfe63765b 100644
--- a/modules/mathildeadsBidAdapter.js
+++ b/modules/mathildeadsBidAdapter.js
@@ -1,212 +1,19 @@
-import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'mathildeads';
 const AD_URL = 'https://endpoint2.mathilde-ads.com/pbjs';
 const SYNC_URL = 'https://cs2.mathilde-ads.com';
 
-function isBidResponseValid (bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency || !bid.meta) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData (bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    placementId,
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  if (mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  }
-
-  if (mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  }
-
-  if (mediaTypes[NATIVE]) {
-    placement.adFormat = NATIVE;
-    placement.native = mediaTypes[NATIVE];
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && params.placementId);
-
-    if (mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    }
-
-    if (mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    }
-
-    if (mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    }
-
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest?.refererInfo?.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-
-    // TODO: does the fallback make sense here?
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(['placementId']),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/mediaConsortiumBidAdapter.js b/modules/mediaConsortiumBidAdapter.js
new file mode 100644
index 00000000000..a1cd6586735
--- /dev/null
+++ b/modules/mediaConsortiumBidAdapter.js
@@ -0,0 +1,273 @@
+import {BANNER, VIDEO} from '../src/mediaTypes.js'
+import {registerBidder} from '../src/adapters/bidderFactory.js'
+import {generateUUID, isPlainObject, isArray, logWarn, deepClone} from '../src/utils.js'
+import {Renderer} from '../src/Renderer.js'
+import {OUTSTREAM} from '../src/video.js'
+import {config} from '../src/config.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const BIDDER_CODE = 'mediaConsortium'
+
+const PROFILE_API_USAGE_CONFIG_KEY = 'useProfileApi'
+const ONE_PLUS_X_ID_USAGE_CONFIG_KEY = 'readOnePlusXId'
+
+const SYNC_ENDPOINT = 'https://relay.hubvisor.io/v1/sync/big'
+const AUCTION_ENDPOINT = 'https://relay.hubvisor.io/v1/auction/big'
+
+const XANDR_OUTSTREAM_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+
+export const OPTIMIZATIONS_STORAGE_KEY = 'media_consortium_optimizations'
+
+const SYNC_TYPES = {
+  image: 'image',
+  redirect: 'image',
+  iframe: 'iframe'
+}
+
+const storageManager = getStorageManager({ bidderCode: BIDDER_CODE });
+
+export const spec = {
+  version: '0.0.1',
+  code: BIDDER_CODE,
+  gvlid: 1112,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid(bid) {
+    return true
+  },
+  buildRequests(bidRequests, bidderRequest) {
+    const useProfileApi = config.getConfig(PROFILE_API_USAGE_CONFIG_KEY) ?? false
+    const readOnePlusXId = config.getConfig(ONE_PLUS_X_ID_USAGE_CONFIG_KEY) ?? false
+
+    const {
+      auctionId,
+      bids,
+      gdprConsent: {gdprApplies = false, consentString} = {},
+      ortb2: {device, site}
+    } = bidderRequest
+
+    const currentTimestamp = Date.now()
+    const optimizations = getOptimizationsFromLocalStorage()
+
+    const impressions = bids.reduce((acc, bidRequest) => {
+      const {bidId, adUnitCode, mediaTypes} = bidRequest
+      const optimization = optimizations[adUnitCode]
+
+      if (optimization) {
+        const {expiresAt, isEnabled} = optimization
+
+        if (expiresAt >= currentTimestamp && !isEnabled) {
+          return acc
+        }
+      }
+
+      let finalizedMediatypes = deepClone(mediaTypes)
+
+      if (mediaTypes.video && mediaTypes.video.context !== OUTSTREAM) {
+        logWarn(`Filtering video request for adUnitCode ${adUnitCode} because context is not ${OUTSTREAM}`)
+
+        if (Object.keys(finalizedMediatypes).length > 1) {
+          delete finalizedMediatypes.video
+        } else {
+          return acc
+        }
+      }
+
+      return acc.concat({id: bidId, adUnitCode, mediaTypes: finalizedMediatypes})
+    }, [])
+
+    if (!impressions.length) {
+      return
+    }
+
+    const request = {
+      id: auctionId ?? generateUUID(),
+      impressions,
+      device,
+      site,
+      user: {
+        ids: {}
+      },
+      regulations: {
+        gdpr: {
+          applies: gdprApplies,
+          consentString
+        }
+      },
+      timeout: 3600,
+      options: {
+        useProfileApi
+      }
+    }
+
+    if (readOnePlusXId) {
+      const fpId = getFpIdFromLocalStorage()
+
+      if (fpId) {
+        request.user.ids['1plusX'] = fpId
+      }
+    }
+
+    const syncData = {
+      gdpr: gdprApplies,
+      ad_unit_codes: impressions.map(({adUnitCode}) => adUnitCode).join(',')
+    }
+
+    if (consentString) {
+      syncData.gdpr_consent = consentString
+    }
+
+    return [
+      {
+        method: 'GET',
+        url: SYNC_ENDPOINT,
+        data: syncData
+      },
+      {
+        method: 'POST',
+        url: AUCTION_ENDPOINT,
+        data: request
+      }
+    ]
+  },
+  interpretResponse(serverResponse, params) {
+    if (!isValidResponse(serverResponse)) return []
+
+    const {body: {bids, optimizations}} = serverResponse
+
+    if (optimizations && isArray(optimizations)) {
+      const currentTimestamp = Date.now()
+
+      const optimizationsToStore = optimizations.reduce((acc, optimization) => {
+        const {adUnitCode, isEnabled, ttl} = optimization
+
+        return {
+          ...acc,
+          [adUnitCode]: {isEnabled, expiresAt: currentTimestamp + ttl}
+        }
+      }, getOptimizationsFromLocalStorage())
+
+      storageManager.setDataInLocalStorage(OPTIMIZATIONS_STORAGE_KEY, JSON.stringify(optimizationsToStore))
+    }
+
+    return bids.map((bid) => {
+      const {
+        impressionId,
+        price: {cpm, currency},
+        dealId,
+        ad: {
+          creative: {id, mediaType, size: {width, height}, markup}
+        },
+        ttl = 360
+      } = bid
+
+      const formattedBid = {
+        requestId: impressionId,
+        cpm,
+        currency,
+        dealId,
+        ttl,
+        netRevenue: true,
+        creativeId: id,
+        mediaType,
+        width,
+        height,
+        ad: markup,
+        adUrl: null
+      }
+
+      if (mediaType === VIDEO) {
+        const impressionRequest = params.data.impressions.find(({id}) => id === impressionId)
+
+        formattedBid.vastXml = markup
+
+        if (impressionRequest) {
+          formattedBid.renderer = buildXandrOutstreamRenderer(impressionId, impressionRequest.adUnitCode)
+        } else {
+          logWarn(`Could not find adUnitCode matching the impressionId ${impressionId} to setup the renderer`)
+        }
+      }
+
+      return formattedBid
+    })
+  },
+  getUserSyncs(syncOptions, serverResponses) {
+    if (serverResponses.length !== 2) {
+      return
+    }
+
+    const [sync] = serverResponses
+
+    return sync.body?.bidders?.reduce((acc, {type, url}) => {
+      const syncType = SYNC_TYPES[type]
+
+      if (!syncType || !url) {
+        return acc
+      }
+
+      return acc.concat({type: syncType, url})
+    }, [])
+  }
+}
+
+registerBidder(spec)
+
+export function getOptimizationsFromLocalStorage() {
+  try {
+    const storedOptimizations = storageManager.getDataFromLocalStorage(OPTIMIZATIONS_STORAGE_KEY)
+
+    return storedOptimizations ? JSON.parse(storedOptimizations) : {}
+  } catch (err) {
+    return {}
+  }
+}
+
+function getFpIdFromLocalStorage() {
+  try {
+    return storageManager.getDataFromLocalStorage('ope_fpid')
+  } catch (err) {
+    return null
+  }
+}
+
+function isValidResponse(response) {
+  return isPlainObject(response) &&
+      isPlainObject(response.body) &&
+      isArray(response.body.bids)
+}
+
+function buildXandrOutstreamRenderer(bidId, adUnitCode) {
+  const renderer = Renderer.install({
+    id: bidId,
+    url: XANDR_OUTSTREAM_RENDERER_URL,
+    loaded: false,
+    adUnitCode,
+    targetId: adUnitCode
+  });
+
+  try {
+    renderer.setRender(xandrOutstreamRenderer);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  return renderer;
+}
+
+function xandrOutstreamRenderer(bid) {
+  const {width, height, adUnitCode, vastXml} = bid
+
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      sizes: [width, height],
+      targetId: adUnitCode,
+      rendererOptions: {
+        showBigPlayButton: false,
+        showProgressBar: 'bar',
+        content: vastXml,
+        showVolume: false,
+        allowFullscreen: true,
+        skippable: false
+      }
+    });
+  });
+}
diff --git a/modules/mediaConsortiumBidAdapter.md b/modules/mediaConsortiumBidAdapter.md
new file mode 100644
index 00000000000..b78627077cb
--- /dev/null
+++ b/modules/mediaConsortiumBidAdapter.md
@@ -0,0 +1,79 @@
+# Media Consortium Bid adapter
+
+## Overview
+
+```
+- Module Name: Media Consortium Bidder Adapter
+- Module Type: Media Consortium Bidder Adapter
+- Maintainer: mediaconsortium-develop@bi.garage.co.jp
+```
+
+## Description
+
+Module that connects to Media Consortium demand sources and supports the following media types: `banner`, `video`.
+
+To get access to the full feature set of the adapter you'll need to allow localstorage usage in the `bidderSettings`.
+
+```javascript
+    pbjs.bidderSettings = {
+        mediaConsortium: {
+            storageAllowed: true
+        }
+    }
+```
+
+## Managing 1plusX profile API usage and FPID retrieval
+
+You can use the `setBidderConfig` function to enable or disable 1plusX profile API usage and fpid retrieval.
+
+If the keys found below are not defined, their values will default to `false`.
+
+```javascript
+    pbjs.setBidderConfig({
+        bidders: ['mediaConsortium'],
+        config: {
+            // Controls the 1plusX profile API usage
+            useProfileApi: true,
+            // Controls the 1plusX fpid retrieval
+            readOnePlusXId: true
+        }
+    });
+```
+
+## Test Parameters
+
+```javascript
+    var adUnits = [
+        {
+            code: 'div-prebid-banner',
+            mediaTypes:{
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids:[
+                {
+                    bidder: 'mediaConsortium',
+                    params: {}
+                }
+            ]
+        },
+        {
+            code: 'div-prebid-video',
+            mediaTypes:{
+                video: {
+                    playerSize: [
+                        [300, 250]
+                    ],
+                    context: 'outstream'
+                }
+            },
+            bids:[
+                {
+                    bidder: 'mediaConsortium',
+                    params: {}
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/mediabramaBidAdapter.js b/modules/mediabramaBidAdapter.js
new file mode 100644
index 00000000000..9722f1672ba
--- /dev/null
+++ b/modules/mediabramaBidAdapter.js
@@ -0,0 +1,22 @@
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { bidWinReport, buildBidRequests, buildUserSyncs, interpretResponse, isBidRequestValid } from '../libraries/precisoUtils/bidUtilsCommon.js';
+
+const BIDDER_CODE = 'mediabrama';
+const AD_URL = 'https://prebid.mediabrama.com/pbjs';
+const SYNC_URL = 'https://prebid.mediabrama.com/sync';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid: isBidRequestValid,
+  buildRequests: buildBidRequests(AD_URL),
+  interpretResponse: interpretResponse,
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    return buildUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent, SYNC_URL);
+  },
+  onBidWon: bidWinReport
+};
+
+registerBidder(spec);
diff --git a/modules/mediabramaBidAdapter.md b/modules/mediabramaBidAdapter.md
new file mode 100644
index 00000000000..fde0a399852
--- /dev/null
+++ b/modules/mediabramaBidAdapter.md
@@ -0,0 +1,33 @@
+# Overview
+
+```
+Module Name: MediaBrama Bidder Adapter
+Module Type: MediaBrama Bidder Adapter
+Maintainer: support@mediabrama.com
+```
+
+# Description
+
+Module that connects to mediabrama demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'div-prebid',
+            mediaTypes:{
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids:[
+                {
+                    bidder: 'mediabrama',
+                    params: {
+                        placementId: '24428' //test, please replace after test 
+                    }
+                }
+            ]
+        },
+    ];
+```
diff --git a/modules/mediafilterRtdProvider.js b/modules/mediafilterRtdProvider.js
new file mode 100644
index 00000000000..5472c4a6ce0
--- /dev/null
+++ b/modules/mediafilterRtdProvider.js
@@ -0,0 +1,96 @@
+/**
+ * This module adds the Media Filter real-time ad monitoring and protection module.
+ *
+ * The {@link module:modules/realTimeData} module is required
+ *
+ * For more information, visit {@link https://www.themediatrust.com The Media Trust}.
+ *
+ * @author Mirnes Cajlakovic 
+ * @module modules/mediafilterRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import { submodule } from '../src/hook.js';
+import { logError, generateUUID } from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+import * as events from '../src/events.js';
+import { EVENTS } from '../src/constants.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+/** The event type for Media Filter. */
+export const MEDIAFILTER_EVENT_TYPE = 'com.mediatrust.pbjs.';
+/** The base URL for Media Filter scripts. */
+export const MEDIAFILTER_BASE_URL = 'https://scripts.webcontentassessor.com/scripts/';
+
+export const MediaFilter = {
+  /**
+   * Registers the Media Filter as a submodule of real-time data.
+   */
+  register: function() {
+    submodule('realTimeData', {
+      'name': 'mediafilter',
+      'init': this.generateInitHandler()
+    });
+  },
+
+  /**
+   * Sets up the Media Filter by initializing event listeners and loading the external script.
+   * @param {object} configuration - The configuration object.
+   */
+  setup: function(configuration) {
+    this.setupEventListener(configuration.configurationHash);
+    this.setupScript(configuration.configurationHash);
+  },
+
+  /**
+   * Sets up an event listener for Media Filter messages.
+   * @param {string} configurationHash - The configuration hash.
+   */
+  setupEventListener: function(configurationHash) {
+    window.addEventListener('message', this.generateEventHandler(configurationHash));
+  },
+
+  /**
+   * Loads the Media Filter script based on the provided configuration hash.
+   * @param {string} configurationHash - The configuration hash.
+   */
+  setupScript: function(configurationHash) {
+    loadExternalScript(MEDIAFILTER_BASE_URL.concat(configurationHash), MODULE_TYPE_RTD, 'mediafilter', () => {
+    });
+  },
+
+  /**
+   * Generates an event handler for Media Filter messages.
+   * @param {string} configurationHash - The configuration hash.
+   * @returns {function} The generated event handler.
+   */
+  generateEventHandler: function(configurationHash) {
+    return (windowEvent) => {
+      if (windowEvent.data.type === MEDIAFILTER_EVENT_TYPE.concat('.', configurationHash)) {
+        events.emit(EVENTS.BILLABLE_EVENT, {
+          'billingId': generateUUID(),
+          'configurationHash': configurationHash,
+          'type': 'impression',
+          'vendor': 'mediafilter',
+        });
+      }
+    };
+  },
+
+  /**
+   * Generates an initialization handler for Media Filter.
+   * @returns {function} The generated init handler.
+   */
+  generateInitHandler: function() {
+    return (configuration) => {
+      try {
+        this.setup(configuration);
+      } catch (error) {
+        logError(`Error in initialization: ${error.message}`);
+      }
+    };
+  }
+};
+
+// Register the module
+MediaFilter.register();
diff --git a/modules/mediafilterRtdProvider.md b/modules/mediafilterRtdProvider.md
new file mode 100644
index 00000000000..469479f8d0b
--- /dev/null
+++ b/modules/mediafilterRtdProvider.md
@@ -0,0 +1,37 @@
+## Overview
+
+**Module:** The Media Filter  
+**Type: **Real Time Data Module  
+
+As malvertising, scams, and controversial and offensive ad content proliferate across the digital media ecosystem, publishers need advanced controls to both shield audiences from malware attacks and ensure quality site experience. With the market’s fastest and most comprehensive real-time ad quality tool, The Media Trust empowers publisher Ad/Revenue Operations teams to block a wide range of malware, high-risk ad platforms, heavy ads, ads with sensitive or objectionable content, and custom lists (e.g., competitors). Customizable replacement code calls for a new ad to ensure impressions are still monetized.
+
+[![IMAGE ALT TEXT](http://img.youtube.com/vi/VBHRiirge7s/0.jpg)](http://www.youtube.com/watch?v=VBHRiirge7s "Publishers' Ultimate Avenger: Media Filter")
+
+To start using this module, please contact [The Media Trust](https://mediatrust.com/how-we-help/media-filter/ "The Media Trust") to get a script and configuration hash for module configuration.
+
+## Integration 
+
+1. Build Prebid bundle with The Media Filter module included.  
+
+```
+gulp build --modules=mediafilterRtdProvider
+```
+
+2. Inlcude the bundled script in your application.
+
+## Configuration
+
+Add configuration entry to `realTimeData.dataProviders` for The Media Filter module.
+
+```
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'mediafilter',
+            params: {
+                configurationHash: '',
+            }
+        }]
+    }
+});
+```
diff --git a/modules/mediaforceBidAdapter.js b/modules/mediaforceBidAdapter.js
index 3d33bbf8c12..9f899974721 100644
--- a/modules/mediaforceBidAdapter.js
+++ b/modules/mediaforceBidAdapter.js
@@ -3,6 +3,12 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
 const BIDDER_CODE = 'mediaforce';
 const ENDPOINT_URL = 'https://rtb.mfadsrvr.com/header_bid';
 const TEST_ENDPOINT_URL = 'https://rtb.mfadsrvr.com/header_bid?debug_key=abcdefghijklmnop';
diff --git a/modules/mediafuseBidAdapter.js b/modules/mediafuseBidAdapter.js
index 1fdd3530fae..b70d2bf30a5 100644
--- a/modules/mediafuseBidAdapter.js
+++ b/modules/mediafuseBidAdapter.js
@@ -20,23 +20,25 @@ import {Renderer} from '../src/Renderer.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {ADPOD, BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {auctionManager} from '../src/auctionManager.js';
 import {find, includes} from '../src/polyfill.js';
 import {INSTREAM, OUTSTREAM} from '../src/video.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {bidderSettings} from '../src/bidderSettings.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
 import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
 import {APPNEXUS_CATEGORY_MAPPING} from '../libraries/categoryTranslationMapping/index.js';
 import {
   getANKewyordParamFromMaps,
-  getANKeywordParam,
-  transformBidderParamKeywords
+  getANKeywordParam
 } from '../libraries/appnexusUtils/anKeywords.js';
 import {convertCamelToUnderscore, fill} from '../libraries/appnexusUtils/anUtils.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
 import {chunk} from '../libraries/chunk/chunk.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'mediafuse';
 const URL = 'https://ib.adnxs.com/ut/v3/prebid';
 const URL_SIMPLE = 'https://ib.adnxs-simple.com/ut/v3/prebid';
@@ -347,31 +349,6 @@ export const spec = {
     }
   },
 
-  transformBidParams: function (params, isOpenRtb) {
-    params = convertTypes({
-      'member': 'string',
-      'invCode': 'string',
-      'placementId': 'number',
-      'keywords': transformBidderParamKeywords,
-      'publisherId': 'number'
-    }, params);
-
-    if (isOpenRtb) {
-      params.use_pmt_rule = (typeof params.usePaymentRule === 'boolean') ? params.usePaymentRule : false;
-      if (params.usePaymentRule) { delete params.usePaymentRule; }
-
-      Object.keys(params).forEach(paramKey => {
-        let convertedKey = convertCamelToUnderscore(paramKey);
-        if (convertedKey !== paramKey) {
-          params[convertedKey] = params[paramKey];
-          delete params[paramKey];
-        }
-      });
-    }
-
-    return params;
-  },
-
   /**
    * Add element selector to javascript tracker to improve native viewability
    * @param {Bid} bid
@@ -752,7 +729,7 @@ function bidToTag(bid) {
   if (!isEmpty(bid.params.keywords)) {
     tag.keywords = getANKewyordParamFromMaps(bid.params.keywords);
   }
-  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
   if (gpid) {
     tag.gpid = gpid;
   }
@@ -865,9 +842,7 @@ function bidToTag(bid) {
     tag['banner_frameworks'] = bid.params.frameworks;
   }
 
-  // TODO: why does this need to iterate through every ad unit?
-  let adUnit = find(auctionManager.getAdUnits(), au => bid.transactionId === au.transactionId);
-  if (adUnit && adUnit.mediaTypes && adUnit.mediaTypes.banner) {
+  if (bid.mediaTypes?.banner) {
     tag.ad_types.push(BANNER);
   }
 
@@ -1061,7 +1036,7 @@ function hideSASIframe(elementId) {
 function outstreamRender(bid) {
   hidedfpContainer(bid.adUnitCode);
   hideSASIframe(bid.adUnitCode);
-  // push to render queue because ANOutstreamVideo may not be loaded yet
+  // push to render queue because ANOutstreamVideo may not be loaded
   bid.renderer.push(() => {
     window.ANOutstreamVideo.renderAd({
       tagId: bid.adResponse.tag_id,
diff --git a/modules/mediagoBidAdapter.js b/modules/mediagoBidAdapter.js
index 756e636572d..1811f62e6ba 100644
--- a/modules/mediagoBidAdapter.js
+++ b/modules/mediagoBidAdapter.js
@@ -5,42 +5,66 @@
 import * as utils from '../src/utils.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getPageTitle, getPageDescription, getPageKeywords, getConnectionDownLink, getReferrer } from '../libraries/fpdUtils/pageInfo.js';
+import { getDevice } from '../libraries/fpdUtils/deviceInfo.js';
+import { getBidFloor } from '../libraries/currencyUtils/floor.js';
+import { transformSizes, normalAdSize } from '../libraries/sizeUtils/tranformSize.js';
+import { getHLen } from '../libraries/navigatorData/navigatorData.js';
+
 // import { config } from '../src/config.js';
 // import { isPubcidEnabled } from './pubCommonId.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').mediaType} mediaType
+ */
+
 const BIDDER_CODE = 'mediago';
 // const PROTOCOL = window.document.location.protocol;
-const ENDPOINT_URL =
-  // ((PROTOCOL === 'https:') ? 'https' : 'http') +
-  'https://rtb-us.mediago.io/api/bid?tn=';
+const ENDPOINT_URL = 'https://gbid.mediago.io/api/bid?tn=';
+// const COOKY_SYNC_URL = 'https://gtrace.mediago.io/ju/cs/eplist';
+const COOKY_SYNC_IFRAME_URL = 'https://cdn.mediago.io/js/cookieSync.html';
+export const THIRD_PARTY_COOKIE_ORIGIN = 'https://cdn.mediago.io';
+
 const TIME_TO_LIVE = 500;
+const GVLID = 1020;
 // const ENDPOINT_URL = '/api/bid?tn=';
-const storage = getStorageManager({bidderCode: BIDDER_CODE});
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 let globals = {};
 let itemMaps = {};
 
 /* ----- mguid:start ------ */
-const COOKIE_KEY_MGUID = '__mguid_';
+export const COOKIE_KEY_MGUID = '__mguid_';
+const COOKIE_KEY_PMGUID = '__pmguid_';
+const COOKIE_RETENTION_TIME = 365 * 24 * 60 * 60 * 1000; // 1 year
+let reqTimes = 0;
 
 /**
- * 获取用户id
+ * get pmg uid
+ * 获取并生成用户的id
+ *
  * @return {string}
  */
-const getUserID = () => {
-  const i = storage.getCookie(COOKIE_KEY_MGUID);
-
-  if (i === null) {
-    const uuid = utils.generateUUID();
-    storage.setCookie(COOKIE_KEY_MGUID, uuid);
-    return uuid;
+export const getPmgUID = () => {
+  if (!storage.cookiesAreEnabled()) return;
+
+  let pmgUid = storage.getCookie(COOKIE_KEY_PMGUID);
+  if (!pmgUid) {
+    pmgUid = utils.generateUUID();
+    try {
+      storage.setCookie(COOKIE_KEY_PMGUID, pmgUid, getCurrentTimeToUTCString());
+    } catch (e) {}
   }
-  return i;
+  return pmgUid;
 };
 
-/* ----- mguid:end ------ */
+/* ----- pmguid:end ------ */
 
 /**
  * 获取一个对象的某个值，如果没有则返回空字符串
+ *
  * @param  {Object}    obj  对象
  * @param  {...string} keys 键名
  * @return {any}
@@ -59,54 +83,6 @@ function getProperty(obj, ...keys) {
   return o;
 }
 
-/**
- * 是不是移动设备或者平板
- * @return {boolean}
- */
-function isMobileAndTablet() {
-  let check = false;
-  (function (a) {
-    let reg1 = new RegExp(
-      [
-        '(android|bbd+|meego)',
-        '.+mobile|avantgo|bada/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)',
-        '|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone',
-        '|p(ixi|re)/|plucker|pocket|psp|series(4|6)0|symbian|treo|up.(browser|link)|vodafone|wap',
-        '|windows ce|xda|xiino|android|ipad|playbook|silk',
-      ].join(''),
-      'i'
-    );
-    let reg2 = new RegExp(
-      [
-        '1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)',
-        '|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )',
-        '|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55/|capi|ccwa|cdm-|cell',
-        '|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)',
-        '|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene',
-        '|gf-5|g-mo|go(.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c',
-        '|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|/)|ibro|idea|ig01|ikom',
-        '|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc-|kyo(c|k)',
-        '|le(no|xi)|lg( g|/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)',
-        '|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]',
-        '|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)',
-        '|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio',
-        '|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms',
-        '|ny|va)|sc(01|h-|oo|p-)|sdk/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al',
-        '|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)',
-        '|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(.b|g1|si)|utst|',
-        'v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)',
-        '|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-',
-        '|your|zeto|zte-',
-      ].join(''),
-      'i'
-    );
-    if (reg1.test(a) || reg2.test(a.substr(0, 4))) {
-      check = true;
-    }
-  })(navigator.userAgent || navigator.vendor || window.opera);
-  return check;
-}
-
 /**
  * 获取底价
  * @param {*} bid
@@ -129,66 +105,9 @@ function isMobileAndTablet() {
 //   }
 //   return floor;
 // }
-function getBidFloor(bid) {
-  if (!utils.isFn(bid.getFloor)) {
-    return utils.deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0;
-  }
-}
-
-/**
- * 将尺寸转为RTB识别的尺寸
- *
- * @param  {Array|Object} requestSizes 配置尺寸
- * @return {Object}
- */
-function transformSizes(requestSizes) {
-  let sizes = [];
-  let sizeObj = {};
-
-  if (
-    utils.isArray(requestSizes) &&
-    requestSizes.length === 2 &&
-    !utils.isArray(requestSizes[0])
-  ) {
-    sizeObj.width = parseInt(requestSizes[0], 10);
-    sizeObj.height = parseInt(requestSizes[1], 10);
-    sizes.push(sizeObj);
-  } else if (typeof requestSizes === 'object') {
-    for (let i = 0; i < requestSizes.length; i++) {
-      let size = requestSizes[i];
-      sizeObj = {};
-      sizeObj.width = parseInt(size[0], 10);
-      sizeObj.height = parseInt(size[1], 10);
-      sizes.push(sizeObj);
-    }
-  }
-
-  return sizes;
-}
 
 // 支持的广告尺寸
-const mediagoAdSize = [
-  { w: 300, h: 250 },
-  { w: 300, h: 600 },
-  { w: 728, h: 90 },
-  { w: 970, h: 250 },
-  { w: 320, h: 50 },
-  { w: 160, h: 600 },
-  { w: 320, h: 180 },
-  { w: 320, h: 100 },
-  { w: 336, h: 280 },
-];
+const mediagoAdSize = normalAdSize;
 
 /**
  * 获取广告位配置
@@ -207,24 +126,32 @@ function getItems(validBidRequests, bidderRequest) {
 
     // 确认尺寸是否符合我们要求
     for (let size of sizes) {
-      matchSize = mediagoAdSize.find(
-        (item) => size.width === item.w && size.height === item.h
-      );
+      matchSize = mediagoAdSize.find(item => size.width === item.w && size.height === item.h);
       if (matchSize) {
         break;
       }
     }
     if (!matchSize) {
-      matchSize = sizes[0]
-        ? { h: sizes[0].height || 0, w: sizes[0].width || 0 }
-        : { h: 0, w: 0 };
+      matchSize = sizes[0] ? { h: sizes[0].height || 0, w: sizes[0].width || 0 } : { h: 0, w: 0 };
     }
 
     const bidFloor = getBidFloor(req);
-    // const gpid =
-    //   utils.deepAccess(req, 'ortb2Imp.ext.gpid') ||
-    //   utils.deepAccess(req, 'ortb2Imp.ext.data.pbadslot') ||
-    //   utils.deepAccess(req, 'params.placementId', 0);
+    const gpid =
+      utils.deepAccess(req, 'ortb2Imp.ext.gpid') ||
+      utils.deepAccess(req, 'ortb2Imp.ext.data.pbadslot') ||
+      utils.deepAccess(req, 'params.placementId', 0);
+
+    const gdprConsent = {};
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      gdprConsent.consent = bidderRequest.gdprConsent.consentString;
+      gdprConsent.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+      // if (bidderRequest.gdprConsent.addtlConsent && bidderRequest.gdprConsent.addtlConsent.indexOf('~') !== -1) {
+      //   let ac = bidderRequest.gdprConsent.addtlConsent;
+      //   // pull only the ids from the string (after the ~) and convert them to an array of ints
+      //   let acStr = ac.substring(ac.indexOf('~') + 1);
+      //   gdpr_consent.addtl_consent = acStr.split('.').map(id => parseInt(id, 10));
+      // }
+    }
 
     // if (mediaTypes.native) {}
     // banner广告类型
@@ -237,16 +164,21 @@ function getItems(validBidRequests, bidderRequest) {
           h: matchSize.h,
           w: matchSize.w,
           pos: 1,
-          format: sizes,
+          format: sizes
         },
         ext: {
-          //   gpid: gpid, // 加入后无法返回广告
+          adUnitCode: req.adUnitCode,
+          referrer: getReferrer(req, bidderRequest),
+          ortb2Imp: utils.deepAccess(req, 'ortb2Imp'), // 传入完整对象，分析日志数据
+          gpid: gpid, // 加入后无法返回广告
+          adslot: utils.deepAccess(req, 'ortb2Imp.ext.data.adserver.adslot', '', ''),
+          ...gdprConsent // gdpr
         },
-        tagid: req.params && req.params.tagid,
+        tagid: req.params && req.params.tagid
       };
       itemMaps[id] = {
         req,
-        ret,
+        ret
       };
     }
 
@@ -255,6 +187,16 @@ function getItems(validBidRequests, bidderRequest) {
   return items;
 }
 
+/**
+ * get current time to UTC string
+ * @returns utc string
+ */
+export function getCurrentTimeToUTCString() {
+  const date = new Date();
+  date.setTime(date.getTime() + COOKIE_RETENTION_TIME);
+  return date.toUTCString();
+}
+
 /**
  * 获取rtb请求参数
  *
@@ -267,22 +209,31 @@ function getParam(validBidRequests, bidderRequest) {
   const sharedid =
     utils.deepAccess(validBidRequests[0], 'userId.sharedid.id') ||
     utils.deepAccess(validBidRequests[0], 'userId.pubcid');
-  const eids = validBidRequests[0].userIdAsEids || validBidRequests[0].userId;
 
-  let isMobile = isMobileAndTablet() ? 1 : 0;
+  const bidsUserIdAsEids = validBidRequests[0].userIdAsEids;
+  const bidsUserid = validBidRequests[0].userId;
+  const eids = bidsUserIdAsEids || bidsUserid;
+  const ppuid = bidsUserid && bidsUserid.pubProvidedId;
+  const content = utils.deepAccess(bidderRequest, 'ortb2.site.content');
+  const cat = utils.deepAccess(bidderRequest, 'ortb2.site.cat');
+  reqTimes += 1;
+
+  let isMobile = getDevice() ? 1 : 0;
   // input test status by Publisher. more frequently for test true req
   let isTest = validBidRequests[0].params.test || 0;
   let auctionId = getProperty(bidderRequest, 'auctionId');
   let items = getItems(validBidRequests, bidderRequest);
 
-  const domain =
-    utils.deepAccess(bidderRequest, 'refererInfo.domain') || document.domain;
+  const domain = utils.deepAccess(bidderRequest, 'refererInfo.domain') || document.domain;
   const location = utils.deepAccess(bidderRequest, 'refererInfo.location');
   const page = utils.deepAccess(bidderRequest, 'refererInfo.page');
   const referer = utils.deepAccess(bidderRequest, 'refererInfo.ref');
 
   const timeout = bidderRequest.timeout || 2000;
   const firstPartyData = bidderRequest.ortb2;
+  const title = getPageTitle();
+  const desc = getPageDescription();
+  const keywords = getPageKeywords();
 
   if (items && items.length) {
     let c = {
@@ -300,14 +251,30 @@ function getParam(validBidRequests, bidderRequest) {
         // ua: 'Mozilla/5.0 (Linux; Android 12; SM-G970U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Mobile Safari/537.36',
         os: navigator.platform || '',
         ua: navigator.userAgent,
-        language: /en/.test(navigator.language) ? 'en' : navigator.language,
+        language: /en/.test(navigator.language) ? 'en' : navigator.language
       },
       ext: {
         eids,
+        bidsUserIdAsEids,
+        bidsUserid,
+        ppuid,
         firstPartyData,
+        content,
+        cat,
+        reqTimes,
+        pmguid: getPmgUID(),
+        page: {
+          title: title ? title.slice(0, 100) : undefined,
+          desc: desc ? desc.slice(0, 300) : undefined,
+          keywords: keywords ? keywords.slice(0, 100) : undefined,
+          hLen: getHLen(),
+        },
+        device: {
+          nbw: getConnectionDownLink(),
+        }
       },
       user: {
-        buyeruid: getUserID(),
+        buyeruid: storage.getCookie(COOKIE_KEY_MGUID) || undefined,
         id: sharedid || pubcid,
       },
       eids,
@@ -321,11 +288,11 @@ function getParam(validBidRequests, bidderRequest) {
         publisher: {
           // todo
           id: domain,
-          name: domain,
-        },
+          name: domain
+        }
       },
       imp: items,
-      tmax: timeout,
+      tmax: timeout
     };
     return c;
   } else {
@@ -335,6 +302,7 @@ function getParam(validBidRequests, bidderRequest) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   // aliases: ['ex'], // short code
   /**
    * Determines whether or not the given bid request is valid.
@@ -372,7 +340,6 @@ export const spec = {
 
   /**
    * Unpack the response from the server into a list of bids.
-   *
    * @param {ServerResponse} serverResponse A successful response from the server.
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
@@ -397,7 +364,7 @@ export const spec = {
           ttl: TIME_TO_LIVE,
           // referrer: REFERER,
           ad: getProperty(bid, 'adm'),
-          nurl: getProperty(bid, 'nurl'),
+          nurl: getProperty(bid, 'nurl')
           //   adserverTargeting: {
           //     granularityMultiplier: 0.1,
           //     priceGranularity: 'pbHg',
@@ -414,6 +381,45 @@ export const spec = {
     return bidResponses;
   },
 
+  getUserSyncs: function (syncOptions, serverResponse, gdprConsent, uspConsent, gppConsent) {
+    const origin = encodeURIComponent(location.origin || `https://${location.host}`);
+    let syncParamUrl = `dm=${origin}`;
+
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncParamUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncParamUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncParamUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    if (syncOptions.iframeEnabled) {
+      window.addEventListener('message', function handler(event) {
+        if (!event.data || event.origin != THIRD_PARTY_COOKIE_ORIGIN) {
+          return;
+        }
+
+        this.removeEventListener('message', handler);
+
+        event.stopImmediatePropagation();
+
+        const response = event.data;
+        if (!response.optout && response.mguid) {
+          storage.setCookie(COOKIE_KEY_MGUID, response.mguid, getCurrentTimeToUTCString());
+        }
+      }, true);
+      return [
+        {
+          type: 'iframe',
+          url: `${COOKY_SYNC_IFRAME_URL}?${syncParamUrl}`
+        }
+      ];
+    }
+  },
+
   /**
    * Register bidder specific code, which will execute if bidder timed out after an auction
    * @param {data} Containing timeout specific data
@@ -433,7 +439,7 @@ export const spec = {
     if (bid['nurl']) {
       utils.triggerPixel(bid['nurl']);
     }
-  },
+  }
 
   /**
    * Register bidder specific code, which will execute when the adserver targeting has been set for a bid from this bidder
diff --git a/modules/mediaimpactBidAdapter.js b/modules/mediaimpactBidAdapter.js
new file mode 100644
index 00000000000..a1f04a44142
--- /dev/null
+++ b/modules/mediaimpactBidAdapter.js
@@ -0,0 +1,147 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { buildBidRequestsAndParams, postRequest, buildEndpointUrl } from '../libraries/mediaImpactUtils/index.js';
+
+const BIDDER_CODE = 'mediaimpact';
+export const ENDPOINT_PROTOCOL = 'https';
+export const ENDPOINT_DOMAIN = 'bidder.smartytouch.co';
+export const ENDPOINT_PATH = '/hb/bid';
+
+export const spec = {
+  code: BIDDER_CODE,
+
+  isBidRequestValid: function (bidRequest) {
+    return !!parseInt(bidRequest.params.unitId) || !!parseInt(bidRequest.params.partnerId);
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const referer = bidderRequest?.refererInfo?.page || window.location.href;
+
+    // Use the common function to build bidRequests and beaconParams
+    const { bidRequests, beaconParams } = buildBidRequestsAndParams(validBidRequests, referer);
+
+    const adRequestUrl = buildEndpointUrl(
+      ENDPOINT_PROTOCOL,
+      ENDPOINT_DOMAIN,
+      ENDPOINT_PATH,
+      beaconParams
+    );
+
+    return {
+      method: 'POST',
+      url: adRequestUrl,
+      data: JSON.stringify(bidRequests),
+    };
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const validBids = JSON.parse(bidRequest.data);
+
+    if (typeof serverResponse.body === 'undefined') {
+      return [];
+    }
+
+    return validBids
+      .map(bid => ({ bid: bid, ad: serverResponse.body[bid.adUnitCode] }))
+      .filter(item => item.ad)
+      .map(item => spec.adResponse(item.bid, item.ad));
+  },
+
+  adResponse: function (bid, ad) {
+    return {
+      requestId: bid.bidId,
+      ad: ad.ad,
+      cpm: ad.cpm,
+      width: ad.width,
+      height: ad.height,
+      ttl: 60,
+      creativeId: ad.creativeId,
+      netRevenue: ad.netRevenue,
+      currency: ad.currency,
+      winNotification: ad.winNotification,
+      meta: ad.meta || {},
+    };
+  },
+
+  onBidWon: function (data) {
+    data.winNotification.forEach(function (unitWon) {
+      const adBidWonUrl = buildEndpointUrl(
+        ENDPOINT_PROTOCOL,
+        ENDPOINT_DOMAIN,
+        unitWon.path
+      );
+
+      if (unitWon.method === 'POST') {
+        postRequest(adBidWonUrl, JSON.stringify(unitWon.data));
+      }
+    });
+
+    return true;
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+
+    if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
+      return syncs;
+    }
+
+    let appendGdprParams = function (url, gdprParams) {
+      if (gdprParams === null) {
+        return url;
+      }
+
+      return url + (url.indexOf('?') >= 0 ? '&' : '?') + gdprParams;
+    };
+
+    let gdprParams = null;
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
+    serverResponses.forEach(resp => {
+      if (resp.body) {
+        Object.keys(resp.body).map(function(key, index) {
+          let respObject = resp.body[key];
+          if (respObject['syncs'] !== undefined &&
+            Array.isArray(respObject.syncs) &&
+            respObject.syncs.length > 0) {
+            if (syncOptions.iframeEnabled) {
+              respObject.syncs.filter(function (syncIframeObject) {
+                if (syncIframeObject['type'] !== undefined &&
+                  syncIframeObject['link'] !== undefined &&
+                  syncIframeObject.type === 'iframe') { return true; }
+                return false;
+              }).forEach(function (syncIframeObject) {
+                syncs.push({
+                  type: 'iframe',
+                  url: appendGdprParams(syncIframeObject.link, gdprParams)
+                });
+              });
+            }
+            if (syncOptions.pixelEnabled) {
+              respObject.syncs.filter(function (syncImageObject) {
+                if (syncImageObject['type'] !== undefined &&
+                  syncImageObject['link'] !== undefined &&
+                  syncImageObject.type === 'image') { return true; }
+                return false;
+              }).forEach(function (syncImageObject) {
+                syncs.push({
+                  type: 'image',
+                  url: appendGdprParams(syncImageObject.link, gdprParams)
+                });
+              });
+            }
+          }
+        });
+      }
+    });
+
+    return syncs;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/mediaimpactBidAdapter.md b/modules/mediaimpactBidAdapter.md
new file mode 100644
index 00000000000..fb1a3ea27b2
--- /dev/null
+++ b/modules/mediaimpactBidAdapter.md
@@ -0,0 +1,45 @@
+# Overview
+
+Module Name: MEDIAIMPACT Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: Info@mediaimpact.com.ua
+
+# Description
+
+You can use this adapter to get a bid from mediaimpact.com.ua.
+
+About us : https://mediaimpact.com.ua
+
+
+# Test Parameters
+```javascript
+    var adUnits = [
+        {
+            code: 'div-ad-example',
+            sizes: [[300, 250]],
+            bids: [
+                {
+                    bidder: "mediaimpact",
+                    params: {
+                        unitId: 6698
+                    }
+                }
+            ]
+        },
+        {
+            code: 'div-ad-example-2',
+            sizes: [[300, 250]],
+            bids: [
+                {
+                    bidder: "mediaimpact",
+                    params: {
+                        partnerId: 6698,
+                        sizes: [[300, 600]],
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/mediakeysBidAdapter.js b/modules/mediakeysBidAdapter.js
index 7af43a3c549..efe9eb90256 100644
--- a/modules/mediakeysBidAdapter.js
+++ b/modules/mediakeysBidAdapter.js
@@ -11,6 +11,7 @@ import {
   isFn,
   isInteger,
   isNumber,
+  isPlainObject,
   isStr,
   logError,
   logWarn,
@@ -66,6 +67,7 @@ const ORTB_VIDEO_PARAMS = {
   h: value => isInteger(value),
   startdelay: value => isInteger(value),
   placement: value => [1, 2, 3, 4, 5].indexOf(value) !== -1,
+  plcmt: value => [1, 2, 3, 4].indexOf(value) !== -1,
   linearity: value => [1, 2].indexOf(value) !== -1,
   skip: value => [0, 1].indexOf(value) !== -1,
   skipmin: value => isInteger(value),
@@ -119,7 +121,7 @@ function getOS() {
  *
  * @param {*} bid a Prebid.js bid (request) object
  * @param {string} mediaType the mediaType or the wildcard '*'
- * @param {string|array} size the size array or the wildcard '*'
+ * @param {string|Array} size the size array or the wildcard '*'
  * @returns {number|boolean}
  */
 function getFloor(bid, mediaType, size = '*') {
@@ -138,7 +140,7 @@ function getFloor(bid, mediaType, size = '*') {
     size
   })
 
-  return (!isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY) ? floor.floor : false
+  return (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY) ? floor.floor : false
 }
 
 /**
diff --git a/modules/medianetAnalyticsAdapter.js b/modules/medianetAnalyticsAdapter.js
index b902727a730..1b4ccc45c88 100644
--- a/modules/medianetAnalyticsAdapter.js
+++ b/modules/medianetAnalyticsAdapter.js
@@ -8,16 +8,18 @@ import {
   logError,
   logInfo,
   triggerPixel,
-  uniques
+  uniques,
+  deepSetValue
 } from '../src/utils.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { BID_STATUS, EVENTS, TARGETING_KEYS } from '../src/constants.js';
 import {ajax} from '../src/ajax.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {AUCTION_COMPLETED, AUCTION_IN_PROGRESS, getPriceGranularity} from '../src/auction.js';
 import {includes} from '../src/polyfill.js';
 import {getGlobal} from '../src/prebidGlobal.js';
+import {convertCurrency} from '../libraries/currencyUtils/currency.js';
 
 const analyticsType = 'endpoint';
 const ENDPOINT = 'https://pb-logs.media.net/log?logid=kfk&evtid=prebid_analytics_events_client';
@@ -36,8 +38,7 @@ const PRICE_GRANULARITY = {
 };
 
 const MEDIANET_BIDDER_CODE = 'medianet';
-// eslint-disable-next-line no-undef
-const PREBID_VERSION = getGlobal().version;
+const PREBID_VERSION = '$prebid.version$'
 const ERROR_CONFIG_JSON_PARSE = 'analytics_config_parse_fail';
 const ERROR_CONFIG_FETCH = 'analytics_config_ajax_fail';
 const ERROR_WINNING_BID_ABSENT = 'winning_bid_absent';
@@ -113,6 +114,7 @@ class Configure {
       pbv: PREBID_VERSION,
       pbav: ANALYTICS_VERSION,
       flt: 1,
+      enableDbf: 1
     }
   }
 
@@ -304,21 +306,17 @@ class BidWrapper {
     this.bidObjs.push(bidObj);
   }
 
-  getAdSlotBids(adSlot) {
-    const bidResponses = this.getAdSlotBidObjs(adSlot);
-    return bidResponses.map((bid) => bid.getLoggingData());
+  getAdSlotBidRequests(adSlot) {
+    return this.bidReqs.filter((bid) => bid.adUnitCode === adSlot);
   }
 
-  getAdSlotBidObjs(adSlot) {
-    const bidResponses = this.bidObjs
-      .filter((bid) => bid.adUnitCode === adSlot);
-    const remResponses = this.bidReqs.filter(bid => !bid.used && bid.adUnitCode === adSlot);
-    return [...bidResponses, ...remResponses];
+  getAdSlotBidResponses(adSlot) {
+    return this.bidObjs.filter((bid) => bid.adUnitCode === adSlot);
   }
 }
 
 class Bid {
-  constructor(bidId, bidder, src, start, adUnitCode, mediaType, allMediaTypeSizes) {
+  constructor(bidId, bidder, src, start, adUnitCode, mediaType, allMediaTypeSizes, resSizes) {
     this.bidId = bidId;
     this.bidder = bidder;
     this.src = src;
@@ -349,6 +347,14 @@ class Bid {
     this.used = false;
     this.originalRequestId = bidId;
     this.requestId = undefined;
+    this.advUrl = undefined;
+    this.latestAcid = undefined;
+    this.originalCurrency = undefined;
+    this.currMul = undefined;
+    this.inCurrMul = undefined;
+    this.res_mtype = undefined;
+    this.res_sizes = resSizes;
+    this.req_mtype = mediaType;
   }
 
   get size() {
@@ -375,7 +381,7 @@ class Bid {
       cbdp: this.dfpbd,
       dfpbd: this.dfpbd,
       szs: this.allMediaTypeSizes.join('|'),
-      size: this.size,
+      size: (this.res_sizes || [this.size]).join('|'),
       mtype: this.mediaType,
       dId: this.dealId,
       winner: this.winner,
@@ -390,6 +396,13 @@ class Bid {
       flrrule: this.floorRule,
       ext: JSON.stringify(this.ext),
       rtime: this.serverLatencyMillis,
+      advurl: this.advUrl,
+      lacid: this.latestAcid,
+      icurr: this.originalCurrency,
+      imul: this.inCurrMul,
+      omul: this.currMul,
+      res_mtype: this.res_mtype,
+      req_mtype: this.req_mtype
     }
   }
 }
@@ -455,11 +468,12 @@ class Auction {
     return this.bidWrapper.findBidObj(key, value)
   }
 
-  getAdSlotBids(adSlot) {
-    return this.bidWrapper.getAdSlotBids(adSlot);
+  getAdSlotBidRequests(adSlot) {
+    return this.bidWrapper.getAdSlotBidRequests(adSlot);
   }
-  getAdSlotBidObjs(adSlot) {
-    return this.bidWrapper.getAdSlotBidObjs(adSlot);
+
+  getAdSlotBidResponses(adSlot) {
+    return this.bidWrapper.getAdSlotBidResponses(adSlot);
   }
 
   _mergeFieldsToLog(objParams) {
@@ -559,8 +573,8 @@ function _getSizes(mediaTypes, sizes) {
 }
 
 function bidResponseHandler(bid) {
-  const { width, height, mediaType, cpm, requestId, timeToRespond, auctionId, dealId, originalRequestId, bidder } = bid;
-  const {originalCpm, creativeId, adId, currency} = bid;
+  const { width, height, mediaType, cpm, requestId, timeToRespond, auctionId, dealId, originalRequestId, bidder, meta } = bid;
+  let {originalCpm, creativeId, adId, currency, originalCurrency} = bid;
 
   if (!(auctions[auctionId] instanceof Auction)) {
     return;
@@ -576,13 +590,26 @@ function bidResponseHandler(bid) {
     bidObj = {};
     isBidOverridden = false;
   }
+  currency = currency ? currency.toUpperCase() : '';
+  originalCurrency = originalCurrency ? originalCurrency.toUpperCase() : currency;
   Object.assign(bidObj, bidReq,
     { cpm, width, height, mediaType, timeToRespond, dealId, creativeId, originalRequestId, requestId },
-    { adId, currency }
+    { adId, currency, originalCurrency }
   );
   bidObj.floorPrice = deepAccess(bid, 'floorData.floorValue');
   bidObj.floorRule = deepAccess(bid, 'floorData.floorRule');
   bidObj.originalCpm = originalCpm || cpm;
+  bidObj.advUrl = meta && meta.advertiserDomains && meta.advertiserDomains.join(',');
+  bidObj.currMul = 1;
+  bidObj.inCurrMul = 1;
+  if (bidObj.originalCurrency !== 'USD') {
+    bidObj.originalCpm = exchangeCurrency(bidObj.originalCpm, bidObj.originalCurrency, 'USD');
+    bidObj.inCurrMul = exchangeCurrency(1, 'USD', bidObj.originalCurrency)
+  }
+  if (bidObj.currency !== 'USD') {
+    bidObj.cpm = exchangeCurrency(bidObj.cpm, bidObj.currency, 'USD');
+    bidObj.currMul = exchangeCurrency(1, 'USD', bidObj.currency)
+  }
   let dfpbd = deepAccess(bid, 'adserverTargeting.hb_pb');
   if (!dfpbd) {
     let priceGranularity = getPriceGranularity(bid);
@@ -590,7 +617,7 @@ function bidResponseHandler(bid) {
     dfpbd = bid[priceGranularityKey] || cpm;
   }
   bidObj.dfpbd = dfpbd;
-  if (bid.status === CONSTANTS.BID_STATUS.BID_REJECTED) {
+  if (bid.status === BID_STATUS.BID_REJECTED) {
     bidObj.status = BID_FLOOR_REJECTED;
   } else {
     bidObj.status = BID_SUCCESS;
@@ -607,9 +634,19 @@ function bidResponseHandler(bid) {
   if (typeof bid.serverResponseTimeMs !== 'undefined') {
     bidObj.serverLatencyMillis = bid.serverResponseTimeMs;
   }
+  bidObj.res_mtype = mediaType;
   !isBidOverridden && auctions[auctionId].addBidObj(bidObj);
 }
 
+function exchangeCurrency(price, fromCurrency, toCurrency) {
+  try {
+    return convertCurrency(price, fromCurrency, toCurrency, false).toFixed(4)
+  } catch (e) {
+    logError(`Media.net Analytics Adapter: Could not convert ${fromCurrency} to ${toCurrency} for price ${price}`);
+  }
+  return price;
+}
+
 function noBidResponseHandler({ auctionId, bidId }) {
   if (!(auctions[auctionId] instanceof Auction)) {
     return;
@@ -631,7 +668,7 @@ function bidTimeoutHandler(timedOutBids) {
     if (!(auctions[auctionId] instanceof Auction)) {
       return;
     }
-    const bidReq = auctions[auctionId].findReqBid('bidId', bidId);
+    const bidReq = auctions[auctionId].findReqBid(bidId);
     if (!(bidReq instanceof Bid) || bidReq.used) {
       return;
     }
@@ -660,12 +697,12 @@ function setTargetingHandler(params) {
       adunitObj.targeting = params[adunit];
       auctionObj.setTargetingTime = Date.now();
       let targetingObj = Object.keys(params[adunit]).reduce((result, key) => {
-        if (key.indexOf(CONSTANTS.TARGETING_KEYS.AD_ID) !== -1) {
+        if (key.indexOf(TARGETING_KEYS.AD_ID) !== -1) {
           result[key] = params[adunit][key]
         }
         return result;
       }, {});
-      const winnerAdId = params[adunit][CONSTANTS.TARGETING_KEYS.AD_ID];
+      const winnerAdId = params[adunit][TARGETING_KEYS.AD_ID];
       let winningBid;
       let bidAdIds = Object.keys(targetingObj).map(k => targetingObj[k]);
       auctionObj.bidWrapper.bidObjs.filter((bid) => bidAdIds.indexOf(bid.adId) !== -1).map(function(bid) {
@@ -711,6 +748,7 @@ function bidWonHandler(bid) {
     }).send();
     return;
   }
+  bidObj.latestAcid = bid.latestTargetedAuctionId;
   auctions[auctionId].bidWonTime = Date.now();
   bidObj.winner = 1;
   sendEvent(auctionId, adUnitCode, LOG_TYPE.RA, bidObj.adId);
@@ -750,6 +788,43 @@ function getCommonLoggingData(acid, adtag) {
   return Object.assign(commonParams, adunitParams, auctionParams);
 }
 
+function getResponseSizeMap(acid, adtag) {
+  const responses = auctions[acid].getAdSlotBidResponses(adtag);
+  const receivedResponse = {};
+  // Set true in map for success bids
+  responses.filter((bid) => bid.size !== '')
+    .forEach((bid) => deepSetValue(receivedResponse, `${bid.bidId}.${bid.size}`, true));
+
+  // For non-success bids:
+  // 1) set bid.res_sizes = (sizes for which no successful bid received)
+  // 2) set true in map
+  responses.filter((bid) => bid.size === '').forEach((bid) => {
+    bid.res_sizes = bid.allMediaTypeSizes.filter((size) => !deepAccess(receivedResponse, `${bid.bidId}.${size}`));
+    bid.allMediaTypeSizes.forEach((size) => deepSetValue(receivedResponse, `${bid.bidId}.${size}`, true));
+  });
+  return receivedResponse;
+}
+
+function getDummyBids(acid, adtag, receivedResponse) {
+  const emptyBids = [];
+  auctions[acid].getAdSlotBidRequests(adtag).forEach(({ bidId, bidder, src, start, adUnitCode, mediaType, allMediaTypeSizes, status }) => {
+    const emptySizes = allMediaTypeSizes.filter((size) => !deepAccess(receivedResponse, `${bidId}.${size}`));
+    if (bidder !== DUMMY_BIDDER && emptySizes.length > 0) {
+      const bid = new Bid(bidId, bidder, src, start, adUnitCode, mediaType, allMediaTypeSizes, emptySizes);
+      bid.status = status === BID_SUCCESS ? BID_NOBID : status;
+      emptyBids.push(bid);
+    }
+  });
+  return emptyBids;
+}
+
+function getLoggingBids(acid, adtag) {
+  const receivedResponse = getResponseSizeMap(acid, adtag);
+  const dummyBids = getDummyBids(acid, adtag, receivedResponse);
+
+  return [...auctions[acid].getAdSlotBidResponses(adtag), ...dummyBids];
+}
+
 function fireAuctionLog(acid, adtag, logType, adId) {
   let commonParams = getCommonLoggingData(acid, adtag);
   commonParams.lgtp = logType;
@@ -767,7 +842,7 @@ function fireAuctionLog(acid, adtag, logType, adId) {
     bidParams = [winLogData];
     commonParams.lper = 1;
   } else {
-    bidParams = auctions[acid].getAdSlotBids(adtag).map(({winner, ...restParams}) => restParams);
+    bidParams = getLoggingBids(acid, adtag).map((bid) => bid.getLoggingData())
     delete commonParams.wts;
   }
   let mnetPresent = bidParams.filter(b => b.pvnm === MEDIANET_BIDDER_CODE).length > 0;
@@ -845,35 +920,35 @@ let medianetAnalytics = Object.assign(adapter({URL, analyticsType}), {
       logInfo(eventType, args);
     }
     switch (eventType) {
-      case CONSTANTS.EVENTS.AUCTION_INIT: {
+      case EVENTS.AUCTION_INIT: {
         auctionInitHandler(args);
         break;
       }
-      case CONSTANTS.EVENTS.BID_REQUESTED: {
+      case EVENTS.BID_REQUESTED: {
         bidRequestedHandler(args);
         break;
       }
-      case CONSTANTS.EVENTS.BID_RESPONSE: {
+      case EVENTS.BID_RESPONSE: {
         bidResponseHandler(args);
         break;
       }
-      case CONSTANTS.EVENTS.BID_TIMEOUT: {
+      case EVENTS.BID_TIMEOUT: {
         bidTimeoutHandler(args);
         break;
       }
-      case CONSTANTS.EVENTS.NO_BID: {
+      case EVENTS.NO_BID: {
         noBidResponseHandler(args);
         break;
       }
-      case CONSTANTS.EVENTS.AUCTION_END: {
+      case EVENTS.AUCTION_END: {
         auctionEndHandler(args);
         break;
       }
-      case CONSTANTS.EVENTS.SET_TARGETING : {
+      case EVENTS.SET_TARGETING: {
         setTargetingHandler(args);
         break;
       }
-      case CONSTANTS.EVENTS.BID_WON: {
+      case EVENTS.BID_WON: {
         bidWonHandler(args);
         break;
       }
diff --git a/modules/medianetBidAdapter.js b/modules/medianetBidAdapter.js
index 041db71cd34..bd6d684c9a0 100644
--- a/modules/medianetBidAdapter.js
+++ b/modules/medianetBidAdapter.js
@@ -1,6 +1,6 @@
 import {
-  buildUrl,
   deepAccess,
+  formatQS,
   getWindowTop,
   isArray,
   isEmpty,
@@ -8,7 +8,9 @@ import {
   isStr,
   logError,
   logInfo,
-  triggerPixel
+  safeJSONEncode,
+  deepClone,
+  deepSetValue
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
@@ -18,6 +20,14 @@ import {Renderer} from '../src/Renderer.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {getGptSlotInfoForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
+import {ajax} from '../src/ajax.js';
+import {getViewportCoordinates} from '../libraries/viewport/viewport.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').TimedOutBid} TimedOutBid
+ */
 
 const BIDDER_CODE = 'medianet';
 const TRUSTEDSTACK_CODE = 'trustedstack';
@@ -29,29 +39,22 @@ const SLOT_VISIBILITY = {
   ABOVE_THE_FOLD: 1,
   BELOW_THE_FOLD: 2
 };
-const EVENTS = {
+export const EVENTS = {
   TIMEOUT_EVENT_NAME: 'client_timeout',
-  BID_WON_EVENT_NAME: 'client_bid_won'
+  BID_WON_EVENT_NAME: 'client_bid_won',
+  SET_TARGETING: 'client_set_targeting',
+  BIDDER_ERROR: 'client_bidder_error'
 };
-const EVENT_PIXEL_URL = 'qsearch-a.akamaihd.net/log';
+export const EVENT_PIXEL_URL = 'https://navvy.media.net/log';
 const OUTSTREAM = 'outstream';
 
-// TODO: this should be picked from bidderRequest
-let refererInfo = getRefererInfo();
-
-let mnData = {};
+let pageMeta;
 
 window.mnet = window.mnet || {};
 window.mnet.queue = window.mnet.queue || [];
 
-mnData.urlData = {
-  domain: refererInfo.domain,
-  page: refererInfo.page,
-  isTop: refererInfo.reachedTop
-};
-
 const aliases = [
-  { code: TRUSTEDSTACK_CODE },
+  { code: TRUSTEDSTACK_CODE, gvlid: 1288 },
 ];
 
 getGlobal().medianetGlobals = getGlobal().medianetGlobals || {};
@@ -79,20 +82,20 @@ function siteDetails(site, bidderRequest) {
 }
 
 function getPageMeta() {
-  if (mnData.pageMeta) {
-    return mnData.pageMeta;
+  if (pageMeta) {
+    return pageMeta;
   }
   let canonicalUrl = getUrlFromSelector('link[rel="canonical"]', 'href');
   let ogUrl = getUrlFromSelector('meta[property="og:url"]', 'content');
   let twitterUrl = getUrlFromSelector('meta[name="twitter:url"]', 'content');
 
-  mnData.pageMeta = Object.assign({},
+  pageMeta = Object.assign({},
     canonicalUrl && { 'canonical_url': canonicalUrl },
     ogUrl && { 'og_url': ogUrl },
     twitterUrl && { 'twitter_url': twitterUrl }
   );
 
-  return mnData.pageMeta;
+  return pageMeta;
 }
 
 function getUrlFromSelector(selector, attribute) {
@@ -178,9 +181,10 @@ function extParams(bidRequest, bidderRequests) {
   const gdprApplies = !!(gdpr && gdpr.gdprApplies);
   const uspApplies = !!(uspConsent);
   const coppaApplies = !!(config.getConfig('coppa'));
+  const {top = -1, right = -1, bottom = -1, left = -1} = getViewportCoordinates();
   return Object.assign({},
     { customer_id: params.cid },
-    { prebid_version: getGlobal().version },
+    { prebid_version: 'v' + '$prebid.version$' },
     { gdpr_applies: gdprApplies },
     (gdprApplies) && { gdpr_consent_string: gdpr.consentString || '' },
     { usp_applies: uspApplies },
@@ -189,18 +193,24 @@ function extParams(bidRequest, bidderRequests) {
     windowSize.w !== -1 && windowSize.h !== -1 && { screen: windowSize },
     userId && { user_id: userId },
     getGlobal().medianetGlobals.analyticsEnabled && { analytics: true },
-    !isEmpty(sChain) && {schain: sChain}
+    !isEmpty(sChain) && {schain: sChain},
+    {
+      vcoords: {
+        top_left: { x: left, y: top },
+        bottom_right: { x: right, y: bottom }
+      }
+    }
   );
 }
 
-function slotParams(bidRequest) {
+function slotParams(bidRequest, bidderRequests) {
   // check with Media.net Account manager for  bid floor and crid parameters
   let params = {
     id: bidRequest.bidId,
     transactionId: bidRequest.ortb2Imp?.ext?.tid,
     ext: {
       dfp_id: bidRequest.adUnitCode,
-      display_count: bidRequest.bidRequestsCount
+      display_count: bidRequest.auctionsCount
     },
     all: bidRequest.params
   };
@@ -255,7 +265,9 @@ function slotParams(bidRequest) {
   if (floorInfo && floorInfo.length > 0) {
     params.bidfloors = floorInfo;
   }
-
+  if (bidderRequests.paapi?.enabled) {
+    params.ext.ae = bidRequest?.ortb2Imp?.ext?.ae;
+  }
   return params;
 }
 
@@ -279,7 +291,7 @@ function getBidFloorByType(bidRequest) {
   return floorInfo;
 }
 function setFloorInfo(bidRequest, mediaType, size, floorInfo) {
-  let floor = bidRequest.getFloor({currency: 'USD', mediaType: mediaType, size: size});
+  let floor = bidRequest.getFloor({currency: 'USD', mediaType: mediaType, size: size}) || {};
   if (size.length > 1) floor.size = size;
   floor.mediaType = mediaType;
   floorInfo.push(floor);
@@ -313,14 +325,15 @@ function getOverlapArea(topLeft1, bottomRight1, topLeft2, bottomRight2) {
 }
 
 function normalizeCoordinates(coordinates) {
+  const {scrollX, scrollY} = window;
   return {
     top_left: {
-      x: coordinates.top_left.x + window.pageXOffset,
-      y: coordinates.top_left.y + window.pageYOffset,
+      x: coordinates.top_left.x + scrollX,
+      y: coordinates.top_left.y + scrollY,
     },
     bottom_right: {
-      x: coordinates.bottom_right.x + window.pageXOffset,
-      y: coordinates.bottom_right.y + window.pageYOffset,
+      x: coordinates.bottom_right.x + scrollX,
+      y: coordinates.bottom_right.y + scrollY,
     }
   }
 }
@@ -330,14 +343,23 @@ function getBidderURL(bidderCode, cid) {
   return url + '?cid=' + encodeURIComponent(cid);
 }
 
+function ortb2Data(ortb2, bidRequests) {
+  const ortb2Object = deepClone(ortb2);
+  const eids = deepAccess(bidRequests, '0.userIdAsEids');
+  if (eids) {
+    deepSetValue(ortb2Object, 'user.ext.eids', eids)
+  }
+  return ortb2Object;
+}
+
 function generatePayload(bidRequests, bidderRequests) {
   return {
     site: siteDetails(bidRequests[0].params.site, bidderRequests),
     ext: extParams(bidRequests[0], bidderRequests),
     // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
     id: bidRequests[0].auctionId,
-    imp: bidRequests.map(request => slotParams(request)),
-    ortb2: bidderRequests.ortb2,
+    imp: bidRequests.map(request => slotParams(request, bidderRequests)),
+    ortb2: ortb2Data(bidderRequests.ortb2, bidRequests),
     tmax: bidderRequests.timeout
   }
 }
@@ -355,38 +377,71 @@ function fetchCookieSyncUrls(response) {
   return [];
 }
 
-function getLoggingData(event, data) {
-  data = (isArray(data) && data) || [];
-
-  let params = {};
+function getEventData(event) {
+  const params = {};
+  const referrerInfo = getRefererInfo();
   params.logid = 'kfk';
   params.evtid = 'projectevents';
   params.project = 'prebid';
-  params.acid = deepAccess(data, '0.auctionId') || '';
+  params.pbver = '$prebid.version$';
   params.cid = getGlobal().medianetGlobals.cid || '';
-  params.crid = data.map((adunit) => deepAccess(adunit, 'params.0.crid') || adunit.adUnitCode).join('|');
-  params.adunit_count = data.length || 0;
-  params.dn = mnData.urlData.domain || '';
-  params.requrl = mnData.urlData.page || '';
-  params.istop = mnData.urlData.isTop || '';
+  params.dn = encodeURIComponent(referrerInfo.domain || '');
+  params.requrl = encodeURIComponent(referrerInfo.page || '');
   params.event = event.name || '';
   params.value = event.value || '';
   params.rd = event.related_data || '';
+  return params;
+}
+
+function getBidData(bid) {
+  const params = {};
+  params.acid = bid.auctionId || '';
+  params.crid = deepAccess(bid, 'params.crid') || deepAccess(bid, 'params.0.crid') || bid.adUnitCode || '';
+  params.ext = safeJSONEncode(bid.ext) || '';
 
+  const rawobj = deepClone(bid);
+  delete rawobj.ad;
+  delete rawobj.vastXml;
+  params.rawobj = safeJSONEncode(rawobj);
   return params;
 }
 
-function logEvent (event, data) {
-  let getParams = {
-    protocol: 'https',
-    hostname: EVENT_PIXEL_URL,
-    search: getLoggingData(event, data)
-  };
-  triggerPixel(buildUrl(getParams));
+function getLoggingData(event, bids) {
+  const logData = {};
+  if (!isArray(bids)) {
+    bids = [];
+  }
+  bids.forEach((bid) => {
+    let bidData = getBidData(bid);
+    Object.keys(bidData).forEach((key) => {
+      logData[key] = logData[key] || [];
+      logData[key].push(encodeURIComponent(bidData[key]));
+    });
+  });
+  return Object.assign({}, getEventData(event), logData)
+}
+
+function fireAjaxLog(url, payload) {
+  ajax(url,
+    {
+      success: () => undefined,
+      error: () => undefined
+    },
+    payload,
+    {
+      method: 'POST',
+      keepalive: true
+    }
+  );
 }
 
-function clearMnData() {
-  mnData = {};
+function logEvent(event, data) {
+  const logData = getLoggingData(event, data);
+  fireAjaxLog(EVENT_PIXEL_URL, formatQS(logData));
+}
+
+function clearPageMeta() {
+  pageMeta = undefined;
 }
 
 function addRenderer(bid) {
@@ -475,26 +530,33 @@ export const spec = {
    * Unpack the response from the server into a list of bids.
    *
    * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
+   * @returns {{bids: *[], fledgeAuctionConfigs: *[]} | *[]} An object containing bids and fledgeAuctionConfigs if present, otherwise an array of bids.
    */
   interpretResponse: function(serverResponse, request) {
     let validBids = [];
-
     if (!serverResponse || !serverResponse.body) {
       logInfo(`${BIDDER_CODE} : response is empty`);
       return validBids;
     }
-
     let bids = serverResponse.body.bidList;
     if (!isArray(bids) || bids.length === 0) {
       logInfo(`${BIDDER_CODE} : no bids`);
+    } else {
+      validBids = bids.filter(bid => isValidBid(bid));
+      validBids.forEach(addRenderer);
+    }
+    const fledgeAuctionConfigs = deepAccess(serverResponse, 'body.ext.paApiAuctionConfigs') || [];
+    const ortbAuctionConfigs = deepAccess(serverResponse, 'body.ext.igi') || [];
+    if (fledgeAuctionConfigs.length === 0 && ortbAuctionConfigs.length === 0) {
       return validBids;
     }
-    validBids = bids.filter(bid => isValidBid(bid));
-
-    validBids.forEach(addRenderer);
-
-    return validBids;
+    if (ortbAuctionConfigs.length > 0) {
+      fledgeAuctionConfigs.push(...ortbAuctionConfigs.map(({igs}) => igs || []).flat());
+    }
+    return {
+      bids: validBids,
+      paapi: fledgeAuctionConfigs,
+    }
   },
   getUserSyncs: function(syncOptions, serverResponses) {
     let cookieSyncUrls = fetchCookieSyncUrls(serverResponses);
@@ -535,7 +597,30 @@ export const spec = {
     } catch (e) {}
   },
 
-  clearMnData,
+  onSetTargeting: (bid) => {
+    try {
+      let eventData = {
+        name: EVENTS.SET_TARGETING,
+        value: bid.cpm
+      };
+      const enableSendAllBids = config.getConfig('enableSendAllBids');
+      if (!enableSendAllBids) {
+        logEvent(eventData, [bid]);
+      }
+    } catch (e) {}
+  },
+
+  onBidderError: ({error, bidderRequest}) => {
+    try {
+      let eventData = {
+        name: EVENTS.BIDDER_ERROR,
+        related_data: `timedOut:${error.timedOut}|status:${error.status}|message:${error.reason.message}`
+      };
+      logEvent(eventData, bidderRequest.bids);
+    } catch (e) {}
+  },
+
+  clearPageMeta,
 
   getWindowSize,
 };
diff --git a/modules/medianetBidAdapter.md b/modules/medianetBidAdapter.md
index fbe967122e9..500c9f3f12b 100644
--- a/modules/medianetBidAdapter.md
+++ b/modules/medianetBidAdapter.md
@@ -180,4 +180,24 @@ var adUnits = [{
 }];    
 
 
+```
+
+# Protected Audience API (FLEDGE)
+
+In order to enable PAAPI auctions follow the instructions below:
+
+1. Add the paapiForGpt and paapi modules to your prebid bundle.
+2. Add the following configuration for the module
+```
+pbjs.que.push(function() {
+  pbjs.setConfig({
+    paapi: {
+      enabled: true,
+      bidders: ['medianet'],
+      defaultForSlots: 1
+    }
+  });
+});
+```
 
+For a detailed guide to enabling PAAPI auctions follow Prebid's documentation on [paapiForGpt](https://docs.prebid.org/dev-docs/modules/paapiForGpt.html)
diff --git a/modules/medianetRtdProvider.js b/modules/medianetRtdProvider.js
index 5a159b39081..42fcffbf576 100644
--- a/modules/medianetRtdProvider.js
+++ b/modules/medianetRtdProvider.js
@@ -3,6 +3,7 @@ import {loadExternalScript} from '../src/adloader.js';
 import {submodule} from '../src/hook.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {includes} from '../src/polyfill.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
 
 const MODULE_NAME = 'medianet';
 const SOURCE = MODULE_NAME + 'rtd';
@@ -84,7 +85,7 @@ function executeCommand(command) {
 
 function loadRtdScript(customerId) {
   const url = getClientUrl(customerId, window.location.hostname);
-  loadExternalScript(url, MODULE_NAME)
+  loadExternalScript(url, MODULE_TYPE_RTD, MODULE_NAME)
 }
 
 function getAdUnits(adUnits, adUnitCodes) {
diff --git a/modules/mediasniperBidAdapter.js b/modules/mediasniperBidAdapter.js
index aee5f6230b2..796a15e1778 100644
--- a/modules/mediasniperBidAdapter.js
+++ b/modules/mediasniperBidAdapter.js
@@ -7,6 +7,7 @@ import {
   isEmpty,
   isFn,
   isNumber,
+  isPlainObject,
   isStr,
   logError,
   logMessage,
@@ -241,7 +242,7 @@ function createImp(bid) {
  *
  * @param {*} bid a Prebid.js bid (request) object
  * @param {string} mediaType the mediaType or the wildcard '*'
- * @param {string|array} size the size array or the wildcard '*'
+ * @param {string|Array} size the size array or the wildcard '*'
  * @returns {number|boolean}
  */
 function getFloor(bid, mediaType, size = '*') {
@@ -262,7 +263,7 @@ function getFloor(bid, mediaType, size = '*') {
     size,
   });
 
-  return !isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY
+  return isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY
     ? floor.floor
     : false;
 }
diff --git a/modules/mediasquareBidAdapter.js b/modules/mediasquareBidAdapter.js
index 87404b7a9ff..a84c19b786b 100644
--- a/modules/mediasquareBidAdapter.js
+++ b/modules/mediasquareBidAdapter.js
@@ -6,6 +6,15 @@ import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 import {Renderer} from '../src/Renderer.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'mediasquare';
 const BIDDER_URL_PROD = 'https://pbs-front.mediasquare.fr/'
 const BIDDER_URL_TEST = 'https://bidder-test.mediasquare.fr/'
@@ -20,20 +29,20 @@ export const spec = {
   aliases: ['msq'], // short code
   supportedMediaTypes: [BANNER, NATIVE, VIDEO],
   /**
-         * Determines whether or not the given bid request is valid.
-         *
-         * @param {BidRequest} bid The bid params to validate.
-         * @return boolean True if this is a valid bid, and false otherwise.
-         */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     return !!(bid.params.owner && bid.params.code);
   },
   /**
-         * Make a server request from the list of BidRequests.
-         *
-         * @param {validBidRequests[]} - an array of bids
-         * @return ServerRequest Info describing the request to the server.
-         */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     // convert Native ORTB definition to old-style prebid native definition
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
@@ -53,6 +62,8 @@ export const spec = {
             if (tmpFloor != {}) { floor[value.join('x')] = tmpFloor; }
           });
         }
+        let tmpFloor = adunitValue.getFloor({currency: 'USD', mediaType: '*', size: '*'});
+        if (tmpFloor != {}) { floor['*'] = tmpFloor; }
       }
       codes.push({
         owner: adunitValue.params.owner,
@@ -86,6 +97,7 @@ export const spec = {
       } else if (bidderRequest.hasOwnProperty('bids') && typeof bidderRequest.bids == 'object' && bidderRequest.bids.length > 0 && bidderRequest.bids[0].hasOwnProperty('userId')) {
         payload.userId = bidderRequest.bids[0].userId;
       }
+      if (bidderRequest.ortb2?.regs?.ext?.dsa) { payload.dsa = bidderRequest.ortb2.regs.ext.dsa }
     };
     if (test) { payload.debug = true; }
     const payloadString = JSON.stringify(payload);
@@ -96,11 +108,11 @@ export const spec = {
     };
   },
   /**
-         * Unpack the response from the server into a list of bids.
-         *
-         * @param {ServerResponse} serverResponse A successful response from the server.
-         * @return {Bid[]} An array of bids which were nested inside the server.
-         */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, bidRequest) {
     const serverBody = serverResponse.body;
     // const headerValue = serverResponse.headers.get('some-response-header');
@@ -125,7 +137,8 @@ export const spec = {
             'advertiserDomains': value['adomain']
           }
         };
-        let paramsToSearchFor = ['bidder', 'code', 'match', 'hasConsent', 'context', 'increment'];
+        if ('dsa' in value) { bidResponse.meta.dsa = value['dsa']; }
+        let paramsToSearchFor = ['bidder', 'code', 'match', 'hasConsent', 'context', 'increment', 'ova'];
         paramsToSearchFor.forEach(param => {
           if (param in value) {
             bidResponse['mediasquare'][param] = value[param];
@@ -148,12 +161,12 @@ export const spec = {
   },
 
   /**
-     * Register the user sync pixels which should be dropped after the auction.
-     *
-     * @param {SyncOptions} syncOptions Which user syncs are allowed?
-     * @param {ServerResponse[]} serverResponses List of server's responses.
-     * @return {UserSync[]} The user syncs which should be dropped.
-     */
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
     if (typeof serverResponses === 'object' && serverResponses != null && serverResponses.length > 0 && serverResponses[0].hasOwnProperty('body') &&
         serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
@@ -164,9 +177,9 @@ export const spec = {
   },
 
   /**
-     * Register bidder specific code, which will execute if a bid from this bidder won the auction
-     * @param {Bid} The bid that won the auction
-     */
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
   onBidWon: function(bid) {
     // fires a pixel to confirm a winning bid
     if (bid.hasOwnProperty('mediaType') && bid.mediaType == 'video') {
@@ -174,7 +187,7 @@ export const spec = {
     }
     let params = { pbjs: '$prebid.version$', referer: encodeURIComponent(getRefererInfo().page || getRefererInfo().topmostLocation) };
     let endpoint = document.location.search.match(/msq_test=true/) ? BIDDER_URL_TEST : BIDDER_URL_PROD;
-    let paramsToSearchFor = ['bidder', 'code', 'match', 'hasConsent', 'context', 'increment'];
+    let paramsToSearchFor = ['bidder', 'code', 'match', 'hasConsent', 'context', 'increment', 'ova'];
     if (bid.hasOwnProperty('mediasquare')) {
       paramsToSearchFor.forEach(param => {
         if (bid['mediasquare'].hasOwnProperty(param)) {
diff --git a/modules/merkleIdSystem.js b/modules/merkleIdSystem.js
index fc77c7cc97d..3f3a90c3c49 100644
--- a/modules/merkleIdSystem.js
+++ b/modules/merkleIdSystem.js
@@ -11,6 +11,13 @@ import {submodule} from '../src/hook.js'
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'merkleId';
 const ID_URL = 'https://prebid.sv.rkdms.com/identity/';
 const DEFAULT_REFRESH = 7 * 3600;
@@ -87,17 +94,17 @@ function generateId(configParams, configStorage) {
 /** @type {Submodule} */
 export const merkleIdSubmodule = {
   /**
-     * used to link submodule with config
-     * @type {string}
-     */
+   * used to link submodule with config
+   * @type {string}
+   */
   name: MODULE_NAME,
 
   /**
-     * decode the stored id value for passing to bid requests
-     * @function
-     * @param {string} value
-     * @returns {{eids:arrayofields}}
-     */
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} value
+   * @returns {{eids:arrayofields}}
+   */
   decode(value) {
     // Legacy support for a single id
     const id = (value && value.pam_id && typeof value.pam_id.id === 'string') ? value.pam_id : undefined;
@@ -115,12 +122,12 @@ export const merkleIdSubmodule = {
   },
 
   /**
-     * performs action to obtain id and return a value in the callback's response argument
-     * @function
-     * @param {SubmoduleConfig} [config]
-     * @param {ConsentData} [consentData]
-     * @returns {IdResponse|undefined}
-     */
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse|undefined}
+   */
   getId(config, consentData) {
     logInfo('User ID - merkleId generating id');
 
diff --git a/modules/mgidBidAdapter.js b/modules/mgidBidAdapter.js
index 1e158236deb..9e2ea06df69 100644
--- a/modules/mgidBidAdapter.js
+++ b/modules/mgidBidAdapter.js
@@ -8,18 +8,27 @@ import {
   parseUrl,
   isEmpty,
   triggerPixel,
+  triggerNurlWithCpm,
   logWarn,
   isFn,
   isNumber,
   isBoolean,
-  isInteger, deepSetValue, getBidIdParameter,
+  extractDomainFromHost,
+  isInteger, deepSetValue, getBidIdParameter, setOnAny
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-import {USERSYNC_DEFAULT_CONFIG} from '../src/userSync.js';
+import { getUserSyncs } from '../libraries/mgidUtils/mgidUtils.js'
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js'
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
 
 const GVLID = 358;
 const DEFAULT_CUR = 'USD';
@@ -80,7 +89,7 @@ _each(NATIVE_ASSETS, anAsset => { _NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAs
 _each(NATIVE_ASSETS, anAsset => { _NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] = anAsset });
 
 export const spec = {
-  VERSION: '1.6',
+  VERSION: '1.8',
   code: BIDDER_CODE,
   gvlid: GVLID,
   supportedMediaTypes: [BANNER, NATIVE],
@@ -150,7 +159,7 @@ export const spec = {
     if (isStr(muid) && muid.length > 0) {
       url += '?muid=' + muid;
     }
-    const cur = setOnAny(validBidRequests, 'params.currency') || setOnAny(validBidRequests, 'params.cur') || config.getConfig('currency.adServerCurrency') || DEFAULT_CUR;
+    const cur = setOnAny(validBidRequests, 'params.currency') || setOnAny(validBidRequests, 'params.cur') || getCurrencyFromBidderRequest(bidderRequest) || DEFAULT_CUR;
     const secure = window.location.protocol === 'https:' ? 1 : 0;
     let imp = [];
     validBidRequests.forEach(bid => {
@@ -161,6 +170,8 @@ export const spec = {
         tagid,
         secure,
       };
+      const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid');
+      gpid && isStr(gpid) && deepSetValue(impObj, `ext.gpid`, gpid);
       const floorData = getBidFloor(bid, cur);
       if (floorData.floor) {
         impObj.bidfloor = floorData.floor;
@@ -223,7 +234,7 @@ export const spec = {
     const page = deepAccess(bidderRequest, 'refererInfo.page') || info.location
     if (!isStr(deepAccess(request.site, 'domain'))) {
       const hostname = parseUrl(page).hostname;
-      request.site.domain = extractDomainFromHost(hostname) || hostname
+      request.site.domain = extractDomainFromHostExceptLocalhost(hostname) || hostname
     }
     if (!isStr(deepAccess(request.site, 'page'))) {
       request.site.page = page
@@ -336,13 +347,7 @@ export const spec = {
   },
   onBidWon: (bid) => {
     const cpm = deepAccess(bid, 'adserverTargeting.hb_pb') || '';
-    if (isStr(bid.nurl) && bid.nurl !== '') {
-      bid.nurl = bid.nurl.replace(
-        /\${AUCTION_PRICE}/,
-        cpm
-      );
-      triggerPixel(bid.nurl);
-    }
+    triggerNurlWithCpm(bid, cpm)
     if (bid.isBurl) {
       if (bid.mediaType === BANNER) {
         bid.ad = bid.ad.replace(
@@ -359,81 +364,11 @@ export const spec = {
     }
     logInfo(LOG_INFO_PREFIX + `onBidWon`);
   },
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) => {
-    logInfo(LOG_INFO_PREFIX + `getUserSyncs`);
-    const spb = isPlainObject(config.getConfig('userSync')) &&
-        isNumber(config.getConfig('userSync').syncsPerBidder)
-      ? config.getConfig('userSync').syncsPerBidder : USERSYNC_DEFAULT_CONFIG.syncsPerBidder;
-
-    if (spb > 0 && isPlainObject(syncOptions) && (syncOptions.iframeEnabled || syncOptions.pixelEnabled)) {
-      let pixels = [];
-      if (serverResponses &&
-        isArray(serverResponses) &&
-        serverResponses.length > 0 &&
-        isPlainObject(serverResponses[0].body) &&
-        isPlainObject(serverResponses[0].body.ext) &&
-        isArray(serverResponses[0].body.ext.cm) &&
-        serverResponses[0].body.ext.cm.length > 0) {
-        pixels = serverResponses[0].body.ext.cm;
-      }
-
-      const syncs = [];
-      const query = [];
-      query.push('cbuster={cbuster}');
-      query.push('gdpr_consent=' + encodeURIComponent(isPlainObject(gdprConsent) && isStr(gdprConsent?.consentString) ? gdprConsent.consentString : ''));
-      if (isPlainObject(gdprConsent) && typeof gdprConsent?.gdprApplies === 'boolean' && gdprConsent.gdprApplies) {
-        query.push('gdpr=1');
-      } else {
-        query.push('gdpr=0');
-      }
-      if (isPlainObject(uspConsent) && uspConsent?.consentString) {
-        query.push(`us_privacy=${encodeURIComponent(uspConsent?.consentString)}`);
-      }
-      if (isPlainObject(gppConsent) && gppConsent?.gppString) {
-        query.push(`gppString=${encodeURIComponent(gppConsent?.gppString)}`);
-      }
-      if (config.getConfig('coppa')) {
-        query.push('coppa=1')
-      }
-      const q = query.join('&')
-      if (syncOptions.iframeEnabled) {
-        syncs.push({
-          type: 'iframe',
-          url: 'https://cm.mgid.com/i.html?' + q.replace('{cbuster}', Math.round(new Date().getTime()))
-        });
-      } else if (syncOptions.pixelEnabled) {
-        if (pixels.length === 0) {
-          for (let i = 0; i < spb; i++) {
-            syncs.push({
-              type: 'image',
-              url: 'https://cm.mgid.com/i.gif?' + q.replace('{cbuster}', Math.round(new Date().getTime())) // randomly selects partner if sync required
-            });
-          }
-        } else {
-          for (let i = 0; i < spb && i < pixels.length; i++) {
-            syncs.push({
-              type: 'image',
-              url: pixels[i] + (pixels[i].indexOf('?') > 0 ? '&' : '?') + q.replace('{cbuster}', Math.round(new Date().getTime()))
-            });
-          }
-        }
-      }
-      return syncs;
-    }
-  }
+  getUserSyncs: getUserSyncs,
 };
 
 registerBidder(spec);
 
-function setOnAny(collection, key) {
-  for (let i = 0, result; i < collection.length; i++) {
-    result = deepAccess(collection[i], key);
-    if (result) {
-      return result;
-    }
-  }
-}
-
 /**
  * Unpack the Server's Bid into a Prebid-compatible one.
  * @param serverBid
@@ -480,25 +415,11 @@ function setMediaType(bid, newBid) {
   }
 }
 
-function extractDomainFromHost(pageHost) {
+function extractDomainFromHostExceptLocalhost(pageHost) {
   if (pageHost === 'localhost') {
     return 'localhost'
   }
-  let domain = null;
-  try {
-    let domains = /[-\w]+\.([-\w]+|[-\w]{3,}|[-\w]{1,3}\.[-\w]{2})$/i.exec(pageHost);
-    if (domains != null && domains.length > 0) {
-      domain = domains[0];
-      for (let i = 1; i < domains.length; i++) {
-        if (domains[i].length > domain.length) {
-          domain = domains[i];
-        }
-      }
-    }
-  } catch (e) {
-    domain = null;
-  }
-  return domain;
+  return extractDomainFromHost(pageHost)
 }
 
 function getLanguage() {
@@ -676,33 +597,25 @@ function commonNativeRequestObject(nativeAsset, params) {
 function parseNativeResponse(bid, newBid) {
   newBid.native = {};
   if (bid.hasOwnProperty('adm')) {
-    let adm = '';
+    let nativeAdm = '';
     try {
-      adm = JSON.parse(bid.adm);
+      nativeAdm = JSON.parse(bid.adm);
     } catch (ex) {
       logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native response for ad response: ' + newBid.adm);
       return;
     }
-    if (adm && adm.native && adm.native.assets && adm.native.assets.length > 0) {
+    if (nativeAdm && nativeAdm.native && nativeAdm.native.assets && nativeAdm.native.assets.length > 0) {
       newBid.mediaType = NATIVE;
-      for (let i = 0, len = adm.native.assets.length; i < len; i++) {
-        switch (adm.native.assets[i].id) {
+      for (let i = 0, len = nativeAdm.native.assets.length; i < len; i++) {
+        switch (nativeAdm.native.assets[i].id) {
           case NATIVE_ASSETS.TITLE.ID:
-            newBid.native.title = adm.native.assets[i].title && adm.native.assets[i].title.text;
+            newBid.native.title = nativeAdm.native.assets[i].title && nativeAdm.native.assets[i].title.text;
             break;
           case NATIVE_ASSETS.IMAGE.ID:
-            newBid.native.image = {
-              url: adm.native.assets[i].img && adm.native.assets[i].img.url,
-              height: adm.native.assets[i].img && adm.native.assets[i].img.h,
-              width: adm.native.assets[i].img && adm.native.assets[i].img.w,
-            };
+            newBid.native.image = copyFromAdmAsset(nativeAdm.native.assets[i]);
             break;
           case NATIVE_ASSETS.ICON.ID:
-            newBid.native.icon = {
-              url: adm.native.assets[i].img && adm.native.assets[i].img.url,
-              height: adm.native.assets[i].img && adm.native.assets[i].img.h,
-              width: adm.native.assets[i].img && adm.native.assets[i].img.w,
-            };
+            newBid.native.icon = copyFromAdmAsset(nativeAdm.native.assets[i]);
             break;
           case NATIVE_ASSETS.SPONSOREDBY.ID:
           case NATIVE_ASSETS.SPONSORED.ID:
@@ -712,14 +625,14 @@ function parseNativeResponse(bid, newBid) {
           case NATIVE_ASSETS.BODY.ID:
           case NATIVE_ASSETS.DISPLAYURL.ID:
           case NATIVE_ASSETS.CTA.ID:
-            newBid.native[spec.NATIVE_ASSET_ID_TO_KEY_MAP[adm.native.assets[i].id]] = adm.native.assets[i].data && adm.native.assets[i].data.value;
+            newBid.native[spec.NATIVE_ASSET_ID_TO_KEY_MAP[nativeAdm.native.assets[i].id]] = nativeAdm.native.assets[i].data && nativeAdm.native.assets[i].data.value;
             break;
         }
       }
-      newBid.native.clickUrl = adm.native.link && adm.native.link.url;
-      newBid.native.clickTrackers = (adm.native.link && adm.native.link.clicktrackers) || [];
-      newBid.native.impressionTrackers = adm.native.imptrackers || [];
-      newBid.native.jstracker = adm.native.jstracker || [];
+      newBid.native.clickUrl = nativeAdm.native.link && nativeAdm.native.link.url;
+      newBid.native.clickTrackers = (nativeAdm.native.link && nativeAdm.native.link.clicktrackers) || [];
+      newBid.native.impressionTrackers = nativeAdm.native.imptrackers || [];
+      newBid.native.jstracker = nativeAdm.native.jstracker || [];
       newBid.width = 0;
       newBid.height = 0;
     }
@@ -779,3 +692,11 @@ function getBidFloor(bid, cur) {
   }
   return {floor: bidFloor, cur: cur}
 }
+
+function copyFromAdmAsset(asset) {
+  return {
+    url: asset.img && asset.img.url,
+    height: asset.img && asset.img.h,
+    width: asset.img && asset.img.w,
+  }
+}
diff --git a/modules/mgidRtdProvider.js b/modules/mgidRtdProvider.js
index fd2c0bbe6fd..059be4e9103 100644
--- a/modules/mgidRtdProvider.js
+++ b/modules/mgidRtdProvider.js
@@ -5,6 +5,10 @@ import {getStorageManager} from '../src/storageManager.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const MODULE_NAME = 'realTimeData';
 const SUBMODULE_NAME = 'mgid';
 const MGID_RTD_API_URL = 'https://servicer.mgid.com/sda';
diff --git a/modules/mgidXBidAdapter.js b/modules/mgidXBidAdapter.js
index 5789f0d8b95..f15b76818b5 100644
--- a/modules/mgidXBidAdapter.js
+++ b/modules/mgidXBidAdapter.js
@@ -1,263 +1,35 @@
-import {
-  isFn,
-  deepAccess,
-  logMessage,
-  logError,
-  isPlainObject,
-  isNumber,
-  isArray,
-  isStr
-} from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-import { USERSYNC_DEFAULT_CONFIG } from '../src/userSync.js';
+import { isBidRequestValid, buildRequestsBase, interpretResponse } from '../libraries/teqblazeUtils/bidderUtils.js';
+import { getUserSyncs } from '../libraries/mgidUtils/mgidUtils.js'
 
 const BIDDER_CODE = 'mgidX';
 const GVLID = 358;
-const AD_URL = 'https://us-east-x.mgid.com/pbjs';
-const PIXEL_SYNC_URL = 'https://cm.mgid.com/i.gif';
-const IFRAME_SYNC_URL = 'https://cm.mgid.com/i.html';
+const AD_URL = 'https://#{REGION}#.mgid.com/pbjs';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
+const buildRequests = (validBidRequests = [], bidderRequest = {}) => {
+  const request = buildRequestsBase({ adUrl: AD_URL, validBidRequests, bidderRequest });
+  const region = validBidRequests[0].params?.region;
 
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
+  if (region === 'eu') {
+    request.url = AD_URL.replace('#{REGION}#', 'eu-x');
+  } else {
+    request.url = AD_URL.replace('#{REGION}#', 'us-east-x');
   }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId, endpointId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
 
-  if (placementId) {
-    placement.placementId = placementId;
-    placement.type = 'publisher';
-  } else if (endpointId) {
-    placement.endpointId = endpointId;
-    placement.type = 'network';
-  }
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
+  return request;
+};
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests,
+  interpretResponse,
 
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) => {
-    const spb = isPlainObject(config.getConfig('userSync')) &&
-    isNumber(config.getConfig('userSync').syncsPerBidder)
-      ? config.getConfig('userSync').syncsPerBidder : USERSYNC_DEFAULT_CONFIG.syncsPerBidder;
-
-    if (spb > 0 && isPlainObject(syncOptions) && (syncOptions.iframeEnabled || syncOptions.pixelEnabled)) {
-      let pixels = [];
-      if (serverResponses &&
-        isArray(serverResponses) &&
-        serverResponses.length > 0 &&
-        isPlainObject(serverResponses[0].body) &&
-        isPlainObject(serverResponses[0].body.ext) &&
-        isArray(serverResponses[0].body.ext.cm) &&
-        serverResponses[0].body.ext.cm.length > 0) {
-        pixels = serverResponses[0].body.ext.cm;
-      }
-
-      const syncs = [];
-      const query = [];
-      query.push('cbuster={cbuster}');
-      query.push('gdpr_consent=' + encodeURIComponent(isPlainObject(gdprConsent) && isStr(gdprConsent?.consentString) ? gdprConsent.consentString : ''));
-      if (isPlainObject(gdprConsent) && typeof gdprConsent?.gdprApplies === 'boolean' && gdprConsent.gdprApplies) {
-        query.push('gdpr=1');
-      } else {
-        query.push('gdpr=0');
-      }
-      if (isPlainObject(uspConsent) && uspConsent?.consentString) {
-        query.push(`us_privacy=${encodeURIComponent(uspConsent?.consentString)}`);
-      }
-      if (isPlainObject(gppConsent) && gppConsent?.gppString) {
-        query.push(`gppString=${encodeURIComponent(gppConsent?.gppString)}`);
-      }
-      if (config.getConfig('coppa')) {
-        query.push('coppa=1')
-      }
-      const q = query.join('&')
-      if (syncOptions.iframeEnabled) {
-        syncs.push({
-          type: 'iframe',
-          url: IFRAME_SYNC_URL + '?' + q.replace('{cbuster}', Math.round(new Date().getTime()))
-        });
-      } else if (syncOptions.pixelEnabled) {
-        if (pixels.length === 0) {
-          for (let i = 0; i < spb; i++) {
-            syncs.push({
-              type: 'image',
-              url: PIXEL_SYNC_URL + '?' + q.replace('{cbuster}', Math.round(new Date().getTime())) // randomly selects partner if sync required
-            });
-          }
-        } else {
-          for (let i = 0; i < spb && i < pixels.length; i++) {
-            syncs.push({
-              type: 'image',
-              url: pixels[i] + (pixels[i].indexOf('?') > 0 ? '&' : '?') + q.replace('{cbuster}', Math.round(new Date().getTime()))
-            });
-          }
-        }
-      }
-      return syncs;
-    }
-  }
+  getUserSyncs: getUserSyncs,
 };
 
 registerBidder(spec);
diff --git a/modules/microadBidAdapter.js b/modules/microadBidAdapter.js
index ed88dce757c..82b9025766b 100644
--- a/modules/microadBidAdapter.js
+++ b/modules/microadBidAdapter.js
@@ -28,7 +28,6 @@ const AUDIENCE_IDS = [
   {type: 8, bidKey: 'userId.id5id.uid', source: 'id5-sync.com'},
   {type: 9, bidKey: 'userId.tdid', source: 'adserver.org'},
   {type: 10, bidKey: 'userId.novatiq.snowflake', source: 'novatiq.com'},
-  {type: 11, bidKey: 'userId.parrableId.eid', source: 'parrable.com'},
   {type: 12, bidKey: 'userId.dacId.id', source: 'dac.co.jp'},
   {type: 13, bidKey: 'userId.idl_env', source: 'liveramp.com'},
   {type: 14, bidKey: 'userId.criteoId', source: 'criteo.com'},
@@ -115,6 +114,26 @@ export const spec = {
         params['aids'] = JSON.stringify(aidsParams)
       }
 
+      const pbadslot = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+      const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || pbadslot;
+      if (gpid) {
+        params['gpid'] = gpid;
+      }
+
+      if (pbadslot) {
+        params['pbadslot'] = pbadslot;
+      }
+
+      const adservname = deepAccess(bid, 'ortb2Imp.ext.data.adserver.name');
+      if (adservname) {
+        params['adservname'] = adservname;
+      }
+
+      const adservadslot = deepAccess(bid, 'ortb2Imp.ext.data.adserver.adslot');
+      if (adservadslot) {
+        params['adservadslot'] = adservadslot;
+      }
+
       requests.push({
         method: 'GET',
         url: ENDPOINT_URLS[ENVIRONMENT],
diff --git a/modules/minutemediaBidAdapter.js b/modules/minutemediaBidAdapter.js
index e67534d74fe..4e83c5c6db4 100644
--- a/modules/minutemediaBidAdapter.js
+++ b/modules/minutemediaBidAdapter.js
@@ -2,33 +2,28 @@ import {
   logWarn,
   logInfo,
   isArray,
-  isFn,
   deepAccess,
-  isEmpty,
-  contains,
-  timestamp,
   triggerPixel,
-  isInteger,
-  getBidIdParameter
 } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  getEndpoint,
+  generateBidsParams,
+  generateGeneralParams,
+  buildBidResponse,
+} from '../libraries/riseUtils/index.js';
 
 const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
 const BIDDER_CODE = 'minutemedia';
 const ADAPTER_VERSION = '6.0.0';
 const TTL = 360;
-const CURRENCY = 'USD';
-const SELLER_ENDPOINT = 'https://hb.minutemedia-prebid.com/';
+const DEFAULT_CURRENCY = 'USD';
+const BASE_URL = 'https://hb.minutemedia-prebid.com/';
 const MODES = {
   PRODUCTION: 'hb-mm-multi',
   TEST: 'hb-multi-mm-test'
-}
-const SUPPORTED_SYNC_METHODS = {
-  IFRAME: 'iframe',
-  PIXEL: 'pixel'
-}
+};
 
 export const spec = {
   code: BIDDER_CODE,
@@ -51,50 +46,24 @@ export const spec = {
   buildRequests: function (validBidRequests, bidderRequest) {
     const combinedRequestsObject = {};
 
-    // use data from the first bid, to create the general params for all bids
     const generalObject = validBidRequests[0];
     const testMode = generalObject.params.testMode;
 
-    combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest);
+    combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest, ADAPTER_VERSION);
     combinedRequestsObject.bids = generateBidsParams(validBidRequests, bidderRequest);
 
     return {
       method: 'POST',
-      url: getEndpoint(testMode),
+      url: getEndpoint(testMode, BASE_URL, MODES),
       data: combinedRequestsObject
-    }
+    };
   },
-  interpretResponse: function ({body}) {
+  interpretResponse: function ({ body }) {
     const bidResponses = [];
 
     if (body.bids) {
       body.bids.forEach(adUnit => {
-        const bidResponse = {
-          requestId: adUnit.requestId,
-          cpm: adUnit.cpm,
-          currency: adUnit.currency || CURRENCY,
-          width: adUnit.width,
-          height: adUnit.height,
-          ttl: adUnit.ttl || TTL,
-          creativeId: adUnit.requestId,
-          netRevenue: adUnit.netRevenue || true,
-          nurl: adUnit.nurl,
-          mediaType: adUnit.mediaType,
-          meta: {
-            mediaType: adUnit.mediaType
-          }
-        };
-
-        if (adUnit.mediaType === VIDEO) {
-          bidResponse.vastXml = adUnit.vastXml;
-        } else if (adUnit.mediaType === BANNER) {
-          bidResponse.ad = adUnit.ad;
-        }
-
-        if (adUnit.adomain && adUnit.adomain.length) {
-          bidResponse.meta.advertiserDomains = adUnit.adomain;
-        }
-
+        const bidResponse = buildBidResponse(adUnit, DEFAULT_CURRENCY, TTL, VIDEO, BANNER);
         bidResponses.push(bidResponse);
       });
     }
@@ -104,20 +73,20 @@ export const spec = {
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
     for (const response of serverResponses) {
-      if (syncOptions.iframeEnabled && response.body.params.userSyncURL) {
+      if (syncOptions.iframeEnabled && deepAccess(response, 'body.params.userSyncURL')) {
         syncs.push({
           type: 'iframe',
-          url: response.body.params.userSyncURL
+          url: deepAccess(response, 'body.params.userSyncURL')
         });
       }
-      if (syncOptions.pixelEnabled && isArray(response.body.params.userSyncPixels)) {
+      if (syncOptions.pixelEnabled && isArray(deepAccess(response, 'body.params.userSyncPixels'))) {
         const pixels = response.body.params.userSyncPixels.map(pixel => {
           return {
             type: 'image',
             url: pixel
-          }
-        })
-        syncs.push(...pixels)
+          };
+        });
+        syncs.push(...pixels);
       }
     }
     return syncs;
@@ -135,341 +104,3 @@ export const spec = {
 };
 
 registerBidder(spec);
-
-/**
- * Get floor price
- * @param bid {bid}
- * @returns {Number}
- */
-function getFloor(bid, mediaType) {
-  if (!isFn(bid.getFloor)) {
-    return 0;
-  }
-  let floorResult = bid.getFloor({
-    currency: CURRENCY,
-    mediaType: mediaType,
-    size: '*'
-  });
-  return floorResult.currency === CURRENCY && floorResult.floor ? floorResult.floor : 0;
-}
-
-/**
- * Get the the ad sizes array from the bid
- * @param bid {bid}
- * @returns {Array}
- */
-function getSizesArray(bid, mediaType) {
-  let sizesArray = []
-
-  if (deepAccess(bid, `mediaTypes.${mediaType}.sizes`)) {
-    sizesArray = bid.mediaTypes[mediaType].sizes;
-  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
-    sizesArray = bid.sizes;
-  }
-
-  return sizesArray;
-}
-
-/**
- * Get schain string value
- * @param schainObject {Object}
- * @returns {string}
- */
-function getSupplyChain(schainObject) {
-  if (isEmpty(schainObject)) {
-    return '';
-  }
-  let scStr = `${schainObject.ver},${schainObject.complete}`;
-  schainObject.nodes.forEach((node) => {
-    scStr += '!';
-    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
-    scStr += `${node.hp ? encodeURIComponent(node.hp) : ''},`;
-    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
-  });
-  return scStr;
-}
-
-/**
- * Get encoded node value
- * @param val {string}
- * @returns {string}
- */
-function getEncodedValIfNotEmpty(val) {
-  return !isEmpty(val) ? encodeURIComponent(val) : '';
-}
-
-/**
- * Get preferred user-sync method based on publisher configuration
- * @param bidderCode {string}
- * @returns {string}
- */
-function getAllowedSyncMethod(filterSettings, bidderCode) {
-  const iframeConfigsToCheck = ['all', 'iframe'];
-  const pixelConfigToCheck = 'image';
-  if (filterSettings && iframeConfigsToCheck.some(config => isSyncMethodAllowed(filterSettings[config], bidderCode))) {
-    return SUPPORTED_SYNC_METHODS.IFRAME;
-  }
-  if (!filterSettings || !filterSettings[pixelConfigToCheck] || isSyncMethodAllowed(filterSettings[pixelConfigToCheck], bidderCode)) {
-    return SUPPORTED_SYNC_METHODS.PIXEL;
-  }
-}
-
-/**
- * Check if sync rule is supported
- * @param syncRule {Object}
- * @param bidderCode {string}
- * @returns {boolean}
- */
-function isSyncMethodAllowed(syncRule, bidderCode) {
-  if (!syncRule) {
-    return false;
-  }
-  const isInclude = syncRule.filter === 'include';
-  const bidders = isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
-  return isInclude && contains(bidders, bidderCode);
-}
-
-/**
- * Get the seller endpoint
- * @param testMode {boolean}
- * @returns {string}
- */
-function getEndpoint(testMode) {
-  return testMode
-    ? SELLER_ENDPOINT + MODES.TEST
-    : SELLER_ENDPOINT + MODES.PRODUCTION;
-}
-
-/**
- * get device type
- * @param uad {ua}
- * @returns {string}
- */
-function getDeviceType(ua) {
-  if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i
-    .test(ua.toLowerCase())) {
-    return '5';
-  }
-  if (/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i
-    .test(ua.toLowerCase())) {
-    return '4';
-  }
-  if (/smart[-_\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b/i
-    .test(ua.toLowerCase())) {
-    return '3';
-  }
-  return '1';
-}
-
-function generateBidsParams(validBidRequests, bidderRequest) {
-  const bidsArray = [];
-
-  if (validBidRequests.length) {
-    validBidRequests.forEach(bid => {
-      bidsArray.push(generateBidParameters(bid, bidderRequest));
-    });
-  }
-
-  return bidsArray;
-}
-
-/**
- * Generate bid specific parameters
- * @param {bid} bid
- * @param {bidderRequest} bidderRequest
- * @returns {Object} bid specific params object
- */
-function generateBidParameters(bid, bidderRequest) {
-  const {params} = bid;
-  const mediaType = isBanner(bid) ? BANNER : VIDEO;
-  const sizesArray = getSizesArray(bid, mediaType);
-
-  // fix floor price in case of NAN
-  if (isNaN(params.floorPrice)) {
-    params.floorPrice = 0;
-  }
-
-  const bidObject = {
-    mediaType,
-    adUnitCode: getBidIdParameter('adUnitCode', bid),
-    sizes: sizesArray,
-    floorPrice: Math.max(getFloor(bid, mediaType), params.floorPrice),
-    bidId: getBidIdParameter('bidId', bid),
-    loop: getBidIdParameter('bidderRequestsCount', bid),
-    bidderRequestId: getBidIdParameter('bidderRequestId', bid),
-    transactionId: bid.ortb2Imp?.ext?.tid || '',
-    coppa: 0
-  };
-
-  const pos = deepAccess(bid, `mediaTypes.${mediaType}.pos`);
-  if (pos) {
-    bidObject.pos = pos;
-  }
-
-  const gpid = deepAccess(bid, `ortb2Imp.ext.gpid`);
-  if (gpid) {
-    bidObject.gpid = gpid;
-  }
-
-  const placementId = params.placementId || deepAccess(bid, `mediaTypes.${mediaType}.name`);
-  if (placementId) {
-    bidObject.placementId = placementId;
-  }
-
-  const mimes = deepAccess(bid, `mediaTypes.${mediaType}.mimes`);
-  if (mimes) {
-    bidObject.mimes = mimes;
-  }
-  const api = deepAccess(bid, `mediaTypes.${mediaType}.api`);
-  if (api) {
-    bidObject.api = api;
-  }
-
-  const sua = deepAccess(bid, `ortb2.device.sua`);
-  if (sua) {
-    bidObject.sua = sua;
-  }
-
-  const coppa = deepAccess(bid, `ortb2.regs.coppa`)
-  if (coppa) {
-    bidObject.coppa = 1;
-  }
-
-  if (mediaType === VIDEO) {
-    const playbackMethod = deepAccess(bid, `mediaTypes.video.playbackmethod`);
-    let playbackMethodValue;
-
-    // verify playbackMethod is of type integer array, or integer only.
-    if (Array.isArray(playbackMethod) && isInteger(playbackMethod[0])) {
-      // only the first playbackMethod in the array will be used, according to OpenRTB 2.5 recommendation
-      playbackMethodValue = playbackMethod[0];
-    } else if (isInteger(playbackMethod)) {
-      playbackMethodValue = playbackMethod;
-    }
-
-    if (playbackMethodValue) {
-      bidObject.playbackMethod = playbackMethodValue;
-    }
-
-    const placement = deepAccess(bid, `mediaTypes.video.placement`);
-    if (placement) {
-      bidObject.placement = placement;
-    }
-
-    const minDuration = deepAccess(bid, `mediaTypes.video.minduration`);
-    if (minDuration) {
-      bidObject.minDuration = minDuration;
-    }
-
-    const maxDuration = deepAccess(bid, `mediaTypes.video.maxduration`);
-    if (maxDuration) {
-      bidObject.maxDuration = maxDuration;
-    }
-
-    const skip = deepAccess(bid, `mediaTypes.video.skip`);
-    if (skip) {
-      bidObject.skip = skip;
-    }
-
-    const linearity = deepAccess(bid, `mediaTypes.video.linearity`);
-    if (linearity) {
-      bidObject.linearity = linearity;
-    }
-
-    const protocols = deepAccess(bid, `mediaTypes.video.protocols`);
-    if (protocols) {
-      bidObject.protocols = protocols;
-    }
-
-    const plcmt = deepAccess(bid, `mediaTypes.video.plcmt`);
-    if (plcmt) {
-      bidObject.plcmt = plcmt;
-    }
-  }
-
-  return bidObject;
-}
-
-function isBanner(bid) {
-  return bid.mediaTypes && bid.mediaTypes.banner;
-}
-
-/**
- * Generate params that are common between all bids
- * @param {single bid object} generalObject
- * @param {bidderRequest} bidderRequest
- * @returns {object} the common params object
- */
-function generateGeneralParams(generalObject, bidderRequest) {
-  const domain = window.location.hostname;
-  const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
-  const {bidderCode} = bidderRequest;
-  const generalBidParams = generalObject.params;
-  const timeout = bidderRequest.timeout;
-
-  // these params are snake_case instead of camelCase to allow backwards compatability on the server.
-  // in the future, these will be converted to camelCase to match our convention.
-  const generalParams = {
-    wrapper_type: 'prebidjs',
-    wrapper_vendor: '$$PREBID_GLOBAL$$',
-    wrapper_version: '$prebid.version$',
-    adapter_version: ADAPTER_VERSION,
-    auction_start: timestamp(),
-    publisher_id: generalBidParams.org,
-    publisher_name: domain,
-    site_domain: domain,
-    dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
-    device_type: getDeviceType(navigator.userAgent),
-    ua: navigator.userAgent,
-    is_wrapper: !!generalBidParams.isWrapper,
-    session_id: generalBidParams.sessionId || getBidIdParameter('bidderRequestId', generalObject),
-    tmax: timeout
-  }
-
-  const userIdsParam = getBidIdParameter('userId', generalObject);
-  if (userIdsParam) {
-    generalParams.userIds = JSON.stringify(userIdsParam);
-  }
-
-  const ortb2Metadata = bidderRequest.ortb2 || {};
-  if (ortb2Metadata.site) {
-    generalParams.site_metadata = JSON.stringify(ortb2Metadata.site);
-  }
-  if (ortb2Metadata.user) {
-    generalParams.user_metadata = JSON.stringify(ortb2Metadata.user);
-  }
-
-  if (syncEnabled) {
-    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
-    if (allowedSyncMethod) {
-      generalParams.cs_method = allowedSyncMethod;
-    }
-  }
-
-  if (bidderRequest.uspConsent) {
-    generalParams.us_privacy = bidderRequest.uspConsent;
-  }
-
-  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
-    generalParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
-    generalParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
-  }
-
-  if (generalBidParams.ifa) {
-    generalParams.ifa = generalBidParams.ifa;
-  }
-
-  if (generalObject.schain) {
-    generalParams.schain = getSupplyChain(generalObject.schain);
-  }
-
-  if (bidderRequest && bidderRequest.refererInfo) {
-    generalParams.referrer = deepAccess(bidderRequest, 'refererInfo.ref');
-    generalParams.page_url = deepAccess(bidderRequest, 'refererInfo.page') || deepAccess(window, 'location.href');
-  }
-
-  return generalParams
-}
diff --git a/modules/minutemediaplusBidAdapter.js b/modules/minutemediaplusBidAdapter.js
deleted file mode 100644
index 146d437b1fa..00000000000
--- a/modules/minutemediaplusBidAdapter.js
+++ /dev/null
@@ -1,349 +0,0 @@
-import {_each, deepAccess, parseSizesInput, parseUrl, uniques, isFn} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {config} from '../src/config.js';
-
-const GVLID = 918;
-const DEFAULT_SUB_DOMAIN = 'exchange';
-const BIDDER_CODE = 'mmplus';
-const BIDDER_VERSION = '1.0.0';
-const CURRENCY = 'USD';
-const TTL_SECONDS = 60 * 5;
-const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 15;
-
-const storage = getStorageManager({bidderCode: BIDDER_CODE});
-
-function getTopWindowQueryParams() {
-  try {
-    const parsedUrl = parseUrl(window.top.document.URL, {decodeSearchAsString: true});
-    return parsedUrl.search;
-  } catch (e) {
-    return '';
-  }
-}
-
-export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
-  return `https://${subDomain}.minutemedia-prebid.com`;
-}
-
-export function extractCID(params) {
-  return params.cId || params.CID || params.cID || params.CId || params.cid || params.ciD || params.Cid || params.CiD;
-}
-
-export function extractPID(params) {
-  return params.pId || params.PID || params.pID || params.PId || params.pid || params.piD || params.Pid || params.PiD;
-}
-
-export function extractSubDomain(params) {
-  return params.subDomain || params.SubDomain || params.Subdomain || params.subdomain || params.SUBDOMAIN || params.subDOMAIN;
-}
-
-function isBidRequestValid(bid) {
-  const params = bid.params || {};
-  return !!(extractCID(params) && extractPID(params));
-}
-
-function buildRequest(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout) {
-  const {
-    params,
-    bidId,
-    userId,
-    adUnitCode,
-    schain,
-    mediaTypes,
-    auctionId,
-    ortb2Imp,
-    bidderRequestId,
-    bidRequestsCount,
-    bidderRequestsCount,
-    bidderWinsCount
-  } = bid;
-  let {bidFloor, ext} = params;
-  const hashUrl = hashCode(topWindowUrl);
-  const uniqueDealId = getUniqueDealId(hashUrl);
-  const cId = extractCID(params);
-  const pId = extractPID(params);
-  const subDomain = extractSubDomain(params);
-
-  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid', deepAccess(bid, 'ortb2Imp.ext.data.pbadslot', ''));
-
-  if (isFn(bid.getFloor)) {
-    const floorInfo = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*'
-    });
-
-    if (floorInfo.currency === 'USD') {
-      bidFloor = floorInfo.floor;
-    }
-  }
-
-  let data = {
-    url: encodeURIComponent(topWindowUrl),
-    uqs: getTopWindowQueryParams(),
-    cb: Date.now(),
-    bidFloor: bidFloor,
-    bidId: bidId,
-    referrer: bidderRequest.refererInfo.ref,
-    adUnitCode: adUnitCode,
-    publisherId: pId,
-    sizes: sizes,
-    uniqueDealId: uniqueDealId,
-    bidderVersion: BIDDER_VERSION,
-    prebidVersion: '$prebid.version$',
-    res: `${screen.width}x${screen.height}`,
-    schain: schain,
-    mediaTypes: mediaTypes,
-    gpid: gpid,
-    // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-    auctionId: auctionId,
-    transactionId: ortb2Imp?.ext?.tid,
-    bidderRequestId: bidderRequestId,
-    bidRequestsCount: bidRequestsCount,
-    bidderRequestsCount: bidderRequestsCount,
-    bidderWinsCount: bidderWinsCount,
-    bidderTimeout: bidderTimeout
-  };
-
-  appendUserIdsToRequestPayload(data, userId);
-
-  const sua = deepAccess(bidderRequest, 'ortb2.device.sua');
-
-  if (sua) {
-    data.sua = sua;
-  }
-
-  if (bidderRequest.gdprConsent) {
-    if (bidderRequest.gdprConsent.consentString) {
-      data.gdprConsent = bidderRequest.gdprConsent.consentString;
-    }
-    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
-      data.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
-    }
-  }
-  if (bidderRequest.uspConsent) {
-    data.usPrivacy = bidderRequest.uspConsent;
-  }
-
-  if (bidderRequest.gppConsent) {
-    data.gppString = bidderRequest.gppConsent.gppString;
-    data.gppSid = bidderRequest.gppConsent.applicableSections;
-  } else if (bidderRequest.ortb2?.regs?.gpp) {
-    data.gppString = bidderRequest.ortb2.regs.gpp;
-    data.gppSid = bidderRequest.ortb2.regs.gpp_sid;
-  }
-
-  const dto = {
-    method: 'POST',
-    url: `${createDomain(subDomain)}/prebid/multi/${cId}`,
-    data: data
-  };
-
-  _each(ext, (value, key) => {
-    dto.data['ext.' + key] = value;
-  });
-
-  return dto;
-}
-
-function appendUserIdsToRequestPayload(payloadRef, userIds) {
-  let key;
-  _each(userIds, (userId, idSystemProviderName) => {
-    key = `uid.${idSystemProviderName}`;
-
-    switch (idSystemProviderName) {
-      case 'digitrustid':
-        payloadRef[key] = deepAccess(userId, 'data.id');
-        break;
-      case 'lipb':
-        payloadRef[key] = userId.lipbid;
-        break;
-      case 'parrableId':
-        payloadRef[key] = userId.eid;
-        break;
-      case 'id5id':
-        payloadRef[key] = userId.uid;
-        break;
-      default:
-        payloadRef[key] = userId;
-    }
-  });
-}
-
-function buildRequests(validBidRequests, bidderRequest) {
-  const topWindowUrl = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
-  const bidderTimeout = config.getConfig('bidderTimeout');
-  const requests = [];
-  validBidRequests.forEach(validBidRequest => {
-    const sizes = parseSizesInput(validBidRequest.sizes);
-    const request = buildRequest(validBidRequest, topWindowUrl, sizes, bidderRequest, bidderTimeout);
-    requests.push(request);
-  });
-  return requests;
-}
-
-function interpretResponse(serverResponse, request) {
-  if (!serverResponse || !serverResponse.body) {
-    return [];
-  }
-  const {bidId} = request.data;
-  const {results} = serverResponse.body;
-
-  let output = [];
-
-  try {
-    results.forEach(result => {
-      const {
-        creativeId,
-        ad,
-        price,
-        exp,
-        width,
-        height,
-        currency,
-        metaData,
-        advertiserDomains,
-        mediaType = BANNER
-      } = result;
-      if (!ad || !price) {
-        return;
-      }
-
-      const response = {
-        requestId: bidId,
-        cpm: price,
-        width: width,
-        height: height,
-        creativeId: creativeId,
-        currency: currency || CURRENCY,
-        netRevenue: true,
-        ttl: exp || TTL_SECONDS,
-      };
-
-      if (metaData) {
-        Object.assign(response, {
-          meta: metaData
-        })
-      } else {
-        Object.assign(response, {
-          meta: {
-            advertiserDomains: advertiserDomains || []
-          }
-        })
-      }
-
-      if (mediaType === BANNER) {
-        Object.assign(response, {
-          ad: ad,
-        });
-      } else {
-        Object.assign(response, {
-          vastXml: ad,
-          mediaType: VIDEO
-        });
-      }
-      output.push(response);
-    });
-    return output;
-  } catch (e) {
-    return [];
-  }
-}
-
-function getUserSyncs(syncOptions, responses, gdprConsent = {}, uspConsent = '', gppConsent = {}) {
-  let syncs = [];
-  const {iframeEnabled, pixelEnabled} = syncOptions;
-  const {gdprApplies, consentString = ''} = gdprConsent;
-  const {gppString, applicableSections} = gppConsent;
-
-  const cidArr = responses.filter(resp => deepAccess(resp, 'body.cid')).map(resp => resp.body.cid).filter(uniques);
-  let params = `?cid=${encodeURIComponent(cidArr.join(','))}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`
-
-  if (gppString && applicableSections?.length) {
-    params += '&gpp=' + encodeURIComponent(gppString);
-    params += '&gpp_sid=' + encodeURIComponent(applicableSections.join(','));
-  }
-
-  if (iframeEnabled) {
-    syncs.push({
-      type: 'iframe',
-      url: `https://sync.minutemedia-prebid.com/api/sync/iframe/${params}`
-    });
-  }
-  if (pixelEnabled) {
-    syncs.push({
-      type: 'image',
-      url: `https://sync.minutemedia-prebid.com/api/sync/image/${params}`
-    });
-  }
-  return syncs;
-}
-
-export function hashCode(s, prefix = '_') {
-  const l = s.length;
-  let h = 0
-  let i = 0;
-  if (l > 0) {
-    while (i < l) {
-      h = (h << 5) - h + s.charCodeAt(i++) | 0;
-    }
-  }
-  return prefix + h;
-}
-
-export function getUniqueDealId(key, expiry = UNIQUE_DEAL_ID_EXPIRY) {
-  const storageKey = `u_${key}`;
-  const now = Date.now();
-  const data = getStorageItem(storageKey);
-  let uniqueId;
-
-  if (!data || !data.value || now - data.created > expiry) {
-    uniqueId = `${key}_${now.toString()}`;
-    setStorageItem(storageKey, uniqueId);
-  } else {
-    uniqueId = data.value;
-  }
-
-  return uniqueId;
-}
-
-export function getStorageItem(key) {
-  try {
-    return tryParseJSON(storage.getDataFromLocalStorage(key));
-  } catch (e) {
-  }
-
-  return null;
-}
-
-export function setStorageItem(key, value, timestamp) {
-  try {
-    const created = timestamp || Date.now();
-    const data = JSON.stringify({value, created});
-    storage.setDataInLocalStorage(key, data);
-  } catch (e) {
-  }
-}
-
-export function tryParseJSON(value) {
-  try {
-    return JSON.parse(value);
-  } catch (e) {
-    return value;
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  version: BIDDER_VERSION,
-  gvlid: GVLID,
-  supportedMediaTypes: [BANNER, VIDEO],
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  getUserSyncs
-};
-
-registerBidder(spec);
diff --git a/modules/missenaBidAdapter.js b/modules/missenaBidAdapter.js
index 33fa6857e85..cd5650e73c2 100644
--- a/modules/missenaBidAdapter.js
+++ b/modules/missenaBidAdapter.js
@@ -1,12 +1,100 @@
-import { buildUrl, formatQS, logInfo, triggerPixel } from '../src/utils.js';
+import {
+  buildUrl,
+  formatQS,
+  generateUUID,
+  isFn,
+  logInfo,
+  safeJSONParse,
+  triggerPixel,
+} from '../src/utils.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+import { isAutoplayEnabled } from '../libraries/autoplayDetection/autoplay.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ * @typedef {import('../src/adapters/bidderFactory.js').TimedOutBid} TimedOutBid
+ */
 
 const BIDDER_CODE = 'missena';
 const ENDPOINT_URL = 'https://bid.missena.io/';
 const EVENTS_DOMAIN = 'events.missena.io';
 const EVENTS_DOMAIN_DEV = 'events.staging.missena.xyz';
 
+export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
+window.msna_ik = window.msna_ik || generateUUID();
+
+/* Get Floor price information */
+function getFloor(bidRequest) {
+  if (!isFn(bidRequest.getFloor)) {
+    return {};
+  }
+
+  const bidFloors = bidRequest.getFloor({
+    currency: 'USD',
+    mediaType: BANNER,
+  });
+
+  if (!isNaN(bidFloors?.floor)) {
+    return bidFloors;
+  }
+}
+
+/* Helper function that converts the prebid data to the payload expected by our servers */
+function toPayload(bidRequest, bidderRequest) {
+  const payload = {
+    adunit: bidRequest.adUnitCode,
+    ik: window.msna_ik,
+    request_id: bidRequest.bidId,
+    timeout: bidderRequest.timeout,
+  };
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    // TODO: is 'topmostLocation' the right value here?
+    payload.referer = bidderRequest.refererInfo.topmostLocation;
+    payload.referer_canonical = bidderRequest.refererInfo.canonicalUrl;
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    payload.consent_string = bidderRequest.gdprConsent.consentString;
+    payload.consent_required = bidderRequest.gdprConsent.gdprApplies;
+  }
+
+  if (bidderRequest && bidderRequest.uspConsent) {
+    payload.us_privacy = bidderRequest.uspConsent;
+  }
+
+  const baseUrl = bidRequest.params.baseUrl || ENDPOINT_URL;
+  payload.params = bidRequest.params;
+
+  if (bidRequest.ortb2?.device?.ext?.cdep) {
+    payload.cdep = bidRequest.ortb2?.device?.ext?.cdep;
+  }
+  payload.userEids = bidRequest.userIdAsEids || [];
+  payload.version = '$prebid.version$';
+
+  const bidFloor = getFloor(bidRequest);
+  payload.floor = bidFloor?.floor;
+  payload.floor_currency = bidFloor?.currency;
+  payload.currency = getCurrencyFromBidderRequest(bidderRequest);
+  payload.schain = bidRequest.schain;
+  payload.coppa = bidderRequest?.ortb2?.regs?.coppa ? 1 : 0;
+  payload.autoplay = isAutoplayEnabled() === true ? 1 : 0;
+  payload.screen = { height: screen.height, width: screen.width };
+
+  return {
+    method: 'POST',
+    url: baseUrl + '?' + formatQS({ t: bidRequest.params.apiKey }),
+    data: JSON.stringify(payload),
+  };
+}
+
 export const spec = {
   aliases: ['msna'],
   code: BIDDER_CODE,
@@ -26,47 +114,28 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
+   * @param {Array} validBidRequests
+   * @param {BidderRequest} bidderRequest
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    return validBidRequests.map((bidRequest) => {
-      const payload = {
-        adunit: bidRequest.adUnitCode,
-        request_id: bidRequest.bidId,
-        timeout: bidderRequest.timeout,
-      };
-
-      if (bidderRequest && bidderRequest.refererInfo) {
-        // TODO: is 'topmostLocation' the right value here?
-        payload.referer = bidderRequest.refererInfo.topmostLocation;
-        payload.referer_canonical = bidderRequest.refererInfo.canonicalUrl;
-      }
-
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        payload.consent_string = bidderRequest.gdprConsent.consentString;
-        payload.consent_required = bidderRequest.gdprConsent.gdprApplies;
-      }
-      const baseUrl = bidRequest.params.baseUrl || ENDPOINT_URL;
-      if (bidRequest.params.test) {
-        payload.test = bidRequest.params.test;
-      }
-      if (bidRequest.params.placement) {
-        payload.placement = bidRequest.params.placement;
-      }
-      if (bidRequest.params.formats) {
-        payload.formats = bidRequest.params.formats;
-      }
-      if (bidRequest.params.isInternal) {
-        payload.is_internal = bidRequest.params.isInternal;
-      }
-      payload.userEids = bidRequest.userIdAsEids || [];
-      return {
-        method: 'POST',
-        url: baseUrl + '?' + formatQS({ t: bidRequest.params.apiKey }),
-        data: JSON.stringify(payload),
-      };
-    });
+    const capKey = `missena.missena.capper.remove-bubble.${validBidRequests[0]?.params.apiKey}`;
+    const capping = safeJSONParse(storage.getDataFromLocalStorage(capKey));
+    const referer = bidderRequest?.refererInfo?.topmostLocation;
+    if (
+      typeof capping?.expiry === 'number' &&
+      new Date().getTime() < capping?.expiry &&
+      (!capping?.referer || capping?.referer == referer)
+    ) {
+      logInfo('Missena - Capped');
+      return [];
+    }
+
+    this.msnaApiKey = validBidRequests[0]?.params.apiKey;
+
+    return validBidRequests.map((bidRequest) =>
+      toPayload(bidRequest, bidderRequest),
+    );
   },
 
   /**
@@ -88,30 +157,29 @@ export const spec = {
   getUserSyncs: function (
     syncOptions,
     serverResponses,
-    gdprConsent,
-    uspConsent
+    gdprConsent = {},
+    uspConsent,
   ) {
-    if (!syncOptions.iframeEnabled) {
+    if (!syncOptions.iframeEnabled || !this.msnaApiKey) {
       return [];
     }
 
-    let gdprParams = '';
-    if (
-      gdprConsent &&
-      'gdprApplies' in gdprConsent &&
-      typeof gdprConsent.gdprApplies === 'boolean'
-    ) {
-      gdprParams = `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${
-        gdprConsent.consentString
-      }`;
+    const url = new URL('https://sync.missena.io/iframe');
+    url.searchParams.append('t', this.msnaApiKey);
+
+    if (typeof gdprConsent.gdprApplies === 'boolean') {
+      url.searchParams.append('gdpr', Number(gdprConsent.gdprApplies));
+      url.searchParams.append('gdpr_consent', gdprConsent.consentString);
+    }
+    if (uspConsent) {
+      url.searchParams.append('us_privacy', uspConsent);
     }
-    return [
-      { type: 'iframe', url: 'https://sync.missena.io/iframe' + gdprParams },
-    ];
+
+    return [{ type: 'iframe', url: url.href }];
   },
   /**
    * Register bidder specific code, which will execute if bidder timed out after an auction
-   * @param {data} Containing timeout specific data
+   * @param {TimedOutBid} timeoutData - Containing timeout specific data
    */
   onTimeout: function onTimeout(timeoutData) {
     logInfo('Missena - Timeout from adapter', timeoutData);
@@ -119,7 +187,7 @@ export const spec = {
 
   /**
    * Register bidder specific code, which@ will execute if a bid from this bidder won the auction
-   * @param {Bid} The bid that won the auction
+   * @param {Bid} bid - The bid that won the auction
    */
   onBidWon: function (bid) {
     const hostname = bid.params[0].baseUrl ? EVENTS_DOMAIN_DEV : EVENTS_DOMAIN;
@@ -128,8 +196,13 @@ export const spec = {
         protocol: 'https',
         hostname,
         pathname: '/v1/bidsuccess',
-        search: { t: bid.params[0].apiKey, provider: bid.meta?.networkName, cpm: bid.cpm, currency: bid.currency },
-      })
+        search: {
+          t: bid.params[0].apiKey,
+          provider: bid.meta?.networkName,
+          cpm: bid.originalCpm,
+          currency: bid.originalCurrency,
+        },
+      }),
     );
     logInfo('Missena - Bid won', bid);
   },
diff --git a/modules/mobfoxpbBidAdapter.js b/modules/mobfoxpbBidAdapter.js
index 9ff50e2531f..dcc6e9594c4 100644
--- a/modules/mobfoxpbBidAdapter.js
+++ b/modules/mobfoxpbBidAdapter.js
@@ -1,138 +1,17 @@
-import { isFn, deepAccess, getWindowTop } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { isBidRequestValid, buildRequests, interpretResponse } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'mobfoxpb';
 const AD_URL = 'https://bes.mobfox.com/pbjs';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency) {
-    return false;
-  }
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers);
-    default:
-      return false;
-  }
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && bid.params.placementId);
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-    const winTop = getWindowTop();
-    const location = winTop.location;
-    const placements = [];
-    const request = {
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'language': (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
-      'secure': 1,
-      'host': location.host,
-      'page': location.pathname,
-      'placements': placements
-    };
-
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent;
-      }
-    }
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      const placement = {
-        placementId: bid.params.placementId,
-        bidId: bid.bidId,
-        schain: bid.schain || {},
-        bidfloor: getBidFloor(bid)
-      };
-      const mediaType = bid.mediaTypes;
-
-      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
-        placement.traffic = BANNER;
-        placement.sizes = mediaType[BANNER].sizes;
-      } else if (mediaType && mediaType[VIDEO] && mediaType[VIDEO].playerSize) {
-        placement.traffic = VIDEO;
-        placement.wPlayer = mediaType[VIDEO].playerSize[0];
-        placement.hPlayer = mediaType[VIDEO].playerSize[1];
-        placement.playerSize = mediaType[VIDEO].playerSize;
-        placement.minduration = mediaType[VIDEO].minduration;
-        placement.maxduration = mediaType[VIDEO].maxduration;
-        placement.mimes = mediaType[VIDEO].mimes;
-        placement.protocols = mediaType[VIDEO].protocols;
-        placement.startdelay = mediaType[VIDEO].startdelay;
-        placement.placement = mediaType[VIDEO].placement;
-        placement.skip = mediaType[VIDEO].skip;
-        placement.skipafter = mediaType[VIDEO].skipafter;
-        placement.minbitrate = mediaType[VIDEO].minbitrate;
-        placement.maxbitrate = mediaType[VIDEO].maxbitrate;
-        placement.delivery = mediaType[VIDEO].delivery;
-        placement.playbackmethod = mediaType[VIDEO].playbackmethod;
-        placement.api = mediaType[VIDEO].api;
-        placement.linearity = mediaType[VIDEO].linearity;
-      } else if (mediaType && mediaType[NATIVE]) {
-        placement.traffic = NATIVE;
-        placement.native = mediaType[NATIVE];
-      }
-      placements.push(placement);
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        resItem.meta = resItem.meta || {};
-        resItem.meta.advertiserDomains = resItem.adomain || [];
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse
 };
 
 registerBidder(spec);
diff --git a/modules/mobianRtdProvider.js b/modules/mobianRtdProvider.js
new file mode 100644
index 00000000000..02f2d1b83cf
--- /dev/null
+++ b/modules/mobianRtdProvider.js
@@ -0,0 +1,203 @@
+/**
+ * This module adds the Mobian RTD provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ */
+import { submodule } from '../src/hook.js';
+import { ajaxBuilder } from '../src/ajax.js';
+import { safeJSONParse, logMessage as _logMessage } from '../src/utils.js';
+import { setKeyValue } from '../libraries/gptUtils/gptUtils.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
+/**
+ * @typedef {Object} MobianConfig
+ * @property {MobianConfigParams} params
+ */
+
+/**
+ * @typedef {Object} MobianConfigParams
+ * @property {string} [prefix] - Optional prefix for targeting keys (default: 'mobian')
+ * @property {boolean} [publisherTargeting] - Optional boolean to enable targeting for publishers (default: false)
+ * @property {boolean} [advertiserTargeting] - Optional boolean to enable targeting for advertisers (default: false)
+ */
+
+/**
+ * @typedef {Object} MobianContextData
+ * @property {Object} apValues
+ * @property {string[]} categories
+ * @property {string[]} emotions
+ * @property {string[]} genres
+ * @property {string} risk
+ * @property {string} sentiment
+ * @property {string[]} themes
+ * @property {string[]} tones
+ */
+
+export const MOBIAN_URL = 'https://prebid.outcomes.net/api/prebid/v1/assessment/async';
+
+export const CONTEXT_KEYS = [
+  'apValues',
+  'categories',
+  'emotions',
+  'genres',
+  'risk',
+  'sentiment',
+  'themes',
+  'tones'
+];
+
+const AP_KEYS = ['a0', 'a1', 'p0', 'p1'];
+
+const logMessage = (...args) => {
+  _logMessage('Mobian', ...args);
+};
+
+function makeMemoizedFetch() {
+  let cachedResponse = null;
+  return async function () {
+    if (cachedResponse) {
+      return Promise.resolve(cachedResponse);
+    }
+    try {
+      const response = await fetchContextData();
+      cachedResponse = makeDataFromResponse(response);
+      return cachedResponse;
+    } catch (error) {
+      logMessage('error', error);
+      return Promise.resolve({});
+    }
+  }
+}
+
+export const getContextData = makeMemoizedFetch();
+
+export async function fetchContextData() {
+  const pageUrl = encodeURIComponent(window.location.href);
+  const requestUrl = `${MOBIAN_URL}?url=${pageUrl}`;
+  const request = ajaxBuilder();
+
+  return new Promise((resolve, reject) => {
+    request(requestUrl, { success: resolve, error: reject });
+  });
+}
+
+export function getConfig(config) {
+  const [advertiserTargeting, publisherTargeting] = ['advertiserTargeting', 'publisherTargeting'].map((key) => {
+    const value = config?.params?.[key];
+    if (!value) {
+      return [];
+    } else if (value === true) {
+      return CONTEXT_KEYS;
+    } else if (Array.isArray(value) && value.length) {
+      return value.filter((key) => CONTEXT_KEYS.includes(key));
+    }
+    return [];
+  });
+
+  const prefix = config?.params?.prefix || 'mobian';
+  return { advertiserTargeting, prefix, publisherTargeting };
+}
+
+/**
+ * @param {MobianConfigParams} parsedConfig
+ * @param {MobianContextData} contextData
+ * @returns {function}
+ */
+export function setTargeting(parsedConfig, contextData) {
+  const { publisherTargeting, prefix } = parsedConfig;
+  logMessage('context', contextData);
+
+  CONTEXT_KEYS.forEach((key) => {
+    if (!publisherTargeting.includes(key)) return;
+
+    if (key === 'apValues') {
+      AP_KEYS.forEach((apKey) => {
+        if (!contextData[key]?.[apKey]?.length) return;
+        logMessage(`${prefix}_ap_${apKey}`, contextData[key][apKey]);
+        setKeyValue(`${prefix}_ap_${apKey}`, contextData[key][apKey]);
+      });
+      return;
+    }
+
+    if (contextData[key]?.length) {
+      logMessage(`${prefix}_${key}`, contextData[key]);
+      setKeyValue(`${prefix}_${key}`, contextData[key]);
+    }
+  });
+}
+
+export function makeDataFromResponse(contextData) {
+  const data = typeof contextData === 'string' ? safeJSONParse(contextData) : contextData;
+  const results = data.results;
+  if (!results) {
+    return {};
+  }
+  return {
+    apValues: results.ap || {},
+    categories: results.mobianContentCategories,
+    emotions: results.mobianEmotions,
+    genres: results.mobianGenres,
+    risk: results.mobianRisk || 'unknown',
+    sentiment: results.mobianSentiment || 'unknown',
+    themes: results.mobianThemes,
+    tones: results.mobianTones,
+  };
+}
+
+export function extendBidRequestConfig(bidReqConfig, contextData) {
+  logMessage('extendBidRequestConfig', bidReqConfig, contextData);
+  const { site: ortb2Site } = bidReqConfig.ortb2Fragments.global;
+
+  ortb2Site.ext = ortb2Site.ext || {};
+  ortb2Site.ext.data = {
+    ...(ortb2Site.ext.data || {}),
+    ...contextData
+  };
+
+  return bidReqConfig;
+}
+
+/**
+ * @param {MobianConfig} config
+ * @returns {boolean}
+ */
+function init(config) {
+  logMessage('init', config);
+
+  const parsedConfig = getConfig(config);
+
+  if (parsedConfig.publisherTargeting.length) {
+    getContextData().then((contextData) => setTargeting(parsedConfig, contextData));
+  }
+
+  return true;
+}
+
+function getBidRequestData(bidReqConfig, callback, config) {
+  logMessage('getBidRequestData', bidReqConfig);
+
+  const { advertiserTargeting } = getConfig(config);
+
+  if (!advertiserTargeting.length) {
+    callback();
+    return;
+  }
+
+  getContextData()
+    .then((contextData) => {
+      extendBidRequestConfig(bidReqConfig, contextData);
+    })
+    .catch(() => {})
+    .finally(() => callback());
+}
+
+/** @type {RtdSubmodule} */
+export const mobianBrandSafetySubmodule = {
+  name: 'mobianBrandSafety',
+  init: init,
+  getBidRequestData: getBidRequestData
+};
+
+submodule('realTimeData', mobianBrandSafetySubmodule);
diff --git a/modules/mobianRtdProvider.md b/modules/mobianRtdProvider.md
new file mode 100644
index 00000000000..100e529143f
--- /dev/null
+++ b/modules/mobianRtdProvider.md
@@ -0,0 +1,156 @@
+# Mobian Rtd Provider
+
+## Overview
+
+Module Name: Mobian Rtd Provider
+
+Module Type: Rtd Provider
+
+Maintainer: rich.rodriguez@themobian.com
+
+The Mobian Real-Time Data (RTD) Module is a plug-and-play Prebid.js adapter that is designed to provide Mobian Contextual results on the publisher’s page.
+
+## Downloading and Configuring the Mobian RTD module
+
+Navigate to https://docs.prebid.org/download.html and check the box labeled Mobian Prebid Contextual Evaluation. If you have installed Prebid.js on your site previously, please be sure to select any other modules and adaptors to suit your needs. When clicking the "Get Prebid.js" button at the bottom of the page, the site will build a version of Prebid.js with all of your selections.
+
+Direct link to the Mobian module in the Prebid.js repository: https://github.com/prebid/Prebid.js/blob/a9de3c15ac9a108b43a1e2df04abd6dfb5297530/modules/mobianRtdProvider.js
+
+The client will need to provide Mobian with all the domains that would be using the prebid module so that Mobian can whitelist those domains. Failure to whitelist the domains will yield a 404 when making a request to the Mobian Contextual API at https://prebid.outcomes.net/.
+
+## Functionality
+
+At a high level, the Mobian RTD Module is designed to call the Mobian Contextal API on page load, requesting the Mobian classifications and results for the URL. The classifications and results are designed to be picked up by any SSP or DSP in the Prebid.js ecosystem. The module also supports placing the Mobian classifications on each ad slot on the page, thus allowing for targeting within GAM.
+
+## Available Classifications
+
+Risk:
+
+Key: mobianRisk
+
+Possible values: "none", "low", "medium" or "high"
+
+Description: Risk will contain Mobian’s brand safety assessment of the page. Brand Safety is determined via the Mobian AI models taking into account a semantic analysis of the content while understanding the context. A more detailed description of the reasoning for a given URL can be observed by going to mbs.themobian.com and entering the URL.
+
+------------------
+
+Content Categories:
+
+Key: mobianContentCategories
+
+Possible values: "adult_content", "arms", "crime", "death_injury", "debated_issue", "hate_speech", "drugs_alcohol", "obscenity", "piracy", "spam", "terrorism"
+
+Description: Content Categories contain results based on the legacy GARM framework. GARM no longer is a standard and does not factor into our risk assessment but is included for posterity.
+
+------------------
+
+Sentiment:
+
+Key: mobianSentiment
+
+Possible values: "negative", "neutral" or "positive"
+
+Description: Sentiment can only be one of the three values listed, and is determined via the Mobian AI analyzing the content and making one of these three determinations.
+
+------------------
+
+Emotion:
+
+Key: mobianEmotions
+
+Possible values: "love", "joy", "surprise", "anger", "sadness", "fear"
+
+Description: The Mobian AI assesses the emotions exuded from the content, taking into account the context. A given piece of content can have multiple emotions. The current list of emotions is all possible emotions available but this will be updated to be more freeform and varied in a future release.
+
+------------------
+
+Tone:
+
+Key: mobianTones
+
+Possible values: Various, but some examples include "comedic", "serious" or "emotional"
+
+Description: While the Mobian emotion classification looks at the emotions exuded from the content, tone examines the overall presentation of the content and determines the overall mood of the work. A given piece of content can have multiple tones.
+
+------------------
+
+Theme:
+
+Key: mobianThemes
+
+Possible values: Various, but some examples include "skincare", "food" and "nightlife"
+
+Description: Themes are a wide classification of content categorization, taking into account the content and context to label the content with a theme. A given piece of content can have multiple themes.
+
+------------------
+
+Genre:
+
+Key: mobianGenre
+
+Possible values: Various, but some examples include "journalism", "gaming" or "how-to"
+
+Description: Genres are a more narrow classification of content categorization, aiming to label the content towards its overall purpose and audience. A given piece of content can have multiple genres.
+
+------------------
+
+AP Values
+
+Keys: ap_a0, ap_a1, ap_p0, ap_p1
+
+Possible values: Various, numerically id-based and customizable based on Mobian Persona Settings.
+
+Description: Mobian AI Personas are custom created based on prompts to find a specific audience. Please contact your Mobian contact directly for more information on this tool. The difference between the keys is below:
+
+a0 = Advertisers (via Campaign IDs) in this list should NOT want to advertise on this page
+
+a1 = Advertisers (via Campaign IDs) should want to advertise on this page
+
+p0 = Advertisers (via Campaign IDs) should AVOID targeting these personas
+
+p1 = Advertisers (via Campaign IDs) should target these personas
+
+*AP Values is in the early stages of testing and is subject to change.
+
+## GAM Targeting:
+
+On each page load, the Mobian RTD module finds each ad slot on the page and performs the following function:
+
+```js
+window.googletag.cmd.push(() => {
+  window.googletag.pubads().setTargeting(key, value);
+```
+
+"key" and "value" will be replaced with the various classifications as described in the previous section. Notably, this function runs before ad calls are made to GAM, which enables the keys and value to be used for targeting or blocking in GAM.
+
+For more details on how to set up key-value pairs in GAM, please see this documentation from Google: https://support.google.com/admanager/answer/9796369?sjid=12535178383871274096-NA
+
+For example, if you wanted to target articles where mobianRisk is "low", the key to set in GAM would be "mobianRisk" and the value would be "low". Once these keys and values are set within the Inventory section in GAM as listed by their documentation, you can then reference the key value pair in Custom Targeting for any line item you create.
+
+## Configuration Highlight
+
+```js
+pbjs.setConfig({
+  realTimeData: {
+    dataProviders: [{
+      name: 'mobianBrandSafety',
+      params: {
+        // Prefix for the targeting keys (default: 'mobian')
+        prefix: 'mobian',
+        
+        // Enable targeting keys for advertiser data
+        advertiserTargeting: true,
+        // Or set it as an array to pick specific targeting keys:
+        // advertiserTargeting: ['genres', 'emotions', 'themes'],
+        // Available values: 'apValues', 'categories', 'emotions', 'genres', 'risk', 'sentiment', 'themes', 'tones'
+
+        // Enable targeting keys for publisher data
+        publisherTargeting: true,
+        // Or set it as an array to pick specific targeting keys:
+        // publisherTargeting: ['tones', 'risk'],
+        // Available values: 'apValues', 'categories', 'emotions', 'genres', 'risk', 'sentiment', 'themes', 'tones'
+      }
+    }]
+  }
+});
+```
diff --git a/modules/multibid/index.js b/modules/multibid/index.js
index df77a157bee..d0ce2ae159e 100644
--- a/modules/multibid/index.js
+++ b/modules/multibid/index.js
@@ -9,7 +9,7 @@ import {
   logWarn, deepAccess, getUniqueIdentifierStr, deepSetValue, groupBy
 } from '../../src/utils.js';
 import * as events from '../../src/events.js';
-import CONSTANTS from '../../src/constants.json';
+import { EVENTS } from '../../src/constants.js';
 import {addBidderRequests} from '../../src/auction.js';
 import {getHighestCpmBidsFromBidPool, sortByDealAndPriceBucketOrCpm} from '../../src/targeting.js';
 import {PBS, registerOrtbProcessor, REQUEST} from '../../src/pbjsORTB.js';
@@ -45,10 +45,10 @@ config.getConfig(MODULE_NAME, conf => {
 });
 
 /**
-   * @summary validates multibid configuration entries
-   * @param {Object[]} multibid - example [{bidder: 'bidderA', maxbids: 2, prefix: 'bidA'}, {bidder: 'bidderB', maxbids: 2}]
-   * @return {Boolean}
-*/
+ * @summary validates multibid configuration entries
+ * @param {Object[]} multibid - example [{bidder: 'bidderA', maxbids: 2, prefix: 'bidA'}, {bidder: 'bidderB', maxbids: 2}]
+ * @return {Boolean}
+ */
 export function validateMultibid(conf) {
   let check = true;
   let duplicate = conf.filter(entry => {
@@ -77,10 +77,10 @@ export function validateMultibid(conf) {
 }
 
 /**
-   * @summary addBidderRequests before hook
-   * @param {Function} fn reference to original function (used by hook logic)
-   * @param {Object[]} array containing copy of each bidderRequest object
-*/
+ * @summary addBidderRequests before hook
+ * @param {Function} fn reference to original function (used by hook logic)
+ * @param {Object[]} array containing copy of each bidderRequest object
+ */
 export function adjustBidderRequestsHook(fn, bidderRequests) {
   bidderRequests.map(bidRequest => {
     // Loop through bidderRequests and check if bidderCode exists in multiconfig
@@ -95,11 +95,11 @@ export function adjustBidderRequestsHook(fn, bidderRequests) {
 }
 
 /**
-   * @summary addBidResponse before hook
-   * @param {Function} fn reference to original function (used by hook logic)
-   * @param {String} ad unit code for bid
-   * @param {Object} bid object
-*/
+ * @summary addBidResponse before hook
+ * @param {Function} fn reference to original function (used by hook logic)
+ * @param {String} ad unit code for bid
+ * @param {Object} bid object
+ */
 export const addBidResponseHook = timedBidResponseHook('multibid', function addBidResponseHook(fn, adUnitCode, bid, reject) {
   let floor = deepAccess(bid, 'floorData.floorValue');
 
@@ -146,9 +146,9 @@ export const addBidResponseHook = timedBidResponseHook('multibid', function addB
 });
 
 /**
-* A descending sort function that will sort the list of objects based on the following:
-*  - bids without dynamic aliases are sorted before bids with dynamic aliases
-*/
+ * A descending sort function that will sort the list of objects based on the following:
+ *  - bids without dynamic aliases are sorted before bids with dynamic aliases
+ */
 export function sortByMultibid(a, b) {
   if (a.bidder !== a.bidderCode && b.bidder === b.bidderCode) {
     return 1;
@@ -162,13 +162,13 @@ export function sortByMultibid(a, b) {
 }
 
 /**
-   * @summary getHighestCpmBidsFromBidPool before hook
-   * @param {Function} fn reference to original function (used by hook logic)
-   * @param {Object[]} array of objects containing all bids from bid pool
-   * @param {Function} function to reduce to only highest cpm value for each bidderCode
-   * @param {Number} adUnit bidder targeting limit, default set to 0
-   * @param {Boolean} default set to false, this hook modifies targeting and sets to true
-*/
+ * @summary getHighestCpmBidsFromBidPool before hook
+ * @param {Function} fn reference to original function (used by hook logic)
+ * @param {Object[]} array of objects containing all bids from bid pool
+ * @param {Function} function to reduce to only highest cpm value for each bidderCode
+ * @param {Number} adUnit bidder targeting limit, default set to 0
+ * @param {Boolean} default set to false, this hook modifies targeting and sets to true
+ */
 export function targetBidPoolHook(fn, bidsReceived, highestCpmCallback, adUnitBidLimit = 0, hasModified = false) {
   if (!config.getConfig('multibid')) resetMultiConfig();
   if (hasMultibid) {
@@ -216,21 +216,21 @@ export function targetBidPoolHook(fn, bidsReceived, highestCpmCallback, adUnitBi
 }
 
 /**
-* Resets globally stored multibid configuration
-*/
+ * Resets globally stored multibid configuration
+ */
 export const resetMultiConfig = () => { hasMultibid = false; multiConfig = {}; };
 
 /**
-* Resets globally stored multibid ad unit bids
-*/
+ * Resets globally stored multibid ad unit bids
+ */
 export const resetMultibidUnits = () => multibidUnits = {};
 
 /**
-* Set up hooks on init
-*/
+ * Set up hooks on init
+ */
 function init() {
   // TODO: does this reset logic make sense - what about simultaneous auctions?
-  events.on(CONSTANTS.EVENTS.AUCTION_INIT, resetMultibidUnits);
+  events.on(EVENTS.AUCTION_INIT, resetMultibidUnits);
   setupBeforeHookFnOnce(addBidderRequests, adjustBidderRequestsHook);
   getHook('addBidResponse').before(addBidResponseHook, 3);
   setupBeforeHookFnOnce(getHighestCpmBidsFromBidPool, targetBidPoolHook);
diff --git a/modules/mwOpenLinkIdSystem.js b/modules/mwOpenLinkIdSystem.js
index ff23547224b..c06f61ff82f 100644
--- a/modules/mwOpenLinkIdSystem.js
+++ b/modules/mwOpenLinkIdSystem.js
@@ -11,6 +11,11 @@ import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleParams} SubmoduleParams
+ */
+
 const openLinkID = {
   name: 'mwol',
   cookie_expiration: (86400 * 1000 * 365 * 1) // 1 year
@@ -112,27 +117,27 @@ export { writeCookie };
 /** @type {Submodule} */
 export const mwOpenLinkIdSubModule = {
   /**
-     * used to link submodule with config
-     * @type {string}
-     */
+   * used to link submodule with config
+   * @type {string}
+   */
   name: 'mwOpenLinkId',
   /**
-     * decode the stored id value for passing to bid requests
-     * @function
-     * @param {MwOlId} mwOlId
-     * @return {(Object|undefined}
-     */
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {MwOlId} mwOlId
+   * @return {(Object|undefined}
+   */
   decode(mwOlId) {
     const id = mwOlId && isPlainObject(mwOlId) ? mwOlId.eid : undefined;
     return id ? { 'mwOpenLinkId': id } : undefined;
   },
 
   /**
-     * performs action to obtain id and return a value in the callback's response argument
-     * @function
-     * @param {SubmoduleParams} [submoduleParams]
-     * @returns {id:MwOlId | undefined}
-     */
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleParams} [submoduleParams]
+   * @returns {id:MwOlId | undefined}
+   */
   getId(submoduleConfig) {
     const submoduleConfigParams = (submoduleConfig && submoduleConfig.params) || {};
     if (!isValidConfig(submoduleConfigParams)) return undefined;
diff --git a/modules/mygaruIdSystem.js b/modules/mygaruIdSystem.js
new file mode 100644
index 00000000000..9133480477b
--- /dev/null
+++ b/modules/mygaruIdSystem.js
@@ -0,0 +1,104 @@
+/**
+ * This module adds MyGaru Real Time User Sync to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/mygaruIdSystem
+ * @requires module:modules/userId
+ */
+
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ */
+
+const bidderCode = 'mygaruId';
+const syncUrl = 'https://ident.mygaru.com/v2/id';
+
+export function buildUrl(opts) {
+  const queryPairs = [];
+  for (let key in opts) {
+    if (opts[key] !== undefined) {
+      queryPairs.push(`${key}=${encodeURIComponent(opts[key])}`);
+    }
+  }
+  return `${syncUrl}?${queryPairs.join('&')}`;
+}
+
+function requestRemoteIdAsync(url) {
+  return new Promise((resolve) => {
+    ajax(
+      url,
+      {
+        success: response => {
+          try {
+            const jsonResponse = JSON.parse(response);
+            const { iuid } = jsonResponse;
+            resolve(iuid);
+          } catch (e) {
+            resolve();
+          }
+        },
+        error: () => {
+          resolve();
+        },
+      },
+      undefined,
+      {
+        method: 'GET',
+        contentType: 'application/json'
+      }
+    );
+  });
+}
+
+/** @type {Submodule} */
+export const mygaruIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: bidderCode,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{id: string} | null}
+   */
+  decode(id) {
+    return id;
+  },
+  /**
+   * get the MyGaru Id from local storages and initiate a new user sync
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData} [consentData]
+   * @returns {{id: string | undefined}}
+   */
+  getId(config, consentData) {
+    const gdprApplies = consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies ? 1 : 0;
+    const gdprConsentString = gdprApplies ? consentData.consentString : undefined;
+    const url = buildUrl({
+      gdprApplies,
+      gdprConsentString
+    });
+
+    return {
+      url,
+      callback: function (done) {
+        return requestRemoteIdAsync(url).then((id) => {
+          done({ mygaruId: id });
+        })
+      }
+    }
+  },
+  eids: {
+    'mygaruId': {
+      source: 'mygaru.com',
+      atype: 1
+    },
+  }
+};
+
+submodule('userId', mygaruIdSubmodule);
diff --git a/modules/mygaruIdSystem.md b/modules/mygaruIdSystem.md
new file mode 100644
index 00000000000..92724f99469
--- /dev/null
+++ b/modules/mygaruIdSystem.md
@@ -0,0 +1,24 @@
+## Mygaru User ID Submodule
+
+MyGaru provides single use tokens as a UserId for SSPs and DSP that consume  telecom DMP data.  
+
+## Building Prebid with Mygaru ID Support
+
+First, make sure to add submodule to your Prebid.js package with:
+
+```
+gulp build --modules=userId,mygaruIdSystem
+```
+Params configuration is not required. 
+Also mygaru is async, in order to get ids for initial ad auctions you need to add auctionDelay param to userSync config.
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        auctionDelay: 100,
+        userIds: [{
+            name: 'mygaruId',
+        }]
+    }
+});
+```
diff --git a/modules/mytargetBidAdapter.md b/modules/mytargetBidAdapter.md
deleted file mode 100644
index 3292ff561fa..00000000000
--- a/modules/mytargetBidAdapter.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Overview
-
-```
-Module Name: myTarget Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: support_target@corp.my.com
-```
-
-# Description
-
-Module that connects to myTarget demand sources.
-
-# Test Parameters
-
-```
-    var adUnits = [{
-      code: 'placementCode',
-      mediaTypes: {
-        banner: {
-          sizes: [[240, 400]],
-        }
-      },
-      bids: [{
-        bidder: 'mytarget',
-        params: {
-          placementId: '379783',
-
-          // OPTIONAL: custom bid floor
-          bidfloor: 10000,
-
-          // OPTIONAL: if you know the ad position on the page, specify it here
-          //           (this corresponds to "Ad Position" in OpenRTB 2.3, section 5.4)
-          position: 0,
-
-          // OPTIONAL: bid response type: 0 - ad url (default), 1 - ad markup
-          response: 0
-        }
-      }]
-    }];
-```
diff --git a/modules/nativeRendering.js b/modules/nativeRendering.js
new file mode 100644
index 00000000000..8e6b6baab55
--- /dev/null
+++ b/modules/nativeRendering.js
@@ -0,0 +1,27 @@
+import {getRenderingData} from '../src/adRendering.js';
+import {getNativeRenderingData, isNativeResponse} from '../src/native.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {RENDERER} from '../libraries/creative-renderer-native/renderer.js';
+import {getCreativeRendererSource} from '../src/creativeRenderers.js';
+
+function getRenderingDataHook(next, bidResponse, options) {
+  if (isNativeResponse(bidResponse)) {
+    next.bail({
+      native: getNativeRenderingData(bidResponse, auctionManager.index.getAdUnit(bidResponse))
+    })
+  } else {
+    next(bidResponse, options)
+  }
+}
+function getRendererSourceHook(next, bidResponse) {
+  if (isNativeResponse(bidResponse)) {
+    next.bail(RENDERER);
+  } else {
+    next(bidResponse);
+  }
+}
+
+if (FEATURES.NATIVE) {
+  getRenderingData.before(getRenderingDataHook)
+  getCreativeRendererSource.before(getRendererSourceHook);
+}
diff --git a/modules/nativoBidAdapter.js b/modules/nativoBidAdapter.js
index 69a270247cd..bdd0fa7e054 100644
--- a/modules/nativoBidAdapter.js
+++ b/modules/nativoBidAdapter.js
@@ -1,6 +1,6 @@
 import { deepAccess, isEmpty } from '../src/utils.js'
 import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { BANNER } from '../src/mediaTypes.js'
+import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js'
 import { getGlobal } from '../src/prebidGlobal.js'
 import { ortbConverter } from '../libraries/ortbConverter/converter.js'
 
@@ -8,14 +8,16 @@ const converter = ortbConverter({
   context: {
     // `netRevenue` and `ttl` are required properties of bid responses - provide a default for them
     netRevenue: true, // or false if your adapter should set bidResponse.netRevenue = false
-    ttl: 30 // default bidResponse.ttl (when not specified in ORTB response.seatbid[].bid[].exp)
+    ttl: 30, // default bidResponse.ttl (when not specified in ORTB response.seatbid[].bid[].exp)
   },
   imp(buildImp, bidRequest, context) {
-    const imp = buildImp(bidRequest, context);
+    const imp = buildImp(bidRequest, context)
     imp.tagid = bidRequest.adUnitCode
-    return imp;
-  }
-});
+    if (imp.ext) imp.ext.placementId = bidRequest.params.placementId
+
+    return imp
+  },
+})
 
 const BIDDER_CODE = 'nativo'
 const BIDDER_ENDPOINT = 'https://exchange.postrelease.com/prebid'
@@ -24,17 +26,27 @@ const GVLID = 263
 
 const TIME_TO_LIVE = 360
 
-const SUPPORTED_AD_TYPES = [BANNER]
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO, NATIVE]
 const FLOOR_PRICE_CURRENCY = 'USD'
 const PRICE_FLOOR_WILDCARD = '*'
 
 const localPbjsRef = getGlobal()
 
+function getMediaType(accessObj) {
+  if (deepAccess(accessObj, 'mediaTypes.video')) {
+    return VIDEO
+  } else if (deepAccess(accessObj, 'mediaTypes.native')) {
+    return NATIVE
+  } else {
+    return BANNER
+  }
+}
+
 /**
  * Keep track of bid data by keys
  * @returns {Object} - Map of bid data that can be referenced by multiple keys
  */
-export const BidDataMap = () => {
+export function BidDataMap() {
   const referenceMap = {}
   const bids = []
 
@@ -122,8 +134,7 @@ export const spec = {
    */
   isBidRequestValid: function (bid) {
     // We don't need any specific parameters to make a bid request
-    // If not parameters are supplied just verify it's the correct bidder code
-    if (!bid.params) return bid.bidder === BIDDER_CODE
+    if (!bid.params) return true
 
     // Check if any supplied parameters are invalid
     const hasInvalidParameters = Object.keys(bid.params).some((key) => {
@@ -150,7 +161,10 @@ export const spec = {
    */
   buildRequests: function (validBidRequests, bidderRequest) {
     // Get OpenRTB Data
-    const openRTBData = converter.toORTB({bidRequests: validBidRequests, bidderRequest})
+    const openRTBData = converter.toORTB({
+      bidRequests: validBidRequests,
+      bidderRequest,
+    })
     const openRTBDataString = JSON.stringify(openRTBData)
 
     const requestData = new RequestData()
@@ -201,7 +215,8 @@ export const spec = {
     let params = [
       // Prebid version
       {
-        key: 'ntv_pbv', value: localPbjsRef.version
+        key: 'ntv_pbv',
+        value: localPbjsRef.version,
       },
       // Prebid request id
       { key: 'ntv_pb_rid', value: bidderRequest.bidderRequestId },
@@ -278,19 +293,31 @@ export const spec = {
       })
     }
 
+    // Add GPP params
+    if (bidderRequest.gppConsent) {
+      params.unshift({
+        key: 'ntv_gpp_consent',
+        value: bidderRequest.gppConsent.gppString,
+      })
+    }
+
     // Add USP params
     if (bidderRequest.uspConsent) {
       // Put on the beginning of the qs param array
       params.unshift({ key: 'us_privacy', value: bidderRequest.uspConsent })
     }
 
-    const qsParamStrings = [requestData.getRequestDataQueryString(), arrayToQS(params)]
+    const qsParamStrings = [
+      requestData.getRequestDataQueryString(),
+      arrayToQS(params),
+    ]
     const requestUrl = buildRequestUrl(BIDDER_ENDPOINT, qsParamStrings)
 
     let serverRequest = {
       method: 'POST',
       url: requestUrl,
       data: openRTBDataString,
+      bidderRequest: bidderRequest,
     }
 
     return serverRequest
@@ -320,9 +347,10 @@ export const spec = {
 
       // Step through and grab pertinent data
       let bidResponse, adUnit
-      seatbids.forEach((seatbid) => {
+      seatbids.forEach((seatbid, i) => {
         seatbid.bid.forEach((bid) => {
           adUnit = this.getAdUnitData(body.id, bid)
+
           bidResponse = {
             requestId: adUnit.bidId,
             cpm: bid.price,
@@ -337,10 +365,18 @@ export const spec = {
             meta: {
               advertiserDomains: bid.adomain,
             },
+            mediaType: getMediaType(request.bidderRequest.bids[i]),
           }
 
           if (bid.ext) extData[bid.id] = bid.ext
-
+          if (bidResponse.mediaType === VIDEO) {
+            bidResponse.vastUrl = bid.adm
+          }
+          if (bidResponse.mediaType === NATIVE) {
+            bidResponse.native = {
+              ortb: JSON.parse(bidResponse.ad),
+            }
+          }
           bidResponses.push(bidResponse)
         })
       })
@@ -414,23 +450,27 @@ export const spec = {
           typeof response.body === 'string'
             ? JSON.parse(response.body)
             : response.body
-      } catch (err) { return }
+      } catch (err) {
+        return
+      }
 
       // Make sure we have valid content
       if (!body || !body.seatbid || body.seatbid.length === 0) return
 
       body.seatbid.forEach((seatbid) => {
         // Grab the syncs for each seatbid
-        seatbid.syncUrls.forEach((sync) => {
-          if (types[sync.type]) {
-            if (sync.url.trim() !== '') {
-              syncs.push({
-                type: sync.type,
-                url: sync.url.replace('{GDPR_params}', params),
-              })
+        if (seatbid.syncUrls) {
+          seatbid.syncUrls.forEach((sync) => {
+            if (types[sync.type]) {
+              if (sync.url.trim() !== '') {
+                syncs.push({
+                  type: sync.type,
+                  url: sync.url.replace('{GDPR_params}', params),
+                })
+              }
             }
-          }
-        })
+          })
+        }
       })
     })
 
@@ -491,7 +531,9 @@ export class RequestData {
   getRequestDataQueryString() {
     if (this.bidRequestDataSources.length == 0) return
 
-    const queryParams = this.bidRequestDataSources.map(dataSource => dataSource.getRequestQueryString()).filter(queryString => queryString !== '')
+    const queryParams = this.bidRequestDataSources
+      .map((dataSource) => dataSource.getRequestQueryString())
+      .filter((queryString) => queryString !== '')
     return queryParams.join('&')
   }
 }
@@ -500,8 +542,10 @@ export class BidRequestDataSource {
   constructor() {
     this.type = 'BidRequestDataSource'
   }
-  processBidRequestData(bidRequest, bidderRequest) { }
-  getRequestQueryString() { return '' }
+  processBidRequestData(bidRequest, bidderRequest) {}
+  getRequestQueryString() {
+    return ''
+  }
 }
 
 export class UserEIDs extends BidRequestDataSource {
@@ -540,7 +584,7 @@ QueryStringParam.prototype.toString = function () {
 export function encodeToBase64(value) {
   try {
     return btoa(JSON.stringify(value))
-  } catch (err) { }
+  } catch (err) {}
 }
 
 export function parseFloorPriceData(bidRequest) {
@@ -565,7 +609,7 @@ export function parseFloorPriceData(bidRequest) {
         size,
       })
       // Save the data and track the sizes
-      mediaTypeFloorPriceData[sizeToString(size)] = priceFloorData.floor
+      mediaTypeFloorPriceData[sizeToString(size)] = priceFloorData?.floor
       sizeOptions.add(size)
     })
     bidRequestFloorPriceData[mediaType] = mediaTypeFloorPriceData
@@ -573,7 +617,7 @@ export function parseFloorPriceData(bidRequest) {
     // Get floor price of current media type with a wildcard size
     const sizeWildcardFloor = getSizeWildcardPrice(bidRequest, mediaType)
     // Save the wildcard floor price if it was retrieved successfully
-    if (sizeWildcardFloor.floor > 0) {
+    if (sizeWildcardFloor?.floor > 0) {
       mediaTypeFloorPriceData['*'] = sizeWildcardFloor.floor
     }
   })
@@ -708,9 +752,13 @@ function getLargestSize(sizes, method = area) {
  * Build the final request url
  */
 export function buildRequestUrl(baseUrl, qsParamStringArray = []) {
-  if (qsParamStringArray.length === 0 || !Array.isArray(qsParamStringArray)) return baseUrl
+  if (qsParamStringArray.length === 0 || !Array.isArray(qsParamStringArray)) {
+    return baseUrl
+  }
 
-  const nonEmptyQSParamStrings = qsParamStringArray.filter(qsParamString => qsParamString.trim() !== '')
+  const nonEmptyQSParamStrings = qsParamStringArray.filter(
+    (qsParamString) => qsParamString.trim() !== ''
+  )
 
   if (nonEmptyQSParamStrings.length === 0) return baseUrl
 
@@ -752,7 +800,7 @@ export function getPageUrlFromBidRequest(bidRequest) {
   try {
     const url = new URL(paramPageUrl)
     return url.href
-  } catch (err) { }
+  } catch (err) {}
 }
 
 export function hasProtocol(url) {
diff --git a/modules/nativoBidAdapter.md b/modules/nativoBidAdapter.md
index f83fb45b52e..515d87af28e 100644
--- a/modules/nativoBidAdapter.md
+++ b/modules/nativoBidAdapter.md
@@ -16,24 +16,91 @@ gulp serve --modules=nativoBidAdapter
 
 # Test Parameters
 
+## Banner
+
+```js
+var adUnits = [
+  {
+    code: 'div-gpt-ad-1460505748561-0',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 600],
+        ],
+      },
+    },
+    // Replace this object to test a new Adapter!
+    bids: [
+      {
+        bidder: 'nativo',
+        params: {
+          url: 'https://test-sites.internal.nativo.net/testing/prebid_adpater.html',
+        },
+      },
+    ],
+  },
+]
 ```
+
+## Video
+
+```js
 var adUnits = [
-        {
-            code: 'div-gpt-ad-1460505748561-0',
-            mediaTypes: {
-                banner: {
-                    sizes: [[300, 250], [300,600]],
-                }
-            },
-            // Replace this object to test a new Adapter!
-            bids: [{
-                bidder: 'nativo',
-                params: {
-                    url: 'https://test-sites.internal.nativo.net/testing/prebid_adpater.html'
-                }
-            }]
-
-        }
-    ];
+  {
+    code: 'ntvPlaceholder-1',
+    mediaTypes: {
+      video: {
+        mimes: ['video/mp4'],
+        protocols: [2, 3, 5, 6],
+        playbackmethod: [1, 2],
+        skip: 1,
+        skipafter: 5,
+      },
+    },
+    video: {
+      divId: 'player',
+    },
+    bids: [
+      {
+        bidder: 'nativo',
+        params: {
+          url: 'https://test-sites.internal.nativo.net/testing/prebid_adpater.html',
+        },
+      },
+    ],
+  },
+]
+```
+
+## Native
 
+```js
+var adUnits = [
+  {
+    code: '/416881364/prebid-native-test-unit',
+    sizes: [[300, 250]],
+    mediaTypes: {
+      native: {
+        title: {
+          required: true,
+        },
+        image: {
+          required: true,
+        },
+        sponsoredBy: {
+          required: true,
+        },
+      },
+    },
+    bids: [
+      {
+        bidder: 'nativo',
+        params: {
+          url: 'https://test-sites.internal.nativo.net/testing/prebid_adpater.html',
+        },
+      },
+    ],
+  },
+]
 ```
diff --git a/modules/naveggIdSystem.js b/modules/naveggIdSystem.js
index 8a472259873..6f1964b11df 100644
--- a/modules/naveggIdSystem.js
+++ b/modules/naveggIdSystem.js
@@ -6,107 +6,116 @@
  */
 import { isStr, isPlainObject, logError } from '../src/utils.js';
 import { submodule } from '../src/hook.js';
-import { ajax } from '../src/ajax.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {MODULE_TYPE_UID} from '../src/activities/modules.js';
+import { ajaxBuilder } from '../src/ajax.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ */
 
 const MODULE_NAME = 'naveggId';
 const OLD_NAVEGG_ID = 'nid';
 const NAVEGG_ID = 'nvggid';
 const BASE_URL = 'https://id.navegg.com/uid/';
-const DEFAULT_EXPIRE = 8 * 24 * 3600 * 1000;
-const INVALID_EXPIRE = 3600 * 1000;
 
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
 
-function getNaveggIdFromApi() {
-  const callbacks = {
-    success: response => {
-      if (response) {
-        try {
-          const responseObj = JSON.parse(response);
-          writeCookie(NAVEGG_ID, responseObj[NAVEGG_ID]);
-        } catch (error) {
-          logError(error);
+function getIdFromAPI() {
+  const resp = function (callback) {
+    ajaxBuilder()(
+      BASE_URL,
+      response => {
+        if (response) {
+          let responseObj;
+          try {
+            responseObj = JSON.parse(response);
+          } catch (error) {
+            logError(error);
+            const fallbackValue = getNaveggIdFromLocalStorage() || getOldCookie();
+            callback(fallbackValue);
+          }
+
+          if (responseObj && responseObj[NAVEGG_ID]) {
+            callback(responseObj[NAVEGG_ID]);
+          } else {
+            const fallbackValue = getNaveggIdFromLocalStorage() || getOldCookie();
+            callback(fallbackValue);
+          }
         }
-      }
-    },
-    error: error => {
-      logError('Navegg ID fetch encountered an error', error);
-    }
+      },
+      error => {
+        logError('Navegg ID fetch encountered an error', error);
+        const fallbackValue = getNaveggIdFromLocalStorage() || getOldCookie();
+        callback(fallbackValue);
+      },
+      {method: 'GET', withCredentials: false});
   };
-  ajax(BASE_URL, callbacks, undefined, { method: 'GET', withCredentials: false });
+  return resp;
 }
 
-function writeCookie(key, value) {
-  try {
-    if (storage.cookiesAreEnabled) {
-      let expTime = new Date();
-      const expires = value ? DEFAULT_EXPIRE : INVALID_EXPIRE;
-      expTime.setTime(expTime.getTime() + expires);
-      storage.setCookie(key, value, expTime.toUTCString(), 'none');
-    }
-  } catch (e) {
-    logError(e);
-  }
-}
-
-function readnaveggIdFromLocalStorage() {
-  return storage.localStorageIsEnabled ? storage.getDataFromLocalStorage(NAVEGG_ID) : null;
+/**
+ * @returns {string | null}
+ */
+function readNvgIdFromCookie() {
+  return storage.cookiesAreEnabled ? (storage.findSimilarCookies('nvg') ? storage.findSimilarCookies('nvg')[0] : null) : null;
 }
-
-function readnaveggIDFromCookie() {
-  return storage.cookiesAreEnabled ? storage.getCookie(NAVEGG_ID) : null;
+/**
+ * @returns {string | null}
+ */
+function readNavIdFromCookie() {
+  return storage.cookiesAreEnabled() ? (storage.findSimilarCookies('nav') ? storage.findSimilarCookies('nav')[0] : null) : null;
 }
-
-function readoldnaveggIDFromCookie() {
-  return storage.cookiesAreEnabled ? storage.getCookie(OLD_NAVEGG_ID) : null;
+/**
+ * @returns {string | null}
+ */
+function readOldNaveggIdFromCookie() {
+  return storage.cookiesAreEnabled() ? storage.getCookie(OLD_NAVEGG_ID) : null;
 }
-
-function readnvgIDFromCookie() {
-  return storage.cookiesAreEnabled ? (storage.findSimilarCookies('nvg') ? storage.findSimilarCookies('nvg')[0] : null) : null;
+/**
+ * @returns {string | null}
+ */
+function getOldCookie() {
+  const oldCookie = readOldNaveggIdFromCookie() || readNvgIdFromCookie() || readNavIdFromCookie();
+  return oldCookie;
 }
-
-function readnavIDFromCookie() {
-  return storage.cookiesAreEnabled ? (storage.findSimilarCookies('nav') ? storage.findSimilarCookies('nav')[0] : null) : null;
+/**
+ * @returns {string | null}
+ */
+function getNaveggIdFromLocalStorage() {
+  return storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(NAVEGG_ID) : null;
 }
 
 /** @type {Submodule} */
 export const naveggIdSubmodule = {
   /**
-  * used to link submodule with config
-  * @type {string}
-  */
+   * used to link submodule with config
+   * @type {string}
+   */
   name: MODULE_NAME,
   /**
-  * decode the stored id value for passing to bid requests
-  * @function
-  * @param { Object | string | undefined } value
-  * @return { Object | string | undefined }
-  */
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param { Object | string | undefined } value
+   * @return { Object | string | undefined }
+   */
   decode(value) {
     const naveggIdVal = value ? isStr(value) ? value : isPlainObject(value) ? value.id : undefined : undefined;
     return naveggIdVal ? {
       'naveggId': naveggIdVal.split('|')[0]
     } : undefined;
   },
-  /**
-  * performs action to obtain id and return a value in the callback's response argument
-  * @function
-  * @param {SubmoduleConfig} config
-  * @return {{id: string | undefined } | undefined}
-  */
-  getId() {
-    const naveggIdString = readnaveggIdFromLocalStorage() || readnaveggIDFromCookie() || getNaveggIdFromApi() || readoldnaveggIDFromCookie() || readnvgIDFromCookie() || readnavIDFromCookie();
 
-    if (typeof naveggIdString == 'string' && naveggIdString) {
-      try {
-        return { id: naveggIdString };
-      } catch (error) {
-        logError(error);
-      }
-    }
-    return undefined;
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} config
+   * @return {{id: string | undefined } | undefined}
+   */
+  getId(config, consentData) {
+    const resp = getIdFromAPI()
+    return {callback: resp}
   },
   eids: {
     'naveggId': {
diff --git a/modules/naveggIdSystem.md b/modules/naveggIdSystem.md
index f758fbc9d5d..81d9841c78f 100644
--- a/modules/naveggIdSystem.md
+++ b/modules/naveggIdSystem.md
@@ -10,6 +10,11 @@ pbjs.setConfig({
     userSync: {
         userIds: [{
             name: 'naveggId',
+            storage: {
+                name : 'nvggid',
+                type : 'cookie&html5',
+                expires: 8
+            }
         }]
     }
 });
@@ -20,3 +25,6 @@ The below parameters apply only to the naveggID integration.
 | Param under usersync.userIds[] | Scope | Type | Description | Example |
 | --- | --- | --- | --- | --- |
 | name | Required | String | ID of the module - `"naveggId"` | `"naveggId"` |
+| storage.name | Required | String | The name of the cookie or html5 local storage where the user ID will be stored.	 | `"nvggid"` |
+| storage.type | Required | String | Must be "`cookie`", "`html5`" or "`cookie&html5`". This is where the results of the user ID will be stored.	| `"cookie&html5"` |
+| storage.expires | Required | Integer | How long (in days) the user ID information will be stored. | `8` |
diff --git a/modules/netIdSystem.js b/modules/netIdSystem.js
index 6f1ffe8b0e7..4765f892a97 100644
--- a/modules/netIdSystem.js
+++ b/modules/netIdSystem.js
@@ -7,6 +7,13 @@
 
 import {submodule} from '../src/hook.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 /** @type {Submodule} */
 export const netIdSubmodule = {
   /**
diff --git a/modules/neuwoRtdProvider.js b/modules/neuwoRtdProvider.js
index 881bbc10b11..a2c2249285b 100644
--- a/modules/neuwoRtdProvider.js
+++ b/modules/neuwoRtdProvider.js
@@ -3,7 +3,7 @@ import { getRefererInfo } from '../src/refererDetection.js';
 import { ajax } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 
 export const DATA_PROVIDER = 'neuwo.ai';
 const SEGTAX_IAB = 6 // IAB - Content Taxonomy version 2
@@ -42,7 +42,7 @@ export function getBidRequestData(reqBidsConfigObj, callback, config, userConsen
     try {
       const jsonContent = JSON.parse(responseContent);
       if (jsonContent.marketing_categories) {
-        events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, { type: 'request', billingId, vendor: neuwoRtdModule.name })
+        events.emit(EVENTS.BILLABLE_EVENT, { type: 'request', billingId, vendor: neuwoRtdModule.name })
       }
       injectTopics(jsonContent, reqBidsConfigObj, billingId)
     } catch (ex) {
@@ -71,7 +71,7 @@ export function addFragment(base, path, addition) {
 /**
  * Concatenate a base array and an array within an object
  * non-array bases will be arrays, non-arrays at object key will be discarded
- * @param {array} base base array to add to
+ * @param {Array} base base array to add to
  * @param {object} source object to get an array from
  * @param {string} key dot-notated path to array within object
  * @returns base + source[key] if that's an array
diff --git a/modules/newspassidBidAdapter.js b/modules/newspassidBidAdapter.js
index 2a4b2da186b..d33b4e64297 100644
--- a/modules/newspassidBidAdapter.js
+++ b/modules/newspassidBidAdapter.js
@@ -1,4 +1,5 @@
 import {
+  deepClone,
   logInfo,
   logError,
   deepAccess,
@@ -33,12 +34,12 @@ export const spec = {
   },
   loadConfiguredData(bid) {
     if (this.propertyBag.config) { return; }
-    this.propertyBag.config = JSON.parse(JSON.stringify(this.config_defaults));
+    this.propertyBag.config = deepClone(this.config_defaults);
     let bidder = bid.bidder || 'newspassid';
     this.propertyBag.config.logId = bidder.toUpperCase();
     this.propertyBag.config.bidder = bidder;
     let bidderConfig = config.getConfig(bidder) || {};
-    logInfo('got bidderConfig: ', JSON.parse(JSON.stringify(bidderConfig)));
+    logInfo('got bidderConfig: ', deepClone(bidderConfig));
     let arrGetParams = this.getGetParametersAsObject();
     if (bidderConfig.endpointOverride) {
       if (bidderConfig.endpointOverride.origin) {
@@ -131,7 +132,7 @@ export const spec = {
   buildRequests(validBidRequests, bidderRequest) {
     this.loadConfiguredData(validBidRequests[0]);
     this.propertyBag.buildRequestsStart = new Date().getTime();
-    logInfo(`buildRequests time: ${this.propertyBag.buildRequestsStart} v ${NEWSPASSVERSION} validBidRequests`, JSON.parse(JSON.stringify(validBidRequests)), 'bidderRequest', JSON.parse(JSON.stringify(bidderRequest)));
+    logInfo(`buildRequests time: ${this.propertyBag.buildRequestsStart} v ${NEWSPASSVERSION} validBidRequests`, deepClone(validBidRequests), 'bidderRequest', deepClone(bidderRequest));
     if (this.blockTheRequest()) {
       return [];
     }
@@ -281,7 +282,7 @@ export const spec = {
         data: JSON.stringify(npRequest),
         bidderRequest: bidderRequest
       };
-      logInfo('buildRequests request data for single = ', JSON.parse(JSON.stringify(npRequest)));
+      logInfo('buildRequests request data for single = ', deepClone(npRequest));
       this.propertyBag.buildRequestsEnd = new Date().getTime();
       logInfo(`buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
       return ret;
@@ -309,7 +310,7 @@ export const spec = {
     if (request && request.bidderRequest && request.bidderRequest.bids) { this.loadConfiguredData(request.bidderRequest.bids[0]); }
     let startTime = new Date().getTime();
     logInfo(`interpretResponse time: ${startTime}. buildRequests done -> interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
-    logInfo(`serverResponse, request`, JSON.parse(JSON.stringify(serverResponse)), JSON.parse(JSON.stringify(request)));
+    logInfo(`serverResponse, request`, deepClone(serverResponse), deepClone(request));
     serverResponse = serverResponse.body || {};
     let aucId = serverResponse.id; // this will be correct for single requests and non-single
     if (!serverResponse.hasOwnProperty('seatbid')) {
@@ -464,10 +465,6 @@ export const spec = {
       if (id5id) {
         ret['id5id'] = id5id;
       }
-      let parrableId = deepAccess(bidRequest.userId, 'parrableId.eid');
-      if (parrableId) {
-        ret['parrableId'] = parrableId;
-      }
       let sharedid = deepAccess(bidRequest.userId, 'sharedid.id');
       if (sharedid) {
         ret['sharedid'] = sharedid;
diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index 0cbe954175c..a4169947e85 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -1,45 +1,77 @@
 import {
   _each,
-  createTrackPixelHtml,
-  deepAccess, getBidIdParameter,
+  deepAccess,
+  deepSetValue,
+  getBidIdParameter,
   getDefinedParams,
   getWindowTop,
   isArray,
   isStr,
-  logMessage,
   parseGPTSingleSizeArrayToRtbSize,
   parseUrl,
   triggerPixel,
 } from '../src/utils.js';
 
-import CONSTANTS from '../src/constants.json';
+import {getAd} from '../libraries/targetVideoUtils/bidderUtils.js';
+
+import { EVENTS } from '../src/constants.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
-import * as events from '../src/events.js';
 
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 
+const NM_VERSION = '4.2.1';
+const PBJS_VERSION = 'v$prebid.version$';
+const GVLID = 1060;
 const BIDDER_CODE = 'nextMillennium';
 const ENDPOINT = 'https://pbs.nextmillmedia.com/openrtb2/auction';
 const TEST_ENDPOINT = 'https://test.pbs.nextmillmedia.com/openrtb2/auction';
-const SYNC_ENDPOINT = 'https://cookies.nextmillmedia.com/sync?';
+const SYNC_ENDPOINT = 'https://cookies.nextmillmedia.com/sync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}&type={{.TYPE_PIXEL}}';
 const REPORT_ENDPOINT = 'https://report2.hb.brainlyads.com/statistics/metric';
 const TIME_TO_LIVE = 360;
-const VIDEO_PARAMS = [
-  'api', 'linearity', 'maxduration', 'mimes', 'minduration', 'placement',
-  'playbackmethod', 'protocols', 'startdelay'
-];
-const GVLID = 1060;
-
-const sendingDataStatistic = initSendingDataStatistic();
-events.on(CONSTANTS.EVENTS.AUCTION_INIT, auctionInitHandler);
-
-const EXPIRENCE_WURL = 20 * 60000;
-const wurlMap = {};
-cleanWurl();
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_TMAX = 1500;
+
+const VIDEO_PARAMS_DEFAULT = {
+  api: undefined,
+  context: undefined,
+  delivery: undefined,
+  linearity: undefined,
+  maxduration: undefined,
+  mimes: [
+    'video/mp4',
+    'video/x-ms-wmv',
+    'application/javascript',
+  ],
+
+  minduration: undefined,
+  placement: undefined,
+  plcmt: undefined,
+  playbackend: undefined,
+  playbackmethod: undefined,
+  pos: undefined,
+  protocols: undefined,
+  skip: undefined,
+  skipafter: undefined,
+  skipmin: undefined,
+  startdelay: undefined,
+};
 
-events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler);
+const VIDEO_PARAMS = Object.keys(VIDEO_PARAMS_DEFAULT);
+const ALLOWED_ORTB2_PARAMETERS = [
+  'site.pagecat',
+  'site.content.cat',
+  'site.content.language',
+  'device.sua',
+  'site.keywords',
+  'site.content.keywords',
+  'user.keywords',
+  'bcat',
+  'badv',
+  'wlang',
+  'wlangb',
+];
 
 export const spec = {
   code: BIDDER_CODE,
@@ -48,149 +80,86 @@ export const spec = {
 
   isBidRequestValid: function(bid) {
     return !!(
-      (bid.params.placement_id && isStr(bid.params.placement_id)) || (bid.params.group_id && isStr(bid.params.group_id))
+      (bid.params.placement_id && isStr(bid.params.placement_id)) ||
+      (bid.params.group_id && isStr(bid.params.group_id))
     );
   },
 
   buildRequests: function(validBidRequests, bidderRequest) {
     const requests = [];
     window.nmmRefreshCounts = window.nmmRefreshCounts || {};
+    const site = getSiteObj();
+    const device = getDeviceObj();
+    const source = getSourceObj(validBidRequests, bidderRequest);
+    const tmax = deepAccess(bidderRequest, 'timeout') || DEFAULT_TMAX;
+
+    const postBody = {
+      id: bidderRequest?.bidderRequestId,
+      tmax,
+      ext: {
+        next_mil_imps: [],
+      },
+
+      device,
+      site,
+      source,
+      imp: [],
+    };
 
-    _each(validBidRequests, function(bid) {
-      window.nmmRefreshCounts[bid.adUnitCode] = window.nmmRefreshCounts[bid.adUnitCode] || 0;
-      const id = getPlacementId(bid);
-      const auctionId = bid.auctionId;
-      const bidId = bid.bidId;
-      let sizes = bid.sizes;
-      if (sizes && !Array.isArray(sizes[0])) sizes = [sizes];
-
-      const site = getSiteObj();
-      const device = getDeviceObj();
-
-      const postBody = {
-        'id': bidderRequest?.bidderRequestId,
-        'ext': {
-          'prebid': {
-            'storedrequest': {
-              'id': id
-            }
-          },
-
-          'nextMillennium': {
-            'refresh_count': window.nmmRefreshCounts[bid.adUnitCode]++,
-            'elOffsets': getBoundingClient(bid),
-            'scrollTop': window.pageYOffset || document.documentElement.scrollTop
-          }
-        },
-
-        device,
-        site,
-        imp: []
-      };
-
-      const imp = {
-        id: bid.adUnitCode,
-        ext: {
-          prebid: {
-            storedrequest: {id}
-          }
-        }
-      };
-
-      if (deepAccess(bid, 'mediaTypes.banner')) {
-        imp.banner = {
-          format: (sizes || []).map(s => { return {w: s[0], h: s[1]} })
-        };
-      };
-
-      const video = deepAccess(bid, 'mediaTypes.video');
-      if (video) {
-        imp.video = getDefinedParams(video, VIDEO_PARAMS);
-        if (video.playerSize) {
-          imp.video = Object.assign(
-            imp.video, parseGPTSingleSizeArrayToRtbSize(video.playerSize[0]) || {}
-          );
-        } else if (video.w && video.h) {
-          imp.video.w = video.w;
-          imp.video.h = video.h;
-        };
-      };
-
-      postBody.imp.push(imp);
-
-      const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
-      const uspConsent = bidderRequest && bidderRequest.uspConsent;
-
-      if (gdprConsent || uspConsent) {
-        postBody.regs = { ext: {} };
-
-        if (uspConsent) {
-          postBody.regs.ext.us_privacy = uspConsent;
-        };
+    setConsentStrings(postBody, bidderRequest);
+    setOrtb2Parameters(postBody, bidderRequest?.ortb2);
 
-        if (gdprConsent) {
-          if (typeof gdprConsent.gdprApplies !== 'undefined') {
-            postBody.regs.ext.gdpr = gdprConsent.gdprApplies ? 1 : 0;
-          };
+    const urlParameters = parseUrl(getWindowTop().location.href).search;
+    const isTest = urlParameters['pbs'] && urlParameters['pbs'] === 'test';
+    setEids(postBody, validBidRequests);
 
-          if (typeof gdprConsent.consentString !== 'undefined') {
-            postBody.user = {
-              ext: { consent: gdprConsent.consentString }
-            };
-          };
-        };
-      };
+    _each(validBidRequests, (bid, i) => {
+      window.nmmRefreshCounts[bid.adUnitCode] = window.nmmRefreshCounts[bid.adUnitCode] || 0;
+      const id = getPlacementId(bid);
+      const {cur, mediaTypes} = getCurrency(bid);
+      if (i === 0) postBody.cur = cur;
+      postBody.imp.push(getImp(bid, id, mediaTypes));
+      postBody.ext.next_mil_imps.push(getExtNextMilImp(bid));
+    });
 
-      const urlParameters = parseUrl(getWindowTop().location.href).search;
-      const isTest = urlParameters['pbs'] && urlParameters['pbs'] === 'test';
-      const params = bid.params;
-
-      requests.push({
-        method: 'POST',
-        url: isTest ? TEST_ENDPOINT : ENDPOINT,
-        data: JSON.stringify(postBody),
-        options: {
-          contentType: 'text/plain',
-          withCredentials: true
-        },
+    this.getUrlPixelMetric(EVENTS.BID_REQUESTED, validBidRequests);
 
-        bidId,
-        params,
-        auctionId,
-      });
+    requests.push({
+      method: 'POST',
+      url: isTest ? TEST_ENDPOINT : ENDPOINT,
+      data: JSON.stringify(postBody),
+      options: {
+        contentType: 'text/plain',
+        withCredentials: true,
+      },
     });
 
     return requests;
   },
 
-  interpretResponse: function(serverResponse, bidRequest) {
+  interpretResponse: function(serverResponse) {
     const response = serverResponse.body;
     const bidResponses = [];
 
+    const bids = [];
     _each(response.seatbid, (resp) => {
       _each(resp.bid, (bid) => {
-        const requestId = bidRequest.bidId;
-        const params = bidRequest.params;
-        const auctionId = bidRequest.auctionId;
-        const wurl = deepAccess(bid, 'ext.prebid.events.win');
-        // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-        addWurl({auctionId, requestId, wurl});
+        const requestId = bid.impid;
 
         const {ad, adUrl, vastUrl, vastXml} = getAd(bid);
 
         const bidResponse = {
           requestId,
-          params,
           cpm: bid.price,
           width: bid.w,
           height: bid.h,
           creativeId: bid.adid,
-          currency: response.cur,
+          currency: response.cur || DEFAULT_CURRENCY,
           netRevenue: true,
           ttl: TIME_TO_LIVE,
           meta: {
-            advertiserDomains: bid.adomain || []
-          }
+            advertiserDomains: bid.adomain || [],
+          },
         };
 
         if (vastUrl || vastXml) {
@@ -205,62 +174,71 @@ export const spec = {
 
         bidResponses.push(bidResponse);
       });
+
+      bids.push(resp.bid);
     });
 
+    this.getUrlPixelMetric(EVENTS.BID_RESPONSE, bids.flat());
+
     return bidResponses;
   },
 
-  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
+    if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) return [];
+
     const pixels = [];
+    const getSetPixelFunc = type => url => { pixels.push({type, url: replaceUsersyncMacros(url, gdprConsent, uspConsent, gppConsent, type)}) };
+    const getSetPixelsFunc = type => response => { deepAccess(response, `body.ext.sync.${type}`, []).forEach(getSetPixelFunc(type)) };
+
+    const setPixel = (type, url) => { (getSetPixelFunc(type))(url) };
+    const setPixelImages = getSetPixelsFunc('image');
+    const setPixelIframes = getSetPixelsFunc('iframe');
 
     if (isArray(responses)) {
       responses.forEach(response => {
-        if (syncOptions.pixelEnabled) {
-          deepAccess(response, 'body.ext.sync.image', []).forEach(imgUrl => {
-            pixels.push({
-              type: 'image',
-              url: replaceUsersyncMacros(imgUrl, gdprConsent, uspConsent)
-            });
-          })
-        }
-
-        if (syncOptions.iframeEnabled) {
-          deepAccess(response, 'body.ext.sync.iframe', []).forEach(iframeUrl => {
-            pixels.push({
-              type: 'iframe',
-              url: replaceUsersyncMacros(iframeUrl, gdprConsent, uspConsent)
-            });
-          })
-        }
-      })
+        if (syncOptions.pixelEnabled) setPixelImages(response);
+        if (syncOptions.iframeEnabled) setPixelIframes(response);
+      });
     }
 
     if (!pixels.length) {
-      let syncUrl = SYNC_ENDPOINT;
-      if (gdprConsent && gdprConsent.gdprApplies) syncUrl += 'gdpr=1&gdpr_consent=' + gdprConsent.consentString + '&';
-      if (uspConsent) syncUrl += 'us_privacy=' + uspConsent + '&';
-      if (syncOptions.iframeEnabled) pixels.push({type: 'iframe', url: syncUrl + 'type=iframe'});
-      if (syncOptions.pixelEnabled) pixels.push({type: 'image', url: syncUrl + 'type=image'});
+      if (syncOptions.pixelEnabled) setPixel('image', SYNC_ENDPOINT);
+      if (syncOptions.iframeEnabled) setPixel('iframe', SYNC_ENDPOINT);
     }
+
     return pixels;
   },
 
   getUrlPixelMetric(eventName, bid) {
-    const bidder = bid.bidder || bid.bidderCode;
+    const disabledSending = !!config.getBidderConfig()?.nextMillennium?.disabledSendingStatisticData;
+    if (disabledSending) return;
+
+    const url = this._getUrlPixelMetric(eventName, bid);
+    if (!url) return;
+
+    triggerPixel(url);
+  },
+
+  _getUrlPixelMetric(eventName, bids) {
+    if (!Array.isArray(bids)) bids = [bids];
+
+    const bidder = bids[0]?.bidder || bids[0]?.bidderCode;
     if (bidder != BIDDER_CODE) return;
 
-    let params;
-    if (bid.params) {
-      params = Array.isArray(bid.params) ? bid.params : [bid.params];
-    } else {
-      if (Array.isArray(bid.bids)) params = bid.bids.map(bidI => bidI.params);
-    };
+    let params = [];
+    _each(bids, bid => {
+      if (bid.params) {
+        params.push(bid.params);
+      } else {
+        if (Array.isArray(bid.bids)) params.push(bid.bids.map(bidI => bidI.params));
+      };
+    });
 
     if (!params.length) return;
 
     const placementIdsArray = [];
     const groupIdsArray = [];
-    params.forEach(paramsI => {
+    params.flat().forEach(paramsI => {
       if (paramsI.group_id) {
         groupIdsArray.push(paramsI.group_id);
       } else {
@@ -271,53 +249,196 @@ export const spec = {
     const placementIds = (placementIdsArray.length && `&placements=${placementIdsArray.join(';')}`) || '';
     const groupIds = (groupIdsArray.length && `&groups=${groupIdsArray.join(';')}`) || '';
 
-    if (!(groupIds || placementIds)) {
-      return;
-    };
+    if (!(groupIds || placementIds)) return;
 
     const url = `${REPORT_ENDPOINT}?event=${eventName}&bidder=${bidder}&source=pbjs${groupIds}${placementIds}`;
 
     return url;
   },
+
+  onTimeout(bids) {
+    for (const bid of bids) {
+      this.getUrlPixelMetric(EVENTS.BID_TIMEOUT, bid);
+    };
+  },
 };
 
-function replaceUsersyncMacros(url, gdprConsent, uspConsent) {
-  const { consentString, gdprApplies } = gdprConsent || {};
+function getExtNextMilImp(bid) {
+  if (typeof window?.nmmRefreshCounts[bid.adUnitCode] === 'number') ++window.nmmRefreshCounts[bid.adUnitCode];
+  const nextMilImp = {
+    impId: bid.bidId,
+    nextMillennium: {
+      nm_version: NM_VERSION,
+      pbjs_version: PBJS_VERSION,
+      refresh_count: window?.nmmRefreshCounts[bid.adUnitCode] || 0,
+      scrollTop: window.pageYOffset || document.documentElement.scrollTop,
+    },
+  };
 
-  if (gdprApplies) {
-    const gdpr = Number(gdprApplies);
-    url = url.replace('{{.GDPR}}', gdpr);
+  return nextMilImp;
+}
 
-    if (gdpr == 1 && consentString && consentString.length > 0) {
-      url = url.replace('{{.GDPRConsent}}', consentString);
-    }
-  } else {
-    url = url.replace('{{.GDPR}}', 0);
-    url = url.replace('{{.GDPRConsent}}', '');
-  }
+export function getImp(bid, id, mediaTypes) {
+  const {banner, video} = mediaTypes;
+  const imp = {
+    id: bid.bidId,
+    ext: {
+      prebid: {
+        storedrequest: {
+          id,
+        },
+      },
+    },
+  };
 
-  if (uspConsent) {
-    url = url.replace('{{.USPrivacy}}', uspConsent);
-  }
+  const gpid = bid?.ortb2Imp?.ext?.gpid;
+  const pbadslot = bid?.ortb2Imp?.ext?.data?.pbadslot;
+  if (gpid) imp.ext.gpid = gpid;
+  if (pbadslot) imp.ext.data = { pbadslot };
 
-  return url;
+  getImpBanner(imp, banner);
+  getImpVideo(imp, video);
+
+  return imp;
+};
+
+export function getImpBanner(imp, banner) {
+  if (!banner) return;
+
+  if (banner.bidfloorcur) imp.bidfloorcur = banner.bidfloorcur;
+  if (banner.bidfloor) imp.bidfloor = banner.bidfloor;
+
+  const format = (banner.data?.sizes || []).map(s => { return {w: s[0], h: s[1]} })
+  const {w, h} = (format[0] || {})
+  imp.banner = {
+    w,
+    h,
+    format,
+  };
+};
+
+export function getImpVideo(imp, video) {
+  if (!video) return;
+
+  if (video.bidfloorcur) imp.bidfloorcur = video.bidfloorcur;
+  if (video.bidfloor) imp.bidfloor = video.bidfloor;
+
+  imp.video = getDefinedParams(video.data, VIDEO_PARAMS);
+  Object.keys(VIDEO_PARAMS_DEFAULT)
+    .filter(videoParamName => VIDEO_PARAMS_DEFAULT[videoParamName])
+    .forEach(videoParamName => {
+      if (typeof imp.video[videoParamName] === 'undefined') imp.video[videoParamName] = VIDEO_PARAMS_DEFAULT[videoParamName];
+    });
+
+  if (video.data.playerSize) {
+    imp.video = Object.assign(imp.video, parseGPTSingleSizeArrayToRtbSize(video.data?.playerSize) || {});
+  } else if (video.data.w && video.data.h) {
+    imp.video.w = video.data.w;
+    imp.video.h = video.data.h;
+  };
 };
 
-function getAdEl(bid) {
-  // best way I could think of to get El, is by matching adUnitCode to google slots...
-  const slot = window.googletag && window.googletag.pubads && window.googletag.pubads().getSlots().find(slot => slot.getAdUnitPath() === bid.adUnitCode);
-  const slotElementId = slot && slot.getSlotElementId();
-  if (!slotElementId) return null;
-  return document.querySelector('#' + slotElementId);
+export function setConsentStrings(postBody = {}, bidderRequest) {
+  const gdprConsent = bidderRequest?.gdprConsent;
+  const uspConsent = bidderRequest?.uspConsent;
+  let gppConsent = bidderRequest?.gppConsent?.gppString && bidderRequest?.gppConsent;
+  if (!gppConsent && bidderRequest?.ortb2?.regs?.gpp) gppConsent = bidderRequest?.ortb2?.regs;
+
+  if (gdprConsent || uspConsent || gppConsent) {
+    postBody.regs = {};
+
+    if (uspConsent) {
+      postBody.regs.us_privacy = uspConsent;
+    };
+
+    if (gppConsent) {
+      postBody.regs.gpp = gppConsent?.gppString || gppConsent?.gpp;
+      postBody.regs.gpp_sid = bidderRequest.gppConsent?.applicableSections || gppConsent?.gpp_sid;
+    };
+
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies !== 'undefined') {
+        postBody.regs.gdpr = gdprConsent.gdprApplies ? 1 : 0;
+      };
+
+      if (typeof gdprConsent.consentString !== 'undefined') {
+        postBody.user = {
+          consent: gdprConsent.consentString,
+        };
+      };
+    };
+
+    if (typeof bidderRequest?.ortb2?.regs?.coppa === 'number') {
+      postBody.regs.coppa = bidderRequest?.ortb2?.regs?.coppa;
+    };
+  };
+};
+
+export function setOrtb2Parameters(postBody, ortb2 = {}) {
+  for (let parameter of ALLOWED_ORTB2_PARAMETERS) {
+    const value = deepAccess(ortb2, parameter);
+    if (value) deepSetValue(postBody, parameter, value);
+  }
+
+  if (postBody.wlang) delete postBody.wlangb
+}
+
+export function setEids(postBody = {}, bids = []) {
+  let isFind = false;
+  _each(bids, bid => {
+    if (isFind || !isArray(bid.userIdAsEids) || !bid.userIdAsEids.length) return;
+
+    if (bid.userIdAsEids.length) {
+      deepSetValue(postBody, 'user.eids', bid.userIdAsEids);
+      isFind = true;
+    };
+  });
 }
 
-function getBoundingClient(bid) {
-  const el = getAdEl(bid);
-  if (!el) return {};
-  return el.getBoundingClientRect();
+export function replaceUsersyncMacros(url, gdprConsent = {}, uspConsent = '', gppConsent = {}, type = '') {
+  const { consentString = '', gdprApplies = false } = gdprConsent;
+  const gdpr = Number(gdprApplies);
+  url = url
+    .replace('{{.GDPR}}', gdpr)
+    .replace('{{.GDPRConsent}}', consentString)
+    .replace('{{.USPrivacy}}', uspConsent)
+    .replace('{{.GPP}}', gppConsent.gppString || '')
+    .replace('{{.GPPSID}}', (gppConsent.applicableSections || []).join(','))
+    .replace('{{.TYPE_PIXEL}}', type);
+
+  return url;
 }
 
-function getPlacementId(bid) {
+function getCurrency(bid = {}) {
+  const currency = config?.getConfig('currency')?.adServerCurrency || DEFAULT_CURRENCY;
+  const cur = [];
+  const types = ['banner', 'video'];
+  const mediaTypes = {};
+  for (const mediaType of types) {
+    const mediaTypeData = deepAccess(bid, `mediaTypes.${mediaType}`);
+    if (mediaTypeData) {
+      mediaTypes[mediaType] = {data: mediaTypeData};
+    } else {
+      continue;
+    };
+
+    if (typeof bid.getFloor === 'function') {
+      let floorInfo = bid.getFloor({currency, mediaType, size: '*'});
+      mediaTypes[mediaType].bidfloorcur = floorInfo?.currency;
+      mediaTypes[mediaType].bidfloor = floorInfo?.floor;
+    } else {
+      mediaTypes[mediaType].bidfloorcur = currency;
+    };
+
+    if (cur.includes(mediaTypes[mediaType].bidfloorcur)) cur.push(mediaTypes[mediaType].bidfloorcur);
+  };
+
+  if (!cur.length) cur.push(DEFAULT_CURRENCY);
+
+  return {cur, mediaTypes};
+}
+
+export function getPlacementId(bid) {
   const groupId = getBidIdParameter('group_id', bid.params);
   const placementId = getBidIdParameter('placement_id', bid.params);
   if (!groupId) return placementId;
@@ -325,8 +446,8 @@ function getPlacementId(bid) {
   let windowTop = getTopWindow(window);
   let sizes = [];
   if (bid.mediaTypes) {
-    if (bid.mediaTypes.banner) sizes = bid.mediaTypes.banner.sizes;
-    if (bid.mediaTypes.video) sizes = [bid.mediaTypes.video.playerSize];
+    if (bid.mediaTypes.banner) sizes = [...bid.mediaTypes.banner.sizes];
+    if (bid.mediaTypes.video) sizes.push(bid.mediaTypes.video.playerSize);
   };
 
   const host = (windowTop && windowTop.location && windowTop.location.host) || '';
@@ -347,39 +468,24 @@ function getTopWindow(curWindow, nesting = 0) {
   };
 }
 
-function getAd(bid) {
-  let ad, adUrl, vastXml, vastUrl;
-
-  switch (deepAccess(bid, 'ext.prebid.type')) {
-    case VIDEO:
-      if (bid.adm.substr(0, 4) === 'http') {
-        vastUrl = bid.adm;
-      } else {
-        vastXml = bid.adm;
-      };
-
-      break;
-    default:
-      if (bid.adm && bid.nurl) {
-        ad = bid.adm;
-        ad += createTrackPixelHtml(decodeURIComponent(bid.nurl));
-      } else if (bid.adm) {
-        ad = bid.adm;
-      } else if (bid.nurl) {
-        adUrl = bid.nurl;
-      };
-  }
-
-  return {ad, adUrl, vastXml, vastUrl};
-}
-
 function getSiteObj() {
   const refInfo = (getRefererInfo && getRefererInfo()) || {};
 
+  let language = navigator.language;
+  let content;
+  if (language) {
+    // get ISO-639-1-alpha-2 (2 character language)
+    language = language.split('-')[0];
+    content = {
+      language,
+    };
+  };
+
   return {
     page: refInfo.page,
     ref: refInfo.ref,
-    domain: refInfo.domain
+    domain: refInfo.domain,
+    content,
   };
 }
 
@@ -387,129 +493,33 @@ function getDeviceObj() {
   return {
     w: window.innerWidth || window.document.documentElement.clientWidth || window.document.body.clientWidth || 0,
     h: window.innerHeight || window.document.documentElement.clientHeight || window.document.body.clientHeight || 0,
+    ua: window.navigator.userAgent || undefined,
+    sua: getSua(),
   };
 }
 
-function getKeyWurl({auctionId, requestId}) {
-  return `${auctionId}-${requestId}`;
-}
-
-function addWurl({wurl, requestId, auctionId}) {
-  if (!wurl) return;
+export function getSourceObj(validBidRequests, bidderRequest) {
+  const schain = validBidRequests?.[0]?.schain ||
+    (bidderRequest?.ortb2?.source && (bidderRequest?.ortb2?.source?.schain || bidderRequest?.ortb2?.source?.ext?.schain));
 
-  const expirence = Date.now() + EXPIRENCE_WURL;
-  const key = getKeyWurl({auctionId, requestId});
-  wurlMap[key] = {wurl, expirence};
-}
-
-function removeWurl({auctionId, requestId}) {
-  const key = getKeyWurl({auctionId, requestId});
-  delete wurlMap[key];
-}
-
-function getWurl({auctionId, requestId}) {
-  const key = getKeyWurl({auctionId, requestId});
-  return wurlMap[key] && wurlMap[key].wurl;
-}
+  if (!schain) return;
 
-function bidWonHandler(bid) {
-  const {auctionId, requestId} = bid;
-  const wurl = getWurl({auctionId, requestId});
-  if (wurl) {
-    logMessage(`(nextmillennium) Invoking image pixel for wurl on BID_WIN: "${wurl}"`);
-    triggerPixel(wurl);
-    removeWurl({auctionId, requestId});
+  const source = {
+    schain,
   };
-}
-
-function auctionInitHandler() {
-  sendingDataStatistic.initEvents();
-}
-
-function cleanWurl() {
-  const dateNow = Date.now();
-  Object.keys(wurlMap).forEach(key => {
-    if (dateNow >= wurlMap[key].expirence) {
-      delete wurlMap[key];
-    };
-  });
 
-  setTimeout(cleanWurl, 60000);
+  return source;
 }
 
-function initSendingDataStatistic() {
-  class SendingDataStatistic {
-    eventNames = [
-      CONSTANTS.EVENTS.BID_TIMEOUT,
-      CONSTANTS.EVENTS.BID_RESPONSE,
-      CONSTANTS.EVENTS.BID_REQUESTED,
-      CONSTANTS.EVENTS.NO_BID,
-    ];
-
-    disabledSending = false;
-    enabledSending = false;
-    eventHendlers = {};
-
-    initEvents() {
-      this.disabledSending = !!config.getBidderConfig()?.nextMillennium?.disabledSendingStatisticData;
-      if (this.disabledSending) {
-        this.removeEvents();
-      } else {
-        this.createEvents();
-      };
-    }
-
-    createEvents() {
-      if (this.enabledSending) return;
+function getSua() {
+  let {brands, mobile, platform} = (window?.navigator?.userAgentData || {});
+  if (!(brands && platform)) return undefined;
 
-      this.enabledSending = true;
-      for (let eventName of this.eventNames) {
-        if (!this.eventHendlers[eventName]) {
-          this.eventHendlers[eventName] = this.eventHandler(eventName);
-        };
-
-        events.on(eventName, this.eventHendlers[eventName]);
-      };
-    }
-
-    removeEvents() {
-      if (!this.enabledSending) return;
-
-      this.enabledSending = false;
-      for (let eventName of this.eventNames) {
-        if (!this.eventHendlers[eventName]) continue;
-
-        events.off(eventName, this.eventHendlers[eventName]);
-      };
-    }
-
-    eventHandler(eventName) {
-      const eventHandlerFunc = this.getEventHandler(eventName);
-      if (eventName == CONSTANTS.EVENTS.BID_TIMEOUT) {
-        return bids => {
-          if (this.disabledSending || !Array.isArray(bids)) return;
-
-          for (let bid of bids) {
-            eventHandlerFunc(bid);
-          };
-        }
-      };
-
-      return eventHandlerFunc;
-    }
-
-    getEventHandler(eventName) {
-      return bid => {
-        if (this.disabledSending) return;
-
-        const url = spec.getUrlPixelMetric(eventName, bid);
-        if (!url) return;
-        triggerPixel(url);
-      };
-    }
+  return {
+    brands,
+    mobile: Number(!!mobile),
+    platform: (platform && {brand: platform}) || undefined,
   };
-
-  return new SendingDataStatistic();
 }
 
 registerBidder(spec);
diff --git a/modules/nextrollBidAdapter.js b/modules/nextrollBidAdapter.js
index eab174d22dd..689f2120de2 100644
--- a/modules/nextrollBidAdapter.js
+++ b/modules/nextrollBidAdapter.js
@@ -11,9 +11,16 @@ import {
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { getOsVersion } from '../libraries/advangUtils/index.js';
 
 import {find} from '../src/polyfill.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
 const BIDDER_CODE = 'nextroll';
 const BIDDER_ENDPOINT = 'https://d.adroll.com/bid/prebid/';
 const ADAPTER_VERSION = 5;
@@ -306,7 +313,7 @@ function _getDevice(_bidRequest) {
     ua: navigator.userAgent,
     language: navigator['language'],
     os: _getOs(navigator.userAgent.toLowerCase()),
-    osv: _getOsVersion(navigator.userAgent)
+    osv: getOsVersion()
   };
 }
 
@@ -337,25 +344,4 @@ function _getOs(userAgent) {
   }) || 'etc';
 }
 
-function _getOsVersion(userAgent) {
-  const clientStrings = [
-    { s: 'Android', r: /Android/ },
-    { s: 'iOS', r: /(iPhone|iPad|iPod)/ },
-    { s: 'Mac OS X', r: /Mac OS X/ },
-    { s: 'Mac OS', r: /(MacPPC|MacIntel|Mac_PowerPC|Macintosh)/ },
-    { s: 'Linux', r: /(Linux|X11)/ },
-    { s: 'Windows 10', r: /(Windows 10.0|Windows NT 10.0)/ },
-    { s: 'Windows 8.1', r: /(Windows 8.1|Windows NT 6.3)/ },
-    { s: 'Windows 8', r: /(Windows 8|Windows NT 6.2)/ },
-    { s: 'Windows 7', r: /(Windows 7|Windows NT 6.1)/ },
-    { s: 'Windows Vista', r: /Windows NT 6.0/ },
-    { s: 'Windows Server 2003', r: /Windows NT 5.2/ },
-    { s: 'Windows XP', r: /(Windows NT 5.1|Windows XP)/ },
-    { s: 'UNIX', r: /UNIX/ },
-    { s: 'Search Bot', r: /(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves\/Teoma|ia_archiver)/ }
-  ];
-  let cs = find(clientStrings, cs => cs.r.test(userAgent));
-  return cs ? cs.s : 'unknown';
-}
-
 registerBidder(spec);
diff --git a/modules/nexverseBidAdapter.js b/modules/nexverseBidAdapter.js
new file mode 100644
index 00000000000..5ff6aa10bc5
--- /dev/null
+++ b/modules/nexverseBidAdapter.js
@@ -0,0 +1,247 @@
+/* eslint-disable camelcase */
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
+import { isArray } from '../src/utils.js';
+import {getConnectionType} from '../libraries/connectionInfo/connectionUtils.js'
+import { getDeviceType, getOS } from '../libraries/userAgentUtils/index.js';
+import { getDeviceModel, buildEndpointUrl, isBidRequestValid, parseNativeResponse, printLog, getUid } from '../libraries/nexverseUtils/index.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {MODULE_TYPE_UID} from '../src/activities/modules.js';
+import { getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
+import { getOsVersion } from '../libraries/advangUtils/index.js';
+
+const BIDDER_CODE = 'nexverse';
+const BIDDER_ENDPOINT = 'https://rtb.nexverse.ai/';
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO, NATIVE];
+const DEFAULT_CURRENCY = 'USD';
+const BID_TTL = 300;
+const DEFAULT_LANG = 'en';
+
+export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: BIDDER_CODE});
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+  isBidRequestValid,
+  /**
+   * Builds the OpenRTB server request from the list of valid bid requests.
+   *
+   * @param {Array} validBidRequests - Array of valid bid requests.
+   * @param {Object} bidderRequest - The bidder request object containing additional data.
+   * @returns {Array} Array of server requests to be sent to the endpoint.
+   */
+  buildRequests(validBidRequests, bidderRequest) {
+    const requests = validBidRequests.map((bid) => {
+      // Build the endpoint URL with query parameters
+      const endpointUrl = buildEndpointUrl(BIDDER_ENDPOINT, bid);
+
+      // Build the OpenRTB payload
+      const payload = buildOpenRtbRequest(bid, bidderRequest);
+
+      if (!payload) {
+        printLog('error', 'Payload could not be built.');
+        return null; // Skip this bid
+      }
+
+      // Return the server request
+      return {
+        method: 'POST',
+        url: endpointUrl,
+        data: JSON.stringify(payload),
+        bidRequest: bid,
+      };
+    });
+
+    return requests.filter((request) => request !== null); // Remove null entries
+  },
+
+  /**
+   * Interprets the server's response and extracts bid information.
+   *
+   * @param {Object} serverResponse - The response from the server.
+   * @param {Object} request - The original server request.
+   * @returns {Array} Array of bids to be passed to the auction.
+   */
+  interpretResponse(serverResponse, request) {
+    if (serverResponse && serverResponse.status === 204) {
+      printLog('info', 'No ad available (204 response).');
+      return [];
+    }
+
+    const bidResponses = [];
+    const response = serverResponse.body;
+
+    if (!response || !response.seatbid || !isArray(response.seatbid)) {
+      printLog('warning', 'No valid bids in the response.');
+      return bidResponses;
+    }
+
+    response.seatbid.forEach((seatbid) => {
+      seatbid.bid.forEach((bid) => {
+        const bidResponse = {
+          requestId: bid.impid,
+          cpm: bid.price,
+          currency: response.cur || DEFAULT_CURRENCY,
+          width: bid.width || 0,
+          height: bid.height || 0,
+          creativeId: bid.crid || bid.id,
+          ttl: BID_TTL,
+          netRevenue: true,
+          meta: {},
+        };
+        // Determine media type and assign the ad content
+        if (bid.ext && bid.ext.mediaType) {
+          bidResponse.mediaType = bid.ext.mediaType;
+        } else if (bid.adm && bid.adm.indexOf(' ({ w: size[0], h: size[1] })), // List of size objects
+        w: bid.sizes[0][0],
+        h: bid.sizes[0][1],
+      },
+      secure: window.location.protocol === 'https:' ? 1 : 0, // Indicates whether the request is secure (HTTPS)
+    });
+  }
+  if (bid.mediaTypes.video) {
+    imp.push({
+      id: bid.bidId,
+      video: {
+        w: bid.sizes[0][0],
+        h: bid.sizes[0][1],
+        mimes: bid.mediaTypes.video.mimes || ['video/mp4'], // Default to video/mp4 if not specified
+        protocols: bid.mediaTypes.video.protocols || [2, 3, 5, 6], // RTB video ad serving protocols
+        maxduration: bid.mediaTypes.video.maxduration || 30,
+        linearity: bid.mediaTypes.video.linearity || 1,
+        playbackmethod: bid.mediaTypes.video.playbackmethod || [2],
+      },
+      secure: window.location.protocol === 'https:' ? 1 : 0, // Indicates whether the request is secure (HTTPS)
+    });
+  }
+  if (bid.mediaTypes.native) {
+    imp.push({
+      id: bid.bidId,
+      native: {
+        request: JSON.stringify(bid.mediaTypes.native), // Convert native request to JSON string
+      },
+      secure: window.location.protocol === 'https:' ? 1 : 0, // Indicates whether the request is secure (HTTPS)
+    });
+  }
+
+  // Construct the OpenRTB request object
+  const openRtbRequest = {
+    id: bidderRequest.auctionId,
+    imp: imp,
+    site: {
+      page: bidderRequest.refererInfo.page,
+      domain: bidderRequest.refererInfo.domain,
+      ref: bidderRequest.refererInfo.ref || '', // Referrer URL
+    },
+    device: {
+      ua: navigator.userAgent,
+      devicetype: getDeviceType(), // 1 = Mobile/Tablet, 2 = Desktop
+      os: getOS(),
+      osv: getOsVersion(),
+      make: navigator.vendor || '',
+      model: getDeviceModel(),
+      connectiontype: getConnectionType(), // Include connection type
+      geo: {
+        lat: bid.params.geoLat || 0,
+        lon: bid.params.geoLon || 0,
+      },
+      language: navigator.language || DEFAULT_LANG,
+      dnt: navigator.doNotTrack === '1' ? 1 : 0, // Do Not Track flag
+    },
+    user: {
+      id: getUid(storage),
+      buyeruid: bidderRequest.userId || '', // User ID or Buyer ID
+      ext: {
+        consent: bidderRequest.gdprConsent ? bidderRequest.gdprConsent.consentString : null, // GDPR consent string
+      },
+    },
+    regs: {
+      ext: {
+        gdpr: bidderRequest.gdprConsent ? (bidderRequest.gdprConsent.gdprApplies ? 1 : 0) : 0,
+      },
+    },
+    ext: {
+      prebid: {
+        auctiontimestamp: bidderRequest.auctionStart,
+      },
+    },
+  };
+
+  // Add app object if the request comes from a mobile app
+  if (bidderRequest.app) {
+    openRtbRequest.app = {
+      id: bidderRequest.app.id,
+      name: bidderRequest.app.name,
+      bundle: bidderRequest.app.bundle,
+      domain: bidderRequest.app.domain,
+      storeurl: bidderRequest.app.storeUrl,
+      cat: bidderRequest.app.cat || [],
+    };
+  }
+  // Add additional fields related to GDPR, US Privacy, CCPA
+  if (bidderRequest.uspConsent) {
+    openRtbRequest.regs.ext.us_privacy = bidderRequest.uspConsent;
+  }
+  return openRtbRequest;
+}
+
+registerBidder(spec);
diff --git a/modules/nexverseBidAdapter.md b/modules/nexverseBidAdapter.md
new file mode 100644
index 00000000000..1de5dda01e9
--- /dev/null
+++ b/modules/nexverseBidAdapter.md
@@ -0,0 +1,41 @@
+# Nexverse Bid Adapter
+
+## Overview
+The Nexverse Bid Adapter enables publishers to connect with the Nexverse Real-Time Bidding (RTB) platform. This adapter supports multiple ad formats, including Banner, Video, and Native ads. By integrating this adapter, publishers can send bid requests to Nexverse’s marketplace and receive high-quality ads in response.
+
+- **Module name**: Nexverse
+- **Module type**: Bidder Adapter
+- **Supported Media Types**: Banner, Video, Native
+- **Maintainer**: anand.kumar@nexverse.ai
+
+## Bidder Parameters
+To correctly configure the Nexverse Bid Adapter, the following parameters are required:
+
+| Param Name   | Scope    | Type   | Description                                         |
+|--------------|----------|--------|-----------------------------------------------------|
+| `uid`        | required | string | Unique User ID assigned by Nexverse for the publisher |
+| `pubId`     | required | string | The unique ID for the publisher                     |
+| `pubEpid`   | required | string | The unique endpoint ID for the publisher            |
+
+### Example Configuration
+The following is an example configuration for a Nexverse bid request using Prebid.js:
+
+```javascript
+var adUnits = [{
+  code: 'div-gpt-ad-1460505748561-0',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300, 600]]
+    }
+  },
+  bids: [{
+    bidder: 'nexverse',
+    params: {
+      uid: '12345',
+      pubId: '54321',
+      pubEpid: 'abcde'
+    },
+    isDebug: false // Optional, i.e True for debug mode
+  }]
+}];
+```
diff --git a/modules/nexx360BidAdapter.js b/modules/nexx360BidAdapter.js
index c65544936fa..933c0378f03 100644
--- a/modules/nexx360BidAdapter.js
+++ b/modules/nexx360BidAdapter.js
@@ -1,4 +1,3 @@
-import {config} from '../src/config.js';
 import { deepAccess, deepSetValue, generateUUID, logError, logInfo } from '../src/utils.js';
 import {Renderer} from '../src/Renderer.js';
 import {getStorageManager} from '../src/storageManager.js';
@@ -7,13 +6,23 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {ortbConverter} from '../libraries/ortbConverter/converter.js'
 import { INSTREAM, OUTSTREAM } from '../src/video.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
 
 const OUTSTREAM_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
 
 const BIDDER_CODE = 'nexx360';
 const REQUEST_URL = 'https://fast.nexx360.io/booster';
 const PAGE_VIEW_ID = generateUUID();
-const BIDDER_VERSION = '3.0';
+const BIDDER_VERSION = '4.2';
 const GVLID = 965;
 const NEXXID_KEY = 'nexx360_storage';
 
@@ -24,6 +33,8 @@ const ALIASES = [
   { code: 'league-m', gvlid: 965 },
   { code: 'prjads' },
   { code: 'pubtech' },
+  { code: '1accord', gvlid: 965 },
+  { code: 'easybid', gvlid: 1068 },
 ];
 
 export const storage = getStorageManager({
@@ -60,6 +71,19 @@ function getAdContainer(container) {
   }
 }
 
+/**
+ * Get the AMX ID
+ * @return {string | false } false if localstorageNotEnabled
+ */
+export function getAmxId() {
+  if (!storage.localStorageIsEnabled()) {
+    logInfo(`localstorage not enabled for Nexx360`);
+    return false;
+  }
+  const amxId = storage.getDataFromLocalStorage('__amuidpb');
+  return amxId || false;
+}
+
 const converter = ortbConverter({
   context: {
     netRevenue: true, // or false if your adapter should set bidResponse.netRevenue = false
@@ -98,13 +122,30 @@ const converter = ortbConverter({
   request(buildRequest, imps, bidderRequest, context) {
     const request = buildRequest(imps, bidderRequest, context);
     const nexx360LocalStorage = getNexx360LocalStorage();
-    if (nexx360LocalStorage) deepSetValue(request, 'ext.nexx360Id', nexx360LocalStorage.nexx360Id);
+    if (nexx360LocalStorage) {
+      deepSetValue(request, 'ext.nexx360Id', nexx360LocalStorage.nexx360Id);
+      deepSetValue(request, 'ext.localStorage.nexx360Id', nexx360LocalStorage.nexx360Id);
+    }
+    const amxId = getAmxId();
+    if (amxId) deepSetValue(request, 'ext.localStorage.amxId', amxId);
     deepSetValue(request, 'ext.version', '$prebid.version$');
     deepSetValue(request, 'ext.source', 'prebid.js');
     deepSetValue(request, 'ext.pageViewId', PAGE_VIEW_ID);
     deepSetValue(request, 'ext.bidderVersion', BIDDER_VERSION);
-    deepSetValue(request, 'cur', [config.getConfig('currency.adServerCurrency') || 'USD']);
-    if (!request.user) deepSetValue(request, 'user', {});
+    deepSetValue(request, 'cur', [getCurrencyFromBidderRequest(bidderRequest) || 'USD']);
+    if (!request.user) request.user = {};
+    if (getAmxId()) {
+      if (!request.user.ext) request.user.ext = {};
+      if (!request.user.ext.eids) request.user.ext.eids = [];
+      request.user.ext.eids.push({
+        source: 'amxdt.net',
+        uids: [{
+          id: `${getAmxId()}`,
+          atype: 1
+        }]
+      });
+    }
+
     return request;
   },
 });
@@ -142,7 +183,6 @@ function isBidRequestValid(bid) {
 /**
  * Make a server request from the list of BidRequests.
  *
- * @param {validBidRequests[]} - an array of bids
  * @return ServerRequest Info describing the request to the server.
  */
 
@@ -199,7 +239,7 @@ function interpretResponse(serverResponse) {
           response.adUrl = bid.ext.adUrl;
         }
       }
-      if ([INSTREAM, OUTSTREAM].includes(bid.ext.mediaType)) response.vastXml = bid.ext.vastXml;
+      if ([INSTREAM, OUTSTREAM].includes(bid.ext.mediaType)) response.vastXml = bid.adm;
 
       if (bid.ext.mediaType === OUTSTREAM) {
         response.renderer = createRenderer(bid, OUTSTREAM_RENDERER_URL);
diff --git a/modules/nexx360BidAdapter.md b/modules/nexx360BidAdapter.md
index 532d48418b6..5935b568a13 100644
--- a/modules/nexx360BidAdapter.md
+++ b/modules/nexx360BidAdapter.md
@@ -30,8 +30,7 @@ var adUnits = [
       bids: [{
          bidder: 'nexx360',
          params: {
-            account: '1067',
-            tagId: 'luvxjvgn'
+            tagId: 'testnexx'
          }
        }]
    },
@@ -51,8 +50,7 @@ var adUnits = [
         bids: [{
             bidder: 'nexx360',
             params: {
-               account: '1067',
-               tagId: 'luvxjvgn'
+              tagId: 'testnexx'
             }
         }]
     };
diff --git a/modules/nobidAnalyticsAdapter.js b/modules/nobidAnalyticsAdapter.js
index 27ec1cd9451..afa980b05c9 100644
--- a/modules/nobidAnalyticsAdapter.js
+++ b/modules/nobidAnalyticsAdapter.js
@@ -1,15 +1,15 @@
-import {deepClone, logError, getParameterByName} from '../src/utils.js';
+import {deepClone, logError, getParameterByName, logMessage} from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import {getStorageManager} from '../src/storageManager.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
 
-const VERSION = '1.0.4';
+const VERSION = '2.0.2';
 const MODULE_NAME = 'nobidAnalyticsAdapter';
-const ANALYTICS_DATA_NAME = 'analytics.nobid.io';
-const RETENTION_SECONDS = 7 * 24 * 3600;
+const ANALYTICS_OPT_FLUSH_TIMEOUT_SECONDS = 5 * 1000;
+const RETENTION_SECONDS = 1 * 24 * 3600;
 const TEST_ALLOCATION_PERCENTAGE = 5; // dont block 5% of the time;
 window.nobidAnalyticsVersion = VERSION;
 const analyticsType = 'endpoint';
@@ -17,19 +17,16 @@ const url = 'localhost:8383/event';
 const GVLID = 816;
 const storage = getStorageManager({gvlid: GVLID, moduleName: MODULE_NAME, moduleType: MODULE_TYPE_ANALYTICS});
 const {
-  EVENTS: {
-    AUCTION_INIT,
-    BID_REQUESTED,
-    BID_TIMEOUT,
-    BID_RESPONSE,
-    BID_WON,
-    AUCTION_END,
-    AD_RENDER_SUCCEEDED
-  }
-} = CONSTANTS;
+  AUCTION_INIT,
+  BID_REQUESTED,
+  BID_TIMEOUT,
+  BID_RESPONSE,
+  BID_WON,
+  AUCTION_END,
+  AD_RENDER_SUCCEEDED
+} = EVENTS;
 function log (msg) {
-  // eslint-disable-next-line no-console
-  console.log(`%cNoBid Analytics ${VERSION}`, 'padding: 2px 8px 2px 8px; background-color:#f50057; color: white', msg);
+  logMessage(`%cNoBid Analytics ${VERSION}: ${msg}`);
 }
 function isJson (str) {
   return str && str.startsWith('{') && str.endsWith('}');
@@ -49,11 +46,13 @@ function sendEvent (event, eventType) {
     return ret;
   }
   if (!nobidAnalytics.initOptions || !nobidAnalytics.initOptions.siteId || !event) return;
-  if (nobidAnalytics.isAnalyticsDisabled()) {
+  if (nobidAnalytics.isAnalyticsDisabled(eventType)) {
     log('NoBid Analytics is Disabled');
     return;
   }
   try {
+    event.version = VERSION;
+    event.pbver = '$prebid.version$';
     const endpoint = `${resolveEndpoint()}/event/${eventType}?pubid=${nobidAnalytics.initOptions.siteId}`;
     ajax(endpoint,
       function (response) {
@@ -83,7 +82,7 @@ function cleanupObjectAttributes (obj, attributes) {
 }
 function sendBidWonEvent (event, eventType) {
   const data = deepClone(event);
-  cleanupObjectAttributes(data, ['bidderCode', 'size', 'statusMessage', 'adId', 'requestId', 'mediaType', 'adUnitCode', 'cpm', 'timeToRespond']);
+  cleanupObjectAttributes(data, ['bidderCode', 'size', 'statusMessage', 'adId', 'requestId', 'mediaType', 'adUnitCode', 'cpm', 'currency', 'originalCpm', 'originalCurrency', 'timeToRespond']);
   if (nobidAnalytics.topLocation) data.topLocation = nobidAnalytics.topLocation;
   sendEvent(data, eventType);
 }
@@ -95,10 +94,18 @@ function sendAuctionEndEvent (event, eventType) {
 
   cleanupObjectAttributes(data, ['timestamp', 'timeout', 'auctionId', 'bidderRequests', 'bidsReceived']);
   if (data) cleanupObjectAttributes(data.bidderRequests, ['bidderCode', 'bidderRequestId', 'bids', 'refererInfo']);
-  if (data) cleanupObjectAttributes(data.bidsReceived, ['bidderCode', 'width', 'height', 'adUnitCode', 'statusMessage', 'requestId', 'mediaType', 'cpm']);
+  if (data) cleanupObjectAttributes(data.bidsReceived, ['bidderCode', 'width', 'height', 'adUnitCode', 'statusMessage', 'requestId', 'mediaType', 'cpm', 'currency', 'originalCpm', 'originalCurrency']);
   if (data) cleanupObjectAttributes(data.noBids, ['bidder', 'sizes', 'bidId']);
-  if (data.bidderRequests) cleanupObjectAttributes(data.bidderRequests.bids, ['mediaTypes', 'adUnitCode', 'sizes', 'bidId']);
-  if (data.bidderRequests) cleanupObjectAttributes(data.bidderRequests.refererInfo, ['topmostLocation']);
+  if (data.bidderRequests) {
+    data.bidderRequests.forEach(bidderRequest => {
+      cleanupObjectAttributes(bidderRequest.bids, ['mediaTypes', 'adUnitCode', 'sizes', 'bidId']);
+    });
+  }
+  if (data.bidderRequests) {
+    data.bidderRequests.forEach(bidderRequest => {
+      cleanupObjectAttributes(bidderRequest.refererInfo, ['topmostLocation']);
+    });
+  }
   sendEvent(data, eventType);
 }
 function auctionInit (event) {
@@ -147,52 +154,100 @@ nobidAnalytics = {
   isExpired (data) {
     return isExpired(data, this.retentionSeconds);
   },
-  isAnalyticsDisabled () {
-    let stored = storage.getDataFromLocalStorage(ANALYTICS_DATA_NAME);
+  isAnalyticsDisabled (eventType) {
+    let stored = storage.getDataFromLocalStorage(this.ANALYTICS_DATA_NAME);
     if (!isJson(stored)) return false;
     stored = JSON.parse(stored);
     if (this.isExpired(stored)) return false;
-    return stored.disabled;
+    if (stored.disabled === 1) return true;
+    else if (stored.disabled === 0) return false;
+    if (eventType) {
+      if (stored[`disabled_${eventType}`] === 1) return true;
+      else if (stored[`disabled_${eventType}`] === 0) return false;
+    }
+    return false;
   },
   processServerResponse (response) {
     if (!isJson(response)) return;
     const resp = JSON.parse(response);
-    storage.setDataInLocalStorage(ANALYTICS_DATA_NAME, JSON.stringify({ ...resp, ts: Date.now() }));
-  }
+    storage.setDataInLocalStorage(this.ANALYTICS_DATA_NAME, JSON.stringify({ ...resp, ts: Date.now() }));
+  },
+  ANALYTICS_DATA_NAME: 'analytics.nobid.io',
+  ANALYTICS_OPT_NAME: 'analytics.nobid.io.optData'
 }
-
 adapterManager.registerAnalyticsAdapter({
   adapter: nobidAnalytics,
-  code: 'nobidAnalytics',
+  code: 'nobid',
   gvlid: GVLID
 });
+nobidAnalytics.originalAdUnits = {};
 window.nobidCarbonizer = {
   getStoredLocalData: function () {
-    return storage.getDataFromLocalStorage(ANALYTICS_DATA_NAME);
+    const a = storage.getDataFromLocalStorage(nobidAnalytics.ANALYTICS_DATA_NAME);
+    const b = storage.getDataFromLocalStorage(nobidAnalytics.ANALYTICS_OPT_NAME);
+    const ret = {};
+    if (a) ret[nobidAnalytics.ANALYTICS_DATA_NAME] = a;
+    if (b) ret[nobidAnalytics.ANALYTICS_OPT_NAME] = b
+    return ret;
   },
   isActive: function () {
-    let stored = storage.getDataFromLocalStorage(ANALYTICS_DATA_NAME);
+    let stored = storage.getDataFromLocalStorage(nobidAnalytics.ANALYTICS_DATA_NAME);
     if (!isJson(stored)) return false;
     stored = JSON.parse(stored);
     if (isExpired(stored, nobidAnalytics.retentionSeconds)) return false;
     return stored.carbonizer_active || false;
   },
   carbonizeAdunits: function (adunits, skipTestGroup) {
+    function processBlockedBidders (blockedBidders) {
+      function sendOptimizerData() {
+        let optData = storage.getDataFromLocalStorage(nobidAnalytics.ANALYTICS_OPT_NAME);
+        storage.removeDataFromLocalStorage(nobidAnalytics.ANALYTICS_OPT_NAME);
+        if (isJson(optData)) {
+          optData = JSON.parse(optData);
+          if (Object.getOwnPropertyNames(optData).length > 0) {
+            const event = { o_bidders: optData };
+            if (nobidAnalytics.topLocation) event.topLocation = nobidAnalytics.topLocation;
+            sendEvent(event, 'optData');
+          }
+        }
+      }
+      if (blockedBidders && blockedBidders.length > 0) {
+        let optData = storage.getDataFromLocalStorage(nobidAnalytics.ANALYTICS_OPT_NAME);
+        optData = isJson(optData) ? JSON.parse(optData) : {};
+        const bidders = blockedBidders.map(rec => rec.bidder);
+        if (bidders && bidders.length > 0) {
+          bidders.forEach(bidder => {
+            if (!optData[bidder]) optData[bidder] = 1;
+            else optData[bidder] += 1;
+          });
+          storage.setDataInLocalStorage(nobidAnalytics.ANALYTICS_OPT_NAME, JSON.stringify(optData));
+          if (window.nobidAnalyticsOptTimer) return;
+          window.nobidAnalyticsOptTimer = setInterval(sendOptimizerData, ANALYTICS_OPT_FLUSH_TIMEOUT_SECONDS);
+        }
+      }
+    }
     function carbonizeAdunit (adunit) {
-      let stored = storage.getDataFromLocalStorage(ANALYTICS_DATA_NAME);
+      let stored = storage.getDataFromLocalStorage(nobidAnalytics.ANALYTICS_DATA_NAME);
       if (!isJson(stored)) return;
       stored = JSON.parse(stored);
       if (isExpired(stored, nobidAnalytics.retentionSeconds)) return;
       const carbonizerBidders = stored.bidders || [];
-      const allowedBidders = adunit.bids.filter(rec => carbonizerBidders.includes(rec.bidder));
+      let originalAdUnit = null;
+      if (nobidAnalytics.originalAdUnits && nobidAnalytics.originalAdUnits[adunit.code]) originalAdUnit = nobidAnalytics.originalAdUnits[adunit.code];
+      const allowedBidders = originalAdUnit.bids.filter(rec => carbonizerBidders.includes(rec.bidder));
+      const blockedBidders = originalAdUnit.bids.filter(rec => !carbonizerBidders.includes(rec.bidder));
+      processBlockedBidders(blockedBidders);
       adunit.bids = allowedBidders;
     }
+    for (const adunit of adunits) {
+      if (!nobidAnalytics.originalAdUnits[adunit.code]) nobidAnalytics.originalAdUnits[adunit.code] = deepClone(adunit);
+    };
     if (this.isActive()) {
       // 5% of the time do not block;
       if (!skipTestGroup && Math.floor(Math.random() * 101) <= TEST_ALLOCATION_PERCENTAGE) return;
-      adunits.forEach(adunit => {
+      for (const adunit of adunits) {
         carbonizeAdunit(adunit);
-      });
+      };
     }
   }
 };
diff --git a/modules/nobidBidAdapter.js b/modules/nobidBidAdapter.js
index 68010b32b37..7cacac819c1 100644
--- a/modules/nobidBidAdapter.js
+++ b/modules/nobidBidAdapter.js
@@ -3,12 +3,21 @@ import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
-import { hasPurpose1Consent } from '../src/utils/gpdr.js';
+import { hasPurpose1Consent } from '../src/utils/gdpr.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
 
 const GVLID = 816;
 const BIDDER_CODE = 'nobid';
 const storage = getStorageManager({bidderCode: BIDDER_CODE});
-window.nobidVersion = '1.3.3';
+window.nobidVersion = '1.3.4';
 window.nobid = window.nobid || {};
 window.nobid.bidResponses = window.nobid.bidResponses || {};
 window.nobid.timeoutTotal = 0;
@@ -152,6 +161,7 @@ function nobidBuildRequests(bids, bidderRequest) {
     state['gdpr'] = gdprConsent(bidderRequest);
     state['usp'] = uspConsent(bidderRequest);
     state['pjbdr'] = (bidderRequest && bidderRequest.bidderCode) ? bidderRequest.bidderCode : 'nobid';
+    state['pbver'] = '$prebid.version$';
     const sch = schain(bids);
     if (sch) state['schain'] = sch;
     const cop = coppa();
@@ -221,7 +231,7 @@ function nobidBuildRequests(bids, bidderRequest) {
     return adunits;
   }
   function getFloor (bid) {
-    if (bid && typeof bid.getFloor === 'function' && bid.getFloor().floor) {
+    if (bid && typeof bid.getFloor === 'function' && bid.getFloor()?.floor) {
       return bid.getFloor().floor;
     }
     return null;
@@ -367,21 +377,22 @@ export const spec = {
   ],
   supportedMediaTypes: [BANNER, VIDEO],
   /**
- * Determines whether or not the given bid request is valid.
- *
- * @param {BidRequest} bid The bid params to validate.
- * @return boolean True if this is a valid bid, and false otherwise.
- */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     log('isBidRequestValid', bid);
-    return !!bid.params.siteId;
+    if (bid?.params?.siteId) return true;
+    return false;
   },
   /**
- * Make a server request from the list of BidRequests.
- *
- * @param {validBidRequests[]} - an array of bids
- * @return ServerRequest Info describing the request to the server.
- */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     function resolveEndpoint() {
       var ret = 'https://ads.servenobid.com/';
@@ -421,11 +432,11 @@ export const spec = {
     };
   },
   /**
-     * Unpack the response from the server into a list of bids.
-     *
-     * @param {ServerResponse} serverResponse A successful response from the server.
-     * @return {Bid[]} An array of bids which were nested inside the server.
-     */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, bidRequest) {
     log('interpretResponse -> serverResponse', serverResponse);
     log('interpretResponse -> bidRequest', bidRequest);
@@ -433,12 +444,12 @@ export const spec = {
   },
 
   /**
-     * Register the user sync pixels which should be dropped after the auction.
-     *
-     * @param {SyncOptions} syncOptions Which user syncs are allowed?
-     * @param {ServerResponse[]} serverResponses List of server's responses.
-     * @return {UserSync[]} The user syncs which should be dropped.
-     */
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, usPrivacy, gppConsent) {
     if (syncOptions.iframeEnabled) {
       let params = '';
@@ -483,9 +494,9 @@ export const spec = {
   },
 
   /**
-     * Register bidder specific code, which will execute if bidder timed out after an auction
-     * @param {data} Containing timeout specific data
-     */
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
   onTimeout: function(data) {
     window.nobid.timeoutTotal++;
     log('Timeout total: ' + window.nobid.timeoutTotal, data);
diff --git a/modules/novatiqIdSystem.js b/modules/novatiqIdSystem.js
index 7eced81d35e..b6eab776df2 100644
--- a/modules/novatiqIdSystem.js
+++ b/modules/novatiqIdSystem.js
@@ -11,15 +11,20 @@ import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ */
+
 const MODULE_NAME = 'novatiq';
 
 /** @type {Submodule} */
 export const novatiqIdSubmodule = {
 
   /**
- * used to link submodule with config
- * @type {string}
- */
+   * used to link submodule with config
+   * @type {string}
+   */
   name: MODULE_NAME,
   /**
    * used to specify vendor id
@@ -28,10 +33,10 @@ export const novatiqIdSubmodule = {
   gvlid: 1119,
 
   /**
- * decode the stored id value for passing to bid requests
- * @function
- * @returns {novatiq: {snowflake: string}}
- */
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {novatiq: {snowflake: string}}
+   */
   decode(novatiqId, config) {
     let responseObj = {
       novatiq: {
@@ -52,11 +57,11 @@ export const novatiqIdSubmodule = {
   },
 
   /**
- * performs action to obtain id and return a value in the callback's response argument
- * @function
- * @param {SubmoduleConfig} config
- * @returns {id: string}
- */
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} config
+   * @returns {id: string}
+   */
   getId(config) {
     const configParams = config.params || {};
     const urlParams = this.getUrlParams(configParams);
diff --git a/modules/novatiqIdSystem.md b/modules/novatiqIdSystem.md
index f33fc700311..a78363e8fe3 100644
--- a/modules/novatiqIdSystem.md
+++ b/modules/novatiqIdSystem.md
@@ -19,12 +19,11 @@ pbjs.setConfig({
       name: 'novatiq',
       params: {
         // change to the Partner Number you received from Novatiq
-        sourceid '1a3'            
-        }
+        sourceid: '1a3'
       }
     }],
     // 50ms maximum auction delay, applies to all userId modules
-    auctionDelay: 50             
+    auctionDelay: 50
   }
 });
 ```
diff --git a/modules/oguryBidAdapter.js b/modules/oguryBidAdapter.js
index c1c8376de87..ecf512f11d3 100644
--- a/modules/oguryBidAdapter.js
+++ b/modules/oguryBidAdapter.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import {BANNER} from '../src/mediaTypes.js';
-import {getWindowSelf, getWindowTop, isFn, logWarn} from '../src/utils.js';
+import {getWindowSelf, getWindowTop, isFn, logWarn, deepAccess, isPlainObject} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {ajax} from '../src/ajax.js';
 import {getAdUnitSizes} from '../libraries/sizeUtils/sizeUtils.js';
@@ -12,7 +12,7 @@ const DEFAULT_TIMEOUT = 1000;
 const BID_HOST = 'https://mweb-hb.presage.io/api/header-bidding-request';
 const TIMEOUT_MONITORING_HOST = 'https://ms-ads-monitoring-events.presage.io';
 const MS_COOKIE_SYNC_DOMAIN = 'https://ms-cookie-sync.presage.io';
-const ADAPTER_VERSION = '1.5.0';
+const ADAPTER_VERSION = '1.7.0';
 
 function getClientWidth() {
   const documentElementClientWidth = window.top.document.documentElement.clientWidth
@@ -46,14 +46,16 @@ function isBidRequestValid(bid) {
   return (isValidSizes && isValidAdUnitId && isValidAssetKey);
 }
 
-function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) {
   const consent = (gdprConsent && gdprConsent.consentString) || '';
+  const gpp = (gppConsent && gppConsent.gppString) || '';
+  const gppSid = (gppConsent && gppConsent.applicableSections && gppConsent.applicableSections.toString()) || '';
 
   if (syncOptions.iframeEnabled) {
     return [
       {
         type: 'iframe',
-        url: `${MS_COOKIE_SYNC_DOMAIN}/user-sync.html?gdpr_consent=${consent}&source=prebid`
+        url: `${MS_COOKIE_SYNC_DOMAIN}/user-sync.html?gdpr_consent=${consent}&source=prebid&gpp=${gpp}&gpp_sid=${gppSid}`
       }
     ];
   }
@@ -62,15 +64,15 @@ function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
     return [
       {
         type: 'image',
-        url: `${MS_COOKIE_SYNC_DOMAIN}/v1/init-sync/bid-switch?iab_string=${consent}&source=prebid`
+        url: `${MS_COOKIE_SYNC_DOMAIN}/v1/init-sync/bid-switch?iab_string=${consent}&source=prebid&gpp=${gpp}&gpp_sid=${gppSid}`
       },
       {
         type: 'image',
-        url: `${MS_COOKIE_SYNC_DOMAIN}/ttd/init-sync?iab_string=${consent}&source=prebid`
+        url: `${MS_COOKIE_SYNC_DOMAIN}/ttd/init-sync?iab_string=${consent}&source=prebid&gpp=${gpp}&gpp_sid=${gppSid}`
       },
       {
         type: 'image',
-        url: `${MS_COOKIE_SYNC_DOMAIN}/xandr/init-sync?iab_string=${consent}&source=prebid`
+        url: `${MS_COOKIE_SYNC_DOMAIN}/xandr/init-sync?iab_string=${consent}&source=prebid&gpp=${gpp}&gpp_sid=${gppSid}`
       }
     ];
   }
@@ -81,11 +83,11 @@ function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
 function buildRequests(validBidRequests, bidderRequest) {
   const openRtbBidRequestBanner = {
     id: bidderRequest.bidderRequestId,
-    tmax: DEFAULT_TIMEOUT,
+    tmax: Math.min(DEFAULT_TIMEOUT, bidderRequest.timeout),
     at: 1,
     regs: {
       ext: {
-        gdpr: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+        gdpr: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
       },
     },
     site: {
@@ -112,6 +114,12 @@ function buildRequests(validBidRequests, bidderRequest) {
   if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString) {
     openRtbBidRequestBanner.user.ext.consent = bidderRequest.gdprConsent.consentString
   }
+  if (bidderRequest.gppConsent && bidderRequest.gppConsent.gppString) {
+    openRtbBidRequestBanner.regs.ext.gpp = bidderRequest.gppConsent.gppString
+  }
+  if (bidderRequest.gppConsent && bidderRequest.gppConsent.applicableSections) {
+    openRtbBidRequestBanner.regs.ext.gpp_sid = bidderRequest.gppConsent.applicableSections
+  }
 
   validBidRequests.forEach((bidRequest) => {
     const sizes = getAdUnitSizes(bidRequest)
@@ -122,6 +130,15 @@ function buildRequests(validBidRequests, bidderRequest) {
       openRtbBidRequestBanner.site.id = bidRequest.params.assetKey;
       const floor = getFloor(bidRequest);
 
+      if (bidRequest.userId) {
+        openRtbBidRequestBanner.user.ext.uids = bidRequest.userId
+      }
+      if (bidRequest.userIdAsEids) {
+        openRtbBidRequestBanner.user.ext.eids = bidRequest.userIdAsEids
+      }
+
+      const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid');
+
       openRtbBidRequestBanner.imp.push({
         id: bidRequest.bidId,
         tagid: bidRequest.params.adUnitId,
@@ -131,6 +148,7 @@ function buildRequests(validBidRequests, bidderRequest) {
         },
         ext: {
           ...bidRequest.params,
+          ...(gpid && {gpid}),
           timeSpentOnPage: document.timeline && document.timeline.currentTime ? document.timeline.currentTime : 0
         }
       });
@@ -193,7 +211,7 @@ function getFloor(bid) {
     mediaType: 'banner',
     size: '*'
   });
-  return floorResult.currency === 'USD' ? floorResult.floor : 0;
+  return (isPlainObject(floorResult) && floorResult.currency === 'USD') ? floorResult.floor : 0;
 }
 
 function getWindowContext() {
diff --git a/modules/brightcomSSPBidAdapter.js b/modules/omsBidAdapter.js
similarity index 63%
rename from modules/brightcomSSPBidAdapter.js
rename to modules/omsBidAdapter.js
index 4750881da40..901b9a138d5 100644
--- a/modules/brightcomSSPBidAdapter.js
+++ b/modules/omsBidAdapter.js
@@ -1,33 +1,37 @@
 import {
   isArray,
   getWindowTop,
-  getUniqueIdentifierStr,
   deepSetValue,
   logError,
   logWarn,
   createTrackPixelHtml,
   getWindowSelf,
   isFn,
-  isPlainObject, getBidIdParameter,
+  isPlainObject,
+  getBidIdParameter,
+  getUniqueIdentifierStr,
+  formatQS,
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
 import {ajax} from '../src/ajax.js';
+import {percentInView} from '../libraries/percentInView/percentInView.js';
+import {getUserSyncParams} from '../libraries/userSyncUtils/userSyncUtils.js';
 
-const BIDDER_CODE = 'bcmssp';
+const BIDDER_CODE = 'oms';
 const URL = 'https://rt.marphezis.com/hb';
-const TRACK_EVENT_URL = 'https://rt.marphezis.com/prebid'
+const TRACK_EVENT_URL = 'https://rt.marphezis.com/prebid';
+const USER_SYNC_URL_IFRAME = 'https://rt.marphezis.com/sync?dpid=0';
 
 export const spec = {
   code: BIDDER_CODE,
+  aliases: ['brightcom', 'bcmssp'],
   gvlid: 883,
   supportedMediaTypes: [BANNER],
   isBidRequestValid,
   buildRequests,
   interpretResponse,
   onBidderError,
-  onTimeout,
   onBidWon,
   getUserSyncs,
 };
@@ -44,15 +48,19 @@ function buildRequests(bidReqs, bidderRequest) {
       const minSize = _getMinSize(processedSizes);
       const viewabilityAmount = _isViewabilityMeasurable(element) ? _getViewability(element, getWindowTop(), minSize) : 'na';
       const viewabilityAmountRounded = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
+      const gpidData = _extractGpidData(bid);
 
       const imp = {
         id: bid.bidId,
         banner: {
           format: processedSizes,
           ext: {
-            viewability: viewabilityAmountRounded
+            viewability: viewabilityAmountRounded,
           }
         },
+        ext: {
+          ...gpidData
+        },
         tagid: String(bid.adUnitCode)
       };
 
@@ -79,7 +87,7 @@ function buildRequests(bidReqs, bidderRequest) {
         }
       },
       device: {
-        devicetype: _getDeviceType(),
+        devicetype: _getDeviceType(navigator.userAgent, bidderRequest?.ortb2?.device?.sua),
         w: screen.width,
         h: screen.height
       },
@@ -91,11 +99,12 @@ function buildRequests(bidReqs, bidderRequest) {
       deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
     }
 
-    if (bidderRequest?.uspConsent) {
-      deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    const gpp = _getGpp(bidderRequest)
+    if (gpp) {
+      deepSetValue(payload, 'regs.ext.gpp', gpp);
     }
 
-    if (config.getConfig('coppa') === true) {
+    if (bidderRequest?.ortb2?.regs?.coppa) {
       deepSetValue(payload, 'regs.coppa', 1);
     }
 
@@ -103,6 +112,10 @@ function buildRequests(bidReqs, bidderRequest) {
       deepSetValue(payload, 'source.ext.schain', bidReqs[0].schain)
     }
 
+    if (bidderRequest?.ortb2?.user) {
+      deepSetValue(payload, 'user', bidderRequest.ortb2.user)
+    }
+
     if (bidReqs?.[0]?.userIdAsEids) {
       deepSetValue(payload, 'user.ext.eids', bidReqs[0].userIdAsEids || [])
     }
@@ -111,6 +124,10 @@ function buildRequests(bidReqs, bidderRequest) {
       deepSetValue(payload, 'user.ext.ids', bidReqs[0].userId || [])
     }
 
+    if (bidderRequest?.ortb2?.site?.content) {
+      deepSetValue(payload, 'site.content', bidderRequest.ortb2.site.content)
+    }
+
     return {
       method: 'POST',
       url: URL,
@@ -122,7 +139,7 @@ function buildRequests(bidReqs, bidderRequest) {
 }
 
 function isBidRequestValid(bid) {
-  if (bid.bidder !== BIDDER_CODE || !bid.params || !bid.params.publisherId) {
+  if (!bid.params || !bid.params.publisherId) {
     return false;
   }
 
@@ -132,7 +149,7 @@ function isBidRequestValid(bid) {
 function interpretResponse(serverResponse) {
   let response = [];
   if (!serverResponse.body || typeof serverResponse.body != 'object') {
-    logWarn('Brightcom server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
+    logWarn('OMS server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
     return response;
   }
 
@@ -151,7 +168,7 @@ function interpretResponse(serverResponse) {
           netRevenue: true,
           mediaType: BANNER,
           ad: _getAdMarkup(bid),
-          ttl: 60,
+          ttl: 300,
           meta: {
             advertiserDomains: bid?.adomain || []
           }
@@ -165,17 +182,20 @@ function interpretResponse(serverResponse) {
   return response;
 }
 
-// Don't do user sync for now
-function getUserSyncs(syncOptions, responses, gdprConsent) {
-  return [];
-}
+function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) {
+  const syncs = [];
 
-function onTimeout(timeoutData) {
-  if (timeoutData === null) {
-    return;
+  if (syncOptions.iframeEnabled) {
+    let params = getUserSyncParams(gdprConsent, uspConsent, gppConsent);
+    params = Object.keys(params).length ? `&${formatQS(params)}` : '';
+
+    syncs.push({
+      type: 'iframe',
+      url: USER_SYNC_URL_IFRAME + params,
+    });
   }
 
-  _trackEvent('timeout', timeoutData);
+  return syncs;
 }
 
 function onBidderError(errorData) {
@@ -201,16 +221,26 @@ function _trackEvent(endpoint, data) {
   });
 }
 
-function _isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
-}
+function _getDeviceType(ua, sua) {
+  if (sua?.mobile || (/(ios|ipod|ipad|iphone|android)/i).test(ua)) {
+    return 1
+  }
+
+  if ((/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(ua)) {
+    return 3
+  }
 
-function _isConnectedTV() {
-  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
+  return 2
 }
 
-function _getDeviceType() {
-  return _isMobile() ? 1 : _isConnectedTV() ? 3 : 2;
+function _getGpp(bidderRequest) {
+  if (bidderRequest?.gppConsent != null) {
+    return bidderRequest.gppConsent;
+  }
+
+  return (
+    bidderRequest?.ortb2?.regs?.gpp ?? { gppString: '', applicableSections: '' }
+  );
 }
 
 function _getAdMarkup(bid) {
@@ -226,7 +256,16 @@ function _isViewabilityMeasurable(element) {
 }
 
 function _getViewability(element, topWin, {w, h} = {}) {
-  return getWindowTop().document.visibilityState === 'visible' ? _getPercentInView(element, topWin, {w, h}) : 0;
+  return getWindowTop().document.visibilityState === 'visible' ? percentInView(element, topWin, {w, h}) : 0;
+}
+
+function _extractGpidData(bid) {
+  return {
+    gpid: bid?.ortb2Imp?.ext?.gpid,
+    adserverName: bid?.ortb2Imp?.ext?.data?.adserver?.name,
+    adslot: bid?.ortb2Imp?.ext?.data?.adserver?.adslot,
+    pbadslot: bid?.ortb2Imp?.ext?.data?.pbadslot,
+  }
 }
 
 function _isIframe() {
@@ -241,69 +280,6 @@ function _getMinSize(sizes) {
   return sizes.reduce((min, size) => size.h * size.w < min.h * min.w ? size : min);
 }
 
-function _getBoundingBox(element, {w, h} = {}) {
-  let {width, height, left, top, right, bottom} = element.getBoundingClientRect();
-
-  if ((width === 0 || height === 0) && w && h) {
-    width = w;
-    height = h;
-    right = left + w;
-    bottom = top + h;
-  }
-
-  return {width, height, left, top, right, bottom};
-}
-
-function _getIntersectionOfRects(rects) {
-  const bbox = {
-    left: rects[0].left, right: rects[0].right, top: rects[0].top, bottom: rects[0].bottom
-  };
-
-  for (let i = 1; i < rects.length; ++i) {
-    bbox.left = Math.max(bbox.left, rects[i].left);
-    bbox.right = Math.min(bbox.right, rects[i].right);
-
-    if (bbox.left >= bbox.right) {
-      return null;
-    }
-
-    bbox.top = Math.max(bbox.top, rects[i].top);
-    bbox.bottom = Math.min(bbox.bottom, rects[i].bottom);
-
-    if (bbox.top >= bbox.bottom) {
-      return null;
-    }
-  }
-
-  bbox.width = bbox.right - bbox.left;
-  bbox.height = bbox.bottom - bbox.top;
-
-  return bbox;
-}
-
-function _getPercentInView(element, topWin, {w, h} = {}) {
-  const elementBoundingBox = _getBoundingBox(element, {w, h});
-
-  // Obtain the intersection of the element and the viewport
-  const elementInViewBoundingBox = _getIntersectionOfRects([{
-    left: 0, top: 0, right: topWin.innerWidth, bottom: topWin.innerHeight
-  }, elementBoundingBox]);
-
-  let elementInViewArea, elementTotalArea;
-
-  if (elementInViewBoundingBox !== null) {
-    // Some or all of the element is in view
-    elementInViewArea = elementInViewBoundingBox.width * elementInViewBoundingBox.height;
-    elementTotalArea = elementBoundingBox.width * elementBoundingBox.height;
-
-    return ((elementInViewArea / elementTotalArea) * 100);
-  }
-
-  // No overlap between element and the viewport; therefore, the element
-  // lies completely out of view
-  return 0;
-}
-
 function _getBidFloor(bid) {
   if (!isFn(bid.getFloor)) {
     return bid.params.bidFloor ? bid.params.bidFloor : null;
diff --git a/modules/brightcomSSPBidAdapter.md b/modules/omsBidAdapter.md
similarity index 73%
rename from modules/brightcomSSPBidAdapter.md
rename to modules/omsBidAdapter.md
index 8d0e4ec70dc..0a6b9cac82c 100644
--- a/modules/brightcomSSPBidAdapter.md
+++ b/modules/omsBidAdapter.md
@@ -1,14 +1,14 @@
 # Overview
 
 ```
-Module Name: Brightcom SSP Bid Adapter
+Module Name: OMS Bid Adapter
 Module Type: Bidder Adapter
-Maintainer: alexandruc@brightcom.com
+Maintainer: devsupport@onlinemediasolutions.com
 ```
 
 # Description
 
-Brightcom's adapter integration to the Prebid library.
+Online media solutions adapter integration to the Prebid library.
 
 # Test Parameters
 
@@ -22,7 +22,7 @@ var adUnits = [
       }
     },
     bids: [{
-      bidder: 'bcmssp',
+      bidder: 'oms',
       params: {
         publisherId: 2141020,
         bidFloor: 0.01
@@ -36,7 +36,7 @@ var adUnits = [
       }
     },
     bids: [{
-      bidder: 'bcmssp',
+      bidder: 'oms',
       params: {
         publisherId: 2141020
       }
diff --git a/modules/oneKeyIdSystem.js b/modules/oneKeyIdSystem.js
index 699a7a6ab95..8765a72a1af 100644
--- a/modules/oneKeyIdSystem.js
+++ b/modules/oneKeyIdSystem.js
@@ -8,6 +8,13 @@
 import {submodule} from '../src/hook.js';
 import { logError, logMessage } from '../src/utils.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 // Pre-init OneKey if it has not load yet.
 window.OneKey = window.OneKey || {};
 window.OneKey.queue = window.OneKey.queue || [];
@@ -47,27 +54,27 @@ const getIdsAndPreferences = (callback) => {
 /** @type {Submodule} */
 export const oneKeyIdSubmodule = {
   /**
-    * used to link submodule with config
-    * @type {string}
-    */
+   * used to link submodule with config
+   * @type {string}
+   */
   name: 'oneKeyData',
   /**
-    * decode the stored data value for passing to bid requests
-    * @function decode
-    * @param {(Object|string)} value
-    * @returns {(Object|undefined)}
-    */
+   * decode the stored data value for passing to bid requests
+   * @function decode
+   * @param {(Object|string)} value
+   * @returns {(Object|undefined)}
+   */
   decode(data) {
     return { oneKeyData: data };
   },
   /**
-    * performs action to obtain id and return a value in the callback's response argument
-    * @function
-    * @param {SubmoduleConfig} [config]
-    * @param {ConsentData} [consentData]
-    * @param {(Object|undefined)} cacheIdObj
-    * @returns {IdResponse|undefined}
-    */
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData} [consentData]
+   * @param {(Object|undefined)} cacheIdObj
+   * @returns {IdResponse|undefined}
+   */
   getId(config) {
     return {
       callback: getIdsAndPreferences
diff --git a/modules/oneKeyRtdProvider.js b/modules/oneKeyRtdProvider.js
index 27511017676..19915609820 100644
--- a/modules/oneKeyRtdProvider.js
+++ b/modules/oneKeyRtdProvider.js
@@ -3,6 +3,10 @@ import { submodule } from '../src/hook.js';
 import { mergeDeep, logError, logMessage, deepSetValue, generateUUID } from '../src/utils.js';
 import { getGlobal } from '../src/prebidGlobal.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const SUBMODULE_NAME = 'oneKey';
 const prefixLog = 'OneKey.RTD-module'
 
diff --git a/modules/onetagBidAdapter.js b/modules/onetagBidAdapter.js
index 801bb747e34..8bf326b4848 100644
--- a/modules/onetagBidAdapter.js
+++ b/modules/onetagBidAdapter.js
@@ -8,6 +8,11 @@ import { getStorageManager } from '../src/storageManager.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { deepClone, logError, deepAccess } from '../src/utils.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const ENDPOINT = 'https://onetag-sys.com/prebid-request';
 const USER_SYNC_ENDPOINT = 'https://onetag-sys.com/usync/';
 const BIDDER_CODE = 'onetag';
@@ -58,7 +63,8 @@ function buildRequests(validBidRequests, bidderRequest) {
   if (bidderRequest && bidderRequest.gdprConsent) {
     payload.gdprConsent = {
       consentString: bidderRequest.gdprConsent.consentString,
-      consentRequired: bidderRequest.gdprConsent.gdprApplies
+      consentRequired: bidderRequest.gdprConsent.gdprApplies,
+      addtlConsent: bidderRequest.gdprConsent.addtlConsent
     };
   }
   if (bidderRequest && bidderRequest.gppConsent) {
@@ -87,6 +93,7 @@ function buildRequests(validBidRequests, bidderRequest) {
   const connection = navigator.connection || navigator.webkitConnection;
   payload.networkConnectionType = (connection && connection.type) ? connection.type : null;
   payload.networkEffectiveConnectionType = (connection && connection.effectiveType) ? connection.effectiveType : null;
+  payload.fledgeEnabled = Boolean(bidderRequest?.paapi?.enabled)
   return {
     method: 'POST',
     url: ENDPOINT,
@@ -101,10 +108,10 @@ function interpretResponse(serverResponse, bidderRequest) {
   if (!body || (body.nobid && body.nobid === true)) {
     return bids;
   }
-  if (!body.bids || !Array.isArray(body.bids) || body.bids.length === 0) {
+  if (!body.fledgeAuctionConfigs && (!body.bids || !Array.isArray(body.bids) || body.bids.length === 0)) {
     return bids;
   }
-  body.bids.forEach(bid => {
+  Array.isArray(body.bids) && body.bids.forEach(bid => {
     const responseBid = {
       requestId: bid.requestId,
       cpm: bid.cpm,
@@ -121,6 +128,9 @@ function interpretResponse(serverResponse, bidderRequest) {
       },
       ttl: bid.ttl || 300
     };
+    if (bid.dsa) {
+      responseBid.meta.dsa = bid.dsa;
+    }
     if (bid.mediaType === BANNER) {
       responseBid.ad = bid.ad;
     } else if (bid.mediaType === VIDEO) {
@@ -141,7 +151,16 @@ function interpretResponse(serverResponse, bidderRequest) {
     }
     bids.push(responseBid);
   });
-  return bids;
+
+  if (body.fledgeAuctionConfigs && Array.isArray(body.fledgeAuctionConfigs)) {
+    const fledgeAuctionConfigs = body.fledgeAuctionConfigs
+    return {
+      bids,
+      paapi: fledgeAuctionConfigs,
+    }
+  } else {
+    return bids;
+  }
 }
 
 function createRenderer(bid, rendererOptions = {}) {
@@ -267,12 +286,12 @@ function setGeneralInfo(bidRequest) {
   this['adUnitCode'] = bidRequest.adUnitCode;
   this['bidId'] = bidRequest.bidId;
   this['bidderRequestId'] = bidRequest.bidderRequestId;
-  // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-  this['auctionId'] = bidRequest.auctionId;
-  this['transactionId'] = bidRequest.ortb2Imp?.ext?.tid;
+  this['auctionId'] = deepAccess(bidRequest, 'ortb2.source.tid');
+  this['transactionId'] = deepAccess(bidRequest, 'ortb2Imp.ext.tid');
   this['gpid'] = deepAccess(bidRequest, 'ortb2Imp.ext.gpid') || deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
   this['pubId'] = params.pubId;
   this['ext'] = params.ext;
+  this['ortb2Imp'] = deepAccess(bidRequest, 'ortb2Imp');
   if (params.pubClick) {
     this['click'] = params.pubClick;
   }
@@ -392,7 +411,7 @@ function getBidFloor(bidRequest, mediaType, sizes) {
         currency: 'EUR',
         mediaType: mediaType || '*',
         size: [size.width, size.height]
-      });
+      }) || {};
       floor.size = deepClone(size);
       if (!floor.floor) { floor.floor = null; }
       priceFloors.push(floor);
diff --git a/modules/ooloAnalyticsAdapter.js b/modules/ooloAnalyticsAdapter.js
index 9bc140f0536..573fee3b0b3 100644
--- a/modules/ooloAnalyticsAdapter.js
+++ b/modules/ooloAnalyticsAdapter.js
@@ -2,7 +2,7 @@ import { _each, deepClone, pick, deepSetValue, logError, logInfo } from '../src/
 import { getOrigin } from '../libraries/getOrigin/index.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js'
 import adapterManager from '../src/adapterManager.js'
-import CONSTANTS from '../src/constants.json'
+import { EVENTS } from '../src/constants.js'
 import { ajax } from '../src/ajax.js'
 import { config } from '../src/config.js'
 
@@ -33,7 +33,7 @@ const {
   BID_WON,
   BID_TIMEOUT,
   AD_RENDER_FAILED
-} = CONSTANTS.EVENTS
+} = EVENTS
 
 const SERVER_EVENTS = {
   AUCTION: 'auction',
@@ -433,6 +433,11 @@ function sendPage() {
 function sendHbConfigData() {
   const conf = {}
   const pbjsConfig = config.getConfig()
+  // Check if pbjsConfig.userSync exists and has userIds property
+  if (pbjsConfig.userSync && pbjsConfig.userSync.userIds) {
+    // Delete the userIds property
+    delete pbjsConfig.userSync.userIds;
+  }
 
   Object.keys(pbjsConfig).forEach(key => {
     if (key[0] !== '_') {
diff --git a/modules/openwebBidAdapter.js b/modules/openwebBidAdapter.js
index 547447039da..60364f41d3c 100644
--- a/modules/openwebBidAdapter.js
+++ b/modules/openwebBidAdapter.js
@@ -1,249 +1,112 @@
-import {deepAccess, flatten, isArray, isNumber, parseSizesInput} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {ADPOD, BANNER, VIDEO} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import {find} from '../src/polyfill.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
-
-const ENDPOINT = 'https://ghb.spotim.market/v2/auction';
+import {
+  logWarn,
+  logInfo,
+  isArray,
+  deepAccess,
+  triggerPixel
+} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  getEndpoint,
+  generateBidsParams,
+  generateGeneralParams,
+  buildBidResponse,
+} from '../libraries/riseUtils/index.js';
+
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
 const BIDDER_CODE = 'openweb';
-const DISPLAY = 'display';
-const syncsCache = {};
+const ADAPTER_VERSION = '6.0.0';
+const TTL = 360;
+const DEFAULT_CURRENCY = 'USD';
+const BASE_URL = 'https://hb.openwebmp.com/';
+const MODES = {
+  PRODUCTION: 'hb-multi',
+  TEST: 'hb-multi-test'
+};
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 280,
-  supportedMediaTypes: [VIDEO, BANNER, ADPOD],
-  isBidRequestValid: function (bid) {
-    return isNumber(deepAccess(bid, 'params.aid'));
-  },
-  getUserSyncs: function (syncOptions, serverResponses) {
-    const syncs = [];
-
-    function addSyncs(bid) {
-      const uris = bid.cookieURLs;
-      const types = bid.cookieURLSTypes || [];
-
-      if (Array.isArray(uris)) {
-        uris.forEach((uri, i) => {
-          const type = types[i] || 'image';
-
-          if ((!syncOptions.pixelEnabled && type === 'image') ||
-            (!syncOptions.iframeEnabled && type === 'iframe') ||
-            syncsCache[uri]) {
-            return;
-          }
-
-          syncsCache[uri] = true;
-          syncs.push({
-            type: type,
-            url: uri
-          })
-        })
-      }
+  version: ADAPTER_VERSION,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest.params) {
+      logWarn('no params have been set to OpenWeb adapter');
+      return false;
     }
 
-    if (syncOptions.pixelEnabled || syncOptions.iframeEnabled) {
-      isArray(serverResponses) && serverResponses.forEach((response) => {
-        if (response.body) {
-          if (isArray(response.body)) {
-            response.body.forEach(b => {
-              addSyncs(b);
-            })
-          } else {
-            addSyncs(response.body)
-          }
-        }
-      })
+    if (!bidRequest.params.org) {
+      logWarn('org is a mandatory param for OpenWeb adapter');
+      return false;
     }
-    return syncs;
-  },
-  /**
-   * Make a server request from the list of BidRequests
-   * @param bidRequests
-   * @param adapterRequest
-   */
-  buildRequests: function (bidRequests, adapterRequest) {
-    const { tag, bids } = bidToTag(bidRequests, adapterRequest);
-    return [{
-      data: Object.assign({}, tag, { BidRequests: bids }),
-      adapterRequest,
-      method: 'POST',
-      url: ENDPOINT
-    }];
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids
-   * @param serverResponse
-   * @param bidderRequest
-   * @return {Bid[]} An array of bids which were nested inside the server
-   */
-  interpretResponse: function (serverResponse, { adapterRequest }) {
-    serverResponse = serverResponse.body;
-    let bids = [];
 
-    if (!isArray(serverResponse)) {
-      return parseRTBResponse(serverResponse, adapterRequest);
+    if (!bidRequest.params.placementId) {
+      logWarn('placementId is a mandatory param for OpenWeb adapter');
+      return false;
     }
 
-    serverResponse.forEach(serverBidResponse => {
-      bids = flatten(bids, parseRTBResponse(serverBidResponse, adapterRequest));
-    });
-
-    return bids;
+    return true;
   },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const combinedRequestsObject = {};
 
-  transformBidParams(params) {
-    return convertTypes({
-      'aid': 'number',
-    }, params);
-  }
-};
-
-function parseRTBResponse(serverResponse, adapterRequest) {
-  const isEmptyResponse = !serverResponse || !isArray(serverResponse.bids);
-  const bids = [];
-
-  if (isEmptyResponse) {
-    return bids;
-  }
-
-  serverResponse.bids.forEach(serverBid => {
-    const request = find(adapterRequest.bids, (bidRequest) => {
-      return bidRequest.bidId === serverBid.requestId;
-    });
+    // use data from the first bid, to create the general params for all bids
+    const generalObject = validBidRequests[0];
+    const testMode = generalObject.params.testMode;
 
-    if (serverBid.cpm !== 0 && request !== undefined) {
-      const bid = createBid(serverBid, request);
+    combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest);
+    combinedRequestsObject.bids = generateBidsParams(validBidRequests, bidderRequest);
 
-      bids.push(bid);
+    return {
+      method: 'POST',
+      url: getEndpoint(testMode, BASE_URL, MODES),
+      data: combinedRequestsObject
     }
-  });
-
-  return bids;
-}
-
-function bidToTag(bidRequests, adapterRequest) {
-  // start publisher env
-  const tag = {
-    // TODO: is 'page' the right value here?
-    Domain: deepAccess(adapterRequest, 'refererInfo.page')
-  };
-  if (config.getConfig('coppa') === true) {
-    tag.Coppa = 1;
-  }
-  if (deepAccess(adapterRequest, 'gdprConsent.gdprApplies')) {
-    tag.GDPR = 1;
-    tag.GDPRConsent = deepAccess(adapterRequest, 'gdprConsent.consentString');
-  }
-  if (deepAccess(adapterRequest, 'uspConsent')) {
-    tag.USP = deepAccess(adapterRequest, 'uspConsent');
-  }
-  if (deepAccess(bidRequests[0], 'schain')) {
-    tag.Schain = deepAccess(bidRequests[0], 'schain');
-  }
-  if (deepAccess(bidRequests[0], 'userId')) {
-    tag.UserIds = deepAccess(bidRequests[0], 'userId');
-  }
-  if (deepAccess(bidRequests[0], 'userIdAsEids')) {
-    tag.UserEids = deepAccess(bidRequests[0], 'userIdAsEids');
-  }
-  // end publisher env
-  const bids = [];
-
-  for (let i = 0, length = bidRequests.length; i < length; i++) {
-    const bid = prepareBidRequests(bidRequests[i]);
-    bids.push(bid);
-  }
-
-  return { tag, bids };
-}
-
-/**
- * Parse mediaType
- * @param bidReq {object}
- * @returns {object}
- */
-function prepareBidRequests(bidReq) {
-  const mediaType = deepAccess(bidReq, 'mediaTypes.video') ? VIDEO : DISPLAY;
-  const sizes = mediaType === VIDEO ? deepAccess(bidReq, 'mediaTypes.video.playerSize') : deepAccess(bidReq, 'mediaTypes.banner.sizes');
-  const bidReqParams = {
-    'CallbackId': bidReq.bidId,
-    'Aid': bidReq.params.aid,
-    'AdType': mediaType,
-    'Sizes': parseSizesInput(sizes).join(',')
-  };
-
-  bidReqParams.PlacementId = bidReq.adUnitCode;
-  if (bidReq.params.iframe) {
-    bidReqParams.AdmType = 'iframe';
-  }
-  if (mediaType === VIDEO) {
-    const context = deepAccess(bidReq, 'mediaTypes.video.context');
-    if (context === ADPOD) {
-      bidReqParams.Adpod = deepAccess(bidReq, 'mediaTypes.video');
+  },
+  interpretResponse: function ({body}) {
+    const bidResponses = [];
+
+    if (body && body.bids && body.bids.length) {
+      body.bids.forEach(adUnit => {
+        const bidResponse = buildBidResponse(adUnit, DEFAULT_CURRENCY, TTL, VIDEO, BANNER);
+        bidResponses.push(bidResponse);
+      });
     }
-  }
-  return bidReqParams;
-}
-
-/**
- * Prepare all parameters for request
- * @param bidderRequest {object}
- * @returns {object}
- */
-function getMediaType(bidderRequest) {
-  return deepAccess(bidderRequest, 'mediaTypes.video') ? VIDEO : BANNER;
-}
 
-/**
- * Configure new bid by response
- * @param bidResponse {object}
- * @param bidRequest {Object}
- * @returns {object}
- */
-function createBid(bidResponse, bidRequest) {
-  const mediaType = getMediaType(bidRequest)
-  const context = deepAccess(bidRequest, 'mediaTypes.video.context');
-  const bid = {
-    requestId: bidResponse.requestId,
-    creativeId: bidResponse.cmpId,
-    height: bidResponse.height,
-    currency: bidResponse.cur,
-    width: bidResponse.width,
-    cpm: bidResponse.cpm,
-    netRevenue: true,
-    mediaType,
-    ttl: 300,
-    meta: {
-      advertiserDomains: bidResponse.adomain || []
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (syncOptions.iframeEnabled && deepAccess(response, 'body.params.userSyncURL')) {
+        syncs.push({
+          type: 'iframe',
+          url: deepAccess(response, 'body.params.userSyncURL')
+        });
+      }
+      if (syncOptions.pixelEnabled && isArray(deepAccess(response, 'body.params.userSyncPixels'))) {
+        const pixels = response.body.params.userSyncPixels.map(pixel => {
+          return {
+            type: 'image',
+            url: pixel
+          }
+        });
+        syncs.push(...pixels);
+      }
+    }
+    return syncs;
+  },
+  onBidWon: function (bid) {
+    if (bid == null) {
+      return;
     }
-  };
 
-  if (mediaType === BANNER) {
-    return Object.assign(bid, {
-      ad: bidResponse.ad,
-      adUrl: bidResponse.adUrl,
-    });
-  }
-  if (context === ADPOD) {
-    Object.assign(bid, {
-      meta: {
-        primaryCatId: bidResponse.primaryCatId,
-      },
-      video: {
-        context: ADPOD,
-        durationSeconds: bidResponse.durationSeconds
-      }
-    });
+    logInfo('onBidWon:', bid);
+    if (bid.hasOwnProperty('nurl') && bid.nurl.length > 0) {
+      triggerPixel(bid.nurl);
+    }
   }
-
-  Object.assign(bid, {
-    vastUrl: bidResponse.vastUrl
-  });
-
-  return bid;
-}
+};
 
 registerBidder(spec);
diff --git a/modules/openwebBidAdapter.md b/modules/openwebBidAdapter.md
index dc8bfa6c59e..5450182265c 100644
--- a/modules/openwebBidAdapter.md
+++ b/modules/openwebBidAdapter.md
@@ -1,27 +1,51 @@
 # Overview
 
-**Module Name**: OpenWeb Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**: monetization@openweb.com
+Module Name: OpenWeb Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: monetization@openweb.com
+
 
 # Description
 
-OpenWeb.com official prebid adapter. Available in both client and server side versions.
-OpenWeb header bidding adapter provides solution for accessing both Video and Display demand.
+Module that connects to OpenWeb's demand sources.
+
+The OpenWeb adapter requires setup and approval from OpenWeb. Please reach out to monetization@openweb.com to create an OpenWeb account.
+
+The adapter supports Video and Display demand.
+
+# Bid Parameters
+## Video
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `org` | required | String |  OpenWeb publisher Id provided by your OpenWeb representative  | "1234567890abcdef12345678"
+| `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
+| `placementId` | optional | String |  A unique placement identifier  | "12345678"
+| `testMode` | optional | Boolean |  This activates the test mode  | false
 
 # Test Parameters
-```
-    var adUnits = [
-      // Banner adUnit
-      {
-        code: 'div-test-div',
-        sizes: [[300, 250]],
+```javascript
+var adUnits = [
+       {
+        code: 'dfp-video-div',
+        sizes: [[640, 480]],
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'instream'
+          }
+        },
         bids: [{
           bidder: 'openweb',
           params: {
-            aid: 529814
+            org: '1234567890abcdef12345678', // Required
+            floorPrice: 2.00, // Optional
+            placementId: '12345678', // Optional
+            testMode: false, // Optional,
           }
         }]
       }
-    ];
+   ];
 ```
diff --git a/modules/openxBidAdapter.js b/modules/openxBidAdapter.js
index 181a0c70c7e..19da19e661f 100644
--- a/modules/openxBidAdapter.js
+++ b/modules/openxBidAdapter.js
@@ -4,7 +4,6 @@ import * as utils from '../src/utils.js';
 import {mergeDeep} from '../src/utils.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {ortbConverter} from '../libraries/ortbConverter/converter.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
 
 const bidderConfig = 'hb_pb_ortb';
 const bidderVersion = '2.0';
@@ -18,8 +17,7 @@ export const spec = {
   isBidRequestValid,
   buildRequests,
   interpretResponse,
-  getUserSyncs,
-  transformBidParams
+  getUserSyncs
 };
 
 registerBidder(spec);
@@ -50,7 +48,8 @@ const converter = ortbConverter({
     mergeDeep(req, {
       at: 1,
       ext: {
-        bc: `${bidderConfig}_${bidderVersion}`
+        bc: `${bidderConfig}_${bidderVersion}`,
+        pv: '$prebid.version$'
       }
     })
     const bid = context.bidRequests[0];
@@ -81,11 +80,6 @@ const converter = ortbConverter({
       bidResponse.meta.advertiserId = bid.ext.buyer_id;
       bidResponse.meta.brandId = bid.ext.brand_id;
     }
-    const {ortbResponse} = context;
-    if (ortbResponse.ext && ortbResponse.ext.paf) {
-      bidResponse.meta.paf = Object.assign({}, ortbResponse.ext.paf);
-      bidResponse.meta.paf.content_id = utils.deepAccess(bid, 'ext.paf.content_id');
-    }
     return bidResponse;
   },
   response(buildResponse, bidResponses, ortbResponse, context) {
@@ -106,17 +100,19 @@ const converter = ortbConverter({
       fledgeAuctionConfigs = Object.entries(fledgeAuctionConfigs).map(([bidId, cfg]) => {
         return {
           bidId,
-          config: Object.assign({
-            auctionSignals: {},
-          }, cfg)
+          config: mergeDeep(Object.assign({}, cfg), {
+            auctionSignals: {
+              ortb2Imp: context.impContext[bidId]?.imp,
+            },
+          }),
         }
       });
       return {
         bids: response.bids,
-        fledgeAuctionConfigs,
+        paapi: fledgeAuctionConfigs,
       }
     } else {
-      return response.bids
+      return response
     }
   },
   overrides: {
@@ -141,22 +137,12 @@ const converter = ortbConverter({
             bidRequest = {...bidRequest, mediaTypes: {[VIDEO]: videoParams}}
           }
           orig(imp, bidRequest, context);
-          if (imp.video && videoParams?.context === 'outstream') {
-            imp.video.placement = imp.video.placement || 4;
-          }
         }
       }
     }
   }
 });
 
-function transformBidParams(params, isOpenRtb) {
-  return convertTypes({
-    'unit': 'string',
-    'customFloor': 'number'
-  }, params);
-}
-
 function isBidRequestValid(bidRequest) {
   const hasDelDomainOrPlatform = bidRequest.params.delDomain ||
     bidRequest.params.platform;
diff --git a/modules/operaadsBidAdapter.js b/modules/operaadsBidAdapter.js
index b45c0452319..486d5ac726b 100644
--- a/modules/operaadsBidAdapter.js
+++ b/modules/operaadsBidAdapter.js
@@ -18,6 +18,13 @@ import {Renderer} from '../src/Renderer.js';
 import {OUTSTREAM} from '../src/video.js';
 import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
 const BIDDER_CODE = 'operaads';
 
 const ENDPOINT = 'https://s.adx.opera.com/ortb/v2/';
@@ -70,7 +77,7 @@ const NATIVE_DEFAULTS = {
 
 export const spec = {
   code: BIDDER_CODE,
-
+  gvlid: 1135,
   // short code
   aliases: ['opera'],
 
@@ -232,13 +239,6 @@ function buildOpenRtbBidRequest(bidRequest, bidderRequest) {
     test: config.getConfig('debug') ? 1 : 0,
     imp: createImp(bidRequest),
     device: getDevice(),
-    site: {
-      id: String(deepAccess(bidRequest, 'params.publisherId')),
-      // TODO: does the fallback make sense here?
-      domain: bidderRequest?.refererInfo?.domain || window.location.host,
-      page: bidderRequest?.refererInfo?.page,
-      ref: bidderRequest?.refererInfo?.ref || '',
-    },
     at: 1,
     bcat: getBcat(bidRequest),
     cur: [DEFAULT_CURRENCY],
@@ -250,6 +250,7 @@ function buildOpenRtbBidRequest(bidRequest, bidderRequest) {
       buyeruid: getUserId(bidRequest)
     }
   }
+  fulfillInventoryInfo(payload, bidRequest, bidderRequest);
 
   const gdprConsent = deepAccess(bidderRequest, 'gdprConsent');
   if (!!gdprConsent && gdprConsent.gdprApplies) {
@@ -524,7 +525,6 @@ function createImp(bidRequest) {
       playbackmethod: videoReq.playbackmethod || VIDEO_DEFAULTS.PLAYBACK_METHODS,
       delivery: videoReq.delivery || VIDEO_DEFAULTS.DELIVERY,
       api: videoReq.api || VIDEO_DEFAULTS.API,
-      placement: videoReq.context === OUTSTREAM ? 3 : 1,
     };
 
     mediaType = VIDEO;
@@ -764,6 +764,38 @@ function getDevice() {
   return device;
 }
 
+/**
+ * Fulfill inventory info
+ *
+ * @param payload
+ * @param bidRequest
+ * @param bidderRequest
+ */
+function fulfillInventoryInfo(payload, bidRequest, bidderRequest) {
+  let info = deepAccess(bidRequest, 'params.site');
+  // 1.If the inventory info for site specified, use the site object provided in params.
+  let key = 'site';
+  if (!isPlainObject(info)) {
+    info = deepAccess(bidRequest, 'params.app');
+    if (isPlainObject(info)) {
+      // 2.If the inventory info for app specified, use the app object provided in params.
+      key = 'app';
+    } else {
+      // 3.Otherwise, we use site by default.
+      info = {};
+    }
+  }
+  // Fulfill key parameters.
+  info.id = String(deepAccess(bidRequest, 'params.publisherId'));
+  info.domain = info.domain || bidderRequest?.refererInfo?.domain || window.location.host;
+  if (key === 'site') {
+    info.ref = info.ref || bidderRequest?.refererInfo?.ref || '';
+    info.page = info.page || bidderRequest?.refererInfo?.page;
+  }
+
+  payload[key] = info;
+}
+
 /**
  * Get browser language
  *
diff --git a/modules/operaadsBidAdapter.md b/modules/operaadsBidAdapter.md
index 6c5a4646dd0..6f13eebd7d5 100644
--- a/modules/operaadsBidAdapter.md
+++ b/modules/operaadsBidAdapter.md
@@ -14,41 +14,43 @@ Module that connects to OperaAds's demand sources
 
 ## Bid Parameters
 
-| Name | Scope | Type | Description | Example
-| ---- | ----- | ---- | ----------- | -------
-| `placementId` | required | String | The Placement Id provided by Opera Ads. | `s5340077725248`
-| `endpointId` | required | String | The Endpoint Id provided by Opera Ads. | `ep3425464070464`
-| `publisherId` | required | String | The Publisher Id provided by Opera Ads. | `pub3054952966336`
-| `bcat` | optional | String or String[] | The bcat value. | `IAB9-31`
+| Name          | Scope    | Type               | Description                             | Example                                         |
+|---------------|----------|--------------------|-----------------------------------------|-------------------------------------------------|
+| `placementId` | required | String             | The Placement Id provided by Opera Ads. | `s5340077725248`                                |
+| `endpointId`  | required | String             | The Endpoint Id provided by Opera Ads.  | `ep3425464070464`                               |
+| `publisherId` | required | String             | The Publisher Id provided by Opera Ads. | `pub3054952966336`                              |
+| `bcat`        | optional | String or String[] | The bcat value.                         | `IAB9-31`                                       |
+| `site`        | optional | Object             | The site information.                   | `{"name": "my_site", "domain": "www.test.com"}` |
+| `app`         | optional | Object             | The app information.                    | `{"name": "my_app", "ver": "1.1.0"}`            |
 
 ### Bid Video Parameters
 
 Set these parameters to `bid.mediaTypes.video`.
 
-| Name | Scope | Type | Description | Example
-| ---- | ----- | ---- | ----------- | -------
-| `context` | optional | String | `instream` or `outstream`. | `instream`
-| `mimes` | optional | String[] | Content MIME types supported. | `['video/mp4']`
-| `playerSize` | optional | Number[] or Number[][] | Video player size in device independent pixels | `[[640, 480]]`
-| `protocols` | optional | Number[] | Array of supported video protocls. | `[1, 2, 3, 4, 5, 6, 7, 8]`
-| `startdelay` | optional | Number | Indicates the start delay in seconds for pre-roll, mid-roll, or post-roll ad placements. | `0`
-| `skip` | optional | Number | Indicates if the player will allow the video to be skipped, where 0 = no, 1 = yes. | `1`
-| `playbackmethod` | optional | Number[] | Playback methods that may be in use. | `[2]`
-| `delivery` | optional | Number[] | Supported delivery methods. | `[1]`
-| `api` | optional | Number[] | List of supported API frameworks for this impression. | `[1, 2, 5]`
+| Name             | Scope    | Type                   | Description                                                                              | Example                    |
+|------------------|----------|------------------------|------------------------------------------------------------------------------------------|----------------------------|
+| `context`        | optional | String                 | `instream` or `outstream`.                                                               | `instream`                 |
+| `mimes`          | optional | String[]               | Content MIME types supported.                                                            | `['video/mp4']`            |
+| `playerSize`     | optional | Number[] or Number[][] | Video player size in device independent pixels                                           | `[[640, 480]]`             |
+| `protocols`      | optional | Number[]               | Array of supported video protocls.                                                       | `[1, 2, 3, 4, 5, 6, 7, 8]` |
+| `startdelay`     | optional | Number                 | Indicates the start delay in seconds for pre-roll, mid-roll, or post-roll ad placements. | `0`                        |
+| `skip`           | optional | Number                 | Indicates if the player will allow the video to be skipped, where 0 = no, 1 = yes.       | `1`                        |
+| `playbackmethod` | optional | Number[]               | Playback methods that may be in use.                                                     | `[2]`                      |
+| `delivery`       | optional | Number[]               | Supported delivery methods.                                                              | `[1]`                      |
+| `api`            | optional | Number[]               | List of supported API frameworks for this impression.                                    | `[1, 2, 5]`                |
 
 ### Bid Native Parameters
 
 Set these parameters to `bid.nativeParams` or `bid.mediaTypes.native`.
 
-| Name | Scope | Type | Description | Example
-| ---- | ----- | ---- | ----------- | -------
-| `title` | optional | Object | Config for native asset title. | `{required: true, len: 25}`
-| `image` | optional | Object | Config for native asset image. | `{required: true, sizes: [[300, 250]], aspect_ratios: [{min_width: 300, min_height: 250, ratio_width: 1, ratio_height: 1}]}`
-| `icon` | optional | Object | Config for native asset icon. | `{required: true, sizes: [[60, 60]], aspect_ratios: [{min_width: 60, min_height: 60, ratio_width: 1, ratio_height: 1}]}}`
-| `sponsoredBy` | optional | Object | Config for native asset sponsoredBy. | `{required: true, len: 20}`
-| `body` | optional | Object | Config for native asset body. | `{required: true, len: 200}`
-| `cta` | optional | Object | Config for native asset cta. | `{required: true, len: 20}`
+| Name          | Scope    | Type   | Description                          | Example                                                                                                                      |
+|---------------|----------|--------|--------------------------------------|------------------------------------------------------------------------------------------------------------------------------|
+| `title`       | optional | Object | Config for native asset title.       | `{required: true, len: 25}`                                                                                                  |
+| `image`       | optional | Object | Config for native asset image.       | `{required: true, sizes: [[300, 250]], aspect_ratios: [{min_width: 300, min_height: 250, ratio_width: 1, ratio_height: 1}]}` |
+| `icon`        | optional | Object | Config for native asset icon.        | `{required: true, sizes: [[60, 60]], aspect_ratios: [{min_width: 60, min_height: 60, ratio_width: 1, ratio_height: 1}]}}`    |
+| `sponsoredBy` | optional | Object | Config for native asset sponsoredBy. | `{required: true, len: 20}`                                                                                                  |
+| `body`        | optional | Object | Config for native asset body.        | `{required: true, len: 200}`                                                                                                 |
+| `cta`         | optional | Object | Config for native asset cta.         | `{required: true, len: 20}`                                                                                                  |
 
 ## Example
 
@@ -127,7 +129,9 @@ var adUnits = [{
     params: {
       placementId: 's5340077725248',
       endpointId: 'ep3425464070464',
-      publisherId: 'pub3054952966336'
+      publisherId: 'pub3054952966336',
+      // You might want to specify some application information here if the bid requests are from an application instead of a browser.
+      app: { 'name': 'my_app', 'bundle': 'test_bundle', 'store_url': 'www.some-store.com', 'ver': '1.1.0' }
     }
   }]
 }];
diff --git a/modules/operaadsIdSystem.js b/modules/operaadsIdSystem.js
index 09dd8512a2b..7cf5e2ce5e1 100644
--- a/modules/operaadsIdSystem.js
+++ b/modules/operaadsIdSystem.js
@@ -8,6 +8,11 @@ import * as ajax from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import { logMessage, logError } from '../src/utils.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'operaId';
 const ID_KEY = MODULE_NAME;
 const version = '1.0';
@@ -50,33 +55,33 @@ function asyncRequest(url, cb) {
 
 export const operaIdSubmodule = {
   /**
-     * used to link submodule with config
-     * @type {string}
-     */
+   * used to link submodule with config
+   * @type {string}
+   */
   name: MODULE_NAME,
 
   /**
-     * @type {string}
-     */
+   * @type {string}
+   */
   version,
 
   /**
-     * decode the stored id value for passing to bid requests
-     * @function
-     * @param {string} id
-     * @returns {{'operaId': string}}
-     */
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} id
+   * @returns {{'operaId': string}}
+   */
   decode: (id) =>
     id != null && id.length > 0
       ? { [ID_KEY]: id }
       : undefined,
 
   /**
-     * performs action to obtain id and return a value in the callback's response argument
-     * @function
-     * @param {SubmoduleConfig} [config]
-     * @returns {IdResponse|undefined}
-     */
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {IdResponse|undefined}
+   */
   getId(config, consentData) {
     logMessage(`${MODULE_NAME}: start synchronizing opera uid`);
     const params = (config && config.params) || {};
diff --git a/modules/opscoBidAdapter.js b/modules/opscoBidAdapter.js
new file mode 100644
index 00000000000..2ad14227804
--- /dev/null
+++ b/modules/opscoBidAdapter.js
@@ -0,0 +1,133 @@
+import {deepAccess, deepSetValue, isArray, logInfo} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+
+const ENDPOINT = 'https://exchange.ops.co/openrtb2/auction';
+const BIDDER_CODE = 'opsco';
+const DEFAULT_BID_TTL = 300;
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_NET_REVENUE = true;
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: (bid) => !!(bid.params &&
+    bid.params.placementId &&
+    bid.params.publisherId &&
+    bid.mediaTypes?.banner?.sizes &&
+    Array.isArray(bid.mediaTypes?.banner?.sizes)),
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    if (!validBidRequests || !bidderRequest) {
+      return;
+    }
+
+    const {publisherId, siteId} = validBidRequests[0].params;
+
+    const payload = {
+      id: bidderRequest.bidderRequestId,
+      imp: validBidRequests.map(bidRequest => ({
+        id: bidRequest.bidId,
+        banner: {format: extractSizes(bidRequest)},
+        ext: {
+          opsco: {
+            placementId: bidRequest.params.placementId,
+            publisherId: publisherId,
+          }
+        }
+      })),
+      site: {
+        id: siteId,
+        publisher: {id: publisherId},
+        domain: bidderRequest.refererInfo?.domain,
+        page: bidderRequest.refererInfo?.page,
+        ref: bidderRequest.refererInfo?.ref,
+      },
+    };
+
+    if (isTest(validBidRequests[0])) {
+      payload.test = 1;
+    }
+
+    if (bidderRequest.gdprConsent) {
+      deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+    const eids = deepAccess(validBidRequests[0], 'userIdAsEids');
+    if (eids && eids.length !== 0) {
+      deepSetValue(payload, 'user.ext.eids', eids);
+    }
+
+    const schainData = deepAccess(validBidRequests[0], 'schain.nodes');
+    if (isArray(schainData) && schainData.length > 0) {
+      deepSetValue(payload, 'source.ext.schain', validBidRequests[0].schain);
+    }
+
+    if (bidderRequest.uspConsent) {
+      deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: JSON.stringify(payload),
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    const response = (serverResponse || {}).body;
+    const bidResponses = response?.seatbid?.[0]?.bid?.map(bid => ({
+      requestId: bid.impid,
+      cpm: bid.price,
+      width: bid.w,
+      height: bid.h,
+      ad: bid.adm,
+      ttl: typeof bid.exp === 'number' ? bid.exp : DEFAULT_BID_TTL,
+      creativeId: bid.crid,
+      netRevenue: DEFAULT_NET_REVENUE,
+      currency: DEFAULT_CURRENCY,
+      meta: {advertiserDomains: bid?.adomain || []},
+      mediaType: bid.mediaType || bid.mtype
+    })) || [];
+
+    if (!bidResponses.length) {
+      logInfo('opsco.interpretResponse :: No valid responses');
+    }
+
+    return bidResponses;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses) => {
+    logInfo('opsco.getUserSyncs', 'syncOptions', syncOptions, 'serverResponses', serverResponses);
+    if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
+      return [];
+    }
+    let syncs = [];
+    serverResponses.forEach(resp => {
+      const userSync = deepAccess(resp, 'body.ext.usersync');
+      if (userSync) {
+        const syncDetails = Object.values(userSync).flatMap(value => value.syncs || []);
+        syncDetails.forEach(syncDetail => {
+          const type = syncDetail.type === 'iframe' ? 'iframe' : 'image';
+          if ((type === 'iframe' && syncOptions.iframeEnabled) || (type === 'image' && syncOptions.pixelEnabled)) {
+            syncs.push({type, url: syncDetail.url});
+          }
+        });
+      }
+    });
+
+    logInfo('opsco.getUserSyncs result=%o', syncs);
+    return syncs;
+  }
+};
+
+function extractSizes(bidRequest) {
+  return (bidRequest.mediaTypes?.banner?.sizes || []).map(([width, height]) => ({w: width, h: height}));
+}
+
+function isTest(validBidRequest) {
+  return validBidRequest.params?.test === true;
+}
+
+registerBidder(spec);
diff --git a/modules/opscoBidAdapter.md b/modules/opscoBidAdapter.md
new file mode 100644
index 00000000000..b5e1015a325
--- /dev/null
+++ b/modules/opscoBidAdapter.md
@@ -0,0 +1,36 @@
+# Overview
+
+```
+Module Name:  Opsco Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:   prebid@ops.co
+```
+
+# Description
+
+Module that connects to Opscos's demand sources.
+
+# Test Parameters
+
+## Banner
+
+```
+var adUnits = [
+    {
+        code: 'test-ad',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250], [300,600]]
+            }
+        },
+        bids: [{
+            bidder: 'opsco',
+            params: {
+                placementId: '1234',
+                publisherId: '9876',
+                test: true
+            }
+        }],
+    }
+];
+```
diff --git a/modules/optableBidAdapter.js b/modules/optableBidAdapter.js
new file mode 100644
index 00000000000..d2dae252e6c
--- /dev/null
+++ b/modules/optableBidAdapter.js
@@ -0,0 +1,67 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js'
+const converter = ortbConverter({
+  context: { netRevenue: true, ttl: 300 },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    utils.mergeDeep(imp, {
+      tagid: bidRequest.params.site,
+    });
+    return imp;
+  }
+});
+const BIDDER_CODE = 'optable';
+const DEFAULT_REGION = 'ca'
+const DEFAULT_ORIGIN = 'https://ads.optable.co'
+
+function getOrigin() {
+  return config.getConfig('optable.origin') ?? DEFAULT_ORIGIN;
+}
+
+function getBaseUrl() {
+  const region = config.getConfig('optable.region') ?? DEFAULT_REGION;
+  return `${getOrigin()}/${region}`
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  isBidRequestValid: function(bid) { return !!bid.params?.site },
+  buildRequests: function(bidRequests, bidderRequest) {
+    const requestURL = `${getBaseUrl()}/ortb2/v1/ssp/bid`
+    const data = converter.toORTB({ bidRequests, bidderRequest, context: { mediaType: BANNER } });
+    return { method: 'POST', url: requestURL, data }
+  },
+  buildPAAPIConfigs: function(bidRequests) {
+    const origin = getOrigin();
+    return bidRequests
+      .filter(req => req.ortb2Imp?.ext?.ae)
+      .map(bid => ({
+        bidId: bid.bidId,
+        config: {
+          seller: origin,
+          decisionLogicURL: `${getBaseUrl()}/paapi/v1/ssp/decision-logic.js?origin=${bid.params.site}`,
+          interestGroupBuyers: [origin],
+          perBuyerMultiBidLimits: {
+            [origin]: 100
+          },
+          perBuyerCurrencies: {
+            [origin]: 'USD'
+          }
+        }
+      }))
+  },
+  interpretResponse: function(response, request) {
+    const bids = converter.fromORTB({ response: response.body, request: request.data }).bids
+    const auctionConfigs = (response.body.ext?.optable?.fledge?.auctionconfigs ?? []).map((cfg) => {
+      const { impid, ...config } = cfg;
+      return { bidId: impid, config }
+    })
+
+    return { bids, paapi: auctionConfigs }
+  },
+  supportedMediaTypes: [BANNER]
+}
+registerBidder(spec);
diff --git a/modules/optableBidAdapter.md b/modules/optableBidAdapter.md
new file mode 100644
index 00000000000..a7c4829fe63
--- /dev/null
+++ b/modules/optableBidAdapter.md
@@ -0,0 +1,41 @@
+# Overview
+
+```
+Module Name: Optable Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@optable.co
+```
+
+# Description
+
+Module that connects to Optable's demand sources.
+
+# Bid Parameters
+## Banner
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `site` | required | String | Optable site ID provided by your Optable representative. | "aaaaaaaa"
+
+## Video
+
+Not supported at the moment.
+
+# Example
+```javascript
+var adUnits = [
+  {
+    code: 'test-div',
+    sizes: [[728, 90]],  // a display size
+    mediaTypes: {'banner': {}},
+    bids: [
+      {
+        bidder: 'optable',
+        params: {
+          site: 'aaaaaaaa',
+        },
+      },
+    ],
+  },
+];
+```
diff --git a/modules/optidigitalBidAdapter.js b/modules/optidigitalBidAdapter.js
index 9f27ae49d1e..f8dea0f5a92 100755
--- a/modules/optidigitalBidAdapter.js
+++ b/modules/optidigitalBidAdapter.js
@@ -1,8 +1,17 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
-import {deepAccess, parseSizesInput} from '../src/utils.js';
+import {deepAccess, isPlainObject, parseSizesInput} from '../src/utils.js';
 import {getAdUnitSizes} from '../libraries/sizeUtils/sizeUtils.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'optidigital';
 const GVL_ID = 915;
 const ENDPOINT_URL = 'https://pbs.optidigital.com/bidder';
@@ -15,11 +24,11 @@ export const spec = {
   gvlid: GVL_ID,
   supportedMediaTypes: [BANNER],
   /**
-     * Determines whether or not the given bid request is valid.
-     *
-     * @param {BidRequest} bid The bid params to validate.
-     * @return boolean True if this is a valid bid, and false otherwise.
-     */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     let isValid = false;
     if (typeof bid.params !== 'undefined' && bid.params.placementId && bid.params.publisherId) {
@@ -29,11 +38,11 @@ export const spec = {
     return isValid;
   },
   /**
-     * Make a server request from the list of BidRequests.
-     *
-     * @param {validBidRequests[]} - an array of bids
-     * @return ServerRequest Info describing the request to the server.
-     */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     if (!validBidRequests || validBidRequests.length === 0 || !bidderRequest || !bidderRequest.bids) {
       return [];
@@ -83,12 +92,24 @@ export const spec = {
       }
     }
 
+    if (bidderRequest?.gppConsent?.gppString) {
+      payload.gpp = {
+        consent: bidderRequest.gppConsent.gppString,
+        sid: bidderRequest.gppConsent.applicableSections
+      }
+    } else if (bidderRequest?.ortb2?.regs?.gpp) {
+      payload.gpp = {
+        consent: bidderRequest.ortb2.regs.gpp,
+        sid: bidderRequest.ortb2.regs.gpp_sid
+      }
+    }
+
     if (window.location.href.indexOf('optidigitalTestMode=true') !== -1) {
       payload.testMode = true;
     }
 
     if (bidderRequest && bidderRequest.uspConsent) {
-      payload.uspConsent = bidderRequest.uspConsent;
+      payload.us_privacy = bidderRequest.uspConsent;
     }
 
     if (_getEids(validBidRequests[0])) {
@@ -105,11 +126,11 @@ export const spec = {
     };
   },
   /**
-     * Unpack the response from the server into a list of bids.
-     *
-     * @param {ServerResponse} serverResponse A successful response from the server.
-     * @return {Bid[]} An array of bids which were nested inside the server.
-     */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, bidRequest) {
     const bidResponses = [];
     serverResponse = serverResponse.body;
@@ -138,13 +159,13 @@ export const spec = {
   },
 
   /**
-     * Register the user sync pixels which should be dropped after the auction.
-     *
-     * @param {SyncOptions} syncOptions Which user syncs are allowed?
-     * @param {ServerResponse[]} serverResponses List of server's responses.
-     * @return {UserSync[]} The user syncs which should be dropped.
-     */
-  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) {
     let syncurl = '';
     if (!isSynced) {
       // Attaching GDPR Consent Params in UserSync url
@@ -152,8 +173,12 @@ export const spec = {
         syncurl += '&gdpr=' + (gdprConsent.gdprApplies ? 1 : 0);
         syncurl += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
       }
-      if (uspConsent && uspConsent.consentString) {
-        syncurl += `&ccpa_consent=${uspConsent.consentString}`;
+      if (uspConsent) {
+        syncurl += '&us_privacy=' + encodeURIComponent(uspConsent);
+      }
+      if (gppConsent?.gppString && gppConsent?.applicableSections?.length) {
+        syncurl += '&gpp=' + encodeURIComponent(gppConsent.gppString);
+        syncurl += '&gpp_sid=' + encodeURIComponent(gppConsent?.applicableSections?.join(','));
       }
 
       if (syncOptions.iframeEnabled) {
@@ -222,7 +247,7 @@ function _getFloor (bid, sizes, currency) {
         mediaType: 'banner',
         size: size
       });
-      if (typeof floorInfo === 'object' && floorInfo.currency === CUR && !isNaN(parseFloat(floorInfo.floor))) {
+      if (isPlainObject(floorInfo) && floorInfo.currency === CUR && !isNaN(parseFloat(floorInfo.floor))) {
         floor = parseFloat(floorInfo.floor);
       }
     } catch (err) {}
diff --git a/modules/optimeraRtdProvider.js b/modules/optimeraRtdProvider.js
index 04d9b9d1b9f..71cd2a3b79b 100644
--- a/modules/optimeraRtdProvider.js
+++ b/modules/optimeraRtdProvider.js
@@ -23,6 +23,10 @@ import { logInfo, logError } from '../src/utils.js';
 import { submodule } from '../src/hook.js';
 import { ajaxBuilder } from '../src/ajax.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 /** @type {ModuleParams} */
 let _moduleParams = {};
 
@@ -30,7 +34,8 @@ let _moduleParams = {};
  * Default Optimera Key Name
  * This can default to hb_deal_optimera for publishers
  * who used the previous Optimera Bidder Adapter.
- * @type {string} */
+ * @type {string}
+ */
 export let optimeraKeyName = 'hb_deal_optimera';
 
 /**
@@ -182,7 +187,11 @@ export function setScoresURL() {
   if (apiVersion === 'v1') {
     newScoresURL = `${baseUrl}api/products/scores?c=${clientID}&h=${optimeraHost}&p=${optimeraPathName}&s=${device}`;
   } else {
-    newScoresURL = `${baseUrl}${clientID}/${optimeraHost}${optimeraPathName}.js`;
+    let encoded = encodeURIComponent(`${optimeraHost}${optimeraPathName}`)
+      .replaceAll('%2F', '/')
+      .replaceAll('%20', '+');
+
+    newScoresURL = `${baseUrl}${clientID}/${encoded}.js`;
   }
 
   if (scoresURL !== newScoresURL) {
diff --git a/modules/optimonAnalyticsAdapter.js b/modules/optimonAnalyticsAdapter.js
index 82bc18f605d..68baf007563 100644
--- a/modules/optimonAnalyticsAdapter.js
+++ b/modules/optimonAnalyticsAdapter.js
@@ -1,12 +1,12 @@
 /**
-*
-*********************************************************
-*
-* Optimon.io Prebid Analytics Adapter
-*
-*********************************************************
-*
-*/
+ *
+ *********************************************************
+ *
+ * Optimon.io Prebid Analytics Adapter
+ *
+ *********************************************************
+ *
+ */
 
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
diff --git a/modules/optoutBidAdapter.js b/modules/optoutBidAdapter.js
index f7b5934665c..f0010d54833 100644
--- a/modules/optoutBidAdapter.js
+++ b/modules/optoutBidAdapter.js
@@ -1,7 +1,7 @@
 import { deepAccess } from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
 
 const BIDDER_CODE = 'optout';
 
diff --git a/modules/orakiBidAdapter.js b/modules/orakiBidAdapter.js
new file mode 100644
index 00000000000..d3ef143249b
--- /dev/null
+++ b/modules/orakiBidAdapter.js
@@ -0,0 +1,19 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'oraki';
+const AD_URL = 'https://eu1.oraki.io/pbjs';
+const SYNC_URL = 'https://sync.oraki.io';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
+};
+
+registerBidder(spec);
diff --git a/modules/orakiBidAdapter.md b/modules/orakiBidAdapter.md
new file mode 100644
index 00000000000..ce35021a937
--- /dev/null
+++ b/modules/orakiBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: Oraki Bidder Adapter
+Module Type: Oraki Bidder Adapter
+Maintainer: ben@oraki.io
+```
+
+# Description
+
+Connects to Oraki exchange for bids.
+Oraki bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'oraki',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'oraki',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'oraki',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/orbidderBidAdapter.js b/modules/orbidderBidAdapter.js
index 53fff39047f..dc8293e74f2 100644
--- a/modules/orbidderBidAdapter.js
+++ b/modules/orbidderBidAdapter.js
@@ -3,8 +3,11 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-import { getGlobal } from '../src/prebidGlobal.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 const storageManager = getStorageManager({ bidderCode: 'orbidder' });
 
 /**
@@ -89,6 +92,9 @@ export const spec = {
       if (bidderRequest && bidderRequest.refererInfo) {
         referer = bidderRequest.refererInfo.page || '';
       }
+      if (bidRequest?.mediaTypes?.video) {
+        delete bidRequest.mediaTypes.video;
+      }
 
       bidRequest.params.bidfloor = getBidFloor(bidRequest);
 
@@ -97,17 +103,9 @@ export const spec = {
         method: 'POST',
         options: { withCredentials: true },
         data: {
-          v: getGlobal().version,
+          v: 'v' + '$prebid.version$',
           pageUrl: referer,
-          bidId: bidRequest.bidId,
-          auctionId: bidRequest.auctionId,
-          // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-          transactionId: bidRequest.ortb2Imp?.ext?.tid,
-          adUnitCode: bidRequest.adUnitCode,
-          bidRequestCount: bidRequest.bidRequestCount,
-          params: bidRequest.params,
-          sizes: bidRequest.sizes,
-          mediaTypes: bidRequest.mediaTypes
+          ...bidRequest // get all data provided by bid request
         }
       };
 
diff --git a/modules/outbrainBidAdapter.js b/modules/outbrainBidAdapter.js
index 0637d680912..f626b2485d1 100644
--- a/modules/outbrainBidAdapter.js
+++ b/modules/outbrainBidAdapter.js
@@ -3,8 +3,9 @@
 
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
 import {OUTSTREAM} from '../src/video.js';
-import {_map, deepAccess, deepSetValue, isArray, logWarn, replaceAuctionPrice} from '../src/utils.js';
+import {_map, deepAccess, deepSetValue, logWarn, replaceAuctionPrice, setOnAny, parseGPTSingleSizeArrayToRtbSize, isPlainObject} from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
 import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
@@ -23,6 +24,9 @@ const NATIVE_PARAMS = {
   cta: { id: 1, type: 12, name: 'data' }
 };
 const OUTSTREAM_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+const OB_USER_TOKEN_KEY = 'OB-USER-TOKEN';
+
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 export const spec = {
   code: BIDDER_CODE,
@@ -90,7 +94,7 @@ export const spec = {
         imp.video = getVideoAsset(bid);
       } else {
         imp.banner = {
-          format: transformSizes(bid.sizes)
+          format: bid.sizes?.map((size) => parseGPTSingleSizeArrayToRtbSize(size))
         }
       }
 
@@ -107,7 +111,7 @@ export const spec = {
     const request = {
       id: bidderRequest.bidderRequestId,
       site: { page, publisher },
-      device: { ua },
+      device: ortb2?.device || { ua },
       source: { fd: 1 },
       cur: [cur],
       tmax: timeout,
@@ -130,6 +134,11 @@ export const spec = {
       request.test = 1;
     }
 
+    const obUserToken = storage.getDataFromLocalStorage(OB_USER_TOKEN_KEY)
+    if (obUserToken) {
+      deepSetValue(request, 'user.ext.obusertoken', obUserToken)
+    }
+
     if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies')) {
       deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString)
       deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1)
@@ -140,6 +149,13 @@ export const spec = {
     if (config.getConfig('coppa') === true) {
       deepSetValue(request, 'regs.coppa', config.getConfig('coppa') & 1)
     }
+    if (bidderRequest.gppConsent) {
+      deepSetValue(request, 'regs.ext.gpp', bidderRequest.gppConsent.gppString)
+      deepSetValue(request, 'regs.ext.gpp_sid', bidderRequest.gppConsent.applicableSections)
+    } else if (deepAccess(bidderRequest, 'ortb2.regs.gpp')) {
+      deepSetValue(request, 'regs.ext.gpp', bidderRequest.ortb2.regs.gpp)
+      deepSetValue(request, 'regs.ext.gpp_sid', bidderRequest.ortb2.regs.gpp_sid)
+    }
 
     if (eids) {
       deepSetValue(request, 'user.ext.eids', eids);
@@ -158,7 +174,7 @@ export const spec = {
     }
     const { seatbid, cur } = serverResponse.body;
 
-    const bidResponses = flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
+    const bidResponses = seatbid.map(seat => seat.bid).flat().reduce((result, bid) => {
       result[bid.impid - 1] = bid;
       return result;
     }, []);
@@ -203,7 +219,7 @@ export const spec = {
       }
     }).filter(Boolean);
   },
-  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent, gppConsent) => {
     const syncs = [];
     let syncUrl = config.getConfig('outbrain.usersyncUrl');
 
@@ -216,6 +232,10 @@ export const spec = {
       if (uspConsent) {
         query.push('us_privacy=' + encodeURIComponent(uspConsent));
       }
+      if (gppConsent) {
+        query.push('gpp=' + encodeURIComponent(gppConsent.gppString));
+        query.push('gpp_sid=' + encodeURIComponent(gppConsent.applicableSections.join(',')));
+      }
 
       syncs.push({
         type: 'image',
@@ -268,19 +288,6 @@ function parseNative(bid) {
   return result;
 }
 
-function setOnAny(collection, key) {
-  for (let i = 0, result; i < collection.length; i++) {
-    result = deepAccess(collection[i], key);
-    if (result) {
-      return result;
-    }
-  }
-}
-
-function flatten(arr) {
-  return [].concat(...arr);
-}
-
 function getNativeAssets(bid) {
   return _map(bid.nativeParams, (bidParams, key) => {
     const props = NATIVE_PARAMS[key];
@@ -299,7 +306,7 @@ function getNativeAssets(bid) {
       }
 
       if (bidParams.sizes) {
-        const sizes = flatten(bidParams.sizes);
+        const sizes = bidParams.sizes.flat();
         w = parseInt(sizes[0], 10);
         h = parseInt(sizes[1], 10);
       }
@@ -319,7 +326,7 @@ function getNativeAssets(bid) {
 }
 
 function getVideoAsset(bid) {
-  const sizes = flatten(bid.mediaTypes.video.playerSize);
+  const sizes = bid.mediaTypes.video.playerSize.flat();
   return {
     w: parseInt(sizes[0], 10),
     h: parseInt(sizes[1], 10),
@@ -335,40 +342,18 @@ function getVideoAsset(bid) {
     maxduration: bid.mediaTypes.video.maxduration,
     startdelay: bid.mediaTypes.video.startdelay,
     placement: bid.mediaTypes.video.placement,
+    plcmt: bid.mediaTypes.video.plcmt,
     linearity: bid.mediaTypes.video.linearity
   };
 }
 
-/* Turn bid request sizes into ut-compatible format */
-function transformSizes(requestSizes) {
-  if (!isArray(requestSizes)) {
-    return [];
-  }
-
-  if (requestSizes.length === 2 && !isArray(requestSizes[0])) {
-    return [{
-      w: parseInt(requestSizes[0], 10),
-      h: parseInt(requestSizes[1], 10)
-    }];
-  } else if (isArray(requestSizes[0])) {
-    return requestSizes.map(item =>
-      ({
-        w: parseInt(item[0], 10),
-        h: parseInt(item[1], 10)
-      })
-    );
-  }
-
-  return [];
-}
-
 function _getFloor(bid, type) {
   const floorInfo = bid.getFloor({
     currency: CURRENCY,
     mediaType: type,
     size: '*'
   });
-  if (typeof floorInfo === 'object' && floorInfo.currency === CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
+  if (isPlainObject(floorInfo) && floorInfo.currency === CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
     return parseFloat(floorInfo.floor);
   }
   return null;
diff --git a/modules/ownadxBidAdapter.js b/modules/ownadxBidAdapter.js
new file mode 100644
index 00000000000..5843735f314
--- /dev/null
+++ b/modules/ownadxBidAdapter.js
@@ -0,0 +1,99 @@
+import { parseSizesInput, isEmpty } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js'
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
+const BIDDER_CODE = 'ownadx';
+const CUR = 'USD';
+const CREATIVE_TTL = 300;
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.tokenId && bid.params.sspId && bid.params.seatId);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param validBidRequests
+   * @param bidderRequest
+   * @return Array Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map(bidRequest => {
+      const sizes = parseSizesInput(bidRequest.params.size || bidRequest.sizes);
+      let mtype = 0;
+      if (bidRequest.mediaTypes[BANNER]) {
+        mtype = 1;
+      } else {
+        mtype = 2;
+      }
+
+      let tkn = bidRequest.params.tokenId;
+      let seatid = bidRequest.params.seatId;
+      let sspid = bidRequest.params.sspId;
+
+      const payload = {
+        sizes: sizes,
+        slotBidId: bidRequest.bidId,
+        PageUrl: bidderRequest.refererInfo.page,
+        mediaChannel: mtype
+      };
+      return {
+        method: 'POST',
+        url: `https://pbs-js.prebid-ownadx.com/publisher/prebid/${seatid}/${sspid}?token=${tkn}`,
+        data: payload
+      };
+    });
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse) {
+    const response = serverResponse.body;
+    const bids = [];
+    if (isEmpty(response)) {
+      return bids;
+    }
+    const responseBid = {
+      width: response.width,
+      height: response.height,
+      token: response.tokenId,
+      ttl: CREATIVE_TTL,
+      requestId: response.slotBidId,
+      aType: response.adType || '1',
+      cpm: response.cpm,
+      creativeId: response.creativeId || 0,
+      netRevenue: response.netRevenue || false,
+      currency: response.currency || CUR,
+      meta: {
+        mediaType: response.mediaType || BANNER,
+        advertiserDomains: response.advertiserDomains || []
+      },
+      ad: response.adm
+    };
+    bids.push(responseBid);
+    return bids;
+  }
+
+};
+
+registerBidder(spec);
diff --git a/modules/oxxionAnalyticsAdapter.js b/modules/oxxionAnalyticsAdapter.js
index cc69443d8bf..9e18c92d25b 100644
--- a/modules/oxxionAnalyticsAdapter.js
+++ b/modules/oxxionAnalyticsAdapter.js
@@ -1,21 +1,20 @@
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import { ajax } from '../src/ajax.js';
 import { getRefererInfo } from '../src/refererDetection.js';
+import { deepClone } from '../src/utils.js';
 
 const analyticsType = 'endpoint';
 const url = 'URL_TO_SERVER_ENDPOINT';
 
 const {
-  EVENTS: {
-    AUCTION_END,
-    BID_WON,
-    BID_RESPONSE,
-    BID_REQUESTED,
-    BID_TIMEOUT,
-  }
-} = CONSTANTS;
+  AUCTION_END,
+  BID_WON,
+  BID_RESPONSE,
+  BID_REQUESTED,
+  BID_TIMEOUT,
+} = EVENTS;
 
 let saveEvents = {}
 let allEvents = {}
@@ -23,7 +22,7 @@ let auctionEnd = {}
 let initOptions = {}
 let mode = {};
 let endpoint = 'https://default'
-let requestsAttributes = ['adUnitCode', 'auctionId', 'bidder', 'bidderCode', 'bidId', 'cpm', 'creativeId', 'currency', 'width', 'height', 'mediaType', 'netRevenue', 'originalCpm', 'originalCurrency', 'requestId', 'size', 'source', 'status', 'timeToRespond', 'transactionId', 'ttl', 'sizes', 'mediaTypes', 'src', 'params', 'userId', 'labelAny', 'bids', 'adId'];
+let requestsAttributes = ['adUnitCode', 'auctionId', 'bidder', 'bidderCode', 'bidId', 'cpm', 'creativeId', 'currency', 'width', 'height', 'mediaType', 'netRevenue', 'originalCpm', 'originalCurrency', 'requestId', 'size', 'source', 'status', 'timeToRespond', 'transactionId', 'ttl', 'sizes', 'mediaTypes', 'src', 'params', 'userId', 'labelAny', 'bids', 'adId', 'ova'];
 
 function getAdapterNameForAlias(aliasName) {
   return adapterManager.aliasRegistry[aliasName] || aliasName;
@@ -127,7 +126,7 @@ function addTimeout(args) {
   let stringArgs = JSON.parse(dereferenceWithoutRenderer(args));
   argsDereferenced = stringArgs;
   argsDereferenced.forEach((attr) => {
-    argsCleaned.push(filterAttributes(JSON.parse(JSON.stringify(attr)), false));
+    argsCleaned.push(filterAttributes(deepClone(attr), false));
   });
   if (auctionEnd[eventType] == undefined) { auctionEnd[eventType] = [] }
   auctionEnd[eventType].push(argsCleaned);
@@ -183,6 +182,15 @@ function handleBidWon(args) {
           }
         });
       }
+      if (auction['auctionId'] == args['auctionId'] && typeof auction['bidderRequests'] == 'object') {
+        auction['bidderRequests'].forEach((req) => {
+          req.bids.forEach((bid) => {
+            if (bid['bidId'] == args['requestId'] && bid['transactionId'] == args['transactionId']) {
+              args['ova'] = bid['ova'];
+            }
+          });
+        });
+      }
     });
   }
   args['cpmIncrement'] = increment;
@@ -232,7 +240,8 @@ let oxxionAnalytics = Object.assign(adapter({url, analyticsType}), {
         addTimeout(args);
         break;
     }
-  }});
+  }
+});
 
 // save the base class function
 oxxionAnalytics.originEnableAnalytics = oxxionAnalytics.enableAnalytics;
diff --git a/modules/oxxionRtdProvider.js b/modules/oxxionRtdProvider.js
index c6f8b9a902b..a0476d8ca0f 100644
--- a/modules/oxxionRtdProvider.js
+++ b/modules/oxxionRtdProvider.js
@@ -1,12 +1,14 @@
 import { submodule } from '../src/hook.js'
-import { deepAccess, logInfo, logError } from '../src/utils.js'
+import { logInfo, logError } from '../src/utils.js'
 import { ajax } from '../src/ajax.js';
 import adapterManager from '../src/adapterManager.js';
 
-const oxxionRtdSearchFor = [ 'adUnitCode', 'auctionId', 'bidder', 'bidderCode', 'bidId', 'cpm', 'creativeId', 'currency', 'width', 'height', 'mediaType', 'netRevenue', 'originalCpm', 'originalCurrency', 'requestId', 'size', 'source', 'status', 'timeToRespond', 'transactionId', 'ttl', 'sizes', 'mediaTypes', 'src', 'userId', 'labelAny', 'adId' ];
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const LOG_PREFIX = 'oxxionRtdProvider submodule: ';
 
-const allAdUnits = [];
 const bidderAliasRegistry = adapterManager.aliasRegistry || {};
 
 /** @type {RtdSubmodule} */
@@ -14,19 +16,18 @@ export const oxxionSubmodule = {
   name: 'oxxionRtd',
   init: init,
   getBidRequestData: getAdUnits,
-  onBidResponseEvent: insertVideoTracking,
   getRequestsList: getRequestsList,
   getFilteredAdUnitsOnBidRates: getFilteredAdUnitsOnBidRates,
 };
 
 function init(config, userConsent) {
   if (!config.params || !config.params.domain) { return false }
-  if (config.params.contexts && Array.isArray(config.params.contexts) && config.params.contexts.length > 0) { return true; }
   if (typeof config.params.threshold != 'undefined' && typeof config.params.samplingRate == 'number') { return true }
   return false;
 }
 
 function getAdUnits(reqBidsConfigObj, callback, config, userConsent) {
+  const moduleStarted = new Date();
   logInfo(LOG_PREFIX + 'started with ', config);
   if (typeof config.params.threshold != 'undefined' && typeof config.params.samplingRate == 'number') {
     let filteredBids;
@@ -51,83 +52,13 @@ function getAdUnits(reqBidsConfigObj, callback, config, userConsent) {
         });
       }
       if (typeof callback == 'function') { callback(); }
-    }).catch(error => logError(LOG_PREFIX, 'bidInterestError', error));
-  }
-  if (config.params.contexts && Array.isArray(config.params.contexts) && config.params.contexts.length > 0) {
-    const reqAdUnits = reqBidsConfigObj.adUnits;
-    if (Array.isArray(reqAdUnits)) {
-      reqAdUnits.forEach(adunit => {
-        if (config.params.contexts.includes(deepAccess(adunit, 'mediaTypes.video.context'))) {
-          allAdUnits.push(adunit);
-        }
-      });
-    }
-    if (!(typeof config.params.threshold != 'undefined' && typeof config.params.samplingRate == 'number') && typeof callback == 'function') {
-      callback();
-    }
-  }
-}
-
-function insertVideoTracking(bidResponse, config, userConsent) {
-  // this should only be do for video bids
-  if (bidResponse.mediaType === 'video') {
-    let maxCpm = 0;
-    const trackingUrl = getImpUrl(config, bidResponse, maxCpm);
-    if (!trackingUrl) {
-      return;
-    }
-    // Vast Impression URL
-    if (bidResponse.vastUrl) {
-      bidResponse.vastImpUrl = bidResponse.vastImpUrl
-        ? trackingUrl + '&url=' + encodeURI(bidResponse.vastImpUrl)
-        : trackingUrl;
-      logInfo(LOG_PREFIX + 'insert into vastImpUrl for adId ' + bidResponse.adId);
-    }
-    // Vast XML document
-    if (bidResponse.vastXml !== undefined) {
-      const doc = new DOMParser().parseFromString(bidResponse.vastXml, 'text/xml');
-      const wrappers = doc.querySelectorAll('VAST Ad Wrapper, VAST Ad InLine');
-      let hasAltered = false;
-      if (wrappers.length) {
-        wrappers.forEach(wrapper => {
-          const impression = doc.createElement('Impression');
-          impression.appendChild(doc.createCDATASection(trackingUrl));
-          wrapper.appendChild(impression)
-        });
-        bidResponse.vastXml = new XMLSerializer().serializeToString(doc);
-        hasAltered = true;
-      }
-      if (hasAltered) {
-        logInfo(LOG_PREFIX + 'insert into vastXml for adId ' + bidResponse.adId);
+      const timeToRun = new Date() - moduleStarted;
+      logInfo(LOG_PREFIX + ' time to run: ' + timeToRun);
+      if (getRandomNumber(50) == 1) {
+        ajax('https://' + config.params.domain + '.oxxion.io/ova/time', null, JSON.stringify({'duration': timeToRun, 'auctionId': reqBidsConfigObj.auctionId}), {method: 'POST', withCredentials: true});
       }
-    }
-  }
-}
-
-function getImpUrl(config, data, maxCpm) {
-  const adUnitCode = data.adUnitCode;
-  const adUnits = allAdUnits.find(adunit => adunit.code === adUnitCode &&
-  'mediaTypes' in adunit &&
-  'video' in adunit.mediaTypes &&
-  typeof adunit.mediaTypes.video.context === 'string');
-  const context = adUnits !== undefined
-    ? adUnits.mediaTypes.video.context
-    : 'unknown';
-  if (!config.params.contexts.includes(context)) {
-    return false;
+    }).catch(error => logError(LOG_PREFIX, 'bidInterestError', error));
   }
-  let trackingImpUrl = 'https://' + config.params.domain + '.oxxion.io/analytics/vast_imp?';
-  trackingImpUrl += oxxionRtdSearchFor.reduce((acc, param) => {
-    switch (typeof data[param]) {
-      case 'string':
-      case 'number':
-        acc += param + '=' + data[param] + '&'
-        break;
-    }
-    return acc;
-  }, '');
-  const cpmIncrement = 0.0;
-  return trackingImpUrl + 'cpmIncrement=' + cpmIncrement + '&context=' + context;
 }
 
 function getPromisifiedAjax (url, data = {}, options = {}) {
@@ -146,22 +77,27 @@ function getPromisifiedAjax (url, data = {}, options = {}) {
 
 function getFilteredAdUnitsOnBidRates (bidsRateInterests, adUnits, params, useSampling) {
   const { threshold, samplingRate } = params;
+  const sampling = getRandomNumber(100) < samplingRate && useSampling;
   const filteredBids = [];
   // Separate bidsRateInterests in two groups against threshold & samplingRate
-  const { interestingBidsRates, uninterestingBidsRates } = bidsRateInterests.reduce((acc, interestingBid) => {
+  const { interestingBidsRates, uninterestingBidsRates, sampledBidsRates } = bidsRateInterests.reduce((acc, interestingBid) => {
     const isBidRateUpper = typeof threshold == 'number' ? interestingBid.rate === true || interestingBid.rate > threshold : interestingBid.suggestion;
-    const isBidInteresting = isBidRateUpper || (getRandomNumber(100) < samplingRate && useSampling);
+    const isBidInteresting = isBidRateUpper || sampling;
     const key = isBidInteresting ? 'interestingBidsRates' : 'uninterestingBidsRates';
     acc[key].push(interestingBid);
+    if (!isBidRateUpper && sampling) {
+      acc['sampledBidsRates'].push(interestingBid);
+    }
     return acc;
   }, {
     interestingBidsRates: [],
-    uninterestingBidsRates: [] // Do something with later
+    uninterestingBidsRates: [], // Do something with later
+    sampledBidsRates: []
   });
   logInfo(LOG_PREFIX, 'getFilteredAdUnitsOnBidRates()', interestingBidsRates, uninterestingBidsRates);
   // Filter bids and adUnits against interesting bids rates
   const newAdUnits = adUnits.filter(({ bids = [] }, adUnitIndex) => {
-    adUnits[adUnitIndex].bids = bids.filter(bid => {
+    adUnits[adUnitIndex].bids = bids.filter((bid, bidIndex) => {
       if (!params.bidders || params.bidders.includes(bid.bidder)) {
         const index = interestingBidsRates.findIndex(({ id }) => id === bid._id);
         if (index == -1) {
@@ -173,10 +109,19 @@ function getFilteredAdUnitsOnBidRates (bidsRateInterests, adUnits, params, useSa
             delete tmpBid.floorData;
           }
           filteredBids.push(tmpBid);
+          adUnits[adUnitIndex].bids[bidIndex]['ova'] = 'filtered';
+        } else {
+          if (sampledBidsRates.findIndex(({ id }) => id === bid._id) == -1) {
+            adUnits[adUnitIndex].bids[bidIndex]['ova'] = 'cleared';
+          } else {
+            adUnits[adUnitIndex].bids[bidIndex]['ova'] = 'sampled';
+            logInfo(LOG_PREFIX + ' sampled ! ');
+          }
         }
         delete bid._id;
         return index !== -1;
       } else {
+        adUnits[adUnitIndex].bids[bidIndex]['ova'] = 'protected';
         return true;
       }
     });
diff --git a/modules/oxxionRtdProvider.md b/modules/oxxionRtdProvider.md
index 14b4abec5c2..bfdbfae1fa9 100644
--- a/modules/oxxionRtdProvider.md
+++ b/modules/oxxionRtdProvider.md
@@ -7,7 +7,7 @@ Maintainer: tech@oxxion.io
 # Oxxion Real-Time-Data submodule
 
 Oxxion helps you to understand how your prebid stack performs.
-This Rtd module is to use in order to improve video events tracking and/or to filter bidder requested.
+This Rtd module purpose is to filter bidders requested.
 
 # Integration
 
@@ -30,7 +30,6 @@ pbjs.setConfig(
           waitForIt: true,
           params: {
             domain: "test.endpoint",
-            contexts: ["instream"],
             threshold: false,
             samplingRate: 10,
           }
@@ -47,12 +46,6 @@ pbjs.setConfig(
 |:---------------------------------|:---------|:------------------------------------------------------------------------------------------------------------|
 | domain                           | String   | This string identifies yourself in Oxxion's systems and is provided to you by your Oxxion representative.   |
 
-# setConfig Parameters for Video Tracking
-
-| Name                             | Type     | Description                                                                                                 |
-|:---------------------------------|:---------|:------------------------------------------------------------------------------------------------------------|
-| contexts                         | Array    | Array defining which video contexts to add tracking events into. Values can be instream and/or outstream.   |
-
 # setConfig Parameters for bidder filtering
 
 | Name                             | Type       | Description                                                                                                 |
diff --git a/modules/ozoneBidAdapter.js b/modules/ozoneBidAdapter.js
index 970c7d49fb9..d554c0afeda 100644
--- a/modules/ozoneBidAdapter.js
+++ b/modules/ozoneBidAdapter.js
@@ -8,7 +8,7 @@ import {
   contains,
   mergeDeep,
   parseUrl,
-  generateUUID
+  generateUUID, isInteger, deepClone
 } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
@@ -22,10 +22,10 @@ const AUCTIONURI = '/openrtb2/auction';
 const OZONECOOKIESYNC = '/static/load-cookie.html';
 const OZONE_RENDERER_URL = 'https://prebid.the-ozone-project.com/ozone-renderer.js';
 const ORIGIN_DEV = 'https://test.ozpr.net';
-const OZONEVERSION = '2.9.0';
+const OZONEVERSION = '2.9.4';
 export const spec = {
   gvlid: 524,
-  aliases: [{code: 'lmc', gvlid: 524}],
+  aliases: [{code: 'lmc', gvlid: 524}, {code: 'venatus', gvlid: 524}],
   version: OZONEVERSION,
   code: BIDDER_CODE,
   supportedMediaTypes: [VIDEO, BANNER],
@@ -38,7 +38,7 @@ export const spec = {
     'auctionUrl': ORIGIN + AUCTIONURI,
     'cookieSyncUrl': ORIGIN + OZONECOOKIESYNC,
     'rendererUrl': OZONE_RENDERER_URL,
-    'batchRequests': false /* you can change this to true OR override it in the config: config.ozone.batchRequests */
+    'batchRequests': false /* you can change this to true OR numeric OR override it in the config: config.ozone.batchRequests = true/false/number */
   },
   loadWhitelabelData(bid) {
     if (this.propertyBag.whitelabel) { return; }
@@ -47,7 +47,7 @@ export const spec = {
     this.propertyBag.whitelabel.logId = bidder.toUpperCase();
     this.propertyBag.whitelabel.bidder = bidder;
     let bidderConfig = config.getConfig(bidder) || {};
-    logInfo('got bidderConfig: ', JSON.parse(JSON.stringify(bidderConfig)));
+    logInfo('got bidderConfig: ', deepClone(bidderConfig));
     if (bidderConfig.kvpPrefix) {
       this.propertyBag.whitelabel.keyPrefix = bidderConfig.kvpPrefix;
     }
@@ -76,7 +76,22 @@ export const spec = {
       }
     }
     if (bidderConfig.hasOwnProperty('batchRequests')) {
-      this.propertyBag.whitelabel.batchRequests = bidderConfig.batchRequests;
+      if (this.batchValueIsValid(bidderConfig.batchRequests)) {
+        this.propertyBag.whitelabel.batchRequests = bidderConfig.batchRequests;
+      } else {
+        logError('bidderConfig.batchRequests must be boolean or a number. Found & ignored data type: ' + typeof bidderConfig.batchRequests);
+      }
+    }
+    if (bidderConfig.hasOwnProperty('videoParams')) {
+      this.propertyBag.whitelabel.videoParams = bidderConfig.videoParams;
+    }
+    if (arr.hasOwnProperty('batchRequests')) {
+      let getBatch = parseInt(arr.batchRequests);
+      if (this.batchValueIsValid(getBatch)) {
+        this.propertyBag.whitelabel.batchRequests = getBatch;
+      } else {
+        logError('Ignoring query param: batchRequests - this must be a positive number');
+      }
     }
     try {
       if (arr.hasOwnProperty('auction') && arr.auction === 'dev') {
@@ -90,6 +105,9 @@ export const spec = {
     } catch (e) {}
     logInfo('set propertyBag.whitelabel to', this.propertyBag.whitelabel);
   },
+  batchValueIsValid(batch) {
+    return typeof batch === 'boolean' || (typeof batch === 'number' && batch > 0);
+  },
   getAuctionUrl() {
     return this.propertyBag.whitelabel.auctionUrl;
   },
@@ -99,8 +117,17 @@ export const spec = {
   getRendererUrl() {
     return this.propertyBag.whitelabel.rendererUrl;
   },
-  isBatchRequests() {
-    return this.propertyBag.whitelabel.batchRequests;
+  getVideoPlacementValue: function(context) {
+    if (['instream', 'outstream'].indexOf(context) < 0) return null;
+    return deepAccess(this.propertyBag, `whitelabel.videoParams.${context}`, null);
+  },
+  getBatchRequests() {
+    logInfo('getBatchRequests going to return ', this.propertyBag.whitelabel.batchRequests);
+    if (this.propertyBag.whitelabel.batchRequests === true) { return 10; }
+    if (typeof this.propertyBag.whitelabel.batchRequests === 'number' && this.propertyBag.whitelabel.batchRequests > 0) {
+      return this.propertyBag.whitelabel.batchRequests;
+    }
+    return false;
   },
   isBidRequestValid(bid) {
     this.loadWhitelabelData(bid);
@@ -173,13 +200,14 @@ export const spec = {
     this.propertyBag.buildRequestsStart = new Date().getTime();
     let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
     let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
-    logInfo(`buildRequests time: ${this.propertyBag.buildRequestsStart} v ${OZONEVERSION} validBidRequests`, JSON.parse(JSON.stringify(validBidRequests)), 'bidderRequest', JSON.parse(JSON.stringify(bidderRequest)));
+    logInfo(`buildRequests time: ${this.propertyBag.buildRequestsStart} v ${OZONEVERSION} validBidRequests`, deepClone(validBidRequests), 'bidderRequest', deepClone(bidderRequest));
     if (this.blockTheRequest()) {
       return [];
     }
+    let fledgeEnabled = !!bidderRequest.fledgeEnabled; // IF true then this is added as each bid[].ext.ae=1
     let htmlParams = {'publisherId': '', 'siteId': ''};
     if (validBidRequests.length > 0) {
-      this.cookieSyncBag.userIdObject = Object.assign(this.cookieSyncBag.userIdObject, this.findAllUserIds(validBidRequests[0]));
+      this.cookieSyncBag.userIdObject = Object.assign(this.cookieSyncBag.userIdObject, this.findAllUserIdsFromEids(validBidRequests[0]));
       this.cookieSyncBag.siteId = deepAccess(validBidRequests[0], 'params.siteId');
       this.cookieSyncBag.publisherId = deepAccess(validBidRequests[0], 'params.publisherId');
       htmlParams = validBidRequests[0].params;
@@ -199,9 +227,13 @@ export const spec = {
     const getParams = this.getGetParametersAsObject();
     const wlOztestmodeKey = whitelabelPrefix + 'testmode';
     const isTestMode = getParams[wlOztestmodeKey] || null; // this can be any string, it's used for testing ads
-    ozoneRequest.device = {'w': window.innerWidth, 'h': window.innerHeight};
+    ozoneRequest.device = bidderRequest?.ortb2?.device || {};
     let placementIdOverrideFromGetParam = this.getPlacementIdOverrideFromGetParam(); // null or string
     let schain = null;
+    var auctionId = deepAccess(validBidRequests, '0.ortb2.source.tid');
+    if (auctionId === '0') {
+      auctionId = null;
+    }
     let tosendtags = validBidRequests.map(ozoneBidRequest => {
       var obj = {};
       let placementId = placementIdOverrideFromGetParam || this.getPlacementId(ozoneBidRequest); // prefer to use a valid override param, else the bidRequest placement Id
@@ -301,6 +333,21 @@ export const spec = {
       if (gpid) {
         deepSetValue(obj, 'ext.gpid', gpid);
       }
+      let transactionId = deepAccess(ozoneBidRequest, 'ortb2Imp.ext.tid');
+      if (transactionId) {
+        obj.ext[whitelabelBidder].transactionId = transactionId; // this is the transactionId PER adUnit, common across bidders for this unit
+      }
+      if (auctionId) {
+        obj.ext[whitelabelBidder].auctionId = auctionId; // we were sent a valid auctionId to use - this will also be used as the root id value for the request
+      }
+      if (fledgeEnabled) { // fledge is enabled at some config level - pbjs.setBidderConfig or pbjs.setConfig
+        const auctionEnvironment = deepAccess(ozoneBidRequest, 'ortb2Imp.ext.ae'); // this will be set for one of 3 reasons; adunit, setBidderConfig, setConfig
+        if (isInteger(auctionEnvironment)) {
+          deepSetValue(obj, 'ext.ae', auctionEnvironment);
+        } else {
+          logError('ortb2Imp.ext.ae is not an integer - ignoring it for obj.id=' + obj.id);
+        }
+      }
       return obj;
     });
     let extObj = {};
@@ -309,8 +356,8 @@ export const spec = {
     extObj[whitelabelBidder][whitelabelPrefix + '_rw'] = placementIdOverrideFromGetParam ? 1 : 0;
     if (validBidRequests.length > 0) {
       let userIds = this.cookieSyncBag.userIdObject; // 2021-01-06 - slight optimisation - we've already found this info
-      if (userIds.hasOwnProperty('pubcid')) {
-        extObj[whitelabelBidder].pubcid = userIds.pubcid;
+      if (userIds.hasOwnProperty('pubcid.org')) {
+        extObj[whitelabelBidder].pubcid = userIds['pubcid.org'];
       }
     }
     extObj[whitelabelBidder].pv = this.getPageId(); // attach the page ID that will be common to all auction calls for this page if refresh() is called
@@ -358,6 +405,10 @@ export const spec = {
     } else {
       logInfo('WILL NOT ADD USP consent info; no bidderRequest.uspConsent.');
     }
+    if (bidderRequest?.ortb2?.regs?.gpp) {
+      deepSetValue(ozoneRequest, 'regs.gpp', bidderRequest.ortb2.regs.gpp);
+      deepSetValue(ozoneRequest, 'regs.gpp_sid', bidderRequest.ortb2.regs.gpp_sid);
+    }
     if (schain) { // we set this while iterating over the bids
       logInfo('schain found');
       deepSetValue(ozoneRequest, 'source.ext.schain', schain);
@@ -365,15 +416,20 @@ export const spec = {
     if (config.getConfig('coppa') === true) {
       deepSetValue(ozoneRequest, 'regs.coppa', 1);
     }
-    let ozUuid = generateUUID();
-    if (this.isBatchRequests()) {
+    extObj[whitelabelBidder].cookieDeprecationLabel = deepAccess(bidderRequest, 'ortb2.device.ext.cdep', 'none');
+    logInfo('cookieDeprecationLabel from bidderRequest object = ' + extObj[whitelabelBidder].cookieDeprecationLabel);
+    let batchRequestsVal = this.getBatchRequests(); // false|numeric
+    if (typeof batchRequestsVal === 'number') {
       logInfo('going to batch the requests');
       let arrRet = []; // return an array of objects containing data describing max 10 bids
-      for (let i = 0; i < tosendtags.length; i += 10) {
-        ozoneRequest.id = ozUuid; // Unique ID of the bid request, provided by the exchange. (REQUIRED)
-        ozoneRequest.imp = tosendtags.slice(i, i + 10);
-        ozoneRequest.ext = extObj;
+      for (let i = 0; i < tosendtags.length; i += batchRequestsVal) {
+        ozoneRequest.id = generateUUID(); // Unique ID of the bid request, provided by the exchange. (REQUIRED)
         deepSetValue(ozoneRequest, 'user.ext.eids', userExtEids);
+        if (auctionId) {
+          deepSetValue(ozoneRequest, 'source.tid', auctionId);
+        }
+        ozoneRequest.imp = tosendtags.slice(i, i + batchRequestsVal);
+        ozoneRequest.ext = extObj;
         if (ozoneRequest.imp.length > 0) {
           arrRet.push({
             method: 'POST',
@@ -389,17 +445,20 @@ export const spec = {
     logInfo('requests will not be batched.');
     if (singleRequest) {
       logInfo('buildRequests starting to generate response for a single request');
-      ozoneRequest.id = ozUuid; // Unique ID of the bid request, provided by the exchange. (REQUIRED)
+      ozoneRequest.id = generateUUID(); // Unique ID of the bid request, provided by the exchange. (REQUIRED)
       ozoneRequest.imp = tosendtags;
       ozoneRequest.ext = extObj;
       deepSetValue(ozoneRequest, 'user.ext.eids', userExtEids);
+      if (auctionId) {
+        deepSetValue(ozoneRequest, 'source.tid', auctionId);
+      }
       var ret = {
         method: 'POST',
         url: this.getAuctionUrl(),
         data: JSON.stringify(ozoneRequest),
         bidderRequest: bidderRequest
       };
-      logInfo('buildRequests request data for single = ', JSON.parse(JSON.stringify(ozoneRequest)));
+      logInfo('buildRequests request data for single = ', deepClone(ozoneRequest));
       this.propertyBag.buildRequestsEnd = new Date().getTime();
       logInfo(`buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
       return ret;
@@ -411,6 +470,9 @@ export const spec = {
       ozoneRequestSingle.imp = [imp];
       ozoneRequestSingle.ext = extObj;
       deepSetValue(ozoneRequestSingle, 'user.ext.eids', userExtEids);
+      if (auctionId) {
+        deepSetValue(ozoneRequestSingle, 'source.tid', auctionId);
+      }
       logInfo('buildRequests RequestSingle (for non-single) = ', ozoneRequestSingle);
       return {
         method: 'POST',
@@ -432,15 +494,15 @@ export const spec = {
     logInfo('getFloorObjectForAuction mediaTypesSizes : ', mediaTypesSizes);
     let ret = {};
     if (mediaTypesSizes.banner) {
-      ret.banner = bidRequestRef.getFloor({mediaType: 'banner', currency: 'USD', size: mediaTypesSizes.banner});
+      ret.banner = bidRequestRef.getFloor({mediaType: 'banner', currency: 'USD', size: mediaTypesSizes.banner}) || {};
     }
     if (mediaTypesSizes.video) {
-      ret.video = bidRequestRef.getFloor({mediaType: 'video', currency: 'USD', size: mediaTypesSizes.video});
+      ret.video = bidRequestRef.getFloor({mediaType: 'video', currency: 'USD', size: mediaTypesSizes.video}) || {};
     }
     if (mediaTypesSizes.native) {
-      ret.native = bidRequestRef.getFloor({mediaType: 'native', currency: 'USD', size: mediaTypesSizes.native});
+      ret.native = bidRequestRef.getFloor({mediaType: 'native', currency: 'USD', size: mediaTypesSizes.native}) || {};
     }
-    logInfo('getFloorObjectForAuction returning : ', JSON.parse(JSON.stringify(ret)));
+    logInfo('getFloorObjectForAuction returning : ', deepClone(ret));
     return ret;
   },
   interpretResponse(serverResponse, request) {
@@ -449,7 +511,7 @@ export const spec = {
     let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
     let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
     logInfo(`interpretResponse time: ${startTime} . Time between buildRequests done and interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
-    logInfo(`serverResponse, request`, JSON.parse(JSON.stringify(serverResponse)), JSON.parse(JSON.stringify(request)));
+    logInfo(`serverResponse, request`, deepClone(serverResponse), deepClone(request));
     serverResponse = serverResponse.body || {};
     let aucId = serverResponse.id; // this will be correct for single requests and non-single
     if (!serverResponse.hasOwnProperty('seatbid')) {
@@ -476,7 +538,7 @@ export const spec = {
       for (let j = 0; j < sb.bid.length; j++) {
         let thisRequestBid = this.getBidRequestForBidId(sb.bid[j].impid, request.bidderRequest.bids);
         logInfo(`seatbid:${i}, bid:${j} Going to set default w h for seatbid/bidRequest`, sb.bid[j], thisRequestBid);
-        const {defaultWidth, defaultHeight} = defaultSize(thisRequestBid);
+        let {defaultWidth, defaultHeight} = defaultSize(thisRequestBid);
         let thisBid = ozoneAddStandardProperties(sb.bid[j], defaultWidth, defaultHeight);
         thisBid.meta = {advertiserDomains: thisBid.adomain || []};
         let videoContext = null;
@@ -508,8 +570,8 @@ export const spec = {
           this.setBidMediaTypeIfNotExist(thisBid, BANNER);
         }
         if (enhancedAdserverTargeting) {
-          let allBidsForThisBidid = ozoneGetAllBidsForBidId(thisBid.bidId, serverResponse.seatbid);
-          logInfo('Going to iterate allBidsForThisBidId', allBidsForThisBidid);
+          let allBidsForThisBidid = ozoneGetAllBidsForBidId(thisBid.bidId, serverResponse.seatbid, defaultWidth, defaultHeight);
+          logInfo('Going to iterate allBidsForThisBidId', deepClone(allBidsForThisBidid));
           Object.keys(allBidsForThisBidid).forEach((bidderName, index, ar2) => {
             logInfo(`adding adserverTargeting for ${bidderName} for bidId ${thisBid.bidId}`);
             adserverTargeting[whitelabelPrefix + '_' + bidderName] = bidderName;
@@ -517,6 +579,7 @@ export const spec = {
             adserverTargeting[whitelabelPrefix + '_' + bidderName + '_adv'] = String(allBidsForThisBidid[bidderName].adomain);
             adserverTargeting[whitelabelPrefix + '_' + bidderName + '_adId'] = String(allBidsForThisBidid[bidderName].adId);
             adserverTargeting[whitelabelPrefix + '_' + bidderName + '_pb_r'] = getRoundedBid(allBidsForThisBidid[bidderName].price, allBidsForThisBidid[bidderName].ext.prebid.type);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_size'] = String(allBidsForThisBidid[bidderName].width) + 'x' + String(allBidsForThisBidid[bidderName].height);
             if (allBidsForThisBidid[bidderName].hasOwnProperty('dealid')) {
               adserverTargeting[whitelabelPrefix + '_' + bidderName + '_dealid'] = String(allBidsForThisBidid[bidderName].dealid);
             }
@@ -546,6 +609,7 @@ export const spec = {
           }
         }
         let {seat: winningSeat, bid: winningBid} = ozoneGetWinnerForRequestBid(thisBid.bidId, serverResponse.seatbid);
+        winningBid = ozoneAddStandardProperties(winningBid, defaultWidth, defaultHeight);
         adserverTargeting[whitelabelPrefix + '_auc_id'] = String(aucId); // was request.bidderRequest.auctionId
         adserverTargeting[whitelabelPrefix + '_winner'] = String(winningSeat);
         adserverTargeting[whitelabelPrefix + '_bid'] = 'true';
@@ -567,10 +631,28 @@ export const spec = {
         arrAllBids.push(thisBid);
       }
     }
+    let ret = arrAllBids;
+    let fledgeAuctionConfigs = deepAccess(serverResponse, 'ext.igi') || []; // 20240606 standardising
+    if (Array.isArray(fledgeAuctionConfigs) && fledgeAuctionConfigs.length > 0) {
+      fledgeAuctionConfigs = fledgeAuctionConfigs.filter(config => {
+        if (!this.isValidAuctionConfig(config)) {
+          logWarn('Malformed auction config detected:', config);
+          return false;
+        }
+        return true;
+      });
+      ret = {
+        bids: arrAllBids,
+        fledgeAuctionConfigs,
+      };
+    }
     let endTime = new Date().getTime();
     logInfo(`interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`);
-    logInfo('interpretResponse arrAllBids (serialised): ', JSON.parse(JSON.stringify(arrAllBids))); // this is ok to log because the renderer has not been attached yet
-    return arrAllBids;
+    logInfo('interpretResponse arrAllBids (serialised): ', deepClone(ret)); // this is ok to log because the renderer has not been attached yet
+    return ret;
+  },
+  isValidAuctionConfig(config) {
+    return typeof config === 'object' && config !== null;
   },
   setBidMediaTypeIfNotExist(thisBid, mediaType) {
     if (!thisBid.hasOwnProperty('mediaType')) {
@@ -609,11 +691,12 @@ export const spec = {
     }
     return ret;
   },
-  getUserSyncs(optionsType, serverResponse, gdprConsent, usPrivacy) {
+  getUserSyncs(optionsType, serverResponse, gdprConsent, usPrivacy, gppConsent = {}) {
     logInfo('getUserSyncs optionsType', optionsType, 'serverResponse', serverResponse, 'gdprConsent', gdprConsent, 'usPrivacy', usPrivacy, 'cookieSyncBag', this.cookieSyncBag);
     if (!serverResponse || serverResponse.length === 0) {
       return [];
     }
+    let { gppString = '', applicableSections = [] } = gppConsent;
     if (optionsType.iframeEnabled) {
       var arrQueryString = [];
       if (config.getConfig('debug')) {
@@ -622,6 +705,10 @@ export const spec = {
       arrQueryString.push('gdpr=' + (deepAccess(gdprConsent, 'gdprApplies', false) ? '1' : '0'));
       arrQueryString.push('gdpr_consent=' + deepAccess(gdprConsent, 'consentString', ''));
       arrQueryString.push('usp_consent=' + (usPrivacy || ''));
+      arrQueryString.push('gpp=' + gppString);
+      if (Array.isArray(applicableSections)) {
+        arrQueryString.push(`gpp_sid=${applicableSections.join()}`);
+      }
       for (let keyname in this.cookieSyncBag.userIdObject) {
         arrQueryString.push(keyname + '=' + this.cookieSyncBag.userIdObject[keyname]);
       }
@@ -655,47 +742,26 @@ export const spec = {
     }
     return null;
   },
-  findAllUserIds(bidRequest) {
-    var ret = {};
-    let searchKeysSingle = ['pubcid', 'tdid', 'idl_env', 'criteoId', 'lotamePanoramaId', 'fabrickId'];
-    if (bidRequest.hasOwnProperty('userId')) {
-      for (let arrayId in searchKeysSingle) {
-        let key = searchKeysSingle[arrayId];
-        if (bidRequest.userId.hasOwnProperty(key)) {
-          if (typeof (bidRequest.userId[key]) == 'string') {
-            ret[key] = bidRequest.userId[key];
-          } else if (typeof (bidRequest.userId[key]) == 'object') {
-            logError(`WARNING: findAllUserIds had to use first key in user object to get value for bid.userId key: ${key}. Prebid adapter should be updated.`);
-            ret[key] = bidRequest.userId[key][Object.keys(bidRequest.userId[key])[0]]; // cannot use Object.values
-          } else {
-            logError(`failed to get string key value for userId : ${key}`);
-          }
-        }
-      }
-      let lipbid = deepAccess(bidRequest.userId, 'lipb.lipbid');
-      if (lipbid) {
-        ret['lipb'] = {'lipbid': lipbid};
-      }
-      let id5id = deepAccess(bidRequest.userId, 'id5id.uid');
-      if (id5id) {
-        ret['id5id'] = id5id;
-      }
-      let parrableId = deepAccess(bidRequest.userId, 'parrableId.eid');
-      if (parrableId) {
-        ret['parrableId'] = parrableId;
-      }
-      let sharedid = deepAccess(bidRequest.userId, 'sharedid.id');
-      if (sharedid) {
-        ret['sharedid'] = sharedid;
-      }
+  findAllUserIdsFromEids(bidRequest) {
+    let ret = {};
+    if (!bidRequest.hasOwnProperty('userIdAsEids')) {
+      logInfo('findAllUserIdsFromEids - no bidRequest.userIdAsEids object - will quit');
+      this.tryGetPubCidFromOldLocation(ret, bidRequest); // legacy
+      return ret;
+    }
+    for (let obj of bidRequest.userIdAsEids) {
+      ret[obj.source] = deepAccess(obj, 'uids.0.id');
     }
+    this.tryGetPubCidFromOldLocation(ret, bidRequest); // legacy
+    return ret;
+  },
+  tryGetPubCidFromOldLocation(ret, bidRequest) {
     if (!ret.hasOwnProperty('pubcid')) {
       let pubcid = deepAccess(bidRequest, 'crumbs.pubcid');
       if (pubcid) {
-        ret['pubcid'] = pubcid; // if built with old pubCommonId module
+        ret['pubcid.org'] = pubcid; // if built with old pubCommonId module (use the new eid key)
       }
     }
-    return ret;
   },
   getPlacementId(bidRequest) {
     return (bidRequest.params.placementId).toString();
@@ -763,7 +829,7 @@ export const spec = {
     return ret;
   },
   _unpackVideoConfigIntoIABformat(ret, objConfig) {
-    let arrVideoKeysAllowed = ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin', 'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad', 'api', 'companiontype'];
+    let arrVideoKeysAllowed = ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'plcmt', 'linearity', 'skip', 'skipmin', 'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad', 'api', 'companiontype'];
     for (const key in objConfig) {
       var found = false;
       arrVideoKeysAllowed.forEach(function(arg) {
@@ -791,11 +857,9 @@ export const spec = {
     return objRet;
   },
   _addVideoDefaults(objRet, objConfig, addIfMissing) {
-    let context = deepAccess(objConfig, 'context');
-    if (context === 'outstream') {
-      objRet.placement = 3;
-    } else if (context === 'instream') {
-      objRet.placement = 1;
+    let placementValue = this.getVideoPlacementValue(deepAccess(objConfig, 'context'));
+    if (placementValue) {
+      objRet.placement = placementValue;
     }
     let skippable = deepAccess(objConfig, 'skippable', null);
     if (skippable == null) {
@@ -830,7 +894,9 @@ export const spec = {
       params: bid.params,
       price: bid.price,
       transactionId: bid.transactionId,
-      ttl: bid.ttl
+      ttl: bid.ttl,
+      ortb2: deepAccess(bid, 'ortb2'),
+      ortb2Imp: deepAccess(bid, 'ortb2Imp'),
     };
     if (bid.hasOwnProperty('floorData')) {
       logObj.floorData = bid.floorData;
@@ -839,7 +905,7 @@ export const spec = {
   }
 };
 export function injectAdIdsIntoAllBidResponses(seatbid) {
-  logInfo('injectAdIdsIntoAllBidResponses', seatbid);
+  logInfo('injectAdIdsIntoAllBidResponses', deepClone(seatbid));
   for (let i = 0; i < seatbid.length; i++) {
     let sb = seatbid[i];
     for (let j = 0; j < sb.bid.length; j++) {
@@ -891,7 +957,7 @@ export function ozoneGetWinnerForRequestBid(requestBidId, serverResponseSeatBid)
   }
   return {'seat': winningSeat, 'bid': thisBidWinner};
 }
-export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid) {
+export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid, defaultWidth, defaultHeight) {
   let objBids = {};
   for (let j = 0; j < serverResponseSeatBid.length; j++) {
     let theseBids = serverResponseSeatBid[j].bid;
@@ -900,10 +966,11 @@ export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid) {
       if (theseBids[k].impid === matchBidId) {
         if (objBids.hasOwnProperty(thisSeat)) { // > 1 bid for an adunit from a bidder - only use the one with the highest bid
           if (objBids[thisSeat]['price'] < theseBids[k].price) {
-            objBids[thisSeat] = theseBids[k];
+            objBids[thisSeat] = ozoneAddStandardProperties(theseBids[k], defaultWidth, defaultHeight);
           }
         } else {
           objBids[thisSeat] = theseBids[k];
+          objBids[thisSeat] = ozoneAddStandardProperties(theseBids[k], defaultWidth, defaultHeight);
         }
       }
     }
@@ -1035,7 +1102,7 @@ function newRenderer(adUnitCode, rendererOptions = {}) {
 }
 function outstreamRender(bid) {
   logInfo('outstreamRender called. Going to push the call to window.ozoneVideo.outstreamRender(bid) bid = (first static, then reference)');
-  logInfo(JSON.parse(JSON.stringify(spec.getLoggableBidObject(bid))));
+  logInfo(deepClone(spec.getLoggableBidObject(bid)));
   bid.renderer.push(() => {
     logInfo('Going to execute window.ozoneVideo.outstreamRender');
     window.ozoneVideo.outstreamRender(bid);
diff --git a/modules/paapi.js b/modules/paapi.js
new file mode 100644
index 00000000000..8b214ebe135
--- /dev/null
+++ b/modules/paapi.js
@@ -0,0 +1,744 @@
+/**
+ * Collect PAAPI component auction configs from bid adapters and make them available through `pbjs.getPAAPIConfig()`
+ */
+import {config} from '../src/config.js';
+import {getHook, hook, module} from '../src/hook.js';
+import {
+  deepAccess,
+  deepEqual,
+  deepSetValue,
+  logError,
+  logInfo,
+  logWarn,
+  mergeDeep,
+  sizesToSizeTuples
+} from '../src/utils.js';
+import {IMP, PBS, registerOrtbProcessor, RESPONSE} from '../src/pbjsORTB.js';
+import * as events from '../src/events.js';
+import {EVENTS} from '../src/constants.js';
+import {currencyCompare} from '../libraries/currencyUtils/currency.js';
+import {keyCompare, maximum, minimum} from '../src/utils/reducers.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import {auctionStore} from '../libraries/weakStore/weakStore.js';
+import {adapterMetrics, guardTids} from '../src/adapters/bidderFactory.js';
+import {defer} from '../src/utils/promise.js';
+import {auctionManager} from '../src/auctionManager.js';
+
+const MODULE = 'PAAPI';
+
+const submodules = [];
+const USED = new WeakSet();
+
+export function registerSubmodule(submod) {
+  submodules.push(submod);
+  submod.init && submod.init({
+    getPAAPIConfig,
+    expandFilters
+  });
+}
+
+module('paapi', registerSubmodule);
+
+/* auction configs as returned by getPAAPIConfigs */
+const configsForAuction = auctionStore();
+
+/* auction configs returned by adapters, but waiting for end-of-auction signals before they're added to configsForAuction */
+const pendingConfigsForAuction = auctionStore();
+
+/* igb returned by adapters, waiting for end-of-auction signals before they're merged into configForAuctions */
+const pendingBuyersForAuction = auctionStore();
+
+/* for auction configs that were generated in parallel with auctions (and contain promises), their resolve/reject methods */
+const deferredConfigsForAuction = auctionStore();
+
+let latestAuctionForAdUnit = {};
+let moduleConfig = {};
+
+config.getConfig('paapi', config => {
+  init(config.paapi);
+});
+
+export function reset() {
+  submodules.splice(0, submodules.length);
+  latestAuctionForAdUnit = {};
+}
+
+export function init(cfg) {
+  if (cfg && cfg.enabled === true) {
+    if (!moduleConfig.enabled) {
+      attachHandlers();
+    }
+    moduleConfig = cfg;
+    logInfo(`${MODULE} enabled (browser ${isFledgeSupported() ? 'supports' : 'does NOT support'} runAdAuction)`, cfg);
+  } else {
+    if (moduleConfig.enabled) {
+      detachHandlers();
+    }
+    moduleConfig = {};
+    logInfo(`${MODULE} disabled`, cfg);
+  }
+}
+
+function attachHandlers() {
+  getHook('addPaapiConfig').before(addPaapiConfigHook);
+  getHook('makeBidRequests').before(addPaapiData);
+  getHook('makeBidRequests').after(markForFledge);
+  getHook('processBidderRequests').before(parallelPaapiProcessing);
+  events.on(EVENTS.AUCTION_INIT, onAuctionInit);
+  events.on(EVENTS.AUCTION_END, onAuctionEnd);
+}
+
+function detachHandlers() {
+  getHook('addPaapiConfig').getHooks({hook: addPaapiConfigHook}).remove();
+  getHook('makeBidRequests').getHooks({hook: addPaapiData}).remove();
+  getHook('makeBidRequests').getHooks({hook: markForFledge}).remove();
+  getHook('processBidderRequests').getHooks({hook: parallelPaapiProcessing}).remove();
+  events.off(EVENTS.AUCTION_INIT, onAuctionInit);
+  events.off(EVENTS.AUCTION_END, onAuctionEnd);
+}
+
+function getStaticSignals(adUnit = {}) {
+  const cfg = {};
+  const requestedSize = getRequestedSize(adUnit);
+  if (requestedSize) {
+    cfg.requestedSize = requestedSize;
+  }
+  return cfg;
+}
+
+function getSlotSignals(bidsReceived = [], bidRequests = []) {
+  let bidfloor, bidfloorcur;
+  if (bidsReceived.length > 0) {
+    const bestBid = bidsReceived.reduce(maximum(currencyCompare(bid => [bid.cpm, bid.currency])));
+    bidfloor = bestBid.cpm;
+    bidfloorcur = bestBid.currency;
+  } else {
+    const floors = bidRequests.map(bid => typeof bid.getFloor === 'function' && bid.getFloor()).filter(f => f);
+    const minFloor = floors.length && floors.reduce(minimum(currencyCompare(floor => [floor.floor, floor.currency])));
+    bidfloor = minFloor?.floor;
+    bidfloorcur = minFloor?.currency;
+  }
+  const cfg = {};
+  if (bidfloor) {
+    deepSetValue(cfg, 'auctionSignals.prebid.bidfloor', bidfloor);
+    bidfloorcur && deepSetValue(cfg, 'auctionSignals.prebid.bidfloorcur', bidfloorcur);
+  }
+  return cfg;
+}
+
+export function buyersToAuctionConfigs(igbRequests, merge = mergeBuyers, config = moduleConfig?.componentSeller ?? {}, partitioners = {
+  compact: (igbRequests) => partitionBuyers(igbRequests.map(req => req[1])).map(part => [{}, part]),
+  expand: partitionBuyersByBidder
+}) {
+  if (!config.auctionConfig) {
+    logWarn(MODULE, 'Cannot use IG buyers: paapi.componentSeller.auctionConfig not set', igbRequests.map(req => req[1]));
+    return [];
+  }
+  const partition = partitioners[config.separateAuctions ? 'expand' : 'compact'];
+  return partition(igbRequests)
+    .map(([request, igbs]) => {
+      const auctionConfig = mergeDeep(merge(igbs), config.auctionConfig);
+      auctionConfig.auctionSignals = setFPD(auctionConfig.auctionSignals || {}, request);
+      return [request, auctionConfig];
+    });
+}
+
+function onAuctionEnd({auctionId, bidsReceived, bidderRequests, adUnitCodes, adUnits}) {
+  const adUnitsByCode = Object.fromEntries(adUnits?.map(au => [au.code, au]) || []);
+  const allReqs = bidderRequests?.flatMap(br => br.bids);
+  const paapiConfigs = configsForAuction(auctionId);
+  (adUnitCodes || []).forEach(au => {
+    if (!paapiConfigs.hasOwnProperty(au)) {
+      paapiConfigs[au] = null;
+    }
+    !latestAuctionForAdUnit.hasOwnProperty(au) && (latestAuctionForAdUnit[au] = null);
+  });
+
+  const pendingConfigs = pendingConfigsForAuction(auctionId);
+  const pendingBuyers = pendingBuyersForAuction(auctionId);
+
+  if (pendingConfigs && pendingBuyers) {
+    Object.entries(pendingBuyers).forEach(([adUnitCode, igbRequests]) => {
+      buyersToAuctionConfigs(igbRequests).forEach(([{bidder}, auctionConfig]) => append(pendingConfigs, adUnitCode, {id: getComponentSellerConfigId(bidder), config: auctionConfig}))
+    })
+  }
+
+  const deferredConfigs = deferredConfigsForAuction(auctionId);
+
+  const adUnitsWithConfigs = Array.from(new Set(Object.keys(pendingConfigs).concat(Object.keys(deferredConfigs))));
+  const signals = Object.fromEntries(
+    adUnitsWithConfigs.map(adUnitCode => {
+      latestAuctionForAdUnit[adUnitCode] = auctionId;
+      const forThisAdUnit = (bid) => bid.adUnitCode === adUnitCode;
+      return [adUnitCode, {
+        ...getStaticSignals(adUnitsByCode[adUnitCode]),
+        ...getSlotSignals(bidsReceived?.filter(forThisAdUnit), allReqs?.filter(forThisAdUnit))
+      }]
+    })
+  )
+
+  const configsById = {};
+  Object.entries(pendingConfigs || {}).forEach(([adUnitCode, auctionConfigs]) => {
+    auctionConfigs.forEach(({id, config}) => append(configsById, id, {
+      adUnitCode,
+      config: mergeDeep({}, signals[adUnitCode], config)
+    }));
+  });
+
+  function resolveSignals(signals, deferrals) {
+    Object.entries(deferrals).forEach(([signal, {resolve, default: defaultValue}]) => {
+      let value = signals.hasOwnProperty(signal) ? signals[signal] : null;
+      if (value == null && defaultValue == null) {
+        value = undefined;
+      } else if (typeof defaultValue === 'object' && typeof value === 'object') {
+        value = mergeDeep({}, defaultValue, value);
+      } else {
+        value = value ?? defaultValue
+      }
+      resolve(value);
+    })
+  }
+
+  Object.entries(deferredConfigs).forEach(([adUnitCode, {top, components}]) => {
+    resolveSignals(signals[adUnitCode], top);
+    Object.entries(components).forEach(([configId, {deferrals}]) => {
+      const matchingConfigs = configsById.hasOwnProperty(configId) ? configsById[configId] : [];
+      if (matchingConfigs.length > 1) {
+        logWarn(`Received multiple PAAPI configs for the same bidder and seller (${configId}), active PAAPI auctions will only see the first`);
+      }
+      const {config} = matchingConfigs.shift() ?? {config: {...signals[adUnitCode]}}
+      resolveSignals(config, deferrals);
+    })
+  });
+
+  const newConfigs = Object.values(configsById).flatMap(configs => configs);
+  const hasDeferredConfigs = Object.keys(deferredConfigs).length > 0;
+
+  if (moduleConfig.parallel && hasDeferredConfigs && newConfigs.length > 0) {
+    logError(`Received PAAPI configs after PAAPI auctions were already started in parallel with their contextual auction`, newConfigs)
+  }
+
+  newConfigs.forEach(({adUnitCode, config}) => {
+    if (paapiConfigs[adUnitCode] == null) {
+      paapiConfigs[adUnitCode] = {
+        ...signals[adUnitCode],
+        componentAuctions: []
+      }
+    }
+    paapiConfigs[adUnitCode].componentAuctions.push(mergeDeep({}, signals[adUnitCode], config));
+  });
+
+  if (!moduleConfig.parallel || !hasDeferredConfigs) {
+    submodules.forEach(submod => submod.onAuctionConfig?.(auctionId, paapiConfigs));
+  }
+}
+
+function append(target, key, value) {
+  !target.hasOwnProperty(key) && (target[key] = []);
+  target[key].push(value);
+}
+
+function setFPD(target, {ortb2, ortb2Imp}) {
+  ortb2 != null && deepSetValue(target, 'prebid.ortb2', mergeDeep({}, ortb2, target.prebid?.ortb2));
+  ortb2Imp != null && deepSetValue(target, 'prebid.ortb2Imp', mergeDeep({}, ortb2Imp, target.prebid?.ortb2Imp));
+  return target;
+}
+
+function getConfigId(bidderCode, seller) {
+  return `${bidderCode}::${seller}`;
+}
+
+function getComponentSellerConfigId(bidderCode) {
+  return moduleConfig.componentSeller.separateAuctions ? `igb::${bidderCode}` : 'igb';
+}
+
+export function addPaapiConfigHook(next, request, paapiConfig) {
+  if (getFledgeConfig(config.getCurrentBidder()).enabled) {
+    const {adUnitCode, auctionId, bidder} = request;
+
+    // eslint-disable-next-line no-inner-declarations
+    function storePendingData(store, data) {
+      const target = store(auctionId);
+      if (target != null) {
+        append(target, adUnitCode, data)
+      } else {
+        logWarn(MODULE, `Received PAAPI config for auction that has closed (auction '${auctionId}', adUnit '${adUnitCode}')`, data);
+      }
+    }
+
+    const {config, igb} = paapiConfig;
+    if (config) {
+      config.auctionSignals = setFPD(config.auctionSignals || {}, request);
+      const pbs = config.perBuyerSignals = config.perBuyerSignals ?? {};
+      (config.interestGroupBuyers || []).forEach(buyer => {
+        pbs[buyer] = setFPD(pbs[buyer] ?? {}, request);
+      })
+      storePendingData(pendingConfigsForAuction, {id: getConfigId(bidder, config.seller), config});
+    }
+    if (igb && checkOrigin(igb)) {
+      igb.pbs = setFPD(igb.pbs || {}, request);
+      storePendingData(pendingBuyersForAuction, [request, igb])
+    }
+  }
+  next(request, paapiConfig);
+}
+
+export const IGB_TO_CONFIG = {
+  cur: 'perBuyerCurrencies',
+  pbs: 'perBuyerSignals',
+  ps: 'perBuyerPrioritySignals',
+  maxbid: 'auctionSignals.prebid.perBuyerMaxbid',
+}
+
+function checkOrigin(igb) {
+  if (igb.origin) return true;
+  logWarn('PAAPI buyer does not specify origin and will be ignored', igb);
+}
+
+/**
+ * Convert a list of InterestGroupBuyer (igb) objects into a partial auction config.
+ * https://github.com/InteractiveAdvertisingBureau/openrtb/blob/main/extensions/community_extensions/Protected%20Audience%20Support.md
+ */
+export function mergeBuyers(igbs) {
+  const buyers = new Set();
+  return Object.assign(
+    igbs.reduce((config, igb) => {
+      if (checkOrigin(igb)) {
+        if (!buyers.has(igb.origin)) {
+          buyers.add(igb.origin);
+          Object.entries(IGB_TO_CONFIG).forEach(([igbField, configField]) => {
+            if (igb[igbField] != null) {
+              const entry = deepAccess(config, configField) || {}
+              entry[igb.origin] = igb[igbField];
+              deepSetValue(config, configField, entry);
+            }
+          });
+        } else {
+          logWarn(MODULE, `Duplicate buyer: ${igb.origin}. All but the first will be ignored`, igbs);
+        }
+      }
+      return config;
+    }, {}),
+    {
+      interestGroupBuyers: Array.from(buyers.keys())
+    }
+  );
+}
+
+/**
+ * Partition a list of InterestGroupBuyer (igb) object into sets that can each be merged into a single auction.
+ * If the same buyer (origin) appears more than once, it will be split across different partition unless the igb objects
+ * are identical.
+ */
+export function partitionBuyers(igbs) {
+  return igbs.reduce((partitions, igb) => {
+    if (checkOrigin(igb)) {
+      let partition = partitions.find(part => !part.hasOwnProperty(igb.origin) || deepEqual(part[igb.origin], igb));
+      if (!partition) {
+        partition = {};
+        partitions.push(partition);
+      }
+      partition[igb.origin] = igb;
+    }
+    return partitions;
+  }, []).map(part => Object.values(part));
+}
+
+export function partitionBuyersByBidder(igbRequests) {
+  const requests = {};
+  const igbs = {};
+  igbRequests.forEach(([request, igb]) => {
+    !requests.hasOwnProperty(request.bidder) && (requests[request.bidder] = request);
+    append(igbs, request.bidder, igb);
+  })
+  return Object.entries(igbs).map(([bidder, igbs]) => [requests[bidder], igbs])
+}
+
+/**
+ * Expand PAAPI api filters into a map from ad unit code to auctionId.
+ *
+ * @param auctionId when specified, the result will have this as the value for each entry.
+ * when not specified, each ad unit will map to the latest auction that involved that ad unit.
+ * @param adUnitCode when specified, the result will contain only one entry (for this ad unit) or be empty (if this ad
+ * unit was never involved in an auction).
+ * when not specified, the result will contain an entry for every ad unit that was involved in any auction.
+ * @return {{[adUnitCode: string]: string}}
+ */
+function expandFilters({auctionId, adUnitCode} = {}) {
+  let adUnitCodes = [];
+  if (adUnitCode == null) {
+    adUnitCodes = Object.keys(latestAuctionForAdUnit);
+  } else if (latestAuctionForAdUnit.hasOwnProperty(adUnitCode)) {
+    adUnitCodes = [adUnitCode];
+  }
+  return Object.fromEntries(
+    adUnitCodes.map(au => [au, auctionId ?? latestAuctionForAdUnit[au]])
+  );
+}
+
+/**
+ * Get PAAPI auction configuration.
+ *
+ * @param {Object} [filters] - Filters object
+ * @param {string} [filters.auctionId] optional auction filter; if omitted, the latest auction for each ad unit is used
+ * @param {string} [filters.adUnitCode] optional ad unit filter
+ * @param {boolean} [includeBlanks=false] if true, include null entries for ad units that match the given filters but do not have any available auction configs.
+ * @returns {Object} a map from ad unit code to auction config for the ad unit.
+ */
+export function getPAAPIConfig(filters = {}, includeBlanks = false) {
+  const output = {};
+  Object.entries(expandFilters(filters)).forEach(([au, auctionId]) => {
+    const auctionConfigs = configsForAuction(auctionId);
+    if (auctionConfigs?.hasOwnProperty(au)) {
+      // ad unit was involved in a PAAPI auction
+      const candidate = auctionConfigs[au];
+      if (candidate && !USED.has(candidate)) {
+        output[au] = candidate;
+        USED.add(candidate);
+      } else if (includeBlanks) {
+        output[au] = null;
+      }
+    } else if (auctionId == null && includeBlanks) {
+      // ad unit was involved in a non-PAAPI auction
+      output[au] = null;
+    }
+  });
+  return output;
+}
+
+getGlobal().getPAAPIConfig = (filters) => getPAAPIConfig(filters);
+
+function isFledgeSupported() {
+  return 'runAdAuction' in navigator && 'joinAdInterestGroup' in navigator;
+}
+
+function getFledgeConfig(bidder) {
+  const enabled = moduleConfig.enabled && (bidder == null || !moduleConfig.bidders?.length || moduleConfig.bidders?.includes(bidder));
+  return {
+    enabled,
+    ae: enabled ? moduleConfig.defaultForSlots : undefined
+  };
+}
+
+/**
+ * Given an array of size tuples, return the one that should be used for PAAPI.
+ */
+export const getPAAPISize = hook('sync', function (sizes) {
+  sizes = sizes
+    ?.filter(([w, h]) => !(w === h && w <= 5));
+
+  if (sizes?.length) {
+    return sizes
+      .reduce(maximum(keyCompare(([w, h]) => w * h)));
+  }
+}, 'getPAAPISize');
+
+function getRequestedSize(adUnit) {
+  return adUnit.ortb2Imp?.ext?.paapi?.requestedSize || (() => {
+    const size = getPAAPISize(sizesToSizeTuples(adUnit.mediaTypes?.banner?.sizes));
+    if (size) {
+      return {
+        width: size[0],
+        height: size[1]
+      };
+    }
+  })();
+}
+
+export function addPaapiData(next, adUnits, ...args) {
+  if (isFledgeSupported() && moduleConfig.enabled) {
+    adUnits.forEach(adUnit => {
+      // https://github.com/InteractiveAdvertisingBureau/openrtb/blob/main/extensions/community_extensions/Protected%20Audience%20Support.md
+      const igsAe = adUnit.ortb2Imp?.ext?.igs != null
+        ? adUnit.ortb2Imp.ext.igs.ae || 1
+        : null;
+      const extAe = adUnit.ortb2Imp?.ext?.ae;
+      if (igsAe !== extAe && igsAe != null && extAe != null) {
+        logWarn(MODULE, `Ad unit defines conflicting ortb2Imp.ext.ae and ortb2Imp.ext.igs, using the latter`, adUnit);
+      }
+      const ae = igsAe ?? extAe ?? moduleConfig.defaultForSlots;
+      if (ae) {
+        deepSetValue(adUnit, 'ortb2Imp.ext.ae', ae);
+        adUnit.ortb2Imp.ext.igs = Object.assign({
+          ae: ae,
+          biddable: 1
+        }, adUnit.ortb2Imp.ext.igs);
+        const requestedSize = getRequestedSize(adUnit);
+        if (requestedSize) {
+          deepSetValue(adUnit, 'ortb2Imp.ext.paapi.requestedSize', requestedSize);
+        }
+        adUnit.bids.forEach(bidReq => {
+          if (!getFledgeConfig(bidReq.bidder).enabled) {
+            deepSetValue(bidReq, 'ortb2Imp.ext.ae', 0);
+            bidReq.ortb2Imp.ext.igs = {ae: 0, biddable: 0};
+          }
+        })
+      }
+    })
+  }
+  next(adUnits, ...args);
+}
+
+export function markForFledge(next, bidderRequests) {
+  if (isFledgeSupported()) {
+    bidderRequests.forEach((bidderReq) => {
+      const {enabled} = getFledgeConfig(bidderReq.bidderCode);
+      Object.assign(bidderReq, {
+        paapi: {
+          enabled,
+          componentSeller: !!moduleConfig.componentSeller?.auctionConfig
+        }
+      });
+    });
+  }
+  next(bidderRequests);
+}
+
+export const ASYNC_SIGNALS = ['auctionSignals', 'sellerSignals', 'perBuyerSignals', 'perBuyerTimeouts', 'directFromSellerSignals'];
+
+const validatePartialConfig = (() => {
+  const REQUIRED_SYNC_SIGNALS = [
+    {
+      props: ['seller'],
+      validate: (val) => typeof val === 'string'
+    },
+    {
+      props: ['interestGroupBuyers'],
+      validate: (val) => Array.isArray(val) && val.length > 0
+    },
+    {
+      props: ['decisionLogicURL', 'decisionLogicUrl'],
+      validate: (val) => typeof val === 'string'
+    }
+  ];
+
+  return function (config) {
+    const invalid = REQUIRED_SYNC_SIGNALS.find(({props, validate}) => props.every(prop => !config.hasOwnProperty(prop) || !config[prop] || !validate(config[prop])));
+    if (invalid) {
+      logError(`Partial PAAPI config has missing or invalid property "${invalid.props[0]}"`, config)
+      return false;
+    }
+    return true;
+  }
+})()
+
+/**
+ * Adapters can provide a `spec.buildPAAPIConfigs(validBidRequests, bidderRequest)` to be included in PAAPI auctions
+ * that can be started in parallel with contextual auctions.
+ *
+ * If PAAPI is enabled, and an adapter provides `buildPAAPIConfigs`, it is invoked just before `buildRequests`,
+ * and takes the same arguments. It should return an array of PAAPI configuration objects with the same format
+ * as in `interpretResponse` (`{bidId, config?, igb?}`).
+ *
+ * Everything returned by `buildPAAPIConfigs` is treated in the same way as if it was returned by `interpretResponse` -
+ * except for signals that can be provided asynchronously (cfr. `ASYNC_SIGNALS`), which are replaced by promises.
+ * When the (contextual) auction ends, the promises are resolved.
+ *
+ * If during the auction the adapter's `interpretResponse` returned matching configurations (same `bidId`,
+ * and a `config` with the same `seller`, or an `igb` with the same `origin`), the promises resolve to their contents.
+ * Otherwise, they resolve to the values provided by `buildPAAPIConfigs`, or an empty object if no value was provided.
+ *
+ * Promisified auction configs are available from `getPAAPIConfig` immediately after `requestBids`.
+ * If the `paapi.parallel` config flag is set, PAAPI submodules are also triggered at the same time
+ * (instead of when the auction ends).
+ */
+export function parallelPaapiProcessing(next, spec, bids, bidderRequest, ...args) {
+  function makeDeferrals(defaults = {}) {
+    let promises = {};
+    const deferrals = Object.fromEntries(ASYNC_SIGNALS.map(signal => {
+      const def = defer({promiseFactory: (resolver) => new Promise(resolver)});
+      def.default = defaults.hasOwnProperty(signal) ? defaults[signal] : null;
+      promises[signal] = def.promise;
+      return [signal, def]
+    }))
+    return [deferrals, promises];
+  }
+
+  const {auctionId, paapi: {enabled, componentSeller} = {}} = bidderRequest;
+  const auctionConfigs = configsForAuction(auctionId);
+  bids.map(bid => bid.adUnitCode).forEach(adUnitCode => {
+    latestAuctionForAdUnit[adUnitCode] = auctionId;
+    if (!auctionConfigs.hasOwnProperty(adUnitCode)) {
+      auctionConfigs[adUnitCode] = null;
+    }
+  });
+
+  if (enabled && spec.buildPAAPIConfigs) {
+    const metrics = adapterMetrics(bidderRequest);
+    const tidGuard = guardTids(bidderRequest);
+    let partialConfigs;
+    metrics.measureTime('buildPAAPIConfigs', () => {
+      try {
+        partialConfigs = spec.buildPAAPIConfigs(bids.map(tidGuard.bidRequest), tidGuard.bidderRequest(bidderRequest))
+      } catch (e) {
+        logError(`Error invoking "buildPAAPIConfigs":`, e);
+      }
+    });
+    const requestsById = Object.fromEntries(bids.map(bid => [bid.bidId, bid]));
+    (partialConfigs ?? []).forEach(({bidId, config, igb}) => {
+      const bidRequest = requestsById.hasOwnProperty(bidId) && requestsById[bidId];
+      if (!bidRequest) {
+        logError(`Received partial PAAPI config for unknown bidId`, {bidId, config});
+      } else {
+        const adUnitCode = bidRequest.adUnitCode;
+        latestAuctionForAdUnit[adUnitCode] = auctionId;
+        const deferredConfigs = deferredConfigsForAuction(auctionId);
+
+        const getDeferredConfig = () => {
+          if (!deferredConfigs.hasOwnProperty(adUnitCode)) {
+            const [deferrals, promises] = makeDeferrals();
+            auctionConfigs[adUnitCode] = {
+              ...getStaticSignals(auctionManager.index.getAdUnit(bidRequest)),
+              ...promises,
+              componentAuctions: []
+            }
+            deferredConfigs[adUnitCode] = {
+              top: deferrals,
+              components: {},
+              auctionConfig: auctionConfigs[adUnitCode]
+            }
+          }
+          return deferredConfigs[adUnitCode];
+        }
+
+        if (config && validatePartialConfig(config)) {
+          const configId = getConfigId(bidRequest.bidder, config.seller);
+          const deferredConfig = getDeferredConfig();
+          if (deferredConfig.components.hasOwnProperty(configId)) {
+            logWarn(`Received multiple PAAPI configs for the same bidder and seller; config will be ignored`, {
+              config,
+              bidder: bidRequest.bidder
+            })
+          } else {
+            const [deferrals, promises] = makeDeferrals(config);
+            const auctionConfig = {
+              ...getStaticSignals(bidRequest),
+              ...config,
+              ...promises
+            }
+            deferredConfig.auctionConfig.componentAuctions.push(auctionConfig)
+            deferredConfig.components[configId] = {auctionConfig, deferrals};
+          }
+        }
+        if (componentSeller && igb && checkOrigin(igb)) {
+          const configId = getComponentSellerConfigId(spec.code);
+          const deferredConfig = getDeferredConfig();
+          const partialConfig = buyersToAuctionConfigs([[bidRequest, igb]])[0][1];
+          if (deferredConfig.components.hasOwnProperty(configId)) {
+            const {auctionConfig, deferrals} = deferredConfig.components[configId];
+            if (!auctionConfig.interestGroupBuyers.includes(igb.origin)) {
+              const immediate = {};
+              Object.entries(partialConfig).forEach(([key, value]) => {
+                if (deferrals.hasOwnProperty(key)) {
+                  mergeDeep(deferrals[key], {default: value});
+                } else {
+                  immediate[key] = value;
+                }
+              })
+              mergeDeep(auctionConfig, immediate);
+            } else {
+              logWarn(`Received the same PAAPI buyer multiple times for the same PAAPI auction. Consider setting paapi.componentSeller.separateAuctions: true`, igb)
+            }
+          } else {
+            const [deferrals, promises] = makeDeferrals(partialConfig);
+            const auctionConfig = {
+              ...partialConfig,
+              ...getStaticSignals(bidRequest),
+              ...promises,
+            }
+            deferredConfig.components[configId] = {auctionConfig, deferrals};
+            deferredConfig.auctionConfig.componentAuctions.push(auctionConfig);
+          }
+        }
+      }
+    })
+  }
+  return next.call(this, spec, bids, bidderRequest, ...args);
+}
+
+export function onAuctionInit({auctionId}) {
+  if (moduleConfig.parallel) {
+    auctionManager.index.getAuction({auctionId}).requestsDone.then(() => {
+      if (Object.keys(deferredConfigsForAuction(auctionId)).length > 0) {
+        submodules.forEach(submod => submod.onAuctionConfig?.(auctionId, configsForAuction(auctionId)));
+      }
+    })
+  }
+}
+
+export function setImpExtAe(imp, bidRequest, context) {
+  if (!context.bidderRequest.paapi?.enabled) {
+    delete imp.ext?.ae;
+    delete imp.ext?.igs;
+  }
+}
+
+registerOrtbProcessor({type: IMP, name: 'impExtAe', fn: setImpExtAe});
+
+export function parseExtIgi(response, ortbResponse, context) {
+  paapiResponseParser(
+    (ortbResponse.ext?.igi || []).flatMap(igi => {
+      return (igi?.igs || []).map(igs => {
+        if (igs.impid !== igi.impid && igs.impid != null && igi.impid != null) {
+          logWarn(MODULE, 'ORTB response ext.igi.igs.impid conflicts with parent\'s impid', igi);
+        }
+        return {
+          config: igs.config,
+          impid: igs.impid ?? igi.impid
+        }
+      }).concat((igi?.igb || []).map(igb => ({
+        igb,
+        impid: igi.impid
+      })))
+    }),
+    response,
+    context
+  )
+}
+
+function paapiResponseParser(configs, response, context) {
+  configs.forEach((config) => {
+    const impCtx = context.impContext[config.impid];
+    if (!impCtx?.imp?.ext?.ae) {
+      logWarn(MODULE, 'Received auction configuration for an impression that was not in the request or did not ask for it', config, impCtx?.imp);
+    } else {
+      impCtx.paapiConfigs = impCtx.paapiConfigs || [];
+      impCtx.paapiConfigs.push(config);
+    }
+  });
+}
+
+// to make it easier to share code between the PBS adapter and adapters whose backend is PBS, break up
+// fledge response processing in two steps: first aggregate all the auction configs by their imp...
+
+export function parseExtPrebidFledge(response, ortbResponse, context) {
+  paapiResponseParser(
+    (ortbResponse.ext?.prebid?.fledge?.auctionconfigs || []),
+    response,
+    context
+  )
+}
+
+registerOrtbProcessor({type: RESPONSE, name: 'extPrebidFledge', fn: parseExtPrebidFledge, dialects: [PBS]});
+registerOrtbProcessor({type: RESPONSE, name: 'extIgiIgs', fn: parseExtIgi});
+
+// ...then, make them available in the adapter's response. This is the client side version, for which the
+// interpretResponse api is {fledgeAuctionConfigs: [{bidId, config}]}
+
+export function setResponsePaapiConfigs(response, ortbResponse, context) {
+  const configs = Object.values(context.impContext)
+    .flatMap((impCtx) => (impCtx.paapiConfigs || []).map(cfg => ({
+      bidId: impCtx.bidRequest.bidId,
+      ...cfg
+    })));
+  if (configs.length > 0) {
+    response.paapi = configs;
+  }
+}
+
+registerOrtbProcessor({
+  type: RESPONSE,
+  name: 'paapiConfigs',
+  priority: -1,
+  fn: setResponsePaapiConfigs,
+});
diff --git a/modules/paapiForGpt.js b/modules/paapiForGpt.js
new file mode 100644
index 00000000000..61133014e28
--- /dev/null
+++ b/modules/paapiForGpt.js
@@ -0,0 +1,165 @@
+/**
+ * GPT-specific slot configuration logic for PAAPI.
+ */
+import {getHook, submodule} from '../src/hook.js';
+import {deepAccess, logInfo, logWarn, sizeTupleToSizeString} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+
+import {keyCompare} from '../src/utils/reducers.js';
+import {getGPTSlotsForAdUnits, targeting} from '../src/targeting.js';
+
+const MODULE = 'paapiForGpt';
+
+let getPAAPIConfig;
+
+config.getConfig('paapi', (cfg) => {
+  if (deepAccess(cfg, 'paapi.gpt.configWithTargeting', true)) {
+    logInfo(MODULE, 'enabling PAAPI configuration with setTargetingForGPTAsync')
+    targeting.setTargetingForGPT.before(setTargetingHook);
+  } else {
+    targeting.setTargetingForGPT.getHooks({hook: setTargetingHook}).remove();
+  }
+});
+
+export function setTargetingHookFactory(setPaapiConfig = getGlobal().setPAAPIConfigForGPT) {
+  return function(next, adUnit, customSlotMatching) {
+    const adUnitCodes = Array.isArray(adUnit) ? adUnit : [adUnit]
+    adUnitCodes
+      .map(adUnitCode => adUnitCode == null ? undefined : {adUnitCode})
+      .forEach(filters => setPaapiConfig(filters, customSlotMatching))
+    next(adUnit, customSlotMatching);
+  }
+}
+
+export function slotConfigurator() {
+  const PREVIOUSLY_SET = {};
+  return function setComponentAuction(adUnitCode, gptSlots, auctionConfigs, reset = true) {
+    if (gptSlots.length > 0) {
+      let previous = PREVIOUSLY_SET[adUnitCode] ?? {};
+      let configsBySeller = Object.fromEntries(auctionConfigs.map(cfg => [cfg.seller, cfg]));
+      const sellers = Object.keys(configsBySeller);
+      if (reset) {
+        configsBySeller = Object.assign(previous, configsBySeller);
+        previous = Object.fromEntries(sellers.map(seller => [seller, null]));
+      } else {
+        sellers.forEach(seller => {
+          previous[seller] = null;
+        });
+      }
+      Object.keys(previous).length ? PREVIOUSLY_SET[adUnitCode] = previous : delete PREVIOUSLY_SET[adUnitCode];
+      const componentAuction = Object.entries(configsBySeller)
+        .map(([configKey, auctionConfig]) => ({configKey, auctionConfig}));
+      if (componentAuction.length > 0) {
+        gptSlots.forEach(gptSlot => {
+          gptSlot.setConfig({componentAuction});
+          logInfo(MODULE, `register component auction configs for: ${adUnitCode}: ${gptSlot.getAdUnitPath()}`, auctionConfigs);
+        });
+      }
+    } else if (auctionConfigs.length > 0) {
+      logWarn(MODULE, `unable to register component auction config for ${adUnitCode}`, auctionConfigs);
+    }
+  };
+}
+
+const setComponentAuction = slotConfigurator();
+
+export const getPAAPISizeHook = (() => {
+  /*
+    https://github.com/google/ads-privacy/tree/master/proposals/fledge-multiple-seller-testing#faq
+    https://support.google.com/admanager/answer/1100453?hl=en
+
+    Ignore any placeholder sizes, where placeholder is defined as a square creative with a side of <= 5 pixels
+    Look if there are any sizes that are part of the set of supported ad sizes defined here. If there are, choose the largest supported size by area (width * height)
+        For clarity, the set of supported ad sizes includes all of the ad sizes listed under “Top-performing ad sizes”, “Other supported ad sizes”, and “Regional ad sizes”.
+    If not, choose the largest remaining size (i.e. that isn’t in the list of supported ad sizes) by area (width * height)
+   */
+  const SUPPORTED_SIZES = [
+    [728, 90],
+    [336, 280],
+    [300, 250],
+    [300, 50],
+    [160, 600],
+    [1024, 768],
+    [970, 250],
+    [970, 90],
+    [768, 1024],
+    [480, 320],
+    [468, 60],
+    [320, 480],
+    [320, 100],
+    [320, 50],
+    [300, 600],
+    [300, 100],
+    [250, 250],
+    [234, 60],
+    [200, 200],
+    [180, 150],
+    [125, 125],
+    [120, 600],
+    [120, 240],
+    [120, 60],
+    [88, 31],
+    [980, 120],
+    [980, 90],
+    [950, 90],
+    [930, 180],
+    [750, 300],
+    [750, 200],
+    [750, 100],
+    [580, 400],
+    [250, 360],
+    [240, 400],
+  ].sort(keyCompare(([w, h]) => -(w * h)))
+    .map(size => [size, sizeTupleToSizeString(size)]);
+
+  return function(next, sizes) {
+    if (sizes?.length) {
+      const sizeStrings = new Set(sizes.map(sizeTupleToSizeString));
+      const preferredSize = SUPPORTED_SIZES.find(([_, sizeStr]) => sizeStrings.has(sizeStr));
+      if (preferredSize) {
+        next.bail(preferredSize[0]);
+        return;
+      }
+    }
+    next(sizes);
+  }
+})();
+
+export function setPAAPIConfigFactory(
+  getConfig = (filters) => getPAAPIConfig(filters, true),
+  setGptConfig = setComponentAuction,
+  getSlots = getGPTSlotsForAdUnits) {
+  /**
+   * Configure GPT slots with PAAPI auction configs.
+   * `filters` are the same filters accepted by `pbjs.getPAAPIConfig`;
+   */
+  return function(filters = {}, customSlotMatching) {
+    let some = false;
+    const cfg = getConfig(filters) || {};
+    const auToSlots = getSlots(Object.keys(cfg), customSlotMatching);
+
+    Object.entries(cfg).forEach(([au, config]) => {
+      if (config != null) {
+        some = true;
+      }
+      setGptConfig(au, auToSlots[au], config?.componentAuctions || [], true);
+    })
+    if (!some) {
+      logInfo(`${MODULE}: No component auctions available to set`);
+    }
+  }
+}
+/**
+ * Configure GPT slots with PAAPI component auctions. Accepts the same filter arguments as `pbjs.getPAAPIConfig`.
+ */
+getGlobal().setPAAPIConfigForGPT = setPAAPIConfigFactory();
+const setTargetingHook = setTargetingHookFactory();
+
+submodule('paapi', {
+  name: 'gpt',
+  init(params) {
+    getPAAPIConfig = params.getPAAPIConfig;
+    getHook('getPAAPISize').before(getPAAPISizeHook);
+  }
+});
diff --git a/modules/fledgeForGpt.md b/modules/paapiForGpt.md
similarity index 55%
rename from modules/fledgeForGpt.md
rename to modules/paapiForGpt.md
index 28f44da6459..31cde2e268d 100644
--- a/modules/fledgeForGpt.md
+++ b/modules/paapiForGpt.md
@@ -1,22 +1,22 @@
 # Overview
-This module allows Prebid.js to support FLEDGE by integrating it with GPT's [experimental FLEDGE
+This module allows Prebid.js to support PAAPI by integrating it with GPT's [experimental PAAPI
 support](https://github.com/google/ads-privacy/tree/master/proposals/fledge-multiple-seller-testing).
 
-To learn more about FLEDGE in general, go [here](https://github.com/WICG/turtledove/blob/main/FLEDGE.md).
+To learn more about PAAPI in general, go [here](https://github.com/WICG/turtledove/blob/main/PAAPI.md).
 
-This document covers the steps necessary for publishers to enable FLEDGE on their inventory. It also describes
-the changes Bid Adapters need to implement in order to support FLEDGE.
+This document covers the steps necessary for publishers to enable PAAPI on their inventory. It also describes
+the changes Bid Adapters need to implement in order to support PAAPI.
 
 ## Publisher Integration
-Publishers wishing to enable FLEDGE support must do two things. First, they must compile Prebid.js with support for this module.
-This is accomplished by adding the `fledgeForGpt` module to the list of modules they are already using:
+Publishers wishing to enable PAAPI support must do two things. First, they must compile Prebid.js with support for this module.
+This is accomplished by adding the `paapiForGpt` module to the list of modules they are already using:
 
 ```
-gulp build --modules=fledgeForGpt,...
+gulp build --modules=paapiForGpt,...
 ```
 
-Second, they must enable FLEDGE in their Prebid.js configuration. 
-This is done through module level configuration, but to provide a high degree of flexiblity for testing, FLEDGE settings also exist at the bidder level and slot level.
+Second, they must enable PAAPI in their Prebid.js configuration. 
+This is done through module level configuration, but to provide a high degree of flexiblity for testing, PAAPI settings also exist the slot level.
 
 ### Module Configuration
 This module exposes the following settings:
@@ -27,14 +27,13 @@ This module exposes the following settings:
 |bidders | Array[String] |Optional list of bidders |Defaults to all bidders |
 |defaultForSlots | Number |Default value for `imp.ext.ae` in requests for specified bidders |Should be 1 |
 
-As noted above, FLEDGE support is disabled by default. To enable it, set the `enabled` value to `true` for this module and configure `defaultForSlots` to be `1` (meaning _Client-side auction_).
-using the `setConfig` method of Prebid.js. Optionally, a list of 
-bidders to apply these settings to may be provided:
+As noted above, PAAPI support is disabled by default. To enable it, set the `enabled` value to `true` for this module and configure `defaultForSlots` to be `1` (meaning _Client-side auction_).
+using the `setConfig` method of Prebid.js. Optionally, a list of bidders to apply these settings to may be provided:
 
 ```js
 pbjs.que.push(function() {
   pbjs.setConfig({
-    fledgeForGpt: {
+    paapi: {
       enabled: true,
       bidders: ['openx', 'rtbhouse'],
       defaultForSlots: 1
@@ -43,35 +42,14 @@ pbjs.que.push(function() {
 });
 ```
 
-### Bidder Configuration
-This module adds the following setting for bidders:
-
-|Name |Type |Description |Notes |
-| :------------ | :------------ | :------------ |:------------ |
-| fledgeEnabled | Boolean | Enable/disable a bidder to participate in FLEDGE | Defaults to `false` |
-|defaultForSlots | Number |Default value for `imp.ext.ae` in requests for specified bidders |Should be 1|
-
-Individual bidders may be further included or excluded here using the `setBidderConfig` method
-of Prebid.js:
-
-```js
-pbjs.setBidderConfig({
-    bidders: ["openx"],
-    config: {
-        fledgeEnabled: true,
-        defaultForSlots: 1
-    }
-});
-```
-
 ### AdUnit Configuration
-All adunits can be opted-in to FLEDGE in the global config via the `defaultForSlots` parameter.
+All adunits can be opted-in to PAAPI in the global config via the `defaultForSlots` parameter.
 If needed, adunits can be configured individually by setting an attribute of the `ortb2Imp` object for that
 adunit. This attribute will take precedence over `defaultForSlots` setting.
 
 |Name |Type |Description |Notes |
 | :------------ | :------------ | :------------ |:------------ |
-| ortb2Imp.ext.ae | Integer | Auction Environment: 1 indicates FLEDGE eligible, 0 indicates it is not | Absence indicates this is not FLEDGE eligible |
+| ortb2Imp.ext.ae | Integer | Auction Environment: 1 indicates PAAPI eligible, 0 indicates it is not | Absence indicates this is not PAAPI eligible |
 
 The `ae` field stands for Auction Environment and was chosen to be consistent with the field that GAM passes to bidders
 in their Open Bidding and Exchange Bidding APIs. More details on that can be found
@@ -91,31 +69,31 @@ pbjs.addAdUnits({
 ```
 
 ## Bid Adapter Integration
-Chrome has enabled a two-tier auction in FLEDGE. This allows multiple sellers (frequently SSPs) to act on behalf of the publisher with
+Chrome has enabled a two-tier auction in PAAPI. This allows multiple sellers (frequently SSPs) to act on behalf of the publisher with
 a single entity serving as the final decision maker. In their [current approach](https://github.com/google/ads-privacy/tree/master/proposals/fledge-multiple-seller-testing),
 GPT has opted to run the final auction layer while allowing other SSPs/sellers to participate as
-[Component Auctions](https://github.com/WICG/turtledove/blob/main/FLEDGE.md#21-initiating-an-on-device-auction) which feed their
-bids to the final layer. To learn more about Component Auctions, go [here](https://github.com/WICG/turtledove/blob/main/FLEDGE.md#24-scoring-bids-in-component-auctions).
+[Component Auctions](https://github.com/WICG/turtledove/blob/main/PAAPI.md#21-initiating-an-on-device-auction) which feed their
+bids to the final layer. To learn more about Component Auctions, go [here](https://github.com/WICG/turtledove/blob/main/PAAPI.md#24-scoring-bids-in-component-auctions).
 
-The FLEDGE auction, including Component Auctions, are configured via an `AuctionConfig` object that defines the parameters of the auction for a given
-seller. This module enables FLEDGE support by allowing bid adaptors to return `AuctionConfig` objects in addition to bids. If a bid adaptor returns an
+The PAAPI auction, including Component Auctions, are configured via an `AuctionConfig` object that defines the parameters of the auction for a given
+seller. This module enables PAAPI support by allowing bid adaptors to return `AuctionConfig` objects in addition to bids. If a bid adaptor returns an
 `AuctionConfig` object, Prebid.js will register it with the appropriate GPT ad slot so the bidder can participate as a Component Auction in the overall
-FLEDGE auction for that slot. More details on the GPT API can be found [here](https://developers.google.com/publisher-tag/reference#googletag.config.componentauctionconfig).
+PAAPI auction for that slot. More details on the GPT API can be found [here](https://developers.google.com/publisher-tag/reference#googletag.config.componentauctionconfig).
 
-Modifying a bid adapter to support FLEDGE is a straightforward process and consists of the following steps:
-1. Detecting when a bid request is FLEDGE eligible
+Modifying a bid adapter to support PAAPI is a straightforward process and consists of the following steps:
+1. Detecting when a bid request is PAAPI eligible
 2. Responding with AuctionConfig
 
-FLEDGE eligibility is made available to bid adapters through the `bidderRequest.fledgeEnabled` field.
+PAAPI eligibility is made available to bid adapters through the `bidderRequest.paapi.enabled` field.
 The [`bidderRequest`](https://docs.prebid.org/dev-docs/bidder-adaptor.html#bidderrequest-parameters) object is passed to
 the [`buildRequests`](https://docs.prebid.org/dev-docs/bidder-adaptor.html#building-the-request) method of an adapter. Bid adapters
-who wish to participate should read this flag and pass it to their server. FLEDGE eligibility depends on a number of parameters:
+who wish to participate should read this flag and pass it to their server. PAAPI eligibility depends on a number of parameters:
 
 1. Chrome enablement
 2. Publisher participatipon in the [Origin Trial](https://developer.chrome.com/docs/privacy-sandbox/unified-origin-trial/#configure)
 3. Publisher Prebid.js configuration (detailed above)
 
-When a bid request is FLEDGE enabled, a bid adapter can return a tuple consisting of bids and AuctionConfig objects rather than just a list of bids:
+When a bid request is PAAPI enabled, a bid adapter can return a tuple consisting of bids and AuctionConfig objects rather than just a list of bids:
 
 ```js
 function interpretResponse(resp, req) {
@@ -138,8 +116,8 @@ An AuctionConfig must be associated with an adunit and auction, and this is acco
 `validBidRequests` array passed to the `buildRequests` function - see [here](https://docs.prebid.org/dev-docs/bidder-adaptor.html#ad-unit-params-in-the-validbidrequests-array)
 for more details. This means that the AuctionConfig objects returned from `interpretResponse` must contain a `bidId` field whose value corresponds to
 the request it should be associated with. This may raise the question: why isn't the AuctionConfig object returned as part of the bid? The
-answer is that it's possible to participate in the FLEDGE auction without returning a contextual bid.
+answer is that it's possible to participate in the PAAPI auction without returning a contextual bid.
 
 An example of this can be seen in the OpenX OpenRTB bid adapter [here](https://github.com/prebid/Prebid.js/blob/master/modules/openxOrtbBidAdapter.js#L327).
 
-Other than the addition of the `bidId` field, the AuctionConfig object should adhere to the requirements set forth in FLEDGE. The details of creating an   AuctionConfig object are beyond the scope of this document.
+Other than the addition of the `bidId` field, the AuctionConfig object should adhere to the requirements set forth in PAAPI. The details of creating an   AuctionConfig object are beyond the scope of this document.
diff --git a/modules/pairIdSystem.js b/modules/pairIdSystem.js
index 489b97d02e3..778857bae1c 100644
--- a/modules/pairIdSystem.js
+++ b/modules/pairIdSystem.js
@@ -10,6 +10,10 @@ import {getStorageManager} from '../src/storageManager.js'
 import { logInfo } from '../src/utils.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ */
+
 const MODULE_NAME = 'pairId';
 const PAIR_ID_KEY = 'pairId';
 const DEFAULT_LIVERAMP_PAIR_ID_KEY = '_lr_pairId';
@@ -27,29 +31,31 @@ function pairIdFromCookie(key) {
 /** @type {Submodule} */
 export const pairIdSubmodule = {
   /**
-  * used to link submodule with config
-  * @type {string}
-  */
+   * used to link submodule with config
+   * @type {string}
+   */
   name: MODULE_NAME,
   /**
-  * used to specify vendor id
-  * @type {number}
-  */
+   * used to specify vendor id
+   * @type {number}
+   */
   gvlid: 755,
   /**
-  * decode the stored id value for passing to bid requests
-  * @function
-  * @param { string | undefined } value
-  * @returns {{pairId:string} | undefined }
-  */
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param { string | undefined } value
+   * @returns {{pairId:string} | undefined }
+   */
   decode(value) {
     return value && Array.isArray(value) ? {'pairId': value} : undefined
   },
   /**
-  * performs action to obtain id and return a value in the callback's response argument
-  * @function
-  * @returns {id: string | undefined }
-  */
+   * Performs action to obtain ID and return a value in the callback's response argument.
+   * @function getId
+   * @param {Object} config - The configuration object.
+   * @param {Object} config.params - The parameters from the configuration.
+   * @returns {{id: string[] | undefined}} The obtained IDs or undefined if no IDs are found.
+   */
   getId(config) {
     const pairIdsString = pairIdFromLocalStorage(PAIR_ID_KEY) || pairIdFromCookie(PAIR_ID_KEY)
     let ids = []
@@ -63,13 +69,28 @@ export const pairIdSubmodule = {
 
     const configParams = (config && config.params) || {};
     if (configParams && configParams.liveramp) {
-      let LRStorageLocation = configParams.liveramp.storageKey || DEFAULT_LIVERAMP_PAIR_ID_KEY
-      const liverampValue = pairIdFromLocalStorage(LRStorageLocation) || pairIdFromCookie(LRStorageLocation)
-      try {
-        const obj = JSON.parse(atob(liverampValue));
-        ids = ids.concat(obj.envelope);
-      } catch (error) {
-        logInfo(error)
+      let LRStorageLocation = configParams.liveramp.storageKey || DEFAULT_LIVERAMP_PAIR_ID_KEY;
+      const liverampValue = pairIdFromLocalStorage(LRStorageLocation) || pairIdFromCookie(LRStorageLocation);
+
+      if (liverampValue) {
+        try {
+          const parsedValue = atob(liverampValue);
+          if (parsedValue) {
+            const obj = JSON.parse(parsedValue);
+
+            if (obj && typeof obj === 'object' && obj.envelope) {
+              ids = ids.concat(obj.envelope);
+            } else {
+              logInfo('Pairid: Parsed object is not valid or does not contain envelope');
+            }
+          } else {
+            logInfo('Pairid: Decoded value is empty');
+          }
+        } catch (error) {
+          logInfo('Pairid: Error parsing JSON: ', error);
+        }
+      } else {
+        logInfo('Pairid: liverampValue for pairId from storage is empty or null');
       }
     }
 
diff --git a/modules/pangleBidAdapter.js b/modules/pangleBidAdapter.js
index 408a8b24c29..c22a44687a2 100644
--- a/modules/pangleBidAdapter.js
+++ b/modules/pangleBidAdapter.js
@@ -1,19 +1,27 @@
-// ver V1.0.3
-import { BANNER } from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { ortbConverter } from '../libraries/ortbConverter/converter.js'
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { deepSetValue, generateUUID, timestamp } from '../src/utils.js';
+import { deepSetValue, generateUUID, timestamp, deepAccess } from '../src/utils.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
 
+import { Renderer } from '../src/Renderer.js';
+
 const BIDDER_CODE = 'pangle';
 const ENDPOINT = 'https://pangle.pangleglobal.com/api/ad/union/web_js/common/get_ads';
 
+const OUTSTREAM_RENDERER_URL = 'https://sf16-static.i18n-pglstatp.com/obj/ad-pattern-sg/pangle/web/ads/video.js';
+
 const DEFAULT_BID_TTL = 30;
 const DEFAULT_CURRENCY = 'USD';
 const DEFAULT_NET_REVENUE = true;
 const PANGLE_COOKIE = '_pangle_id';
 const COOKIE_EXP = 86400 * 1000 * 365 * 1; // 1 year
+const MEDIA_TYPES = {
+  Banner: 1,
+  Video: 2
+};
+
 export const storage = getStorageManager({ moduleType: MODULE_TYPE_RTD, moduleName: BIDDER_CODE })
 
 export function isValidUuid(uuid) {
@@ -25,9 +33,7 @@ export function isValidUuid(uuid) {
 function getPangleCookieId() {
   let sid = storage.cookiesAreEnabled() && storage.getCookie(PANGLE_COOKIE);
 
-  if (
-    !sid || !isValidUuid(sid)
-  ) {
+  if (!sid || !isValidUuid(sid)) {
     sid = generateUUID();
     setPangleCookieId(sid);
   }
@@ -37,30 +43,107 @@ function getPangleCookieId() {
 
 function setPangleCookieId(sid) {
   if (storage.cookiesAreEnabled()) {
-    const expires = (new Date(timestamp() + COOKIE_EXP)).toGMTString();
+    const expires = new Date(timestamp() + COOKIE_EXP).toGMTString();
 
     storage.setCookie(PANGLE_COOKIE, sid, expires);
   }
 }
 
+function createRequest(bidRequests, bidderRequest, mediaType) {
+  const data = converter.toORTB({
+    bidRequests,
+    bidderRequest,
+    context: { mediaType },
+  });
+  const devicetype = spec.getDeviceType(navigator.userAgent);
+  deepSetValue(data, 'device.devicetype', devicetype);
+  if (bidderRequest.userId && typeof bidderRequest.userId === 'object') {
+    const pangleId = getPangleCookieId();
+    // add pangle cookie
+    const _eids = data.user?.ext?.eids ?? [];
+    deepSetValue(data, 'user.ext.eids', [
+      ..._eids,
+      {
+        source: document.location.host,
+        uids: [
+          {
+            id: pangleId,
+            atype: 1,
+          },
+        ],
+      },
+    ]);
+  }
+  bidRequests.forEach((item, idx) => {
+    deepSetValue(data.imp[idx], 'ext.networkids', item.params);
+    deepSetValue(data.imp[idx], 'banner.api', [5]);
+    deepSetValue(data, 'test', item.params.test ?? 0)
+  });
+  return {
+    method: 'POST',
+    url: ENDPOINT,
+    data,
+    options: { contentType: 'application/json', withCredentials: true }
+  }
+}
+
+function isVideoBid(bid) {
+  return !!deepAccess(bid, 'mediaTypes.video');
+}
+
+function isBannerBid(bid) {
+  return !!deepAccess(bid, 'mediaTypes.banner');
+}
+
+function renderOutstream(bid) {
+  bid.renderer.push(() => {
+    window.outstreamPlayer({ bid, codeId: bid.adUnitCode });
+  });
+}
+
 const converter = ortbConverter({
   context: {
     netRevenue: DEFAULT_NET_REVENUE,
     ttl: DEFAULT_BID_TTL,
     currency: DEFAULT_CURRENCY,
-    mediaType: BANNER
-  }
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    const { bidRequest } = context;
+    let bidResponse;
+    if (bid.mtype === MEDIA_TYPES.Video) {
+      context.mediaType = VIDEO;
+      bidResponse = buildBidResponse(bid, context);
+      if (bidRequest.mediaTypes.video?.context === 'outstream') {
+        const renderer = Renderer.install({id: bid.bidId, url: OUTSTREAM_RENDERER_URL, adUnitCode: bid.adUnitCode});
+        renderer.setRender(renderOutstream);
+        bidResponse.renderer = renderer;
+      }
+    }
+    if (bid.mtype === MEDIA_TYPES.Banner) {
+      context.mediaType = BANNER;
+      bidResponse = buildBidResponse(bid, context);
+    }
+    return bidResponse;
+  },
 });
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
 
   getDeviceType: function (ua) {
-    if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(ua.toLowerCase()))) {
+    if (
+      /ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(
+        ua.toLowerCase()
+      )
+    ) {
       return 5; // 'tablet'
     }
-    if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(ua.toLowerCase()))) {
+    if (
+      /iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(
+        ua.toLowerCase()
+      )
+    ) {
       return 4; // 'mobile'
     }
     return 2; // 'desktop'
@@ -71,38 +154,23 @@ export const spec = {
   },
 
   buildRequests(bidRequests, bidderRequest) {
-    const data = converter.toORTB({ bidRequests, bidderRequest })
-    const devicetype = spec.getDeviceType(navigator.userAgent);
-    deepSetValue(data, 'device.devicetype', devicetype);
-    if (bidderRequest.userId && typeof bidderRequest.userId === 'object') {
-      const pangleId = getPangleCookieId();
-      // add pangle cookie
-      const _eids = data.user?.ext?.eids ?? []
-      deepSetValue(data, 'user.ext.eids', [..._eids, {
-        source: document.location.host,
-        uids: [
-          {
-            id: pangleId,
-            atype: 1
-          }
-        ]
-      }]);
-    }
-    bidRequests.forEach((item, idx) => {
-      deepSetValue(data.imp[idx], 'ext.networkids', item.params);
-      deepSetValue(data.imp[idx], 'banner.api', [5]);
+    const reqArr = [];
+    const videoBids = bidRequests.filter((bid) => isVideoBid(bid));
+    const bannerBids = bidRequests.filter((bid) => isBannerBid(bid));
+    bannerBids.forEach((bid) => {
+      reqArr.push(createRequest([bid], bidderRequest, BANNER));
+    })
+    videoBids.forEach((bid) => {
+      reqArr.push(createRequest([bid], bidderRequest, VIDEO));
     });
-
-    return [{
-      method: 'POST',
-      url: ENDPOINT,
-      data,
-      options: { contentType: 'application/json', withCredentials: true }
-    }]
+    return reqArr;
   },
 
   interpretResponse(response, request) {
-    const bids = converter.fromORTB({ response: response.body, request: request.data }).bids;
+    const bids = converter.fromORTB({
+      response: response.body,
+      request: request.data,
+    }).bids;
     return bids;
   },
 };
diff --git a/modules/parrableIdSystem.js b/modules/parrableIdSystem.js
deleted file mode 100644
index 3e3488f72f3..00000000000
--- a/modules/parrableIdSystem.js
+++ /dev/null
@@ -1,410 +0,0 @@
-/**
- * This module adds Parrable to the User ID module
- * The {@link module:modules/userId} module is required
- * @module modules/parrableIdSystem
- * @requires module:modules/userId
- */
-
-// ci trigger: 1
-
-import {
-  contains,
-  deepClone,
-  inIframe,
-  isEmpty,
-  isPlainObject,
-  logError,
-  logWarn,
-  pick,
-  timestamp
-} from '../src/utils.js';
-import {find} from '../src/polyfill.js';
-import {ajax} from '../src/ajax.js';
-import {submodule} from '../src/hook.js';
-import {getRefererInfo} from '../src/refererDetection.js';
-import {uspDataHandler} from '../src/adapterManager.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {MODULE_TYPE_UID} from '../src/activities/modules.js';
-
-const PARRABLE_URL = 'https://h.parrable.com/prebid';
-const PARRABLE_COOKIE_NAME = '_parrable_id';
-const PARRABLE_GVLID = 928;
-const LEGACY_ID_COOKIE_NAME = '_parrable_eid';
-const LEGACY_OPTOUT_COOKIE_NAME = '_parrable_optout';
-const ONE_YEAR_MS = 364 * 24 * 60 * 60 * 1000;
-const EXPIRE_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:00 GMT';
-const MODULE_NAME = 'parrableId';
-
-const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
-
-function getExpirationDate() {
-  const oneYearFromNow = new Date(timestamp() + ONE_YEAR_MS);
-  return oneYearFromNow.toGMTString();
-}
-
-function deserializeParrableId(parrableIdStr) {
-  const parrableId = {};
-  const values = parrableIdStr.split(',');
-
-  values.forEach(function(value) {
-    const pair = value.split(':');
-    if (pair[0] === 'ccpaOptout' || pair[0] === 'ibaOptout') { // unpack a value of 0 or 1 as boolean
-      parrableId[pair[0]] = Boolean(+pair[1]);
-    } else if (!isNaN(pair[1])) { // convert to number if is a number
-      parrableId[pair[0]] = +pair[1]
-    } else {
-      parrableId[pair[0]] = pair[1]
-    }
-  });
-
-  return parrableId;
-}
-
-function serializeParrableId(parrableIdAndParams) {
-  let components = [];
-
-  if (parrableIdAndParams.eid) {
-    components.push('eid:' + parrableIdAndParams.eid);
-  }
-  if (parrableIdAndParams.ibaOptout) {
-    components.push('ibaOptout:1');
-  }
-  if (parrableIdAndParams.ccpaOptout) {
-    components.push('ccpaOptout:1');
-  }
-  if (parrableIdAndParams.tpcSupport !== undefined) {
-    const tpcSupportComponent = parrableIdAndParams.tpcSupport === true ? 'tpc:1' : 'tpc:0';
-    const tpcUntil = `tpcUntil:${parrableIdAndParams.tpcUntil}`;
-    components.push(tpcSupportComponent);
-    components.push(tpcUntil);
-  }
-  if (parrableIdAndParams.filteredUntil) {
-    components.push(`filteredUntil:${parrableIdAndParams.filteredUntil}`);
-    components.push(`filterHits:${parrableIdAndParams.filterHits}`);
-  }
-
-  return components.join(',');
-}
-
-function isValidConfig(configParams) {
-  if (!configParams) {
-    logError('User ID - parrableId submodule requires configParams');
-    return false;
-  }
-  if (!configParams.partners && !configParams.partner) {
-    logError('User ID - parrableId submodule requires partner list');
-    return false;
-  }
-  if (configParams.storage) {
-    logWarn('User ID - parrableId submodule does not require a storage config');
-  }
-  return true;
-}
-
-function encodeBase64UrlSafe(base64) {
-  const ENC = {
-    '+': '-',
-    '/': '_',
-    '=': '.'
-  };
-  return base64.replace(/[+/=]/g, (m) => ENC[m]);
-}
-
-function readCookie() {
-  const parrableIdStr = storage.getCookie(PARRABLE_COOKIE_NAME);
-  if (parrableIdStr) {
-    const parsedCookie = deserializeParrableId(decodeURIComponent(parrableIdStr));
-    const { tpc, tpcUntil, filteredUntil, filterHits, ...parrableId } = parsedCookie;
-    let { eid, ibaOptout, ccpaOptout, ...params } = parsedCookie;
-
-    if ((Date.now() / 1000) >= tpcUntil) {
-      params.tpc = undefined;
-    }
-
-    if ((Date.now() / 1000) < filteredUntil) {
-      params.shouldFilter = true;
-      params.filteredUntil = filteredUntil;
-    } else {
-      params.shouldFilter = false;
-      params.filterHits = filterHits;
-    }
-    return { parrableId, params };
-  }
-  return null;
-}
-
-function writeCookie(parrableIdAndParams) {
-  if (parrableIdAndParams) {
-    const parrableIdStr = encodeURIComponent(serializeParrableId(parrableIdAndParams));
-    storage.setCookie(PARRABLE_COOKIE_NAME, parrableIdStr, getExpirationDate(), 'lax');
-  }
-}
-
-function readLegacyCookies() {
-  const eid = storage.getCookie(LEGACY_ID_COOKIE_NAME);
-  const ibaOptout = (storage.getCookie(LEGACY_OPTOUT_COOKIE_NAME) === 'true');
-  if (eid || ibaOptout) {
-    const parrableId = {};
-    if (eid) {
-      parrableId.eid = eid;
-    }
-    if (ibaOptout) {
-      parrableId.ibaOptout = ibaOptout;
-    }
-    return parrableId;
-  }
-  return null;
-}
-
-function migrateLegacyCookies(parrableId) {
-  if (parrableId) {
-    writeCookie(parrableId);
-    if (parrableId.eid) {
-      storage.setCookie(LEGACY_ID_COOKIE_NAME, '', EXPIRE_COOKIE_DATE);
-    }
-    if (parrableId.ibaOptout) {
-      storage.setCookie(LEGACY_OPTOUT_COOKIE_NAME, '', EXPIRE_COOKIE_DATE);
-    }
-  }
-}
-
-function shouldFilterImpression(configParams, parrableId) {
-  const config = configParams.timezoneFilter;
-
-  if (!config) {
-    return false;
-  }
-
-  if (parrableId) {
-    return false;
-  }
-
-  const offset = (new Date()).getTimezoneOffset() / 60;
-  const zone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
-  function isZoneListed(list, zone) {
-    // IE does not provide a timeZone in IANA format so zone will be empty
-    const zoneLowercase = zone && zone.toLowerCase();
-    return !!(list && zone && find(list, zn => zn.toLowerCase() === zoneLowercase));
-  }
-
-  function isAllowed() {
-    if (isEmpty(config.allowedZones) &&
-      isEmpty(config.allowedOffsets)) {
-      return true;
-    }
-    if (isZoneListed(config.allowedZones, zone)) {
-      return true;
-    }
-    if (contains(config.allowedOffsets, offset)) {
-      return true;
-    }
-    return false;
-  }
-
-  function isBlocked() {
-    if (isEmpty(config.blockedZones) &&
-      isEmpty(config.blockedOffsets)) {
-      return false;
-    }
-    if (isZoneListed(config.blockedZones, zone)) {
-      return true;
-    }
-    if (contains(config.blockedOffsets, offset)) {
-      return true;
-    }
-    return false;
-  }
-
-  return isBlocked() || !isAllowed();
-}
-
-function epochFromTtl(ttl) {
-  return Math.floor((Date.now() / 1000) + ttl);
-}
-
-function incrementFilterHits(parrableId, params) {
-  params.filterHits += 1;
-  writeCookie({ ...parrableId, ...params })
-}
-
-function fetchId(configParams, gdprConsentData) {
-  if (!isValidConfig(configParams)) return;
-
-  let { parrableId, params } = readCookie() || {};
-  if (!parrableId) {
-    parrableId = readLegacyCookies();
-    migrateLegacyCookies(parrableId);
-  }
-
-  if (shouldFilterImpression(configParams, parrableId)) {
-    return null;
-  }
-
-  const eid = parrableId ? parrableId.eid : null;
-  const refererInfo = getRefererInfo();
-  const tpcSupport = params ? params.tpc : null;
-  const shouldFilter = params ? params.shouldFilter : null;
-  const uspString = uspDataHandler.getConsentData();
-  const gdprApplies = (gdprConsentData && typeof gdprConsentData.gdprApplies === 'boolean' && gdprConsentData.gdprApplies);
-  const gdprConsentString = (gdprConsentData && gdprApplies && gdprConsentData.consentString) || '';
-  const partners = configParams.partners || configParams.partner;
-  const trackers = typeof partners === 'string'
-    ? partners.split(',')
-    : partners;
-
-  const data = {
-    eid,
-    trackers,
-    url: refererInfo.page,
-    prebidVersion: '$prebid.version$',
-    isIframe: inIframe(),
-    tpcSupport
-  };
-
-  if (shouldFilter === false) {
-    data.filterHits = params.filterHits;
-  }
-
-  const searchParams = {
-    data: encodeBase64UrlSafe(btoa(JSON.stringify(data))),
-    gdpr: gdprApplies ? 1 : 0,
-    _rand: Math.random()
-  };
-
-  if (uspString) {
-    searchParams.us_privacy = uspString;
-  }
-
-  if (gdprApplies) {
-    searchParams.gdpr_consent = gdprConsentString;
-  }
-
-  const options = {
-    method: 'GET',
-    withCredentials: true
-  };
-
-  const callback = function (cb) {
-    const callbacks = {
-      success: response => {
-        let newParrableId = parrableId ? deepClone(parrableId) : {};
-        let newParams = {};
-        if (response) {
-          try {
-            let responseObj = JSON.parse(response);
-            if (responseObj) {
-              if (responseObj.ccpaOptout !== true) {
-                newParrableId.eid = responseObj.eid;
-              } else {
-                newParrableId.eid = null;
-                newParrableId.ccpaOptout = true;
-              }
-              if (responseObj.ibaOptout === true) {
-                newParrableId.ibaOptout = true;
-              }
-              if (responseObj.tpcSupport !== undefined) {
-                newParams.tpcSupport = responseObj.tpcSupport;
-                newParams.tpcUntil = epochFromTtl(responseObj.tpcSupportTtl);
-              }
-              if (responseObj.filterTtl) {
-                newParams.filteredUntil = epochFromTtl(responseObj.filterTtl);
-                newParams.filterHits = 0;
-              }
-            }
-          } catch (error) {
-            logError(error);
-            cb();
-          }
-          writeCookie({ ...newParrableId, ...newParams });
-          cb(newParrableId);
-        } else {
-          logError('parrableId: ID fetch returned an empty result');
-          cb();
-        }
-      },
-      error: error => {
-        logError(`parrableId: ID fetch encountered an error`, error);
-        cb();
-      }
-    };
-
-    if (shouldFilter) {
-      incrementFilterHits(parrableId, params);
-    } else {
-      ajax(PARRABLE_URL, callbacks, searchParams, options);
-    }
-  };
-
-  return {
-    callback,
-    id: parrableId
-  };
-}
-
-/** @type {Submodule} */
-export const parrableIdSubmodule = {
-  /**
-   * used to link submodule with config
-   * @type {string}
-   */
-  name: MODULE_NAME,
-  /**
-   * Global Vendor List ID
-   * @type {number}
-   */
-  gvlid: PARRABLE_GVLID,
-
-  /**
-   * decode the stored id value for passing to bid requests
-   * @function
-   * @param {ParrableId} parrableId
-   * @return {(Object|undefined}
-   */
-  decode(parrableId) {
-    if (parrableId && isPlainObject(parrableId)) {
-      return { parrableId };
-    }
-    return undefined;
-  },
-
-  /**
-   * performs action to obtain id and return a value in the callback's response argument
-   * @function
-   * @param {SubmoduleConfig} [config]
-   * @param {ConsentData} [consentData]
-   * @returns {function(callback:function), id:ParrableId}
-   */
-  getId(config, gdprConsentData, currentStoredId) {
-    const configParams = (config && config.params) || {};
-    return fetchId(configParams, gdprConsentData);
-  },
-  eids: {
-    'parrableId': {
-      source: 'parrable.com',
-      atype: 1,
-      getValue: function(parrableId) {
-        if (parrableId.eid) {
-          return parrableId.eid;
-        }
-        if (parrableId.ccpaOptout) {
-          // If the EID was suppressed due to a non consenting ccpa optout then
-          // we still wish to provide this as a reason to the adapters
-          return '';
-        }
-        return null;
-      },
-      getUidExt: function(parrableId) {
-        const extendedData = pick(parrableId, [
-          'ibaOptout',
-          'ccpaOptout'
-        ]);
-        if (Object.keys(extendedData).length) {
-          return extendedData;
-        }
-      }
-    },
-  },
-};
-
-submodule('userId', parrableIdSubmodule);
diff --git a/modules/performaxBidAdapter.js b/modules/performaxBidAdapter.js
new file mode 100644
index 00000000000..a765c4d9d78
--- /dev/null
+++ b/modules/performaxBidAdapter.js
@@ -0,0 +1,77 @@
+import { deepSetValue, deepAccess } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js'
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+
+const BIDDER_CODE = 'performax';
+const BIDDER_SHORT_CODE = 'px';
+const GVLID = 732
+const ENDPOINT = 'https://dale.performax.cz/ortb'
+export const converter = ortbConverter({
+
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    deepSetValue(imp, 'tagid', bidRequest.params.tagid);
+    return imp;
+  },
+
+  bidResponse(buildBidResponse, bid, context) {
+    context.netRevenue = deepAccess(bid, 'netRevenue');
+    context.mediaType = deepAccess(bid, 'mediaType');
+    context.currency = deepAccess(bid, 'currency');
+
+    return buildBidResponse(bid, context)
+  },
+
+  context: {
+    ttl: 360,
+  }
+})
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: [BIDDER_SHORT_CODE],
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    return !!bid.params.tagid;
+  },
+
+  buildRequests: function (bidRequests, bidderRequest) {
+    let data = converter.toORTB({bidderRequest, bidRequests})
+    return [{
+      method: 'POST',
+      url: ENDPOINT,
+      options: {'contentType': 'application/json'},
+      data: data
+    }]
+  },
+
+  interpretResponse: function (bidderResponse, request) {
+    if (!bidderResponse.body) return [];
+    const response = bidderResponse.body
+    const data = {
+
+      seatbid: response.seatbid.map(seatbid => ({
+        seat: seatbid.seat,
+        bid: seatbid.bid.map(bid => ({
+          impid: bid.imp_id,
+          w: bid.w,
+          h: bid.h,
+          requestId: request.data.id,
+          price: bid.price,
+          currency: response.cur,
+          adm: bid.adm,
+          crid: bid.id,
+          netRevenue: true,
+          mediaType: BANNER,
+        }))
+      }))
+    };
+    return converter.fromORTB({ response: data, request: request.data }).bids
+  },
+
+}
+
+registerBidder(spec);
diff --git a/modules/performaxBidAdapter.md b/modules/performaxBidAdapter.md
new file mode 100644
index 00000000000..8b5b702a8e6
--- /dev/null
+++ b/modules/performaxBidAdapter.md
@@ -0,0 +1,36 @@
+# Overview
+
+```
+Module Name:  Performax Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: development@performax.cz
+```
+
+# Description
+
+Connects to Performax exchange for bids.
+
+Performax bid adapter supports Banner.
+
+
+# Sample Banner Ad Unit: For Publishers
+
+```javascript
+    var adUnits = [
+        {
+            code: 'performax-div',
+            mediaTypes: {
+                banner: {sizes: [[300, 300]]},
+            },
+            bids: [
+                {
+                    bidder: "performax",
+                    params: {
+                        tagid: "sample"   // required
+                    }
+                }
+            ]
+        },
+    ];
+```
+
diff --git a/modules/permutiveIdentityManagerIdSystem.js b/modules/permutiveIdentityManagerIdSystem.js
new file mode 100644
index 00000000000..5dc12d44edb
--- /dev/null
+++ b/modules/permutiveIdentityManagerIdSystem.js
@@ -0,0 +1,151 @@
+import {MODULE_TYPE_UID} from '../src/activities/modules.js'
+import {submodule} from '../src/hook.js'
+import {getStorageManager} from '../src/storageManager.js'
+import {prefixLog, safeJSONParse} from '../src/utils.js'
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
+const MODULE_NAME = 'permutiveIdentityManagerId'
+const PERMUTIVE_ID_DATA_STORAGE_KEY = 'permutive-prebid-id'
+
+const ID5_DOMAIN = 'id5-sync.com'
+const LIVERAMP_DOMAIN = 'liveramp.com'
+const UID_DOMAIN = 'uidapi.com'
+
+const PRIMARY_IDS = ['id5id', 'idl_env', 'uid2']
+
+export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME})
+
+const logger = prefixLog('[PermutiveID]')
+
+const readFromSdkLocalStorage = () => {
+  const data = safeJSONParse(storage.getDataFromLocalStorage(PERMUTIVE_ID_DATA_STORAGE_KEY))
+  const id = {}
+  if (data && typeof data === 'object' && 'providers' in data && typeof data.providers === 'object') {
+    const now = Date.now()
+    for (const [idName, value] of Object.entries(data.providers)) {
+      if (PRIMARY_IDS.includes(idName) && value.userId) {
+        if (!value.expiryTime || value.expiryTime > now) {
+          id[idName] = value.userId
+        }
+      }
+    }
+  }
+  return id
+}
+
+/**
+ * Catch and log errors
+ * @param {function} fn - Function to safely evaluate
+ */
+function makeSafe (fn) {
+  try {
+    return fn()
+  } catch (e) {
+    logger.logError(e)
+  }
+}
+
+const waitAndRetrieveFromSdk = (timeoutMs) =>
+  new Promise(
+    resolve => {
+      const fallback = setTimeout(() => {
+        logger.logInfo('timeout expired waiting for SDK - attempting read from local storage again')
+        resolve(readFromSdkLocalStorage())
+      }, timeoutMs)
+      return window?.permutive?.ready(() => makeSafe(() => {
+        logger.logInfo('Permutive SDK is ready')
+        const onReady = makeSafe(() => window.permutive.addons.identity_manager.prebid.onReady)
+        if (typeof onReady === 'function') {
+          onReady((ids) => {
+            logger.logInfo('Permutive SDK has provided ids')
+            resolve(ids)
+            clearTimeout(fallback)
+          })
+        } else {
+          logger.logError('Permutive SDK initialised but identity manager prebid api not present')
+        }
+      }))
+    }
+  )
+
+/** @type {Submodule} */
+export const permutiveIdentityManagerIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function decode
+   * @param {(Object|string)} value
+   * @param {SubmoduleConfig|undefined} config
+   * @returns {(Object|undefined)}
+   */
+  decode(value, config) {
+    return value
+  },
+
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function getId
+   * @param {SubmoduleConfig} submoduleConfig
+   * @param {ConsentData} consentData
+   * @param {(Object|undefined)} cacheIdObj
+   * @returns {IdResponse|undefined}
+   */
+  getId(submoduleConfig, consentData, cacheIdObj) {
+    const id = readFromSdkLocalStorage()
+    if (Object.entries(id).length > 0) {
+      logger.logInfo('found id in sdk storage')
+      return { id }
+    } else if ('params' in submoduleConfig && submoduleConfig.params.ajaxTimeout) {
+      logger.logInfo('failed to find id in sdk storage - waiting for sdk')
+      // Is ajaxTimeout an appropriate timeout to use here?
+      return { callback: (done) => waitAndRetrieveFromSdk(submoduleConfig.params.ajaxTimeout).then(done) }
+    } else {
+      logger.logInfo('failed to find id in sdk storage and no wait time specified')
+    }
+  },
+
+  primaryIds: PRIMARY_IDS,
+
+  eids: {
+    'id5id': {
+      getValue: function (data) {
+        return data.uid
+      },
+      source: ID5_DOMAIN,
+      atype: 1,
+      getUidExt: function (data) {
+        if (data.ext) {
+          return data.ext
+        }
+      }
+    },
+    'idl_env': {
+      source: LIVERAMP_DOMAIN,
+      atype: 3,
+    },
+    'uid2': {
+      source: UID_DOMAIN,
+      atype: 3,
+      getValue: function(data) {
+        return data.id
+      },
+      getUidExt: function(data) {
+        if (data.ext) {
+          return data.ext
+        }
+      }
+    }
+  }
+}
+
+submodule('userId', permutiveIdentityManagerIdSubmodule)
diff --git a/modules/permutiveIdentityManagerIdSystem.md b/modules/permutiveIdentityManagerIdSystem.md
new file mode 100644
index 00000000000..ae249803d11
--- /dev/null
+++ b/modules/permutiveIdentityManagerIdSystem.md
@@ -0,0 +1,58 @@
+# Permutive Identity Manager
+
+This module supports [Permutive](https://permutive.com/) customers in using Permutive's Identity Manager functionality.
+
+To use this Prebid.js module it is assumed that the site includes Permutive's SDK, with Identity Manager configuration
+enabled. See Permutive's user documentation for more information on Identity Manager.
+
+## Building Prebid.js with Permutive Identity Manager Support
+
+Prebid.js must be built with the `permutiveIdentityManagerIdSystem` module in order for Permutive's Identity Manager to be able to
+activate relevant user identities to Prebid.
+
+To build Prebid.js with the `permutiveIdentityManagerIdSystem` module included:
+
+```
+gulp build --modules=userId,permutiveIdentityManagerIdSystem
+```
+
+## Prebid configuration
+
+There is minimal configuration required to be set on Prebid.js, since the bulk of the behaviour is managed through
+Permutive's dashboard and SDK.
+
+It is recommended to keep the Prebid.js caching for this module short, since the mechanism by which Permutive's SDK
+communicates with Prebid.js is effectively a local cache anyway.
+
+```
+pbjs.setConfig({
+  ...
+  userSync: {
+    userIds: [
+      {
+        name: 'permutiveIdentityManagerId',
+        params: {
+          ajaxTimeout: 90
+        },
+        storage: {
+          type: 'html5',
+          name: 'permutiveIdentityManagerId',
+          refreshInSeconds: 5
+        }
+      }
+    ],
+    auctionDelay: 100
+  },
+  ...
+});
+```
+
+### ajaxTimeout
+
+By default this module will read IDs provided by the Permutive SDK from local storage when requested by prebid, and if
+nothing is found, will not provide any identities. If a timeout is provided via the `ajaxTimeout` parameter, it will
+instead wait for up to the specified number of milliseconds for Permutive's SDK to become available, and will retrieve
+identities from the SDK directly if/when this happens.
+
+This value should be set to a value smaller than the `auctionDelay` set on the `userSync` configuration object, since
+there is no point waiting longer than this as the auction will already have been triggered.
\ No newline at end of file
diff --git a/modules/permutiveRtdProvider.js b/modules/permutiveRtdProvider.js
index 697d7721205..bb2dff6189e 100644
--- a/modules/permutiveRtdProvider.js
+++ b/modules/permutiveRtdProvider.js
@@ -12,6 +12,10 @@ import {deepAccess, deepSetValue, isFn, logError, mergeDeep, isPlainObject, safe
 import {includes} from '../src/polyfill.js';
 import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const MODULE_NAME = 'permutive'
 
 const logger = prefixLog('[PermutiveRTD]')
@@ -91,7 +95,8 @@ export function getModuleConfig(customModuleConfig) {
 /**
  * Sets ortb2 config for ac bidders
  * @param {Object} bidderOrtb2 - The ortb2 object for the all bidders
- * @param {Object} customModuleConfig - Publisher config for module
+ * @param {Object} moduleConfig - Publisher config for module
+ * @param {Object} segmentData - Segment data grouped by bidder or type
  */
 export function setBidderRtb (bidderOrtb2, moduleConfig, segmentData) {
   const acBidders = deepAccess(moduleConfig, 'params.acBidders')
@@ -100,6 +105,7 @@ export function setBidderRtb (bidderOrtb2, moduleConfig, segmentData) {
 
   const ssps = segmentData?.ssp?.ssps ?? []
   const sspCohorts = segmentData?.ssp?.cohorts ?? []
+  const topics = segmentData?.topics ?? {}
 
   const bidders = new Set([...acBidders, ...ssps])
   bidders.forEach(function (bidder) {
@@ -117,23 +123,24 @@ export function setBidderRtb (bidderOrtb2, moduleConfig, segmentData) {
       cohorts = [...new Set([...cohorts, ...sspCohorts])].slice(0, maxSegs)
     }
 
-    const nextConfig = updateOrtbConfig(bidder, currConfig, cohorts, sspCohorts, transformationConfigs, segmentData)
+    const nextConfig = updateOrtbConfig(bidder, currConfig, cohorts, sspCohorts, topics, transformationConfigs, segmentData)
     bidderOrtb2[bidder] = nextConfig.ortb2
   })
 }
 
 /**
  * Updates `user.data` object in existing bidder config with Permutive segments
- * @param string bidder - The bidder
+ * @param {string} bidder - The bidder identifier
  * @param {Object} currConfig - Current bidder config
- * @param {Object[]} transformationConfigs - array of objects with `id` and `config` properties, used to determine
- *                                           the transformations on user data to include the ORTB2 object
  * @param {string[]} segmentIDs - Permutive segment IDs
  * @param {string[]} sspSegmentIDs - Permutive SSP segment IDs
+ * @param {Object} topics - Privacy Sandbox Topics, keyed by IAB taxonomy version (600, 601, etc.)
+ * @param {Object[]} transformationConfigs - array of objects with `id` and `config` properties, used to determine
+ *                                           the transformations on user data to include the ORTB2 object
  * @param {Object} segmentData - The segments available for targeting
  * @return {Object} Merged ortb2 object
  */
-function updateOrtbConfig(bidder, currConfig, segmentIDs, sspSegmentIDs, transformationConfigs, segmentData) {
+function updateOrtbConfig(bidder, currConfig, segmentIDs, sspSegmentIDs, topics, transformationConfigs, segmentData) {
   logger.logInfo(`Current ortb2 config`, { bidder, config: currConfig })
 
   const customCohortsData = deepAccess(segmentData, bidder) || []
@@ -157,9 +164,21 @@ function updateOrtbConfig(bidder, currConfig, segmentIDs, sspSegmentIDs, transfo
   const ortbConfig = mergeDeep({}, currConfig)
   const currentUserData = deepAccess(ortbConfig, 'ortb2.user.data') || []
 
+  let topicsUserData = []
+  for (const [k, value] of Object.entries(topics)) {
+    topicsUserData.push({
+      name,
+      ext: {
+        segtax: Number(k)
+      },
+      segment: value.map(topic => ({ id: topic.toString() })),
+    })
+  }
+
   const updatedUserData = currentUserData
     .filter(el => el.name !== permutiveUserData.name && el.name !== customCohortsUserData.name)
     .concat(permutiveUserData, transformedUserData, customCohortsUserData)
+    .concat(topicsUserData)
 
   logger.logInfo(`Updating ortb2.user.data`, { bidder, user_data: updatedUserData })
   deepSetValue(ortbConfig, 'ortb2.user.data', updatedUserData)
@@ -252,7 +271,7 @@ function setSegments (reqBidsConfigObj, moduleConfig, segmentData) {
  */
 function makeSafe (fn) {
   try {
-    fn()
+    return fn()
   } catch (e) {
     logError(e)
   }
@@ -292,34 +311,88 @@ export function isPermutiveOnPage () {
  * @param {number} maxSegs - Maximum number of segments to be included
  * @return {Object}
  */
-export function getSegments (maxSegs) {
-  const legacySegs = readSegments('_psegs', []).map(Number).filter(seg => seg >= 1000000).map(String)
-  const _ppam = readSegments('_ppam', [])
-  const _pcrprs = readSegments('_pcrprs', [])
-
+export function getSegments(maxSegs) {
   const segments = {
-    ac: [..._pcrprs, ..._ppam, ...legacySegs],
-    ix: readSegments('_pindexs', []),
-    rubicon: readSegments('_prubicons', []),
-    appnexus: readSegments('_papns', []),
-    gam: readSegments('_pdfps', []),
-    ssp: readSegments('_pssps', {
-      cohorts: [],
-      ssps: []
+    ac:
+      makeSafe(() => {
+        const legacySegs =
+          makeSafe(() =>
+            readSegments('_psegs', [])
+              .map(Number)
+              .filter((seg) => seg >= 1000000)
+              .map(String),
+          ) || [];
+        const _ppam = makeSafe(() => readSegments('_ppam', []).map(String)) || [];
+        const _pcrprs = makeSafe(() => readSegments('_pcrprs', []).map(String)) || [];
+
+        return [..._pcrprs, ..._ppam, ...legacySegs];
+      }) || [],
+
+    ix:
+      makeSafe(() => {
+        const _pindexs = readSegments('_pindexs', []);
+        return _pindexs.map(String);
+      }) || [],
+
+    rubicon:
+      makeSafe(() => {
+        const _prubicons = readSegments('_prubicons', []);
+        return _prubicons.map(String);
+      }) || [],
+
+    appnexus:
+      makeSafe(() => {
+        const _papns = readSegments('_papns', []);
+        return _papns.map(String);
+      }) || [],
+
+    gam:
+      makeSafe(() => {
+        const _pdfps = readSegments('_pdfps', []);
+        return _pdfps.map(String);
+      }) || [],
+
+    ssp: makeSafe(() => {
+      const _pssps = readSegments('_pssps', {
+        cohorts: [],
+        ssps: [],
+      });
+
+      return {
+        cohorts: makeSafe(() => _pssps.cohorts.map(String)) || [],
+        ssps: makeSafe(() => _pssps.ssps.map(String)) || [],
+      };
     }),
-  }
+
+    topics:
+      makeSafe(() => {
+        const _ppsts = readSegments('_ppsts', {});
+
+        const topics = {};
+        for (const [k, value] of Object.entries(_ppsts)) {
+          topics[k] = makeSafe(() => value.map(String)) || [];
+        }
+
+        return topics;
+      }) || {},
+  };
 
   for (const bidder in segments) {
     if (bidder === 'ssp') {
       if (segments[bidder].cohorts && Array.isArray(segments[bidder].cohorts)) {
         segments[bidder].cohorts = segments[bidder].cohorts.slice(0, maxSegs)
       }
+    } else if (bidder === 'topics') {
+      for (const taxonomy in segments[bidder]) {
+        segments[bidder][taxonomy] = segments[bidder][taxonomy].slice(0, maxSegs)
+      }
     } else {
       segments[bidder] = segments[bidder].slice(0, maxSegs)
     }
   }
 
-  return segments
+  logger.logInfo(`Read segments`, segments)
+  return segments;
 }
 
 /**
@@ -370,7 +443,7 @@ function iabSegmentId(permutiveSegmentId, iabIds) {
  * Pull the latest configuration and cohort information and update accordingly.
  *
  * @param reqBidsConfigObj - Bidder provided config for request
- * @param customModuleConfig - Publisher provide config
+ * @param moduleConfig - Publisher provided config
  */
 export function readAndSetCohorts(reqBidsConfigObj, moduleConfig) {
   const segmentData = getSegments(deepAccess(moduleConfig, 'params.maxSegs'))
diff --git a/modules/pgamsspBidAdapter.js b/modules/pgamsspBidAdapter.js
index 7d285daf3c6..36dbd1159cc 100644
--- a/modules/pgamsspBidAdapter.js
+++ b/modules/pgamsspBidAdapter.js
@@ -1,212 +1,21 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'pgamssp';
+const GVLID = 1353;
 const AD_URL = 'https://us-east.pgammedia.com/pbjs';
 const SYNC_URL = 'https://cs.pgammedia.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId, endpointId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  if (placementId) {
-    placement.placementId = placementId;
-    placement.type = 'publisher';
-  } else if (endpointId) {
-    placement.endpointId = endpointId;
-    placement.type = 'network';
-  }
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-    // TODO: does the fallback make sense here?
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/pilotxBidAdapter.js b/modules/pilotxBidAdapter.js
index 335c461e3d9..417c1f0c089 100644
--- a/modules/pilotxBidAdapter.js
+++ b/modules/pilotxBidAdapter.js
@@ -1,4 +1,12 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'pilotx';
 const ENDPOINT_URL = '//adn.pilotx.tv/hb'
 export const spec = {
@@ -6,11 +14,11 @@ export const spec = {
   supportedMediaTypes: ['banner', 'video'],
   aliases: ['pilotx'], // short code
   /**
-         * Determines whether or not the given bid request is valid.
-         *
-         * @param {BidRequest} bid The bid params to validate.
-         * @return boolean True if this is a valid bid, and false otherwise.
-         */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function (bid) {
     let sizesCheck = !!bid.sizes
     let paramSizesCheck = !!bid.params.sizes
@@ -35,11 +43,11 @@ export const spec = {
     return !!(bid.params.placementId);
   },
   /**
-         * Make a server request from the list of BidRequests.
-         *
-         * @param {validBidRequests[]} - an array of bids
-         * @return ServerRequest Info describing the request to the server.
-         */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function (validBidRequests, bidderRequest) {
     let payloadItems = {};
     validBidRequests.forEach(bidRequest => {
@@ -84,11 +92,11 @@ export const spec = {
     };
   },
   /**
-         * Unpack the response from the server into a list of bids.
-         *
-         * @param {ServerResponse} serverResponse A successful response from the server.
-         * @return {Bid[]} An array of bids which were nested inside the server.
-         */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function (serverResponse, bidRequest) {
     const serverBody = serverResponse.body;
     const bidResponses = [];
@@ -135,7 +143,7 @@ export const spec = {
 
   /**
    * Formats placement ids for adserver ingestion purposes
-   * @param {string[]} The placement ID/s in an array
+   * @param {string[]} placementId the placement ID/s in an array
    */
   setPlacementID: function (placementId) {
     if (Array.isArray(placementId)) {
diff --git a/modules/pixfutureBidAdapter.js b/modules/pixfutureBidAdapter.js
index 1c3f9b8da1a..c7ed1ec989d 100644
--- a/modules/pixfutureBidAdapter.js
+++ b/modules/pixfutureBidAdapter.js
@@ -5,7 +5,6 @@ import {config} from '../src/config.js';
 import {find, includes} from '../src/polyfill.js';
 import {deepAccess, isArray, isFn, isNumber, isPlainObject} from '../src/utils.js';
 import {auctionManager} from '../src/auctionManager.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 import {getANKeywordParam} from '../libraries/appnexusUtils/anKeywords.js';
 import {convertCamelToUnderscore} from '../libraries/appnexusUtils/anUtils.js';
 
@@ -126,7 +125,7 @@ export const spec = {
         method: 'POST',
         options: {withCredentials: true},
         data: {
-          v: getGlobal().version,
+          v: 'v' + '$prebid.version$',
           pageUrl: referer,
           bidId: bidRequest.bidId,
           // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
@@ -277,7 +276,7 @@ function bidToTag(bid) {
   }
   tag.keywords = getANKeywordParam(bid.ortb2, bid.params.keywords)
 
-  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
   if (gpid) {
     tag.gpid = gpid;
   }
diff --git a/modules/playdigoBidAdapter.js b/modules/playdigoBidAdapter.js
new file mode 100644
index 00000000000..5d65a91e1a7
--- /dev/null
+++ b/modules/playdigoBidAdapter.js
@@ -0,0 +1,21 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'playdigo';
+const GVLID = 1302;
+const AD_URL = 'https://server.playdigo.com/pbjs';
+const SYNC_URL = 'https://cs.playdigo.com';
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
+};
+
+registerBidder(spec);
diff --git a/modules/playdigoBidAdapter.md b/modules/playdigoBidAdapter.md
new file mode 100644
index 00000000000..1c63cce79a1
--- /dev/null
+++ b/modules/playdigoBidAdapter.md
@@ -0,0 +1,78 @@
+# Overview
+
+```
+Module Name: Playdigo Bidder Adapter
+Module Type: Playdigo Bidder Adapter
+Maintainer: yr@playdigo.com
+```
+
+# Description
+
+One of the easiest way to gain access to Playdigo demand sources - Playdigo header bidding adapter.
+Playdigo header bidding adapter connects with Playdigo demand sources to fetch bids for display placements
+
+# Test Parameters
+```
+  var adUnits = [
+    {
+        code: 'adunit1',
+        mediaTypes: {
+            banner: {
+                sizes: [ [300, 250], [320, 50] ],
+            }
+        },
+        bids: [
+            {
+                bidder: 'playdigo',
+                params: {
+                    placementId: 'testBanner',
+                }
+            }
+        ]
+    },
+    {
+        code: 'addunit2',
+        mediaTypes: {
+            video: {
+                playerSize: [ [640, 480] ],
+                context: 'instream',
+                minduration: 5,
+                maxduration: 60,
+            }
+        },
+        bids: [
+            {
+                bidder: 'playdigo',
+                params: {
+                    placementId: 'testVideo',
+                }
+            }
+        ]
+    },
+    {
+        code: 'addunit3',
+        mediaTypes: {
+            native: {
+                title: {
+                    required: true
+                },
+                body: {
+                    required: true
+                },
+                icon: {
+                    required: true,
+                    size: [64, 64]
+                }
+            }
+        },
+        bids: [
+            {
+                bidder: 'playdigo',
+                params: {
+                    placementId: 'testNative',
+                }
+            }
+        ]
+    }
+  ];
+```
diff --git a/modules/prebidServerBidAdapter/bidderConfig.js b/modules/prebidServerBidAdapter/bidderConfig.js
new file mode 100644
index 00000000000..44ab2f90d42
--- /dev/null
+++ b/modules/prebidServerBidAdapter/bidderConfig.js
@@ -0,0 +1,158 @@
+import {mergeDeep, deepEqual, deepAccess, deepSetValue, deepClone} from '../../src/utils.js';
+import {ORTB_EIDS_PATHS} from '../../src/activities/redactor.js';
+
+/**
+ * Perform a partial pre-merge of bidder config for PBS.
+ *
+ * Prebid.js and Prebid Server use different strategies for merging global and bidder-specific config; JS attemps to
+ * merge arrays (concatenating them, with some deduping, cfr. mergeDeep), while PBS only merges objects -
+ * a bidder-specific array will replace a global array.
+ *
+ * This returns bidder config (from `bidder`) where arrays are replaced with what you get from merging them with `global`,
+ * so that the result of merging in PBS is the same as in JS.
+ */
+export function getPBSBidderConfig({global, bidder}) {
+  return Object.fromEntries(
+    Object.entries(bidder).map(([bidderCode, bidderConfig]) => {
+      return [bidderCode, replaceArrays(bidderConfig, mergeDeep({}, global, bidderConfig))]
+    })
+  )
+}
+
+function replaceArrays(config, mergedConfig) {
+  return Object.fromEntries(
+    Object.entries(config).map(([key, value]) => {
+      const mergedValue = mergedConfig[key];
+      if (Array.isArray(value)) {
+        if (!deepEqual(value, mergedValue) && Array.isArray(mergedValue)) {
+          value = mergedValue;
+        }
+      } else if (value != null && typeof value === 'object') {
+        value = replaceArrays(value, mergedValue);
+      }
+      return [key, value];
+    })
+  )
+}
+
+/**
+ * Extract all EIDs from FPD.
+ *
+ * Returns {eids, conflicts}, where:
+ *
+ *  - `eids` contains an object of the form `{eid, bidders}` for each unique EID object found anywhere in FPD;
+ *      `bidders` is a list of all the bidders that refer to that specific EID object, or false if that EID object is defined globally.
+ *   - `conflicts` is a set containing all EID sources that appear in multiple, otherwise different, EID objects.
+ */
+export function extractEids({global, bidder}) {
+  const entries = [];
+  const bySource = {};
+  const conflicts = new Set()
+
+  function getEntry(eid) {
+    let entry = entries.find((candidate) => deepEqual(candidate.eid, eid));
+    if (entry == null) {
+      entry = {eid, bidders: []}
+      entries.push(entry);
+    }
+    if (bySource[eid.source] == null) {
+      bySource[eid.source] = entry.eid;
+    } else if (entry.eid === eid) {
+      // if this is the first time we see this eid, but not the first time we see its source, we have a conflict
+      conflicts.add(eid.source);
+    }
+    return entry;
+  }
+
+  ORTB_EIDS_PATHS.forEach(path => {
+    (deepAccess(global, path) || []).forEach(eid => {
+      getEntry(eid).bidders = false;
+    });
+  })
+  Object.entries(bidder).forEach(([bidderCode, bidderConfig]) => {
+    ORTB_EIDS_PATHS.forEach(path => {
+      (deepAccess(bidderConfig, path) || []).forEach(eid => {
+        const entry = getEntry(eid);
+        if (entry.bidders !== false) {
+          entry.bidders.push(bidderCode);
+        }
+      })
+    })
+  })
+  return {eids: entries, conflicts};
+}
+
+/**
+ * Consolidate extracted EIDs to take advantage of PBS's eidpermissions feature:
+ * https://docs.prebid.org/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#eid-permissions
+ *
+ * If different bidders have different EID configurations, in most cases we can avoid repeating it in each bidder's
+ * specific config. As long as there are no conflicts (different EID objects that refer to the same source constitute a conflict),
+ * the EID can be set as global, and eidpermissions can restrict its access only to specific bidders.
+ *
+ * Returns {global, bidder, permissions}, where:
+ *  - `global` is a list of global EID objects (some of which may be restricted through `permissions`
+ *  - `bidder` is a map from bidder code to EID objects that are specific to that bidder, and cannot be restricted through `permissions`
+ *  - `permissions` is a list of EID permissions as expected by PBS.
+ */
+export function consolidateEids({eids, conflicts = new Set()}) {
+  const globalEntries = [];
+  const bidderEntries = [];
+  const byBidder = {};
+  eids.forEach(eid => {
+    (eid.bidders === false ? globalEntries : bidderEntries).push(eid);
+  });
+  bidderEntries.forEach(({eid, bidders}) => {
+    if (!conflicts.has(eid.source)) {
+      globalEntries.push({eid, bidders})
+    } else {
+      bidders.forEach(bidderCode => {
+        (byBidder[bidderCode] = byBidder[bidderCode] || []).push(eid)
+      })
+    }
+  });
+  return {
+    global: globalEntries.map(({eid}) => eid),
+    permissions: globalEntries.filter(({bidders}) => bidders !== false).map(({eid, bidders}) => ({
+      source: eid.source,
+      bidders
+    })),
+    bidder: byBidder
+  }
+}
+
+function replaceEids({global, bidder}) {
+  const consolidated = consolidateEids(extractEids({global, bidder}));
+  global = deepClone(global);
+  bidder = deepClone(bidder);
+  function removeEids(target) {
+    delete target?.user?.eids;
+    delete target?.user?.ext?.eids;
+  }
+  removeEids(global);
+  Object.values(bidder).forEach(removeEids);
+  if (consolidated.global.length) {
+    deepSetValue(global, 'user.ext.eids', consolidated.global);
+  }
+  if (consolidated.permissions.length) {
+    deepSetValue(global, 'ext.prebid.data.eidpermissions', consolidated.permissions);
+  }
+  Object.entries(consolidated.bidder).forEach(([bidderCode, bidderEids]) => {
+    if (bidderEids.length) {
+      deepSetValue(bidder[bidderCode], 'user.ext.eids', bidderEids);
+    }
+  })
+  return {global, bidder}
+}
+
+export function premergeFpd(ortb2Fragments) {
+  if (ortb2Fragments == null || Object.keys(ortb2Fragments.bidder || {}).length === 0) {
+    return ortb2Fragments;
+  } else {
+    ortb2Fragments = replaceEids(ortb2Fragments);
+    return {
+      ...ortb2Fragments,
+      bidder: getPBSBidderConfig(ortb2Fragments)
+    };
+  }
+}
diff --git a/modules/prebidServerBidAdapter/config.js b/modules/prebidServerBidAdapter/config.js
index f6b8ac9f86a..4a5ac1d8564 100644
--- a/modules/prebidServerBidAdapter/config.js
+++ b/modules/prebidServerBidAdapter/config.js
@@ -1,26 +1,17 @@
 // accountId and bidders params are not included here, should be configured by end-user
 export const S2S_VENDORS = {
-  'appnexus': {
+  'appnexuspsp': {
     adapter: 'prebidServer',
     enabled: true,
     endpoint: {
-      p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
-      noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/openrtb2/auction'
+      p1Consent: 'https://ib.adnxs.com/openrtb2/prebid',
+      noP1Consent: 'https://ib.adnxs-simple.com/openrtb2/prebid'
     },
     syncEndpoint: {
       p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync',
       noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/cookie_sync'
     },
-    timeout: 1000
-  },
-  'appnexuspsp': {
-    adapter: 'prebidServer',
-    enabled: true,
-    endpoint: {
-      p1Consent: 'https://ib.adnxs.com/openrtb2/prebid',
-      noP1Consent: 'https://ib.adnxs-simple.com/openrtb2/prebid'
-    },
-    timeout: 1000
+    maxTimeout: 1000
   },
   'rubicon': {
     adapter: 'prebidServer',
@@ -33,19 +24,15 @@ export const S2S_VENDORS = {
       p1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
       noP1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
     },
-    timeout: 500
+    maxTimeout: 500
   },
-  'openx': {
+  'openwrap': {
     adapter: 'prebidServer',
     enabled: true,
     endpoint: {
-      p1Consent: 'https://prebid.openx.net/openrtb2/auction',
-      noP1Consent: 'https://prebid.openx.net/openrtb2/auction'
-    },
-    syncEndpoint: {
-      p1Consent: 'https://prebid.openx.net/cookie_sync',
-      noP1Consent: 'https://prebid.openx.net/cookie_sync'
+      p1Consent: 'https://ow.pubmatic.com/openrtb2/auction?source=pbjs',
+      noP1Consent: 'https://ow.pubmatic.com/openrtb2/auction?source=pbjs'
     },
-    timeout: 1000
+    maxTimeout: 500
   }
 }
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 0fff93cdcd1..673e92f709b 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -1,10 +1,8 @@
 import Adapter from '../../src/adapter.js';
 import {
-  deepAccess,
   deepClone,
   flatten,
   generateUUID,
-  getPrebidInternal,
   insertUserSyncIframe,
   isNumber,
   isPlainObject,
@@ -16,16 +14,16 @@ import {
   triggerPixel,
   uniques,
 } from '../../src/utils.js';
-import CONSTANTS from '../../src/constants.json';
+import {EVENTS, REJECTION_REASON, S2S} from '../../src/constants.js';
 import adapterManager, {s2sActivityParams} from '../../src/adapterManager.js';
 import {config} from '../../src/config.js';
-import {addComponentAuction, isValid} from '../../src/adapters/bidderFactory.js';
+import {addPaapiConfig, isValid} from '../../src/adapters/bidderFactory.js';
 import * as events from '../../src/events.js';
 import {includes} from '../../src/polyfill.js';
 import {S2S_VENDORS} from './config.js';
 import {ajax} from '../../src/ajax.js';
 import {hook} from '../../src/hook.js';
-import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../../src/utils/gdpr.js';
 import {buildPBSRequest, interpretPBSResponse} from './ortbConverter.js';
 import {useMetrics} from '../../src/utils/perfMetrics.js';
 import {isActivityAllowed} from '../../src/activities/rules.js';
@@ -33,12 +31,10 @@ import {ACTIVITY_TRANSMIT_UFPD} from '../../src/activities/activities.js';
 
 const getConfig = config.getConfig;
 
-const TYPE = CONSTANTS.S2S.SRC;
+const TYPE = S2S.SRC;
 let _syncCount = 0;
 let _s2sConfigs;
 
-let eidPermissions;
-
 /**
  * @typedef {Object} AdapterOptions
  * @summary s2sConfig parameter that adds arguments to resulting OpenRTB payload that goes to Prebid Server
@@ -82,6 +78,7 @@ let eidPermissions;
  * @property {string} [syncEndpoint] endpoint URL for syncing cookies
  * @property {Object} [extPrebid] properties will be merged into request.ext.prebid
  * @property {Object} [ortbNative] base value for imp.native.request
+ * @property {Number} [maxTimeout]
  */
 
 /**
@@ -89,7 +86,6 @@ let eidPermissions;
  */
 export const s2sDefaultConfig = {
   bidders: Object.freeze([]),
-  timeout: 1000,
   syncTimeout: 1000,
   maxBids: 1,
   adapter: 'prebidServer',
@@ -100,7 +96,8 @@ export const s2sDefaultConfig = {
     eventtrackers: [
       {event: 1, methods: [1, 2]}
     ],
-  }
+  },
+  maxTimeout: 1500
 };
 
 config.setDefaults({
@@ -178,7 +175,7 @@ function setS2sConfig(options) {
 
   const activeBidders = [];
   const optionsValid = normalizedOptions.every((option, i, array) => {
-    formatUrlParams(options);
+    formatUrlParams(option);
     const updateSuccess = updateConfigDefaultVendor(option);
     if (updateSuccess !== false) {
       const valid = validateConfigRequiredProps(option);
@@ -207,7 +204,7 @@ getConfig('s2sConfig', ({s2sConfig}) => setS2sConfig(s2sConfig));
 
 /**
  * resets the _synced variable back to false, primiarily used for testing purposes
-*/
+ */
 export function resetSyncedStatus() {
   _syncCount = 0;
 }
@@ -426,7 +423,12 @@ function bidWonHandler(bid) {
 }
 
 function getMatchingConsentUrl(urlProp, gdprConsent) {
-  return hasPurpose1Consent(gdprConsent) ? urlProp.p1Consent : urlProp.noP1Consent;
+  const hasPurpose = hasPurpose1Consent(gdprConsent);
+  const url = hasPurpose ? urlProp.p1Consent : urlProp.noP1Consent
+  if (!url) {
+    logWarn('Missing matching consent URL when gdpr=' + hasPurpose);
+  }
+  return url;
 }
 
 function getConsentData(bidRequests) {
@@ -447,7 +449,7 @@ export function PrebidServer() {
 
   /* Prebid executes this function when the page asks to send out bid requests */
   baseAdapter.callBids = function(s2sBidRequest, bidRequests, addBidResponse, done, ajax) {
-    const adapterMetrics = s2sBidRequest.metrics = useMetrics(deepAccess(bidRequests, '0.metrics'))
+    const adapterMetrics = s2sBidRequest.metrics = useMetrics(bidRequests?.[0]?.metrics)
       .newMetrics()
       .renameWith((n) => [`adapter.s2s.${n}`, `adapters.s2s.${s2sBidRequest.s2sConfig.defaultVendor}.${n}`])
     done = adapterMetrics.startTiming('total').stopBefore(done);
@@ -457,8 +459,9 @@ export function PrebidServer() {
 
     if (Array.isArray(_s2sConfigs)) {
       if (s2sBidRequest.s2sConfig && s2sBidRequest.s2sConfig.syncEndpoint && getMatchingConsentUrl(s2sBidRequest.s2sConfig.syncEndpoint, gdprConsent)) {
+        const s2sAliases = (s2sBidRequest.s2sConfig.extPrebid && s2sBidRequest.s2sConfig.extPrebid.aliases) ?? {};
         let syncBidders = s2sBidRequest.s2sConfig.bidders
-          .map(bidder => adapterManager.aliasRegistry[bidder] || bidder)
+          .map(bidder => adapterManager.aliasRegistry[bidder] || s2sAliases[bidder] || bidder)
           .filter((bidder, index, array) => (array.indexOf(bidder) === index));
 
         queueSync(syncBidders, gdprConsent, uspConsent, gppConsent, s2sBidRequest.s2sConfig);
@@ -467,10 +470,11 @@ export function PrebidServer() {
       processPBSRequest(s2sBidRequest, bidRequests, ajax, {
         onResponse: function (isValid, requestedBidders, response) {
           if (isValid) {
-            bidRequests.forEach(bidderRequest => events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest));
+            bidRequests.forEach(bidderRequest => events.emit(EVENTS.BIDDER_DONE, bidderRequest));
           }
-          if (shouldEmitNonbids(s2sBidRequest.s2sConfig, response)) {
-            events.emit(CONSTANTS.EVENTS.SEAT_NON_BID, {
+          const { seatNonBidData, atagData } = getAnalyticsFlags(s2sBidRequest.s2sConfig, response)
+          if (seatNonBidData) {
+            events.emit(EVENTS.SEAT_NON_BID, {
               seatnonbid: response.ext.seatnonbid,
               auctionId: bidRequests[0].auctionId,
               requestedBidders,
@@ -478,20 +482,37 @@ export function PrebidServer() {
               adapterMetrics
             });
           }
-          done();
+          // pbs analytics event
+          if (seatNonBidData || atagData) {
+            const data = {
+              seatnonbid: seatNonBidData,
+              atag: atagData,
+              auctionId: bidRequests[0].auctionId,
+              requestedBidders,
+              response,
+              adapterMetrics
+            }
+            events.emit(EVENTS.PBS_ANALYTICS, data);
+          }
+          done(false);
           doClientSideSyncs(requestedBidders, gdprConsent, uspConsent, gppConsent);
         },
         onError(msg, error) {
-          logError(`Prebid server call failed: '${msg}'`, error);
-          bidRequests.forEach(bidderRequest => events.emit(CONSTANTS.EVENTS.BIDDER_ERROR, {error, bidderRequest}));
-          done();
+          const {p1Consent = '', noP1Consent = ''} = s2sBidRequest?.s2sConfig?.endpoint || {};
+          if (p1Consent === noP1Consent) {
+            logError(`Prebid server call failed: '${msg}'. Endpoint: "${p1Consent}"}`, error);
+          } else {
+            logError(`Prebid server call failed: '${msg}'. Endpoints: p1Consent "${p1Consent}", noP1Consent "${noP1Consent}"}`, error);
+          }
+          bidRequests.forEach(bidderRequest => events.emit(EVENTS.BIDDER_ERROR, { error, bidderRequest }));
+          done(error.timedOut);
         },
         onBid: function ({adUnit, bid}) {
           const metrics = bid.metrics = s2sBidRequest.metrics.fork().renameWith();
           metrics.checkpoint('addBidResponse');
           if ((bid.requestId == null || bid.requestBidder == null) && !s2sBidRequest.s2sConfig.allowUnknownBidderCodes) {
             logWarn(`PBS adapter received bid from unknown bidder (${bid.bidder}), but 's2sConfig.allowUnknownBidderCodes' is not set. Ignoring bid.`);
-            addBidResponse.reject(adUnit, bid, CONSTANTS.REJECTION_REASON.BIDDER_DISALLOWED);
+            addBidResponse.reject(adUnit, bid, REJECTION_REASON.BIDDER_DISALLOWED);
           } else {
             if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnit, bid))) {
               addBidResponse(adUnit, bid);
@@ -499,19 +520,21 @@ export function PrebidServer() {
                 addWurl(bid.auctionId, bid.adId, bid.pbsWurl);
               }
             } else {
-              addBidResponse.reject(adUnit, bid, CONSTANTS.REJECTION_REASON.INVALID);
+              addBidResponse.reject(adUnit, bid, REJECTION_REASON.INVALID);
             }
           }
         },
-        onFledge: ({adUnitCode, config}) => {
-          addComponentAuction(bidRequests[0].auctionId, adUnitCode, config);
+        onFledge: (params) => {
+          config.runWithBidder(params.bidder, () => {
+            addPaapiConfig({auctionId: bidRequests[0].auctionId, ...params}, {config: params.config});
+          })
         }
       })
     }
   };
 
   // Listen for bid won to call wurl
-  events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler);
+  events.on(EVENTS.BID_WON, bidWonHandler);
 
   return Object.assign(this, {
     callBids: baseAdapter.callBids,
@@ -540,10 +563,11 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
     .reduce(flatten, [])
     .filter(uniques);
 
-  const request = s2sBidRequest.metrics.measureTime('buildRequests', () => buildPBSRequest(s2sBidRequest, bidRequests, adUnits, requestedBidders, eidPermissions));
+  const request = s2sBidRequest.metrics.measureTime('buildRequests', () => buildPBSRequest(s2sBidRequest, bidRequests, adUnits, requestedBidders));
   const requestJson = request && JSON.stringify(request);
   logInfo('BidRequest: ' + requestJson);
   const endpointUrl = getMatchingConsentUrl(s2sBidRequest.s2sConfig.endpoint, gdprConsent);
+  const customHeaders = s2sBidRequest?.s2sConfig?.customHeaders ?? {};
   if (request && requestJson && endpointUrl) {
     const networkDone = s2sBidRequest.metrics.startTiming('net');
     ajax(
@@ -554,10 +578,10 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
           let result;
           try {
             result = JSON.parse(response);
-            const {bids, fledgeAuctionConfigs} = s2sBidRequest.metrics.measureTime('interpretResponse', () => interpretPBSResponse(result, request));
+            const {bids, paapi} = s2sBidRequest.metrics.measureTime('interpretResponse', () => interpretPBSResponse(result, request));
             bids.forEach(onBid);
-            if (fledgeAuctionConfigs) {
-              fledgeAuctionConfigs.forEach(onFledge);
+            if (paapi) {
+              paapi.forEach(onFledge);
             }
           } catch (error) {
             logError(error);
@@ -578,7 +602,8 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
       {
         contentType: 'text/plain',
         withCredentials: true,
-        browsingTopics: isActivityAllowed(ACTIVITY_TRANSMIT_UFPD, s2sActivityParams(s2sBidRequest.s2sConfig))
+        browsingTopics: isActivityAllowed(ACTIVITY_TRANSMIT_UFPD, s2sActivityParams(s2sBidRequest.s2sConfig)),
+        customHeaders
       }
     );
   } else {
@@ -586,18 +611,18 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
   }
 }, 'processPBSRequest');
 
-function shouldEmitNonbids(s2sConfig, response) {
-  return s2sConfig?.extPrebid?.returnallbidstatus && response?.ext?.seatnonbid;
+function getAnalyticsFlags(s2sConfig, response) {
+  return {
+    atagData: getAtagData(response),
+    seatNonBidData: getNonBidData(s2sConfig, response)
+  }
+}
+function getNonBidData(s2sConfig, response) {
+  return s2sConfig?.extPrebid?.returnallbidstatus ? response?.ext?.seatnonbid : undefined;
 }
 
-/**
- * Global setter that sets eids permissions for bidders
- * This setter is to be used by userId module when included
- * @param {array} newEidPermissions
- */
-function setEidPermissions(newEidPermissions) {
-  eidPermissions = newEidPermissions;
+function getAtagData(response) {
+  return response?.ext?.prebid?.analytics?.tags;
 }
-getPrebidInternal().setEidPermissions = setEidPermissions;
 
 adapterManager.registerBidAdapter(new PrebidServer(), 'prebidServer');
diff --git a/modules/prebidServerBidAdapter/ortbConverter.js b/modules/prebidServerBidAdapter/ortbConverter.js
index 54f71c7dc3e..2cc34586102 100644
--- a/modules/prebidServerBidAdapter/ortbConverter.js
+++ b/modules/prebidServerBidAdapter/ortbConverter.js
@@ -1,17 +1,7 @@
 import {ortbConverter} from '../../libraries/ortbConverter/converter.js';
-import {
-  deepAccess,
-  deepSetValue,
-  getBidRequest,
-  getDefinedParams,
-  isArray,
-  logError,
-  logWarn,
-  mergeDeep,
-  timestamp
-} from '../../src/utils.js';
+import {deepSetValue, getBidRequest, logError, logWarn, mergeDeep, timestamp} from '../../src/utils.js';
 import {config} from '../../src/config.js';
-import CONSTANTS from '../../src/constants.json';
+import {S2S, STATUS} from '../../src/constants.js';
 import {createBid} from '../../src/bidfactory.js';
 import {pbsExtensions} from '../../libraries/pbsExtensions/pbsExtensions.js';
 import {setImpBidParams} from '../../libraries/pbsExtensions/processors/params.js';
@@ -25,6 +15,8 @@ import {isActivityAllowed} from '../../src/activities/rules.js';
 import {ACTIVITY_TRANSMIT_TID} from '../../src/activities/activities.js';
 import {currencyCompare} from '../../libraries/currencyUtils/currency.js';
 import {minimum} from '../../src/utils/reducers.js';
+import {s2sDefaultConfig} from './index.js';
+import {premergeFpd} from './bidderConfig.js';
 
 const DEFAULT_S2S_TTL = 60;
 const DEFAULT_S2S_CURRENCY = 'USD';
@@ -46,7 +38,7 @@ const PBS_CONVERTER = ortbConverter({
       }
     });
     if (Object.values(SUPPORTED_MEDIA_TYPES).some(mtype => imp[mtype])) {
-      imp.secure = context.s2sBidRequest.s2sConfig.secure;
+      imp.secure = proxyBidRequest.ortb2Imp?.secure ?? 1;
       return imp;
     }
   },
@@ -54,10 +46,11 @@ const PBS_CONVERTER = ortbConverter({
     if (!imps.length) {
       logError('Request to Prebid Server rejected due to invalid media type(s) in adUnit.');
     } else {
-      let {s2sBidRequest, requestedBidders, eidPermissions} = context;
+      let {s2sBidRequest} = context;
       const request = buildRequest(imps, proxyBidderRequest, context);
 
-      request.tmax = s2sBidRequest.s2sConfig.timeout;
+      request.tmax = s2sBidRequest.s2sConfig.timeout ?? Math.min(s2sBidRequest.requestBidsTimeout * 0.75, s2sBidRequest.s2sConfig.maxTimeout ?? s2sDefaultConfig.maxTimeout);
+      request.ext.tmaxmax = request.ext.tmaxmax || s2sBidRequest.requestBidsTimeout;
 
       [request.app, request.dooh, request.site].forEach(section => {
         if (section && !section.publisher?.id) {
@@ -65,16 +58,6 @@ const PBS_CONVERTER = ortbConverter({
         }
       })
 
-      if (isArray(eidPermissions) && eidPermissions.length > 0) {
-        if (requestedBidders && isArray(requestedBidders)) {
-          eidPermissions = eidPermissions.map(p => ({
-            ...p,
-            bidders: p.bidders.filter(bidder => requestedBidders.includes(bidder))
-          }))
-        }
-        deepSetValue(request, 'ext.prebid.data.eidpermissions', eidPermissions);
-      }
-
       if (!context.transmitTids) {
         deepSetValue(request, 'ext.prebid.createtids', false);
       }
@@ -114,12 +97,16 @@ const PBS_CONVERTER = ortbConverter({
     // because core has special treatment for PBS adapter responses, we need some additional processing
     bidResponse.requestTimestamp = context.requestTimestamp;
     return {
-      bid: Object.assign(createBid(CONSTANTS.STATUS.GOOD, {
-        src: CONSTANTS.S2S.SRC,
+      bid: Object.assign(createBid(STATUS.GOOD, {
+        src: S2S.SRC,
         bidId: bidRequest ? (bidRequest.bidId || bidRequest.bid_Id) : null,
         transactionId: context.adUnit.transactionId,
+        adUnitId: context.adUnit.adUnitId,
         auctionId: context.bidderRequest.auctionId,
-      }), bidResponse),
+      }), bidResponse, {
+        deferRendering: !!context.adUnit.deferBilling,
+        deferBilling: !!context.adUnit.deferBilling
+      }),
       adUnit: context.adUnit.code
     };
   },
@@ -196,10 +183,8 @@ const PBS_CONVERTER = ortbConverter({
         context.actualBidderRequests.forEach(req => orig(ortbRequest, req, context));
       },
       sourceExtSchain(orig, ortbRequest, proxyBidderRequest, context) {
-        // pass schains in ext.prebid.schains, with the most commonly used one in source.ext.schain
-        let mainChain;
-
-        let chains = (deepAccess(ortbRequest, 'ext.prebid.schains') || []);
+        // pass schains in ext.prebid.schains
+        let chains = ortbRequest?.ext?.prebid?.schains || [];
         const chainBidders = new Set(chains.flatMap((item) => item.bidders));
 
         chains = Object.values(
@@ -208,7 +193,7 @@ const PBS_CONVERTER = ortbConverter({
               .filter((req) => !chainBidders.has(req.bidderCode)) // schain defined in s2sConfig.extPrebid takes precedence
               .map((req) => ({
                 bidders: [req.bidderCode],
-                schain: deepAccess(req, 'bids.0.schain')
+                schain: req?.bids?.[0]?.schain
               })))
             .filter(({bidders, schain}) => bidders?.length > 0 && schain)
             .reduce((chains, {bidders, schain}) => {
@@ -217,17 +202,10 @@ const PBS_CONVERTER = ortbConverter({
                 chains[key] = {bidders: new Set(), schain};
               }
               bidders.forEach((bidder) => chains[key].bidders.add(bidder));
-              if (mainChain == null || chains[key].bidders.size > mainChain.bidders.size) {
-                mainChain = chains[key]
-              }
               return chains;
             }, {})
         ).map(({bidders, schain}) => ({bidders: Array.from(bidders), schain}));
 
-        if (mainChain != null) {
-          deepSetValue(ortbRequest, 'source.ext.schain', mainChain.schain);
-        }
-
         if (chains.length) {
           deepSetValue(ortbRequest, 'ext.prebid.schains', chains);
         }
@@ -238,18 +216,28 @@ const PBS_CONVERTER = ortbConverter({
         // override to process each request
         context.actualBidderRequests.forEach(req => orig(response, ortbResponse, {...context, bidderRequest: req, bidRequests: req.bids}));
       },
-      fledgeAuctionConfigs(orig, response, ortbResponse, context) {
+      paapiConfigs(orig, response, ortbResponse, context) {
         const configs = Object.values(context.impContext)
-          .flatMap((impCtx) => (impCtx.fledgeConfigs || []).map(cfg => ({adUnitCode: impCtx.adUnit.code, config: cfg.config})));
+          .flatMap((impCtx) => (impCtx.paapiConfigs || []).map(cfg => {
+            const bidderReq = impCtx.actualBidderRequests.find(br => br.bidderCode === cfg.bidder);
+            const bidReq = impCtx.actualBidRequests.get(cfg.bidder);
+            return {
+              adUnitCode: impCtx.adUnit.code,
+              ortb2: bidderReq?.ortb2,
+              ortb2Imp: bidReq?.ortb2Imp,
+              bidder: cfg.bidder,
+              config: cfg.config
+            };
+          }));
         if (configs.length > 0) {
-          response.fledgeAuctionConfigs = configs;
+          response.paapi = configs;
         }
       }
     }
   },
 });
 
-export function buildPBSRequest(s2sBidRequest, bidderRequests, adUnits, requestedBidders, eidPermissions) {
+export function buildPBSRequest(s2sBidRequest, bidderRequests, adUnits, requestedBidders) {
   const requestTimestamp = timestamp();
   const impIds = new Set();
   const proxyBidRequests = [];
@@ -291,14 +279,15 @@ export function buildPBSRequest(s2sBidRequest, bidderRequests, adUnits, requeste
     proxyBidRequests.push({
       ...adUnit,
       adUnitCode: adUnit.code,
-      ...getDefinedParams(actualBidRequests.values().next().value || {}, ['userId', 'userIdAsEids', 'schain']),
       pbsData: {impId, actualBidRequests, adUnit},
     });
   });
 
   const proxyBidderRequest = {
     ...Object.fromEntries(Object.entries(bidderRequests[0]).filter(([k]) => !BIDDER_SPECIFIC_REQUEST_PROPS.has(k))),
-    fledgeEnabled: bidderRequests.some(req => req.fledgeEnabled)
+    paapi: {
+      enabled: bidderRequests.some(br => br.paapi?.enabled)
+    }
   }
 
   return PBS_CONVERTER.toORTB({
@@ -308,10 +297,12 @@ export function buildPBSRequest(s2sBidRequest, bidderRequests, adUnits, requeste
       currency: config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY,
       ttl: s2sBidRequest.s2sConfig.defaultTtl || DEFAULT_S2S_TTL,
       requestTimestamp,
-      s2sBidRequest,
+      s2sBidRequest: {
+        ...s2sBidRequest,
+        ortb2Fragments: premergeFpd(s2sBidRequest.ortb2Fragments)
+      },
       requestedBidders,
       actualBidderRequests: bidderRequests,
-      eidPermissions,
       nativeRequest: s2sBidRequest.s2sConfig.ortbNative,
       getRedactor,
       transmitTids: isActivityAllowed(ACTIVITY_TRANSMIT_TID, s2sParams),
diff --git a/modules/prebidmanagerAnalyticsAdapter.md b/modules/prebidmanagerAnalyticsAdapter.md
deleted file mode 100644
index 030e79b406f..00000000000
--- a/modules/prebidmanagerAnalyticsAdapter.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Overview
-
-Module Name: Prebid Manager Analytics Adapter
-Module Type: Analytics Adapter
-Maintainer: admin@prebidmanager.com
-
-# Description
-
-Analytics adapter for Prebid Manager. Contact admin@prebidmanager.com for information.
diff --git a/modules/precisoBidAdapter.js b/modules/precisoBidAdapter.js
index c7f7db56fd4..8c244dca040 100644
--- a/modules/precisoBidAdapter.js
+++ b/modules/precisoBidAdapter.js
@@ -1,164 +1,66 @@
-import { logMessage, isFn, deepAccess } from '../src/utils.js';
+import { logInfo } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
-const BIDDER_CODE = 'preciso';
-const AD_URL = 'https://ssp-bidder.mndtrk.com/bid_request/openrtb';
-const URL_SYNC = 'https://ck.2trk.info/rtb/user/usersync.aspx?id=preciso_srl';
-const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE, VIDEO];
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+import { buildBidResponse, buildRequests, onBidWon } from '../libraries/precisoUtils/bidUtils.js';
+import { buildUserSyncs } from '../libraries/precisoUtils/bidUtilsCommon.js';
+
+const BIDDER__CODE = 'preciso';
+export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: BIDDER__CODE });
+const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE];
 const GVLID = 874;
+let precisoId = 'NA';
+let sharedId = 'NA';
+
+const endpoint = 'https://ssp-bidder.mndtrk.com/bid_request/openrtb';
+let syncEndpoint = 'https://ck.2trk.info/rtb/user/usersync.aspx?';
 
 export const spec = {
-  code: BIDDER_CODE,
+  code: BIDDER__CODE,
   supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
   gvlid: GVLID,
 
   isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(bid.params.publisherId) && bid.params.host == 'prebid');
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let winTop = window;
-    let location;
-    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
-    try {
-      location = new URL(bidderRequest.refererInfo.page)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
-
-    let site = {
-      'domain': location.domain || '',
-      'page': location || ''
-    }
-
-    let request = {
-      id: '123456678',
-      imp: validBidRequests.map(request => {
-        const { bidId, sizes, mediaType } = request
-        const item = {
-          id: bidId,
-          region: request.params.region,
-          traffic: mediaType,
-          bidFloor: getBidFloor(request)
-        }
-
-        if (request.mediaTypes.banner) {
-          item.banner = {
-            format: (request.mediaTypes.banner.sizes || sizes).map(size => {
-              return { w: size[0], h: size[1] }
-            }),
-          }
-        }
-
-        if (request.schain) {
-          item.schain = request.schain;
-        }
-
-        return item
-      }),
-
-      'site': site,
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'language': (navigator && navigator.language) ? navigator.language : '',
-      'secure': 1,
-      'host': location.host,
-      'page': location.pathname,
-      'coppa': config.getConfig('coppa') === true ? 1 : 0
-    };
-
-    request.language.indexOf('-') != -1 && (request.language = request.language.split('-')[0])
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
-      }
-      if (bidderRequest.gppConsent) {
-        request.gpp = bidderRequest.gppConsent;
+    sharedId = storage.getDataFromLocalStorage('_sharedid') || storage.getCookie('_sharedid');
+    let precisoBid = true;
+    const preCall = 'https://ssp-usersync.mndtrk.com/getUUID?sharedId=' + sharedId;
+    precisoId = storage.getDataFromLocalStorage('_pre|id');
+    if (Object.is(precisoId, 'NA') || Object.is(precisoId, null) || Object.is(precisoId, undefined)) {
+      if (!bid.precisoBid) {
+        precisoBid = false;
+        getapi(preCall);
       }
     }
 
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request,
-
-    };
-  },
-
-  interpretResponse: function (serverResponse) {
-    const response = serverResponse.body
-
-    const bids = []
-
-    response.seatbid.forEach(seat => {
-      seat.bid.forEach(bid => {
-        bids.push({
-          requestId: bid.impid,
-          cpm: bid.price,
-          width: bid.w,
-          height: bid.h,
-          creativeId: bid.crid,
-          ad: bid.adm,
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 300,
-          meta: {
-            advertiserDomains: bid.adomain || [],
-          },
-        })
-      })
-    })
-
-    return bids
+    return Boolean(bid.bidId && bid.params && bid.params.publisherId && precisoBid);
   },
-
-  getUserSyncs: (syncOptions, serverResponses = [], gdprConsent = {}, uspConsent = '', gppConsent = '') => {
-    let syncs = [];
-    let { gdprApplies, consentString = '' } = gdprConsent;
-
-    if (syncOptions.iframeEnabled) {
-      syncs.push({
-        type: 'iframe',
-        url: `${URL_SYNC}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}&us_privacy=${uspConsent}&t=4`
-      });
-    } else {
-      syncs.push({
-        type: 'image',
-        url: `${URL_SYNC}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}&us_privacy=${uspConsent}&t=2`
-      });
-    }
-
-    return syncs
+  buildRequests: buildRequests(endpoint),
+  interpretResponse: buildBidResponse,
+  onBidWon,
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    syncEndpoint = syncEndpoint + 'id=' + sharedId;
+    return buildUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent, syncEndpoint);
   }
-
 };
 
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidFloor', 0);
-  }
+registerBidder(spec);
 
+async function getapi(url) {
   try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
+    const response = await fetch(url);
+    var data = await response.json();
+
+    const dataMap = new Map(Object.entries(data));
+    const uuidValue = dataMap.get('UUID');
+
+    if (!Object.is(uuidValue, null) && !Object.is(uuidValue, undefined)) {
+      if (storage.localStorageIsEnabled()) {
+        storage.setDataInLocalStorage('_pre|id', uuidValue);
+      }
+    }
+    return data;
+  } catch (error) {
+    logInfo('Error in preciso precall' + error);
   }
 }
-
-registerBidder(spec);
diff --git a/modules/precisoBidAdapter.md b/modules/precisoBidAdapter.md
index b1fb0d062da..97521f195d8 100644
--- a/modules/precisoBidAdapter.md
+++ b/modules/precisoBidAdapter.md
@@ -14,9 +14,9 @@ Module that connects to preciso' demand sources
 
 | Name          | Scope    | Description               | Example              |
 | :------------ | :------- | :------------------------ | :------------------- |
-| `region`  | required (for prebid.js)     | region | "prebid-eu" |
-| `publisherId` | required (for prebid-server) | partner ID | "1901" |
-| `traffic`   | optional (for prebid.js)     | Configures the mediaType that should be used. Values can be banner, native or video | "banner" |
+| `region`      | optional (for prebid.js)     | 3 letter country code | "USA"  |
+| `publisherId` | required (for prebid-server) |  partner ID provided by preciso | PreTest_0001 |
+| `traffic`     | optional (for prebid.js)     | Configures the mediaType that should be used. Values can be banner, native | "banner" |
 
 # Test Parameters
 ```
@@ -25,7 +25,35 @@ Module that connects to preciso' demand sources
                 {
                     code: 'placementId_0',
                     mediaTypes: {
-                        native: {}
+                        native: {
+                            ortb: {
+                                assets: [
+                                   {
+                                        id: 3,
+                                        required: 1,
+                                        img: {
+                                            type: 3,
+                                            w: 300,
+                                            h: 250
+                                        }
+                                    },
+                                {
+                                    id: 1,
+                                    required: 1,
+                                    title: {
+                                        len: 800
+                                    }
+                                },
+                                {
+                                    id: 4,
+                                    required: 0,
+                                    data: {
+                                        type: 1
+                                    }
+                                }
+                            ]
+                        }
+                        }
                     },
                     bids: [
                         {
@@ -33,7 +61,7 @@ Module that connects to preciso' demand sources
                             params: {
                                 host: 'prebid',
                                 publisherId: '0',
-                                region: 'prebid-eu',
+                                region: 'USA',
                                 traffic: 'native'
                             }
                         }
@@ -53,32 +81,11 @@ Module that connects to preciso' demand sources
                             params: {
                                 host: 'prebid',
                                 publisherId: '0',
-                                region: 'prebid-eu',
+                                region: 'USA',
                                 traffic: 'banner'
                             }
                         }
                     ]
-                },
-                // Will return test vast xml. All video params are stored under placement in publishers UI
-                {
-                    code: 'placementId_0',
-                    mediaTypes: {
-                        video: {
-                            playerSize: [640, 480],
-                            context: 'instream'
-                        }
-                    },
-                    bids: [
-                        {
-                            bidder: 'preciso',
-                            params: {
-                                host: 'prebid',
-                                publisherId: '0',
-                                region: 'prebid-eu',
-                                traffic: 'video'
-                            }
-                        }
-                    ]
                 }
             ]; 
 ```
\ No newline at end of file
diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index 07f8fbed45d..d14a82af360 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -3,7 +3,6 @@ import {
   deepAccess,
   deepClone,
   deepSetValue,
-  generateUUID,
   getParameterByName,
   isNumber,
   logError,
@@ -13,13 +12,14 @@ import {
   parseGPTSingleSizeArray,
   parseUrl,
   pick,
-  deepEqual
+  deepEqual,
+  generateUUID
 } from '../src/utils.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {config} from '../src/config.js';
 import {ajaxBuilder} from '../src/ajax.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS, REJECTION_REASON } from '../src/constants.js';
 import {getHook} from '../src/hook.js';
 import {find} from '../src/polyfill.js';
 import {getRefererInfo} from '../src/refererDetection.js';
@@ -30,6 +30,12 @@ import {timedAuctionHook, timedBidResponseHook} from '../src/utils/perfMetrics.j
 import {adjustCpm} from '../src/utils/cpm.js';
 import {getGptSlotInfoForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
 import {convertCurrency} from '../libraries/currencyUtils/currency.js';
+import { timeoutQueue } from '../libraries/timeoutQueue/timeoutQueue.js';
+
+export const FLOOR_SKIPPED_REASON = {
+  NOT_FOUND: 'not_found',
+  RANDOM: 'random'
+};
 
 /**
  * @summary This Module is intended to provide users with the ability to dynamically set and enforce price floors on a per auction basis.
@@ -51,12 +57,12 @@ export let allowedFields = [SYN_FIELD, 'gptSlot', 'adUnitCode', 'size', 'domain'
 
 /**
  * @summary This is a flag to indicate if a AJAX call is processing for a floors request
-*/
+ */
 let fetching = false;
 
 /**
  * @summary so we only register for our hooks once
-*/
+ */
 let addedFloorsHook = false;
 
 /**
@@ -67,7 +73,7 @@ let _floorsConfig = {};
 /**
  * @summary If a auction is to be delayed by an ongoing fetch we hold it here until it can be resumed
  */
-let _delayedAuctions = [];
+const _delayedAuctions = timeoutQueue();
 
 /**
  * @summary Each auction can have differing floors data depending on execution time or per adunit setup
@@ -94,8 +100,8 @@ const getHostname = (() => {
 })();
 
 // First look into bidRequest!
-function getGptSlotFromAdUnit(transactionId, {index = auctionManager.index} = {}) {
-  const adUnit = index.getAdUnit({transactionId});
+function getGptSlotFromAdUnit(adUnitId, {index = auctionManager.index} = {}) {
+  const adUnit = index.getAdUnit({adUnitId});
   const isGam = deepAccess(adUnit, 'ortb2Imp.ext.data.adserver.name') === 'gam';
   return isGam && adUnit.ortb2Imp.ext.data.adserver.adslot;
 }
@@ -111,7 +117,7 @@ export let fieldMatchingFunctions = {
   [SYN_FIELD]: () => '*',
   'size': (bidRequest, bidResponse) => parseGPTSingleSizeArray(bidResponse.size) || '*',
   'mediaType': (bidRequest, bidResponse) => bidResponse.mediaType || 'banner',
-  'gptSlot': (bidRequest, bidResponse) => getGptSlotFromAdUnit((bidRequest || bidResponse).transactionId) || getGptSlotInfoForAdUnitCode(getAdUnitCode(bidRequest, bidResponse)).gptSlot,
+  'gptSlot': (bidRequest, bidResponse) => getGptSlotFromAdUnit((bidRequest || bidResponse).adUnitId) || getGptSlotInfoForAdUnitCode(getAdUnitCode(bidRequest, bidResponse)).gptSlot,
   'domain': getHostname,
   'adUnitCode': (bidRequest, bidResponse) => getAdUnitCode(bidRequest, bidResponse)
 }
@@ -265,6 +271,10 @@ export function getFloor(requestParams = {currency: 'USD', mediaType: '*', size:
     }
   }
 
+  if (floorInfo.floorRuleValue === null) {
+    return null;
+  }
+
   if (floorInfo.matchingFloor) {
     return {
       floor: roundUp(floorInfo.matchingFloor, 4),
@@ -332,13 +342,29 @@ export function getFloorDataFromAdUnits(adUnits) {
   }, {});
 }
 
+function getNoFloorSignalBidersArray(floorData) {
+  const { data, enforcement } = floorData
+  // The data.noFloorSignalBidders higher priority then the enforcment
+  if (data?.noFloorSignalBidders?.length > 0) {
+    return data.noFloorSignalBidders
+  } else if (enforcement?.noFloorSignalBidders?.length > 0) {
+    return enforcement.noFloorSignalBidders
+  }
+  return []
+}
+
 /**
  * @summary This function takes the adUnits for the auction and update them accordingly as well as returns the rules hashmap for the auction
  */
 export function updateAdUnitsForAuction(adUnits, floorData, auctionId) {
+  const noFloorSignalBiddersArray = getNoFloorSignalBidersArray(floorData)
+
   adUnits.forEach((adUnit) => {
     adUnit.bids.forEach(bid => {
-      if (floorData.skipped) {
+      // check if the bidder is in the no signal list
+      const isNoFloorSignaled = noFloorSignalBiddersArray.some(bidderName => bidderName === bid.bidder)
+      if (floorData.skipped || isNoFloorSignaled) {
+        isNoFloorSignaled && logInfo(`noFloorSignal to ${bid.bidder}`)
         delete bid.getFloor;
       } else {
         bid.getFloor = getFloor;
@@ -346,8 +372,10 @@ export function updateAdUnitsForAuction(adUnits, floorData, auctionId) {
       // information for bid and analytics adapters
       bid.auctionId = auctionId;
       bid.floorData = {
+        noFloorSignaled: isNoFloorSignaled,
         skipped: floorData.skipped,
-        skipRate: floorData.skipRate,
+        skipRate: deepAccess(floorData, 'data.skipRate') ?? floorData.skipRate,
+        skippedReason: floorData.skippedReason,
         floorMin: floorData.floorMin,
         modelVersion: deepAccess(floorData, 'data.modelVersion'),
         modelWeight: deepAccess(floorData, 'data.modelWeight'),
@@ -394,11 +422,13 @@ export function createFloorsDataForAuction(adUnits, auctionId) {
   // if we still do not have a valid floor data then floors is not on for this auction, so skip
   if (Object.keys(deepAccess(resolvedFloorsData, 'data.values') || {}).length === 0) {
     resolvedFloorsData.skipped = true;
+    resolvedFloorsData.skippedReason = FLOOR_SKIPPED_REASON.NOT_FOUND
   } else {
     // determine the skip rate now
-    const auctionSkipRate = getParameterByName('pbjs_skipRate') || resolvedFloorsData.skipRate;
+    const auctionSkipRate = getParameterByName('pbjs_skipRate') || (deepAccess(resolvedFloorsData, 'data.skipRate') ?? resolvedFloorsData.skipRate);
     const isSkipped = Math.random() * 100 < parseFloat(auctionSkipRate);
     resolvedFloorsData.skipped = isSkipped;
+    if (isSkipped) resolvedFloorsData.skippedReason = FLOOR_SKIPPED_REASON.RANDOM
   }
   // copy FloorMin to floorData.data
   if (resolvedFloorsData.hasOwnProperty('floorMin')) resolvedFloorsData.data.floorMin = resolvedFloorsData.floorMin;
@@ -411,27 +441,24 @@ export function createFloorsDataForAuction(adUnits, auctionId) {
  * @summary This is the function which will be called to exit our module and continue the auction.
  */
 export function continueAuction(hookConfig) {
-  // only run if hasExited
   if (!hookConfig.hasExited) {
-    // if this current auction is still fetching, remove it from the _delayedAuctions
-    _delayedAuctions = _delayedAuctions.filter(auctionConfig => auctionConfig.timer !== hookConfig.timer);
-
     // We need to know the auctionId at this time. So we will use the passed in one or generate and set it ourselves
     hookConfig.reqBidsConfigObj.auctionId = hookConfig.reqBidsConfigObj.auctionId || generateUUID();
-
     // now we do what we need to with adUnits and save the data object to be used for getFloor and enforcement calls
     _floorDataForAuction[hookConfig.reqBidsConfigObj.auctionId] = createFloorsDataForAuction(hookConfig.reqBidsConfigObj.adUnits || getGlobal().adUnits, hookConfig.reqBidsConfigObj.auctionId);
-
     hookConfig.nextFn.apply(hookConfig.context, [hookConfig.reqBidsConfigObj]);
     hookConfig.hasExited = true;
   }
 }
 
 function validateSchemaFields(fields) {
-  if (Array.isArray(fields) && fields.length > 0 && fields.every(field => allowedFields.indexOf(field) !== -1)) {
-    return true;
+  if (Array.isArray(fields) && fields.length > 0) {
+    if (fields.every(field => allowedFields.includes(field))) {
+      return true;
+    } else {
+      logError(`${MODULE_NAME}: Fields received do not match allowed fields`);
+    }
   }
-  logError(`${MODULE_NAME}: Fields recieved do not match allowed fields`);
   return false;
 }
 
@@ -439,7 +466,7 @@ function isValidRule(key, floor, numFields, delimiter) {
   if (typeof key !== 'string' || key.split(delimiter).length !== numFields) {
     return false;
   }
-  return typeof floor === 'number';
+  return typeof floor === 'number' || floor === null;
 }
 
 function validateRules(floorsData, numFields, delimiter) {
@@ -549,36 +576,22 @@ export const requestBidsHook = timedAuctionHook('priceFloors', function requestB
     reqBidsConfigObj,
     context: this,
     nextFn: fn,
-    haveExited: false,
+    hasExited: false,
     timer: null
   };
 
   // If auction delay > 0 AND we are fetching -> Then wait until it finishes
   if (_floorsConfig.auctionDelay > 0 && fetching) {
-    hookConfig.timer = setTimeout(() => {
+    _delayedAuctions.submit(_floorsConfig.auctionDelay, () => continueAuction(hookConfig), () => {
       logWarn(`${MODULE_NAME}: Fetch attempt did not return in time for auction`);
       _floorsConfig.fetchStatus = 'timeout';
       continueAuction(hookConfig);
-    }, _floorsConfig.auctionDelay);
-    _delayedAuctions.push(hookConfig);
+    });
   } else {
     continueAuction(hookConfig);
   }
 });
 
-/**
- * @summary If an auction was queued to be delayed (waiting for a fetch) then this function will resume
- * those delayed auctions when delay is hit or success return or fail return
- */
-function resumeDelayedAuctions() {
-  _delayedAuctions.forEach(auctionConfig => {
-    // clear the timeout
-    clearTimeout(auctionConfig.timer);
-    continueAuction(auctionConfig);
-  });
-  _delayedAuctions = [];
-}
-
 /**
  * This function handles the ajax response which comes from the user set URL to fetch floors data from
  * @param {object} fetchResponse The floors data response which came back from the url configured in config.floors
@@ -603,7 +616,7 @@ export function handleFetchResponse(fetchResponse) {
   }
 
   // if any auctions are waiting for fetch to finish, we need to continue them!
-  resumeDelayedAuctions();
+  _delayedAuctions.resume();
 }
 
 function handleFetchError(status) {
@@ -612,11 +625,11 @@ function handleFetchError(status) {
   logError(`${MODULE_NAME}: Fetch errored with: `, status);
 
   // if any auctions are waiting for fetch to finish, we need to continue them!
-  resumeDelayedAuctions();
+  _delayedAuctions.resume();
 }
 
 /**
- * This function handles sending and recieving the AJAX call for a floors fetch
+ * This function handles sending and receiving the AJAX call for a floors fetch
  * @param {object} floorsConfig the floors config coming from setConfig
  */
 export function generateAndHandleFetch(floorEndpoint) {
@@ -663,7 +676,8 @@ export function handleSetFloorsConfig(config) {
       'enforceJS', enforceJS => enforceJS !== false, // defaults to true
       'enforcePBS', enforcePBS => enforcePBS === true, // defaults to false
       'floorDeals', floorDeals => floorDeals === true, // defaults to false
-      'bidAdjustment', bidAdjustment => bidAdjustment !== false, // defaults to true
+      'bidAdjustment', bidAdjustment => bidAdjustment !== false, // defaults to true,
+      'noFloorSignalBidders', noFloorSignalBidders => noFloorSignalBidders || []
     ]),
     'additionalSchemaFields', additionalSchemaFields => typeof additionalSchemaFields === 'object' && Object.keys(additionalSchemaFields).length > 0 ? addFieldOverrides(additionalSchemaFields) : undefined,
     'data', data => (data && parseFloorData(data, 'setConfig')) || undefined
@@ -677,7 +691,7 @@ export function handleSetFloorsConfig(config) {
     if (!addedFloorsHook) {
       // register hooks / listening events
       // when auction finishes remove it's associated floor data after 3 seconds so we stil have it for latent responses
-      events.on(CONSTANTS.EVENTS.AUCTION_END, (args) => {
+      events.on(EVENTS.AUCTION_END, (args) => {
         setTimeout(() => delete _floorDataForAuction[args.auctionId], 3000);
       });
 
@@ -748,7 +762,7 @@ export const addBidResponseHook = timedBidResponseHook('priceFloors', function a
   let floorInfo = getFirstMatchingFloor(floorData.data, matchingBidRequest, {...bid, size: [bid.width, bid.height]});
 
   if (!floorInfo.matchingFloor) {
-    logWarn(`${MODULE_NAME}: unable to determine a matching price floor for bidResponse`, bid);
+    if (floorInfo.matchingFloor !== 0) logWarn(`${MODULE_NAME}: unable to determine a matching price floor for bidResponse`, bid);
     return fn.call(this, adUnitCode, bid, reject);
   }
 
@@ -778,7 +792,7 @@ export const addBidResponseHook = timedBidResponseHook('priceFloors', function a
   // now do the compare!
   if (shouldFloorBid(floorData, floorInfo, bid)) {
     // bid fails floor -> throw it out
-    reject(CONSTANTS.REJECTION_REASON.FLOOR_NOT_MET);
+    reject(REJECTION_REASON.FLOOR_NOT_MET);
     logWarn(`${MODULE_NAME}: ${bid.bidderCode}'s Bid Response for ${adUnitCode} was rejected due to floor not met (adjusted cpm: ${bid?.floorData?.cpmAfterAdjustments}, floor: ${floorInfo?.matchingFloor})`, bid);
     return;
   }
@@ -798,7 +812,7 @@ export function setOrtbImpBidFloor(imp, bidRequest, context) {
         currency: context.currency || config.getConfig('currency.adServerCurrency') || 'USD',
         mediaType: context.mediaType || '*',
         size: '*'
-      }));
+      }) || {});
     } catch (e) {
       logWarn('Cannot compute floor for bid', bidRequest);
       return;
diff --git a/modules/prismaBidAdapter.js b/modules/prismaBidAdapter.js
index c13e6e1c330..9f7d37dcebe 100644
--- a/modules/prismaBidAdapter.js
+++ b/modules/prismaBidAdapter.js
@@ -3,6 +3,16 @@ import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {getANKeywordParam} from '../libraries/appnexusUtils/anKeywords.js';
+import {getConnectionType} from '../libraries/connectionInfo/connectionUtils.js'
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
 
 const BIDDER_CODE = 'prisma';
 const BIDDER_URL = 'https://prisma.nexx360.io/prebid';
@@ -11,53 +21,26 @@ const METRICS_TRACKER_URL = 'https://prisma.nexx360.io/track-imp';
 
 const GVLID = 965;
 
-function getConnectionType() {
-  const connection = navigator.connection || navigator.webkitConnection;
-  if (!connection) {
-    return 0;
-  }
-  switch (connection.type) {
-    case 'ethernet':
-      return 1;
-    case 'wifi':
-      return 2;
-    case 'cellular':
-      switch (connection.effectiveType) {
-        case 'slow-2g':
-        case '2g':
-          return 4;
-        case '3g':
-          return 5;
-        case '4g':
-          return 6;
-        default:
-          return 3;
-      }
-    default:
-      return 0;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
   aliases: ['prismadirect'], // short code
   supportedMediaTypes: [BANNER, VIDEO],
   /**
-         * Determines whether or not the given bid request is valid.
-         *
-         * @param {BidRequest} bid The bid params to validate.
-         * @return boolean True if this is a valid bid, and false otherwise.
-         */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     return !!(bid.params.account && bid.params.tagId);
   },
   /**
-         * Make a server request from the list of BidRequests.
-         *
-         * @param {validBidRequests[]} - an array of bids
-         * @return ServerRequest Info describing the request to the server.
-         */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     const adUnits = [];
     const test = config.getConfig('debug') ? 1 : 0;
@@ -109,11 +92,11 @@ export const spec = {
     };
   },
   /**
-         * Unpack the response from the server into a list of bids.
-         *
-         * @param {ServerResponse} serverResponse A successful response from the server.
-         * @return {Bid[]} An array of bids which were nested inside the server.
-         */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, bidRequest) {
     const serverBody = serverResponse.body;
     const bidResponses = [];
@@ -163,12 +146,12 @@ export const spec = {
   },
 
   /**
-     * Register the user sync pixels which should be dropped after the auction.
-     *
-     * @param {SyncOptions} syncOptions Which user syncs are allowed?
-     * @param {ServerResponse[]} serverResponses List of server's responses.
-     * @return {UserSync[]} The user syncs which should be dropped.
-     */
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
     if (typeof serverResponses === 'object' && serverResponses != null && serverResponses.length > 0 && serverResponses[0].hasOwnProperty('body') &&
         serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
@@ -179,9 +162,9 @@ export const spec = {
   },
 
   /**
-     * Register bidder specific code, which will execute if a bid from this bidder won the auction
-     * @param {Bid} The bid that won the auction
-     */
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} bid the bid that won the auction
+   */
   onBidWon: function(bid) {
     // fires a pixel to confirm a winning bid
     const params = { type: 'prebid', mediatype: 'banner' };
diff --git a/modules/programmaticaBidAdapter.js b/modules/programmaticaBidAdapter.js
new file mode 100644
index 00000000000..aeca74120d6
--- /dev/null
+++ b/modules/programmaticaBidAdapter.js
@@ -0,0 +1,153 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { hasPurpose1Consent } from '../src/utils/gdpr.js';
+import { deepAccess, parseSizesInput, isArray } from '../src/utils.js';
+
+const BIDDER_CODE = 'programmatica';
+const DEFAULT_ENDPOINT = 'asr.programmatica.com';
+const SYNC_ENDPOINT = 'sync.programmatica.com';
+const ADOMAIN = 'programmatica.com';
+const TIME_TO_LIVE = 360;
+
+export const spec = {
+  code: BIDDER_CODE,
+
+  isBidRequestValid: function(bid) {
+    let valid = bid.params.siteId && bid.params.placementId;
+
+    return !!valid;
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let requests = [];
+    for (const bid of validBidRequests) {
+      let endpoint = bid.params.endpoint || DEFAULT_ENDPOINT;
+
+      requests.push({
+        method: 'GET',
+        url: `https://${endpoint}/get`,
+        data: {
+          site_id: bid.params.siteId,
+          placement_id: bid.params.placementId,
+          prebid: true,
+        },
+        bidRequest: bid,
+      });
+    }
+
+    return requests;
+  },
+
+  interpretResponse: function(serverResponse, request) {
+    if (!serverResponse?.body?.content?.data) {
+      return [];
+    }
+
+    const bidResponses = [];
+    const body = serverResponse.body;
+
+    let mediaType = BANNER;
+    let ad, vastXml;
+    let width;
+    let height;
+
+    let sizes = getSize(body.size);
+    if (isArray(sizes)) {
+      [width, height] = sizes;
+    }
+
+    if (body.type.format != '') {
+      // banner
+      ad = body.content.data;
+      if (body.content.imps?.length) {
+        for (const imp of body.content.imps) {
+          ad += ``;
+        }
+      }
+    } else {
+      // video
+      vastXml = body.content.data;
+      mediaType = VIDEO;
+
+      if (!width || !height) {
+        const pSize = deepAccess(request.bidRequest, 'mediaTypes.video.playerSize');
+        const reqSize = getSize(pSize);
+        if (isArray(reqSize)) {
+          [width, height] = reqSize;
+        }
+      }
+    }
+
+    const bidResponse = {
+      requestId: request.bidRequest.bidId,
+      cpm: body.cpm,
+      currency: body.currency || 'USD',
+      width: parseInt(width),
+      height: parseInt(height),
+      creativeId: body.id,
+      netRevenue: true,
+      ttl: TIME_TO_LIVE,
+      ad: ad,
+      mediaType: mediaType,
+      vastXml: vastXml,
+      meta: {
+        advertiserDomains: [ADOMAIN],
+      }
+    };
+
+    if ((mediaType === VIDEO && request.bidRequest.mediaTypes?.video) || (mediaType === BANNER && request.bidRequest.mediaTypes?.banner)) {
+      bidResponses.push(bidResponse);
+    }
+
+    return bidResponses;
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = []
+
+    if (!hasPurpose1Consent(gdprConsent)) {
+      return syncs;
+    }
+
+    let params = `usp=${uspConsent ?? ''}&consent=${gdprConsent?.consentString ?? ''}`;
+    if (typeof gdprConsent?.gdprApplies === 'boolean') {
+      params += `&gdpr=${Number(gdprConsent.gdprApplies)}`;
+    }
+
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: `//${SYNC_ENDPOINT}/match/sp.ifr?${params}`
+      });
+    }
+
+    if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: `//${SYNC_ENDPOINT}/match/sp?${params}`
+      });
+    }
+
+    return syncs;
+  },
+
+  onTimeout: function(timeoutData) {},
+  onBidWon: function(bid) {},
+  onSetTargeting: function(bid) {},
+  onBidderError: function() {},
+  supportedMediaTypes: [ BANNER, VIDEO ]
+}
+
+registerBidder(spec);
+
+function getSize(paramSizes) {
+  const parsedSizes = parseSizesInput(paramSizes);
+  const sizes = parsedSizes.map(size => {
+    const [width, height] = size.split('x');
+    const w = parseInt(width, 10);
+    const h = parseInt(height, 10);
+    return [w, h];
+  });
+
+  return sizes[0] || null;
+}
diff --git a/modules/programmaticaBidAdapter.md b/modules/programmaticaBidAdapter.md
new file mode 100644
index 00000000000..5982edf143e
--- /dev/null
+++ b/modules/programmaticaBidAdapter.md
@@ -0,0 +1,46 @@
+# Overview
+
+```
+Module Name: Programmatica Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: tech@programmatica.com
+```
+
+# Description
+Connects to Programmatica server for bids.
+Module supports banner and video mediaType.
+
+# Test Parameters
+
+```
+    var adUnits = [{
+        code: '/test/div',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [{
+            bidder: 'programmatica',
+            params: {
+                siteId: 'cga9l34ipgja79esubrg',
+                placementId: 'cgim20sipgj0vj1cb510'
+            }
+        }]
+    },
+    {
+        code: '/test/div',
+        mediaTypes: {
+            video: {
+                playerSize: [[640, 360]]
+            }
+        },
+        bids: [{
+            bidder: 'programmatica',
+            params: {
+                siteId: 'cga9l34ipgja79esubrg',
+                placementId: 'cioghpcipgj8r721e9ag'
+            }
+        }]
+    },];
+```
diff --git a/modules/pstudioBidAdapter.js b/modules/pstudioBidAdapter.js
new file mode 100644
index 00000000000..cc9310e174b
--- /dev/null
+++ b/modules/pstudioBidAdapter.js
@@ -0,0 +1,433 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  deepAccess,
+  isArray,
+  isNumber,
+  generateUUID,
+  isEmpty,
+} from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const BIDDER_CODE = 'pstudio';
+const ENDPOINT = 'https://exchange.pstudio.tadex.id/prebid-bid'
+const TIME_TO_LIVE = 300;
+// in case that the publisher limits number of user syncs, these syncs will be discarded from the end of the list
+// so more important syncing calls should be at the start of the list
+const USER_SYNCS = [
+  // PARTNER_UID is a partner user id
+  {
+    type: 'img',
+    url: 'https://match.adsrvr.org/track/cmf/generic?ttd_pid=k1on5ig&ttd_tpi=1&ttd_puid=%PARTNER_UID%&dsp=ttd',
+    macro: '%PARTNER_UID%',
+  },
+  {
+    type: 'img',
+    url: 'https://dsp.myads.telkomsel.com/api/v1/pixel?uid=%USERID%',
+    macro: '%USERID%',
+  },
+];
+const COOKIE_NAME = '__tadexid';
+const COOKIE_TTL_DAYS = 365;
+const DAY_IN_MS = 24 * 60 * 60 * 1000;
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
+const VIDEO_PARAMS = [
+  'mimes',
+  'minduration',
+  'maxduration',
+  'protocols',
+  'startdelay',
+  'placement',
+  'plcmt',
+  'skip',
+  'skipafter',
+  'minbitrate',
+  'maxbitrate',
+  'delivery',
+  'playbackmethod',
+  'api',
+  'linearity',
+];
+
+export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+
+  isBidRequestValid: function (bid) {
+    const params = bid.params || {};
+    return !!params.pubid && !!params.adtagid && isVideoRequestValid(bid);
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map((bid) => ({
+      method: 'POST',
+      url: ENDPOINT,
+      data: JSON.stringify(buildRequestData(bid, bidderRequest)),
+      options: {
+        contentType: 'application/json',
+        withCredentials: true,
+      },
+    }));
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = [];
+
+    if (!serverResponse.body.bids) return [];
+    const { id } = JSON.parse(bidRequest.data);
+
+    serverResponse.body.bids.map((bid) => {
+      const { cpm, width, height, currency, ad, meta } = bid;
+      let bidResponse = {
+        requestId: id,
+        cpm,
+        width,
+        height,
+        creativeId: bid.creative_id,
+        currency,
+        netRevenue: bid.net_revenue,
+        ttl: TIME_TO_LIVE,
+        meta: {
+          advertiserDomains: meta.advertiser_domains,
+        },
+      };
+
+      if (bid.vast_url || bid.vast_xml) {
+        bidResponse.vastUrl = bid.vast_url;
+        bidResponse.vastXml = bid.vast_xml;
+        bidResponse.mediaType = VIDEO;
+      } else {
+        bidResponse.ad = ad;
+      }
+
+      bidResponses.push(bidResponse);
+    });
+
+    return bidResponses;
+  },
+
+  getUserSyncs(_optionsType, _serverResponse, _gdprConsent, _uspConsent) {
+    const syncs = [];
+
+    let userId = readUserIdFromCookie(COOKIE_NAME);
+
+    if (!userId) {
+      userId = generateId();
+      writeIdToCookie(COOKIE_NAME, userId);
+    }
+
+    USER_SYNCS.map((userSync) => {
+      if (userSync.type === 'img') {
+        syncs.push({
+          type: 'image',
+          url: userSync.url.replace(userSync.macro, userId),
+        });
+      }
+    });
+
+    return syncs;
+  },
+};
+
+function buildRequestData(bid, bidderRequest) {
+  let payloadObject = buildBaseObject(bid, bidderRequest);
+
+  if (bid.mediaTypes.banner) {
+    return buildBannerObject(bid, payloadObject);
+  } else if (bid.mediaTypes.video) {
+    return buildVideoObject(bid, payloadObject);
+  }
+}
+
+function buildBaseObject(bid, bidderRequest) {
+  const firstPartyData = prepareFirstPartyData(bidderRequest.ortb2);
+  const { pubid, adtagid, bcat, badv, bapp } = bid.params;
+  const { userId } = bid;
+  const uid2Token = userId?.uid2?.id;
+
+  if (uid2Token) {
+    if (firstPartyData.user) {
+      firstPartyData.user.uid2_token = uid2Token;
+    } else {
+      firstPartyData.user = { uid2_token: uid2Token };
+    }
+  }
+  const userCookieId = readUserIdFromCookie(COOKIE_NAME);
+  if (userCookieId) {
+    if (firstPartyData.user) {
+      firstPartyData.user.id = userCookieId;
+    } else {
+      firstPartyData.user = { id: userCookieId };
+    }
+  }
+
+  return {
+    id: bid.bidId,
+    pubid,
+    adtagid: adtagid,
+    ...(bcat && { bcat }),
+    ...(badv && { badv }),
+    ...(bapp && { bapp }),
+    ...firstPartyData,
+  };
+}
+
+function buildBannerObject(bid, payloadObject) {
+  const { sizes, pos, name } = bid.mediaTypes.banner;
+
+  payloadObject.banner_properties = {
+    name,
+    sizes,
+    pos,
+  };
+
+  return payloadObject;
+}
+
+function buildVideoObject(bid, payloadObject) {
+  const { context, playerSize, w, h } = bid.mediaTypes.video;
+
+  payloadObject.video_properties = {
+    context,
+    w: w || playerSize[0][0],
+    h: h || playerSize[0][1],
+  };
+
+  for (const param of VIDEO_PARAMS) {
+    const paramValue = deepAccess(bid, `mediaTypes.video.${param}`);
+
+    if (paramValue) {
+      payloadObject.video_properties[param] = paramValue;
+    }
+  }
+
+  return payloadObject;
+}
+
+function readUserIdFromCookie(key) {
+  try {
+    const storedValue = storage.getCookie(key);
+
+    if (storedValue !== null) {
+      return storedValue;
+    }
+  } catch (error) {
+  }
+}
+
+function generateId() {
+  return generateUUID();
+}
+
+function daysToMs(days) {
+  return days * DAY_IN_MS;
+}
+
+function writeIdToCookie(key, value) {
+  if (storage.cookiesAreEnabled()) {
+    const expires = new Date(
+      Date.now() + daysToMs(parseInt(COOKIE_TTL_DAYS))
+    ).toUTCString();
+    storage.setCookie(key, value, expires, '/');
+  }
+}
+
+function prepareFirstPartyData({ user, device, site, app, regs }) {
+  let userData;
+  let deviceData;
+  let siteData;
+  let appData;
+  let regsData;
+
+  if (user) {
+    userData = {
+      yob: user.yob,
+      gender: user.gender,
+    };
+  }
+
+  if (device) {
+    deviceData = {
+      ua: device.ua,
+      dnt: device.dnt,
+      lmt: device.lmt,
+      ip: device.ip,
+      ipv6: device.ipv6,
+      devicetype: device.devicetype,
+      make: device.make,
+      model: device.model,
+      os: device.os,
+      osv: device.osv,
+      js: device.js,
+      language: device.language,
+      carrier: device.carrier,
+      connectiontype: device.connectiontype,
+      ifa: device.ifa,
+      ...(device.geo && {
+        geo: {
+          lat: device.geo.lat,
+          lon: device.geo.lon,
+          country: device.geo.country,
+          region: device.geo.region,
+          regionfips104: device.geo.regionfips104,
+          metro: device.geo.metro,
+          city: device.geo.city,
+          zip: device.geo.zip,
+          type: device.geo.type,
+        },
+      }),
+      ...(device.ext && {
+        ext: {
+          ifatype: device.ext.ifatype,
+        },
+      }),
+    };
+  }
+
+  if (site) {
+    siteData = {
+      id: site.id,
+      name: site.name,
+      domain: site.domain,
+      page: site.page,
+      cat: site.cat,
+      sectioncat: site.sectioncat,
+      pagecat: site.pagecat,
+      ref: site.ref,
+      ...(site.publisher && {
+        publisher: {
+          name: site.publisher.name,
+          cat: site.publisher.cat,
+          domain: site.publisher.domain,
+        },
+      }),
+      ...(site.content && {
+        content: {
+          id: site.content.id,
+          episode: site.content.episode,
+          title: site.content.title,
+          series: site.content.series,
+          artist: site.content.artist,
+          genre: site.content.genre,
+          album: site.content.album,
+          isrc: site.content.isrc,
+          season: site.content.season,
+        },
+      }),
+      mobile: site.mobile,
+    };
+  }
+
+  if (app) {
+    appData = {
+      id: app.id,
+      name: app.name,
+      bundle: app.bundle,
+      domain: app.domain,
+      storeurl: app.storeurl,
+      cat: app.cat,
+      sectioncat: app.sectioncat,
+      pagecat: app.pagecat,
+      ver: app.ver,
+      privacypolicy: app.privacypolicy,
+      paid: app.paid,
+      ...(app.publisher && {
+        publisher: {
+          name: app.publisher.name,
+          cat: app.publisher.cat,
+          domain: app.publisher.domain,
+        },
+      }),
+      keywords: app.keywords,
+      ...(app.content && {
+        content: {
+          id: app.content.id,
+          episode: app.content.episode,
+          title: app.content.title,
+          series: app.content.series,
+          artist: app.content.artist,
+          genre: app.content.genre,
+          album: app.content.album,
+          isrc: app.content.isrc,
+          season: app.content.season,
+        },
+      }),
+    };
+  }
+
+  if (regs) {
+    regsData = { coppa: regs.coppa };
+  }
+
+  return cleanObject({
+    user: userData,
+    device: deviceData,
+    site: siteData,
+    app: appData,
+    regs: regsData,
+  });
+}
+
+function cleanObject(data) {
+  for (let key in data) {
+    if (typeof data[key] == 'object') {
+      cleanObject(data[key]);
+
+      if (isEmpty(data[key])) delete data[key];
+    }
+
+    if (data[key] === undefined) delete data[key];
+  }
+
+  return data;
+}
+
+function isVideoRequestValid(bidRequest) {
+  if (bidRequest.mediaTypes.video) {
+    const { w, h, playerSize, mimes, protocols } = deepAccess(
+      bidRequest,
+      'mediaTypes.video',
+      {}
+    );
+
+    const areSizesValid =
+      (isNumber(w) && isNumber(h)) || validateSizes(playerSize);
+    const areMimesValid = isArray(mimes) && mimes.length > 0;
+    const areProtocolsValid =
+      isArray(protocols) && protocols.length > 0 && protocols.every(isNumber);
+
+    return areSizesValid && areMimesValid && areProtocolsValid;
+  }
+
+  return true;
+}
+
+function validateSizes(sizes) {
+  return (
+    isArray(sizes) &&
+    sizes.length > 0 &&
+    sizes.every(
+      (size) => isArray(size) && size.length === 2 && size.every(isNumber)
+    )
+  );
+}
+
+/* function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.floorPrice ? bid.params.floorPrice : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*',
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+} */
+
+registerBidder(spec);
diff --git a/modules/pstudioBidAdapter.md b/modules/pstudioBidAdapter.md
new file mode 100644
index 00000000000..a4b3e098cfc
--- /dev/null
+++ b/modules/pstudioBidAdapter.md
@@ -0,0 +1,150 @@
+# Overview
+
+```
+Module Name: PStudio Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: pstudio@telkomsel.com 
+```
+
+# Description
+
+Currently module supports banner as well as instream video mediaTypes.
+
+
+# Test parameters
+
+Those parameters should be used to get test responses from the adapter.
+
+```js
+var adUnits = [
+  // Banner ad unit
+  {
+    code: 'test-div-1',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      },
+    },
+    bids: [
+      {
+        bidder: 'pstudio',
+        params: {
+          // id of test publisher
+          pubid: '22430f9d-9610-432c-aabe-6134256f11af',
+          // id of test adtag id
+          adtagid: '6f3173b9-5623-4a4f-8c62-2b1d24ceb4e6',
+        },
+      },
+    ],
+  },
+  // Instream video ad unit
+  {
+    code: 'test-div-2',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [3],
+      },
+    },
+    bids: [
+      {
+        bidder: 'pstudio',
+        params: {
+          // id of test publisher
+          pubid: '22430f9d-9610-432c-aabe-6134256f11af',
+          // id of test adtag id
+          adtagid: '097c601f-ad09-495b-b70b-d9cf6f1edbc1',
+        },
+      },
+    ],
+  },
+];
+```
+
+# Sample Banner Ad Unit
+
+```js
+var adUnits = [
+  {
+    code: 'test-div-1',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+        pos: 0,
+        name: 'test-name',
+      },
+    },
+    bids: [
+      {
+        bidder: 'pstudio',
+        params: {
+          pubid: '22430f9d-9610-432c-aabe-6134256f11af', // required
+          adtagid: 'b9be4c35-3c12-4fa9-96ba-34b90276208c', // required
+          bcat: ['IAB1-1', 'IAB1-3'], // optional
+          badv: ['nike.com'], // optional
+          bapp: ['com.foo.mygame'], // optional
+        },
+      },
+    ],
+  },
+];
+```
+
+# Sample Video Ad Unit
+
+```js
+var videoAdUnits = [
+  {
+    code: 'test-instream-video',
+    mediaTypes: {
+      video: {
+        context: 'instream', // required (only instream accepted)
+        playerSize: [640, 480], // required (alternatively it could be pair of `w` and `h` parameters)
+        mimes: ['video/mp4'], // required (only choices `video/mp4`, `application/javascript`, `video/webm` and `video/ogg` supported)
+        protocols: [2, 3], // 1 required (only choices 2 and 3 supported)
+        minduration: 5, // optional
+        maxduration: 30, // optional
+        startdelay: 5, // optional
+        placement: 1, // optional (only 1 accepted, as it is instream placement)
+        skip: 1, // optional
+        skipafter: 1, // optional
+        minbitrate: 10, // optional
+        maxbitrate: 10, // optional
+        delivery: 1, // optional
+        playbackmethod: [1, 3], // optional
+        api: [2], // optional (only choice 2 supported)
+        linearity: 1, // optional
+      },
+    },
+    bids: [
+      {
+        bidder: 'pstudio',
+        params: {
+          pubid: '22430f9d-9610-432c-aabe-6134256f11af',
+          adtagid: '46e348cf-b79d-43e5-81bc-5954cdf15d7e',
+          badv: ['adidas.com'],
+        },
+      },
+    ],
+  },
+];
+```
+
+# Configuration for video
+
+### Prebid cache
+
+For video ads, Prebid cache must be enabled, as the demand partner does not support caching of video content.
+
+```js
+pbjs.setConfig({
+  cache: {
+    url: 'https://prebid.adnxs.com/pbc/v1/cache',
+  },
+});
+```
+
+Please provide Prebid Cache of your choice. This example uses AppNexus cache, but if you use other cache, change it according to your needs.
+
diff --git a/modules/pubCircleBidAdapter.js b/modules/pubCircleBidAdapter.js
index 54224fd0403..c63b80b819c 100644
--- a/modules/pubCircleBidAdapter.js
+++ b/modules/pubCircleBidAdapter.js
@@ -1,231 +1,19 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'pubcircle';
 const AD_URL = 'https://ml.pubcircle.ai/pbjs';
 const SYNC_URL = 'https://cs.pubcircle.ai';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  placement.placementId = placementId;
-  placement.type = 'publisher';
-
-  if (bid.userId) {
-    getUserId(placement.eids, bid.userId.uid2 && bid.userId.uid2.id, 'uidapi.com');
-    getUserId(placement.eids, bid.userId.lotamePanoramaId, 'lotame.com');
-    getUserId(placement.eids, bid.userId.idx, 'idx.lat');
-    getUserId(placement.eids, bid.userId.idl_env, 'liveramp.com');
-  }
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
-
-function getUserId(eids, id, source, uidExt) {
-  if (id) {
-    var uid = { id };
-    if (uidExt) {
-      uid.ext = uidExt;
-    }
-    eids.push({
-      source,
-      uids: [ uid ]
-    });
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && params.placementId);
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-    // TODO: does the fallback make sense here?
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  },
-
-  onBidViewable: function (bid) {
-    // to do : we need to implement js tag to fire pixel with viewability counter
-  }
+  isBidRequestValid: isBidRequestValid(['placementId']),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/pubProvidedIdSystem.js b/modules/pubProvidedIdSystem.js
index baffd997443..d23d992e495 100644
--- a/modules/pubProvidedIdSystem.js
+++ b/modules/pubProvidedIdSystem.js
@@ -9,6 +9,11 @@ import {submodule} from '../src/hook.js';
 import { logInfo, isArray } from '../src/utils.js';
 import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ */
+
 const MODULE_NAME = 'pubProvidedId';
 
 /** @type {Submodule} */
@@ -25,7 +30,7 @@ export const pubProvidedIdSubmodule = {
    * decode the stored id value for passing to bid request
    * @function
    * @param {string} value
-   * @returns {{pubProvidedId: array}} or undefined if value doesn't exists
+   * @returns {{pubProvidedId: Array}} or undefined if value doesn't exists
    */
   decode(value) {
     const res = value ? {pubProvidedId: value} : undefined;
@@ -37,7 +42,7 @@ export const pubProvidedIdSubmodule = {
    * performs action to obtain id and return a value.
    * @function
    * @param {SubmoduleConfig} [config]
-   * @returns {{id: array}}
+   * @returns {{id: Array}}
    */
   getId(config) {
     const configParams = (config && config.params) || {};
diff --git a/modules/pubgeniusBidAdapter.js b/modules/pubgeniusBidAdapter.js
index d92a9352cee..19260e65e60 100644
--- a/modules/pubgeniusBidAdapter.js
+++ b/modules/pubgeniusBidAdapter.js
@@ -155,7 +155,7 @@ function buildVideoParams(videoMediaType, videoParams) {
     'maxduration',
     'protocols',
     'startdelay',
-    'placement',
+    'plcmt',
     'skip',
     'skipafter',
     'minbitrate',
@@ -166,17 +166,6 @@ function buildVideoParams(videoMediaType, videoParams) {
     'linearity',
   ]);
 
-  switch (videoMediaType.context) {
-    case 'instream':
-      params.placement = 1;
-      break;
-    case 'outstream':
-      params.placement = 2;
-      break;
-    default:
-      break;
-  }
-
   if (videoMediaType.playerSize) {
     params.w = videoMediaType.playerSize[0][0];
     params.h = videoMediaType.playerSize[0][1];
@@ -205,7 +194,7 @@ function buildImp(bid) {
       mediaType: bid.mediaTypes.banner ? 'banner' : 'video',
       size: '*',
       currency: 'USD',
-    });
+    }) || {};
 
     if (floor) {
       imp.bidfloor = floor;
@@ -301,8 +290,7 @@ function isValidBanner(banner) {
 function isValidVideo(videoMediaType, videoParams) {
   const params = buildVideoParams(videoMediaType, videoParams);
 
-  return !!(params.placement &&
-    isValidSize([params.w, params.h]) &&
+  return !!(isValidSize([params.w, params.h]) &&
     params.mimes && params.mimes.length &&
     isArrayOfNums(params.protocols) && params.protocols.length);
 }
diff --git a/modules/publinkIdSystem.js b/modules/publinkIdSystem.js
index 5b20dbb620a..e8eb90cd02a 100644
--- a/modules/publinkIdSystem.js
+++ b/modules/publinkIdSystem.js
@@ -12,10 +12,19 @@ import { parseUrl, buildUrl, logError } from '../src/utils.js';
 import {uspDataHandler} from '../src/adapterManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'publinkId';
 const GVLID = 24;
 const PUBLINK_COOKIE = '_publink';
 const PUBLINK_S2S_COOKIE = '_publink_srv';
+const PUBLINK_REQUEST_PATH = '/cvx/client/sync/publink';
+const PUBLINK_REFRESH_PATH = '/cvx/client/sync/publink/refresh';
 
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME});
 
@@ -23,10 +32,9 @@ function isHex(s) {
   return /^[A-F0-9]+$/i.test(s);
 }
 
-function publinkIdUrl(params, consentData) {
-  let url = parseUrl('https://proc.ad.cpe.dotomi.com/cvx/client/sync/publink');
+function publinkIdUrl(params, consentData, storedId) {
+  let url = parseUrl('https://proc.ad.cpe.dotomi.com' + PUBLINK_REFRESH_PATH);
   url.search = {
-    deh: params.e,
     mpn: 'Prebid.js',
     mpv: '$prebid.version$',
   };
@@ -36,9 +44,21 @@ function publinkIdUrl(params, consentData) {
     url.search.gdpr_consent = consentData.consentString;
   }
 
-  if (params.site_id) { url.search.sid = params.site_id; }
+  if (params) {
+    if (params.e) {
+      // if there's an email parameter call the request path
+      url.search.deh = params.e;
+      url.pathname = PUBLINK_REQUEST_PATH;
+    }
+
+    if (params.site_id) { url.search.sid = params.site_id; }
+
+    if (params.api_key) { url.search.apikey = params.api_key; }
+  }
 
-  if (params.api_key) { url.search.apikey = params.api_key; }
+  if (storedId) {
+    url.search.publink = storedId;
+  }
 
   const usPrivacyString = uspDataHandler.getConsentData();
   if (usPrivacyString && typeof usPrivacyString === 'string') {
@@ -48,7 +68,7 @@ function publinkIdUrl(params, consentData) {
   return buildUrl(url);
 }
 
-function makeCallback(config = {}, consentData) {
+function makeCallback(config = {}, consentData, storedId) {
   return function(prebidCallback) {
     const options = {method: 'GET', withCredentials: true};
     let handleResponse = function(responseText, xhr) {
@@ -59,15 +79,12 @@ function makeCallback(config = {}, consentData) {
         }
       }
     };
-
-    if (config.params && config.params.e) {
-      if (isHex(config.params.e)) {
-        ajax(publinkIdUrl(config.params, consentData), handleResponse, undefined, options);
-      } else {
-        logError('params.e must be a hex string');
-      }
+    if ((config.params && config.params.e && isHex(config.params.e)) || storedId) {
+      ajax(publinkIdUrl(config.params, consentData, storedId), handleResponse, undefined, options);
+    } else if (config.params.e) {
+      logError('params.e must be a hex string');
     }
-  };
+  }
 }
 
 function getlocalValue() {
@@ -137,9 +154,7 @@ export const publinkIdSubmodule = {
     if (localValue) {
       return {id: localValue};
     }
-    if (!storedId) {
-      return {callback: makeCallback(config, consentData)};
-    }
+    return {callback: makeCallback(config, consentData, storedId)};
   },
   eids: {
     'publinkId': {
diff --git a/modules/publirBidAdapter.js b/modules/publirBidAdapter.js
new file mode 100644
index 00000000000..2cf55aa86cb
--- /dev/null
+++ b/modules/publirBidAdapter.js
@@ -0,0 +1,138 @@
+import {
+  logWarn,
+  logInfo,
+  isArray,
+  deepAccess,
+  timestamp,
+  triggerPixel,
+} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { ajax } from '../src/ajax.js';
+import {
+  generateBidsParams,
+  generateGeneralParams,
+} from '../libraries/riseUtils/index.js';
+
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+const BIDDER_CODE = 'publir';
+const ADAPTER_VERSION = '1.0.0';
+const TTL = 360;
+const CURRENCY = 'USD';
+const BASE_URL = 'https://prebid.publir.com/publirPrebidEndPoint';
+const DEFAULT_IMPS_ENDPOINT = 'https://prebidimpst.publir.com/publirPrebidImpressionTracker';
+
+export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
+export const spec = {
+  code: BIDDER_CODE,
+  version: ADAPTER_VERSION,
+  aliases: ['plr'],
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest.params.pubId) {
+      logWarn('pubId is a mandatory param for Publir adapter');
+      return false;
+    }
+    return true;
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const combinedRequestsObject = {};
+
+    const generalObject = validBidRequests[0];
+    combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest, ADAPTER_VERSION);
+    combinedRequestsObject.bids = generateBidsParams(validBidRequests, bidderRequest);
+    combinedRequestsObject.bids.timestamp = timestamp();
+
+    let options = {
+      withCredentials: false
+    };
+
+    return {
+      method: 'POST',
+      url: BASE_URL,
+      data: combinedRequestsObject,
+      options
+    };
+  },
+  interpretResponse: function ({ body }) {
+    const bidResponses = [];
+    if (body.bids) {
+      body.bids.forEach(adUnit => {
+        const bidResponse = {
+          requestId: adUnit.requestId,
+          cpm: adUnit.cpm,
+          currency: adUnit.currency || CURRENCY,
+          width: adUnit.width,
+          height: adUnit.height,
+          ttl: adUnit.ttl || TTL,
+          creativeId: adUnit.creativeId,
+          netRevenue: adUnit.netRevenue || true,
+          nurl: adUnit.nurl,
+          mediaType: adUnit.mediaType,
+          meta: {
+            mediaType: adUnit.mediaType
+          },
+        };
+
+        if (adUnit.mediaType === VIDEO) {
+          bidResponse.vastXml = adUnit.vastXml;
+        } else if (adUnit.mediaType === BANNER) {
+          bidResponse.ad = adUnit.ad;
+        }
+
+        if (adUnit.adomain && adUnit.adomain.length) {
+          bidResponse.meta.advertiserDomains = adUnit.adomain;
+        } else {
+          bidResponse.meta.advertiserDomains = [];
+        }
+        if (adUnit?.meta?.ad_key) {
+          bidResponse.meta.ad_key = adUnit.meta.ad_key ?? null;
+        }
+        if (adUnit.campId) {
+          bidResponse.campId = adUnit.campId;
+        }
+        bidResponse.bidder = BIDDER_CODE;
+        bidResponses.push(bidResponse);
+      });
+    } else {
+      return [];
+    }
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (response.body && response.body.params) {
+        if (syncOptions.iframeEnabled && deepAccess(response, 'body.params.userSyncURL')) {
+          syncs.push({
+            type: 'iframe',
+            url: deepAccess(response, 'body.params.userSyncURL')
+          });
+        }
+        if (syncOptions.pixelEnabled && isArray(deepAccess(response, 'body.params.userSyncPixels'))) {
+          const pixels = response.body.params.userSyncPixels.map(pixel => {
+            return {
+              type: 'image',
+              url: pixel
+            };
+          });
+          syncs.push(...pixels);
+        }
+      }
+    }
+    return syncs;
+  },
+  onBidWon: function (bid) {
+    if (bid == null) {
+      return;
+    }
+    logInfo('onBidWon:', bid);
+    ajax(DEFAULT_IMPS_ENDPOINT, null, JSON.stringify(bid), { method: 'POST', mode: 'no-cors', credentials: 'include', headers: { 'Content-Type': 'application/json' } });
+    if (bid.hasOwnProperty('nurl') && bid.nurl.length > 0) {
+      triggerPixel(bid.nurl);
+    }
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/publirBidAdapter.md b/modules/publirBidAdapter.md
new file mode 100644
index 00000000000..872fd40c2ae
--- /dev/null
+++ b/modules/publirBidAdapter.md
@@ -0,0 +1,47 @@
+# Overview
+
+```
+Module Name:  Publir Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: info@publir.com
+```
+
+
+# Description
+
+Module that connects to Publir's demand sources.
+
+The Publir adapter requires setup and approval from the Publir. Please reach out to info@publir.com to create an Publir account.
+
+The adapter supports Video(instream).
+
+# Bid Parameters
+## Video
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `pubId` | required | String |  Publir publisher Id provided by your Publir representative  | "1234567890abcdef12345678"
+
+
+# Test Parameters
+```javascript
+var adUnits = [
+       {
+        code: 'hre_div-hre-vcn-1',
+        sizes: [[1080, 1920]]],
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [1080, 1920],
+            ],
+          },
+        },
+        bids: [{
+          bidder: 'publir',
+          params: {
+            pubId: '1234567890abcdef12345678'
+          }
+        }]
+      }
+   ];
+```
diff --git a/modules/pubmaticAnalyticsAdapter.js b/modules/pubmaticAnalyticsAdapter.js
index 0651b373f12..2fec213a612 100755
--- a/modules/pubmaticAnalyticsAdapter.js
+++ b/modules/pubmaticAnalyticsAdapter.js
@@ -1,14 +1,25 @@
-import {_each, isArray, isStr, logError, logWarn, pick} from '../src/utils.js';
+import {_each, isArray, isStr, logError, logWarn, pick, generateUUID} from '../src/utils.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { BID_STATUS, EVENTS, STATUS, REJECTION_REASON } from '../src/constants.js';
 import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {getGptSlotInfoForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
 
+const FLOOR_VALUES = {
+  NO_DATA: 'noData',
+  AD_UNIT: 'adUnit',
+  SET_CONFIG: 'setConfig',
+  FETCH: 'fetch',
+  SUCCESS: 'success',
+  ERROR: 'error',
+  TIMEOUT: 'timeout'
+};
+
 /// /////////// CONSTANTS //////////////
 const ADAPTER_CODE = 'pubmatic';
+const VENDOR_OPENWRAP = 'openwrap';
 const SEND_TIMEOUT = 2000;
 const END_POINT_HOST = 'https://t.pubmatic.com/';
 const END_POINT_BID_LOGGER = END_POINT_HOST + 'wl?';
@@ -93,7 +104,7 @@ function copyRequiredBidDetails(bid) {
     'bidderCode',
     'adapterCode',
     'bidId',
-    'status', () => NO_BID, // default a bid to NO_BID until response is recieved or bid is timed out
+    'status', () => NO_BID, // default a bid to NO_BID until response is received or bid is timed out
     'finalSource as source',
     'params',
     'floorData',
@@ -108,7 +119,7 @@ function copyRequiredBidDetails(bid) {
 
 function setBidStatus(bid, args) {
   switch (args.getStatusCode()) {
-    case CONSTANTS.STATUS.GOOD:
+    case STATUS.GOOD:
       bid.status = SUCCESS;
       delete bid.error; // it's possible for this to be set by a previous timeout
       break;
@@ -150,6 +161,7 @@ function parseBidResponse(bid) {
     'cpm', () => window.parseFloat(Number(bid.cpm).toFixed(BID_PRECISION)),
     'originalCpm', () => window.parseFloat(Number(bid.originalCpm).toFixed(BID_PRECISION)),
     'originalCurrency',
+    'adserverTargeting',
     'dealChannel',
     'meta',
     'status',
@@ -258,14 +270,41 @@ function isS2SBidder(bidder) {
   return (s2sBidders.indexOf(bidder) > -1) ? 1 : 0
 }
 
-function gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestBid) {
+function isOWPubmaticBid(adapterName) {
+  let s2sConf = config.getConfig('s2sConfig');
+  let s2sConfArray = isArray(s2sConf) ? s2sConf : [s2sConf];
+  return s2sConfArray.some(conf => {
+    if (adapterName === ADAPTER_CODE && conf.defaultVendor === VENDOR_OPENWRAP &&
+      conf.bidders.indexOf(ADAPTER_CODE) > -1) {
+      return true;
+    }
+  })
+}
+
+function gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestBid, e) {
   highestBid = (highestBid && highestBid.length > 0) ? highestBid[0] : null;
   return Object.keys(adUnit.bids).reduce(function(partnerBids, bidId) {
     adUnit.bids[bidId].forEach(function(bid) {
+      let adapterName = getAdapterNameForAlias(bid.adapterCode || bid.bidder);
+      if (isOWPubmaticBid(adapterName) && isS2SBidder(bid.bidder)) {
+        return;
+      }
+      const pg = window.parseFloat(Number(bid.bidResponse?.adserverTargeting?.hb_pb || bid.bidResponse?.adserverTargeting?.pwtpb).toFixed(BID_PRECISION));
+
+      const prebidBidsReceived = e?.bidsReceived;
+      if (isArray(prebidBidsReceived) && prebidBidsReceived.length > 0) {
+        prebidBidsReceived.forEach(function(iBid) {
+          if (iBid.adId === bid.adId) {
+            bid.bidderCode = iBid.bidderCode;
+          }
+        });
+      }
+
       partnerBids.push({
-        'pn': getAdapterNameForAlias(bid.adapterCode || bid.bidder),
+        'pn': adapterName,
         'bc': bid.bidderCode || bid.bidder,
         'bidid': bid.bidId || bidId,
+        'origbidid': bid?.bidResponse?.partnerImpId || bid?.bidResponse?.prebidBidId || bid.bidId || bidId,
         'db': bid.bidResponse ? 0 : 1,
         'kgpv': getValueForKgpv(bid, adUnitId),
         'kgpsv': bid.params && bid.params.kgpv ? bid.params.kgpv : adUnitId,
@@ -285,9 +324,9 @@ function gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestBid) {
         'af': bid.bidResponse ? (bid.bidResponse.mediaType || undefined) : undefined,
         'ocpm': bid.bidResponse ? (bid.bidResponse.originalCpm || 0) : 0,
         'ocry': bid.bidResponse ? (bid.bidResponse.originalCurrency || CURRENCY_USD) : CURRENCY_USD,
-        'piid': bid.bidResponse ? (bid.bidResponse.partnerImpId || EMPTY_STRING) : EMPTY_STRING,
-        'frv': (bid.bidResponse ? (bid.bidResponse.floorData ? bid.bidResponse.floorData.floorRuleValue : undefined) : undefined),
-        'md': bid.bidResponse ? getMetadata(bid.bidResponse.meta) : undefined
+        'frv': bid.bidResponse ? bid.bidResponse.floorData?.floorRuleValue : undefined,
+        'md': bid.bidResponse ? getMetadata(bid.bidResponse.meta) : undefined,
+        'pb': pg || undefined
       });
     });
     return partnerBids;
@@ -327,9 +366,9 @@ function getFloorFetchStatus(floorData) {
     return false;
   }
   const { location, fetchStatus } = floorData?.floorRequestData;
-  const isDataValid = location !== CONSTANTS.FLOOR_VALUES.NO_DATA;
-  const isFetchSuccessful = location === CONSTANTS.FLOOR_VALUES.FETCH && fetchStatus === CONSTANTS.FLOOR_VALUES.SUCCESS;
-  const isAdUnitOrSetConfig = location === CONSTANTS.FLOOR_VALUES.AD_UNIT || location === CONSTANTS.FLOOR_VALUES.SET_CONFIG;
+  const isDataValid = location !== FLOOR_VALUES.NO_DATA;
+  const isFetchSuccessful = location === FLOOR_VALUES.FETCH && fetchStatus === FLOOR_VALUES.SUCCESS;
+  const isAdUnitOrSetConfig = location === FLOOR_VALUES.AD_UNIT || location === FLOOR_VALUES.SET_CONFIG;
   return isDataValid && (isAdUnitOrSetConfig || isFetchSuccessful);
 }
 
@@ -337,11 +376,11 @@ function executeBidsLoggerCall(e, highestCpmBids) {
   let auctionId = e.auctionId;
   let referrer = config.getConfig('pageUrl') || cache.auctions[auctionId].referer || '';
   let auctionCache = cache.auctions[auctionId];
-  let floorData = auctionCache.floorData;
+  let wiid = auctionCache?.wiid || auctionId;
+  let floorData = auctionCache?.floorData;
+  let floorFetchStatus = getFloorFetchStatus(auctionCache?.floorData);
   let outputObj = { s: [] };
   let pixelURL = END_POINT_BID_LOGGER;
-  // will return true if floor data is present.
-  let fetchStatus = getFloorFetchStatus(auctionCache.floorData);
 
   if (!auctionCache) {
     return;
@@ -353,7 +392,7 @@ function executeBidsLoggerCall(e, highestCpmBids) {
 
   pixelURL += 'pubid=' + publisherId;
   outputObj['pubid'] = '' + publisherId;
-  outputObj['iid'] = '' + auctionId;
+  outputObj['iid'] = '' + wiid;
   outputObj['to'] = '' + auctionCache.timeout;
   outputObj['purl'] = referrer;
   outputObj['orig'] = getDomainFromUrl(referrer);
@@ -362,8 +401,9 @@ function executeBidsLoggerCall(e, highestCpmBids) {
   outputObj['pdvid'] = '' + profileVersionId;
   outputObj['dvc'] = {'plt': getDevicePlatform()};
   outputObj['tgid'] = getTgId();
+  outputObj['pbv'] = '$prebid.version$' || '-1';
 
-  if (floorData && fetchStatus) {
+  if (floorData && floorFetchStatus) {
     outputObj['fmv'] = floorData.floorRequestData ? floorData.floorRequestData.modelVersion || undefined : undefined;
     outputObj['ft'] = floorData.floorResponseData ? (floorData.floorResponseData.enforcements.enforceJS == false ? 0 : 1) : undefined;
   }
@@ -374,12 +414,29 @@ function executeBidsLoggerCall(e, highestCpmBids) {
     // getGptSlotInfoForAdUnitCode returns gptslot corresponding to adunit provided as input.
     let slotObject = {
       'sn': adUnitId,
-      'au': origAdUnit.adUnitId || getGptSlotInfoForAdUnitCode(adUnitId)?.gptSlot || adUnitId,
+      'au': origAdUnit.owAdUnitId || getGptSlotInfoForAdUnitCode(adUnitId)?.gptSlot || adUnitId,
       'mt': getAdUnitAdFormats(origAdUnit),
       'sz': getSizesForAdUnit(adUnit, adUnitId),
-      'ps': gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestCpmBids.filter(bid => bid.adUnitCode === adUnitId)),
-      'fskp': (floorData && fetchStatus) ? (floorData.floorRequestData ? (floorData.floorRequestData.skipped == false ? 0 : 1) : undefined) : undefined,
+      'ps': gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestCpmBids.filter(bid => bid.adUnitCode === adUnitId), e),
+      'fskp': floorData && floorFetchStatus ? (floorData.floorRequestData ? (floorData.floorRequestData.skipped == false ? 0 : 1) : undefined) : undefined,
+      'sid': generateUUID()
     };
+    if (floorData?.floorRequestData) {
+      const { location, fetchStatus, floorProvider } = floorData?.floorRequestData;
+      slotObject.ffs = {
+        [FLOOR_VALUES.SUCCESS]: 1,
+        [FLOOR_VALUES.ERROR]: 2,
+        [FLOOR_VALUES.TIMEOUT]: 4,
+        undefined: 0
+      }[fetchStatus];
+      slotObject.fsrc = {
+        [FLOOR_VALUES.FETCH]: 2,
+        [FLOOR_VALUES.NO_DATA]: 2,
+        [FLOOR_VALUES.AD_UNIT]: 1,
+        [FLOOR_VALUES.SET_CONFIG]: 1
+      }[location];
+      slotObject.fp = floorProvider;
+    }
     slotsArray.push(slotObject);
     return slotsArray;
   }, []);
@@ -401,37 +458,48 @@ function executeBidsLoggerCall(e, highestCpmBids) {
 function executeBidWonLoggerCall(auctionId, adUnitId) {
   const winningBidId = cache.auctions[auctionId].adUnitCodes[adUnitId].bidWon;
   const winningBids = cache.auctions[auctionId].adUnitCodes[adUnitId].bids[winningBidId];
-  let winningBid = winningBids[0];
+  if (!winningBids) {
+    logWarn(LOG_PRE_FIX + 'Could not find winningBids for : ', auctionId);
+    return;
+  }
 
+  let winningBid = winningBids[0];
   if (winningBids.length > 1) {
     winningBid = winningBids.filter(bid => bid.adId === cache.auctions[auctionId].adUnitCodes[adUnitId].bidWonAdId)[0];
   }
 
   const adapterName = getAdapterNameForAlias(winningBid.adapterCode || winningBid.bidder);
+  if (isOWPubmaticBid(adapterName) && isS2SBidder(winningBid.bidder)) {
+    return;
+  }
   let origAdUnit = getAdUnit(cache.auctions[auctionId].origAdUnits, adUnitId) || {};
+  let owAdUnitId = origAdUnit.owAdUnitId || getGptSlotInfoForAdUnitCode(adUnitId)?.gptSlot || adUnitId;
   let auctionCache = cache.auctions[auctionId];
   let floorData = auctionCache.floorData;
+  let wiid = cache.auctions[auctionId]?.wiid || auctionId;
   let referrer = config.getConfig('pageUrl') || cache.auctions[auctionId].referer || '';
   let adv = winningBid.bidResponse ? getAdDomain(winningBid.bidResponse) || undefined : undefined;
   let fskp = floorData ? (floorData.floorRequestData ? (floorData.floorRequestData.skipped == false ? 0 : 1) : undefined) : undefined;
-
+  let pg = window.parseFloat(Number(winningBid?.bidResponse?.adserverTargeting?.hb_pb || winningBid?.bidResponse?.adserverTargeting?.pwtpb)) || undefined;
   let pixelURL = END_POINT_WIN_BID_LOGGER;
+
   pixelURL += 'pubid=' + publisherId;
   pixelURL += '&purl=' + enc(config.getConfig('pageUrl') || cache.auctions[auctionId].referer || '');
   pixelURL += '&tst=' + Math.round((new window.Date()).getTime() / 1000);
-  pixelURL += '&iid=' + enc(auctionId);
+  pixelURL += '&iid=' + enc(wiid);
   pixelURL += '&bidid=' + enc(winningBidId);
   pixelURL += '&pid=' + enc(profileId);
   pixelURL += '&pdvid=' + enc(profileVersionId);
   pixelURL += '&slot=' + enc(adUnitId);
-  pixelURL += '&au=' + enc(origAdUnit.adUnitId || adUnitId);
+  pixelURL += '&au=' + enc(owAdUnitId);
   pixelURL += '&pn=' + enc(adapterName);
   pixelURL += '&bc=' + enc(winningBid.bidderCode || winningBid.bidder);
   pixelURL += '&en=' + enc(winningBid.bidResponse.bidPriceUSD);
   pixelURL += '&eg=' + enc(winningBid.bidResponse.bidGrossCpmUSD);
   pixelURL += '&kgpv=' + enc(getValueForKgpv(winningBid, adUnitId));
-  pixelURL += '&piid=' + enc(winningBid.bidResponse.partnerImpId || EMPTY_STRING);
+  pixelURL += '&origbidid=' + enc(winningBid?.bidResponse?.partnerImpId || winningBid?.bidResponse?.prebidBidId || winningBid.bidId);
   pixelURL += '&di=' + enc(winningBid?.bidResponse?.dealId || OPEN_AUCTION_DEAL_ID);
+  pg && (pixelURL += '&pb=' + enc(pg));
 
   pixelURL += '&plt=' + enc(getDevicePlatform());
   pixelURL += '&psz=' + enc((winningBid?.bidResponse?.dimensions?.width || '0') + 'x' +
@@ -460,7 +528,10 @@ function executeBidWonLoggerCall(auctionId, adUnitId) {
 function auctionInitHandler(args) {
   s2sBidders = (function() {
     let s2sConf = config.getConfig('s2sConfig');
-    return (s2sConf && isArray(s2sConf.bidders)) ? s2sConf.bidders : [];
+    let s2sBidders = [];
+    (s2sConf || []) &&
+      isArray(s2sConf) ? s2sConf.map(conf => s2sBidders.push(...conf.bidders)) : s2sBidders.push(...s2sConf.bidders);
+    return s2sBidders || [];
   }());
   let cacheEntry = pick(args, [
     'timestamp',
@@ -483,6 +554,9 @@ function bidRequestedHandler(args) {
         dimensions: bid.sizes
       };
     }
+    if (bid.bidder === 'pubmatic' && !!bid?.params?.wiid) {
+      cache.auctions[args.auctionId].wiid = bid.params.wiid;
+    }
     cache.auctions[args.auctionId].adUnitCodes[bid.adUnitCode].bids[bid.bidId] = [copyRequiredBidDetails(bid)];
     if (bid.floorData) {
       cache.auctions[args.auctionId].floorData['floorRequestData'] = bid.floorData;
@@ -491,7 +565,12 @@ function bidRequestedHandler(args) {
 }
 
 function bidResponseHandler(args) {
-  let bid = cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[args.requestId][0];
+  if (!args.requestId) {
+    logWarn(LOG_PRE_FIX + 'Got null requestId in bidResponseHandler');
+    return;
+  }
+  let requestId = args.originalRequestId || args.requestId;
+  let bid = cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[requestId][0];
   if (!bid) {
     logError(LOG_PRE_FIX + 'Could not find associated bid request for bid response with requestId: ', args.requestId);
     return;
@@ -499,7 +578,9 @@ function bidResponseHandler(args) {
 
   if ((bid.bidder && args.bidderCode && bid.bidder !== args.bidderCode) || (bid.bidder === args.bidderCode && bid.status === SUCCESS)) {
     bid = copyRequiredBidDetails(args);
-    cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[args.requestId].push(bid);
+    cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[requestId].push(bid);
+  } else if (args.originalRequestId) {
+    bid.bidId = args.requestId;
   }
 
   if (args.floorData) {
@@ -520,9 +601,9 @@ function bidResponseHandler(args) {
 function bidRejectedHandler(args) {
   // If bid is rejected due to floors value did not met
   // make cpm as 0, status as bidRejected and forward the bid for logging
-  if (args.rejectionReason === CONSTANTS.REJECTION_REASON.FLOOR_NOT_MET) {
+  if (args.rejectionReason === REJECTION_REASON.FLOOR_NOT_MET) {
     args.cpm = 0;
-    args.status = CONSTANTS.BID_STATUS.BID_REJECTED;
+    args.status = BID_STATUS.BID_REJECTED;
     bidResponseHandler(args);
   }
 }
@@ -530,7 +611,7 @@ function bidRejectedHandler(args) {
 function bidderDoneHandler(args) {
   cache.auctions[args.auctionId].bidderDonePendingCount--;
   args.bids.forEach(bid => {
-    let cachedBid = cache.auctions[bid.auctionId].adUnitCodes[bid.adUnitCode].bids[bid.bidId || bid.requestId];
+    let cachedBid = cache.auctions[bid.auctionId].adUnitCodes[bid.adUnitCode].bids[bid.bidId || bid.originalRequestId || bid.requestId];
     if (typeof bid.serverResponseTimeMs !== 'undefined') {
       cachedBid.serverLatencyTimeMs = bid.serverResponseTimeMs;
     }
@@ -545,7 +626,7 @@ function bidderDoneHandler(args) {
 
 function bidWonHandler(args) {
   let auctionCache = cache.auctions[args.auctionId];
-  auctionCache.adUnitCodes[args.adUnitCode].bidWon = args.requestId;
+  auctionCache.adUnitCodes[args.adUnitCode].bidWon = args.originalRequestId || args.requestId;
   auctionCache.adUnitCodes[args.adUnitCode].bidWonAdId = args.adId;
   executeBidWonLoggerCall(args.auctionId, args.adUnitCode);
 }
@@ -555,7 +636,7 @@ function auctionEndHandler(args) {
   let highestCpmBids = getGlobal().getHighestCpmBids() || [];
   setTimeout(() => {
     executeBidsLoggerCall.call(this, args, highestCpmBids);
-  }, (cache.auctions[args.auctionId].bidderDonePendingCount === 0 ? 500 : SEND_TIMEOUT));
+  }, (cache.auctions[args.auctionId]?.bidderDonePendingCount === 0 ? 500 : SEND_TIMEOUT));
 }
 
 function bidTimeoutHandler(args) {
@@ -563,7 +644,7 @@ function bidTimeoutHandler(args) {
   // db = 0 and t = 1 means bidder did  respond with a bid but post timeout
   args.forEach(badBid => {
     let auctionCache = cache.auctions[badBid.auctionId];
-    let bid = auctionCache.adUnitCodes[badBid.adUnitCode].bids[ badBid.bidId || badBid.requestId ][0];
+    let bid = auctionCache.adUnitCodes[badBid.adUnitCode].bids[ badBid.bidId || badBid.originalRequestId || badBid.requestId ][0];
     if (bid) {
       bid.status = ERROR;
       bid.error = {
@@ -616,28 +697,28 @@ let pubmaticAdapter = Object.assign({}, baseAdapter, {
 
   track({eventType, args}) {
     switch (eventType) {
-      case CONSTANTS.EVENTS.AUCTION_INIT:
+      case EVENTS.AUCTION_INIT:
         auctionInitHandler(args);
         break;
-      case CONSTANTS.EVENTS.BID_REQUESTED:
+      case EVENTS.BID_REQUESTED:
         bidRequestedHandler(args);
         break;
-      case CONSTANTS.EVENTS.BID_RESPONSE:
+      case EVENTS.BID_RESPONSE:
         bidResponseHandler(args);
         break;
-      case CONSTANTS.EVENTS.BID_REJECTED:
+      case EVENTS.BID_REJECTED:
         bidRejectedHandler(args)
         break;
-      case CONSTANTS.EVENTS.BIDDER_DONE:
+      case EVENTS.BIDDER_DONE:
         bidderDoneHandler(args);
         break;
-      case CONSTANTS.EVENTS.BID_WON:
+      case EVENTS.BID_WON:
         bidWonHandler(args);
         break;
-      case CONSTANTS.EVENTS.AUCTION_END:
+      case EVENTS.AUCTION_END:
         auctionEndHandler(args);
         break;
-      case CONSTANTS.EVENTS.BID_TIMEOUT:
+      case EVENTS.BID_TIMEOUT:
         bidTimeoutHandler(args);
         break;
     }
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 16d909c2fea..ab83cfdf88a 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -1,11 +1,16 @@
-import { getBidRequest, logWarn, isBoolean, isStr, isArray, inIframe, mergeDeep, deepAccess, isNumber, deepSetValue, logInfo, logError, deepClone, uniques, isPlainObject, isInteger } from '../src/utils.js';
+import { getBidRequest, logWarn, isBoolean, isStr, isArray, inIframe, mergeDeep, deepAccess, isNumber, deepSetValue, logInfo, logError, deepClone, uniques, isPlainObject, isInteger, generateUUID } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO, NATIVE, ADPOD } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { bidderSettings } from '../src/bidderSettings.js';
-import CONSTANTS from '../src/constants.json';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
+import { NATIVE_IMAGE_TYPES, NATIVE_KEYS_THAT_ARE_NOT_ASSETS, NATIVE_KEYS, NATIVE_ASSET_TYPES } from '../src/constants.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
 
 const BIDDER_CODE = 'pubmatic';
 const LOG_WARN_PREFIX = 'PubMatic: ';
@@ -17,10 +22,11 @@ const AUCTION_TYPE = 1;
 const UNDEFINED = undefined;
 const DEFAULT_WIDTH = 0;
 const DEFAULT_HEIGHT = 0;
+const DEFAULT_TTL = 360;
 const PREBID_NATIVE_HELP_LINK = 'http://prebid.org/dev-docs/show-native-ads.html';
 const PUBLICATION = 'pubmatic'; // Your publication on Blue Billywig, potentially with environment (e.g. publication.bbvms.com or publication.test.bbvms.com)
 const RENDERER_URL = 'https://pubmatic.bbvms.com/r/'.concat('$RENDERER', '.js'); // URL of the renderer application
-const MSG_VIDEO_PLACEMENT_MISSING = 'Video.Placement param missing';
+const MSG_VIDEO_PLCMT_MISSING = 'Video.plcmt param missing';
 
 const CUSTOM_PARAMS = {
   'kadpageurl': '', // Custom page url
@@ -63,6 +69,10 @@ const NATIVE_ASSET_IMAGE_TYPE = {
   'IMAGE': 3
 }
 
+const BANNER_CUSTOM_PARAMS = {
+  'battr': DATA_TYPES.ARRAY
+}
+
 const NET_REVENUE = true;
 const dealChannelValues = {
   1: 'PMP',
@@ -131,6 +141,12 @@ const MEDIATYPE = [
   NATIVE
 ]
 
+const MEDIATYPE_TTL = {
+  'banner': 360,
+  'video': 1800,
+  'native': 1800
+};
+
 let publisherId = 0;
 let isInvalidNativeRequest = false;
 let biddersList = ['pubmatic'];
@@ -258,6 +274,25 @@ function _handleCustomParams(params, conf) {
   return conf;
 }
 
+export function getDeviceConnectionType() {
+  let connection = window.navigator && (window.navigator.connection || window.navigator.mozConnection || window.navigator.webkitConnection);
+  switch (connection?.effectiveType) {
+    case 'ethernet':
+      return 1;
+    case 'wifi':
+      return 2;
+    case 'slow-2g':
+    case '2g':
+      return 4;
+    case '3g':
+      return 5;
+    case '4g':
+      return 6;
+    default:
+      return 0;
+  }
+}
+
 function _createOrtbTemplate(conf) {
   return {
     id: '' + new Date().getTime(),
@@ -275,7 +310,8 @@ function _createOrtbTemplate(conf) {
       dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
       h: screen.height,
       w: screen.width,
-      language: navigator.language
+      language: navigator.language,
+      connectiontype: getDeviceConnectionType()
     },
     user: {},
     ext: {}
@@ -326,7 +362,6 @@ const PREBID_NATIVE_DATA_KEYS_TO_ORTB = {
   'displayurl': 'displayurl'
 };
 
-const { NATIVE_IMAGE_TYPES, NATIVE_KEYS_THAT_ARE_NOT_ASSETS, NATIVE_KEYS, NATIVE_ASSET_TYPES } = CONSTANTS;
 const PREBID_NATIVE_DATA_KEY_VALUES = Object.values(PREBID_NATIVE_DATA_KEYS_TO_ORTB);
 
 // TODO remove this function when the support for 1.1 is removed
@@ -527,6 +562,14 @@ function _createBannerRequest(bid) {
     }
     bannerObj.pos = 0;
     bannerObj.topframe = inIframe() ? 0 : 1;
+
+    // Adding Banner custom params
+    const bannerCustomParams = {...deepAccess(bid, 'ortb2Imp.banner')};
+    for (let key in BANNER_CUSTOM_PARAMS) {
+      if (bannerCustomParams.hasOwnProperty(key)) {
+        bannerObj[key] = _checkParamDataType(key, bannerCustomParams[key], BANNER_CUSTOM_PARAMS[key]);
+      }
+    }
   } else {
     logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
     bannerObj = UNDEFINED;
@@ -536,8 +579,8 @@ function _createBannerRequest(bid) {
 
 export function checkVideoPlacement(videoData, adUnitCode) {
   // Check for video.placement property. If property is missing display log message.
-  if (FEATURES.VIDEO && !deepAccess(videoData, 'placement')) {
-    logWarn(MSG_VIDEO_PLACEMENT_MISSING + ' for ' + adUnitCode);
+  if (FEATURES.VIDEO && !deepAccess(videoData, 'plcmt')) {
+    logWarn(MSG_VIDEO_PLCMT_MISSING + ' for ' + adUnitCode);
   };
 }
 
@@ -639,7 +682,7 @@ function _createImpressionObject(bid, bidderRequest) {
   var sizes = bid.hasOwnProperty('sizes') ? bid.sizes : [];
   var mediaTypes = '';
   var format = [];
-  var isFledgeEnabled = bidderRequest?.fledgeEnabled;
+  var isFledgeEnabled = bidderRequest?.paapi?.enabled;
 
   impObj = {
     id: bid.bidId,
@@ -649,7 +692,10 @@ function _createImpressionObject(bid, bidderRequest) {
     ext: {
       pmZoneId: _parseSlotParam('pmzoneid', bid.params.pmzoneid)
     },
-    bidfloorcur: bid.params.currency ? _parseSlotParam('currency', bid.params.currency) : DEFAULT_CURRENCY
+    bidfloorcur: bid.params.currency ? _parseSlotParam('currency', bid.params.currency) : DEFAULT_CURRENCY,
+    displaymanager: 'Prebid.js',
+    displaymanagerver: '$prebid.version$', // prebid version
+    pmp: bid.ortb2Imp?.pmp || undefined
   };
 
   _addPMPDealsInImpression(impObj, bid);
@@ -734,9 +780,9 @@ function _addImpressionFPD(imp, bid) {
   const ortb2 = {...deepAccess(bid, 'ortb2Imp.ext.data')};
   Object.keys(ortb2).forEach(prop => {
     /**
-      * Prebid AdSlot
-      * @type {(string|undefined)}
-    */
+     * Prebid AdSlot
+     * @type {(string|undefined)}
+     */
     if (prop === 'pbadslot') {
       if (typeof ortb2[prop] === 'string' && ortb2[prop]) deepSetValue(imp, 'ext.data.pbadslot', ortb2[prop]);
     } else if (prop === 'adserver') {
@@ -758,6 +804,9 @@ function _addImpressionFPD(imp, bid) {
       deepSetValue(imp, `ext.data.${prop}`, ortb2[prop]);
     }
   });
+
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid');
+  gpid && deepSetValue(imp, `ext.gpid`, gpid);
 }
 
 function _addFloorFromFloorModule(impObj, bid) {
@@ -784,7 +833,7 @@ function _addFloorFromFloorModule(impObj, bid) {
         sizesArray.forEach(size => {
           let floorInfo = bid.getFloor({ currency: impObj.bidfloorcur, mediaType: mediaType, size: size });
           logInfo(LOG_WARN_PREFIX, 'floor from floor module returned for mediatype:', mediaType, ' and size:', size, ' is: currency', floorInfo.currency, 'floor', floorInfo.floor);
-          if (typeof floorInfo === 'object' && floorInfo.currency === impObj.bidfloorcur && !isNaN(parseInt(floorInfo.floor))) {
+          if (isPlainObject(floorInfo) && floorInfo.currency === impObj.bidfloorcur && !isNaN(parseInt(floorInfo.floor))) {
             let mediaTypeFloor = parseFloat(floorInfo.floor);
             logInfo(LOG_WARN_PREFIX, 'floor from floor module:', mediaTypeFloor, 'previous floor value', bidFloor, 'Min:', Math.min(mediaTypeFloor, bidFloor));
             if (bidFloor === -1) {
@@ -817,6 +866,23 @@ function _handleEids(payload, validBidRequests) {
   }
 }
 
+export function setTTL(bid, newBid) {
+  let ttl = MEDIATYPE_TTL[newBid?.mediaType] || DEFAULT_TTL;
+  newBid.ttl = bid.exp || ttl;
+}
+
+// Setting IBV & meta.mediaType field into the bid response
+export function setIBVField(bid, newBid) {
+  if (bid?.ext?.ibv) {
+    newBid.ext = newBid.ext || {};
+    newBid.ext['ibv'] = bid.ext.ibv;
+
+    // Overriding the mediaType field in meta with the `video` value if bid.ext.ibv is present
+    newBid.meta = newBid.meta || {};
+    newBid.meta.mediaType = VIDEO;
+  }
+}
+
 function _checkMediaType(bid, newBid) {
   // Create a regex here to check the strings
   if (bid.ext && bid.ext['bidtype'] != undefined) {
@@ -966,7 +1032,7 @@ function isNonEmptyArray(test) {
  * @param {*} bid : bids
  */
 export function prepareMetaObject(br, bid, seat) {
-  br.meta = {};
+  br.meta = br.meta || {};
 
   if (bid.ext && bid.ext.dspid) {
     br.meta.networkId = bid.ext.dspid;
@@ -1001,6 +1067,15 @@ export function prepareMetaObject(br, bid, seat) {
     br.meta.secondaryCatIds = bid.cat;
     br.meta.primaryCatId = bid.cat[0];
   }
+
+  if (bid.ext && bid.ext.dsa && Object.keys(bid.ext.dsa).length) {
+    br.meta.dsa = bid.ext.dsa;
+  }
+
+  // Initializing meta.mediaType field to the actual bidType returned by the bidder
+  if (br.mediaType) {
+    br.meta.mediaType = br.mediaType;
+  }
 }
 
 export const spec = {
@@ -1008,11 +1083,11 @@ export const spec = {
   gvlid: 76,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   /**
-  * Determines whether or not the given bid request is valid. Valid bid request must have placementId and hbid
-  *
-  * @param {BidRequest} bid The bid params to validate.
-  * @return boolean True if this is a valid bid, and false otherwise.
-  */
+   * Determines whether or not the given bid request is valid. Valid bid request must have placementId and hbid
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: bid => {
     if (bid && bid.params) {
       if (!isStr(bid.params.publisherId)) {
@@ -1061,7 +1136,6 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
@@ -1078,8 +1152,10 @@ export const spec = {
     var bid;
     var blockedIabCategories = [];
     var allowedIabCategories = [];
+    var wiid = generateUUID();
 
     validBidRequests.forEach(originalBid => {
+      originalBid.params.wiid = originalBid.params.wiid || bidderRequest.auctionId || wiid;
       bid = deepClone(originalBid);
       bid.params.adSlot = bid.params.adSlot || '';
       _parseAdSlot(bid);
@@ -1206,11 +1282,16 @@ export const spec = {
       deepSetValue(payload, 'regs.coppa', 1);
     }
 
+    // dsa
+    if (bidderRequest?.ortb2?.regs?.ext?.dsa) {
+      deepSetValue(payload, 'regs.ext.dsa', bidderRequest.ortb2.regs.ext.dsa);
+    }
+
     _handleEids(payload, validBidRequests);
 
     // First Party Data
     const commonFpd = (bidderRequest && bidderRequest.ortb2) || {};
-    const { user, device, site, bcat } = commonFpd;
+    const { user, device, site, bcat, badv } = commonFpd;
     if (site) {
       const { page, domain, ref } = payload.site;
       mergeDeep(payload, {site: site});
@@ -1221,6 +1302,9 @@ export const spec = {
     if (user) {
       mergeDeep(payload, {user: user});
     }
+    if (badv) {
+      mergeDeep(payload, {badv: badv});
+    }
     if (bcat) {
       blockedIabCategories = blockedIabCategories.concat(bcat);
     }
@@ -1229,6 +1313,10 @@ export const spec = {
       payload.device.sua = device?.sua;
     }
 
+    if (device?.ext?.cdep) {
+      deepSetValue(payload, 'device.ext.cdep', device.ext.cdep);
+    }
+
     if (user?.geo && device?.geo) {
       payload.device.geo = { ...payload.device.geo, ...device.geo };
       payload.user.geo = { ...payload.user.geo, ...user.geo };
@@ -1238,6 +1326,11 @@ export const spec = {
       }
     }
 
+    // if present, merge device object from ortb2 into `payload.device`
+    if (bidderRequest?.ortb2?.device) {
+      mergeDeep(payload.device, bidderRequest.ortb2.device);
+    }
+
     if (commonFpd.ext?.prebid?.bidderparams?.[bidderRequest.bidderCode]?.acat) {
       const acatParams = commonFpd.ext.prebid.bidderparams[bidderRequest.bidderCode].acat;
       _allowedIabCategoriesValidation(payload, acatParams);
@@ -1309,7 +1402,7 @@ export const spec = {
                 dealId: bid.dealid,
                 currency: respCur,
                 netRevenue: NET_REVENUE,
-                ttl: 300,
+                ttl: DEFAULT_TTL,
                 referrer: parsedReferrer,
                 ad: bid.adm,
                 pm_seat: seatbidder.seat || null,
@@ -1320,6 +1413,7 @@ export const spec = {
                 parsedRequest.imp.forEach(req => {
                   if (bid.impid === req.id) {
                     _checkMediaType(bid, newBid);
+                    setTTL(bid, newBid);
                     switch (newBid.mediaType) {
                       case BANNER:
                         break;
@@ -1337,12 +1431,12 @@ export const spec = {
                   }
                 });
               }
+              prepareMetaObject(newBid, bid, seatbidder.seat);
+              setIBVField(bid, newBid);
               if (bid.ext && bid.ext.deal_channel) {
                 newBid['dealChannel'] = dealChannelValues[bid.ext.deal_channel] || null;
               }
 
-              prepareMetaObject(newBid, bid, seatbidder.seat);
-
               // adserverTargeting
               if (seatbidder.ext && seatbidder.ext.buyid) {
                 newBid.adserverTargeting = {
@@ -1372,12 +1466,13 @@ export const spec = {
         });
         return {
           bids: bidResponses,
-          fledgeAuctionConfigs,
+          paapi: fledgeAuctionConfigs,
         }
       }
     } catch (error) {
       logError(error);
     }
+
     return bidResponses;
   },
 
@@ -1420,20 +1515,6 @@ export const spec = {
         url: USER_SYNC_URL_IMAGE + syncurl
       }];
     }
-  },
-
-  /**
-   * Covert bid param types for S2S
-   * @param {Object} params bid params
-   * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
-   * @return {Object} params bid params
-   */
-
-  transformBidParams: function (params, isOpenRtb, adUnit, bidRequests) {
-    return convertTypes({
-      'publisherId': 'string',
-      'adSlot': 'string'
-    }, params);
   }
 };
 
diff --git a/modules/pubmaticBidAdapter.md b/modules/pubmaticBidAdapter.md
index baf58177505..6fe84d81350 100644
--- a/modules/pubmaticBidAdapter.md
+++ b/modules/pubmaticBidAdapter.md
@@ -70,6 +70,7 @@ var adVideoAdUnits = [
           protocols: [ 2, 3 ],                  // optional
           battr: [ 13, 14 ],                    // optional
           linearity: 1,                         // optional
+          plcmt: 1,                             // optional
           placement: 2,                         // optional
           minbitrate: 10,                       // optional
           maxbitrate: 10                        // optional
@@ -169,6 +170,7 @@ var adUnits = [
           protocols: [ 2, 3 ],                  // optional
           battr: [ 13, 14 ],                    // optional
           linearity: 1,                         // optional
+          plcmt: 1,                             // optional
           placement: 2,                         // optional
           minbitrate: 10,                       // optional
           maxbitrate: 10                        // optional
@@ -187,7 +189,12 @@ PubMatic recommends the UserSync configuration below.  Without it, the PubMatic
 pbjs.setConfig({
    userSync: {
     iframeEnabled: true,
-    enabledBidders: ['pubmatic'],
+    filterSettings: {
+      iframe: {
+        bidders: '*',    // '*' represents all bidders
+        filter: 'include'
+      }
+    },
     syncDelay: 6000
  }});
 
diff --git a/modules/pubriseBidAdapter.js b/modules/pubriseBidAdapter.js
new file mode 100644
index 00000000000..646546329db
--- /dev/null
+++ b/modules/pubriseBidAdapter.js
@@ -0,0 +1,19 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'pubrise';
+const AD_URL = 'https://backend.pubrise.ai/pbjs';
+const SYNC_URL = 'https://sync.pubrise.ai';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
+};
+
+registerBidder(spec);
diff --git a/modules/pubriseBidAdapter.md b/modules/pubriseBidAdapter.md
new file mode 100755
index 00000000000..4c130954392
--- /dev/null
+++ b/modules/pubriseBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: Pubrise Bidder Adapter
+Module Type: Pubrise Bidder Adapter
+Maintainer: prebid@pubrise.ai
+```
+
+# Description
+
+Connects to Pubrise exchange for bids.
+Pubrise bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'pubrise',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'pubrise',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'pubrise',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/pubwiseAnalyticsAdapter.js b/modules/pubwiseAnalyticsAdapter.js
index 6aed462f2d5..00d8e3ccb6a 100644
--- a/modules/pubwiseAnalyticsAdapter.js
+++ b/modules/pubwiseAnalyticsAdapter.js
@@ -2,7 +2,7 @@ import { getParameterByName, logInfo, generateUUID, debugTurnedOn } from '../src
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
 const MODULE_CODE = 'pubwise';
@@ -176,13 +176,13 @@ function flushEvents() {
 
 function isIngestedEvent(eventType) {
   const ingested = [
-    CONSTANTS.EVENTS.AUCTION_INIT,
-    CONSTANTS.EVENTS.BID_REQUESTED,
-    CONSTANTS.EVENTS.BID_RESPONSE,
-    CONSTANTS.EVENTS.BID_WON,
-    CONSTANTS.EVENTS.BID_TIMEOUT,
-    CONSTANTS.EVENTS.AD_RENDER_FAILED,
-    CONSTANTS.EVENTS.TCF2_ENFORCEMENT
+    EVENTS.AUCTION_INIT,
+    EVENTS.BID_REQUESTED,
+    EVENTS.BID_RESPONSE,
+    EVENTS.BID_WON,
+    EVENTS.BID_TIMEOUT,
+    EVENTS.AD_RENDER_FAILED,
+    EVENTS.TCF2_ENFORCEMENT
   ];
   return ingested.indexOf(eventType) !== -1;
 }
@@ -278,9 +278,9 @@ pubwiseAnalytics.handleEvent = function(eventType, data) {
     metaData = enrichWithCustomSegments(metaData);
 
     // add data on init to the metadata container
-    if (eventType === CONSTANTS.EVENTS.AUCTION_INIT) {
+    if (eventType === EVENTS.AUCTION_INIT) {
       data = filterAuctionInit(data);
-    } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
+    } else if (eventType === EVENTS.BID_RESPONSE) {
       data = filterBidResponse(data);
     }
 
@@ -294,7 +294,7 @@ pubwiseAnalytics.handleEvent = function(eventType, data) {
   }
 
   // once the auction ends, or the event is a bid won send events
-  if (eventType === CONSTANTS.EVENTS.AUCTION_END || eventType === CONSTANTS.EVENTS.BID_WON) {
+  if (eventType === EVENTS.AUCTION_END || eventType === EVENTS.BID_WON) {
     flushEvents();
   }
 };
diff --git a/modules/pubwiseBidAdapter.js b/modules/pubwiseBidAdapter.js
index 6a5d866c76d..df31dde127b 100644
--- a/modules/pubwiseBidAdapter.js
+++ b/modules/pubwiseBidAdapter.js
@@ -1,11 +1,18 @@
 
-import { _each, isBoolean, isEmptyStr, isNumber, isStr, deepClone, isArray, deepSetValue, inIframe, mergeDeep, deepAccess, logMessage, logInfo, logWarn, logError } from '../src/utils.js';
+import { _each, isBoolean, isEmptyStr, isNumber, isStr, deepClone, isArray, deepSetValue, inIframe, mergeDeep, deepAccess, logMessage, logInfo, logWarn, logError, isPlainObject } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 import { OUTSTREAM, INSTREAM } from '../src/video.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const VERSION = '0.3.0';
 const GVLID = 842;
 const NET_REVENUE = true;
@@ -56,6 +63,7 @@ const VIDEO_CUSTOM_PARAMS = {
   'battr': DATA_TYPES.ARRAY,
   'linearity': DATA_TYPES.NUMBER,
   'placement': DATA_TYPES.NUMBER,
+  'plcmt': DATA_TYPES.NUMBER,
   'minbitrate': DATA_TYPES.NUMBER,
   'maxbitrate': DATA_TYPES.NUMBER,
   'skip': DATA_TYPES.NUMBER
@@ -173,7 +181,7 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
+   * @param {validBidRequests} - an array of bids
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
@@ -659,7 +667,7 @@ function _addFloorFromFloorModule(impObj, bid) {
     [BANNER, VIDEO, NATIVE].forEach(mediaType => {
       if (impObj.hasOwnProperty(mediaType)) {
         let floorInfo = bid.getFloor({ currency: impObj.bidFloorCur, mediaType: mediaType, size: '*' });
-        if (typeof floorInfo === 'object' && floorInfo.currency === impObj.bidFloorCur && !isNaN(parseInt(floorInfo.floor))) {
+        if (isPlainObject(floorInfo) && floorInfo.currency === impObj.bidFloorCur && !isNaN(parseInt(floorInfo.floor))) {
           let mediaTypeFloor = parseFloat(floorInfo.floor);
           bidFloor = (bidFloor == -1 ? mediaTypeFloor : Math.min(mediaTypeFloor, bidFloor))
         }
diff --git a/modules/pubxBidAdapter.js b/modules/pubxBidAdapter.js
index ee28d549475..60e5be2a321 100644
--- a/modules/pubxBidAdapter.js
+++ b/modules/pubxBidAdapter.js
@@ -55,8 +55,8 @@ export const spec = {
   /**
    * Determine which user syncs should occur
    * @param {object} syncOptions
-   * @param {array} serverResponses
-   * @returns {array} User sync pixels
+   * @param {Array} serverResponses
+   * @returns {Array} User sync pixels
    */
   getUserSyncs: function (syncOptions, serverResponses) {
     const kwTag = document.getElementsByName('keywords');
diff --git a/modules/pubxaiAnalyticsAdapter.js b/modules/pubxaiAnalyticsAdapter.js
index e97e5505768..b2f9af247f6 100644
--- a/modules/pubxaiAnalyticsAdapter.js
+++ b/modules/pubxaiAnalyticsAdapter.js
@@ -1,208 +1,354 @@
-import { deepAccess, parseSizesInput, getWindowLocation, buildUrl } from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import {
+  getGptSlotInfoForAdUnitCode, getGptSlotForAdUnitCode
+} from '../libraries/gptUtils/gptUtils.js';
+import { getDeviceType, getBrowser, getOS } from '../libraries/userAgentUtils/index.js';
+import { MODULE_TYPE_ANALYTICS } from '../src/activities/modules.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
-import {getGlobal} from '../src/prebidGlobal.js';
-import {getGptSlotInfoForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
+import { sendBeacon } from '../src/ajax.js'
+import { EVENTS } from '../src/constants.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { getStorageManager } from '../src/storageManager.js';
+import {
+  deepAccess, parseSizesInput, getWindowLocation, buildUrl, cyrb53Hash
+} from '../src/utils.js';
+
+let initOptions;
 
 const emptyUrl = '';
 const analyticsType = 'endpoint';
-const pubxaiAnalyticsVersion = 'v1.2.0';
+const adapterCode = 'pubxai';
+const pubxaiAnalyticsVersion = 'v2.1.0';
 const defaultHost = 'api.pbxai.com';
 const auctionPath = '/analytics/auction';
 const winningBidPath = '/analytics/bidwon';
+const storage = getStorageManager({ moduleType: MODULE_TYPE_ANALYTICS, moduleName: adapterCode })
 
-let initOptions;
-let auctionTimestamp;
-let auctionCache = [];
-let events = {
-  bids: [],
-  floorDetail: {},
-  pageDetail: {},
-  deviceDetail: {}
-};
-
-function getStorage() {
-  try {
-    return window.top['sessionStorage'];
-  } catch (e) {
-    return null;
+/**
+ * The sendCache is a global cache object which tracks the pending sends
+ * back to pubx.ai. The data may be removed from this cache, post send.
+ */
+export const sendCache = new Proxy(
+  {},
+  {
+    get: (target, name) => {
+      if (!target.hasOwnProperty(name)) {
+        target[name] = [];
+      }
+      return target[name];
+    },
   }
-}
+);
 
-var pubxaiAnalyticsAdapter = Object.assign(adapter(
+/**
+ * auctionCache is a global cache object which stores all auction histories
+ * for the session. When getting a key from the auction cache, any
+ * information already known about the auction or associated data (floor
+ * data configured by prebid, browser data, user data etc) is added to
+ * the cache automatically.
+ */
+export const auctionCache = new Proxy(
+  {},
   {
-    emptyUrl,
-    analyticsType
-  }), {
-  track({ eventType, args }) {
-    if (typeof args !== 'undefined') {
-      if (eventType === CONSTANTS.EVENTS.BID_TIMEOUT) {
-        args.forEach(item => { mapBidResponse(item, 'timeout'); });
-      } else if (eventType === CONSTANTS.EVENTS.AUCTION_INIT) {
-        events.auctionInit = args;
-        events.floorDetail = {};
-        events.bids = [];
-        const floorData = deepAccess(args, 'bidderRequests.0.bids.0.floorData');
-        if (typeof floorData !== 'undefined') {
-          Object.assign(events.floorDetail, floorData);
-        }
-        auctionTimestamp = args.timestamp;
-      } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
-        mapBidResponse(args, 'response');
-      } else if (eventType === CONSTANTS.EVENTS.BID_WON) {
-        send({
-          winningBid: mapBidResponse(args, 'bidwon')
-        }, 'bidwon');
+    get: (target, name) => {
+      if (!target.hasOwnProperty(name)) {
+        target[name] = {
+          bids: [],
+          auctionDetail: {
+            refreshRank: Object.keys(target).length,
+            auctionId: name,
+          },
+          floorDetail: {},
+          pageDetail: {
+            host: getWindowLocation().host,
+            path: getWindowLocation().pathname,
+            search: getWindowLocation().search,
+          },
+          deviceDetail: {
+            platform: navigator.platform,
+            deviceType: getDeviceType(),
+            deviceOS: getOS(),
+            browser: getBrowser(),
+          },
+          userDetail: {
+            userIdTypes: Object.keys(getGlobal().getUserIds?.() || {}),
+          },
+          consentDetail: {
+            consentTypes: Object.keys(getGlobal().getConsentMetadata?.() || {}),
+          },
+          pmacDetail: JSON.parse(storage.getDataFromLocalStorage('pubx:pmac')) || {}, // {auction_1: {floor:0.23,maxBid:0.34,bidCount:3},auction_2:{floor:0.13,maxBid:0.14,bidCount:2}
+          extraData: JSON.parse(storage.getDataFromLocalStorage('pubx:extraData')) || {},
+          initOptions: {
+            ...initOptions,
+            auctionId: name, // back-compat
+          },
+          sendAs: [],
+        };
       }
-    }
-    if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
-      send(events, 'auctionEnd');
-    }
+      return target[name];
+    },
   }
-});
+);
 
-function mapBidResponse(bidResponse, status) {
-  if (typeof bidResponse !== 'undefined') {
-    let bid = {
-      adUnitCode: bidResponse.adUnitCode,
-      gptSlotCode: getGptSlotInfoForAdUnitCode(bidResponse.adUnitCode).gptSlot || null,
-      auctionId: bidResponse.auctionId,
-      bidderCode: bidResponse.bidder,
-      cpm: bidResponse.cpm,
-      creativeId: bidResponse.creativeId,
-      currency: bidResponse.currency,
-      floorData: bidResponse.floorData,
-      mediaType: bidResponse.mediaType,
-      netRevenue: bidResponse.netRevenue,
-      requestTimestamp: bidResponse.requestTimestamp,
-      responseTimestamp: bidResponse.responseTimestamp,
-      status: bidResponse.status,
-      statusMessage: bidResponse.statusMessage,
-      timeToRespond: bidResponse.timeToRespond,
-      transactionId: bidResponse.transactionId
-    };
-    if (status !== 'bidwon') {
-      Object.assign(bid, {
-        bidId: status === 'timeout' ? bidResponse.bidId : bidResponse.requestId,
-        renderStatus: status === 'timeout' ? 3 : 2,
-        sizes: parseSizesInput(bidResponse.size).toString(),
+/**
+ * Fetch extra ad server data for a specific ad slot (bid)
+ * @param {object} bid an output from extractBid
+ * @returns {object} key value pairs from the adserver
+ */
+const getAdServerDataForBid = (bid) => {
+  const gptSlot = getGptSlotForAdUnitCode(bid);
+  if (gptSlot) {
+    return Object.fromEntries(
+      gptSlot
+        .getTargetingKeys()
+        .filter(
+          (key) =>
+            key.startsWith('pubx-') ||
+            (key.startsWith('hb_') && (key.match(/_/g) || []).length === 1)
+        )
+        .map((key) => [key, gptSlot.getTargeting(key)])
+    );
+  }
+  return {}; // TODO: support more ad servers
+};
+
+/**
+ * extracts and derives valuable data from a prebid bidder bidResponse object
+ * @param {object} bidResponse a prebid bidder bidResponse (see
+ * https://docs.prebid.org/dev-docs/publisher-api-reference/getBidResponses.html)
+ * @returns {object}
+ */
+const extractBid = (bidResponse) => {
+  return {
+    adUnitCode: bidResponse.adUnitCode,
+    gptSlotCode:
+      getGptSlotInfoForAdUnitCode(bidResponse.adUnitCode).gptSlot || null,
+    auctionId: bidResponse.auctionId,
+    bidderCode: bidResponse.bidder,
+    cpm: bidResponse.cpm,
+    creativeId: bidResponse.creativeId,
+    dealId: bidResponse.dealId,
+    currency: bidResponse.currency,
+    floorData: bidResponse.floorData,
+    mediaType: bidResponse.mediaType,
+    netRevenue: bidResponse.netRevenue,
+    requestTimestamp: bidResponse.requestTimestamp,
+    responseTimestamp: bidResponse.responseTimestamp,
+    status: bidResponse.status,
+    sizes: parseSizesInput(bidResponse.size).toString(),
+    statusMessage: bidResponse.statusMessage,
+    timeToRespond: bidResponse.timeToRespond,
+    transactionId: bidResponse.transactionId,
+    bidId: bidResponse.bidId || bidResponse.requestId,
+    placementId: bidResponse.params
+      ? deepAccess(bidResponse, 'params.0.placementId')
+      : null,
+    source: bidResponse.source || 'null',
+  };
+};
+
+/**
+ * Track the events emitted by prebid and handle each case. See https://docs.prebid.org/dev-docs/publisher-api-reference/getEvents.html for more info
+ * @param {object} event the prebid event emmitted
+ * @param {string} event.eventType the type of the event
+ * @param {object} event.args the arguments of the emitted event
+ */
+const track = ({ eventType, args }) => {
+  switch (eventType) {
+    // handle invalid bids, and remove them from the adUnit cache
+    case EVENTS.BID_TIMEOUT:
+      args.map(extractBid).forEach((bid) => {
+        bid.bidType = 3;
+        auctionCache[bid.auctionId].bids.push(bid);
+      });
+      break;
+    // handle valid bid responses and record them as part of an auction
+    case EVENTS.BID_RESPONSE:
+      const bid = Object.assign(extractBid(args), { bidType: 2 });
+      auctionCache[bid.auctionId].bids.push(bid);
+      break;
+    case EVENTS.BID_REJECTED:
+      const rejectedBid = Object.assign(extractBid(args), { bidType: 1 });
+      auctionCache[rejectedBid.auctionId].bids.push(rejectedBid);
+      break;
+    // capture extra information from the auction, and if there were no bids
+    // (and so no chance of a win) send the auction
+    case EVENTS.AUCTION_END:
+      Object.assign(
+        auctionCache[args.auctionId].floorDetail,
+        args.adUnits
+          .map((i) => i?.bids.length && i.bids[0]?.floorData)
+          .find((i) => i) || {}
+      );
+      auctionCache[args.auctionId].deviceDetail.cdep = args.bidderRequests
+        .map((bidRequest) => bidRequest.ortb2?.device?.ext?.cdep)
+        .find((i) => i);
+      Object.assign(auctionCache[args.auctionId].auctionDetail, {
+        adUnitCodes: args.adUnits.map((i) => i.code),
+        timestamp: args.timestamp,
       });
-      events.bids.push(bid);
-    } else {
-      Object.assign(bid, {
-        bidId: bidResponse.requestId,
-        floorProvider: events.floorDetail?.floorProvider || null,
-        floorFetchStatus: events.floorDetail?.fetchStatus || null,
-        floorLocation: events.floorDetail?.location || null,
-        floorModelVersion: events.floorDetail?.modelVersion || null,
-        floorSkipRate: events.floorDetail?.skipRate || 0,
-        isFloorSkipped: events.floorDetail?.skipped || false,
+      if (
+        auctionCache[args.auctionId].bids.every((bid) => [1, 3].includes(bid.bidType))
+      ) {
+        prepareSend(args.auctionId);
+      }
+      break;
+    // send the prebid winning bid back to pubx
+    case EVENTS.BID_WON:
+      const winningBid = extractBid(args);
+      const floorDetail = auctionCache[winningBid.auctionId].floorDetail;
+      Object.assign(winningBid, {
+        floorProvider: floorDetail?.floorProvider || null,
+        floorFetchStatus: floorDetail?.fetchStatus || null,
+        floorLocation: floorDetail?.location || null,
+        floorModelVersion: floorDetail?.modelVersion || null,
+        floorSkipRate: floorDetail?.skipRate || 0,
+        isFloorSkipped: floorDetail?.skipped || false,
         isWinningBid: true,
-        placementId: bidResponse.params ? deepAccess(bidResponse, 'params.0.placementId') : null,
-        renderedSize: bidResponse.size,
-        renderStatus: 4
+        renderedSize: args.size,
+        bidType: 4,
       });
-      return bid;
-    }
-  }
-}
-
-export function getDeviceType() {
-  if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(navigator.userAgent.toLowerCase()))) {
-    return 'tablet';
-  }
-  if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(navigator.userAgent.toLowerCase()))) {
-    return 'mobile';
+      winningBid.adServerData = getAdServerDataForBid(winningBid);
+      auctionCache[winningBid.auctionId].winningBid = winningBid;
+      prepareSend(winningBid.auctionId);
+      break;
+    // do nothing
+    default:
+      break;
   }
-  return 'desktop';
-}
-
-export function getBrowser() {
-  if (/Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor)) return 'Chrome';
-  else if (navigator.userAgent.match('CriOS')) return 'Chrome';
-  else if (/Firefox/.test(navigator.userAgent)) return 'Firefox';
-  else if (/Edg/.test(navigator.userAgent)) return 'Microsoft Edge';
-  else if (/Safari/.test(navigator.userAgent) && /Apple Computer/.test(navigator.vendor)) return 'Safari';
-  else if (/Trident/.test(navigator.userAgent) || /MSIE/.test(navigator.userAgent)) return 'Internet Explorer';
-  else return 'Others';
-}
-
-export function getOS() {
-  if (navigator.userAgent.indexOf('Android') != -1) return 'Android';
-  if (navigator.userAgent.indexOf('like Mac') != -1) return 'iOS';
-  if (navigator.userAgent.indexOf('Win') != -1) return 'Windows';
-  if (navigator.userAgent.indexOf('Mac') != -1) return 'Macintosh';
-  if (navigator.userAgent.indexOf('Linux') != -1) return 'Linux';
-  if (navigator.appVersion.indexOf('X11') != -1) return 'Unix';
-  return 'Others';
-}
+};
 
-// add sampling rate
-pubxaiAnalyticsAdapter.shouldFireEventRequest = function (samplingRate = 1) {
-  return (Math.floor((Math.random() * samplingRate + 1)) === parseInt(samplingRate));
+/**
+ * If true, send data back to pubxai
+ * @param {string} auctionId
+ * @param {number} samplingRate
+ * @returns {boolean}
+ */
+const shouldFireEventRequest = (auctionId, samplingRate = 1) => {
+  return parseInt(cyrb53Hash(auctionId)) % samplingRate === 0;
 };
 
-function send(data, status) {
-  if (pubxaiAnalyticsAdapter.shouldFireEventRequest(initOptions.samplingRate)) {
-    let location = getWindowLocation();
-    const storage = getStorage();
-    data.initOptions = initOptions;
-    data.pageDetail = {};
-    Object.assign(data.pageDetail, {
-      host: location.host,
-      path: location.pathname,
-      search: location.search
-    });
-    if (typeof data !== 'undefined' && typeof data.auctionInit !== 'undefined') {
-      data.pageDetail.adUnits = data.auctionInit.adUnitCodes;
-      data.initOptions.auctionId = data.auctionInit.auctionId;
-      delete data.auctionInit;
-
-      data.pmcDetail = {};
-      Object.assign(data.pmcDetail, {
-        bidDensity: storage ? storage.getItem('pbx:dpbid') : null,
-        maxBid: storage ? storage.getItem('pbx:mxbid') : null,
-        auctionId: storage ? storage.getItem('pbx:aucid') : null,
-      });
+/**
+ * prepare the payload for sending auction data back to pubx.ai
+ * @param {string} auctionId the auction to send
+ */
+const prepareSend = (auctionId) => {
+  const auctionData = Object.assign({}, auctionCache[auctionId]);
+  if (!shouldFireEventRequest(auctionId, initOptions.samplingRate)) {
+    return;
+  }
+  [
+    {
+      path: winningBidPath,
+      requiredKeys: [
+        'winningBid',
+        'pageDetail',
+        'deviceDetail',
+        'floorDetail',
+        'auctionDetail',
+        'userDetail',
+        'consentDetail',
+        'pmacDetail',
+        'extraData',
+        'initOptions',
+      ],
+      eventType: 'win',
+    },
+    {
+      path: auctionPath,
+      requiredKeys: [
+        'bids',
+        'pageDetail',
+        'deviceDetail',
+        'floorDetail',
+        'auctionDetail',
+        'userDetail',
+        'consentDetail',
+        'pmacDetail',
+        'extraData',
+        'initOptions',
+      ],
+      eventType: 'auction',
+    },
+  ].forEach(({ path, requiredKeys, eventType }) => {
+    const data = Object.fromEntries(
+      requiredKeys.map((key) => [key, auctionData[key]])
+    );
+    if (
+      auctionCache[auctionId].sendAs.includes(eventType) ||
+      !requiredKeys.every((key) => !!auctionData[key])
+    ) {
+      return;
     }
-    data.deviceDetail = {};
-    Object.assign(data.deviceDetail, {
-      platform: navigator.platform,
-      deviceType: getDeviceType(),
-      deviceOS: getOS(),
-      browser: getBrowser()
-    });
-
-    let pubxaiAnalyticsRequestUrl = buildUrl({
+    const pubxaiAnalyticsRequestUrl = buildUrl({
       protocol: 'https',
-      hostname: (initOptions && initOptions.hostName) || defaultHost,
-      pathname: status == 'bidwon' ? winningBidPath : auctionPath,
+      hostname:
+        (auctionData.initOptions && auctionData.initOptions.hostName) ||
+        defaultHost,
+      pathname: path,
       search: {
-        auctionTimestamp: auctionTimestamp,
+        auctionTimestamp: auctionData.auctionDetail.timestamp,
         pubxaiAnalyticsVersion: pubxaiAnalyticsVersion,
-        prebidVersion: getGlobal().version
+        prebidVersion: '$prebid.version$',
+        pubxId: initOptions.pubxId,
+      },
+    });
+    sendCache[pubxaiAnalyticsRequestUrl].push(data);
+    auctionCache[auctionId].sendAs.push(eventType);
+  });
+};
+
+const send = () => {
+  const toBlob = (d) => new Blob([JSON.stringify(d)], { type: 'text/json' });
+
+  Object.entries(sendCache).forEach(([requestUrl, events]) => {
+    let payloadStart = 0;
+
+    events.forEach((event, index, arr) => {
+      const payload = arr.slice(payloadStart, index + 2);
+      const payloadTooLarge = toBlob(payload).size > 65536;
+
+      if (payloadTooLarge || index + 1 === arr.length) {
+        sendBeacon(
+          requestUrl,
+          toBlob(payloadTooLarge ? payload.slice(0, -1) : payload)
+        );
+        payloadStart = index;
       }
     });
-    if (status == 'bidwon') {
-      ajax(pubxaiAnalyticsRequestUrl, undefined, JSON.stringify(data), { method: 'POST', contentType: 'text/json' });
-    } else if (status == 'auctionEnd' && auctionCache.indexOf(data.initOptions.auctionId) === -1) {
-      ajax(pubxaiAnalyticsRequestUrl, undefined, JSON.stringify(data), { method: 'POST', contentType: 'text/json' });
-      auctionCache.push(data.initOptions.auctionId);
+
+    events.splice(0);
+  });
+};
+
+// register event listener to send logs when user leaves page
+if (document.visibilityState) {
+  document.addEventListener('visibilitychange', () => {
+    if (document.visibilityState === 'hidden') {
+      send();
     }
-  }
+  });
 }
 
-pubxaiAnalyticsAdapter.originEnableAnalytics = pubxaiAnalyticsAdapter.enableAnalytics;
-pubxaiAnalyticsAdapter.enableAnalytics = function (config) {
+// declare the analytics adapter
+var pubxaiAnalyticsAdapter = Object.assign(
+  adapter({
+    emptyUrl,
+    analyticsType,
+  }),
+  { track }
+);
+
+pubxaiAnalyticsAdapter.originEnableAnalytics =
+  pubxaiAnalyticsAdapter.enableAnalytics;
+pubxaiAnalyticsAdapter.enableAnalytics = (config) => {
   initOptions = config.options;
   pubxaiAnalyticsAdapter.originEnableAnalytics(config);
 };
 
 adapterManager.registerAnalyticsAdapter({
   adapter: pubxaiAnalyticsAdapter,
-  code: 'pubxai'
+  code: adapterCode,
 });
 
 export default pubxaiAnalyticsAdapter;
diff --git a/modules/pubxaiRtdProvider.js b/modules/pubxaiRtdProvider.js
new file mode 100644
index 00000000000..4528b29cf11
--- /dev/null
+++ b/modules/pubxaiRtdProvider.js
@@ -0,0 +1,166 @@
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import { submodule } from '../src/hook.js';
+import { deepAccess } from '../src/utils.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+import { getStorageManager } from '../src/storageManager.js';
+/**
+ * This RTD module has a dependency on the priceFloors module.
+ * We utilize the createFloorsDataForAuction function from the priceFloors module to incorporate price floors data into the current auction.
+ */
+import { createFloorsDataForAuction } from './priceFloors.js'; // eslint-disable-line prebid/validate-imports
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'pubxai';
+window.__pubxFloorRulesPromise__ = null;
+export const FloorsApiStatus = Object.freeze({
+  IN_PROGRESS: 'IN_PROGRESS',
+  SUCCESS: 'SUCCESS',
+  ERROR: 'ERROR',
+});
+export const storage = getStorageManager({ moduleType: MODULE_TYPE_RTD, moduleName: SUBMODULE_NAME });
+export const FLOORS_EVENT_HANDLE = 'floorsApi';
+export const FLOORS_END_POINT = 'https://floor.pbxai.com/';
+export const FLOOR_PROVIDER = 'PubxFloorProvider';
+
+export const getFloorsConfig = (provider, floorsResponse) => {
+  const floorsConfig = {
+    floors: {
+      enforcement: { floorDeals: true },
+      data: floorsResponse,
+    },
+  };
+  const { floorMin, enforcement } = deepAccess(provider, 'params');
+  if (floorMin) {
+    floorsConfig.floors.floorMin = floorMin;
+  }
+  if (enforcement) {
+    floorsConfig.floors.enforcement = enforcement;
+  }
+  return floorsConfig;
+};
+
+export const setFloorsConfig = (provider, data) => {
+  if (data) {
+    const floorsConfig = getFloorsConfig(provider, data);
+    config.setConfig(floorsConfig);
+    window.__pubxLoaded__ = true;
+    window.__pubxFloorsConfig__ = floorsConfig;
+  } else {
+    config.setConfig({ floors: window.__pubxPrevFloorsConfig__ });
+    window.__pubxLoaded__ = false;
+    window.__pubxFloorsConfig__ = null;
+  }
+};
+
+export const setDefaultPriceFloors = (provider) => {
+  const { data } = deepAccess(provider, 'params');
+  if (data !== undefined) {
+    data.floorProvider = FLOOR_PROVIDER;
+    setFloorsConfig(provider, data);
+  }
+};
+
+export const setPriceFloors = async (provider) => {
+  window.__pubxPrevFloorsConfig__ = config.getConfig('floors');
+  setDefaultPriceFloors(provider);
+  return fetchFloorRules(provider)
+    .then((floorsResponse) => {
+      setFloorsConfig(provider, floorsResponse);
+      setFloorsApiStatus(FloorsApiStatus.SUCCESS);
+    })
+    .catch((_) => {
+      setFloorsApiStatus(FloorsApiStatus.ERROR);
+    });
+};
+
+export const setFloorsApiStatus = (status) => {
+  window.__pubxFloorsApiStatus__ = status;
+  window.dispatchEvent(
+    new CustomEvent(FLOORS_EVENT_HANDLE, { detail: { status } })
+  );
+};
+
+export const getUrl = (provider) => {
+  const { pubxId, endpoint } = deepAccess(provider, 'params');
+  if (!endpoint) {
+    return null; // Indicate that no endpoint is provided
+  }
+  return `${endpoint || FLOORS_END_POINT}?pubxId=${pubxId}&page=${window.location.href}`;
+};
+
+export const fetchFloorRules = async (provider) => {
+  return new Promise((resolve, reject) => {
+    setFloorsApiStatus(FloorsApiStatus.IN_PROGRESS);
+    const url = getUrl(provider);
+    if (url) {
+      // Fetch from remote endpoint
+      ajax(url, {
+        success: (responseText, response) => {
+          try {
+            if (response && response.response) {
+              const floorsResponse = JSON.parse(response.response);
+              resolve(floorsResponse);
+            } else {
+              resolve(null);
+            }
+          } catch (error) {
+            reject(error);
+          }
+        },
+        error: (responseText, response) => {
+          reject(response);
+        },
+      });
+    } else {
+      // Fetch from local storage
+      try {
+        const localData = storage.getDataFromSessionStorage('pubx:dynamicFloors') || window.__pubxDynamicFloors__;
+        if (localData) {
+          resolve(JSON.parse(localData));
+        } else {
+          resolve(null);
+        }
+      } catch (error) {
+        reject(error);
+      }
+    }
+  });
+};
+
+const init = (provider) => {
+  window.__pubxFloorRulesPromise__ = setPriceFloors(provider);
+  return true;
+};
+
+const getBidRequestData = (() => {
+  let floorsAttached = false;
+  return (reqBidsConfigObj, onDone) => {
+    if (!floorsAttached) {
+      createFloorsDataForAuction(
+        reqBidsConfigObj.adUnits,
+        reqBidsConfigObj.auctionId
+      );
+      window.__pubxFloorRulesPromise__.then(() => {
+        createFloorsDataForAuction(
+          reqBidsConfigObj.adUnits,
+          reqBidsConfigObj.auctionId
+        );
+        onDone();
+      });
+      floorsAttached = true;
+    }
+  };
+})();
+
+export const pubxaiSubmodule = {
+  name: SUBMODULE_NAME,
+  init,
+  getBidRequestData,
+};
+
+export const beforeInit = () => {
+  submodule(MODULE_NAME, pubxaiSubmodule);
+};
+
+beforeInit();
diff --git a/modules/pubxaiRtdProvider.md b/modules/pubxaiRtdProvider.md
new file mode 100644
index 00000000000..2b89d3baa04
--- /dev/null
+++ b/modules/pubxaiRtdProvider.md
@@ -0,0 +1,68 @@
+## Overview
+
+- Module Name: pubX.ai RTD Provider
+- Module Type: RTD Adapter
+- Maintainer: phaneendra@pubx.ai
+
+## Description
+
+This RTD module, provided by pubx.ai, is used to set dynamic floors within Prebid.
+
+## Usage
+
+Ensure that the following modules are listed when building Prebid: `priceFloors`.
+For example:
+
+```shell
+gulp build --modules=priceFloors
+```
+
+To compile the RTD module into your Prebid build:
+
+```shell
+gulp build --modules=rtdModule,pubxaiRtdProvider
+```
+
+To utilize the pubX.ai RTD module, add `realTimeData` with the parameters mentioned below to the Prebid config.
+
+```js
+const AUCTION_DELAY = 100;
+pbjs.setConfig({
+	// rest of the config
+	...,
+	realTimeData: {
+		auctionDelay: AUCTION_DELAY,
+		dataProviders: [{
+			name: "pubxai",
+			waitForIt: true,
+			params: {
+				pubxId: ``,
+				endpoint: ``, // (optional)
+				floorMin: ``, // (optional)
+				enforcement: ``, // (optional)
+				data: `` // (optional)
+			}
+		}]
+	}
+	// rest of the config
+	...,
+});
+```
+
+## Parameters
+
+| Name               | Type    | Description                                                    | Default                    |
+| :----------------- | :------ | :------------------------------------------------------------- | :------------------------- |
+| name               | String  | Name of the real-time data module                              | Always `pubxai`            |
+| waitForIt          | Boolean | Should be `true` if an `auctionDelay` is defined (optional)    | `false`                    |
+| params             | Object  |                                                                |                            |
+| params.pubxId      | String  | Publisher ID                                                   |                            |
+| params.endpoint    | String  | URL to retrieve floor data (optional)                          | `https://floor.pbxai.com/` |
+| params.floorMin    | Number  | Minimum CPM floor (optional)                                   | `None`                     |
+| params.enforcement | Object  | Enforcement behavior within the Price Floors Module (optional) | `None`                     |
+| params.data        | Object  | Default floor data provided by pubX.ai (optional)              | `None`                     |
+
+## What Should Change in the Bid Request?
+
+There are no direct changes in the bid request due to our RTD module, but floor configuration will be set using the price floors module. These changes will be reflected in adunit bids or bidder requests as floor data.
+
diff --git a/modules/pulsepointBidAdapter.js b/modules/pulsepointBidAdapter.js
index 516254b358b..50747616872 100644
--- a/modules/pulsepointBidAdapter.js
+++ b/modules/pulsepointBidAdapter.js
@@ -1,7 +1,6 @@
 import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 import {isArray} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
 
 const DEFAULT_CURRENCY = 'USD';
 const KNOWN_PARAMS = ['cp', 'ct', 'cf', 'battr', 'deals'];
@@ -58,13 +57,6 @@ export const spec = {
         url: 'https://bh.contextweb.com/visitormatch/prebid'
       }];
     }
-  },
-  transformBidParams: function(params) {
-    return convertTypes({
-      'cf': 'string',
-      'cp': 'number',
-      'ct': 'number'
-    }, params);
   }
 };
 
diff --git a/modules/pxyzBidAdapter.js b/modules/pxyzBidAdapter.js
index 1ab432496a3..12bd04c744d 100644
--- a/modules/pxyzBidAdapter.js
+++ b/modules/pxyzBidAdapter.js
@@ -2,6 +2,11 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {isArray, logError, logInfo} from '../src/utils.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'pxyz';
 const URL = 'https://ads.playground.xyz/host-config/prebid?v=2';
 const DEFAULT_CURRENCY = 'USD';
@@ -124,10 +129,13 @@ export const spec = {
     return bids;
   },
 
-  getUserSyncs: function (syncOptions) {
+  getUserSyncs: function () {
     return [{
       type: 'image',
       url: '//ib.adnxs.com/getuidnb?https://ads.playground.xyz/usersync?partner=appnexus&uid=$UID'
+    }, {
+      type: 'iframe',
+      url: '//rtb.gumgum.com/getuid/15801?r=https%3A%2F%2Fads.playground.xyz%2Fusersync%3Fpartner%3Dgumgum%26uid%3D'
     }];
   }
 }
diff --git a/modules/qortexRtdProvider.js b/modules/qortexRtdProvider.js
new file mode 100644
index 00000000000..1ee8f8cf5d0
--- /dev/null
+++ b/modules/qortexRtdProvider.js
@@ -0,0 +1,265 @@
+import { submodule } from '../src/hook.js';
+import { logWarn, mergeDeep, logMessage, generateUUID } from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+import * as events from '../src/events.js';
+import { EVENTS } from '../src/constants.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+const qortexSessionInfo = {};
+const QX_IN_MESSAGE = {
+  BID_ENRICH_INITIALIZED: 'CX-BID-ENRICH-INITIALIZED',
+  DISPATCH_CONTEXT: 'DISPATCH-CONTEXT'
+}
+const QX_OUT_MESSAGE = {
+  AUCTION_END: 'AUCTION-END',
+  NO_CONTEXT: 'NO-CONTEXT',
+  RTD_INITIALIZED: 'RTD-INITIALIZED',
+  REQUEST_CONTEXT: 'REQUEST-CONTEXT'
+}
+
+/**
+ * Init if module configuration is valid
+ * @param {Object} config Module configuration
+ * @returns {Boolean}
+ */
+function init (config) {
+  if (!config?.params?.groupId?.length > 0) {
+    logWarn('Qortex RTD module config does not contain valid groupId parameter. Config params: ' + JSON.stringify(config.params))
+    return false;
+  } else {
+    initializeModuleData(config);
+    if (config?.params?.enableBidEnrichment) {
+      initializeBidEnrichment();
+    } else {
+      logWarn('Bid Enrichment Function has been disabled in module configuration')
+    }
+    if (config?.params?.tagConfig) {
+      loadScriptTag(config)
+    }
+    return true;
+  }
+}
+
+/**
+ * Processess prebid request and attempts to add context to ort2b fragments
+ * @param {Object} reqBidsConfig Bid request configuration object
+ * @param {Function} callback Called on completion
+ */
+function getBidRequestData (reqBidsConfig, callback) {
+  if (reqBidsConfig?.adUnits?.length > 0 && shouldAllowBidEnrichment()) {
+    addContextToRequests(reqBidsConfig);
+  } else {
+    logWarn('Module function is paused due to configuration \n Module Config: ' + JSON.stringify(reqBidsConfig));
+  }
+  callback();
+}
+
+/**
+ * Processess auction end events for Qortex reporting
+ * @param {Object} data Auction end object
+ */
+function onAuctionEndEvent (data, config, t) {
+  logMessage('Auction ended: ', JSON.stringify(data));
+  if (shouldAllowBidEnrichment()) {
+    if (!qortexSessionInfo.auctionsEnded) {
+      qortexSessionInfo.auctionsEnded = [];
+    }
+    qortexSessionInfo.auctionsEnded.push(JSON.stringify(data));
+    postBidEnrichmentMessage(QX_OUT_MESSAGE.AUCTION_END, JSON.stringify(data));
+  }
+}
+
+/**
+ * Updates bidder configs with the response from Qortex context services
+ * @param {Object} reqBidsConfig Bid request configuration object
+ */
+export function addContextToRequests (reqBidsConfig) {
+  if (qortexSessionInfo.currentSiteContext === null) {
+    logWarn('No context data received at this time');
+    requestContextData();
+  } else {
+    if (checkPercentageOutcome(qortexSessionInfo.groupConfig?.prebidBidEnrichmentPercentage)) {
+      const fragment = { site: {content: qortexSessionInfo.currentSiteContext} }
+      if (qortexSessionInfo.bidderArray?.length > 0) {
+        qortexSessionInfo.bidderArray.forEach(bidder => mergeDeep(reqBidsConfig.ortb2Fragments.bidder, {[bidder]: fragment}));
+      } else if (!qortexSessionInfo.bidderArray) {
+        mergeDeep(reqBidsConfig.ortb2Fragments.global, fragment);
+      } else {
+        logWarn('Config contains an empty bidders array, unable to determine which bids to enrich');
+      }
+    }
+  }
+}
+
+/**
+ * Loads Qortex header tag using data passed from module config object
+ * @param {Object} config module config obtained during init
+ */
+export function loadScriptTag(config) {
+  const code = 'qortex';
+  const groupId = config.params.groupId;
+  const src = 'https://tags.qortex.ai/bootstrapper'
+  const attr = {'data-group-id': groupId}
+  const tc = config.params.tagConfig
+
+  Object.keys(tc).forEach(p => {
+    attr[`data-${p.replace(/([A-Z])/g, (m) => `-${m.toLowerCase()}`)}`] = tc[p]
+  })
+
+  addEventListener('qortex-rtd', (e) => {
+    const billableEvent = {
+      vendor: code,
+      billingId: generateUUID(),
+      type: e?.detail?.type,
+      accountId: groupId
+    }
+    switch (e?.detail?.type) {
+      case 'qx-impression':
+        const {uid} = e.detail;
+        if (!uid || qortexSessionInfo.impressionIds.has(uid)) {
+          logWarn(`Received invalid billable event due to ${!uid ? 'missing' : 'duplicate'} uid: qx-impression`)
+          return;
+        } else {
+          logMessage('Received billable event: qx-impression')
+          qortexSessionInfo.impressionIds.add(uid)
+          billableEvent.transactionId = e.detail.uid;
+          events.emit(EVENTS.BILLABLE_EVENT, billableEvent);
+          break;
+        }
+      default:
+        logWarn(`Received invalid billable event: ${e.detail?.type}`)
+    }
+  })
+
+  loadExternalScript(src, MODULE_TYPE_RTD, code, undefined, undefined, attr);
+}
+
+/**
+ * Request contextual data about page (after checking for allow) and begin listening for postMessages from publisher
+ */
+export function initializeBidEnrichment() {
+  if (shouldAllowBidEnrichment()) {
+    requestContextData()
+  }
+  addEventListener('message', windowPostMessageReceived);
+}
+
+/**
+ * Call Qortex code on page for available contextual information about current environment
+ */
+export function requestContextData() {
+  if (qortexSessionInfo.currentSiteContext) {
+    logMessage('Context data already retrieved.');
+  } else {
+    postBidEnrichmentMessage(QX_OUT_MESSAGE.REQUEST_CONTEXT);
+  }
+}
+
+/**
+ * Helper function to set initial values when they are obtained by init
+ * @param {Object} config module config obtained during init
+ */
+export function initializeModuleData(config) {
+  const {groupId, bidders, enableBidEnrichment} = config.params;
+  qortexSessionInfo.bidEnrichmentDisabled = enableBidEnrichment !== null ? !enableBidEnrichment : true;
+  qortexSessionInfo.bidderArray = bidders;
+  qortexSessionInfo.impressionIds = new Set();
+  qortexSessionInfo.currentSiteContext = null;
+  qortexSessionInfo.sessionId = generateSessionId();
+  qortexSessionInfo.groupId = groupId;
+  return qortexSessionInfo;
+}
+
+/**
+ * Allows setting of contextual data
+ */
+export function setContextData(value) {
+  qortexSessionInfo.currentSiteContext = value
+}
+
+/**
+ * Allows setting of group configuration data
+ */
+export function setGroupConfigData(value) {
+  qortexSessionInfo.groupConfig = value
+}
+
+/**
+ * Unique id generator creating an identifier through datetime and random number
+ * @returns {string}
+ */
+function generateSessionId() {
+  const randomInt = window.crypto.getRandomValues(new Uint32Array(1));
+  const currentDateTime = Math.floor(Date.now() / 1000);
+  return 'QX' + randomInt.toString() + 'X' + currentDateTime.toString()
+}
+
+/**
+ * Check for a random value to be above given percentage threshold
+ * @param {number} percentageValue 0-100 number for percentage check.
+ * @returns {Boolean}
+ */
+function checkPercentageOutcome(percentageValue) {
+  return (percentageValue ?? 0) > (Math.random() * 100);
+}
+
+/**
+ * Check for allowing functionality of bid enrichment capabilities.
+ * @returns {Boolean}
+ */
+function shouldAllowBidEnrichment() {
+  if (qortexSessionInfo.bidEnrichmentDisabled) {
+    logWarn('Bid enrichment disabled at prebid config')
+    return false;
+  }
+  return true
+}
+
+/**
+ * Passes message out to external page through postMessage method
+ * @param {string} msg message string to be passed to CX-BID-ENRICH target on current page
+ * @param {Object} data optional parameter object with additional data to send with post
+ */
+function postBidEnrichmentMessage(msg, data = null) {
+  window.postMessage({
+    target: 'CX-BID-ENRICH',
+    message: msg,
+    params: data
+  }, window.location.protocol + '//' + window.location.host);
+  logMessage('Dispatching window postMessage: ' + msg);
+}
+
+/**
+ * Receives messages passed through postMessage method to QORTEX-PREBIDJS-RTD-MODULE on current page
+ * @param {Object} evt data object holding Event information
+ */
+export function windowPostMessageReceived(evt) {
+  const data = evt.data;
+  if (typeof data.target !== 'undefined' && data.target === 'QORTEX-PREBIDJS-RTD-MODULE') {
+    if (shouldAllowBidEnrichment()) {
+      if (data.message === QX_IN_MESSAGE.BID_ENRICH_INITIALIZED) {
+        if (Boolean(data.params) && Boolean(data.params?.groupConfig)) {
+          setGroupConfigData(data.params.groupConfig);
+        }
+        postBidEnrichmentMessage(QX_OUT_MESSAGE.RTD_INITIALIZED);
+        if (qortexSessionInfo?.auctionsEnded?.length > 0) {
+          qortexSessionInfo.auctionsEnded.forEach(data => postBidEnrichmentMessage(QX_OUT_MESSAGE.AUCTION_END, data));
+        }
+        requestContextData();
+      } else if (data.message === QX_IN_MESSAGE.DISPATCH_CONTEXT) {
+        if (data.params?.context) {
+          setContextData(data.params.context);
+        }
+      }
+    }
+  }
+}
+
+export const qortexSubmodule = {
+  name: 'qortex',
+  init,
+  getBidRequestData,
+  onAuctionEndEvent
+}
+
+submodule('realTimeData', qortexSubmodule);
diff --git a/modules/qortexRtdProvider.md b/modules/qortexRtdProvider.md
new file mode 100644
index 00000000000..b9a08eb817a
--- /dev/null
+++ b/modules/qortexRtdProvider.md
@@ -0,0 +1,68 @@
+# Qortex Real-time Data Submodule
+
+## Overview
+
+```
+Module Name: Qortex RTD Provider
+Module Type: RTD Provider
+Maintainer: mannese@qortex.ai
+```
+
+## Description
+
+The Qortex RTD module appends contextual segments to the bidding object based on the content of a page using the Qortex API.
+
+If the `Qortex Group Id` and module parameters provided during configuration is active, the Qortex context API will attempt to generate and return a [Content object](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf#page=26) using indexed data from provided page content. The module will then merge that object into the appropriate bidders' `ortb2.site.content`, which can be used by prebid adapters that use `site.content` data.
+
+
+## Build
+```
+gulp build --modules="rtdModule,qortexRtdProvider,qortexBidAdapter,..."  
+```
+
+> `rtdModule` is a required module to use Qortex RTD module.
+
+## Configuration
+
+Please refer to [Prebid Documentation](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-realTimeData) on RTD module configuration for details on required and optional parameters of `realTimeData`
+
+When configuring Qortex as a data provider, refer to the template below to add the necessary information to ensure the proper connection is made.  
+
+### RTD Module Setup
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [{
+            name: 'qortex',
+            waitForIt: true,
+            params: {
+                groupId: 'ABC123', //required
+                bidders: ['qortex', 'adapter2'], //optional (see below)
+                enableBidEnrichment: true, //optional (see below)
+                tagConfig: { } // optional, please reach out to your account manager for configuration reccommendation
+            }
+        }]
+    }
+});
+```
+
+### Paramter Details
+
+#### `groupId` - Required
+- The Qortex groupId linked to the publisher, this is required to make a request using this adapter
+
+#### `bidders` - optional
+- If this parameter is included, it must be an array of the strings that match the bidder code of the prebid adapters you would like this module to impact. `ortb2.site.content` will be updated *only* for adapters in this array
+
+- If this parameter is omitted, the RTD module will default to updating  `ortb2.site.content` on *all* bid adapters being used on the page
+
+#### `enableBidEnrichment` - optional
+- This optional parameter allows a publisher to opt-in to the features of the RTD module that use our API to enrich bids with first party data for contextuality. Enabling this feature will allow this module to interact with the Qortex AI contextuality server for indexing and analysis. Please use caution when adding this module to pages that may contain personal user data or proprietary information.
+
+#### `tagConfig` - optional
+- This optional parameter is an object containing the config settings that could be usedto initialize the Qortex integration on your page. A preconfigured object for this step will be provided to you by the Qortex team.
+
+- If this parameter is not present, the Qortex integration can still be configured and loaded manually on your page outside of prebid. The RTD module will continue to initialize and operate as normal.
+ 
\ No newline at end of file
diff --git a/modules/qtBidAdapter.js b/modules/qtBidAdapter.js
new file mode 100644
index 00000000000..cbfd3586fe5
--- /dev/null
+++ b/modules/qtBidAdapter.js
@@ -0,0 +1,21 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'qt';
+const GVLID = 1331;
+const AD_URL = 'https://endpoint1.qt.io/pbjs';
+const SYNC_URL = 'https://cs.qt.io';
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
+};
+
+registerBidder(spec);
diff --git a/modules/qtBidAdapter.md b/modules/qtBidAdapter.md
new file mode 100644
index 00000000000..6d505b38379
--- /dev/null
+++ b/modules/qtBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: QT Bidder Adapter
+Module Type: QT Bidder Adapter
+Maintainer: octavian.cimpu@qt.io
+```
+
+# Description
+
+Connects to QT exchange for bids.
+QT bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'qt',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'qt',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'qt',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/quantcastBidAdapter.js b/modules/quantcastBidAdapter.js
index 2c721a61616..ea907f0429c 100644
--- a/modules/quantcastBidAdapter.js
+++ b/modules/quantcastBidAdapter.js
@@ -6,6 +6,11 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {find} from '../src/polyfill.js';
 import {parseDomain} from '../src/refererDetection.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'quantcast';
 const DEFAULT_BID_FLOOR = 0.0000000001;
 
@@ -44,7 +49,6 @@ function makeVideoImp(bid) {
     maxbitrate: video.maxbitrate,
     playbackmethod: video.playbackmethod,
     delivery: video.delivery,
-    placement: video.placement,
     api: video.api,
     w: video.w,
     h: video.h
@@ -53,7 +57,7 @@ function makeVideoImp(bid) {
   return {
     video: videoCopy,
     placementCode: bid.placementCode,
-    bidFloor: bid.params.bidFloor || DEFAULT_BID_FLOOR
+    bidFloor: DEFAULT_BID_FLOOR
   };
 }
 
@@ -71,7 +75,7 @@ function makeBannerImp(bid) {
       })
     },
     placementCode: bid.placementCode,
-    bidFloor: bid.params.bidFloor || DEFAULT_BID_FLOOR
+    bidFloor: DEFAULT_BID_FLOOR
   };
 }
 
diff --git a/modules/quantcastIdSystem.js b/modules/quantcastIdSystem.js
index 2faf638fc0b..d980f5316e5 100644
--- a/modules/quantcastIdSystem.js
+++ b/modules/quantcastIdSystem.js
@@ -11,6 +11,10 @@ import { triggerPixel, logInfo } from '../src/utils.js';
 import { uspDataHandler, coppaDataHandler, gdprDataHandler } from '../src/adapterManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ */
+
 const QUANTCAST_FPA = '__qca';
 const DEFAULT_COOKIE_EXP_DAYS = 392; // (13 months - 2 days)
 const DAY_MS = 86400000;
diff --git a/modules/r2b2BidAdapter.js b/modules/r2b2BidAdapter.js
new file mode 100644
index 00000000000..15a65e3924c
--- /dev/null
+++ b/modules/r2b2BidAdapter.js
@@ -0,0 +1,309 @@
+import {logWarn, logError, triggerPixel, deepSetValue, getParameterByName} from '../src/utils.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js'
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {Renderer} from '../src/Renderer.js';
+import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
+import {pbsExtensions} from '../libraries/pbsExtensions/pbsExtensions.js';
+import {bidderSettings} from '../src/bidderSettings.js';
+
+const ADAPTER_VERSION = '1.0.0';
+const BIDDER_CODE = 'r2b2';
+const GVL_ID = 1235;
+
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_TTL = 360;
+const DEFAULT_NET_REVENUE = true;
+const DEBUG_PARAM = 'pbjs_test_r2b2';
+const RENDERER_URL = 'https://delivery.r2b2.io/static/rendering.js';
+
+const ENDPOINT = bidderSettings.get(BIDDER_CODE, 'endpoint') || 'hb.r2b2.cz';
+const SERVER_URL = 'https://' + ENDPOINT;
+const URL_BID = SERVER_URL + '/openrtb2/bid';
+const URL_SYNC = SERVER_URL + '/cookieSync';
+const URL_EVENT = SERVER_URL + '/event';
+
+const URL_EVENT_ON_BIDDER_ERROR = URL_EVENT + '/bidError';
+const URL_EVENT_ON_TIMEOUT = URL_EVENT + '/timeout';
+
+const R2B2_TEST_UNIT = 'selfpromo';
+
+export const internal = {
+  placementsToSync: [],
+  mappedParams: {}
+}
+
+let r2b2Error = function(message, params) {
+  logError(message, params, BIDDER_CODE)
+}
+
+function getIdParamsFromPID(pid) {
+  // selfpromo test creative
+  if (pid === R2B2_TEST_UNIT) {
+    return { d: 'test', g: 'test', p: 'selfpromo', m: 0, selfpromo: 1 }
+  }
+  if (!isNaN(pid)) {
+    return { pid: Number(pid) }
+  }
+  if (typeof pid === 'string') {
+    const params = pid.split('/');
+    if (params.length === 3 || params.length === 4) {
+      const paramNames = ['d', 'g', 'p', 'm'];
+      return paramNames.reduce((p, paramName, index) => {
+        let param = params[index];
+        if (paramName === 'm') {
+          param = ['desktop', 'classic', '0'].includes(param) ? 0 : Number(!!param)
+        }
+        p[paramName] = param;
+        return p
+      }, {});
+    }
+  }
+}
+
+function pickIdFromParams(params) {
+  if (!params) return null;
+  const { d, g, p, m, pid } = params;
+  return d ? { d, g, p, m } : { pid };
+}
+
+function getIdsFromBids(bids) {
+  return bids.reduce((ids, bid) => {
+    const params = internal.mappedParams[bid.bidId];
+    const id = pickIdFromParams(params);
+    if (id) {
+      ids.push(id);
+    }
+    return ids
+  }, []);
+}
+
+function triggerEvent(eventUrl, ids) {
+  if (ids && !ids.length) return;
+  const timeStamp = new Date().getTime();
+  const symbol = (eventUrl.indexOf('?') === -1 ? '?' : '&');
+  const url = eventUrl + symbol + `p=${btoa(JSON.stringify(ids))}&cb=${timeStamp}`;
+  triggerPixel(url)
+}
+
+const converter = ortbConverter({
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    const idParams = getIdParamsFromPID(bidRequest.params.pid);
+    deepSetValue(imp, 'ext.r2b2', idParams);
+    internal.placementsToSync.push(idParams);
+    internal.mappedParams[imp.id] = Object.assign({}, bidRequest.params, idParams);
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    deepSetValue(request, 'ext.version', ADAPTER_VERSION);
+    request.cur = [DEFAULT_CURRENCY];
+    const test = getParameterByName(DEBUG_PARAM) === '1' ? 1 : 0;
+    deepSetValue(request, 'test', test);
+    return request;
+  },
+  context: {
+    netRevenue: DEFAULT_NET_REVENUE,
+    ttl: DEFAULT_TTL
+  },
+  processors: pbsExtensions
+});
+
+function setUpRenderer(adUnitCode, bid) {
+  // let renderer load once in main window, but pass the renderDocument
+  let renderDoc;
+  const config = {
+    documentResolver: (bid, sourceDocument, renderDocument) => {
+      renderDoc = renderDocument;
+      return sourceDocument;
+    }
+  }
+  let renderer = Renderer.install({
+    url: RENDERER_URL,
+    config: config,
+    id: bid.requestId,
+    adUnitCode
+  });
+
+  renderer.setRender(function (bid, doc) {
+    doc = renderDoc || doc;
+    window.R2B2 = window.R2B2 || {};
+    let main = window.R2B2;
+    main.HB = main.HB || {};
+    main.HB.Render = main.HB.Render || {};
+    main.HB.Render.queue = main.HB.Render.queue || [];
+    main.HB.Render.queue.push(() => {
+      const id = pickIdFromParams(internal.mappedParams[bid.requestId])
+      main.HB.Renderer.render(id, bid, null, doc)
+    })
+  })
+
+  return renderer
+}
+
+function getExtMediaType(bidMediaType, responseBid) {
+  switch (bidMediaType) {
+    case BANNER:
+      return {
+        type: 'banner',
+        settings: {
+          chd: null,
+          width: responseBid.w,
+          height: responseBid.h,
+          ad: {
+            type: 'content',
+            data: responseBid.adm
+          }
+        }
+      };
+    case NATIVE:
+      break;
+    case VIDEO:
+      break;
+    default:
+      break;
+  }
+}
+
+function createPrebidResponseBid(requestImp, bidResponse, serverResponse, bids) {
+  const bidId = requestImp.id;
+  const adUnitCode = bids[0].adUnitCode;
+  const mediaType = bidResponse.ext.prebid.type;
+  let bidOut = {
+    requestId: bidId,
+    cpm: bidResponse.price,
+    creativeId: bidResponse.crid,
+    width: bidResponse.w,
+    height: bidResponse.h,
+    ttl: bidResponse.ttl ?? DEFAULT_TTL,
+    netRevenue: serverResponse.netRevenue ?? DEFAULT_NET_REVENUE,
+    currency: serverResponse.cur ?? DEFAULT_CURRENCY,
+    ad: bidResponse.adm,
+    mediaType: mediaType,
+    winUrl: bidResponse.nurl,
+    ext: {
+      cid: bidResponse.ext?.r2b2?.cid,
+      cdid: bidResponse.ext?.r2b2?.cdid,
+      mediaType: getExtMediaType(mediaType, bidResponse),
+      adUnit: adUnitCode,
+      dgpm: internal.mappedParams[bidId],
+      events: bidResponse.ext?.r2b2?.events
+    }
+  };
+  if (bidResponse.ext?.r2b2?.useRenderer) {
+    bidOut.renderer = setUpRenderer(adUnitCode, bidOut);
+  }
+  return bidOut;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVL_ID,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function(bid) {
+    if (!bid.params || !bid.params.pid) {
+      logWarn('Bad params, "pid" required.');
+      return false
+    }
+    const id = getIdParamsFromPID(bid.params.pid);
+    if (!id || !(id.pid || (id.d && id.g && id.p))) {
+      logWarn('Bad params, "pid" has to be either a number or a correctly assembled string.');
+      return false
+    }
+    return true
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const data = converter.toORTB({
+      bidRequests: validBidRequests,
+      bidderRequest
+    });
+    return [{
+      method: 'POST',
+      url: URL_BID,
+      data,
+      bids: bidderRequest.bids
+    }]
+  },
+
+  interpretResponse: function(serverResponse, request) {
+    // r2b2Error('error message', {params: 1});
+    let prebidResponses = [];
+
+    const response = serverResponse.body;
+    if (!response || !response.seatbid || !response.seatbid[0] || !response.seatbid[0].bid) {
+      return prebidResponses;
+    }
+    let requestImps = request.data.imp || [];
+    try {
+      response.seatbid.forEach(seat => {
+        let bids = seat.bid;
+
+        for (let responseBid of bids) {
+          let responseImpId = responseBid.impid;
+          let requestCurrentImp = requestImps.find((requestImp) => requestImp.id === responseImpId);
+          if (!requestCurrentImp) {
+            r2b2Error('Cant match bid response.', {impid: Boolean(responseBid.impid)});
+            continue;// Skip this iteration if there's no match
+          }
+          prebidResponses.push(createPrebidResponseBid(requestCurrentImp, responseBid, response, request.bids));
+        }
+      })
+    } catch (e) {
+      r2b2Error('Error while interpreting response:', {msg: e.message});
+    }
+    return prebidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+
+    if (!syncOptions.iframeEnabled) {
+      logWarn('Please enable iframe based user sync.');
+      return syncs;
+    }
+
+    let plString;
+    try {
+      plString = btoa(JSON.stringify(internal.placementsToSync || []));
+    } catch (e) {
+      logWarn('User sync failed: ' + e.message);
+      return syncs
+    }
+
+    let url = URL_SYNC + `?p=${plString}`;
+
+    if (gdprConsent) {
+      url += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`
+    }
+
+    if (uspConsent) {
+      url += `&us_privacy=${uspConsent}`
+    }
+
+    syncs.push({
+      type: 'iframe',
+      url: url
+    })
+    return syncs;
+  },
+  onBidWon: function(bid) {
+    const url = bid.ext?.events?.onBidWon;
+    if (url) {
+      triggerEvent(url)
+    }
+  },
+  onSetTargeting: function(bid) {
+    const url = bid.ext?.events?.onSetTargeting;
+    if (url) {
+      triggerEvent(url)
+    }
+  },
+  onTimeout: function(bids) {
+    triggerEvent(URL_EVENT_ON_TIMEOUT, getIdsFromBids(bids))
+  },
+  onBidderError: function(params) {
+    let { bidderRequest } = params;
+    triggerEvent(URL_EVENT_ON_BIDDER_ERROR, getIdsFromBids(bidderRequest.bids))
+  }
+}
+registerBidder(spec);
diff --git a/modules/r2b2BidAdapter.md b/modules/r2b2BidAdapter.md
new file mode 100644
index 00000000000..43b59133215
--- /dev/null
+++ b/modules/r2b2BidAdapter.md
@@ -0,0 +1,37 @@
+# Overview
+
+```
+Module Name: R2B2 Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: dev@r2b2.cz
+```
+
+## Description
+
+Module that integrates R2B2 demand sources. To get your bidder configuration reach out to our account team on partner@r2b2.io
+
+
+
+## Test unit
+
+```javascript
+  var adUnits = [
+    {
+      code: 'test-r2b2',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]],
+        }
+      },
+      bids: [{
+        bidder: 'r2b2',
+        params: {
+            pid: 'selfpromo'
+        }
+      }]
+    }
+  ];
+```
+## Rendering
+
+Our adapter can feature a custom renderer specifically for display ads, tailored to enhance ad presentation and functionality. This is particularly beneficial for non-standard ad formats that require more complex logic. It's important to note that our rendering process operates outside of SafeFrames. For additional information, not limited to rendering aspects, please feel free to contact us at partner@r2b2.io
diff --git a/modules/radsBidAdapter.js b/modules/radsBidAdapter.js
index ae16bcf9d83..faa35ee51f7 100644
--- a/modules/radsBidAdapter.js
+++ b/modules/radsBidAdapter.js
@@ -2,6 +2,10 @@ import {deepAccess} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ */
+
 const BIDDER_CODE = 'rads';
 const ENDPOINT_URL = 'https://rads.recognified.net/md.request.php';
 const ENDPOINT_URL_DEV = 'https://dcradn1.online-solution.biz/md.request.php';
diff --git a/modules/rasBidAdapter.js b/modules/rasBidAdapter.js
deleted file mode 100644
index 801457aa552..00000000000
--- a/modules/rasBidAdapter.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { isEmpty, parseSizesInput, deepAccess } from '../src/utils.js';
-import {getAllOrtbKeywords} from '../libraries/keywords/keywords.js';
-import {getAdUnitSizes} from '../libraries/sizeUtils/sizeUtils.js';
-
-const BIDDER_CODE = 'ras';
-const VERSION = '1.0';
-
-const getEndpoint = (network) => {
-  return `https://csr.onet.pl/${encodeURIComponent(network)}/csr-006/csr.json?nid=${encodeURIComponent(network)}&`;
-};
-
-function parseParams(params, bidderRequest) {
-  const newParams = {};
-  if (params.customParams && typeof params.customParams === 'object') {
-    for (const param in params.customParams) {
-      if (params.customParams.hasOwnProperty(param)) {
-        newParams[param] = params.customParams[param];
-      }
-    }
-  }
-  const du = deepAccess(bidderRequest, 'refererInfo.page');
-  const dr = deepAccess(bidderRequest, 'refererInfo.ref');
-  if (du) {
-    newParams.du = du;
-  }
-  if (dr) {
-    newParams.dr = dr;
-  }
-  const pageContext = params.pageContext;
-  if (!pageContext) {
-    return newParams;
-  }
-  if (pageContext.du) {
-    newParams.du = pageContext.du;
-  }
-  if (pageContext.dr) {
-    newParams.dr = pageContext.dr;
-  }
-  if (pageContext.dv) {
-    newParams.DV = pageContext.dv;
-  }
-  const keywords = getAllOrtbKeywords(bidderRequest?.ortb2, pageContext.keyWords)
-  if (keywords.length > 0) {
-    newParams.kwrd = keywords.join('+')
-  }
-  if (pageContext.capping) {
-    newParams.local_capping = pageContext.capping;
-  }
-  if (pageContext.keyValues && typeof pageContext.keyValues === 'object') {
-    for (const param in pageContext.keyValues) {
-      if (pageContext.keyValues.hasOwnProperty(param)) {
-        const kvName = 'kv' + param;
-        newParams[kvName] = pageContext.keyValues[param];
-      }
-    }
-  }
-  return newParams;
-}
-
-const buildBid = (ad) => {
-  if (ad.type === 'empty') {
-    return null;
-  }
-  return {
-    requestId: ad.id,
-    cpm: ad.bid_rate ? ad.bid_rate.toFixed(2) : 0,
-    width: ad.width || 0,
-    height: ad.height || 0,
-    ttl: 300,
-    creativeId: ad.adid ? parseInt(ad.adid.split(',')[2], 10) : 0,
-    netRevenue: true,
-    currency: ad.currency || 'USD',
-    dealId: null,
-    meta: {
-      mediaType: BANNER
-    },
-    ad: ad.html || null
-  };
-};
-
-const getContextParams = (bidRequests, bidderRequest) => {
-  const bid = bidRequests[0];
-  const { params } = bid;
-  const requestParams = {
-    site: params.site,
-    area: params.area,
-    cre_format: 'html',
-    systems: 'das',
-    kvprver: VERSION,
-    ems_url: 1,
-    bid_rate: 1,
-    ...parseParams(params, bidderRequest)
-  };
-  return Object.keys(requestParams).map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(requestParams[key])).join('&');
-};
-
-const getSlots = (bidRequests) => {
-  let queryString = '';
-  const batchSize = bidRequests.length;
-  for (let i = 0; i < batchSize; i++) {
-    const adunit = bidRequests[i];
-    const slotSequence = deepAccess(adunit, 'params.slotSequence');
-
-    const sizes = parseSizesInput(getAdUnitSizes(adunit)).join(',');
-
-    queryString += `&slot${i}=${encodeURIComponent(adunit.params.slot)}&id${i}=${encodeURIComponent(adunit.bidId)}&composition${i}=CHILD`;
-
-    if (sizes.length) {
-      queryString += `&iusizes${i}=${encodeURIComponent(sizes)}`;
-    }
-    if (slotSequence !== undefined) {
-      queryString += `&pos${i}=${encodeURIComponent(slotSequence)}`;
-    }
-  }
-  return queryString;
-};
-
-const getGdprParams = (bidderRequest) => {
-  const gdprApplies = deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
-  let consentString = deepAccess(bidderRequest, 'gdprConsent.consentString');
-  let queryString = '';
-  if (gdprApplies !== undefined) {
-    queryString += `&gdpr_applies=${encodeURIComponent(gdprApplies)}`;
-  }
-  if (consentString !== undefined) {
-    queryString += `&euconsent=${encodeURIComponent(consentString)}`;
-  }
-  return queryString;
-};
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-
-  isBidRequestValid: function (bidRequest) {
-    if (!bidRequest || !bidRequest.params || typeof bidRequest.params !== 'object') {
-      return;
-    }
-    const { params } = bidRequest;
-    return Boolean(params.network && params.site && params.area && params.slot);
-  },
-
-  buildRequests: function (bidRequests, bidderRequest) {
-    const slotsQuery = getSlots(bidRequests);
-    const contextQuery = getContextParams(bidRequests, bidderRequest);
-    const gdprQuery = getGdprParams(bidderRequest);
-    const bidIds = bidRequests.map((bid) => ({ slot: bid.params.slot, bidId: bid.bidId }));
-    const network = bidRequests[0].params.network;
-    return [{
-      method: 'GET',
-      url: getEndpoint(network) + contextQuery + slotsQuery + gdprQuery,
-      bidIds: bidIds
-    }];
-  },
-
-  interpretResponse: function (serverResponse, bidRequest) {
-    const response = serverResponse.body;
-    if (!response || !response.ads || response.ads.length === 0) {
-      return [];
-    }
-    return response.ads.map(buildBid).filter((bid) => !isEmpty(bid));
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/raynRtdProvider.js b/modules/raynRtdProvider.js
new file mode 100644
index 00000000000..ee3d18be381
--- /dev/null
+++ b/modules/raynRtdProvider.js
@@ -0,0 +1,231 @@
+/**
+ * This module adds the Rayn provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch real-time audience and context data from Rayn
+ * @module modules/raynRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { deepAccess, deepSetValue, logError, logMessage, mergeDeep } from '../src/utils.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'rayn';
+const RAYN_TCF_ID = 1220;
+const RAYN_PERSONA_TAXONOMY_ID = 103015;
+const LOG_PREFIX = 'RaynJS: ';
+export const SEGMENTS_RESOLVER = 'rayn.io';
+export const RAYN_LOCAL_STORAGE_KEY = 'rayn-segtax';
+
+const defaultIntegration = {
+  iabAudienceCategories: {
+    v1_1: {
+      tier: 6,
+      enabled: true,
+    },
+  },
+  iabContentCategories: {
+    v3_0: {
+      tier: 4,
+      enabled: true,
+    },
+    v2_2: {
+      tier: 4,
+      enabled: true,
+    },
+  },
+};
+
+export const storage = getStorageManager({
+  moduleType: MODULE_TYPE_RTD,
+  moduleName: SUBMODULE_NAME,
+});
+
+function init(moduleConfig, userConsent) {
+  return true;
+}
+
+/**
+ * Create and return ORTB2 object with segtax and segments
+ * @param {number} segtax
+ * @param {Array} segmentIds
+ * @param {number} maxTier
+ * @return {Array}
+ */
+export function generateOrtbDataObject(segtax, segment, maxTier) {
+  const segmentIds = [];
+
+  try {
+    Object.keys(segment).forEach(tier => {
+      if (tier <= maxTier) {
+        segmentIds.push(...segment[tier].map((id) => {
+          return { id };
+        }))
+      }
+    });
+  } catch (error) {
+    logError(LOG_PREFIX, error);
+  }
+
+  return {
+    name: SEGMENTS_RESOLVER,
+    ext: {
+      segtax,
+    },
+    segment: segmentIds,
+  };
+}
+
+/**
+ * Create and return ORTB2 object with segtax and personaIds
+ * @param {number} segtax
+ * @param {Array} personaIds
+ * @return {Array}
+ */
+export function generatePersonaOrtbDataObject(segtax, personaIds) {
+  const segmentIds = [];
+
+  try {
+    segmentIds.push(...personaIds.map((id) => {
+      return { id };
+    }))
+  } catch (error) {
+    logError(LOG_PREFIX, error);
+  }
+
+  return {
+    name: SEGMENTS_RESOLVER,
+    ext: {
+      segtax,
+    },
+    segment: segmentIds,
+  };
+}
+
+/**
+ * Generates checksum
+ * @param {string} url
+ * @returns {string}
+ */
+export function generateChecksum(stringValue) {
+  const l = stringValue.length;
+  let i = 0;
+  let h = 0;
+  if (l > 0) while (i < l) h = ((h << 5) - h + stringValue.charCodeAt(i++)) | 0;
+  return h.toString();
+};
+
+/**
+ * Gets an object of segtax and segment IDs from LocalStorage
+ * or return the default value provided.
+ * @param {string} key
+ * @return {Object}
+ */
+export function readSegments(key) {
+  try {
+    return JSON.parse(storage.getDataFromLocalStorage(key));
+  } catch (error) {
+    logError(LOG_PREFIX, error);
+    return null;
+  }
+}
+
+/**
+ * Pass segments to configured bidders, using ORTB2
+ * @param {Object} bidConfig
+ * @param {Array} bidders
+ * @param {Object} integrationConfig
+ * @param {Array} segments
+ * @return {void}
+ */
+export function setSegmentsAsBidderOrtb2(bidConfig, bidders, integrationConfig, segments, checksum) {
+  const raynOrtb2 = {};
+
+  const raynContentData = [];
+  if (integrationConfig.iabContentCategories.v2_2.enabled && segments[checksum] && segments[checksum][6]) {
+    raynContentData.push(generateOrtbDataObject(6, segments[checksum][6], integrationConfig.iabContentCategories.v2_2.tier));
+  }
+  if (integrationConfig.iabContentCategories.v3_0.enabled && segments[checksum] && segments[checksum][7]) {
+    raynContentData.push(generateOrtbDataObject(7, segments[checksum][7], integrationConfig.iabContentCategories.v3_0.tier));
+  }
+  if (raynContentData.length > 0) {
+    deepSetValue(raynOrtb2, 'site.content.data', raynContentData);
+  }
+
+  const raynUserData = [];
+  if (integrationConfig.iabAudienceCategories.v1_1.enabled && segments[4]) {
+    raynUserData.push(generateOrtbDataObject(4, segments[4], integrationConfig.iabAudienceCategories.v1_1.tier));
+  }
+  if (segments[RAYN_PERSONA_TAXONOMY_ID]) {
+    raynUserData.push(generatePersonaOrtbDataObject(RAYN_PERSONA_TAXONOMY_ID, segments[RAYN_PERSONA_TAXONOMY_ID]));
+  }
+  if (raynUserData.length > 0) {
+    deepSetValue(raynOrtb2, 'user.data', raynUserData);
+  }
+
+  if (!bidders || bidders.length === 0 || !segments || Object.keys(segments).length <= 0) {
+    mergeDeep(bidConfig?.ortb2Fragments?.global, raynOrtb2);
+  } else {
+    const bidderConfig = Object.fromEntries(
+      bidders.map((bidder) => [bidder, raynOrtb2]),
+    );
+    mergeDeep(bidConfig?.ortb2Fragments?.bidder, bidderConfig);
+  }
+}
+
+/**
+ * Real-time data retrieval from Rayn
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
+ * @param {Object} config
+ * @param {Object} userConsent
+ * @return {void}
+ */
+function alterBidRequests(reqBidsConfigObj, callback, config, userConsent) {
+  try {
+    const checksum = generateChecksum(window.location.href);
+
+    const segments = readSegments(RAYN_LOCAL_STORAGE_KEY);
+
+    const bidders = deepAccess(config, 'params.bidders');
+    const integrationConfig = mergeDeep(defaultIntegration, deepAccess(config, 'params.integration'));
+
+    if (segments && Object.keys(segments).length > 0 && (
+      segments[checksum] || (segments[4] &&
+        integrationConfig.iabAudienceCategories.v1_1.enabled &&
+        !integrationConfig.iabContentCategories.v2_2.enabled &&
+        !integrationConfig.iabContentCategories.v3_0.enabled) ||
+      segments[RAYN_PERSONA_TAXONOMY_ID]
+    )) {
+      logMessage(LOG_PREFIX, `Segtax data from localStorage: ${JSON.stringify(segments)}`);
+      setSegmentsAsBidderOrtb2(reqBidsConfigObj, bidders, integrationConfig, segments, checksum);
+      callback();
+    } else if (window.raynJS && typeof window.raynJS.getSegtax === 'function') {
+      window.raynJS.getSegtax().then((segtaxData) => {
+        logMessage(LOG_PREFIX, `Segtax data from RaynJS: ${JSON.stringify(segtaxData)}`);
+        setSegmentsAsBidderOrtb2(reqBidsConfigObj, bidders, integrationConfig, segtaxData, checksum);
+        callback();
+      }).catch((error) => {
+        logError(LOG_PREFIX, error);
+        callback();
+      });
+    } else {
+      logMessage(LOG_PREFIX, 'No segtax data');
+      callback();
+    }
+  } catch (error) {
+    logError(LOG_PREFIX, error);
+    callback();
+  }
+}
+
+export const raynSubmodule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  getBidRequestData: alterBidRequests,
+  gvlid: RAYN_TCF_ID,
+};
+
+submodule(MODULE_NAME, raynSubmodule);
diff --git a/modules/raynRtdProvider.md b/modules/raynRtdProvider.md
new file mode 100644
index 00000000000..8d888a18d1f
--- /dev/null
+++ b/modules/raynRtdProvider.md
@@ -0,0 +1,118 @@
+---
+layout: page_v2
+title: Rayn RTD Provider
+display_name: Rayn Real Time Data Module
+description: Rayn Real Time Data module appends privacy preserving enhanced contextual categories and audiences. Moments matter.
+page_type: module
+module_type: rtd
+module_code: raynRtdProvider
+enable_download: true
+vendor_specific: true
+sidebarType: 1
+---
+
+# Rayn Real-time Data Submodule
+
+Rayn is a privacy preserving, data platform. We turn content into context, into audiences. For Personalisation, Monetisation and Insights. This module reads contextual categories and audience cohorts from RaynJS (via localStorage) and passes them to the bid-stream.
+
+## Integration
+
+To install the module, follow these instructions:
+
+Step 1: Prepare the base Prebid file
+Compile the Rayn RTD module (`raynRtdProvider`) into your Prebid build along with the parent RTD Module (`rtdModule`). From the command line, run gulp build `gulp build --modules=rtdModule,raynRtdProvider`
+
+Step 2: Set configuration
+Enable Rayn RTD Module using pbjs.setConfig. Example is provided in the Configuration section. See the **Parameter Description** for more detailed information of the configuration parameters.
+
+### Configuration
+
+This module is configured as part of the realTimeData.dataProviders object.
+
+Example format:
+
+```js
+pbjs.setConfig(
+    // ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "rayn",
+                waitForIt: true,
+                params: {
+                    bidders: ["appnexus", "pubmatic"],
+                    integration: {
+                        iabAudienceCategories: {
+                            v1_1: {
+                                tier: 6,
+                                enabled: true,
+                            },
+                        },
+                        iabContentCategories: {
+                            v3_0: {
+                                tier: 4,
+                                enabled: true,
+                            },
+                            v2_2: {
+                                tier: 4,
+                                enabled: true,
+                            },
+                        },
+                    }
+                }
+            }
+        ]
+    }
+    // ...
+}
+```
+
+## Parameter Description
+
+The parameters below provide configurability for general behaviours of the RTD submodule, as well as enabling settings for specific use cases mentioned above (e.g. tiers and bidders).
+
+### Parameters
+
+{: .table .table-bordered .table-striped }
+| Name                                                  | Type      | Description                                                                          | Notes |
+| :---------------------------------------------------- | :-------- | :----------------------------------------------------------------------------------- | :---- |
+| name                                                  | `String`  | RTD sub module name                                                                  | Always "rayn" |
+| waitForIt                                             | `Boolean` | Required to ensure that the auction is delayed for the module to respond             | Optional. Defaults to false but recommended to true |
+| params                                                | `Object`  |                                                                                      ||
+| params.bidders                                        | `Array`   | Bidders with which to share context and segment information                          | Optional. In case no bidder is specified Rayn will append data for all bidders |
+| params.integration                                    | `Object`  | Controls which IAB taxonomy should be used and up to which category tier             | Optional. In case it's not defined, all supported IAB taxonomies and all category tiers will be used |
+| params.integration.iabAudienceCategories              | `Object`  |                                                                                      ||
+| params.integration.iabAudienceCategories.v1_1         | `Object`  |                                                                                      ||
+| params.integration.iabAudienceCategories.v1_1.enabled | `Boolean` | Controls if IAB Audience Taxonomy v1.1 will be used                                  | Optional. Enabled by default |
+| params.integration.iabAudienceCategories.v1_1.tier    | `Number`  | Controls up to which IAB Audience Taxonomy v1.1 Category tier will be used           | Optional. Tier 6 by default |
+| params.integration.iabContentCategories               | `Object`  |                                                                                      ||
+| params.integration.iabContentCategories.v3_0          | `Object`  |                                                                                      ||
+| params.integration.iabContentCategories.v3_0.enabled  | `Boolean` | Controls if IAB Content Taxonomy v3.0 will be used                                   | Optional. Enabled by default |
+| params.integration.iabContentCategories.v3_0.tier     | `Number`  | Controls up to which IAB Content Taxonomy v3.0 Category tier will be used            | Optional. Tier 4 by default |
+| params.integration.iabContentCategories.v2_2          | `Object`  |                                                                                      ||
+| params.integration.iabContentCategories.v2_2.enabled  | `Boolean` | Controls if IAB Content Taxonomy v2.2 will be used                                   | Optional. Enabled by default |
+| params.integration.iabContentCategories.v2_2.tier     | `Number`  | Controls up to which IAB Content Taxonomy v2.2 Category tier will be used            | Optional. Tier 4 by default |
+
+Please note that raynRtdProvider should be integrated into the website along with RaynJS.
+
+## Testing
+
+To view an example of the on page setup:
+
+```bash
+gulp serve-fast --modules=rtdModule,raynRtdProvider,appnexusBidAdapter
+```
+
+Then in your browser access: [http://localhost:9999/integrationExamples/gpt/raynRtdProvider_example.html](http://localhost:9999/integrationExamples/gpt/raynRtdProvider_example.html)
+
+Run the unit tests, just on the Rayn RTD module test file:
+
+```bash
+gulp test --file "test/spec/modules/raynRtdProvider_spec.js"
+```
+
+## Support
+
+If you require further assistance or are interested in discussing the module functionality please reach out to [support@rayn.io](mailto:support@rayn.io).
+You are also able to find more examples and other integration routes on the Rayn documentation site.
diff --git a/modules/readpeakBidAdapter.js b/modules/readpeakBidAdapter.js
index 718d6504b56..da3153c0b68 100644
--- a/modules/readpeakBidAdapter.js
+++ b/modules/readpeakBidAdapter.js
@@ -136,7 +136,7 @@ function impression(slot) {
       mediaType: 'native',
       size: '\*'
     });
-    bidFloorFromModule = floorInfo.currency === 'USD' ? floorInfo.floor : undefined;
+    bidFloorFromModule = floorInfo?.currency === 'USD' ? floorInfo?.floor : undefined;
   }
   const imp = {
     id: slot.bidId,
@@ -349,7 +349,7 @@ function nativeResponse(imp, bid) {
         keys.cta = asset.data && asset.id === 5 ? asset.data.value : keys.cta;
       });
       if (nativeAd.link) {
-        keys.clickUrl = encodeURIComponent(nativeAd.link.url);
+        keys.clickUrl = nativeAd.link.url;
       }
       const trackers = nativeAd.imptrackers || [];
       trackers.unshift(replaceAuctionPrice(bid.burl, bid.price));
diff --git a/modules/reconciliationRtdProvider.js b/modules/reconciliationRtdProvider.js
index 9b6a3d7aca3..5671b2021d8 100644
--- a/modules/reconciliationRtdProvider.js
+++ b/modules/reconciliationRtdProvider.js
@@ -21,6 +21,10 @@ import {ajaxBuilder} from '../src/ajax.js';
 import {generateUUID, isGptPubadsDefined, logError, timestamp} from '../src/utils.js';
 import {find} from '../src/polyfill.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 /** @type {Object} */
 const MessageType = {
   IMPRESSION_REQUEST: 'rsdk:impression:req',
diff --git a/modules/redtramBidAdapter.js b/modules/redtramBidAdapter.js
index e1dc0e2a148..bacc209f991 100644
--- a/modules/redtramBidAdapter.js
+++ b/modules/redtramBidAdapter.js
@@ -1,155 +1,21 @@
-import {
-  isFn,
-  isStr,
-  deepAccess,
-  getWindowTop,
-  triggerPixel
-} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { bidWinReport, buildBidRequests, buildUserSyncs, interpretResponse, isBidRequestValid } from '../libraries/precisoUtils/bidUtilsCommon.js';
 
 const BIDDER_CODE = 'redtram';
 const AD_URL = 'https://prebid.redtram.com/pbjs';
 const SYNC_URL = 'https://prebid.redtram.com/sync';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency || !bid.meta) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    default:
-      return false;
-  }
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidFloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER],
-
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && bid.params.placementId);
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    const winTop = getWindowTop();
-    const location = winTop.location;
-    const placements = [];
-
-    const request = {
-      deviceWidth: winTop.screen.width,
-      deviceHeight: winTop.screen.height,
-      language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
-      host: location.host,
-      page: location.pathname,
-      placements: placements
-    };
-
-    if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
-      if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent;
-      }
-    }
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      const placement = {
-        placementId: bid.params.placementId,
-        bidId: bid.bidId,
-        schain: bid.schain || {},
-        bidfloor: getBidFloor(bid)
-      };
-
-      if (typeof bid.userId !== 'undefined') {
-        placement.userId = bid.userId;
-      }
-
-      const mediaType = bid.mediaTypes;
-
-      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
-        placement.sizes = mediaType[BANNER].sizes;
-        placement.adFormat = BANNER;
-      }
-
-      placements.push(placement);
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
+  isBidRequestValid: isBidRequestValid,
+  buildRequests: buildBidRequests(AD_URL),
+  interpretResponse: interpretResponse,
   getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
+    return buildUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent, SYNC_URL);
   },
-
-  onBidWon: (bid) => {
-    const cpm = deepAccess(bid, 'adserverTargeting.hb_pb') || '';
-    if (isStr(bid.nurl) && bid.nurl !== '') {
-      bid.nurl = bid.nurl.replace(/\${AUCTION_PRICE}/, cpm);
-      triggerPixel(bid.nurl);
-    }
-  }
+  onBidWon: bidWinReport
 };
 
 registerBidder(spec);
diff --git a/modules/relaidoBidAdapter.js b/modules/relaidoBidAdapter.js
index 1e702d812f0..69f9be8d107 100644
--- a/modules/relaidoBidAdapter.js
+++ b/modules/relaidoBidAdapter.js
@@ -7,17 +7,19 @@ import {
   isArray,
   isNumber,
   parseSizesInput,
-  getBidIdParameter
+  getBidIdParameter,
+  isGptPubadsDefined
 } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { Renderer } from '../src/Renderer.js';
 import { getStorageManager } from '../src/storageManager.js';
 import sha1 from 'crypto-js/sha1';
+import { isSlotMatchingAdUnitCode } from '../libraries/gptUtils/gptUtils.js';
 
 const BIDDER_CODE = 'relaido';
 const BIDDER_DOMAIN = 'api.relaido.jp';
-const ADAPTER_VERSION = '1.1.0';
+const ADAPTER_VERSION = '1.2.1';
 const DEFAULT_TTL = 300;
 const UUID_KEY = 'relaido_uuid';
 
@@ -47,6 +49,7 @@ function buildRequests(validBidRequests, bidderRequest) {
   let bidDomain = null;
   let bidder = null;
   let count = null;
+  let isOgUrlOption = false;
 
   for (let i = 0; i < validBidRequests.length; i++) {
     const bidRequest = validBidRequests[i];
@@ -92,6 +95,10 @@ function buildRequests(validBidRequests, bidderRequest) {
       count = bidRequest.bidRequestsCount;
     }
 
+    if (getBidIdParameter('ogUrl', bidRequest.params)) {
+      isOgUrlOption = true;
+    }
+
     bids.push({
       bid_id: bidRequest.bidId,
       placement_id: getBidIdParameter('placementId', bidRequest.params),
@@ -104,10 +111,14 @@ function buildRequests(validBidRequests, bidderRequest) {
       width: width,
       height: height,
       banner_sizes: getBannerSizes(bidRequest),
-      media_type: mediaType
+      media_type: mediaType,
+      userIdAsEids: bidRequest.userIdAsEids || [],
+      pagekvt: getTargeting(bidRequest),
     });
   }
 
+  const canonicalUrl = getCanonicalUrl(bidderRequest.refererInfo?.canonicalUrl, isOgUrlOption);
+
   const data = JSON.stringify({
     version: ADAPTER_VERSION,
     bids: bids,
@@ -117,7 +128,8 @@ function buildRequests(validBidRequests, bidderRequest) {
     uuid: getUuid(),
     pv: '$prebid.version$',
     imuid: imuid,
-    canonical_url_hash: getCanonicalUrlHash(bidderRequest.refererInfo),
+    canonical_url: canonicalUrl,
+    canonical_url_hash: getCanonicalUrlHash(canonicalUrl),
     ref: bidderRequest.refererInfo.page
   });
 
@@ -142,6 +154,7 @@ function interpretResponse(serverResponse, bidRequest) {
     const playerUrl = res.playerUrl || bidRequest.player || body.playerUrl;
     let bidResponse = {
       requestId: res.bidId,
+      placementId: res.placementId,
       width: res.width,
       height: res.height,
       cpm: res.price,
@@ -257,6 +270,7 @@ function outstreamRender(bid) {
       height: bid.height,
       vastXml: bid.vastXml,
       mediaType: bid.mediaType,
+      placementId: bid.placementId,
     });
   });
 }
@@ -291,12 +305,25 @@ function getUuid() {
   return newId;
 }
 
-function getCanonicalUrlHash(refererInfo) {
-  const canonicalUrl = refererInfo.canonicalUrl || null;
+function getOgUrl() {
+  try {
+    const ogURLElement = window.top.document.querySelector('meta[property="og:url"]');
+    return ogURLElement ? ogURLElement.content : null;
+  } catch (e) {
+    const ogURLElement = document.querySelector('meta[property="og:url"]');
+    return ogURLElement ? ogURLElement.content : null;
+  }
+}
+
+function getCanonicalUrl(canonicalUrl, isOgUrlOption) {
   if (!canonicalUrl) {
-    return null;
+    return (isOgUrlOption) ? getOgUrl() : null;
   }
-  return sha1(canonicalUrl).toString();
+  return canonicalUrl;
+}
+
+function getCanonicalUrlHash(canonicalUrl) {
+  return (canonicalUrl) ? sha1(canonicalUrl).toString() : null;
 }
 
 function hasBannerMediaType(bid) {
@@ -346,6 +373,44 @@ function getBannerSizes(bidRequest) {
   return parseSizesInput(sizes).join(',');
 }
 
+function getTargeting(bidRequest) {
+  const targetings = {};
+  const pubads = getPubads();
+  if (pubads) {
+    const keys = pubads.getTargetingKeys();
+    for (const key of keys) {
+      const values = pubads.getTargeting(key);
+      targetings[key] = values;
+    }
+  }
+  const adUnitSlot = getAdUnit(bidRequest.adUnitCode);
+  if (adUnitSlot) {
+    const keys = adUnitSlot.getTargetingKeys();
+    for (const key of keys) {
+      const values = adUnitSlot.getTargeting(key);
+      targetings[key] = values;
+    }
+  }
+  return targetings;
+}
+
+function getPubads() {
+  return (isGptPubadsDefined()) ? window.googletag.pubads() : null;
+}
+
+function getAdUnit(adUnitCode) {
+  if (isGptPubadsDefined()) {
+    const adSlots = window.googletag.pubads().getSlots();
+    const isMatchingAdSlot = isSlotMatchingAdUnitCode(adUnitCode);
+    for (let i = 0; i < adSlots.length; i++) {
+      if (isMatchingAdSlot(adSlots[i])) {
+        return adSlots[i];
+      }
+    }
+  }
+  return null;
+}
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
diff --git a/modules/relevantdigitalBidAdapter.js b/modules/relevantdigitalBidAdapter.js
index ad9ee5e1e14..c776022749d 100644
--- a/modules/relevantdigitalBidAdapter.js
+++ b/modules/relevantdigitalBidAdapter.js
@@ -94,11 +94,18 @@ export const spec = {
   gvlid: 1100,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  /** We need both params.placementId + a complete configuration (pbsHost + accountId) to continue **/
+  /** We need both params.placementId + a complete configuration (pbsHost + accountId) to continue */
   isBidRequestValid: (bid) => bid.params?.placementId && getBidderConfig([bid]).complete,
 
   /** Trigger impression-pixel */
-  onBidWon: ({pbsWurl}) => pbsWurl && triggerPixel(pbsWurl),
+  onBidWon(bid) {
+    if (bid.pbsWurl) {
+      triggerPixel(bid.pbsWurl)
+    }
+    if (bid.burl) {
+      triggerPixel(bid.burl)
+    }
+  },
 
   /** Build BidRequest for PBS */
   buildRequests(bidRequests, bidderRequest) {
diff --git a/modules/relevatehealthBidAdapter.js b/modules/relevatehealthBidAdapter.js
new file mode 100644
index 00000000000..560dbdeac3e
--- /dev/null
+++ b/modules/relevatehealthBidAdapter.js
@@ -0,0 +1,144 @@
+import { formatResponse } from '../libraries/deepintentUtils/index.js';
+import {
+  registerBidder
+} from '../src/adapters/bidderFactory.js';
+import {
+  BANNER
+} from '../src/mediaTypes.js';
+import {
+  deepAccess,
+  generateUUID,
+  isArray,
+  logError
+} from '../src/utils.js';
+const BIDDER_CODE = 'relevatehealth';
+const ENDPOINT_URL = 'https://rtb.relevate.health/prebid/relevate';
+
+function buildRequests(bidRequests, bidderRequest) {
+  const requests = [];
+  // Loop through each bid request
+  bidRequests.forEach(bid => {
+    // Construct the bid request object
+    const request = {
+      id: generateUUID(),
+      placementId: bid.params.placement_id,
+      imp: [{
+        id: bid.bidId,
+        banner: getBanner(bid),
+        bidfloor: getFloor(bid)
+      }],
+      site: getSite(bidderRequest),
+      user: buildUser(bid)
+    };
+    // Get uspConsent from bidderRequest
+    if (bidderRequest && bidderRequest.uspConsent) {
+      request.us_privacy = bidderRequest.uspConsent;
+    }
+    // Get GPP Consent from bidderRequest
+    if (bidderRequest?.gppConsent?.gppString) {
+      request.gpp = bidderRequest.gppConsent.gppString;
+      request.gpp_sid = bidderRequest.gppConsent.applicableSections;
+    } else if (bidderRequest?.ortb2?.regs?.gpp) {
+      request.gpp = bidderRequest.ortb2.regs.gpp;
+      request.gpp_sid = bidderRequest.ortb2.regs.gpp_sid;
+    }
+    // Get coppa compliance from bidderRequest
+    if (bidderRequest?.ortb2?.regs?.coppa) {
+      request.coppa = 1;
+    }
+    // Push the constructed bid request to the requests array
+    requests.push(request);
+  });
+  // Return the array of bid requests
+  return {
+    method: 'POST',
+    url: ENDPOINT_URL,
+    data: JSON.stringify(requests),
+    options: {
+      contentType: 'application/json',
+    }
+  };
+}
+// Format the response as per the standards
+function interpretResponse(bidResponse, bidRequest) {
+  let resp = [];
+  if (bidResponse && bidResponse.body) {
+    try {
+      let bids = bidResponse.body.seatbid && bidResponse.body.seatbid[0] ? bidResponse.body.seatbid[0].bid : [];
+      if (bids) {
+        bids.forEach(bidObj => {
+          let newBid = formatResponse(bidObj);
+          newBid.mediaType = BANNER;
+          resp.push(newBid);
+        });
+      }
+    } catch (err) {
+      logError(err);
+    }
+  }
+  return resp;
+}
+// Function to check if Bid is valid
+function isBidRequestValid(bid) {
+  return !!(bid.params.placement_id && bid.params.user_id);
+}
+// Function to get banner details
+function getBanner(bid) {
+  if (deepAccess(bid, 'mediaTypes.banner')) {
+    // Fetch width and height from MediaTypes object, if not provided in bid params
+    if (deepAccess(bid, 'mediaTypes.banner.sizes') && !bid.params.height && !bid.params.width) {
+      let sizes = deepAccess(bid, 'mediaTypes.banner.sizes');
+      if (isArray(sizes) && sizes.length > 0) {
+        return {
+          h: sizes[0][1],
+          w: sizes[0][0]
+        };
+      }
+    } else {
+      return {
+        h: bid.params.height,
+        w: bid.params.width
+      };
+    }
+  }
+}
+// Function to get bid_floor
+function getFloor(bid) {
+  if (bid.params && bid.params.bid_floor) {
+    return bid.params.bid_floor;
+  } else {
+    return 0;
+  }
+}
+// Function to get site details
+function getSite(bidderRequest) {
+  let site = {};
+  if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
+    site.name = bidderRequest.refererInfo.domain;
+  } else {
+    site.name = '';
+  }
+  return site;
+}
+// Function to build the user object
+function buildUser(bid) {
+  if (bid && bid.params) {
+    return {
+      id: bid.params.user_id && typeof bid.params.user_id == 'string' ? bid.params.user_id : '',
+      // TODO: commented out because of rule violations
+      buyeruid: '', // localStorage.getItem('adx_profile_guid') ? localStorage.getItem('adx_profile_guid') : '',
+      keywords: bid.params.keywords && typeof bid.params.keywords == 'string' ? bid.params.keywords : '',
+      customdata: bid.params.customdata && typeof bid.params.customdata == 'string' ? bid.params.customdata : ''
+    };
+  }
+}
+// Export const spec
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: BANNER,
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse
+}
+
+registerBidder(spec);
diff --git a/modules/relevatehealthBidAdapter.md b/modules/relevatehealthBidAdapter.md
new file mode 100644
index 00000000000..432e4fcec02
--- /dev/null
+++ b/modules/relevatehealthBidAdapter.md
@@ -0,0 +1,40 @@
+# Overview
+
+```
+Module Name: relevatehealth Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: marketingops@relevatehealth.com
+```
+
+# Description
+
+relevatehealth currently supports the BANNER type ads through prebid js
+
+Module that connects to relevatehealth's demand sources.
+
+# Banner Test Request
+```
+  var adUnits = [
+    {
+      code: 'banner-ad',
+      mediaTypes: {
+        banner: {
+            sizes: [[160, 600]], 
+        }
+      }
+      bids: [
+        {
+            bidder: 'relevatehealth',
+            params: {
+                placement_id: 110011,  // Required parameter
+                user_id: '1111111' // Required parameter
+                width: 160,   // Optional parameter 
+                height: 600, // Optional parameter
+                domain: '', // Optional parameter
+		        bid_floor: 0.5 // Optional parameter
+            }
+        }
+      ]
+    }
+  ];
+```
diff --git a/modules/resetdigitalBidAdapter.js b/modules/resetdigitalBidAdapter.js
index 8264e0cc9cc..4f1ebafdf9c 100644
--- a/modules/resetdigitalBidAdapter.js
+++ b/modules/resetdigitalBidAdapter.js
@@ -1,25 +1,29 @@
-import { timestamp, deepAccess, isStr, deepClone } from '../src/utils.js';
+import { timestamp, deepAccess, isStr, deepClone, isPlainObject } from '../src/utils.js';
 import { getOrigin } from '../libraries/getOrigin/index.js';
 import { config } from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'resetdigital';
 const CURRENCY = 'USD';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [ 'banner', 'video' ],
-  isBidRequestValid: function(bid) {
-    return (!!(bid.params.pubId || bid.params.zoneId));
+  supportedMediaTypes: ['banner', 'video'],
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.pubId || bid.params.zoneId);
   },
-  buildRequests: function(validBidRequests, bidderRequest) {
-    let stack = (bidderRequest.refererInfo &&
-      bidderRequest.refererInfo.stack ? bidderRequest.refererInfo.stack
-      : [])
-
-    let spb = (config.getConfig('userSync') && config.getConfig('userSync').syncsPerBidder)
-      ? config.getConfig('userSync').syncsPerBidder : 5
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let stack =
+      bidderRequest.refererInfo && bidderRequest.refererInfo.stack
+        ? bidderRequest.refererInfo.stack
+        : [];
+
+    let spb =
+      config.getConfig('userSync') &&
+      config.getConfig('userSync').syncsPerBidder
+        ? config.getConfig('userSync').syncsPerBidder
+        : 5;
 
     const payload = {
       start_time: timestamp(),
@@ -29,19 +33,19 @@ export const spec = {
         iframe: !bidderRequest.refererInfo.reachedTop,
         // TODO: the last element in refererInfo.stack is window.location.href, that's unlikely to have been the intent here
         url: stack && stack.length > 0 ? [stack.length - 1] : null,
-        https: (window.location.protocol === 'https:'),
+        https: window.location.protocol === 'https:',
         // TODO: is 'page' the right value here?
-        referrer: bidderRequest.refererInfo.page
+        referrer: bidderRequest.refererInfo.page,
       },
       imps: [],
       user_ids: validBidRequests[0].userId,
-      sync_limit: spb
+      sync_limit: spb,
     };
 
     if (bidderRequest && bidderRequest.gdprConsent) {
       payload.gdpr = {
         applies: bidderRequest.gdprConsent.gdprApplies,
-        consent: bidderRequest.gdprConsent.consentString
+        consent: bidderRequest.gdprConsent.consentString,
       };
     }
 
@@ -50,10 +54,16 @@ export const spec = {
     }
 
     function getOrtb2Keywords(ortb2Obj) {
-      const fields = ['site.keywords', 'site.content.keywords', 'user.keywords', 'app.keywords', 'app.content.keywords'];
+      const fields = [
+        'site.keywords',
+        'site.content.keywords',
+        'user.keywords',
+        'app.keywords',
+        'app.content.keywords',
+      ];
       let result = [];
 
-      fields.forEach(path => {
+      fields.forEach((path) => {
         let keyStr = deepAccess(ortb2Obj, path);
         if (isStr(keyStr)) result.push(keyStr);
       });
@@ -79,18 +89,26 @@ export const spec = {
         const floorInfo = req.getFloor({
           currency: CURRENCY,
           mediaType: BANNER,
-          size: '*'
+          size: '*',
         });
-        if (typeof floorInfo === 'object' && floorInfo.currency === CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
+        if (
+          isPlainObject(floorInfo) &&
+          floorInfo.currency === CURRENCY &&
+          !isNaN(parseFloat(floorInfo.floor))
+        ) {
           bidFloor = parseFloat(floorInfo.floor);
           bidFloorCur = CURRENCY;
         }
       }
 
       // get param kewords (if it exists)
-      let paramsKeywords = req.params.keywords ? req.params.keywords.split(',') : [];
+      let paramsKeywords = req.params.keywords
+        ? req.params.keywords.split(',')
+        : [];
       // merge all keywords
-      let keywords = ortb2KeywordsList.concat(paramsKeywords).concat(metaKeywords);
+      let keywords = ortb2KeywordsList
+        .concat(paramsKeywords)
+        .concat(metaKeywords);
 
       payload.imps.push({
         pub_id: req.params.pubId,
@@ -110,32 +128,32 @@ export const spec = {
         sizes: req.sizes,
         force_bid: req.params.forceBid,
         coppa: config.getConfig('coppa') === true ? 1 : 0,
-        media_types: deepAccess(req, 'mediaTypes')
+        media_types: deepAccess(req, 'mediaTypes'),
       });
     }
 
-    let params = validBidRequests[0].params
-    let url = params.endpoint ? params.endpoint : '//ads.resetsrv.com'
+    let params = validBidRequests[0].params;
+    let url = params.endpoint ? params.endpoint : '//ads.resetsrv.com';
     return {
       method: 'POST',
       url: url,
       data: JSON.stringify(payload),
-      bids: validBidRequests
+      bids: validBidRequests,
     };
   },
-  interpretResponse: function(serverResponse, bidRequest) {
+  interpretResponse: function (serverResponse, bidRequest) {
     const bidResponses = [];
     if (!serverResponse || !serverResponse.body) {
-      return bidResponses
+      return bidResponses;
     }
 
     let res = serverResponse.body;
     if (!res.bids || !res.bids.length) {
-      return []
+      return [];
     }
 
     for (let x = 0; x < serverResponse.body.bids.length; x++) {
-      let bid = serverResponse.body.bids[x]
+      let bid = serverResponse.body.bids[x];
 
       bidResponses.push({
         requestId: bid.bid_id,
@@ -152,47 +170,45 @@ export const spec = {
         netRevenue: true,
         currency: 'USD',
         meta: {
-          advertiserDomains: bid.adomain
-        }
-      })
+          advertiserDomains: bid.adomain,
+        },
+      });
     }
 
     return bidResponses;
   },
-  getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
-    const syncs = []
-
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent) {
+    let syncs = [];
     if (!serverResponses.length || !serverResponses[0].body) {
-      return syncs
-    }
-
-    let pixels = serverResponses[0].body.pixels
-    if (!pixels || !pixels.length) {
-      return syncs
+      return syncs;
     }
 
-    let gdprParams = null
+    let gdprParams = '';
     if (gdprConsent) {
       if (typeof gdprConsent.gdprApplies === 'boolean') {
-        gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`
+        gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${
+          gdprConsent.consentString
+        }`;
       } else {
-        gdprParams = `gdpr_consent=${gdprConsent.consentString}`
+        gdprParams = `gdpr_consent=${gdprConsent.consentString}`;
       }
     }
 
-    for (let x = 0; x < pixels.length; x++) {
-      let pixel = pixels[x]
-
-      if ((pixel.type === 'iframe' && syncOptions.iframeEnabled) ||
-        (pixel.type === 'image' && syncOptions.pixelEnabled)) {
-        if (gdprParams && gdprParams.length) {
-          pixel = (pixel.indexOf('?') === -1 ? '?' : '&') + gdprParams
-        }
-        syncs.push(pixel)
-      }
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: `https://async.resetdigital.co/async_usersync.html?${gdprParams}`,
+      });
+    } else if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: `https://meta.resetdigital.co/pchain${
+          gdprParams ? `?${gdprParams}` : ''
+        }`,
+      });
     }
     return syncs;
-  }
+  },
 };
 
 registerBidder(spec);
diff --git a/modules/resetdigitalBidAdapter.md b/modules/resetdigitalBidAdapter.md
index a368c7f5633..64b600a7cc0 100644
--- a/modules/resetdigitalBidAdapter.md
+++ b/modules/resetdigitalBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name: ResetDigital Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: bruce@resetdigital.co
+Maintainer: BidderSupport@resetdigital.co
 ```
 
 # Description
@@ -15,49 +15,58 @@ Video is supported but requires a publisher supplied renderer at this time.
 
 ## Web
 ```
-    var adUnits = [
-           {
-               code: 'your-div',
-               mediaTypes: {
-                   banner: {
-                       sizes: [[300,250]]
-                   },
-                   
-               },
-               bids: [
-                   {
-                       bidder: "resetdigital",
-                       params: {
-                           pubId: "your-pub-id",
-                           site_id: "your-site-id",
-                           forceBid: true,
-                       }
-                   }
-               ]
-           }
-       ];
-
-
-    var videoAdUnits = [
-           {
-               code: 'your-div',
-               mediaTypes: {
-                   video: {
-                        playerSize: [640, 480]
-                   },
-                   
-               },
-               bids: [
-                   {
-                       bidder: "resetdigital",
-                       params: {
-                           pubId: "your-pub-id",
-                           site_id: "your-site-id",
-                           forceBid: true,
-                       }
-                   }
-               ]
-           }
-       ];
+// Define the ad units for banner ads
+var adUnits = [
+    {
+        code: 'your-div', // Replace with the actual ad unit code
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]] // Define the sizes for banner ads
+            }
+        },
+        bids: [
+            {
+                bidder: "resetdigital",
+                params: {
+                    pubId: "your-pub-id", // (required) Replace with your publisher ID
+                    site_id: "your-site-id", // Replace with your site ID
+                    endpoint: 'https://ads.resetsrv.com', // (optional) Endpoint URL for the ad server
+                    forceBid: true, // Optional parameter to force the bid
+                    zoneId: { // (optional) Zone ID parameters
+                        placementId: "", // Optional ID used for reports
+                        deals: "", // Optional string of deal IDs, comma-separated
+                        test: 1 // Set to 1 to force the bidder to respond with a creative
+                    }
+                }
+            }
+        ]
+    }
+];
 
+// Define the ad units for video ads
+var videoAdUnits = [
+    {
+        code: 'your-div', // Replace with the actual video ad unit code
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480] // Define the player size for video ads
+            }
+        },
+        bids: [
+            {
+                bidder: "resetdigital",
+                params: {
+                    pubId: "your-pub-id", // (required) Replace with your publisher ID
+                    site_id: "your-site-id", // Replace with your site ID
+                    forceBid: true, // Optional parameter to force the bid
+                    zoneId: { // (optional) Zone ID parameters
+                        placementId: "", // Optional ID used for reports
+                        deals: "", // Optional string of deal IDs, comma-separated
+                        test: 1 // Set to 1 to force the bidder to respond with a creative
+                    }
+                }
+            }
+        ]
+    }
+];
 ```
diff --git a/modules/retailspotBidAdapter.js b/modules/retailspotBidAdapter.js
index 616b638e840..557dd617274 100644
--- a/modules/retailspotBidAdapter.js
+++ b/modules/retailspotBidAdapter.js
@@ -2,6 +2,11 @@ import {buildUrl, deepAccess, parseSizesInput} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'retailspot';
 const DEFAULT_SUBDOMAIN = 'ssp';
 const PREPROD_SUBDOMAIN = 'ssp-preprod';
@@ -28,7 +33,7 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {bidRequests} - bidRequests.bids[] is an array of AdUnits and bids
+   * @param {BidRequests} - bidRequests.bids[] is an array of AdUnits and bids
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
diff --git a/modules/revcontentBidAdapter.js b/modules/revcontentBidAdapter.js
index f1d5521f780..ce04e3aa822 100644
--- a/modules/revcontentBidAdapter.js
+++ b/modules/revcontentBidAdapter.js
@@ -207,7 +207,7 @@ function buildImp(bid, id) {
       currency: 'USD',
       mediaType: '*',
       size: '*'
-    }).floor;
+    })?.floor;
   } else {
     bidfloor = deepAccess(bid, `params.bidfloor`) || 0.1;
   }
diff --git a/modules/rewardedInterestIdSystem.js b/modules/rewardedInterestIdSystem.js
new file mode 100644
index 00000000000..8cf514f372b
--- /dev/null
+++ b/modules/rewardedInterestIdSystem.js
@@ -0,0 +1,142 @@
+/**
+ * This module adds rewarded interest ID to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/rewardedInterestIdSystem
+ * @requires module:modules/userId
+ */
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
+/**
+ * @typedef RewardedInterestApi
+ * @property {getApiVersion} getApiVersion
+ * @property {getIdentityToken} getIdentityToken
+ */
+
+/**
+ * Retrieves the Rewarded Interest API version.
+ * @callback getApiVersion
+ * @return {string}
+ */
+
+/**
+ * Retrieves the current identity token.
+ * @callback getIdentityToken
+ * @return {Promise}
+ */
+
+import {submodule} from '../src/hook.js';
+import {logError} from '../src/utils.js';
+
+export const MODULE_NAME = 'rewardedInterestId';
+export const SOURCE = 'rewardedinterest.com';
+
+/**
+ * Get rewarded interest API
+ * @function
+ * @returns {RewardedInterestApi|undefined}
+ */
+export function getRewardedInterestApi() {
+  if (window.__riApi && window.__riApi.getIdentityToken) {
+    return window.__riApi;
+  }
+}
+
+/**
+ * Wait while rewarded interest API to be set and execute the callback function
+ * @param {function} callback
+ */
+export function watchRewardedInterestApi(callback) {
+  Object.defineProperties(window, {
+    __rewardedInterestApi: {
+      value: undefined,
+      writable: true
+    },
+    __riApi: {
+      get: () => {
+        return window.__rewardedInterestApi;
+      },
+      set: value => {
+        window.__rewardedInterestApi = value;
+        callback(value);
+      },
+      configurable: true,
+    }
+  });
+}
+
+/**
+ * Get rewarded interest ID from API and pass it to the callback function
+ * @param {RewardedInterestApi} rewardedInterestApi
+ * @param {function} callback User ID callbackCompleted
+ */
+export function getRewardedInterestId(rewardedInterestApi, callback) {
+  rewardedInterestApi.getIdentityToken().then(callback).catch(error => {
+    callback();
+    logError(`${MODULE_NAME} module: ID fetch encountered an error`, error);
+  });
+}
+
+/**
+ * @param {function} callback User ID callbackCompleted
+ */
+export function apiNotAvailable(callback) {
+  callback();
+  logError(`${MODULE_NAME} module: Rewarded Interest API not found`);
+}
+
+/** @type {Submodule} */
+export const rewardedInterestIdSubmodule = {
+  /**
+   * Used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  /**
+   * Decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} value
+   * @returns {{rewardedInterestId: string}|undefined}
+   */
+  decode(value) {
+    return value ? {[MODULE_NAME]: value} : undefined;
+  },
+
+  /**
+   * Performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @returns {IdResponse|undefined}
+   */
+  getId() {
+    return {
+      callback: cb => {
+        const api = getRewardedInterestApi();
+        if (api) {
+          getRewardedInterestId(api, cb);
+        } else if (document.readyState === 'complete') {
+          apiNotAvailable(cb);
+        } else {
+          watchRewardedInterestApi(api => getRewardedInterestId(api, cb));
+          // Ensure that cb is called when API is not available
+          window.addEventListener('load', () => {
+            if (!getRewardedInterestApi()) {
+              apiNotAvailable(cb);
+            }
+          })
+        }
+      },
+    };
+  },
+  eids: {
+    [MODULE_NAME]: {
+      source: SOURCE,
+      atype: 3,
+    },
+  },
+};
+
+submodule('userId', rewardedInterestIdSubmodule);
diff --git a/modules/rewardedInterestIdSystem.md b/modules/rewardedInterestIdSystem.md
new file mode 100644
index 00000000000..8d12aa86e61
--- /dev/null
+++ b/modules/rewardedInterestIdSystem.md
@@ -0,0 +1,23 @@
+## Rewarded Interest User ID Submodule
+
+This module adds rewarded interest advertising token to the user ID module
+
+*Note: The storage config should be omitted
+
+### Prebid Params
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'rewardedInterestId',
+        }]
+    }
+});
+```
+
+## Parameter Descriptions for the `usersync` Configuration Section
+
+| Param under usersync.userIds[] | Scope    | Type   | Description              | Example                |
+|--------------------------------|----------|--------|--------------------------|------------------------|
+| name                           | Required | String | The name of this module. | `"rewardedInterestId"` |
diff --git a/modules/rhythmoneBidAdapter.js b/modules/rhythmoneBidAdapter.js
index 749ab92c0dc..3ab8b79df81 100644
--- a/modules/rhythmoneBidAdapter.js
+++ b/modules/rhythmoneBidAdapter.js
@@ -161,7 +161,7 @@ function RhythmOneBidAdapter() {
         }
       },
       at: 1,
-      tmax: 1000,
+      tmax: Math.min(1000, bidderRequest.timeout),
       regs: {
         ext: {
           gdpr: deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? Boolean(bidderRequest.gdprConsent.gdprApplies & 1) : false
diff --git a/modules/richaudienceBidAdapter.js b/modules/richaudienceBidAdapter.js
old mode 100755
new mode 100644
index 1625912ddb8..135d2e94b65
--- a/modules/richaudienceBidAdapter.js
+++ b/modules/richaudienceBidAdapter.js
@@ -1,9 +1,9 @@
-import {deepAccess, isStr} from '../src/utils.js';
+import {deepAccess, isStr, triggerPixel} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
-import {getAllOrtbKeywords} from '../libraries/keywords/keywords.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
 
 const BIDDER_CODE = 'richaudience';
 let REFERER = '';
@@ -11,7 +11,7 @@ let REFERER = '';
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 108,
-  aliases: ['ra'],
+  aliases: [{code: 'ra', gvlid: 108}],
   supportedMediaTypes: [BANNER, VIDEO],
 
   /***
@@ -36,8 +36,7 @@ export const spec = {
         ifa: bid.params.ifa,
         pid: bid.params.pid,
         supplyType: bid.params.supplyType,
-        currencyCode: config.getConfig('currency.adServerCurrency'),
-        // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
+        currencyCode: getCurrencyFromBidderRequest(bidderRequest),
         auctionId: bid.auctionId,
         bidId: bid.bidId,
         BidRequestsCount: bid.bidRequestsCount,
@@ -45,22 +44,22 @@ export const spec = {
         bidderRequestId: bid.bidderRequestId,
         tagId: bid.adUnitCode,
         sizes: raiGetSizes(bid),
-        // TODO: is 'page' the right value here?
         referer: (typeof bidderRequest.refererInfo.page != 'undefined' ? encodeURIComponent(bidderRequest.refererInfo.page) : null),
         numIframes: (typeof bidderRequest.refererInfo.numIframes != 'undefined' ? bidderRequest.refererInfo.numIframes : null),
         transactionId: bid.ortb2Imp?.ext?.tid,
-        timeout: config.getConfig('bidderTimeout'),
+        timeout: bidderRequest.timeout || 600,
         user: raiSetEids(bid),
         demand: raiGetDemandType(bid),
         videoData: raiGetVideoInfo(bid),
         scr_rsl: raiGetResolution(),
         cpuc: (typeof window.navigator != 'undefined' ? window.navigator.hardwareConcurrency : null),
-        kws: getAllOrtbKeywords(bidderRequest.ortb2, bid.params.keywords).join(','),
+        kws: bid.params.keywords,
         schain: bid.schain,
-        gpid: raiSetPbAdSlot(bid)
+        gpid: raiSetPbAdSlot(bid),
+        dsa: setDSA(bid),
+        userData: deepAccess(bid, 'ortb2.user.data')
       };
 
-      // TODO: is 'page' the right value here?
       REFERER = (typeof bidderRequest.refererInfo.page != 'undefined' ? encodeURIComponent(bidderRequest.refererInfo.page) : null)
 
       payload.gdpr_consent = '';
@@ -75,6 +74,18 @@ export const spec = {
         }
       }
 
+      if (bidderRequest?.gppConsent) {
+        payload.privacy = {
+          gpp: bidderRequest.gppConsent.gppString,
+          gpp_sid: bidderRequest.gppConsent.applicableSections
+        }
+      } else if (bidderRequest?.ortb2?.regs?.gpp) {
+        payload.privacy = {
+          gpp: bidderRequest.ortb2.regs.gpp,
+          gpp_sid: bidderRequest.ortb2.regs.gpp_sid
+        }
+      }
+
       var payloadString = JSON.stringify(payload);
 
       var endpoint = 'https://shb.richaudience.com/hb/';
@@ -107,7 +118,9 @@ export const spec = {
         netRevenue: response.netRevenue,
         currency: response.currency,
         ttl: response.ttl,
-        meta: response.adomain,
+        meta: {
+          advertiserDomains: [response.adomain[0]]
+        },
         dealId: response.dealId
       };
 
@@ -142,15 +155,16 @@ export const spec = {
    *
    * @param {syncOptions} Publisher prebid configuration
    * @param {serverResponses} Response from the server
-   * @param {gdprConsent} GPDR consent object
+   * @param {gdprConsent} GDPR consent object
    * @returns {Array}
    */
-  getUserSyncs: function (syncOptions, serverResponses, gdprConsent) {
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
     const syncs = [];
 
     var rand = Math.floor(Math.random() * 9999999999);
     var syncUrl = '';
     var consent = '';
+    var consentGPP = '';
 
     var raiSync = {};
 
@@ -160,11 +174,20 @@ export const spec = {
       consent = `consentString=${gdprConsent.consentString}`
     }
 
+    // GPP Consent
+    if (gppConsent?.gppString && gppConsent?.applicableSections?.length) {
+      consentGPP = 'gpp=' + encodeURIComponent(gppConsent.gppString);
+      consentGPP += '&gpp_sid=' + encodeURIComponent(gppConsent?.applicableSections?.join(','));
+    }
+
     if (syncOptions.iframeEnabled && raiSync.raiIframe != 'exclude') {
       syncUrl = 'https://sync.richaudience.com/dcf3528a0b8aa83634892d50e91c306e/?ord=' + rand
       if (consent != '') {
         syncUrl += `&${consent}`
       }
+      if (consentGPP != '') {
+        syncUrl += `&${consentGPP}`
+      }
       syncs.push({
         type: 'iframe',
         url: syncUrl
@@ -176,6 +199,9 @@ export const spec = {
       if (consent != '') {
         syncUrl += `&${consent}`
       }
+      if (consentGPP != '') {
+        syncUrl += `&${consentGPP}`
+      }
       syncs.push({
         type: 'image',
         url: syncUrl
@@ -183,6 +209,13 @@ export const spec = {
     }
     return syncs
   },
+
+  onTimeout: function (data) {
+    let url = raiGetTimeoutURL(data);
+    if (url) {
+      triggerPixel(url);
+    }
+  }
 };
 
 registerBidder(spec);
@@ -332,3 +365,20 @@ function raiGetFloor(bid, config) {
     return 0
   }
 }
+
+function raiGetTimeoutURL(data) {
+  let {params, timeout} = data[0]
+  let url = 'https://s.richaudience.com/err/?ec=6&ev=[timeout_publisher]&pla=[placement_hash]&int=PREBID&pltfm=&node=&dm=[domain]';
+
+  url = url.replace('[timeout_publisher]', timeout)
+  url = url.replace('[placement_hash]', params[0].pid)
+  if (document.location.host != null) {
+    url = url.replace('[domain]', document.location.host)
+  }
+  return url
+}
+
+function setDSA(bid) {
+  let dsa = bid?.ortb2?.regs?.ext?.dsa ? bid?.ortb2?.regs?.ext?.dsa : null;
+  return dsa;
+}
diff --git a/modules/richaudienceBidAdapter.md b/modules/richaudienceBidAdapter.md
index f888117b166..35298b8421d 100644
--- a/modules/richaudienceBidAdapter.md
+++ b/modules/richaudienceBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name: Rich Audience Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: cert@richaudience.com
+Maintainer: integrations@richaudience.com
 ```
 
 # Description
diff --git a/modules/ringieraxelspringerBidAdapter.js b/modules/ringieraxelspringerBidAdapter.js
new file mode 100644
index 00000000000..14033c1247f
--- /dev/null
+++ b/modules/ringieraxelspringerBidAdapter.js
@@ -0,0 +1,403 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import {
+  isEmpty,
+  parseSizesInput,
+  deepAccess
+} from '../src/utils.js';
+import { getAllOrtbKeywords } from '../libraries/keywords/keywords.js';
+import { getAdUnitSizes } from '../libraries/sizeUtils/sizeUtils.js';
+import { BO_CSR_ONET } from '../libraries/paapiTools/buyerOrigins.js';
+
+const BIDDER_CODE = 'ringieraxelspringer';
+const VERSION = '1.0';
+
+const getEndpoint = (network) => {
+  return `https://csr.onet.pl/${encodeURIComponent(network)}/csr-006/csr.json?nid=${encodeURIComponent(network)}&`;
+};
+
+function parseParams(params, bidderRequest) {
+  const newParams = {};
+  if (params.customParams && typeof params.customParams === 'object') {
+    for (const param in params.customParams) {
+      if (params.customParams.hasOwnProperty(param)) {
+        newParams[param] = params.customParams[param];
+      }
+    }
+  }
+  const du = deepAccess(bidderRequest, 'refererInfo.page');
+  const dr = deepAccess(bidderRequest, 'refererInfo.ref');
+  if (du) {
+    newParams.du = du;
+  }
+  if (dr) {
+    newParams.dr = dr;
+  }
+  const pageContext = params.pageContext;
+  if (!pageContext) {
+    return newParams;
+  }
+  if (pageContext.du) {
+    newParams.du = pageContext.du;
+  }
+  if (pageContext.dr) {
+    newParams.dr = pageContext.dr;
+  }
+  if (pageContext.dv) {
+    newParams.DV = pageContext.dv;
+  }
+  const keywords = getAllOrtbKeywords(bidderRequest?.ortb2, pageContext.keyWords)
+  if (keywords.length > 0) {
+    newParams.kwrd = keywords.join('+')
+  }
+  if (pageContext.capping) {
+    newParams.local_capping = pageContext.capping;
+  }
+  if (pageContext.keyValues && typeof pageContext.keyValues === 'object') {
+    for (const param in pageContext.keyValues) {
+      if (pageContext.keyValues.hasOwnProperty(param)) {
+        const kvName = 'kv' + param;
+        newParams[kvName] = pageContext.keyValues[param];
+      }
+    }
+  }
+  if (bidderRequest?.ortb2?.regs?.ext?.dsa?.required !== undefined) {
+    newParams.dsainfo = bidderRequest?.ortb2?.regs?.ext?.dsa?.required;
+  }
+  return newParams;
+}
+
+/**
+ * @param url string
+ * @param type number // 1 - img, 2 - js
+ * @returns an object { event: 1, method: 1 or 2, url: 'string' }
+ */
+function prepareItemEventtrackers(url, type) {
+  return {
+    event: 1,
+    method: type,
+    url: url
+  };
+}
+
+function prepareEventtrackers(emsLink, imp, impression, impression1, impressionJs1) {
+  const eventtrackers = [prepareItemEventtrackers(emsLink, 1)];
+
+  if (imp) {
+    eventtrackers.push(prepareItemEventtrackers(imp, 1));
+  }
+
+  if (impression) {
+    eventtrackers.push(prepareItemEventtrackers(impression, 1));
+  }
+
+  if (impression1) {
+    eventtrackers.push(prepareItemEventtrackers(impression1, 1));
+  }
+
+  if (impressionJs1) {
+    eventtrackers.push(prepareItemEventtrackers(impressionJs1, 2));
+  }
+
+  return eventtrackers;
+}
+
+function parseOrtbResponse(ad) {
+  if (!(ad.data?.fields && ad.data?.meta)) {
+    return false;
+  }
+
+  const { image, Image, title, url, Headline, Thirdpartyclicktracker, thirdPartyClickTracker2, imp, impression, impression1, impressionJs1, partner_logo: partnerLogo, adInfo, body } = ad.data.fields;
+  const { dsaurl, height, width, adclick } = ad.data.meta;
+  const emsLink = ad.ems_link;
+  const link = adclick + (url || Thirdpartyclicktracker);
+  const eventtrackers = prepareEventtrackers(emsLink, imp, impression, impression1, impressionJs1);
+  const clicktrackers = thirdPartyClickTracker2 ? [thirdPartyClickTracker2] : [];
+
+  const ortb = {
+    ver: '1.2',
+    assets: [
+      {
+        id: 0,
+        data: {
+          value: body || '',
+          type: 2
+        },
+      },
+      {
+        id: 1,
+        data: {
+          value: adInfo || '',
+          // Body2 type
+          type: 10
+        },
+      },
+      {
+        id: 3,
+        img: {
+          type: 1,
+          url: partnerLogo || '',
+          w: width,
+          h: height
+        }
+      },
+      {
+        id: 4,
+        img: {
+          type: 3,
+          url: image || Image || '',
+          w: width,
+          h: height
+        }
+      },
+      {
+        id: 5,
+        data: {
+          value: deepAccess(ad, 'data.meta.advertiser_name', null),
+          type: 1
+        }
+      },
+      {
+        id: 6,
+        title: {
+          text: title || Headline || ''
+        }
+      },
+    ],
+    link: {
+      url: link,
+      clicktrackers
+    },
+    eventtrackers
+  };
+
+  if (dsaurl) {
+    ortb.privacy = dsaurl
+  }
+
+  return ortb
+}
+
+function parseNativeResponse(ad) {
+  if (!(ad.data?.fields && ad.data?.meta)) {
+    return false;
+  }
+
+  const { image, Image, title, leadtext, url, Calltoaction, Body, Headline, Thirdpartyclicktracker, adInfo, partner_logo: partnerLogo } = ad.data.fields;
+  const { dsaurl, height, width, adclick } = ad.data.meta;
+  const link = adclick + (url || Thirdpartyclicktracker);
+  const nativeResponse = {
+    sendTargetingKeys: false,
+    title: title || Headline || '',
+    image: {
+      url: image || Image || '',
+      width,
+      height
+    },
+    icon: {
+      url: partnerLogo || '',
+      width,
+      height
+    },
+    clickUrl: link,
+    cta: Calltoaction || '',
+    body: leadtext || Body || '',
+    body2: adInfo || '',
+    sponsoredBy: deepAccess(ad, 'data.meta.advertiser_name', null) || '',
+    ortb: parseOrtbResponse(ad)
+  };
+
+  if (dsaurl) {
+    nativeResponse.privacyLink = dsaurl;
+  }
+
+  return nativeResponse
+}
+
+const buildBid = (ad, mediaType) => {
+  if (ad.type === 'empty' || mediaType === undefined) {
+    return null;
+  }
+
+  const data = {
+    requestId: ad.id,
+    cpm: ad.bid_rate ? ad.bid_rate.toFixed(2) : 0,
+    ttl: 300,
+    creativeId: ad.adid ? parseInt(ad.adid.split(',')[2], 10) : 0,
+    netRevenue: true,
+    currency: ad.currency || 'USD',
+    dealId: ad.prebid_deal || null,
+    actgMatch: ad.actg_match || 0,
+    meta: { mediaType: BANNER },
+    mediaType: BANNER,
+    ad: ad.html || null,
+    width: ad.width || 0,
+    height: ad.height || 0
+  }
+
+  if (mediaType === 'native') {
+    data.meta = { mediaType: NATIVE };
+    data.mediaType = NATIVE;
+    data.native = parseNativeResponse(ad) || {};
+
+    delete data.ad;
+  }
+
+  return data;
+};
+
+const getContextParams = (bidRequests, bidderRequest) => {
+  const bid = bidRequests[0];
+  const { params } = bid;
+  const requestParams = {
+    site: params.site,
+    area: params.area,
+    cre_format: 'html',
+    systems: 'das',
+    kvprver: VERSION,
+    ems_url: 1,
+    bid_rate: 1,
+    ...parseParams(params, bidderRequest)
+  };
+  return Object.keys(requestParams).map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(requestParams[key])).join('&');
+};
+
+const getSlots = (bidRequests) => {
+  let queryString = '';
+  const batchSize = bidRequests.length;
+  for (let i = 0; i < batchSize; i++) {
+    const adunit = bidRequests[i];
+    const slotSequence = deepAccess(adunit, 'params.slotSequence');
+    const creFormat = getAdUnitCreFormat(adunit);
+    const sizes = creFormat === 'native' ? 'fluid' : parseSizesInput(getAdUnitSizes(adunit)).join(',');
+
+    queryString += `&slot${i}=${encodeURIComponent(adunit.params.slot)}&id${i}=${encodeURIComponent(adunit.bidId)}&composition${i}=CHILD`;
+
+    if (creFormat === 'native') {
+      queryString += `&cre_format${i}=native`;
+    }
+
+    queryString += `&kvhb_format${i}=${creFormat === 'native' ? 'native' : 'banner'}`;
+
+    if (sizes) {
+      queryString += `&iusizes${i}=${encodeURIComponent(sizes)}`;
+    }
+
+    if (slotSequence !== undefined && slotSequence !== null) {
+      queryString += `&pos${i}=${encodeURIComponent(slotSequence)}`;
+    }
+  }
+
+  return queryString;
+};
+
+const getGdprParams = (bidderRequest) => {
+  const gdprApplies = deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
+  let consentString = deepAccess(bidderRequest, 'gdprConsent.consentString');
+  let queryString = '';
+  if (gdprApplies !== undefined) {
+    queryString += `&gdpr_applies=${encodeURIComponent(gdprApplies)}`;
+  }
+  if (consentString !== undefined) {
+    queryString += `&euconsent=${encodeURIComponent(consentString)}`;
+  }
+  return queryString;
+};
+
+const parseAuctionConfigs = (serverResponse, bidRequest) => {
+  if (isEmpty(bidRequest)) {
+    return null;
+  }
+  const auctionConfigs = [];
+  const gctx = serverResponse && serverResponse.body?.gctx;
+
+  bidRequest.bidIds.filter(bid => bid.fledgeEnabled).forEach((bid) => {
+    auctionConfigs.push({
+      'bidId': bid.bidId,
+      'config': {
+        'seller': BO_CSR_ONET,
+        'decisionLogicUrl': `${BO_CSR_ONET}/${encodeURIComponent(bid.params.network)}/v1/protected-audience-api/decision-logic.js`,
+        'interestGroupBuyers': [ BO_CSR_ONET ],
+        'auctionSignals': {
+          'params': bid.params,
+          'sizes': bid.sizes,
+          'gctx': gctx
+        }
+      }
+    });
+  });
+
+  if (auctionConfigs.length === 0) {
+    return null;
+  } else {
+    return auctionConfigs;
+  }
+}
+
+const getAdUnitCreFormat = (adUnit) => {
+  if (!adUnit) {
+    return;
+  }
+
+  let creFormat = 'html';
+  let mediaTypes = Object.keys(adUnit.mediaTypes);
+
+  if (mediaTypes && mediaTypes.length === 1 && mediaTypes.includes('native')) {
+    creFormat = 'native';
+  }
+
+  return creFormat;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE],
+
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest || !bidRequest.params || typeof bidRequest.params !== 'object') {
+      return;
+    }
+    const { params } = bidRequest;
+    return Boolean(params.network && params.site && params.area && params.slot);
+  },
+
+  buildRequests: function (bidRequests, bidderRequest) {
+    const slotsQuery = getSlots(bidRequests);
+    const contextQuery = getContextParams(bidRequests, bidderRequest);
+    const gdprQuery = getGdprParams(bidderRequest);
+    const fledgeEligible = Boolean(bidderRequest?.paapi?.enabled);
+    const network = bidRequests[0].params.network;
+    const bidIds = bidRequests.map((bid) => ({
+      slot: bid.params.slot,
+      bidId: bid.bidId,
+      sizes: getAdUnitSizes(bid),
+      params: bid.params,
+      fledgeEnabled: fledgeEligible,
+      mediaType: (bid.mediaTypes && bid.mediaTypes.banner) ? 'display' : NATIVE
+    }));
+
+    return [{
+      method: 'GET',
+      url: getEndpoint(network) + contextQuery + slotsQuery + gdprQuery,
+      bidIds: bidIds
+    }];
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const response = serverResponse.body;
+    const fledgeAuctionConfigs = parseAuctionConfigs(serverResponse, bidRequest);
+    const bids = (!response || !response.ads || response.ads.length === 0) ? [] : response.ads.map((ad, index) => buildBid(
+      ad,
+      bidRequest?.bidIds?.[index]?.mediaType || 'banner'
+    )).filter((bid) => !isEmpty(bid));
+
+    if (fledgeAuctionConfigs) {
+      // Return a tuple of bids and auctionConfigs. It is possible that bids could be null.
+      return {bids, paapi: fledgeAuctionConfigs};
+    } else {
+      return bids;
+    }
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/rasBidAdapter.md b/modules/ringieraxelspringerBidAdapter.md
similarity index 88%
rename from modules/rasBidAdapter.md
rename to modules/ringieraxelspringerBidAdapter.md
index e8a61974130..b3a716f9f56 100644
--- a/modules/rasBidAdapter.md
+++ b/modules/ringieraxelspringerBidAdapter.md
@@ -9,7 +9,7 @@ Maintainer: support@ringpublishing.com
 # Description
 
 Module that connects to Ringer Axel Springer demand sources.
-Only banner format is supported.
+Only banner and native format is supported.
 
 # Test Parameters
 ```js
@@ -21,7 +21,7 @@ var adUnits = [{
     }
   },
   bids: [{
-    bidder: 'ras',
+    bidder: 'ringieraxelspringer',
     params: {
       network: '4178463',
       site: 'test',
@@ -36,11 +36,11 @@ var adUnits = [{
 
 | Name                         | Scope    | Type     | Description                                                                                                                                                                                                                                                                | Example                                                                                     |
 |------------------------------|----------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
-| network                      | required | String   | Specific identifier provided by RAS                                                                                                                                                                                                                                        | `"4178463"`                                                                                 |
-| site                         | required | String   | Specific identifier name (case-insensitive) that is associated with this ad unit and provided by RAS                                                                                                                                                                       | `"example_com"`                                                                             |
+| network                      | required | String   | Specific identifier provided by Ringier Axel Springer                                                                                                                                                                                                                                        | `"4178463"`                                                                                 |
+| site                         | required | String   | Specific identifier name (case-insensitive) that is associated with this ad unit and provided by Ringier Axel Springer                                                                                                                                                                       | `"example_com"`                                                                             |
 | area                         | required | String   | Ad unit category name; only case-insensitive alphanumeric with underscores and hyphens are allowed                                                                                                                                                                         | `"sport"`                                                                                   |
-| slot                         | required | String   | Ad unit placement name (case-insensitive) provided by RAS                                                                                                                                                                                                                  | `"slot"`                                                                                    |
-| slotSequence                 | optional | Number   | Ad unit sequence position provided by RAS                                                                                                                                                                                                                                  | `1`                                                                                         |
+| slot                         | required | String   | Ad unit placement name (case-insensitive) provided by Ringier Axel Springer                                                                                                                                                                                                                  | `"slot"`                                                                                    |
+| slotSequence                 | optional | Number   | Ad unit sequence position provided by Ringier Axel Springer                                                                                                                                                                                                                                  | `1`                                                                                         |
 | pageContext                  | optional | Object   | Web page context data                                                                                                                                                                                                                                                      | `{}`                                                                                        |
 | pageContext.dr               | optional | String   | Document referrer URL address                                                                                                                                                                                                                                              | `"https://example.com/"`                                                                    |
 | pageContext.du               | optional | String   | Document URL address                                                                                                                                                                                                                                                       | `"https://example.com/sport/football/article.html?id=932016a5-02fc-4d5c-b643-fafc2f270f06"` |
@@ -49,4 +49,4 @@ var adUnits = [{
 | pageContext.keyValues        | optional | Object   | Key-values associated with this ad unit (case-insensitive); following characters are not allowed in the values: `" ' = ! + # * ~ ; ^ ( ) < > [ ] & @`                                                                                                                      | `{}`                                                                                        |
 | pageContext.keyValues.ci     | optional | String   | Content unique identifier                                                                                                                                                                                                                                                  | `"932016a5-02fc-4d5c-b643-fafc2f270f06"`                                                    |
 | pageContext.keyValues.adunit | optional | String   | Ad unit name                                                                                                                                                                                                                                                               | `"example_com/sport"`                                                                       |
-| customParams                 | optional | Object   | Custom request params                                                                                                                                                                                                                                                      | `{}`                                                                                        |
\ No newline at end of file
+| customParams                 | optional | Object   | Custom request params                                                                                                                                                                                                                                                      | `{}`                                                                                        |
diff --git a/modules/riseBidAdapter.js b/modules/riseBidAdapter.js
index 78740f7f87d..236c048982a 100644
--- a/modules/riseBidAdapter.js
+++ b/modules/riseBidAdapter.js
@@ -2,37 +2,37 @@ import {
   logWarn,
   logInfo,
   isArray,
-  isFn,
   deepAccess,
-  isEmpty,
-  contains,
-  timestamp,
   triggerPixel,
-  isInteger,
-  getBidIdParameter
 } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  getEndpoint,
+  generateBidsParams,
+  generateGeneralParams,
+  buildBidResponse,
+} from '../libraries/riseUtils/index.js';
 
 const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
 const BIDDER_CODE = 'rise';
 const ADAPTER_VERSION = '6.0.0';
 const TTL = 360;
-const CURRENCY = 'USD';
-const DEFAULT_SELLER_ENDPOINT = 'https://hb.yellowblue.io/';
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_GVLID = 1043;
+const BASE_URL = 'https://hb.yellowblue.io/';
 const MODES = {
   PRODUCTION: 'hb-multi',
   TEST: 'hb-multi-test'
-}
-const SUPPORTED_SYNC_METHODS = {
-  IFRAME: 'iframe',
-  PIXEL: 'pixel'
-}
+};
 
 export const spec = {
   code: BIDDER_CODE,
-  gvlid: 1043,
+  aliases: [
+    { code: 'risexchange', gvlid: DEFAULT_GVLID },
+    { code: 'openwebxchange', gvlid: 280 }
+  ],
+  gvlid: DEFAULT_GVLID,
   version: ADAPTER_VERSION,
   supportedMediaTypes: SUPPORTED_AD_TYPES,
   isBidRequestValid: function (bidRequest) {
@@ -54,48 +54,23 @@ export const spec = {
     // use data from the first bid, to create the general params for all bids
     const generalObject = validBidRequests[0];
     const testMode = generalObject.params.testMode;
-    const rtbDomain = generalObject.params.rtbDomain;
+    const rtbDomain = generalObject.params.rtbDomain || BASE_URL;
 
     combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest);
     combinedRequestsObject.bids = generateBidsParams(validBidRequests, bidderRequest);
 
     return {
       method: 'POST',
-      url: getEndpoint(testMode, rtbDomain),
+      url: getEndpoint(testMode, rtbDomain, MODES),
       data: combinedRequestsObject
     }
   },
-  interpretResponse: function ({body}) {
+  interpretResponse: function ({ body }) {
     const bidResponses = [];
 
     if (body.bids) {
       body.bids.forEach(adUnit => {
-        const bidResponse = {
-          requestId: adUnit.requestId,
-          cpm: adUnit.cpm,
-          currency: adUnit.currency || CURRENCY,
-          width: adUnit.width,
-          height: adUnit.height,
-          ttl: adUnit.ttl || TTL,
-          creativeId: adUnit.requestId,
-          netRevenue: adUnit.netRevenue || true,
-          nurl: adUnit.nurl,
-          mediaType: adUnit.mediaType,
-          meta: {
-            mediaType: adUnit.mediaType
-          }
-        };
-
-        if (adUnit.mediaType === VIDEO) {
-          bidResponse.vastXml = adUnit.vastXml;
-        } else if (adUnit.mediaType === BANNER) {
-          bidResponse.ad = adUnit.ad;
-        }
-
-        if (adUnit.adomain && adUnit.adomain.length) {
-          bidResponse.meta.advertiserDomains = adUnit.adomain;
-        }
-
+        const bidResponse = buildBidResponse(adUnit, DEFAULT_CURRENCY, TTL, VIDEO, BANNER);
         bidResponses.push(bidResponse);
       });
     }
@@ -105,20 +80,20 @@ export const spec = {
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
     for (const response of serverResponses) {
-      if (syncOptions.iframeEnabled && response.body.params.userSyncURL) {
+      if (syncOptions.iframeEnabled && deepAccess(response, 'body.params.userSyncURL')) {
         syncs.push({
           type: 'iframe',
-          url: response.body.params.userSyncURL
+          url: deepAccess(response, 'body.params.userSyncURL')
         });
       }
-      if (syncOptions.pixelEnabled && isArray(response.body.params.userSyncPixels)) {
+      if (syncOptions.pixelEnabled && isArray(deepAccess(response, 'body.params.userSyncPixels'))) {
         const pixels = response.body.params.userSyncPixels.map(pixel => {
           return {
             type: 'image',
             url: pixel
           }
-        })
-        syncs.push(...pixels)
+        });
+        syncs.push(...pixels);
       }
     }
     return syncs;
@@ -136,346 +111,3 @@ export const spec = {
 };
 
 registerBidder(spec);
-
-/**
- * Get floor price
- * @param bid {bid}
- * @returns {Number}
- */
-function getFloor(bid, mediaType) {
-  if (!isFn(bid.getFloor)) {
-    return 0;
-  }
-  let floorResult = bid.getFloor({
-    currency: CURRENCY,
-    mediaType: mediaType,
-    size: '*'
-  });
-  return floorResult.currency === CURRENCY && floorResult.floor ? floorResult.floor : 0;
-}
-
-/**
- * Get the the ad sizes array from the bid
- * @param bid {bid}
- * @returns {Array}
- */
-function getSizesArray(bid, mediaType) {
-  let sizesArray = []
-
-  if (deepAccess(bid, `mediaTypes.${mediaType}.sizes`)) {
-    sizesArray = bid.mediaTypes[mediaType].sizes;
-  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
-    sizesArray = bid.sizes;
-  }
-
-  return sizesArray;
-}
-
-/**
- * Get schain string value
- * @param schainObject {Object}
- * @returns {string}
- */
-function getSupplyChain(schainObject) {
-  if (isEmpty(schainObject)) {
-    return '';
-  }
-  let scStr = `${schainObject.ver},${schainObject.complete}`;
-  schainObject.nodes.forEach((node) => {
-    scStr += '!';
-    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
-    scStr += `${node.hp ? encodeURIComponent(node.hp) : ''},`;
-    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
-  });
-  return scStr;
-}
-
-/**
- * Get encoded node value
- * @param val {string}
- * @returns {string}
- */
-function getEncodedValIfNotEmpty(val) {
-  return !isEmpty(val) ? encodeURIComponent(val) : '';
-}
-
-/**
- * Get preferred user-sync method based on publisher configuration
- * @param bidderCode {string}
- * @returns {string}
- */
-function getAllowedSyncMethod(filterSettings, bidderCode) {
-  const iframeConfigsToCheck = ['all', 'iframe'];
-  const pixelConfigToCheck = 'image';
-  if (filterSettings && iframeConfigsToCheck.some(config => isSyncMethodAllowed(filterSettings[config], bidderCode))) {
-    return SUPPORTED_SYNC_METHODS.IFRAME;
-  }
-  if (!filterSettings || !filterSettings[pixelConfigToCheck] || isSyncMethodAllowed(filterSettings[pixelConfigToCheck], bidderCode)) {
-    return SUPPORTED_SYNC_METHODS.PIXEL;
-  }
-}
-
-/**
- * Check if sync rule is supported
- * @param syncRule {Object}
- * @param bidderCode {string}
- * @returns {boolean}
- */
-function isSyncMethodAllowed(syncRule, bidderCode) {
-  if (!syncRule) {
-    return false;
-  }
-  const isInclude = syncRule.filter === 'include';
-  const bidders = isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
-  return isInclude && contains(bidders, bidderCode);
-}
-
-/**
- * Get the seller endpoint
- * @param testMode {boolean}
- * @param rtbDomain {string}
- * @returns {string}
- */
-function getEndpoint(testMode, rtbDomain) {
-  const SELLER_ENDPOINT = rtbDomain ? `https://${rtbDomain}/` : DEFAULT_SELLER_ENDPOINT;
-  return testMode
-    ? SELLER_ENDPOINT + MODES.TEST
-    : SELLER_ENDPOINT + MODES.PRODUCTION;
-}
-
-/**
- * get device type
- * @param uad {ua}
- * @returns {string}
- */
-function getDeviceType(ua) {
-  if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i
-    .test(ua.toLowerCase())) {
-    return '5';
-  }
-  if (/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i
-    .test(ua.toLowerCase())) {
-    return '4';
-  }
-  if (/smart[-_\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b/i
-    .test(ua.toLowerCase())) {
-    return '3';
-  }
-  return '1';
-}
-
-function generateBidsParams(validBidRequests, bidderRequest) {
-  const bidsArray = [];
-
-  if (validBidRequests.length) {
-    validBidRequests.forEach(bid => {
-      bidsArray.push(generateBidParameters(bid, bidderRequest));
-    });
-  }
-
-  return bidsArray;
-}
-
-/**
- * Generate bid specific parameters
- * @param {bid} bid
- * @param {bidderRequest} bidderRequest
- * @returns {Object} bid specific params object
- */
-function generateBidParameters(bid, bidderRequest) {
-  const {params} = bid;
-  const mediaType = isBanner(bid) ? BANNER : VIDEO;
-  const sizesArray = getSizesArray(bid, mediaType);
-
-  // fix floor price in case of NAN
-  if (isNaN(params.floorPrice)) {
-    params.floorPrice = 0;
-  }
-
-  const bidObject = {
-    mediaType,
-    adUnitCode: getBidIdParameter('adUnitCode', bid),
-    sizes: sizesArray,
-    floorPrice: Math.max(getFloor(bid, mediaType), params.floorPrice),
-    bidId: getBidIdParameter('bidId', bid),
-    bidderRequestId: getBidIdParameter('bidderRequestId', bid),
-    loop: getBidIdParameter('bidderRequestsCount', bid),
-    transactionId: bid.ortb2Imp?.ext?.tid,
-    coppa: 0
-  };
-
-  const pos = deepAccess(bid, `mediaTypes.${mediaType}.pos`);
-  if (pos) {
-    bidObject.pos = pos;
-  }
-
-  const gpid = deepAccess(bid, `ortb2Imp.ext.gpid`);
-  if (gpid) {
-    bidObject.gpid = gpid;
-  }
-
-  const placementId = params.placementId || deepAccess(bid, `mediaTypes.${mediaType}.name`);
-  if (placementId) {
-    bidObject.placementId = placementId;
-  }
-
-  const mimes = deepAccess(bid, `mediaTypes.${mediaType}.mimes`);
-  if (mimes) {
-    bidObject.mimes = mimes;
-  }
-
-  const api = deepAccess(bid, `mediaTypes.${mediaType}.api`);
-  if (api) {
-    bidObject.api = api;
-  }
-
-  const sua = deepAccess(bid, `ortb2.device.sua`);
-  if (sua) {
-    bidObject.sua = sua;
-  }
-
-  const coppa = deepAccess(bid, `ortb2.regs.coppa`)
-  if (coppa) {
-    bidObject.coppa = 1;
-  }
-
-  if (mediaType === VIDEO) {
-    const playbackMethod = deepAccess(bid, `mediaTypes.video.playbackmethod`);
-    let playbackMethodValue;
-
-    // verify playbackMethod is of type integer array, or integer only.
-    if (Array.isArray(playbackMethod) && isInteger(playbackMethod[0])) {
-      // only the first playbackMethod in the array will be used, according to OpenRTB 2.5 recommendation
-      playbackMethodValue = playbackMethod[0];
-    } else if (isInteger(playbackMethod)) {
-      playbackMethodValue = playbackMethod;
-    }
-
-    if (playbackMethodValue) {
-      bidObject.playbackMethod = playbackMethodValue;
-    }
-
-    const placement = deepAccess(bid, `mediaTypes.video.placement`);
-    if (placement) {
-      bidObject.placement = placement;
-    }
-
-    const minDuration = deepAccess(bid, `mediaTypes.video.minduration`);
-    if (minDuration) {
-      bidObject.minDuration = minDuration;
-    }
-
-    const maxDuration = deepAccess(bid, `mediaTypes.video.maxduration`);
-    if (maxDuration) {
-      bidObject.maxDuration = maxDuration;
-    }
-
-    const skip = deepAccess(bid, `mediaTypes.video.skip`);
-    if (skip) {
-      bidObject.skip = skip;
-    }
-
-    const linearity = deepAccess(bid, `mediaTypes.video.linearity`);
-    if (linearity) {
-      bidObject.linearity = linearity;
-    }
-
-    const protocols = deepAccess(bid, `mediaTypes.video.protocols`);
-    if (protocols) {
-      bidObject.protocols = protocols;
-    }
-
-    const plcmt = deepAccess(bid, `mediaTypes.video.plcmt`);
-    if (plcmt) {
-      bidObject.plcmt = plcmt;
-    }
-  }
-
-  return bidObject;
-}
-
-function isBanner(bid) {
-  return bid.mediaTypes && bid.mediaTypes.banner;
-}
-
-/**
- * Generate params that are common between all bids
- * @param {single bid object} generalObject
- * @param {bidderRequest} bidderRequest
- * @returns {object} the common params object
- */
-function generateGeneralParams(generalObject, bidderRequest) {
-  const domain = window.location.hostname;
-  const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
-  const {bidderCode} = bidderRequest;
-  const generalBidParams = generalObject.params;
-  const timeout = bidderRequest.timeout;
-
-  // these params are snake_case instead of camelCase to allow backwards compatability on the server.
-  // in the future, these will be converted to camelCase to match our convention.
-  const generalParams = {
-    wrapper_type: 'prebidjs',
-    wrapper_vendor: '$$PREBID_GLOBAL$$',
-    wrapper_version: '$prebid.version$',
-    adapter_version: ADAPTER_VERSION,
-    auction_start: timestamp(),
-    publisher_id: generalBidParams.org,
-    publisher_name: domain,
-    site_domain: domain,
-    dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
-    device_type: getDeviceType(navigator.userAgent),
-    ua: navigator.userAgent,
-    is_wrapper: !!generalBidParams.isWrapper,
-    session_id: generalBidParams.sessionId || getBidIdParameter('bidderRequestId', generalObject),
-    tmax: timeout
-  };
-
-  const userIdsParam = getBidIdParameter('userId', generalObject);
-  if (userIdsParam) {
-    generalParams.userIds = JSON.stringify(userIdsParam);
-  }
-
-  const ortb2Metadata = bidderRequest.ortb2 || {};
-  if (ortb2Metadata.site) {
-    generalParams.site_metadata = JSON.stringify(ortb2Metadata.site);
-  }
-  if (ortb2Metadata.user) {
-    generalParams.user_metadata = JSON.stringify(ortb2Metadata.user);
-  }
-
-  if (syncEnabled) {
-    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
-    if (allowedSyncMethod) {
-      generalParams.cs_method = allowedSyncMethod;
-    }
-  }
-
-  if (bidderRequest.uspConsent) {
-    generalParams.us_privacy = bidderRequest.uspConsent;
-  }
-
-  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
-    generalParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
-    generalParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
-  }
-
-  if (generalBidParams.ifa) {
-    generalParams.ifa = generalBidParams.ifa;
-  }
-
-  if (generalObject.schain) {
-    generalParams.schain = getSupplyChain(generalObject.schain);
-  }
-
-  if (bidderRequest && bidderRequest.refererInfo) {
-    // TODO: is 'ref' the right value here?
-    generalParams.referrer = deepAccess(bidderRequest, 'refererInfo.ref');
-    // TODO: does the fallback make sense here?
-    generalParams.page_url = deepAccess(bidderRequest, 'refererInfo.page') || deepAccess(window, 'location.href');
-  }
-
-  return generalParams;
-}
diff --git a/modules/riseBidAdapter.md b/modules/riseBidAdapter.md
index f0837cb5508..94d36a08510 100644
--- a/modules/riseBidAdapter.md
+++ b/modules/riseBidAdapter.md
@@ -27,7 +27,6 @@ The adapter supports Video(instream).
 | `rtbDomain` | optional | String |  Sets the seller end point  | "www.test.com"
 | `is_wrapper` | private | Boolean |  Please don't use unless your account manager asked you to  | false
 
-
 # Test Parameters
 ```javascript
 var adUnits = [
diff --git a/modules/rixengineBidAdapter.js b/modules/rixengineBidAdapter.js
new file mode 100644
index 00000000000..8ffdb55f09b
--- /dev/null
+++ b/modules/rixengineBidAdapter.js
@@ -0,0 +1,67 @@
+import { BANNER } from '../src/mediaTypes.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'rixengine';
+
+let ENDPOINT = null;
+let SID = null;
+let TOKEN = null;
+
+const DEFAULT_BID_TTL = 30;
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_NET_REVENUE = true;
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: DEFAULT_NET_REVENUE,
+    ttl: DEFAULT_BID_TTL,
+    currency: DEFAULT_CURRENCY,
+    mediaType: BANNER,
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    return imp;
+  },
+});
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    if (
+      Boolean(bid.params.endpoint) &&
+      Boolean(bid.params.sid) &&
+      Boolean(bid.params.token)
+    ) {
+      SID = bid.params.sid;
+      TOKEN = bid.params.token;
+      ENDPOINT = bid.params.endpoint + '?sid=' + SID + '&token=' + TOKEN;
+      return true;
+    }
+    return false;
+  },
+
+  buildRequests(bidRequests, bidderRequest) {
+    let data = converter.toORTB({ bidRequests, bidderRequest });
+
+    return [
+      {
+        method: 'POST',
+        url: ENDPOINT,
+        data,
+        options: { contentType: 'application/json;charset=utf-8' },
+      },
+    ];
+  },
+
+  interpretResponse(response, request) {
+    const bids = converter.fromORTB({
+      response: response.body,
+      request: request.data,
+    }).bids;
+    return bids;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/rixengineBidAdapter.md b/modules/rixengineBidAdapter.md
new file mode 100644
index 00000000000..c05648f4b85
--- /dev/null
+++ b/modules/rixengineBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+```
+Module Name:  RixEngine Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: yuanchang@algorix.co
+```
+
+# Description
+
+Connects to RixEngine exchange for bids.
+
+RixEngine bid adapter supports Banner currently.
+
+# Sample Banner Ad Unit: For Publishers
+```
+var adUnits = [
+{
+    sizes: [
+        [320, 50]
+    ],     
+    bids: [{
+      bidder: 'rixengine',
+      params: {
+        endpoint: 'http://demo.svr.rixengine.com/rtb', // required
+        token: '1e05a767930d7d96ef6ce16318b4ab99', // required
+        sid: 36540, // required
+      }
+    }]
+}];
+```
+
diff --git a/modules/roxotAnalyticsAdapter.js b/modules/roxotAnalyticsAdapter.js
index 2c3be3e1757..8e5371044a2 100644
--- a/modules/roxotAnalyticsAdapter.js
+++ b/modules/roxotAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import {deepClone, getParameterByName, logError, logInfo} from '../src/utils.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import {includes} from '../src/polyfill.js';
 import {ajaxBuilder} from '../src/ajax.js';
@@ -18,15 +18,13 @@ const DEFAULT_SERVER_CONFIG_URL = 'pa.rxthdr.com/v3';
 const analyticsType = 'endpoint';
 
 const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    BID_REQUESTED,
-    BID_ADJUSTMENT,
-    BIDDER_DONE,
-    BID_WON
-  }
-} = CONSTANTS;
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_REQUESTED,
+  BID_ADJUSTMENT,
+  BIDDER_DONE,
+  BID_WON
+} = EVENTS;
 
 const AUCTION_STATUS = {
   'RUNNING': 'running',
diff --git a/modules/rtbhouseBidAdapter.js b/modules/rtbhouseBidAdapter.js
index 4ca4e4f90a9..74a4df14f6f 100644
--- a/modules/rtbhouseBidAdapter.js
+++ b/modules/rtbhouseBidAdapter.js
@@ -1,10 +1,11 @@
-import {deepAccess, isArray, logError, logInfo, mergeDeep} from '../src/utils.js';
+import {deepAccess, deepClone, isArray, logError, logInfo, mergeDeep, isEmpty, isPlainObject, isNumber, isStr} from '../src/utils.js';
 import {getOrigin} from '../libraries/getOrigin/index.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {includes} from '../src/polyfill.js';
 import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
 import {config} from '../src/config.js';
+import { interpretNativeBid, OPENRTB } from '../libraries/precisoUtils/bidNativeUtils.js';
 
 const BIDDER_CODE = 'rtbhouse';
 const REGIONS = ['prebid-eu', 'prebid-us', 'prebid-asia'];
@@ -18,28 +19,11 @@ const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE];
 const TTL = 55;
 const GVLID = 16;
 
-// Codes defined by OpenRTB Native Ads 1.1 specification
-export const OPENRTB = {
-  NATIVE: {
-    IMAGE_TYPE: {
-      ICON: 1,
-      MAIN: 3,
-    },
-    ASSET_ID: {
-      TITLE: 1,
-      IMAGE: 2,
-      ICON: 3,
-      BODY: 4,
-      SPONSORED: 5,
-      CTA: 6
-    },
-    DATA_ASSET_TYPE: {
-      SPONSORED: 1,
-      DESC: 2,
-      CTA_TEXT: 12,
-    },
-  }
-};
+const DSA_ATTRIBUTES = [
+  { name: 'dsarequired', 'min': 0, 'max': 3 },
+  { name: 'pubrender', 'min': 0, 'max': 2 },
+  { name: 'datatopub', 'min': 0, 'max': 2 }
+];
 
 export const spec = {
   code: BIDDER_CODE,
@@ -95,13 +79,25 @@ export const spec = {
       }
     });
 
+    const dsa = deepAccess(ortb2Params, 'regs.ext.dsa');
+    if (validateDSA(dsa)) {
+      mergeDeep(request, {
+        regs: {
+          ext: {
+            dsa
+          }
+        }
+      });
+    }
+
     let computedEndpointUrl = ENDPOINT_URL;
 
-    if (bidderRequest.fledgeEnabled) {
-      const fledgeConfig = config.getConfig('fledgeConfig') || {
+    if (bidderRequest.paapi?.enabled) {
+      const fromConfig = config.getConfig('paapiConfig') || config.getConfig('fledgeConfig') || { sellerTimeout: 500 };
+      const fledgeConfig = {
         seller: FLEDGE_SELLER_URL,
         decisionLogicUrl: FLEDGE_DECISION_LOGIC_URL,
-        sellerTimeout: 500
+        ...fromConfig
       };
       mergeDeep(request, { ext: { fledge_config: fledgeConfig } });
       computedEndpointUrl = FLEDGE_ENDPOINT_URL;
@@ -133,7 +129,13 @@ export const spec = {
       } else {
         interpretedBid = interpretBannerBid(serverBid);
       }
-      if (serverBid.ext) interpretedBid.ext = serverBid.ext;
+
+      if (serverBid.ext) {
+        interpretedBid.ext = deepClone(serverBid.ext);
+        if (serverBid.ext.dsa) {
+          interpretedBid.meta = Object.assign({}, interpretedBid.meta, { dsa: serverBid.ext.dsa });
+        }
+      }
 
       bids.push(interpretedBid);
     });
@@ -149,24 +151,35 @@ export const spec = {
       // we have fledge response
       // mimic the original response ([{},...])
       bids = this.interpretOrtbResponse({ body: responseBody.seatbid[0]?.bid }, originalRequest);
-
-      const seller = responseBody.ext.seller;
-      const decisionLogicUrl = responseBody.ext.decisionLogicUrl;
-      const sellerTimeout = 'sellerTimeout' in responseBody.ext ? { sellerTimeout: responseBody.ext.sellerTimeout } : {};
+      const paapiAdapterConfig = config.getConfig('paapiConfig') || config.getConfig('fledgeConfig') || {};
+      const fledgeInterestGroupBuyers = paapiAdapterConfig.interestGroupBuyers || [];
+      // values from the response.ext are the most important
+      const {
+        decisionLogicUrl = paapiAdapterConfig.decisionLogicUrl || paapiAdapterConfig.decisionLogicURL ||
+          FLEDGE_DECISION_LOGIC_URL,
+        seller = paapiAdapterConfig.seller || FLEDGE_SELLER_URL,
+        sellerTimeout = 500
+      } = responseBody.ext;
+
+      const fledgeConfig = {
+        seller,
+        decisionLogicUrl,
+        decisionLogicURL: decisionLogicUrl,
+        sellerTimeout
+      };
+      // fledgeConfig settings are more important; other paapiAdapterConfig settings are facultative
+      mergeDeep(fledgeConfig, paapiAdapterConfig, fledgeConfig);
       responseBody.ext.igbid.forEach((igbid) => {
-        const perBuyerSignals = {};
+        const perBuyerSignals = {...fledgeConfig.perBuyerSignals}; // may come from paapiAdapterConfig
         igbid.igbuyer.forEach(buyerItem => {
           perBuyerSignals[buyerItem.igdomain] = buyerItem.buyersignal
         });
         fledgeAuctionConfigs = fledgeAuctionConfigs || {};
-        fledgeAuctionConfigs[igbid.impid] = mergeDeep(
+        fledgeAuctionConfigs[igbid.impid] = mergeDeep({}, fledgeConfig,
           {
-            seller,
-            decisionLogicUrl,
-            interestGroupBuyers: Object.keys(perBuyerSignals),
+            interestGroupBuyers: [...new Set([...fledgeInterestGroupBuyers, ...Object.keys(perBuyerSignals)])],
             perBuyerSignals,
-          },
-          sellerTimeout
+          }
         );
       });
     } else {
@@ -185,7 +198,7 @@ export const spec = {
       logInfo('Response with FLEDGE:', { bids, fledgeAuctionConfigs });
       return {
         bids,
-        fledgeAuctionConfigs,
+        paapi: fledgeAuctionConfigs,
       }
     }
     return bids;
@@ -195,14 +208,14 @@ registerBidder(spec);
 
 /**
  * @param {object} slot Ad Unit Params by Prebid
- * @returns {int} floor by imp type
+ * @returns {number} floor by imp type
  */
 function applyFloor(slot) {
   const floors = [];
   if (typeof slot.getFloor === 'function') {
     Object.keys(slot.mediaTypes).forEach(type => {
       if (includes(SUPPORTED_MEDIA_TYPES, type)) {
-        floors.push(slot.getFloor({ currency: DEFAULT_CURRENCY_ARR[0], mediaType: type, size: slot.sizes || '*' }).floor);
+        floors.push(slot.getFloor({ currency: DEFAULT_CURRENCY_ARR[0], mediaType: type, size: slot.sizes || '*' })?.floor);
       }
     });
   }
@@ -226,7 +239,7 @@ function mapImpression(slot, bidderRequest) {
     imp.bidfloor = bidfloor;
   }
 
-  if (bidderRequest.fledgeEnabled) {
+  if (bidderRequest.paapi?.enabled) {
     imp.ext = imp.ext || {};
     imp.ext.ae = slot?.ortb2Imp?.ext?.ae
   } else {
@@ -350,7 +363,7 @@ function mapNative(slot) {
 
 /**
  * @param {object} slot Slot config by Prebid
- * @returns {array} Request Assets by OpenRTB Native Ads 1.1 §4.2
+ * @returns {Array} Request Assets by OpenRTB Native Ads 1.1 §4.2
  */
 function mapNativeAssets(slot) {
   const params = slot.nativeParams || deepAccess(slot, 'mediaTypes.native');
@@ -413,7 +426,7 @@ function mapNativeAssets(slot) {
 
 /**
  * @param {object} image Prebid native.image/icon
- * @param {int} type Image or icon code
+ * @param {number} type Image or icon code
  * @returns {object} Request Image by OpenRTB Native Ads 1.1 §4.4
  */
 function mapNativeImage(image, type) {
@@ -455,66 +468,25 @@ function interpretBannerBid(serverBid) {
 }
 
 /**
- * @param {object} serverBid Bid by OpenRTB 2.5 §4.2.3
- * @returns {object} Prebid native bidObject
- */
-function interpretNativeBid(serverBid) {
-  return {
-    requestId: serverBid.impid,
-    mediaType: NATIVE,
-    cpm: serverBid.price,
-    creativeId: serverBid.adid,
-    width: 1,
-    height: 1,
-    ttl: TTL,
-    meta: {
-      advertiserDomains: serverBid.adomain
-    },
-    netRevenue: true,
-    currency: 'USD',
-    native: interpretNativeAd(serverBid.adm),
-  }
-}
-
-/**
- * @param {string} adm JSON-encoded Request by OpenRTB Native Ads 1.1 §4.1
- * @returns {object} Prebid bidObject.native
+ * https://github.com/InteractiveAdvertisingBureau/openrtb/blob/main/extensions/community_extensions/dsa_transparency.md
+ *
+ * @param {object} dsa
+ * @returns {boolean} whether dsa object contains valid attributes values
  */
-function interpretNativeAd(adm) {
-  const native = JSON.parse(adm).native;
-  const result = {
-    clickUrl: encodeURI(native.link.url),
-    impressionTrackers: native.imptrackers
-  };
-  native.assets.forEach(asset => {
-    switch (asset.id) {
-      case OPENRTB.NATIVE.ASSET_ID.TITLE:
-        result.title = asset.title.text;
-        break;
-      case OPENRTB.NATIVE.ASSET_ID.IMAGE:
-        result.image = {
-          url: encodeURI(asset.img.url),
-          width: asset.img.w,
-          height: asset.img.h
-        };
-        break;
-      case OPENRTB.NATIVE.ASSET_ID.ICON:
-        result.icon = {
-          url: encodeURI(asset.img.url),
-          width: asset.img.w,
-          height: asset.img.h
-        };
-        break;
-      case OPENRTB.NATIVE.ASSET_ID.BODY:
-        result.body = asset.data.value;
-        break;
-      case OPENRTB.NATIVE.ASSET_ID.SPONSORED:
-        result.sponsoredBy = asset.data.value;
-        break;
-      case OPENRTB.NATIVE.ASSET_ID.CTA:
-        result.cta = asset.data.value;
-        break;
-    }
-  });
-  return result;
+function validateDSA(dsa) {
+  if (isEmpty(dsa) || !isPlainObject(dsa)) return false;
+
+  return DSA_ATTRIBUTES.reduce((prev, attr) => {
+    const dsaEntry = dsa[attr.name];
+    return prev && (
+      !dsa.hasOwnProperty(attr.name) ||
+      (isNumber(dsaEntry) && dsaEntry >= attr.min && dsaEntry <= attr.max)
+    )
+  }, true) &&
+    (!dsa.hasOwnProperty('transparency') ||
+      (isArray(dsa.transparency) && dsa.transparency.every(
+        v => isPlainObject(v) && isStr(v.domain) && v.domain && isArray(v.dsaparams) &&
+          v.dsaparams.every(x => isNumber(x))
+      ))
+    )
 }
diff --git a/modules/rtbhouseBidAdapter.md b/modules/rtbhouseBidAdapter.md
index 338ba6b4df4..7fcae1299b2 100644
--- a/modules/rtbhouseBidAdapter.md
+++ b/modules/rtbhouseBidAdapter.md
@@ -69,7 +69,7 @@ Please reach out to pmp@rtbhouse.com to receive your own
 # Protected Audience API (FLEDGE) support
 There’s an option to receive demand for Protected Audience API (FLEDGE/PAAPI) 
 ads using RTB House bid adapter. 
-Prebid’s [fledgeForGpt](https://docs.prebid.org/dev-docs/modules/fledgeForGpt.html) 
+Prebid’s [paapiForGpt](https://docs.prebid.org/dev-docs/modules/paapiForGpt.html) 
 module and Google Ad Manager is currently required.
 
 The following steps should be taken to setup Protected Audience for RTB House:
@@ -77,15 +77,15 @@ The following steps should be taken to setup Protected Audience for RTB House:
 1. Reach out to your RTB House representative for setup coordination.
 
 2. Build and enable FLEDGE module as described in 
-[fledgeForGpt](https://docs.prebid.org/dev-docs/modules/fledgeForGpt.html) 
+[paapiForGpt](https://docs.prebid.org/dev-docs/modules/paapiForGpt.html) 
 module documentation.
 
     a. Make sure to enable RTB House bidder to participate in FLEDGE. If there are any other bidders to be allowed for that, add them to the **bidders** array:
     ```javascript
-    pbjs.setBidderConfig({
-        bidders: ["rtbhouse"],
-        config: {
-            fledgeEnabled: true
+    pbjs.setConfig({
+        paapi: {
+            bidders: ["rtbhouse"],
+            enabled: true
         }
     });
     ```
@@ -93,15 +93,15 @@ module documentation.
     b. If you as a publisher have your own [decisionLogicUrl](https://github.com/WICG/turtledove/blob/main/FLEDGE.md#21-initiating-an-on-device-auction)
     you may utilize it by setting up a dedicated `fledgeConfig` object:
     ```javascript
-    pbjs.setBidderConfig({
-        bidders: ["rtbhouse"],
-        config: {
-            fledgeEnabled: true,
-            fledgeConfig: {
-                seller: 'https://seller.domain',
-                decisionLogicUrl: 'https://seller.domain/decisionLogicFile.js',
-                sellerTimeout: 100
-            }
+    pbjs.setConfig({
+        paapi: {
+            bidders: ["rtbhouse"],
+            enabled: true
+        },
+        fledgeConfig: {
+            seller: 'https://seller.domain',
+            decisionLogicUrl: 'https://seller.domain/decisionLogicFile.js',
+            sellerTimeout: 100
         }
     });
     ```
diff --git a/modules/rtbsapeBidAdapter.js b/modules/rtbsapeBidAdapter.js
index 5b1a92b02a0..502b62c8799 100644
--- a/modules/rtbsapeBidAdapter.js
+++ b/modules/rtbsapeBidAdapter.js
@@ -4,6 +4,14 @@ import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {OUTSTREAM} from '../src/video.js';
 import {Renderer} from '../src/Renderer.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
 const BIDDER_CODE = 'rtbsape';
 const ENDPOINT = 'https://ssp-rtb.sape.ru/prebid';
 const RENDERER_SRC = 'https://cdn-rtb.sape.ru/js/player.js';
diff --git a/modules/rtdModule/index.js b/modules/rtdModule/index.js
index 633c4f4cdc1..2ebc334b29e 100644
--- a/modules/rtdModule/index.js
+++ b/modules/rtdModule/index.js
@@ -1,6 +1,7 @@
 /**
  * This module adds Real time data support to prebid.js
  * @module modules/realTimeData
+ * @typedef {import('../../modules/rtdModule/index.js').SubmoduleConfig} SubmoduleConfig
  */
 
 /**
@@ -30,7 +31,7 @@
  */
 
 /**
- * @function?
+ * @function
  * @summary return real time data
  * @name RtdSubmodule#getTargetingData
  * @param {string[]} adUnitsCodes
@@ -40,7 +41,7 @@
  */
 
 /**
- * @function?
+ * @function
  * @summary modify bid request data
  * @name RtdSubmodule#getBidRequestData
  * @param {Object} reqBidsConfigObj
@@ -73,7 +74,7 @@
  */
 
 /**
- * @function?
+ * @function
  * @summary on auction init event
  * @name RtdSubmodule#onAuctionInitEvent
  * @param {Object} data
@@ -82,7 +83,7 @@
  */
 
 /**
- * @function?
+ * @function
  * @summary on auction end event
  * @name RtdSubmodule#onAuctionEndEvent
  * @param {Object} data
@@ -91,7 +92,7 @@
  */
 
 /**
- * @function?
+ * @function
  * @summary on bid response event
  * @name RtdSubmodule#onBidResponseEvent
  * @param {Object} data
@@ -100,7 +101,7 @@
  */
 
 /**
- * @function?
+ * @function
  * @summary on bid requested event
  * @name RtdSubmodule#onBidRequestEvent
  * @param {Object} data
@@ -109,7 +110,7 @@
  */
 
 /**
- * @function?
+ * @function
  * @summary on data deletion request
  * @name RtdSubmodule#onDataDeletionRequest
  * @param {SubmoduleConfig} config
@@ -162,7 +163,7 @@ import {config} from '../../src/config.js';
 import {getHook, module} from '../../src/hook.js';
 import {logError, logInfo, logWarn} from '../../src/utils.js';
 import * as events from '../../src/events.js';
-import CONSTANTS from '../../src/constants.json';
+import { EVENTS, JSON_MAPPING } from '../../src/constants.js';
 import adapterManager, {gdprDataHandler, uspDataHandler, gppDataHandler} from '../../src/adapterManager.js';
 import {find} from '../../src/polyfill.js';
 import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
@@ -187,10 +188,12 @@ let _dataProviders = [];
 let _userConsent;
 
 /**
- * Register a RTD submodule.
+ * Register a Real-Time Data (RTD) submodule.
  *
- * @param {RtdSubmodule} submodule
- * @returns {function()} a de-registration function that will unregister the module when called.
+ * @param {Object} submodule The RTD submodule to register.
+ * @param {string} submodule.name The name of the RTD submodule.
+ * @param {number} [submodule.gvlid] The Global Vendor List ID (GVLID) of the RTD submodule.
+ * @returns {function(): void} A de-registration function that will unregister the module when called.
  */
 export function attachRealTimeDataProvider(submodule) {
   registeredSubModules.push(submodule);
@@ -212,10 +215,11 @@ const setEventsListeners = (function () {
   return function setEventsListeners() {
     if (!registered) {
       Object.entries({
-        [CONSTANTS.EVENTS.AUCTION_INIT]: ['onAuctionInitEvent'],
-        [CONSTANTS.EVENTS.AUCTION_END]: ['onAuctionEndEvent', getAdUnitTargeting],
-        [CONSTANTS.EVENTS.BID_RESPONSE]: ['onBidResponseEvent'],
-        [CONSTANTS.EVENTS.BID_REQUESTED]: ['onBidRequestEvent']
+        [EVENTS.AUCTION_INIT]: ['onAuctionInitEvent'],
+        [EVENTS.AUCTION_END]: ['onAuctionEndEvent', getAdUnitTargeting],
+        [EVENTS.BID_RESPONSE]: ['onBidResponseEvent'],
+        [EVENTS.BID_REQUESTED]: ['onBidRequestEvent'],
+        [EVENTS.BID_ACCEPTED]: ['onBidAcceptedEvent']
       }).forEach(([ev, [handler, preprocess]]) => {
         events.on(ev, (args) => {
           preprocess && preprocess(args);
@@ -314,10 +318,8 @@ export const setBidRequestsData = timedAuctionHook('rtd', function setBidRequest
   relevantSubModules.forEach(sm => {
     const fpdGuard = guardOrtb2Fragments(reqBidsConfigObj.ortb2Fragments || {}, activityParams(MODULE_TYPE_RTD, sm.name));
     verifiers.push(fpdGuard.verify);
-    sm.getBidRequestData({
-      ...reqBidsConfigObj,
-      ortb2Fragments: fpdGuard.obj
-    }, onGetBidRequestDataCallback.bind(sm), sm.config, _userConsent)
+    reqBidsConfigObj.ortb2Fragments = fpdGuard.obj;
+    sm.getBidRequestData(reqBidsConfigObj, onGetBidRequestDataCallback.bind(sm), sm.config, _userConsent)
   });
 
   function onGetBidRequestDataCallback() {
@@ -378,14 +380,14 @@ export function getAdUnitTargeting(auction) {
       return
     }
     logInfo('RTD set ad unit targeting of', kv, 'for', adUnit);
-    adUnit[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = Object.assign(adUnit[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] || {}, kv);
+    adUnit[JSON_MAPPING.ADSERVER_TARGETING] = Object.assign(adUnit[JSON_MAPPING.ADSERVER_TARGETING] || {}, kv);
   });
   return auction.adUnits;
 }
 
 /**
  * deep merge array of objects
- * @param {array} arr - objects array
+ * @param {Array} arr - objects array
  * @return {Object} merged object
  */
 export function deepMerge(arr) {
diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index 4cfd40fb682..411e194b1ee 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -3,7 +3,6 @@ import { pbsExtensions } from '../libraries/pbsExtensions/pbsExtensions.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { find } from '../src/polyfill.js';
 import { getGlobal } from '../src/prebidGlobal.js';
 import { Renderer } from '../src/Renderer.js';
 import {
@@ -17,10 +16,17 @@ import {
   logMessage,
   logWarn,
   mergeDeep,
-  parseSizesInput, _each
+  parseSizesInput,
+  pick,
+  _each,
+  isPlainObject
 } from '../src/utils.js';
 import {getAllOrtbKeywords} from '../libraries/keywords/keywords.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
+import {getUserSyncParams} from '../libraries/userSyncUtils/userSyncUtils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ */
 
 const DEFAULT_INTEGRATION = 'pbjs_lite';
 const DEFAULT_PBS_INTEGRATION = 'pbjs';
@@ -36,6 +42,8 @@ config.getConfig('rubicon', config => {
 
 const GVLID = 52;
 
+let impIdMap = {};
+
 var sizeMap = {
   1: '468x60',
   2: '728x90',
@@ -124,6 +132,7 @@ var sizeMap = {
   278: '320x500',
   282: '320x400',
   288: '640x380',
+  484: '720x1280',
   524: '1x2',
   548: '500x1000',
   550: '980x480',
@@ -141,7 +150,13 @@ var sizeMap = {
   580: '505x656',
   622: '192x160',
   632: '1200x450',
-  634: '340x450'
+  634: '340x450',
+  680: '970x570',
+  682: '300x240',
+  684: '970x550',
+  686: '300x210',
+  688: '300x220',
+  690: '970x170'
 };
 
 _each(sizeMap, (item, key) => sizeMap[item] = key);
@@ -195,9 +210,6 @@ export const converter = ortbConverter({
     const imp = buildImp(bidRequest, context);
     imp.id = bidRequest.adUnitCode;
     delete imp.banner;
-    if (config.getConfig('s2sConfig.defaultTtl')) {
-      imp.exp = config.getConfig('s2sConfig.defaultTtl');
-    };
     bidRequest.params.position === 'atf' && imp.video && (imp.video.pos = 1);
     bidRequest.params.position === 'btf' && imp.video && (imp.video.pos = 3);
     delete imp.ext?.prebid?.storedrequest;
@@ -208,6 +220,9 @@ export const converter = ortbConverter({
 
     setBidFloors(bidRequest, imp);
 
+    // ensure unique imp IDs for twin adunits
+    imp.id = impIdMap[imp.id] ? imp.id + impIdMap[imp.id]++ : (impIdMap[imp.id] = 2, imp.id);
+
     return imp;
   },
   bidResponse(buildBidResponse, bid, context) {
@@ -216,9 +231,9 @@ export const converter = ortbConverter({
     const {bidRequest} = context;
 
     let [parseSizeWidth, parseSizeHeight] = bidRequest.mediaTypes.video?.context === 'outstream' ? parseSizes(bidRequest, VIDEO) : [undefined, undefined];
-
-    bidResponse.width = bid.w || parseSizeWidth || bidResponse.playerWidth;
-    bidResponse.height = bid.h || parseSizeHeight || bidResponse.playerHeight;
+    // 0 by default to avoid undefined size
+    bidResponse.width = bid.w || parseSizeWidth || bidResponse.playerWidth || 0;
+    bidResponse.height = bid.h || parseSizeHeight || bidResponse.playerHeight || 0;
 
     if (bidResponse.mediaType === VIDEO && bidRequest.mediaTypes.video.context === 'outstream') {
       bidResponse.renderer = outstreamRenderer(bidResponse);
@@ -231,7 +246,7 @@ export const converter = ortbConverter({
   },
   context: {
     netRevenue: rubiConf.netRevenue !== false, // If anything other than false, netRev is true
-    ttl: 300,
+    ttl: 360,
   },
   processors: pbsExtensions
 });
@@ -298,6 +313,7 @@ export const spec = {
 
     if (filteredRequests && filteredRequests.length) {
       const data = converter.toORTB({bidRequests: filteredRequests, bidderRequest});
+      resetImpIdMap();
 
       filteredHttpRequest.push({
         method: 'POST',
@@ -407,6 +423,8 @@ export const spec = {
         'x_source.tid',
         'l_pb_bid_id',
         'p_screen_res',
+        'o_ae',
+        'o_cdep',
         'rp_floor',
         'rp_secure',
         'tk_user_key'
@@ -480,6 +498,9 @@ export const spec = {
       'x_source.tid': bidderRequest.ortb2?.source?.tid,
       'x_imp.ext.tid': bidRequest.ortb2Imp?.ext?.tid,
       'l_pb_bid_id': bidRequest.bidId,
+      'o_cdep': bidRequest.ortb2?.device?.ext?.cdep,
+      'ip': bidRequest.ortb2?.device?.ip,
+      'ipv6': bidRequest.ortb2?.device?.ipv6,
       'p_screen_res': _getScreenResolution(),
       'tk_user_key': params.userId,
       'p_geo.latitude': isNaN(parseFloat(latitude)) ? undefined : parseFloat(latitude).toFixed(4),
@@ -500,7 +521,7 @@ export const spec = {
       } catch (e) {
         logError('Rubicon: getFloor threw an error: ', e);
       }
-      data['rp_hard_floor'] = typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? floorInfo.floor : undefined;
+      data['rp_hard_floor'] = isPlainObject(floorInfo) && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? floorInfo.floor : undefined;
     }
 
     // Send multiformat data if requested
@@ -519,40 +540,51 @@ export const spec = {
     if (configUserId) {
       data['ppuid'] = configUserId;
     }
+
+    if (bidRequest?.ortb2Imp?.ext?.ae) {
+      data['o_ae'] = 1;
+    }
+    // If the bid request contains a 'mobile' property under 'ortb2.site', add it to 'data' as 'p_site.mobile'.
+    if (typeof bidRequest?.ortb2?.site?.mobile === 'number') {
+      data['p_site.mobile'] = bidRequest.ortb2.site.mobile
+    }
+
+    addDesiredSegtaxes(bidderRequest, data);
     // loop through userIds and add to request
-    if (bidRequest.userIdAsEids) {
-      bidRequest.userIdAsEids.forEach(eid => {
+    if (bidRequest?.ortb2?.user?.ext?.eids) {
+      bidRequest.ortb2.user.ext.eids.forEach(({ source, uids = [], inserter, matcher, mm, ext = {} }) => {
         try {
-          // special cases
-          if (eid.source === 'adserver.org') {
-            data['tpid_tdid'] = eid.uids[0].id;
-            data['eid_adserver.org'] = eid.uids[0].id;
-          } else if (eid.source === 'liveintent.com') {
-            data['tpid_liveintent.com'] = eid.uids[0].id;
-            data['eid_liveintent.com'] = eid.uids[0].id;
-            if (eid.ext && Array.isArray(eid.ext.segments) && eid.ext.segments.length) {
-              data['tg_v.LIseg'] = eid.ext.segments.join(',');
-            }
-          } else if (eid.source === 'liveramp.com') {
-            data['x_liverampidl'] = eid.uids[0].id;
-          } else if (eid.source === 'id5-sync.com') {
-            data['eid_id5-sync.com'] = `${eid.uids[0].id}^${eid.uids[0].atype}^${(eid.uids[0].ext && eid.uids[0].ext.linkType) || ''}`;
-          } else {
-            // add anything else with this generic format
-            // if rubicon drop ^
-            const id = eid.source === 'rubiconproject.com' ? eid.uids[0].id : `${eid.uids[0].id}^${eid.uids[0].atype || ''}`
-            data[`eid_${eid.source}`] = id;
-          }
-          // send AE "ppuid" signal if exists, and hasn't already been sent
+          // Ensure there is at least one valid UID in the 'uids' array
+          const uidData = uids[0];
+          if (!uidData) return; // Skip processing if no valid UID exists
+
+          // Function to build the EID value in the required format
+          const buildEidValue = (uidData) => [
+            uidData.id, // uid: The user ID
+            uidData.atype || '',
+            '', // third: Always empty, as specified in the requirement
+            inserter || '',
+            matcher || '',
+            mm || '',
+            uidData?.ext?.rtipartner || ''
+          ].join('^'); // Return a single string formatted with '^' delimiter
+
+          const eidValue = buildEidValue(uidData); // Build the EID value string
+
+          // Store the constructed EID value for the given source
+          data[`eid_${source}`] = eidValue;
+
+          // Handle the "ppuid" signal, ensuring it is set only once
           if (!data['ppuid']) {
-            // get the first eid.uids[*].ext.stype === 'ppuid', if one exists
-            const ppId = find(eid.uids, uid => uid.ext && uid.ext.stype === 'ppuid');
-            if (ppId && ppId.id) {
-              data['ppuid'] = ppId.id;
+            // Search for a UID with the 'stype' field equal to 'ppuid' in its extension
+            const ppId = uids.find(uid => uid.ext?.stype === 'ppuid');
+            if (ppId?.id) {
+              data['ppuid'] = ppId.id; // Store the ppuid if found
             }
           }
         } catch (e) {
-          logWarn('Rubicon: error reading eid:', eid, e);
+          // Log any errors encountered during processing
+          logWarn('Rubicon: error reading eid:', { source, uids }, e);
         }
       });
     }
@@ -618,7 +650,7 @@ export const spec = {
    * @param {*} responseObj
    * @param {BidRequest|Object.} request - if request was SRA the bidRequest argument will be a keyed BidRequest array object,
    * non-SRA responses return a plain BidRequest object
-   * @return {Bid[]} An array of bids which
+   * @return {{fledgeAuctionConfigs: *, bids: *}} An array of bids which
    */
   interpretResponse: function (responseObj, request) {
     responseObj = responseObj.body;
@@ -628,7 +660,6 @@ export const spec = {
     if (!responseObj || typeof responseObj !== 'object') {
       return [];
     }
-
     // Response from PBS Java openRTB
     if (responseObj.seatbid) {
       const responseErrors = deepAccess(responseObj, 'ext.errors.rubicon');
@@ -654,7 +685,7 @@ export const spec = {
       return [];
     }
 
-    return ads.reduce((bids, ad, i) => {
+    let bids = ads.reduce((bids, ad, i) => {
       (ad.impression_id && lastImpId === ad.impression_id) ? multibid++ : lastImpId = ad.impression_id;
 
       if (ad.status !== 'ok') {
@@ -671,7 +702,7 @@ export const spec = {
           creativeId: ad.creative_id || `${ad.network || ''}-${ad.advertiser || ''}`,
           cpm: ad.cpm || 0,
           dealId: ad.deal,
-          ttl: 300, // 5 minutes
+          ttl: 360, // 6 minutes
           netRevenue: rubiConf.netRevenue !== false, // If anything other than false, netRev is true
           rubicon: {
             advertiserId: ad.advertiser, networkId: ad.network
@@ -685,10 +716,18 @@ export const spec = {
           bid.mediaType = ad.creative_type;
         }
 
+        if (ad.dsa && Object.keys(ad.dsa).length) {
+          bid.meta.dsa = ad.dsa;
+        }
+
         if (ad.adomain) {
           bid.meta.advertiserDomains = Array.isArray(ad.adomain) ? ad.adomain : [ad.adomain];
         }
 
+        if (ad.emulated_format) {
+          bid.meta.mediaType = ad.emulated_format;
+        }
+
         if (ad.creative_type === VIDEO) {
           bid.width = associatedBidRequest.params.video.playerWidth;
           bid.height = associatedBidRequest.params.video.playerHeight;
@@ -715,30 +754,21 @@ export const spec = {
     }, []).sort((adA, adB) => {
       return (adB.cpm || 0.0) - (adA.cpm || 0.0);
     });
+
+    let fledgeAuctionConfigs = responseObj.component_auction_config?.map(config => {
+      return { config, bidId: config.bidId }
+    });
+
+    if (fledgeAuctionConfigs) {
+      return { bids, paapi: fledgeAuctionConfigs };
+    } else {
+      return bids;
+    }
   },
   getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
     if (!hasSynced && syncOptions.iframeEnabled) {
       // data is only assigned if params are available to pass to syncEndpoint
-      let params = {};
-
-      if (gdprConsent) {
-        if (typeof gdprConsent.gdprApplies === 'boolean') {
-          params['gdpr'] = Number(gdprConsent.gdprApplies);
-        }
-        if (typeof gdprConsent.consentString === 'string') {
-          params['gdpr_consent'] = gdprConsent.consentString;
-        }
-      }
-
-      if (uspConsent) {
-        params['us_privacy'] = encodeURIComponent(uspConsent);
-      }
-
-      if (gppConsent?.gppString) {
-        params['gpp'] = gppConsent.gppString;
-        params['gpp_sid'] = gppConsent.applicableSections?.toString();
-      }
-
+      let params = getUserSyncParams(gdprConsent, uspConsent, gppConsent);
       params = Object.keys(params).length ? `?${formatQS(params)}` : '';
 
       hasSynced = true;
@@ -747,19 +777,6 @@ export const spec = {
         url: `https://${rubiConf.syncHost || 'eus'}.rubiconproject.com/usync.html` + params
       };
     }
-  },
-  /**
-   * Covert bid param types for S2S
-   * @param {Object} params bid params
-   * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
-   * @return {Object} params bid params
-   */
-  transformBidParams: function(params, isOpenRtb) {
-    return convertTypes({
-      'accountId': 'number',
-      'siteId': 'number',
-      'zoneId': 'number'
-    }, params);
   }
 };
 
@@ -816,20 +833,27 @@ function renderBid(bid) {
   hideSmartAdServerIframe(adUnitElement);
 
   // configure renderer
-  const config = bid.renderer.getConfig();
+  const defaultConfig = {
+    align: 'center',
+    position: 'append',
+    closeButton: false,
+    label: undefined,
+    collapse: true
+  };
+  const config = { ...defaultConfig, ...bid.renderer.getConfig() };
   bid.renderer.push(() => {
     window.MagniteApex.renderAd({
       width: bid.width,
       height: bid.height,
       vastUrl: bid.vastUrl,
       placement: {
-        attachTo: adUnitElement,
-        align: config.align || 'center',
-        position: config.position || 'append'
+        attachTo: `#${bid.adUnitCode}`,
+        align: config.align,
+        position: config.position
       },
-      closeButton: config.closeButton || false,
-      label: config.label || undefined,
-      collapse: config.collapse || true
+      closeButton: config.closeButton,
+      label: config.label,
+      collapse: config.collapse
     });
   });
 }
@@ -897,6 +921,7 @@ function applyFPD(bidRequest, mediaType, data) {
   let impExtData = deepAccess(bidRequest.ortb2Imp, 'ext.data') || {};
 
   const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid');
+  const dsa = deepAccess(fpd, 'regs.ext.dsa');
   const SEGTAX = {user: [4], site: [1, 2, 5, 6]};
   const MAP = {user: 'tg_v.', site: 'tg_i.', adserver: 'tg_i.dfp_ad_unit_code', pbadslot: 'tg_i.pbadslot', keywords: 'kw'};
   const validate = function(prop, key, parentName) {
@@ -952,10 +977,71 @@ function applyFPD(bidRequest, mediaType, data) {
       data['p_gpid'] = gpid;
     }
 
+    // add dsa signals
+    if (dsa && Object.keys(dsa).length) {
+      pick(dsa, [
+        'dsainfo', (dsainfo) => data['dsainfo'] = dsainfo,
+        'dsarequired', (required) => data['dsarequired'] = required,
+        'pubrender', (pubrender) => data['dsapubrender'] = pubrender,
+        'datatopub', (datatopub) => data['dsadatatopubs'] = datatopub,
+        'transparency', (transparency) => {
+          if (Array.isArray(transparency) && transparency.length) {
+            data['dsatransparency'] = transparency.reduce((param, transp) => {
+              // make sure domain is there, otherwise skip entry
+              const domain = transp.domain || '';
+              if (!domain) {
+                return param;
+              }
+
+              // make sure dsaParam array is there (try both 'dsaparams' and 'params', but prefer dsaparams)
+              const dsaParamArray = transp.dsaparams || transp.params;
+              if (!Array.isArray(dsaParamArray) || dsaParamArray.length === 0) {
+                return param;
+              }
+
+              // finally we will add this one, if param has been added already, add our seperator
+              if (param) {
+                param += '~~'
+              }
+
+              return param += `${domain}~${dsaParamArray.join('_')}`;
+            }, '');
+          }
+        }
+      ])
+    }
+
     // only send one of pbadslot or dfp adunit code (prefer pbadslot)
     if (data['tg_i.pbadslot']) {
       delete data['tg_i.dfp_ad_unit_code'];
     }
+
+    // High Entropy stuff -> sua object is the ORTB standard (default to pass unless specifically disabled)
+    const clientHints = deepAccess(fpd, 'device.sua');
+    if (clientHints && rubiConf.chEnabled !== false) {
+      // pick out client hints we want to send (any that are undefined or empty will NOT be sent)
+      pick(clientHints, [
+        'architecture', arch => data.m_ch_arch = arch,
+        'bitness', bitness => data.m_ch_bitness = bitness,
+        'browsers', browsers => {
+          if (!Array.isArray(browsers)) return;
+          // reduce down into ua and full version list attributes
+          const [ua, fullVer] = browsers.reduce((accum, browserData) => {
+            accum[0].push(`"${browserData?.brand}"|v="${browserData?.version?.[0]}"`);
+            accum[1].push(`"${browserData?.brand}"|v="${browserData?.version?.join?.('.')}"`);
+            return accum;
+          }, [[], []]);
+          data.m_ch_ua = ua?.join?.(',');
+          data.m_ch_full_ver = fullVer?.join?.(',');
+        },
+        'mobile', isMobile => data.m_ch_mobile = `?${isMobile}`,
+        'model', model => data.m_ch_model = model,
+        'platform', platform => {
+          data.m_ch_platform = platform?.brand;
+          data.m_ch_platform_ver = platform?.version?.join?.('.');
+        }
+      ])
+    }
   } else {
     if (Object.keys(impExt).length) {
       mergeDeep(data.imp[0].ext, impExt);
@@ -969,6 +1055,27 @@ function applyFPD(bidRequest, mediaType, data) {
   }
 }
 
+function addDesiredSegtaxes(bidderRequest, target) {
+  if (rubiConf.readTopics === false) {
+    return;
+  }
+  let iSegments = [1, 2, 5, 6, 7, 507].concat(rubiConf.sendSiteSegtax?.map(seg => Number(seg)) || []);
+  let vSegments = [4, 508].concat(rubiConf.sendUserSegtax?.map(seg => Number(seg)) || []);
+  let userData = bidderRequest.ortb2?.user?.data || [];
+  let siteData = bidderRequest.ortb2?.site?.content?.data || [];
+  userData.forEach(iterateOverSegmentData(target, 'v', vSegments));
+  siteData.forEach(iterateOverSegmentData(target, 'i', iSegments));
+}
+
+function iterateOverSegmentData(target, char, segments) {
+  return (topic) => {
+    const taxonomy = Number(topic.ext?.segtax);
+    if (segments.includes(taxonomy)) {
+      target[`tg_${char}.tax${taxonomy}`] = topic.segment?.map(seg => seg.id).join(',');
+    }
+  }
+}
+
 /**
  * @param sizes
  * @returns {*}
@@ -1068,6 +1175,7 @@ function bidType(bid, log = false) {
 }
 
 export const resetRubiConf = () => rubiConf = {};
+export const resetImpIdMap = () => impIdMap = {};
 export function masSizeOrdering(sizes) {
   const MAS_SIZE_PRIORITY = [15, 2, 9];
 
@@ -1103,7 +1211,7 @@ export function determineRubiconVideoSizeId(bid) {
 }
 
 /**
- * @param {PrebidConfig} config
+ * @param {Object} config
  * @returns {{ranges: {ranges: Object[]}}}
  */
 export function getPriceGranularity(config) {
@@ -1137,8 +1245,7 @@ export function hasValidVideoParams(bid) {
   var requiredParams = {
     mimes: arrayType,
     protocols: arrayType,
-    linearity: numberType,
-    api: arrayType
+    linearity: numberType
   }
   // loop through each param and verify it has the correct
   Object.keys(requiredParams).forEach(function(param) {
@@ -1153,7 +1260,6 @@ export function hasValidVideoParams(bid) {
 /**
  * Make sure the required params are present
  * @param {Object} schain
- * @param {Bool}
  */
 export function hasValidSupplyChainParams(schain) {
   let isValid = false;
diff --git a/modules/s2sTesting.js b/modules/s2sTesting.js
index 8e9628c8810..4c78b62d710 100644
--- a/modules/s2sTesting.js
+++ b/modules/s2sTesting.js
@@ -44,7 +44,7 @@ s2sTesting.getSourceBidderMap = function(adUnits = [], allS2SBidders = []) {
 
 /**
  * @function calculateBidSources determines the source for each s2s bidder based on bidderControl weightings.  these can be overridden at the adUnit level
- * @param s2sConfigs server-to-server configuration
+ * @param s2sConfig server-to-server configuration
  */
 s2sTesting.calculateBidSources = function(s2sConfig = {}) {
   // calculate bid source (server/client) for each s2s bidder
diff --git a/modules/saambaaBidAdapter.js b/modules/saambaaBidAdapter.js
index da6e7028abe..3e33496b7d9 100644
--- a/modules/saambaaBidAdapter.js
+++ b/modules/saambaaBidAdapter.js
@@ -1,419 +1,3 @@
-// TODO: this adapter appears to have no tests
-
-import {deepAccess, generateUUID, isEmpty, isFn, parseSizesInput, parseUrl} from '../src/utils.js';
-import {config} from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {find, includes} from '../src/polyfill.js';
-
-const ADAPTER_VERSION = '1.0';
-const BIDDER_CODE = 'saambaa';
-
-export const VIDEO_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';
-export const BANNER_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';
-export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/loader/outstream.js';
-export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'skip', 'playerSize', 'context'];
-export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
-
-let pubid = '';
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
-
-  isBidRequestValid(bidRequest) {
-    if (typeof bidRequest != 'undefined') {
-      if (bidRequest.bidder !== BIDDER_CODE && typeof bidRequest.params === 'undefined') { return false; }
-      if (bidRequest === '' || bidRequest.params.placement === '' || bidRequest.params.pubid === '') { return false; }
-      return true;
-    } else { return false; }
-  },
-
-  buildRequests(bids, bidderRequest) {
-    let requests = [];
-    let videoBids = bids.filter(bid => isVideoBidValid(bid));
-    let bannerBids = bids.filter(bid => isBannerBidValid(bid));
-    videoBids.forEach(bid => {
-      pubid = getVideoBidParam(bid, 'pubid');
-      requests.push({
-        method: 'POST',
-        url: VIDEO_ENDPOINT + pubid,
-        data: createVideoRequestData(bid, bidderRequest),
-        bidRequest: bid
-      });
-    });
-
-    bannerBids.forEach(bid => {
-      pubid = getBannerBidParam(bid, 'pubid');
-
-      requests.push({
-        method: 'POST',
-        url: BANNER_ENDPOINT + pubid,
-        data: createBannerRequestData(bid, bidderRequest),
-        bidRequest: bid
-      });
-    });
-    return requests;
-  },
-
-  interpretResponse(serverResponse, {bidRequest}) {
-    let response = serverResponse.body;
-    if (response !== null && isEmpty(response) == false) {
-      if (isVideoBid(bidRequest)) {
-        let bidResponse = {
-          requestId: response.id,
-          cpm: response.seatbid[0].bid[0].price,
-          width: response.seatbid[0].bid[0].w,
-          height: response.seatbid[0].bid[0].h,
-          ttl: response.seatbid[0].bid[0].ttl || 60,
-          creativeId: response.seatbid[0].bid[0].crid,
-          currency: response.cur,
-          meta: { 'advertiserDomains': response.seatbid[0].bid[0].adomain },
-          mediaType: VIDEO,
-          netRevenue: true
-        }
-
-        if (response.seatbid[0].bid[0].adm) {
-          bidResponse.vastXml = response.seatbid[0].bid[0].adm;
-          bidResponse.adResponse = {
-            content: response.seatbid[0].bid[0].adm
-          };
-        } else {
-          bidResponse.vastUrl = response.seatbid[0].bid[0].nurl;
-        }
-
-        return bidResponse;
-      } else {
-        return {
-          requestId: response.id,
-          bidderCode: BIDDER_CODE,
-          cpm: response.seatbid[0].bid[0].price,
-          width: response.seatbid[0].bid[0].w,
-          height: response.seatbid[0].bid[0].h,
-          ad: response.seatbid[0].bid[0].adm,
-          ttl: response.seatbid[0].bid[0].ttl || 60,
-          creativeId: response.seatbid[0].bid[0].crid,
-          currency: response.cur,
-          meta: { 'advertiserDomains': response.seatbid[0].bid[0].adomain },
-          mediaType: BANNER,
-          netRevenue: true
-        }
-      }
-    }
-  }
-};
-
-function isBannerBid(bid) {
-  return deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
-}
-
-function isVideoBid(bid) {
-  return deepAccess(bid, 'mediaTypes.video');
-}
-
-function getBannerBidFloor(bid) {
-  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'banner', size: '*' }) : {};
-  return floorInfo.floor || getBannerBidParam(bid, 'bidfloor');
-}
-
-function getVideoBidFloor(bid) {
-  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'video', size: '*' }) : {};
-  return floorInfo.floor || getVideoBidParam(bid, 'bidfloor');
-}
-
-function isVideoBidValid(bid) {
-  return isVideoBid(bid) && getVideoBidParam(bid, 'pubid') && getVideoBidParam(bid, 'placement');
-}
-
-function isBannerBidValid(bid) {
-  return isBannerBid(bid) && getBannerBidParam(bid, 'pubid') && getBannerBidParam(bid, 'placement');
-}
-
-function getVideoBidParam(bid, key) {
-  return deepAccess(bid, 'params.video.' + key) || deepAccess(bid, 'params.' + key);
-}
-
-function getBannerBidParam(bid, key) {
-  return deepAccess(bid, 'params.banner.' + key) || deepAccess(bid, 'params.' + key);
-}
-
-function isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
-}
-
-function isConnectedTV() {
-  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
-}
-
-function getDoNotTrack() {
-  return navigator.doNotTrack === '1' || window.doNotTrack === '1' || navigator.msDoNoTrack === '1' || navigator.doNotTrack === 'yes';
-}
-
-function findAndFillParam(o, key, value) {
-  try {
-    if (typeof value === 'function') {
-      o[key] = value();
-    } else {
-      o[key] = value;
-    }
-  } catch (ex) {}
-}
-
-function getOsVersion() {
-  let clientStrings = [
-    { s: 'Android', r: /Android/ },
-    { s: 'iOS', r: /(iPhone|iPad|iPod)/ },
-    { s: 'Mac OS X', r: /Mac OS X/ },
-    { s: 'Mac OS', r: /(MacPPC|MacIntel|Mac_PowerPC|Macintosh)/ },
-    { s: 'Linux', r: /(Linux|X11)/ },
-    { s: 'Windows 10', r: /(Windows 10.0|Windows NT 10.0)/ },
-    { s: 'Windows 8.1', r: /(Windows 8.1|Windows NT 6.3)/ },
-    { s: 'Windows 8', r: /(Windows 8|Windows NT 6.2)/ },
-    { s: 'Windows 7', r: /(Windows 7|Windows NT 6.1)/ },
-    { s: 'Windows Vista', r: /Windows NT 6.0/ },
-    { s: 'Windows Server 2003', r: /Windows NT 5.2/ },
-    { s: 'Windows XP', r: /(Windows NT 5.1|Windows XP)/ },
-    { s: 'UNIX', r: /UNIX/ },
-    { s: 'Search Bot', r: /(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves\/Teoma|ia_archiver)/ }
-  ];
-  let cs = find(clientStrings, cs => cs.r.test(navigator.userAgent));
-  return cs ? cs.s : 'unknown';
-}
-
-function getFirstSize(sizes) {
-  return (sizes && sizes.length) ? sizes[0] : { w: undefined, h: undefined };
-}
-
-function parseSizes(sizes) {
-  return parseSizesInput(sizes).map(size => {
-    let [ width, height ] = size.split('x');
-    return {
-      w: parseInt(width, 10) || undefined,
-      h: parseInt(height, 10) || undefined
-    };
-  });
-}
-
-function getVideoSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
-}
-
-function getBannerSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
-}
-
-function getTopWindowReferrer() {
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return '';
-  }
-}
-
-function getVideoTargetingParams(bid) {
-  const result = {};
-  const excludeProps = ['playerSize', 'context', 'w', 'h'];
-  Object.keys(Object(bid.mediaTypes.video))
-    .filter(key => !includes(excludeProps, key))
-    .forEach(key => {
-      result[ key ] = bid.mediaTypes.video[ key ];
-    });
-  Object.keys(Object(bid.params.video))
-    .filter(key => includes(VIDEO_TARGETING, key))
-    .forEach(key => {
-      result[ key ] = bid.params.video[ key ];
-    });
-  return result;
-}
-
-function createVideoRequestData(bid, bidderRequest) {
-  let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer();
-
-  // if size is explicitly given via adapter params
-  let paramSize = getVideoBidParam(bid, 'size');
-  let sizes = [];
-  let coppa = config.getConfig('coppa');
-
-  if (typeof paramSize !== 'undefined' && paramSize != '') {
-    sizes = parseSizes(paramSize);
-  } else {
-    sizes = getVideoSizes(bid);
-  }
-  const firstSize = getFirstSize(sizes);
-  let floor = (getVideoBidFloor(bid) == null || typeof getVideoBidFloor(bid) == 'undefined') ? 0.5 : getVideoBidFloor(bid);
-  let video = getVideoTargetingParams(bid);
-  const o = {
-    'device': {
-      'langauge': (global.navigator.language).split('-')[0],
-      'dnt': (global.navigator.doNotTrack === 1 ? 1 : 0),
-      'devicetype': isMobile() ? 4 : isConnectedTV() ? 3 : 2,
-      'js': 1,
-      'os': getOsVersion()
-    },
-    'at': 2,
-    'site': {},
-    'tmax': 3000,
-    'cur': ['USD'],
-    'id': bid.bidId,
-    'imp': [],
-    'regs': {
-      'ext': {
-      }
-    },
-    'user': {
-      'ext': {
-      }
-    }
-  };
-
-  o.site['page'] = topLocation.href;
-  o.site['domain'] = topLocation.hostname;
-  o.site['search'] = topLocation.search;
-  o.site['domain'] = topLocation.hostname;
-  o.site['ref'] = topReferrer;
-  o.site['mobile'] = isMobile() ? 1 : 0;
-  const secure = topLocation.protocol.indexOf('https') === 0 ? 1 : 0;
-
-  o.device['dnt'] = getDoNotTrack() ? 1 : 0;
-
-  findAndFillParam(o.site, 'name', function() {
-    return global.top.document.title;
-  });
-
-  findAndFillParam(o.device, 'h', function() {
-    return global.screen.height;
-  });
-  findAndFillParam(o.device, 'w', function() {
-    return global.screen.width;
-  });
-
-  let placement = getVideoBidParam(bid, 'placement');
-
-  for (let j = 0; j < sizes.length; j++) {
-    o.imp.push({
-      'id': '' + j,
-      'displaymanager': '' + BIDDER_CODE,
-      'displaymanagerver': '' + ADAPTER_VERSION,
-      'tagId': placement,
-      'bidfloor': floor,
-      'bidfloorcur': 'USD',
-      'secure': secure,
-      'video': Object.assign({
-        'id': generateUUID(),
-        'pos': 0,
-        'w': firstSize.w,
-        'h': firstSize.h,
-        'mimes': DEFAULT_MIMES
-      }, video)
-
-    });
-  }
-  if (coppa) {
-    o.regs.ext = {'coppa': 1};
-  }
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    let { gdprApplies, consentString } = bidderRequest.gdprConsent;
-    o.regs.ext = {'gdpr': gdprApplies ? 1 : 0};
-    o.user.ext = {'consent': consentString};
-  }
-
-  return o;
-}
-
-function getTopWindowLocation(bidderRequest) {
-  return parseUrl(bidderRequest?.refererInfo?.page || '', { decodeSearchAsString: true });
-}
-
-function createBannerRequestData(bid, bidderRequest) {
-  let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer();
-
-  // if size is explicitly given via adapter params
-
-  let paramSize = getBannerBidParam(bid, 'size');
-  let sizes = [];
-  let coppa = config.getConfig('coppa');
-  if (typeof paramSize !== 'undefined' && paramSize != '') {
-    sizes = parseSizes(paramSize);
-  } else {
-    sizes = getBannerSizes(bid);
-  }
-
-  let floor = (getBannerBidFloor(bid) == null || typeof getBannerBidFloor(bid) == 'undefined') ? 0.1 : getBannerBidFloor(bid);
-  const o = {
-    'device': {
-      'langauge': (global.navigator.language).split('-')[0],
-      'dnt': (global.navigator.doNotTrack === 1 ? 1 : 0),
-      'devicetype': isMobile() ? 4 : isConnectedTV() ? 3 : 2,
-      'js': 1
-    },
-    'at': 2,
-    'site': {},
-    'tmax': 3000,
-    'cur': ['USD'],
-    'id': bid.bidId,
-    'imp': [],
-    'regs': {
-      'ext': {
-      }
-    },
-    'user': {
-      'ext': {
-      }
-    }
-  };
-
-  o.site['page'] = topLocation.href;
-  o.site['domain'] = topLocation.hostname;
-  o.site['search'] = topLocation.search;
-  o.site['domain'] = topLocation.hostname;
-  o.site['ref'] = topReferrer;
-  o.site['mobile'] = isMobile() ? 1 : 0;
-  const secure = topLocation.protocol.indexOf('https') === 0 ? 1 : 0;
-
-  o.device['dnt'] = getDoNotTrack() ? 1 : 0;
-
-  findAndFillParam(o.site, 'name', function() {
-    return global.top.document.title;
-  });
-
-  findAndFillParam(o.device, 'h', function() {
-    return global.screen.height;
-  });
-  findAndFillParam(o.device, 'w', function() {
-    return global.screen.width;
-  });
-
-  let placement = getBannerBidParam(bid, 'placement');
-  for (let j = 0; j < sizes.length; j++) {
-    let size = sizes[j];
-
-    o.imp.push({
-      'id': '' + j,
-      'displaymanager': '' + BIDDER_CODE,
-      'displaymanagerver': '' + ADAPTER_VERSION,
-      'tagId': placement,
-      'bidfloor': floor,
-      'bidfloorcur': 'USD',
-      'secure': secure,
-      'banner': {
-        'id': generateUUID(),
-        'pos': 0,
-        'w': size['w'],
-        'h': size['h']
-      }
-    });
-  }
-  if (coppa) {
-    o.regs.ext = {'coppa': 1};
-  }
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    let { gdprApplies, consentString } = bidderRequest.gdprConsent;
-    o.regs.ext = {'gdpr': gdprApplies ? 1 : 0};
-    o.user.ext = {'consent': consentString};
-  }
-
-  return o;
-}
+import { spec } from './advangelistsBidAdapter.js'; // eslint-disable-line prebid/validate-imports
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 registerBidder(spec);
diff --git a/modules/scaleableAnalyticsAdapter.js b/modules/scaleableAnalyticsAdapter.js
index 46f9d45d84d..054ccb7db55 100644
--- a/modules/scaleableAnalyticsAdapter.js
+++ b/modules/scaleableAnalyticsAdapter.js
@@ -1,7 +1,7 @@
 /* COPYRIGHT SCALEABLE LLC 2019 */
 
 import { ajax } from '../src/ajax.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { logMessage } from '../src/utils.js';
@@ -16,10 +16,10 @@ const entries = Object.entries || function(obj) {
   return resArray;
 };
 
-const BID_TIMEOUT = CONSTANTS.EVENTS.BID_TIMEOUT;
-const AUCTION_INIT = CONSTANTS.EVENTS.AUCTION_INIT;
-const BID_WON = CONSTANTS.EVENTS.BID_WON;
-const AUCTION_END = CONSTANTS.EVENTS.AUCTION_END;
+const BID_TIMEOUT = EVENTS.BID_TIMEOUT;
+const AUCTION_INIT = EVENTS.AUCTION_INIT;
+const BID_WON = EVENTS.BID_WON;
+const AUCTION_END = EVENTS.AUCTION_END;
 
 const URL = 'https://auction.scaleable.ai/';
 const ANALYTICS_TYPE = 'endpoint';
diff --git a/modules/seedingAllianceBidAdapter.js b/modules/seedingAllianceBidAdapter.js
index e287ea7ff78..e5fbebc8ffe 100755
--- a/modules/seedingAllianceBidAdapter.js
+++ b/modules/seedingAllianceBidAdapter.js
@@ -3,25 +3,44 @@
 
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
-import {_map, deepSetValue, isArray, isEmpty, replaceAuctionPrice} from '../src/utils.js';
+import {generateUUID, deepSetValue, isEmpty, replaceAuctionPrice} from '../src/utils.js';
 import {config} from '../src/config.js';
-import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
 
 const GVL_ID = 371;
 const BIDDER_CODE = 'seedingAlliance';
 const DEFAULT_CUR = 'EUR';
 const ENDPOINT_URL = 'https://b.nativendo.de/cds/rtb/bid?format=openrtb2.5&ssp=pb';
+const NATIVENDO_KEY = 'nativendo_id';
 
-const NATIVE_ASSET_IDS = { 0: 'title', 1: 'body', 2: 'sponsoredBy', 3: 'image', 4: 'cta', 5: 'icon' };
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
-const NATIVE_PARAMS = {
-  title: { id: 0, name: 'title' },
-  body: { id: 1, name: 'data', type: 2 },
-  sponsoredBy: { id: 2, name: 'data', type: 1 },
-  image: { id: 3, type: 3, name: 'img' },
-  cta: { id: 4, type: 12, name: 'data' },
-  icon: { id: 5, type: 1, name: 'img' }
-};
+const converter = ortbConverter({
+  context: {
+    ttl: 360,
+    netRevenue: true
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    // set basic page, this might be updated later by adunit param
+    deepSetValue(request, 'site.page', bidderRequest.refererInfo.page);
+    deepSetValue(request, 'regs.ext.pb_ver', '$prebid.version$');
+    deepSetValue(request, 'cur', [config.getConfig('currency') || DEFAULT_CUR]);
+
+    // As this is client side, we get needed info from headers
+    delete request.device;
+
+    return request;
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    // add tagid from params
+    imp.tagid = bidRequest.params.adUnitId;
+
+    return imp;
+  }
+});
 
 export const spec = {
   code: BIDDER_CODE,
@@ -33,109 +52,30 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let url = bidderRequest.refererInfo.page;
-
-    const imps = validBidRequests.map((bidRequest, id) => {
-      const imp = {
-        id: String(id + 1),
-        tagid: bidRequest.params.adUnitId
-      };
-
-      /**
-       * Native Ad
-       */
-      if (bidRequest.nativeParams) {
-        const assets = _map(bidRequest.nativeParams, (nativeAsset, key) => {
-          const props = NATIVE_PARAMS[key];
-
-          if (props) {
-            let wmin, hmin, w, h;
-            let aRatios = nativeAsset.aspect_ratios;
-
-            if (aRatios && aRatios[0]) {
-              aRatios = aRatios[0];
-              wmin = aRatios.min_width || 0;
-              hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
-            }
-
-            if (nativeAsset.sizes) {
-              const sizes = flatten(nativeAsset.sizes);
-              w = parseInt(sizes[0], 10);
-              h = parseInt(sizes[1], 10);
-            }
-
-            const asset = {
-              id: props.id,
-              required: nativeAsset.required & 1
-            };
-
-            asset[props.name] = {
-              len: nativeAsset.len,
-              type: props.type,
-              wmin,
-              hmin,
-              w,
-              h
-            };
-
-            return asset;
-          } else {
-            // TODO Filter impressions with required assets we don't support
-          }
-        }).filter(Boolean);
-
-        imp.native = {
-          request: {
-            assets
-          }
-        };
-      } else {
-        let sizes = transformSizes(bidRequest.sizes);
-
-        imp.banner = {
-          format: sizes,
-          w: sizes[0] ? sizes[0].w : 0,
-          h: sizes[0] ? sizes[0].h : 0
-        }
-      }
+    const oRtbRequest = converter.toORTB({bidRequests: validBidRequests, bidderRequest});
+    let eids = getEids(validBidRequests[0]);
 
+    // check for url in params and set in site object
+    validBidRequests.forEach(bidRequest => {
       if (bidRequest.params.url) {
-        url = bidRequest.params.url;
+        deepSetValue(oRtbRequest, 'site.page', bidRequest.params.url);
       }
-
-      return imp;
     });
 
-    const request = {
-      id: bidderRequest.bidderRequestId,
-      site: {
-        page: url
-      },
-      cur: [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR],
-      imp: imps,
-      tmax: bidderRequest.timeout,
-      regs: {
-        ext: {
-          gdpr: 0,
-          pb_ver: '$prebid.version$'
-        }
-      }
-    };
-
     if (bidderRequest.gdprConsent) {
-      request.user = {};
+      oRtbRequest.user = {};
 
-      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-      deepSetValue(request, 'regs.ext.gdpr', (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean' && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0);
+      deepSetValue(oRtbRequest, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(oRtbRequest, 'regs.ext.gdpr', (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean' && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0);
+      deepSetValue(oRtbRequest, 'user.ext.eids', eids);
     }
 
+    let endpoint = config.getConfig('seedingAlliance.endpoint') || ENDPOINT_URL;
+
     return {
       method: 'POST',
-      url: config.getConfig('seedingAlliance.endpoint') || ENDPOINT_URL,
-      data: JSON.stringify(request),
+      url: endpoint,
+      data: JSON.stringify(oRtbRequest),
       bidRequests: validBidRequests
     };
   },
@@ -148,14 +88,13 @@ export const spec = {
     const { seatbid, cur } = serverResponse.body;
 
     const bidResponses = (typeof seatbid != 'undefined') ? flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
-      result[bid.impid - 1] = bid;
+      result[bid.impid] = bid;
       return result;
     }, []) : [];
-
     return bidRequests
-      .map((bidRequest, id) => {
-        const bidResponse = bidResponses[id];
-
+      .map((bidRequest) => {
+        const bidId = bidRequest.bidId;
+        const bidResponse = bidResponses[bidId];
         const type = bidRequest.nativeParams ? NATIVE : BANNER;
 
         if (bidResponse) {
@@ -173,7 +112,7 @@ export const spec = {
           };
 
           if (type === NATIVE) {
-            bidObject.native = parseNative(bidResponse);
+            bidObject.native = parseNative(bidResponse, bidRequest.nativeParams);
             bidObject.mediaType = NATIVE;
           }
 
@@ -191,32 +130,62 @@ export const spec = {
   }
 };
 
-function transformSizes(requestSizes) {
-  if (!isArray(requestSizes)) {
-    return [];
+const getNativendoID = () => {
+  let nativendoID = storage.localStorageIsEnabled() &&
+      storage.getDataFromLocalStorage(NATIVENDO_KEY);
+
+  if (!nativendoID) {
+    if (storage.localStorageIsEnabled()) {
+      nativendoID = generateUUID();
+      storage.setDataInLocalStorage(NATIVENDO_KEY, nativendoID);
+    }
+  }
+
+  return nativendoID;
+}
+
+const getEids = (bidRequest) => {
+  const eids = [];
+  const nativendoID = getNativendoID();
+
+  if (nativendoID) {
+    const nativendoUserEid = {
+      source: 'nativendo.de',
+      uids: [
+        {
+          id: nativendoID,
+          atype: 1
+        }
+      ]
+    };
+
+    eids.push(nativendoUserEid);
   }
 
-  if (requestSizes.length === 2 && !isArray(requestSizes[0])) {
-    return [{
-      w: parseInt(requestSizes[0], 10),
-      h: parseInt(requestSizes[1], 10)
-    }];
-  } else if (isArray(requestSizes[0])) {
-    return requestSizes.map(item => ({
-      w: parseInt(item[0], 10),
-      h: parseInt(item[1], 10)
-    }));
+  if (bidRequest.userIdAsEids) {
+    eids.push(bidRequest.userIdAsEids);
   }
 
-  return [];
+  return eids;
 }
 
 function flatten(arr) {
   return [].concat(...arr);
 }
 
-function parseNative(bid) {
-  const { assets, link, imptrackers } = bid.adm.native;
+function parseNative(bid, nativeParams) {
+  let native;
+  if (typeof bid.adm === 'string') {
+    try {
+      native = JSON.parse(bid.adm).native;
+    } catch (e) {
+      return;
+    }
+  } else {
+    native = bid.adm.native;
+  }
+
+  const { assets, link, imptrackers } = native;
 
   let clickUrl = link.url.replace(/\$\{AUCTION_PRICE\}/g, bid.price);
 
@@ -239,13 +208,34 @@ function parseNative(bid) {
     impressionTrackers: imptrackers || undefined
   };
 
-  assets.forEach(asset => {
-    const kind = NATIVE_ASSET_IDS[asset.id];
-    const content = kind && asset[NATIVE_PARAMS[kind].name];
+  let nativeParamKeys = Object.keys(nativeParams);
+  let id = 0;
+
+  nativeParamKeys.forEach(nativeParam => {
+    assets.forEach(asset => {
+      if (asset.id == id) {
+        switch (nativeParam) {
+          case 'title':
+            result.title = asset.title.text;
+            break;
+          case 'body':
+          case 'cta':
+          case 'sponsoredBy':
+            result[nativeParam] = asset.data.value;
+            break;
+          case 'image':
+          case 'icon':
+            result[nativeParam] = {
+              url: asset.img.url,
+              width: asset.img.w,
+              height: asset.img.h
+            };
+            break;
+        }
+      }
+    });
 
-    if (content) {
-      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
-    }
+    id++;
   });
 
   return result;
diff --git a/modules/seedtagBidAdapter.js b/modules/seedtagBidAdapter.js
index 7ac7d048c50..ad579f1cdbf 100644
--- a/modules/seedtagBidAdapter.js
+++ b/modules/seedtagBidAdapter.js
@@ -1,18 +1,23 @@
-import { isArray, _map, triggerPixel } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { _map, isArray, triggerPixel } from '../src/utils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ * @typedef {import('../src/adapters/bidderFactory.js').bidderRequest} bidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').TimedOutBid} TimedOutBid
+ */
 
 const BIDDER_CODE = 'seedtag';
 const SEEDTAG_ALIAS = 'st';
 const SEEDTAG_SSP_ENDPOINT = 'https://s.seedtag.com/c/hb/bid';
 const SEEDTAG_SSP_ONTIMEOUT_ENDPOINT = 'https://s.seedtag.com/se/hb/timeout';
-const ALLOWED_DISPLAY_PLACEMENTS = [
-  'inScreen',
-  'inImage',
-  'inArticle',
-  'inBanner',
-];
 
 // Global Vendor List Id
 // https://iabeurope.eu/vendor-list-tcf-v2-0/
@@ -29,6 +34,22 @@ const deviceConnection = {
   UNKNOWN: 'unknown',
 };
 
+export const BIDFLOOR_CURRENCY = 'USD'
+
+function getBidFloor(bidRequest) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: BIDFLOOR_CURRENCY,
+      mediaType: '*',
+      size: '*'
+    });
+  }
+
+  return floorInfo?.floor;
+}
+
 const getConnectionType = () => {
   const connection =
     navigator.connection ||
@@ -68,8 +89,7 @@ function hasMandatoryDisplayParams(bid) {
   const p = bid.params;
   return (
     !!p.publisherId &&
-    !!p.adUnitId &&
-    ALLOWED_DISPLAY_PLACEMENTS.indexOf(p.placement) > -1
+    !!p.adUnitId
   );
 }
 
@@ -84,19 +104,7 @@ function hasMandatoryVideoParams(bid) {
     isArray(videoParams.playerSize) &&
     videoParams.playerSize.length > 0;
 
-  switch (bid.params.placement) {
-    // instream accept only video format
-    case 'inStream':
-      return isValid && videoParams.context === 'instream';
-    // outstream accept banner/native/video format
-    default:
-      return (
-        isValid &&
-        videoParams.context === 'outstream' &&
-        hasBannerMediaType(bid) &&
-        hasMandatoryDisplayParams(bid)
-      );
-  }
+  return isValid
 }
 
 function buildBidRequest(validBidRequest) {
@@ -107,22 +115,28 @@ function buildBidRequest(validBidRequest) {
       return mediaTypesMap[pbjsType];
     }
   );
-
   const bidRequest = {
     id: validBidRequest.bidId,
     transactionId: validBidRequest.ortb2Imp?.ext?.tid,
+    gpid: validBidRequest.ortb2Imp?.ext?.gpid,
     sizes: validBidRequest.sizes,
     supplyTypes: mediaTypes,
     adUnitId: params.adUnitId,
     adUnitCode: validBidRequest.adUnitCode,
+    geom: geom(validBidRequest.adUnitCode),
     placement: params.placement,
-    requestCount: validBidRequest.bidderRequestsCount || 1, // FIXME : in unit test the parameter bidderRequestsCount is undefined
+    requestCount: validBidRequest.bidderRequestsCount || 1, // FIXME : in unit test the parameter bidderRequestsCount is undefinedt
   };
 
   if (hasVideoMediaType(validBidRequest)) {
     bidRequest.videoParams = getVideoParams(validBidRequest);
   }
 
+  const bidFloor = getBidFloor(validBidRequest)
+  if (bidFloor) {
+    bidRequest.bidFloor = bidFloor;
+  }
+
   return bidRequest;
 }
 
@@ -139,6 +153,10 @@ function getVideoParams(validBidRequest) {
   return videoParams;
 }
 
+function isVideoOutstream(validBidRequest) {
+  return getVideoParams(validBidRequest).context === 'outstream';
+}
+
 function buildBidResponse(seedtagBid) {
   const mediaType = mapMediaType(seedtagBid.mediaType);
   const bid = {
@@ -198,6 +216,27 @@ function ttfb() {
   return ttfb >= 0 && ttfb <= performance.now() ? ttfb : 0;
 }
 
+function geom(adunitCode) {
+  const slot = document.getElementById(adunitCode);
+  if (slot) {
+    const scrollY = window.scrollY;
+    const { top, left, width, height } = slot.getBoundingClientRect();
+    const viewport = {
+      width: window.innerWidth,
+      height: window.innerHeight,
+    };
+
+    return {
+      scrollY,
+      top,
+      left,
+      width,
+      height,
+      viewport,
+    };
+  }
+}
+
 export function getTimeoutUrl(data) {
   let queryParams = '';
   if (
@@ -232,15 +271,26 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid(bid) {
-    return hasVideoMediaType(bid)
-      ? hasMandatoryVideoParams(bid)
-      : hasMandatoryDisplayParams(bid);
+    const hasVideo = hasVideoMediaType(bid);
+    const hasBanner = hasBannerMediaType(bid);
+
+    // when accept both mediatype but it must be outstream
+    if (hasVideo && hasBanner) {
+      return hasMandatoryVideoParams(bid) && isVideoOutstream(bid) && hasMandatoryDisplayParams(bid);
+    } else if (hasVideo) {
+      return hasMandatoryVideoParams(bid);
+    } else if (hasBanner) {
+      return hasMandatoryDisplayParams(bid);
+    } else {
+      return false;
+    }
   },
 
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
+   * @param {validBidRequests[]} validBidRequests an array of bids
+   * @param {bidderRequest} bidderRequest an array of bids
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests(validBidRequests, bidderRequest) {
@@ -254,6 +304,8 @@ export const spec = {
       auctionStart: bidderRequest.auctionStart || Date.now(),
       ttfb: ttfb(),
       bidRequests: _map(validBidRequests, buildBidRequest),
+      user: { topics: [], eids: [] },
+      site: {}
     };
 
     if (payload.cmp) {
@@ -286,7 +338,39 @@ export const spec = {
       }
     }
 
+    if (bidderRequest.ortb2?.user?.data) {
+      payload.user.topics = bidderRequest.ortb2.user.data
+    }
+    if (validBidRequests[0] && validBidRequests[0].userIdAsEids) {
+      payload.user.eids = validBidRequests[0].userIdAsEids
+    }
+
+    if (bidderRequest.ortb2?.bcat) {
+      payload.bcat = bidderRequest.ortb2?.bcat
+    }
+
+    if (bidderRequest.ortb2?.badv) {
+      payload.badv = bidderRequest.ortb2?.badv
+    }
+
+    if (bidderRequest.ortb2?.device?.sua) {
+      payload.sua = bidderRequest.ortb2.device.sua
+    }
+
+    if (bidderRequest.ortb2?.site?.cat) {
+      payload.site.cat = bidderRequest.ortb2.site.cat
+    }
+
+    if (bidderRequest.ortb2?.site?.cattax) {
+      payload.site.cattax = bidderRequest.ortb2.site.cattax
+    }
+
+    if (bidderRequest.ortb2?.site?.pagecat) {
+      payload.site.pagecat = bidderRequest.ortb2.site.pagecat
+    }
+
     const payloadString = JSON.stringify(payload);
+
     return {
       method: 'POST',
       url: SEEDTAG_SSP_ENDPOINT,
@@ -330,7 +414,7 @@ export const spec = {
 
   /**
    * Register bidder specific code, which will execute if bidder timed out after an auction
-   * @param {data} Containing timeout specific data
+   * @param {TimedOutBid} data Containing timeout specific data
    */
   onTimeout(data) {
     const url = getTimeoutUrl(data);
@@ -339,7 +423,7 @@ export const spec = {
 
   /**
    * Function to call when the adapter wins the auction
-   * @param {bid} Bid information received from the server
+   * @param {Bid} bid The bid information received from the server
    */
   onBidWon: function (bid) {
     if (bid && bid.nurl) {
diff --git a/modules/setupadBidAdapter.js b/modules/setupadBidAdapter.js
new file mode 100644
index 00000000000..4ee6dd7c085
--- /dev/null
+++ b/modules/setupadBidAdapter.js
@@ -0,0 +1,194 @@
+import {
+  _each,
+  isStr,
+  getBidIdParameter,
+  triggerPixel,
+  logWarn,
+  deepSetValue,
+} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
+
+const BIDDER_CODE = 'setupad';
+const ENDPOINT = 'https://prebid.setupad.io/openrtb2/auction';
+const SYNC_ENDPOINT = 'https://cookie.stpd.cloud/sync?';
+const REPORT_ENDPOINT = 'https://adapter-analytics.setupad.io/api/adapter-analytics?';
+const GVLID = 1241;
+const TIME_TO_LIVE = 360;
+export const biddersCreativeIds = {}; // export only for tests
+const NET_REVENUE = true;
+const TEST_REQUEST = 0; // used only for testing
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: NET_REVENUE,
+    ttl: TIME_TO_LIVE,
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    deepSetValue(
+      imp,
+      'ext.prebid.storedrequest.id',
+      getBidIdParameter('placement_id', bidRequest.params)
+    );
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    deepSetValue(request, 'test', TEST_REQUEST);
+    deepSetValue(
+      request,
+      'ext.prebid.storedrequest.id',
+      getBidIdParameter(
+        'account_id',
+        bidderRequest.bids.find((bid) => bid.hasOwnProperty('params')).params
+      )
+    );
+    deepSetValue(request, 'setupad', 'adapter');
+    return request;
+  },
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  gvlid: GVLID,
+
+  isBidRequestValid: function (bid) {
+    return !!(
+      bid.params.placement_id &&
+      isStr(bid.params.placement_id) &&
+      bid.params.account_id &&
+      isStr(bid.params.account_id)
+    );
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const data = converter.toORTB({ validBidRequests, bidderRequest });
+
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data,
+      options: {
+        contentType: 'text/plain',
+        withCredentials: true,
+      },
+    };
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    if (
+      !serverResponse ||
+      !serverResponse.body ||
+      typeof serverResponse.body != 'object' ||
+      Object.keys(serverResponse.body).length === 0
+    ) {
+      logWarn('no response or body is malformed');
+      return [];
+    }
+
+    // set a seat for creativeId for triggerPixel url
+    _each(serverResponse.body.seatbid, (res) => {
+      _each(res.bid, (bid) => {
+        biddersCreativeIds[bid.crid] = res.seat;
+      });
+    });
+
+    // used for a test case "should update biddersCreativeIds correctly" to return early and not throw ORTB error
+    if (serverResponse.testCase === 1) return;
+
+    const bids = converter.fromORTB({
+      response: serverResponse.body,
+      request: bidRequest.data,
+    }).bids;
+
+    return bids;
+  },
+
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+    if (!responses?.length) return [];
+
+    const syncs = [];
+    const bidders = getBidders(responses);
+
+    if (syncOptions.iframeEnabled && bidders) {
+      const queryParams = [];
+
+      queryParams.push(`bidders=${bidders}`);
+      queryParams.push('gdpr=' + +gdprConsent.gdprApplies);
+      queryParams.push('gdpr_consent=' + gdprConsent.consentString);
+      queryParams.push('usp_consent=' + (uspConsent || ''));
+
+      const strQueryParams = queryParams.join('&');
+
+      syncs.push({
+        type: 'iframe',
+        url: SYNC_ENDPOINT + strQueryParams + '&type=iframe',
+      });
+
+      return syncs;
+    }
+
+    return [];
+  },
+
+  onBidWon: function (bid) {
+    let bidder = bid.bidder || bid.bidderCode;
+    const auctionId = bid.auctionId;
+    if (bidder !== BIDDER_CODE) return;
+
+    let params;
+    if (bid.params) {
+      params = Array.isArray(bid.params) ? bid.params : [bid.params];
+    } else {
+      if (Array.isArray(bid.bids)) {
+        params = bid.bids.map((singleBid) => singleBid.params);
+      }
+    }
+
+    if (!params?.length) return;
+
+    const placementIdsArray = [];
+    params.forEach((param) => {
+      if (!param.placement_id) return;
+      placementIdsArray.push(param.placement_id);
+    });
+
+    const placementIds = (placementIdsArray.length && placementIdsArray.join(';')) || '';
+
+    if (!placementIds) return;
+
+    // find the winning bidder by using creativeId as identification
+    if (biddersCreativeIds.hasOwnProperty(bid.creativeId) && biddersCreativeIds[bid.creativeId]) {
+      bidder = biddersCreativeIds[bid.creativeId];
+    }
+
+    const queryParams = [];
+    queryParams.push(`event=bidWon`);
+    queryParams.push('bidder=' + bidder);
+    queryParams.push('placementIds=' + placementIds);
+    queryParams.push('auctionId=' + auctionId);
+    queryParams.push('cpm=' + bid.originalCpm);
+    queryParams.push('currency=' + bid.originalCurrency);
+    queryParams.push('timestamp=' + Date.now());
+
+    const strQueryParams = queryParams.join('&');
+
+    const url = REPORT_ENDPOINT + strQueryParams;
+    triggerPixel(url);
+  },
+};
+
+function getBidders(serverResponse) {
+  const bidders = serverResponse
+    .map((res) => Object.keys(res.body.ext.responsetimemillis || []))
+    .flat(1);
+
+  if (bidders.length) {
+    return encodeURIComponent(JSON.stringify([...new Set(bidders)]));
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/setupadBidAdapter.md b/modules/setupadBidAdapter.md
new file mode 100644
index 00000000000..c11e8eb4bae
--- /dev/null
+++ b/modules/setupadBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```text
+Module Name: Setupad Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: it@setupad.com
+```
+
+# Description
+
+Module that connects to Setupad's demand sources.
+
+# Test Parameters
+
+```js
+const adUnits = [
+  {
+    code: 'test-div',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      },
+    },
+    bids: [
+      {
+        bidder: 'setupad',
+        params: {
+          placement_id: '123', //required
+          account_id: '123', //required
+        },
+      },
+    ],
+  },
+];
+```
diff --git a/modules/sharedIdSystem.js b/modules/sharedIdSystem.js
index 9046d6a633d..fa8b5e3bfdb 100644
--- a/modules/sharedIdSystem.js
+++ b/modules/sharedIdSystem.js
@@ -13,6 +13,14 @@ import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 import {domainOverrideToRootDomain} from '../libraries/domainOverrideToRootDomain/index.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').SubmoduleParams} SubmoduleParams
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleName: 'sharedId'});
 const COOKIE = 'cookie';
 const LOCAL_STORAGE = 'html5';
diff --git a/modules/sharethroughAnalyticsAdapter.md b/modules/sharethroughAnalyticsAdapter.md
new file mode 100644
index 00000000000..4acf8eacfd0
--- /dev/null
+++ b/modules/sharethroughAnalyticsAdapter.md
@@ -0,0 +1,41 @@
+# Overview
+
+```txt
+Module Name: Sharethrough Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer:  pubgrowth.engineering@sharethrough.com
+```
+
+#### About
+
+This analytics adapter collects data about win/loss events (beacon firings) from each auction run on your site. This data is communicated to Sharethrough via API calls the analytics adapter makes to an endpoint dedicated to the collection of beacon information. Sharethrough uses this information to improve its services as a SSP.
+
+This analytics adapter is free to use.
+
+#### Configuration
+
+In order to guarantee consistent reporting events, we recommend
+including the GPT Pre-Auction Module, `gptPreAuction`. This module is included
+by default when Prebid is downloaded.
+
+If you are compiling from source, this might look something like:
+
+```sh
+gulp bundle --modules=gptPreAuction,sharethroughBidAdapter,sharethroughAnalyticsAdapter
+```
+
+Please note that the above snippet is a "bare bones" example - you will likely want to include other modules as well. A more realistic example might look something like the example below (with other bid adapters also included in the list as needed):
+
+```sh
+gulp bundle --modules=gptPreAuction,consentManagement,consentManagementGpp,consentManagementUsp,enrichmentFpdModule,gdprEnforcement,sharethroughBidAdapter,sharethroughAnalyticsAdapter
+```
+
+Enable the Sharethrough Analytics Adapter in Prebid.js using the analytics provider `sharethrough` as seen in the example below.
+
+#### Example Configuration
+
+```js
+pbjs.enableAnalytics({
+  provider: 'sharethrough',
+});
+```
diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js
index a8beb018b73..7144370dc9c 100644
--- a/modules/sharethroughBidAdapter.js
+++ b/modules/sharethroughBidAdapter.js
@@ -1,13 +1,14 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { deepAccess, generateUUID, inIframe } from '../src/utils.js';
+import { deepAccess, generateUUID, inIframe, isPlainObject, logWarn, mergeDeep } from '../src/utils.js';
 
 const VERSION = '4.3.0';
 const BIDDER_CODE = 'sharethrough';
 const SUPPLY_ID = 'WYu2BXv1';
 
 const STR_ENDPOINT = `https://btlr.sharethrough.com/universal/v1?supply_id=${SUPPLY_ID}`;
+const IDENTIFIER_PREFIX = 'Sharethrough:';
 
 // this allows stubbing of utility function that is used internally by the sharethrough adapter
 export const sharethroughInternal = {
@@ -18,7 +19,7 @@ export const sharethroughAdapterSpec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [VIDEO, BANNER],
   gvlid: 80,
-  isBidRequestValid: (bid) => !!bid.params.pkey && bid.bidder === BIDDER_CODE,
+  isBidRequestValid: (bid) => !!bid.params.pkey,
 
   buildRequests: (bidRequests, bidderRequest) => {
     const timeout = bidderRequest.timeout;
@@ -45,6 +46,7 @@ export const sharethroughAdapterSpec = {
         dnt: navigator.doNotTrack === '1' ? 1 : 0,
         h: window.screen.height,
         w: window.screen.width,
+        ext: {},
       },
       regs: {
         coppa: config.getConfig('coppa') === true ? 1 : 0,
@@ -63,6 +65,15 @@ export const sharethroughAdapterSpec = {
       test: 0,
     };
 
+    if (bidderRequest.ortb2?.device?.ext?.cdep) {
+      req.device.ext['cdep'] = bidderRequest.ortb2.device.ext.cdep;
+    }
+
+    // if present, merge device object from ortb2 into `req.device`
+    if (bidderRequest?.ortb2?.device) {
+      mergeDeep(req.device, bidderRequest.ortb2.device);
+    }
+
     req.user = nullish(firstPartyData.user, {});
     if (!req.user.ext) req.user.ext = {};
     req.user.ext.eids = bidRequests[0].userIdAsEids || [];
@@ -87,6 +98,10 @@ export const sharethroughAdapterSpec = {
       req.regs.ext.gpp_sid = bidderRequest.ortb2.regs.gpp_sid;
     }
 
+    if (bidderRequest?.ortb2?.regs?.ext?.dsa) {
+      req.regs.ext.dsa = bidderRequest.ortb2.regs.ext.dsa;
+    }
+
     const imps = bidRequests
       .map((bidReq) => {
         const impression = { ext: {} };
@@ -94,11 +109,15 @@ export const sharethroughAdapterSpec = {
         // mergeDeep(impression, bidReq.ortb2Imp); // leaving this out for now as we may want to leave stuff out on purpose
         const tid = deepAccess(bidReq, 'ortb2Imp.ext.tid');
         if (tid) impression.ext.tid = tid;
-        const gpid = deepAccess(bidReq, 'ortb2Imp.ext.gpid', deepAccess(bidReq, 'ortb2Imp.ext.data.pbadslot'));
+        const gpid = deepAccess(bidReq, 'ortb2Imp.ext.gpid') || deepAccess(bidReq, 'ortb2Imp.ext.data.pbadslot');
         if (gpid) impression.ext.gpid = gpid;
 
         const videoRequest = deepAccess(bidReq, 'mediaTypes.video');
 
+        if (bidderRequest.paapi?.enabled && bidReq.mediaTypes.banner) {
+          mergeDeep(impression, { ext: { ae: 1 } }); // ae = auction environment; if this is 1, ad server knows we have a fledge auction
+        }
+
         if (videoRequest) {
           // default playerSize, only change this if we know width and height are properly defined in the request
           let [w, h] = [640, 360];
@@ -111,34 +130,48 @@ export const sharethroughAdapterSpec = {
             [w, h] = videoRequest.playerSize[0];
           }
 
+          /**
+           * Applies a specified property to an impression object if it is present in the video request
+           * @param {string} prop A property to apply to the impression object
+           * @param {object} vidReq A video request object from which to extract the property
+           * @param {object} imp A video impression object to which to apply the property
+           */
+          const applyVideoProperty = (prop, vidReq, imp) => {
+            const propIsTypeArray = ['api', 'battr', 'mimes', 'playbackmethod', 'protocols'].includes(prop);
+            if (propIsTypeArray) {
+              const notAssignable = (!Array.isArray(vidReq[prop]) || vidReq[prop].length === 0) && vidReq[prop];
+              if (notAssignable) {
+                logWarn(`${IDENTIFIER_PREFIX} Invalid video request property: "${prop}" must be an array with at least 1 entry.  Value supplied: "${vidReq[prop]}".  This will not be added to the bid request.`);
+                return;
+              }
+            }
+            if (vidReq[prop]) {
+              imp.video[prop] = vidReq[prop];
+            }
+          };
+
           impression.video = {
             pos: nullish(videoRequest.pos, 0),
             topframe: inIframe() ? 0 : 1,
-            skip: nullish(videoRequest.skip, 0),
-            linearity: nullish(videoRequest.linearity, 1),
-            minduration: nullish(videoRequest.minduration, 5),
-            maxduration: nullish(videoRequest.maxduration, 60),
-            playbackmethod: videoRequest.playbackmethod || [2],
-            api: getVideoApi(videoRequest),
-            mimes: videoRequest.mimes || ['video/mp4'],
-            protocols: getVideoProtocols(videoRequest),
             w,
             h,
-            startdelay: nullish(videoRequest.startdelay, 0),
-            skipmin: nullish(videoRequest.skipmin, 0),
-            skipafter: nullish(videoRequest.skipafter, 0),
-            placement: videoRequest.context === 'instream' ? 1 : +deepAccess(videoRequest, 'placement', 4),
           };
 
-          if (videoRequest.delivery) impression.video.delivery = videoRequest.delivery;
-          if (videoRequest.companiontype) impression.video.companiontype = videoRequest.companiontype;
-          if (videoRequest.companionad) impression.video.companionad = videoRequest.companionad;
+          const propertiesToConsider = [
+            'api', 'battr', 'companionad', 'companiontype', 'delivery', 'linearity', 'maxduration', 'mimes', 'minduration', 'placement', 'playbackmethod', 'plcmt', 'protocols', 'skip', 'skipafter', 'skipmin', 'startdelay'
+          ]
+
+          propertiesToConsider.forEach(propertyToConsider => {
+            applyVideoProperty(propertyToConsider, videoRequest, impression);
+          });
         } else {
           impression.banner = {
             pos: deepAccess(bidReq, 'mediaTypes.banner.pos', 0),
             topframe: inIframe() ? 0 : 1,
             format: bidReq.sizes.map((size) => ({ w: +size[0], h: +size[1] })),
           };
+          const battr = deepAccess(bidReq, 'mediaTypes.banner.battr', null) || deepAccess(bidReq, 'ortb2Imp.banner.battr')
+          if (battr) impression.banner.battr = battr
         }
 
         return {
@@ -174,7 +207,9 @@ export const sharethroughAdapterSpec = {
       return [];
     }
 
-    return body.seatbid[0].bid.map((bid) => {
+    const fledgeAuctionEnabled = body.ext?.auctionConfigs;
+
+    const bidsFromExchange = body.seatbid[0].bid.map((bid) => {
       // Spec: https://docs.prebid.org/dev-docs/bidder-adaptor.html#interpreting-the-response
       const response = {
         requestId: bid.impid,
@@ -214,28 +249,22 @@ export const sharethroughAdapterSpec = {
 
       return response;
     });
+
+    if (fledgeAuctionEnabled) {
+      return {
+        bids: bidsFromExchange,
+        paapi: body.ext?.auctionConfigs || {},
+      };
+    } else {
+      return bidsFromExchange;
+    }
   },
 
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, gppConsent) => {
+  getUserSyncs: (syncOptions, serverResponses) => {
     const shouldCookieSync =
       syncOptions.pixelEnabled && deepAccess(serverResponses, '0.body.cookieSyncUrls') !== undefined;
 
-    let syncurl = '';
-
-    // Attaching GDPR Consent Params in UserSync url
-    if (gdprConsent) {
-      syncurl += '&gdpr=' + (gdprConsent.gdprApplies ? 1 : 0);
-      syncurl += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
-    }
-    if (gppConsent) {
-      syncurl += '&gpp=' + encodeURIComponent(gppConsent?.gppString);
-      syncurl += '&gpp_sid=' + encodeURIComponent(gppConsent?.applicableSections?.join(','));
-    }
-
-    return shouldCookieSync ? serverResponses[0].body.cookieSyncUrls.map((url) => (
-      { type: 'image',
-        url: url + syncurl
-      })) : [];
+    return shouldCookieSync ? serverResponses[0].body.cookieSyncUrls.map((url) => ({ type: 'image', url: url })) : [];
   },
 
   // Empty implementation for prebid core to be able to find it
@@ -248,24 +277,6 @@ export const sharethroughAdapterSpec = {
   onSetTargeting: (bid) => {},
 };
 
-function getVideoApi({ api }) {
-  let defaultValue = [2];
-  if (api && Array.isArray(api) && api.length > 0) {
-    return api;
-  } else {
-    return defaultValue;
-  }
-}
-
-function getVideoProtocols({ protocols }) {
-  let defaultValue = [2, 3, 5, 6, 7, 8];
-  if (protocols && Array.isArray(protocols) && protocols.length > 0) {
-    return protocols;
-  } else {
-    return defaultValue;
-  }
-}
-
 function getBidRequestFloor(bid) {
   let floor = null;
   if (typeof bid.getFloor === 'function') {
@@ -274,7 +285,7 @@ function getBidRequestFloor(bid) {
       mediaType: bid.mediaTypes && bid.mediaTypes.video ? 'video' : 'banner',
       size: bid.sizes.map((size) => ({ w: size[0], h: size[1] })),
     });
-    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+    if (isPlainObject(floorInfo) && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
       floor = parseFloat(floorInfo.floor);
     }
   }
diff --git a/modules/shinezBidAdapter.js b/modules/shinezBidAdapter.js
index 47fca317de2..89f39284bed 100644
--- a/modules/shinezBidAdapter.js
+++ b/modules/shinezBidAdapter.js
@@ -2,33 +2,28 @@ import {
   logWarn,
   logInfo,
   isArray,
-  isFn,
   deepAccess,
-  isEmpty,
-  contains,
-  timestamp,
   triggerPixel,
-  isInteger,
-  getBidIdParameter
 } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  getEndpoint,
+  generateBidsParams,
+  generateGeneralParams,
+  buildBidResponse,
+} from '../libraries/riseUtils/index.js';
 
 const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
 const BIDDER_CODE = 'shinez';
 const ADAPTER_VERSION = '1.0.0';
 const TTL = 360;
 const CURRENCY = 'USD';
-const SELLER_ENDPOINT = 'https://hb.sweetgum.io/';
+const BASE_URL = 'https://hb.sweetgum.io/';
 const MODES = {
   PRODUCTION: 'hb-sz-multi',
   TEST: 'hb-multi-sz-test'
-}
-const SUPPORTED_SYNC_METHODS = {
-  IFRAME: 'iframe',
-  PIXEL: 'pixel'
-}
+};
 
 export const spec = {
   code: BIDDER_CODE,
@@ -59,7 +54,7 @@ export const spec = {
 
     return {
       method: 'POST',
-      url: getEndpoint(testMode),
+      url: getEndpoint(testMode, BASE_URL, MODES),
       data: combinedRequestsObject
     }
   },
@@ -68,32 +63,7 @@ export const spec = {
 
     if (body.bids) {
       body.bids.forEach(adUnit => {
-        const bidResponse = {
-          requestId: adUnit.requestId,
-          cpm: adUnit.cpm,
-          currency: adUnit.currency || CURRENCY,
-          width: adUnit.width,
-          height: adUnit.height,
-          ttl: adUnit.ttl || TTL,
-          creativeId: adUnit.requestId,
-          netRevenue: adUnit.netRevenue || true,
-          nurl: adUnit.nurl,
-          mediaType: adUnit.mediaType,
-          meta: {
-            mediaType: adUnit.mediaType
-          }
-        };
-
-        if (adUnit.mediaType === VIDEO) {
-          bidResponse.vastXml = adUnit.vastXml;
-        } else if (adUnit.mediaType === BANNER) {
-          bidResponse.ad = adUnit.ad;
-        }
-
-        if (adUnit.adomain && adUnit.adomain.length) {
-          bidResponse.meta.advertiserDomains = adUnit.adomain;
-        }
-
+        const bidResponse = buildBidResponse(adUnit, CURRENCY, TTL, VIDEO, BANNER);
         bidResponses.push(bidResponse);
       });
     }
@@ -103,20 +73,20 @@ export const spec = {
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
     for (const response of serverResponses) {
-      if (syncOptions.iframeEnabled && response.body.params.userSyncURL) {
+      if (syncOptions.iframeEnabled && deepAccess(response, 'body.params.userSyncURL')) {
         syncs.push({
           type: 'iframe',
-          url: response.body.params.userSyncURL
+          url: deepAccess(response, 'body.params.userSyncURL')
         });
       }
-      if (syncOptions.pixelEnabled && isArray(response.body.params.userSyncPixels)) {
+      if (syncOptions.pixelEnabled && isArray(deepAccess(response, 'body.params.userSyncPixels'))) {
         const pixels = response.body.params.userSyncPixels.map(pixel => {
           return {
             type: 'image',
             url: pixel
           }
-        })
-        syncs.push(...pixels)
+        });
+        syncs.push(...pixels);
       }
     }
     return syncs;
@@ -134,314 +104,3 @@ export const spec = {
 };
 
 registerBidder(spec);
-
-/**
- * Get floor price
- * @param bid {bid}
- * @returns {Number}
- */
-function getFloor(bid, mediaType) {
-  if (!isFn(bid.getFloor)) {
-    return 0;
-  }
-  let floorResult = bid.getFloor({
-    currency: CURRENCY,
-    mediaType: mediaType,
-    size: '*'
-  });
-  return floorResult.currency === CURRENCY && floorResult.floor ? floorResult.floor : 0;
-}
-
-/**
- * Get the the ad sizes array from the bid
- * @param bid {bid}
- * @returns {Array}
- */
-function getSizesArray(bid, mediaType) {
-  let sizesArray = []
-
-  if (deepAccess(bid, `mediaTypes.${mediaType}.sizes`)) {
-    sizesArray = bid.mediaTypes[mediaType].sizes;
-  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
-    sizesArray = bid.sizes;
-  }
-
-  return sizesArray;
-}
-
-/**
- * Get schain string value
- * @param schainObject {Object}
- * @returns {string}
- */
-function getSupplyChain(schainObject) {
-  if (isEmpty(schainObject)) {
-    return '';
-  }
-  let scStr = `${schainObject.ver},${schainObject.complete}`;
-  schainObject.nodes.forEach((node) => {
-    scStr += '!';
-    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
-    scStr += `${node.hp ? encodeURIComponent(node.hp) : ''},`;
-    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
-  });
-  return scStr;
-}
-
-/**
- * Get encoded node value
- * @param val {string}
- * @returns {string}
- */
-function getEncodedValIfNotEmpty(val) {
-  return !isEmpty(val) ? encodeURIComponent(val) : '';
-}
-
-/**
- * Get preferred user-sync method based on publisher configuration
- * @param bidderCode {string}
- * @returns {string}
- */
-function getAllowedSyncMethod(filterSettings, bidderCode) {
-  const iframeConfigsToCheck = ['all', 'iframe'];
-  const pixelConfigToCheck = 'image';
-  if (filterSettings && iframeConfigsToCheck.some(config => isSyncMethodAllowed(filterSettings[config], bidderCode))) {
-    return SUPPORTED_SYNC_METHODS.IFRAME;
-  }
-  if (!filterSettings || !filterSettings[pixelConfigToCheck] || isSyncMethodAllowed(filterSettings[pixelConfigToCheck], bidderCode)) {
-    return SUPPORTED_SYNC_METHODS.PIXEL;
-  }
-}
-
-/**
- * Check if sync rule is supported
- * @param syncRule {Object}
- * @param bidderCode {string}
- * @returns {boolean}
- */
-function isSyncMethodAllowed(syncRule, bidderCode) {
-  if (!syncRule) {
-    return false;
-  }
-  const isInclude = syncRule.filter === 'include';
-  const bidders = isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
-  return isInclude && contains(bidders, bidderCode);
-}
-
-/**
- * Get the seller endpoint
- * @param testMode {boolean}
- * @returns {string}
- */
-function getEndpoint(testMode) {
-  return testMode
-    ? SELLER_ENDPOINT + MODES.TEST
-    : SELLER_ENDPOINT + MODES.PRODUCTION;
-}
-
-/**
- * get device type
- * @param uad {ua}
- * @returns {string}
- */
-function getDeviceType(ua) {
-  if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i
-    .test(ua.toLowerCase())) {
-    return '5';
-  }
-  if (/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i
-    .test(ua.toLowerCase())) {
-    return '4';
-  }
-  if (/smart[-_\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b/i
-    .test(ua.toLowerCase())) {
-    return '3';
-  }
-  return '1';
-}
-
-function generateBidsParams(validBidRequests, bidderRequest) {
-  const bidsArray = [];
-
-  if (validBidRequests.length) {
-    validBidRequests.forEach(bid => {
-      bidsArray.push(generateBidParameters(bid, bidderRequest));
-    });
-  }
-
-  return bidsArray;
-}
-
-/**
- * Generate bid specific parameters
- * @param {bid} bid
- * @param {bidderRequest} bidderRequest
- * @returns {Object} bid specific params object
- */
-function generateBidParameters(bid, bidderRequest) {
-  const {params} = bid;
-  const mediaType = isBanner(bid) ? BANNER : VIDEO;
-  const sizesArray = getSizesArray(bid, mediaType);
-
-  // fix floor price in case of NAN
-  if (isNaN(params.floorPrice)) {
-    params.floorPrice = 0;
-  }
-
-  const bidObject = {
-    mediaType,
-    adUnitCode: getBidIdParameter('adUnitCode', bid),
-    sizes: sizesArray,
-    floorPrice: Math.max(getFloor(bid, mediaType), params.floorPrice),
-    bidId: getBidIdParameter('bidId', bid),
-    bidderRequestId: getBidIdParameter('bidderRequestId', bid),
-    transactionId: bid.ortb2Imp?.ext?.tid || '',
-  };
-
-  const pos = deepAccess(bid, `mediaTypes.${mediaType}.pos`);
-  if (pos) {
-    bidObject.pos = pos;
-  }
-
-  const gpid = deepAccess(bid, `ortb2Imp.ext.gpid`);
-  if (gpid) {
-    bidObject.gpid = gpid;
-  }
-
-  const placementId = params.placementId || deepAccess(bid, `mediaTypes.${mediaType}.name`);
-  if (placementId) {
-    bidObject.placementId = placementId;
-  }
-
-  if (mediaType === VIDEO) {
-    const playbackMethod = deepAccess(bid, `mediaTypes.video.playbackmethod`);
-    let playbackMethodValue;
-
-    // verify playbackMethod is of type integer array, or integer only.
-    if (Array.isArray(playbackMethod) && isInteger(playbackMethod[0])) {
-      // only the first playbackMethod in the array will be used, according to OpenRTB 2.5 recommendation
-      playbackMethodValue = playbackMethod[0];
-    } else if (isInteger(playbackMethod)) {
-      playbackMethodValue = playbackMethod;
-    }
-
-    if (playbackMethodValue) {
-      bidObject.playbackMethod = playbackMethodValue;
-    }
-
-    const placement = deepAccess(bid, `mediaTypes.video.placement`);
-    if (placement) {
-      bidObject.placement = placement;
-    }
-
-    const minDuration = deepAccess(bid, `mediaTypes.video.minduration`);
-    if (minDuration) {
-      bidObject.minDuration = minDuration;
-    }
-
-    const maxDuration = deepAccess(bid, `mediaTypes.video.maxduration`);
-    if (maxDuration) {
-      bidObject.maxDuration = maxDuration;
-    }
-
-    const skip = deepAccess(bid, `mediaTypes.video.skip`);
-    if (skip) {
-      bidObject.skip = skip;
-    }
-
-    const linearity = deepAccess(bid, `mediaTypes.video.linearity`);
-    if (linearity) {
-      bidObject.linearity = linearity;
-    }
-  }
-
-  return bidObject;
-}
-
-function isBanner(bid) {
-  return bid.mediaTypes && bid.mediaTypes.banner;
-}
-
-/**
- * Generate params that are common between all bids
- * @param {single bid object} generalObject
- * @param {bidderRequest} bidderRequest
- * @returns {object} the common params object
- */
-function generateGeneralParams(generalObject, bidderRequest) {
-  const domain = window.location.hostname;
-  const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
-  const {bidderCode} = bidderRequest;
-  const generalBidParams = generalObject.params;
-  const timeout = bidderRequest.timeout;
-
-  // these params are snake_case instead of camelCase to allow backwards compatability on the server.
-  // in the future, these will be converted to camelCase to match our convention.
-  const generalParams = {
-    wrapper_type: 'prebidjs',
-    wrapper_vendor: '$$PREBID_GLOBAL$$',
-    wrapper_version: '$prebid.version$',
-    adapter_version: ADAPTER_VERSION,
-    auction_start: timestamp(),
-    publisher_id: generalBidParams.org,
-    publisher_name: domain,
-    site_domain: domain,
-    dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
-    device_type: getDeviceType(navigator.userAgent),
-    ua: navigator.userAgent,
-    session_id: getBidIdParameter('auctionId', generalObject),
-    tmax: timeout
-  };
-
-  const userIdsParam = getBidIdParameter('userId', generalObject);
-  if (userIdsParam) {
-    generalParams.userIds = JSON.stringify(userIdsParam);
-  }
-
-  const ortb2Metadata = bidderRequest.ortb2 || {};
-  if (ortb2Metadata.site) {
-    generalParams.site_metadata = JSON.stringify(ortb2Metadata.site);
-  }
-  if (ortb2Metadata.user) {
-    generalParams.user_metadata = JSON.stringify(ortb2Metadata.user);
-  }
-
-  if (syncEnabled) {
-    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
-    if (allowedSyncMethod) {
-      generalParams.cs_method = allowedSyncMethod;
-    }
-  }
-
-  if (bidderRequest.uspConsent) {
-    generalParams.us_privacy = bidderRequest.uspConsent;
-  }
-
-  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
-    generalParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
-    generalParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
-  }
-
-  if (generalBidParams.ifa) {
-    generalParams.ifa = generalBidParams.ifa;
-  }
-
-  if (generalObject.schain) {
-    generalParams.schain = getSupplyChain(generalObject.schain);
-  }
-
-  if (bidderRequest.ortb2 && bidderRequest.ortb2.site) {
-    generalParams.referrer = bidderRequest.ortb2.site.ref;
-    generalParams.page_url = bidderRequest.ortb2.site.page;
-  }
-
-  if (bidderRequest && bidderRequest.refererInfo) {
-    generalParams.referrer = generalParams.referrer || deepAccess(bidderRequest, 'refererInfo.referer');
-    generalParams.page_url = generalParams.page_url || config.getConfig('pageUrl') || deepAccess(window, 'location.href');
-  }
-
-  return generalParams;
-}
diff --git a/modules/shinezRtbBidAdapter.js b/modules/shinezRtbBidAdapter.js
new file mode 100644
index 00000000000..f2034bd1992
--- /dev/null
+++ b/modules/shinezRtbBidAdapter.js
@@ -0,0 +1,38 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {
+  isBidRequestValid,
+  createBuildRequestsFn,
+  createInterpretResponseFn, createUserSyncGetter
+} from '../libraries/vidazooUtils/bidderUtils.js';
+
+const DEFAULT_SUB_DOMAIN = 'exchange';
+const BIDDER_CODE = 'shinezRtb';
+const BIDDER_VERSION = '1.0.0';
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
+  return `https://${subDomain}.sweetgum.io`;
+}
+
+const buildRequests = createBuildRequestsFn(createDomain, null, storage, BIDDER_CODE, BIDDER_VERSION, false);
+
+const interpretResponse = createInterpretResponseFn(BIDDER_CODE, false);
+
+const getUserSyncs = createUserSyncGetter({
+  iframeSyncUrl: 'https://sync.sweetgum.io/api/sync/iframe',
+  imageSyncUrl: 'https://sync.sweetgum.io/api/sync/image',
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs
+};
+
+registerBidder(spec);
diff --git a/modules/shinezRtbBidAdapter.md b/modules/shinezRtbBidAdapter.md
new file mode 100644
index 00000000000..e9190c2a9c4
--- /dev/null
+++ b/modules/shinezRtbBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+**Module Name:** Shinez RTB Bid Adapter
+
+**Module Type:** Bidder Adapter
+
+**Maintainer:** tech-team@shinez.io
+
+# Description
+
+Module that connects to Shinez RTB demand sources.
+
+# Test Parameters
+```js
+var adUnits = [
+  {
+    code: 'test-ad',
+    sizes: [[300, 250]],
+    bids: [
+      {
+        bidder: 'shinezRtb',
+        params: {
+          cId: '562524b21b1c1f08117fc7f9',
+          pId: '59ac17c192832d0011283fe3',
+          bidFloor: 0.0001,
+          ext: {
+            param1: 'loremipsum',
+            param2: 'dolorsitamet'
+          }
+        }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/showheroes-bsBidAdapter.js b/modules/showheroes-bsBidAdapter.js
index a1e7df49d18..afac0a88567 100644
--- a/modules/showheroes-bsBidAdapter.js
+++ b/modules/showheroes-bsBidAdapter.js
@@ -1,190 +1,114 @@
 import {
   deepAccess,
-  getWindowTop,
+  deepSetValue,
   triggerPixel,
-  logInfo,
-  logError, getBidIdParameter
+  isFn,
+  logInfo
 } from '../src/utils.js';
-import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { VIDEO, BANNER } from '../src/mediaTypes.js';
-import { loadExternalScript } from '../src/adloader.js';
+import { VIDEO } from '../src/mediaTypes.js';
 
-const PROD_ENDPOINT = 'https://bs.showheroes.com/api/v1/bid';
-const STAGE_ENDPOINT = 'https://bid-service.stage.showheroes.com/api/v1/bid';
-const VIRALIZE_ENDPOINT = 'https://ads.viralize.tv/prebid-sh/';
-const PROD_PUBLISHER_TAG = 'https://static.showheroes.com/publishertag.js';
-const STAGE_PUBLISHER_TAG = 'https://pubtag.stage.showheroes.com/publishertag.js';
-const PROD_VL = 'https://video-library.showheroes.com';
-const STAGE_VL = 'https://video-library.stage.showheroes.com';
+const ENDPOINT = 'https://ads.viralize.tv/openrtb2/auction/';
 const BIDDER_CODE = 'showheroes-bs';
 const TTL = 300;
 
-function getEnvURLs(isStage) {
-  return {
-    pubTag: isStage ? STAGE_PUBLISHER_TAG : PROD_PUBLISHER_TAG,
-    vlHost: isStage ? STAGE_VL : PROD_VL
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['showheroesBs'],
-  supportedMediaTypes: [VIDEO, BANNER],
-  isBidRequestValid: function(bid) {
-    return !!bid.params.playerId || !!bid.params.unitId;
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: TTL,
+    currency: 'EUR',
+    mediaType: VIDEO,
   },
-  buildRequests: function(validBidRequests, bidderRequest) {
-    let adUnits = [];
-    const pageURL = validBidRequests[0].params.contentPageUrl ||
-      bidderRequest.refererInfo.canonicalUrl ||
-      deepAccess(window, 'location.href');
-    const isStage = !!validBidRequests[0].params.stage;
-    const isViralize = !!validBidRequests[0].params.unitId;
-    const isOutstream = deepAccess(validBidRequests[0], 'mediaTypes.video.context') === 'outstream';
-    const isCustomRender = deepAccess(validBidRequests[0], 'params.outstreamOptions.customRender');
-    const isNodeRender = deepAccess(validBidRequests[0], 'params.outstreamOptions.slot') || deepAccess(validBidRequests[0], 'params.outstreamOptions.iframe');
-    const isNativeRender = deepAccess(validBidRequests[0], 'renderer');
-    const outstreamOptions = deepAccess(validBidRequests[0], 'params.outstreamOptions');
-    const isBanner = !!validBidRequests[0].mediaTypes.banner || (isOutstream && !(isCustomRender || isNativeRender || isNodeRender));
-    const defaultSchain = validBidRequests[0].schain || {};
-
-    const consentData = bidderRequest.gdprConsent || {};
-    const uspConsent = bidderRequest.uspConsent || '';
-    const gdprConsent = {
-      apiVersion: consentData.apiVersion || 2,
-      gdprApplies: consentData.gdprApplies || 0,
-      consentString: consentData.consentString || '',
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    const videoContext = deepAccess(bidRequest, 'mediaTypes.video.context');
+    deepSetValue(imp, 'video.ext.context', videoContext);
+    imp.ext = imp.ext || {};
+    imp.ext.params = bidRequest.params;
+    imp.ext.adUnitCode = bidRequest.adUnitCode;
+
+    if (!imp.displaymanager) {
+      imp.displaymanager = 'Prebid.js';
+      imp.displaymanagerver = '$prebid.version$'; // prebid version
     }
 
-    validBidRequests.forEach((bid) => {
-      const videoSizes = getVideoSizes(bid);
-      const bannerSizes = getBannerSizes(bid);
-      const vpaidMode = getBidIdParameter('vpaidMode', bid.params);
-
-      const makeBids = (type, size, isViralize) => {
-        let context = '';
-        let streamType = 2;
-
-        if (type === BANNER) {
-          streamType = 5;
-        } else {
-          context = deepAccess(bid, 'mediaTypes.video.context');
-          if (vpaidMode && context === 'instream') {
-            streamType = 1;
-          }
-          if (context === 'outstream') {
-            streamType = 5;
-          }
-        }
+    if (!isFn(bidRequest.getFloor)) {
+      return imp
+    }
 
-        let rBid = {
-          type: streamType,
-          adUnitCode: bid.adUnitCode,
-          bidId: bid.bidId,
-          context: context,
-          // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-          auctionId: bidderRequest.auctionId,
-          start: +new Date(),
-          timeout: 3000,
-          params: bid.params,
-          schain: bid.schain || defaultSchain
-        };
+    let floor = bidRequest.getFloor({
+      currency: 'EUR',
+      mediaType: '*',
+      size: '*',
+    });
+    if (!isNaN(floor?.floor) && floor?.currency === 'EUR') {
+      imp.bidfloor = floor.floor;
+      imp.bidfloorcur = 'EUR';
+    }
+    return imp;
+  },
 
-        if (isViralize) {
-          rBid.unitId = getBidIdParameter('unitId', bid.params);
-          rBid.sizes = size;
-          rBid.mediaTypes = {
-            [type]: {'context': context}
-          };
-        } else {
-          rBid.playerId = getBidIdParameter('playerId', bid.params);
-          rBid.mediaType = type;
-          rBid.size = {
-            width: size[0],
-            height: size[1]
-          };
-          rBid.gdprConsent = gdprConsent;
-          rBid.uspConsent = uspConsent;
-        }
+  bidResponse(buildBidResponse, bid, context) {
+    const bidResponse = buildBidResponse(bid, context);
 
-        return rBid;
+    if (context.imp?.video?.ext?.context === 'outstream') {
+      const renderConfig = {
+        rendererUrl: bid.ext?.rendererConfig?.rendererUrl,
+        renderFunc: bid.ext?.rendererConfig?.renderFunc,
+        renderOptions: bid.ext?.rendererConfig?.renderOptions,
       };
-
-      if (isViralize) {
-        if (videoSizes && videoSizes[0]) {
-          adUnits.push(makeBids(VIDEO, videoSizes, isViralize));
-        }
-        if (bannerSizes && bannerSizes[0]) {
-          adUnits.push(makeBids(BANNER, bannerSizes, isViralize));
-        }
-      } else {
-        videoSizes.forEach((size) => {
-          adUnits.push(makeBids(VIDEO, size));
-        });
-
-        bannerSizes.forEach((size) => {
-          adUnits.push(makeBids(BANNER, size));
-        });
+      if (renderConfig.renderFunc && renderConfig.rendererUrl) {
+        bidResponse.renderer = createRenderer(bidResponse, renderConfig);
       }
-    });
-
-    let endpointUrl;
-    let data;
+    }
+    bidResponse.callbacks = bid.ext?.callbacks;
+    bidResponse.extra = bid.ext?.extra;
+    return bidResponse;
+  },
+})
 
-    const QA = validBidRequests[0].params.qa || {};
+const GVLID = 111;
 
-    if (isViralize) {
-      endpointUrl = VIRALIZE_ENDPOINT;
-      data = {
-        'bidRequests': adUnits,
-        'context': {
-          'gdprConsent': gdprConsent,
-          'uspConsent': uspConsent,
-          'schain': defaultSchain,
-          'pageURL': QA.pageURL || encodeURIComponent(pageURL)
-        }
-      }
-    } else {
-      endpointUrl = isStage ? STAGE_ENDPOINT : PROD_ENDPOINT;
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: ['showheroesBs'],
+  supportedMediaTypes: [VIDEO],
+  isBidRequestValid: (bid) => {
+    return !!bid.params.unitId;
+  },
+  buildRequests: (bidRequests, bidderRequest) => {
+    const QA = bidRequests[0].params.qa;
 
-      data = {
-        'user': [],
-        'meta': {
-          'adapterVersion': 2,
-          'pageURL': QA.pageURL || encodeURIComponent(pageURL),
-          'vastCacheEnabled': (!!config.getConfig('cache') && !isBanner && !outstreamOptions) || false,
-          'isDesktop': getWindowTop().document.documentElement.clientWidth > 700,
-          'xmlAndTag': !!(isOutstream && isCustomRender) || false,
-          'stage': isStage || undefined
-        },
-        'requests': adUnits,
-        'debug': validBidRequests[0].params.debug || false,
-      }
-    }
+    const ortbData = converter.toORTB({ bidRequests, bidderRequest })
 
     return {
-      url: QA.endpoint || endpointUrl,
+      url: QA?.endpoint || ENDPOINT,
       method: 'POST',
-      options: {contentType: 'application/json', accept: 'application/json'},
-      data: data
+      data: ortbData,
     };
   },
-  interpretResponse: function(response, request) {
-    return createBids(response.body, request.data);
+  interpretResponse: (response, request) => {
+    if (!response.body) {
+      return [];
+    }
+
+    const bids = converter.fromORTB({response: response.body, request: request.data}).bids;
+    return bids;
   },
-  getUserSyncs: function(syncOptions, serverResponses) {
+  getUserSyncs: (syncOptions, serverResponses) => {
     const syncs = [];
 
-    if (!serverResponses.length || !serverResponses[0].body.userSync) {
+    if (!serverResponses.length || !serverResponses[0].body?.ext?.userSync) {
       return syncs;
     }
 
-    const userSync = serverResponses[0].body.userSync;
+    const userSync = serverResponses[0].body.ext.userSync;
 
-    if (syncOptions.iframeEnabled) {
-      (userSync.iframes || []).forEach(url => {
+    if (syncOptions.iframeEnabled && userSync?.iframes?.length) {
+      userSync.iframes.forEach(url => {
         syncs.push({
           type: 'iframe',
           url
@@ -200,6 +124,7 @@ export const spec = {
         });
       });
     }
+
     return syncs;
   },
 
@@ -213,177 +138,33 @@ export const spec = {
   },
 };
 
-function createBids(bidRes, reqData) {
-  if (!bidRes) {
-    return [];
-  }
-  const responseBids = bidRes.bids || bidRes.bidResponses;
-  if (!Array.isArray(responseBids) || responseBids.length < 1) {
-    return [];
-  }
-
-  const bids = [];
-  const bidMap = {};
-  (reqData.requests || reqData.bidRequests || []).forEach((bid) => {
-    bidMap[bid.bidId] = bid;
-  });
-
-  responseBids.forEach(function (bid) {
-    const requestId = bid.bidId || bid.requestId;
-    const reqBid = bidMap[requestId];
-    const currentBidParams = reqBid.params;
-    const isViralize = !!reqBid.params.unitId;
-    const size = {
-      width: bid.width || bid.size.width,
-      height: bid.height || bid.size.height
-    };
-
-    let bidUnit = {};
-    bidUnit.cpm = bid.cpm;
-    bidUnit.requestId = requestId;
-    bidUnit.adUnitCode = reqBid.adUnitCode;
-    bidUnit.currency = bid.currency;
-    bidUnit.mediaType = bid.mediaType || VIDEO;
-    bidUnit.ttl = TTL;
-    bidUnit.creativeId = 'c_' + requestId;
-    bidUnit.netRevenue = true;
-    bidUnit.width = size.width;
-    bidUnit.height = size.height;
-    bidUnit.meta = {
-      advertiserDomains: bid.adomain || []
-    };
-    if (bid.vastXml) {
-      bidUnit.vastXml = bid.vastXml;
-      bidUnit.adResponse = {
-        content: bid.vastXml,
-      };
+function outstreamRender(response, renderConfig) {
+  response.renderer.push(() => {
+    const func = deepAccess(window, renderConfig.renderFunc);
+    if (!isFn(func)) {
+      return;
     }
-    if (bid.vastTag || bid.vastUrl) {
-      bidUnit.vastUrl = bid.vastTag || bid.vastUrl;
-    }
-    if (bid.mediaType === BANNER) {
-      bidUnit.ad = getBannerHtml(bid, reqBid, reqData);
-    } else if (bid.context === 'outstream') {
-      const renderer = Renderer.install({
-        id: requestId,
-        url: 'https://static.showheroes.com/renderer.js',
-        adUnitCode: reqBid.adUnitCode,
-        config: {
-          playerId: reqBid.playerId,
-          width: size.width,
-          height: size.height,
-          vastUrl: bid.vastTag,
-          vastXml: bid.vastXml,
-          ad: bid.ad,
-          debug: reqData.debug,
-          isStage: reqData.meta && !!reqData.meta.stage,
-          isViralize: isViralize,
-          customRender: getBidIdParameter('customRender', currentBidParams.outstreamOptions),
-          slot: getBidIdParameter('slot', currentBidParams.outstreamOptions),
-          iframe: getBidIdParameter('iframe', currentBidParams.outstreamOptions),
-        }
-      });
-      renderer.setRender(outstreamRender);
-      bidUnit.renderer = renderer;
+    const renderPayload = { ...renderConfig.renderOptions };
+    if (response.vastXml) {
+      renderPayload.adResponse = {
+        content: response.vastXml,
+      };
     }
-    bids.push(bidUnit);
+    func(renderPayload);
   });
-
-  return bids;
-}
-
-function outstreamRender(bid) {
-  let embedCode;
-  if (bid.renderer.config.isViralize) {
-    embedCode = createOutstreamEmbedCodeV2(bid);
-  } else {
-    embedCode = createOutstreamEmbedCode(bid);
-  }
-  if (typeof bid.renderer.config.customRender === 'function') {
-    bid.renderer.config.customRender(bid, embedCode);
-  } else {
-    try {
-      const inIframe = getBidIdParameter('iframe', bid.renderer.config);
-      if (inIframe && window.document.getElementById(inIframe).nodeName === 'IFRAME') {
-        const iframe = window.document.getElementById(inIframe);
-        let framedoc = iframe.contentDocument || (iframe.contentWindow && iframe.contentWindow.document);
-        framedoc.body.appendChild(embedCode);
-        return;
-      }
-
-      const slot = getBidIdParameter('slot', bid.renderer.config) || bid.adUnitCode;
-      if (slot && window.document.getElementById(slot)) {
-        window.document.getElementById(slot).appendChild(embedCode);
-      } else if (slot) {
-        logError('[ShowHeroes][renderer] Error: spot not found');
-      }
-    } catch (err) {
-      logError('[ShowHeroes][renderer] Error:' + err.message);
-    }
-  }
 }
 
-function createOutstreamEmbedCode(bid) {
-  const isStage = getBidIdParameter('isStage', bid.renderer.config);
-  const urls = getEnvURLs(isStage);
-
-  const fragment = window.document.createDocumentFragment();
-
-  let script = loadExternalScript(urls.pubTag, 'outstream', function () {
-    window.ShowheroesTag = this;
+function createRenderer(bid, renderConfig) {
+  const renderer = Renderer.install({
+    id: bid.id,
+    url: renderConfig.rendererUrl,
+    loaded: false,
+    adUnitCode: bid.adUnitCode,
   });
-  script.setAttribute('data-player-host', urls.vlHost);
-
-  const spot = window.document.createElement('div');
-  spot.setAttribute('class', 'showheroes-spot');
-  spot.setAttribute('data-player', getBidIdParameter('playerId', bid.renderer.config));
-  spot.setAttribute('data-debug', getBidIdParameter('debug', bid.renderer.config));
-  spot.setAttribute('data-ad-vast-tag', getBidIdParameter('vastUrl', bid.renderer.config));
-  spot.setAttribute('data-stream-type', 'outstream');
-
-  fragment.appendChild(spot);
-  fragment.appendChild(script);
-  return fragment;
-}
-
-function createOutstreamEmbedCodeV2(bid) {
-  const range = document.createRange();
-  range.selectNode(document.getElementsByTagName('body')[0]);
-  return range.createContextualFragment(getBidIdParameter('ad', bid.renderer.config));
-}
-
-function getBannerHtml (bid, reqBid, reqData) {
-  const isStage = !!reqData.meta.stage;
-  const urls = getEnvURLs(isStage);
-  return `
-    
-    
-      
-      

-    
-  `;
-}
-
-function getVideoSizes(bidRequest) {
-  return formatSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize') || []);
-}
-
-function getBannerSizes(bidRequest) {
-  return formatSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes') || []);
-}
-
-function formatSizes(sizes) {
-  if (!sizes || !sizes.length) {
-    return []
-  }
-  return Array.isArray(sizes[0]) ? sizes : [sizes];
+  renderer.setRender((render) => {
+    return outstreamRender(render, renderConfig);
+  });
+  return renderer;
 }
 
 registerBidder(spec);
diff --git a/modules/showheroes-bsBidAdapter.md b/modules/showheroes-bsBidAdapter.md
index a32a77a2525..f306593a783 100644
--- a/modules/showheroes-bsBidAdapter.md
+++ b/modules/showheroes-bsBidAdapter.md
@@ -1,16 +1,14 @@
 # Overview
 
+```
 Module Name: ShowHeroes Bidder Adapter
-
 Module Type: Bidder Adapter
-
 Alias: showheroesBs
-
 Maintainer: tech@showheroes.com
-
+```
 # Description
 
-Module that connects to ShowHeroes demand source to fetch bids.
+A module that connects to ShowHeroes demand source to fetch bids.
 
 # Test Parameters
 ```
@@ -27,122 +25,7 @@ Module that connects to ShowHeroes demand source to fetch bids.
                    {
                        bidder: "showheroes-bs",
                        params: {
-                           playerId: '0151f985-fb1a-4f37-bb26-cfc62e43ec05',
-                           vpaidMode: true // by default is 'false'
-                       }
-                   }
-               ]
-           },
-           {
-               // if you have adSlot renderer or oustream should be returned as banner
-               code: 'video',
-               mediaTypes: {
-                   video: {
-                       playerSize: [640, 480],
-                       context: 'outstream',
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "showheroes-bs",
-                       params: {
-                           playerId: '0151f985-fb1a-4f37-bb26-cfc62e43ec05',
-                       }
-                   }
-               ]
-           },
-           {
-               code: 'video',
-               mediaTypes: {
-                   video: {
-                       playerSize: [640, 480],
-                       context: 'outstream',
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "showheroes-bs",
-                       params: {
-                           playerId: '0151f985-fb1a-4f37-bb26-cfc62e43ec05',
-
-                           outstreamOptions: {
-                               // Required for the outstream renderer to exact node, one of
-                               iframe: 'iframe_id',
-                               // or
-                               slot: 'slot_id'
-                           }
-                       }
-                   }
-               ]
-           },
-           {
-               code: 'video',
-               mediaTypes: {
-                   video: {
-                       playerSize: [640, 480],
-                       context: 'outstream',
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "showheroes-bs",
-                       params: {
-                           playerId: '0151f985-fb1a-4f37-bb26-cfc62e43ec05',
-
-                           outstreamOptions: {
-                               // Custom outstream rendering function
-                               customRender: function(bid, embedCode) {
-                                   // Example with embedCode
-                                   someContainer.appendChild(embedCode);
-
-                                   // bid config data
-                                   var vastUrl = bid.renderer.config.vastUrl;
-                                   var vastXML = bid.renderer.config.vastXML;
-                                   var videoWidth = bid.renderer.config.width;
-                                   var videoHeight = bid.renderer.config.height;
-                                   var playerId = bid.renderer.config.playerId;
-                               },
-                           }
-                       }
-                   }
-               ]
-           },
-           {
-               code: 'banner',
-               mediaTypes: {
-                   banner: {
-                       sizes: [[640, 480]],
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "showheroes-bs",
-                       params: {
-                           playerId: '0151f985-fb1a-4f37-bb26-cfc62e43ec05',
-                       }
-                   }
-               ]
-           }
-       ];
-```
-
-# Test Parameters (V2)
-```
-    var adUnits = [
-           {
-               code: 'video',
-               mediaTypes: {
-                   video: {
-                       playerSize: [640, 480],
-                       context: 'instream',
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "showheroes-bs",
-                       params: {
-                           unitId: 'AACBWAcof-611K4U',
-                           vpaidMode: true // by default is 'false'
+                           unitId: '1234abcd-5678efgh',
                        }
                    }
                ]
@@ -159,18 +42,10 @@ Module that connects to ShowHeroes demand source to fetch bids.
                    {
                        bidder: "showheroes-bs",
                        params: {
-                           unitId: 'AACBTwsZVANd9NlB',
-
-                           outstreamOptions: {
-                               // Required for the outstream renderer to exact node, one of
-                               iframe: 'iframe_id',
-                               // or
-                               slot: 'slot_id'
-                           }
+                           unitId: '1234abcd-5678efgh',
                        }
                    }
                ]
            }
        ];
 ```
-
diff --git a/modules/sigmoidAnalyticsAdapter.js b/modules/sigmoidAnalyticsAdapter.js
deleted file mode 100644
index 18e1e20e3e3..00000000000
--- a/modules/sigmoidAnalyticsAdapter.js
+++ /dev/null
@@ -1,293 +0,0 @@
-/* Sigmoid Analytics Adapter for prebid.js v1.1.0-pre
-Updated : 2018-03-28 */
-import {includes} from '../src/polyfill.js';
-import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
-import adapterManager from '../src/adapterManager.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {generateUUID, logError, logInfo} from '../src/utils.js';
-import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
-
-const MODULE_CODE = 'sigmoid';
-const storage = getStorageManager({moduleType: MODULE_TYPE_ANALYTICS, moduleName: MODULE_CODE});
-
-const url = 'https://kinesis.us-east-1.amazonaws.com/';
-const analyticsType = 'endpoint';
-
-const auctionInitConst = CONSTANTS.EVENTS.AUCTION_INIT;
-const auctionEndConst = CONSTANTS.EVENTS.AUCTION_END;
-const bidWonConst = CONSTANTS.EVENTS.BID_WON;
-const bidRequestConst = CONSTANTS.EVENTS.BID_REQUESTED;
-const bidAdjustmentConst = CONSTANTS.EVENTS.BID_ADJUSTMENT;
-const bidResponseConst = CONSTANTS.EVENTS.BID_RESPONSE;
-
-let initOptions = { publisherIds: [], utmTagData: [], adUnits: [] };
-let bidWon = {options: {}, events: []};
-let eventStack = {options: {}, events: []};
-
-let auctionStatus = 'not_started';
-
-let localStoragePrefix = 'sigmoid_analytics_';
-let utmTags = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'];
-let utmTimeoutKey = 'utm_timeout';
-let utmTimeout = 60 * 60 * 1000;
-let sessionTimeout = 60 * 60 * 1000;
-let sessionIdStorageKey = 'session_id';
-let sessionTimeoutKey = 'session_timeout';
-
-function getParameterByName(param) {
-  let vars = {};
-  window.location.href.replace(location.hash, '').replace(
-    /[?&]+([^=&]+)=?([^&]*)?/gi,
-    function(m, key, value) {
-      vars[key] = value !== undefined ? value : '';
-    }
-  );
-
-  return vars[param] ? vars[param] : '';
-}
-
-function buildSessionIdLocalStorageKey() {
-  return localStoragePrefix.concat(sessionIdStorageKey);
-}
-
-function buildSessionIdTimeoutLocalStorageKey() {
-  return localStoragePrefix.concat(sessionTimeoutKey);
-}
-
-function updateSessionId() {
-  if (isSessionIdTimeoutExpired()) {
-    let newSessionId = generateUUID();
-    storage.setDataInLocalStorage(buildSessionIdLocalStorageKey(), newSessionId);
-  }
-  initOptions.sessionId = getSessionId();
-  updateSessionIdTimeout();
-}
-
-function updateSessionIdTimeout() {
-  storage.setDataInLocalStorage(buildSessionIdTimeoutLocalStorageKey(), Date.now());
-}
-
-function isSessionIdTimeoutExpired() {
-  let cpmSessionTimestamp = storage.getDataFromLocalStorage(buildSessionIdTimeoutLocalStorageKey());
-  return Date.now() - cpmSessionTimestamp > sessionTimeout;
-}
-
-function getSessionId() {
-  return storage.getDataFromLocalStorage(buildSessionIdLocalStorageKey()) ? storage.getDataFromLocalStorage(buildSessionIdLocalStorageKey()) : '';
-}
-
-function updateUtmTimeout() {
-  storage.setDataInLocalStorage(buildUtmLocalStorageTimeoutKey(), Date.now());
-}
-
-function isUtmTimeoutExpired() {
-  let utmTimestamp = storage.getDataFromLocalStorage(buildUtmLocalStorageTimeoutKey());
-  return (Date.now() - utmTimestamp) > utmTimeout;
-}
-
-function buildUtmLocalStorageTimeoutKey() {
-  return localStoragePrefix.concat(utmTimeoutKey);
-}
-
-function buildUtmLocalStorageKey(utmMarkKey) {
-  return localStoragePrefix.concat(utmMarkKey);
-}
-
-function checkOptions() {
-  if (typeof initOptions.publisherIds === 'undefined') {
-    return false;
-  }
-
-  return initOptions.publisherIds.length > 0;
-}
-
-function checkAdUnitConfig() {
-  if (typeof initOptions.adUnits === 'undefined') {
-    return false;
-  }
-
-  return initOptions.adUnits.length > 0;
-}
-
-function buildBidWon(eventType, args) {
-  bidWon.options = initOptions;
-  if (checkAdUnitConfig()) {
-    if (includes(initOptions.adUnits, args.adUnitCode)) {
-      bidWon.events = [{ args: args, eventType: eventType }];
-    }
-  } else {
-    bidWon.events = [{ args: args, eventType: eventType }];
-  }
-}
-
-function buildEventStack() {
-  eventStack.options = initOptions;
-}
-
-function filterBidsByAdUnit(bids) {
-  var filteredBids = [];
-  bids.forEach(function (bid) {
-    if (includes(initOptions.adUnits, bid.placementCode)) {
-      filteredBids.push(bid);
-    }
-  });
-  return filteredBids;
-}
-
-function isValidEvent(eventType, adUnitCode) {
-  if (checkAdUnitConfig()) {
-    let validationEvents = [bidAdjustmentConst, bidResponseConst, bidWonConst];
-    if (!includes(initOptions.adUnits, adUnitCode) && includes(validationEvents, eventType)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-function isValidEventStack() {
-  if (eventStack.events.length > 0) {
-    return eventStack.events.some(function(event) {
-      return bidRequestConst === event.eventType || bidWonConst === event.eventType;
-    });
-  }
-  return false;
-}
-
-function isValidBidWon() {
-  return bidWon.events.length > 0;
-}
-
-function flushEventStack() {
-  eventStack.events = [];
-}
-
-let sigmoidAdapter = Object.assign(adapter({url, analyticsType}),
-  {
-    track({eventType, args}) {
-      if (!checkOptions()) {
-        return;
-      }
-
-      let info = Object.assign({}, args);
-
-      if (info && info.ad) {
-        info.ad = '';
-      }
-
-      if (eventType === auctionInitConst) {
-        auctionStatus = 'started';
-      }
-
-      if (eventType === bidWonConst && auctionStatus === 'not_started') {
-        updateSessionId();
-        buildBidWon(eventType, info);
-        if (isValidBidWon()) {
-          send(eventType, bidWon, 'bidWon');
-        }
-        return;
-      }
-
-      if (eventType === auctionEndConst) {
-        updateSessionId();
-        buildEventStack();
-        if (isValidEventStack()) {
-          send(eventType, eventStack, 'eventStack');
-        }
-        auctionStatus = 'not_started';
-      } else {
-        pushEvent(eventType, info);
-      }
-    },
-
-  });
-
-sigmoidAdapter.originEnableAnalytics = sigmoidAdapter.enableAnalytics;
-
-sigmoidAdapter.enableAnalytics = function (config) {
-  initOptions = config.options;
-  initOptions.utmTagData = this.buildUtmTagData();
-  logInfo('Sigmoid Analytics enabled with config', initOptions);
-  sigmoidAdapter.originEnableAnalytics(config);
-};
-
-sigmoidAdapter.buildUtmTagData = function () {
-  let utmTagData = {};
-  let utmTagsDetected = false;
-  utmTags.forEach(function(utmTagKey) {
-    let utmTagValue = getParameterByName(utmTagKey);
-    if (utmTagValue !== '') {
-      utmTagsDetected = true;
-    }
-    utmTagData[utmTagKey] = utmTagValue;
-  });
-  utmTags.forEach(function(utmTagKey) {
-    if (utmTagsDetected) {
-      storage.setDataInLocalStorage(buildUtmLocalStorageKey(utmTagKey), utmTagData[utmTagKey]);
-      updateUtmTimeout();
-    } else {
-      if (!isUtmTimeoutExpired()) {
-        utmTagData[utmTagKey] = storage.getDataFromLocalStorage(buildUtmLocalStorageKey(utmTagKey)) ? storage.getDataFromLocalStorage(buildUtmLocalStorageKey(utmTagKey)) : '';
-        updateUtmTimeout();
-      }
-    }
-  });
-  return utmTagData;
-};
-
-function send(eventType, data, sendDataType) {
-  // eslint-disable-next-line no-undef
-  AWS.config.credentials = new AWS.Credentials({
-    accessKeyId: 'accesskey', secretAccessKey: 'secretkey'
-  });
-
-  // eslint-disable-next-line no-undef
-  AWS.config.region = 'us-east-1';
-  // eslint-disable-next-line no-undef
-  AWS.config.credentials.get(function(err) {
-    // attach event listener
-    if (err) {
-      logError(err);
-      return;
-    }
-    // create kinesis service object
-    // eslint-disable-next-line no-undef
-    var kinesis = new AWS.Kinesis({
-      apiVersion: '2013-12-02'
-    });
-    var dataList = [];
-    var jsonData = {};
-    jsonData['Data'] = JSON.stringify(data) + '\n';
-    jsonData['PartitionKey'] = 'partition-' + Math.random().toString(36).substring(7);
-    dataList.push(jsonData);
-    kinesis.putRecords({
-      Records: dataList,
-      StreamName: 'sample-stream'
-    });
-    if (sendDataType === 'eventStack') {
-      flushEventStack();
-    }
-  });
-};
-
-function pushEvent(eventType, args) {
-  if (eventType === bidRequestConst) {
-    if (checkAdUnitConfig()) {
-      args.bids = filterBidsByAdUnit(args.bids);
-    }
-    if (args.bids.length > 0) {
-      eventStack.events.push({ eventType: eventType, args: args });
-    }
-  } else {
-    if (isValidEvent(eventType, args.adUnitCode)) {
-      eventStack.events.push({ eventType: eventType, args: args });
-    }
-  }
-}
-
-adapterManager.registerAnalyticsAdapter({
-  adapter: sigmoidAdapter,
-  code: MODULE_CODE,
-});
-
-export default sigmoidAdapter;
diff --git a/modules/silvermobBidAdapter.js b/modules/silvermobBidAdapter.js
new file mode 100644
index 00000000000..340dc9c70ac
--- /dev/null
+++ b/modules/silvermobBidAdapter.js
@@ -0,0 +1,76 @@
+// import { logMessage } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+
+import {ortbConverter} from '../libraries/ortbConverter/converter.js'
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'silvermob';
+const AD_URL = 'https://{HOST}.silvermob.com/marketplace/api/dsp/prebidjs/{ZONEID}';
+const GVLID = 1058;
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 30
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    if (!imp.bidfloor) imp.bidfloor = bidRequest.params.bidfloor || 0;
+    imp.ext = {
+      [BIDDER_CODE]: {
+        zoneid: bidRequest.params.zoneid,
+        host: bidRequest.params.host || 'us',
+      }
+    }
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    const bid = context.bidRequests[0];
+    request.test = config.getConfig('debug') ? 1 : 0;
+    if (!request.cur) request.cur = [bid.params.currency || 'USD'];
+    return request;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    const bidResponse = buildBidResponse(bid, context);
+    bidResponse.cur = bid.cur || 'USD';
+    return bidResponse;
+  }
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.bidId && bid.params && !isNaN(bid.params.zoneid));
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    if (validBidRequests && validBidRequests.length === 0) return [];
+
+    const host = validBidRequests[0].params.host || 'us';
+    const zoneid = validBidRequests[0].params.zoneid;
+
+    const data = converter.toORTB({ bidRequests: validBidRequests, bidderRequest });
+
+    return {
+      method: 'POST',
+      url: AD_URL.replace('{HOST}', host).replace('{ZONEID}', zoneid),
+      data: data
+    };
+  },
+
+  interpretResponse: (response, request) => {
+    if (response?.body) {
+      const bids = converter.fromORTB({ response: response.body, request: request.data }).bids;
+      return bids;
+    }
+    return [];
+  }
+
+};
+
+registerBidder(spec);
diff --git a/modules/silvermobBidAdapter.md b/modules/silvermobBidAdapter.md
new file mode 100644
index 00000000000..ba080ec105e
--- /dev/null
+++ b/modules/silvermobBidAdapter.md
@@ -0,0 +1,70 @@
+# Overview
+
+```
+Module Name: SilverMob Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@silvermob.com
+```
+
+# Description
+
+Module that connects to SilverMob platform
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static native ad. Assets are stored through user UI for each placement separetly
+                {
+                    code: 'placementId_0',
+                    mediaTypes: {
+                        native: {}
+                    },
+                    bids: [
+                        {
+                            bidder: 'silvermob',
+                            params: {
+                                host: 'us',
+                                zoneid: '0'
+                            }
+                        }
+                    ]
+                },
+                // Will return static test banner
+                {
+                    code: 'placementId_0',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'silvermob',
+                            params: {
+                              host: 'us',
+                              zoneid: '0'
+                            }
+                        }
+                    ]
+                },
+                // Will return test vast xml. All video params are stored under placement in publishers UI
+                {
+                    code: 'placementId_0',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'silvermob',
+                            params: {
+                                host: 'us',
+                                zoneid: '0'
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/silverpushBidAdapter.js b/modules/silverpushBidAdapter.js
index 5403f3bd88c..70c0e475cc4 100644
--- a/modules/silverpushBidAdapter.js
+++ b/modules/silverpushBidAdapter.js
@@ -1,4 +1,3 @@
-import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import * as utils from '../src/utils.js';
 import { mergeDeep } from '../src/utils.js';
@@ -6,6 +5,7 @@ import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 import { Renderer } from '../src/Renderer.js';
 import { ajax } from '../src/ajax.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
 
 const BIDDER_CODE = 'silverpush';
 const bidderConfig = 'sp_pb_ortb';
@@ -65,7 +65,7 @@ export const CONVERTER = ortbConverter({
       imp = buildBannerImp(bidRequest, imp);
     }
 
-    const bidFloor = getBidFloor(bidRequest);
+    const bidFloor = getBidFloor(bidRequest, bidRequest.bidderRequest);
 
     utils.deepSetValue(imp, 'bidfloor', bidFloor);
 
@@ -128,7 +128,7 @@ export const CONVERTER = ortbConverter({
       });
       return {
         bids: response.bids,
-        fledgeAuctionConfigs,
+        paapi: fledgeAuctionConfigs,
       }
     } else {
       return response.bids
@@ -216,7 +216,8 @@ function createRequest(bidRequests, bidderRequest, mediaType) {
   return {
     method: 'POST',
     url: REQUEST_URL,
-    data: CONVERTER.toORTB({ bidRequests, bidderRequest, context: { mediaType } })
+    data: CONVERTER.toORTB({ bidRequests, bidderRequest, context: { mediaType } }),
+    bidderRequest
   }
 }
 
@@ -247,8 +248,8 @@ function buildVideoOutstreamResponse(bidResponse, context) {
   return {...bidResponse};
 }
 
-function getBidFloor(bid) {
-  const currency = config.getConfig('currency.adServerCurrency') || DEFAULT_CURRENCY;
+function getBidFloor(bid, bidderRequest) {
+  const currency = getCurrencyFromBidderRequest(bidderRequest) || DEFAULT_CURRENCY;
 
   if (typeof bid.getFloor !== 'function') {
     return utils.deepAccess(bid, 'params.bidFloor', 0.05);
@@ -259,7 +260,7 @@ function getBidFloor(bid) {
     mediaType: '*',
     size: '*',
   });
-  return bidFloor.floor;
+  return bidFloor?.floor;
 }
 
 function _renderer(bid) {
diff --git a/modules/sirdataRtdProvider.js b/modules/sirdataRtdProvider.js
index aaa3c48856b..129d708cf8f 100644
--- a/modules/sirdataRtdProvider.js
+++ b/modules/sirdataRtdProvider.js
@@ -7,19 +7,35 @@
  * @module modules/sirdataRtdProvider
  * @requires module:modules/realTimeData
  */
-import {deepAccess, deepSetValue, isEmpty, logError, mergeDeep} from '../src/utils.js';
-import {submodule} from '../src/hook.js';
-import {ajax} from '../src/ajax.js';
-import {findIndex} from '../src/polyfill.js';
-import {getRefererInfo} from '../src/refererDetection.js';
-import {config} from '../src/config.js';
+import adapterManager from '../src/adapterManager.js';
+import { ajax, sendBeacon } from '../src/ajax.js';
+import {
+  deepAccess, checkCookieSupport, deepSetValue, hasDeviceAccess, inIframe, isEmpty,
+  logError, logInfo, mergeDeep
+} from '../src/utils.js';
+import { findIndex } from '../src/polyfill.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+import { submodule } from '../src/hook.js';
 
 /** @type {string} */
 const MODULE_NAME = 'realTimeData';
 const SUBMODULE_NAME = 'SirdataRTDModule';
 const ORTB2_NAME = 'sirdata.com';
-
-const partnerIds = {
+const LOG_PREFIX = 'Sirdata RTD: ';
+const EUIDS_STORAGE_NAME = 'SDDAN';
+// Get the cookie domain from the referer info or fallback to window location hostname
+const cookieDomain = getRefererInfo().domain || window.location.hostname;
+
+/** @type {number} */
+const GVLID = 53;
+
+/** @type {object} */
+const STORAGE = getStorageManager({ moduleType: MODULE_TYPE_RTD, moduleName: SUBMODULE_NAME });
+const bidderAliasRegistry = adapterManager.aliasRegistry || {};
+const biddersId = { // Partner IDs mapping for different SSPs and DSPs
   'criteo': 27443,
   'openx': 30342,
   'pubmatic': 30345,
@@ -28,24 +44,9 @@ const partnerIds = {
   'yahoossp': 30339,
   'rubicon': 27452,
   'appnexus': 27446,
-  'appnexusAst': 27446,
-  'brealtime': 27446,
-  'emxdigital': 27446,
-  'pagescience': 27446,
   'gourmetads': 33394,
-  'matomy': 27446,
-  'featureforward': 27446,
-  'oftmedia': 27446,
-  'districtm': 27446,
-  'adasta': 27446,
-  'beintoo': 27446,
-  'gravity': 27446,
-  'msq_classic': 27878,
-  'msq_max': 27878,
-  '366_apx': 27878,
   'mediasquare': 27878,
   'smartadserver': 27440,
-  'smart': 27440,
   'proxistore': 27484,
   'ix': 27248,
   'sdRtdForGpt': 27449,
@@ -62,58 +63,367 @@ const partnerIds = {
   'zeta_global_ssp': 33385,
 };
 
-let CONTEXT_ONLY = true;
+const eidsProvidersMap = {
+  'id5': 'id5-sync.com',
+  'id5id': 'id5-sync.com',
+  'id5_id': 'id5-sync.com',
+  'pubprovided_id': 'pubProvidedId',
+  'ppid': 'pubProvidedId',
+  'first-id.fr': 'pubProvidedId',
+  'sharedid': 'pubcid.org',
+  'publishercommonid': 'pubcid.org',
+  'pubcid.org': 'pubcid.org',
+}
 
-export function getSegmentsAndCategories(reqBidsConfigObj, onDone, moduleConfig, userConsent) {
-  moduleConfig.params = moduleConfig.params || {};
-
-  var tcString = (userConsent && userConsent.gdpr && userConsent.gdpr.consentString ? userConsent.gdpr.consentString : '');
-  var gdprApplies = (userConsent && userConsent.gdpr && userConsent.gdpr.gdprApplies ? userConsent.gdpr.gdprApplies : '');
-
-  moduleConfig.params.partnerId = moduleConfig.params.partnerId ? moduleConfig.params.partnerId : 1;
-  moduleConfig.params.key = moduleConfig.params.key ? moduleConfig.params.key : 1;
-
-  var sirdataDomain;
-  var sendWithCredentials;
-
-  if (userConsent.coppa || (userConsent.usp && (userConsent.usp[0] == '1' && (userConsent.usp[1] == 'N' || userConsent.usp[2] == 'Y')))) {
-    // if children or "Do not Sell" management in California, no segments, page categories only whatever TCF signal
-    sirdataDomain = 'cookieless-data.com';
-    sendWithCredentials = false;
-    gdprApplies = null;
-    tcString = '';
-  } else if (config.getConfig('consentManagement.gdpr')) {
-    // Default endpoint is cookieless if gdpr management is set. Needed because the cookie-based endpoint will fail and return error if user is located in Europe and no consent has been given
-    sirdataDomain = 'cookieless-data.com';
-    sendWithCredentials = false;
+// params
+let params = {
+  partnerId: 1,
+  key: 1,
+  actualUrl: getRefererInfo().stack.pop() || getRefererInfo().page,
+  cookieAccessGranted: false,
+  setGptKeyValues: true,
+  contextualMinRelevancyScore: 30,
+  preprod: false,
+  authorizedEids: ['pubProvidedId', 'id5-sync.com', 'pubcid.org'],
+  avoidPostContent: false,
+  sirdataDomain: 'cookieless-data.com',
+  bidders: []
+};
+
+/**
+ * Sets a cookie on the top-level domain
+ * @param {string} key - The cookie name
+ * @param {string} value - The cookie value
+ * @param {string} hostname - The hostname for setting the cookie
+ * @param {boolean} deleteCookie - The cookie must be deleted
+ * @returns {boolean} - True if the cookie was successfully set, otherwise false
+ */
+export function setCookieOnTopDomain(key, value, hostname, deleteCookie) {
+  const subDomains = hostname.split('.');
+  let expTime = new Date();
+  expTime.setTime(expTime.getTime() + (deleteCookie ? -1 : 365 * 24 * 60 * 60 * 1000)); // Set expiration time
+  for (let i = 0; i < subDomains.length; ++i) {
+    // Try to write the cookie on this subdomain (we want it to be stored only on the TLD+1)
+    const domain = subDomains.slice(subDomains.length - i - 1).join('.');
+    try {
+      STORAGE.setCookie(key, value, expTime.toUTCString(), 'Lax', '.' + domain);
+      // Try to read the cookie to check if we wrote it
+      if (STORAGE.getCookie(key, null) === value) return true; // Check if the cookie was set, and if so top domain was found. If deletion with expire date -1 will parse until complete host
+    } catch (e) {
+      logError(LOG_PREFIX, e);
+    }
+  }
+  return false;
+}
+
+/**
+ * Retrieves the UID from storage (cookies or local storage)
+ * @returns {Array|null} - Array of UID objects or null if no UID found
+ */
+export function getUidFromStorage() {
+  let cUid = STORAGE.getCookie(EUIDS_STORAGE_NAME, null);
+  let lsUid = STORAGE.getDataFromLocalStorage(EUIDS_STORAGE_NAME, null);
+  if (cUid && (!lsUid || cUid !== lsUid)) {
+    STORAGE.setDataInLocalStorage(EUIDS_STORAGE_NAME, cUid, null);
+  } else if (lsUid && !cUid) {
+    setCookieOnTopDomain(EUIDS_STORAGE_NAME, lsUid, cookieDomain, false);
+    cUid = lsUid;
+  }
+  return cUid ? [{ source: 'sddan.com', uids: [{ id: cUid, atype: 1 }] }] : null;
+}
+
+/**
+ * Sets the UID in storage (cookies and local storage)
+ * @param {string} sddanId - The UID to be set
+ * @returns {boolean} - True if the UID was successfully set, otherwise false
+ */
+export function setUidInStorage(sddanId) {
+  if (!sddanId) return false;
+  sddanId = encodeURI(sddanId.toString());
+  setCookieOnTopDomain(EUIDS_STORAGE_NAME, sddanId, cookieDomain, false);
+  STORAGE.setDataInLocalStorage(EUIDS_STORAGE_NAME, sddanId, null);
+  return true;
+}
+
+/**
+ * Merges and cleans objects from two eids arrays based on the 'source' and unique 'id' within the 'uids' array.
+ * Processes each array to add unique items or merge uids if the source already exists.
+ * @param {Array} euids1 - The first array to process and merge.
+ * @param {Array} euids2 - The second array to process and merge.
+ * @returns {Array} The merged array with unique sources and uid ids.
+ */
+export function mergeEuidsArrays(euids1, euids2) {
+  if (isEmpty(euids1)) return euids2;
+  if (isEmpty(euids2)) return euids1;
+  const mergedArray = [];
+  // Helper function to process each array
+  const processArray = (array) => {
+    array.forEach(item => {
+      if (item.uids) {
+        const foundIndex = findIndex(mergedArray, function (x) {
+          return x.source === item.source;
+        });
+        if (foundIndex !== -1) {
+          // Merge uids if the source is found
+          item.uids.forEach(uid => {
+            if (!mergedArray[foundIndex].uids.some(u => u.id === uid.id)) {
+              mergedArray[foundIndex].uids.push(uid);
+            }
+          });
+        } else {
+          // Add the entire item if the source does not exist
+          mergedArray.push({ ...item, uids: [...item.uids] });
+        }
+      }
+    });
+  };
+  // Process both euids1 and euids2
+  processArray(euids1);
+  processArray(euids2);
+  return mergedArray;
+}
+
+/**
+ * Handles data deletion request by removing stored EU IDs
+ * @param {Object} moduleConfig - The module configuration
+ * @returns {boolean} - True if data was deleted successfully
+ */
+export function onDataDeletionRequest(moduleConfig) {
+  if (moduleConfig && moduleConfig.params) {
+    setCookieOnTopDomain(EUIDS_STORAGE_NAME, '', window.location.hostname, true);
+    STORAGE.removeDataFromLocalStorage(EUIDS_STORAGE_NAME, null);
+  }
+  return !getUidFromStorage();
+}
+
+/**
+ * Sends the page content for semantic analysis to Sirdata's server.
+ * @param {string} postContentToken - The token required to post content.
+ * @param {string} actualUrl - The actual URL of the current page.
+ * @returns {boolean} - True if the content was sent successfully
+ */
+export function postContentForSemanticAnalysis(postContentToken, actualUrl) {
+  if (!postContentToken || !actualUrl) return false;
+
+  try {
+    let content = document.implementation.createHTMLDocument('');
+    // Clone the current document content to avoid altering the original page content
+    content.documentElement.innerHTML = document.documentElement.innerHTML;
+    // Sanitize the cloned content to remove unnecessary elements and PII
+    content = sanitizeContent(content);
+    // Serialize the sanitized content to a string
+    const payload = new XMLSerializer().serializeToString(content.documentElement);
+
+    if (payload && payload.length > 300 && payload.length < 300000) {
+      const url = `https://contextual.sirdata.io/api/v1/push/contextual?post_content_token=${postContentToken}&url=${encodeURIComponent(actualUrl)}`;
+
+      if (!sendBeacon(url, payload)) {
+        // Fallback to using AJAX if Beacon API is not supported
+        ajax(url, {}, payload, {
+          contentType: 'text/plain',
+          method: 'POST',
+          withCredentials: false, // No user-specific data is tied to the request
+          referrerPolicy: 'unsafe-url',
+          crossOrigin: true
+        });
+      }
+    }
+  } catch (e) {
+    logError(LOG_PREFIX, e);
+    return false;
   }
+  return true;
+}
 
-  // default global endpoint is cookie-based if no rules falls into cookieless or consent has been given or GDPR doesn't apply
+/**
+ * Executes a callback function when the document is fully loaded.
+ * @param {function} callback - The function to execute when the document is ready.
+ */
+export function onDocumentReady(callback) {
+  if (typeof callback !== 'function') return false;
+  try {
+    if (document.readyState && document.readyState !== 'loading') {
+      callback();
+    } else if (typeof document.addEventListener === 'function') {
+      document.addEventListener('DOMContentLoaded', callback);
+    }
+  } catch (e) {
+    callback();
+  }
+  return true;
+}
 
-  if (!sirdataDomain || !gdprApplies || (deepAccess(userConsent, 'gdpr.vendorData.vendor.consents') && userConsent.gdpr.vendorData.vendor.consents[53] && userConsent.gdpr.vendorData.purpose.consents[1] && userConsent.gdpr.vendorData.purpose.consents[4])) {
-    sirdataDomain = 'sddan.com';
-    sendWithCredentials = true;
-    CONTEXT_ONLY = false;
+/**
+ * Removes Personally Identifiable Information (PII) from the content
+ * @param {string} content - The content to be sanitized
+ * @returns {string} - The sanitized content
+ */
+export function removePII(content) {
+  const patterns = [
+    /\b(?:\d{4}[ -]?){3}\d{4}\b/g, // Credit card numbers
+    /\b\d{10,12}\b/g, // US bank account numbers
+    /\b\d{5}\d{5}\d{11}\d{2}\b/g, // EU bank account numbers
+    /\b(\d{3}-\d{2}-\d{4}|\d{9}|\d{13}|\d{2} \d{2} \d{2} \d{3} \d{3} \d{3})\b/g, // SSN
+    /\b[A-Z]{1,2}\d{6,9}\b/g, // Passport numbers
+    /\b(\d{8,10}|\d{3}-\d{3}-\d{3}-\d{3}|\d{2} \d{2} \d{2} \d{3} \d{3})\b/g, // ID card numbers
+    /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b/g, // Email addresses
+    /(\+?\d{1,3}[-.\s]?)?(\(?\d{2,3}\)?[-.\s]?)(\d{2}[-.\s]?){3,4}\d{2}/g // Phone numbers
+  ];
+  patterns.forEach(pattern => {
+    content = content.replace(pattern, '');
+  });
+  return content;
+}
+
+/**
+ * Sanitizes the content by removing unnecessary elements and PII
+ * @param {Object} content - The content to be sanitized
+ * @returns {Object} - The sanitized content
+ */
+export function sanitizeContent(content) {
+  if (content && content.documentElement.textContent && content.documentElement.textContent.length > 500) {
+    // Reduce size by removing useless content
+    // Allowed tags
+    const allowedTags = [
+      'div', 'span', 'a', 'article', 'section', 'p', 'h1', 'h2', 'body', 'b', 'u', 'i', 'big', 'mark', 'ol', 'small', 'strong', 'blockquote',
+      'nav', 'menu', 'li', 'ul', 'ins', 'head', 'title', 'main', 'var', 'table', 'caption', 'colgroup', 'col', 'tr', 'td', 'th',
+      'summary', 'details', 'dl', 'dt', 'dd'
+    ];
+
+    const processElement = (element) => {
+      Array.from(element.childNodes).reverse().forEach(child => {
+        if (child.nodeType === Node.ELEMENT_NODE) {
+          processElement(child);
+          Array.from(child.attributes).forEach(attr => {
+            // keeps only id attributes and class attribute if useful for contextualisation
+            if (attr.name === 'class' && !/^(main|article|product)/.test(attr.value)) {
+              child.removeAttribute(attr.name);
+            } else if (attr.name !== 'id') {
+              child.removeAttribute(attr.name);
+            }
+          });
+          if (!child.innerHTML.trim() || !allowedTags.includes(child.tagName.toLowerCase())) { // Keeps only allowed Tags (allowedTags)
+            child.remove();
+          }
+        }
+      });
+    };
+
+    const removeEmpty = (element) => { // remove empty tags
+      Array.from(element.childNodes).reverse().forEach(child => {
+        if (child.nodeType === Node.ELEMENT_NODE) {
+          removeEmpty(child);
+          if (!child.innerHTML.trim()) {
+            child.remove();
+          }
+        } else if (child.nodeType === Node.TEXT_NODE && !child.textContent.trim()) {
+          child.remove();
+        }
+      });
+    };
+
+    processElement(content.documentElement);
+    removeEmpty(content.documentElement);
+
+    // Clean any potential PII
+    content.documentElement.innerHTML = removePII(content.documentElement.innerHTML);
+
+    let htmlContent = content.documentElement.innerHTML;
+    // Remove HTML comments
+    // This regex removes HTML comments, including those that might not be properly closed
+    htmlContent = htmlContent.replace(/|$)/g, '');
+    // Remove multiple spaces
+    htmlContent = htmlContent.replace(/\s+/g, ' ');
+    // Remove spaces between tags
+    htmlContent = htmlContent.replace(/>\s+<');
+    // Assign the cleaned content
+    content.documentElement.innerHTML = htmlContent;
   }
+  return content;
+}
 
-  var actualUrl = moduleConfig.params.actualUrl || getRefererInfo().stack.pop() || getRefererInfo().page;
+/**
+ * Fetches segments and categories from Sirdata server and processes the response
+ * @param {Object} reqBidsConfigObj - The bids configuration object
+ * @param {function} onDone - The callback function to be called upon completion
+ * @param {Object} moduleConfig - The module Config
+ * @param {Object} userConsent - The user consent information
+ */
+export function getSegmentsAndCategories(reqBidsConfigObj, onDone, moduleConfig, userConsent) {
+  logInfo(LOG_PREFIX, 'get Segments And Categories');
+  const adUnits = (reqBidsConfigObj && reqBidsConfigObj.adUnits) || getGlobal().adUnits;
+  if (!adUnits) {
+    logInfo(LOG_PREFIX, 'no ad unit, RTD processing is useless');
+    onDone();
+    return;
+  }
 
-  const url = 'https://kvt.' + sirdataDomain + '/api/v1/public/p/' + moduleConfig.params.partnerId + '/d/' + moduleConfig.params.key + '/s?callback=&gdpr=' + gdprApplies + '&gdpr_consent=' + tcString + (actualUrl ? '&url=' + encodeURIComponent(actualUrl) : '');
+  const gdprApplies = deepAccess(userConsent, 'gdpr.gdprApplies') ? userConsent.gdpr.gdprApplies : false;
+  const sirdataSubDomain = params.preprod ? 'kvt-preprod' : 'kvt';
 
-  ajax(url,
-    {
+  let euids; // empty if no right to access device (publisher or user reject)
+  let privacySignals = '';
+
+  // Default global endpoint is cookie-based only if no rules falls into cookieless or consent has been given or GDPR doesn't apply
+  if (hasDeviceAccess() && !userConsent.coppa && (isEmpty(userConsent.usp) || userConsent.usp === -1 || (userConsent.usp[0] === '1' && (userConsent.usp[1] !== 'N' && userConsent.usp[2] !== 'Y'))) && (!gdprApplies || (deepAccess(userConsent, 'gdpr.vendorData.vendor.consents') && userConsent.gdpr.vendorData.vendor.consents[GVLID] && deepAccess(userConsent, 'gdpr.vendorData.purpose.consents') && userConsent.gdpr.vendorData.purpose.consents[1] && (userConsent.gdpr.vendorData.purpose.consents[2] || userConsent.gdpr.vendorData.purpose.consents[3]) && userConsent.gdpr.vendorData.purpose.consents[4])) && (isEmpty(userConsent.gpp) || userConsent.gpp.gppString) && checkCookieSupport()) {
+    params.sirdataDomain = 'sddan.com'; // cookie based domain
+    params.cookieAccessGranted = true; // cookies sent in request
+
+    if (gdprApplies && deepAccess(userConsent, 'gdpr.consentString')) {
+      privacySignals = `&gdpr=${gdprApplies}&gdpr_consent=${userConsent.gdpr.consentString}`;
+    } else if (!isEmpty(userConsent.usp)) {
+      privacySignals = `&ccpa_consent=${userConsent.usp.toString()}`;
+    } else if (deepAccess(userConsent, 'gpp.gppString')) {
+      const sid = deepAccess(userConsent, 'gpp.applicableSections') ? `&gpp_sid=${userConsent.gpp.applicableSections.join(',')}` : '';
+      privacySignals = `&gpp=${userConsent.gpp.gppString}${sid}`;
+    }
+
+    // Authorized EUIDS from storage and sync global for graph
+    euids = getUidFromStorage(); // Sirdata Id
+
+    if (!isEmpty(params.authorizedEids) && typeof getGlobal().getUserIds === 'function') {
+      let filteredEids = {};
+      const authorizedEids = params.authorizedEids;
+      const globalUserIds = getGlobal().getUserIds();
+      const globalUserIdsAsEids = getGlobal().getUserIdsAsEids();
+
+      const hasPubProvidedId = authorizedEids.indexOf('pubProvidedId') !== -1;
+
+      if (hasPubProvidedId && !isEmpty(globalUserIds.pubProvidedId)) { // Publisher allows pubProvidedId
+        filteredEids = mergeEuidsArrays(filteredEids, globalUserIds.pubProvidedId);
+      }
+
+      if (!hasPubProvidedId || authorizedEids.length > 1) { // Publisher allows other Id providers
+        const filteredGlobalEids = globalUserIdsAsEids.filter(entry => authorizedEids.includes(entry.source));
+        if (!isEmpty(filteredGlobalEids)) {
+          filteredEids = mergeEuidsArrays(filteredEids, filteredGlobalEids);
+        }
+      }
+
+      if (!isEmpty(filteredEids)) {
+        euids = mergeEuidsArrays(euids, filteredEids); // merge ids for graph id
+      }
+    }
+  }
+
+  const url = `https://${sirdataSubDomain}.${params.sirdataDomain}/api/v1/public/p/${params.partnerId.toString()}/d/${params.key.toString()}/s?callback=&allowed_post_content=${!params.avoidPostContent}${privacySignals}${params.actualUrl ? `&url=${encodeURIComponent(params.actualUrl)}` : ''}`;
+  const method = isEmpty(euids) ? 'GET' : 'POST';
+  const payload = isEmpty(euids) ? null : JSON.stringify({ external_ids: euids });
+
+  try {
+    ajax(url, {
       success: function (response, req) {
         if (req.status === 200) {
           try {
             const data = JSON.parse(response);
             if (data && data.segments) {
-              addSegmentData(reqBidsConfigObj, data, moduleConfig, onDone);
+              addSegmentData(reqBidsConfigObj, data, adUnits, onDone);
             } else {
               onDone();
             }
           } catch (e) {
             onDone();
-            logError('unable to parse Sirdata data' + e);
+            logError(LOG_PREFIX, 'unable to parse Sirdata data' + e);
           }
         } else if (req.status === 204) {
           onDone();
@@ -121,104 +431,136 @@ export function getSegmentsAndCategories(reqBidsConfigObj, onDone, moduleConfig,
       },
       error: function () {
         onDone();
-        logError('unable to get Sirdata data');
+        logError(LOG_PREFIX, 'unable to get Sirdata data');
       }
-    },
-    null,
-    {
+    }, payload, {
       contentType: 'text/plain',
-      method: 'GET',
-      withCredentials: sendWithCredentials,
+      method: method,
+      withCredentials: params.cookieAccessGranted,
       referrerPolicy: 'unsafe-url',
       crossOrigin: true
     });
+  } catch (e) {
+    logError(LOG_PREFIX, e);
+  }
 }
 
+/**
+ * Pushes data to OpenRTB 2.5 fragments for the specified bidder
+ * @param {Object} ortb2Fragments - The OpenRTB 2.5 fragments
+ * @param {string} bidder - The bidder name
+ * @param {Object} data - The data to be pushed
+ * @param {number} segtaxid - The segment taxonomy ID
+ * @param {number} cattaxid - The category taxonomy ID
+ * @returns {boolean} - True if data was pushed successfully
+ */
 export function pushToOrtb2(ortb2Fragments, bidder, data, segtaxid, cattaxid) {
   try {
     if (!isEmpty(data.segments)) {
       if (segtaxid) {
         setOrtb2Sda(ortb2Fragments, bidder, 'user', data.segments, segtaxid);
       } else {
-        setOrtb2(ortb2Fragments, bidder, 'user.ext.data', {sd_rtd: {segments: data.segments}});
+        setOrtb2(ortb2Fragments, bidder, 'user.ext.data', { sd_rtd: { segments: data.segments } });
       }
     }
     if (!isEmpty(data.categories)) {
       if (cattaxid) {
         setOrtb2Sda(ortb2Fragments, bidder, 'site', data.categories, cattaxid);
       } else {
-        setOrtb2(ortb2Fragments, bidder, 'site.ext.data', {sd_rtd: {categories: data.categories}});
+        setOrtb2(ortb2Fragments, bidder, 'site.ext.data', { sd_rtd: { categories: data.categories } });
       }
     }
     if (!isEmpty(data.categories_score) && !cattaxid) {
-      setOrtb2(ortb2Fragments, bidder, 'site.ext.data', {sd_rtd: {categories_score: data.categories_score}});
+      setOrtb2(ortb2Fragments, bidder, 'site.ext.data', { sd_rtd: { categories_score: data.categories_score } });
     }
   } catch (e) {
-    logError(e)
+    logError(LOG_PREFIX, e);
   }
   return true;
 }
 
+/**
+ * Sets OpenRTB 2.5 Seller Defined Audiences (SDA) data
+ * @param {Object} ortb2Fragments - The OpenRTB 2.5 fragments
+ * @param {string} bidder - The bidder name
+ * @param {string} type - The type of data ('user' or 'site')
+ * @param {Array} segments - The segments to be set
+ * @param {number} segtaxValue - The segment taxonomy value
+ * @returns {boolean} - True if data was set successfully
+ */
 export function setOrtb2Sda(ortb2Fragments, bidder, type, segments, segtaxValue) {
   try {
-    let ortb2Data = [{
-      name: ORTB2_NAME,
-      segment: segments.map((segmentId) => ({ id: segmentId })),
-    }];
-    if (segtaxValue) {
-      ortb2Data[0].ext = { segtax: segtaxValue };
-    }
-    let ortb2Conf = (type == 'site' ? {site: {content: {data: ortb2Data}}} : {user: {data: ortb2Data}});
-    if (bidder) {
-      ortb2Conf = {[bidder]: ortb2Conf};
-    }
+    let ortb2Data = [{ name: ORTB2_NAME, segment: segments.map(segmentId => ({ id: segmentId })) }];
+    if (segtaxValue) ortb2Data[0].ext = { segtax: segtaxValue };
+    let ortb2Conf = (type === 'site') ? { site: { content: { data: ortb2Data } } } : { user: { data: ortb2Data } };
+    if (bidder) ortb2Conf = { [bidder]: ortb2Conf };
     mergeDeep(ortb2Fragments, ortb2Conf);
   } catch (e) {
-    logError(e)
+    logError(LOG_PREFIX, e);
   }
   return true;
 }
 
+/**
+ * Sets OpenRTB 2.5 data at the specified path
+ * @param {Object} ortb2Fragments - The OpenRTB 2.5 fragments
+ * @param {string} bidder - The bidder name
+ * @param {string} path - The path to set the data at
+ * @param {Object} segments - The segments to be set
+ * @returns {boolean} - True if data was set successfully
+ */
 export function setOrtb2(ortb2Fragments, bidder, path, segments) {
   try {
-    if (isEmpty(segments)) { return false; }
+    if (isEmpty(segments)) return false;
     let ortb2Conf = {};
-    deepSetValue(ortb2Conf, path, segments || {});
-    if (bidder) {
-      ortb2Conf = {[bidder]: ortb2Conf};
-    }
+    deepSetValue(ortb2Conf, path, segments);
+    if (bidder) ortb2Conf = { [bidder]: ortb2Conf };
     mergeDeep(ortb2Fragments, ortb2Conf);
   } catch (e) {
-    logError(e)
+    logError(LOG_PREFIX, e);
   }
-
   return true;
 }
 
+/**
+ * Loads a custom function for processing ad unit data
+ * @param {function} todo - The custom function to be executed
+ * @param {Object} adUnit - The ad unit object
+ * @param {Object} list - The list of data
+ * @param {Object} data - The data object
+ * @param {Object} bid - The bid object
+ * @returns {boolean} - True if the function was executed successfully
+ */
 export function loadCustomFunction(todo, adUnit, list, data, bid) {
   try {
-    if (typeof todo == 'function') {
-      todo(adUnit, list, data, bid);
-    }
+    if (typeof todo === 'function') todo(adUnit, list, data, bid);
   } catch (e) {
-    logError(e);
+    logError(LOG_PREFIX, e);
   }
   return true;
 }
 
+/**
+ * Gets segments and categories array from the data object
+ * @param {Object} data - The data object
+ * @param {number} minScore - The minimum score threshold for contextual relevancy
+ * @param {string} pid - The partner ID (attributed by Sirdata to bidder)
+ * @returns {Object} - The segments and categories data
+ */
 export function getSegAndCatsArray(data, minScore, pid) {
-  let sirdataData = {'segments': [], 'categories': [], 'categories_score': {}};
-  minScore = minScore && typeof minScore == 'number' ? minScore : 30;
-  let cattaxid = data.cattaxid || null;
-  let segtaxid = data.segtaxid || null;
+  let sirdataData = { segments: [], categories: [], categories_score: {} };
+  minScore = typeof minScore === 'number' ? minScore : 30;
+  const { cattaxid, segtaxid, segments } = data;
+  const contextualCategories = data.contextual_categories || {};
+  // parses contextual categories
   try {
-    if (data && data.contextual_categories) {
-      for (let catId in data.contextual_categories) {
-        if (data.contextual_categories.hasOwnProperty(catId) && data.contextual_categories[catId]) {
-          let value = data.contextual_categories[catId];
-          if (value >= minScore && sirdataData.categories.indexOf(catId) === -1) {
-            if (pid && cattaxid) {
-              sirdataData.categories.push(pid.toString() + 'cc' + catId.toString());
+    if (contextualCategories) {
+      for (let catId in contextualCategories) {
+        if (contextualCategories.hasOwnProperty(catId) && contextualCategories[catId]) {
+          let value = contextualCategories[catId];
+          if (value >= minScore && !sirdataData.categories.includes(catId)) {
+            if (pid === '27440' && cattaxid) { // Equativ only
+              sirdataData.categories.push(`${pid}cc${catId}`);
             } else {
               sirdataData.categories.push(catId.toString());
               sirdataData.categories_score[catId] = value;
@@ -228,176 +570,194 @@ export function getSegAndCatsArray(data, minScore, pid) {
       }
     }
   } catch (e) {
-    logError(e);
+    logError(LOG_PREFIX, e);
   }
+  // parses user-centric segments (empty if no right to access device/process PII)
   try {
-    if (data && data.segments) {
-      for (let segId in data.segments) {
-        if (data.segments.hasOwnProperty(segId) && data.segments[segId]) {
-          let id = data.segments[segId].toString();
-          if (pid && CONTEXT_ONLY) {
-            if (segtaxid) {
-              sirdataData.categories.push(pid.toString() + 'uc' + id);
-            } else {
-              sirdataData.categories.push(id);
-              sirdataData.categories_score[id] = 100;
-            }
+    if (segments) {
+      for (let segId in segments) {
+        if (segments.hasOwnProperty(segId) && segments[segId]) {
+          let id = segments[segId].toString();
+          if (pid === '27440' && segtaxid) { // Equativ only
+            sirdataData.segments.push(`${pid}us${id}`);
           } else {
-            sirdataData.segments.push((pid && segtaxid) ? pid.toString() + 'us' + id : id);
+            sirdataData.segments.push(id);
           }
         }
       }
     }
   } catch (e) {
-    logError(e);
+    logError(LOG_PREFIX, e);
   }
   return sirdataData;
 }
 
-export function applySdaGetSpecificData(data, sirdataData, biddersParamsExist, minScore, reqBids, bid, moduleConfig, indexFound, bidderIndex, adUnit) {
-  // only share SDA data if whitelisted
-  if (!biddersParamsExist || indexFound) {
-    // SDA Publisher
-    let sirdataDataForSDA = getSegAndCatsArray(data, minScore, moduleConfig.params.partnerId);
-    pushToOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, sirdataDataForSDA, data.segtaxid, data.cattaxid);
+/**
+ * Applies Seller Defined Audience (SDA) data and specific data for the bidder
+ * @param {Object} data - The data object
+ * @param {Object} sirdataData - The Sirdata data object
+ * @param {boolean} biddersParamsExist - Flag indicating if bidder parameters exist
+ * @param {Object} reqBids - The request bids object
+ * @param {Object} bid - The bid object
+ * @param {number} bidderIndex - The bidder index
+ * @param {Object} adUnit - The ad unit object
+ * @param {string} aliasActualBidder - The bidder Alias
+ * @returns {Object} - The modified Sirdata data
+ */
+export function applySdaGetSpecificData(data, sirdataData, biddersParamsExist, reqBids, bid, bidderIndex, adUnit, aliasActualBidder) {
+  // Apply custom function or return Bidder Specific Data if publisher is ok
+  if (bidderIndex && params.bidders[bidderIndex]?.customFunction && typeof (params.bidders[bidderIndex]?.customFunction) === 'function') {
+    return loadCustomFunction(params.bidders[bidderIndex].customFunction, adUnit, sirdataData, data, bid);
   }
 
-  // always share SDA for curation
-  let curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : (partnerIds[bid.bidder] ? partnerIds[bid.bidder] : null));
-  if (curationId) {
-    // seller defined audience & bidder specific data
-    if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
-      // Get Bidder Specific Data
-      let curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore, curationId);
-      pushToOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, curationData, data.shared_taxonomy[curationId].segtaxid, data.shared_taxonomy[curationId].cattaxid);
-    }
+  // Only share Publisher SDA data if whitelisted
+  if (!biddersParamsExist || bidderIndex) {
+    // SDA Publisher
+    let sirdataDataForSDA = getSegAndCatsArray(data, params.contextualMinRelevancyScore, params.partnerId.toString());
+    pushToOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, sirdataDataForSDA, data.segtaxid, data.cattaxid);
   }
 
-  // Apply custom function or return Bidder Specific Data if publisher is ok
-  if (!biddersParamsExist || indexFound) {
-    if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
-      return loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataData, data, bid);
-    } else {
-      return sirdataData;
+  // Always share SDA for curation
+  if (!isEmpty(data.shared_taxonomy)) {
+    let curationId = (bidderIndex && params.bidders[bidderIndex]?.curationId) || biddersId[aliasActualBidder];
+    if (curationId && data.shared_taxonomy[curationId]) {
+      // Seller defined audience & bidder specific data
+      let curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], params.contextualMinRelevancyScore, curationId.toString());
+      if (!isEmpty(curationData)) {
+        pushToOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, curationData, data.shared_taxonomy[curationId].segtaxid, data.shared_taxonomy[curationId].cattaxid);
+        mergeDeep(sirdataData, curationData);
+      }
     }
   }
-}
 
-export function applySdaAndDefaultSpecificData(data, sirdataData, biddersParamsExist, minScore, reqBids, bid, moduleConfig, indexFound, bidderIndex, adUnit) {
-  sirdataData = applySdaGetSpecificData(data, sirdataData, biddersParamsExist, minScore, reqBids, bid, moduleConfig, indexFound, bidderIndex, adUnit);
-  /*
-  if (sirdataData.segments && sirdataData.segments.length > 0) {
-    setOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, 'user.ext.data', {sd_rtd: sirdataData.segments});
-  }
-  if (sirdataData.categories && sirdataData.categories.length > 0) {
-    setOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, 'site.ext.data', {sd_rtd: sirdataData.categories});
-  }
-  */
+  return sirdataData;
 }
 
-export function addSegmentData(reqBids, data, moduleConfig, onDone) {
-  const adUnits = reqBids.adUnits;
-  moduleConfig = moduleConfig || {};
-  moduleConfig.params = moduleConfig.params || {};
-  const globalMinScore = moduleConfig.params.hasOwnProperty('contextualMinRelevancyScore') ? moduleConfig.params.contextualMinRelevancyScore : 30;
-  var sirdataData = getSegAndCatsArray(data, globalMinScore, null);
+/**
+ * Adds segment data to the request bids object and processes the data
+ * @param {Object} reqBids - The request bids object
+ * @param {Object} data - The data object
+ * @param {Array} adUnits - The ad units array
+ * @param {function} onDone - The callback function to be called upon completion
+ * @returns {Array} - The ad units array
+ */
+export function addSegmentData(reqBids, data, adUnits, onDone) {
+  logInfo(LOG_PREFIX, 'Dispatch Segments And Categories');
+  const minScore = params.contextualMinRelevancyScore || 30;
+  let sirdataData = getSegAndCatsArray(data, minScore, '');
 
-  const biddersParamsExist = (!!(moduleConfig.params && moduleConfig.params.bidders));
+  const biddersParamsExist = params.bidders.length > 0;
 
   // Global ortb2 SDA
-  if (data.global_taxonomy && !isEmpty(data.global_taxonomy)) {
-    let globalData = {'segments': [], 'categories': [], 'categories_score': []};
+  if (!isEmpty(data.global_taxonomy)) {
     for (let i in data.global_taxonomy) {
+      let globalData;
       if (!isEmpty(data.global_taxonomy[i])) {
-        globalData = getSegAndCatsArray(data.global_taxonomy[i], globalMinScore, null);
-        pushToOrtb2(reqBids.ortb2Fragments?.global, null, globalData, data.global_taxonomy[i].segtaxid, data.global_taxonomy[i].cattaxid);
+        globalData = getSegAndCatsArray(data.global_taxonomy[i], params.contextualMinRelevancyScore, '');
+        if (!isEmpty(globalData)) {
+          pushToOrtb2(reqBids.ortb2Fragments?.global, '', globalData, data.global_taxonomy[i].segtaxid, data.global_taxonomy[i].cattaxid);
+        }
       }
     }
   }
 
   // Google targeting
-  if (typeof window.googletag !== 'undefined' && (moduleConfig.params.setGptKeyValues || !moduleConfig.params.hasOwnProperty('setGptKeyValues'))) {
+  if (typeof window.googletag !== 'undefined' && params.setGptKeyValues) {
     try {
-      let gptCurationId = (moduleConfig.params.gptCurationId ? moduleConfig.params.gptCurationId : (partnerIds['sdRtdForGpt'] ? partnerIds['sdRtdForGpt'] : null));
-      let sirdataMergedList = sirdataData.segments.concat(sirdataData.categories);
-      if (gptCurationId && data.shared_taxonomy && data.shared_taxonomy[gptCurationId]) {
-        let gamCurationData = getSegAndCatsArray(data.shared_taxonomy[gptCurationId], globalMinScore, null);
-        sirdataMergedList = sirdataMergedList.concat(gamCurationData.segments).concat(gamCurationData.categories);
+      const gptCurationId = params.gptCurationId || biddersId.sdRtdForGpt;
+      let sirdataMergedList = [...sirdataData.segments, ...sirdataData.categories];
+
+      if (gptCurationId && data.shared_taxonomy?.[gptCurationId]) {
+        const gamCurationData = getSegAndCatsArray(data.shared_taxonomy[gptCurationId], params.contextualMinRelevancyScore, '');
+        sirdataMergedList = [...sirdataMergedList, ...gamCurationData.segments, ...gamCurationData.categories];
       }
-      window.googletag.cmd.push(function() {
-        window.googletag.pubads().getSlots().forEach(function (n) {
-          if (typeof n.setTargeting !== 'undefined' && sirdataMergedList && sirdataMergedList.length > 0) {
-            n.setTargeting('sd_rtd', sirdataMergedList);
+
+      window.googletag.cmd.push(() => {
+        window.googletag.pubads().getSlots().forEach(slot => {
+          if (typeof slot.setTargeting !== 'undefined' && sirdataMergedList.length > 0) {
+            slot.setTargeting('sd_rtd', sirdataMergedList);
           }
         });
       });
     } catch (e) {
-      logError(e);
+      logError(LOG_PREFIX, e);
     }
   }
 
-  // Bid targeting level for FPD non-generic biders
-  var bidderIndex = '';
-  var indexFound = false;
-
   adUnits.forEach(adUnit => {
-    adUnit.hasOwnProperty('bids') && adUnit.bids.forEach(bid => {
-      bidderIndex = (moduleConfig.params.hasOwnProperty('bidders') ? findIndex(moduleConfig.params.bidders, function (i) {
-        return i.bidder === bid.bidder;
-      }) : false);
-      indexFound = (!!(typeof bidderIndex == 'number' && bidderIndex >= 0));
+    return adUnit.bids?.forEach(bid => {
+      const bidderIndex = findIndex(params.bidders, function (i) { return i.bidder === bid.bidder; });
       try {
-        let minScore = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('contextualMinRelevancyScore') ? moduleConfig.params.bidders[bidderIndex].contextualMinRelevancyScore : globalMinScore);
-
-        switch (bid.bidder) {
-          case 'appnexus':
-          case 'appnexusAst':
-          case 'brealtime':
-          case 'emxdigital':
-          case 'pagescience':
-          case 'gourmetads':
-          case 'matomy':
-          case 'featureforward':
-          case 'oftmedia':
-          case 'districtm':
-          case 'adasta':
-          case 'beintoo':
-          case 'gravity':
-          case 'msq_classic':
-          case 'msq_max':
-          case '366_apx':
-            sirdataData = applySdaGetSpecificData(data, sirdataData, biddersParamsExist, minScore, reqBids, bid, moduleConfig, indexFound, bidderIndex, adUnit);
-            if (sirdataData.segments && sirdataData.segments.length > 0) {
-              setOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, 'user.keywords', 'sd_rtd=' + sirdataData.segments.join(',sd_rtd='));
-            }
-            if (sirdataData.categories && sirdataData.categories.length > 0) {
-              setOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, 'site.content.keywords', 'sd_rtd=' + sirdataData.categories.join(',sd_rtd='));
-            }
-            break;
-
-          default:
-            if (!biddersParamsExist || (indexFound && (!moduleConfig.params.bidders[bidderIndex].hasOwnProperty('adUnitCodes') || moduleConfig.params.bidders[bidderIndex].adUnitCodes.indexOf(adUnit.code) !== -1))) {
-              applySdaAndDefaultSpecificData(data, sirdataData, biddersParamsExist, minScore, reqBids, bid, moduleConfig, indexFound, bidderIndex, adUnit);
-            }
+        const aliasActualBidder = bidderAliasRegistry[bid.bidder] || bid.bidder;
+        if (aliasActualBidder === 'appnexus') {
+          let xandrData = applySdaGetSpecificData(data, sirdataData, biddersParamsExist, reqBids, bid, bidderIndex, adUnit, aliasActualBidder);
+          // Surprisingly, to date Xandr doesn't support SDA, we need to set specific 'keywords' entries
+          if (xandrData.segments.length > 0) {
+            setOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, 'user.keywords', `sd_rtd=${xandrData.segments.join(',sd_rtd=')}`);
+          }
+          if (xandrData.categories.length > 0) {
+            setOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, 'site.content.keywords', `sd_rtd=${xandrData.categories.join(',sd_rtd=')}`);
+          }
+        } else {
+          applySdaGetSpecificData(data, sirdataData, biddersParamsExist, reqBids, bid, bidderIndex, adUnit, aliasActualBidder);
         }
       } catch (e) {
-        logError(e);
+        logError(LOG_PREFIX, e);
       }
-    })
+    });
   });
 
+  // Trigger onDone
   onDone();
+
+  // Postprocessing: should we send async content to categorize content and/or store Sirdata ID (stored in 3PC) within local scope ?
+  if (params.sirdataDomain === 'sddan.com') { // Means consent has been given for device and content access
+    if (!isEmpty(data.sddan_id) && params.cookieAccessGranted) { // Device access allowed by publisher and cookies are supported
+      setUidInStorage(data.sddan_id); // Save Sirdata user ID
+    }
+    if (!params.avoidPostContent && params.actualUrl && !inIframe() && !isEmpty(data.post_content_token)) {
+      onDocumentReady(() => postContentForSemanticAnalysis(data.post_content_token, params.actualUrl));
+    }
+  }
   return adUnits;
 }
 
-export function init(config) {
+/**
+ * Initializes the module with the given configuration
+ * @param {Object} moduleConfig - The module configuration
+ * @returns {boolean} - True if the initialization was successful
+ */
+export function init(moduleConfig) {
+  logInfo(LOG_PREFIX, moduleConfig);
+  if (typeof (moduleConfig.params) !== 'object' || !moduleConfig.params.key) return false;
+  if (typeof (moduleConfig.params.authorizedEids) !== 'object' || !Array.isArray(moduleConfig.params.authorizedEids)) {
+    delete (moduleConfig.params.authorizedEids); // must be array of strings
+  } else {
+    // we need it if the publishers uses user Id module name instead of key or source
+    const resultSet = new Set(
+      moduleConfig.params.authorizedEids.map(item => {
+        const formattedItem = item.toLowerCase().replace(/\s+/g, '_'); // Normalize
+        return eidsProvidersMap[formattedItem] || formattedItem;
+      })
+    );
+    moduleConfig.params.authorizedEids = Array.from(resultSet);
+  }
+  if (typeof (moduleConfig.params.bidders) !== 'object' || !Array.isArray(moduleConfig.params.bidders)) delete (moduleConfig.params.bidders); // must be array of objects
+  delete (moduleConfig.params.sirdataDomain); // delete cookieless domain if specified => shouldn't be overridden by publisher
+  params = Object.assign({}, params, moduleConfig.params);
   return true;
 }
 
+/**
+ * The Sirdata submodule definition
+ * @type {Object}
+ */
 export const sirdataSubmodule = {
   name: SUBMODULE_NAME,
+  gvlid: GVLID,
   init: init,
   getBidRequestData: getSegmentsAndCategories
 };
 
+// Register the Sirdata submodule with the real time data module
 submodule(MODULE_NAME, sirdataSubmodule);
diff --git a/modules/sirdataRtdProvider.md b/modules/sirdataRtdProvider.md
index f67e34db43a..9e712e5fbd6 100644
--- a/modules/sirdataRtdProvider.md
+++ b/modules/sirdataRtdProvider.md
@@ -1,30 +1,28 @@
-# Sirdata Real-Time Data Submodule
+# Sirdata RTD/SDA Module
 
-Module Name: Sirdata Rtd Provider
+Module Name: Sirdata Real-time SDA Module
 Module Type: Rtd Provider
 Maintainer: bob@sirdata.com
 
 # Description
 
-Sirdata provides a disruptive API that allows its partners to leverage its 
-cutting-edge contextualization technology and its audience segments based on 
-cookies and consent or without cookies nor consent! 
+Sirdata provides a disruptive API that allows publishers and SDA compliant SSPs/DSPs to leverage its cutting-edge contextualization technology and its audience segments!
 
-User-based segments and page-level automatic contextual categories will be 
-attached to bid request objects sent to different SSPs in order to optimize
-targeting.
+User-based segments and page-level automatic contextual categories will be attached to bid request objects sent to different bidders in order to optimize targeting.
 
-Automatic integration with Google Ad Manager and major bidders like Xandr/Appnexus,
-Smartadserver, Index Exchange, Proxistore, Magnite/Rubicon or Triplelift !
+Automatic or custom integration with Google Ad Manager and major bidders like Xandr's, Equativ's, Index Exchange's, Proxistore's, Magnite's or Triplelift's !
 
-User's country and choice management are included in the module, so it's 100%
-compliant with local and regional laws like GDPR and CCPA/CPRA.
+User's country and choice management are included in the module, so it's 100% compliant with local and regional laws like GDPR and CCPA/CPRA.
 
 ORTB2 compliant and FPD support for Prebid versions < 4.29
 
-Contact bob@sirdata.com for information.
+Fully supports Seller Defined Audience ! Please find the full SDA taxonomy ids list here.
 
-### Publisher Usage
+Please contact  for more information.
+
+## Publisher Usage
+
+### Configure Prebid.js
 
 Compile the Sirdata RTD module into your Prebid build:
 
@@ -32,15 +30,39 @@ Compile the Sirdata RTD module into your Prebid build:
 
 Add the Sirdata RTD provider to your Prebid config.
 
-Segments ids (user-centric) and category ids (page-centric) will be provided
-salted and hashed : you can use them with a dedicated and private matching table.
-Should you want to allow a SSP or a partner to curate your media and operate
-cross-publishers campaigns with our data, please ask Sirdata (bob@sirdata.com) to
-open it for you account. 
+`actualUrl` MUST be set with actual location of parent page if prebid.js is loaded in an iframe (e.g. hosted). It can be left blank ('') or removed otherwise.
+
+`partnerId` and `key` should be provided by your partnering SSP or get one and your dedicated taxonomy from Sirdata (). Segments ids (user-centric) and category ids (page-centric) will be provided salted and hashed : you can use them with a dedicated and private matching table.
+
+Should you want to allow any SSP or a partner to curate your media and operate cross-publishers campaigns with our data, please ask Sirdata () to whitelist him it in your account.
+
+#### Typical configuration
 
+```javascript
+pbjs.setConfig({
+    // ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "SirdataRTDModule",
+                waitForIt: true,
+                params: {
+                    partnerId: 1,
+                    key: 1,
+                }
+            }
+        ]
+    }
+    // ...
+});
 ```
-pbjs.setConfig(
-    ...
+
+#### Advanced configuration
+
+```javascript
+pbjs.setConfig({
+    // ...
     realTimeData: {
         auctionDelay: 1000,
         dataProviders: [
@@ -48,85 +70,114 @@ pbjs.setConfig(
                 name: "SirdataRTDModule",
                 waitForIt: true,
                 params: {
-                	partnerId: 1,
+                    partnerId: 1,
                     key: 1,
-                	setGptKeyValues: true,
-                	contextualMinRelevancyScore: 50, //Min score to filter contextual category globally (0-100 scale)
-                	actualUrl: actual_url, //top location url, for contextual categories
-                    bidders: [{
-                        bidder: 'appnexus',
-                        adUnitCodes: ['adUnit-1','adUnit-2'],
-                        customFunction: overrideAppnexus,
-                        curationId: '111',
-                    },{
-                        bidder: 'ix',
-                        sizeLimit: 1200 //specific to Index Exchange,
-                        contextualMinRelevancyScore: 50, //Min score to filter contextual category for curation in the bidder (0-100 scale)
-                    }]
+                    setGptKeyValues: true,
+                    contextualMinRelevancyScore: 50, //Min score to filter contextual category globally (0-100 scale)
+                    actualUrl: '' //top location url, for contextual categories
                 }
             }
         ]
     }
-    ...
-}
+    // ...
+});
 ```
 
 ### Parameter Descriptions for the Sirdata Configuration Section
 
-| Name  |Type | Description   | Notes  |
-| :------------ | :------------ | :------------ |:------------ |
-| name | String | Real time data module name | Mandatory. Always 'SirdataRTDModule' |
-| waitForIt | Boolean | Mandatory. Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false but recommended to true |
-| params | Object | | Optional |
-| params.partnerId | Integer | Partner ID, required to get results and provided by Sirdata. Use 1 for tests and get one running at bob@sirdata.com | Mandatory. Defaults 1. |
-| params.key | Integer | Key linked to Partner ID, required to get results and provided by Sirdata. Use 1 for tests and get one running at bob@sirdata.com | Mandatory. Defaults 1. |
-| params.setGptKeyValues | Boolean | This parameter Sirdata to set Targeting for GPT/GAM | Optional. Defaults to true. |
-| params.contextualMinRelevancyScore | Integer | Min score to keep filter category in the bidders (0-100 scale). Optional. Defaults to 30. |
-| params.bidders | Object | Dictionary of bidders you would like to supply Sirdata data for. | Optional. In case no bidder is specified Sirdata will atend to ad data custom and ortb2 to all bidders, adUnits & Globalconfig |
+| Name                               | Type                      | Description                                                                                                                             | Notes                                                                                                    |
+|:-----------------------------------|:--------------------------|:----------------------------------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------|
+| name                               | String                    | Real time data module name                                                                                                              | Mandatory. Always 'SirdataRTDModule'                                                                     |
+| waitForIt                          | Boolean                   | Required to ensure that the auction is delayed until prefetch is complete                                                               | Optional. Default to false but recommended to true                                                       |
+| params                             | Object                    | Settings                                                                                                                                | Optional                                                                                                 |
+| params.partnerId                   | Integer                   | Partner ID, required to get results and provided by Sirdata. Use 1 for tests and request your Id at                 | Mandatory. Default 1                                                                                     |
+| params.key                         | Integer                   | Key linked to Partner ID, required to get results and provided by Sirdata. Use 1 for tests and request your key at  | Mandatory. Default 1                                                                                     |
+| params.setGptKeyValues             | Boolean                   | Sets Targeting for GPT/GAM                                                                                                              | Optional. Default to true                                                                                |
+| params.authorizedEids              | Array of String           | List of authorised Eids for graph. Set [] to prevent all Eids usage                                                                     | Optional. Default to : ID5, pubProvidedId and sharedId                                                   |
+| params.avoidPostContent            | Boolean                   | Block contextual data POST from user's device (a crawler is use instead)                                                                | Optional. Default to false, and setting it to true results in your content downloaded by Sirdata crawler |
+| params.contextualMinRelevancyScore | Integer                   | Min relevancy score to filter categories sent to the bidders (0-100 scale).                                                             | Optional. Defaults to 30.                                                                                |
+| params.bidders                     | Array of Object           | Bidders you want to supply your own data to (works only with your private data bought to Sirdata)                                       | Optional                                                                                                 |
 
 Bidders can receive common setting :
-| Name  |Type | Description   | Notes  |
-| :------------ | :------------ | :------------ |:------------ |
-| bidder | String | Bidder name | Mandatory if params.bidders are specified |
-| adUnitCodes | Array of String | Use if you want to limit data injection to specified adUnits for the bidder | Optional. Default is false and data shared with the bidder isn't filtered |
-| customFunction | Function | Use it to override the way data is shared with a bidder | Optional. Default is false |
-| curationId | String | Specify the curation ID of the bidder. Provided by Sirdata, request it at bob@sirdata.com | Optional. Default curation ids are specified for main bidders |
-| contextualMinRelevancyScore | Integer | Min score to filter contextual categories for curation in the bidder (0-100 scale). Optional. Defaults to 30 or global params.contextualMinRelevancyScore if exits. |
-| sizeLimit | Integer | used only for bidder 'ix' to limit the size of the get parameter in Index Exchange ad call | Optional. Default is 1000 |
 
+| Name           | Type            | Description                                                                                    | Notes                                                                     |
+|:---------------|:----------------|:-----------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------|
+| bidder         | String          | Bidder name                                                                                    | Mandatory if params.bidders are specified                                 |
+| adUnitCodes    | Array of String | Use if you want to limit data injection to specified adUnits for the bidder                    | Optional. Default is false and data shared with the bidder isn't filtered |
+| customFunction | Function        | Use it to override the way data is shared with a bidder                                        | Optional. Default is false                                                |
+| curationId     | String          | Specify the curation ID of the bidder. Provided by Sirdata, request it at  | Optional. Default curation ids are specified for main bidders             |
 
 ### Overriding data sharing function
-As indicated above, it is possible to provide your own bid augmentation
-functions. This is useful if you know a bid adapter's API supports segment
-fields which aren't specifically being added to request objects in the Prebid
-bid adapter.
 
-Please see the following example, which provides a function to modify bids for
-a bid adapter called ix and overrides the appnexus.
+As indicated above, it is possible to provide your own bid augmentation functions. This is useful if you know a bid adapter's API supports segment fields which aren't specifically being added to request objects in the Prebid bid adapter.
 
+Please see the following example, which provides a function to modify bids for a bid adapter called ix and overrides the appnexus.
 data Object format for usage in this kind of function :
+
+```json
 {
-	"segments":[111111,222222],
-	"contextual_categories":{"333333":100},
-	"shared_taxonomy":{
-		"27446":{ //CurationId
-			"segments":[444444,555555],
-			"contextual_categories":{"666666":100}
-		}
-	}
+  "segments": [
+    111111,
+    222222
+  ],
+  "segtaxid": null,
+  "cattaxid": null,
+  "contextual_categories": {
+    "333333": 100
+  },
+  "shared_taxonomy": {
+    "27440": {
+      "segments": [
+        444444,
+        555555
+      ],
+      "segtaxid": 552,
+      "cattaxid": 553,
+      "contextual_categories": {
+        "666666": 100
+      }
+    }
+  },
+  "global_taxonomy": {
+    "9998": {
+      "segments": [
+        123,
+        234
+      ],
+      "segtaxid": 4,
+      "cattaxid": 7,
+      "contextual_categories": {
+        "345": 100,
+        "456": 100
+      }
+    },
+    "9999": {
+      "segments": [
+        12345,
+        23456
+      ],
+      "segtaxid": 550,
+      "cattaxid": 551,
+      "contextual_categories": {
+        "34567": 100,
+        "45678": 100
+      }
+    }
+  }
 }
-
 ```
+
+```javascript
 function overrideAppnexus (adUnit, segmentsArray, dataObject, bid) {
-	for (var i = 0; i < segmentsArray.length; i++) {
+    for (var i = 0; i < segmentsArray.length; i++) {
         if (segmentsArray[i]) {
             bid.params.user.segments.push(segmentsArray[i]);
         }
     }
 }
 
-pbjs.setConfig(
-    ...
+pbjs.setConfig({
+    // ...
     realTimeData: {
         auctionDelay: 1000,
         dataProviders: [
@@ -134,18 +185,17 @@ pbjs.setConfig(
                 name: "SirdataRTDModule",
                 waitForIt: true,
                 params: {
-                	partnerId: 1,
+                    partnerId: 1,
                     key: 1,
-                	setGptKeyValues: true,
-                	contextualMinRelevancyScore: 50, //Min score to keep contextual category in the bidders (0-100 scale)
-                	actualUrl: actual_url, //top location url, for contextual categories
+                    setGptKeyValues: true,
+                    contextualMinRelevancyScore: 50, //Min score to keep contextual category in the bidders (0-100 scale)
+                    actualUrl: actual_url, //top location url, for contextual categories
                     bidders: [{
                         bidder: 'appnexus',
                         customFunction: overrideAppnexus,
                         curationId: '111'
                     },{
                         bidder: 'ix',
-                        sizeLimit: 1200, //specific to Index Exchange
                         customFunction: function(adUnit, segmentsArray, dataObject, bid) {
                             bid.params.contextual.push(dataObject.contextual_categories);
                         },
@@ -153,17 +203,19 @@ pbjs.setConfig(
                 }
             }
         ]
-    }
+    },
     ...
-}
+});
 ```
 
 ### Testing
 
 To view an example of available segments returned by Sirdata's backends:
 
-`gulp serve --modules=rtdModule,sirdataRtdProvider,appnexusBidAdapter`
+```bash
+gulp serve --modules=rtdModule,sirdataRtdProvider,appnexusBidAdapter
+```
 
 and then point your browser at:
 
-`http://localhost:9999/integrationExamples/gpt/sirdataRtdProvider_example.html`
\ No newline at end of file
+[http://localhost:9999/integrationExamples/gpt/sirdataRtdProvider_example.html]
diff --git a/modules/sizeMapping.js b/modules/sizeMapping.js
index fcd0b0963f2..9b2a37d0235 100644
--- a/modules/sizeMapping.js
+++ b/modules/sizeMapping.js
@@ -4,7 +4,6 @@ import {includes} from '../src/polyfill.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {setupAdUnitMediaTypes} from '../src/adapterManager.js';
 
-let installed = false;
 let sizeConfig = [];
 
 /**
@@ -24,18 +23,16 @@ let sizeConfig = [];
  */
 export function setSizeConfig(config) {
   sizeConfig = config;
-  if (!installed) {
-    setupAdUnitMediaTypes.before((next, adUnit, labels) => next(processAdUnitsForLabels(adUnit, labels), labels));
-    installed = true;
-  }
 }
+
+setupAdUnitMediaTypes.before((next, adUnit, labels) => next(processAdUnitsForLabels(adUnit, labels), labels));
 config.getConfig('sizeConfig', config => setSizeConfig(config.sizeConfig));
 
 /**
  * Returns object describing the status of labels on the adUnit or bidder along with labels passed into requestBids
  * @param bidOrAdUnit the bidder or adUnit to get label info on
  * @param activeLabels the labels passed to requestBids
- * @returns {LabelDescriptor}
+ * @returns {object}
  */
 export function getLabels(bidOrAdUnit, activeLabels) {
   if (bidOrAdUnit.labelAll) {
@@ -66,14 +63,18 @@ if (FEATURES.VIDEO) {
 }
 
 /**
- * Resolves the unique set of the union of all sizes and labels that are active from a SizeConfig.mediaQuery match
- * @param {Array} labels Labels specified on adUnit or bidder
- * @param {boolean} labelAll if true, all labels must match to be enabled
- * @param {Array} activeLabels Labels passed in through requestBids
- * @param {object} mediaTypes A mediaTypes object describing the various media types (banner, video, native)
- * @param {Array>} sizes Sizes specified on adUnit (deprecated)
- * @param {Array} configs
- * @returns {{labels: Array, sizes: Array>}}
+ * Resolves the unique set of the union of all sizes and labels that are active from a SizeConfig.mediaQuery match.
+ *
+ * @param {Object} options - The options object.
+ * @param {Array} [options.labels=[]] - Labels specified on adUnit or bidder.
+ * @param {boolean} [options.labelAll=false] - If true, all labels must match to be enabled.
+ * @param {Array} [options.activeLabels=[]] - Labels passed in through requestBids.
+ * @param {Object} mediaTypes - A mediaTypes object describing the various media types (banner, video, native).
+ * @param {Array} configs - An array of SizeConfig objects.
+ * @returns {Object} - An object containing the active status, media types, and filter results.
+ * @returns {boolean} return.active - Whether the media types are active.
+ * @returns {Object} return.mediaTypes - The media types object.
+ * @returns {Object} [return.filterResults] - The filter results before and after applying size filtering.
  */
 export function resolveStatus({labels = [], labelAll = false, activeLabels = []} = {}, mediaTypes, configs = sizeConfig) {
   let maps = evaluateSizeConfig(configs);
diff --git a/modules/sizeMappingV2.js b/modules/sizeMappingV2.js
index d212d98f50b..5ddb2e410cb 100644
--- a/modules/sizeMappingV2.js
+++ b/modules/sizeMappingV2.js
@@ -63,7 +63,7 @@ export function isUsingNewSizeMapping(adUnits) {
   does not recognize.
   @params {Array} adUnits
   @returns {Array} validateAdUnits - Unrecognized properties are deleted.
-*/
+ */
 export function checkAdUnitSetupHook(adUnits) {
   const validateSizeConfig = function (mediaType, sizeConfig, adUnitCode) {
     let isValid = true;
diff --git a/modules/slimcutBidAdapter.js b/modules/slimcutBidAdapter.js
index c3f06556652..250c1ebb19e 100644
--- a/modules/slimcutBidAdapter.js
+++ b/modules/slimcutBidAdapter.js
@@ -5,6 +5,13 @@ import {
 import {
   ajax
 } from '../src/ajax.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'slimcut';
 const ENDPOINT_URL = 'https://sb.freeskreen.com/pbr';
 export const spec = {
@@ -13,11 +20,11 @@ export const spec = {
   aliases: [{ code: 'scm', gvlid: 102 }],
   supportedMediaTypes: ['video', 'banner'],
   /**
-     * Determines whether or not the given bid request is valid.
-     *
-     * @param {BidRequest} bid The bid params to validate.
-     * @return boolean True if this is a valid bid, and false otherwise.
-     */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     let isValid = false;
     if (typeof bid.params !== 'undefined' && !isNaN(parseInt(getValue(bid.params, 'placementId'))) && parseInt(getValue(bid.params, 'placementId')) > 0) {
@@ -26,11 +33,11 @@ export const spec = {
     return isValid;
   },
   /**
-     * Make a server request from the list of BidRequests.
-     *
-     * @param {validBidRequests[]} an array of bids
-     * @return ServerRequest Info describing the request to the server.
-     */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     const bids = validBidRequests.map(buildRequestObject);
     const payload = {
@@ -55,11 +62,11 @@ export const spec = {
     };
   },
   /**
-     * Unpack the response from the server into a list of bids.
-     *
-     * @param {*} serverResponse A successful response from the server.
-     * @return {Bid[]} An array of bids which were nested inside the server.
-     */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, request) {
     const bidResponses = [];
     serverResponse = serverResponse.body;
diff --git a/modules/smaatoBidAdapter.js b/modules/smaatoBidAdapter.js
index b735953d099..f8a363cb084 100644
--- a/modules/smaatoBidAdapter.js
+++ b/modules/smaatoBidAdapter.js
@@ -3,142 +3,31 @@ import {find} from '../src/polyfill.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {ADPOD, BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import CONSTANTS from '../src/constants.json';
+import {NATIVE_IMAGE_TYPES} from '../src/constants.js';
 import {getAdUnitSizes} from '../libraries/sizeUtils/sizeUtils.js';
 import {fill} from '../libraries/appnexusUtils/anUtils.js';
 import {chunk} from '../libraries/chunk/chunk.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
 
-const { NATIVE_IMAGE_TYPES } = CONSTANTS;
 const BIDDER_CODE = 'smaato';
 const SMAATO_ENDPOINT = 'https://prebid.ad.smaato.net/oapi/prebid';
-const SMAATO_CLIENT = 'prebid_js_$prebid.version$_1.8'
+const SMAATO_CLIENT = 'prebid_js_$prebid.version$_3.2'
+const TTL = 300;
 const CURRENCY = 'USD';
-
-const buildOpenRtbBidRequest = (bidRequest, bidderRequest) => {
-  const requestTemplate = {
-    id: bidderRequest.bidderRequestId,
-    at: 1,
-    cur: [CURRENCY],
-    tmax: bidderRequest.timeout,
-    site: {
-      id: window.location.hostname,
-      // TODO: do the fallbacks make sense here?
-      domain: bidderRequest.refererInfo.domain || window.location.hostname,
-      page: bidderRequest.refererInfo.page || window.location.href,
-      ref: bidderRequest.refererInfo.ref
-    },
-    device: {
-      language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
-      ua: navigator.userAgent,
-      dnt: getDNT() ? 1 : 0,
-      h: screen.height,
-      w: screen.width
-    },
-    regs: {
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ext: {}
-    },
-    user: {
-      ext: {}
-    },
-    source: {
-      ext: {
-        schain: bidRequest.schain
-      }
-    },
-    ext: {
-      client: SMAATO_CLIENT
-    }
-  };
-
-  let ortb2 = bidderRequest.ortb2 || {};
-  Object.assign(requestTemplate.user, ortb2.user);
-  Object.assign(requestTemplate.site, ortb2.site);
-
-  deepSetValue(requestTemplate, 'site.publisher.id', deepAccess(bidRequest, 'params.publisherId'));
-
-  if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies === true) {
-    deepSetValue(requestTemplate, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
-    deepSetValue(requestTemplate, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-  }
-
-  if (bidderRequest.uspConsent !== undefined) {
-    deepSetValue(requestTemplate, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-  }
-
-  if (ortb2.regs?.gpp !== undefined) {
-    deepSetValue(requestTemplate, 'regs.ext.gpp', ortb2.regs.gpp);
-    deepSetValue(requestTemplate, 'regs.ext.gpp_sid', ortb2.regs.gpp_sid);
-  }
-
-  if (ortb2.device?.ifa !== undefined) {
-    deepSetValue(requestTemplate, 'device.ifa', ortb2.device.ifa);
-  }
-
-  if (ortb2.device?.geo !== undefined) {
-    deepSetValue(requestTemplate, 'device.geo', ortb2.device.geo);
-  }
-
-  if (deepAccess(bidRequest, 'params.app')) {
-    if (!deepAccess(requestTemplate, 'device.geo')) {
-      const geo = deepAccess(bidRequest, 'params.app.geo');
-      deepSetValue(requestTemplate, 'device.geo', geo);
-    }
-    if (!deepAccess(requestTemplate, 'device.ifa')) {
-      const ifa = deepAccess(bidRequest, 'params.app.ifa');
-      deepSetValue(requestTemplate, 'device.ifa', ifa);
-    }
-  }
-
-  const eids = deepAccess(bidRequest, 'userIdAsEids');
-  if (eids && eids.length) {
-    deepSetValue(requestTemplate, 'user.ext.eids', eids);
-  }
-
-  let requests = [];
-
-  if (deepAccess(bidRequest, 'mediaTypes.banner')) {
-    const bannerRequest = Object.assign({}, requestTemplate, createBannerImp(bidRequest));
-    requests.push(bannerRequest);
-  }
-
-  const videoMediaType = deepAccess(bidRequest, 'mediaTypes.video');
-  if (videoMediaType) {
-    if (videoMediaType.context === ADPOD) {
-      const adPodRequest = Object.assign({}, requestTemplate, createAdPodImp(bidRequest, videoMediaType));
-      addOptionalAdpodParameters(adPodRequest, videoMediaType);
-      requests.push(adPodRequest);
-    } else {
-      const videoRequest = Object.assign({}, requestTemplate, createVideoImp(bidRequest, videoMediaType));
-      requests.push(videoRequest);
-    }
-  }
-
-  const nativeOrtbRequest = bidRequest.nativeOrtbRequest;
-  if (nativeOrtbRequest) {
-    const nativeRequest = Object.assign({}, requestTemplate, createNativeImp(bidRequest, nativeOrtbRequest));
-    requests.push(nativeRequest);
-  }
-
-  return requests;
-}
-
-const buildServerRequest = (validBidRequest, data) => {
-  logInfo('[SMAATO] OpenRTB Request:', data);
-  return {
-    method: 'POST',
-    url: validBidRequest.params.endpoint || SMAATO_ENDPOINT,
-    data: JSON.stringify(data),
-    options: {
-      withCredentials: true,
-      crossOrigin: true,
-    }
-  };
-}
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO, NATIVE];
+const SYNC_URL = 'https://s.ad.smaato.net/c/?adExInit=p'
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
   gvlid: 82,
 
   /**
@@ -188,13 +77,30 @@ export const spec = {
     return true;
   },
 
-  buildRequests: (validBidRequests, bidderRequest) => {
+  buildRequests: (bidRequests, bidderRequest) => {
     logInfo('[SMAATO] Client version:', SMAATO_CLIENT);
 
-    return validBidRequests.map((validBidRequest) => {
-      const openRtbBidRequests = buildOpenRtbBidRequest(validBidRequest, bidderRequest);
-      return openRtbBidRequests.map((openRtbBidRequest) => buildServerRequest(validBidRequest, openRtbBidRequest));
-    }).reduce((acc, item) => item != null && acc.concat(item), []);
+    let requests = [];
+    bidRequests.forEach(bid => {
+      // separate requests per mediaType
+      SUPPORTED_MEDIA_TYPES.forEach(mediaType => {
+        if ((bid.mediaTypes && bid.mediaTypes[mediaType]) || (mediaType === NATIVE && bid.nativeOrtbRequest)) {
+          const data = converter.toORTB({bidderRequest, bidRequests: [bid], context: {mediaType}});
+          requests.push({
+            method: 'POST',
+            url: bid.params.endpoint || SMAATO_ENDPOINT,
+            data: JSON.stringify(data),
+            options: {
+              withCredentials: true,
+              crossOrigin: true,
+            },
+            bidderRequest
+          })
+        }
+      });
+    });
+
+    return requests;
   },
   /**
    * Unpack the response from the server into a list of bids.
@@ -232,11 +138,12 @@ export const spec = {
           creativeId: bid.crid,
           dealId: bid.dealid || null,
           netRevenue: deepAccess(bid, 'ext.net', true),
-          currency: response.cur,
+          currency: CURRENCY,
           meta: {
             advertiserDomains: bid.adomain,
             networkName: bid.bidderName,
-            agencyId: seatbid.seat
+            agencyId: seatbid.seat,
+            ...(bid.ext?.dsa && {dsa: bid.ext.dsa})
           }
         };
 
@@ -255,12 +162,8 @@ export const spec = {
         } else {
           switch (smtAdType) {
             case 'Img':
-              resultingBid.ad = createImgAd(bid.adm);
-              resultingBid.mediaType = BANNER;
-              bids.push(resultingBid);
-              break;
             case 'Richmedia':
-              resultingBid.ad = createRichmediaAd(bid.adm);
+              resultingBid.ad = createBannerAd(bid);
               resultingBid.mediaType = BANNER;
               bids.push(resultingBid);
               break;
@@ -294,42 +197,206 @@ export const spec = {
    * @return {UserSync[]} The user syncs which should be dropped.
    */
   getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    if (syncOptions && syncOptions.pixelEnabled) {
+      let gdprParams = '';
+      if (gdprConsent && gdprConsent.consentString) {
+        if (typeof gdprConsent.gdprApplies === 'boolean') {
+          gdprParams = `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+        } else {
+          gdprParams = `&gdpr_consent=${gdprConsent.consentString}`;
+        }
+      }
+
+      return [{
+        type: 'image',
+        url: SYNC_URL + gdprParams
+      }];
+    }
+
     return [];
   }
 }
 registerBidder(spec);
 
-const createImgAd = (adm) => {
-  const image = JSON.parse(adm).image;
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: TTL,
+    currency: CURRENCY
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    function isGdprApplicable() {
+      return bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies;
+    }
 
-  let clickEvent = '';
-  image.clicktrackers.forEach(src => {
-    clickEvent += `fetch(decodeURIComponent('${encodeURIComponent(src)}'), {cache: 'no-cache'});`;
-  })
+    function setPublisherId(node) {
+      deepSetValue(node, 'publisher.id', bidRequest.params.publisherId);
+    }
 
-  let markup = `
`;
+    const request = buildRequest(imps, bidderRequest, context);
+    const bidRequest = context.bidRequests[0];
+    let content;
+    const mediaType = context.mediaType;
+    if (mediaType === VIDEO) {
+      const videoParams = bidRequest.mediaTypes[VIDEO];
+      if (videoParams.context === ADPOD) {
+        request.imp = createAdPodImp(request.imp[0], videoParams);
+        content = addOptionalAdpodParameters(videoParams);
+      }
+    }
 
-  image.impressiontrackers.forEach(src => {
-    markup += ``;
-  });
+    request.at = 1;
 
-  return markup + '
';
-};
+    if (request.user) {
+      if (isGdprApplicable()) {
+        deepSetValue(request.user, 'ext.consent', bidderRequest.gdprConsent.consentString);
+      }
+    } else {
+      const eids = deepAccess(bidRequest, 'userIdAsEids');
+      request.user = {
+        ext: {
+          consent: isGdprApplicable() ? bidderRequest.gdprConsent.consentString : null,
+          eids: (eids && eids.length) ? eids : null
+        }
+      }
+    }
 
-const createRichmediaAd = (adm) => {
-  const rich = JSON.parse(adm).richmedia;
-  let clickEvent = '';
-  rich.clicktrackers.forEach(src => {
-    clickEvent += `fetch(decodeURIComponent('${encodeURIComponent(src)}'), {cache: 'no-cache'});`;
-  })
+    if (request.site) {
+      request.site.id = window.location.hostname
+      if (content) {
+        request.site.content = content;
+      }
+      setPublisherId(request.site);
+    } else if (request.dooh) {
+      request.dooh.id = window.location.hostname
+      if (content) {
+        request.dooh.content = content;
+      }
+      setPublisherId(request.dooh);
+    } else {
+      request.site = {
+        id: window.location.hostname,
+        domain: bidderRequest.refererInfo.domain || window.location.hostname,
+        page: bidderRequest.refererInfo.page || window.location.href,
+        ref: bidderRequest.refererInfo.ref,
+        content: content || null
+      }
+      setPublisherId(request.site);
+    }
+
+    if (request.regs) {
+      if (isGdprApplicable()) {
+        deepSetValue(request.regs, 'ext.gdpr', bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
+      }
+      if (bidderRequest.uspConsent !== undefined) {
+        deepSetValue(request.regs, 'ext.us_privacy', bidderRequest.uspConsent);
+      }
+      if (request.regs?.gpp) {
+        deepSetValue(request.regs, 'ext.gpp', request.regs.gpp);
+        deepSetValue(request.regs, 'ext.gpp_sid', request.regs.gpp_sid);
+      }
+    } else {
+      request.regs = {
+        coppa: config.getConfig('coppa') === true ? 1 : 0,
+        ext: {
+          gdpr: isGdprApplicable() ? bidderRequest.gdprConsent.gdprApplies ? 1 : 0 : null,
+          us_privacy: bidderRequest.uspConsent
+        }
+      }
+    }
+
+    if (!request.device) {
+      request.device = {
+        language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
+        ua: navigator.userAgent,
+        dnt: getDNT() ? 1 : 0,
+        h: screen.height,
+        w: screen.width
+      }
+    }
+    if (bidRequest.params.app) {
+      if (!deepAccess(request.device, 'geo')) {
+        const geo = deepAccess(bidRequest, 'params.app.geo');
+        deepSetValue(request.device, 'geo', geo);
+      }
+      if (!deepAccess(request.device, 'ifa')) {
+        const ifa = deepAccess(bidRequest, 'params.app.ifa');
+        deepSetValue(request.device, 'ifa', ifa);
+      }
+    }
+
+    request.source = {
+      ext: {
+        schain: bidRequest.schain
+      }
+    };
+    request.ext = {
+      client: SMAATO_CLIENT
+    }
+    return request;
+  },
 
-  let markup = `
${rich.mediadata.content}`;
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    deepSetValue(imp, 'tagid', bidRequest.params.adbreakId || bidRequest.params.adspaceId);
+    if (imp.bidfloorcur && imp.bidfloorcur !== CURRENCY) {
+      delete imp.bidfloor;
+      delete imp.bidfloorcur;
+    }
+    return imp;
+  },
 
-  rich.impressiontrackers.forEach(src => {
-    markup += ``;
-  });
+  overrides: {
+    imp: {
+      banner(orig, imp, bidRequest, context) {
+        const mediaType = context.mediaType;
 
-  return markup + '
';
+        if (mediaType === BANNER) {
+          imp.bidfloor = getBidFloor(bidRequest, BANNER, getAdUnitSizes(bidRequest));
+        }
+
+        orig(imp, bidRequest, context);
+      },
+
+      video(orig, imp, bidRequest, context) {
+        const mediaType = context.mediaType;
+        if (mediaType === VIDEO) {
+          const videoParams = bidRequest.mediaTypes[VIDEO];
+          imp.bidfloor = getBidFloor(bidRequest, VIDEO, videoParams.playerSize);
+          if (videoParams.context !== ADPOD) {
+            deepSetValue(imp, 'video.ext', {
+              rewarded: videoParams.ext && videoParams.ext.rewarded ? videoParams.ext.rewarded : 0
+            })
+          }
+        }
+
+        orig(imp, bidRequest, context);
+      },
+
+      native(orig, imp, bidRequest, context) {
+        const mediaType = context.mediaType;
+
+        if (mediaType === NATIVE) {
+          imp.bidfloor = getBidFloor(bidRequest, NATIVE, getNativeMainImageSize(bidRequest.nativeOrtbRequest));
+        }
+
+        orig(imp, bidRequest, context);
+      }
+    },
+  }
+});
+
+const createBannerAd = (bid) => {
+  let clickEvent = '';
+  if (bid.ext && bid.ext.curls) {
+    let clicks = ''
+    bid.ext.curls.forEach(src => {
+      clicks += `fetch(decodeURIComponent('${encodeURIComponent(src)}'), {cache: 'no-cache'});`;
+    })
+    clickEvent = `onclick="${clicks}"`
+  }
+
+  return `
${bid.adm}
`;
 };
 
 const createNativeAd = (adm) => {
@@ -339,65 +406,6 @@ const createNativeAd = (adm) => {
   }
 };
 
-function createBannerImp(bidRequest) {
-  const adUnitSizes = getAdUnitSizes(bidRequest);
-  const sizes = adUnitSizes.map((size) => ({w: size[0], h: size[1]}));
-  return {
-    imp: [{
-      id: bidRequest.bidId,
-      tagid: deepAccess(bidRequest, 'params.adspaceId'),
-      bidfloor: getBidFloor(bidRequest, BANNER, adUnitSizes),
-      instl: deepAccess(bidRequest.ortb2Imp, 'instl'),
-      banner: {
-        w: sizes[0].w,
-        h: sizes[0].h,
-        format: sizes
-      }
-    }]
-  };
-}
-
-function createVideoImp(bidRequest, videoMediaType) {
-  return {
-    imp: [{
-      id: bidRequest.bidId,
-      tagid: deepAccess(bidRequest, 'params.adspaceId'),
-      bidfloor: getBidFloor(bidRequest, VIDEO, videoMediaType.playerSize),
-      instl: deepAccess(bidRequest.ortb2Imp, 'instl'),
-      video: {
-        mimes: videoMediaType.mimes,
-        minduration: videoMediaType.minduration,
-        startdelay: videoMediaType.startdelay,
-        linearity: videoMediaType.linearity,
-        w: videoMediaType.playerSize[0][0],
-        h: videoMediaType.playerSize[0][1],
-        maxduration: videoMediaType.maxduration,
-        skip: videoMediaType.skip,
-        protocols: videoMediaType.protocols,
-        ext: {
-          rewarded: videoMediaType.ext && videoMediaType.ext.rewarded ? videoMediaType.ext.rewarded : 0
-        },
-        skipmin: videoMediaType.skipmin,
-        api: videoMediaType.api
-      }
-    }]
-  };
-}
-
-function createNativeImp(bidRequest, nativeRequest) {
-  return {
-    imp: [{
-      id: bidRequest.bidId,
-      tagid: deepAccess(bidRequest, 'params.adspaceId'),
-      bidfloor: getBidFloor(bidRequest, NATIVE, getNativeMainImageSize(nativeRequest)),
-      native: {
-        request: JSON.stringify(nativeRequest),
-        ver: '1.2'
-      }
-    }]
-  };
-}
-
 function getNativeMainImageSize(nativeRequest) {
   const mainImage = find(nativeRequest.assets, asset => asset.hasOwnProperty('img') && asset.img.type === NATIVE_IMAGE_TYPES.MAIN)
   if (mainImage) {
@@ -411,30 +419,12 @@ function getNativeMainImageSize(nativeRequest) {
   return []
 }
 
-function createAdPodImp(bidRequest, videoMediaType) {
-  const tagid = deepAccess(bidRequest, 'params.adbreakId')
+function createAdPodImp(imp, videoMediaType) {
   const bce = config.getConfig('adpod.brandCategoryExclusion')
-  let imp = {
-    id: bidRequest.bidId,
-    tagid: tagid,
-    bidfloor: getBidFloor(bidRequest, VIDEO, videoMediaType.playerSize),
-    instl: deepAccess(bidRequest.ortb2Imp, 'instl'),
-    video: {
-      w: videoMediaType.playerSize[0][0],
-      h: videoMediaType.playerSize[0][1],
-      mimes: videoMediaType.mimes,
-      startdelay: videoMediaType.startdelay,
-      linearity: videoMediaType.linearity,
-      skip: videoMediaType.skip,
-      protocols: videoMediaType.protocols,
-      skipmin: videoMediaType.skipmin,
-      api: videoMediaType.api,
-      ext: {
-        context: ADPOD,
-        brandcategoryexclusion: bce !== undefined && bce
-      }
-    }
-  }
+  imp.video.ext = {
+    context: ADPOD,
+    brandcategoryexclusion: bce !== undefined && bce
+  };
 
   const numberOfPlacements = getAdPodNumberOfPlacements(videoMediaType)
   let imps = fill(imp, numberOfPlacements)
@@ -464,9 +454,7 @@ function createAdPodImp(bidRequest, videoMediaType) {
     });
   }
 
-  return {
-    imp: imps
-  }
+  return imps
 }
 
 function getAdPodNumberOfPlacements(videoMediaType) {
@@ -479,7 +467,7 @@ function getAdPodNumberOfPlacements(videoMediaType) {
     : numberOfPlacements
 }
 
-const addOptionalAdpodParameters = (request, videoMediaType) => {
+const addOptionalAdpodParameters = (videoMediaType) => {
   const content = {}
 
   if (videoMediaType.tvSeriesName) {
@@ -502,7 +490,7 @@ const addOptionalAdpodParameters = (request, videoMediaType) => {
   }
 
   if (!isEmpty(content)) {
-    request.site.content = content
+    return content
   }
 }
 
diff --git a/modules/smartadserverBidAdapter.js b/modules/smartadserverBidAdapter.js
index ca43c26ffd7..e3cdb3dc5bf 100644
--- a/modules/smartadserverBidAdapter.js
+++ b/modules/smartadserverBidAdapter.js
@@ -1,11 +1,27 @@
-import { deepAccess, deepClone, logError, isFn, isPlainObject } from '../src/utils.js';
+import {
+  deepAccess,
+  deepClone,
+  isArray,
+  isArrayOfNums,
+  isEmpty,
+  isInteger,
+  logError
+} from '../src/utils.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
+import { getBidFloor } from '../libraries/equativUtils/equativUtils.js'
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
 
 const BIDDER_CODE = 'smartadserver';
 const GVL_ID = 45;
-const DEFAULT_FLOOR = 0.0;
 
 export const spec = {
   code: BIDDER_CODE,
@@ -55,20 +71,53 @@ export const spec = {
    * Fills the payload with specific video attributes.
    *
    * @param {*} payload Payload that will be sent in the ServerRequest
-   * @param {*} videoMediaType Video media type.
+   * @param {*} videoMediaType Video media type
    */
   fillPayloadForVideoBidRequest: function(payload, videoMediaType, videoParams) {
     const playerSize = videoMediaType.playerSize[0];
-    payload.isVideo = videoMediaType.context === 'instream';
+    const map = {
+      maxbitrate: 'vbrmax',
+      maxduration: 'vdmax',
+      minbitrate: 'vbrmin',
+      minduration: 'vdmin',
+      placement: 'vpt',
+      plcmt: 'vplcmt',
+      skip: 'skip'
+    };
+
     payload.mediaType = VIDEO;
+    payload.isVideo = videoMediaType.context === 'instream';
+    payload.videoData = {};
+
+    for (const [key, value] of Object.entries(map)) {
+      payload.videoData = {
+        ...payload.videoData,
+        ...this.getValuableProperty(value, videoMediaType[key])
+      };
+    }
+
     payload.videoData = {
-      videoProtocol: this.getProtocolForVideoBidRequest(videoMediaType, videoParams),
-      playerWidth: playerSize[0],
-      playerHeight: playerSize[1],
-      adBreak: this.getStartDelayForVideoBidRequest(videoMediaType, videoParams)
+      ...payload.videoData,
+      ...this.getValuableProperty('playerWidth', playerSize[0]),
+      ...this.getValuableProperty('playerHeight', playerSize[1]),
+      ...this.getValuableProperty('adBreak', this.getStartDelayForVideoBidRequest(videoMediaType, videoParams)),
+      ...this.getValuableProperty('videoProtocol', this.getProtocolForVideoBidRequest(videoMediaType, videoParams)),
+      ...(isArrayOfNums(videoMediaType.api) && videoMediaType.api.length ? { iabframeworks: videoMediaType.api.toString() } : {}),
+      ...(isArrayOfNums(videoMediaType.playbackmethod) && videoMediaType.playbackmethod.length ? { vpmt: videoMediaType.playbackmethod } : {})
     };
   },
 
+  /**
+   * Gets a property object if the value not falsy
+   * @param {string} property
+   * @param {number} value
+   * @returns object with the property or empty
+   */
+  getValuableProperty: function(property, value) {
+    return typeof property === 'string' && isInteger(value) && value
+      ? { [property]: value } : {};
+  },
+
   /**
    * Gets the protocols from either videoParams or VideoMediaType
    * @param {*} videoMediaType
@@ -93,18 +142,16 @@ export const spec = {
    * @returns positive integer value of startdelay
    */
   getStartDelayForVideoBidRequest: function(videoMediaType, videoParams) {
-    if (videoParams !== undefined && videoParams.startDelay) {
+    if (videoParams?.startDelay) {
       return videoParams.startDelay;
-    } else if (videoMediaType !== undefined) {
-      if (videoMediaType.startdelay == 0) {
-        return 1;
-      } else if (videoMediaType.startdelay == -1) {
+    } else if (videoMediaType?.startdelay) {
+      if (videoMediaType.startdelay > 0 || videoMediaType.startdelay == -1) {
         return 2;
       } else if (videoMediaType.startdelay == -2) {
         return 3;
       }
     }
-    return 2;// Default value for all exotic cases set to bid.params.video.startDelay midroll hence 2.
+    return 1; // SADR-5619
   },
 
   /**
@@ -119,6 +166,9 @@ export const spec = {
       method: 'POST',
       url: (domain !== undefined ? domain : 'https://prg.smartadserver.com') + '/prebid/v1',
       data: JSON.stringify(payload),
+      options: {
+        browsingTopics: false
+      }
     };
   },
 
@@ -126,12 +176,12 @@ export const spec = {
    * Makes server requests from the list of BidRequests.
    *
    * @param {BidRequest[]} validBidRequests an array of bids
-   * @param {BidderRequest} bidderRequest bidder request object
+   * @param {BidRequest} bidderRequest bidder request object
    * @return {ServerRequest[]} Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
     // use bidderRequest.bids[] to get bidder-dependent request info
-    const adServerCurrency = config.getConfig('currency.adServerCurrency');
+    const adServerCurrency = getCurrencyFromBidderRequest(bidderRequest);
     const sellerDefinedAudience = deepAccess(bidderRequest, 'ortb2.user.data', config.getAnyConfig('ortb2.user.data'));
     const sellerDefinedContext = deepAccess(bidderRequest, 'ortb2.site.content.data', config.getAnyConfig('ortb2.site.content.data'));
 
@@ -159,11 +209,16 @@ export const spec = {
         sdc: sellerDefinedContext
       };
 
-      const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid', deepAccess(bid, 'ortb2Imp.ext.data.pbadslot', ''));
+      const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
       if (gpid) {
         payload.gpid = gpid;
       }
 
+      const dsa = deepAccess(bid, 'ortb2.regs.ext.dsa');
+      if (dsa) {
+        payload.dsa = dsa;
+      }
+
       if (bidderRequest) {
         if (bidderRequest.gdprConsent) {
           payload.addtl_consent = bidderRequest.gdprConsent.addtlConsent;
@@ -202,7 +257,7 @@ export const spec = {
           if (isSupportedVideoContext) {
             let videoPayload = deepClone(payload);
             spec.fillPayloadForVideoBidRequest(videoPayload, videoMediaType, bid.params.video);
-            videoPayload.bidfloor = bid.params.bidfloor || spec.getBidFloor(bid, adServerCurrency, VIDEO);
+            videoPayload.bidfloor = bid.params.bidfloor || getBidFloor(bid, adServerCurrency, VIDEO);
             bidRequests.push(spec.createServerRequest(videoPayload, bid.params.domain));
           }
         } else {
@@ -210,7 +265,7 @@ export const spec = {
           spec.fillPayloadForVideoBidRequest(payload, videoMediaType, bid.params.video);
         }
 
-        payload.bidfloor = bid.params.bidfloor || spec.getBidFloor(bid, adServerCurrency, type);
+        payload.bidfloor = bid.params.bidfloor || getBidFloor(bid, adServerCurrency, type);
         bidRequests.push(spec.createServerRequest(payload, bid.params.domain));
       } else {
         bidRequests.push({});
@@ -245,7 +300,10 @@ export const spec = {
           netRevenue: response.isNetCpm,
           ttl: response.ttl,
           dspPixels: response.dspPixels,
-          meta: { advertiserDomains: response.adomain ? response.adomain : [] }
+          meta: {
+            ...isArray(response.adomain) && !isEmpty(response.adomain) ? { advertiserDomains: response.adomain } : {},
+            ...!isEmpty(response.dsa) ? { dsa: response.dsa } : {}
+          }
         };
 
         if (bidRequest.mediaType === VIDEO) {
@@ -266,34 +324,12 @@ export const spec = {
     return bidResponses;
   },
 
-  /**
-   * Get floors from Prebid Price Floors module
-   *
-   * @param {object} bid Bid request object
-   * @param {string} currency Ad server currency
-   * @param {string} mediaType Bid media type
-   * @return {number} Floor price
-   */
-  getBidFloor: function (bid, currency, mediaType) {
-    if (!isFn(bid.getFloor)) {
-      return DEFAULT_FLOOR;
-    }
-
-    const floor = bid.getFloor({
-      currency: currency || 'USD',
-      mediaType,
-      size: '*'
-    });
-
-    return isPlainObject(floor) && !isNaN(floor.floor) ? floor.floor : DEFAULT_FLOOR;
-  },
-
   /**
    * User syncs.
    *
    * @param {*} syncOptions Publisher prebid configuration.
    * @param {*} serverResponses A successful response from the server.
-   * @return {syncs[]} An array of syncs that should be executed.
+   * @return {UserSync[]} An array of syncs that should be executed.
    */
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
diff --git a/modules/smarthubBidAdapter.js b/modules/smarthubBidAdapter.js
index 2889bd5358b..c9cc737fac7 100644
--- a/modules/smarthubBidAdapter.js
+++ b/modules/smarthubBidAdapter.js
@@ -1,190 +1,84 @@
-import {deepAccess, isFn, logError, logMessage} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {
+  buildPlacementProcessingFunction,
+  buildRequestsBase,
+  interpretResponseBuilder,
+  isBidRequestValid
+} from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'smarthub';
+const ALIASES = [
+  {code: 'attekmi', skipPbsAliasing: true},
+  {code: 'markapp', skipPbsAliasing: true},
+  {code: 'jdpmedia', skipPbsAliasing: true},
+  {code: 'tredio', skipPbsAliasing: true},
+  {code: 'felixads', skipPbsAliasing: true},
+  {code: 'vimayx', skipPbsAliasing: true},
+];
+const BASE_URLS = {
+  attekmi: 'https://prebid.attekmi.com/pbjs',
+  smarthub: 'https://prebid.attekmi.com/pbjs',
+  markapp: 'https://markapp-prebid.attekmi.com/pbjs',
+  jdpmedia: 'https://jdpmedia-prebid.attekmi.com/pbjs',
+  tredio: 'https://tredio-prebid.attekmi.com/pbjs',
+  felixads: 'https://felixads-prebid.attekmi.com/pbjs',
+  vimayx: 'https://vimayx-prebid.attekmi.com/pbjs',
+};
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency || !bid.hasOwnProperty('netRevenue')) {
-    return false;
-  }
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.width && bid.height && (bid.vastUrl || bid.vastXml));
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { partnerName, seat, token, iabCat, minBidfloor, pos } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    partnerName: partnerName.toLowerCase(),
-    seat,
-    token,
-    iabCat,
-    minBidfloor,
-    pos,
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
+const _getUrl = (partnerName) => {
+  const aliases = ALIASES.map(el => el.code);
+  if (aliases.includes(partnerName)) {
+    return BASE_URLS[partnerName];
   }
 
-  return placement;
+  return `${BASE_URLS[BIDDER_CODE]}?partnerName=${partnerName}`;
 }
 
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
+const getPartnerName = (bid) => String(bid.params?.partnerName || bid.bidder).toLowerCase();
+
+const getPlacementReqData = buildPlacementProcessingFunction({
+  addPlacementType() {},
+  addCustomFieldsToPlacement(bid, bidderRequest, placement) {
+    const { seat, token, iabCat, minBidfloor, pos } = bid.params;
+    Object.assign(placement, {
+      partnerName: getPartnerName(bid),
+      seat,
+      token,
+      iabCat,
+      minBidfloor,
+      pos,
     });
-    return bidFloor.floor;
-  } catch (e) {
-    logError(e);
-    return 0;
   }
-}
-
-function buildRequestParams(bidderRequest = {}, placements = []) {
-  let deviceWidth = 0;
-  let deviceHeight = 0;
-
-  let winLocation;
-  try {
-    const winTop = window.top;
-    deviceWidth = winTop.screen.width;
-    deviceHeight = winTop.screen.height;
-    winLocation = winTop.location;
-  } catch (e) {
-    logMessage(e);
-    winLocation = window.location;
-  }
-
-  const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-  let refferLocation;
-  try {
-    refferLocation = refferUrl && new URL(refferUrl);
-  } catch (e) {
-    logMessage(e);
-  }
-
-  let location = refferLocation || winLocation;
-  const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-  const host = location.host;
-  const page = location.pathname;
-  const secure = location.protocol === 'https:' ? 1 : 0;
-  return {
-    deviceWidth,
-    deviceHeight,
-    language,
-    secure,
-    host,
-    page,
-    placements,
-    coppa: config.getConfig('coppa') === true ? 1 : 0,
-    ccpa: bidderRequest.uspConsent || undefined,
-    gdpr: bidderRequest.gdprConsent || undefined,
-    tmax: bidderRequest.timeout
-  };
+})
+
+const buildRequests = (validBidRequests = [], bidderRequest = {}) => {
+  const bidsByPartner = validBidRequests.reduce((bidsByPartner, bid) => {
+    const partner = getPartnerName(bid);
+    (bidsByPartner[partner] = bidsByPartner[partner] || []).push(bid);
+    return bidsByPartner;
+  }, {});
+  return Object.entries(bidsByPartner).map(([partner, validBidRequests]) => {
+    return buildRequestsBase({
+      adUrl: _getUrl(partner),
+      bidderRequest,
+      validBidRequests,
+      placementProcessingFunction: getPlacementReqData
+    })
+  })
 }
 
 export const spec = {
   code: BIDDER_CODE,
+  aliases: ALIASES,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && params.partnerName && params.seat && params.token);
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-    const tempObj = {};
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      const data = getPlacementReqData(bid);
-      tempObj[data.partnerName] = tempObj[data.partnerName] || [];
-      tempObj[data.partnerName].push(data);
+  isBidRequestValid: isBidRequestValid(['seat', 'token'], 'every'),
+  buildRequests,
+  interpretResponse: interpretResponseBuilder({
+    addtlBidValidation(bid) {
+      return bid.hasOwnProperty('netRevenue')
     }
-
-    return Object.keys(tempObj).map(key => {
-      const request = buildRequestParams(bidderRequest, tempObj[key]);
-      return {
-        method: 'POST',
-        url: `https://${key}-prebid.smart-hub.io/pbjs`,
-        data: request,
-      }
-    });
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  }
+  })
 };
 
 registerBidder(spec);
diff --git a/modules/smarthubBidAdapter.md b/modules/smarthubBidAdapter.md
index c09855303e2..dbdae927097 100644
--- a/modules/smarthubBidAdapter.md
+++ b/modules/smarthubBidAdapter.md
@@ -1,16 +1,16 @@
 # Overview
 
 ```
-Module Name: SmartHub Bidder Adapter
-Module Type: SmartHub Bidder Adapter
-Maintainer: support@smart-hub.io
+Module Name: Attekmi Bidder Adapter
+Module Type: Attekmi Bidder Adapter
+Maintainer: prebid@attekmi.com
 ```
 
 # Description
 
-Connects to SmartHub exchange for bids.
+Connects to Attekmi exchange for bids.
 
-SmartHub bid adapter supports Banner, Video (instream and outstream) and Native.
+Attekmi bid adapter supports Banner, Video (instream and outstream) and Native.
 
 # Test Parameters
 ```
diff --git a/modules/smartxBidAdapter.js b/modules/smartxBidAdapter.js
index 45cc45192ef..1442199cd6d 100644
--- a/modules/smartxBidAdapter.js
+++ b/modules/smartxBidAdapter.js
@@ -21,6 +21,12 @@ import {
 import {
   VIDEO
 } from '../src/mediaTypes.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'smartx';
 const URL = 'https://bid.sxp.smartclip.net/bid/1000';
 const GVLID = 115;
@@ -113,12 +119,6 @@ export const spec = {
       const pos = getBidIdParameter('pos', bid.params) || 1;
       const api = getBidIdParameter('api', bid.params) || [2];
       const protocols = getBidIdParameter('protocols', bid.params) || [2, 3, 5, 6];
-      var contextcustom = deepAccess(bid, 'mediaTypes.video.context');
-      var placement = 1;
-
-      if (contextcustom === 'outstream') {
-        placement = 3;
-      }
 
       let smartxReq = [{
         id: bid.bidId,
@@ -138,7 +138,6 @@ export const spec = {
           maxbitrate: maxbitrate,
           delivery: delivery,
           pos: pos,
-          placement: placement,
           api: api,
           ext: ext
         },
@@ -423,6 +422,12 @@ function createOutstreamConfig(bid) {
 
   var playerListener = function callback(event) {
     switch (event) {
+      case 'AdError':
+        try {
+          window.sc_smartIntxtError();
+        } catch (f) {}
+        break;
+
       case 'AdSlotStarted':
         try {
           window.sc_smartIntxtStart();
diff --git a/modules/smartxBidAdapter.md b/modules/smartxBidAdapter.md
index 853f06d6baf..50f78660458 100644
--- a/modules/smartxBidAdapter.md
+++ b/modules/smartxBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name: smartclip Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: adtech@smartclip.tv
+Maintainer: bidding@smartclip.tv
 ```
 
 # Description
@@ -170,4 +170,4 @@ This adapter requires setup and approval from the smartclip team.
             }
         }],
     }];
-```
\ No newline at end of file
+```
diff --git a/modules/smartyadsAnalyticsAdapter.js b/modules/smartyadsAnalyticsAdapter.js
new file mode 100644
index 00000000000..7784e0bc831
--- /dev/null
+++ b/modules/smartyadsAnalyticsAdapter.js
@@ -0,0 +1,133 @@
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import { EVENTS } from '../src/constants.js';
+import { ajax } from '../src/ajax.js';
+
+const {
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_WON,
+  BID_TIMEOUT,
+  BIDDER_ERROR,
+  BID_REJECTED,
+  BID_REQUESTED,
+  AD_RENDER_FAILED,
+  AD_RENDER_SUCCEEDED,
+  AUCTION_TIMEOUT
+} = EVENTS;
+
+const URL = 'https://ps.itdsmr.com';
+const ANALYTICS_TYPE = 'endpoint';
+const BIDDER_CODE = 'smartyads';
+const GVLID = 534;
+
+let smartyParams = {};
+
+let smartyadsAdapter = Object.assign({},
+  adapter({
+    url: URL,
+    analyticsType: ANALYTICS_TYPE,
+  }),
+  {
+    track({ eventType, args }) {
+      switch (eventType) {
+        case AUCTION_INIT:
+        case AUCTION_TIMEOUT:
+        case AUCTION_END:
+          auctionHandler(eventType, args);
+          break;
+        case BID_REQUESTED:
+          if (args.bidderCode === BIDDER_CODE) {
+            for (const bid of args.bids) {
+              const bidParams = bid.params?.length ? bid.params[0] : bid.params;
+              smartyParams[bid.bidId] = bidParams;
+            }
+          };
+          break;
+        case BID_WON:
+        case BID_TIMEOUT:
+        case BID_REJECTED:
+          bidHandler(eventType, args);
+          break;
+        case BIDDER_ERROR:
+          onBidderError(args);
+          break;
+        case AD_RENDER_FAILED:
+        case AD_RENDER_SUCCEEDED:
+          onAdRender(eventType, args);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+);
+
+const sendDataToServer = (data) => {
+  ajax(URL, () => {}, JSON.stringify(data));
+}
+
+const auctionHandler = (eventType, data) => {
+  const auctionData = {
+    auctionId: data.auctionId,
+    status: eventType,
+    timeout: data.timeout,
+    metrics: data.metrics,
+    bidderRequests: data.bidderRequests?.map(bidderRequest => {
+      delete bidderRequest.gdprConsent;
+      delete bidderRequest.refererInfo;
+      return bidderRequest;
+    }).filter(request => request.bidderCode === BIDDER_CODE),
+  }
+
+  sendDataToServer({ eventType, auctionData });
+}
+
+const bidHandler = (eventType, bid) => {
+  let bids = bid.length ? bid : [ bid ];
+
+  for (const bidObj of bids) {
+    let bidToSend;
+
+    if (bidObj.bidderCode != BIDDER_CODE) {
+      if (eventType === BID_WON) {
+        bidToSend = {
+          cpm: bidObj.cpm,
+          auctionId: bidObj.auctionId
+        };
+      } else continue;
+    }
+
+    bidToSend = bidObj;
+
+    if (eventType === BID_REJECTED) {
+      bidToSend.params = smartyParams[bid.requestId];
+    }
+
+    sendDataToServer({ eventType, bid: bidToSend });
+  }
+}
+
+const onBidderError = (data) => {
+  sendDataToServer({
+    eventType: BIDDER_ERROR,
+    error: data.error,
+    bidderRequests: data?.bidderRequests?.length
+      ? data.bidderRequests.filter(request => request.bidderCode === BIDDER_CODE)
+      : [ data.bidderRequest ]
+  });
+}
+
+const onAdRender = (eventType, data) => {
+  if (data?.bid?.bidderCode === BIDDER_CODE) {
+    sendDataToServer({ eventType, renderData: data });
+  }
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: smartyadsAdapter,
+  code: BIDDER_CODE,
+  gvlid: GVLID
+})
+
+export default smartyadsAdapter;
diff --git a/modules/smartyadsAnalyticsAdapter.md b/modules/smartyadsAnalyticsAdapter.md
new file mode 100644
index 00000000000..e08b2a02cb7
--- /dev/null
+++ b/modules/smartyadsAnalyticsAdapter.md
@@ -0,0 +1,11 @@
+#### Description
+
+Module that enables SmartyAds analytics
+
+### Configuration
+
+```javascript
+    pbjs.enableAnalytics({
+        provider: 'smartyads'
+    });
+```
\ No newline at end of file
diff --git a/modules/smartyadsBidAdapter.js b/modules/smartyadsBidAdapter.js
index 3e6c5cf360b..de7c61b7163 100644
--- a/modules/smartyadsBidAdapter.js
+++ b/modules/smartyadsBidAdapter.js
@@ -1,33 +1,18 @@
-import { logMessage } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-import { ajax } from '../src/ajax.js';
+import { getAdUrlByRegion } from '../libraries/smartyadsUtils/getAdUrlByRegion.js';
+import { interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'smartyads';
-const AD_URL = 'https://n1.smartyads.com/?c=o&m=prebid&secret_key=prebid_js';
-const URL_SYNC = 'https://as.ck-ie.com/prebidjs?p=7c47322e527cf8bdeb7facc1bb03387a';
+const GVLID = 534;
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency) {
-    return false;
-  }
-  switch (bid['mediaType']) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl) || Boolean(bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.title && bid.native.image && bid.native.impressionTrackers);
-    default:
-      return false;
-  }
-}
+const URL_SYNC = 'https://as.ck-ie.com/prebidjs?p=7c47322e527cf8bdeb7facc1bb03387a';
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   isBidRequestValid: (bid) => {
@@ -40,30 +25,20 @@ export const spec = {
 
     let winTop = window;
     let location;
-    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
-    try {
-      location = new URL(bidderRequest.refererInfo.page)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      logMessage(e);
-    };
+    location = bidderRequest?.refererInfo ?? null;
     let placements = [];
     let request = {
       'deviceWidth': winTop.screen.width,
       'deviceHeight': winTop.screen.height,
-      'language': (navigator && navigator.language) ? navigator.language : '',
-      'secure': 1,
-      'host': location.host,
-      'page': location.pathname,
+      'host': location?.domain ?? '',
+      'page': location?.page ?? '',
       'coppa': config.getConfig('coppa') === true ? 1 : 0,
-      'placements': placements
+      'placements': placements,
+      'eeid': validBidRequests[0]?.userIdAsEids,
+      'ifa': bidderRequest?.ortb2?.device?.ifa,
     };
-    request.language.indexOf('-') != -1 && (request.language = request.language.split('-')[0])
+
     if (bidderRequest) {
-      if (bidderRequest.uspConsent) {
-        request.ccpa = bidderRequest.uspConsent;
-      }
       if (bidderRequest.gdprConsent) {
         request.gdpr = bidderRequest.gdprConsent
       }
@@ -73,9 +48,14 @@ export const spec = {
     }
     const len = validBidRequests.length;
 
+    let adUrl;
+
     for (let i = 0; i < len; i++) {
       let bid = validBidRequests[i];
-      let traff = bid.params.traffic || BANNER
+
+      if (i === 0) adUrl = getAdUrlByRegion(bid);
+
+      let traff = bid.params.traffic || BANNER;
       placements.push({
         placementId: bid.params.sourceid,
         bidId: bid.bidId,
@@ -87,66 +67,16 @@ export const spec = {
         placements.schain = bid.schain;
       }
     }
+
     return {
       method: 'POST',
-      url: AD_URL,
+      url: adUrl,
       data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    serverResponse = serverResponse.body;
-    for (let i = 0; i < serverResponse.length; i++) {
-      let resItem = serverResponse[i];
-      if (isBidResponseValid(resItem)) {
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses = [], gdprConsent = {}, uspConsent = '', gppConsent = '') => {
-    let syncs = [];
-    let { gdprApplies, consentString = '' } = gdprConsent;
-
-    if (syncOptions.iframeEnabled) {
-      syncs.push({
-        type: 'iframe',
-        url: `${URL_SYNC}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}&type=iframe&us_privacy=${uspConsent}&gpp=${gppConsent}`
-      });
-    } else {
-      syncs.push({
-        type: 'image',
-        url: `${URL_SYNC}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}&type=image&us_privacy=${uspConsent}&gpp=${gppConsent}`
-      });
-    }
-
-    return syncs
-  },
-
-  onBidWon: function(bid) {
-    if (bid.winUrl) {
-      ajax(bid.winUrl, () => {}, JSON.stringify(bid));
-    } else {
-      if (bid?.postData && bid?.postData[0] && bid?.postData[0].params && bid?.postData[0].params[0].host == 'prebid') {
-        ajax('https://et-nd43.itdsmr.com/?c=o&m=prebid&secret_key=prebid_js&winTest=1', () => {}, JSON.stringify(bid));
-      }
-    }
-  },
-
-  onTimeout: function(bid) {
-    if (bid?.postData && bid?.postData[0] && bid?.postData[0].params && bid?.postData[0].params[0].host == 'prebid') {
-      ajax('https://et-nd43.itdsmr.com/?c=o&m=prebid&secret_key=prebid_js&bidTimeout=1', () => {}, JSON.stringify(bid));
-    }
-  },
-
-  onBidderError: function(bid) {
-    if (bid?.postData && bid?.postData[0] && bid?.postData[0].params && bid?.postData[0].params[0].host == 'prebid') {
-      ajax('https://et-nd43.itdsmr.com/?c=o&m=prebid&secret_key=prebid_js&bidderError=1', () => {}, JSON.stringify(bid));
     }
   },
 
+  interpretResponse,
+  getUserSyncs: getUserSyncs(URL_SYNC),
 };
 
 registerBidder(spec);
diff --git a/modules/smartyadsBidAdapter.md b/modules/smartyadsBidAdapter.md
index e0d6023a794..443d5ab5978 100644
--- a/modules/smartyadsBidAdapter.md
+++ b/modules/smartyadsBidAdapter.md
@@ -14,10 +14,11 @@ Module that connects to SmartyAds' demand sources
 
 | Name          | Scope    | Description               | Example              |
 | :------------ | :------- | :------------------------ | :------------------- |
-| `sourceid`  | required (for prebid.js)     | placement ID | "0" |
-| `host`      | required (for prebid-server) | const value, set to "prebid" | "prebid" |
-| `accountid` | required (for prebid-server) | partner ID | "1901" |
+| `sourceid`  | required (for prebid.js)     | Placement ID | "0" |
+| `host`      | required (for prebid-server) | Const value, set to "prebid" | "prebid" |
+| `accountid` | required (for prebid-server) | Partner ID | "1901" |
 | `traffic`   | optional (for prebid.js)     | Configures the mediaType that should be used. Values can be banner, native or video | "banner" |
+| `region`    | optional (for prebid.js)     | Prefix of the region to which prebid must send requests. Possible values: "US_EAST", "EU" | "US_EAST" |
 
 # Test Parameters
 ```
@@ -35,7 +36,9 @@ Module that connects to SmartyAds' demand sources
                                 host: 'prebid',
                                 sourceid: '0',
                                 accountid: '0',
-                                traffic: 'native'
+                                traffic: 'native',
+                                region: 'US_EAST'
+
                             }
                         }
                     ]
@@ -55,7 +58,8 @@ Module that connects to SmartyAds' demand sources
                               host: 'prebid',
                                 sourceid: '0',
                                 accountid: '0',
-                                traffic: 'banner'
+                                traffic: 'banner',
+                                region: 'US_EAST'
                             }
                         }
                     ]
@@ -76,7 +80,9 @@ Module that connects to SmartyAds' demand sources
                               host: 'prebid',
                                 sourceid: '0',
                                 accountid: '0',
-                                traffic: 'video'
+                                traffic: 'video',
+                                region: 'US_EAST'
+
                             }
                         }
                     ]
diff --git a/modules/smartytechBidAdapter.js b/modules/smartytechBidAdapter.js
index af1442bd301..c081b49c2e6 100644
--- a/modules/smartytechBidAdapter.js
+++ b/modules/smartytechBidAdapter.js
@@ -127,14 +127,19 @@ export const spec = {
       creativeId: response.creativeId,
       netRevenue: true,
       currency: response.currency,
-      mediaType: BANNER
-    }
+      mediaType: BANNER,
+      meta: {}
+    };
 
     if (response.mediaType === VIDEO) {
       bidObject.vastXml = response.ad;
       bidObject.mediaType = VIDEO;
     }
 
+    if (response.meta) {
+      bidObject.meta = response.meta;
+    }
+
     return bidObject;
   },
 
diff --git a/modules/smartytechBidAdapter.md b/modules/smartytechBidAdapter.md
index 9df57ddbde7..53b246e4cab 100644
--- a/modules/smartytechBidAdapter.md
+++ b/modules/smartytechBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name:  SmartyTech Bid Adapter
 Module Type:  Bidder Adapter
-Maintainer: info@adpartner.pro
+Maintainer:   info@fusify.io
 ```
 
 # Description
diff --git a/modules/smilewantedBidAdapter.js b/modules/smilewantedBidAdapter.js
index 2fbfcaa79af..a78c60f8308 100644
--- a/modules/smilewantedBidAdapter.js
+++ b/modules/smilewantedBidAdapter.js
@@ -1,37 +1,72 @@
-import { isArray, logError, logWarn, isFn, isPlainObject } from '../src/utils.js';
-import { Renderer } from '../src/Renderer.js';
-import { config } from '../src/config.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {deepAccess, deepClone, isArray, isFn, isPlainObject, logError, logWarn} from '../src/utils.js';
+import {Renderer} from '../src/Renderer.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {INSTREAM, OUTSTREAM} from '../src/video.js';
+import {serializeSupplyChain} from '../libraries/schainSerializer/schainSerializer.js'
+import {convertOrtbRequestToProprietaryNative, toOrtbNativeRequest, toLegacyResponse} from '../src/native.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+
+const BIDDER_CODE = 'smilewanted';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
 
 const GVL_ID = 639;
 
 export const spec = {
-  code: 'smilewanted',
-  aliases: ['smile', 'sw'],
+  code: BIDDER_CODE,
   gvlid: GVL_ID,
-  supportedMediaTypes: [BANNER, VIDEO],
+  aliases: ['smile', 'sw'],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   /**
    * Determines whether or not the given bid request is valid.
    *
-   * @param {object} bid The bid to validate.
+   * @param {BidRequest} bid The bid to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function(bid) {
-    return !!(bid.params && bid.params.zoneId);
+    if (!bid.params || !bid.params.zoneId) {
+      return false;
+    }
+
+    if (deepAccess(bid, 'mediaTypes.video')) {
+      const videoMediaTypesParams = deepAccess(bid, 'mediaTypes.video', {});
+      const videoBidderParams = deepAccess(bid, 'params.video', {});
+
+      const videoParams = {
+        ...videoMediaTypesParams,
+        ...videoBidderParams
+      };
+
+      if (!videoParams.context || ![INSTREAM, OUTSTREAM].includes(videoParams.context)) {
+        return false;
+      }
+    }
+
+    return true;
   },
 
   /**
    * Make a server request from the list of BidRequests.
    *
    * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @param {BidderRequest} bidderRequest bidder request object.
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     return validBidRequests.map(bid => {
-      var payload = {
+      const payload = {
         zoneId: bid.params.zoneId,
-        currencyCode: config.getConfig('currency.adServerCurrency') || 'EUR',
+        currencyCode: getCurrencyFromBidderRequest(bidderRequest) || 'EUR',
         tagId: bid.adUnitCode,
         sizes: bid.sizes.map(size => ({
           w: size[0],
@@ -40,13 +75,16 @@ export const spec = {
         transactionId: bid.ortb2Imp?.ext?.tid,
         timeout: bidderRequest?.timeout,
         bidId: bid.bidId,
-        /** positionType is undocumented
+        /**
+         positionType is undocumented
         It is unclear what this parameter means.
         If it means the same as pos in openRTB,
         It should read from openRTB object
-        or from mediaTypes.banner.pos */
+        or from mediaTypes.banner.pos
+         */
         positionType: bid.params.positionType || '',
-        prebidVersion: '$prebid.version$'
+        prebidVersion: '$prebid.version$',
+        schain: serializeSupplyChain(bid.schain, ['asi', 'sid', 'hp', 'rid', 'name', 'domain', 'ext']),
       };
 
       const floor = getBidFloor(bid);
@@ -58,20 +96,41 @@ export const spec = {
         payload.bidfloor = bid.params.bidfloor;
       }
 
-      if (bidderRequest && bidderRequest.refererInfo) {
+      if (bidderRequest?.refererInfo) {
         payload.pageDomain = bidderRequest.refererInfo.page || '';
       }
 
-      if (bidderRequest && bidderRequest.gdprConsent) {
+      if (bidderRequest?.gdprConsent) {
         payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
         payload.gdpr = bidderRequest.gdprConsent.gdprApplies; // we're handling the undefined case server side
       }
 
-      if (bid && bid.userIdAsEids) {
-        payload.eids = bid.userIdAsEids;
+      payload.eids = bid?.userIdAsEids;
+
+      const videoMediaType = deepAccess(bid, 'mediaTypes.video');
+      const context = deepAccess(bid, 'mediaTypes.video.context');
+
+      if (bid.mediaType === 'video' || (videoMediaType && context === INSTREAM) || (videoMediaType && context === OUTSTREAM)) {
+        payload.context = context;
+        payload.videoParams = deepClone(videoMediaType);
       }
 
-      var payloadString = JSON.stringify(payload);
+      const nativeMediaType = deepAccess(bid, 'mediaTypes.native');
+
+      if (nativeMediaType) {
+        payload.context = 'native';
+        payload.nativeParams = nativeMediaType;
+        let sizes = deepAccess(bid, 'mediaTypes.native.image.sizes', []);
+
+        if (sizes.length > 0) {
+          const size = Array.isArray(sizes[0]) ? sizes[0] : sizes;
+
+          payload.width = size[0] || payload.width;
+          payload.height = size[1] || payload.height;
+        }
+      }
+
+      const payloadString = JSON.stringify(payload);
       return {
         method: 'POST',
         url: 'https://prebid.smilewanted.com',
@@ -83,37 +142,47 @@ export const spec = {
   /**
    * Unpack the response from the server into a list of bids.
    *
-   * @param {*} serverResponse A successful response from the server.
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidRequest
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: function(serverResponse, bidRequest) {
+    if (!serverResponse.body) return [];
     const bidResponses = [];
-    var response = serverResponse.body;
 
     try {
+      const response = serverResponse.body;
+      const bidRequestData = JSON.parse(bidRequest.data);
       if (response) {
         const dealId = response.dealId || '';
         const bidResponse = {
-          requestId: JSON.parse(bidRequest.data).bidId,
+          ad: response.ad,
           cpm: response.cpm,
-          width: response.width,
-          height: response.height,
           creativeId: response.creativeId,
-          dealId: response.dealId,
           currency: response.currency,
+          dealId: response.dealId,
+          height: response.height,
           netRevenue: response.isNetCpm,
+          requestId: bidRequestData.bidId,
           ttl: response.ttl,
-          ad: response.ad,
+          width: response.width,
         };
 
-        if (response.formatTypeSw == 'video_instream' || response.formatTypeSw == 'video_outstream') {
+        if (response.formatTypeSw === 'video_instream' || response.formatTypeSw === 'video_outstream') {
           bidResponse['mediaType'] = 'video';
           bidResponse['vastUrl'] = response.ad;
           bidResponse['ad'] = null;
+
+          if (response.formatTypeSw === 'video_outstream') {
+            bidResponse['renderer'] = newRenderer(bidRequestData, response);
+          }
         }
 
-        if (response.formatTypeSw == 'video_outstream') {
-          bidResponse['renderer'] = newRenderer(JSON.parse(bidRequest.data), response);
+        if (response.formatTypeSw === 'native') {
+          const nativeAdResponse = JSON.parse(response.ad);
+          const ortbNativeRequest = toOrtbNativeRequest(bidRequestData.nativeParams);
+          bidResponse['mediaType'] = 'native';
+          bidResponse['native'] = toLegacyResponse(nativeAdResponse, ortbNativeRequest);
         }
 
         if (dealId.length > 0) {
@@ -121,7 +190,7 @@ export const spec = {
         }
 
         bidResponse.meta = {};
-        if (response.meta && response.meta.advertiserDomains && isArray(response.meta.advertiserDomains)) {
+        if (response.meta?.advertiserDomains && isArray(response.meta.advertiserDomains)) {
           bidResponse.meta.advertiserDomains = response.meta.advertiserDomains;
         }
         bidResponses.push(bidResponse);
@@ -129,38 +198,43 @@ export const spec = {
     } catch (error) {
       logError('Error while parsing smilewanted response', error);
     }
+
     return bidResponses;
   },
 
   /**
-   * User syncs.
+   * Register the user sync pixels which should be dropped after the auction.
    *
-   * @param {*} syncOptions Publisher prebid configuration.
-   * @param {*} serverResponses A successful response from the server.
-   * @return {Syncs[]} An array of syncs that should be executed.
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} responses List of server's responses.
+   * @param {Object} gdprConsent The GDPR consent parameters
+   * @param {Object} uspConsent The USP consent parameters
+   * @return {UserSync[]} The user syncs which should be dropped.
    */
-  getUserSyncs: function(syncOptions, responses, gdprConsent, uspConsent) {
-    let params = '';
-
-    if (gdprConsent && typeof gdprConsent.consentString === 'string') {
-      // add 'gdpr' only if 'gdprApplies' is defined
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        params += `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        params += `?gdpr_consent=${gdprConsent.consentString}`;
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+    const syncs = [];
+
+    if (syncOptions.iframeEnabled) {
+      let params = [];
+
+      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+        // add 'gdpr' only if 'gdprApplies' is defined
+        if (typeof gdprConsent.gdprApplies === 'boolean') {
+          params.push(`gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`);
+        } else {
+          params.push(`gdpr_consent=${gdprConsent.consentString}`);
+        }
       }
-    }
 
-    if (uspConsent) {
-      params += `${params ? '&' : '?'}us_privacy=${encodeURIComponent(uspConsent)}`;
-    }
+      if (uspConsent) {
+        params.push(`us_privacy=${encodeURIComponent(uspConsent)}`);
+      }
 
-    const syncs = []
+      const paramsStr = params.length > 0 ? '?' + params.join('&') : '';
 
-    if (syncOptions.iframeEnabled) {
       syncs.push({
         type: 'iframe',
-        url: 'https://csync.smilewanted.com' + params
+        url: 'https://csync.smilewanted.com' + paramsStr
       });
     }
 
@@ -170,7 +244,8 @@ export const spec = {
 
 /**
  * Create SmileWanted renderer
- * @param requestId
+ * @param bidRequest
+ * @param bidResponse
  * @returns {*}
  */
 function newRenderer(bidRequest, bidResponse) {
diff --git a/modules/smootBidAdapter.js b/modules/smootBidAdapter.js
new file mode 100644
index 00000000000..cd55dc5f253
--- /dev/null
+++ b/modules/smootBidAdapter.js
@@ -0,0 +1,19 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
+
+const BIDDER_CODE = 'smoot';
+const AD_URL = 'https://endpoint1.smoot.ai/pbjs';
+const SYNC_URL = 'https://usync.smxconv.com';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: isBidRequestValid(['placementId']),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
+};
+
+registerBidder(spec);
diff --git a/modules/smootBidAdapter.md b/modules/smootBidAdapter.md
new file mode 100644
index 00000000000..322584f19ea
--- /dev/null
+++ b/modules/smootBidAdapter.md
@@ -0,0 +1,80 @@
+# Overview
+
+```
+Module Name: Smoot Bidder Adapter
+Module Type: Smoot Bidder Adapter
+Maintainer: it.ops@smoot.ai
+```
+
+# Description
+
+Connects to Smoot exchange for bids.
+Smoot bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'smoot',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'smoot',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'smoot',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/snigelBidAdapter.js b/modules/snigelBidAdapter.js
index 489d0bcdc9e..13731e2b7e1 100644
--- a/modules/snigelBidAdapter.js
+++ b/modules/snigelBidAdapter.js
@@ -1,9 +1,9 @@
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
-import {deepAccess, isArray, isFn, isPlainObject, inIframe, getDNT} from '../src/utils.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
-import {getGlobal} from '../src/prebidGlobal.js';
+import {deepAccess, isArray, isFn, isPlainObject, inIframe, getDNT, generateUUID} from '../src/utils.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
+import {getStorageManager} from '../src/storageManager.js';
 
 const BIDDER_CODE = 'snigel';
 const GVLID = 1076;
@@ -11,9 +11,15 @@ const DEFAULT_URL = 'https://adserv.snigelweb.com/bp/v1/prebid';
 const DEFAULT_TTL = 60;
 const DEFAULT_CURRENCIES = ['USD'];
 const FLOOR_MATCH_ALL_SIZES = '*';
+const SESSION_ID_KEY = '_sn_session_pba';
 
 const getConfig = config.getConfig;
+const storageManager = getStorageManager({bidderCode: BIDDER_CODE});
 const refreshes = {};
+const placementCounters = {};
+const pageViewId = generateUUID();
+const pageViewStart = new Date().getTime();
+let auctionCounter = 0;
 
 export const spec = {
   code: BIDDER_CODE,
@@ -33,9 +39,15 @@ export const spec = {
         id: bidderRequest.auctionId,
         accountId: deepAccess(bidRequests, '0.params.accountId'),
         site: deepAccess(bidRequests, '0.params.site'),
+        sessionId: getSessionId(),
+        counter: auctionCounter++,
+        pageViewId: pageViewId,
+        pageViewStart: pageViewStart,
+        gdprConsent: gdprApplies === true ? hasFullGdprConsent(deepAccess(bidderRequest, 'gdprConsent')) : false,
         cur: getCurrencies(),
         test: getTestFlag(),
-        version: getGlobal().version,
+        version: 'v' + '$prebid.version$',
+        adapterVersion: '2.0',
         gpp: deepAccess(bidderRequest, 'gppConsent.gppString') || deepAccess(bidderRequest, 'ortb2.regs.gpp'),
         gpp_sid:
           deepAccess(bidderRequest, 'gppConsent.applicableSections') || deepAccess(bidderRequest, 'ortb2.regs.gpp_sid'),
@@ -61,6 +73,7 @@ export const spec = {
             gpid: deepAccess(r, 'ortb2Imp.ext.gpid'),
             pbadslot: deepAccess(r, 'ortb2Imp.ext.data.pbadslot') || deepAccess(r, 'ortb2Imp.ext.gpid'),
             name: r.params.placement,
+            counter: getPlacementCounter(r.params.placement),
             sizes: r.sizes,
             floor: getPriceFloor(r, BANNER, FLOOR_MATCH_ALL_SIZES),
             refresh: getRefreshInformation(r.adUnitCode),
@@ -104,9 +117,7 @@ export const spec = {
 registerBidder(spec);
 
 function getPage(bidderRequest) {
-  return (
-    getConfig(`${BIDDER_CODE}.page`) || deepAccess(bidderRequest, 'refererInfo.canonicalUrl') || window.location.href
-  );
+  return getConfig(`${BIDDER_CODE}.page`) || deepAccess(bidderRequest, 'refererInfo.page') || window.location.href;
 }
 
 function getEndpoint() {
@@ -174,6 +185,17 @@ function getRefreshInformation(adUnitCode) {
   };
 }
 
+function getPlacementCounter(placement) {
+  const counter = placementCounters[placement];
+  if (counter === undefined) {
+    placementCounters[placement] = 0;
+    return 0;
+  }
+
+  placementCounters[placement]++;
+  return placementCounters[placement];
+}
+
 function mapIdToRequestId(id, bidRequest) {
   return bidRequest.bidderRequest.bids.filter((bid) => bid.adUnitCode === id)[0].bidId;
 }
@@ -193,6 +215,19 @@ function hasSyncConsent(gdprConsent, uspConsent, gppConsent) {
   return hasPurpose1Consent(gdprConsent) && hasUspConsent(uspConsent) && hasGppConsent(gppConsent);
 }
 
+function hasFullGdprConsent(gdprConsent) {
+  try {
+    const purposeConsents = Object.values(gdprConsent.vendorData.purpose.consents);
+    return (
+      purposeConsents.length > 0 &&
+      purposeConsents.every((value) => value === true) &&
+      gdprConsent.vendorData.vendor.consents[GVLID] === true
+    );
+  } catch (e) {
+    return false;
+  }
+}
+
 function getSyncUrl(responses) {
   return getConfig(`${BIDDER_CODE}.syncUrl`) || deepAccess(responses[0], 'body.syncUrl');
 }
@@ -202,3 +237,20 @@ function getSyncEndpoint(url, gdprConsent) {
     gdprConsent?.consentString || ''
   )}`;
 }
+
+function getSessionId() {
+  try {
+    if (storageManager.localStorageIsEnabled()) {
+      let sessionId = storageManager.getDataFromLocalStorage(SESSION_ID_KEY);
+      if (sessionId == null) {
+        sessionId = generateUUID();
+        storageManager.setDataInLocalStorage(SESSION_ID_KEY, sessionId);
+      }
+      return sessionId;
+    } else {
+      return undefined;
+    }
+  } catch (e) {
+    return undefined;
+  }
+}
diff --git a/modules/sonobiAnalyticsAdapter.js b/modules/sonobiAnalyticsAdapter.js
deleted file mode 100644
index 0057944b201..00000000000
--- a/modules/sonobiAnalyticsAdapter.js
+++ /dev/null
@@ -1,277 +0,0 @@
-import { deepClone, logInfo, logError } from '../src/utils.js';
-import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
-import adapterManager from '../src/adapterManager.js';
-import {ajaxBuilder} from '../src/ajax.js';
-
-let ajax = ajaxBuilder(0);
-
-const DEFAULT_EVENT_URL = 'apex.go.sonobi.com/keymaker';
-const analyticsType = 'endpoint';
-const QUEUE_TIMEOUT_DEFAULT = 200;
-const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    BID_REQUESTED,
-    BID_ADJUSTMENT,
-    BIDDER_DONE,
-    BID_WON,
-    BID_RESPONSE,
-    BID_TIMEOUT
-  }
-} = CONSTANTS;
-
-let initOptions = {};
-let auctionCache = {};
-let auctionTtl = 60 * 60 * 1000;
-
-function deleteOldAuctions() {
-  for (let auctionId in auctionCache) {
-    let auction = auctionCache[auctionId];
-    if (Date.now() - auction.start > auctionTtl) {
-      delete auctionCache[auctionId];
-    }
-  }
-}
-
-function buildAuctionEntity(args) {
-  return {
-    'id': args.auctionId,
-    'start': args.timestamp,
-    'timeout': args.timeout,
-    'adUnits': {},
-    'stats': {},
-    'queue': [],
-    'qTimeout': false
-  };
-}
-function buildAdUnit(data) {
-  return `/${initOptions.pubId}/${initOptions.siteId}/${data.adUnitCode.toLowerCase()}`;
-}
-function getLatency(data) {
-  if (!data.responseTimestamp) {
-    return -1;
-  } else {
-    return data.responseTimestamp - data.requestTimestamp;
-  }
-}
-function getBid(data) {
-  if (data.cpm) {
-    return Math.round(data.cpm * 100);
-  } else {
-    return 0;
-  }
-}
-function buildItem(data, response, phase = 1) {
-  let size = data.width ? {width: data.width, height: data.height} : {width: data.sizes[0][0], height: data.sizes[0][1]};
-  return {
-    'bidid': data.bidId || data.requestId,
-    'p': phase,
-    'buyerid': data.bidder.toLowerCase(),
-    'bid': getBid(data),
-    'adunit_code': buildAdUnit(data),
-    's': `${size.width}x${size.height}`,
-    'latency': getLatency(data),
-    'response': response,
-    'jsLatency': getLatency(data),
-    'buyername': data.bidder.toLowerCase()
-  };
-}
-function sendQueue(auctionId) {
-  let auction = auctionCache[auctionId];
-  let data = auction.queue;
-  auction.queue = [];
-  auction.qTimeout = false;
-  sonobiAdapter.sendData(auction, data);
-}
-function addToAuctionQueue(auctionId, id) {
-  let auction = auctionCache[auctionId];
-  auction.queue = auction.queue.filter((item) => {
-    if (item.bidid !== id) { return true; }
-    return auction.stats[id].data.p !== item.p;
-  });
-  auction.queue.push(deepClone(auction.stats[id].data));
-  if (!auction.qTimeout) {
-    auction.qTimeout = setTimeout(() => {
-      sendQueue(auctionId);
-    }, initOptions.delay)
-  }
-}
-function updateBidStats(auctionId, id, data) {
-  let auction = auctionCache[auctionId];
-  auction.stats[id].data = {...auction.stats[id].data, ...data};
-  addToAuctionQueue(auctionId, id);
-  _logInfo('Updated Bid Stats: ', auction.stats[id]);
-  return auction.stats[id];
-}
-
-function handleOtherEvents(eventType, args) {
-  _logInfo('Other Event: ' + eventType, args);
-}
-
-function handlerAuctionInit(args) {
-  auctionCache[args.auctionId] = buildAuctionEntity(args);
-  deleteOldAuctions();
-  _logInfo('Auction Init', args);
-}
-function handlerBidRequested(args) {
-  let auction = auctionCache[args.auctionId];
-  let data = [];
-  let phase = 1;
-  let response = 1;
-  args.bids.forEach(function (bidRequest) {
-    auction = auctionCache[bidRequest.auctionId]
-    let built = buildItem(bidRequest, response, phase);
-    auction.stats[built.bidid] = {id: built.bidid, adUnitCode: bidRequest.adUnitCode, data: built};
-    addToAuctionQueue(args.auctionId, built.bidid);
-  })
-
-  _logInfo('Bids Requested ', data);
-}
-
-function handlerBidAdjustment(args) {
-  _logInfo('Bid Adjustment', args);
-}
-function handlerBidderDone(args) {
-  _logInfo('Bidder Done', args);
-}
-
-function handlerAuctionEnd(args) {
-  let winners = {};
-  args.bidsReceived.forEach((bid) => {
-    if (!winners[bid.adUnitCode]) {
-      winners[bid.adUnitCode] = {bidId: bid.requestId, cpm: bid.cpm};
-    } else if (winners[bid.adUnitCode].cpm < bid.cpm) {
-      winners[bid.adUnitCode] = {bidId: bid.requestId, cpm: bid.cpm};
-    }
-  })
-  args.adUnitCodes.forEach((adUnitCode) => {
-    if (winners[adUnitCode]) {
-      let bidId = winners[adUnitCode].bidId;
-      updateBidStats(args.auctionId, bidId, {response: 4});
-    }
-  })
-  _logInfo('Auction End', args);
-  _logInfo('Auction Cache', auctionCache[args.auctionId].stats);
-}
-function handlerBidWon(args) {
-  let {auctionId, requestId} = args;
-  let res = updateBidStats(auctionId, requestId, {p: 3, response: 6});
-  _logInfo('Bid Won ', args);
-  _logInfo('Bid Update Result: ', res);
-}
-function handlerBidResponse(args) {
-  let {auctionId, requestId, cpm, size, timeToRespond} = args;
-  updateBidStats(auctionId, requestId, {bid: cpm, s: size, jsLatency: timeToRespond, latency: timeToRespond, p: 2, response: 9});
-
-  _logInfo('Bid Response ', args);
-}
-function handlerBidTimeout(args) {
-  let {auctionId, bidId} = args;
-  _logInfo('Bid Timeout ', args);
-  updateBidStats(auctionId, bidId, {p: 2, response: 0, latency: args.timeout, jsLatency: args.timeout});
-}
-let sonobiAdapter = Object.assign(adapter({url: DEFAULT_EVENT_URL, analyticsType}), {
-  track({eventType, args}) {
-    switch (eventType) {
-      case AUCTION_INIT:
-        handlerAuctionInit(args);
-        break;
-      case BID_REQUESTED:
-        handlerBidRequested(args);
-        break;
-      case BID_ADJUSTMENT:
-        handlerBidAdjustment(args);
-        break;
-      case BIDDER_DONE:
-        handlerBidderDone(args);
-        break;
-      case AUCTION_END:
-        handlerAuctionEnd(args);
-        break;
-      case BID_WON:
-        handlerBidWon(args);
-        break;
-      case BID_RESPONSE:
-        handlerBidResponse(args);
-        break;
-      case BID_TIMEOUT:
-        handlerBidTimeout(args);
-        break;
-      default:
-        handleOtherEvents(eventType, args);
-        break;
-    }
-  },
-
-});
-
-sonobiAdapter.originEnableAnalytics = sonobiAdapter.enableAnalytics;
-
-sonobiAdapter.enableAnalytics = function (config) {
-  if (this.initConfig(config)) {
-    _logInfo('Analytics adapter enabled', initOptions);
-    sonobiAdapter.originEnableAnalytics(config);
-  }
-};
-
-sonobiAdapter.initConfig = function (config) {
-  let isCorrectConfig = true;
-  initOptions = {};
-  initOptions.options = deepClone(config.options);
-
-  initOptions.pubId = initOptions.options.pubId || null;
-  initOptions.siteId = initOptions.options.siteId || null;
-  initOptions.delay = initOptions.options.delay || QUEUE_TIMEOUT_DEFAULT;
-  if (!initOptions.pubId) {
-    _logError('"options.pubId" is empty');
-    isCorrectConfig = false;
-  }
-  if (!initOptions.siteId) {
-    _logError('"options.siteId" is empty');
-    isCorrectConfig = false;
-  }
-
-  initOptions.server = DEFAULT_EVENT_URL;
-  initOptions.host = initOptions.options.host || window.location.hostname;
-  this.initOptions = initOptions;
-  return isCorrectConfig;
-};
-
-sonobiAdapter.getOptions = function () {
-  return initOptions;
-};
-
-sonobiAdapter.sendData = function (auction, data) {
-  let url = 'https://' + initOptions.server + '?pageviewid=' + auction.id + '&corscred=1&pubId=' + initOptions.pubId + '&siteId=' + initOptions.siteId;
-  ajax(
-    url,
-    function () { _logInfo('Auction [' + auction.id + '] sent ', data); },
-    JSON.stringify(data),
-    {
-      method: 'POST',
-      // withCredentials: true,
-      contentType: 'text/plain'
-    }
-  );
-};
-
-function _logInfo(message, meta) {
-  logInfo(buildLogMessage(message), meta);
-}
-
-function _logError(message) {
-  logError(buildLogMessage(message));
-}
-
-function buildLogMessage(message) {
-  return 'Sonobi Prebid Analytics: ' + message;
-}
-
-adapterManager.registerAnalyticsAdapter({
-  adapter: sonobiAdapter,
-  code: 'sonobi'
-});
-
-export default sonobiAdapter;
diff --git a/modules/sonobiBidAdapter.js b/modules/sonobiBidAdapter.js
index a2d1f385623..720ce8ee269 100644
--- a/modules/sonobiBidAdapter.js
+++ b/modules/sonobiBidAdapter.js
@@ -6,7 +6,13 @@ import { Renderer } from '../src/Renderer.js';
 import { userSync } from '../src/userSync.js';
 import { bidderSettings } from '../src/bidderSettings.js';
 import { getAllOrtbKeywords } from '../libraries/keywords/keywords.js';
-import {getGptSlotInfoForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
+import { getGptSlotInfoForAdUnitCode } from '../libraries/gptUtils/gptUtils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
+
 const BIDDER_CODE = 'sonobi';
 const STR_ENDPOINT = 'https://apex.go.sonobi.com/trinity.json';
 const PAGEVIEW_ID = generateUUID();
@@ -95,6 +101,8 @@ export const spec = {
     const fpd = bidderRequest.ortb2;
 
     if (fpd) {
+      delete fpd.experianRtidData; // Omit the experian data since we already pass this through a dedicated query param
+      delete fpd.experianRtidKey
       payload.fpd = JSON.stringify(fpd);
     }
 
@@ -321,7 +329,7 @@ function _validateFloor(bid) {
 }
 
 function _validateGPID(bid) {
-  const gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot') || deepAccess(getGptSlotInfoForAdUnitCode(bid.adUnitCode), 'gptSlot') || bid.params.ad_unit;
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot') || deepAccess(getGptSlotInfoForAdUnitCode(bid.adUnitCode), 'gptSlot') || bid.params.ad_unit;
 
   if (gpid) {
     return `gpid=${gpid},`
@@ -406,8 +414,6 @@ export function _getPlatform(context = window) {
  * @return {object} firstPartyData - Data object containing first party information
  */
 function loadOrCreateFirstPartyData() {
-  var localStorageEnabled;
-
   var FIRST_PARTY_KEY = '_iiq_fdata';
   var tryParse = function (data) {
     try {
@@ -418,19 +424,14 @@ function loadOrCreateFirstPartyData() {
   };
   var readData = function (key) {
     if (hasLocalStorage()) {
+      // TODO FIX RULES VIOLATION
+      // eslint-disable-next-line prebid/no-global
       return window.localStorage.getItem(key);
     }
     return null;
   };
+  // TODO FIX RULES VIOLATION - USE STORAGE MANAGER
   var hasLocalStorage = function () {
-    if (typeof localStorageEnabled != 'undefined') { return localStorageEnabled; } else {
-      try {
-        localStorageEnabled = !!window.localStorage;
-        return localStorageEnabled;
-      } catch (e) {
-        localStorageEnabled = false;
-      }
-    }
     return false;
   };
   var generateGUID = function () {
@@ -444,6 +445,8 @@ function loadOrCreateFirstPartyData() {
   var storeData = function (key, value) {
     try {
       if (hasLocalStorage()) {
+        // TODO FIX RULES VIOLATION
+        // eslint-disable-next-line prebid/no-global
         window.localStorage.setItem(key, value);
       }
     } catch (error) {
diff --git a/modules/sovrnAnalyticsAdapter.js b/modules/sovrnAnalyticsAdapter.js
deleted file mode 100644
index a72c4b1a5a5..00000000000
--- a/modules/sovrnAnalyticsAdapter.js
+++ /dev/null
@@ -1,289 +0,0 @@
-import {logError, timestamp} from '../src/utils.js';
-import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import adaptermanager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
-import {ajaxBuilder} from '../src/ajax.js';
-import {config} from '../src/config.js';
-import {find, includes} from '../src/polyfill.js';
-import {getRefererInfo} from '../src/refererDetection.js';
-
-const ajax = ajaxBuilder(0)
-
-const {
-  EVENTS: {
-    AUCTION_END,
-    BID_REQUESTED,
-    BID_ADJUSTMENT,
-    BID_RESPONSE,
-    BID_WON
-  }
-} = CONSTANTS
-
-let pbaUrl = 'https://pba.aws.lijit.com/analytics'
-let currentAuctions = {};
-const analyticsType = 'endpoint'
-
-const rootURL = (() => {
-  const ref = getRefererInfo();
-  // TODO: does the fallback make sense here?
-  return ref.page || ref.topmostLocation;
-})();
-
-let sovrnAnalyticsAdapter = Object.assign(adapter({url: pbaUrl, analyticsType}), {
-  track({ eventType, args }) {
-    try {
-      if (eventType === BID_WON) {
-        new BidWinner(this.sovrnId, args).send();
-        return
-      }
-      if (args && args.auctionId && currentAuctions[args.auctionId] && currentAuctions[args.auctionId].status === 'complete') {
-        throw new Error('Event Received after Auction Close Auction Id ' + args.auctionId)
-      }
-      if (args && args.auctionId && currentAuctions[args.auctionId] === undefined) {
-        currentAuctions[args.auctionId] = new AuctionData(this.sovrnId, args.auctionId)
-      }
-      switch (eventType) {
-        case BID_REQUESTED:
-          currentAuctions[args.auctionId].bidRequested(args)
-          break
-        case BID_ADJUSTMENT:
-          currentAuctions[args.auctionId].originalBid(args)
-          break
-        case BID_RESPONSE:
-          currentAuctions[args.auctionId].adjustedBid(args)
-          break
-        case AUCTION_END:
-          currentAuctions[args.auctionId].send();
-          break
-      }
-    } catch (e) {
-      new LogError(e, this.sovrnId, {eventType, args}).send()
-    }
-  },
-})
-
-sovrnAnalyticsAdapter.getAuctions = function () {
-  return currentAuctions;
-};
-
-sovrnAnalyticsAdapter.originEnableAnalytics = sovrnAnalyticsAdapter.enableAnalytics;
-
-// override enableAnalytics so we can get access to the config passed in from the page
-sovrnAnalyticsAdapter.enableAnalytics = function (config) {
-  let sovrnId = ''
-  if (config && config.options && (config.options.sovrnId || config.options.affiliateId)) {
-    sovrnId = config.options.sovrnId || config.options.affiliateId;
-  } else {
-    logError('Need Sovrn Id to log auction results. Please contact a Sovrn representative if you do not know your Sovrn Id.')
-    return
-  }
-  sovrnAnalyticsAdapter.sovrnId = sovrnId;
-  if (config.options.pbaUrl) {
-    pbaUrl = config.options.pbaUrl;
-  }
-  sovrnAnalyticsAdapter.originEnableAnalytics(config) // call the base class function
-};
-
-adaptermanager.registerAnalyticsAdapter({
-  adapter: sovrnAnalyticsAdapter,
-  code: 'sovrn'
-});
-
-/** Class Representing a Winning Bid */
-class BidWinner {
-  /**
-   * Creates a new bid winner
-   * @param {string} sovrnId - the affiliate id from the analytics config
-   * @param {*} event - the args object from the auction event
-   */
-  constructor(sovrnId, event) {
-    this.body = {}
-    // eslint-disable-next-line no-undef
-    this.body.prebidVersion = $$REPO_AND_VERSION$$
-    this.body.sovrnId = sovrnId
-    this.body.winningBid = JSON.parse(JSON.stringify(event))
-    this.body.url = rootURL
-    this.body.payload = 'winner'
-    delete this.body.winningBid.ad
-  }
-
-  /**
-   * Sends the auction to the the ingest server
-   */
-  send() {
-    this.body.ts = timestamp()
-    ajax(
-      pbaUrl,
-      null,
-      JSON.stringify(this.body),
-      {
-        contentType: 'application/json',
-        method: 'POST',
-      }
-    )
-  }
-}
-
-/** Class representing an Auction */
-class AuctionData {
-  /**
-   * Create a new auction data collector
-   * @param {string} sovrnId - the affiliate id from the analytics config
-   * @param {string} auctionId - the auction id from the auction event
-   */
-  constructor(sovrnId, auctionId) {
-    this.auction = {}
-    // eslint-disable-next-line no-undef
-    this.auction.prebidVersion = $$REPO_AND_VERSION$$
-    this.auction.sovrnId = sovrnId
-    this.auction.auctionId = auctionId
-    this.auction.payload = 'auction'
-    this.auction.timeouts = {
-      buffer: config.getConfig('timeoutBuffer'),
-      bidder: config.getConfig('bidderTimeout'),
-    }
-    this.auction.priceGranularity = config.getConfig('priceGranularity')
-    this.auction.url = rootURL
-    this.auction.requests = []
-    this.auction.unsynced = []
-    this.dropBidFields = ['auctionId', 'ad', 'requestId', 'bidderCode']
-
-    setTimeout(function(id) {
-      delete currentAuctions[id]
-    }, 300000, this.auction.auctionId)
-  }
-
-  /**
-   * Record a bid request event
-   * @param {*} event - the args object from the auction event
-   */
-  bidRequested(event) {
-    const eventCopy = JSON.parse(JSON.stringify(event))
-    delete eventCopy.doneCbCallCount
-    delete eventCopy.auctionId
-    this.auction.requests.push(eventCopy)
-  }
-
-  /**
-   * Finds the bid from the auction that the event is associated with
-   * @param {*} event - the args object from the auction event
-   * @return {*} - the bid
-   */
-  findBid(event) {
-    const bidder = find(this.auction.requests, r => (r.bidderCode === event.bidderCode))
-    if (!bidder) {
-      this.auction.unsynced.push(JSON.parse(JSON.stringify(event)))
-    }
-    let bid = find(bidder.bids, b => (b.bidId === event.requestId))
-
-    if (!bid) {
-      event.unmatched = true
-      bidder.bids.push(JSON.parse(JSON.stringify(event)))
-    }
-    return bid
-  }
-
-  /**
-   * Records the original bid before any adjustments have been made
-   * @param {*} event - the args object from the auction event
-   * NOTE: the bid adjustment occurs before the bid response
-   * the bid adjustment seems to be the bid ready to be adjusted
-   */
-  originalBid(event) {
-    let bid = this.findBid(event)
-    if (bid) {
-      Object.assign(bid, JSON.parse(JSON.stringify(event)))
-      this.dropBidFields.forEach((f) => delete bid[f])
-    }
-  }
-
-  /**
-   * Replaces original values with adjusted values and records the original values for changed values
-   * in bid.originalValues
-   * @param {*} event - the args object from the auction event
-   */
-  adjustedBid(event) {
-    let bid = this.findBid(event)
-    if (bid) {
-      bid.originalValues = Object.keys(event).reduce((o, k) => {
-        if (JSON.stringify(bid[k]) !== JSON.stringify(event[k]) && !includes(this.dropBidFields, k)) {
-          o[k] = bid[k]
-          bid[k] = event[k]
-        }
-        return o
-      }, {})
-    }
-  }
-
-  /**
-   * Sends the auction to the the ingest server
-   */
-  send() {
-    let maxBids = {}
-    this.auction.requests.forEach(request => {
-      request.bids.forEach(bid => {
-        maxBids[bid.adUnitCode] = maxBids[bid.adUnitCode] || {cpm: 0}
-        if (bid.cpm > maxBids[bid.adUnitCode].cpm) {
-          maxBids[bid.adUnitCode] = bid
-        }
-      })
-    })
-    Object.keys(maxBids).forEach(unit => {
-      maxBids[unit].isAuctionWinner = true
-    })
-    this.auction.ts = timestamp()
-    ajax(
-      pbaUrl,
-      () => {
-        currentAuctions[this.auction.auctionId] = {status: 'complete', auctionId: this.auction.auctionId}
-      },
-      JSON.stringify(this.auction),
-      {
-        contentType: 'application/json',
-        method: 'POST',
-      }
-    )
-  }
-}
-class LogError {
-  constructor(e, sovrnId, data) {
-    this.error = {}
-    this.error.payload = 'error'
-    this.error.message = e.message
-    this.error.stack = e.stack
-    this.error.data = data
-    // eslint-disable-next-line no-undef
-    this.error.prebidVersion = $$REPO_AND_VERSION$$
-    this.error.sovrnId = sovrnId
-    this.error.url = rootURL
-    this.error.userAgent = navigator.userAgent
-  }
-  send() {
-    if (this.error.data && this.error.data.requests) {
-      this.error.data.requests.forEach(request => {
-        if (request.bids) {
-          request.bids.forEach(bid => {
-            if (bid.ad) {
-              delete bid.ad
-            }
-          })
-        }
-      })
-    }
-    if (ErrorEvent.data && this.error.data.ad) {
-      delete this.error.data.ad
-    }
-    this.error.ts = timestamp()
-    ajax(
-      pbaUrl,
-      null,
-      JSON.stringify(this.error),
-      {
-        contentType: 'application/json',
-        method: 'POST',
-      }
-    )
-  }
-}
-
-export default sovrnAnalyticsAdapter;
diff --git a/modules/sovrnAnalyticsAdapter.md b/modules/sovrnAnalyticsAdapter.md
deleted file mode 100644
index 80bc6d7f6b1..00000000000
--- a/modules/sovrnAnalyticsAdapter.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Overview
-
-```
-Module Name: Sovrn Analytics Adapter
-Module Type: Analytics Adapter
-Maintainer: jrosendahl@sovrn.com
-```
-
-# Description
-
-Sovrn's analytics adaptor allows you to view detailed auction information in Meridian. 
-
-For more information, visit Sovrn.com.
-
-# Test Parameters
-```
-{
-  provider: 'sovrn',
-  options: {
-    sovrnId: 'xxxxx', // Sovrn ID (required) you can get this by contacting Sovrn support.
-  }
-}
-```
diff --git a/modules/sovrnBidAdapter.js b/modules/sovrnBidAdapter.js
index 79481b81936..d4e53c00472 100644
--- a/modules/sovrnBidAdapter.js
+++ b/modules/sovrnBidAdapter.js
@@ -6,7 +6,10 @@ import {
   logError,
   deepAccess,
   isInteger,
-  logWarn, getBidIdParameter
+  logWarn,
+  getBidIdParameter,
+  isEmptyStr,
+  mergeDeep
 } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js'
 import {
@@ -14,37 +17,23 @@ import {
   BANNER,
   VIDEO
 } from '../src/mediaTypes.js'
+import { COMMON_ORTB_VIDEO_PARAMS } from '../libraries/deepintentUtils/index.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 
 const ORTB_VIDEO_PARAMS = {
-  'mimes': (value) => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
-  'minduration': (value) => isInteger(value),
-  'maxduration': (value) => isInteger(value),
-  'protocols': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 10),
-  'w': (value) => isInteger(value),
-  'h': (value) => isInteger(value),
-  'startdelay': (value) => isInteger(value),
+  ...COMMON_ORTB_VIDEO_PARAMS,
   'placement': (value) => isInteger(value) && value >= 1 && value <= 5,
-  'linearity': (value) => [1, 2].indexOf(value) !== -1,
-  'skip': (value) => [0, 1].indexOf(value) !== -1,
-  'skipmin': (value) => isInteger(value),
-  'skipafter': (value) => isInteger(value),
-  'sequence': (value) => isInteger(value),
-  'battr': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 17),
-  'maxextended': (value) => isInteger(value),
-  'minbitrate': (value) => isInteger(value),
-  'maxbitrate': (value) => isInteger(value),
-  'boxingallowed': (value) => [0, 1].indexOf(value) !== -1,
-  'playbackmethod': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6),
-  'playbackend': (value) => [1, 2, 3].indexOf(value) !== -1,
+  'plcmt': (value) => isInteger(value) && value >= 1 && value <= 4,
   'delivery': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 3),
   'pos': (value) => isInteger(value) && value >= 1 && value <= 7,
-  'api': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6)
 }
 
 const REQUIRED_VIDEO_PARAMS = {
   context: (value) => value !== ADPOD,
   mimes: ORTB_VIDEO_PARAMS.mimes,
-  minduration: ORTB_VIDEO_PARAMS.minduration,
   maxduration: ORTB_VIDEO_PARAMS.maxduration,
   protocols: ORTB_VIDEO_PARAMS.protocols
 }
@@ -104,18 +93,11 @@ export const spec = {
         }
         iv = iv || getBidIdParameter('iv', bid.params)
 
-        const floorInfo = (bid.getFloor && typeof bid.getFloor === 'function') ? bid.getFloor({
-          currency: 'USD',
-          mediaType: bid.mediaTypes && bid.mediaTypes.banner ? 'banner' : 'video',
-          size: '*'
-        }) : {}
-        floorInfo.floor = floorInfo.floor || getBidIdParameter('bidfloor', bid.params)
-
         const imp = {
           adunitcode: bid.adUnitCode,
           id: bid.bidId,
           tagid: String(getBidIdParameter('tagid', bid.params)),
-          bidfloor: floorInfo.floor
+          bidfloor: _getBidFloors(bid)
         }
 
         if (deepAccess(bid, 'mediaTypes.banner')) {
@@ -141,6 +123,17 @@ export const spec = {
           imp.ext = imp.ext || {}
           imp.ext.deals = segmentsString.split(',').map(deal => deal.trim())
         }
+
+        const auctionEnvironment = bid?.ortb2Imp?.ext?.ae
+        if (bidderRequest.paapi?.enabled && isInteger(auctionEnvironment)) {
+          imp.ext = imp.ext || {}
+          imp.ext.ae = auctionEnvironment
+        } else {
+          if (imp.ext?.ae) {
+            delete imp.ext.ae
+          }
+        }
+
         sovrnImps.push(imp)
       })
 
@@ -173,6 +166,11 @@ export const spec = {
         deepSetValue(sovrnBidReq, 'source.tid', tid)
       }
 
+      const coppa = deepAccess(bidderRequest, 'ortb2.regs.coppa');
+      if (coppa) {
+        deepSetValue(sovrnBidReq, 'regs.coppa', 1);
+      }
+
       if (bidderRequest.gdprConsent) {
         deepSetValue(sovrnBidReq, 'regs.ext.gdpr', +bidderRequest.gdprConsent.gdprApplies);
         deepSetValue(sovrnBidReq, 'user.ext.consent', bidderRequest.gdprConsent.consentString)
@@ -185,6 +183,12 @@ export const spec = {
         deepSetValue(sovrnBidReq, 'regs.gpp_sid', bidderRequest.gppConsent.applicableSections);
       }
 
+      // if present, merge device object from ortb2 into `sovrnBidReq.device`
+      if (bidderRequest?.ortb2?.device) {
+        sovrnBidReq.device = sovrnBidReq.device || {};
+        mergeDeep(sovrnBidReq.device, bidderRequest.ortb2.device);
+      }
+
       if (eids) {
         deepSetValue(sovrnBidReq, 'user.ext.eids', eids)
         if (criteoId) {
@@ -208,14 +212,14 @@ export const spec = {
 
   /**
    * Format Sovrn responses as Prebid bid responses
-   * @param {id, seatbid} sovrnResponse A successful response from Sovrn.
-   * @return {Bid[]} An array of formatted bids.
-  */
-  interpretResponse: function({ body: {id, seatbid} }) {
+   * @param {id, seatbid, ext} sovrnResponse A successful response from Sovrn.
+   * @return An array of formatted bids (+ fledgeAuctionConfigs if available)
+   */
+  interpretResponse: function({ body: {id, seatbid, ext} }) {
     if (!id || !seatbid || !Array.isArray(seatbid)) return []
 
     try {
-      return seatbid
+      let bids = seatbid
         .filter(seat => seat)
         .map(seat => seat.bid.map(sovrnBid => {
           const bid = {
@@ -241,6 +245,45 @@ export const spec = {
           return bid
         }))
         .flat()
+
+      let fledgeAuctionConfigs = null;
+      if (isArray(ext?.igbid)) {
+        const seller = ext.seller
+        const decisionLogicUrl = ext.decisionLogicUrl
+        const sellerTimeout = ext.sellerTimeout
+        ext.igbid.filter(item => isValidIgBid(item)).forEach((igbid) => {
+          const perBuyerSignals = {}
+          igbid.igbuyer.filter(item => isValidIgBuyer(item)).forEach(buyerItem => {
+            perBuyerSignals[buyerItem.igdomain] = buyerItem.buyerdata
+          })
+          const interestGroupBuyers = [...Object.keys(perBuyerSignals)]
+          if (interestGroupBuyers.length) {
+            fledgeAuctionConfigs = fledgeAuctionConfigs || {}
+            fledgeAuctionConfigs[igbid.impid] = {
+              seller,
+              decisionLogicUrl,
+              sellerTimeout,
+              interestGroupBuyers: interestGroupBuyers,
+              perBuyerSignals,
+            }
+          }
+        })
+      }
+      if (fledgeAuctionConfigs) {
+        fledgeAuctionConfigs = Object.entries(fledgeAuctionConfigs).map(([bidId, cfg]) => {
+          return {
+            bidId,
+            config: Object.assign({
+              auctionSignals: {}
+            }, cfg)
+          }
+        })
+        return {
+          bids,
+          paapi: fledgeAuctionConfigs,
+        }
+      }
+      return bids
     } catch (e) {
       logError('Could not interpret bidresponse, error details:', e)
       return e
@@ -270,7 +313,7 @@ export const spec = {
             params.push(['informer', iidArr[0]]);
             tracks.push({
               type: 'iframe',
-              url: 'https://ap.lijit.com/beacon?' + params.map(p => p.join('=')).join('&')
+              url: 'https://ce.lijit.com/beacon?' + params.map(p => p.join('=')).join('&')
             });
           }
         }
@@ -324,4 +367,26 @@ function _buildVideoRequestObj(bid) {
   return videoObj
 }
 
+function _getBidFloors(bid) {
+  const floorInfo = (bid.getFloor && typeof bid.getFloor === 'function') ? bid.getFloor({
+    currency: 'USD',
+    mediaType: bid.mediaTypes && bid.mediaTypes.banner ? 'banner' : 'video',
+    size: '*'
+  }) : {}
+  const floorModuleValue = parseFloat(floorInfo?.floor)
+  if (!isNaN(floorModuleValue)) {
+    return floorModuleValue
+  }
+  const paramValue = parseFloat(getBidIdParameter('bidfloor', bid.params))
+  return !isNaN(paramValue) ? paramValue : undefined
+}
+
+function isValidIgBid(igBid) {
+  return !isEmptyStr(igBid.impid) && isArray(igBid.igbuyer) && igBid.igbuyer.length
+}
+
+function isValidIgBuyer(igBuyer) {
+  return !isEmptyStr(igBuyer.igdomain)
+}
+
 registerBidder(spec)
diff --git a/modules/sovrnBidAdapter.md b/modules/sovrnBidAdapter.md
index 53e3158024d..ce131269eee 100644
--- a/modules/sovrnBidAdapter.md
+++ b/modules/sovrnBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name: Sovrn Bid Adapter
 Module Type: Bidder Adapter
-Maintainer: jrosendahl@sovrn.com
+Maintainer: exchange@sovrn.com
 ```
 
 # Description
diff --git a/modules/sparteoBidAdapter.js b/modules/sparteoBidAdapter.js
new file mode 100644
index 00000000000..2bb08707c85
--- /dev/null
+++ b/modules/sparteoBidAdapter.js
@@ -0,0 +1,174 @@
+import { deepAccess, deepSetValue, logError, parseSizesInput, triggerPixel } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js'
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ */
+
+const BIDDER_CODE = 'sparteo';
+const GVLID = 1028;
+const TTL = 60;
+const HTTP_METHOD = 'POST';
+const REQUEST_URL = 'https://bid.sparteo.com/auction';
+const USER_SYNC_URL_IFRAME = 'https://sync.sparteo.com/sync/iframe.html?from=prebidjs';
+let isSynced = window.sparteoCrossfire?.started || false;
+
+const converter = ortbConverter({
+  context: {
+    // `netRevenue` and `ttl` are required properties of bid responses - provide a default for them
+    netRevenue: true, // or false if your adapter should set bidResponse.netRevenue = false
+    ttl: TTL // default bidResponse.ttl (when not specified in ORTB response.seatbid[].bid[].exp)
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+
+    deepSetValue(request, 'site.publisher.ext.params.pbjsVersion', '$prebid.version$');
+
+    if (bidderRequest.bids[0].params.networkId) {
+      request.site.publisher.ext.params.networkId = bidderRequest.bids[0].params.networkId;
+    }
+
+    if (bidderRequest.bids[0].params.publisherId) {
+      request.site.publisher.ext.params.publisherId = bidderRequest.bids[0].params.publisherId;
+    }
+
+    return request;
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+
+    deepSetValue(imp, 'ext.sparteo.params', bidRequest.params);
+    imp.ext.sparteo.params.adUnitCode = bidRequest.adUnitCode;
+
+    return imp;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    context.mediaType = deepAccess(bid, 'ext.prebid.type');
+
+    const response = buildBidResponse(bid, context);
+
+    if (context.mediaType == 'video') {
+      response.nurl = bid.nurl;
+      response.vastUrl = deepAccess(bid, 'ext.prebid.cache.vastXml.url') ?? null;
+    }
+
+    return response;
+  }
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    let bannerParams = deepAccess(bid, 'mediaTypes.banner');
+    let videoParams = deepAccess(bid, 'mediaTypes.video');
+
+    if (!bid.params) {
+      logError('The bid params are missing');
+      return false;
+    }
+
+    if (!bid.params.networkId && !bid.params.publisherId) {
+      // publisherId is deprecated but is still accepted for now for retrocompatibility purpose.
+      logError('The networkId is required');
+      return false;
+    }
+
+    if (!bannerParams && !videoParams) {
+      logError('The placement must be of banner or video type');
+      return false;
+    }
+
+    /**
+     * BANNER checks
+     */
+
+    if (bannerParams) {
+      let sizes = bannerParams.sizes;
+
+      if (!sizes || parseSizesInput(sizes).length == 0) {
+        logError('mediaTypes.banner.sizes must be set for banner placement at the right format.');
+        return false;
+      }
+    }
+
+    /**
+     * VIDEO checks
+     */
+
+    if (videoParams) {
+      if (parseSizesInput(videoParams.playerSize).length == 0) {
+        logError('mediaTypes.video.playerSize must be set for video placement at the right format.');
+        return false;
+      }
+    }
+
+    return true;
+  },
+
+  buildRequests: function (bidRequests, bidderRequest) {
+    const payload = converter.toORTB({bidRequests, bidderRequest})
+
+    return {
+      method: HTTP_METHOD,
+      url: bidRequests[0].params.endpoint ? bidRequests[0].params.endpoint : REQUEST_URL,
+      data: payload
+    };
+  },
+
+  interpretResponse: function (serverResponse, requests) {
+    const bids = converter.fromORTB({response: serverResponse.body, request: requests.data}).bids;
+
+    return bids;
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+    let syncurl = '';
+
+    if (!isSynced && !window.sparteoCrossfire?.started) {
+      // Attaching GDPR Consent Params in UserSync url
+      if (gdprConsent) {
+        syncurl += '&gdpr=' + (gdprConsent.gdprApplies ? 1 : 0);
+        syncurl += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
+      }
+      if (uspConsent && uspConsent.consentString) {
+        syncurl += `&usp_consent=${uspConsent.consentString}`;
+      }
+
+      if (syncOptions.iframeEnabled) {
+        isSynced = true;
+
+        window.sparteoCrossfire = {
+          started: true
+        };
+
+        return [{
+          type: 'iframe',
+          url: USER_SYNC_URL_IFRAME + syncurl
+        }];
+      }
+    }
+  },
+
+  onTimeout: function (timeoutData) {},
+
+  onBidWon: function (bid) {
+    if (bid && bid.nurl) {
+      triggerPixel(bid.nurl, null);
+    }
+  },
+
+  onSetTargeting: function (bid) {}
+};
+
+registerBidder(spec);
diff --git a/modules/sparteoBidAdapter.md b/modules/sparteoBidAdapter.md
new file mode 100644
index 00000000000..774d9211d9d
--- /dev/null
+++ b/modules/sparteoBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: Sparteo Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@sparteo.com
+```
+
+# Description
+
+Module that connects to Sparteo's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [
+                        [1, 1]
+                    ]
+                }
+            },
+            bids: [
+                {
+                    bidder: 'sparteo',
+                    params: {
+                        networkId: '1234567a-eb1b-1fae-1d23-e1fbaef234cf'
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
deleted file mode 100644
index 017544cc596..00000000000
--- a/modules/spotxBidAdapter.js
+++ /dev/null
@@ -1,522 +0,0 @@
-import {
-  logError,
-  deepAccess,
-  isArray,
-  getDNT,
-  deepSetValue,
-  isEmpty,
-  _each,
-  logMessage,
-  logWarn,
-  isBoolean,
-  isNumber,
-  isPlainObject,
-  isFn,
-  setScriptAttributes,
-  getBidIdParameter
-} from '../src/utils.js';
-import { config } from '../src/config.js';
-import { Renderer } from '../src/Renderer.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { VIDEO } from '../src/mediaTypes.js';
-import { loadExternalScript } from '../src/adloader.js';
-
-const BIDDER_CODE = 'spotx';
-const URL = 'https://search.spotxchange.com/openrtb/2.3/dados/';
-const ORTB_VERSION = '2.3';
-export const GOOGLE_CONSENT = { consented_providers: ['3', '7', '11', '12', '15', '20', '22', '35', '43', '46', '48', '55', '57', '61', '62', '66', '70', '80', '83', '85', '86', '89', '93', '108', '122', '124', '125', '126', '131', '134', '135', '136', '143', '144', '147', '149', '153', '154', '159', '161', '162', '165', '167', '171', '178', '184', '188', '192', '195', '196', '202', '209', '211', '218', '221', '228', '229', '230', '236', '239', '241', '253', '255', '259', '266', '271', '272', '274', '286', '291', '294', '303', '308', '310', '311', '313', '314', '316', '317', '322', '323', '327', '336', '338', '340', '348', '350', '358', '359', '363', '367', '370', '371', '384', '385', '389', '393', '394', '397', '398', '407', '414', '415', '424', '429', '430', '432', '436', '438', '440', '442', '443', '445', '448', '449', '453', '459', '479', '482', '486', '491', '492', '494', '495', '503', '505', '510', '522', '523', '528', '537', '540', '550', '559', '560', '568', '571', '574', '575', '576', '584', '585', '587', '588', '590', '591', '592', '595', '609', '621', '624', '723', '725', '733', '737', '776', '780', '782', '787', '797', '798', '802', '803', '814', '817', '820', '821', '827', '829', '839', '853', '864', '867', '874', '899', '904', '922', '926', '931', '932', '933', '938', '955', '973', '976', '979', '981', '985', '987', '991', '1003', '1024', '1025', '1027', '1028', '1029', '1033', '1034', '1040', '1047', '1048', '1051', '1052', '1053', '1054', '1062', '1063', '1067', '1072', '1085', '1092', '1095', '1097', '1099', '1100', '1107', '1126', '1127', '1143', '1149', '1152', '1162', '1166', '1167', '1170', '1171', '1172', '1188', '1192', '1199', '1201', '1204', '1205', '1211', '1212', '1215', '1220', '1225', '1226', '1227', '1230', '1232', '1236', '1241', '1248', '1250', '1252', '1268', '1275', '1276', '1284', '1286', '1298', '1301', '1307', '1312', '1313', '1317', '1329', '1336', '1344', '1345', '1356', '1362', '1365', '1375', '1403', '1409', '1411', '1415', '1416', '1419', '1423', '1440', '1442', '1449', '1451', '1455', '1456', '1468', '1496', '1503', '1509', '1512', '1514', '1517', '1520', '1525', '1540', '1547', '1548', '1555', '1558', '1570', '1575', '1577', '1579', '1583', '1584', '1591', '1598', '1603', '1608', '1613', '1616', '1626', '1631', '1633', '1638', '1642', '1648', '1651', '1652', '1653', '1660', '1665', '1667', '1669', '1671', '1674', '1677', '1678', '1682', '1684', '1697', '1703', '1705', '1716', '1720', '1721', '1722', '1725', '1732', '1733', '1735', '1739', '1741', '1745', '1750', '1753', '1760', '1765', '1769', '1776', '1780', '1782', '1786', '1791', '1794', '1799', '1800', '1801', '1810', '1827', '1831', '1832', '1834', '1837', '1840', '1843', '1844', '1845', '1858', '1859', '1863', '1866', '1870', '1872', '1875', '1878', '1880', '1882', '1883', '1889', '1892', '1896', '1898', '1899', '1902', '1905', '1911', '1922', '1928', '1929', '1934', '1942', '1943', '1944', '1945', '1958', '1960', '1962', '1963', '1964', '1967', '1968', '1978', '1985', '1986', '1987', '1998', '2003', '2007', '2012', '2013', '2027', '2035', '2038', '2039', '2044', '2047', '2052', '2056', '2059', '2062', '2064', '2068', '2070', '2072', '2078', '2079', '2084', '2088', '2090', '2095', '2100', '2103', '2107', '2109', '2113', '2115', '2121', '2127', '2130', '2133', '2137', '2140', '2141', '2145', '2147', '2150', '2156', '2166', '2170', '2171', '2176', '2177', '2179', '2183', '2186', '2192', '2198', '2202', '2205', '2214', '2216', '2219', '2220', '2222', '2223', '2224', '2225', '2227', '2228', '2234', '2238', '2247', '2251', '2253', '2262', '2264', '2271', '2276', '2278', '2279', '2282', '2290', '2292', '2295', '2299', '2305', '2306', '2310', '2311', '2312', '2315', '2320', '2325', '2328', '2331', '2334', '2335', '2336', '2337', '2343', '2346', '2354', '2357', '2358', '2359', '2366', '2370', '2373', '2376', '2377', '2380', '2382', '2387', '2389', '2392', '2394', '2400', '2403', '2405', '2406', '2407', '2410', '2411', '2413', '2414', '2415', '2416', '2418', '2422', '2425', '2427', '2435', '2437', '2440', '2441', '2447', '2453', '2459', '2461', '2462', '2464', '2467', '2468', '2472', '2477', '2481', '2484', '2486', '2492', '2493', '2496', '2497', '2498', '2499', '2504', '2506', '2510', '2511', '2512', '2517', '2526', '2527', '2531', '2532', '2534', '2542', '2544', '2552', '2555', '2559', '2563', '2564', '2567', '2568', '2569', '2571', '2572', '2573', '2575', '2577', '2579', '2583', '2584', '2586', '2589', '2595', '2596', '2597', '2601', '2604', '2605', '2609', '2610', '2612', '2614', '2621', '2622', '2624', '2628', '2629', '2632', '2634', '2636', '2639', '2643', '2645', '2646', '2647', '2649', '2650', '2651', '2652', '2656', '2657', '2658', '2660', '2661', '2662', '2663', '2664', '2669', '2670', '2673', '2676', '2677', '2678', '2681', '2682', '2684', '2685', '2686', '2689', '2690', '2691', '2695', '2698', '2699', '2702', '2704', '2705', '2706', '2707', '2709', '2710', '2713', '2714', '2727', '2729', '2739', '2758', '2765', '2766', '2767', '2768', '2770', '2771', '2772', '2776', '2777', '2778', '2779', '2780', '2783', '2784', '2786', '2787', '2791', '2792', '2793', '2797', '2798', '2801', '2802', '2803', '2805', '2808', '2809', '2810', '2811', '2812', '2813', '2814', '2817', '2818', '2824', '2826', '2827', '2829', '2830', '2831', '2832', '2834', '2836', '2838', '2840', '2842', '2843', '2844', '2850', '2851', '2852', '2854', '2858', '2860', '2862', '2864', '2865', '2866', '2867', '2868', '2869', '2871'] };
-
-export const spec = {
-  code: BIDDER_CODE,
-  gvlid: 165,
-  supportedMediaTypes: [VIDEO],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   * From Prebid.js: isBidRequestValid - Verify the the AdUnits.bids, respond with true (valid) or false (invalid).
-   *
-   * @param {object} bid The bid to validate.
-   * @return {boolean} True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function(bid) {
-    if (bid && typeof bid.params !== 'object') {
-      logError(BIDDER_CODE + ': params is not defined or is incorrect in the bidder settings.');
-      return false;
-    }
-
-    if (!deepAccess(bid, 'mediaTypes.video')) {
-      logError(BIDDER_CODE + ': mediaTypes.video is not present in the bidder settings.');
-      return false;
-    }
-
-    const playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
-    if (!playerSize || !isArray(playerSize)) {
-      logError(BIDDER_CODE + ': mediaTypes.video.playerSize is not defined in the bidder settings.');
-      return false;
-    }
-
-    if (!getBidIdParameter('channel_id', bid.params)) {
-      logError(BIDDER_CODE + ': channel_id is not present in bidder params');
-      return false;
-    }
-
-    if (deepAccess(bid, 'mediaTypes.video.context') == 'outstream' || deepAccess(bid, 'params.ad_unit') == 'outstream') {
-      if (!getBidIdParameter('outstream_function', bid.params)) {
-        if (!getBidIdParameter('outstream_options', bid.params)) {
-          logError(BIDDER_CODE + ': please define outstream_options parameter or override the default SpotX outstream rendering by defining your own Outstream function using field outstream_function.');
-          return false;
-        }
-        if (!getBidIdParameter('slot', bid.params.outstream_options)) {
-          logError(BIDDER_CODE + ': please define parameter slot in outstream_options object in the configuration.');
-          return false;
-        }
-      }
-    }
-
-    return true;
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   * from Prebid.js: buildRequests - Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
-   *
-   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
-   * @param {object} bidderRequest - The master bidRequest object.
-   * @return {ServerRequest} Info describing the request to the server.
-   */
-  buildRequests: function(bidRequests, bidderRequest) {
-    // TODO: does the fallback make sense here?
-    const referer = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
-    const isPageSecure = !!referer.match(/^https:/);
-
-    const siteId = '';
-    const spotxRequests = bidRequests.map(function(bid) {
-      let page;
-      if (getBidIdParameter('page', bid.params)) {
-        page = getBidIdParameter('page', bid.params);
-      } else {
-        page = referer;
-      }
-
-      const channelId = getBidIdParameter('channel_id', bid.params);
-      let pubcid = null;
-
-      const playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
-      const contentWidth = playerSize[0][0];
-      const contentHeight = playerSize[0][1];
-
-      const secure = isPageSecure || (getBidIdParameter('secure', bid.params) ? 1 : 0);
-
-      const ext = {
-        sdk_name: 'Prebid 1+',
-        versionOrtb: ORTB_VERSION
-      };
-
-      if (getBidIdParameter('hide_skin', bid.params) != '') {
-        ext.hide_skin = +!!getBidIdParameter('hide_skin', bid.params);
-      }
-
-      if (getBidIdParameter('ad_volume', bid.params) != '') {
-        ext.ad_volume = getBidIdParameter('ad_volume', bid.params);
-      }
-
-      if (getBidIdParameter('ad_unit', bid.params) != '') {
-        ext.ad_unit = getBidIdParameter('ad_unit', bid.params);
-      }
-
-      if (getBidIdParameter('outstream_options', bid.params) != '') {
-        ext.outstream_options = getBidIdParameter('outstream_options', bid.params);
-      }
-
-      if (getBidIdParameter('outstream_function', bid.params) != '') {
-        ext.outstream_function = getBidIdParameter('outstream_function', bid.params);
-      }
-
-      if (getBidIdParameter('custom', bid.params) != '') {
-        ext.custom = getBidIdParameter('custom', bid.params);
-      }
-
-      if (getBidIdParameter('pre_market_bids', bid.params) != '' && isArray(getBidIdParameter('pre_market_bids', bid.params))) {
-        const preMarketBids = getBidIdParameter('pre_market_bids', bid.params);
-        ext.pre_market_bids = [];
-        for (let i in preMarketBids) {
-          const preMarketBid = preMarketBids[i];
-          let vastStr = '';
-          if (preMarketBid['vast_url']) {
-            vastStr = '' + preMarketBid['vast_url'] + '';
-          } else if (preMarketBid['vast_string']) {
-            vastStr = preMarketBid['vast_string'];
-          }
-          ext.pre_market_bids.push({
-            id: preMarketBid['deal_id'],
-            seatbid: [{
-              bid: [{
-                impid: Date.now(),
-                dealid: preMarketBid['deal_id'],
-                price: preMarketBid['price'],
-                adm: vastStr
-              }]
-            }],
-            cur: preMarketBid['currency'],
-            ext: {
-              event_log: [{}]
-            }
-          });
-        }
-      }
-
-      const mimes = getBidIdParameter('mimes', bid.params) || deepAccess(bid, 'mediaTypes.video.mimes') || ['application/javascript', 'video/mp4', 'video/webm'];
-
-      const spotxReq = {
-        id: bid.bidId,
-        secure: secure,
-        video: {
-          w: contentWidth,
-          h: contentHeight,
-          ext: ext,
-          mimes: mimes
-        }
-      };
-
-      if (isFn(bid.getFloor)) {
-        let floorInfo = bid.getFloor({
-          currency: 'USD',
-          mediaType: 'video',
-          size: '*'
-        });
-
-        if (floorInfo.currency === 'USD') {
-          spotxReq.bidfloor = floorInfo.floor;
-        }
-      } else if (getBidIdParameter('price_floor', bid.params) != '') {
-        spotxReq.bidfloor = getBidIdParameter('price_floor', bid.params);
-      }
-
-      const startdelay = getBidIdParameter('start_delay', bid.params) || deepAccess(bid, 'mediaTypes.video.startdelay');
-      if (startdelay) {
-        spotxReq.video.startdelay = 0 + Boolean(startdelay);
-      }
-
-      const minduration = getBidIdParameter('min_duration', bid.params) || deepAccess(bid, 'mediaTypes.video.minduration');
-      if (minduration) {
-        spotxReq.video.minduration = minduration;
-      }
-
-      const maxduration = getBidIdParameter('max_duration', bid.params) || deepAccess(bid, 'mediaTypes.video.maxduration');
-      if (maxduration) {
-        spotxReq.video.maxduration = maxduration;
-      }
-
-      const placement = getBidIdParameter('placement_type', bid.params) || deepAccess(bid, 'mediaTypes.video.placement');
-      if (placement) {
-        spotxReq.video.ext.placement = placement;
-      }
-
-      const position = getBidIdParameter('position', bid.params) || deepAccess(bid, 'mediaTypes.video.pos');
-      if (position) {
-        spotxReq.video.ext.pos = position;
-      }
-
-      if (bid.crumbs && bid.crumbs.pubcid) {
-        pubcid = bid.crumbs.pubcid;
-      }
-
-      const language = navigator.language ? 'language' : 'userLanguage';
-      const device = {
-        h: screen.height,
-        w: screen.width,
-        dnt: getDNT() ? 1 : 0,
-        language: navigator[language].split('-')[0],
-        make: navigator.vendor ? navigator.vendor : '',
-        ua: navigator.userAgent
-      };
-
-      const requestPayload = {
-        id: channelId,
-        imp: spotxReq,
-        site: {
-          id: siteId,
-          page: page,
-          content: 'content',
-        },
-        device: device,
-        ext: {
-          wrap_response: 1
-        }
-      };
-
-      // If the publisher asks to ignore the bidder cache key we need to return the full vast xml
-      // so that it can be cached on the publishes specified server.
-      if (!!config.getConfig('cache') && !!config.getConfig('cache.url') && (config.getConfig('cache.ignoreBidderCacheKey') === true)) {
-        requestPayload['ext']['wrap_response'] = 0;
-      }
-
-      if (getBidIdParameter('number_of_ads', bid.params)) {
-        requestPayload['ext']['number_of_ads'] = getBidIdParameter('number_of_ads', bid.params);
-      }
-
-      const userExt = {};
-
-      if (getBidIdParameter('spotx_all_google_consent', bid.params) == 1) {
-        userExt['consented_providers_settings'] = GOOGLE_CONSENT;
-      }
-
-      // Add GDPR flag and consent string
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        userExt.consent = bidderRequest.gdprConsent.consentString;
-
-        if (typeof bidderRequest.gdprConsent.gdprApplies !== 'undefined') {
-          deepSetValue(requestPayload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
-        }
-      }
-
-      if (bidderRequest && bidderRequest.uspConsent) {
-        deepSetValue(requestPayload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-      }
-
-      if (bid.userIdAsEids) {
-        userExt.eids = bid.userIdAsEids;
-
-        userExt.eids.forEach(eid => {
-          if (eid.source === 'uidapi.com') {
-            eid.uids.forEach(uid => {
-              uid.ext = uid.ext || {};
-              uid.ext.rtiPartner = 'UID2'
-            });
-          }
-        });
-      }
-
-      // Add common id if available
-      if (pubcid) {
-        userExt.fpc = pubcid;
-      }
-
-      // Add schain object if it is present
-      if (bid && bid.schain) {
-        requestPayload['source'] = {
-          ext: {
-            schain: bid.schain
-          }
-        };
-      }
-
-      // Only add the user object if it's not empty
-      if (!isEmpty(userExt)) {
-        requestPayload.user = { ext: userExt };
-      }
-      const urlQueryParams = 'src_sys=prebid';
-      return {
-        method: 'POST',
-        url: URL + channelId + '?' + urlQueryParams,
-        data: requestPayload,
-        bidRequest: bidderRequest
-      };
-    });
-
-    return spotxRequests;
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, bidderRequest) {
-    const bidResponses = [];
-    const serverResponseBody = serverResponse.body;
-
-    if (serverResponseBody && isArray(serverResponseBody.seatbid)) {
-      _each(serverResponseBody.seatbid, function(bids) {
-        _each(bids.bid, function(spotxBid) {
-          let currentBidRequest = {};
-          for (let i in bidderRequest.bidRequest.bids) {
-            if (spotxBid.impid == bidderRequest.bidRequest.bids[i].bidId) {
-              currentBidRequest = bidderRequest.bidRequest.bids[i];
-            }
-          }
-
-          /**
-           * Make sure currency and price are the right ones
-           * TODO: what about the pre_market_bid partners sizes?
-           */
-          _each(currentBidRequest.params.pre_market_bids, function(pmb) {
-            if (pmb.deal_id == spotxBid.id) {
-              spotxBid.price = pmb.price;
-              serverResponseBody.cur = pmb.currency;
-            }
-          });
-
-          const bid = {
-            requestId: currentBidRequest.bidId,
-            currency: serverResponseBody.cur || 'USD',
-            cpm: spotxBid.price,
-            creativeId: spotxBid.crid || '',
-            dealId: spotxBid.dealid || '',
-            ttl: 360,
-            netRevenue: true,
-            channel_id: serverResponseBody.id,
-            mediaType: VIDEO,
-            width: spotxBid.w,
-            height: spotxBid.h
-          };
-
-          if (!!config.getConfig('cache') && !!config.getConfig('cache.url') && (config.getConfig('cache.ignoreBidderCacheKey') === true)) {
-            bid.vastXml = spotxBid.adm;
-          } else {
-            bid.cache_key = spotxBid.ext.cache_key;
-            bid.vastUrl = 'https://search.spotxchange.com/ad/vast.html?key=' + spotxBid.ext.cache_key;
-            bid.videoCacheKey = spotxBid.ext.cache_key;
-          }
-
-          bid.meta = bid.meta || {};
-          if (spotxBid && spotxBid.adomain && spotxBid.adomain.length > 0) {
-            bid.meta.advertiserDomains = spotxBid.adomain;
-          }
-
-          const context1 = deepAccess(currentBidRequest, 'mediaTypes.video.context');
-          const context2 = deepAccess(currentBidRequest, 'params.ad_unit');
-          if (context1 == 'outstream' || context2 == 'outstream') {
-            const playersize = deepAccess(currentBidRequest, 'mediaTypes.video.playerSize');
-            const renderer = Renderer.install({
-              id: 0,
-              renderNow: true,
-              url: '/',
-              config: {
-                adText: 'SpotX Outstream Video Ad via Prebid.js',
-                player_width: playersize[0][0],
-                player_height: playersize[0][1],
-                content_page_url: deepAccess(bidderRequest, 'data.site.page'),
-                ad_mute: +!!deepAccess(currentBidRequest, 'params.ad_mute'),
-                hide_skin: +!!deepAccess(currentBidRequest, 'params.hide_skin'),
-                outstream_options: deepAccess(currentBidRequest, 'params.outstream_options'),
-                outstream_function: deepAccess(currentBidRequest, 'params.outstream_function')
-              }
-            });
-
-            try {
-              renderer.setRender(outstreamRender);
-              renderer.setEventHandlers({
-                impression: function impression() {
-                  return logMessage('SpotX outstream video impression event');
-                },
-                loaded: function loaded() {
-                  return logMessage('SpotX outstream video loaded event');
-                },
-                ended: function ended() {
-                  logMessage('SpotX outstream renderer video event');
-                }
-              });
-            } catch (err) {
-              logWarn('Prebid Error calling setRender or setEventHandlers on renderer', err);
-            }
-            bid.renderer = renderer;
-          }
-
-          bidResponses.push(bid);
-        })
-      });
-    }
-
-    return bidResponses;
-  }
-}
-
-function createOutstreamScript(bid) {
-  const script = window.document.createElement('script');
-  let dataSpotXParams = createScriptAttributeMap(bid);
-
-  script.type = 'text/javascript';
-  script.src = 'https://js.spotx.tv/easi/v1/' + bid.channel_id + '.js';
-
-  setScriptAttributes(script, dataSpotXParams);
-
-  return script;
-}
-
-function outstreamRender(bid) {
-  if (bid.renderer.config.outstream_function != null && typeof bid.renderer.config.outstream_function === 'function') {
-    const script = createOutstreamScript(bid);
-    bid.renderer.config.outstream_function(bid, script);
-  } else {
-    try {
-      const inIframe = getBidIdParameter('in_iframe', bid.renderer.config.outstream_options);
-      const easiUrl = 'https://js.spotx.tv/easi/v1/' + bid.channel_id + '.js';
-      let attributes = createScriptAttributeMap(bid);
-      if (inIframe && window.document.getElementById(inIframe).nodeName == 'IFRAME') {
-        const rawframe = window.document.getElementById(inIframe);
-        let framedoc = rawframe.contentDocument;
-        if (!framedoc && rawframe.contentWindow) {
-          framedoc = rawframe.contentWindow.document;
-        }
-        loadExternalScript(easiUrl, BIDDER_CODE, undefined, framedoc, attributes);
-      } else {
-        loadExternalScript(easiUrl, BIDDER_CODE, undefined, undefined, attributes);
-      }
-    } catch (err) {
-      logError('[SPOTX][renderer] Error:' + err.message);
-    }
-  }
-}
-
-function createScriptAttributeMap(bid) {
-  const slot = getBidIdParameter('slot', bid.renderer.config.outstream_options);
-  logMessage('[SPOTX][renderer] Handle SpotX outstream renderer');
-  let dataSpotXParams = {};
-  dataSpotXParams['data-spotx_channel_id'] = '' + bid.channel_id;
-  dataSpotXParams['data-spotx_vast_url'] = '' + bid.vastUrl;
-  dataSpotXParams['data-spotx_content_page_url'] = bid.renderer.config.content_page_url;
-  dataSpotXParams['data-spotx_ad_unit'] = 'incontent';
-
-  logMessage('[SPOTX][renderer] Default behavior');
-  if (getBidIdParameter('ad_mute', bid.renderer.config.outstream_options)) {
-    dataSpotXParams['data-spotx_ad_mute'] = '1';
-  }
-  dataSpotXParams['data-spotx_collapse'] = '0';
-  dataSpotXParams['data-spotx_autoplay'] = '1';
-  dataSpotXParams['data-spotx_blocked_autoplay_override_mode'] = '1';
-  dataSpotXParams['data-spotx_video_slot_can_autoplay'] = '1';
-  dataSpotXParams['data-spotx_content_container_id'] = slot;
-
-  const playersizeAutoAdapt = getBidIdParameter('playersize_auto_adapt', bid.renderer.config.outstream_options);
-  if (playersizeAutoAdapt && isBoolean(playersizeAutoAdapt) && playersizeAutoAdapt === true) {
-    const ratio = bid.width && isNumber(bid.width) && bid.height && isNumber(bid.height) ? bid.width / bid.height : 4 / 3;
-    const slotClientWidth = window.document.getElementById(slot).clientWidth;
-    let playerWidth = bid.renderer.config.player_width;
-    let playerHeight = bid.renderer.config.player_height;
-    let contentWidth = 0;
-    let contentHeight = 0;
-    if (slotClientWidth < playerWidth) {
-      playerWidth = slotClientWidth;
-      playerHeight = playerWidth / ratio;
-    }
-    if (ratio <= 1) {
-      contentWidth = Math.round(playerHeight * ratio);
-      contentHeight = playerHeight;
-    } else {
-      contentWidth = playerWidth;
-      contentHeight = Math.round(playerWidth / ratio);
-    }
-
-    dataSpotXParams['data-spotx_content_width'] = '' + contentWidth;
-    dataSpotXParams['data-spotx_content_height'] = '' + contentHeight;
-  }
-
-  const customOverride = getBidIdParameter('custom_override', bid.renderer.config.outstream_options);
-  if (customOverride && isPlainObject(customOverride)) {
-    logMessage('[SPOTX][renderer] Custom behavior.');
-    for (let name in customOverride) {
-      if (customOverride.hasOwnProperty(name)) {
-        if (name === 'channel_id' || name === 'vast_url' || name === 'content_page_url' || name === 'ad_unit') {
-          logWarn('[SPOTX][renderer] Custom behavior: following option cannot be overridden: ' + name);
-        } else {
-          dataSpotXParams['data-spotx_' + name] = customOverride[name];
-        }
-      }
-    }
-  }
-  return dataSpotXParams;
-}
-
-registerBidder(spec);
diff --git a/modules/spotxBidAdapter.md b/modules/spotxBidAdapter.md
deleted file mode 100644
index 0bd1cf71aa1..00000000000
--- a/modules/spotxBidAdapter.md
+++ /dev/null
@@ -1,136 +0,0 @@
-# Overview
-
-```
-Module Name: SpotX Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: teameighties@spotx.tv
-```
-
-# Description
-
-Connect to SpotX for bids.
-
-This adapter requires setup and approval from the SpotX team.
-
-# Test Parameters - Use case #1 - outstream with default rendering options
-```
-    var adUnits = [{
-        code: 'something',
-        mediaTypes: {
-            video: {
-                context: 'outstream', // 'instream' or 'outstream'
-                playerSize: [640, 480]
-            }
-        },
-        bids: [{
-            bidder: 'spotx',
-            params: {
-                channel_id: 85394,
-                ad_unit: 'outstream',
-                outstream_options: { // Needed for the default outstream renderer - fields video_slot/content_width/content_height are mandatory
-                    slot: 'adSlot1',
-                    content_width: 300,
-                    content_height: 250
-                }
-            }
-        }]
-    }];
-```
-
-# Test Parameters - Use case #2 - outstream with default rendering options + some other options
-```
-    var adUnits = [{
-        code: 'something',
-        mediaTypes: {
-            video: {
-                context: 'outstream', // 'instream' or 'outstream'
-                playerSize: [640, 480]
-            }
-        },
-        bids: [{
-            bidder: 'spotx',
-            params: {
-                channel_id: 85394,
-                ad_unit: 'outstream',
-                outstream_options: {
-                    slot: 'adSlot1',
-                    custom_override: { // This option is not mandatory though used to override default renderer parameters using EASI player options in here: https://developer.spotxchange.com/content/local/docs/sdkDocs/EASI/README.md
-                        content_width: 300,
-                        content_height: 250,
-                        collapse: '1',
-                        hide_fullscreen: '1',
-                        unmute_on_mouse: '1',
-                        continue_out_of_view: '1',
-                        ad_volume: '100',
-                        content_container_id: 'video1',
-                        hide_skin: '1',
-                        spotx_all_google_consent: '1'
-                    }
-                }
-            }
-        }]
-    }];
-```
-
-# Test Parameters - Use case #3 - outstream with your own outstream redering function
-```
-    var adUnits = [{
-        code: 'something',
-        mediaTypes: {
-            video: {
-                context: 'outstream', // 'instream' or 'outstream'
-                playerSize: [640, 480]
-            }
-        },
-        bids: [{
-            bidder: 'spotx',
-            params: {
-                channel_id: 79391,
-                ad_unit: 'outstream',
-                outstream_function: myOutstreamFunction // Override the default outstream renderer by this referenced function
-            }
-        }]
-    }];
-```
-
-# Sample of a custom outstream rendering function
-```
-function myOutstreamFunction(bid) {
-    const videoDiv = 'video1';
-    const playerWidth = 300;
-    const playerHeight = 250;
-
-    window.console.log('[SPOTX][renderer] Handle SpotX custom outstream renderer');
-    let script = window.document.createElement('script');
-    script.type = 'text/javascript';
-    script.src = '//js.spotx.tv/easi/v1/' + bid.channel_id + '.js';
-    script.setAttribute('data-spotx_channel_id', '' + bid.channel_id);
-    script.setAttribute('data-spotx_vast_url', '' + bid.vastUrl);
-    script.setAttribute('data-spotx_content_width', playerWidth);
-    script.setAttribute('data-spotx_content_height', playerHeight);
-    script.setAttribute('data-spotx_content_page_url', bid.renderer.config.content_page_url);
-    if (bid.renderer.config.ad_mute) {
-        script.setAttribute('data-spotx_ad_mute', '0');
-    }
-    script.setAttribute('data-spotx_ad_unit', 'incontent');
-    script.setAttribute('data-spotx_collapse', '0');
-    script.setAttribute('data-spotx_hide_fullscreen', '1');
-    script.setAttribute('data-spotx_autoplay', '1');
-    script.setAttribute('data-spotx_blocked_autoplay_override_mode', '1');
-    script.setAttribute('data-spotx_video_slot_can_autoplay', '1');
-    script.setAttribute('data-spotx_unmute_on_mouse', '1');
-    script.setAttribute('data-spotx_click_to_replay', '1');
-    script.setAttribute('data-spotx_continue_out_of_view', '1');
-    script.setAttribute('data-spotx_ad_volume', '100');
-    if (bid.renderer.config.inIframe && window.document.getElementById(bid.renderer.config.inIframe).nodeName == 'IFRAME') {
-        let rawframe = window.document.getElementById(bid.renderer.config.inIframe);
-        let framedoc = rawframe.contentDocument;
-        if (!framedoc && rawframe.contentWindow) {
-            framedoc = rawframe.contentWindow.document;
-        }
-        framedoc.body.appendChild(script);
-    } else {
-        window.document.getElementById(videoDiv).appendChild(script);
-    }
-};
-```
diff --git a/modules/sspBCBidAdapter.js b/modules/sspBCBidAdapter.js
index 2b39faa02d8..03a9f5a1da9 100644
--- a/modules/sspBCBidAdapter.js
+++ b/modules/sspBCBidAdapter.js
@@ -1,18 +1,19 @@
-import { deepAccess, getWindowTop, isArray, logWarn } from '../src/utils.js';
+import { deepAccess, getWindowTop, isArray, logInfo, logWarn } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { includes as strIncludes } from '../src/polyfill.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
 
 const BIDDER_CODE = 'sspBC';
 const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
-const SYNC_URL = 'https://ssp.wp.pl/bidder/usersync';
+const SYNC_URL_IFRAME = 'https://ssp.wp.pl/bidder/usersync';
+const SYNC_URL_IMAGE = 'https://ssp.wp.pl/v1/sync/pixel';
 const NOTIFY_URL = 'https://ssp.wp.pl/bidder/notify';
 const GVLID = 676;
 const TMAX = 450;
-const BIDDER_VERSION = '5.91';
+const BIDDER_VERSION = '6.10';
 const DEFAULT_CURRENCY = 'PLN';
 const W = window;
 const { navigator } = W;
@@ -21,7 +22,6 @@ const adUnitsCalled = {};
 const adSizesCalled = {};
 const bidderRequestsMap = {};
 const pageView = {};
-var consentApiVersion;
 
 /**
  * Native asset mapping - we use constant id per type
@@ -38,7 +38,7 @@ var nativeAssetMap = {
 
 /**
  * return native asset type, based on asset id
- * @param {int} id - native asset id
+ * @param {number} id - native asset id
  * @returns {string} asset type
  */
 const getNativeAssetType = id => {
@@ -71,13 +71,26 @@ const getContentLanguage = () => {
     const topWindow = getWindowTop();
     return topWindow.document.body.parentNode.lang;
   } catch (err) {
-    logWarn('Could not read language form top-level html', err);
+    logWarn('Could not read language from top-level html', err);
+  }
+};
+
+/**
+ * Get host name of the top level html object
+ * @returns {string} host name
+ */
+const getTopHost = () => {
+  try {
+    const topWindow = getWindowTop();
+    return topWindow.location.host;
+  } catch (err) {
+    logWarn('Could not read host from top-level window', err);
   }
 };
 
 /**
  * Get Bid parameters - returns bid params from Object, or 1el array
- * @param {*} bidData - bid (bidWon), or array of bids (timeout)
+ * @param {*} bidParams - bid (bidWon), or array of bids (timeout)
  * @returns {object} params object
  */
 const unpackParams = (bidParams) => {
@@ -99,7 +112,8 @@ const getNotificationPayload = bidData => {
         tagid: [],
       }
       bids.forEach(bid => {
-        const { adUnitCode, cpm, creativeId, meta, mediaType, params: bidParams, bidderRequestId, requestId, timeout } = bid;
+        const { adUnitCode, cpm, creativeId, meta = {}, mediaType, params: bidParams, bidderRequestId, requestId, timeout } = bid;
+        const { platform = 'wpartner' } = meta;
         const params = unpackParams(bidParams);
 
         // basic notification data
@@ -107,6 +121,7 @@ const getNotificationPayload = bidData => {
           requestId: bidderRequestId || bidderRequestsMap[requestId],
           timeout: timeout || result.timeout,
           pvid: pageView.id,
+          platform
         }
         result = { ...result, ...bidBasicData }
 
@@ -164,7 +179,7 @@ const applyClientHints = ortbRequest => {
     Check / generate page view id
     Should be generated dureing first call to applyClientHints(),
     and re-generated if pathname has changed
-  */
+   */
   if (!pageView.id || location.pathname !== pageView.path) {
     pageView.path = location.pathname;
     pageView.id = Math.floor(1E20 * Math.random()).toString();
@@ -216,8 +231,11 @@ const applyTopics = (validBidRequest, ortbRequest) => {
 };
 
 const applyUserIds = (validBidRequest, ortbRequest) => {
-  const eids = validBidRequest.userIdAsEids
-  if (eids && eids.length) {
+  const { userIdAsEids: eidsVbr = [], ortb2 = {} } = validBidRequest;
+  const eidsOrtb = ortb2.user?.ext?.data?.eids || [];
+  const eids = [...eidsVbr, ...eidsOrtb];
+
+  if (eids.length) {
     const ids = { eids };
     ortbRequest.user = { ...ortbRequest.user, ...ids };
   }
@@ -230,10 +248,9 @@ const applyUserIds = (validBidRequest, ortbRequest) => {
 const applyGdpr = (bidderRequest, ortbRequest) => {
   const { gdprConsent } = bidderRequest;
   if (gdprConsent) {
-    const { apiVersion, gdprApplies, consentString } = gdprConsent;
-    consentApiVersion = apiVersion;
-    ortbRequest.regs = Object.assign(ortbRequest.regs, { 'gdpr': gdprApplies ? 1 : 0 });
-    ortbRequest.user = Object.assign(ortbRequest.user, { 'consent': consentString });
+    const { gdprApplies, consentString } = gdprConsent;
+    ortbRequest.regs = Object.assign(ortbRequest.regs || {}, { 'gdpr': gdprApplies ? 1 : 0 });
+    ortbRequest.user = Object.assign(ortbRequest.user || {}, { 'consent': consentString });
   }
 }
 
@@ -243,7 +260,7 @@ const applyGdpr = (bidderRequest, ortbRequest) => {
  * returns floor = 0 if getFloor() is not defined
  *
  * @param {object} slot bid request adslot
- * @returns {float} floorprice
+ * @returns {number} floorprice
  */
 const getHighestFloor = (slot) => {
   const currency = getCurrency();
@@ -258,18 +275,18 @@ const getHighestFloor = (slot) => {
           mediaType: 'banner',
           size: next,
           currency
-        });
+        }) || {};
         return prev > currentFloor ? prev : currentFloor;
       }, 0);
     }
 
     const { floor: nativeFloor = 0 } = slot.getFloor({
       mediaType: 'native', currency
-    });
+    }) || {};
 
     const { floor: videoFloor = 0 } = slot.getFloor({
       mediaType: 'video', currency
-    });
+    }) || {};
 
     result.floor = Math.max(bannerFloor, nativeFloor, videoFloor);
   }
@@ -281,7 +298,7 @@ const getHighestFloor = (slot) => {
  * Get currency (either default or adserver)
  * @returns {string} currency name
  */
-const getCurrency = () => config.getConfig('currency.adServerCurrency') || DEFAULT_CURRENCY;
+const getCurrency = (bidderRequest) => getCurrencyFromBidderRequest(bidderRequest) || DEFAULT_CURRENCY;
 
 /**
  * Get value for first occurence of key within the collection
@@ -337,7 +354,7 @@ var mapAsset = function mapAsset(paramName, paramValue) {
           id: id,
           required: required,
           title: {
-            len: len
+            len: len || 140
           }
         });
         break;
@@ -466,7 +483,7 @@ var mapVideo = (slot, videoFromBid) => {
 const mapImpression = slot => {
   const { adUnitCode, bidderRequestId, bidId, params = {}, ortb2Imp = {} } = slot;
   const { id, siteId, video } = params;
-  const { ext = {} } = ortb2Imp;
+  const { instl, ext = {} } = ortb2Imp;
 
   /*
     store bidId <-> bidderRequestId mapping for bidWon notification
@@ -494,6 +511,7 @@ const mapImpression = slot => {
     video: mapVideo(slot, video),
     tagid: adUnitCode,
     ext,
+    instl,
   };
 
   // Check floorprices for this imp
@@ -506,7 +524,7 @@ const mapImpression = slot => {
 }
 
 const isVideoAd = bid => {
-  const xmlTester = new RegExp(/^<\?xml/);
+  const xmlTester = new RegExp(/^<\?xml| {
   return bid.admNative || (bid.adm && bid.adm.match(xmlTester));
 }
 
+const isHTML = bid => {
+  const xmlTester = new RegExp(/^ {
   const { link = {}, imptrackers: impressionTrackers, jstracker } = nativeData;
   const { url: clickUrl, clicktrackers: clickTrackers = [] } = link;
@@ -569,81 +592,6 @@ const parseNative = (nativeData, adUnitCode) => {
   return result;
 }
 
-const renderCreative = (site, auctionId, bid, seat, request) => {
-  let gam;
-
-  const mcad = {
-    id: auctionId,
-    seat,
-    seatbid: [{
-      bid: [bid],
-    }],
-  };
-
-  const mcbase = btoa(encodeURI(JSON.stringify(mcad)));
-
-  if (bid.adm) {
-    // parse adm for gam config
-    try {
-      gam = JSON.parse(bid.adm).gam;
-
-      if (!gam || !Object.keys(gam).length) {
-        gam = undefined;
-      } else {
-        gam.namedSizes = ['fluid'];
-        gam.div = 'div-gpt-ad-x01';
-        gam.targeting = Object.assign(gam.targeting || {}, {
-          OAS_retarg: '0',
-          PREBID_ON: '1',
-          emptygaf: '0',
-        });
-      }
-
-      if (gam && !gam.targeting) {
-        gam.targeting = {};
-      }
-    } catch (err) {
-      logWarn('Could not parse adm data', bid.adm);
-    }
-  }
-
-  let adcode = `
-  
-  
-    
-    
-  
-    
-    
-    

-    
-    
-  
-  `;
-
-  return adcode;
-}
-
 const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
@@ -654,8 +602,6 @@ const spec = {
     return true;
   },
   buildRequests(validBidRequests, bidderRequest) {
-    logWarn('DEBUG: buildRequests', bidderRequest.auctionId, bidderRequest.bidderRequestId);
-
     // convert Native ORTB definition to old-style prebid native definition
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
 
@@ -663,6 +609,7 @@ const spec = {
       return false;
     }
 
+    const ortb2 = setOnAny(validBidRequests, 'ortb2');
     const siteId = setOnAny(validBidRequests, 'params.siteId');
     const publisherId = setOnAny(validBidRequests, 'params.publisherId');
     const page = setOnAny(validBidRequests, 'params.page') || bidderRequest.refererInfo.page;
@@ -671,6 +618,9 @@ const spec = {
     const pbver = '$prebid.version$';
     const testMode = setOnAny(validBidRequests, 'params.test') ? 1 : undefined;
     const ref = bidderRequest.refererInfo.ref;
+    const { source = {}, regs = {} } = ortb2 || {};
+
+    source.schain = setOnAny(validBidRequests, 'schain');
 
     const payload = {
       id: bidderRequest.bidderRequestId,
@@ -683,10 +633,11 @@ const spec = {
         content: { language: getContentLanguage() },
       },
       imp: validBidRequests.map(slot => mapImpression(slot)),
-      cur: [getCurrency()],
+      cur: [getCurrency(bidderRequest)],
       tmax,
       user: {},
-      regs: {},
+      regs,
+      source,
       device: {
         language: getBrowserLanguage(),
         w: screen.width,
@@ -710,21 +661,22 @@ const spec = {
 
   interpretResponse(serverResponse, request) {
     const { bidderRequest } = request;
-    const response = serverResponse.body;
+    const { body: response = {} } = serverResponse;
+    const { seatbid: responseSeat, ext: responseExt = {} } = response;
+    const { paapi: fledgeAuctionConfigs = [] } = responseExt;
     const bids = [];
     let site = JSON.parse(request.data).site; // get page and referer data from request
     site.sn = response.sn || 'mc_adapter'; // WPM site name (wp_sn)
     pageView.sn = site.sn; // store site_name (for syncing and notifications)
-    let seat;
 
-    if (response.seatbid !== undefined) {
+    if (responseSeat !== undefined) {
       /*
         Match response to request, by comparing bid id's
         'bidid-' prefix indicates oneCode (parameterless) request and response
       */
-      response.seatbid.forEach(seatbid => {
-        seat = seatbid.seat;
-        seatbid.bid.forEach(serverBid => {
+      responseSeat.forEach(seatbid => {
+        const { seat, bid } = seatbid;
+        bid.forEach(serverBid => {
           // get data from bid response
           const { adomain, crid = `mcad_${bidderRequest.auctionId}_${site.slot}`, impid, exp = 300, ext = {}, price, w, h } = serverBid;
 
@@ -740,7 +692,7 @@ const spec = {
           const { bidId } = bidRequest || {};
 
           // get ext data from bid
-          const { siteid = site.id, slotid = site.slot, pubid, adlabel, cache: creativeCache, vurls = [] } = ext;
+          const { siteid = site.id, slotid = site.slot, pubid, adlabel, cache: creativeCache, vurls = [], dsa, platform = 'wpartner', pricepl } = ext;
 
           // update site data
           site = {
@@ -771,7 +723,9 @@ const spec = {
               meta: {
                 advertiserDomains: adomain,
                 networkName: seat,
-                pricepl: ext && ext.pricepl,
+                pricepl,
+                dsa,
+                platform,
               },
               netRevenue: true,
               vurls,
@@ -785,6 +739,8 @@ const spec = {
               bid.vastXml = serverBid.adm;
               bid.vastContent = serverBid.adm;
               bid.vastUrl = creativeCache;
+
+              logInfo(`Bid ${bid.creativeId} is a video ad`);
             } else if (isNativeAd(serverBid)) {
               // native
               bid.mediaType = 'native';
@@ -798,10 +754,18 @@ const spec = {
                 logWarn('Could not parse native data', serverBid.adm);
                 bid.cpm = 0;
               }
-            } else {
-              // banner ad (default)
+              logInfo(`Bid ${bid.creativeId} as a native ad`);
+            } else if (isHTML(serverBid)) {
+              // banner ad (preformatted)
               bid.mediaType = 'banner';
-              bid.ad = renderCreative(site, response.id, serverBid, seat, bidderRequest);
+              logInfo(`Bid ${bid.creativeId} as a preformatted banner`);
+              bid.ad = serverBid.adm;
+            } else {
+              // unsupported bid format - send notification and set CPM to zero
+              const payload = getNotificationPayload(bid);
+              payload.event = 'parseError';
+              sendNotification(payload);
+              bid.cpm = 0;
             }
 
             if (bid.cpm > 0) {
@@ -815,17 +779,24 @@ const spec = {
       });
     }
 
-    return bids;
+    return fledgeAuctionConfigs.length ? { bids, fledgeAuctionConfigs } : bids;
   },
-  getUserSyncs(syncOptions, serverResponses, gdprConsent) {
+
+  getUserSyncs(syncOptions, _, gdprConsent = {}) {
+    const {iframeEnabled, pixelEnabled} = syncOptions;
+    const {gdprApplies, consentString = ''} = gdprConsent;
     let mySyncs = [];
-    // TODO: the check on CMP api version does not seem to make sense here. It means "always run the usersync unless an old (v1) CMP was detected". No attention is paid to the consent choices.
-    if (syncOptions.iframeEnabled && consentApiVersion != 1) {
+    if (iframeEnabled) {
       mySyncs.push({
         type: 'iframe',
-        url: `${SYNC_URL}?tcf=${consentApiVersion}&pvid=${pageView.id}&sn=${pageView.sn}`,
+        url: `${SYNC_URL_IFRAME}?tcf=2&pvid=${pageView.id}&sn=${pageView.sn}`,
       });
-    };
+    } else if (pixelEnabled) {
+      mySyncs.push({
+        type: 'image',
+        url: `${SYNC_URL_IMAGE}?inver=0&platform=wpartner&host=${getTopHost() || ''}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}`,
+      });
+    }
     return mySyncs;
   },
 
@@ -838,6 +809,15 @@ const spec = {
     }
   },
 
+  onBidderError(errorData) {
+    const payload = getNotificationPayload(errorData);
+    if (payload) {
+      payload.event = 'parseError';
+      sendNotification(payload);
+      return payload;
+    }
+  },
+
   onBidViewable(bid) {
     const payload = getNotificationPayload(bid);
     if (payload) {
@@ -847,6 +827,15 @@ const spec = {
     }
   },
 
+  onBidBillable(bid) {
+    const payload = getNotificationPayload(bid);
+    if (payload) {
+      payload.event = 'bidBillable';
+      sendNotification(payload);
+      return payload;
+    }
+  },
+
   onBidWon(bid) {
     const payload = getNotificationPayload(bid);
     if (payload) {
@@ -855,6 +844,7 @@ const spec = {
       return payload;
     }
   },
+
 };
 
 registerBidder(spec);
diff --git a/modules/ssp_genieeBidAdapter.js b/modules/ssp_genieeBidAdapter.js
new file mode 100644
index 00000000000..ed15842f96b
--- /dev/null
+++ b/modules/ssp_genieeBidAdapter.js
@@ -0,0 +1,425 @@
+/* eslint-disable camelcase */
+import * as utils from '../src/utils.js';
+import { isPlainObject } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { MODULE_TYPE_ANALYTICS } from '../src/activities/modules.js';
+import { highEntropySUAAccessor } from '../src/fpd/sua.js';
+import { config } from '../src/config.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
+const BIDDER_CODE = 'ssp_geniee';
+export const BANNER_ENDPOINT = 'https://aladdin.genieesspv.jp/yie/ld/api/ad_call/v2';
+// export const ENDPOINT_USERSYNC = '';
+const SUPPORTED_MEDIA_TYPES = [ BANNER ];
+const DEFAULT_CURRENCY = 'JPY';
+const ALLOWED_CURRENCIES = ['USD', 'JPY'];
+const NET_REVENUE = true;
+const MODULE_NAME = `ssp_geniee`;
+export const storage = getStorageManager({moduleType: MODULE_TYPE_ANALYTICS, moduleName: MODULE_NAME})
+
+/**
+ * List of keys for geparams (parameters we use)
+ * key: full name of the parameter
+ * value: shortened name used in geparams
+ */
+const GEPARAMS_KEY = {
+  /**
+   * location.href whose protocol is not http
+   */
+  LOCATION: 'loc',
+  /**
+   * document.referrer whose protocol is not http
+   */
+  REFERRER: 'ref',
+  /**
+   * URL parameter to be linked to clicks
+   */
+  GENIEE_CT0: 'ct0',
+  /**
+   * zipcode
+   */
+  ZIP: 'zip',
+  /**
+   * country
+   */
+  COUNTRY: 'country',
+  /**
+   * city
+   */
+  CITY: 'city',
+  /**
+   * longitude
+   */
+  LONGITUDE: 'long',
+  /**
+   * lattitude
+   */
+  LATITUDE: 'lati',
+  /**
+   * for customised parameters
+   */
+  CUSTOM: 'custom',
+  /**
+   * advertising identifier for iOS
+   */
+  IDENTIFIER_FOR_ADVERTISERS: 'idfa',
+  /**
+   * tracked Ad restrictions for iOS
+   */
+  LIMIT_AD_TRACKING: 'lat',
+  /**
+   * bundle ID of iOS applications?
+   */
+  BUNDLE: 'bundle',
+};
+
+/**
+ * List of keys for gecuparams (parameters we use)
+ * key: full name of the parameter
+ * value: shortened name used in geparams
+ */
+const GECUPARAMS_KEY = {
+  /**
+   * version no of gecuparams
+   */
+  VERSION: 'ver',
+  /**
+   * minor version no of gecuparams
+   */
+  MINOR_VERSION: 'minor',
+  /**
+   * encrypted value of LTSV format
+   */
+  VALUE: 'value',
+};
+
+/**
+ * executing encodeURIComponent including single quotation
+ * @param {string} str
+ * @returns
+ */
+function encodeURIComponentIncludeSingleQuotation(str) {
+  return encodeURIComponent(str).replace(/'/g, '%27');
+}
+
+/**
+ * Checking "params" has a value for the key "key" and it is not undefined, null, or an empty string
+ * To support IE in the same way, we cannot use the ?? operator
+ * @param {Object} params
+ * @param {string} key
+ * @returns {boolean}
+ */
+function hasParamsNotBlankString(params, key) {
+  return (
+    key in params &&
+    typeof params[key] !== 'undefined' &&
+    params[key] != null &&
+    params[key] != ''
+  );
+}
+
+/**
+ * making request data be used commonly banner and native
+ * @see https://docs.prebid.org/dev-docs/bidder-adaptor.html#location-and-referrers
+ */
+function makeCommonRequestData(bid, geparameter, refererInfo) {
+  const data = {
+    zoneid: bid.params.zoneId,
+    cb: Math.floor(Math.random() * 99999999999),
+    charset: document.charset || document.characterSet || '',
+    loc: refererInfo?.page || refererInfo?.location || refererInfo?.topmostLocation || refererInfo?.legacy.referer || encodeURIComponentIncludeSingleQuotation(geparameter[GEPARAMS_KEY.LOCATION]) || '',
+    ct0: geparameter[GEPARAMS_KEY.GENIEE_CT0] !== 'undefined'
+      ? encodeURIComponentIncludeSingleQuotation(geparameter[GEPARAMS_KEY.GENIEE_CT0])
+      : '',
+    referer: refererInfo?.ref || encodeURIComponentIncludeSingleQuotation(geparameter[GEPARAMS_KEY.REFERRER]) || '',
+    topframe: window.parent == window.self ? 1 : 0,
+    cur: bid.params.hasOwnProperty('currency') ? bid.params.currency : DEFAULT_CURRENCY,
+    requestid: bid.bidId,
+    ua: navigator.userAgent,
+    tpaf: 1,
+    cks: 1,
+    ib: 0,
+  };
+
+  try {
+    if (window.self.toString() !== '[object Window]' || window.parent.toString() !== '[object Window]') {
+      data.err = '1';
+    }
+  } catch (e) {}
+
+  if (GEPARAMS_KEY.IDENTIFIER_FOR_ADVERTISERS in geparameter) {
+    data.idfa = encodeURIComponentIncludeSingleQuotation(geparameter[GEPARAMS_KEY.IDENTIFIER_FOR_ADVERTISERS]);
+  }
+  if (GEPARAMS_KEY.LIMIT_AD_TRACKING in geparameter) {
+    data.adtk = geparameter[GEPARAMS_KEY.LIMIT_AD_TRACKING] ? '0' : '1';
+  }
+  // makeScreenSizeForQueryParameter
+  if (typeof screen !== 'undefined') {
+    const screenWidth = screen.width;
+    const screenHeight = screen.height;
+    if (screenWidth > screenHeight) {
+      data.sw = screenHeight;
+      data.sh = screenWidth;
+    } else {
+      data.sw = screenWidth;
+      data.sh = screenHeight;
+    }
+  }
+  // makeBannerJskQuery
+  if (hasParamsNotBlankString(geparameter, GEPARAMS_KEY.ZIP)) {
+    data.zip = encodeURIComponentIncludeSingleQuotation(geparameter[GEPARAMS_KEY.ZIP]);
+  }
+  if (hasParamsNotBlankString(geparameter, GEPARAMS_KEY.COUNTRY)) {
+    data.country = encodeURIComponentIncludeSingleQuotation(geparameter[GEPARAMS_KEY.COUNTRY]);
+  }
+  if (hasParamsNotBlankString(geparameter, GEPARAMS_KEY.CITY)) {
+    data.city = encodeURIComponentIncludeSingleQuotation(geparameter[GEPARAMS_KEY.CITY]);
+  }
+  if (hasParamsNotBlankString(geparameter, GEPARAMS_KEY.LONGITUDE)) {
+    data.long = encodeURIComponentIncludeSingleQuotation(geparameter[GEPARAMS_KEY.LONGITUDE]);
+  }
+  if (hasParamsNotBlankString(geparameter, GEPARAMS_KEY.LATITUDE)) {
+    data.lati = encodeURIComponentIncludeSingleQuotation(
+      geparameter[GEPARAMS_KEY.LATITUDE]
+    );
+  }
+  if (GEPARAMS_KEY.CUSTOM in geparameter && isPlainObject(geparameter[GEPARAMS_KEY.CUSTOM])) {
+    for (const c in geparameter[GEPARAMS_KEY.CUSTOM]) {
+      if (hasParamsNotBlankString(geparameter[GEPARAMS_KEY.CUSTOM], c)) {
+        data[encodeURIComponentIncludeSingleQuotation('custom_' + c)] =
+          encodeURIComponentIncludeSingleQuotation(
+            geparameter[GEPARAMS_KEY.CUSTOM][c]
+          );
+      }
+    }
+  }
+  const gecuparameter = window.gecuparams || {};
+  if (isPlainObject(gecuparameter)) {
+    if (hasParamsNotBlankString(gecuparameter, GECUPARAMS_KEY.VERSION)) {
+      data.gc_ver = encodeURIComponentIncludeSingleQuotation(gecuparameter[GECUPARAMS_KEY.VERSION]);
+    }
+    if (hasParamsNotBlankString(gecuparameter, GECUPARAMS_KEY.MINOR_VERSION)) {
+      data.gc_minor = encodeURIComponentIncludeSingleQuotation(gecuparameter[GECUPARAMS_KEY.MINOR_VERSION]);
+    }
+    if (hasParamsNotBlankString(gecuparameter, GECUPARAMS_KEY.VALUE)) {
+      data.gc_value = encodeURIComponentIncludeSingleQuotation(gecuparameter[GECUPARAMS_KEY.VALUE]);
+    }
+  }
+
+  // imuid
+  const imuidQuery = getImuidAsQueryParameter(bid);
+  if (imuidQuery) data.extuid = imuidQuery;
+
+  // makeUAQuery
+  // To avoid double encoding, not using encodeURIComponent here
+  const ua = JSON.parse(getUserAgent());
+  if (ua && ua.fullVersionList) {
+    const fullVersionList = ua.fullVersionList.reduce((acc, cur) => {
+      let str = acc;
+      if (str) str += ',';
+      str += '"' + cur.brand + '";v="' + cur.version + '"';
+      return str;
+    }, '');
+    data.ucfvl = fullVersionList;
+  }
+  if (ua && ua.platform) data.ucp = '"' + ua.platform + '"';
+  if (ua && ua.architecture) data.ucarch = '"' + ua.architecture + '"';
+  if (ua && ua.platformVersion) data.ucpv = '"' + ua.platformVersion + '"';
+  if (ua && ua.bitness) data.ucbit = '"' + ua.bitness + '"';
+  data.ucmbl = '?' + (ua && ua.mobile ? '1' : '0');
+  if (ua && ua.model) data.ucmdl = '"' + ua.model + '"';
+
+  return data;
+}
+
+/**
+ * making request data for banner
+ */
+function makeBannerRequestData(bid, geparameter, refererInfo) {
+  const data = makeCommonRequestData(bid, geparameter, refererInfo);
+
+  // this query is not used in nad endpoint but used in ad_call endpoint
+  if (hasParamsNotBlankString(geparameter, GEPARAMS_KEY.BUNDLE)) {
+    data.apid = encodeURIComponentIncludeSingleQuotation(geparameter[GEPARAMS_KEY.BUNDLE]);
+  }
+
+  return data;
+}
+
+/**
+ * making bid response be used commonly banner and native
+ */
+function makeCommonBidResponse(bid, width, height) {
+  return {
+    requestId: bid.requestid,
+    cpm: bid.price,
+    creativeId: bid.creativeId,
+    currency: bid.cur,
+    netRevenue: NET_REVENUE,
+    ttl: 700,
+    width: width, // width of the ad iframe
+    height: height, // height of the ad iframe
+  };
+}
+
+/**
+ * making bid response for banner
+ */
+function makeBannerBidResponse(bid, request) {
+  const bidResponse = makeCommonBidResponse(bid, bid.width, bid.height);
+  const loc = encodeURIComponentIncludeSingleQuotation(
+    window.top === window.self ? location.href : window.top.document.referrer
+  );
+  const beacon = !bid.ib
+    ? ''
+    : `
+    

+    
+    
`;
+  bidResponse.ad = makeBidResponseAd(
+    beacon + '
' + makeChangeHeightEventMarkup(request) + decodeURIComponent(bid.adm) + '
'
+  );
+  bidResponse.mediaType = BANNER;
+
+  return bidResponse;
+}
+
+/**
+ * making change height event markup for af iframe. About passback ad, it is possible that ad image is cut off. To handle this, we add this event to change height after ad is loaded.
+ */
+function makeChangeHeightEventMarkup(request) {
+  return (
+    ''
+  );
+}
+
+/**
+ * making bid response ad. This is also the value to be used by document.write in renderAd function.
+ * @param {string} innerHTML
+ * @returns
+ */
+function makeBidResponseAd(innerHTML) {
+  return '' + innerHTML + '';
+}
+
+/**
+ * return imuid strings as query parameters
+ */
+function getImuidAsQueryParameter(bid) {
+  const imuid = utils.deepAccess(bid, 'userId.imuid');
+  return imuid ? 'im:' + imuid : ''; // To avoid double encoding, not using encodeURIComponent here
+}
+
+function getUserAgent() {
+  return storage.getDataFromLocalStorage('key') || null;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+  /**
+   * Determines whether or not the given bid request is valid.
+   * @param {BidRequest} bidRequest The bid request params to validate.
+   * @return boolean True if this is a valid bid request, and false otherwise.
+   */
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest.params.zoneId) return false;
+    const currencyType = config.getConfig('currency.adServerCurrency');
+    if (typeof currencyType === 'string' && ALLOWED_CURRENCIES.indexOf(currencyType) === -1) {
+      utils.logError('Invalid currency type, we support only JPY and USD!');
+      return false;
+    }
+    return true;
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Array} validBidRequests an array of bid requests
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const serverRequests = [];
+
+    const HIGH_ENTROPY_HINTS = [
+      'architecture',
+      'model',
+      'mobile',
+      'platform',
+      'bitness',
+      'platformVersion',
+      'fullVersionList',
+    ];
+
+    const uaData = window.navigator?.userAgentData;
+    if (uaData && uaData.getHighEntropyValues) {
+      const getHighEntropySUA = highEntropySUAAccessor(uaData);
+      getHighEntropySUA(HIGH_ENTROPY_HINTS).then((ua) => {
+        if (ua) {
+          storage.setDataInLocalStorage('ua', JSON.stringify(ua));
+        }
+      });
+    }
+
+    validBidRequests.forEach((bid) => {
+      // const isNative = bid.mediaTypes?.native;
+      const geparameter = window.geparams || {};
+
+      serverRequests.push({
+        method: 'GET',
+        url: BANNER_ENDPOINT,
+        data: makeBannerRequestData(bid, geparameter, bidderRequest?.refererInfo),
+        bid: bid,
+      });
+    });
+
+    return serverRequests;
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidderRequest A matched bid request for this response.
+   * @return Array An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidderRequest) {
+    const bidResponses = [];
+
+    if (!serverResponse || !serverResponse.body) {
+      return bidResponses;
+    }
+
+    const zoneId = bidderRequest.bid.params.zoneId;
+    let successBid;
+    successBid = serverResponse.body || {};
+
+    if (successBid.hasOwnProperty(zoneId)) {
+      const bid = successBid[zoneId];
+      bidResponses.push(makeBannerBidResponse(bid, bidderRequest));
+    }
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+
+    // if we need user sync, we add this part after preparing the endpoint
+    /* if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: ENDPOINT_USERSYNC
+      });
+    } */
+
+    return syncs;
+  },
+  onTimeout: function (timeoutData) {},
+  onBidWon: function (bid) {},
+  onSetTargeting: function (bid) {},
+};
+
+registerBidder(spec);
diff --git a/modules/ssp_genieeBidAdapter.md b/modules/ssp_genieeBidAdapter.md
new file mode 100644
index 00000000000..fe77a6f858b
--- /dev/null
+++ b/modules/ssp_genieeBidAdapter.md
@@ -0,0 +1,43 @@
+# Overview
+
+```
+Module Name: Geniee Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: supply-carpet@geniee.co.jp
+```
+
+# Description
+This is [Geniee](https://geniee.co.jp) Bidder Adapter for Prebid.js.
+(This is Geniee *SSP* Bidder Adapter. The another adapter named "Geniee Bid Adapter" is Geniee *DSP* Bidder Adapter.)
+
+Please contact us before using the adapter.
+
+We will provide ads when satisfy the following conditions:
+
+- There are a certain number bid requests by zone
+- The request is a Banner ad
+- Payment is possible in Japanese yen or US dollars
+- The request is not for GDPR or COPPA users
+
+Thus, even if the following test, it will be no bids if the request does not reach a certain requests.
+
+# Test Parameters
+
+```js
+var adUnits = [
+    {
+        code: 'banner-ad',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [{
+            bidder: 'ssp_geniee',
+            params: {
+                zoneId: 1573195
+            }
+        }]
+    },
+];
+```
diff --git a/modules/staqAnalyticsAdapter.js b/modules/staqAnalyticsAdapter.js
deleted file mode 100644
index c1aaa727af5..00000000000
--- a/modules/staqAnalyticsAdapter.js
+++ /dev/null
@@ -1,433 +0,0 @@
-import { logInfo, logError, parseUrl, _each } from '../src/utils.js';
-import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
-import adapterManager from '../src/adapterManager.js';
-import { getRefererInfo } from '../src/refererDetection.js';
-import { ajax } from '../src/ajax.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
-
-const MODULE_CODE = 'staq';
-const storageObj = getStorageManager({moduleType: MODULE_TYPE_ANALYTICS, moduleName: MODULE_CODE});
-
-const ANALYTICS_VERSION = '1.0.0';
-const DEFAULT_QUEUE_TIMEOUT = 4000;
-const DEFAULT_HOST = 'tag.staq.com';
-
-let staqAdapterRefWin;
-
-const STAQ_EVENTS = {
-  AUCTION_INIT: 'auctionInit',
-  BID_REQUEST: 'bidRequested',
-  BID_RESPONSE: 'bidResponse',
-  BID_WON: 'bidWon',
-  AUCTION_END: 'auctionEnd',
-  TIMEOUT: 'adapterTimedOut'
-};
-
-function buildRequestTemplate(connId) {
-  // TODO: what should these pick from refererInfo?
-  const url = staqAdapterRefWin.topmostLocation;
-  const ref = staqAdapterRefWin.topmostLocation;
-  const topLocation = staqAdapterRefWin.topmostLocation;
-
-  return {
-    ver: ANALYTICS_VERSION,
-    domain: topLocation.hostname,
-    path: topLocation.pathname,
-    userAgent: navigator.userAgent,
-    connId: connId,
-    env: {
-      screen: {
-        w: window.screen.width,
-        h: window.screen.height
-      },
-      lang: navigator.language
-    },
-    src: getUmtSource(url, ref)
-  }
-}
-
-let analyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoint' }), {
-  track({ eventType, args }) {
-    if (!analyticsAdapter.context) {
-      return;
-    }
-    let handler = null;
-    switch (eventType) {
-      case CONSTANTS.EVENTS.AUCTION_INIT:
-        if (analyticsAdapter.context.queue) {
-          analyticsAdapter.context.queue.init();
-        }
-        handler = trackAuctionInit;
-        break;
-      case CONSTANTS.EVENTS.BID_REQUESTED:
-        handler = trackBidRequest;
-        break;
-      case CONSTANTS.EVENTS.BID_RESPONSE:
-        handler = trackBidResponse;
-        break;
-      case CONSTANTS.EVENTS.BID_WON:
-        handler = trackBidWon;
-        break;
-      case CONSTANTS.EVENTS.BID_TIMEOUT:
-        handler = trackBidTimeout;
-        break;
-      case CONSTANTS.EVENTS.AUCTION_END:
-        handler = trackAuctionEnd;
-        break;
-    }
-    if (handler) {
-      let events = handler(args);
-      if (analyticsAdapter.context.queue) {
-        analyticsAdapter.context.queue.push(events);
-        if (eventType === CONSTANTS.EVENTS.BID_WON) {
-          analyticsAdapter.context.queue.updateWithWins(events);
-        }
-      }
-      if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
-        sendAll();
-      }
-    }
-  }
-});
-
-analyticsAdapter.context = {};
-
-analyticsAdapter.originEnableAnalytics = analyticsAdapter.enableAnalytics;
-
-analyticsAdapter.enableAnalytics = (config) => {
-  logInfo('Enabling STAQ Adapter');
-  staqAdapterRefWin = getRefererInfo(window);
-  if (!config.options.connId) {
-    logError('ConnId is not defined. STAQ Analytics won\'t work');
-    return;
-  }
-  if (!config.options.url) {
-    logError('URL is not defined. STAQ Analytics won\'t work');
-    return;
-  }
-  analyticsAdapter.context = {
-    host: config.options.host || DEFAULT_HOST,
-    url: config.options.url,
-    connectionId: config.options.connId,
-    requestTemplate: buildRequestTemplate(config.options.connId),
-    queue: new ExpiringQueue(sendAll, config.options.queueTimeout || DEFAULT_QUEUE_TIMEOUT)
-  };
-  analyticsAdapter.originEnableAnalytics(config);
-};
-
-adapterManager.registerAnalyticsAdapter({
-  adapter: analyticsAdapter,
-  code: MODULE_CODE,
-});
-
-export default analyticsAdapter;
-
-function sendAll() {
-  let events = analyticsAdapter.context.queue.popAll();
-  if (events.length !== 0) {
-    let req = analyticsAdapter.context.requestTemplate;
-    req.auctionId = analyticsAdapter.context.auctionId;
-    req.events = events
-
-    analyticsAdapter.ajaxCall(JSON.stringify(req));
-  }
-}
-
-analyticsAdapter.ajaxCall = function ajaxCall(data) {
-  logInfo('SENDING DATA: ' + data);
-  ajax(`https://${analyticsAdapter.context.url}/prebid/${analyticsAdapter.context.connectionId}`, () => {}, data, { contentType: 'text/plain' });
-};
-
-function trackAuctionInit(args) {
-  analyticsAdapter.context.auctionTimeStart = Date.now();
-  analyticsAdapter.context.auctionId = args.auctionId;
-  const event = createHbEvent(args.auctionId, undefined, STAQ_EVENTS.AUCTION_INIT);
-  return [event];
-}
-
-function trackBidRequest(args) {
-  return args.bids.map(bid =>
-    createHbEvent(args.auctionId, args.bidderCode, STAQ_EVENTS.BID_REQUEST, bid.adUnitCode));
-}
-
-function trackBidResponse(args) {
-  const event = createHbEvent(args.auctionId, args.bidderCode, STAQ_EVENTS.BID_RESPONSE,
-    args.adUnitCode, args.cpm, args.timeToRespond / 1000, false, args);
-  return [event];
-}
-
-function trackBidWon(args) {
-  const event = createHbEvent(args.auctionId, args.bidderCode, STAQ_EVENTS.BID_WON, args.adUnitCode, args.cpm, undefined, true, args);
-  return [event];
-}
-
-function trackAuctionEnd(args) {
-  const event = createHbEvent(args.auctionId, undefined, STAQ_EVENTS.AUCTION_END, undefined,
-    undefined, (Date.now() - analyticsAdapter.context.auctionTimeStart) / 1000);
-  return [event];
-}
-
-function trackBidTimeout(args) {
-  return args.map(arg => createHbEvent(arg.auctionId, arg.bidderCode, STAQ_EVENTS.TIMEOUT));
-}
-
-function createHbEvent(auctionId, adapter, event, adUnitCode = undefined, value = 0, time = 0, bidWon = undefined, eventArgs) {
-  let ev = { event: event };
-  if (adapter) {
-    ev.adapter = adapter;
-    ev.bidderName = adapter;
-  }
-  if (adUnitCode) {
-    ev.adUnitCode = adUnitCode;
-  }
-  if (value) {
-    ev.cpm = value;
-  }
-  if (time) {
-    ev.timeToRespond = time;
-  }
-  if (typeof bidWon !== 'undefined') {
-    ev.bidWon = bidWon;
-  } else if (event === 'bidResponse') {
-    ev.bidWon = false;
-  }
-  ev.auctionId = auctionId;
-
-  if (eventArgs) {
-    if (STAQ_EVENTS.BID_RESPONSE == event || STAQ_EVENTS.BID_WON == event) {
-      ev.width = eventArgs.width;
-      ev.height = eventArgs.height;
-
-      ev.adId = eventArgs.adId;
-    }
-  }
-
-  return ev;
-}
-
-const UTM_TAGS = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
-  'utm_c1', 'utm_c2', 'utm_c3', 'utm_c4', 'utm_c5'
-];
-const STAQ_PREBID_KEY = 'staq_analytics';
-const DIRECT = '(direct)';
-const REFERRAL = '(referral)';
-const ORGANIC = '(organic)';
-
-export let storage = {
-  getItem: (name) => {
-    return storageObj.getDataFromLocalStorage(name);
-  },
-  setItem: (name, value) => {
-    storageObj.setDataInLocalStorage(name, value);
-  }
-};
-
-export function getUmtSource(pageUrl, referrer) {
-  let prevUtm = getPreviousTrafficSource();
-  let currUtm = getCurrentTrafficSource(pageUrl, referrer);
-  let [updated, actual] = chooseActualUtm(prevUtm, currUtm);
-  if (updated) {
-    storeUtm(actual);
-  }
-  return actual;
-
-  function getPreviousTrafficSource() {
-    let val = storage.getItem(STAQ_PREBID_KEY);
-    if (!val) {
-      return getDirect();
-    }
-    return JSON.parse(val);
-  }
-
-  function getCurrentTrafficSource(pageUrl, referrer) {
-    var source = getUTM(pageUrl);
-    if (source) {
-      return source;
-    }
-    if (referrer) {
-      let se = getSearchEngine(referrer);
-      if (se) {
-        return asUtm(se, ORGANIC, ORGANIC);
-      }
-      let parsedUrl = parseUrl(pageUrl);
-      let [refHost, refPath] = getReferrer(referrer);
-      if (refHost && refHost !== parsedUrl.hostname) {
-        return asUtm(refHost, REFERRAL, REFERRAL, '', refPath);
-      }
-    }
-    return getDirect();
-  }
-
-  function getSearchEngine(pageUrl) {
-    let engines = {
-      'google': /^https?\:\/\/(?:www\.)?(?:google\.(?:com?\.)?(?:com|cat|[a-z]{2})|g.cn)\//i,
-      'yandex': /^https?\:\/\/(?:www\.)?ya(?:ndex\.(?:com|net)?\.?(?:asia|mobi|org|[a-z]{2})?|\.ru)\//i,
-      'bing': /^https?\:\/\/(?:www\.)?bing\.com\//i,
-      'duckduckgo': /^https?\:\/\/(?:www\.)?duckduckgo\.com\//i,
-      'ask': /^https?\:\/\/(?:www\.)?ask\.com\//i,
-      'yahoo': /^https?\:\/\/(?:[-a-z]+\.)?(?:search\.)?yahoo\.com\//i
-    };
-
-    for (let engine in engines) {
-      if (engines.hasOwnProperty(engine) && engines[engine].test(pageUrl)) {
-        return engine;
-      }
-    }
-  }
-
-  function getReferrer(referrer) {
-    let ref = parseUrl(referrer);
-    return [ref.hostname, ref.pathname];
-  }
-
-  function getUTM(pageUrl) {
-    let urlParameters = parseUrl(pageUrl).search;
-    if (!urlParameters['utm_campaign'] || !urlParameters['utm_source']) {
-      return;
-    }
-    let utmArgs = [];
-    _each(UTM_TAGS, (utmTagName) => {
-      let utmValue = urlParameters[utmTagName] || '';
-      utmArgs.push(utmValue);
-    });
-    return asUtm.apply(this, utmArgs);
-  }
-
-  function getDirect() {
-    return asUtm(DIRECT, DIRECT, DIRECT);
-  }
-
-  function storeUtm(utm) {
-    let val = JSON.stringify(utm);
-    storage.setItem(STAQ_PREBID_KEY, val);
-  }
-
-  function asUtm(source, medium, campaign, term = '', content = '', c1 = '', c2 = '', c3 = '', c4 = '', c5 = '') {
-    let result = {
-      source: source,
-      medium: medium,
-      campaign: campaign
-    };
-    if (term) {
-      result.term = term;
-    }
-    if (content) {
-      result.content = content;
-    }
-    if (c1) {
-      result.c1 = c1;
-    }
-    if (c2) {
-      result.c2 = c2;
-    }
-    if (c3) {
-      result.c3 = c3;
-    }
-    if (c4) {
-      result.c4 = c4;
-    }
-    if (c5) {
-      result.c5 = c5;
-    }
-    return result;
-  }
-
-  function chooseActualUtm(prev, curr) {
-    if (ord(prev) < ord(curr)) {
-      return [true, curr];
-    }
-    if (ord(prev) > ord(curr)) {
-      return [false, prev];
-    } else {
-      if (prev.campaign === REFERRAL && prev.content !== curr.content) {
-        return [true, curr];
-      } else if (prev.campaign === ORGANIC && prev.source !== curr.source) {
-        return [true, curr];
-      } else if (isCampaignTraffic(prev) && (prev.campaign !== curr.campaign || prev.source !== curr.source)) {
-        return [true, curr];
-      }
-    }
-    return [false, prev];
-  }
-
-  function ord(utm) {
-    switch (utm.campaign) {
-      case DIRECT:
-        return 0;
-      case ORGANIC:
-        return 1;
-      case REFERRAL:
-        return 2;
-      default:
-        return 3;
-    }
-  }
-
-  function isCampaignTraffic(utm) {
-    return [DIRECT, REFERRAL, ORGANIC].indexOf(utm.campaign) === -1;
-  }
-}
-
-/**
- * Expiring queue implementation. Fires callback on elapsed timeout since last last update or creation.
- * @param callback
- * @param ttl
- * @constructor
- */
-export function ExpiringQueue(callback, ttl) {
-  let queue = [];
-  let timeoutId;
-
-  this.push = (event) => {
-    if (event instanceof Array) {
-      queue.push.apply(queue, event);
-    } else {
-      queue.push(event);
-    }
-    reset();
-  };
-
-  this.updateWithWins = (winEvents) => {
-    winEvents.forEach(winEvent => {
-      queue.forEach(prevEvent => {
-        if (prevEvent.event === 'bidResponse' &&
-          prevEvent.auctionId == winEvent.auctionId &&
-          prevEvent.adUnitCode == winEvent.adUnitCode &&
-          prevEvent.adId == winEvent.adId &&
-          prevEvent.adapter == winEvent.adapter) {
-          prevEvent.bidWon = true;
-        }
-      });
-    });
-  }
-
-  this.popAll = () => {
-    let result = queue;
-    queue = [];
-    reset();
-    return result;
-  };
-
-  /**
-   * For test/debug purposes only
-   * @return {Array}
-   */
-  this.peekAll = () => {
-    return queue;
-  };
-
-  this.init = reset;
-
-  function reset() {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
-    }
-    timeoutId = setTimeout(() => {
-      if (queue.length) {
-        callback();
-      }
-    }, ttl);
-  }
-}
diff --git a/modules/stnBidAdapter.js b/modules/stnBidAdapter.js
new file mode 100644
index 00000000000..ba922c0fd57
--- /dev/null
+++ b/modules/stnBidAdapter.js
@@ -0,0 +1,109 @@
+import {
+  logWarn,
+  logInfo,
+  isArray,
+  deepAccess,
+  triggerPixel,
+} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  getEndpoint,
+  generateBidsParams,
+  generateGeneralParams,
+  buildBidResponse,
+} from '../libraries/riseUtils/index.js';
+
+export const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+export const BIDDER_CODE = 'stn';
+export const ADAPTER_VERSION = '6.1.0';
+export const TTL = 360;
+export const DEFAULT_CURRENCY = 'USD';
+export const SELLER_ENDPOINT = 'https://hb.stngo.com/';
+export const MODES = {
+  PRODUCTION: 'hb-multi',
+  TEST: 'hb-multi-test'
+};
+export const SUPPORTED_SYNC_METHODS = {
+  IFRAME: 'iframe',
+  PIXEL: 'pixel'
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: ADAPTER_VERSION,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest.params) {
+      logWarn('no params have been set to STN adapter');
+      return false;
+    }
+
+    if (!bidRequest.params.org) {
+      logWarn('org is a mandatory param for STN adapter');
+      return false;
+    }
+
+    return true;
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const combinedRequestsObject = {};
+
+    const generalObject = validBidRequests[0];
+    const testMode = generalObject.params.testMode;
+
+    combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest);
+    combinedRequestsObject.bids = generateBidsParams(validBidRequests, bidderRequest);
+
+    return {
+      method: 'POST',
+      url: getEndpoint(testMode, SELLER_ENDPOINT, MODES),
+      data: combinedRequestsObject
+    }
+  },
+  interpretResponse: function ({ body }) {
+    const bidResponses = [];
+
+    if (body.bids) {
+      body.bids.forEach(adUnit => {
+        const bidResponse = buildBidResponse(adUnit, DEFAULT_CURRENCY, TTL, VIDEO, BANNER);
+        bidResponses.push(bidResponse);
+      });
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (syncOptions.iframeEnabled && deepAccess(response, 'body.params.userSyncURL')) {
+        syncs.push({
+          type: 'iframe',
+          url: deepAccess(response, 'body.params.userSyncURL')
+        });
+      }
+      if (syncOptions.pixelEnabled && isArray(deepAccess(response, 'body.params.userSyncPixels'))) {
+        const pixels = response.body.params.userSyncPixels.map(pixel => {
+          return {
+            type: 'image',
+            url: pixel
+          }
+        })
+        syncs.push(...pixels)
+      }
+    }
+    return syncs;
+  },
+  onBidWon: function (bid) {
+    if (bid == null) {
+      return;
+    }
+
+    logInfo('onBidWon:', bid);
+    if (bid.hasOwnProperty('nurl') && bid.nurl.length > 0) {
+      triggerPixel(bid.nurl);
+    }
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/stnBidAdapter.md b/modules/stnBidAdapter.md
new file mode 100644
index 00000000000..90b0b58e34b
--- /dev/null
+++ b/modules/stnBidAdapter.md
@@ -0,0 +1,76 @@
+#Overview
+
+Module Name: STN Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: hb@stnvideo.com
+
+
+# Description
+
+Module that connects to STN's demand sources.
+
+The STN adapter requires setup and approval from the STN. Please reach out to hb@stnvideo.com to create an STN account.
+
+The adapter supports Video(instream) & Banner.
+
+# Bid Parameters
+## Video
+
+| Name | Scope | Type | Description                                                       | Example
+| ---- | ----- | ---- |-------------------------------------------------------------------| -------
+| `org` | required | String | STN publisher Id provided by your STN representative              | "STN_0000013"
+| `floorPrice` | optional | Number | Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
+| `placementId` | optional | String | A unique placement identifier                                     | "12345678"
+| `testMode` | optional | Boolean | This activates the test mode                                      | true
+
+# Test Parameters
+```javascript
+var adUnits = [{
+        code: 'dfp-video-div',
+        sizes: [
+            [640, 480]
+        ],
+        mediaTypes: {
+            video: {
+                playerSize: [
+                    [640, 480]
+                ],
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'stn',
+            params: {
+                org: 'STN_0000013', // Required
+                floorPrice: 2.00, // Optional
+                placementId: 'video-test', // Optional
+                testMode: true // Optional
+            }
+        }]
+    },
+    {
+        code: 'dfp-banner-div',
+        sizes: [
+            [640, 480]
+        ],
+        mediaTypes: {
+            banner: {
+                sizes: [
+                    [640, 480]
+                ]
+            }
+        },
+        bids: [{
+            bidder: 'stn',
+            params: {
+                org: 'STN_0000013', // Required
+                floorPrice: 2.00, // Optional
+                placementId: 'banner-test', // Optional
+                testMode: true // Optional
+            }
+        }]
+    }
+];
+```
diff --git a/modules/stroeerCoreBidAdapter.js b/modules/stroeerCoreBidAdapter.js
index 307a50c7f78..5a492a8e5e0 100644
--- a/modules/stroeerCoreBidAdapter.js
+++ b/modules/stroeerCoreBidAdapter.js
@@ -1,4 +1,4 @@
-import { buildUrl, deepAccess, generateUUID, getWindowSelf, getWindowTop, isEmpty, isStr, logWarn } from '../src/utils.js';
+import { buildUrl, deepAccess, deepSetValue, generateUUID, getWindowSelf, getWindowTop, isEmpty, isStr, logWarn } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {find} from '../src/polyfill.js';
@@ -52,7 +52,6 @@ export const spec = {
     const basePayload = {
       id: generateUUID(),
       ref: refererInfo.ref,
-      ssl: isSecureWindow(),
       mpa: isMainPageAccessible(),
       timeout: bidderRequest.timeout - (Date.now() - bidderRequest.auctionStart),
       url: refererInfo.page,
@@ -76,6 +75,14 @@ export const spec = {
       };
     }
 
+    const ORTB2_KEYS = ['regs.ext.dsa', 'device.ext.cdep', 'site.ext'];
+    ORTB2_KEYS.forEach(key => {
+      const value = deepAccess(bidderRequest.ortb2, key);
+      if (value !== undefined) {
+        deepSetValue(basePayload, `ortb2.${key}`, value);
+      }
+    });
+
     const bannerBids = validBidRequests
       .filter(hasBanner)
       .map(mapToPayloadBannerBid);
@@ -108,7 +115,9 @@ export const spec = {
           netRevenue: true,
           creativeId: '',
           meta: {
-            advertiserDomains: bidResponse.adomain
+            advertiserDomains: bidResponse.adomain,
+            dsa: bidResponse.dsa,
+            campaignType: bidResponse.campaignType,
           },
           mediaType,
         };
@@ -138,8 +147,6 @@ export const spec = {
   }
 };
 
-const isSecureWindow = () => getWindowSelf().location.protocol === 'https:';
-
 const isMainPageAccessible = () => {
   try {
     return !!getWindowTop().location.href;
@@ -210,6 +217,7 @@ const mapToPayloadBaseBid = (bidRequest) => ({
   bid: bidRequest.bidId,
   sid: bidRequest.params.sid,
   viz: elementInView(bidRequest.adUnitCode),
+  sfp: bidRequest.params.sfp,
 });
 
 const mapToPayloadBannerBid = (bidRequest) => {
@@ -245,14 +253,14 @@ const createFloorPriceObject = (mediaType, sizes, bidRequest) => {
     currency: 'EUR',
     mediaType: mediaType,
     size: '*'
-  });
+  }) || {};
 
   const sizeFloors = sizes.map(size => {
     const floor = bidRequest.getFloor({
       currency: 'EUR',
       mediaType: mediaType,
       size: [size[0], size[1]]
-    });
+    }) || {};
     return {...floor, size};
   });
 
diff --git a/modules/stvBidAdapter.js b/modules/stvBidAdapter.js
index 8d368b996fc..ef8b815b5f9 100644
--- a/modules/stvBidAdapter.js
+++ b/modules/stvBidAdapter.js
@@ -1,7 +1,20 @@
-import {deepAccess} from '../src/utils.js';
+import {deepAccess, logMessage} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {includes} from '../src/polyfill.js';
+import {
+  handleSyncUrls,
+  isBannerRequest,
+  isVideoRequest,
+  convertMediaInfoForRequest,
+  getMediaTypesInfo,
+  getBidFloor,
+  interpretResponse
+} from '../libraries/dspxUtils/bidderUtils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ */
 
 const BIDDER_CODE = 'stv';
 const ENDPOINT_URL = 'https://ads.smartstream.tv/r/';
@@ -51,6 +64,7 @@ export const spec = {
         bid_id: bidId,
         pbver: '$prebid.version$',
         schain: '',
+        uids: '',
       };
       if (!isVideoRequest(bidRequest)) {
         payload._f = 'html';
@@ -61,6 +75,11 @@ export const spec = {
         delete payload.schain;
       }
 
+      payload.uids = serializeUids(bidRequest);
+      if (payload.uids == '') {
+        delete payload.uids;
+      }
+
       payload.pfilter = { ...params };
       delete payload.pfilter.placement;
       if (params.bcat !== undefined) { delete payload.pfilter.bcat; }
@@ -111,88 +130,21 @@ export const spec = {
       return {
         method: 'GET',
         url: endpoint,
-        data: objectToQueryString(payload),
+        data: stvObjectToQueryString(payload),
       };
     });
   },
   interpretResponse: function(serverResponse, bidRequest) {
-    const bidResponses = [];
-    const response = serverResponse.body;
-    const crid = response.crid || 0;
-    const cpm = response.cpm / 1000000 || 0;
-    if (cpm !== 0 && crid !== 0) {
-      const dealId = response.dealid || '';
-      const currency = response.currency || 'EUR';
-      const netRevenue = (response.netRevenue === undefined) ? true : response.netRevenue;
-      const bidResponse = {
-        requestId: response.bid_id,
-        cpm: cpm,
-        width: response.width,
-        height: response.height,
-        creativeId: crid,
-        dealId: dealId,
-        currency: currency,
-        netRevenue: netRevenue,
-        ttl: 60,
-        meta: {
-          advertiserDomains: response.adomain || []
-        }
-      };
-      if (response.vastXml) {
-        bidResponse.vastXml = response.vastXml;
-        bidResponse.mediaType = 'video';
-      } else {
-        bidResponse.ad = response.adTag;
-      }
-
-      bidResponses.push(bidResponse);
-    }
-    return bidResponses;
+    logMessage('STV: serverResponse', serverResponse);
+    logMessage('STV: bidRequest', bidRequest);
+    return interpretResponse(serverResponse, bidRequest, (bidRequest, response) => null); // we don't use any renderer
   },
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
-    if (!serverResponses || serverResponses.length === 0) {
-      return [];
-    }
-
-    const syncs = []
-
-    let gdprParams = '';
-    if (gdprConsent) {
-      if ('gdprApplies' in gdprConsent && typeof gdprConsent.gdprApplies === 'boolean') {
-        gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        gdprParams = `gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-
-    if (serverResponses.length > 0 && serverResponses[0].body !== undefined &&
-        serverResponses[0].body.userSync !== undefined && serverResponses[0].body.userSync.iframeUrl !== undefined &&
-        serverResponses[0].body.userSync.iframeUrl.length > 0) {
-      if (syncOptions.iframeEnabled) {
-        serverResponses[0].body.userSync.iframeUrl.forEach((url) => syncs.push({
-          type: 'iframe',
-          url: appendToUrl(url, gdprParams)
-        }));
-      }
-      if (syncOptions.pixelEnabled) {
-        serverResponses[0].body.userSync.imageUrl.forEach((url) => syncs.push({
-          type: 'image',
-          url: appendToUrl(url, gdprParams)
-        }));
-      }
-    }
-    return syncs;
+    return handleSyncUrls(syncOptions, serverResponses, gdprConsent);
   }
 }
 
-function appendToUrl(url, what) {
-  if (!what) {
-    return url;
-  }
-  return url + (url.indexOf('?') !== -1 ? '&' : '?') + what;
-}
-
-function objectToQueryString(obj, prefix) {
+function stvObjectToQueryString(obj, prefix) {
   let str = [];
   let p;
   for (p in obj) {
@@ -200,8 +152,8 @@ function objectToQueryString(obj, prefix) {
       let k = prefix ? prefix + '[' + p + ']' : p;
       let v = obj[p];
       str.push((v !== null && typeof v === 'object')
-        ? objectToQueryString(v, k)
-        : (k == 'schain' ? k + '=' + v : encodeURIComponent(k) + '=' + encodeURIComponent(v)));
+        ? stvObjectToQueryString(v, k)
+        : (k == 'schain' || k == 'uids' ? k + '=' + v : encodeURIComponent(k) + '=' + encodeURIComponent(v)));
     }
   }
   return str.join('&');
@@ -227,136 +179,58 @@ function serializeSChain(schain) {
     ret += encodeURIComponent(node.name ?? '');
     ret += ',';
     ret += encodeURIComponent(node.domain ?? '');
-    ret += ',';
-    ret += encodeURIComponent(node.ext ?? '');
+    if (node.ext) {
+      ret += ',';
+      ret += encodeURIComponent(node.ext ?? '');
+    }
   }
 
   return ret;
 }
 
-/**
- * Check if it's a banner bid request
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {boolean} True if it's a banner bid
- */
-function isBannerRequest(bid) {
-  return bid.mediaType === 'banner' || !!deepAccess(bid, 'mediaTypes.banner') || !isVideoRequest(bid);
-}
-
-/**
- * Check if it's a video bid request
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {boolean} True if it's a video bid
- */
-function isVideoRequest(bid) {
-  return bid.mediaType === 'video' || !!deepAccess(bid, 'mediaTypes.video');
-}
+function serializeUids(bidRequest) {
+  let uids = [];
 
-/**
- * Get video sizes
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {object} True if it's a video bid
- */
-function getVideoSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
-}
-
-/**
- * Get banner sizes
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {object} True if it's a video bid
- */
-function getBannerSizes(bid) {
-  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
-}
-
-/**
- * Parse size
- * @param sizes
- * @returns {width: number, h: height}
- */
-function parseSize(size) {
-  let sizeObj = {}
-  sizeObj.width = parseInt(size[0], 10);
-  sizeObj.height = parseInt(size[1], 10);
-  return sizeObj;
-}
-
-/**
- * Parse sizes
- * @param sizes
- * @returns {{width: number , height: number }[]}
- */
-function parseSizes(sizes) {
-  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
-    return sizes.map(size => parseSize(size));
+  let id5 = deepAccess(bidRequest, 'userId.id5id.uid');
+  if (id5) {
+    uids.push(encodeURIComponent('id5:' + id5));
+    let id5Linktype = deepAccess(bidRequest, 'userId.id5id.ext.linkType');
+    if (id5Linktype) {
+      uids.push(encodeURIComponent('id5_linktype:' + id5Linktype));
+    }
   }
-  return [parseSize(sizes)]; // or a single one ? (ie. [728,90])
-}
-
-/**
- * Get MediaInfo object for server request
- *
- * @param mediaTypesInfo
- * @returns {*}
- */
-function convertMediaInfoForRequest(mediaTypesInfo) {
-  let requestData = {};
-  Object.keys(mediaTypesInfo).forEach(mediaType => {
-    requestData[mediaType] = mediaTypesInfo[mediaType].map(size => {
-      return size.width + 'x' + size.height;
-    }).join(',');
-  });
-  return requestData;
-}
-
-/**
- * Get Bid Floor
- * @param bid
- * @returns {number|*}
- */
-function getBidFloor(bid) {
-  if (typeof bid.getFloor !== 'function') {
-    return deepAccess(bid, 'params.bidfloor', 0);
+  let netId = deepAccess(bidRequest, 'userId.netId');
+  if (netId) {
+    uids.push(encodeURIComponent('netid:' + netId));
   }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'EUR',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (_) {
-    return 0
+  let uId2 = deepAccess(bidRequest, 'userId.uid2.id');
+  if (uId2) {
+    uids.push(encodeURIComponent('uid2:' + uId2));
   }
-}
-
-/**
- * Get media types info
- *
- * @param bid
- */
-function getMediaTypesInfo(bid) {
-  let mediaTypesInfo = {};
-
-  if (bid.mediaTypes) {
-    Object.keys(bid.mediaTypes).forEach(mediaType => {
-      if (mediaType === BANNER) {
-        mediaTypesInfo[mediaType] = getBannerSizes(bid);
-      }
-      if (mediaType === VIDEO) {
-        mediaTypesInfo[mediaType] = getVideoSizes(bid);
-      }
-    });
+  let sharedId = deepAccess(bidRequest, 'userId.sharedid.id');
+  if (sharedId) {
+    uids.push(encodeURIComponent('sharedid:' + sharedId));
+  }
+  let liverampId = deepAccess(bidRequest, 'userId.idl_env');
+  if (liverampId) {
+    uids.push(encodeURIComponent('liverampid:' + liverampId));
+  }
+  let criteoId = deepAccess(bidRequest, 'userId.criteoId');
+  if (criteoId) {
+    uids.push(encodeURIComponent('criteoid:' + criteoId));
+  }
+  // documentation missing...
+  let utiqId = deepAccess(bidRequest, 'userId.utiq.id');
+  if (utiqId) {
+    uids.push(encodeURIComponent('utiq:' + utiqId));
   } else {
-    mediaTypesInfo[BANNER] = getBannerSizes(bid);
+    utiqId = deepAccess(bidRequest, 'userId.utiq');
+    if (utiqId) {
+      uids.push(encodeURIComponent('utiq:' + utiqId));
+    }
   }
-  return mediaTypesInfo;
+
+  return uids.join(',');
 }
 
 registerBidder(spec);
diff --git a/modules/sublimeBidAdapter.js b/modules/sublimeBidAdapter.js
index db2b02aaef1..eaae877ba0e 100644
--- a/modules/sublimeBidAdapter.js
+++ b/modules/sublimeBidAdapter.js
@@ -1,6 +1,13 @@
 import { logInfo, generateUUID, formatQS, triggerPixel, deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ */
 
 const BIDDER_CODE = 'sublime';
 const BIDDER_GVLID = 114;
@@ -146,7 +153,7 @@ function buildRequests(validBidRequests, bidderRequest) {
     pbav: SUBLIME_VERSION,
     // Current Prebid params
     prebidVersion: '$prebid.version$',
-    currencyCode: config.getConfig('currency.adServerCurrency') || DEFAULT_CURRENCY,
+    currencyCode: getCurrencyFromBidderRequest(bidderRequest) || DEFAULT_CURRENCY,
     timeout: (typeof bidderRequest === 'object' && !!bidderRequest) ? bidderRequest.timeout : config.getConfig('bidderTimeout'),
   };
 
diff --git a/modules/symitriAnalyticsAdapter.js b/modules/symitriAnalyticsAdapter.js
new file mode 100644
index 00000000000..89dc27886e3
--- /dev/null
+++ b/modules/symitriAnalyticsAdapter.js
@@ -0,0 +1,61 @@
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import { EVENTS } from '../src/constants.js';
+import { logMessage } from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+
+const analyticsType = 'endpoint';
+const url = 'https://ProdSymPrebidEventhub1.servicebus.windows.net/prebid-said-1/messages';
+
+const { BID_WON } = EVENTS;
+
+let initOptions;
+
+let symitriAnalytics = Object.assign(adapter({url, analyticsType}), {
+  track({ eventType, args }) {
+    switch (eventType) {
+      case BID_WON:
+        logMessage('##### symitriAnalytics :: Event Triggered : ' + eventType);
+        sendEvent(args);
+        break;
+      default:
+        logMessage('##### symitriAnalytics :: Event Triggered : ' + eventType);
+        break;
+    }
+  }
+});
+
+function sendEvent(payload) {
+  try {
+    if (initOptions.apiAuthToken) {
+      const body = JSON.stringify(payload);
+      logMessage('##### symitriAnalytics :: sendEvent ', payload);
+      let cb = {
+        success: () => {
+          logMessage('##### symitriAnalytics :: Bid Reported Successfully');
+        },
+        error: (request, error) => {
+          logMessage('##### symitriAnalytics :: Bid Report Failed' + error);
+        }
+      };
+
+      ajax(url, cb, body, {
+        method: 'POST',
+        customHeaders: {'Content-Type': 'application/atom+xml;type=entry;charset=utf-8', 'Authorization': initOptions.apiAuthToken}
+      });
+    }
+  } catch (err) { logMessage('##### symitriAnalytics :: error' + err) }
+}
+
+symitriAnalytics.originEnableAnalytics = symitriAnalytics.enableAnalytics;
+symitriAnalytics.enableAnalytics = function (config) {
+  initOptions = config.options;
+  symitriAnalytics.originEnableAnalytics(config);
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: symitriAnalytics,
+  code: 'symitri'
+});
+
+export default symitriAnalytics;
diff --git a/modules/symitriAnalyticsAdapter.md b/modules/symitriAnalyticsAdapter.md
new file mode 100644
index 00000000000..d7da72ae166
--- /dev/null
+++ b/modules/symitriAnalyticsAdapter.md
@@ -0,0 +1,35 @@
+### Overview
+
+ Symitri Analytics Adapter.
+
+### Integration
+
+ 1) Build the symitriAnalyticsAdapter module into the Prebid.js package with:
+
+ ```
+ gulp build --modules=symitriAnalyticsAdapter,...
+ ```
+
+ 2) Use `enableAnalytics` to instruct Prebid.js to initilaize the symitriAnalyticsAdapter module, as specified below.
+
+### Configuration
+
+```
+  pbjs.enableAnalytics({
+				provider: 'symitri',
+				options: {
+					'apiAuthToken': ''
+				}
+			});
+ ```
+
+Please reach out to your Symitri account representative(Prebid@symitri.com) to get provisioned on the DAP platform.
+
+
+### Testing
+To view an example of available segments returned by dap:
+```
+‘gulp serve --modules=rtdModule,symitriDapRtdProvider,symitriAnalyticsAdapter,appnexusBidAdapter,sovrnBidAdapter’
+```
+and then point your browser at:
+"http://localhost:9999/integrationExamples/gpt/symitridap_segments_example.html"
diff --git a/modules/symitriDapRtdProvider.js b/modules/symitriDapRtdProvider.js
new file mode 100644
index 00000000000..7bf523170fe
--- /dev/null
+++ b/modules/symitriDapRtdProvider.js
@@ -0,0 +1,863 @@
+/**
+ * This module adds the Symitri DAP RTD provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch real-time data from DAP
+ * @module modules/symitriDapRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {ajax} from '../src/ajax.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {submodule} from '../src/hook.js';
+import {isPlainObject, mergeDeep, logMessage, logInfo, logError} from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
+
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+export function createRtdProvider(moduleName, moduleCode, headerPrefix) {
+  const MODULE_NAME = 'realTimeData';
+  const SUBMODULE_NAME = moduleName;
+  const MODULE_CODE = moduleCode;
+
+  const DAP_TOKEN = 'async_dap_token';
+  const DAP_MEMBERSHIP = 'async_dap_membership';
+  const DAP_ENCRYPTED_MEMBERSHIP = 'encrypted_dap_membership';
+  const DAP_SS_ID = 'dap_ss_id';
+  const DAP_DEFAULT_TOKEN_TTL = 3600; // in seconds
+  const DAP_MAX_RETRY_TOKENIZE = 1;
+  const DAP_CLIENT_ENTROPY = 'dap_client_entropy'
+
+  const storage = getStorageManager({moduleType: MODULE_TYPE_RTD, moduleName: SUBMODULE_NAME});
+  let dapRetryTokenize = 0;
+
+  /**
+   * Lazy merge objects.
+   * @param {String} target
+   * @param {String} source
+   */
+  function mergeLazy(target, source) {
+    if (!isPlainObject(target)) {
+      target = {};
+    }
+    if (!isPlainObject(source)) {
+      source = {};
+    }
+    return mergeDeep(target, source);
+  }
+
+  /**
+   * Add real-time data & merge segments.
+   * @param {Object} ortb2 destination object to merge RTD into
+   * @param {Object} rtd
+   */
+  function addRealTimeData(ortb2, rtd) {
+    logInfo('DEBUG(addRealTimeData) - ENTER');
+    if (isPlainObject(rtd.ortb2)) {
+      logMessage('DEBUG(addRealTimeData): merging original: ', ortb2);
+      logMessage('DEBUG(addRealTimeData): merging in: ', rtd.ortb2);
+      mergeLazy(ortb2, rtd.ortb2);
+    }
+    logInfo('DEBUG(addRealTimeData) - EXIT');
+  }
+
+  /**
+   * Real-time data retrieval from Audigent
+   * @param {Object} bidConfig
+   * @param {function} onDone
+   * @param {Object} rtdConfig
+   * @param {Object} userConsent
+   */
+  function getRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
+    let entropyDict = JSON.parse(storage.getDataFromLocalStorage(DAP_CLIENT_ENTROPY));
+
+    // Attempt to load entroy script if no entropy object exist and entropy config settings are present.
+    // Else
+    if (!entropyDict && rtdConfig && rtdConfig.params && dapUtils.isValidHttpsUrl(rtdConfig.params.dapEntropyUrl)) {
+      let loadScriptPromise = new Promise((resolve, reject) => {
+        if (rtdConfig && rtdConfig.params && rtdConfig.params.dapEntropyTimeout && Number.isInteger(rtdConfig.params.dapEntropyTimeout)) {
+          setTimeout(reject, rtdConfig.params.dapEntropyTimeout, Error('DapEntropy script could not be loaded'));
+        }
+        if (entropyDict && entropyDict.expires_at > Math.round(Date.now() / 1000.0)) {
+          logMessage('Using cached entropy');
+          resolve();
+        } else {
+          if (typeof window.dapCalculateEntropy === 'function') {
+            window.dapCalculateEntropy(resolve, reject);
+          } else {
+            if (rtdConfig && rtdConfig.params && dapUtils.isValidHttpsUrl(rtdConfig.params.dapEntropyUrl)) {
+              loadExternalScript(rtdConfig.params.dapEntropyUrl, MODULE_TYPE_RTD, MODULE_CODE, () => {
+                dapUtils.dapGetEntropy(resolve, reject)
+              });
+            } else {
+              reject(Error('Please check if dapEntropyUrl is specified and is valid under config.params'));
+            }
+          }
+        }
+      });
+
+      loadScriptPromise
+        .catch((error) => {
+          logError('Entropy could not be calculated due to: ', error.message);
+        })
+        .finally(() => {
+          generateRealTimeData(bidConfig, onDone, rtdConfig, userConsent);
+        });
+    } else {
+      logMessage('No dapEntropyUrl is specified.');
+      generateRealTimeData(bidConfig, onDone, rtdConfig, userConsent);
+    }
+  }
+
+  function generateRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
+    logInfo('DEBUG(generateRealTimeData) - ENTER');
+    logMessage('  - apiHostname: ' + rtdConfig.params.apiHostname);
+    logMessage('  - apiVersion:  ' + rtdConfig.params.apiVersion);
+    dapRetryTokenize = 0;
+    var jsonData = null;
+    if (rtdConfig && isPlainObject(rtdConfig.params)) {
+      if (rtdConfig.params.segtax == 710) {
+        let encMembership = dapUtils.dapGetEncryptedMembershipFromLocalStorage();
+        if (encMembership) {
+          jsonData = dapUtils.dapGetEncryptedRtdObj(encMembership, rtdConfig.params.segtax)
+        }
+      } else {
+        let membership = dapUtils.dapGetMembershipFromLocalStorage();
+        if (membership) {
+          jsonData = dapUtils.dapGetRtdObj(membership, rtdConfig.params.segtax)
+        }
+      }
+    }
+    if (jsonData) {
+      if (jsonData.rtd) {
+        addRealTimeData(bidConfig.ortb2Fragments?.global, jsonData.rtd);
+        onDone();
+        logInfo('DEBUG(generateRealTimeData) - 1');
+        // Don't return - ensure the data is always fresh.
+      }
+    }
+    // Calling setTimeout to release the main thread so that the bid request could be sent.
+    setTimeout(dapUtils.callDapAPIs, 0, bidConfig, onDone, rtdConfig, userConsent);
+  }
+
+  /**
+   * Module init
+   * @param {Object} config
+   * @param {Object} userConsent
+   * @return {boolean}
+   */
+  function init(config, userConsent) {
+    if (dapUtils.checkConsent(userConsent) === false) {
+      return false;
+    }
+    return true;
+  }
+
+  function onBidResponse(bidResponse, config, userConsent) {
+    if (bidResponse.dealId && typeof (bidResponse.dealId) != typeof (undefined)) {
+      let membership = dapUtils.dapGetMembershipFromLocalStorage(); // Get Membership details from Local Storage
+      let deals = membership.deals; // Get list of Deals the user is mapped to
+      deals.forEach((deal) => {
+        deal = JSON.parse(deal);
+        if (bidResponse.dealId == deal.id) { // Check if the bid response deal Id matches to the deals mapped to the user
+          let token = dapUtils.dapGetTokenFromLocalStorage();
+          let url = config.params.pixelUrl + '?token=' + token + '&ad_id=' + bidResponse.adId + '&bidder=' + bidResponse.bidder + '&bidder_code=' + bidResponse.bidderCode + '&cpm=' + bidResponse.cpm + '&creative_id=' + bidResponse.creativeId + '&deal_id=' + bidResponse.dealId + '&media_type=' + bidResponse.mediaType + '&response_timestamp=' + bidResponse.responseTimestamp;
+          bidResponse.ad = `${bidResponse.ad}
-      
-    
-  `;
 }
 
 registerBidder(spec);
diff --git a/modules/targetVideoBidAdapter.md b/modules/targetVideoBidAdapter.md
index 557c9f94410..a34ad0aff27 100644
--- a/modules/targetVideoBidAdapter.md
+++ b/modules/targetVideoBidAdapter.md
@@ -3,17 +3,17 @@
 ```
 Module Name:  Target Video Bid Adapter
 Module Type:  Bidder Adapter
-Maintainer:   grajzer@gmail.com
+Maintainers:   grajzer@gmail.com, danijel.ristic@target-video.com
 ```
 
 # Description
 
 Connects to Appnexus exchange for bids.
 
-TargetVideo bid adapter supports Banner.
+TargetVideo bid adapter supports Banner and Video.
 
 # Test Parameters
-```
+```js
 var adUnits = [
   // Banner adUnit
   {
@@ -29,6 +29,23 @@ var adUnits = [
               placementId: 13232361
           }
       }]
+  },
+  // Video adUnit
+  {
+    mediaTypes: {
+        video: {
+            playerSize: [[640, 360]],
+            context: 'instream',
+            playbackmethod: [1, 2, 3, 4]
+        }
+    },
+    bids: [{
+        bidder: 'targetVideo',
+        params: {
+            placementId: 12345,
+            reserve: 0,
+        }
+    }]
   }
 ];
 ```
diff --git a/modules/gdprEnforcement.js b/modules/tcfControl.js
similarity index 91%
rename from modules/gdprEnforcement.js
rename to modules/tcfControl.js
index 4e600f71b90..603c91443a3 100644
--- a/modules/gdprEnforcement.js
+++ b/modules/tcfControl.js
@@ -6,7 +6,7 @@ import {deepAccess, logError, logWarn} from '../src/utils.js';
 import {config} from '../src/config.js';
 import adapterManager, {gdprDataHandler} from '../src/adapterManager.js';
 import * as events from '../src/events.js';
-import CONSTANTS from '../src/constants.json';
+import {EVENTS} from '../src/constants.js';
 import {GDPR_GVLIDS, VENDORLESS_GVLID} from '../src/consentHandler.js';
 import {
   MODULE_TYPE_ANALYTICS,
@@ -23,10 +23,14 @@ import {
 import {registerActivityControl} from '../src/activities/rules.js';
 import {
   ACTIVITY_ACCESS_DEVICE,
-  ACTIVITY_ENRICH_EIDS, ACTIVITY_ENRICH_UFPD,
+  ACTIVITY_ENRICH_EIDS,
+  ACTIVITY_ENRICH_UFPD,
   ACTIVITY_FETCH_BIDS,
   ACTIVITY_REPORT_ANALYTICS,
-  ACTIVITY_SYNC_USER, ACTIVITY_TRANSMIT_EIDS, ACTIVITY_TRANSMIT_PRECISE_GEO, ACTIVITY_TRANSMIT_UFPD
+  ACTIVITY_SYNC_USER,
+  ACTIVITY_TRANSMIT_EIDS,
+  ACTIVITY_TRANSMIT_PRECISE_GEO,
+  ACTIVITY_TRANSMIT_UFPD
 } from '../src/activities/activities.js';
 
 export const STRICT_STORAGE_ENFORCEMENT = 'strictStorageEnforcement';
@@ -37,7 +41,7 @@ export const ACTIVE_RULES = {
 };
 
 const CONSENT_PATHS = {
-  purpose: 'purpose.consents',
+  purpose: false,
   feature: 'specialFeatureOptins'
 };
 
@@ -98,6 +102,7 @@ const RULE_HANDLES = [];
 
 // in JS we do not have access to the GVL; assume that everyone declares legitimate interest for basic ads
 const LI_PURPOSES = [2];
+const PUBLISHER_LI_PURPOSES = [2, 7, 9, 10];
 
 /**
  * Retrieve a module's GVL ID.
@@ -163,14 +168,25 @@ export function shouldEnforce(consentData, purpose, name) {
   return consentData && consentData.gdprApplies;
 }
 
-function getConsent(consentData, type, id, gvlId) {
-  let purpose = !!deepAccess(consentData, `vendorData.${CONSENT_PATHS[type]}.${id}`);
-  let vendor = !!deepAccess(consentData, `vendorData.vendor.consents.${gvlId}`);
-  if (type === 'purpose' && LI_PURPOSES.includes(id)) {
-    purpose ||= !!deepAccess(consentData, `vendorData.purpose.legitimateInterests.${id}`);
-    vendor ||= !!deepAccess(consentData, `vendorData.vendor.legitimateInterests.${gvlId}`);
+function getConsentOrLI(consentData, path, id, acceptLI) {
+  const data = deepAccess(consentData, `vendorData.${path}`);
+  return !!data?.consents?.[id] || (acceptLI && !!data?.legitimateInterests?.[id]);
+}
+
+function getConsent(consentData, type, purposeNo, gvlId) {
+  let purpose;
+  if (CONSENT_PATHS[type] !== false) {
+    purpose = !!deepAccess(consentData, `vendorData.${CONSENT_PATHS[type]}.${purposeNo}`);
+  } else {
+    const [path, liPurposes] = gvlId === VENDORLESS_GVLID
+      ? ['publisher', PUBLISHER_LI_PURPOSES]
+      : ['purpose', LI_PURPOSES];
+    purpose = getConsentOrLI(consentData, path, purposeNo, liPurposes.includes(purposeNo));
+  }
+  return {
+    purpose,
+    vendor: getConsentOrLI(consentData, 'vendor', gvlId, LI_PURPOSES.includes(purposeNo))
   }
-  return {purpose, vendor};
 }
 
 /**
@@ -198,6 +214,7 @@ function gdprRule(purposeNo, checkConsent, blocked = null, gvlidFallback = () =>
   return function (params) {
     const consentData = gdprDataHandler.getConsentData();
     const modName = params[ACTIVITY_PARAM_COMPONENT_NAME];
+
     if (shouldEnforce(consentData, purposeNo, modName)) {
       const gvlid = getGvlid(params[ACTIVITY_PARAM_COMPONENT_TYPE], modName, gvlidFallback(params));
       let allow = !!checkConsent(consentData, modName, gvlid);
@@ -283,11 +300,11 @@ function emitTCF2FinalResults() {
     geoBlocked: formatSet(geoBlocked)
   };
 
-  events.emit(CONSTANTS.EVENTS.TCF2_ENFORCEMENT, tcf2FinalResults);
+  events.emit(EVENTS.TCF2_ENFORCEMENT, tcf2FinalResults);
   [storageBlocked, biddersBlocked, analyticsBlocked, ufpdBlocked, eidsBlocked, geoBlocked].forEach(el => el.clear());
 }
 
-events.on(CONSTANTS.EVENTS.AUCTION_END, emitTCF2FinalResults);
+events.on(EVENTS.AUCTION_END, emitTCF2FinalResults);
 
 /**
  * A configuration function that initializes some module variables, as well as adds hooks
diff --git a/modules/teadsBidAdapter.js b/modules/teadsBidAdapter.js
index 5e92af640b8..cbf7a989e91 100644
--- a/modules/teadsBidAdapter.js
+++ b/modules/teadsBidAdapter.js
@@ -1,6 +1,13 @@
-import {getValue, logError, deepAccess, parseSizesInput, isArray, getBidIdParameter} from '../src/utils.js';
+import {logError, deepAccess, parseSizesInput, isArray, getBidIdParameter} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {getStorageManager} from '../src/storageManager.js';
+import {isAutoplayEnabled} from '../libraries/autoplayDetection/autoplay.js';
+import {getDM, getHC, getHLen} from '../libraries/navigatorData/navigatorData.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 
 const BIDDER_CODE = 'teads';
 const GVL_ID = 132;
@@ -27,8 +34,8 @@ export const spec = {
   isBidRequestValid: function(bid) {
     let isValid = false;
     if (typeof bid.params !== 'undefined') {
-      let isValidPlacementId = _validateId(getValue(bid.params, 'placementId'));
-      let isValidPageId = _validateId(getValue(bid.params, 'pageId'));
+      let isValidPlacementId = _validateId(bid.params.placementId);
+      let isValidPageId = _validateId(bid.params.pageId);
       isValid = isValidPlacementId && isValidPageId;
     }
 
@@ -45,6 +52,7 @@ export const spec = {
    */
   buildRequests: function(validBidRequests, bidderRequest) {
     const bids = validBidRequests.map(buildRequestObject);
+    const topWindow = window.top;
 
     const payload = {
       referrer: getReferrerInfo(bidderRequest),
@@ -54,7 +62,16 @@ export const spec = {
       networkBandwidth: getConnectionDownLink(window.navigator),
       timeToFirstByte: getTimeToFirstByte(window),
       data: bids,
+      device: bidderRequest?.ortb2?.device || {},
       deviceWidth: screen.width,
+      deviceHeight: screen.height,
+      devicePixelRatio: topWindow.devicePixelRatio,
+      screenOrientation: screen.orientation?.type,
+      historyLength: getHLen(),
+      viewportHeight: topWindow.visualViewport?.height,
+      viewportWidth: topWindow.visualViewport?.width,
+      hardwareConcurrency: getHC(),
+      deviceMemory: getDM(),
       hb_version: '$prebid.version$',
       ...getSharedViewerIdParameters(validBidRequests),
       ...getFirstPartyTeadsIdParameter(validBidRequests)
@@ -66,6 +83,18 @@ export const spec = {
       payload.schain = firstBidRequest.schain;
     }
 
+    let gpp = bidderRequest.gppConsent;
+    if (bidderRequest && gpp) {
+      let isValidConsentString = typeof gpp.gppString === 'string';
+      let validateApplicableSections =
+        Array.isArray(gpp.applicableSections) &&
+        gpp.applicableSections.every((section) => typeof (section) === 'number')
+      payload.gpp = {
+        consentString: isValidConsentString ? gpp.gppString : '',
+        applicableSectionIds: validateApplicableSections ? gpp.applicableSections : [],
+      };
+    }
+
     let gdpr = bidderRequest.gdprConsent;
     if (bidderRequest && gdpr) {
       let isCmp = typeof gdpr.gdprApplies === 'boolean';
@@ -84,11 +113,16 @@ export const spec = {
       payload.us_privacy = bidderRequest.uspConsent;
     }
 
-    const userAgentClientHints = deepAccess(firstBidRequest, 'ortb2.device.sua');
+    const userAgentClientHints = firstBidRequest?.ortb2?.device?.sua;
     if (userAgentClientHints) {
       payload.userAgentClientHints = userAgentClientHints;
     }
 
+    const dsa = bidderRequest?.ortb2?.regs?.ext?.dsa;
+    if (dsa) {
+      payload.dsa = dsa;
+    }
+
     const payloadString = JSON.stringify(payload);
     return {
       method: 'POST',
@@ -103,11 +137,18 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: function(serverResponse, bidderRequest) {
-    const bidResponses = [];
     serverResponse = serverResponse.body;
 
-    if (serverResponse.responses) {
-      serverResponse.responses.forEach(function (bid) {
+    if (!serverResponse.responses) {
+      return [];
+    }
+
+    const autoplayEnabled = isAutoplayEnabled();
+    return serverResponse.responses
+      .filter((bid) =>
+        // ignore this bid if it requires autoplay but it is not enabled on this browser
+        !bid.needAutoplay || autoplayEnabled
+      ).map((bid) => {
         const bidResponse = {
           cpm: bid.cpm,
           width: bid.width,
@@ -126,10 +167,11 @@ export const spec = {
         if (bid.dealId) {
           bidResponse.dealId = bid.dealId
         }
-        bidResponses.push(bidResponse);
+        if (bid?.ext?.dsa) {
+          bidResponse.meta.dsa = bid.ext.dsa;
+        }
+        return bidResponse;
       });
-    }
-    return bidResponses;
   }
 };
 
@@ -245,10 +287,10 @@ function findGdprStatus(gdprApplies, gdprData) {
 
 function buildRequestObject(bid) {
   const reqObj = {};
-  let placementId = getValue(bid.params, 'placementId');
-  let pageId = getValue(bid.params, 'pageId');
-  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid');
-  const videoPlcmt = deepAccess(bid, 'mediaTypes.video.plcmt');
+  let placementId = bid.params.placementId;
+  let pageId = bid.params.pageId;
+  const gpid = bid?.ortb2Imp?.ext?.gpid;
+  const videoPlcmt = bid?.mediaTypes?.video?.plcmt;
 
   reqObj.sizes = getSizes(bid);
   reqObj.bidId = getBidIdParameter('bidId', bid);
@@ -267,9 +309,9 @@ function getSizes(bid) {
 }
 
 function concatSizes(bid) {
-  let playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
-  let videoSizes = deepAccess(bid, 'mediaTypes.video.sizes');
-  let bannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
+  let playerSize = bid?.mediaTypes?.video?.playerSize;
+  let videoSizes = bid?.mediaTypes?.video?.sizes;
+  let bannerSizes = bid?.mediaTypes?.banner?.sizes;
 
   if (isArray(bannerSizes) || isArray(playerSize) || isArray(videoSizes)) {
     let mediaTypesSizes = [bannerSizes, videoSizes, playerSize];
@@ -301,7 +343,7 @@ function _validateId(id) {
  * @returns `{} | {firstPartyCookieTeadsId: string}`
  */
 function getFirstPartyTeadsIdParameter(validBidRequests) {
-  const firstPartyTeadsIdFromUserIdModule = deepAccess(validBidRequests, '0.userId.teadsId');
+  const firstPartyTeadsIdFromUserIdModule = validBidRequests?.[0]?.userId?.teadsId;
 
   if (firstPartyTeadsIdFromUserIdModule) {
     return {firstPartyCookieTeadsId: firstPartyTeadsIdFromUserIdModule};
diff --git a/modules/teadsIdSystem.js b/modules/teadsIdSystem.js
index b4067bf75c3..8026fe77f87 100644
--- a/modules/teadsIdSystem.js
+++ b/modules/teadsIdSystem.js
@@ -12,6 +12,13 @@ import {getStorageManager} from '../src/storageManager.js';
 import {uspDataHandler} from '../src/adapterManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'teadsId';
 const GVL_ID = 132;
 const FP_TEADS_ID_COOKIE_NAME = '_tfpvi';
@@ -34,9 +41,9 @@ export const storage = getStorageManager({moduleType: MODULE_TYPE_UID, moduleNam
 /** @type {Submodule} */
 export const teadsIdSubmodule = {
   /**
-     * used to link submodule with config
-     * @type {string}
-     */
+   * used to link submodule with config
+   * @type {string}
+   */
   name: MODULE_NAME,
   /**
    * Vendor id of Teads
@@ -44,21 +51,21 @@ export const teadsIdSubmodule = {
    */
   gvlid: GVL_ID,
   /**
-     * decode the stored id value for passing to bid requests
-     * @function
-     * @param {string} value
-     * @returns {{teadsId:string}}
-     */
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} value
+   * @returns {{teadsId:string}}
+   */
   decode(value) {
     return {teadsId: value}
   },
   /**
-     * performs action to obtain id and return a value in the callback's response argument
-     * @function
-     * @param {SubmoduleConfig} [submoduleConfig]
-     * @param {ConsentData} [consentData]
-     * @returns {IdResponse|undefined}
-     */
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [submoduleConfig]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse|undefined}
+   */
   getId(submoduleConfig, consentData) {
     const resp = function (callback) {
       const url = buildAnalyticsTagUrl(submoduleConfig, consentData);
diff --git a/modules/telariaBidAdapter.js b/modules/telariaBidAdapter.js
index 38eefd447a8..4ad544aaa50 100644
--- a/modules/telariaBidAdapter.js
+++ b/modules/telariaBidAdapter.js
@@ -1,6 +1,7 @@
 import { logError, isEmpty, deepAccess, triggerPixel, logWarn, isArray } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {VIDEO} from '../src/mediaTypes.js';
+import {getSupplyChain} from '../libraries/riseUtils/index.js';
 
 const BIDDER_CODE = 'telaria';
 const DOMAIN = 'tremorhub.com';
@@ -127,37 +128,6 @@ function getDefaultSrcPageUrl() {
   return encodeURIComponent(document.location.href);
 }
 
-function getEncodedValIfNotEmpty(val) {
-  return (val !== '' && val !== undefined) ? encodeURIComponent(val) : '';
-}
-
-/**
- * Converts the schain object to a url param value. Please refer to
- * https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/supplychainobject.md
- * (schain for non ORTB section) for more information
- * @param schainObject
- * @returns {string}
- */
-function getSupplyChainAsUrlParam(schainObject) {
-  if (isEmpty(schainObject)) {
-    return '';
-  }
-
-  let scStr = `&schain=${schainObject.ver},${schainObject.complete}`;
-
-  schainObject.nodes.forEach((node) => {
-    scStr += '!';
-    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.hp)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
-    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
-  });
-
-  return scStr;
-}
-
 function getUrlParams(params, schainFromBidRequest) {
   let urlSuffix = '';
 
@@ -167,7 +137,7 @@ function getUrlParams(params, schainFromBidRequest) {
         urlSuffix += `&${key}=${params[key]}`;
       }
     }
-    urlSuffix += getSupplyChainAsUrlParam(!isEmpty(schainFromBidRequest) ? schainFromBidRequest : params['schain']);
+    urlSuffix += getSupplyChain(!isEmpty(schainFromBidRequest) ? schainFromBidRequest : params['schain']);
   }
 
   return urlSuffix;
diff --git a/modules/telariaBidAdapter.md b/modules/telariaBidAdapter.md
index 6a5e24e9a5e..3a6c86ec2f6 100644
--- a/modules/telariaBidAdapter.md
+++ b/modules/telariaBidAdapter.md
@@ -10,7 +10,7 @@ Maintainer: github@telaria.com
 
 Connects to Telaria's exchange.
 
-Telaria bid adapter supports insteream Video.
+Telaria bid adapter supports instream Video.
 
 # Test Parameters
 ```
diff --git a/modules/temedyaBidAdapter.js b/modules/temedyaBidAdapter.js
index 4eac0bc641f..0e48768b605 100644
--- a/modules/temedyaBidAdapter.js
+++ b/modules/temedyaBidAdapter.js
@@ -3,6 +3,14 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'temedya';
 const ENDPOINT_URL = 'https://adm.vidyome.com/';
 const ENDPOINT_METHOD = 'GET';
@@ -12,20 +20,20 @@ export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, NATIVE],
   /**
-  * Determines whether or not the given bid request is valid.
-  *
-  * @param {BidRequest} bid The bid params to validate.
-  * @return boolean True if this is a valid bid, and false otherwise.
-  */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function (bid) {
     return !!(bid.params.widgetId);
   },
   /**
-  * Make a server request from the list of BidRequests.
-  *
-  * @param {validBidRequests[]} - an array of bids
-  * @return ServerRequest Info describing the request to the server.
-  */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function (validBidRequests, bidderRequest) {
     // convert Native ORTB definition to old-style prebid native definition
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
@@ -54,11 +62,11 @@ export const spec = {
     });
   },
   /**
-  * Unpack the response from the server into a list of bids.
-  *
-  * @param {ServerResponse} serverResponse A successful response from the server.
-  * @return {Bid[]} An array of bids which were nested inside the server.
-  */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function (serverResponse, bidRequest) {
     try {
       const bidResponse = serverResponse.body;
diff --git a/modules/terceptAnalyticsAdapter.js b/modules/terceptAnalyticsAdapter.js
index c17948d73d0..289a19beb53 100644
--- a/modules/terceptAnalyticsAdapter.js
+++ b/modules/terceptAnalyticsAdapter.js
@@ -2,8 +2,7 @@ import { parseSizesInput, getWindowLocation, buildUrl } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
-import {getGlobal} from '../src/prebidGlobal.js';
+import { EVENTS } from '../src/constants.js';
 
 const emptyUrl = '';
 const analyticsType = 'endpoint';
@@ -24,23 +23,23 @@ var terceptAnalyticsAdapter = Object.assign(adapter(
   }), {
   track({ eventType, args }) {
     if (typeof args !== 'undefined') {
-      if (eventType === CONSTANTS.EVENTS.BID_TIMEOUT) {
+      if (eventType === EVENTS.BID_TIMEOUT) {
         args.forEach(item => { mapBidResponse(item, 'timeout'); });
-      } else if (eventType === CONSTANTS.EVENTS.AUCTION_INIT) {
+      } else if (eventType === EVENTS.AUCTION_INIT) {
         events.auctionInit = args;
         auctionTimestamp = args.timestamp;
-      } else if (eventType === CONSTANTS.EVENTS.BID_REQUESTED) {
+      } else if (eventType === EVENTS.BID_REQUESTED) {
         mapBidRequests(args).forEach(item => { events.bids.push(item) });
-      } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
+      } else if (eventType === EVENTS.BID_RESPONSE) {
         mapBidResponse(args, 'response');
-      } else if (eventType === CONSTANTS.EVENTS.BID_WON) {
+      } else if (eventType === EVENTS.BID_WON) {
         send({
           bidWon: mapBidResponse(args, 'win')
         }, 'won');
       }
     }
 
-    if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
+    if (eventType === EVENTS.AUCTION_END) {
       send(events, 'auctionEnd');
     }
   }
@@ -124,7 +123,7 @@ function send(data, status) {
     search: {
       auctionTimestamp: auctionTimestamp,
       terceptAnalyticsVersion: terceptAnalyticsVersion,
-      prebidVersion: getGlobal().version
+      prebidVersion: 'v' + '$prebid.version$'
     }
   });
 
diff --git a/modules/theAdxBidAdapter.js b/modules/theAdxBidAdapter.js
index 03f303498a1..6d3c2e07b84 100644
--- a/modules/theAdxBidAdapter.js
+++ b/modules/theAdxBidAdapter.js
@@ -9,8 +9,18 @@ import {
 } from '../src/adapters/bidderFactory.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'theadx';
 const ENDPOINT_URL = 'https://ssp.theadx.com/request';
+const ENDPOINT_TR_URL = 'https://ssptr.theadx.com/request';
 
 const NATIVEASSETNAMES = {
   0: 'title',
@@ -116,7 +126,7 @@ const NATIVEPROBS = {
 
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['theadx'], // short code
+  aliases: ['theadx', 'theAdx'], // short code
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
@@ -151,15 +161,15 @@ export const spec = {
     if (!isEmpty(validBidRequests)) {
       results = validBidRequests.map(
         bidRequest => {
+          let url = `${getRegionEndPoint(bidRequest)}?tagid=${bidRequest.params.tagId}`;
           return {
             method: requestType,
             type: requestType,
-            url: `${ENDPOINT_URL}?tagid=${bidRequest.params.tagId}`,
+            url: url,
             options: {
               withCredentials: true,
             },
             bidder: 'theadx',
-            // TODO: is 'page' the right value here?
             referrer: encodeURIComponent(bidderRequest.refererInfo.page || ''),
             data: generatePayload(bidRequest, bidderRequest),
             mediaTypes: bidRequest['mediaTypes'],
@@ -261,6 +271,7 @@ export const spec = {
           ad: creative,
           ttl: ttl || 3000,
           creativeId: bid.crid,
+          dealId: bid.dealid || null,
           netRevenue: true,
           currency: responseBody.cur,
           mediaType: mediaType,
@@ -466,11 +477,19 @@ let generateImpBody = (bidRequest, bidderRequest) => {
   } else if (mediaTypes && mediaTypes.native) {
     native = generateNativeComponent(bidRequest, bidderRequest);
   }
-
   const result = {
     id: bidRequest.index,
     tagid: bidRequest.params.tagId + '',
   };
+
+  // deals support
+  if (bidRequest.params.deals && Array.isArray(bidRequest.params.deals) && bidRequest.params.deals.length > 0) {
+    result.pmp = {
+      deals: bidRequest.params.deals,
+      private_auction: 0,
+    };
+  }
+
   if (banner) {
     result['banner'] = banner;
   }
@@ -483,6 +502,14 @@ let generateImpBody = (bidRequest, bidderRequest) => {
 
   return result;
 }
+let getRegionEndPoint = (bidRequest) => {
+  if (bidRequest && bidRequest.params && bidRequest.params.region) {
+    if (bidRequest.params.region.toLowerCase() == 'tr') {
+      return ENDPOINT_TR_URL;
+    }
+  }
+  return ENDPOINT_URL;
+};
 
 let generatePayload = (bidRequest, bidderRequest) => {
   // Generate the expected OpenRTB payload
@@ -494,7 +521,38 @@ let generatePayload = (bidRequest, bidderRequest) => {
     imp: [generateImpBody(bidRequest, bidderRequest)],
   };
   // return payload;
+  let eids = getEids(bidRequest);
+  if (Object.keys(eids).length > 0) {
+    payload.ext = eids;
+  }
   return JSON.stringify(payload);
 };
 
+function getEids(bidRequest) {
+  let eids = {}
+
+  let uId2 = deepAccess(bidRequest, 'userId.uid2.id');
+  if (uId2) {
+    eids['uid2'] = uId2;
+  }
+
+  let id5 = deepAccess(bidRequest, 'userId.id5id.uid');
+  if (id5) {
+    eids['id5id'] = id5;
+    let id5Linktype = deepAccess(bidRequest, 'userId.id5id.ext.linkType');
+    if (id5Linktype) {
+      eids['id5_linktype'] = id5Linktype;
+    }
+  }
+  let netId = deepAccess(bidRequest, 'userId.netId');
+  if (netId) {
+    eids['netid'] = netId;
+  }
+  let sharedId = deepAccess(bidRequest, 'userId.sharedid.id');
+  if (sharedId) {
+    eids['sharedid'] = sharedId;
+  }
+  return eids;
+};
+
 registerBidder(spec);
diff --git a/modules/theAdxBidAdapter.md b/modules/theAdxBidAdapter.md
index 2392bfaa819..cdc7b8410a8 100644
--- a/modules/theAdxBidAdapter.md
+++ b/modules/theAdxBidAdapter.md
@@ -26,9 +26,9 @@ Module that connects to TheAdx demand sources
                {
                    bidder: "theadx",
                    params: {
-                        pid: 1000, // publisher id
-                        wid: 2000, //website id
-                        tagId: 5000, //zone id
+                        pid: 1, // publisher id
+                        wid: 7, //website id
+                        tagId: 19, //zone id
                     }
                }
            ]
@@ -43,9 +43,10 @@ Module that connects to TheAdx demand sources
                {
                    bidder: "theadx",
                    params: {
-                        pid: 1000, // publisher id
-                        wid: 2000, //website id
-                        tagId: 5000, //zone id
+                        pid: 1, // publisher id
+                        wid: 7, //website id
+                        tagId: 18, //zone id
+                        deals:[{"id":"theadx:137"}] //optional
                     }
                }
            ]
@@ -80,9 +81,9 @@ Module that connects to TheAdx demand sources
                {
                    bidder: "theadx",
                    params: {
-                        pid: 1000, // publisher id
-                        wid: 2000, //website id
-                        tagId: 5000, //zone id
+                        pid: 1, // publisher id
+                        wid: 7, //website id
+                        tagId: 20, //zone id
                     }
                }
            ]
diff --git a/modules/themoneytizerBidAdapter.js b/modules/themoneytizerBidAdapter.js
new file mode 100644
index 00000000000..9f187478fa7
--- /dev/null
+++ b/modules/themoneytizerBidAdapter.js
@@ -0,0 +1,102 @@
+import { logInfo, logWarn } from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'themoneytizer';
+const GVLID = 1265;
+const ENDPOINT_URL = 'https://ads.biddertmz.com/m/';
+
+export const spec = {
+  aliases: [BIDDER_CODE],
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  gvlid: GVLID,
+
+  isBidRequestValid: function (bid) {
+    if (!(bid && bid.params.pid)) {
+      logWarn('Invalid bid request - missing required bid params');
+      return false;
+    }
+
+    return true;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map((bidRequest) => {
+      const payload = {
+        ext: bidRequest.ortb2Imp.ext,
+        params: bidRequest.params,
+        size: bidRequest.mediaTypes,
+        adunit: bidRequest.adUnitCode,
+        request_id: bidRequest.bidId,
+        timeout: bidderRequest.timeout,
+        ortb2: bidderRequest.ortb2,
+        eids: bidRequest.userIdAsEids,
+        id: bidRequest.auctionId,
+        schain: bidRequest.schain,
+        version: '$prebid.version$',
+        excl_sync: window.tmzrBidderExclSync
+      };
+
+      const baseUrl = bidRequest.params.baseUrl || ENDPOINT_URL;
+
+      if (bidderRequest && bidderRequest.refererInfo) {
+        payload.referer = bidderRequest.refererInfo.topmostLocation;
+        payload.referer_canonical = bidderRequest.refererInfo.canonicalUrl;
+      }
+
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        payload.consent_string = bidderRequest.gdprConsent.consentString;
+        payload.consent_required = bidderRequest.gdprConsent.gdprApplies;
+      }
+
+      if (bidRequest.params.test) {
+        payload.test = bidRequest.params.test;
+      }
+
+      payload.userEids = bidRequest.userIdAsEids || [];
+
+      return {
+        method: 'POST',
+        url: baseUrl,
+        data: JSON.stringify(payload),
+      };
+    });
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = [];
+    const response = serverResponse.body;
+
+    if (response && response.bid && !response.timeout && !!response.bid.ad) {
+      bidResponses.push(response.bid);
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
+      return [];
+    }
+
+    let s = [];
+    serverResponses.map((c) => {
+      if (c.body.c_sync) {
+        c.body.c_sync.bidder_status.map((p) => {
+          if (p.usersync.type === 'redirect') {
+            p.usersync.type = 'image';
+          }
+          s.push(p.usersync);
+        })
+      }
+    });
+
+    return s;
+  },
+
+  onTimeout: function onTimeout(timeoutData) {
+    logInfo('The Moneytizer - Timeout from adapter', timeoutData);
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/themoneytizerBidAdapter.md b/modules/themoneytizerBidAdapter.md
new file mode 100644
index 00000000000..5515013575c
--- /dev/null
+++ b/modules/themoneytizerBidAdapter.md
@@ -0,0 +1,44 @@
+# Overview
+
+```
+Module Name: The Moneytizer Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: tech@themoneytizer.com
+```
+
+## Description
+
+Module that connects to The Moneytizer demand sources
+
+## Bid Parameters
+
+| Key             | Required | Example                                      | Description                            |
+| --------------- | -------- | ---------------------------------------------| ---------------------------------------|
+| `pid`           | yes      | `12345`                                      | The Moneytizer's publisher token       |
+| `test`          | no       | `1`                                          | Set to 1 to receive a test bid response|
+| `baseUrl`       | no       | `'https://custom-endpoint.biddertmz.com/m/'` | Call on custom endpoint                |
+
+## Test parameters
+
+```js
+
+var adUnits = [
+  {
+    code: 'your-adunit-code',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      },
+    },
+    bids: [
+      {
+        bidder: "themoneytizer",
+        params: {
+          pid: -1,
+          test: 1
+        },
+      },
+    ],
+  },
+];
+```
diff --git a/modules/timeoutRtdProvider.js b/modules/timeoutRtdProvider.js
index 323a5291e2d..a46a39a2c2b 100644
--- a/modules/timeoutRtdProvider.js
+++ b/modules/timeoutRtdProvider.js
@@ -4,6 +4,10 @@ import * as ajax from '../src/ajax.js';
 import { logInfo, deepAccess, logError } from '../src/utils.js';
 import { getGlobal } from '../src/prebidGlobal.js';
 
+/**
+ * @typedef {import('../modules/rtdModule/index.js').RtdSubmodule} RtdSubmodule
+ */
+
 const SUBMODULE_NAME = 'timeout';
 
 // this allows the stubbing of functions during testing
@@ -67,7 +71,7 @@ function getConnectionSpeed() {
  * Calculate the time to be added to the timeout
  * @param {Array} adUnits
  * @param {Object} rules
- * @return {int}
+ * @return {number}
  */
 function calculateTimeoutModifier(adUnits, rules) {
   logInfo('Timeout rules', rules);
diff --git a/modules/tncIdSystem.js b/modules/tncIdSystem.js
index 59254a9430f..9d3187462be 100644
--- a/modules/tncIdSystem.js
+++ b/modules/tncIdSystem.js
@@ -1,6 +1,7 @@
 import { submodule } from '../src/hook.js';
 import { logInfo } from '../src/utils.js';
 import { loadExternalScript } from '../src/adloader.js';
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
 
 const MODULE_NAME = 'tncId';
 let url = null;
@@ -10,17 +11,16 @@ const waitTNCScript = (tncNS) => {
     var tnc = window[tncNS];
     if (!tnc) reject(new Error('No TNC Object'));
     if (tnc.tncid) resolve(tnc.tncid);
-    tnc.ready(() => {
-      tnc = window[tncNS];
-      if (tnc.tncid) resolve(tnc.tncid);
-      else tnc.on('data-sent', () => resolve(tnc.tncid));
+    tnc.ready(async () => {
+      let tncid = await tnc.getTNCID('prebid');
+      resolve(tncid);
     });
   });
 }
 
 const loadRemoteScript = () => {
   return new Promise((resolve) => {
-    loadExternalScript(url, MODULE_NAME, resolve);
+    loadExternalScript(url, MODULE_TYPE_UID, MODULE_NAME, resolve);
   })
 }
 
@@ -31,7 +31,6 @@ const tncCallback = function (cb) {
     tncNS = '__tncPbjs';
     promiseArray.push(loadRemoteScript());
   }
-
   return Promise.all(promiseArray).then(() => waitTNCScript(tncNS)).then(cb).catch(() => cb());
 }
 
diff --git a/modules/tncIdSystem.md b/modules/tncIdSystem.md
index f0f98e9098f..b94d03c8e85 100644
--- a/modules/tncIdSystem.md
+++ b/modules/tncIdSystem.md
@@ -10,6 +10,8 @@ gulp build --modules=tncIdSystem,userId
 
 ### TNCIDIdSystem module Configuration
 
+Disclosure: This module loads external script unreviewed by the prebid.js community
+
 You can configure this submodule in your `userSync.userIds[]` configuration:
 
 ```javascript
diff --git a/modules/topLevelPaapi.js b/modules/topLevelPaapi.js
new file mode 100644
index 00000000000..86164668a90
--- /dev/null
+++ b/modules/topLevelPaapi.js
@@ -0,0 +1,214 @@
+import {submodule} from '../src/hook.js';
+import {config} from '../src/config.js';
+import {logError, logInfo, logWarn, mergeDeep} from '../src/utils.js';
+import {auctionStore} from '../libraries/weakStore/weakStore.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import {emit} from '../src/events.js';
+import {BID_STATUS, EVENTS} from '../src/constants.js';
+import {GreedyPromise} from '../src/utils/promise.js';
+import {getBidToRender, getRenderingData, markWinningBid} from '../src/adRendering.js';
+
+let getPAAPIConfig, expandFilters, moduleConfig;
+
+const paapiBids = auctionStore();
+const MODULE_NAME = 'topLevelPaapi';
+
+config.getConfig('paapi', (cfg) => {
+  moduleConfig = cfg.paapi?.topLevelSeller;
+  if (moduleConfig) {
+    getBidToRender.before(renderPaapiHook);
+    getBidToRender.after(renderOverrideHook);
+    getRenderingData.before(getRenderingDataHook);
+    markWinningBid.before(markWinningBidHook);
+  } else {
+    getBidToRender.getHooks({hook: renderPaapiHook}).remove();
+    getBidToRender.getHooks({hook: renderOverrideHook}).remove();
+    getRenderingData.getHooks({hook: getRenderingDataHook}).remove();
+    markWinningBid.getHooks({hook: markWinningBidHook}).remove();
+  }
+});
+
+function isPaapiBid(bid) {
+  return bid?.source === 'paapi';
+}
+
+function bidIfRenderable(bid) {
+  if (bid && !bid.urn) {
+    logWarn(MODULE_NAME, 'rendering in fenced frames is not supported. Consider using resolveToConfig: false', bid);
+    return;
+  }
+  return bid;
+}
+
+const forRenderStack = [];
+
+function renderPaapiHook(next, adId, forRender = true, override = GreedyPromise.resolve()) {
+  forRenderStack.push(forRender);
+  const ids = parsePaapiAdId(adId);
+  if (ids) {
+    override = override.then((bid) => {
+      if (bid) return bid;
+      const [auctionId, adUnitCode] = ids;
+      return paapiBids(auctionId)?.[adUnitCode]?.then(bid => {
+        if (!bid) {
+          logWarn(MODULE_NAME, `No PAAPI bid found for auctionId: "${auctionId}", adUnit: "${adUnitCode}"`);
+        }
+        return bidIfRenderable(bid);
+      });
+    });
+  }
+  next(adId, forRender, override);
+}
+
+function renderOverrideHook(next, bidPm) {
+  const forRender = forRenderStack.pop();
+  if (moduleConfig?.overrideWinner) {
+    bidPm = bidPm.then((bid) => {
+      if (isPaapiBid(bid) || bid?.status === BID_STATUS.RENDERED) return bid;
+      return getPAAPIBids({adUnitCode: bid.adUnitCode}).then(res => {
+        let paapiBid = bidIfRenderable(res[bid.adUnitCode]);
+        if (paapiBid) {
+          if (!forRender) return paapiBid;
+          if (forRender && paapiBid.status !== BID_STATUS.RENDERED) {
+            paapiBid.overriddenAdId = bid.adId;
+            logInfo(MODULE_NAME, 'overriding contextual bid with PAAPI bid', bid, paapiBid)
+            return paapiBid;
+          }
+        }
+        return bid;
+      });
+    });
+  }
+  next(bidPm);
+}
+
+export function getRenderingDataHook(next, bid, options) {
+  if (isPaapiBid(bid)) {
+    next.bail({
+      width: bid.width,
+      height: bid.height,
+      adUrl: bid.urn
+    });
+  } else {
+    next(bid, options);
+  }
+}
+
+export function markWinningBidHook(next, bid) {
+  if (isPaapiBid(bid)) {
+    emit(EVENTS.BID_WON, bid);
+    next.bail();
+  } else {
+    next(bid);
+  }
+}
+
+function getBaseAuctionConfig() {
+  if (moduleConfig?.auctionConfig) {
+    return Object.assign({
+      resolveToConfig: false
+    }, moduleConfig.auctionConfig);
+  }
+}
+
+function onAuctionConfig(auctionId, auctionConfigs) {
+  const base = getBaseAuctionConfig();
+  if (base) {
+    Object.entries(auctionConfigs).forEach(([adUnitCode, auctionConfig]) => {
+      mergeDeep(auctionConfig, base);
+      if (moduleConfig.autorun ?? true) {
+        getPAAPIBids({adUnitCode, auctionId});
+      }
+    });
+  }
+}
+
+export function parsePaapiSize(size) {
+  /* From https://github.com/WICG/turtledove/blob/main/FLEDGE.md#12-interest-group-attributes:
+   *  Each size has the format {width: widthVal, height: heightVal},
+   *  where the values can have either pixel units (e.g. 100 or '100px') or screen dimension coordinates (e.g. 100sw or 100sh).
+   */
+  if (typeof size === 'number') return size;
+  if (typeof size === 'string') {
+    const px = /^(\d+)(px)?$/.exec(size)?.[1];
+    if (px) {
+      return parseInt(px, 10);
+    }
+  }
+  return null;
+}
+
+export function getPaapiAdId(auctionId, adUnitCode) {
+  return `paapi:/${auctionId.replace(/:/g, '::')}/:/${adUnitCode.replace(/:/g, '::')}`;
+}
+
+export function parsePaapiAdId(adId) {
+  const match = /^paapi:\/(.*)\/:\/(.*)$/.exec(adId);
+  if (match) {
+    return [match[1], match[2]].map(s => s.replace(/::/g, ':'));
+  }
+}
+
+/**
+ * Returns the PAAPI runAdAuction result for the given filters, as a map from ad unit code to auction result
+ * (an object with `width`, `height`, and one of `urn` or `frameConfig`).
+ *
+ * @param filters
+ * @param raa
+ * @return {Promise<{[p: string]: any}>}
+ */
+export function getPAAPIBids(filters, raa = (...args) => navigator.runAdAuction(...args)) {
+  return Promise.all(
+    Object.entries(expandFilters(filters))
+      .map(([adUnitCode, auctionId]) => {
+        const bids = paapiBids(auctionId);
+        if (bids && !bids.hasOwnProperty(adUnitCode)) {
+          const auctionConfig = getPAAPIConfig({adUnitCode, auctionId})[adUnitCode];
+          if (auctionConfig) {
+            emit(EVENTS.RUN_PAAPI_AUCTION, {
+              auctionId,
+              adUnitCode,
+              auctionConfig
+            });
+            bids[adUnitCode] = new Promise((resolve, reject) => raa(auctionConfig).then(resolve, reject))
+              .then(result => {
+                if (result) {
+                  const bid = {
+                    source: 'paapi',
+                    adId: getPaapiAdId(auctionId, adUnitCode),
+                    width: parsePaapiSize(auctionConfig.requestedSize?.width),
+                    height: parsePaapiSize(auctionConfig.requestedSize?.height),
+                    adUnitCode,
+                    auctionId,
+                    [typeof result === 'string' ? 'urn' : 'frameConfig']: result,
+                    auctionConfig,
+                  };
+                  emit(EVENTS.PAAPI_BID, bid);
+                  return bid;
+                } else {
+                  emit(EVENTS.PAAPI_NO_BID, {auctionId, adUnitCode, auctionConfig});
+                  return null;
+                }
+              }).catch(error => {
+                logError(MODULE_NAME, `error (auction "${auctionId}", adUnit "${adUnitCode}"):`, error);
+                emit(EVENTS.PAAPI_ERROR, {auctionId, adUnitCode, error, auctionConfig});
+                return null;
+              });
+          }
+        }
+        return bids?.[adUnitCode]?.then(res => [adUnitCode, res]);
+      }).filter(e => e)
+  ).then(result => Object.fromEntries(result));
+}
+
+getGlobal().getPAAPIBids = (filters) => getPAAPIBids(filters);
+
+export const topLevelPAAPI = {
+  name: MODULE_NAME,
+  init(params) {
+    getPAAPIConfig = params.getPAAPIConfig;
+    expandFilters = params.expandFilters;
+  },
+  onAuctionConfig
+};
+submodule('paapi', topLevelPAAPI);
diff --git a/modules/topicsFpdModule.js b/modules/topicsFpdModule.js
index 65c5777acf3..8df01fcd599 100644
--- a/modules/topicsFpdModule.js
+++ b/modules/topicsFpdModule.js
@@ -14,26 +14,17 @@ const MODULE_NAME = 'topicsFpd';
 const DEFAULT_EXPIRATION_DAYS = 21;
 const DEFAULT_FETCH_RATE_IN_DAYS = 1;
 let LOAD_TOPICS_INITIALISE = false;
+let iframeLoadedURL = [];
 
 export function reset() {
   LOAD_TOPICS_INITIALISE = false;
+  iframeLoadedURL = [];
 }
 
-const bidderIframeList = {
-  maxTopicCaller: 2,
-  bidders: [{
-    bidder: 'pubmatic',
-    iframeURL: 'https://ads.pubmatic.com/AdServer/js/topics/topics_frame.html'
-  }, {
-    bidder: 'rtbhouse',
-    iframeURL: 'https://topics.authorizedvault.com/topicsapi.html'
-  }]
-}
 export const coreStorage = getCoreStorageManager(MODULE_NAME);
 export const topicStorageName = 'prebid:topics';
 export const lastUpdated = 'lastUpdated';
 
-const iframeLoadedURL = [];
 const TAXONOMIES = {
   // map from topic taxonomyVersion to IAB segment taxonomy
   '1': 600,
@@ -138,8 +129,8 @@ export function processFpd(config, {global}, {data = topicsData} = {}) {
  */
 export function getCachedTopics() {
   let cachedTopicData = [];
-  const topics = config.getConfig('userSync.topics') || bidderIframeList;
-  const bidderList = topics.bidders || [];
+  const topics = config.getConfig('userSync.topics');
+  const bidderList = topics?.bidders || [];
   let storedSegments = new Map(safeJSONParse(coreStorage.getDataFromLocalStorage(topicStorageName)));
   storedSegments && storedSegments.forEach((value, cachedBidder) => {
     // Check bidder exist in config for cached bidder data and then only retrieve the cached data
@@ -160,7 +151,7 @@ export function getCachedTopics() {
 }
 
 /**
- * Recieve messages from iframe loaded for bidders to fetch topic
+ * Receive messages from iframe loaded for bidders to fetch topic
  * @param {MessageEvent} evt
  */
 export function receiveMessage(evt) {
@@ -177,9 +168,10 @@ export function receiveMessage(evt) {
 }
 
 /**
-Function to store Topics data recieved from iframe in storage(name: "prebid:topics")
-* @param {Topics} topics
-*/
+Function to store Topics data received from iframe in storage(name: "prebid:topics")
+ * @param {string} bidder
+ * @param {object} topics
+ */
 export function storeInLocalStorage(bidder, topics) {
   const storedSegments = new Map(safeJSONParse(coreStorage.getDataFromLocalStorage(topicStorageName)));
   const topicsObj = {
@@ -202,8 +194,8 @@ function isCachedDataExpired(storedTime, cacheTime) {
 }
 
 /**
-* Function to get random bidders based on count passed with array of bidders
-**/
+ * Function to get random bidders based on count passed with array of bidders
+ */
 function getRandomBidders(arr, count) {
   return ([...arr].sort(() => 0.5 - Math.random())).slice(0, count)
 }
@@ -220,7 +212,7 @@ function listenMessagesFromTopicIframe() {
  */
 export function loadTopicsForBidders(doc = document) {
   if (!isTopicsSupported(doc)) return;
-  const topics = config.getConfig('userSync.topics') || bidderIframeList;
+  const topics = config.getConfig('userSync.topics');
 
   if (topics) {
     listenMessagesFromTopicIframe();
diff --git a/modules/topicsFpdModule.md b/modules/topicsFpdModule.md
index 6ef0bf241dd..1f299a9eabe 100644
--- a/modules/topicsFpdModule.md
+++ b/modules/topicsFpdModule.md
@@ -40,6 +40,10 @@ pbjs.setConfig({
                 bidder: 'rtbhouse',
                 iframeURL: 'https://topics.authorizedvault.com/topicsapi.html',
                 expiry: 7 // Configurable expiry days
+            },{
+                bidder: 'openx',
+                iframeURL: 'https://pa.openx.net/topics_frame.html',
+                expiry: 7 // Configurable expiry days
             },{
                 bidder: 'rubicon',
                 iframeURL: 'https://rubicon.com:8080/topics/fpd/topic.html', // dummy URL
@@ -48,6 +52,26 @@ pbjs.setConfig({
                 bidder: 'appnexus',
                 iframeURL: 'https://appnexus.com:8080/topics/fpd/topic.html', // dummy URL
                 expiry: 7 // Configurable expiry days
+            }, {
+                bidder: 'onetag',
+                iframeURL: 'https://onetag-sys.com/static/topicsapi.html',
+                expiry: 7 // Configurable expiry days
+            }, {
+                bidder: 'taboola',
+                iframeURL: 'https://cdn.taboola.com/libtrc/static/topics/taboola-prebid-browsing-topics.html',
+                expiry: 7 // Configurable expiry days
+            }, {
+                bidder: 'discovery',
+                iframeURL: 'https://api.popin.cc/topic/prebid-topics-frame.html',
+                expiry: 7 // Configurable expiry days
+            }, {
+                bidder: 'undertone',
+                iframeURL: 'https://creative-p.undertone.com/spk-public/topics_frame.html',
+                expiry: 7 // Configurable expiry days
+            },{
+                bidder: 'vidazoo',
+                iframeURL: 'https://static.vidazoo.com/topics_api/topics_frame.html',
+                expiry: 7 // Configurable expiry days
             }]
         }
         ....
@@ -63,4 +87,4 @@ pbjs.setConfig({
 | topics.bidders | no | Array of objects  | Array of topics callers with the iframe locations and other necessary informations like bidder(Bidder code) and expiry. Default Array of topics in the module itself.|
 | topics.bidders[].bidder | yes | string  | Bidder Code of the bidder(SSP).  |
 | topics.bidders[].iframeURL | yes | string  | URL which is hosted on bidder/SSP/third-party domains which will call Topics API.  |
-| topics.bidders[].expiry | no | integer  | Max number of days where Topics data will be persist. If Data is stored for more than mentioned expiry day, it will be deleted from storage. Default is 21 days which is hardcoded in Module. |
\ No newline at end of file
+| topics.bidders[].expiry | no | integer  | Max number of days where Topics data will be persist. If Data is stored for more than mentioned expiry day, it will be deleted from storage. Default is 21 days which is hardcoded in Module. |
diff --git a/modules/tpmnBidAdapter.js b/modules/tpmnBidAdapter.js
index bac99d578c5..3edc89c90ae 100644
--- a/modules/tpmnBidAdapter.js
+++ b/modules/tpmnBidAdapter.js
@@ -1,164 +1,245 @@
 /* eslint-disable no-tabs */
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { parseUrl, deepAccess } from '../src/utils.js';
+import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 import { getStorageManager } from '../src/storageManager.js';
-import { BANNER } from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { Renderer } from '../src/Renderer.js';
 import { config } from '../src/config.js';
+import * as utils from '../src/utils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 
-export const ADAPTER_VERSION = '1';
-const SUPPORTED_AD_TYPES = [BANNER];
 const BIDDER_CODE = 'tpmn';
-const URL = 'https://ad.tpmn.co.kr/prebidhb.tpmn';
-const IFRAMESYNC = 'https://ad.tpmn.co.kr/sync.tpmn?type=iframe';
-export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+const DEFAULT_BID_TTL = 500;
+const DEFAULT_CURRENCY = 'USD';
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+// const BIDDER_ENDPOINT_URL = 'http://localhost:8081/ortb/pbjs_bidder';
+const BIDDER_ENDPOINT_URL = 'https://gat.tpmn.io/ortb/pbjs_bidder';
+const IFRAMESYNC = 'https://gat.tpmn.io/sync/iframe';
+const COMMON_PARAMS = [
+  'battr'
+];
 
+export const VIDEO_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+export const ADAPTER_VERSION = '2.0';
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs,
   /**
-   *Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function (bid) {
-    return 'params' in bid &&
-      'inventoryId' in bid.params &&
-      'publisherId' in bid.params &&
-      !isNaN(Number(bid.params.inventoryId)) &&
-      bid.params.inventoryId > 0 &&
-      (typeof bid.mediaTypes.banner.sizes != 'undefined'); // only accepting appropriate sizes
-  },
-
-  /**
-   * @param {BidRequest[]} bidRequests
-   * @param {*} bidderRequest
-   * @return {ServerRequest}
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} bid The bid that won the auction
    */
-  buildRequests: (bidRequests, bidderRequest) => {
-    if (bidRequests.length === 0) {
-      return [];
+  onBidWon: function (bid) {
+    if (bid.burl) {
+      utils.triggerPixel(bid.burl);
     }
-    const bids = bidRequests.map(bidToRequest);
-    const bidderApiUrl = URL;
-    const payload = {
-      'bids': [...bids],
-      'site': createSite(bidderRequest.refererInfo)
-    };
-    return [{
-      method: 'POST',
-      url: bidderApiUrl,
-      data: payload
-    }];
+  }
+}
+
+function isBidRequestValid(bid) {
+  return (isValidInventoryId(bid) && (isValidBannerRequest(bid) || isValidVideoRequest(bid)));
+}
+
+function isValidInventoryId(bid) {
+  return 'params' in bid && 'inventoryId' in bid.params && utils.isNumber(bid.params.inventoryId);
+}
+
+function isValidBannerRequest(bid) {
+  const bannerSizes = utils.deepAccess(bid, `mediaTypes.${BANNER}.sizes`);
+  return utils.isArray(bannerSizes) && bannerSizes.length > 0 && bannerSizes.every(size => utils.isNumber(size[0]) && utils.isNumber(size[1]));
+}
+
+function isValidVideoRequest(bid) {
+  const videoSizes = utils.deepAccess(bid, `mediaTypes.${VIDEO}.playerSize`);
+  const videoMimes = utils.deepAccess(bid, `mediaTypes.${VIDEO}.mimes`);
+
+  const isValidVideoSize = utils.isArray(videoSizes) && videoSizes.length > 0 && videoSizes.every(size => utils.isNumber(size[0]) && utils.isNumber(size[1]));
+  const isValidVideoMimes = utils.isArray(videoMimes) && videoMimes.length > 0;
+  return isValidVideoSize && isValidVideoMimes;
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  let requests = [];
+  try {
+    if (validBidRequests.length === 0 || !bidderRequest) return [];
+    let bannerBids = validBidRequests.filter(bid => utils.deepAccess(bid, 'mediaTypes.banner'));
+    let videoBids = validBidRequests.filter(bid => utils.deepAccess(bid, 'mediaTypes.video'));
+
+    bannerBids.forEach(bid => {
+      requests.push(createRequest([bid], bidderRequest, BANNER));
+    });
+
+    videoBids.forEach(bid => {
+      requests.push(createRequest([bid], bidderRequest, VIDEO));
+    });
+  } catch (err) {
+    utils.logWarn('buildRequests', err);
+  }
+
+  return requests;
+}
+
+function createRequest(bidRequests, bidderRequest, mediaType) {
+  const rtbData = CONVERTER.toORTB({ bidRequests, bidderRequest, context: { mediaType } })
+
+  const bid = bidRequests.find((b) => b.params.inventoryId)
+
+  if (bid.params.inventoryId) rtbData.ext = {};
+  if (bid.params.inventoryId) rtbData.ext.inventoryId = bid.params.inventoryId
+
+  const ortb2Data = bidderRequest?.ortb2 || {};
+  const bcat = ortb2Data?.bcat || bid.params.bcat || [];
+  const badv = ortb2Data?.badv || bid.params.badv || [];
+  const bapp = ortb2Data?.bapp || bid.params.bapp || [];
+
+  if (bcat.length > 0) {
+    rtbData.bcat = bcat;
+  }
+  if (badv.length > 0) {
+    rtbData.badv = badv;
+  }
+  if (badv.length > 0) {
+    rtbData.bapp = bapp;
+  }
+
+  return {
+    method: 'POST',
+    url: BIDDER_ENDPOINT_URL + '?v=' + ADAPTER_VERSION,
+    data: rtbData
+  }
+}
+
+function interpretResponse(response, request) {
+  return CONVERTER.fromORTB({ request: request.data, response: response.body }).bids;
+}
+
+registerBidder(spec);
+
+const CONVERTER = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: DEFAULT_BID_TTL,
+    currency: DEFAULT_CURRENCY
   },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {serverResponse} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function (serverResponse, serverRequest) {
-    if (!Array.isArray(serverResponse.body)) {
-      return [];
+  imp(buildImp, bidRequest, context) {
+    let imp = buildImp(bidRequest, context);
+    if (!imp.bidfloor && bidRequest.params.bidFloor) {
+      imp.bidfloor = bidRequest.params.bidFloor;
     }
-    // server response body is an array of bid results
-    const bidResults = serverResponse.body;
-    // our server directly returns the format needed by prebid.js so no more
-    // transformation is needed here.
-    return bidResults;
-  },
-
-  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
-    const syncArr = [];
-    if (syncOptions.iframeEnabled) {
-      let policyParam = '';
-      if (gdprConsent && gdprConsent.consentString) {
-        if (typeof gdprConsent.gdprApplies === 'boolean') {
-          policyParam += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-        } else {
-          policyParam += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+    [VIDEO, BANNER].forEach(namespace => {
+      COMMON_PARAMS.forEach(param => {
+        if (bidRequest.params.hasOwnProperty(param)) {
+          utils.deepSetValue(imp, `${namespace}.${param}`, bidRequest.params[param])
         }
+      })
+    })
+    return imp;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    const {bidRequest} = context;
+    const bidResponse = buildBidResponse(bid, context);
+    if (bidResponse.mediaType === BANNER) {
+      bidResponse.ad = bid.adm;
+    } else if (bidResponse.mediaType === VIDEO) {
+      if (bidRequest.mediaTypes.video.context === 'outstream') {
+        bidResponse.rendererUrl = VIDEO_RENDERER_URL;
+        bidResponse.renderer = createRenderer(bidRequest);
       }
-      if (uspConsent && uspConsent.consentString) {
-        policyParam += `&ccpa_consent=${uspConsent.consentString}`;
-      }
-      const coppa = config.getConfig('coppa') ? 1 : 0;
-      policyParam += `&coppa=${coppa}`;
-      syncArr.push({
-        type: 'iframe',
-        url: IFRAMESYNC + policyParam
-      });
-    } else {
-      syncArr.push({
-        type: 'image',
-        url: 'https://x.bidswitch.net/sync?ssp=tpmn'
-      });
-      syncArr.push({
-        type: 'image',
-        url: 'https://gocm.c.appier.net/tpmn'
-      });
-      syncArr.push({
-        type: 'image',
-        url: 'https://info.mmnneo.com/getGuidRedirect.info?url=https%3A%2F%2Fad.tpmn.co.kr%2Fcookiesync.tpmn%3Ftpmn_nid%3Dbf91e8b3b9d3f1af3fc1d657f090b4fb%26tpmn_buid%3D'
-      });
-      syncArr.push({
-        type: 'image',
-        url: 'https://sync.aralego.com/idSync?redirect=https%3A%2F%2Fad.tpmn.co.kr%2FpixelCt.tpmn%3Ftpmn_nid%3Dde91e8b3b9d3f1af3fc1d657f090b815%26tpmn_buid%3DSspCookieUserId'
-      });
     }
-    return syncArr;
+    return bidResponse;
   },
-};
+  overrides: {
+    imp: {
+      video(orig, imp, bidRequest, context) {
+        let videoParams = bidRequest.mediaTypes[VIDEO];
+        if (videoParams) {
+          videoParams = Object.assign({}, videoParams, bidRequest.params.video);
+          bidRequest = {...bidRequest, mediaTypes: {[VIDEO]: videoParams}}
+        }
+        orig(imp, bidRequest, context);
+      },
+    },
+  }
+});
 
-registerBidder(spec);
+function createRenderer(bid) {
+  const renderer = Renderer.install({
+    id: bid.bidId,
+    url: VIDEO_RENDERER_URL,
+    config: utils.deepAccess(bid, 'renderer.options'),
+    loaded: false,
+    adUnitCode: bid.adUnitCode
+  });
 
-/**
- * Creates site description object
- */
-function createSite(refInfo) {
-  let url = parseUrl(refInfo.page || '');
-  let site = {
-    'domain': url.hostname,
-    'page': url.protocol + '://' + url.hostname + url.pathname
-  };
-  if (refInfo.ref) {
-    site.ref = refInfo.ref
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    utils.logWarn('Prebid Error calling setRender on renderer', err);
   }
-  let keywords = document.getElementsByTagName('meta')['keywords'];
-  if (keywords && keywords.content) {
-    site.keywords = keywords.content;
-  }
-  return site;
+  return renderer;
 }
 
-function parseSize(size) {
-  let sizeObj = {}
-  sizeObj.width = parseInt(size[0], 10);
-  sizeObj.height = parseInt(size[1], 10);
-  return sizeObj;
-}
+function outstreamRender(bid, doc) {
+  bid.renderer.push(() => {
+    const win = (doc) ? doc.defaultView : window;
+    win.ANOutstreamVideo.renderAd({
+      sizes: [bid.playerWidth, bid.playerHeight],
+      targetId: bid.adUnitCode,
+      rendererOptions: bid.renderer.getConfig(),
+      adResponse: { content: bid.vastXml }
 
-function parseSizes(sizes) {
-  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
-    return sizes.map(size => parseSize(size));
-  }
-  return [parseSize(sizes)]; // or a single one ? (ie. [728,90])
+    }, handleOutstreamRendererEvents.bind(null, bid));
+  });
 }
 
-function getBannerSizes(bidRequest) {
-  return parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes') || bidRequest.sizes);
+function handleOutstreamRendererEvents(bid, id, eventName) {
+  bid.renderer.handleVideoEvent({ id, eventName });
 }
 
-function bidToRequest(bid) {
-  const bidObj = {};
-  bidObj.sizes = getBannerSizes(bid);
-
-  bidObj.inventoryId = bid.params.inventoryId;
-  bidObj.publisherId = bid.params.publisherId;
-  bidObj.bidId = bid.bidId;
-  bidObj.adUnitCode = bid.adUnitCode;
-  // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-  bidObj.auctionId = bid.auctionId;
-
-  return bidObj;
+function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+  const syncArr = [];
+  if (syncOptions.iframeEnabled) {
+    let policyParam = '';
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        policyParam += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        policyParam += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      policyParam += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    policyParam += `&coppa=${coppa}`;
+    syncArr.push({
+      type: 'iframe',
+      url: IFRAMESYNC + '?' + policyParam
+    });
+  } else {
+    syncArr.push({
+      type: 'image',
+      url: 'https://x.bidswitch.net/sync?ssp=tpmn'
+    });
+    syncArr.push({
+      type: 'image',
+      url: 'https://gocm.c.appier.net/tpmn'
+    });
+    syncArr.push({
+      type: 'image',
+      url: 'https://info.mmnneo.com/getGuidRedirect.info?url=https%3A%2F%2Fad.tpmn.co.kr%2Fcookiesync.tpmn%3Ftpmn_nid%3Dbf91e8b3b9d3f1af3fc1d657f090b4fb%26tpmn_buid%3D'
+    });
+    syncArr.push({
+      type: 'image',
+      url: 'https://sync.aralego.com/idSync?redirect=https%3A%2F%2Fad.tpmn.co.kr%2FpixelCt.tpmn%3Ftpmn_nid%3Dde91e8b3b9d3f1af3fc1d657f090b815%26tpmn_buid%3DSspCookieUserId'
+    });
+  }
+  return syncArr;
 }
diff --git a/modules/tpmnBidAdapter.md b/modules/tpmnBidAdapter.md
index 8387528bb0f..3b016d7e5b2 100644
--- a/modules/tpmnBidAdapter.md
+++ b/modules/tpmnBidAdapter.md
@@ -11,10 +11,27 @@ Maintainer: develop@tpmn.co.kr
 Connects to TPMN exchange for bids.
 
 NOTE:
-- TPMN bid adapter only supports Banner at the moment.
+- TPMN bid adapter only supports MediaType BANNER, VIDEO.
 - Multi-currency is not supported.
+- Please contact the TPMN sales team via email for "inventoryId" issuance.
 
-# Sample Ad Unit Config
+
+# Bid Parameters
+
+## bids.params (Banner, Video)
+***Pay attention to the case sensitivity.***
+
+{: .table .table-bordered .table-striped }
+|       Name     |    Scope    |                 Description                |    Example    |     Type     |
+| -------------- | ----------- | ------------------------------------------ | ------------- | ------------ |
+| `inventoryId` | required | Ad Inventory id TPMN | 123 | Number |
+| `bidFloor` | recommended | Minimum price in USD. bidFloor applies to a specific unit. | 1.50 | Number |
+| `bcat` | optional | IAB 5.1 Content Categories | ['IAB7-39'] | [String] |
+| `badv` | optional | IAB Block list of advertisers by their domains | ['example.com'] | [String] |
+| `bapp` | optional | IAB Block list of applications  | ['com.blocked'] | [String] |
+
+
+# Banner Ad Unit Config
 ```
   var adUnits = [{
       // Banner adUnit
@@ -22,16 +39,77 @@ NOTE:
 	  mediaTypes: {
 		  banner: {
 		    sizes: [[300, 250], [320, 50]],  // banner size
+		    battr: [1,2,3]                   // optional
 		  }
 	  },
     bids: [
       {
         bidder: 'tpmn',
         params: {
-          inventoryId: '1',
-          publisherId: 'TPMN'
+          inventoryId: 1,         // required
+          bidFloor: 2.0,            // recommended
+          ... // bcat, badv, bapp   // optional
         }
       }
     ]
     }];
+```
+
+
+# mediaTypes Parameters
+
+## mediaTypes.banner
+
+The following banner parameters are supported here so publishers may fully declare their banner inventory:
+
+{: .table .table-bordered .table-striped }
+|    Name   |    Scope    |                      Description                                  |  Example  |    Type   |
+| --------- | ------------| ----------------------------------------------------------------- | --------- | --------- |
+| `sizes` | required | Avalaible sizes supported for banner ad unit | [ [300, 250], [300, 600] ] | [[Integer, Integer], [Integer, Integer]] | 
+| `battr` | optional | IAB 5.3 Creative Attributes | [1,2,3] | [Number] |
+## mediaTypes.video
+
+We support the following OpenRTB params that can be specified in `mediaTypes.video` or in `bids[].params.video`
+
+{: .table .table-bordered .table-striped }
+|    Name   |    Scope    |                      Description                                  |  Example  |    Type   |
+| --------- | ------------| ----------------------------------------------------------------- | --------- | --------- |
+| `context` | required | instream or outstream |'outstream' | string | 
+| `playerSize` | required | Avalaible sizes supported for video ad unit. | [[300, 250]] | [Integer, Integer] | 
+| `mimes` | required | List of content MIME types supported by the player. | ['video/mp4']| [String]|
+| `protocols` | optional | Supported video bid response protocol values. | [2,3,5,6] | [integers]|
+| `api` | optional | Supported API framework values. | [2] |  [integers] |
+| `maxduration` | optional | Maximum video ad duration in seconds. | 30 | Integer |
+| `minduration` | optional | Minimum video ad duration in seconds. | 6 | Integer |
+| `startdelay` | optional | Indicates the start delay in seconds for pre-roll, mid-roll, or post-roll ad placements. | 0 | Integer |
+| `placement` | optional | Placement type for the impression. | 1 | Integer |
+| `minbitrate` | optional | Minimum bit rate in Kbps. | 300 | Integer |
+| `maxbitrate` | optional | Maximum bit rate in Kbps. | 9600 | Integer |
+| `playbackmethod` | optional | Playback methods that may be in use. Only one method is typically used in practice. | [2]| [Integers] |
+| `linearity` | optional | OpenRTB2 linearity. in-strea,overlay... | 1 | Integer |
+| `skip` | optional | Indicates if the player will allow the video to be skipped, where 0 = no, 1 = yes . | 1 | Integer |
+| `battr` | optional | IAB 5.3 Creative Attributes | [1,2,3] | [Number] |
+
+
+# Video Ad Unit Config
+```
+  var adUnits = [{
+        code: 'video-div',
+        mediaTypes: {
+            video: {
+                context: 'instream',                    // required
+                mimes: ['video/mp4'],                   // required
+                playerSize: [[ 640, 480 ]],               // required
+                ... // skippable, startdelay, battr..   // optional
+            }
+        },
+        bids: [{
+            bidder: 'tpmn',
+            params: {
+                inventoryId: 2,         // required
+                bidFloor: 2.0,            // recommended
+                ... // bcat, badv, bapp   // optional
+            }
+        }]
+    }];
 ```
\ No newline at end of file
diff --git a/modules/trafficgateBidAdapter.js b/modules/trafficgateBidAdapter.js
index fcd84306099..d30d79ef3a6 100644
--- a/modules/trafficgateBidAdapter.js
+++ b/modules/trafficgateBidAdapter.js
@@ -2,7 +2,6 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {ortbConverter} from '../libraries/ortbConverter/converter.js';
 import {deepAccess, mergeDeep} from '../src/utils.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
 
 const BIDDER_CODE = 'trafficgate';
 const URL = 'https://[HOST].bc-plugin.com/prebidjs'
@@ -13,7 +12,6 @@ export const spec = {
   isBidRequestValid,
   buildRequests,
   interpretResponse,
-  transformBidParams,
   isBannerBid
 };
 
@@ -88,14 +86,6 @@ const converter = ortbConverter({
   }
 });
 
-function transformBidParams(params, isOpenRtb) {
-  return convertTypes({
-    'customFloor': 'number',
-    'placementId': 'number',
-    'host': 'string'
-  }, params);
-}
-
 function isBidRequestValid(bidRequest) {
   const isValid = bidRequest.params.placementId && bidRequest.params.host;
   if (!isValid) {
diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index bfbf1409c1b..0c8bd330e11 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -1,4 +1,5 @@
-import { logMessage, logError, isEmpty, isStr, isPlainObject, isArray, logWarn } from '../src/utils.js';
+import * as utils from '../src/utils.js';
+import { logMessage, logError, isEmpty, logWarn } from '../src/utils.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
@@ -57,8 +58,8 @@ export const tripleliftAdapterSpec = {
       tlCall = tryAppendQueryString(tlCall, 'us_privacy', bidderRequest.uspConsent);
     }
 
-    if (bidderRequest && bidderRequest.fledgeEnabled) {
-      tlCall = tryAppendQueryString(tlCall, 'fledge', bidderRequest.fledgeEnabled);
+    if (bidderRequest?.paapi?.enabled) {
+      tlCall = tryAppendQueryString(tlCall, 'fledge', bidderRequest.paapi.enabled);
     }
 
     if (config.getConfig('coppa') === true) {
@@ -95,7 +96,7 @@ export const tripleliftAdapterSpec = {
       logMessage('Response with FLEDGE:', { bids, fledgeAuctionConfigs });
       return {
         bids,
-        fledgeAuctionConfigs
+        paapi: fledgeAuctionConfigs
       };
     } else {
       return bids;
@@ -184,17 +185,12 @@ function _buildPostBody(bidRequests, bidderRequest) {
     return imp;
   });
 
-  let eids = [
-    ...getUnifiedIdEids([bidRequests[0]]),
-    ...getIdentityLinkEids([bidRequests[0]]),
-    ...getCriteoEids([bidRequests[0]]),
-    ...getPubCommonEids([bidRequests[0]]),
-    ...getUniversalEids(bidRequests[0])
-  ];
+  let eids = [];
 
-  if (eids.length > 0) {
+  if (bidRequests[0].userIdAsEids) {
+    eids = utils.deepAccess(bidRequests[0], 'userIdAsEids');
     data.user = {
-      ext: {eids}
+      ext: { eids }
     };
   }
 
@@ -240,20 +236,7 @@ function _getORTBVideo(bidRequest) {
   } catch (err) {
     logWarn('Video size not defined', err);
   }
-  // honor existing publisher settings
-  if (video.context === 'instream') {
-    if (!video.placement) {
-      video.placement = 1;
-    }
-  }
-  if (video.context === 'outstream') {
-    if (!video.placement) {
-      video.placement = 3
-    } else if ([3, 4, 5].indexOf(video.placement) === -1) {
-      logMessage(`video.placement value of ${video.placement} is invalid for outstream context. Setting placement to 3`)
-      video.placement = 3
-    }
-  }
+
   if (video.playbackmethod && Number.isInteger(video.playbackmethod)) {
     video.playbackmethod = Array.from(String(video.playbackmethod), Number);
   }
@@ -272,7 +255,7 @@ function _getFloor (bid) {
         mediaType: _isVideoBidRequest(bid) ? 'video' : 'banner',
         size: '*'
       });
-      if (typeof floorInfo === 'object' &&
+      if (utils.isPlainObject(floorInfo) &&
       floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
         floor = parseFloat(floorInfo.floor);
       }
@@ -363,78 +346,6 @@ function _getExt(schain, fpd) {
   return ext;
 }
 
-function getUnifiedIdEids(bidRequest) {
-  return getEids(bidRequest, 'tdid', 'adserver.org', 'TDID');
-}
-
-function getIdentityLinkEids(bidRequest) {
-  return getEids(bidRequest, 'idl_env', 'liveramp.com', 'idl');
-}
-
-function getCriteoEids(bidRequest) {
-  return getEids(bidRequest, 'criteoId', 'criteo.com', 'criteoId');
-}
-
-function getPubCommonEids(bidRequest) {
-  return getEids(bidRequest, 'pubcid', 'pubcid.org', 'pubcid');
-}
-
-function getUniversalEids(bidRequest) {
-  let common = ['adserver.org', 'liveramp.com', 'criteo.com', 'pubcid.org'];
-  let eids = [];
-  if (bidRequest.userIdAsEids) {
-    bidRequest.userIdAsEids.forEach(id => {
-      try {
-        if (common.indexOf(id.source) === -1) {
-          let uids = id.uids.map(uid => ({ id: uid.id, ext: { rtiPartner: id.source } }));
-          eids.push({ source: id.source, uids });
-        }
-      } catch (err) {
-        logWarn(`Triplelift: Error attempting to add ${id} to bid request`, err);
-      }
-    });
-  }
-  return eids;
-}
-
-function getEids(bidRequest, type, source, rtiPartner) {
-  return bidRequest
-    .map(getUserId(type)) // bids -> userIds of a certain type
-    .filter(filterEids(type)) // filter out unqualified userIds
-    .map(formatEid(source, rtiPartner)); // userIds -> eid objects
-}
-
-const filterEids = type => (userId, i, arr) => {
-  let isValidUserId =
-    !!userId && // is not null nor empty
-    (isStr(userId)
-      ? !!userId
-      : isPlainObject(userId) && // or, is object
-        !isArray(userId) && // not an array
-        !isEmpty(userId) && // is not empty
-        userId.id && // contains nested id field
-        isStr(userId.id) && // nested id field is a string
-        !!userId.id); // that is not empty
-  if (!isValidUserId && arr[0] !== undefined) {
-    logWarn(`Triplelift: invalid ${type} userId format`);
-  }
-  return isValidUserId;
-};
-
-function getUserId(type) {
-  return bid => bid && bid.userId && bid.userId[type];
-}
-
-function formatEid(source, rtiPartner) {
-  return (userId) => ({
-    source,
-    uids: [{
-      id: userId.id ? userId.id : userId,
-      ext: { rtiPartner }
-    }]
-  });
-}
-
 function _sizes(sizeArray) {
   let sizes = sizeArray.filter(_isValidSize);
   return sizes.map(function(size) {
diff --git a/modules/truereachBidAdapter.js b/modules/truereachBidAdapter.js
index 8b1656ec7a2..9dda76f6518 100755
--- a/modules/truereachBidAdapter.js
+++ b/modules/truereachBidAdapter.js
@@ -11,7 +11,7 @@ export const spec = {
   supportedMediaTypes: SUPPORTED_AD_TYPES,
 
   isBidRequestValid: function (bidRequest) {
-    return (bidRequest.params.site_id && bidRequest.params.bidfloor &&
+    return (bidRequest.params.site_id &&
     deepAccess(bidRequest, 'mediaTypes.banner') && (deepAccess(bidRequest, 'mediaTypes.banner.sizes.length') > 0));
   },
 
@@ -116,8 +116,6 @@ function buildCommonQueryParamsFromBids(validBidRequests, bidderRequest) {
     adH = adSizes[0][1];
   }
 
-  let bidFloor = Number(0);
-
   let domain = window.location.host;
   let page = window.location.host + window.location.pathname + location.search + location.hash;
 
@@ -129,8 +127,7 @@ function buildCommonQueryParamsFromBids(validBidRequests, bidderRequest) {
         banner: {
           w: adW,
           h: adH
-        },
-        bidfloor: bidFloor
+        }
       }
     ],
     site: {
diff --git a/modules/ttdBidAdapter.js b/modules/ttdBidAdapter.js
index 17a3cd652e8..e9d0d3ca9f1 100644
--- a/modules/ttdBidAdapter.js
+++ b/modules/ttdBidAdapter.js
@@ -2,12 +2,23 @@ import * as utils from '../src/utils.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import {isNumber} from '../src/utils.js';
-
-const BIDADAPTERVERSION = 'TTD-PREBID-2023.09.05';
+import { isNumber } from '../src/utils.js';
+import { getConnectionType } from '../libraries/connectionInfo/connectionUtils.js'
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
+const BIDADAPTERVERSION = 'TTD-PREBID-2024.07.26';
 const BIDDER_CODE = 'ttd';
 const BIDDER_CODE_LONG = 'thetradedesk';
 const BIDDER_ENDPOINT = 'https://direct.adsrvr.org/bid/bidder/';
+const BIDDER_ENDPOINT_HTTP2 = 'https://d2.adsrvr.org/bid/bidder/';
 const USER_SYNC_ENDPOINT = 'https://match.adsrvr.org';
 
 const MEDIA_TYPE = {
@@ -90,33 +101,6 @@ function getDevice(firstPartyData) {
   return device;
 };
 
-function getConnectionType() {
-  const connection = navigator.connection || navigator.webkitConnection;
-  if (!connection) {
-    return 0;
-  }
-  switch (connection.type) {
-    case 'ethernet':
-      return 1;
-    case 'wifi':
-      return 2;
-    case 'cellular':
-      switch (connection.effectiveType) {
-        case 'slow-2g':
-        case '2g':
-          return 4;
-        case '3g':
-          return 5;
-        case '4g':
-          return 6;
-        default:
-          return 3;
-      }
-    default:
-      return 0;
-  }
-}
-
 function getUser(bidderRequest, firstPartyData) {
   let user = {};
   if (bidderRequest.gdprConsent) {
@@ -232,7 +216,7 @@ function banner(bid) {
     },
     optionalParams);
 
-  const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
+  const battr = utils.deepAccess(bid, 'ortb2Imp.banner.battr');
   if (battr) {
     banner.battr = battr;
   }
@@ -309,7 +293,7 @@ function video(bid) {
       video.maxbitrate = maxbitrate;
     }
 
-    const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
+    const battr = utils.deepAccess(bid, 'ortb2Imp.video.battr');
     if (battr) {
       video.battr = battr;
     }
@@ -318,6 +302,13 @@ function video(bid) {
   }
 }
 
+function selectEndpoint(params) {
+  if (params.useHttp2) {
+    return BIDDER_ENDPOINT_HTTP2;
+  }
+  return BIDDER_ENDPOINT;
+}
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 21,
@@ -434,7 +425,7 @@ export const spec = {
       topLevel.pmp = firstPartyData.pmp
     }
 
-    let url = BIDDER_ENDPOINT + bidderRequest.bids[0].params.supplySourceId;
+    let url = selectEndpoint(bidderRequest.bids[0].params) + bidderRequest.bids[0].params.supplySourceId;
 
     let serverRequest = {
       method: 'POST',
diff --git a/modules/twistDigitalBidAdapter.js b/modules/twistDigitalBidAdapter.js
new file mode 100644
index 00000000000..bed9e531a26
--- /dev/null
+++ b/modules/twistDigitalBidAdapter.js
@@ -0,0 +1,39 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {
+  isBidRequestValid, createInterpretResponseFn, createUserSyncGetter, createBuildRequestsFn, onBidWon
+} from '../libraries/vidazooUtils/bidderUtils.js';
+
+const GVLID = 1292;
+const DEFAULT_SUB_DOMAIN = 'exchange';
+const BIDDER_CODE = 'twistdigital';
+const BIDDER_VERSION = '1.0.0';
+
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
+  return `https://${subDomain}.twist.win`;
+}
+
+const buildRequests = createBuildRequestsFn(createDomain, null, storage, BIDDER_CODE, BIDDER_VERSION, true);
+
+const interpretResponse = createInterpretResponseFn(BIDDER_CODE, true);
+
+const getUserSyncs = createUserSyncGetter({
+  iframeSyncUrl: 'https://sync.twist.win/api/sync/iframe', imageSyncUrl: 'https://sync.twist.win/api/sync/image'
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs,
+  onBidWon
+};
+
+registerBidder(spec);
diff --git a/modules/twistDigitalBidAdapter.md b/modules/twistDigitalBidAdapter.md
new file mode 100644
index 00000000000..8722608c5dd
--- /dev/null
+++ b/modules/twistDigitalBidAdapter.md
@@ -0,0 +1,42 @@
+# Overview
+
+**Module Name:** Twist Digital Bidder Adapter
+
+**Module Type:** Bidder Adapter
+
+**Maintainer:** yoni@twist.win
+
+
+
+
+
+
+
+
+# Description
+
+Module that connects to Twist Digital demand sources.
+ 
+# Test Parameters
+```js
+var adUnits = [
+  {
+    code: 'test-ad',
+    sizes: [[300, 250]],
+    bids: [
+      {
+        bidder: 'twistdigital',
+        params: {
+          cId: '562524b21b1c1f08117fc7f9',
+          pId: '59ac17c192832d0011283fe3',
+          bidFloor: 0.0001,
+          ext: {
+            param1: 'loremipsum',
+            param2: 'dolorsitamet'
+          }
+        }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/ucfunnelAnalyticsAdapter.js b/modules/ucfunnelAnalyticsAdapter.js
index 77fffddbaae..3b4053d3626 100644
--- a/modules/ucfunnelAnalyticsAdapter.js
+++ b/modules/ucfunnelAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {logError, logInfo, deepClone} from '../src/utils.js';
@@ -12,12 +12,10 @@ export const ANALYTICS_VERSION = '1.0.0';
 const ANALYTICS_SERVER = 'https://hbwa.aralego.com';
 
 const {
-  EVENTS: {
-    AUCTION_END,
-    BID_WON,
-    BID_TIMEOUT
-  }
-} = CONSTANTS;
+  AUCTION_END,
+  BID_WON,
+  BID_TIMEOUT
+} = EVENTS;
 
 export const BIDDER_STATUS = {
   BID: 'bid',
diff --git a/modules/ucfunnelBidAdapter.js b/modules/ucfunnelBidAdapter.js
index 2225deaa900..d5017db0705 100644
--- a/modules/ucfunnelBidAdapter.js
+++ b/modules/ucfunnelBidAdapter.js
@@ -5,6 +5,12 @@ import { getStorageManager } from '../src/storageManager.js';
 import { config } from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ */
+
 const COOKIE_NAME = 'ucf_uid';
 const VER = 'ADGENT_PREBID-2018011501';
 const BIDDER_CODE = 'ucfunnel';
@@ -64,11 +70,10 @@ export const spec = {
    * Format ucfunnel responses as Prebid bid responses
    * @param {ucfunnelResponseObj} ucfunnelResponse A successful response from ucfunnel.
    * @return {Bid[]} An array of formatted bids.
-  */
+   */
   interpretResponse: function (ucfunnelResponseObj, request) {
     const bidRequest = request.bidRequest;
     const ad = ucfunnelResponseObj ? ucfunnelResponseObj.body : {};
-    const videoPlayerSize = parseSizes(bidRequest);
 
     let bid = {
       requestId: bidRequest.bidId,
@@ -117,10 +122,10 @@ export const spec = {
           vastXml: ad.vastXml
         });
 
-        if (videoPlayerSize && videoPlayerSize.length === 2) {
+        if (bidRequest.sizes && bidRequest.sizes.length > 0) {
           Object.assign(bid, {
-            width: videoPlayerSize[0],
-            height: videoPlayerSize[1]
+            width: bidRequest.sizes[0][0],
+            height: bidRequest.sizes[0][1]
           });
         }
         break;
@@ -128,8 +133,8 @@ export const spec = {
       default:
         var size = parseSizes(bidRequest);
         Object.assign(bid, {
-          width: ad.width || size[0],
-          height: ad.height || size[1],
+          width: ad.width || size[0][0],
+          height: ad.height || size[0][1],
           ad: ad.adm || ''
         });
     }
@@ -156,12 +161,6 @@ export const spec = {
 };
 registerBidder(spec);
 
-function transformSizes(requestSizes) {
-  if (typeof requestSizes === 'object' && requestSizes.length) {
-    return requestSizes[0];
-  }
-}
-
 function getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent) {
   let param = '?';
   if (gdprApplies == '1') {
@@ -187,11 +186,10 @@ function parseSizes(bid) {
         params.video.playerWidth,
         params.video.playerHeight
       ];
-      return size;
+      return [size];
     }
   }
-
-  return transformSizes(bid.sizes);
+  return bid.sizes;
 }
 
 function getSupplyChain(schain) {
@@ -237,13 +235,27 @@ function getFloor(bid, size, mediaTypes) {
       mediaType: getMediaType(mediaTypes),
       size: (size) ? [ size[0], size[1] ] : '*',
     });
-    if (bidFloor.currency === CURRENCY) {
+    if (bidFloor?.currency === CURRENCY) {
       return bidFloor.floor;
     }
   }
   return undefined;
 }
 
+function addBidData(bidData, key, value) {
+  if (value) {
+    bidData[key] = value;
+  }
+}
+
+function getFormat(size) {
+  let formatList = []
+  for (var i = 0; i < size.length; i++) {
+    formatList.push(size[i].join(','));
+  }
+  return (formatList.length > 0) ? formatList.join(';') : '';
+}
+
 function getRequestData(bid, bidderRequest) {
   const size = parseSizes(bid);
   const language = navigator.language;
@@ -264,14 +276,8 @@ function getRequestData(bid, bidderRequest) {
     schain: supplyChain
   };
 
-  if (bidFloor) {
-    bidData.fp = bidFloor;
-  }
-
-  if (gpid) {
-    bidData.gpid = gpid;
-  }
-
+  addBidData(bidData, 'fp', bidFloor);
+  addBidData(bidData, 'gpid', gpid);
   addUserId(bidData, bid.userId);
 
   bidData.u = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
@@ -293,10 +299,11 @@ function getRequestData(bid, bidderRequest) {
     }
   }
 
-  if (size != undefined && size.length == 2) {
-    bidData.w = size[0];
-    bidData.h = size[1];
+  if (size != undefined && size.length > 0 && size[0].length == 2) {
+    bidData.w = size[0][0];
+    bidData.h = size[0][1];
   }
+  addBidData(bidData, 'format', getFormat(size));
 
   if (bidderRequest && bidderRequest.uspConsent) {
     Object.assign(bidData, {
diff --git a/modules/uid2IdSystem.js b/modules/uid2IdSystem.js
index a36b24e3ae3..afdde5f0a7f 100644
--- a/modules/uid2IdSystem.js
+++ b/modules/uid2IdSystem.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 /**
  * This module adds uid2 ID support to the User ID module
  * The {@link module:modules/userId} module is required.
@@ -7,13 +6,21 @@
  */
 
 import { logInfo, logWarn } from '../src/utils.js';
-import {submodule} from '../src/hook.js';
+import { submodule } from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
 // RE below lint exception: UID2 and EUID are separate modules, but the protocol is the same and shared code makes sense here.
 // eslint-disable-next-line prebid/validate-imports
-import { Uid2GetId, Uid2CodeVersion } from './uid2IdSystem_shared.js';
+import { Uid2GetId, Uid2CodeVersion, extractIdentityFromParams } from './uid2IdSystem_shared.js';
+import {UID2_EIDS} from '../libraries/uid2Eids/uid2Eids.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').uid2Id} uid2Id
+ */
 
 const MODULE_NAME = 'uid2';
 const MODULE_REVISION = Uid2CodeVersion;
@@ -32,6 +39,7 @@ function createLogger(logger, prefix) {
     logger(prefix + ' ', ...strings);
   }
 }
+
 const _logInfo = createLogger(logInfo, LOG_PRE_FIX);
 const _logWarn = createLogger(logWarn, LOG_PRE_FIX);
 
@@ -60,7 +68,7 @@ export const uid2IdSubmodule = {
   /**
    * performs action to obtain id and return a value.
    * @function
-   * @param {SubmoduleConfig} [configparams]
+   * @param {SubmoduleConfig} config
    * @param {ConsentData|undefined} consentData
    * @returns {uid2Id}
    */
@@ -78,25 +86,20 @@ export const uid2IdSubmodule = {
       clientId: UID2_CLIENT_ID,
       internalStorage: ADVERTISING_COOKIE
     }
+
+    if (FEATURES.UID2_CSTG) {
+      mappedConfig.cstg = {
+        serverPublicKey: config?.params?.serverPublicKey,
+        subscriptionId: config?.params?.subscriptionId,
+        ...extractIdentityFromParams(config?.params ?? {})
+      }
+    }
     _logInfo(`UID2 configuration loaded and mapped.`, mappedConfig);
     const result = Uid2GetId(mappedConfig, storage, _logInfo, _logWarn);
     _logInfo(`UID2 getId returned`, result);
     return result;
   },
-  eids: {
-    'uid2': {
-      source: 'uidapi.com',
-      atype: 3,
-      getValue: function(data) {
-        return data.id;
-      },
-      getUidExt: function(data) {
-        if (data.ext) {
-          return data.ext;
-        }
-      }
-    },
-  },
+  eids: UID2_EIDS
 };
 
 function decodeImpl(value) {
@@ -105,6 +108,10 @@ function decodeImpl(value) {
     const result = { uid2: { id: value } };
     return result;
   }
+  if (value.latestToken === 'optout') {
+    _logInfo('Found optout token.  Refresh is unavailable for this token.');
+    return { uid2: { optout: true } };
+  }
   if (Date.now() < value.latestToken.identity_expires) {
     return { uid2: { id: value.latestToken.advertising_token } };
   }
diff --git a/modules/uid2IdSystem.md b/modules/uid2IdSystem.md
index a795d9b1aa1..c3b38e36531 100644
--- a/modules/uid2IdSystem.md
+++ b/modules/uid2IdSystem.md
@@ -1,135 +1,102 @@
-## UID2 User ID Submodule
+# UID2 User ID Submodule
 
-UID2 requires initial tokens to be generated server-side. The UID2 module handles storing, providing, and optionally refreshing them. The module can operate in one of two different modes: *Client Refresh* mode or *Server Only* mode.
+## Overview
 
-*Server Only* mode was originally referred to as *legacy mode*, but it is a popular mode for new integrations where publishers prefer to handle token refresh server-side.
+UID2 provides a Prebid.js module that supports the following:
 
-**Important information:** UID2 is not designed to be used where GDPR applies. The module checks the passed-in consent data and will not operate if the `gdprApplies` flag is true.
+- [Generating the UID2 token](https://unifiedid.com/docs/guides/integration-prebid#generating-the-uid2-token)
+- [Refreshing the UID2 token](https://unifiedid.com/docs/guides/integration-prebid#refreshing-the-uid2-token)
+- [Storing the UID2 token in the browser](https://unifiedid.com/docs/guides/integration-prebid#storing-the-uid2-token-in-the-browser)
+- [Passing the UID2 token to the bid stream](https://unifiedid.com/docs/guides/integration-prebid#passing-the-uid2-token-to-the-bid-stream)
 
-## Client Refresh mode
+For details, see [UID2 Integration Overview for Prebid.js](https://unifiedid.com/docs/guides/integration-prebid).
 
-This is the recommended mode for most scenarios. In this mode, the full response body from the UID2 Token Generate or Token Refresh endpoint must be provided to the module. As long as the refresh token remains valid, the module will refresh the advertising token as needed.
+**Important information:** UID2 is not designed to be used where GDPR applies. The module checks the passed-in consent data and does not operate if the `gdprApplies` flag is true.
 
-To configure the module to use this mode, you must **either**:
-1. Set `params.uid2Cookie` to the name of the cookie which contains the response body as a JSON string, **or**
-2. Set `params.uid2Token` to the response body as a JavaScript object.
+Depending on access to [directly identifying information](https://unifiedid.com/docs/ref-info/glossary-uid#d) (DII), there are two methods to generate UID2 tokens for use with Prebid.js, as shown in the following table.
 
-The `uid2Cookie` param was originally `uid2ServerCookie`. The old name can still be used, however the inclusion of the word 'server' was causing some confusion. If both values are provided, `uid2ServerCookie` will be ignored.
+Determine which method is best for you, and then follow the applicable integration guide.
 
-### Client refresh cookie example
+| Scenario | Integration Guide |
+| :--- | :--- |
+| You have access to DII on the client side and want to do front-end development only. | [UID2 Client-Side Integration Guide for Prebid.js](https://unifiedid.com/docs/guides/integration-prebid-client-side). |
+| You have access to DII on the server side and can do server-side development. | [UID2 Server-Side Integration Guide for Prebid.js](https://unifiedid.com/docs/guides/integration-prebid-server-side). |
 
-In this example, the cookie is called `uid2_pub_cookie`.
+## Storage
 
-Cookie:
-```
-uid2_pub_cookie={"advertising_token":"...advertising token...","refresh_token":"...refresh token...","identity_expires":1684741472161,"refresh_from":1684741425653,"refresh_expires":1684784643668,"refresh_response_key":"...response key..."}
-```
+The module stores a number of internal values. By default, all values are stored in HTML5 local storage. You can switch to cookie storage by setting `params.storage` to `cookie`. The cookie size can be significant and this is not recommended, but is provided as an option if local storage is not an option.
 
-Configuration:
-```
-pbjs.setConfig({
-    userSync: {
-        userIds: [{
-            name: 'uid2',
-            params: {
-                uid2Cookie: 'uid2_pub_cookie'
-            }
-        }]
-    }
-});
-```
+## Parameter Descriptions for the `usersync` Configuration Section
 
-### Client refresh uid2Token example
+The following parameters apply only to the UID2 User ID Module integration.
 
-Configuration:
-```
-pbjs.setConfig({
-    userSync: {
-        userIds: [{
-            name: 'uid2',
-            params: {
-                uid2Token: {
-                    'advertising_token': '...advertising token...',
-                    'refresh_token': '...refresh token...',
-                    // etc. - see the Sample Token below for contents of this object
-                }
-            }
-        }]
-    }
-});
-```
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID value for the UID2 module. Must be `"uid2"`. | `"uid2"` |
+| params.uid2ApiBase | Optional | String | Overrides the default UID2 API endpoint. | `"https://prod.uidapi.com"` _(default)_|
+| params.storage | Optional | String | Specify whether to use `cookie` or `localStorage` for module-internal storage. It is recommended to not provide this and allow the module to use the default. | `"localStorage"` _(default)_ |
 
-## Server-Only Mode
+### Client-Side Integration
 
-In this mode, only the advertising token is provided to the module. The module will not be able to refresh the token. The publisher is responsible for implementing some other way to refresh the token.
+The following parameters apply to the UID2 User ID Module if you are following the [client-side integration guide](https://unifiedid.com/docs/guides/integration-prebid-client-side). Exactly one of `params.email`, `params.emailHash`, `params.phone`, and `params.phoneHash` must be provided. For information on how to normalize and hash these parameters, refer to [Normalization and Encoding](https://unifiedid.com/docs/getting-started/gs-normalization-encoding).
 
-To configure the module to use this mode, you must **either**:
-1. Set a cookie named `__uid2_advertising_token` to the advertising token, **or**
-2. Set `value` to an ID block containing the advertising token (see "Server only value" example below).
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| params.serverPublicKey | Required for client-side integration | String | See [Subscription ID and Public Key](https://unifiedid.com/docs/getting-started/gs-credentials#subscription-id-and-public-key). | - |
+| params.subscriptionId | Required for client-side integration | String | See [Subscription ID and Public Key](https://unifiedid.com/docs/getting-started/gs-credentials#subscription-id-and-public-key). | - |
+| params.email | Optional | String | The user's email address. Provide this parameter if using email as the DII. | `"test@example.com"` |
+| params.emailHash | Optional | String | A [hashed, normalized](https://unifiedid.com/docs/getting-started/gs-normalization-encoding) representation of the user's email. Provide this parameter if using emailHash as the DII. | `"tMmiiTI7IaAcPpQPFQ65uMVCWH8av9jw4cwf/F5HVRQ="` |
+| params.phone | Optional | String | A [normalized](https://unifiedid.com/docs/getting-started/gs-normalization-encoding) representation of the user's phone number. Provide this parameter if using phone as the DII. | `"+15555555555"` |
+| params.phoneHash | Optional | String | A [hashed, normalized](https://unifiedid.com/docs/getting-started/gs-normalization-encoding) representation of the user's phone number. Provide this parameter if using phoneHash as the DII. | `"tMmiiTI7IaAcPpQPFQ65uMVCWH8av9jw4cwf/F5HVRQ="` |
 
-### Server only cookie example
+### Server-Side Integration
 
-Cookie:
-```
-__uid2_advertising_token=...advertising token...
-```
+#### Server-Only Mode
 
-Configuration:
-```
-pbjs.setConfig({
-    userSync: {
-        userIds: [{
-            name: 'uid2'
-        }]
-    }
-});
-```
+The following parameters apply to the UID2 User ID Module if you are following the [server-side integration guide](https://unifiedid.com/docs/guides/integration-prebid-server-side) with [server-only mode](https://unifiedid.com/docs/guides/integration-prebid-server-side#server-only-mode).
 
-### Server only value example
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| value | Required for server-only mode | Object | An object containing the value for the advertising token. | 
{
  uid2: {
    id: '...advertising token...'
  }
}
 |
 
-Configuration:
-```
-pbjs.setConfig({
-    userSync: {
-        userIds: [{
-            name: 'uid2'
-            value: {
-                'uid2': {
-                    'id': '...advertising token...'
-                }
-            }
-        }]
-    }
-});
-```
+#### Client Refresh Mode
 
-## Storage
+The following parameters apply to the UID2 User ID Module if you are following the [server-side integration guide](https://unifiedid.com/docs/guides/integration-prebid-server-side) with [client refresh mode](https://unifiedid.com/docs/guides/integration-prebid-server-side#client-refresh-mode). Either `params.uid2Token` or `params.uid2Cookie` must be provided.
 
-The module stores a number of internal values. By default, all values are stored in HTML5 local storage. You can switch to cookie storage by setting `params.storage` to `cookie`. The cookie size can be significant and this is not recommended, but is provided as an option if local storage is not an option.
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| params.uid2Token | Optional | Object | The initial UID2 token. This should be the `body` element of the decrypted response from a call to the `/token/generate` or `/token/refresh` endpoint. | See [Sample Token](#sample-token). |
+| params.uid2Cookie | Optional | String | The name of a cookie that holds the initial UID2 token, set by the server. The cookie should contain JSON in the same format as the uid2Token param. **If uid2Token is supplied, this param is ignored.** | `"uid2_pub_cookie"` |
 
-## Sample token
+## Sample Token
 
-`{`
  `"advertising_token": "...",`
  `"refresh_token": "...",`
  `"identity_expires": 1633643601000,`
  `"refresh_from": 1633643001000,`
  `"refresh_expires": 1636322000000,`
  `"refresh_response_key": "wR5t6HKMfJ2r4J7fEGX9Gw=="`
`}`
+```
+{
+  "advertising_token": "...",
+  "refresh_token": "...",
+  "identity_expires": 1633643601000,
+  "refresh_from": 1633643001000,
+  "refresh_expires": 1636322000000,
+  "refresh_response_key": "wR5t6HKMfJ2r4J7fEGX9Gw=="
+}
+```
 
-### Notes
+## Normalization and Encoding
 
-If you are trying to limit the size of cookies, provide the token in configuration and use the default option of local storage.
+It's important that, in working with UID2, normalizing and encoding are performed correctly. By doing so, you can ensure that the UID2 value you create can be securely and anonymously matched up with other instances of online behavior by the same user.
 
-If you provide an expired identity and the module has a valid identity which was refreshed from the identity you provide, it will use the refreshed identity. The module stores the original token used for refreshing the token, and it will use the refreshed tokens as long as the original token matches the one supplied.
+For more information, refer to [Normalization and Encoding](https://unifiedid.com/docs/getting-started/gs-normalization-encoding).
 
-If a new token is supplied which does not match the original token used to generate any refreshed tokens, all stored tokens will be discarded and the new token used instead (refreshed if necessary).
+## Notes
 
-You can set `params.uid2ApiBase` to `"https://operator-integ.uidapi.com"` during integration testing. Be aware that you must use the same environment (production or integration) here as you use for generating tokens.
+- If you provide an expired identity, and the module has a valid update from refreshing the same identity, the module uses the refreshed identity in place of the expired one you provided.
 
-## Parameter Descriptions for the `usersync` Configuration Section
+- If you provide a new token that doesn't match the original token used to generate any refreshed tokens, the module discards all stored tokens and uses the new token instead, and keeps it refreshed.
 
-The below parameters apply only to the UID2 User ID Module integration.
+- During integration testing, set `params.uid2ApiBase` to `"https://operator-integ.uidapi.com"`. You must set this value to the same environment (production or integration) that you use for generating tokens.
 
-| Param under userSync.userIds[] | Scope | Type | Description | Example |
-| --- | --- | --- | --- | --- |
-| name | Required | String | ID value for the UID2 module - `"uid2"` | `"uid2"` |
-| value | Optional, Server only | Object | An object containing the value for the advertising token. | See the example above. |
-| params.uid2Token | Optional, Client refresh | Object | The initial UID2 token. This should be `body` element of the decrypted response from a call to the `/token/generate` or `/token/refresh` endpoint. | See the sample token above. |
-| params.uid2Cookie | Optional, Client refresh | String | The name of a cookie which holds the initial UID2 token, set by the server. The cookie should contain JSON in the same format as the uid2Token param. **If uid2Token is supplied, this param is ignored.** | See the sample token above. |
-| params.uid2ApiBase | Optional, Client refresh | String | Overrides the default UID2 API endpoint. | `"https://prod.uidapi.com"` _(default)_|
-| params.storage | Optional, Client refresh | String | Specify whether to use `cookie` or `localStorage` for module-internal storage. It is recommended to not provide this and allow the module to use the default. | `localStorage` _(default)_ |
+- If you are building Prebid.js and following the server-side integration guide, you can create a smaller Prebid.js build by disabling client-side integration functionality. To do this, pass the `--disable UID2_CSTG` flag:
+
+```
+    $ gulp build --modules=uid2IdSystem --disable UID2_CSTG
+```
\ No newline at end of file
diff --git a/modules/uid2IdSystem_shared.js b/modules/uid2IdSystem_shared.js
index 0f6894a9d3e..a9acfd6291e 100644
--- a/modules/uid2IdSystem_shared.js
+++ b/modules/uid2IdSystem_shared.js
@@ -1,18 +1,31 @@
-/* eslint-disable no-console */
+import { ajax } from '../src/ajax.js';
+import { cyrb53Hash } from '../src/utils.js';
+
 export const Uid2CodeVersion = '1.1';
 
 function isValidIdentity(identity) {
   return !!(typeof identity === 'object' && identity !== null && identity.advertising_token && identity.identity_expires && identity.refresh_from && identity.refresh_token && identity.refresh_expires);
 }
 
+// Helper function to prepend message
+function prependMessage(message) {
+  return `UID2 shared library - ${message}`;
+}
+
+// Wrapper function for logInfo
+function logInfoWrapper(logInfo, ...args) {
+  logInfo(prependMessage(args[0]), ...args.slice(1));
+}
+
 // This is extracted from an in-progress API client. Once it's available via NPM, this class should be replaced with the NPM package.
 export class Uid2ApiClient {
   constructor(opts, clientId, logInfo, logWarn) {
     this._baseUrl = opts.baseUrl;
     this._clientVersion = clientId;
-    this._logInfo = logInfo;
+    this._logInfo = (...args) => logInfoWrapper(logInfo, ...args);
     this._logWarn = logWarn;
   }
+
   createArrayBuffer(text) {
     const arrayBuffer = new Uint8Array(text.length);
     for (let i = 0; i < text.length; i++) {
@@ -32,53 +45,62 @@ export class Uid2ApiClient {
     if (this.isValidRefreshResponse(response)) {
       if (response.status === 'success') { return { status: response.status, identity: response.body }; }
       return response;
-    } else { return `Response didn't contain a valid status`; }
+    } else { return prependMessage(`Response didn't contain a valid status`); }
   }
   callRefreshApi(refreshDetails) {
     const url = this._baseUrl + '/v2/token/refresh';
-    const req = new XMLHttpRequest();
-    req.overrideMimeType('text/plain');
-    req.open('POST', url, true);
-    req.setRequestHeader('X-UID2-Client-Version', this._clientVersion);
     let resolvePromise;
     let rejectPromise;
     const promise = new Promise((resolve, reject) => {
       resolvePromise = resolve;
       rejectPromise = reject;
     });
-    req.onreadystatechange = () => {
-      if (req.readyState !== req.DONE) { return; }
-      try {
-        if (!refreshDetails.refresh_response_key || req.status !== 200) {
-          this._logInfo('Error status OR no response decryption key available, assuming unencrypted JSON');
-          const response = JSON.parse(req.responseText);
+    this._logInfo('Sending refresh request', refreshDetails);
+    ajax(url, {
+      success: (responseText) => {
+        try {
+          if (!refreshDetails.refresh_response_key) {
+            this._logInfo('No response decryption key available, assuming unencrypted JSON');
+            const response = JSON.parse(responseText);
+            const result = this.ResponseToRefreshResult(response);
+            if (typeof result === 'string') { rejectPromise(prependMessage(result)); } else { resolvePromise(result); }
+          } else {
+            this._logInfo('Decrypting refresh API response');
+            const encodeResp = this.createArrayBuffer(atob(responseText));
+            window.crypto.subtle.importKey('raw', this.createArrayBuffer(atob(refreshDetails.refresh_response_key)), { name: 'AES-GCM' }, false, ['decrypt']).then((key) => {
+              this._logInfo('Imported decryption key')
+              // returns the symmetric key
+              window.crypto.subtle.decrypt({
+                name: 'AES-GCM',
+                iv: encodeResp.slice(0, 12),
+                tagLength: 128, // The tagLength you used to encrypt (if any)
+              }, key, encodeResp.slice(12)).then((decrypted) => {
+                const decryptedResponse = String.fromCharCode(...new Uint8Array(decrypted));
+                this._logInfo('Decrypted to:', decryptedResponse);
+                const response = JSON.parse(decryptedResponse);
+                const result = this.ResponseToRefreshResult(response);
+                if (typeof result === 'string') { rejectPromise(prependMessage(result)); } else { resolvePromise(result); }
+              }, (reason) => this._logWarn(prependMessage(`Call to UID2 API failed`), reason));
+            }, (reason) => this._logWarn(prependMessage(`Call to UID2 API failed`), reason));
+          }
+        } catch (_err) {
+          rejectPromise(prependMessage(responseText));
+        }
+      },
+      error: (error, xhr) => {
+        try {
+          this._logInfo('Error status, assuming unencrypted JSON');
+          const response = JSON.parse(xhr.responseText);
           const result = this.ResponseToRefreshResult(response);
-          if (typeof result === 'string') { rejectPromise(result); } else { resolvePromise(result); }
-        } else {
-          this._logInfo('Decrypting refresh API response');
-          const encodeResp = this.createArrayBuffer(atob(req.responseText));
-          window.crypto.subtle.importKey('raw', this.createArrayBuffer(atob(refreshDetails.refresh_response_key)), { name: 'AES-GCM' }, false, ['decrypt']).then((key) => {
-            this._logInfo('Imported decryption key')
-            // returns the symmetric key
-            window.crypto.subtle.decrypt({
-              name: 'AES-GCM',
-              iv: encodeResp.slice(0, 12),
-              tagLength: 128, // The tagLength you used to encrypt (if any)
-            }, key, encodeResp.slice(12)).then((decrypted) => {
-              const decryptedResponse = String.fromCharCode(...new Uint8Array(decrypted));
-              this._logInfo('Decrypted to:', decryptedResponse);
-              const response = JSON.parse(decryptedResponse);
-              const result = this.ResponseToRefreshResult(response);
-              if (typeof result === 'string') { rejectPromise(result); } else { resolvePromise(result); }
-            }, (reason) => this._logWarn(`Call to UID2 API failed`, reason));
-          }, (reason) => this._logWarn(`Call to UID2 API failed`, reason));
+          if (typeof result === 'string') { rejectPromise(prependMessage(result)); } else { resolvePromise(result); }
+        } catch (_e) {
+          rejectPromise(prependMessage(error));
         }
-      } catch (err) {
-        rejectPromise(err);
       }
-    };
-    this._logInfo('Sending refresh request', refreshDetails);
-    req.send(refreshDetails.refresh_token);
+    }, refreshDetails.refresh_token, { method: 'POST',
+      customHeaders: {
+        'X-UID2-Client-Version': this._clientVersion
+      } });
     return promise;
   }
 }
@@ -87,7 +109,7 @@ export class Uid2StorageManager {
     this._storage = storage;
     this._preferLocalStorage = preferLocalStorage;
     this._storageName = storageName;
-    this._logInfo = logInfo;
+    this._logInfo = (...args) => logInfoWrapper(logInfo, ...args);
   }
   readCookie(cookieName) {
     return this._storage.cookiesAreEnabled() ? this._storage.getCookie(cookieName) : null;
@@ -160,73 +182,617 @@ function refreshTokenAndStore(baseUrl, token, clientId, storageManager, _logInfo
       originalToken: token,
       latestToken: response.identity,
     };
+    let storedTokens = storageManager.getStoredValueWithFallback();
+    if (storedTokens?.originalIdentity) tokens.originalIdentity = storedTokens.originalIdentity;
     storageManager.storeValue(tokens);
     return tokens;
   });
 }
 
+let clientSideTokenGenerator;
+if (FEATURES.UID2_CSTG) {
+  const SERVER_PUBLIC_KEY_PREFIX_LENGTH = 9;
+
+  clientSideTokenGenerator = {
+    isCSTGOptionsValid(maybeOpts, _logWarn) {
+      if (typeof maybeOpts !== 'object' || maybeOpts === null) {
+        _logWarn('CSTG is not being used, but is included in the Prebid.js bundle. You can reduce the bundle size by passing "--disable UID2_CSTG" to the Prebid.js build.');
+        return false;
+      }
+
+      const opts = maybeOpts;
+      if (!opts.serverPublicKey && !opts.subscriptionId) {
+        _logWarn('CSTG has been enabled but its parameters have not been set.');
+        return false;
+      }
+      if (typeof opts.serverPublicKey !== 'string') {
+        _logWarn('CSTG opts.serverPublicKey must be a string');
+        return false;
+      }
+      const serverPublicKeyPrefix = /^(UID2|EUID)-X-[A-Z]-.+/;
+      if (!serverPublicKeyPrefix.test(opts.serverPublicKey)) {
+        _logWarn(
+          `CSTG opts.serverPublicKey must match the regular expression ${serverPublicKeyPrefix}`
+        );
+        return false;
+      }
+      // We don't do any further validation of the public key, as we will find out
+      // later if it's valid by using importKey.
+
+      if (typeof opts.subscriptionId !== 'string') {
+        _logWarn('CSTG opts.subscriptionId must be a string');
+        return false;
+      }
+      if (opts.subscriptionId.length === 0) {
+        _logWarn('CSTG opts.subscriptionId is empty');
+        return false;
+      }
+      return true;
+    },
+
+    getValidIdentity(opts, _logWarn) {
+      if (opts.emailHash) {
+        if (!UID2DiiNormalization.isBase64Hash(opts.emailHash)) {
+          _logWarn('CSTG opts.emailHash is invalid');
+          return;
+        }
+        return { email_hash: opts.emailHash };
+      }
+
+      if (opts.phoneHash) {
+        if (!UID2DiiNormalization.isBase64Hash(opts.phoneHash)) {
+          _logWarn('CSTG opts.phoneHash is invalid');
+          return;
+        }
+        return { phone_hash: opts.phoneHash };
+      }
+
+      if (opts.email) {
+        const normalizedEmail = UID2DiiNormalization.normalizeEmail(opts.email);
+        if (normalizedEmail === undefined) {
+          _logWarn('CSTG opts.email is invalid');
+          return;
+        }
+        return { email: normalizedEmail };
+      }
+
+      if (opts.phone) {
+        if (!UID2DiiNormalization.isNormalizedPhone(opts.phone)) {
+          _logWarn('CSTG opts.phone is invalid');
+          return;
+        }
+        return { phone: opts.phone };
+      }
+    },
+
+    isStoredTokenInvalid(cstgIdentity, storedTokens, _logInfo, _logWarn) {
+      if (storedTokens) {
+        if (storedTokens.latestToken === 'optout') {
+          return true;
+        }
+        const identity = Object.values(cstgIdentity)[0];
+        if (!this.isStoredTokenFromSameIdentity(storedTokens, identity)) {
+          _logInfo(
+            'CSTG supplied new identity - ignoring stored value.',
+            storedTokens.originalIdentity,
+            cstgIdentity
+          );
+          // Stored token wasn't originally sourced from the provided identity - ignore the stored value. A new user has logged in?
+          return true;
+        }
+      }
+      return false;
+    },
+
+    async generateTokenAndStore(
+      baseUrl,
+      cstgOpts,
+      cstgIdentity,
+      storageManager,
+      _logInfo,
+      _logWarn
+    ) {
+      _logInfo('UID2 cstg opts provided: ', JSON.stringify(cstgOpts));
+      const client = new UID2CstgApiClient(
+        { baseUrl, cstg: cstgOpts },
+        _logInfo,
+        _logWarn
+      );
+      const response = await client.generateToken(cstgIdentity);
+      _logInfo('CSTG endpoint responded with:', response);
+      const tokens = {
+        originalIdentity: this.encodeOriginalIdentity(cstgIdentity),
+        latestToken: response.identity,
+      };
+      storageManager.storeValue(tokens);
+      return tokens;
+    },
+
+    isStoredTokenFromSameIdentity(storedTokens, identity) {
+      if (!storedTokens.originalIdentity) return false;
+      return (
+        cyrb53Hash(identity, storedTokens.originalIdentity.salt) ===
+        storedTokens.originalIdentity.identity
+      );
+    },
+
+    encodeOriginalIdentity(identity) {
+      const identityValue = Object.values(identity)[0];
+      const salt = Math.floor(Math.random() * Math.pow(2, 32));
+      return {
+        identity: cyrb53Hash(identityValue, salt),
+        salt,
+      };
+    },
+  };
+
+  class UID2DiiNormalization {
+    static EMAIL_EXTENSION_SYMBOL = '+';
+    static EMAIL_DOT = '.';
+    static GMAIL_DOMAIN = 'gmail.com';
+
+    static isBase64Hash(value) {
+      if (!(value && value.length === 44)) {
+        return false;
+      }
+
+      try {
+        return btoa(atob(value)) === value;
+      } catch (err) {
+        return false;
+      }
+    }
+
+    static isNormalizedPhone(phone) {
+      return /^\+[0-9]{10,15}$/.test(phone);
+    }
+
+    static normalizeEmail(email) {
+      if (!email || !email.length) return;
+
+      const parsedEmail = email.trim().toLowerCase();
+      if (parsedEmail.indexOf(' ') > 0) return;
+
+      const emailParts = this.splitEmailIntoAddressAndDomain(parsedEmail);
+      if (!emailParts) return;
+
+      const { address, domain } = emailParts;
+
+      const emailIsGmail = this.isGmail(domain);
+      const parsedAddress = this.normalizeAddressPart(
+        address,
+        emailIsGmail,
+        emailIsGmail
+      );
+
+      return parsedAddress ? `${parsedAddress}@${domain}` : undefined;
+    }
+
+    static splitEmailIntoAddressAndDomain(email) {
+      const parts = email.split('@');
+      if (
+        parts.length !== 2 ||
+        parts.some((part) => part === '')
+      ) { return; }
+
+      return {
+        address: parts[0],
+        domain: parts[1],
+      };
+    }
+
+    static isGmail(domain) {
+      return domain === this.GMAIL_DOMAIN;
+    }
+
+    static dropExtension(address, extensionSymbol = this.EMAIL_EXTENSION_SYMBOL) {
+      return address.split(extensionSymbol)[0];
+    }
+
+    static normalizeAddressPart(address, shouldRemoveDot, shouldDropExtension) {
+      let parsedAddress = address;
+      if (shouldRemoveDot) { parsedAddress = parsedAddress.replaceAll(this.EMAIL_DOT, ''); }
+      if (shouldDropExtension) parsedAddress = this.dropExtension(parsedAddress);
+      return parsedAddress;
+    }
+  }
+
+  class UID2CstgApiClient {
+    constructor(opts, logInfo, logWarn) {
+      this._baseUrl = opts.baseUrl;
+      this._serverPublicKey = opts.cstg.serverPublicKey;
+      this._subscriptionId = opts.cstg.subscriptionId;
+      this._logInfo = (...args) => logInfoWrapper(logInfo, ...args);
+      this._logWarn = logWarn;
+    }
+
+    hasStatusResponse(response) {
+      return typeof response === 'object' && response && response.status;
+    }
+
+    isCstgApiSuccessResponse(response) {
+      return (
+        this.hasStatusResponse(response) &&
+        response.status === 'success' &&
+        isValidIdentity(response.body)
+      );
+    }
+
+    isCstgApiOptoutResponse(response) {
+      return (
+        this.hasStatusResponse(response) &&
+        response.status === 'optout');
+    }
+
+    isCstgApiClientErrorResponse(response) {
+      return (
+        this.hasStatusResponse(response) &&
+        response.status === 'client_error' &&
+        typeof response.message === 'string'
+      );
+    }
+
+    isCstgApiForbiddenResponse(response) {
+      return (
+        this.hasStatusResponse(response) &&
+        response.status === 'invalid_http_origin' &&
+        typeof response.message === 'string'
+      );
+    }
+
+    stripPublicKeyPrefix(serverPublicKey) {
+      return serverPublicKey.substring(SERVER_PUBLIC_KEY_PREFIX_LENGTH);
+    }
+
+    async generateCstgRequest(cstgIdentity) {
+      if ('email_hash' in cstgIdentity || 'phone_hash' in cstgIdentity) {
+        return cstgIdentity;
+      }
+      if ('email' in cstgIdentity) {
+        const emailHash = await UID2CstgCrypto.hash(cstgIdentity.email);
+        return { email_hash: emailHash };
+      }
+      if ('phone' in cstgIdentity) {
+        const phoneHash = await UID2CstgCrypto.hash(cstgIdentity.phone);
+        return { phone_hash: phoneHash };
+      }
+    }
+
+    async generateToken(cstgIdentity) {
+      const request = await this.generateCstgRequest(cstgIdentity);
+      this._logInfo('Building CSTG request for', request);
+      const box = await UID2CstgBox.build(
+        this.stripPublicKeyPrefix(this._serverPublicKey)
+      );
+      const encoder = new TextEncoder();
+      const now = Date.now();
+      const { iv, ciphertext } = await box.encrypt(
+        encoder.encode(JSON.stringify(request)),
+        encoder.encode(JSON.stringify([now]))
+      );
+
+      const exportedPublicKey = await UID2CstgCrypto.exportPublicKey(
+        box.clientPublicKey
+      );
+      const requestBody = {
+        payload: UID2CstgCrypto.bytesToBase64(new Uint8Array(ciphertext)),
+        iv: UID2CstgCrypto.bytesToBase64(new Uint8Array(iv)),
+        public_key: UID2CstgCrypto.bytesToBase64(
+          new Uint8Array(exportedPublicKey)
+        ),
+        timestamp: now,
+        subscription_id: this._subscriptionId,
+      };
+      return this.callCstgApi(requestBody, box);
+    }
+
+    async callCstgApi(requestBody, box) {
+      const url = this._baseUrl + '/v2/token/client-generate';
+      let resolvePromise;
+      let rejectPromise;
+      const promise = new Promise((resolve, reject) => {
+        resolvePromise = resolve;
+        rejectPromise = reject;
+      });
+
+      this._logInfo('Sending CSTG request', requestBody);
+      ajax(
+        url,
+        {
+          success: async (responseText, xhr) => {
+            try {
+              const encodedResp = UID2CstgCrypto.base64ToBytes(responseText);
+              const decrypted = await box.decrypt(
+                encodedResp.slice(0, 12),
+                encodedResp.slice(12)
+              );
+              const decryptedResponse = new TextDecoder().decode(decrypted);
+              const response = JSON.parse(decryptedResponse);
+              if (this.isCstgApiSuccessResponse(response)) {
+                resolvePromise({
+                  status: 'success',
+                  identity: response.body,
+                });
+              } else if (this.isCstgApiOptoutResponse(response)) {
+                resolvePromise({
+                  status: 'optout',
+                  identity: 'optout',
+                });
+              } else {
+                // A 200 should always be a success response.
+                // Something has gone wrong.
+                rejectPromise(
+                  prependMessage(`API error: Response body was invalid for HTTP status 200: ${decryptedResponse}`)
+                );
+              }
+            } catch (err) {
+              rejectPromise(prependMessage(err));
+            }
+          },
+          error: (error, xhr) => {
+            try {
+              if (xhr.status === 400) {
+                const response = JSON.parse(xhr.responseText);
+                if (this.isCstgApiClientErrorResponse(response)) {
+                  rejectPromise(prependMessage(`Client error: ${response.message}`));
+                } else {
+                  // A 400 should always be a client error.
+                  // Something has gone wrong.
+                  rejectPromise(
+                    prependMessage(`UID2 API error: Response body was invalid for HTTP status 400: ${xhr.responseText}`)
+                  );
+                }
+              } else if (xhr.status === 403) {
+                const response = JSON.parse(xhr.responseText);
+                if (this.isCstgApiForbiddenResponse(xhr)) {
+                  rejectPromise(prependMessage(`Forbidden: ${response.message}`));
+                } else {
+                  // A 403 should always be a forbidden response.
+                  // Something has gone wrong.
+                  rejectPromise(
+                    prependMessage(`UID2 API error: Response body was invalid for HTTP status 403: ${xhr.responseText}`)
+                  );
+                }
+              } else {
+                rejectPromise(
+                  prependMessage(`UID2 API error: Unexpected HTTP status ${xhr.status}: ${error}`)
+                );
+              }
+            } catch (_e) {
+              rejectPromise(prependMessage(error));
+            }
+          },
+        },
+        JSON.stringify(requestBody),
+        { method: 'POST' }
+      );
+      return promise;
+    }
+  }
+
+  class UID2CstgBox {
+    static _namedCurve = 'P-256';
+    constructor(clientPublicKey, sharedKey) {
+      this._clientPublicKey = clientPublicKey;
+      this._sharedKey = sharedKey;
+    }
+
+    static async build(serverPublicKey) {
+      const clientKeyPair = await UID2CstgCrypto.generateKeyPair(
+        UID2CstgBox._namedCurve
+      );
+      const importedServerPublicKey = await UID2CstgCrypto.importPublicKey(
+        serverPublicKey,
+        this._namedCurve
+      );
+      const sharedKey = await UID2CstgCrypto.deriveKey(
+        importedServerPublicKey,
+        clientKeyPair.privateKey
+      );
+      return new UID2CstgBox(clientKeyPair.publicKey, sharedKey);
+    }
+
+    async encrypt(plaintext, additionalData) {
+      const iv = window.crypto.getRandomValues(new Uint8Array(12));
+      const ciphertext = await window.crypto.subtle.encrypt(
+        {
+          name: 'AES-GCM',
+          iv,
+          additionalData,
+        },
+        this._sharedKey,
+        plaintext
+      );
+      return { iv, ciphertext };
+    }
+
+    async decrypt(iv, ciphertext) {
+      return window.crypto.subtle.decrypt(
+        {
+          name: 'AES-GCM',
+          iv,
+        },
+        this._sharedKey,
+        ciphertext
+      );
+    }
+
+    get clientPublicKey() {
+      return this._clientPublicKey;
+    }
+  }
+
+  class UID2CstgCrypto {
+    static base64ToBytes(base64) {
+      const binString = atob(base64);
+      return Uint8Array.from(binString, (m) => m.codePointAt(0));
+    }
+
+    static bytesToBase64(bytes) {
+      const binString = Array.from(bytes, (x) => String.fromCodePoint(x)).join(
+        ''
+      );
+      return btoa(binString);
+    }
+
+    static async generateKeyPair(namedCurve) {
+      const params = {
+        name: 'ECDH',
+        namedCurve: namedCurve,
+      };
+      return window.crypto.subtle.generateKey(params, false, ['deriveKey']);
+    }
+
+    static async importPublicKey(publicKey, namedCurve) {
+      const params = {
+        name: 'ECDH',
+        namedCurve: namedCurve,
+      };
+      return window.crypto.subtle.importKey(
+        'spki',
+        this.base64ToBytes(publicKey),
+        params,
+        false,
+        []
+      );
+    }
+
+    static exportPublicKey(publicKey) {
+      return window.crypto.subtle.exportKey('spki', publicKey);
+    }
+
+    static async deriveKey(serverPublicKey, clientPrivateKey) {
+      return window.crypto.subtle.deriveKey(
+        {
+          name: 'ECDH',
+          public: serverPublicKey,
+        },
+        clientPrivateKey,
+        {
+          name: 'AES-GCM',
+          length: 256,
+        },
+        false,
+        ['encrypt', 'decrypt']
+      );
+    }
+
+    static async hash(value) {
+      const hash = await window.crypto.subtle.digest(
+        'SHA-256',
+        new TextEncoder().encode(value)
+      );
+      return this.bytesToBase64(new Uint8Array(hash));
+    }
+  }
+}
+
 export function Uid2GetId(config, prebidStorageManager, _logInfo, _logWarn) {
+  const logInfo = (...args) => logInfoWrapper(_logInfo, ...args);
+
   let suppliedToken = null;
   const preferLocalStorage = (config.storage !== 'cookie');
-  const storageManager = new Uid2StorageManager(prebidStorageManager, preferLocalStorage, config.internalStorage, _logInfo);
-  _logInfo(`Module is using ${preferLocalStorage ? 'local storage' : 'cookies'} for internal storage.`);
+  const storageManager = new Uid2StorageManager(prebidStorageManager, preferLocalStorage, config.internalStorage, logInfo);
+  logInfo(`Module is using ${preferLocalStorage ? 'local storage' : 'cookies'} for internal storage.`);
 
-  if (config.paramToken) {
+  const isCstgEnabled =
+  clientSideTokenGenerator &&
+  clientSideTokenGenerator.isCSTGOptionsValid(config.cstg, _logWarn);
+  if (isCstgEnabled) {
+    logInfo(`Module is using client-side token generation.`);
+    // Ignores config.paramToken and config.serverCookieName if any is provided
+    suppliedToken = null;
+  } else if (config.paramToken) {
     suppliedToken = config.paramToken;
-    _logInfo('Read token from params', suppliedToken);
+    logInfo('Read token from params', suppliedToken);
   } else if (config.serverCookieName) {
     suppliedToken = storageManager.readProvidedCookie(config.serverCookieName);
-    _logInfo('Read token from server-supplied cookie', suppliedToken);
+    logInfo('Read token from server-supplied cookie', suppliedToken);
   }
   let storedTokens = storageManager.getStoredValueWithFallback();
-  _logInfo('Loaded module-stored tokens:', storedTokens);
+  logInfo('Loaded module-stored tokens:', storedTokens);
 
   if (storedTokens && typeof storedTokens === 'string') {
     // Stored value is a plain token - if no token is supplied, just use the stored value.
 
-    if (!suppliedToken) {
-      _logInfo('Returning legacy cookie value.');
+    if (!suppliedToken && !isCstgEnabled) {
+      logInfo('Returning legacy cookie value.');
       return { id: storedTokens };
     }
     // Otherwise, ignore the legacy value - it should get over-written later anyway.
-    _logInfo('Discarding superseded legacy cookie.');
+    logInfo('Discarding superseded legacy cookie.');
     storedTokens = null;
   }
 
   if (suppliedToken && storedTokens) {
     if (storedTokens.originalToken?.advertising_token !== suppliedToken.advertising_token) {
-      _logInfo('Server supplied new token - ignoring stored value.', storedTokens.originalToken?.advertising_token, suppliedToken.advertising_token);
+      logInfo('Server supplied new token - ignoring stored value.', storedTokens.originalToken?.advertising_token, suppliedToken.advertising_token);
       // Stored token wasn't originally sourced from the provided token - ignore the stored value. A new user has logged in?
       storedTokens = null;
     }
   }
-  // At this point, any legacy values or superseded stored tokens have been nulled out.
+
+  if (FEATURES.UID2_CSTG && isCstgEnabled) {
+    const cstgIdentity = clientSideTokenGenerator.getValidIdentity(config.cstg, _logWarn);
+    if (cstgIdentity) {
+      if (storedTokens && clientSideTokenGenerator.isStoredTokenInvalid(cstgIdentity, storedTokens, logInfo, _logWarn)) {
+        storedTokens = null;
+      }
+
+      if (!storedTokens || Date.now() > storedTokens.latestToken.refresh_expires) {
+        const promise = clientSideTokenGenerator.generateTokenAndStore(config.apiBaseUrl, config.cstg, cstgIdentity, storageManager, logInfo, _logWarn);
+        logInfo('Generate token using CSTG');
+        return { callback: (cb) => {
+          promise.then((result) => {
+            logInfo('Token generation responded, passing the new token on.', result);
+            cb(result);
+          });
+        } };
+      }
+    }
+  }
+
   const useSuppliedToken = !(storedTokens?.latestToken) || (suppliedToken && suppliedToken.identity_expires > storedTokens.latestToken.identity_expires);
   const newestAvailableToken = useSuppliedToken ? suppliedToken : storedTokens.latestToken;
-  _logInfo('UID2 module selected latest token', useSuppliedToken, newestAvailableToken);
-  if (!newestAvailableToken || Date.now() > newestAvailableToken.refresh_expires) {
-    _logInfo('Newest available token is expired and not refreshable.');
+  logInfo('UID2 module selected latest token', useSuppliedToken, newestAvailableToken);
+  if ((!newestAvailableToken || Date.now() > newestAvailableToken.refresh_expires)) {
+    logInfo('Newest available token is expired and not refreshable.');
     return { id: null };
   }
   if (Date.now() > newestAvailableToken.identity_expires) {
-    const promise = refreshTokenAndStore(config.apiBaseUrl, newestAvailableToken, config.clientId, storageManager, _logInfo, _logWarn);
-    _logInfo('Token is expired but can be refreshed, attempting refresh.');
+    const promise = refreshTokenAndStore(config.apiBaseUrl, newestAvailableToken, config.clientId, storageManager, logInfo, _logWarn);
+    logInfo('Token is expired but can be refreshed, attempting refresh.');
     return { callback: (cb) => {
       promise.then((result) => {
-        _logInfo('Refresh reponded, passing the updated token on.', result);
+        logInfo('Refresh reponded, passing the updated token on.', result);
         cb(result);
       });
     } };
   }
   // If should refresh (but don't need to), refresh in the background.
   if (Date.now() > newestAvailableToken.refresh_from) {
-    _logInfo(`Refreshing token in background with low priority.`);
-    refreshTokenAndStore(config.apiBaseUrl, newestAvailableToken, config.clientId, storageManager, _logInfo, _logWarn);
+    logInfo(`Refreshing token in background with low priority.`);
+    refreshTokenAndStore(config.apiBaseUrl, newestAvailableToken, config.clientId, storageManager, logInfo, _logWarn);
   }
   const tokens = {
     originalToken: suppliedToken ?? storedTokens?.originalToken,
     latestToken: newestAvailableToken,
   };
+  if (FEATURES.UID2_CSTG && isCstgEnabled) {
+    tokens.originalIdentity = storedTokens?.originalIdentity;
+  }
   storageManager.storeValue(tokens);
   return { id: tokens };
 }
+
+export function extractIdentityFromParams(params) {
+  const keysToCheck = ['emailHash', 'phoneHash', 'email', 'phone'];
+
+  for (let key of keysToCheck) {
+    if (params.hasOwnProperty(key)) {
+      return { [key]: params[key] };
+    }
+  }
+
+  return {};
+}
diff --git a/modules/underdogmediaBidAdapter.js b/modules/underdogmediaBidAdapter.js
index 4c2bdfe175f..54b74c7ccd4 100644
--- a/modules/underdogmediaBidAdapter.js
+++ b/modules/underdogmediaBidAdapter.js
@@ -71,7 +71,7 @@ export const spec = {
     let data = {
       dt: 10,
       gdpr: {},
-      pbTimeout: config.getConfig('bidderTimeout'),
+      pbTimeout: +config.getConfig('bidderTimeout') || 3001, // KP: convert to number and if NaN we default to 3001. Particular value to let us know that there was a problem in converting pbTimeout
       pbjsVersion: prebidVersion,
       placements: [],
       ref: deepAccess(bidderRequest, 'refererInfo.page') ? bidderRequest.refererInfo.page : undefined,
diff --git a/modules/undertoneBidAdapter.js b/modules/undertoneBidAdapter.js
index c7e8102ffc9..1ea2f2c1ce6 100644
--- a/modules/undertoneBidAdapter.js
+++ b/modules/undertoneBidAdapter.js
@@ -2,7 +2,7 @@
  * Adapter to send bids to Undertone
  */
 
-import {deepAccess, parseUrl} from '../src/utils.js';
+import {deepAccess, parseUrl, extractDomainFromHost} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
@@ -26,24 +26,6 @@ function getBidFloor(bidRequest, mediaType) {
   return (floor && floor.currency === 'USD' && floor.floor) || 0;
 }
 
-function extractDomainFromHost(pageHost) {
-  let domain = null;
-  try {
-    let domains = /[-\w]+\.([-\w]+|[-\w]{3,}|[-\w]{1,3}\.[-\w]{2})$/i.exec(pageHost);
-    if (domains != null && domains.length > 0) {
-      domain = domains[0];
-      for (let i = 1; i < domains.length; i++) {
-        if (domains[i].length > domain.length) {
-          domain = domains[i];
-        }
-      }
-    }
-  } catch (e) {
-    domain = null;
-  }
-  return domain;
-}
-
 function getGdprQueryParams(gdprConsent) {
   if (!gdprConsent) {
     return null;
diff --git a/modules/unicornBidAdapter.js b/modules/unicornBidAdapter.js
index 66aaf4a17e5..ac81e124b66 100644
--- a/modules/unicornBidAdapter.js
+++ b/modules/unicornBidAdapter.js
@@ -3,6 +3,11 @@ import {BANNER} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {getStorageManager} from '../src/storageManager.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ */
+
 const BIDDER_CODE = 'unicorn';
 const UNICORN_ENDPOINT = 'https://ds.uncn.jp/pb/0/bid.json';
 const UNICORN_DEFAULT_CURRENCY = 'JPY';
@@ -87,10 +92,33 @@ function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
       accountId: deepAccess(validBidRequests[0], 'params.accountId')
     }
   };
+  const eids = initializeEids(validBidRequests[0]);
+  if (eids.length > 0) {
+    request.user.eids = eids;
+  }
+
   logInfo('[UNICORN] OpenRTB Formatted Request:', request);
   return JSON.stringify(request);
 }
 
+const initializeEids = (bidRequest) => {
+  let eids = [];
+
+  let id5 = deepAccess(bidRequest, 'userId.id5id.uid');
+  if (id5) {
+    eids.push({
+      source: 'id5-sync.com',
+      uids: [
+        {
+          id: id5
+        }
+      ]
+    });
+  }
+
+  return eids;
+}
+
 const interpretResponse = (serverResponse, request) => {
   logInfo('[UNICORN] interpretResponse.serverResponse:', serverResponse);
   logInfo('[UNICORN] interpretResponse.request:', request);
@@ -107,7 +135,7 @@ const interpretResponse = (serverResponse, request) => {
           ad: b.adm,
           ttl: 1000,
           creativeId: b.crid,
-          netRevenue: false,
+          netRevenue: true,
           currency: res.cur
         }
 
diff --git a/modules/unifiedIdSystem.js b/modules/unifiedIdSystem.js
index 5576c40d960..1ede5f76850 100644
--- a/modules/unifiedIdSystem.js
+++ b/modules/unifiedIdSystem.js
@@ -8,6 +8,13 @@
 import { logError } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import {submodule} from '../src/hook.js'
+import {UID1_EIDS} from '../libraries/uid1Eids/uid1Eids.js';
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
 
 const MODULE_NAME = 'unifiedId';
 
@@ -68,17 +75,7 @@ export const unifiedIdSubmodule = {
     };
     return {callback: resp};
   },
-  eids: {
-    'tdid': {
-      source: 'adserver.org',
-      atype: 1,
-      getUidExt: function() {
-        return {
-          rtiPartner: 'TDID'
-        };
-      }
-    },
-  }
+  eids: {...UID1_EIDS}
 };
 
 submodule('userId', unifiedIdSubmodule);
diff --git a/modules/unrulyBidAdapter.js b/modules/unrulyBidAdapter.js
index d893bfd3038..53e6629d8cc 100644
--- a/modules/unrulyBidAdapter.js
+++ b/modules/unrulyBidAdapter.js
@@ -31,7 +31,7 @@ const addBidFloorInfo = (validBid) => {
         currency: 'USD',
         mediaType: key,
         size: '*'
-      }).floor || 0;
+      })?.floor || 0;
     } else {
       floor = validBid.params.floor || 0;
     }
@@ -56,6 +56,12 @@ const RemoveDuplicateSizes = (validBid) => {
   }
 };
 
+const ConfigureProtectedAudience = (validBid, protectedAudienceEnabled) => {
+  if (!protectedAudienceEnabled && validBid.ortb2Imp && validBid.ortb2Imp.ext) {
+    delete validBid.ortb2Imp.ext.ae;
+  }
+}
+
 const getRequests = (conf, validBidRequests, bidderRequest) => {
   const {bids, bidderRequestId, bidderCode, ...bidderRequestData} = bidderRequest;
   const invalidBidsCount = bidderRequest.bids.length - validBidRequests.length;
@@ -65,6 +71,7 @@ const getRequests = (conf, validBidRequests, bidderRequest) => {
     const currSiteId = validBid.params.siteId;
     addBidFloorInfo(validBid);
     RemoveDuplicateSizes(validBid);
+    ConfigureProtectedAudience(validBid, conf.protectedAudienceEnabled);
     requestBySiteId[currSiteId] = requestBySiteId[currSiteId] || [];
     requestBySiteId[currSiteId].push(validBid);
   });
@@ -73,7 +80,14 @@ const getRequests = (conf, validBidRequests, bidderRequest) => {
 
   Object.keys(requestBySiteId).forEach((key) => {
     let data = {
-      bidderRequest: Object.assign({}, {bids: requestBySiteId[key], invalidBidsCount, ...bidderRequestData})
+      bidderRequest: Object.assign({},
+        {
+          bids: requestBySiteId[key],
+          invalidBidsCount,
+          prebidVersion: '$prebid.version$',
+          ...bidderRequestData
+        }
+      )
     };
 
     request.push(Object.assign({}, {data, ...conf}));
@@ -206,21 +220,49 @@ export const adapter = {
       endPoint = deepAccess(validBidRequests[0], 'params.endpoint') || endPoint;
     }
 
-    const url = endPoint;
-    const method = 'POST';
-    const options = {contentType: 'application/json'};
-    return getRequests({url, method, options}, validBidRequests, bidderRequest);
+    return getRequests({
+      'url': endPoint,
+      'method': 'POST',
+      'options': {
+        'contentType': 'application/json'
+      },
+      'protectedAudienceEnabled': bidderRequest.paapi?.enabled
+    }, validBidRequests, bidderRequest);
   },
 
-  interpretResponse: function (serverResponse = {}) {
+  interpretResponse: function (serverResponse) {
+    if (!(serverResponse && serverResponse.body && (serverResponse.body.auctionConfigs || serverResponse.body.bids))) {
+      return [];
+    }
+
     const serverResponseBody = serverResponse.body;
+    let bids = [];
+    let fledgeAuctionConfigs = null;
+    if (serverResponseBody.bids.length) {
+      bids = handleBidResponseByMediaType(serverResponseBody.bids);
+    }
 
-    const noBidsResponse = [];
-    const isInvalidResponse = !serverResponseBody || !serverResponseBody.bids;
+    if (serverResponseBody.auctionConfigs) {
+      let auctionConfigs = serverResponseBody.auctionConfigs;
+      let bidIdList = Object.keys(auctionConfigs);
+      if (bidIdList.length) {
+        bidIdList.forEach((bidId) => {
+          fledgeAuctionConfigs = [{
+            'bidId': bidId,
+            'config': auctionConfigs[bidId]
+          }];
+        })
+      }
+    }
 
-    return isInvalidResponse
-      ? noBidsResponse
-      : handleBidResponseByMediaType(serverResponseBody.bids);
+    if (!fledgeAuctionConfigs) {
+      return bids;
+    }
+
+    return {
+      bids,
+      paapi: fledgeAuctionConfigs
+    };
   }
 };
 
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index aad570f20df..57341773184 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -1,27 +1,30 @@
-import {deepAccess, isFn, isPlainObject, isStr} from '../../src/utils.js';
+import {deepClone, isFn, isStr} from '../../src/utils.js';
+
+/**
+ * @typedef {import('./index.js').SubmodulePriorityMap} SubmodulePriorityMap
+ */
 
 export const EID_CONFIG = new Map();
 
 // this function will create an eid object for the given UserId sub-module
-function createEidObject(userIdData, subModuleKey) {
-  const conf = EID_CONFIG.get(subModuleKey);
-  if (conf && userIdData) {
+function createEidObject(userIdData, subModuleKey, eidConf) {
+  if (eidConf && userIdData) {
     let eid = {};
-    eid.source = isFn(conf['getSource']) ? conf['getSource'](userIdData) : conf['source'];
-    const value = isFn(conf['getValue']) ? conf['getValue'](userIdData) : userIdData;
+    eid.source = isFn(eidConf['getSource']) ? eidConf['getSource'](userIdData) : eidConf['source'];
+    const value = isFn(eidConf['getValue']) ? eidConf['getValue'](userIdData) : userIdData;
     if (isStr(value)) {
-      const uid = { id: value, atype: conf['atype'] };
+      const uid = { id: value, atype: eidConf['atype'] };
       // getUidExt
-      if (isFn(conf['getUidExt'])) {
-        const uidExt = conf['getUidExt'](userIdData);
+      if (isFn(eidConf['getUidExt'])) {
+        const uidExt = eidConf['getUidExt'](userIdData);
         if (uidExt) {
           uid.ext = uidExt;
         }
       }
       eid.uids = [uid];
       // getEidExt
-      if (isFn(conf['getEidExt'])) {
-        const eidExt = conf['getEidExt'](userIdData);
+      if (isFn(eidConf['getEidExt'])) {
+        const eidExt = eidConf['getEidExt'](userIdData);
         if (eidExt) {
           eid.ext = eidExt;
         }
@@ -32,7 +35,7 @@ function createEidObject(userIdData, subModuleKey) {
   return null;
 }
 
-export function createEidsArray(bidRequestUserId) {
+export function createEidsArray(bidRequestUserId, eidConfigs = EID_CONFIG) {
   const allEids = {};
   function collect(eid) {
     const key = JSON.stringify([eid.source?.toLowerCase(), eid.ext]);
@@ -45,31 +48,24 @@ export function createEidsArray(bidRequestUserId) {
 
   Object.entries(bidRequestUserId).forEach(([name, values]) => {
     values = Array.isArray(values) ? values : [values];
-    const eids = name === 'pubProvidedId' ? values : values.map(value => createEidObject(value, name));
+    const eids = name === 'pubProvidedId' ? deepClone(values) : values.map(value => createEidObject(value, name, eidConfigs.get(name)));
     eids.filter(eid => eid != null).forEach(collect);
   })
   return Object.values(allEids);
 }
 
 /**
- * @param {SubmoduleContainer[]} submodules
+ * @param {SubmodulePriorityMap} priorityMap
  */
-export function buildEidPermissions(submodules) {
-  let eidPermissions = [];
-  submodules.filter(i => isPlainObject(i.idObj) && Object.keys(i.idObj).length)
-    .forEach(i => {
-      Object.keys(i.idObj).forEach(key => {
-        const eidConf = EID_CONFIG.get(key) || {};
-        if (deepAccess(i, 'config.bidders') && Array.isArray(i.config.bidders) &&
-          eidConf.source) {
-          eidPermissions.push(
-            {
-              source: eidConf.source,
-              bidders: i.config.bidders
-            }
-          );
-        }
-      });
-    });
-  return eidPermissions;
+export function getEids(priorityMap) {
+  const eidConfigs = new Map();
+  const idValues = {};
+  Object.entries(priorityMap).forEach(([key, submodules]) => {
+    const submodule = submodules.find(mod => mod.idObj?.[key] != null);
+    if (submodule) {
+      idValues[key] = submodule.idObj[key];
+      eidConfigs.set(key, submodule.submodule.eids?.[key])
+    }
+  })
+  return createEidsArray(idValues, eidConfigs);
 }
diff --git a/modules/userId/eids.md b/modules/userId/eids.md
index 04073923ed1..53567032175 100644
--- a/modules/userId/eids.md
+++ b/modules/userId/eids.md
@@ -31,7 +31,8 @@ userIdAsEids = [
             id: 'some-random-id-value',
             atype: 1,
             ext: {
-                rtiPartner: 'TDID'
+                rtiPartner: 'TDID',
+                provider: 'liveintent.com'
             }
         }]
     },
@@ -77,13 +78,6 @@ userIdAsEids = [
         uids: [{
             id: 'the-ids-object-stringified',
             atype: 1
-    },
-
-    {
-        source: 'parrable.com',
-        uids: [{
-            id: 'some-random-id-value',
-            atype: 1
         }]
     },
 
@@ -105,7 +99,7 @@ userIdAsEids = [
             segments: ['s1', 's2']
         }
     },
-    
+
     {
         source: 'bidswitch.net',
         uids: [{
@@ -116,9 +110,9 @@ userIdAsEids = [
             }
         }]
     },
-    
+
     {
-        source: 'media.net',
+        source: 'liveintent.indexexchange.com',
         uids: [{
             id: 'some-random-id-value',
             atype: 3,
@@ -128,6 +122,50 @@ userIdAsEids = [
         }]
     },
 
+    {
+        source: 'liveintent.sovrn.com'',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3,
+            ext: {
+                provider: 'liveintent.com'
+            }
+        }]
+    },
+
+    {
+        source: 'openx.net'',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3,
+            ext: {
+                provider: 'liveintent.com'
+            }
+        }]
+    },
+
+    {
+        source: 'pubmatic.com'',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3,
+            ext: {
+                provider: 'liveintent.com'
+            }
+        }]
+    },
+
+    {
+        source: 'media.net',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3,
+            ext: {
+                provider: 'liveintent.com'
+            }
+        }]
+    },
+    
     {
         source: 'rubiconproject.com',
         uids: [{
@@ -139,6 +177,17 @@ userIdAsEids = [
         }]
     },
 
+    {
+        source: 'fpid.liveintent.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1,
+            ext: {
+                provider: 'liveintent.com'
+            }
+        }]
+    },
+
     {
         source: 'merkleinc.com',
         uids: [{
@@ -279,6 +328,13 @@ userIdAsEids = [
             id: 'some-random-id-value',
             atype: 3
         }]
+    },
+    {
+        source: 'mygaru.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
     }
 ]
 ```
diff --git a/modules/userId/index.js b/modules/userId/index.js
index b20b38f0e40..69988e00f3b 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -4,63 +4,47 @@
  */
 
 /**
- * @interface Submodule
+ * @typedef Submodule
+ * @property {string} name - used to link submodule with config
+ * @property {decode} decode
+ * @property {getId} getId
+ * @property {Object} eids
+ * @property {number} [gvlid] - vendor ID
+ * @property {extendId} [extendId]
+ * @property {function} [domainOverride] - use a predefined domain override for cookies or provide your own
+ * @property {function(): string} [findRootDomain] - returns the root domain
  */
 
 /**
- * @function
- * @summary performs action to obtain id and return a value in the callback's response argument.
- *  If IdResponse#id is defined, then it will be written to the current active storage.
- *  If IdResponse#callback is defined, then it'll called at the end of auction.
- *  It's permissible to return neither, one, or both fields.
- * @name Submodule#getId
+ * Performs action to obtain id and return a value in the callback's response argument.
+ * If IdResponse#id is defined, then it will be written to the current active storage.
+ * If IdResponse#callback is defined, then it'll called at the end of auction.
+ * It's permissible to return neither, one, or both fields.
+ * @callback getId
  * @param {SubmoduleConfig} config
- * @param {ConsentData|undefined} consentData
- * @param {(Object|undefined)} cacheIdObj
- * @return {(IdResponse|undefined)} A response object that contains id and/or callback.
+ * @param {ConsentData|undefined} [consentData]
+ * @param {Object|undefined} [cacheIdObj]
+ * @returns {IdResponse|undefined} A response object that contains id and/or callback.
  */
 
 /**
- * @function
- * @summary Similar to Submodule#getId, this optional method returns response to for id that exists already.
- *  If IdResponse#id is defined, then it will be written to the current active storage even if it exists already.
- *  If IdResponse#callback is defined, then it'll called at the end of auction.
- *  It's permissible to return neither, one, or both fields.
- * @name Submodule#extendId
+ * Similar to `getId`, this optional method returns response to for id that exists already.
+ * If IdResponse#id is defined, then it will be written to the current active storage even if it exists already.
+ * If IdResponse#callback is defined, then it'll called at the end of auction.
+ * It's permissible to return neither, one, or both fields.
+ * @callback extendId
  * @param {SubmoduleConfig} config
  * @param {ConsentData|undefined} consentData
  * @param {Object} storedId - existing id, if any
- * @return {(IdResponse|function(callback:function))} A response object that contains id and/or callback.
+ * @returns {IdResponse|function(callback:function)} A response object that contains id and/or callback.
  */
 
 /**
- * @function
- * @summary decode a stored value for passing to bid requests
- * @name Submodule#decode
+ * Decode a stored value for passing to bid requests
+ * @callback decode
  * @param {Object|string} value
- * @param {SubmoduleConfig|undefined} config
- * @return {(Object|undefined)}
- */
-
-/**
- * @property
- * @summary used to link submodule with config
- * @name Submodule#name
- * @type {string}
- */
-
-/**
- * @property
- * @summary use a predefined domain override for cookies or provide your own
- * @name Submodule#domainOverride
- * @type {(undefined|function)}
- */
-
-/**
- * @function
- * @summary Returns the root domain
- * @name Submodule#findRootDomain
- * @returns {string}
+ * @param {SubmoduleConfig|undefined} [config]
+ * @returns {Object|undefined}
  */
 
 /**
@@ -69,6 +53,7 @@
  * @property {(SubmoduleStorage|undefined)} storage - browser storage config
  * @property {(SubmoduleParams|undefined)} params - params config for use by the submodule.getId function
  * @property {(Object|undefined)} value - if not empty, this value is added to bid requests for access in adapters
+ * @property {string[]} [enabledStorageTypes]
  */
 
 /**
@@ -111,6 +96,7 @@
  * @property {(Object|undefined)} idObj - cache decoded id value (this is copied to every adUnit bid)
  * @property {(function|undefined)} callback - holds reference to submodule.getId() result if it returned a function. Will be set to undefined after callback executes
  * @property {StorageManager} storageMgr
+ * @property {string[]} [enabledStorageTypes]
  */
 
 /**
@@ -122,18 +108,22 @@
 
 /**
  * @typedef {Object} IdResponse
- * @property {(Object|undefined)} id - id data
- * @property {(function|undefined)} callback - function that will return an id
+ * @property {Object} [id] - id data
+ * @property {function} [callback] - function that will return an id
  */
 
-import {find, includes} from '../../src/polyfill.js';
+/**
+ * @typedef {{[idKey: string]: SubmoduleContainer[]}} SubmodulePriorityMap
+ */
+
+import {find} from '../../src/polyfill.js';
 import {config} from '../../src/config.js';
 import * as events from '../../src/events.js';
 import {getGlobal} from '../../src/prebidGlobal.js';
 import adapterManager, {gdprDataHandler} from '../../src/adapterManager.js';
-import CONSTANTS from '../../src/constants.json';
+import {EVENTS} from '../../src/constants.js';
 import {module, ready as hooksReady} from '../../src/hook.js';
-import {buildEidPermissions, createEidsArray, EID_CONFIG} from './eids.js';
+import {EID_CONFIG, getEids} from './eids.js';
 import {
   getCoreStorageManager,
   getStorageManager,
@@ -141,13 +131,10 @@ import {
   STORAGE_TYPE_LOCALSTORAGE
 } from '../../src/storageManager.js';
 import {
-  deepAccess,
   deepSetValue,
   delayExecution,
-  getPrebidInternal,
   isArray,
   isEmpty,
-  isEmptyStr,
   isFn,
   isGptPubadsDefined,
   isNumber,
@@ -158,7 +145,6 @@ import {
 } from '../../src/utils.js';
 import {getPPID as coreGetPPID} from '../../src/adserver.js';
 import {defer, GreedyPromise} from '../../src/utils/promise.js';
-import {registerOrtbProcessor, REQUEST} from '../../src/pbjsORTB.js';
 import {newMetrics, timedAuctionHook, useMetrics} from '../../src/utils/perfMetrics.js';
 import {findRootDomain} from '../../src/fpd/rootDomain.js';
 import {allConsent, GDPR_GVLIDS} from '../../src/consentHandler.js';
@@ -166,25 +152,22 @@ import {MODULE_TYPE_UID} from '../../src/activities/modules.js';
 import {isActivityAllowed} from '../../src/activities/rules.js';
 import {ACTIVITY_ENRICH_EIDS} from '../../src/activities/activities.js';
 import {activityParams} from '../../src/activities/activityParams.js';
+import {USERSYNC_DEFAULT_CONFIG} from '../../src/userSync.js';
+import {startAuction} from '../../src/prebid.js';
 
 const MODULE_NAME = 'User ID';
 const COOKIE = STORAGE_TYPE_COOKIES;
 const LOCAL_STORAGE = STORAGE_TYPE_LOCALSTORAGE;
-const DEFAULT_SYNC_DELAY = 500;
-const NO_AUCTION_DELAY = 0;
 export const PBJS_USER_ID_OPTOUT_NAME = '_pbjs_id_optout';
 export const coreStorage = getCoreStorageManager('userId');
 export const dep = {
   isAllowed: isActivityAllowed
 }
 
-/** @type {boolean} */
-let addedUserIdHook = false;
-
 /** @type {SubmoduleContainer[]} */
 let submodules = [];
 
-/** @type {SubmoduleContainer[]} */
+/** @type {PriorityMaps} */
 let initializedSubmodules;
 
 /** @type {SubmoduleConfig[]} */
@@ -239,6 +222,29 @@ function cookieSetter(submodule, storageMgr) {
   }
 }
 
+function setValueInCookie(submodule, valueStr, expiresStr) {
+  const storage = submodule.config.storage;
+  const setCookie = cookieSetter(submodule);
+
+  setCookie(null, valueStr, expiresStr);
+  setCookie('_cst', getConsentHash(), expiresStr);
+  if (typeof storage.refreshInSeconds === 'number') {
+    setCookie('_last', new Date().toUTCString(), expiresStr);
+  }
+}
+
+function setValueInLocalStorage(submodule, valueStr, expiresStr) {
+  const storage = submodule.config.storage;
+  const mgr = submodule.storageMgr;
+
+  mgr.setDataInLocalStorage(`${storage.name}_exp`, expiresStr);
+  mgr.setDataInLocalStorage(`${storage.name}_cst`, getConsentHash());
+  mgr.setDataInLocalStorage(storage.name, encodeURIComponent(valueStr));
+  if (typeof storage.refreshInSeconds === 'number') {
+    mgr.setDataInLocalStorage(`${storage.name}_last`, new Date().toUTCString());
+  }
+}
+
 /**
  * @param {SubmoduleContainer} submodule
  * @param {(Object|string)} value
@@ -248,60 +254,78 @@ export function setStoredValue(submodule, value) {
    * @type {SubmoduleStorage}
    */
   const storage = submodule.config.storage;
-  const mgr = submodule.storageMgr;
 
   try {
     const expiresStr = (new Date(Date.now() + (storage.expires * (60 * 60 * 24 * 1000)))).toUTCString();
     const valueStr = isPlainObject(value) ? JSON.stringify(value) : value;
-    if (storage.type === COOKIE) {
-      const setCookie = cookieSetter(submodule);
-      setCookie(null, valueStr, expiresStr);
-      setCookie('_cst', getConsentHash(), expiresStr);
-      if (typeof storage.refreshInSeconds === 'number') {
-        setCookie('_last', new Date().toUTCString(), expiresStr);
-      }
-    } else if (storage.type === LOCAL_STORAGE) {
-      mgr.setDataInLocalStorage(`${storage.name}_exp`, expiresStr);
-      mgr.setDataInLocalStorage(`${storage.name}_cst`, getConsentHash());
-      mgr.setDataInLocalStorage(storage.name, encodeURIComponent(valueStr));
-      if (typeof storage.refreshInSeconds === 'number') {
-        mgr.setDataInLocalStorage(`${storage.name}_last`, new Date().toUTCString());
+
+    submodule.enabledStorageTypes.forEach(storageType => {
+      switch (storageType) {
+        case COOKIE:
+          setValueInCookie(submodule, valueStr, expiresStr);
+          break;
+        case LOCAL_STORAGE:
+          setValueInLocalStorage(submodule, valueStr, expiresStr);
+          break;
       }
-    }
+    });
   } catch (error) {
     logError(error);
   }
 }
 
+function deleteValueFromCookie(submodule) {
+  const setCookie = cookieSetter(submodule, coreStorage);
+  const expiry = (new Date(Date.now() - 1000 * 60 * 60 * 24)).toUTCString();
+
+  ['', '_last', '_cst'].forEach(suffix => {
+    try {
+      setCookie(suffix, '', expiry);
+    } catch (e) {
+      logError(e);
+    }
+  })
+}
+
+function deleteValueFromLocalStorage(submodule) {
+  ['', '_last', '_exp', '_cst'].forEach(suffix => {
+    try {
+      coreStorage.removeDataFromLocalStorage(submodule.config.storage.name + suffix);
+    } catch (e) {
+      logError(e);
+    }
+  });
+}
+
 export function deleteStoredValue(submodule) {
-  let deleter, suffixes;
-  switch (submodule.config?.storage?.type) {
-    case COOKIE:
-      const setCookie = cookieSetter(submodule, coreStorage);
-      const expiry = (new Date(Date.now() - 1000 * 60 * 60 * 24)).toUTCString();
-      deleter = (suffix) => setCookie(suffix, '', expiry)
-      suffixes = ['', '_last', '_cst'];
-      break;
-    case LOCAL_STORAGE:
-      deleter = (suffix) => coreStorage.removeDataFromLocalStorage(submodule.config.storage.name + suffix)
-      suffixes = ['', '_last', '_exp', '_cst'];
-      break;
-  }
-  if (deleter) {
-    suffixes.forEach(suffix => {
-      try {
-        deleter(suffix)
-      } catch (e) {
-        logError(e);
-      }
-    });
-  }
+  populateEnabledStorageTypes(submodule);
+
+  submodule.enabledStorageTypes.forEach(storageType => {
+    switch (storageType) {
+      case COOKIE:
+        deleteValueFromCookie(submodule);
+        break;
+      case LOCAL_STORAGE:
+        deleteValueFromLocalStorage(submodule);
+        break;
+    }
+  });
 }
 
-function setPrebidServerEidPermissions(initializedSubmodules) {
-  let setEidPermissions = getPrebidInternal().setEidPermissions;
-  if (typeof setEidPermissions === 'function' && isArray(initializedSubmodules)) {
-    setEidPermissions(buildEidPermissions(initializedSubmodules));
+function getValueFromCookie(submodule, storedKey) {
+  return submodule.storageMgr.getCookie(storedKey)
+}
+
+function getValueFromLocalStorage(submodule, storedKey) {
+  const mgr = submodule.storageMgr;
+  const storage = submodule.config.storage;
+  const storedValueExp = mgr.getDataFromLocalStorage(`${storage.name}_exp`);
+
+  // empty string means no expiration set
+  if (storedValueExp === '') {
+    return mgr.getDataFromLocalStorage(storedKey);
+  } else if (storedValueExp && ((new Date(storedValueExp)).getTime() - Date.now() > 0)) {
+    return decodeURIComponent(mgr.getDataFromLocalStorage(storedKey));
   }
 }
 
@@ -311,24 +335,23 @@ function setPrebidServerEidPermissions(initializedSubmodules) {
  * @returns {string}
  */
 function getStoredValue(submodule, key = undefined) {
-  const mgr = submodule.storageMgr;
   const storage = submodule.config.storage;
   const storedKey = key ? `${storage.name}_${key}` : storage.name;
   let storedValue;
   try {
-    if (storage.type === COOKIE) {
-      storedValue = mgr.getCookie(storedKey);
-    } else if (storage.type === LOCAL_STORAGE) {
-      const storedValueExp = mgr.getDataFromLocalStorage(`${storage.name}_exp`);
-      // empty string means no expiration set
-      if (storedValueExp === '') {
-        storedValue = mgr.getDataFromLocalStorage(storedKey);
-      } else if (storedValueExp) {
-        if ((new Date(storedValueExp)).getTime() - Date.now() > 0) {
-          storedValue = decodeURIComponent(mgr.getDataFromLocalStorage(storedKey));
-        }
+    submodule.enabledStorageTypes.find(storageType => {
+      switch (storageType) {
+        case COOKIE:
+          storedValue = getValueFromCookie(submodule, storedKey);
+          break;
+        case LOCAL_STORAGE:
+          storedValue = getValueFromLocalStorage(submodule, storedKey);
+          break;
       }
-    }
+
+      return !!storedValue;
+    });
+
     // support storing a string or a stringified object
     if (typeof storedValue === 'string' && storedValue.trim().charAt(0) === '{') {
       storedValue = JSON.parse(storedValue);
@@ -342,8 +365,9 @@ function getStoredValue(submodule, key = undefined) {
 /**
  * @param {SubmoduleContainer[]} submodules
  * @param {function} cb - callback for after processing is done.
+ * @param {PriorityMaps} priorityMaps
  */
-function processSubmoduleCallbacks(submodules, cb, allModules) {
+function processSubmoduleCallbacks(submodules, cb, priorityMaps) {
   cb = uidMetrics().fork().startTiming('userId.callbacks.total').stopBefore(cb);
   const done = delayExecution(() => {
     clearTimeout(timeoutID);
@@ -359,7 +383,8 @@ function processSubmoduleCallbacks(submodules, cb, allModules) {
         }
         // cache decoded value (this is copied to every adUnit bid)
         submodule.idObj = submodule.submodule.decode(idObj, submodule.config);
-        updatePPID(getCombinedSubmoduleIds(allModules));
+        priorityMaps.refresh();
+        updatePPID(priorityMaps);
       } else {
         logInfo(`${MODULE_NAME}: ${submodule.submodule.name} - request id responded with an empty value`);
       }
@@ -377,95 +402,156 @@ function processSubmoduleCallbacks(submodules, cb, allModules) {
 }
 
 /**
- * This function will create a combined object for all subModule Ids
- * @param {SubmoduleContainer[]} submodules
+ * @param {SubmodulePriorityMap} priorityMap
+ * @returns {{}}
  */
-function getCombinedSubmoduleIds(submodules) {
-  if (!Array.isArray(submodules) || !submodules.length) {
-    return {};
-  }
-  return getPrioritizedCombinedSubmoduleIds(submodules)
+function getIds(priorityMap) {
+  return Object.fromEntries(
+    Object.entries(priorityMap)
+      .map(([key, submodules]) => [key, submodules.find(mod => mod.idObj?.[key] != null)?.idObj?.[key]])
+      .filter(([_, value]) => value != null)
+  )
 }
 
-/**
- * This function will return a submodule ID object for particular source name
- * @param {SubmoduleContainer[]} submodules
- * @param {string} sourceName
- */
-function getSubmoduleId(submodules, sourceName) {
-  if (!Array.isArray(submodules) || !submodules.length) {
-    return {};
+function getPrimaryIds(submodule) {
+  if (submodule.primaryIds) return submodule.primaryIds;
+  const ids = Object.keys(submodule.eids ?? {});
+  if (ids.length > 1) {
+    throw new Error(`ID submodule ${submodule.name} can provide multiple IDs, but does not specify 'primaryIds'`)
   }
-
-  const prioritisedIds = getPrioritizedCombinedSubmoduleIds(submodules);
-  const eligibleIdName = Object.keys(prioritisedIds).find(idName => {
-    const config = EID_CONFIG.get(idName);
-    return config?.source === sourceName || (isFn(config?.getSource) && config.getSource() === sourceName);
-  });
-
-  return eligibleIdName ? {[eligibleIdName]: prioritisedIds[eligibleIdName]} : [];
+  return ids;
 }
 
 /**
- * This function will create a combined object for bidder with allowed subModule Ids
- * @param {SubmoduleContainer[]} submodules
- * @param {string} bidder
+ * Given a collection of items, where each item maps to any number of IDs (getKeys) and an ID module (getIdMod),
+ * return a map from ID key to all items that map to that ID key, in order of priority (highest priority first).
+ *
+ * @template T
+ * @param {T[]} items
+ * @param {(item: T) => string[]} getKeys
+ * @param {(item: T) => Submodule} getIdMod
+ * @returns {{[key: string]: T[]}}
  */
-function getCombinedSubmoduleIdsForBidder(submodules, bidder) {
-  if (!Array.isArray(submodules) || !submodules.length || !bidder) {
-    return {};
-  }
-  const eligibleSubmodules = submodules
-    .filter(i => !i.config.bidders || !isArray(i.config.bidders) || includes(i.config.bidders, bidder))
-
-  return getPrioritizedCombinedSubmoduleIds(eligibleSubmodules);
-}
-
-function collectByPriority(submodules, getIds, getName) {
-  return Object.fromEntries(Object.entries(submodules.reduce((carry, submod) => {
-    const ids = getIds(submod);
-    ids && Object.keys(ids).forEach(key => {
-      const maybeCurrentIdPriority = idPriority[key]?.indexOf(getName(submod));
-      const currentIdPriority = isNumber(maybeCurrentIdPriority) ? maybeCurrentIdPriority : -1;
-      const currentIdState = {priority: currentIdPriority, value: ids[key]};
-      if (carry[key]) {
-        const winnerIdState = currentIdState.priority > carry[key].priority ? currentIdState : carry[key];
-        carry[key] = winnerIdState;
-      } else {
-        carry[key] = currentIdState;
-      }
-    });
-    return carry;
-  }, {})).map(([k, v]) => [k, v.value]));
+function orderByPriority(items, getKeys, getIdMod) {
+  const tally = {};
+  items.forEach(item => {
+    const module = getIdMod(item);
+    const primaryIds = getPrimaryIds(module);
+    getKeys(item).forEach(key => {
+      const keyItems = tally[key] = tally[key] ?? []
+      const keyPriority = idPriority[key]?.indexOf(module.name) ?? (primaryIds.includes(key) ? 0 : -1);
+      const pos = keyItems.findIndex(([priority]) => priority < keyPriority);
+      keyItems.splice(pos === -1 ? keyItems.length : pos, 0, [keyPriority, item])
+    })
+  })
+  return Object.fromEntries(Object.entries(tally).map(([key, items]) => [key, items.map(([_, item]) => item)]))
 }
 
 /**
- * @param {SubmoduleContainer[]} submodules
+ * @typedef {Object} PriorityMaps
+ * @property {SubmoduleContainer[]} submodules all active submodules
+ * @property {SubmodulePriorityMap} global priority map for global (not bidder-specific) submodules
+ * @property {SubmodulePriorityMap} combined priority map for ALL submodules, disregarding bidder filters
+ * @property {{[bidder: string]: SubmodulePriorityMap}} bidder priority maps for each bidder's specific submodules
+ * @property {(submodules: SubmoduleContainer[]) => void} refresh refresh priority maps, optionally adding or updating some submodules.
+ *    Should be called every time a submodule's ID is updated.
  */
-function getPrioritizedCombinedSubmoduleIds(submodules) {
-  return collectByPriority(
-    submodules.filter(i => isPlainObject(i.idObj) && Object.keys(i.idObj).length),
-    (submod) => submod.idObj,
-    (submod) => submod.submodule.name
-  )
-}
 
 /**
- * @param {AdUnit[]} adUnits
- * @param {SubmoduleContainer[]} submodules
+ * @returns PriorityMaps
  */
-function addIdDataToAdUnitBids(adUnits, submodules) {
+function mkPriorityMaps() {
+  const map = {
+    submodules: [],
+    global: {},
+    bidder: {},
+    combined: {},
+    /**
+     * @param {SubmoduleContainer[]} addtlModules
+     */
+    refresh(addtlModules = []) {
+      const refreshing = new Set(addtlModules.map(mod => mod.submodule));
+      map.submodules = map.submodules.filter((mod) => !refreshing.has(mod.submodule)).concat(addtlModules);
+      update();
+    }
+  }
+  function update() {
+    const modulesById = orderByPriority(
+      map.submodules,
+      (submod) => Object.keys(submod.idObj ?? {}),
+      (submod) => submod.submodule,
+    )
+    const global = {};
+    const bidder = {};
+    Object.entries(modulesById)
+      .forEach(([key, modules]) => {
+        let allNonGlobal = true;
+        const bidderFilters = new Set();
+        modules.map(mod => mod.config.bidders)
+          .forEach(bidders => {
+            if (Array.isArray(bidders) && bidders.length > 0) {
+              bidders.forEach(bidder => bidderFilters.add(bidder));
+            } else {
+              allNonGlobal = false;
+            }
+          })
+        if (bidderFilters.size > 0 && !allNonGlobal) {
+          logWarn(`userID modules ${modules.map(mod => mod.submodule.name).join(', ')} provide the same ID ('${key}'), but are configured for different bidders. ID will be skipped.`)
+        } else {
+          if (bidderFilters.size === 0) {
+            global[key] = modules;
+          } else {
+            bidderFilters.forEach(bidderCode => {
+              bidder[bidderCode] = bidder[bidderCode] ?? {};
+              bidder[bidderCode][key] = modules;
+            })
+          }
+        }
+      });
+    const combined = Object.values(bidder).concat([global]).reduce((combo, map) => Object.assign(combo, map), {});
+    Object.assign(map, {global, bidder, combined});
+  }
+  return map;
+}
+
+export function enrichEids(ortb2Fragments) {
+  const {global: globalFpd, bidder: bidderFpd} = ortb2Fragments;
+  const {global: globalMods, bidder: bidderMods} = initializedSubmodules;
+  const globalEids = getEids(globalMods);
+  if (globalEids.length > 0) {
+    deepSetValue(globalFpd, 'user.ext.eids', (globalFpd.user?.ext?.eids ?? []).concat(globalEids));
+  }
+  Object.entries(bidderMods).forEach(([bidder, moduleMap]) => {
+    const bidderEids = getEids(moduleMap);
+    if (bidderEids.length > 0) {
+      deepSetValue(
+        bidderFpd,
+        `${bidder}.user.ext.eids`,
+        (bidderFpd[bidder]?.user?.ext?.eids ?? []).concat(bidderEids)
+      );
+    }
+  })
+  return ortb2Fragments;
+}
+
+function addIdData({adUnits, ortb2Fragments}) {
+  ortb2Fragments = ortb2Fragments ?? {global: {}, bidder: {}}
+  enrichEids(ortb2Fragments);
   if ([adUnits].some(i => !Array.isArray(i) || !i.length)) {
     return;
   }
+  const globalIds = getIds(initializedSubmodules.global);
+  const globalEids = ortb2Fragments.global.user?.ext?.eids || [];
   adUnits.forEach(adUnit => {
     if (adUnit.bids && isArray(adUnit.bids)) {
       adUnit.bids.forEach(bid => {
-        const combinedSubmoduleIds = getCombinedSubmoduleIdsForBidder(submodules, bid.bidder);
-        if (Object.keys(combinedSubmoduleIds).length) {
-          // create a User ID object on the bid,
-          bid.userId = combinedSubmoduleIds;
-          bid.userIdAsEids = createEidsArray(combinedSubmoduleIds);
+        const bidderIds = Object.assign({}, globalIds, getIds(initializedSubmodules.bidder[bid.bidder] ?? {}));
+        const bidderEids = globalEids.concat(ortb2Fragments.bidder[bid.bidder]?.user?.ext?.eids || []);
+        if (Object.keys(bidderIds).length > 0) {
+          bid.userId = bidderIds;
+        }
+        if (bidderEids.length > 0) {
+          bid.userIdAsEids = bidderEids;
         }
       });
     }
@@ -518,7 +604,7 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
       }))
       .then(() => startCallbacks.promise.finally(initMetrics.startTiming('userId.callbacks.pending')))
       .then(checkRefs(() => {
-        const modWithCb = initModules.filter(item => isFn(item.callback));
+        const modWithCb = initModules.submodules.filter(item => isFn(item.callback));
         if (modWithCb.length) {
           return new GreedyPromise((resolve) => processSubmoduleCallbacks(modWithCb, resolve, initModules));
         }
@@ -538,8 +624,8 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
       if (auctionDelay > 0) {
         startCallbacks.resolve();
       } else {
-        events.on(CONSTANTS.EVENTS.AUCTION_END, function auctionEndHandler() {
-          events.off(CONSTANTS.EVENTS.AUCTION_END, auctionEndHandler);
+        events.on(EVENTS.AUCTION_END, function auctionEndHandler() {
+          events.off(EVENTS.AUCTION_END, auctionEndHandler);
           delay(syncDelay).then(startCallbacks.resolve);
         });
       }
@@ -572,7 +658,7 @@ let initIdSystem;
 function getPPID(eids = getUserIdsAsEids() || []) {
   // userSync.ppid should be one of the 'source' values in getUserIdsAsEids() eg pubcid.org or id5-sync.com
   const matchingUserId = ppidSource && eids.find(userID => userID.source === ppidSource);
-  if (matchingUserId && typeof deepAccess(matchingUserId, 'uids.0.id') === 'string') {
+  if (matchingUserId && typeof matchingUserId?.uids?.[0]?.id === 'string') {
     const ppidValue = matchingUserId.uids[0].id.replace(/[\W_]/g, '');
     if (ppidValue.length >= 32 && ppidValue.length <= 150) {
       return ppidValue;
@@ -591,25 +677,43 @@ function getPPID(eids = getUserIdsAsEids() || []) {
  * @param {Object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export const requestBidsHook = timedAuctionHook('userId', function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout, getIds = getUserIdsAsync} = {}) {
+export const startAuctionHook = timedAuctionHook('userId', function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout, getIds = getUserIdsAsync} = {}) {
   GreedyPromise.race([
     getIds().catch(() => null),
     delay(auctionDelay)
   ]).then(() => {
-    // pass available user id data to bid adapters
-    addIdDataToAdUnitBids(reqBidsConfigObj.adUnits || getGlobal().adUnits, initializedSubmodules);
+    addIdData(reqBidsConfigObj);
     uidMetrics().join(useMetrics(reqBidsConfigObj.metrics), {propagate: false, includeGroups: true});
     // calling fn allows prebid to continue processing
     fn.call(this, reqBidsConfigObj);
   });
 });
 
+/**
+ * Append user id data from config to bids to be accessed in adapters when there are no submodules.
+ * @param {function} fn required; The next function in the chain, used by hook.js
+ * @param {Object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
+ */
+export const addUserIdsHook = timedAuctionHook('userId', function requestBidsHook(fn, reqBidsConfigObj) {
+  addIdData(reqBidsConfigObj);
+  // calling fn allows prebid to continue processing
+  fn.call(this, reqBidsConfigObj);
+});
+
+/**
+ * Is startAuctionHook added
+ * @returns {boolean}
+ */
+function addedStartAuctionHook() {
+  return !!startAuction.getHooks({hook: startAuctionHook}).length;
+}
+
 /**
  * This function will be exposed in global-name-space so that userIds stored by Prebid UserId module can be used by external codes as well.
  * Simple use case will be passing these UserIds to A9 wrapper solution
  */
 function getUserIds() {
-  return getCombinedSubmoduleIds(initializedSubmodules)
+  return getIds(initializedSubmodules.combined)
 }
 
 /**
@@ -617,7 +721,7 @@ function getUserIds() {
  * Simple use case will be passing these UserIds to A9 wrapper solution
  */
 function getUserIdsAsEids() {
-  return createEidsArray(getUserIds())
+  return getEids(initializedSubmodules.combined)
 }
 
 /**
@@ -626,7 +730,7 @@ function getUserIdsAsEids() {
  */
 
 function getUserIdsAsEidBySource(sourceName) {
-  return createEidsArray(getSubmoduleId(initializedSubmodules, sourceName))[0];
+  return getUserIdsAsEids().filter(eid => eid.source === sourceName)[0];
 }
 
 /**
@@ -634,7 +738,7 @@ function getUserIdsAsEidBySource(sourceName) {
  * Sample use case is exposing this function to ESP
  */
 function getEncryptedEidsForSource(source, encrypt, customFunction) {
-  return initIdSystem().then(() => {
+  return retryOnCancel().then(() => {
     let eidsSignals = {};
 
     if (isFn(customFunction)) {
@@ -668,8 +772,8 @@ function encryptSignals(signals, version = 1) {
 }
 
 /**
-* This function will be exposed in the global-name-space so that publisher can register the signals-ESP.
-*/
+ * This function will be exposed in the global-name-space so that publisher can register the signals-ESP.
+ */
 function registerSignalSources() {
   if (!isGptPubadsDefined()) {
     return;
@@ -693,6 +797,23 @@ function registerSignalSources() {
   }
 }
 
+function retryOnCancel(initParams) {
+  return initIdSystem(initParams).then(
+    () => getUserIds(),
+    (e) => {
+      if (e === INIT_CANCELED) {
+        // there's a pending refresh - because GreedyPromise runs this synchronously, we are now in the middle
+        // of canceling the previous init, before the refresh logic has had a chance to run.
+        // Use a "normal" Promise to clear the stack and let it complete (or this will just recurse infinitely)
+        return Promise.resolve().then(getUserIdsAsync)
+      } else {
+        logError('Error initializing userId', e)
+        return GreedyPromise.reject(e)
+      }
+    }
+  );
+}
+
 /**
  * Force (re)initialization of ID submodules.
  *
@@ -704,12 +825,12 @@ function registerSignalSources() {
  * @param callback? called when the refresh is complete
  */
 function refreshUserIds({submoduleNames} = {}, callback) {
-  return initIdSystem({refresh: true, submoduleNames})
-    .then(() => {
+  return retryOnCancel({refresh: true, submoduleNames})
+    .then((userIds) => {
       if (callback && isFn(callback)) {
         callback();
       }
-      return getUserIds();
+      return userIds;
     });
 }
 
@@ -725,20 +846,7 @@ function refreshUserIds({submoduleNames} = {}, callback) {
  */
 
 function getUserIdsAsync() {
-  return initIdSystem().then(
-    () => getUserIds(),
-    (e) => {
-      if (e === INIT_CANCELED) {
-        // there's a pending refresh - because GreedyPromise runs this synchronously, we are now in the middle
-        // of canceling the previous init, before the refresh logic has had a chance to run.
-        // Use a "normal" Promise to clear the stack and let it complete (or this will just recurse infinitely)
-        return Promise.resolve().then(getUserIdsAsync)
-      } else {
-        logError('Error initializing userId', e)
-        return GreedyPromise.reject(e)
-      }
-    }
-  );
+  return retryOnCancel();
 }
 
 export function getConsentHash() {
@@ -757,7 +865,7 @@ function consentChanged(submodule) {
   return !storedConsent || storedConsent !== getConsentHash();
 }
 
-function populateSubmoduleId(submodule, forceRefresh, allSubmodules) {
+function populateSubmoduleId(submodule, forceRefresh) {
   // TODO: the ID submodule API only takes GDPR consent; it should be updated now that GDPR
   // is only a tiny fraction of a vast consent universe
   const gdprConsent = gdprDataHandler.getConsentData();
@@ -776,8 +884,10 @@ function populateSubmoduleId(submodule, forceRefresh, allSubmodules) {
     }
 
     if (!storedId || refreshNeeded || forceRefresh || consentChanged(submodule)) {
+      const extendedConfig = Object.assign({ enabledStorageTypes: submodule.enabledStorageTypes }, submodule.config);
+
       // No id previously saved, or a refresh is needed, or consent has changed. Request a new id from the submodule.
-      response = submodule.submodule.getId(submodule.config, gdprConsent, storedId);
+      response = submodule.submodule.getId(extendedConfig, gdprConsent, storedId);
     } else if (typeof submodule.submodule.extendId === 'function') {
       // If the id exists already, give submodule a chance to decide additional actions that need to be taken
       response = submodule.submodule.extendId(submodule.config, gdprConsent, storedId);
@@ -810,12 +920,12 @@ function populateSubmoduleId(submodule, forceRefresh, allSubmodules) {
       if (response.id) { submodule.idObj = submodule.submodule.decode(response.id, submodule.config); }
     }
   }
-  updatePPID(getCombinedSubmoduleIds(allSubmodules));
 }
 
-function updatePPID(userIds = getUserIds()) {
-  if (userIds && ppidSource) {
-    const ppid = getPPID(createEidsArray(userIds));
+function updatePPID(priorityMaps) {
+  const eids = getEids(priorityMaps.combined);
+  if (eids.length && ppidSource) {
+    const ppid = getPPID(eids);
     if (ppid) {
       if (isGptPubadsDefined()) {
         window.googletag.pubads().setPublisherProvidedId(ppid);
@@ -830,10 +940,12 @@ function updatePPID(userIds = getUserIds()) {
   }
 }
 
-function initSubmodules(dest, submodules, forceRefresh = false) {
+function initSubmodules(priorityMaps, submodules, forceRefresh = false) {
   return uidMetrics().fork().measureTime('userId.init.modules', function () {
     if (!submodules.length) return []; // to simplify log messages from here on
 
+    submodules.forEach(submod => populateEnabledStorageTypes(submod));
+
     /**
      * filter out submodules that:
      *
@@ -853,7 +965,7 @@ function initSubmodules(dest, submodules, forceRefresh = false) {
     const initialized = submodules.reduce((carry, submodule) => {
       return submoduleMetrics(submodule.submodule.name).measureTime('init', () => {
         try {
-          populateSubmoduleId(submodule, forceRefresh, submodules);
+          populateSubmoduleId(submodule, forceRefresh);
           carry.push(submodule);
         } catch (e) {
           logError(`Error in userID module '${submodule.submodule.name}':`, e);
@@ -861,96 +973,125 @@ function initSubmodules(dest, submodules, forceRefresh = false) {
         return carry;
       })
     }, []);
-    if (initialized.length) {
-      setPrebidServerEidPermissions(initialized);
-    }
-    initialized.forEach(updateInitializedSubmodules.bind(null, dest));
+    priorityMaps.refresh(initialized);
+    updatePPID(priorityMaps);
     return initialized;
   })
 }
 
-function updateInitializedSubmodules(dest, submodule) {
-  let updated = false;
-  for (let i = 0; i < dest.length; i++) {
-    if (submodule.config.name.toLowerCase() === dest[i].config.name.toLowerCase()) {
-      updated = true;
-      dest[i] = submodule;
-      break;
-    }
-  }
+function getConfiguredStorageTypes(config) {
+  return config?.storage?.type?.trim().split(/\s*&\s*/) || [];
+}
 
-  if (!updated) {
-    dest.push(submodule);
-  }
+function hasValidStorageTypes(config) {
+  const storageTypes = getConfiguredStorageTypes(config);
+
+  return storageTypes.every(storageType => ALL_STORAGE_TYPES.has(storageType));
 }
 
 /**
  * list of submodule configurations with valid 'storage' or 'value' obj definitions
- * * storage config: contains values for storing/retrieving User ID data in browser storage
- * * value config: object properties that are copied to bids (without saving to storage)
+ * storage config: contains values for storing/retrieving User ID data in browser storage
+ * value config: object properties that are copied to bids (without saving to storage)
  * @param {SubmoduleConfig[]} configRegistry
- * @param {Submodule[]} submoduleRegistry
- * @param {string[]} activeStorageTypes
  * @returns {SubmoduleConfig[]}
  */
-function getValidSubmoduleConfigs(configRegistry, submoduleRegistry) {
+export function getValidSubmoduleConfigs(configRegistry) {
+  function err(msg, ...args) {
+    logWarn(`Invalid userSync.userId config: ${msg}`, ...args)
+  }
   if (!Array.isArray(configRegistry)) {
+    if (configRegistry != null) {
+      err('must be an array', configRegistry);
+    }
     return [];
   }
-  return configRegistry.reduce((carry, config) => {
-    // every submodule config obj must contain a valid 'name'
-    if (!config || isEmptyStr(config.name)) {
-      return carry;
-    }
-    // Validate storage config contains 'type' and 'name' properties with non-empty string values
-    // 'type' must be one of html5, cookies
-    if (config.storage &&
-      !isEmptyStr(config.storage.type) &&
-      !isEmptyStr(config.storage.name) &&
-      ALL_STORAGE_TYPES.has(config.storage.type)) {
-      carry.push(config);
-    } else if (isPlainObject(config.value)) {
-      carry.push(config);
-    } else if (!config.storage && !config.value) {
-      carry.push(config);
+  return configRegistry.filter(config => {
+    if (!config?.name) {
+      return err('must specify "name"', config);
+    } else if (config.storage) {
+      if (!config.storage.name || !config.storage.type) {
+        return err('must specify "storage.name" and "storage.type"', config);
+      } else if (!hasValidStorageTypes(config)) {
+        return err('invalid "storage.type"', config)
+      }
+      ['expires', 'refreshInSeconds'].forEach(param => {
+        let value = config.storage[param];
+        if (value != null && typeof value !== 'number') {
+          value = Number(value)
+          if (isNaN(value)) {
+            err(`storage.${param} must be a number and will be ignored`, config);
+            delete config.storage[param];
+          } else {
+            config.storage[param] = value;
+          }
+        }
+      });
     }
-    return carry;
-  }, []);
+    return true;
+  })
 }
 
 const ALL_STORAGE_TYPES = new Set([LOCAL_STORAGE, COOKIE]);
 
-function canUseStorage(submodule) {
-  switch (submodule.config?.storage?.type) {
-    case LOCAL_STORAGE:
-      if (submodule.storageMgr.localStorageIsEnabled()) {
-        if (coreStorage.getDataFromLocalStorage(PBJS_USER_ID_OPTOUT_NAME)) {
-          logInfo(`${MODULE_NAME} - opt-out localStorage found, storage disabled`);
-          return false
-        }
-        return true;
-      }
-      break;
-    case COOKIE:
-      if (submodule.storageMgr.cookiesAreEnabled()) {
-        if (coreStorage.getCookie(PBJS_USER_ID_OPTOUT_NAME)) {
-          logInfo(`${MODULE_NAME} - opt-out cookie found, storage disabled`);
-          return false;
-        }
-        return true
-      }
-      break;
+function canUseLocalStorage(submodule) {
+  if (!submodule.storageMgr.localStorageIsEnabled()) {
+    return false;
+  }
+
+  if (coreStorage.getDataFromLocalStorage(PBJS_USER_ID_OPTOUT_NAME)) {
+    logInfo(`${MODULE_NAME} - opt-out localStorage found, storage disabled`);
+    return false
+  }
+
+  return true;
+}
+
+function canUseCookies(submodule) {
+  if (!submodule.storageMgr.cookiesAreEnabled()) {
+    return false;
+  }
+
+  if (coreStorage.getCookie(PBJS_USER_ID_OPTOUT_NAME)) {
+    logInfo(`${MODULE_NAME} - opt-out cookie found, storage disabled`);
+    return false;
+  }
+
+  return true
+}
+
+function populateEnabledStorageTypes(submodule) {
+  if (submodule.enabledStorageTypes) {
+    return;
   }
-  return false;
+
+  const storageTypes = getConfiguredStorageTypes(submodule.config);
+
+  submodule.enabledStorageTypes = storageTypes.filter(type => {
+    switch (type) {
+      case LOCAL_STORAGE:
+        return canUseLocalStorage(submodule);
+      case COOKIE:
+        return canUseCookies(submodule);
+    }
+
+    return false;
+  });
+}
+
+function canUseStorage(submodule) {
+  return !!submodule.enabledStorageTypes.length;
 }
 
 function updateEIDConfig(submodules) {
   EID_CONFIG.clear();
-  Object.entries(collectByPriority(
-    submodules,
-    (mod) => mod.eids,
-    (mod) => mod.name
-  )).forEach(([id, conf]) => EID_CONFIG.set(id, conf));
+  Object.entries(
+    orderByPriority(
+      submodules,
+      (mod) => Object.keys(mod.eids || {}),
+      (mod) => mod
+    )
+  ).forEach(([key, submodules]) => EID_CONFIG.set(key, submodules[0].eids[key]))
 }
 
 /**
@@ -958,7 +1099,7 @@ function updateEIDConfig(submodules) {
  */
 function updateSubmodules() {
   updateEIDConfig(submoduleRegistry);
-  const configs = getValidSubmoduleConfigs(configRegistry, submoduleRegistry);
+  const configs = getValidSubmoduleConfigs(configRegistry);
   if (!configs.length) {
     return;
   }
@@ -973,7 +1114,6 @@ function updateSubmodules() {
     const submoduleConfig = find(configs, j => j.name && (j.name.toLowerCase() === i.name.toLowerCase() ||
       (i.aliasName && j.name.toLowerCase() === i.aliasName.toLowerCase())));
     if (submoduleConfig && i.name !== submoduleConfig.name) submoduleConfig.name = i.name;
-    i.findRootDomain = findRootDomain;
     return submoduleConfig ? {
       submodule: i,
       config: submoduleConfig,
@@ -984,25 +1124,26 @@ function updateSubmodules() {
   }).filter(submodule => submodule !== null)
     .forEach((sm) => submodules.push(sm));
 
-  if (!addedUserIdHook && submodules.length) {
-    // priority value 40 will load after consentManagement with a priority of 50
-    getGlobal().requestBids.before(requestBidsHook, 40);
-    adapterManager.callDataDeletionRequest.before(requestDataDeletion);
-    coreGetPPID.after((next) => next(getPPID()));
+  if (submodules.length) {
+    if (!addedStartAuctionHook()) {
+      startAuction.getHooks({hook: addUserIdsHook}).remove();
+      startAuction.before(startAuctionHook, 100) // use higher priority than dataController / rtd
+      adapterManager.callDataDeletionRequest.before(requestDataDeletion);
+      coreGetPPID.after((next) => next(getPPID()));
+    }
     logInfo(`${MODULE_NAME} - usersync config updated for ${submodules.length} submodules: `, submodules.map(a => a.submodule.name));
-    addedUserIdHook = true;
   }
 }
 
 /**
  * This function will update the idPriority according to the provided configuration
  * @param {Object} idPriorityConfig
- * @param {SubmoduleContainer[]} submodules
+ * @param {Submodule[]} submodules
  */
 function updateIdPriority(idPriorityConfig, submodules) {
   if (idPriorityConfig) {
     const result = {};
-    const aliasToName = new Map(submodules.map(s => s.submodule.aliasName ? [s.submodule.aliasName, s.submodule.name] : []));
+    const aliasToName = new Map(submodules.map(s => s.aliasName ? [s.aliasName, s.name] : []));
     Object.keys(idPriorityConfig).forEach(key => {
       const priority = isArray(idPriorityConfig[key]) ? [...idPriorityConfig[key]].reverse() : []
       result[key] = priority.map(s => aliasToName.has(s) ? aliasToName.get(s) : s);
@@ -1011,6 +1152,8 @@ function updateIdPriority(idPriorityConfig, submodules) {
   } else {
     idPriority = {};
   }
+  initializedSubmodules.refresh();
+  updateEIDConfig(submodules)
 }
 
 export function requestDataDeletion(next, ...args) {
@@ -1033,6 +1176,7 @@ export function requestDataDeletion(next, ...args) {
  * @param {Submodule} submodule
  */
 export function attachIdSystem(submodule) {
+  submodule.findRootDomain = findRootDomain;
   if (!find(submoduleRegistry, i => i.name === submodule.name)) {
     submoduleRegistry.push(submodule);
     GDPR_GVLIDS.register(MODULE_TYPE_UID, submodule.name, submodule.gvlid)
@@ -1060,8 +1204,7 @@ export function init(config, {delay = GreedyPromise.timeout} = {}) {
   ppidSource = undefined;
   submodules = [];
   configRegistry = [];
-  addedUserIdHook = false;
-  initializedSubmodules = [];
+  initializedSubmodules = mkPriorityMaps();
   initIdSystem = idSystemInitializer({delay});
   if (configListener != null) {
     configListener();
@@ -1076,10 +1219,10 @@ export function init(config, {delay = GreedyPromise.timeout} = {}) {
       ppidSource = userSync.ppid;
       if (userSync.userIds) {
         configRegistry = userSync.userIds;
-        syncDelay = isNumber(userSync.syncDelay) ? userSync.syncDelay : DEFAULT_SYNC_DELAY;
-        auctionDelay = isNumber(userSync.auctionDelay) ? userSync.auctionDelay : NO_AUCTION_DELAY;
+        syncDelay = isNumber(userSync.syncDelay) ? userSync.syncDelay : USERSYNC_DEFAULT_CONFIG.syncDelay
+        auctionDelay = isNumber(userSync.auctionDelay) ? userSync.auctionDelay : USERSYNC_DEFAULT_CONFIG.auctionDelay;
         updateSubmodules();
-        updateIdPriority(userSync.idPriority, submodules);
+        updateIdPriority(userSync.idPriority, submoduleRegistry);
         initIdSystem({ready: true});
       }
     }
@@ -1093,17 +1236,13 @@ export function init(config, {delay = GreedyPromise.timeout} = {}) {
   (getGlobal()).refreshUserIds = normalizePromise(refreshUserIds);
   (getGlobal()).getUserIdsAsync = normalizePromise(getUserIdsAsync);
   (getGlobal()).getUserIdsAsEidBySource = getUserIdsAsEidBySource;
+  if (!addedStartAuctionHook()) {
+    // Add ortb2.user.ext.eids even if 0 submodules are added
+    startAuction.before(addUserIdsHook, 100); // use higher priority than dataController / rtd
+  }
 }
 
 // init config update listener to start the application
 init(config);
 
-module('userId', attachIdSystem);
-
-export function setOrtbUserExtEids(ortbRequest, bidderRequest, context) {
-  const eids = deepAccess(context, 'bidRequests.0.userIdAsEids');
-  if (eids && Object.keys(eids).length > 0) {
-    deepSetValue(ortbRequest, 'user.ext.eids', eids);
-  }
-}
-registerOrtbProcessor({type: REQUEST, name: 'userExtEids', fn: setOrtbUserExtEids});
+module('userId', attachIdSystem, { postInstallAllowed: true });
diff --git a/modules/userId/userId.md b/modules/userId/userId.md
index 01930a67dda..9aea3e8d533 100644
--- a/modules/userId/userId.md
+++ b/modules/userId/userId.md
@@ -70,12 +70,6 @@ pbjs.setConfig({
             params: {
                 url: 'https://d9.flashtalking.com/d9core', // required, if not populated ftrack will not run
             }
-        }, {
-            name: 'parrableId',
-            params: {
-                // Replace partner with comma-separated (if more than one) Parrable Partner Client ID(s) for Parrable-aware bid adapters in use
-                partner: "30182847-e426-4ff9-b2b5-9ca1324ea09b"
-            }
         },{
             name: 'identityLink',
             params: {
@@ -158,6 +152,9 @@ pbjs.setConfig({
         },
         {
             name: "gravitompId"
+        },
+        {
+            name: "mygaruId"
         }
         ],
         syncDelay: 5000,
@@ -355,6 +352,9 @@ pbjs.setConfig({
         },
         {
             name: 'naveggId',
+        },
+        {
+            name: 'lmpid',
         }],
         syncDelay: 5000
     }
@@ -366,16 +366,15 @@ pbjs.setConfig({
 Example showing how to configure a `params` object to pass directly to bid adapters
 
 ```
-
 pbjs.setConfig({
-userSync: {
-userIds: [{
-name: 'tncId',
-params: {
-providerId: "c8549079-f149-4529-a34b-3fa91ef257d1"
-}
-}],
-syncDelay: 5000
-}
+    userSync: {
+        userIds: [{
+            name: 'tncId',
+            params: {
+              url: 'https://js.tncid.app/remote.min.js' //Optional
+            }
+        }],
+        syncDelay: 5000
+    }
 });
 ```
diff --git a/modules/utiqSystem.js b/modules/utiqIdSystem.js
similarity index 83%
rename from modules/utiqSystem.js
rename to modules/utiqIdSystem.js
index 473dc5854a9..b5da87627a5 100644
--- a/modules/utiqSystem.js
+++ b/modules/utiqIdSystem.js
@@ -1,7 +1,7 @@
 /**
  * This module adds Utiq provided by Utiq SA/NV to the User ID module
  * The {@link module:modules/userId} module is required
- * @module modules/utiqSystem
+ * @module modules/utiqIdSystem
  * @requires module:modules/userId
  */
 import { logInfo } from '../src/utils.js';
@@ -9,7 +9,7 @@ import { submodule } from '../src/hook.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { MODULE_TYPE_UID } from '../src/activities/modules.js';
 
-const MODULE_NAME = 'utiq';
+const MODULE_NAME = 'utiqId';
 const LOG_PREFIX = 'Utiq module';
 
 export const storage = getStorageManager({
@@ -27,11 +27,17 @@ function getUtiqFromStorage() {
   let utiqPassStorage = JSON.parse(
     storage.getDataFromLocalStorage('utiqPass')
   );
-  logInfo(
-    `${LOG_PREFIX}: Local storage utiqPass: ${JSON.stringify(
-      utiqPassStorage
-    )}`
-  );
+
+  const netIdAdtechpass = storage.getDataFromLocalStorage('netid_utiq_adtechpass');
+
+  if (netIdAdtechpass) {
+    logInfo(
+      `${LOG_PREFIX}: Local storage netid_utiq_adtechpass: ${netIdAdtechpass}`
+    );
+    return {
+      utiq: netIdAdtechpass,
+    }
+  }
 
   if (
     utiqPassStorage &&
@@ -40,12 +46,19 @@ function getUtiqFromStorage() {
     utiqPassStorage.connectId.idGraph.length > 0
   ) {
     utiqPass = utiqPassStorage.connectId.idGraph[0];
+
+    logInfo(
+      `${LOG_PREFIX}: Local storage utiqPass: ${JSON.stringify(
+        utiqPassStorage
+      )}`
+    );
+
+    logInfo(
+      `${LOG_PREFIX}: Graph of utiqPass: ${JSON.stringify(
+        utiqPass
+      )}`
+    );
   }
-  logInfo(
-    `${LOG_PREFIX}: Graph of utiqPass: ${JSON.stringify(
-      utiqPass
-    )}`
-  );
 
   return {
     utiq:
@@ -56,7 +69,7 @@ function getUtiqFromStorage() {
 }
 
 /** @type {Submodule} */
-export const utiqSubmodule = {
+export const utiqIdSubmodule = {
   /**
    * Used to link submodule with config
    * @type {string}
@@ -135,4 +148,4 @@ export const utiqSubmodule = {
   }
 };
 
-submodule('userId', utiqSubmodule);
+submodule('userId', utiqIdSubmodule);
diff --git a/modules/utiqSystem.md b/modules/utiqIdSystem.md
similarity index 54%
rename from modules/utiqSystem.md
rename to modules/utiqIdSystem.md
index d2c53480383..c7f4f95827f 100644
--- a/modules/utiqSystem.md
+++ b/modules/utiqIdSystem.md
@@ -5,7 +5,7 @@ Utiq ID Module.
 First, make sure to add the utiq submodule to your Prebid.js package with:
 
 ```
-gulp build --modules=userId,adfBidAdapter,ixBidAdapter,prebidServerBidAdapter,utiqSystem
+gulp build --modules=userId,adfBidAdapter,ixBidAdapter,prebidServerBidAdapter,utiqIdSystem
 ```
 
 ## Parameter Descriptions
@@ -15,8 +15,3 @@ gulp build --modules=userId,adfBidAdapter,ixBidAdapter,prebidServerBidAdapter,ut
 | name                            | String           | The name of the module                                                                                       | `"utiq"`                         |
 | params                          | Object           | Object with configuration parameters for utiq User Id submodule                                              | -                                |
 | params.maxDelayTime             | Integer          | Max amount of time (in seconds) before looking into storage for data                                         | 2500                             |
-| bidders                         | Array of Strings | An array of bidder codes to which this user ID may be sent. Currently required and supporting AdformOpenRTB  | [`"adf"`, `"adformPBS"`, `"ix"`] |
-| storage                         | Object           | Local storage configuration object                                                                           | -                                |
-| storage.type                    | String           | Type of the storage that would be used to store user ID. Must be `"html5"` to utilise HTML5 local storage.   | `"html5"`                        |
-| storage.name                    | String           | The name of the key in local storage where the user ID will be stored.                                       | `"utiq"`                         |
-| storage.expires                 | Integer          | How long (in days) the user ID information will be stored. For safety reasons, this information is required. | `1`                              |
diff --git a/modules/utiqMtpIdSystem.js b/modules/utiqMtpIdSystem.js
new file mode 100644
index 00000000000..c5d25f27ca5
--- /dev/null
+++ b/modules/utiqMtpIdSystem.js
@@ -0,0 +1,138 @@
+/**
+ * This module adds Utiq MTP provided by Utiq SA/NV to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/utiqMtpIdSystem
+ * @requires module:modules/userId
+ */
+import { logInfo } from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+
+const MODULE_NAME = 'utiqMtpId';
+const LOG_PREFIX = 'Utiq MTP module';
+
+export const storage = getStorageManager({
+  moduleType: MODULE_TYPE_UID,
+  moduleName: MODULE_NAME,
+});
+
+/**
+ * Get the "mtid" from html5 local storage to make it available to the UserId module.
+ * @param config
+ * @returns {{utiqMtp: (*|string)}}
+ */
+function getUtiqFromStorage() {
+  let utiqPass;
+  let utiqPassStorage = JSON.parse(
+    storage.getDataFromLocalStorage('utiqPass')
+  );
+  logInfo(
+    `${LOG_PREFIX}: Local storage utiqPass: ${JSON.stringify(
+      utiqPassStorage
+    )}`
+  );
+
+  if (
+    utiqPassStorage &&
+    utiqPassStorage.connectId &&
+    Array.isArray(utiqPassStorage.connectId.idGraph) &&
+    utiqPassStorage.connectId.idGraph.length > 0
+  ) {
+    utiqPass = utiqPassStorage.connectId.idGraph[0];
+  }
+  logInfo(
+    `${LOG_PREFIX}: Graph of utiqPass: ${JSON.stringify(
+      utiqPass
+    )}`
+  );
+
+  return {
+    utiqMtp:
+      utiqPass && utiqPass.mtid
+        ? utiqPass.mtid
+        : null,
+  };
+}
+
+/** @type {Submodule} */
+export const utiqMtpIdSubmodule = {
+  /**
+   * Used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * Decodes the stored id value for passing to bid requests.
+   * @function
+   * @returns {{utiqMtp: string} | null}
+   */
+  decode(bidId) {
+    logInfo(`${LOG_PREFIX}: Decoded ID value ${JSON.stringify(bidId)}`);
+    return bidId.utiqMtp ? bidId : null;
+  },
+  /**
+   * Get the id from helper function and initiate a new user sync.
+   * @param config
+   * @returns {{callback: result}|{id: {utiqMtp: string}}}
+   */
+  getId: function (config) {
+    const data = getUtiqFromStorage();
+    if (data.utiqMtp) {
+      logInfo(`${LOG_PREFIX}: Local storage ID value ${JSON.stringify(data)}`);
+      return { id: { utiqMtp: data.utiqMtp } };
+    } else {
+      if (!config) {
+        config = {};
+      }
+      if (!config.params) {
+        config.params = {};
+      }
+      if (
+        typeof config.params.maxDelayTime === 'undefined' ||
+        config.params.maxDelayTime === null
+      ) {
+        config.params.maxDelayTime = 1000;
+      }
+      // Current delay and delay step in milliseconds
+      let currentDelay = 0;
+      const delayStep = 50;
+      const result = (callback) => {
+        const data = getUtiqFromStorage();
+        if (!data.utiqMtp) {
+          if (currentDelay > config.params.maxDelayTime) {
+            logInfo(
+              `${LOG_PREFIX}: No utiq value set after ${config.params.maxDelayTime} max allowed delay time`
+            );
+            callback(null);
+          } else {
+            currentDelay += delayStep;
+            setTimeout(() => {
+              result(callback);
+            }, delayStep);
+          }
+        } else {
+          const dataToReturn = { utiqMtp: data.utiqMtp };
+          logInfo(
+            `${LOG_PREFIX}: Returning ID value data of ${JSON.stringify(
+              dataToReturn
+            )}`
+          );
+          callback(dataToReturn);
+        }
+      };
+      return { callback: result };
+    }
+  },
+  eids: {
+    'utiqMtp': {
+      source: 'utiq-mtp.com',
+      atype: 1,
+      getValue: function (data) {
+        return data;
+      },
+    },
+  }
+};
+
+submodule('userId', utiqMtpIdSubmodule);
diff --git a/modules/utiqMtpIdSystem.md b/modules/utiqMtpIdSystem.md
new file mode 100644
index 00000000000..9b738152969
--- /dev/null
+++ b/modules/utiqMtpIdSystem.md
@@ -0,0 +1,22 @@
+## Utiq User ID Submodule
+
+Utiq MTP ID Module.
+
+### Utiq installation ###
+
+In order to use utiq in your prebid setup, you must first integrate utiq solution on your website as per https://docs.utiq.com/
+If you are interested in using Utiq on your website, please contact Utiq on https://utiq.com/contact/
+
+### Prebid integration ### 
+
+First, make sure to add the utiq MTP submodule to your Prebid.js package with:
+
+```
+gulp build --modules=userId,adfBidAdapter,ixBidAdapter,prebidServerBidAdapter,utiqMtpIdSystem
+```
+
+## Parameter Descriptions
+
+| Params under userSync.userIds[] | Type             | Description                                                                                                  | Example                          |
+| ------------------------------- | ---------------- | ------------------------------------------------------------------------------------------------------------ | -------------------------------- |
+| name                            | String           | The name of the module                                                                                       | `"utiqMtpId"`                         |
diff --git a/modules/validationFpdModule/index.js b/modules/validationFpdModule/index.js
index 70af9d30ec3..2330c41099c 100644
--- a/modules/validationFpdModule/index.js
+++ b/modules/validationFpdModule/index.js
@@ -13,8 +13,8 @@ let optout;
 
 /**
  * Check if data passed is empty
- * @param {*} value to test against
- * @returns {Boolean} is value empty
+ * @param {*} data to test against
+ * @returns {Boolean} is data empty
  */
 function isEmptyData(data) {
   let check = true;
@@ -30,10 +30,10 @@ function isEmptyData(data) {
 
 /**
  * Check if required keys exist in data object
- * @param {Object} data object
- * @param {Array} array of required keys
- * @param {String} object path (for printing warning)
- * @param {Number} index of object value in the data array (for printing warning)
+ * @param {Object} obj data object
+ * @param {Array} required array of required keys
+ * @param {String} parent object path (for printing warning)
+ * @param {Number} i index of object value in the data array (for printing warning)
  * @returns {Boolean} is requirements fulfilled
  */
 function getRequiredData(obj, required, parent, i) {
@@ -51,8 +51,8 @@ function getRequiredData(obj, required, parent, i) {
 
 /**
  * Check if data type is valid
- * @param {*} value to test against
- * @param {Object} object containing type definition and if should be array bool
+ * @param {*} data value to test against
+ * @param {Object} mapping object containing type definition and if should be array bool
  * @returns {Boolean} is type fulfilled
  */
 function typeValidation(data, mapping) {
@@ -77,10 +77,10 @@ function typeValidation(data, mapping) {
 
 /**
  * Validates ortb2 data arrays and filters out invalid data
- * @param {Array} ortb2 data array
- * @param {Object} object defining child type and if array
- * @param {String} config path of data array
- * @param {String} parent path for logging warnings
+ * @param {Array} arr ortb2 data array
+ * @param {Object} child object defining child type and if array
+ * @param {String} path config path of data array
+ * @param {String} parent parent path for logging warnings
  * @returns {Array} validated/filtered data
  */
 export function filterArrayData(arr, child, path, parent) {
@@ -136,9 +136,9 @@ export function filterArrayData(arr, child, path, parent) {
 
 /**
  * Validates ortb2 object and filters out invalid data
- * @param {Object} ortb2 object
- * @param {String} config path of data array
- * @param {String} parent path for logging warnings
+ * @param {Object} fpd ortb2 object
+ * @param {String} path config path of data array
+ * @param {String} parent parent path for logging warnings
  * @returns {Object} validated/filtered data
  */
 export function validateFpd(fpd, path = '', parent = '') {
@@ -190,6 +190,8 @@ export function validateFpd(fpd, path = '', parent = '') {
 
 /**
  * Run validation on global and bidder config data for ortb2
+ * @param {Object} data global and bidder config data
+ * @returns {Object} validated data
  */
 function runValidations(data) {
   return {
@@ -200,6 +202,9 @@ function runValidations(data) {
 
 /**
  * Sets default values to ortb2 if exists and adds currency and ortb2 setConfig callbacks on init
+ * @param {Object} fpdConf configuration object
+ * @param {Object} data ortb2 data
+ * @returns {Object} processed data
  */
 export function processFpd(fpdConf, data) {
   // Checks for existsnece of pubcid optout cookie/storage
@@ -210,11 +215,11 @@ export function processFpd(fpdConf, data) {
   return (!fpdConf.skipValidations) ? runValidations(data) : data;
 }
 
-/** @type {firstPartyDataSubmodule} */
+/** @type {{name: string, queue: number, processFpd: function}} */
 export const validationSubmodule = {
   name: 'validation',
   queue: 1,
   processFpd
 }
 
-submodule('firstPartyData', validationSubmodule)
+submodule('firstPartyData', validationSubmodule);
diff --git a/modules/vdoaiBidAdapter.js b/modules/vdoaiBidAdapter.js
index 05960378d23..8fda9cba593 100644
--- a/modules/vdoaiBidAdapter.js
+++ b/modules/vdoaiBidAdapter.js
@@ -1,9 +1,96 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {getAdUnitSizes} from '../libraries/sizeUtils/sizeUtils.js';
+import { deepClone, logError, deepAccess } from '../src/utils.js';
+import { config } from '../src/config.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
 
 const BIDDER_CODE = 'vdoai';
-const ENDPOINT_URL = 'https://prebid.vdo.ai/auction';
+const ENDPOINT_URL = 'https://prebid-v2.vdo.ai/auction';
+
+function getFrameNesting() {
+  let topmostFrame = window;
+  let parent = window.parent;
+  try {
+    while (topmostFrame !== topmostFrame.parent) {
+      parent = topmostFrame.parent;
+      // eslint-disable-next-line no-unused-expressions
+      parent.location.href;
+      topmostFrame = topmostFrame.parent;
+    }
+  } catch (e) { }
+  return topmostFrame;
+}
+
+/**
+ * Returns information about the page needed by the server in an object to be converted in JSON
+ *
+ * @returns {{location: *, referrer: (*|string), stack: (*|Array.), numIframes: (*|Number), wWidth: (*|Number), wHeight: (*|Number), sWidth, sHeight, date: string, timeOffset: number}}
+ */
+function getPageInfo(bidderRequest) {
+  const topmostFrame = getFrameNesting();
+  return {
+    referrer: deepAccess(bidderRequest, 'refererInfo.ref', null),
+    stack: deepAccess(bidderRequest, 'refererInfo.stack', []),
+    numIframes: deepAccess(bidderRequest, 'refererInfo.numIframes', 0),
+    wWidth: topmostFrame.innerWidth,
+    location: deepAccess(bidderRequest, 'refererInfo.page', null),
+    wHeight: topmostFrame.innerHeight,
+    aWidth: topmostFrame.screen.availWidth,
+    aHeight: topmostFrame.screen.availHeight,
+    oWidth: topmostFrame.outerWidth,
+    oHeight: topmostFrame.outerHeight,
+    sWidth: topmostFrame.screen.width,
+    sHeight: topmostFrame.screen.height,
+    sLeft: 'screenLeft' in topmostFrame ? topmostFrame.screenLeft : topmostFrame.screenX,
+    sTop: 'screenTop' in topmostFrame ? topmostFrame.screenTop : topmostFrame.screenY,
+    xOffset: topmostFrame.pageXOffset,
+    docHeight: topmostFrame.document.body ? topmostFrame.document.body.scrollHeight : null,
+    hLength: history.length,
+    yOffset: topmostFrame.pageYOffset,
+    version: {
+      prebid_version: '$prebid.version$',
+      adapter_version: '1.0.0',
+      vendor: '$$PREBID_GLOBAL$$',
+    }
+  };
+}
+
+export function isSchainValid(schain) {
+  let isValid = false;
+  const requiredFields = ['asi', 'sid', 'hp'];
+  if (!schain || !schain.nodes) return isValid;
+  isValid = schain.nodes.reduce((status, node) => {
+    if (!status) return status;
+    return requiredFields.every(field => node.hasOwnProperty(field));
+  }, true);
+  if (!isValid) {
+    logError('VDO.AI: required schain params missing');
+  }
+  return isValid;
+}
+
+function parseVideoSize(bid) {
+  const playerSize = bid.mediaTypes.video.playerSize;
+  if (typeof playerSize !== 'undefined' && Array.isArray(playerSize) && playerSize.length > 0) {
+    return getSizes(playerSize)
+  }
+  return [];
+}
+
+function getSizes(sizes) {
+  const ret = [];
+  for (let i = 0; i < sizes.length; i++) {
+    const size = sizes[i];
+    ret.push({ width: size[0], height: size[1] })
+  }
+  return ret;
+}
 
 export const spec = {
   code: BIDDER_CODE,
@@ -15,7 +102,7 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
-    return !!(bid.params.placementId);
+    return !!(bid.params.placementId) && typeof bid.params.placementId === 'string';
   },
 
   /**
@@ -25,24 +112,82 @@ export const spec = {
    * @param validBidRequests
    * @param bidderRequest
    */
+
   buildRequests: function (validBidRequests, bidderRequest) {
     if (validBidRequests.length === 0) {
       return [];
     }
-
     return validBidRequests.map(bidRequest => {
       const sizes = getAdUnitSizes(bidRequest);
-      const payload = {
+      let payload = {
         placementId: bidRequest.params.placementId,
         sizes: sizes,
         bidId: bidRequest.bidId,
-        // TODO: is 'page' the right value here?
-        referer: bidderRequest.refererInfo.page,
-        // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-        id: bidRequest.auctionId,
-        mediaType: bidRequest.mediaTypes.video ? 'video' : 'banner'
+        mediaType: bidRequest.mediaTypes.video ? 'video' : 'banner',
+        domain: bidderRequest.ortb2.site.domain,
+        publisherDomain: bidderRequest.ortb2.site.publisher.domain,
+        adUnitCode: bidRequest.adUnitCode,
+        bidder: bidRequest.bidder,
+        tmax: bidderRequest.timeout
       };
-      bidRequest.params.bidFloor && (payload['bidFloor'] = bidRequest.params.bidFloor);
+
+      payload.bidderRequestId = bidRequest.bidderRequestId;
+      payload.auctionId = deepAccess(bidRequest, 'ortb2.source.tid');
+      payload.transactionId = deepAccess(bidRequest, 'ortb2Imp.ext.tid');
+      payload.gpid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid') || deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
+      payload.ortb2Imp = deepAccess(bidRequest, 'ortb2Imp');
+
+      if (payload.mediaType === 'video') {
+        payload.context = bidRequest.mediaTypes.video.context;
+        payload.playerSize = parseVideoSize(bidRequest);
+        payload.mediaTypeInfo = deepClone(bidRequest.mediaTypes.video);
+      }
+
+      if (typeof bidRequest.getFloor === 'function') {
+        let floor = bidRequest.getFloor({
+          currency: 'USD',
+          mediaType: '*',
+          size: '*'
+        });
+        if (floor && floor.floor && floor.currency === 'USD') {
+          payload.bidFloor = floor.floor;
+        }
+      } else if (bidRequest.params.bidFloor) {
+        payload.bidFloor = bidRequest.params.bidFloor;
+      }
+
+      payload.pageInfo = getPageInfo(bidderRequest);
+
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        payload.gdprConsent = {
+          consentRequired: bidderRequest.gdprConsent.gdprApplies,
+          consentString: bidderRequest.gdprConsent.consentString,
+          addtlConsent: bidderRequest.gdprConsent.addtlConsent
+        };
+      }
+      if (bidderRequest && bidderRequest.gppConsent) {
+        payload.gppConsent = {
+          applicableSections: bidderRequest.gppConsent.applicableSections,
+          consentString: bidderRequest.gppConsent.gppString,
+        }
+      }
+      if (bidderRequest && bidderRequest.ortb2) {
+        payload.ortb2 = bidderRequest.ortb2;
+      }
+      if (bidderRequest && bidderRequest.uspConsent) {
+        payload.usPrivacy = bidderRequest.uspConsent;
+      }
+      if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].schain && isSchainValid(validBidRequests[0].schain)) {
+        payload.schain = validBidRequests[0].schain;
+      }
+      if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].userIdAsEids) {
+        payload.userId = validBidRequests[0].userIdAsEids;
+      }
+      let coppaOrtb2 = !!deepAccess(bidderRequest, 'ortb2.regs.coppa');
+      let coppaConfig = config.getConfig('coppa');
+      if (coppaOrtb2 === true || coppaConfig === true) {
+        payload.coppa = true;
+      }
       return {
         method: 'POST',
         url: ENDPOINT_URL,
@@ -62,35 +207,24 @@ export const spec = {
     const bidResponses = [];
     const response = serverResponse.body;
     const creativeId = response.adid || 0;
-    // const width = response.w || 0;
-    const width = response.width;
-    // const height = response.h || 0;
-    const height = response.height;
+    const width = response.w;
+    const height = response.h;
     const cpm = response.price || 0;
 
-    response.rWidth = width;
-    response.rHeight = height;
-
     const adCreative = response.vdoCreative;
 
     if (width !== 0 && height !== 0 && cpm !== 0 && creativeId !== 0) {
-      // const dealId = response.dealid || '';
       const currency = response.cur || 'USD';
       const netRevenue = true;
-      // const referrer = bidRequest.data.referer;
       const bidResponse = {
         requestId: response.bidId,
         cpm: cpm,
         width: width,
         height: height,
         creativeId: creativeId,
-        // dealId: dealId,
         currency: currency,
         netRevenue: netRevenue,
         ttl: 60,
-        // referrer: referrer,
-        // ad: response.adm
-        // ad: adCreative,
         mediaType: response.mediaType
       };
 
@@ -99,9 +233,9 @@ export const spec = {
       } else {
         bidResponse.ad = adCreative;
       }
-      if (response.adDomain) {
+      if (response.adomain) {
         bidResponse.meta = {
-          advertiserDomains: response.adDomain
+          advertiserDomains: response.adomain
         };
       }
       bidResponses.push(bidResponse);
@@ -125,7 +259,7 @@ export const spec = {
     return [];
   },
 
-  onTImeout: function(data) {},
+  onTimeout: function(data) {},
   onBidWon: function(bid) {},
   onSetTargeting: function(bid) {}
 };
diff --git a/modules/verizonMediaIdSystem.js b/modules/verizonMediaIdSystem.js
index 6b22538fdc7..26fa89cfe03 100644
--- a/modules/verizonMediaIdSystem.js
+++ b/modules/verizonMediaIdSystem.js
@@ -10,6 +10,13 @@ import {submodule} from '../src/hook.js';
 import {formatQS, logError} from '../src/utils.js';
 import {includes} from '../src/polyfill.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ * @typedef {import('../modules/userId/index.js').ConsentData} ConsentData
+ * @typedef {import('../modules/userId/index.js').IdResponse} IdResponse
+ */
+
 const MODULE_NAME = 'verizonMediaId';
 const VENDOR_ID = 25;
 const PLACEHOLDER = '__PIXEL_ID__';
diff --git a/modules/viantOrtbBidAdapter.js b/modules/viantOrtbBidAdapter.js
index e7bf9129a62..cfc4c450db8 100644
--- a/modules/viantOrtbBidAdapter.js
+++ b/modules/viantOrtbBidAdapter.js
@@ -5,7 +5,8 @@ import {ortbConverter} from '../libraries/ortbConverter/converter.js'
 import {deepAccess, getBidIdParameter, logError} from '../src/utils.js';
 
 const BIDDER_CODE = 'viant';
-const ENDPOINT = 'https://bidders-us-east-1.adelphic.net/d/rtb/v25/prebid/bidder_test'
+const ENDPOINT = 'https://bidders-us.adelphic.net/d/rtb/v25/prebid/bidder'
+const ADAPTER_VERSION = '2.0.0';
 
 const DEFAULT_BID_TTL = 300;
 const DEFAULT_CURRENCY = 'USD';
@@ -51,8 +52,10 @@ export const spec = {
   onBidWon: function (bid) {
     if (bid.burl) {
       utils.triggerPixel(bid.burl);
+      utils.triggerPixel(utils.replaceAuctionPrice(bid.burl, bid.originalCpm || bid.cpm));
     } else if (bid.nurl) {
       utils.triggerPixel(bid.nurl);
+      utils.triggerPixel(utils.replaceAuctionPrice(bid.nurl, bid.originalCpm || bid.cpm));
     }
   }
 }
@@ -83,6 +86,25 @@ function createRequest(bidRequests, bidderRequest, mediaType) {
     if (!data.regs.ext) data.regs.ext = {};
     data.regs.ext.us_privacy = bidderRequest.uspConsent;
   }
+  let imp = data.imp || [];
+  let dealsMap = new Map();
+  if (bidderRequest.bids) {
+    bidderRequest.bids.forEach(bid => {
+      if (bid.ortb2Imp && bid.ortb2Imp.pmp) {
+        dealsMap.set(bid.bidId, bid.ortb2Imp.pmp);
+      }
+    });
+  }
+  imp.forEach((element) => {
+    let deals = dealsMap.get(element.id);
+    if (deals) {
+      element.pmp = deals;
+    }
+  });
+  data.ext = data.ext || {};
+  data.ext.viant = {
+    adapterVersion: ADAPTER_VERSION
+  };
   return {
     method: 'POST',
     url: ENDPOINT,
diff --git a/modules/viantOrtbBidAdapter.md b/modules/viantOrtbBidAdapter.md
index 178c2c18a0f..def93722b7b 100644
--- a/modules/viantOrtbBidAdapter.md
+++ b/modules/viantOrtbBidAdapter.md
@@ -2,7 +2,7 @@
 
 Module Name: VIANT Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: dist-runtime@viantinc.com
+Maintainer: Marketplace@adelphic.com
 
 # Description
 
diff --git a/modules/vibrantmediaBidAdapter.js b/modules/vibrantmediaBidAdapter.js
index 7368967ff3f..348d17d2395 100644
--- a/modules/vibrantmediaBidAdapter.js
+++ b/modules/vibrantmediaBidAdapter.js
@@ -12,6 +12,13 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {OUTSTREAM} from '../src/video.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderSpec} BidderSpec
+ */
+
 const BIDDER_CODE = 'vibrantmedia';
 const VIBRANT_MEDIA_PREBID_URL = 'https://prebid.intellitxt.com/prebid';
 const VALID_PIXEL_URL_REGEX = /^https?:\/\/[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+([/?].*)?$/;
@@ -90,17 +97,6 @@ export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
 
-  /**
-   * Transforms the 'raw' bid params into ones that this adapter can use, prior to creating the bid request.
-   *
-   * @param {object} bidParams the params to transform.
-   *
-   * @returns {object} the bid params.
-   */
-  transformBidParams: function(bidParams) {
-    return bidParams;
-  },
-
   /**
    * Determines whether or not the given bid request is valid. For all bid requests passed to the buildRequests
    * function, each will have been passed to this function and this function will have returned true.
diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index b5323181c6c..ed732a4814a 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -1,441 +1,46 @@
-import {_each, deepAccess, isFn, parseSizesInput, parseUrl, uniques, isArray} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {getStorageManager} from '../src/storageManager.js';
-import {bidderSettings} from '../src/bidderSettings.js';
-import {config} from '../src/config.js';
-import {chunk} from '../libraries/chunk/chunk.js';
+import {
+  createSessionId,
+  isBidRequestValid,
+  getCacheOpt,
+  getNextDealId,
+  onBidWon,
+  createUserSyncGetter,
+  getVidazooSessionId,
+  createBuildRequestsFn,
+  createInterpretResponseFn
+} from '../libraries/vidazooUtils/bidderUtils.js';
+import {OPT_CACHE_KEY, OPT_TIME_KEY} from '../libraries/vidazooUtils/constants.js';
 
 const GVLID = 744;
 const DEFAULT_SUB_DOMAIN = 'prebid';
 const BIDDER_CODE = 'vidazoo';
 const BIDDER_VERSION = '1.0.0';
-const CURRENCY = 'USD';
-const TTL_SECONDS = 60 * 5;
-const DEAL_ID_EXPIRY = 1000 * 60 * 15;
-const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 60;
-const SESSION_ID_KEY = 'vidSid';
-const OPT_CACHE_KEY = 'vdzwopt';
-export const webSessionId = 'wsid_' + parseInt(Date.now() * Math.random());
-const storage = getStorageManager({bidderCode: BIDDER_CODE});
-
-function getTopWindowQueryParams() {
-  try {
-    const parsedUrl = parseUrl(window.top.document.URL, {decodeSearchAsString: true});
-    return parsedUrl.search;
-  } catch (e) {
-    return '';
-  }
-}
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+export const webSessionId = createSessionId();
 
 export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
   return `https://${subDomain}.cootlogix.com`;
 }
 
-export function extractCID(params) {
-  return params.cId || params.CID || params.cID || params.CId || params.cid || params.ciD || params.Cid || params.CiD;
-}
-
-export function extractPID(params) {
-  return params.pId || params.PID || params.pID || params.PId || params.pid || params.piD || params.Pid || params.PiD;
-}
-
-export function extractSubDomain(params) {
-  return params.subDomain || params.SubDomain || params.Subdomain || params.subdomain || params.SUBDOMAIN || params.subDOMAIN;
-}
-
-function isBidRequestValid(bid) {
-  const params = bid.params || {};
-  return !!(extractCID(params) && extractPID(params));
-}
-
-function buildRequestData(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout) {
-  const {
-    params,
-    bidId,
-    userId,
-    adUnitCode,
-    schain,
-    mediaTypes,
-    ortb2Imp,
-    bidderRequestId,
-    bidRequestsCount,
-    bidderRequestsCount,
-    bidderWinsCount
-  } = bid;
-  const {ext} = params;
-  let {bidFloor} = params;
-  const hashUrl = hashCode(topWindowUrl);
-  const dealId = getNextDealId(hashUrl);
-  const uniqueDealId = getUniqueDealId(hashUrl);
-  const sId = getVidazooSessionId();
-  const pId = extractPID(params);
-  const ptrace = getCacheOpt();
-  const isStorageAllowed = bidderSettings.get(BIDDER_CODE, 'storageAllowed');
-
-  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid', deepAccess(bid, 'ortb2Imp.ext.data.pbadslot', ''));
-  const cat = deepAccess(bidderRequest, 'ortb2.site.cat', []);
-  const pagecat = deepAccess(bidderRequest, 'ortb2.site.pagecat', []);
-
-  if (isFn(bid.getFloor)) {
-    const floorInfo = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*'
-    });
-
-    if (floorInfo.currency === 'USD') {
-      bidFloor = floorInfo.floor;
-    }
-  }
-
-  let data = {
-    url: encodeURIComponent(topWindowUrl),
-    uqs: getTopWindowQueryParams(),
-    cb: Date.now(),
-    bidFloor: bidFloor,
-    bidId: bidId,
-    referrer: bidderRequest.refererInfo.ref,
-    adUnitCode: adUnitCode,
-    publisherId: pId,
-    sessionId: sId,
-    sizes: sizes,
-    dealId: dealId,
-    uniqueDealId: uniqueDealId,
-    bidderVersion: BIDDER_VERSION,
-    prebidVersion: '$prebid.version$',
-    res: `${screen.width}x${screen.height}`,
-    schain: schain,
-    mediaTypes: mediaTypes,
-    ptrace: ptrace,
-    isStorageAllowed: isStorageAllowed,
-    gpid: gpid,
-    cat: cat,
-    pagecat: pagecat,
-    transactionId: ortb2Imp?.ext?.tid,
-    bidderRequestId: bidderRequestId,
-    bidRequestsCount: bidRequestsCount,
-    bidderRequestsCount: bidderRequestsCount,
-    bidderWinsCount: bidderWinsCount,
-    bidderTimeout: bidderTimeout,
-    webSessionId: webSessionId
-  };
-
-  appendUserIdsToRequestPayload(data, userId);
-
-  const sua = deepAccess(bidderRequest, 'ortb2.device.sua');
+function createUniqueRequestData(hashUrl) {
+  const dealId = getNextDealId(storage, hashUrl);
+  const sessionId = getVidazooSessionId(storage);
+  const ptrace = getCacheOpt(storage, OPT_CACHE_KEY);
+  const vdzhum = getCacheOpt(storage, OPT_TIME_KEY);
 
-  if (sua) {
-    data.sua = sua;
-  }
-
-  if (bidderRequest.gdprConsent) {
-    if (bidderRequest.gdprConsent.consentString) {
-      data.gdprConsent = bidderRequest.gdprConsent.consentString;
-    }
-    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
-      data.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
-    }
-  }
-  if (bidderRequest.uspConsent) {
-    data.usPrivacy = bidderRequest.uspConsent;
-  }
-
-  if (bidderRequest.gppConsent) {
-    data.gppString = bidderRequest.gppConsent.gppString;
-    data.gppSid = bidderRequest.gppConsent.applicableSections;
-  } else if (bidderRequest.ortb2?.regs?.gpp) {
-    data.gppString = bidderRequest.ortb2.regs.gpp;
-    data.gppSid = bidderRequest.ortb2.regs.gpp_sid;
-  }
-
-  _each(ext, (value, key) => {
-    data['ext.' + key] = value;
-  });
-
-  return data;
-}
-
-function buildRequest(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout) {
-  const {params} = bid;
-  const cId = extractCID(params);
-  const subDomain = extractSubDomain(params);
-  const data = buildRequestData(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout);
-  const dto = {
-    method: 'POST',
-    url: `${createDomain(subDomain)}/prebid/multi/${cId}`,
-    data: data
+  return {
+    dealId: dealId, sessionId: sessionId, ptrace: ptrace, vdzhum: vdzhum, webSessionId: webSessionId
   };
-  return dto;
-}
-
-function buildSingleRequest(bidRequests, bidderRequest, topWindowUrl, bidderTimeout) {
-  const {params} = bidRequests[0];
-  const cId = extractCID(params);
-  const subDomain = extractSubDomain(params);
-  const data = bidRequests.map(bid => {
-    const sizes = parseSizesInput(bid.sizes);
-    return buildRequestData(bid, topWindowUrl, sizes, bidderRequest, bidderTimeout)
-  });
-  const chunkSize = Math.min(20, config.getConfig('vidazoo.chunkSize') || 10);
-
-  const chunkedData = chunk(data, chunkSize);
-  return chunkedData.map(chunk => {
-    return {
-      method: 'POST',
-      url: `${createDomain(subDomain)}/prebid/multi/${cId}`,
-      data: {
-        bids: chunk
-      }
-    };
-  });
-}
-
-function appendUserIdsToRequestPayload(payloadRef, userIds) {
-  let key;
-  _each(userIds, (userId, idSystemProviderName) => {
-    key = `uid.${idSystemProviderName}`;
-    switch (idSystemProviderName) {
-      case 'digitrustid':
-        payloadRef[key] = deepAccess(userId, 'data.id');
-        break;
-      case 'lipb':
-        payloadRef[key] = userId.lipbid;
-        break;
-      case 'parrableId':
-        payloadRef[key] = userId.eid;
-        break;
-      case 'id5id':
-        payloadRef[key] = userId.uid;
-        break;
-      default:
-        payloadRef[key] = userId;
-    }
-  });
-}
-
-function buildRequests(validBidRequests, bidderRequest) {
-  // TODO: does the fallback make sense here?
-  const topWindowUrl = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
-  const bidderTimeout = config.getConfig('bidderTimeout');
-
-  const singleRequestMode = config.getConfig('vidazoo.singleRequest');
-
-  const requests = [];
-
-  if (singleRequestMode) {
-    // banner bids are sent as a single request
-    const bannerBidRequests = validBidRequests.filter(bid => isArray(bid.mediaTypes) ? bid.mediaTypes.includes(BANNER) : bid.mediaTypes[BANNER] !== undefined);
-    if (bannerBidRequests.length > 0) {
-      const singleRequests = buildSingleRequest(bannerBidRequests, bidderRequest, topWindowUrl, bidderTimeout);
-      requests.push(...singleRequests);
-    }
-
-    // video bids are sent as a single request for each bid
-
-    const videoBidRequests = validBidRequests.filter(bid => bid.mediaTypes[VIDEO] !== undefined);
-    videoBidRequests.forEach(validBidRequest => {
-      const sizes = parseSizesInput(validBidRequest.sizes);
-      const request = buildRequest(validBidRequest, topWindowUrl, sizes, bidderRequest, bidderTimeout);
-      requests.push(request);
-    });
-  } else {
-    validBidRequests.forEach(validBidRequest => {
-      const sizes = parseSizesInput(validBidRequest.sizes);
-      const request = buildRequest(validBidRequest, topWindowUrl, sizes, bidderRequest, bidderTimeout);
-      requests.push(request);
-    });
-  }
-  return requests;
 }
 
-function interpretResponse(serverResponse, request) {
-  if (!serverResponse || !serverResponse.body) {
-    return [];
-  }
-
-  const singleRequestMode = config.getConfig('vidazoo.singleRequest');
-  const reqBidId = deepAccess(request, 'data.bidId');
-  const {results} = serverResponse.body;
-
-  let output = [];
-
-  try {
-    results.forEach((result, i) => {
-      const {
-        creativeId,
-        ad,
-        price,
-        exp,
-        width,
-        height,
-        currency,
-        bidId,
-        advertiserDomains,
-        metaData,
-        mediaType = BANNER
-      } = result;
-      if (!ad || !price) {
-        return;
-      }
-
-      const response = {
-        requestId: (singleRequestMode && bidId) ? bidId : reqBidId,
-        cpm: price,
-        width: width,
-        height: height,
-        creativeId: creativeId,
-        currency: currency || CURRENCY,
-        netRevenue: true,
-        ttl: exp || TTL_SECONDS,
-      };
-
-      if (metaData) {
-        Object.assign(response, {
-          meta: metaData
-        })
-      } else {
-        Object.assign(response, {
-          meta: {
-            advertiserDomains: advertiserDomains || []
-          }
-        })
-      }
-
-      if (mediaType === BANNER) {
-        Object.assign(response, {
-          ad: ad,
-        });
-      } else {
-        Object.assign(response, {
-          vastXml: ad,
-          mediaType: VIDEO
-        });
-      }
-      output.push(response);
-    });
-
-    return output;
-  } catch (e) {
-    return [];
-  }
-}
-
-function getUserSyncs(syncOptions, responses, gdprConsent = {}, uspConsent = '', gppConsent = {}) {
-  let syncs = [];
-  const {iframeEnabled, pixelEnabled} = syncOptions;
-  const {gdprApplies, consentString = ''} = gdprConsent;
-  const {gppString, applicableSections} = gppConsent;
-
-  const cidArr = responses.filter(resp => deepAccess(resp, 'body.cid')).map(resp => resp.body.cid).filter(uniques);
-  let params = `?cid=${encodeURIComponent(cidArr.join(','))}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`;
-
-  if (gppString && applicableSections?.length) {
-    params += '&gpp=' + encodeURIComponent(gppString);
-    params += '&gpp_sid=' + encodeURIComponent(applicableSections.join(','));
-  }
-
-  if (iframeEnabled) {
-    syncs.push({
-      type: 'iframe',
-      url: `https://sync.cootlogix.com/api/sync/iframe/${params}`
-    });
-  }
-  if (pixelEnabled) {
-    syncs.push({
-      type: 'image',
-      url: `https://sync.cootlogix.com/api/sync/image/${params}`
-    });
-  }
-  return syncs;
-}
-
-export function hashCode(s, prefix = '_') {
-  const l = s.length;
-  let h = 0
-  let i = 0;
-  if (l > 0) {
-    while (i < l) {
-      h = (h << 5) - h + s.charCodeAt(i++) | 0;
-    }
-  }
-  return prefix + h;
-}
-
-export function getNextDealId(key, expiry = DEAL_ID_EXPIRY) {
-  try {
-    const data = getStorageItem(key);
-    let currentValue = 0;
-    let timestamp;
-
-    if (data && data.value && Date.now() - data.created < expiry) {
-      currentValue = data.value;
-      timestamp = data.created;
-    }
-
-    const nextValue = currentValue + 1;
-    setStorageItem(key, nextValue, timestamp);
-    return nextValue;
-  } catch (e) {
-    return 0;
-  }
-}
-
-export function getUniqueDealId(key, expiry = UNIQUE_DEAL_ID_EXPIRY) {
-  const storageKey = `u_${key}`;
-  const now = Date.now();
-  const data = getStorageItem(storageKey);
-  let uniqueId;
-
-  if (!data || !data.value || now - data.created > expiry) {
-    uniqueId = `${key}_${now.toString()}`;
-    setStorageItem(storageKey, uniqueId);
-  } else {
-    uniqueId = data.value;
-  }
-
-  return uniqueId;
-}
-
-export function getVidazooSessionId() {
-  return getStorageItem(SESSION_ID_KEY) || '';
-}
-
-export function getCacheOpt() {
-  let data = storage.getDataFromLocalStorage(OPT_CACHE_KEY);
-  if (!data) {
-    data = String(Date.now());
-    storage.setDataInLocalStorage(OPT_CACHE_KEY, data);
-  }
-
-  return data;
-}
-
-export function getStorageItem(key) {
-  try {
-    return tryParseJSON(storage.getDataFromLocalStorage(key));
-  } catch (e) {
-  }
-
-  return null;
-}
-
-export function setStorageItem(key, value, timestamp) {
-  try {
-    const created = timestamp || Date.now();
-    const data = JSON.stringify({value, created});
-    storage.setDataInLocalStorage(key, data);
-  } catch (e) {
-  }
-}
-
-export function tryParseJSON(value) {
-  try {
-    return JSON.parse(value);
-  } catch (e) {
-    return value;
-  }
-}
+const buildRequests = createBuildRequestsFn(createDomain, createUniqueRequestData, storage, BIDDER_CODE, BIDDER_VERSION, true);
+const interpretResponse = createInterpretResponseFn(BIDDER_CODE, true);
+const getUserSyncs = createUserSyncGetter({
+  iframeSyncUrl: 'https://sync.cootlogix.com/api/sync/iframe', imageSyncUrl: 'https://sync.cootlogix.com/api/sync/image'
+});
 
 export const spec = {
   code: BIDDER_CODE,
@@ -445,7 +50,8 @@ export const spec = {
   isBidRequestValid,
   buildRequests,
   interpretResponse,
-  getUserSyncs
+  getUserSyncs,
+  onBidWon
 };
 
 registerBidder(spec);
diff --git a/modules/videoModule/coreVideo.js b/modules/videoModule/coreVideo.js
index ce66acc2b02..4ac5f090334 100644
--- a/modules/videoModule/coreVideo.js
+++ b/modules/videoModule/coreVideo.js
@@ -104,7 +104,6 @@ import { ParentModule, SubmoduleBuilder } from '../../libraries/video/shared/par
 
 /**
  * @summary Maps a Video Provider factory to the video player's vendor code.
- * @type {vendorSubmoduleDirectory}
  */
 const videoVendorDirectory = {};
 
@@ -218,7 +217,10 @@ export function VideoCore(parentModule_) {
     getOrtbContent,
     setAdTagUrl,
     onEvents,
-    offEvents
+    offEvents,
+    hasProviderFor(divId) {
+      return !!parentModule.getSubmodule(divId);
+    }
   };
 }
 
diff --git a/modules/videoModule/gamAdServerSubmodule.js b/modules/videoModule/gamAdServerSubmodule.js
index 87db71ae38b..728ee4d060e 100644
--- a/modules/videoModule/gamAdServerSubmodule.js
+++ b/modules/videoModule/gamAdServerSubmodule.js
@@ -4,7 +4,6 @@ import { getGlobal } from '../../src/prebidGlobal.js';
 /**
  * @constructor
  * @param {Object} dfpModule_ - the DFP ad server module
- * @returns {AdServerProvider}
  */
 function GamAdServerProvider(dfpModule_) {
   const dfp = dfpModule_;
diff --git a/modules/videoModule/index.js b/modules/videoModule/index.js
index b9cba60594d..c84d98a6d5f 100644
--- a/modules/videoModule/index.js
+++ b/modules/videoModule/index.js
@@ -1,9 +1,9 @@
 import { config } from '../../src/config.js';
 import { find } from '../../src/polyfill.js';
 import * as events from '../../src/events.js';
-import { mergeDeep, logWarn } from '../../src/utils.js';
+import {mergeDeep, logWarn, logError} from '../../src/utils.js';
 import { getGlobal } from '../../src/prebidGlobal.js';
-import CONSTANTS from '../../src/constants.json';
+import { EVENTS } from '../../src/constants.js';
 import {
   videoEvents,
   AUCTION_AD_LOAD_ATTEMPT,
@@ -21,6 +21,9 @@ import { gamSubmoduleFactory } from './gamAdServerSubmodule.js';
 import { videoImpressionVerifierFactory } from './videoImpressionVerifier.js';
 import { AdQueueCoordinator } from './adQueue.js';
 import { getExternalVideoEventName, getExternalVideoEventPayload } from '../../libraries/video/shared/helpers.js'
+import {VIDEO} from '../../src/mediaTypes.js';
+import {auctionManager} from '../../src/auctionManager.js';
+import {doRender} from '../../src/adRendering.js';
 
 const allVideoEvents = Object.keys(videoEvents).map(eventKey => videoEvents[eventKey]);
 events.addEvents(allVideoEvents.concat([AUCTION_AD_LOAD_ATTEMPT, AUCTION_AD_LOAD_QUEUED, AUCTION_AD_LOAD_ABORT, BID_IMPRESSION, BID_ERROR]).map(getExternalVideoEventName));
@@ -68,7 +71,7 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
 
     requestBids.before(beforeBidsRequested, 40);
 
-    pbEvents.on(CONSTANTS.EVENTS.BID_ADJUSTMENT, function (bid) {
+    pbEvents.on(EVENTS.BID_ADJUSTMENT, function (bid) {
       videoImpressionVerifier.trackBid(bid);
     });
 
@@ -99,16 +102,33 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
   return { init, renderBid, getOrtbVideo, getOrtbContent };
 
   function beforeBidsRequested(nextFn, bidderRequest) {
+    logErrorForInvalidDivIds(bidderRequest);
     enrichAuction(bidderRequest);
 
     const bidsBackHandler = bidderRequest.bidsBackHandler;
     if (!bidsBackHandler || typeof bidsBackHandler !== 'function') {
-      pbEvents.on(CONSTANTS.EVENTS.AUCTION_END, auctionEnd);
+      pbEvents.on(EVENTS.AUCTION_END, auctionEnd);
     }
 
     return nextFn.call(this, bidderRequest);
   }
 
+  function logErrorForInvalidDivIds(bidderRequest) {
+    const adUnits = bidderRequest.adUnits || pbGlobal.adUnits || [];
+    adUnits.forEach(adUnit => {
+      const video = adUnit.video;
+      if (!video) {
+        return;
+      }
+      if (!video.divId) {
+        logError(`Missing Video player div ID for ad unit '${adUnit.code}'`);
+      }
+      if (!videoCore.hasProviderFor(video.divId)) {
+        logError(`Video player div ID '${video.divId}' for ad unit '${adUnit.code}' does not match any registered player`);
+      }
+    });
+  }
+
   function enrichAuction(bidderRequest) {
     if (mainContentDivId) {
       enrichOrtb2(mainContentDivId, bidderRequest);
@@ -172,7 +192,7 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
         renderWinningBid(adUnit);
       }
     });
-    pbEvents.off(CONSTANTS.EVENTS.AUCTION_END, auctionEnd);
+    pbEvents.off(EVENTS.AUCTION_END, auctionEnd);
   }
 
   function getAdServerConfig(adUnitVideoConfig) {
@@ -244,6 +264,18 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
   }
 }
 
+function videoRenderHook(next, args) {
+  if (args.bidResponse.mediaType === VIDEO) {
+    const adUnit = auctionManager.index.getAdUnit(args.bidResponse);
+    if (adUnit?.video) {
+      getGlobal().videoModule.renderBid(adUnit.video.divId, args.bidResponse);
+      next.bail();
+      return;
+    }
+  }
+  next(args);
+}
+
 export function pbVideoFactory() {
   const videoCore = videoCoreFactory();
   const adQueueCoordinator = AdQueueCoordinator(videoCore, events);
@@ -251,6 +283,7 @@ export function pbVideoFactory() {
   const pbVideo = PbVideo(videoCore, config.getConfig, pbGlobal, events, allVideoEvents, gamSubmoduleFactory, videoImpressionVerifierFactory, adQueueCoordinator);
   pbVideo.init();
   pbGlobal.videoModule = pbVideo;
+  doRender.before(videoRenderHook);
   return pbVideo;
 }
 
diff --git a/modules/videobyteBidAdapter.js b/modules/videobyteBidAdapter.js
index c4dae78e862..c34d3ecb097 100644
--- a/modules/videobyteBidAdapter.js
+++ b/modules/videobyteBidAdapter.js
@@ -2,6 +2,14 @@ import { logMessage, logError, deepAccess, isFn, isPlainObject, isStr, isNumber,
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {VIDEO} from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
 const BIDDER_CODE = 'videobyte';
 const DEFAULT_BID_TTL = 300;
 const DEFAULT_CURRENCY = 'USD';
@@ -11,6 +19,7 @@ const VIDEO_ORTB_PARAMS = [
   'minduration',
   'maxduration',
   'placement',
+  'plcmt',
   'protocols',
   'startdelay',
   'skip',
@@ -183,16 +192,6 @@ function buildRequestData(bidRequest, bidderRequest) {
     }
   });
 
-  // Placement Inference Rules:
-  // - If no placement is defined then default to 1 (In Stream)
-  video.placement = video.placement || 2;
-
-  // - If product is instream (for instream context) then override placement to 1
-  if (params.context === 'instream') {
-    video.startdelay = video.startdelay || 0;
-    video.placement = 1;
-  }
-
   // bid floor
   const bidFloorRequest = {
     currency: bidRequest.params.cur || 'USD',
@@ -215,8 +214,8 @@ function buildRequestData(bidRequest, bidderRequest) {
         id: '1',
         video: video,
         secure: isSecure() ? 1 : 0,
-        bidfloor: floorData.floor,
-        bidfloorcur: floorData.currency
+        bidfloor: floorData?.floor,
+        bidfloorcur: floorData?.currency
       }
     ],
     site: {
diff --git a/modules/videoheroesBidAdapter.js b/modules/videoheroesBidAdapter.js
index 2f02734a31f..4adabacc33b 100644
--- a/modules/videoheroesBidAdapter.js
+++ b/modules/videoheroesBidAdapter.js
@@ -1,165 +1,27 @@
-import { isEmpty, parseUrl, isStr, triggerPixel } from '../src/utils.js';
+import { triggerPixel, isStr } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { parseNative } from '../libraries/braveUtils/index.js';
+import { buildRequests, interpretResponse } from '../libraries/braveUtils/buildAndInterpret.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 
 const BIDDER_CODE = 'videoheroes';
 const DEFAULT_CUR = 'USD';
 const ENDPOINT_URL = `https://point.contextualadv.com/?t=2&partner=hash`;
 
-const NATIVE_ASSETS_IDS = { 1: 'title', 2: 'icon', 3: 'image', 4: 'body', 5: 'sponsoredBy', 6: 'cta' };
-const NATIVE_ASSETS = {
-  title: { id: 1, name: 'title' },
-  icon: { id: 2, type: 1, name: 'img' },
-  image: { id: 3, type: 3, name: 'img' },
-  body: { id: 4, type: 2, name: 'data' },
-  sponsoredBy: { id: 5, type: 1, name: 'data' },
-  cta: { id: 6, type: 12, name: 'data' }
-};
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: (bid) => {
-    return !!(bid.params.placementId && bid.params.placementId.toString().length === 32);
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: (validBidRequests, bidderRequest) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-    if (validBidRequests.length === 0 || !bidderRequest) return [];
-
-    const endpointURL = ENDPOINT_URL.replace('hash', validBidRequests[0].params.placementId);
-
-    let imp = validBidRequests.map(br => {
-      let impObject = {
-        id: br.bidId,
-        secure: 1
-      };
-
-      if (br.mediaTypes.banner) {
-        impObject.banner = createBannerRequest(br);
-      } else if (br.mediaTypes.video) {
-        impObject.video = createVideoRequest(br);
-      } else if (br.mediaTypes.native) {
-        impObject.native = {
-          // TODO: fix transactionId leak: https://github.com/prebid/Prebid.js/issues/9781
-          // Also, `id` is not in the ORTB native spec
-          id: br.transactionId,
-          ver: '1.2',
-          request: createNativeRequest(br)
-        };
-      }
-      return impObject;
-    });
-
-    let page = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
-
-    let data = {
-      id: bidderRequest.bidderRequestId,
-      cur: [ DEFAULT_CUR ],
-      device: {
-        w: screen.width,
-        h: screen.height,
-        language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
-        ua: navigator.userAgent,
-      },
-      site: {
-        domain: parseUrl(page).hostname,
-        page: page,
-      },
-      tmax: bidderRequest.timeout,
-      imp
-    };
-
-    if (bidderRequest.refererInfo.ref) {
-      data.site.ref = bidderRequest.refererInfo.ref;
-    }
-
-    if (bidderRequest.gdprConsent) {
-      data['regs'] = {'ext': {'gdpr': bidderRequest.gdprConsent.gdprApplies ? 1 : 0}};
-      data['user'] = {'ext': {'consent': bidderRequest.gdprConsent.consentString ? bidderRequest.gdprConsent.consentString : ''}};
-    }
-
-    if (bidderRequest.uspConsent !== undefined) {
-      if (!data['regs'])data['regs'] = {'ext': {}};
-      data['regs']['ext']['us_privacy'] = bidderRequest.uspConsent;
-    }
-
-    if (config.getConfig('coppa') === true) {
-      if (!data['regs'])data['regs'] = {'coppa': 1};
-      else data['regs']['coppa'] = 1;
-    }
-
-    if (validBidRequests[0].schain) {
-      data['source'] = {'ext': {'schain': validBidRequests[0].schain}};
-    }
-
-    return {
-      method: 'POST',
-      url: endpointURL,
-      data: data
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: (serverResponse) => {
-    if (!serverResponse || isEmpty(serverResponse.body)) return [];
-
-    let bids = [];
-    serverResponse.body.seatbid.forEach(response => {
-      response.bid.forEach(bid => {
-        let mediaType = bid.ext && bid.ext.mediaType ? bid.ext.mediaType : 'banner';
-
-        let bidObj = {
-          requestId: bid.impid,
-          cpm: bid.price,
-          width: bid.w,
-          height: bid.h,
-          ttl: 1200,
-          currency: DEFAULT_CUR,
-          netRevenue: true,
-          creativeId: bid.crid,
-          dealId: bid.dealid || null,
-          mediaType: mediaType
-        };
-
-        switch (mediaType) {
-          case 'video':
-            bidObj.vastUrl = bid.adm;
-            break;
-          case 'native':
-            bidObj.native = parseNative(bid.adm);
-            break;
-          default:
-            bidObj.ad = bid.adm;
-        }
+  isBidRequestValid: (bid) => !!(bid.params.placementId && bid.params.placementId.toString().length === 32),
 
-        bids.push(bidObj);
-      });
-    });
+  buildRequests: (validBidRequests, bidderRequest) => buildRequests(validBidRequests, bidderRequest, ENDPOINT_URL, DEFAULT_CUR),
 
-    return bids;
-  },
+  interpretResponse: (serverResponse) => interpretResponse(serverResponse, DEFAULT_CUR, parseNative),
 
   onBidWon: (bid) => {
     if (isStr(bid.nurl) && bid.nurl !== '') {
@@ -168,89 +30,4 @@ export const spec = {
   }
 };
 
-const parseNative = adm => {
-  let bid = {
-    clickUrl: adm.native.link && adm.native.link.url,
-    impressionTrackers: adm.native.imptrackers || [],
-    clickTrackers: (adm.native.link && adm.native.link.clicktrackers) || [],
-    jstracker: adm.native.jstracker || []
-  };
-  adm.native.assets.forEach(asset => {
-    let kind = NATIVE_ASSETS_IDS[asset.id];
-    let content = kind && asset[NATIVE_ASSETS[kind].name];
-    if (content) {
-      bid[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
-    }
-  });
-
-  return bid;
-}
-
-const createNativeRequest = br => {
-  let impObject = {
-    ver: '1.2',
-    assets: []
-  };
-
-  let keys = Object.keys(br.mediaTypes.native);
-
-  for (let key of keys) {
-    const props = NATIVE_ASSETS[key];
-    if (props) {
-      const asset = {
-        required: br.mediaTypes.native[key].required ? 1 : 0,
-        id: props.id,
-        [props.name]: {}
-      };
-
-      if (props.type) asset[props.name]['type'] = props.type;
-      if (br.mediaTypes.native[key].len) asset[props.name]['len'] = br.mediaTypes.native[key].len;
-      if (br.mediaTypes.native[key].sizes && br.mediaTypes.native[key].sizes[0]) {
-        asset[props.name]['w'] = br.mediaTypes.native[key].sizes[0];
-        asset[props.name]['h'] = br.mediaTypes.native[key].sizes[1];
-      }
-
-      impObject.assets.push(asset);
-    }
-  }
-
-  return impObject;
-}
-
-const createBannerRequest = br => {
-  let size = [];
-
-  if (br.mediaTypes.banner.sizes && Array.isArray(br.mediaTypes.banner.sizes)) {
-    if (Array.isArray(br.mediaTypes.banner.sizes[0])) { size = br.mediaTypes.banner.sizes[0]; } else { size = br.mediaTypes.banner.sizes; }
-  } else size = [300, 250];
-
-  return { id: br.transactionId, w: size[0], h: size[1] };
-};
-
-const createVideoRequest = br => {
-  let videoObj = {id: br.transactionId};
-  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'skip', 'minbitrate', 'maxbitrate', 'api', 'linearity'];
-
-  for (let param of supportParamsList) {
-    if (br.mediaTypes.video[param] !== undefined) {
-      videoObj[param] = br.mediaTypes.video[param];
-    }
-  }
-
-  if (br.mediaTypes.video.playerSize && Array.isArray(br.mediaTypes.video.playerSize)) {
-    if (Array.isArray(br.mediaTypes.video.playerSize[0])) {
-      videoObj.w = br.mediaTypes.video.playerSize[0][0];
-      videoObj.h = br.mediaTypes.video.playerSize[0][1];
-    } else {
-      videoObj.w = br.mediaTypes.video.playerSize[0];
-      videoObj.h = br.mediaTypes.video.playerSize[1];
-    }
-  } else {
-    videoObj.w = 640;
-    videoObj.h = 480;
-  }
-
-  return videoObj;
-}
-
 registerBidder(spec);
diff --git a/modules/videojsVideoProvider.js b/modules/videojsVideoProvider.js
index 7764e8af995..0be4c6feede 100644
--- a/modules/videojsVideoProvider.js
+++ b/modules/videojsVideoProvider.js
@@ -6,13 +6,16 @@ import {
 } from '../libraries/video/constants/events.js';
 // missing events: , AD_BREAK_START, , AD_BREAK_END, VIEWABLE, BUFFER, CAST, PLAYLIST_COMPLETE, RENDITION_UPDATE, PLAY_ATTEMPT_FAILED, AUTOSTART_BLOCKED
 import {
-  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE, AD_POSITION, PLAYBACK_END
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLCMT, VPAID_MIME_TYPE, AD_POSITION, PLAYBACK_END
 } from '../libraries/video/constants/ortb.js';
 import { VIDEO_JS_VENDOR } from '../libraries/video/constants/vendorCodes.js';
 import { submodule } from '../src/hook.js';
 import stateFactory from '../libraries/video/shared/state.js';
 import { PLAYBACK_MODE } from '../libraries/video/constants/constants.js';
 import { getEventHandler } from '../libraries/video/shared/eventHandler.js';
+/**
+ * @typedef {import('../libraries/video/shared/state.js').State} State
+ */
 
 /*
 Plugins of interest:
@@ -146,8 +149,9 @@ export function VideojsProvider(providerConfig, vjs_, adState_, timeState_, call
     // ~ Sort of resolved check if the player has a source to tell if the placement is instream
     // Still cannot reliably check what type of placement the player is if its outstream
     // i.e. we can't tell if its interstitial, in article, etc.
+    // update: cannot infer instream ever, always need declarations
     if (player.src()) {
-      video.placement = PLACEMENT.INSTREAM;
+      video.plcmt = PLCMT.ACCOMPANYING_CONTENT;
     }
 
     // Placement according to IQG Guidelines 4.2.8
diff --git a/modules/videonowBidAdapter.js b/modules/videonowBidAdapter.js
index bfbc07fdff1..563f692693a 100644
--- a/modules/videonowBidAdapter.js
+++ b/modules/videonowBidAdapter.js
@@ -2,6 +2,12 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {_each, getBidIdParameter, getValue, logError, logInfo} from '../src/utils.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
 const BIDDER_CODE = 'videonow';
 const RTB_URL = 'https://adx.videonow.ru/yhb'
 const DEFAULT_CURRENCY = 'RUB'
diff --git a/modules/vidoomyBidAdapter.js b/modules/vidoomyBidAdapter.js
index c9ac9fae0f4..9f341b42ff5 100644
--- a/modules/vidoomyBidAdapter.js
+++ b/modules/vidoomyBidAdapter.js
@@ -1,4 +1,4 @@
-import {deepAccess, logError, parseSizesInput} from '../src/utils.js';
+import {deepAccess, isPlainObject, logError, parseSizesInput} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
@@ -88,7 +88,7 @@ function getBidFloor(bid, mediaType, sizes, bidfloor) {
   var size = sizes && sizes.length > 0 ? sizes[0] : '*';
   if (typeof bid.getFloor === 'function') {
     const floorInfo = bid.getFloor({currency: 'USD', mediaType, size});
-    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+    if (isPlainObject(floorInfo) && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
       floor = Math.max(bidfloor, parseFloat(floorInfo.floor));
     }
   }
diff --git a/modules/viouslyBidAdapter.js b/modules/viouslyBidAdapter.js
index 5ccca7590dd..e474a8de93c 100644
--- a/modules/viouslyBidAdapter.js
+++ b/modules/viouslyBidAdapter.js
@@ -2,7 +2,7 @@ import { deepAccess, logError, parseUrl, parseSizesInput, triggerPixel } from '.
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import find from 'core-js-pure/features/array/find.js'; // eslint-disable-line prebid/validate-imports
+import {find} from '../src/polyfill.js';
 
 const BIDDER_CODE = 'viously';
 const GVLID = 1028;
diff --git a/modules/viqeoBidAdapter.js b/modules/viqeoBidAdapter.js
index 5762a794c8e..aac9ee69a24 100644
--- a/modules/viqeoBidAdapter.js
+++ b/modules/viqeoBidAdapter.js
@@ -1,39 +1,67 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {logError, logInfo, _each, mergeDeep, isFn, isNumber, isPlainObject} from '../src/utils.js'
-import {VIDEO} from '../src/mediaTypes.js';
-import {Renderer} from '../src/Renderer.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import {
+  logError,
+  logInfo,
+  _each,
+  mergeDeep,
+  isFn,
+  isNumber,
+  isPlainObject,
+} from '../src/utils.js';
+import { VIDEO } from '../src/mediaTypes.js';
+import { Renderer } from '../src/Renderer.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderSpec} BidderSpec
+ */
 
 const BIDDER_CODE = 'viqeo';
-const DEFAULT_MIMES = ['application/javascript'];
-const VIQEO_ENDPOINT = 'https://ads.betweendigital.com/openrtb_bid';
+const DEFAULT_MIMES = [
+  'video/3gpp',
+  'video/mp4',
+  'video/mpeg',
+  'video/webm',
+  'application/javascript',
+];
+const VIQEO_ENDPOINT = 'https://ad.vqserve.com/ads/prebid';
 const RENDERER_URL = 'https://cdn.viqeo.tv/js/vq_starter.js';
 const DEFAULT_CURRENCY = 'USD';
-const DEFAULT_SSPID = 44697;
 
 function getBidFloor(bid) {
-  const {floor, currency} = bid.params;
+  const { floor, currency } = bid.params;
   const curr = currency || DEFAULT_CURRENCY;
   if (!isFn(bid.getFloor)) {
-    return {floor: isNumber(floor) ? floor : 0, currency: curr};
+    return { floor: isNumber(floor) ? floor : 0, currency: curr };
   }
-  const floorInfo = bid.getFloor({currency: curr, mediaType: VIDEO, size: '*'});
-  if (isPlainObject(floorInfo) && isNumber(floorInfo.floor) && floorInfo.currency === curr) {
+  const floorInfo = bid.getFloor({
+    currency: curr,
+    mediaType: VIDEO,
+    size: '*',
+  });
+  if (
+    isPlainObject(floorInfo) &&
+    isNumber(floorInfo.floor) &&
+    floorInfo.currency === curr
+  ) {
     return floorInfo;
   }
-  return {floor: floor || 0, currency: currency || DEFAULT_CURRENCY};
+  return { floor: floor || 0, currency: currency || DEFAULT_CURRENCY };
 }
 
-function getVideoTargetingParams({mediaTypes: {video}}) {
+function getVideoTargetingParams({ mediaTypes: { video } }) {
   const result = {};
-  Object.keys(Object(video))
-    .forEach(key => {
-      if (key === 'playerSize') {
-        result.w = video.playerSize[0][0];
-        result.h = video.playerSize[0][1];
-      } else if (key !== 'context') {
-        result[key] = video[key];
-      }
-    })
+  Object.keys(Object(video)).forEach((key) => {
+    if (key === 'playerSize') {
+      result.w = video.playerSize[0][0];
+      result.h = video.playerSize[0][1];
+    } else if (key !== 'context') {
+      result[key] = video[key];
+    }
+  });
   return result;
 }
 
@@ -47,20 +75,20 @@ export const spec = {
    * @param {BidRequest} bidRequest The bid params to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
    */
-  isBidRequestValid: ({params}) => {
+  isBidRequestValid: ({ params }) => {
     if (!params) {
       logError('failed validation: params not declared');
       return false;
     }
-    if (!params.user && !params.user?.buyeruid) {
-      logError('failed validation: user.buyeruid not declared');
+    if (!params.tagId) {
+      logError('failed validation: tagId not declared');
       return false;
     }
     if (!params.playerOptions) {
       logError('failed validation: playerOptions not declared');
       return false;
     }
-    const {profileId, videoId, playerId} = params.playerOptions;
+    const { profileId, videoId, playerId } = params.playerOptions;
     if (!profileId) {
       logError('failed validation: profileId not declared');
       return false;
@@ -80,46 +108,42 @@ export const spec = {
     const bidRequests = [];
     _each(validBidRequests, (bid, i) => {
       const {
-        params: {test, sspId, endpointUrl},
-        mediaTypes: {video},
+        params: { test, tagId, endpointUrl, bcat, badv },
+        mediaTypes: { video },
       } = bid;
       const ortb2 = bid.ortb2 || {};
       const user = bid.params.user || {};
       const device = bid.params.device || {};
       const site = bid.params.site || {};
-      const w = window;
       const floorInfo = getBidFloor(bid);
+
       const data = {
         id: bid.bidId,
         test,
-        imp: [{
-          id: `${i}`,
-          tagid: bid.adUnitCode,
-          video: {
-            ...getVideoTargetingParams(bid),
-            mimes: video.mimes || DEFAULT_MIMES,
+        imp: [
+          {
+            id: `${i}`,
+            video: {
+              ...getVideoTargetingParams(bid),
+              mimes: video.mimes || DEFAULT_MIMES,
+            },
+            tagid: `${tagId}`,
+            bidfloor: floorInfo.floor,
+            bidfloorcur: floorInfo.currency,
+            secure: 1,
           },
-          bidfloor: floorInfo.floor,
-          bidfloorcur: floorInfo.currency,
-          secure: 1
-        }],
-        site: test === 1 ? {
-          page: 'https://viqeo.tv',
-          domain: 'viqeo.tv'
-        } : mergeDeep({
-          domain: w.location.hostname,
-          page: w.location.href
-        }, ortb2.site, site),
-        device: mergeDeep({
-          w: w.screen.width,
-          h: w.screen.height,
-          ua: w.navigator.userAgent,
-        }, ortb2.device, device),
-        user: mergeDeep({...user}, ortb2.user),
-        app: bid.params.app,
+        ],
+        site: mergeDeep(
+          site,
+          ortb2.site
+        ),
+        device: mergeDeep(device, ortb2.device),
+        user: mergeDeep(user, ortb2.user),
+        bcat: ortb2.bcat || bcat,
+        badv: ortb2.badv || badv
       };
       bidRequests.push({
-        url: endpointUrl || `${VIQEO_ENDPOINT}/?sspId=${sspId || DEFAULT_SSPID}`,
+        url: endpointUrl || `${VIQEO_ENDPOINT}`,
         method: 'POST',
         data,
         bids: validBidRequests,
@@ -140,24 +164,24 @@ export const spec = {
       return [];
     }
     try {
-      const {id, seatbid, cur} = serverResponse.body;
+      const { id, seatbid, cur } = serverResponse.body;
       _each(seatbid, (sb) => {
-        const {bid} = sb;
+        const { bid } = sb;
         _each(bid, (b) => {
-          const bidRequest = bidRequests.bids.find(({bidId}) => bidId === id);
+          const bidRequest = bidRequests.bids.find(({ bidId }) => bidId === id);
           const renderer = Renderer.install({
             url: bidRequest?.params?.renderUrl || RENDERER_URL,
           });
-          renderer.setRender((bid) => {
+          renderer.setRender((bid, doc) => {
             if (window.VIQEO) {
-              window.VIQEO.renderPrebid(bid);
+              window.VIQEO.renderPrebid(bid, doc);
             } else {
               logError('failed get window.VIQEO');
             }
           });
           bidResponses.push({
             requestId: id,
-            currency: cur,
+            currency: cur || DEFAULT_CURRENCY,
             cpm: b.price,
             ttl: b.exp,
             netRevenue: true,
@@ -168,13 +192,18 @@ export const spec = {
             vastUrl: b.nurl,
             mediaType: VIDEO,
             renderer,
-          })
-        })
+            meta: {
+              secondaryCatIds: b.cat,
+              attr: b.attr,
+              advertiserDomains: b.adomain,
+            },
+          });
+        });
       });
     } catch (error) {
       logError(error);
     }
     return bidResponses;
   },
-}
+};
 registerBidder(spec);
diff --git a/modules/viqeoBidAdapter.md b/modules/viqeoBidAdapter.md
index b4a020bf057..b3a0c59d3a5 100644
--- a/modules/viqeoBidAdapter.md
+++ b/modules/viqeoBidAdapter.md
@@ -11,23 +11,21 @@ Viqeo Bidder Adapter for Prebid.js. About: https://viqeo.tv/
 ### Bid params
 
 {: .table .table-bordered .table-striped }
-| Name                        | Scope    | Description                                                                                                                | Example                  | Type      |
-|-----------------------------|----------|----------------------------------------------------------------------------------------------------------------------------|--------------------------|-----------|
-| `user`                      | required | The object containing user data (See OpenRTB spec)                                                                         | `user: {}`               | `object`  |
-| `user.buyeruid`             | required | User id                                                                                                                    | `"12345"`                | `string`  |
-| `playerOptions`             | required | The object containing Viqeo player options                                                                                 | `playerOptions: {}`      | `object`  |
-| `playerOptions.profileId`   | required | Viqeo profile id                                                                                                           | `1382`                   | `number`  |
-| `playerOptions.videId`      | optional | Viqeo video id                                                                                                             | `"ed584da454c7205ca7e4"` | `string`  |
-| `playerOptions.playerId`    | optional | Viqeo player id                                                                                                            | `1`                      | `number`  |
-| `device`                    | optional | The object containing device data (See OpenRTB spec)                                                                       | `device: {}`             | `object`  |
-| `site`                      | optional | The object containing site data (See OpenRTB spec)                                                                         | `site: {}`               | `object`  |
-| `app`                       | optional | The object containing app data (See OpenRTB spec)                                                                          | `app: {}`                | `object`  |
-| `floor`                     | optional | Bid floor price                                                                                                            | `0.5`                    | `number`  |
-| `currency`                  | optional | 3-letter ISO 4217 code defining the currency of the bid.                                                                   | `EUR`                    | `string`  |
-| `test`                      | optional | Flag which will induce a sample bid response when true; only set to true for testing purposes (1 = true, 0 = false)        | `1`                      | `integer` |
-| `sspId`                     | optional | For debug, request id                                                                                                      | `1`                      | `number`  |
-| `renderUrl`                 | optional | For debug, script player url                                                                                               | `"https://viqeo.tv"`     | `string`  |
-| `endpointUrl`               | optional | For debug, api endpoint                                                                                                    | `"https://viqeo.tv"`     | `string`  |
+| Name                        | Scope    | Description                                                                                                         | Example                  | Type      |
+|-----------------------------|----------|---------------------------------------------------------------------------------------------------------------------|--------------------------|-----------|
+| `tagid`                     | required | The unique identifier of the ad placement. Could be obtained from the Viqeo UI or from your account manager.        | `2`                      | `string`  |
+| `playerOptions`             | required | The object containing Viqeo player options                                                                          | `playerOptions: {}`      | `object`  |
+| `playerOptions.profileId`   | required | Viqeo profile id                                                                                                    | `1382`                   | `number`  |
+| `playerOptions.videId`      | optional | Viqeo video id                                                                                                      | `"ed584da454c7205ca7e4"` | `string`  |
+| `playerOptions.playerId`    | optional | Viqeo player id                                                                                                     | `1`                      | `number`  |
+| `user`                      | optional | The object containing user data (See OpenRTB spec)                                                                  | `user: {}`               | `object`  |
+| `device`                    | optional | The object containing device data (See OpenRTB spec)                                                                | `device: {}`             | `object`  |
+| `site`                      | optional | The object containing site data (See OpenRTB spec)                                                                  | `site: {}`               | `object`  |
+| `floor`                     | optional | Bid floor price                                                                                                     | `0.5`                    | `number`  |
+| `currency`                  | optional | 3-letter ISO 4217 code defining the currency of the bid.                                                            | `EUR`                    | `string`  |
+| `test`                      | optional | Flag which will induce a sample bid response when true; only set to true for testing purposes (1 = true, 0 = false) | `1`                      | `integer` |
+| `renderUrl`                 | optional | For debug, script player url                                                                                        | `"https://viqeo.tv"`     | `string`  |
+| `endpointUrl`               | optional | For debug, api endpoint                                                                                             | `"https://viqeo.tv"`     | `string`  |
 
 # Test Parameters
 ```
@@ -42,9 +40,7 @@ Viqeo Bidder Adapter for Prebid.js. About: https://viqeo.tv/
       bids: [{
         bidder: 'viqeo',
         params: { 
-            user: {
-                buyeruid: '1',
-            },
+            tagId: '2',
             playerOptions: {
                 videoId: 'ed584da454c7205ca7e4',
                 profileId: 1382,
diff --git a/modules/visiblemeasuresBidAdapter.js b/modules/visiblemeasuresBidAdapter.js
index e77477c812b..1c51944c538 100644
--- a/modules/visiblemeasuresBidAdapter.js
+++ b/modules/visiblemeasuresBidAdapter.js
@@ -1,212 +1,19 @@
-import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'visiblemeasures';
 const AD_URL = 'https://us-e.visiblemeasures.com/pbjs';
 const SYNC_URL = 'https://cs.visiblemeasures.com';
 
-function isBidResponseValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
-  }
-
-  switch (bid.mediaType) {
-    case BANNER:
-      return Boolean(bid.width && bid.height && bid.ad);
-    case VIDEO:
-      return Boolean(bid.vastUrl || bid.vastXml);
-    case NATIVE:
-      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
-    default:
-      return false;
-  }
-}
-
-function getPlacementReqData(bid) {
-  const { params, bidId, mediaTypes } = bid;
-  const schain = bid.schain || {};
-  const { placementId, endpointId } = params;
-  const bidfloor = getBidFloor(bid);
-
-  const placement = {
-    bidId,
-    schain,
-    bidfloor
-  };
-
-  if (placementId) {
-    placement.placementId = placementId;
-    placement.type = 'publisher';
-  } else if (endpointId) {
-    placement.endpointId = endpointId;
-    placement.type = 'network';
-  }
-
-  if (mediaTypes && mediaTypes[BANNER]) {
-    placement.adFormat = BANNER;
-    placement.sizes = mediaTypes[BANNER].sizes;
-  } else if (mediaTypes && mediaTypes[VIDEO]) {
-    placement.adFormat = VIDEO;
-    placement.playerSize = mediaTypes[VIDEO].playerSize;
-    placement.minduration = mediaTypes[VIDEO].minduration;
-    placement.maxduration = mediaTypes[VIDEO].maxduration;
-    placement.mimes = mediaTypes[VIDEO].mimes;
-    placement.protocols = mediaTypes[VIDEO].protocols;
-    placement.startdelay = mediaTypes[VIDEO].startdelay;
-    placement.placement = mediaTypes[VIDEO].placement;
-    placement.skip = mediaTypes[VIDEO].skip;
-    placement.skipafter = mediaTypes[VIDEO].skipafter;
-    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
-    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
-    placement.delivery = mediaTypes[VIDEO].delivery;
-    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
-    placement.api = mediaTypes[VIDEO].api;
-    placement.linearity = mediaTypes[VIDEO].linearity;
-  } else if (mediaTypes && mediaTypes[NATIVE]) {
-    placement.native = mediaTypes[NATIVE];
-    placement.adFormat = NATIVE;
-  }
-
-  return placement;
-}
-
-function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return deepAccess(bid, 'params.bidfloor', 0);
-  }
-
-  try {
-    const bidFloor = bid.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*',
-    });
-    return bidFloor.floor;
-  } catch (err) {
-    logError(err);
-    return 0;
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: (bid = {}) => {
-    const { params, bidId, mediaTypes } = bid;
-    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
-
-    if (mediaTypes && mediaTypes[BANNER]) {
-      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
-    } else if (mediaTypes && mediaTypes[VIDEO]) {
-      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
-    } else if (mediaTypes && mediaTypes[NATIVE]) {
-      valid = valid && Boolean(mediaTypes[NATIVE]);
-    } else {
-      valid = false;
-    }
-    return valid;
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
-    try {
-      refferLocation = refferUrl && new URL(refferUrl);
-    } catch (e) {
-      logMessage(e);
-    }
-    // TODO: does the fallback make sense here?
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
-    const placements = [];
-    const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
-      placements,
-      coppa: config.getConfig('coppa') === true ? 1 : 0,
-      ccpa: bidderRequest.uspConsent || undefined,
-      gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: bidderRequest.timeout
-    };
-
-    const len = validBidRequests.length;
-    for (let i = 0; i < len; i++) {
-      const bid = validBidRequests[i];
-      placements.push(getPlacementReqData(bid));
-    }
-
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    for (let i = 0; i < serverResponse.body.length; i++) {
-      let resItem = serverResponse.body[i];
-      if (isBidResponseValid(resItem)) {
-        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
-        resItem.meta = { ...resItem.meta, advertiserDomains };
-
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
-    if (gdprConsent && gdprConsent.consentString) {
-      if (typeof gdprConsent.gdprApplies === 'boolean') {
-        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
-      }
-    }
-    if (uspConsent && uspConsent.consentString) {
-      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
-    }
-
-    const coppa = config.getConfig('coppa') ? 1 : 0;
-    syncUrl += `&coppa=${coppa}`;
-
-    return [{
-      type: syncType,
-      url: syncUrl
-    }];
-  }
+  isBidRequestValid: isBidRequestValid(),
+  buildRequests: buildRequests(AD_URL),
+  interpretResponse,
+  getUserSyncs: getUserSyncs(SYNC_URL)
 };
 
 registerBidder(spec);
diff --git a/modules/visxBidAdapter.js b/modules/visxBidAdapter.js
index a45a1db9ece..510106845db 100644
--- a/modules/visxBidAdapter.js
+++ b/modules/visxBidAdapter.js
@@ -1,10 +1,12 @@
-import {deepAccess, logError, parseSizesInput, triggerPixel} from '../src/utils.js';
+import {deepAccess, logError, mergeDeep, parseSizesInput, sizeTupleToRtbSize, sizesToSizeTuples, triggerPixel} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {INSTREAM as VIDEO_INSTREAM} from '../src/video.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {getGptSlotInfoForAdUnitCode} from '../libraries/gptUtils/gptUtils.js';
+import { getBidFromResponse } from '../libraries/processResponse/index.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
 
 const BIDDER_CODE = 'visx';
 const GVLID = 154;
@@ -15,6 +17,7 @@ const TIME_TO_LIVE = 360;
 const DEFAULT_CUR = 'EUR';
 const ADAPTER_SYNC_PATH = '/push_sync';
 const TRACK_TIMEOUT_PATH = '/track/bid_timeout';
+const RUNTIME_STATUS_RESPONSE_TIME = 999000;
 const LOG_ERROR_MESS = {
   noAuid: 'Bid from response has no auid parameter - ',
   noAdm: 'Bid from response has no adm parameter - ',
@@ -31,8 +34,9 @@ const LOG_ERROR_MESS = {
   onlyVideoInstream: `Only video ${VIDEO_INSTREAM} supported`,
   videoMissing: 'Bid request videoType property is missing - '
 };
-const currencyWhiteList = ['EUR', 'USD', 'GBP', 'PLN'];
+const currencyWhiteList = ['EUR', 'USD', 'GBP', 'PLN', 'CHF', 'SEK'];
 export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+const _bidResponseTimeLogged = [];
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
@@ -54,14 +58,19 @@ export const spec = {
     const bids = validBidRequests || [];
     const currency =
       config.getConfig(`currency.bidderCurrencyDefault.${BIDDER_CODE}`) ||
-      config.getConfig('currency.adServerCurrency') ||
+      getCurrencyFromBidderRequest(bidderRequest) ||
       DEFAULT_CUR;
-
+    let request;
     let reqId;
     let payloadSchain;
     let payloadUserId;
     let payloadUserEids;
     let timeout;
+    let payloadDevice;
+    let payloadSite;
+    let payloadRegs;
+    let payloadContent;
+    let payloadUser;
 
     if (currencyWhiteList.indexOf(currency) === -1) {
       logError(LOG_ERROR_MESS.notAllowedCurrency + currency);
@@ -78,9 +87,7 @@ export const spec = {
         imp.push(impObj);
         bidsMap[bid.bidId] = bid;
       }
-
       const { params: { uid }, schain, userId, userIdAsEids } = bid;
-
       if (!payloadSchain && schain) {
         payloadSchain = schain;
       }
@@ -91,6 +98,7 @@ export const spec = {
       if (!payloadUserId && userId) {
         payloadUserId = userId;
       }
+
       auids.push(uid);
     });
 
@@ -98,10 +106,7 @@ export const spec = {
 
     if (bidderRequest) {
       timeout = bidderRequest.timeout;
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
-        // TODO: is 'page' the right value here?
-        payload.u = bidderRequest.refererInfo.page;
-      }
+
       if (bidderRequest.gdprConsent) {
         if (bidderRequest.gdprConsent.consentString) {
           payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
@@ -110,10 +115,45 @@ export const spec = {
             (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean')
               ? Number(bidderRequest.gdprConsent.gdprApplies) : 1;
       }
+
+      const { ortb2 } = bidderRequest;
+      const { device, site, regs, content } = ortb2;
+      const userOrtb2 = ortb2.user;
+      let user;
+      let userReq;
+      const vads = _getUserId();
+      if (payloadUserEids || payload.gdpr_consent || vads) {
+        user = {
+          ext: {
+            ...(payloadUserEids && { eids: payloadUserEids }),
+            ...(payload.gdpr_consent && { consent: payload.gdpr_consent }),
+            ...(vads && { vads })
+          }
+        };
+      }
+      if (user) {
+        userReq = mergeDeep(user, userOrtb2);
+      } else {
+        userReq = userOrtb2;
+      }
+      if (device) {
+        payloadDevice = device;
+      }
+      if (site) {
+        payloadSite = site;
+      }
+      if (regs) {
+        payloadRegs = regs;
+      }
+      if (content) {
+        payloadContent = content;
+      }
+      if (userReq) {
+        payloadUser = userReq;
+      }
     }
 
-    const bidderTimeout = Number(config.getConfig('bidderTimeout')) || timeout;
-    const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
+    const tmax = timeout;
     const source = {
       ext: {
         wrapperType: 'Prebid_js',
@@ -122,29 +162,25 @@ export const spec = {
       }
     };
 
-    const vads = _getUserId();
-    const user = {
-      ext: {
-        ...(payloadUserEids && { eids: payloadUserEids }),
-        ...(payload.gdpr_consent && { consent: payload.gdpr_consent }),
-        ...(vads && { vads })
-      }
-    };
-    const regs = ('gdpr_applies' in payload) && {
-      ext: {
-        gdpr: payload.gdpr_applies
-      }
-    };
+    if (payloadRegs === undefined) {
+      payloadRegs = ('gdpr_applies' in payload) && {
+        ext: {
+          gdpr: payload.gdpr_applies
+        }
+      };
+    }
 
-    const request = {
+    request = {
       id: reqId,
       imp,
       tmax,
       cur: [currency],
       source,
-      site: { page: payload.u },
-      ...(Object.keys(user.ext).length && { user }),
-      ...(regs && { regs })
+      ...(payloadUser && { user: payloadUser }),
+      ...(payloadRegs && {regs: payloadRegs}),
+      ...(payloadDevice && { device: payloadDevice }),
+      ...(payloadSite && { site: payloadSite }),
+      ...(payloadContent && { content: payloadContent }),
     };
 
     return {
@@ -169,7 +205,7 @@ export const spec = {
 
     if (!errorMessage && serverResponse.seatbid) {
       serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidsMap, currency, bidResponses);
+        _addBidResponse(getBidFromResponse(respItem, LOG_ERROR_MESS), bidsMap, currency, bidResponses);
       });
     }
     if (errorMessage) logError(errorMessage);
@@ -208,6 +244,12 @@ export const spec = {
     if (bid.ext && bid.ext.events && bid.ext.events.win) {
       triggerPixel(bid.ext.events.win);
     }
+    // Call 'track/runtime' with the corresponding bid.requestId - only once per auction
+    if (bid.ext && bid.ext.events && bid.ext.events.runtime && !_bidResponseTimeLogged.includes(bid.auctionId)) {
+      _bidResponseTimeLogged.push(bid.auctionId);
+      const _roundedTime = _roundResponseTime(bid.timeToRespond, 50);
+      triggerPixel(bid.ext.events.runtime.replace('{STATUS_CODE}', RUNTIME_STATUS_RESPONSE_TIME + _roundedTime));
+    }
   },
   onTimeout: function(timeoutData) {
     // Call '/track/bid_timeout' with timeout data
@@ -233,13 +275,7 @@ function makeBanner(bannerParams) {
   if (bannerSizes) {
     const sizes = parseSizesInput(bannerSizes);
     if (sizes.length) {
-      const format = sizes.map(size => {
-        const [ width, height ] = size.split('x');
-        const w = parseInt(width, 10);
-        const h = parseInt(height, 10);
-        return { w, h };
-      });
-
+      const format = sizesToSizeTuples(bannerSizes).map(sizeTupleToRtbSize);
       return { format };
     }
   }
@@ -279,17 +315,6 @@ function buildImpObject(bid) {
   }
 }
 
-function _getBidFromResponse(respItem) {
-  if (!respItem) {
-    logError(LOG_ERROR_MESS.emptySeatbid);
-  } else if (!respItem.bid) {
-    logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
-  } else if (!respItem.bid[0]) {
-    logError(LOG_ERROR_MESS.noBid);
-  }
-  return respItem && respItem.bid && respItem.bid[0];
-}
-
 function _addBidResponse(serverBid, bidsMap, currency, bidResponses) {
   if (!serverBid) return;
   let errorMessage;
@@ -321,6 +346,10 @@ function _addBidResponse(serverBid, bidsMap, currency, bidResponses) {
 
         if (serverBid.ext && serverBid.ext.prebid) {
           bidResponse.ext = serverBid.ext.prebid;
+          if (serverBid.ext.visx && serverBid.ext.visx.events) {
+            const prebidExtEvents = bidResponse.ext.events || {};
+            bidResponse.ext.events = Object.assign(prebidExtEvents, serverBid.ext.visx.events);
+          }
         }
 
         const visxTargeting = deepAccess(serverBid, 'ext.prebid.targeting');
@@ -434,4 +463,15 @@ function _getUserId() {
   return null;
 }
 
+function _roundResponseTime(time, timeRange) {
+  if (time <= 0) {
+    return 0; // Special code for scriptLoadTime of 0 ms or less
+  } else if (time > 5000) {
+    return 100; // Constant code for scriptLoadTime greater than 5000 ms
+  } else {
+    const roundedValue = Math.floor((time - 1) / timeRange) + 1;
+    return roundedValue;
+  }
+}
+
 registerBidder(spec);
diff --git a/modules/voxBidAdapter.js b/modules/voxBidAdapter.js
index 34bd46ccb98..b0cfdabee9f 100644
--- a/modules/voxBidAdapter.js
+++ b/modules/voxBidAdapter.js
@@ -2,20 +2,25 @@ import {_map, deepAccess, isArray, logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {find} from '../src/polyfill.js';
-import {auctionManager} from '../src/auctionManager.js';
 import {Renderer} from '../src/Renderer.js';
-import {config} from '../src/config.js'
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
 
-const { getConfig } = config;
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
 
 const BIDDER_CODE = 'vox';
 const SSP_ENDPOINT = 'https://ssp.hybrid.ai/auction/prebid';
 const VIDEO_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
 const TTL = 60;
+const GVLID = 206;
 
-function buildBidRequests(validBidRequests) {
+function buildBidRequests(validBidRequests, bidderRequest) {
   return _map(validBidRequests, function(bid) {
-    const currency = getConfig('currency.adServerCurrency');
+    const currency = getCurrencyFromBidderRequest(bidderRequest);
     const floorInfo = bid.getFloor ? bid.getFloor({
       currency: currency || 'USD'
     }) : {};
@@ -91,17 +96,13 @@ function buildBid(bidData) {
   if (bidData.placement === 'video') {
     bid.vastXml = bidData.content;
     bid.mediaType = VIDEO;
+    const video = bidData.mediaTypes?.video;
 
-    // TODO: why does this need to iterate through every ad unit?
-    let adUnit = find(auctionManager.getAdUnits(), function (unit) {
-      return unit.transactionId === bidData.transactionId;
-    });
-
-    if (adUnit) {
-      bid.width = adUnit.mediaTypes.video.playerSize[0][0];
-      bid.height = adUnit.mediaTypes.video.playerSize[0][1];
+    if (video) {
+      bid.width = video.playerSize[0][0];
+      bid.height = video.playerSize[0][1];
 
-      if (adUnit.mediaTypes.video.context === 'outstream') {
+      if (video.context === 'outstream') {
         bid.renderer = createRenderer(bid);
       }
     }
@@ -183,6 +184,7 @@ function wrapBanner(bid, bidData) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO],
 
   /**
@@ -214,7 +216,7 @@ export const spec = {
       // TODO: is 'page' the right value here?
       url: bidderRequest.refererInfo.page,
       cmp: !!bidderRequest.gdprConsent,
-      bidRequests: buildBidRequests(validBidRequests)
+      bidRequests: buildBidRequests(validBidRequests, bidderRequest)
     };
 
     if (payload.cmp) {
diff --git a/modules/vrtcalBidAdapter.js b/modules/vrtcalBidAdapter.js
index 21870e3218a..07dc35525c3 100644
--- a/modules/vrtcalBidAdapter.js
+++ b/modules/vrtcalBidAdapter.js
@@ -5,6 +5,8 @@ import { config } from '../src/config.js';
 import {deepAccess, isFn, isPlainObject} from '../src/utils.js';
 
 const GVLID = 706;
+const VRTCAL_USER_SYNC_URL_IFRAME = `https://usync.vrtcal.com/i?ssp=1804&synctype=iframe`;
+const VRTCAL_USER_SYNC_URL_REDIRECT = `https://usync.vrtcal.com/i?ssp=1804&synctype=redirect`;
 
 export const spec = {
   code: 'vrtcal',
@@ -67,7 +69,7 @@ export const spec = {
           name: 'VRTCAL_FILLED',
           cat: deepAccess(bid, 'ortb2.site.cat', []),
           domain: decodeURIComponent(window.location.href).replace('https://', '').replace('http://', '').split('/')[0],
-          page: bid.refererInfo.page
+          page: window.location.href
         },
         device: {
           language: navigator.language,
@@ -148,7 +150,34 @@ export const spec = {
     );
     ajax(winUrl, null);
     return true;
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent = {}, uspConsent = '', gppConsent = {}) {
+    const syncs = [];
+    const gdprFlag = `&gdpr=${gdprConsent.gdprApplies ? 1 : 0}`;
+    const gdprString = `&gdpr_consent=${encodeURIComponent((gdprConsent.consentString || ''))}`;
+    const usPrivacy = `&us_privacy=${encodeURIComponent(uspConsent)}`;
+    const gpp = gppConsent.gppString ? gppConsent.gppString : '';
+    const gppSid = Array.isArray(gppConsent.applicableSections) ? gppConsent.applicableSections.join(',') : '';
+    let vrtcalSyncURL = ''
+
+    if (syncOptions.iframeEnabled) {
+      vrtcalSyncURL = `${VRTCAL_USER_SYNC_URL_IFRAME}${usPrivacy}${gdprFlag}${gdprString}&gpp=${gpp}&gpp_sid=${gppSid}&surl=`;
+      syncs.push({
+        type: 'iframe',
+        url: vrtcalSyncURL
+      });
+    } else {
+      vrtcalSyncURL = `${VRTCAL_USER_SYNC_URL_REDIRECT}${usPrivacy}${gdprFlag}${gdprString}&gpp=${gpp}&gpp_sid=${gppSid}&surl=`;
+      syncs.push({
+        type: 'image',
+        url: vrtcalSyncURL
+      });
+    }
+
+    return syncs;
   }
+
 };
 
 registerBidder(spec);
diff --git a/modules/waardexBidAdapter.js b/modules/waardexBidAdapter.js
index 92b7fc26e4c..c4ca5d299bc 100644
--- a/modules/waardexBidAdapter.js
+++ b/modules/waardexBidAdapter.js
@@ -147,7 +147,6 @@ const createVideoObject = (videoMediaTypes, videoParams) => {
     maxduration: getBidIdParameter('maxduration', videoParams) || 500,
     protocols: getBidIdParameter('protocols', videoParams) || [2, 3, 5, 6],
     startdelay: getBidIdParameter('startdelay', videoParams) || 0,
-    placement: getBidIdParameter('placement', videoParams) || videoMediaTypes.context === 'outstream' ? 3 : 1,
     skip: getBidIdParameter('skip', videoParams) || 1,
     skipafter: getBidIdParameter('skipafter', videoParams) || 0,
     minbitrate: getBidIdParameter('minbitrate', videoParams) || 0,
diff --git a/modules/waardexBidAdapter.md b/modules/waardexBidAdapter.md
index 6978281d40e..165321c2057 100644
--- a/modules/waardexBidAdapter.md
+++ b/modules/waardexBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name:  Waardex Bid Adapter
 Module Type:  Bidder Adapter
-Maintainer: info@prebid.org
+Maintainer: 
 ```
 
 # Description
diff --git a/modules/weboramaRtdProvider.js b/modules/weboramaRtdProvider.js
index 14abba95323..67822234840 100644
--- a/modules/weboramaRtdProvider.js
+++ b/modules/weboramaRtdProvider.js
@@ -7,25 +7,29 @@
  * @requires module:modules/realTimeData
  */
 
-/** profile metadata
+/**
+ * profile metadata
  * @typedef dataCallbackMetadata
  * @property {boolean} user if true it is user-centric data
  * @property {string} source describe the source of data, if 'contextual' or 'wam'
  * @property {boolean} isDefault if true it the default profile defined in the configuration
  */
 
-/** profile from contextual, wam or sfbx
+/**
+ * profile from contextual, wam or sfbx
  * @typedef {Object.} Profile
  */
 
-/** onData callback type
+/**
+ * onData callback type
  * @callback dataCallback
  * @param {Profile} data profile data
  * @param {dataCallbackMetadata} meta metadata
  * @returns {void}
  */
 
-/** setPrebidTargeting callback type
+/**
+ * setPrebidTargeting callback type
  * @callback setPrebidTargetingCallback
  * @param {string} adUnitCode
  * @param {Profile} data
@@ -33,7 +37,8 @@
  * @returns {boolean}
  */
 
-/** sendToBidders callback type
+/**
+ * sendToBidders callback type
  * @callback sendToBiddersCallback
  * @param {Object} bid
  * @param {string} adUnitCode
@@ -90,39 +95,32 @@
  * @property {?boolean} enabled if false, will ignore this configuration
  */
 
-/** common configuration between contextual, wam and sfbx
+/**
+ * common configuration between contextual, wam and sfbx
  * @typedef {WeboCtxConf|WeboUserDataConf|SfbxLiteDataConf} CommonConf
  */
 
+import { getGlobal } from '../src/prebidGlobal.js';
 import {
-  getGlobal
-} from '../src/prebidGlobal.js';
-import {
+  deepAccess,
   deepClone,
   deepSetValue,
-  isEmpty,
-  isFn,
-  logError,
-  logMessage,
   isArray,
-  isStr,
   isBoolean,
+  isEmpty,
+  isFn,
+  isNumber,
   isPlainObject,
-  logWarn,
-  mergeDeep
+  isStr,
+  mergeDeep,
+  prefixLog,
 } from '../src/utils.js';
-import {
-  submodule
-} from '../src/hook.js';
-import {
-  ajax
-} from '../src/ajax.js';
-import {
-  getStorageManager
-} from '../src/storageManager.js';
+import { submodule } from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
 import adapterManager from '../src/adapterManager.js';
-import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
-import {tryAppendQueryString} from '../libraries/urlUtils/urlUtils.js';
+import { tryAppendQueryString } from '../libraries/urlUtils/urlUtils.js';
 
 /** @type {string} */
 const MODULE_NAME = 'realTimeData';
@@ -153,9 +151,11 @@ const SFBX_LITE_DATA_SOURCE_LABEL = 'lite';
 /** @type {number} */
 const GVLID = 284;
 
+const logger = prefixLog('[WeboramaRTD]');
+
 export const storage = getStorageManager({
   moduleType: MODULE_TYPE_RTD,
-  moduleName: SUBMODULE_NAME
+  moduleName: SUBMODULE_NAME,
 });
 
 /**
@@ -188,23 +188,30 @@ class WeboramaRtdProvider {
   constructor(components) {
     this.#components = components;
   }
-  /** Initialize module
+  /**
+   * Initialize module
    * @method
    * @param {Object} moduleConfig
    * @param {?ModuleParams} moduleConfig.params
+   * @param {Object} userConsent
+   * @param {?Object} userConsent.gdpr
    * @return {boolean} true if module was initialized with success
    */
-  init(moduleConfig) {
+  init(moduleConfig, userConsent) {
     /** @type {Object} */
     const globalDefaults = {
       setPrebidTargeting: true,
       sendToBidders: true,
       onData: () => {
         /* do nothing */
-      }
+      },
     };
     /** @type {ModuleParams} */
-    const moduleParams = Object.assign({}, globalDefaults, moduleConfig?.params || {});
+    const moduleParams = Object.assign(
+      {},
+      globalDefaults,
+      moduleConfig?.params || {}
+    );
 
     // reset profiles
 
@@ -212,14 +219,32 @@ class WeboramaRtdProvider {
     this.#components.WeboUserData.data = null;
     this.#components.SfbxLiteData.data = null;
 
-    this.#components.WeboCtx.initialized = this.#initSubSection(moduleParams, WEBO_CTX_CONF_SECTION, 'token');
-    this.#components.WeboUserData.initialized = this.#initSubSection(moduleParams, WEBO_USER_DATA_CONF_SECTION);
-    this.#components.SfbxLiteData.initialized = this.#initSubSection(moduleParams, SFBX_LITE_DATA_CONF_SECTION);
+    const weboCtxRequiredFields = ['token'];
+
+    this.#components.WeboCtx.initialized = this.#initSubSection(
+      moduleParams,
+      WEBO_CTX_CONF_SECTION,
+      {
+        requiredFields: weboCtxRequiredFields,
+      }
+    );
+    this.#components.WeboUserData.initialized = this.#initSubSection(
+      moduleParams,
+      WEBO_USER_DATA_CONF_SECTION,
+      {
+        userConsent: userConsent || {},
+      }
+    );
+    this.#components.SfbxLiteData.initialized = this.#initSubSection(
+      moduleParams,
+      SFBX_LITE_DATA_CONF_SECTION
+    );
 
     return Object.values(this.#components).some((c) => c.initialized);
   }
 
-  /** function that will allow RTD sub-modules to modify the AdUnit object for each auction
+  /**
+   * function that will allow RTD sub-modules to modify the AdUnit object for each auction
    * @method
    * @param {Object} reqBidsConfigObj
    * @param {doneCallback} onDone
@@ -242,18 +267,25 @@ class WeboramaRtdProvider {
     /** @type {WeboCtxConf} */
     const weboCtxConf = moduleParams.weboCtxConf || {};
 
-    this.#fetchContextualProfile(weboCtxConf, (data) => {
-      logMessage('fetchContextualProfile on getBidRequestData is done');
+    this.#fetchContextualProfile(
+      weboCtxConf,
+      (data) => {
+        logger.logMessage(
+          'fetchContextualProfile on getBidRequestData is done'
+        );
 
-      this.#setWeboContextualProfile(data);
-    }, () => {
-      this.#handleBidRequestData(reqBidsConfigObj, moduleParams);
+        this.#setWeboContextualProfile(data);
+      },
+      () => {
+        this.#handleBidRequestData(reqBidsConfigObj, moduleParams);
 
-      onDone();
-    });
+        onDone();
+      }
+    );
   }
 
-  /** function that provides ad server targeting data to RTD-core
+  /**
+   * function that provides ad server targeting data to RTD-core
    * @method
    * @param {string[]} adUnitsCodes
    * @param {Object} moduleConfig
@@ -267,17 +299,17 @@ class WeboramaRtdProvider {
     const profileHandlers = this.#buildProfileHandlers(moduleParams);
 
     if (isEmpty(profileHandlers)) {
-      logMessage('no data to set targeting');
+      logger.logMessage('no data to set targeting');
       return {};
     }
 
     try {
       return adUnitsCodes.reduce((data, adUnitCode) => {
         data[adUnitCode] = profileHandlers.reduce((targeting, ph) => {
-          // logMessage(`check if should set targeting for adunit '${adUnitCode}'`);
+          // logger.logMessage(`check if should set targeting for adunit '${adUnitCode}'`);
           const [data, metadata] = this.#copyDataAndMetadata(ph);
           if (ph.setTargeting(adUnitCode, data, metadata)) {
-            // logMessage(`set targeting for adunit '${adUnitCode}', source '${metadata.source}'`);
+            // logger.logMessage(`set targeting for adunit '${adUnitCode}', source '${metadata.source}'`);
 
             mergeDeep(targeting, data);
           }
@@ -288,21 +320,24 @@ class WeboramaRtdProvider {
         return data;
       }, {});
     } catch (e) {
-      logError(`unable to format weborama rtd targeting data:`, e);
+      logger.logError(`unable to format weborama rtd targeting data:`, e);
 
       return {};
     }
   }
 
-  /** Initialize subsection module
+  /**
+   * Initialize subsection module
    * @method
    * @private
    * @param {ModuleParams} moduleParams
    * @param {string} subSection subsection name to initialize
-   * @param {string[]} requiredFields
+   * @param {?Object} extra
+   * @param {string[]} extra.requiredFields
+   * @param {?Object} extra.userConsent
    * @return {boolean} true if module subsection was initialized with success
    */
-  #initSubSection(moduleParams, subSection, ...requiredFields) {
+  #initSubSection(moduleParams, subSection, extra) {
     /** @type {CommonConf} */
     const weboSectionConf = moduleParams[subSection] || { enabled: false };
 
@@ -315,22 +350,71 @@ class WeboramaRtdProvider {
     try {
       this.#normalizeConf(moduleParams, weboSectionConf);
 
-      requiredFields.forEach(field => {
+      extra = extra || {};
+      const requiredFields = extra?.requiredFields || [];
+
+      requiredFields.forEach((field) => {
         if (!(field in weboSectionConf)) {
-          throw `missing required field '${field}''`;
+          throw `missing required field '${field}'`;
         }
       });
+
+      if (
+        isPlainObject(extra?.userConsent?.gdpr) &&
+        !this.#checkTCFv2(extra.userConsent.gdpr)
+      ) {
+        throw 'gdpr consent not ok';
+      }
     } catch (e) {
-      logError(`unable to initialize: error on ${subSection} configuration:`, e);
+      logger.logError(
+        `unable to initialize: error on '${subSection}' configuration:`,
+        e
+      );
       return false;
     }
 
-    logMessage(`weborama ${subSection} initialized with success`);
+    logger.logMessage(`weborama '${subSection}' initialized with success`);
 
     return true;
   }
 
-  /** normalize submodule configuration
+  /**
+   * check gdpr consent data
+   * @method
+   * @private
+   * @param {Object} gdpr
+   * @param {?boolean} gdpr.gdprApplies
+   * @param {?Object} gdpr.vendorData
+   * @param {?Object} gdpr.vendorData.purpose
+   * @param {?Object.} gdpr.vendorData.purpose.consents
+   * @param {?Object} gdpr.vendorData.vendor
+   * @param {?Object.} gdpr.vendorData.vendor.consents
+   * @return {boolean}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #checkTCFv2(gdpr) {
+    if (gdpr?.gdprApplies !== true) {
+      return true;
+    }
+
+    if (
+      deepAccess(gdpr, 'vendorData.vendor.consents') &&
+      deepAccess(gdpr, 'vendorData.purpose.consents')
+    ) {
+      return (
+        gdpr.vendorData.vendor.consents[GVLID] === true && // check weborama vendor id
+        gdpr.vendorData.purpose.consents[1] === true && // info storage access
+        gdpr.vendorData.purpose.consents[3] === true && // create personalized ads
+        gdpr.vendorData.purpose.consents[4] === true && // select personalized ads
+        gdpr.vendorData.purpose.consents[5] === true && // create personalized content
+        gdpr.vendorData.purpose.consents[6] === true
+      ); // select personalized content
+    }
+
+    return true;
+  }
+  /**
+   * normalize submodule configuration
    * @method
    * @private
    * @param {ModuleParams} moduleParams
@@ -363,7 +447,8 @@ class WeboramaRtdProvider {
     }
   }
 
-  /** coerce setPrebidTargeting to a callback
+  /**
+   * coerce setPrebidTargeting to a callback
    * @method
    * @private
    * @param {CommonConf} submoduleParams
@@ -373,13 +458,16 @@ class WeboramaRtdProvider {
   // eslint-disable-next-line no-dupe-class-members
   #coerceSetPrebidTargeting(submoduleParams) {
     try {
-      submoduleParams.setPrebidTargeting = this.#wrapValidatorCallback(submoduleParams.setPrebidTargeting);
+      submoduleParams.setPrebidTargeting = this.#wrapValidatorCallback(
+        submoduleParams.setPrebidTargeting
+      );
     } catch (e) {
       throw `invalid setPrebidTargeting: ${e}`;
     }
   }
 
-  /** coerce sendToBidders to a callback
+  /**
+   * coerce sendToBidders to a callback
    * @method
    * @private
    * @param {CommonConf} submoduleParams
@@ -391,10 +479,13 @@ class WeboramaRtdProvider {
     let sendToBidders = submoduleParams.sendToBidders;
 
     if (isPlainObject(sendToBidders)) {
-      const sendToBiddersMap = Object.entries(sendToBidders).reduce((map, [key, value]) => {
-        map[key] = this.#wrapValidatorCallback(value);
-        return map;
-      }, {});
+      const sendToBiddersMap = Object.entries(sendToBidders).reduce(
+        (map, [key, value]) => {
+          map[key] = this.#wrapValidatorCallback(value);
+          return map;
+        },
+        {}
+      );
 
       submoduleParams.sendToBidders = (bid, adUnitCode) => {
         const bidder = bid.bidder;
@@ -415,8 +506,10 @@ class WeboramaRtdProvider {
     }
 
     try {
-      submoduleParams.sendToBidders = this.#wrapValidatorCallback(submoduleParams.sendToBidders,
-        (bid) => bid.bidder);
+      submoduleParams.sendToBidders = this.#wrapValidatorCallback(
+        submoduleParams.sendToBidders,
+        (bid) => bid.bidder
+      );
     } catch (e) {
       throw `invalid sendToBidders: ${e}`;
     }
@@ -426,7 +519,8 @@ class WeboramaRtdProvider {
    * @typedef {Object} AdUnit
    * @property {Object[]} bids
    */
-  /** function that handles bid request data
+  /**
+   * function that handles bid request data
    * @method
    * @private
    * @param {Object} reqBidsConfigObj
@@ -441,21 +535,21 @@ class WeboramaRtdProvider {
     const profileHandlers = this.#buildProfileHandlers(moduleParams);
 
     if (isEmpty(profileHandlers)) {
-      logMessage('no data to send to bidders');
+      logger.logMessage('no data to send to bidders');
       return;
     }
 
     const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
 
     try {
-      adUnits.forEach(
-        adUnit => adUnit.bids?.forEach(
-          bid => profileHandlers.forEach(ph => {
-            // logMessage(`check if bidder '${bid.bidder}' and adunit '${adUnit.code} are share ${ph.metadata.source} data`);
+      adUnits.forEach((adUnit) =>
+        adUnit.bids?.forEach((bid) =>
+          profileHandlers.forEach((ph) => {
+            // logger.logMessage(`check if bidder '${bid.bidder}' and adunit '${adUnit.code} are share ${ph.metadata.source} data`);
 
             const [data, metadata] = this.#copyDataAndMetadata(ph);
             if (ph.sendToBidders(bid, adUnit.code, data, metadata)) {
-              // logMessage(`handling bidder '${bid.bidder}' with ${ph.metadata.source} data`);
+              // logger.logMessage(`handling bidder '${bid.bidder}' with ${ph.metadata.source} data`);
 
               this.#handleBid(reqBidsConfigObj, bid, data, ph.metadata);
             }
@@ -463,31 +557,37 @@ class WeboramaRtdProvider {
         )
       );
     } catch (e) {
-      logError('unable to send data to bidders:', e);
+      logger.logError('unable to send data to bidders:', e);
     }
 
-    profileHandlers.forEach(ph => {
+    profileHandlers.forEach((ph) => {
       try {
         const [data, metadata] = this.#copyDataAndMetadata(ph);
         ph.onData(data, metadata);
       } catch (e) {
-        logError(`error while execute onData callback with ${ph.metadata.source}-based data:`, e);
+        logger.logError(
+          `error while execute onData callback with ${ph.metadata.source}-based data:`,
+          e
+        );
       }
     });
   }
 
-  /** onSuccess callback type
+  /**
+   * onSuccess callback type
    * @callback successCallback
    * @param {?Object} data
    * @returns {void}
    */
 
-  /** onDone callback type
+  /**
+   * onDone callback type
    * @callback doneCallback
    * @returns {void}
    */
 
-  /** Fetch Bigsea Contextual Profile
+  /**
+   * Fetch Bigsea Contextual Profile
    * @method
    * @private
    * @param {WeboCtxConf} weboCtxConf
@@ -498,7 +598,8 @@ class WeboramaRtdProvider {
   // eslint-disable-next-line no-dupe-class-members
   #fetchContextualProfile(weboCtxConf, onSuccess, onDone) {
     const token = weboCtxConf.token;
-    const baseURLProfileAPI = weboCtxConf.baseURLProfileAPI || BASE_URL_CONTEXTUAL_PROFILE_API;
+    const baseURLProfileAPI =
+      weboCtxConf.baseURLProfileAPI || BASE_URL_CONTEXTUAL_PROFILE_API;
 
     let path = '/profile';
     let queryString = '';
@@ -512,7 +613,10 @@ class WeboramaRtdProvider {
         try {
           assetID = weboCtxConf.assetID();
         } catch (e) {
-          logError('unexpected error while fetching asset id from callback', e);
+          logger.logError(
+            'unexpected error while fetching asset id from callback',
+            e
+          );
 
           onDone();
 
@@ -521,7 +625,7 @@ class WeboramaRtdProvider {
       }
 
       if (!assetID) {
-        logError('missing asset id');
+        logger.logError('missing asset id');
 
         onDone();
 
@@ -548,7 +652,7 @@ class WeboramaRtdProvider {
     };
 
     const error = (e, req) => {
-      logError(`unable to get weborama data`, e, req);
+      logger.logError(`unable to get weborama data`, e, req);
 
       onDone();
     };
@@ -566,7 +670,8 @@ class WeboramaRtdProvider {
     ajax(urlProfileAPI, callback, null, options);
   }
 
-  /** set bigsea contextual profile on module state
+  /**
+   * set bigsea contextual profile on module state
    * @method
    * @private
    * @param {?Object} data
@@ -579,7 +684,8 @@ class WeboramaRtdProvider {
     }
   }
 
-  /** function that provides data handlers based on the configuration
+  /**
+   * function that provides data handlers based on the configuration
    * @method
    * @private
    * @param {ModuleParams} moduleParams
@@ -587,30 +693,43 @@ class WeboramaRtdProvider {
    */
   // eslint-disable-next-line no-dupe-class-members
   #buildProfileHandlers(moduleParams) {
-    const steps = [{
-      component: this.#components.WeboCtx,
-      conf: moduleParams?.weboCtxConf,
-    }, {
-      component: this.#components.WeboUserData,
-      conf: moduleParams?.weboUserDataConf,
-    }, {
-      component: this.#components.SfbxLiteData,
-      conf: moduleParams?.sfbxLiteDataConf,
-    }];
-
-    return steps.filter(step => step.component.initialized).reduce((ph, { component, conf }) => {
-      const user = component.user;
-      const source = component.source;
-      const callback = component.callbackBuilder(component /* equivalent to this */);
-      const profileHandler = this.#buildProfileHandler(conf, callback, user, source);
-      if (profileHandler) {
-        ph.push(profileHandler);
-      } else {
-        logMessage(`skip ${source} profile: no data`);
-      }
+    const steps = [
+      {
+        component: this.#components.WeboCtx,
+        conf: moduleParams?.weboCtxConf,
+      },
+      {
+        component: this.#components.WeboUserData,
+        conf: moduleParams?.weboUserDataConf,
+      },
+      {
+        component: this.#components.SfbxLiteData,
+        conf: moduleParams?.sfbxLiteDataConf,
+      },
+    ];
+
+    return steps
+      .filter((step) => step.component.initialized)
+      .reduce((ph, { component, conf }) => {
+        const user = component.user;
+        const source = component.source;
+        const callback = component.callbackBuilder(
+          component /* equivalent to this */
+        );
+        const profileHandler = this.#buildProfileHandler(
+          conf,
+          callback,
+          user,
+          source
+        );
+        if (profileHandler) {
+          ph.push(profileHandler);
+        } else {
+          logger.logMessage(`skip ${source} profile: no data`);
+        }
 
-      return ph;
-    }, []);
+        return ph;
+      }, []);
   }
 
   /**
@@ -667,7 +786,8 @@ class WeboramaRtdProvider {
       onData: dataConf.onData,
     };
   }
-  /** handle individual bid
+  /**
+   * handle individual bid
    * @method
    * @private
    * @param {Object} reqBidsConfigObj
@@ -683,18 +803,28 @@ class WeboramaRtdProvider {
   #handleBid(reqBidsConfigObj, bid, profile, metadata) {
     this.#handleBidViaORTB2(reqBidsConfigObj, bid.bidder, profile, metadata);
 
-    /** @type {Object.} */
-    const bidderAliasRegistry = adapterManager.aliasRegistry || {};
-
     /** @type {string} */
-    const bidder = bidderAliasRegistry[bid.bidder] || bid.bidder;
+    const bidder = this.#getAdapterNameForAlias(bid.bidder);
 
     if (bidder == 'appnexus') {
       this.#handleAppnexusBid(reqBidsConfigObj, bid, profile);
     }
   }
 
-  /** function that handles bid request data
+  /**
+   * return adapter name based on alias, if any
+   * @method
+   * @private
+   * @param {string} aliasName
+   * @returns {string}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #getAdapterNameForAlias(aliasName) {
+    return adapterManager.aliasRegistry[aliasName] || aliasName;
+  }
+
+  /**
+   * function that handles bid request data
    * @method
    * @private
    * @param {ProfileHandler} ph profile handler
@@ -705,7 +835,8 @@ class WeboramaRtdProvider {
     return [deepClone(ph.data), deepClone(ph.metadata)];
   }
 
-  /** handle appnexus/xandr bid
+  /**
+   * handle appnexus/xandr bid
    * @method
    * @private
    * @param {Object} reqBidsConfigObj
@@ -723,7 +854,8 @@ class WeboramaRtdProvider {
     // this.#setBidderOrtb2(reqBidsConfigObj.ortb2Fragments?.bidder, bid.bidder, base, profile);
   }
 
-  /** handle generic bid via ortb2 arbitrary data
+  /**
+   * handle generic bid via ortb2 arbitrary data
    * @method
    * @private
    * @param {Object} reqBidsConfigObj
@@ -737,13 +869,22 @@ class WeboramaRtdProvider {
   // eslint-disable-next-line no-dupe-class-members
   #handleBidViaORTB2(reqBidsConfigObj, bidder, profile, metadata) {
     if (isBoolean(metadata.user)) {
-      logMessage(`bidder '${bidder}' is not directly supported, trying set data via bidder ortb2 fpd`);
+      logger.logMessage(
+        `bidder '${bidder}' is not directly supported, trying set data via bidder ortb2 fpd`
+      );
       const section = metadata.user ? 'user' : 'site';
       const path = `${section}.ext.data`;
 
-      this.#setBidderOrtb2(reqBidsConfigObj.ortb2Fragments?.bidder, bidder, path, profile)
+      this.#setBidderOrtb2(
+        reqBidsConfigObj.ortb2Fragments?.bidder,
+        bidder,
+        path,
+        profile
+      );
     } else {
-      logMessage(`SKIP unsupported bidder '${bidder}', data from '${metadata.source}' is not defined as user or site-centric`);
+      logger.logMessage(
+        `SKIP unsupported bidder '${bidder}', data from '${metadata.source}' is not defined as user or site-centric`
+      );
     }
   }
   /**
@@ -759,7 +900,7 @@ class WeboramaRtdProvider {
   // eslint-disable-next-line no-dupe-class-members
   #setBidderOrtb2(bidderOrtb2Fragments, bidder, path, profile) {
     const base = `${bidder}.${path}`;
-    this.#assignProfileToObject(bidderOrtb2Fragments, base, profile)
+    this.#assignProfileToObject(bidderOrtb2Fragments, base, profile);
   }
   /**
    * assign profile to object
@@ -775,7 +916,7 @@ class WeboramaRtdProvider {
     Object.entries(profile).forEach(([key, values]) => {
       const path = `${base}.${key}`;
       deepSetValue(destination, path, values);
-    })
+    });
   }
 
   /**
@@ -827,6 +968,7 @@ class WeboramaRtdProvider {
 
 /**
  * check if profile is valid
+ * a valid profile must be a plain object and every value should be an array of strings or numbers
  * @param {*} profile
  * @returns {boolean}
  */
@@ -835,7 +977,18 @@ export function isValidProfile(profile) {
     return false;
   }
 
-  return Object.values(profile).every((field) => isArray(field) && field.every(isStr));
+  return Object.values(profile).every(
+    (field) => isArray(field) && field.every(isStrOrNumber)
+  );
+}
+
+/**
+ * Return if the object is a string or number
+ * @param {*} object object to test
+ * @return {Boolean} if object is a string or number
+ */
+function isStrOrNumber(object) {
+  return isStr(object) || isNumber(object);
 }
 
 /**
@@ -844,7 +997,8 @@ export function isValidProfile(profile) {
  * @returns {buildProfileHandlerCallback}
  */
 function getContextualProfile(component /* equivalent to this */) {
-  /** return contextual profile
+  /**
+   * return contextual profile
    * @param {WeboCtxConf} weboCtxConf
    * @returns {[Profile,boolean]} contextual profile + isDefault boolean flag
    */
@@ -856,7 +1010,7 @@ function getContextualProfile(component /* equivalent to this */) {
     const defaultContextualProfile = weboCtxConf.defaultProfile || {};
 
     return [defaultContextualProfile, true];
-  }
+  };
 }
 
 /**
@@ -865,18 +1019,21 @@ function getContextualProfile(component /* equivalent to this */) {
  * @returns {buildProfileHandlerCallback}
  */
 function getWeboUserDataProfile(component /* equivalent to this */) {
-  /** return weboUserData profile
+  /**
+   * return weboUserData profile
    * @param {WeboUserDataConf} weboUserDataConf
    * @returns {[Profile,boolean]} weboUserData profile  + isDefault boolean flag
    */
   return function (weboUserDataConf) {
-    return getDataFromLocalStorage(weboUserDataConf,
+    return getDataFromLocalStorage(
+      weboUserDataConf,
       () => component.data,
-      (data) => component.data = data,
+      (data) => (component.data = data),
       DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY,
       LOCAL_STORAGE_USER_TARGETING_SECTION,
-      WEBO_USER_DATA_SOURCE_LABEL);
-  }
+      WEBO_USER_DATA_SOURCE_LABEL
+    );
+  };
 }
 
 /**
@@ -885,18 +1042,21 @@ function getWeboUserDataProfile(component /* equivalent to this */) {
  * @returns {buildProfileHandlerCallback}
  */
 function getSfbxLiteDataProfile(component /* equivalent to this */) {
-  /** return weboUserData profile
+  /**
+   * return weboUserData profile
    * @param {SfbxLiteDataConf} sfbxLiteDataConf
    * @returns {[Profile,boolean]} sfbxLiteData profile + isDefault boolean flag
    */
   return function getSfbxLiteDataProfile(sfbxLiteDataConf) {
-    return getDataFromLocalStorage(sfbxLiteDataConf,
+    return getDataFromLocalStorage(
+      sfbxLiteDataConf,
       () => component.data,
-      (data) => component.data = data,
+      (data) => (component.data = data),
       DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY,
       LOCAL_STORAGE_LITE_TARGETING_SECTION,
-      SFBX_LITE_DATA_SOURCE_LABEL);
-  }
+      SFBX_LITE_DATA_SOURCE_LABEL
+    );
+  };
 }
 
 /**
@@ -909,7 +1069,8 @@ function getSfbxLiteDataProfile(component /* equivalent to this */) {
  * @returns {void}
  */
 
-/** return generic webo data profile
+/**
+ * return generic webo data profile
  * @param {WeboUserDataConf|SfbxLiteDataConf} weboDataConf
  * @param {cacheGetCallback} cacheGet
  * @param {cacheSetCallback} cacheSet
@@ -918,11 +1079,23 @@ function getSfbxLiteDataProfile(component /* equivalent to this */) {
  * @param {string} source
  * @returns {[Profile,boolean]} webo (user|lite) data profile + isDefault boolean flag
  */
-function getDataFromLocalStorage(weboDataConf, cacheGet, cacheSet, defaultLocalStorageProfileKey, targetingSection, source) {
+function getDataFromLocalStorage(
+  weboDataConf,
+  cacheGet,
+  cacheSet,
+  defaultLocalStorageProfileKey,
+  targetingSection,
+  source
+) {
   const defaultProfile = weboDataConf.defaultProfile || {};
 
-  if (storage.hasLocalStorage() && storage.localStorageIsEnabled() && !cacheGet()) {
-    const localStorageProfileKey = weboDataConf.localStorageProfileKey || defaultLocalStorageProfileKey;
+  if (
+    storage.hasLocalStorage() &&
+    storage.localStorageIsEnabled() &&
+    !cacheGet()
+  ) {
+    const localStorageProfileKey =
+      weboDataConf.localStorageProfileKey || defaultLocalStorageProfileKey;
 
     const entry = storage.getDataFromLocalStorage(localStorageProfileKey);
     if (entry) {
@@ -932,9 +1105,12 @@ function getDataFromLocalStorage(weboDataConf, cacheGet, cacheSet, defaultLocalS
         const profile = data[targetingSection];
         const valid = isValidProfile(profile);
         if (!valid) {
-          logWarn(`found invalid ${source} profile on local storage key ${localStorageProfileKey}, section ${targetingSection}`);
+          logger.logMessage(
+            `WARNING: found invalid ${source} profile on local storage key ${localStorageProfileKey}, section ${targetingSection}: `,
+            profile
+          );
 
-          return;
+          return [defaultProfile, true];
         }
 
         if (!isEmpty(data)) {
diff --git a/modules/weboramaRtdProvider.md b/modules/weboramaRtdProvider.md
index 0c6e3339787..11b4368a502 100644
--- a/modules/weboramaRtdProvider.md
+++ b/modules/weboramaRtdProvider.md
@@ -16,7 +16,7 @@ Weborama provides a Real-Time Data Submodule for `Prebid.js`, allowing to easy i
 
 * LiTE by SFBX® (Local inApp Trust Engine) provides “Zero Party Data” given by users, stored and calculated only on the user’s device. Through a unique cohorting system, it enables better monetization in a consent/consentless and identity-less mode.
 
-Contact prebid-support@weborama.com for more information.
+Contact [prebid-support@weborama.com] for more information.
 
 ### Publisher Usage
 
@@ -67,7 +67,7 @@ pbjs.setConfig({
                     enabled: true,
                 },
                 sfbxLiteDataConf: { // sfbx-lite site-centric configuration, *omit if not needed*
-                    enabled: true, 
+                    enabled: true,
                 },
             }
         },
@@ -79,7 +79,7 @@ pbjs.setConfig({
 
 Each module can perform two actions:
 
-* set targeting on [GPT](https://docs.prebid.org/dev-docs/publisher-api-reference/setTargetingForGPTAsync.html) / [AST](https://docs.prebid.org/dev-docs/publisher-api-reference/setTargetingForAst.html]) via `prebid.js`
+* set targeting on [GPT](https://docs.prebid.org/dev-docs/publisher-api-reference/setTargetingForGPTAsync.html) / [AST](https://docs.prebid.org/dev-docs/publisher-api-reference/setTargetingForAst.html) via `prebid.js`
 
 * send data to other `prebid.js` bidder modules (check the complete list at the end of this page)
 
@@ -117,9 +117,9 @@ On this section we will explain the `params.weboCtxConf` subconfiguration:
 | enabled | Boolean| if false, will ignore this configuration| Default is `true` if this section is present|
 | baseURLProfileAPI | String| if present, update the domain of the contextual api| Optional. Default is `ctx.weborama.com` |
 
-#### WAM User-Centric Configuration
+#### User-Centric Configuration
 
-To be possible use the integration with Weborama Audience Manager (WAM) you must be a client with an account id and you lust include the `wamfactory` script in your pages with `wam2gam` feature activated.
+To be possible use the integration with Weborama Audience Manager (WAM) you must be a client with an account id and you must include the `wamfactory` script in your pages with `wam2gam` feature activated.
 Please contact weborama if you don't have it.
 
 On this section we will explain the `params.weboUserDataConf` subconfiguration:
@@ -134,6 +134,15 @@ On this section we will explain the `params.weboUserDataConf` subconfiguration:
 | localStorageProfileKey| String | can be used to customize the local storage key | Optional |
 | enabled | Boolean| if false, will ignore this configuration| Default is `true` if this section is present|
 
+##### User Consent
+
+The WAM User-Centric configuration will check for user consent if gdpr applies. It will check for consent:
+
+* Vendor ID 284 (Weborama)
+* Purpose IDs: 1, 3, 4, 5 and 6
+
+If the user consent does not match such conditions, this module will not load, means we will not check for any data in local storage and the default profile will be ignored.
+
 #### Sfbx LiTE Site-Centric Configuration
 
 To be possible use the integration between Weborama and Sfbx LiTE you should also contact SFBX® to setup this product.
@@ -206,7 +215,7 @@ A better look on the `Object` type
 ```javascript
 sendToBidders: {
     appnexus: true,           // send profile to appnexus on all ad units
-    pubmatic: ['adUnitCode1'],// send profile to pubmatic on this ad units 
+    pubmatic: ['adUnitCode1'],// send profile to pubmatic on this ad units
 }
 ```
 
@@ -244,7 +253,7 @@ To be possible customize the way we send data to bidders via this callback:
 sendToBidders: function(bid, adUnitCode, data, metadata){
     if (bid.bidder == 'other'){
         /* use bid object to store data based on this specific logic, like in the example below */
-       
+
         bid.params = bid.params || {};
         bid.params['some_specific_key'] = data;
 
@@ -365,7 +374,7 @@ pbjs.que.push(function () {
                         sendToBidders: true,      // override param.sendToBidders. default is true
                         defaultProfile: {            // optional, used if nothing is found
                             webo_cs: [...],        // wam custom segments
-                            webo_audiences: [...], // wam audiences 
+                            webo_audiences: [...], // wam audiences
                         },
                         enabled: true,
                     },
@@ -476,18 +485,18 @@ pbjs.que.push(function () {
                 params: {
                     weboCtxConf: {
                         token: "to-be-defined", // mandatory
-                        setPrebidTargeting: ['adUnitCode1',...], // set target only on certain adunits 
+                        setPrebidTargeting: ['adUnitCode1',...], // set target only on certain adunits
                         sendToBidders: ['appnexus',...], // overide, send to only some bidders
                         enabled: true,
                     },
                     weboUserDataConf: {
                         accountId: 12345,           // recommended
-                        setPrebidTargeting: ['adUnitCode2',...], // set target only on certain adunits 
+                        setPrebidTargeting: ['adUnitCode2',...], // set target only on certain adunits
                         sendToBidders: ['rubicon',...], // overide, send to only some bidders
                         enabled: true,
                     },
                     sfbxLiteDataConf: {
-                        setPrebidTargeting: ['adUnitCode3',...], // set target only on certain adunits 
+                        setPrebidTargeting: ['adUnitCode3',...], // set target only on certain adunits
                         sendToBidders: ['smartadserver',...], // overide, send to only some bidders
                         enabled: true,
                     }
@@ -537,15 +546,15 @@ pbjs.que.push(function () {
                     },
                     weboUserDataConf: {
                         accountId: 12345,           // recommended
-                        setPrebidTargeting: ['adUnitCode1',...], // set target only on certain adunits 
+                        setPrebidTargeting: ['adUnitCode1',...], // set target only on certain adunits
                         sendToBidders: { // send to only some bidders and adunits
-                            'appnexus': true,               // all adunits for appnexus 
+                            'appnexus': true,               // all adunits for appnexus
                             'pubmatic': ['adUnitCode1',...] // some adunits for pubmatic
                             // other bidders will be ignored
                         },
                         defaultProfile: {           // optional
-                            webo_cs: ['Red'],
-                            webo_audiences: ['bam']
+                            webo_cs: ['Red'],       // using label
+                            webo_audiences: [12345] // using id
                         },
                         localStorageProfileKey: 'webo_wam2gam_entry', // default
                         enabled: true,
diff --git a/modules/welectBidAdapter.js b/modules/welectBidAdapter.js
index d88a3f4c3e2..533e6401cd5 100644
--- a/modules/welectBidAdapter.js
+++ b/modules/welectBidAdapter.js
@@ -1,6 +1,13 @@
 import { deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').validBidRequests} validBidRequests
+ */
+
 const BIDDER_CODE = 'welect';
 const DEFAULT_DOMAIN = 'www.welect.de';
 
diff --git a/modules/widespaceBidAdapter.js b/modules/widespaceBidAdapter.js
index ea6f1bce793..6fa14f5d68c 100644
--- a/modules/widespaceBidAdapter.js
+++ b/modules/widespaceBidAdapter.js
@@ -1,6 +1,6 @@
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {parseQueryStringParameters, parseSizesInput} from '../src/utils.js';
+import {deepClone, parseQueryStringParameters, parseSizesInput} from '../src/utils.js';
 import {find, includes} from '../src/polyfill.js';
 import {getStorageManager} from '../src/storageManager.js';
 
@@ -212,7 +212,7 @@ function getLcuid() {
 }
 
 function encodedParamValue(value) {
-  const requiredStringify = typeof JSON.parse(JSON.stringify(value)) === 'object';
+  const requiredStringify = typeof deepClone(value) === 'object';
   return encodeURIComponent(requiredStringify ? JSON.stringify(value) : value);
 }
 
diff --git a/modules/winrBidAdapter.js b/modules/winrBidAdapter.js
index 41efc432e11..b29a854cbab 100644
--- a/modules/winrBidAdapter.js
+++ b/modules/winrBidAdapter.js
@@ -13,10 +13,15 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {find, includes} from '../src/polyfill.js';
 import {getStorageManager} from '../src/storageManager.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
-import {getANKeywordParam, transformBidderParamKeywords} from '../libraries/appnexusUtils/anKeywords.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
+import {getANKeywordParam} from '../libraries/appnexusUtils/anKeywords.js';
 import {convertCamelToUnderscore} from '../libraries/appnexusUtils/anUtils.js';
-import {convertTypes} from '../libraries/transformParamsUtils/convertTypes.js';
+import { transformSizes } from '../libraries/sizeUtils/tranformSize.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 
 const BIDDER_CODE = 'winr';
 const URL = 'https://ib.adnxs.com/ut/v3/prebid';
@@ -307,39 +312,6 @@ export const spec = {
       ];
     }
   },
-
-  transformBidParams: function (params, isOpenRtb) {
-    params = convertTypes(
-      {
-        member: 'string',
-        invCode: 'string',
-        placementId: 'number',
-        keywords: transformBidderParamKeywords,
-        publisherId: 'number',
-      },
-      params
-    );
-
-    if (isOpenRtb) {
-      params.use_pmt_rule =
-        typeof params.usePaymentRule === 'boolean'
-          ? params.usePaymentRule
-          : false;
-      if (params.usePaymentRule) {
-        delete params.usePaymentRule;
-      }
-
-      Object.keys(params).forEach((paramKey) => {
-        let convertedKey = convertCamelToUnderscore(paramKey);
-        if (convertedKey !== paramKey) {
-          params[convertedKey] = params[paramKey];
-          delete params[paramKey];
-        }
-      });
-    }
-
-    return params;
-  },
 };
 
 function formatRequest(payload, bidderRequest) {
@@ -485,7 +457,7 @@ function bidToTag(bid) {
   }
   tag.keywords = getANKeywordParam(bid.ortb2, bid.params.keywords)
 
-  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
   if (gpid) {
     tag.gpid = gpid;
   }
@@ -499,32 +471,6 @@ function bidToTag(bid) {
   return tag;
 }
 
-/* Turn bid request sizes into ut-compatible format */
-function transformSizes(requestSizes) {
-  let sizes = [];
-  let sizeObj = {};
-
-  if (
-    isArray(requestSizes) &&
-    requestSizes.length === 2 &&
-    !isArray(requestSizes[0])
-  ) {
-    sizeObj.width = parseInt(requestSizes[0], 10);
-    sizeObj.height = parseInt(requestSizes[1], 10);
-    sizes.push(sizeObj);
-  } else if (typeof requestSizes === 'object') {
-    for (let i = 0; i < requestSizes.length; i++) {
-      let size = requestSizes[i];
-      sizeObj = {};
-      sizeObj.width = parseInt(size[0], 10);
-      sizeObj.height = parseInt(size[1], 10);
-      sizes.push(sizeObj);
-    }
-  }
-
-  return sizes;
-}
-
 function hasUserInfo(bid) {
   return !!bid.params.user;
 }
diff --git a/modules/wurflRtdProvider.js b/modules/wurflRtdProvider.js
new file mode 100644
index 00000000000..dbf50744d25
--- /dev/null
+++ b/modules/wurflRtdProvider.js
@@ -0,0 +1,286 @@
+import { submodule } from '../src/hook.js';
+import { fetch, sendBeacon } from '../src/ajax.js';
+import { loadExternalScript } from '../src/adloader.js';
+import {
+  mergeDeep,
+  prefixLog,
+} from '../src/utils.js';
+import { MODULE_TYPE_RTD } from '../src/activities/modules.js';
+
+// Constants
+const REAL_TIME_MODULE = 'realTimeData';
+const MODULE_NAME = 'wurfl';
+
+// WURFL_JS_HOST is the host for the WURFL service endpoints
+const WURFL_JS_HOST = 'https://prebid.wurflcloud.com';
+// WURFL_JS_ENDPOINT_PATH is the path for the WURFL.js endpoint used to load WURFL data
+const WURFL_JS_ENDPOINT_PATH = '/wurfl.js';
+// STATS_ENDPOINT_PATH is the path for the stats endpoint used to send analytics data
+const STATS_ENDPOINT_PATH = '/v1/prebid/stats';
+
+const logger = prefixLog('[WURFL RTD Submodule]');
+
+// enrichedBidders holds a list of prebid bidder names, of bidders which have been
+// injected with WURFL data
+const enrichedBidders = new Set();
+
+/**
+ * init initializes the WURFL RTD submodule
+ * @param {Object} config Configuration for WURFL RTD submodule
+ * @param {Object} userConsent User consent data
+ */
+const init = (config, userConsent) => {
+  logger.logMessage('initialized');
+  return true;
+}
+
+/**
+ * getBidRequestData enriches the OpenRTB 2.0 device data with WURFL data
+ * @param {Object} reqBidsConfigObj Bid request configuration object
+ * @param {Function} callback Called on completion
+ * @param {Object} config Configuration for WURFL RTD submodule
+ * @param {Object} userConsent User consent data
+ */
+const getBidRequestData = (reqBidsConfigObj, callback, config, userConsent) => {
+  const altHost = config.params?.altHost ?? null;
+  const isDebug = config.params?.debug ?? false;
+
+  const bidders = new Set();
+  reqBidsConfigObj.adUnits.forEach(adUnit => {
+    adUnit.bids.forEach(bid => {
+      bidders.add(bid.bidder);
+    });
+  });
+
+  let host = WURFL_JS_HOST;
+  if (altHost) {
+    host = altHost;
+  }
+
+  const url = new URL(host);
+  url.pathname = WURFL_JS_ENDPOINT_PATH;
+
+  if (isDebug) {
+    url.searchParams.set('debug', 'true')
+  }
+
+  url.searchParams.set('mode', 'prebid')
+  logger.logMessage('url', url.toString());
+
+  try {
+    loadExternalScript(url.toString(), MODULE_TYPE_RTD, MODULE_NAME, () => {
+      logger.logMessage('script injected');
+      window.WURFLPromises.complete.then((res) => {
+        logger.logMessage('received data', res);
+        if (!res.wurfl_pbjs) {
+          logger.logError('invalid WURFL.js for Prebid response');
+        } else {
+          enrichBidderRequests(reqBidsConfigObj, bidders, res);
+        }
+        callback();
+      });
+    });
+  } catch (err) {
+    logger.logError(err);
+    callback();
+  }
+}
+
+/**
+ * enrichBidderRequests enriches the OpenRTB 2.0 device data with WURFL data for Business Edition
+ * @param {Object} reqBidsConfigObj Bid request configuration object
+ * @param {Array} bidders List of bidders
+ * @param {Object} wjsResponse WURFL.js response
+ */
+function enrichBidderRequests(reqBidsConfigObj, bidders, wjsResponse) {
+  const authBidders = wjsResponse.wurfl_pbjs?.authorized_bidders ?? {};
+  const caps = wjsResponse.wurfl_pbjs?.caps ?? [];
+
+  bidders.forEach((bidderCode) => {
+    if (bidderCode in authBidders) {
+      // inject WURFL data
+      enrichedBidders.add(bidderCode);
+      const data = bidderData(wjsResponse.WURFL, caps, authBidders[bidderCode]);
+      data['enrich_device'] = true;
+      enrichBidderRequest(reqBidsConfigObj, bidderCode, data);
+      return;
+    }
+    // inject WURFL low entropy data
+    const data = lowEntropyData(wjsResponse.WURFL, wjsResponse.wurfl_pbjs?.low_entropy_caps);
+    enrichBidderRequest(reqBidsConfigObj, bidderCode, data);
+  });
+}
+
+/**
+ * bidderData returns the WURFL data for a bidder
+ * @param {Object} wurflData WURFL data
+ * @param {Array} caps Capability list
+ * @param {Array} filter Filter list
+ * @returns {Object} Bidder data
+ */
+export const bidderData = (wurflData, caps, filter) => {
+  const data = {};
+  caps.forEach((cap, index) => {
+    if (!filter.includes(index)) {
+      return;
+    }
+    if (cap in wurflData) {
+      data[cap] = wurflData[cap];
+    }
+  });
+  return data;
+}
+
+/**
+ * lowEntropyData returns the WURFL low entropy data
+ * @param {Object} wurflData WURFL data
+ * @param {Array} lowEntropyCaps Low entropy capability list
+ * @returns {Object} Bidder data
+ */
+export const lowEntropyData = (wurflData, lowEntropyCaps) => {
+  const data = {};
+  lowEntropyCaps.forEach((cap, _) => {
+    let value = wurflData[cap];
+    if (cap == 'complete_device_name') {
+      value = value.replace(/Apple (iP(hone|ad|od)).*/, 'Apple iP$2');
+    }
+    data[cap] = value;
+  });
+  if ('model_name' in wurflData) {
+    data['model_name'] = wurflData.model_name.replace(/(iP(hone|ad|od)).*/, 'iP$2');
+  }
+  if ('brand_name' in wurflData) {
+    data['brand_name'] = wurflData.brand_name;
+  }
+  return data;
+}
+/**
+ * enrichBidderRequest enriches the bidder request with WURFL data
+ * @param {Object} reqBidsConfigObj Bid request configuration object
+ * @param {String} bidderCode Bidder code
+ * @param {Object} wurflData WURFL data
+ */
+export const enrichBidderRequest = (reqBidsConfigObj, bidderCode, wurflData) => {
+  const ortb2data = {
+    'device': {
+      'ext': {},
+    },
+  };
+
+  const device = reqBidsConfigObj.ortb2Fragments.global.device;
+  enrichOrtb2DeviceData('make', wurflData.brand_name, device, ortb2data);
+  enrichOrtb2DeviceData('model', wurflData.model_name, device, ortb2data);
+  if (wurflData.enrich_device) {
+    delete wurflData.enrich_device;
+    enrichOrtb2DeviceData('devicetype', makeOrtb2DeviceType(wurflData), device, ortb2data);
+    enrichOrtb2DeviceData('os', wurflData.advertised_device_os, device, ortb2data);
+    enrichOrtb2DeviceData('osv', wurflData.advertised_device_os_version, device, ortb2data);
+    enrichOrtb2DeviceData('hwv', wurflData.model_name, device, ortb2data);
+    enrichOrtb2DeviceData('h', wurflData.resolution_height, device, ortb2data);
+    enrichOrtb2DeviceData('w', wurflData.resolution_width, device, ortb2data);
+    enrichOrtb2DeviceData('ppi', wurflData.pixel_density, device, ortb2data);
+    enrichOrtb2DeviceData('pxratio', wurflData.density_class, device, ortb2data);
+    enrichOrtb2DeviceData('js', wurflData.ajax_support_javascript, device, ortb2data);
+  }
+  ortb2data.device.ext['wurfl'] = wurflData
+  mergeDeep(reqBidsConfigObj.ortb2Fragments.bidder, { [bidderCode]: ortb2data });
+}
+
+/**
+ * makeOrtb2DeviceType returns the ortb2 device type based on WURFL data
+ * @param {Object} wurflData WURFL data
+ * @returns {Number} ortb2 device type
+ * @see https://www.scientiamobile.com/how-to-populate-iab-openrtb-device-object/
+ */
+export function makeOrtb2DeviceType(wurflData) {
+  if (wurflData.is_mobile) {
+    if (!('is_phone' in wurflData) || !('is_tablet' in wurflData)) {
+      return undefined;
+    }
+    if (wurflData.is_phone || wurflData.is_tablet) {
+      return 1;
+    }
+    return 6;
+  }
+  if (wurflData.is_full_desktop) {
+    return 2;
+  }
+  if (wurflData.is_connected_tv) {
+    return 3;
+  }
+  if (wurflData.is_phone) {
+    return 4;
+  }
+  if (wurflData.is_tablet) {
+    return 5;
+  }
+  if (wurflData.is_ott) {
+    return 7;
+  }
+  return undefined;
+}
+
+/**
+ * enrichOrtb2DeviceData enriches the ortb2data device data with WURFL data.
+ * Note: it does not overrides properties set by Prebid.js
+ * @param {String} key the device property key
+ * @param {any} value the value of the device property
+ * @param {Object} device the ortb2 device object from Prebid.js
+ * @param {Object} ortb2data the ortb2 device data enrchiced with WURFL data
+ */
+function enrichOrtb2DeviceData(key, value, device, ortb2data) {
+  if (device?.[key] !== undefined) {
+    // value already defined by Prebid.js, do not overrides
+    return;
+  }
+  if (value === undefined) {
+    return;
+  }
+  ortb2data.device[key] = value;
+}
+
+/**
+ * onAuctionEndEvent is called when the auction ends
+ * @param {Object} auctionDetails Auction details
+ * @param {Object} config Configuration for WURFL RTD submodule
+ * @param {Object} userConsent User consent data
+ */
+function onAuctionEndEvent(auctionDetails, config, userConsent) {
+  const altHost = config.params?.altHost ?? null;
+
+  let host = WURFL_JS_HOST;
+  if (altHost) {
+    host = altHost;
+  }
+
+  const url = new URL(host);
+  url.pathname = STATS_ENDPOINT_PATH;
+
+  if (enrichedBidders.size === 0) {
+    return;
+  }
+
+  var payload = JSON.stringify({ bidders: [...enrichedBidders] });
+  const sentBeacon = sendBeacon(url.toString(), payload);
+  if (sentBeacon) {
+    return;
+  }
+
+  fetch(url.toString(), {
+    method: 'POST',
+    body: payload,
+    mode: 'no-cors',
+    keepalive: true
+  });
+}
+
+// The WURFL submodule
+export const wurflSubmodule = {
+  name: MODULE_NAME,
+  init,
+  getBidRequestData,
+  onAuctionEndEvent,
+}
+
+// Register the WURFL submodule as submodule of realTimeData
+submodule(REAL_TIME_MODULE, wurflSubmodule);
diff --git a/modules/wurflRtdProvider.md b/modules/wurflRtdProvider.md
new file mode 100644
index 00000000000..d656add3543
--- /dev/null
+++ b/modules/wurflRtdProvider.md
@@ -0,0 +1,67 @@
+# WURFL Real-time Data Submodule
+
+## Overview
+
+    Module Name: WURFL Rtd Provider
+    Module Type: Rtd Provider
+    Maintainer: prebid@scientiamobile.com
+
+## Description
+
+The WURFL RTD module enriches the OpenRTB 2.0 device data with [WURFL data](https://www.scientiamobile.com/wurfl-js-business-edition-at-the-intersection-of-javascript-and-enterprise/).
+The module sets the WURFL data in `device.ext.wurfl` and all the bidder adapters will always receive the low entry capabilites like `is_mobile`, `complete_device_name` and `form_factor`. 
+
+For a more detailed analysis bidders can subscribe to detect iPhone and iPad models and receive additional [WURFL device capabilities](https://www.scientiamobile.com/capabilities/?products%5B%5D=wurfl-js).
+
+## User-Agent Client Hints
+
+WURFL.js is fully compatible with Chromium's User-Agent Client Hints (UA-CH) initiative. If User-Agent Client Hints are absent in the HTTP headers that WURFL.js receives, the service will automatically fall back to using the User-Agent Client Hints' JS API to fetch [high entropy client hint values](https://wicg.github.io/ua-client-hints/#getHighEntropyValues) from the client device. However, we recommend that you explicitly opt-in/advertise support for User-Agent Client Hints on your website and delegate them to the WURFL.js service for the fastest detection experience. Our documentation regarding implementing User-Agent Client Hint support [is available here](https://docs.scientiamobile.com/guides/implementing-useragent-clienthints). 
+
+## Usage
+
+### Build
+```
+gulp build --modules="wurflRtdProvider,appnexusBidAdapter,..."  
+```
+
+### Configuration
+
+Use `setConfig` to instruct Prebid.js to initilize the WURFL RTD module, as specified below. 
+
+This module is configured as part of the `realTimeData.dataProviders`
+
+```javascript
+var TIMEOUT = 1000;
+pbjs.setConfig({
+    realTimeData: {
+        auctionDelay: TIMEOUT,
+        dataProviders: [{
+            name: 'wurfl',
+            waitForIt: true,
+            params: {
+                debug: false
+            }
+        }]
+    }
+});
+```
+
+### Parameters 
+
+| Name                      | Type          | Description                                                      | Default           |
+| :------------------------ | :------------ | :--------------------------------------------------------------- |:----------------- |
+| name                      | String        | Real time data module name                                       | Always 'wurfl'    |
+| waitForIt                 | Boolean       | Should be `true` if there's an `auctionDelay` defined (optional) | `false`           |
+| params                    | Object        |                                                                  |                   |
+| params.altHost            | String        | Alternate host to connect to WURFL.js                            |                   |
+| params.debug              | Boolean       | Enable debug                                                     | `false`           |
+
+## Testing 
+
+To view an example of how the WURFL RTD module works :
+
+`gulp serve --modules=wurflRtdProvider,appnexusBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/wurflRtdProvider_example.html`
diff --git a/modules/xeBidAdapter.js b/modules/xeBidAdapter.js
index 6f527d905d6..9bd6f8adbac 100644
--- a/modules/xeBidAdapter.js
+++ b/modules/xeBidAdapter.js
@@ -1,206 +1,16 @@
-import { config } from '../src/config.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import {parseSizesInput, isFn, deepAccess, logError, isArray, getBidIdParameter} from '../src/utils.js';
-import {getAdUnitSizes} from '../libraries/sizeUtils/sizeUtils.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {buildRequests, getUserSyncs, interpretResponse, isBidRequestValid} from '../libraries/xeUtils/bidderUtils.js';
 
-const CUR = 'USD';
 const BIDDER_CODE = 'xe';
 const ENDPOINT = 'https://pbjs.xe.works/bid';
 
-/**
- * Determines whether or not the given bid request is valid.
- *
- * @param {BidRequest} bid The bid params to validate.
- * @return boolean True  if this is a valid bid, and false otherwise.
- */
-function isBidRequestValid(req) {
-  if (req && typeof req.params !== 'object') {
-    logError('Params is not defined or is incorrect in the bidder settings');
-    return false;
-  }
-
-  if (!getBidIdParameter('env', req.params) || !getBidIdParameter('placement', req.params)) {
-    logError('Env or placement is not present in bidder params');
-    return false;
-  }
-
-  if (deepAccess(req, 'mediaTypes.video') && !isArray(deepAccess(req, 'mediaTypes.video.playerSize'))) {
-    logError('mediaTypes.video.playerSize is required for video');
-    return false;
-  }
-
-  return true;
-}
-
-/**
- * Make a server request from the list of BidRequests.
- *
- * @param {validBidRequest?pbjs_debug=trues[]} - an array of bids
- * @return ServerRequest Info describing the request to the server.
- */
-function buildRequests(validBidRequests, bidderRequest) {
-  const { refererInfo = {}, gdprConsent = {}, uspConsent } = bidderRequest;
-  const requests = validBidRequests.map(req => {
-    const request = {};
-    request.bidId = req.bidId;
-    request.banner = deepAccess(req, 'mediaTypes.banner');
-    // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
-    request.auctionId = req.auctionId;
-    request.transactionId = req.ortb2Imp?.ext?.tid;
-    request.sizes = parseSizesInput(getAdUnitSizes(req));
-    request.schain = req.schain;
-    request.location = {
-      page: refererInfo.page,
-      location: refererInfo.location,
-      domain: refererInfo.domain,
-      whost: window.location.host,
-      ref: refererInfo.ref,
-      isAmp: refererInfo.isAmp
-    };
-    request.device = {
-      ua: navigator.userAgent,
-      lang: navigator.language
-    };
-    request.env = {
-      env: req.params.env,
-      placement: req.params.placement
-    };
-    request.ortb2 = req.ortb2;
-    request.ortb2Imp = req.ortb2Imp;
-    request.tz = new Date().getTimezoneOffset();
-    request.ext = req.params.ext;
-    request.bc = req.bidRequestsCount;
-    request.floor = getBidFloor(req);
-
-    if (req.userIdAsEids && req.userIdAsEids.length !== 0) {
-      request.userEids = req.userIdAsEids;
-    } else {
-      request.userEids = [];
-    }
-    if (gdprConsent.gdprApplies) {
-      request.gdprApplies = Number(gdprConsent.gdprApplies);
-      request.consentString = gdprConsent.consentString;
-    } else {
-      request.gdprApplies = 0;
-      request.consentString = '';
-    }
-    if (uspConsent) {
-      request.usPrivacy = uspConsent;
-    } else {
-      request.usPrivacy = '';
-    }
-    if (config.getConfig('coppa')) {
-      request.coppa = 1;
-    } else {
-      request.coppa = 0;
-    }
-
-    const video = deepAccess(req, 'mediaTypes.video');
-    if (video) {
-      request.sizes = parseSizesInput(deepAccess(req, 'mediaTypes.video.playerSize'));
-      request.video = video;
-    }
-
-    return request;
-  });
-
-  return {
-    method: 'POST',
-    url: ENDPOINT,
-    data: JSON.stringify(requests),
-    withCredentials: true,
-    bidderRequest,
-    options: {
-      contentType: 'application/json'
-    }
-  };
-}
-
-/**
- * Unpack the response from the server into a list of bids.
- *
- * @param {ServerResponse} serverResponse A successful response from the server.
- * @return {Bid[]} An array of bids which were nested inside the server.
- */
-function interpretResponse(serverResponse, { bidderRequest }) {
-  const response = [];
-  if (!isArray(deepAccess(serverResponse, 'body.data'))) {
-    return response;
-  }
-
-  serverResponse.body.data.forEach(serverBid => {
-    const bid = {
-      requestId: bidderRequest.bidId,
-      dealId: bidderRequest.dealId || null,
-      ...serverBid
-    };
-    response.push(bid);
-  });
-
-  return response;
-}
-
-/**
-* Register the user sync pixels which should be dropped after the auction.
-*
-* @param {SyncOptions} syncOptions Which user syncs are allowed?
-* @param {ServerResponse[]} serverResponses List of server's responses.
-* @return {UserSync[]} The user syncs which should be dropped.
-*/
-function getUserSyncs(syncOptions, serverResponses, gdprConsent = {}, uspConsent = '') {
-  const syncs = [];
-  const pixels = deepAccess(serverResponses, '0.body.data.0.ext.pixels');
-
-  if ((syncOptions.iframeEnabled || syncOptions.pixelEnabled) && isArray(pixels) && pixels.length !== 0) {
-    const gdprFlag = `&gdpr=${gdprConsent.gdprApplies ? 1 : 0}`;
-    const gdprString = `&gdpr_consent=${encodeURIComponent((gdprConsent.consentString || ''))}`;
-    const usPrivacy = `us_privacy=${encodeURIComponent(uspConsent)}`;
-
-    pixels.forEach(pixel => {
-      const [ type, url ] = pixel;
-      const sync = { type, url: `${url}&${usPrivacy}${gdprFlag}${gdprString}` };
-      if (type === 'iframe' && syncOptions.iframeEnabled) {
-        syncs.push(sync)
-      } else if (type === 'image' && syncOptions.pixelEnabled) {
-        syncs.push(sync)
-      }
-    });
-  }
-
-  return syncs;
-}
-
-/**
-* Get valid floor value from getFloor fuction.
-*
-* @param {Object} bid Current bid request.
-* @return {null|Number} Returns floor value when bid.getFloor is function and returns valid floor object with USD currency, otherwise returns null.
-*/
-export function getBidFloor(bid) {
-  if (!isFn(bid.getFloor)) {
-    return null;
-  }
-
-  let floor = bid.getFloor({
-    currency: CUR,
-    mediaType: '*',
-    size: '*'
-  });
-
-  if (typeof floor === 'object' && !isNaN(floor.floor) && floor.currency === CUR) {
-    return floor.floor;
-  }
-
-  return null;
-}
-
 export const spec = {
   code: BIDDER_CODE,
-  aliases: [ 'xeworks', 'lunamediax' ],
-  supportedMediaTypes: [ BANNER, VIDEO ],
+  aliases: ['xeworks', 'lunamediax'],
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid,
-  buildRequests,
+  buildRequests: (validBidRequests, bidderRequest) => buildRequests(validBidRequests, bidderRequest, ENDPOINT),
   interpretResponse,
   getUserSyncs
 }
diff --git a/modules/yahoosspBidAdapter.js b/modules/yahooAdsBidAdapter.js
similarity index 97%
rename from modules/yahoosspBidAdapter.js
rename to modules/yahooAdsBidAdapter.js
index a66d76f8689..7622a5b7587 100644
--- a/modules/yahoosspBidAdapter.js
+++ b/modules/yahooAdsBidAdapter.js
@@ -3,12 +3,15 @@ import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { deepAccess, isFn, isStr, isNumber, isArray, isEmpty, isPlainObject, generateUUID, logInfo, logWarn } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {hasPurpose1Consent} from '../src/utils/gdpr.js';
 
 const INTEGRATION_METHOD = 'prebid.js';
 const BIDDER_CODE = 'yahooAds';
-const BIDDER_ALIASES = ['yahoossp', 'yahooAdvertising']
 const GVLID = 25;
+const BIDDER_ALIASES = [
+  { code: 'yahoossp', gvlid: GVLID },
+  { code: 'yahooAdvertising', gvlid: GVLID }
+];
 const ADAPTER_VERSION = '1.1.0';
 const PREBID_VERSION = '$prebid.version$';
 const DEFAULT_BID_TTL = 300;
@@ -45,7 +48,6 @@ const SUPPORTED_USER_ID_SOURCES = [
   'neustar.biz',
   'nextroll.com',
   'novatiq.com',
-  'parrable.com',
   'pubcid.org',
   'quantcast.com',
   'tapad.com',
@@ -111,7 +113,7 @@ function extractUserSyncUrls(syncOptions, pixels) {
  * @param {object} consentData
  * @param {object} consentData.gpp
  * @param {string} consentData.gpp.gppConsent
- * @param {array} consentData.gpp.applicableSections
+ * @param {Array} consentData.gpp.applicableSections
  * @param {object} consentData.gdpr
  * @param {object} consentData.gdpr.consentString
  * @param {object} consentData.gdpr.gdprApplies
@@ -148,7 +150,7 @@ function getSupportedEids(bid) {
 }
 
 function isSecure(bid) {
-  return deepAccess(bid, 'params.bidOverride.imp.secure') || (document.location.protocol === 'https:') ? 1 : 0;
+  return deepAccess(bid, 'params.bidOverride.imp.secure') ?? bid.ortb2Imp?.secure ?? 1;
 };
 
 function getPubIdMode(bid) {
@@ -344,7 +346,7 @@ function appendImpObject(bid, openRtbObject) {
     const impObject = {
       id: bid.bidId,
       secure: isSecure(bid),
-      bidfloor: getFloorModuleData(bid).floor || deepAccess(bid, 'params.bidOverride.imp.bidfloor')
+      bidfloor: getFloorModuleData(bid)?.floor || deepAccess(bid, 'params.bidOverride.imp.bidfloor')
     };
 
     if (bid.mediaTypes.banner && (typeof mediaTypeMode === 'undefined' || mediaTypeMode === BANNER || mediaTypeMode === '*')) {
@@ -371,6 +373,7 @@ function appendImpObject(bid, openRtbObject) {
         pos: deepAccess(bid, 'params.bidOverride.imp.video.pos') || bid.mediaTypes.video.pos || undefined,
         playbackmethod: deepAccess(bid, 'params.bidOverride.imp.video.playbackmethod') || bid.mediaTypes.video.playbackmethod || undefined,
         placement: deepAccess(bid, 'params.bidOverride.imp.video.placement') || bid.mediaTypes.video.placement || undefined,
+        plcmt: deepAccess(bid, 'params.bidOverride.imp.video.plcmt') || bid.mediaTypes.video.plcmt || undefined,
         linearity: deepAccess(bid, 'params.bidOverride.imp.video.linearity') || bid.mediaTypes.video.linearity || 1,
         protocols: deepAccess(bid, 'params.bidOverride.imp.video.protocols') || bid.mediaTypes.video.protocols || [2, 5],
         startdelay: deepAccess(bid, 'params.bidOverride.imp.video.startdelay') || bid.mediaTypes.video.startdelay || 0,
@@ -657,13 +660,9 @@ export const spec = {
         bidResponse.mediaType = VIDEO;
         bidResponse.meta.mediaType = VIDEO;
         bidResponse.vastXml = bid.adm;
-
-        if (bid.nurl) {
-          bidResponse.vastUrl = bid.nurl;
-        };
       }
 
-      if (deepAccess(bidderRequest, 'mediaTypes.video.context') === 'outstream' && !bidderRequest.renderer) {
+      if (deepAccess(bidderRequest, 'mediaTypes.video.context') === 'outstream' && !bidderRequest.renderer && bidResponse.mediaType === VIDEO) {
         bidResponse.renderer = createRenderer(bidderRequest, bidResponse) || undefined;
       }
 
diff --git a/modules/yahoosspBidAdapter.md b/modules/yahooAdsBidAdapter.md
similarity index 96%
rename from modules/yahoosspBidAdapter.md
rename to modules/yahooAdsBidAdapter.md
index c8c42930e5b..df9b71b2314 100644
--- a/modules/yahoosspBidAdapter.md
+++ b/modules/yahooAdsBidAdapter.md
@@ -1,7 +1,7 @@
 # Overview
 **Module Name:** Yahoo Advertising Bid Adapter
 **Module Type:** Bidder Adapter
-**Maintainer:** hb-fe-tech@yahooinc.com
+**Maintainer:** prebid-tech-team@yahooinc.com
 
 # Description
 The Yahoo Advertising Bid Adapter is an OpenRTB interface that consolidates all previous "Oath.inc" adapters such as: "aol", "oneMobile", "oneDisplay" & "oneVideo" supply-side platforms.
@@ -19,6 +19,16 @@ The Yahoo Advertising Bid Adapter is an OpenRTB interface that consolidates all
 * First Party Data (ortb2 & ortb2Imp)
 * Custom TTL (time to live)
 
+# Adapter Aliases
+Whilst the primary bidder code for this bid adapter is `yahooAds`, the aliases `yahoossp` and `yahooAdvertising` can be used to enable this adapter. If you wish to set Prebid configuration specifically for this bid adapter, then the configuration key _must_ match the used bidder code. All examples in this documentation use the primiry bidder code, but switching `yahooAds` with one of the relevant aliases may be required for your setup. Let's take [setting the request mode](#adapter-request-mode) as an example; if you used the `yahoossp` alias, then the corresponding `setConfig` API call would look like this:
+
+```javascript
+pbjs.setConfig({
+    yahoossp: {
+        mode: 'banner' // 'all', 'video', 'banner' (default)
+    }
+});
+```
 
 # Adapter Request mode
 Since the Yahoo Advertising bid adapter supports both Banner and Video adUnits, a controller was needed to allow you to define when the adapter should generate a bid-requests to the Yahoo bid endpoint.
@@ -571,6 +581,7 @@ Currently the bidOverride object only accepts the following:
     * pos
     * playbackmethod
     * placement
+    * plcmt
     * linearity
     * protocols
     * rewarded
@@ -609,6 +620,7 @@ const adUnits = [{
                         pos: 1,
                         playbackmethod: 0,
                         placement: 1,
+                        plcmt: 1,
                         linearity: 1,
                         protocols: [2,5],
                         startdelay: 0,
diff --git a/modules/yandexAnalyticsAdapter.js b/modules/yandexAnalyticsAdapter.js
new file mode 100644
index 00000000000..6c44bea7cd2
--- /dev/null
+++ b/modules/yandexAnalyticsAdapter.js
@@ -0,0 +1,165 @@
+import buildAdapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import { logError, logInfo } from '../src/utils.js';
+import { EVENTS } from '../src/constants.js';
+import * as events from '../src/events.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+
+const timeoutIds = {};
+const tryUntil = (operationId, conditionCb, cb) => {
+  if (!conditionCb()) {
+    cb();
+    timeoutIds[operationId] = setTimeout(
+      () => tryUntil(conditionCb, conditionCb, cb),
+      100
+    );
+  }
+};
+
+const clearTryUntilTimeouts = (timeouts) => {
+  timeouts.forEach((timeoutID) => {
+    if (timeoutIds[timeoutID]) {
+      clearTimeout(timeoutIds[timeoutID]);
+    }
+  });
+};
+
+export const PBJS_INIT_EVENT_NAME = 'pbjsInit';
+const SEND_EVENTS_BUNDLE_TIMEOUT = 1500;
+const {
+  BID_REQUESTED,
+  BID_RESPONSE,
+  BID_ADJUSTMENT,
+  BID_WON,
+  BIDDER_DONE,
+  AUCTION_END,
+  BID_TIMEOUT,
+  AD_RENDER_FAILED,
+  AD_RENDER_SUCCEEDED,
+  BIDDER_ERROR,
+} = EVENTS;
+
+export const EVENTS_TO_TRACK = [
+  BID_REQUESTED,
+  BID_RESPONSE,
+  BID_ADJUSTMENT,
+  BID_WON,
+  BIDDER_DONE,
+  AUCTION_END,
+  BID_TIMEOUT,
+  AD_RENDER_FAILED,
+  AD_RENDER_SUCCEEDED,
+  BIDDER_ERROR,
+];
+
+const yandexAnalytics = Object.assign(buildAdapter({ analyticsType: 'endpoint' }), {
+  bufferedEvents: [],
+  initTimeoutId: 0,
+  counters: {},
+  counterInitTimeouts: {},
+  oneCounterInited: false,
+
+  onEvent: (eventName, eventData) => {
+    const innerEvent = {
+      event: eventName,
+      data: eventData,
+    };
+    yandexAnalytics.bufferedEvents.push(innerEvent);
+  },
+
+  sendEvents: () => {
+    if (yandexAnalytics.bufferedEvents.length) {
+      const data = yandexAnalytics.bufferedEvents.splice(
+        0,
+        yandexAnalytics.bufferedEvents.length
+      );
+
+      Object.keys(yandexAnalytics.counters).forEach((counterId) => {
+        yandexAnalytics.counters[counterId].pbjs(data);
+      });
+    }
+    setTimeout(yandexAnalytics.sendEvents, SEND_EVENTS_BUNDLE_TIMEOUT);
+  },
+
+  onCounterInit: (counterId) => {
+    yandexAnalytics.counters[counterId] = window[`yaCounter${counterId}`];
+    logInfo(`Found metrika counter ${counterId}`);
+    if (!yandexAnalytics.oneCounterInited) {
+      yandexAnalytics.oneCounterInited = true;
+      setTimeout(() => {
+        yandexAnalytics.sendEvents();
+      }, SEND_EVENTS_BUNDLE_TIMEOUT);
+      clearTimeout(yandexAnalytics.initTimeoutId);
+    }
+  },
+
+  enableAnalytics: (config) => {
+    yandexAnalytics.options = (config && config.options) || {};
+    const { counters } = yandexAnalytics.options || {};
+    const validCounters = counters.filter((counterId) => {
+      if (!counterId) {
+        return false;
+      }
+
+      if (isNaN(counterId)) {
+        return false;
+      }
+
+      return true;
+    });
+
+    if (!validCounters.length) {
+      logError('options.counters contains no valid counter ids');
+      return;
+    }
+
+    const unsubscribeCallbacks = [
+      () => clearTryUntilTimeouts(['countersInit']),
+    ];
+
+    yandexAnalytics.initTimeoutId = setTimeout(() => {
+      yandexAnalytics.bufferedEvents = [];
+      unsubscribeCallbacks.forEach((cb) => cb());
+      logError(`Can't find metrika counter after 25 seconds.`);
+      logError('Aborting yandex analytics provider initialization.');
+    }, 25000);
+
+    yandexAnalytics.onEvent(PBJS_INIT_EVENT_NAME, {
+      'version': getGlobal().version,
+    });
+    events.getEvents().forEach((event) => {
+      if (event && EVENTS_TO_TRACK.indexOf(event.eventType) >= 0) {
+        yandexAnalytics.onEvent(event.eventType, event);
+      }
+    });
+
+    EVENTS_TO_TRACK.forEach((eventName) => {
+      const eventCallback = yandexAnalytics.onEvent.bind(null, eventName);
+      unsubscribeCallbacks.push(() => events.off(eventName, eventCallback));
+      events.on(eventName, eventCallback);
+    });
+
+    let allCountersInited = false;
+    tryUntil('countersInit', () => allCountersInited, () => {
+      allCountersInited = validCounters.reduce((result, counterId) => {
+        if (yandexAnalytics.counters[counterId]) {
+          return result && true;
+        }
+
+        if (window[`yaCounter${counterId}`]) {
+          yandexAnalytics.onCounterInit(counterId);
+          return result && true;
+        }
+
+        return false;
+      }, true);
+    });
+  },
+});
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: yandexAnalytics,
+  code: 'yandex'
+});
+
+export default yandexAnalytics;
diff --git a/modules/yandexAnalyticsAdapter.md b/modules/yandexAnalyticsAdapter.md
new file mode 100644
index 00000000000..0863cc1dfb6
--- /dev/null
+++ b/modules/yandexAnalyticsAdapter.md
@@ -0,0 +1,46 @@
+## Overview
+
+```
+Module Name: Yandex Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: prebid@yandex-team.com
+```
+
+## Description
+
+The Yandex Analytics Adapter integrates Prebid.js with [Yandex Metrica](https://metrica.yandex.com/about), a top-5 worldwide web analytics tool. It offers detailed insights into auction performance and user behavior, enabling publishers to make data-driven decisions to optimize their ad revenue.
+
+Disclosure: The adapter utilizes the Metrica Tag build based on [github.com/yandex/metrica-tag](https://github.com/yandex/metrica-tag), approximately 60 kB gzipped.
+
+## Setup Instructions
+
+1. **Register Your Website:**
+
+   Visit [Yandex Metrica](https://metrica.yandex.com/) and register your website to obtain a counter ID.
+
+2. **Insert Counter Initialization Code:**
+
+   Retrieve the counter initialization code from the Yandex Metrica settings page at [metrica.yandex.com/r/settings](https://metrica.yandex.com/r/settings), and embed it into your website's HTML.
+
+3. **Initialize the Adapter in Prebid.js:**
+
+   Configure the Yandex Analytics Adapter in your Prebid.js setup. For optimal performance and ease of management, it is preferred to use a single counter. Add the following JavaScript snippet, replacing `123` with your actual counter ID:
+
+   ```javascript
+   pbjs.enableAnalytics({
+     provider: "yandex",
+     options: {
+       // Replace 123 with your actual counter ID
+       // It's preferred to use a single counter for optimal performance and ease of management
+       counters: [123]
+     }
+   });
+   ```
+
+4. **Special Instructions for Single Page Applications (SPAs):**
+
+   If your website is an SPA, make sure to [configure your Metrica tag accordingly](https://yandex.com/support/metrica/code/counter-spa-setup.html).
+
+## Accessing Analytics Data
+
+You can view the collected analytics data in the Yandex Metrica dashboard. Navigate to [metrika.yandex.com/r/stat/prebid_events](https://metrika.yandex.com/r/stat/prebid_events) to analyze your data.
diff --git a/modules/yandexBidAdapter.js b/modules/yandexBidAdapter.js
index 9ca989b2259..eed0902e9dc 100644
--- a/modules/yandexBidAdapter.js
+++ b/modules/yandexBidAdapter.js
@@ -1,14 +1,59 @@
-import { formatQS, deepAccess, deepSetValue, triggerPixel, _each, _map } from '../src/utils.js';
+import { getCurrencyFromBidderRequest } from '../libraries/ortb2Utils/currency.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js'
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-import { config } from '../src/config.js';
+import { _each, _map, deepAccess, deepSetValue, formatQS, triggerPixel, logInfo } from '../src/utils.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderSpec} BidderSpec
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ * @typedef {import('../src/auction.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/mediaTypes.js').MediaType} MediaType
+ * @typedef {import('../src/utils.js').MediaTypes} MediaTypes
+ * @typedef {import('../modules/priceFloors.js').getFloor} GetFloor
+ */
+
+/**
+ * @typedef {Object} CustomServerRequestFields
+ * @property {BidRequest} bidRequest
+ */
+
+/**
+ * @typedef {ServerRequest & CustomServerRequestFields} YandexServerRequest
+ */
+
+/**
+ * Yandex bidder-specific params which the publisher used in their bid request.
+ *
+ * @typedef {Object} YandexBidRequestParams
+ * @property {string} placementId Possible formats: `R-I-123456-2`, `R-123456-1`, `123456-789`.
+ * @property {number} [pageId] Deprecated. Please use `placementId` instead.
+ * @property {number} [impId] Deprecated. Please use `placementId` instead.
+ */
+
+/**
+ * @typedef {Object} AdditionalBidRequestFields
+ * @property {GetFloor} [getFloor]
+ * @property {MediaTypes} [mediaTypes]
+ */
+
+/**
+ * @typedef {BidRequest & AdditionalBidRequestFields} ExtendedBidRequest
+ */
 
 const BIDDER_CODE = 'yandex';
 const BIDDER_URL = 'https://bs.yandex.ru/prebid';
 const DEFAULT_TTL = 180;
 const DEFAULT_CURRENCY = 'EUR';
-const SUPPORTED_MEDIA_TYPES = [ BANNER, NATIVE ];
+/**
+ * @type {MediaType[]}
+ */
+const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE];
 const SSP_ID = 10500;
 
 const IMAGE_ASSET_TYPES = {
@@ -42,11 +87,18 @@ export const NATIVE_ASSETS = {
 const NATIVE_ASSETS_IDS = {};
 _each(NATIVE_ASSETS, (asset, key) => { NATIVE_ASSETS_IDS[asset[0]] = key });
 
+/** @type {BidderSpec} */
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['ya'], // short code
   supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
 
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid request to validate.
+   * @returns {boolean} True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     const { params } = bid;
     if (!params) {
@@ -59,25 +111,24 @@ export const spec = {
     return true;
   },
 
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {ExtendedBidRequest[]} validBidRequests An array of bids.
+   * @param {BidderRequest} bidderRequest Bidder request object.
+   * @returns {YandexServerRequest[]} Objects describing the requests to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
 
-    let referrer = '';
-    let domain = '';
-    let page = '';
-
-    if (bidderRequest && bidderRequest.refererInfo) {
-      referrer = bidderRequest.refererInfo.ref;
-      domain = bidderRequest.refererInfo.domain;
-      page = bidderRequest.refererInfo.page;
-    }
+    const ortb2 = bidderRequest.ortb2;
 
     let timeout = null;
     if (bidderRequest) {
       timeout = bidderRequest.timeout;
     }
 
-    const adServerCurrency = config.getConfig('currency.adServerCurrency');
+    const adServerCurrency = getCurrencyFromBidderRequest(bidderRequest);
 
     return validBidRequests.map((bidRequest) => {
       const { params } = bidRequest;
@@ -87,7 +138,7 @@ export const spec = {
 
       const queryParams = {
         'imp-id': impId,
-        'target-ref': targetRef || domain,
+        'target-ref': targetRef || ortb2?.site?.domain,
         'ssp-id': SSP_ID,
       };
 
@@ -118,12 +169,10 @@ export const spec = {
       const data = {
         id: bidRequest.bidId,
         imp: [imp],
-        site: {
-          ref: referrer,
-          page,
-          domain,
-        },
+        site: ortb2?.site,
         tmax: timeout,
+        user: ortb2?.user,
+        device: ortb2?.device,
       };
 
       const eids = deepAccess(bidRequest, 'userIdAsEids');
@@ -132,7 +181,7 @@ export const spec = {
       }
 
       const queryParamsString = formatQS(queryParams);
-      return {
+      const request = {
         method: 'POST',
         url: BIDDER_URL + `/${pageId}?${queryParamsString}`,
         data,
@@ -141,13 +190,21 @@ export const spec = {
         },
         bidRequest,
       };
+
+      logInfo('ServerRequest', request);
+
+      return request;
     });
   },
 
   interpretResponse: interpretResponse,
 
-  onBidWon: function (bid) {
-    const nurl = bid['nurl'];
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction.
+   * @param {Bid} bid The bid that won the auction.
+   */
+  onBidWon: function(bid) {
+    const nurl = addRTT(bid['nurl'], bid.timeToRespond);
 
     if (!nurl) {
       return;
@@ -157,6 +214,9 @@ export const spec = {
   }
 }
 
+/**
+ * @param {YandexBidRequestParams} bidRequestParams
+ */
 function extractPlacementIds(bidRequestParams) {
   const { placementId } = bidRequestParams;
   const result = { pageId: null, impId: null };
@@ -191,6 +251,9 @@ function extractPlacementIds(bidRequestParams) {
   return result;
 }
 
+/**
+ * @param {ExtendedBidRequest} bidRequest
+ */
 function getBidfloor(bidRequest) {
   const floors = [];
 
@@ -200,8 +263,8 @@ function getBidfloor(bidRequest) {
         const floorInfo = bidRequest.getFloor({
           currency: DEFAULT_CURRENCY,
           mediaType: type,
-          size: bidRequest.sizes || '*' }
-        )
+          size: bidRequest.sizes || '*'
+        })
         floors.push(floorInfo);
       }
     });
@@ -210,6 +273,9 @@ function getBidfloor(bidRequest) {
   return floors.sort((a, b) => b.floor - a.floor)[0];
 }
 
+/**
+ * @param {ExtendedBidRequest} bidRequest
+ */
 function mapBanner(bidRequest) {
   if (deepAccess(bidRequest, 'mediaTypes.banner')) {
     const sizes = bidRequest.sizes || bidRequest.mediaTypes.banner.sizes;
@@ -227,6 +293,9 @@ function mapBanner(bidRequest) {
   }
 }
 
+/**
+ * @param {ExtendedBidRequest} bidRequest
+ */
 function mapNative(bidRequest) {
   const adUnitNativeAssets = deepAccess(bidRequest, 'mediaTypes.native');
   if (adUnitNativeAssets) {
@@ -252,7 +321,7 @@ function mapNative(bidRequest) {
 }
 
 function mapAsset(assetCode, adUnitAssetParams, nativeAsset) {
-  const [ nativeAssetId, nativeAssetType ] = nativeAsset;
+  const [nativeAssetId, nativeAssetType] = nativeAsset;
   const asset = {
     id: nativeAssetId,
   };
@@ -299,6 +368,13 @@ function mapImageAsset(adUnitImageAssetParams, nativeAssetType) {
   return img;
 }
 
+/**
+ * Unpack the response from the server into a list of bids.
+ *
+ * @param {ServerResponse} serverResponse A successful response from the server.
+ * @param {YandexServerRequest} yandexServerRequest
+ * @return {Bid[]} An array of bids which were nested inside the server.
+ */
 function interpretResponse(serverResponse, { bidRequest }) {
   let response = serverResponse.body;
   if (!response.seatbid) {
@@ -313,6 +389,7 @@ function interpretResponse(serverResponse, { bidRequest }) {
 
   return bidsReceived.map(bidReceived => {
     const price = bidReceived.price;
+    /** @type {Bid} */
     let prBid = {
       requestId: bidRequest.bidId,
       cpm: price,
@@ -385,4 +462,24 @@ function replaceAuctionPrice(url, price, currency) {
     .replace(/\${AUCTION_CURRENCY}/, currency);
 }
 
+function addRTT(url, rtt) {
+  if (!url) return;
+
+  if (url.indexOf(`\${RTT}`) > -1) {
+    return url.replace(/\${RTT}/, rtt ?? -1);
+  }
+
+  const urlObj = new URL(url);
+
+  if (Number.isInteger(rtt)) {
+    urlObj.searchParams.set('rtt', rtt);
+  } else {
+    urlObj.searchParams.delete('rtt');
+  }
+
+  url = urlObj.toString();
+
+  return url;
+}
+
 registerBidder(spec);
diff --git a/modules/yandexBidAdapter.md b/modules/yandexBidAdapter.md
index 55a658cc25c..f16d0ec0b33 100644
--- a/modules/yandexBidAdapter.md
+++ b/modules/yandexBidAdapter.md
@@ -8,7 +8,9 @@ Maintainer: prebid@yandex-team.com
 
 # Description
 
-Yandex Bidder Adapter for Prebid.js.
+The Yandex Prebid Adapter is designed for seamless integration with Yandex's advertising services. It facilitates effective bidding by leveraging Yandex's robust ad-serving technology, ensuring publishers can maximize their ad revenue through efficient and targeted ad placements.
+
+For comprehensive auction analytics, consider using the [Yandex Analytics Adapter](https://docs.prebid.org/dev-docs/analytics/yandex.html). This tool provides essential insights into auction dynamics and user interactions, empowering publishers to fine-tune their strategies for optimal ad performance.
 
 # Parameters
 
diff --git a/modules/yandexIdSystem.js b/modules/yandexIdSystem.js
new file mode 100644
index 00000000000..e21642abf0b
--- /dev/null
+++ b/modules/yandexIdSystem.js
@@ -0,0 +1,165 @@
+/**
+ * The {@link module:modules/userId} module is required
+ * @module modules/yandexIdSystem
+ * @requires module:modules/userId
+ */
+
+// @ts-check
+
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ */
+
+import { MODULE_TYPE_UID } from '../src/activities/modules.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager, STORAGE_TYPE_COOKIES } from '../src/storageManager.js';
+import { logError, logInfo } from '../src/utils.js';
+
+// .com suffix is just a convention for naming the bidder eids
+// See https://github.com/prebid/Prebid.js/pull/11196#discussion_r1591165139
+export const BIDDER_EID_KEY = 'yandex.com';
+export const YANDEX_ID_KEY = 'yandexId';
+export const YANDEX_EXT_COOKIE_NAMES = ['_ym_fa'];
+export const BIDDER_CODE = 'yandex';
+export const YANDEX_USER_ID_KEY = '_ym_uid';
+export const YANDEX_STORAGE_TYPE = STORAGE_TYPE_COOKIES;
+export const YANDEX_MIN_EXPIRE_DAYS = 30;
+
+export const PREBID_STORAGE = getStorageManager({
+  moduleType: MODULE_TYPE_UID,
+  moduleName: BIDDER_CODE,
+  bidderCode: undefined
+});
+
+/** @type {Submodule} */
+export const yandexIdSubmodule = {
+  name: BIDDER_CODE,
+  /**
+   * Decodes the stored id value for passing to bid requests.
+   * @param {string} value
+   */
+  decode(value) {
+    logInfo(`Decoded ${YANDEX_ID_KEY}`, value);
+
+    return { [YANDEX_ID_KEY]: value };
+  },
+  getId(submoduleConfig, _consentData, storedId) {
+    if (checkConfigHasErrorsAndReport(submoduleConfig)) {
+      return;
+    }
+
+    if (storedId) {
+      logInfo('Got storedId', storedId);
+      return {
+        id: storedId
+      };
+    }
+
+    return {
+      id: new YandexIdGenerator().generate(),
+    };
+  },
+  eids: {
+    [YANDEX_ID_KEY]: {
+      source: BIDDER_EID_KEY,
+      /**
+       * Agent Type 1 means that it is an ID
+       * which is tied to a specific web browser or device (cookie-based, probabilistic, or other).
+       * @see https://github.com/InteractiveAdvertisingBureau/AdCOM/blob/main/AdCOM%20v1.0%20FINAL.md#list--agent-types-
+       */
+      atype: 1,
+      getUidExt() {
+        if (PREBID_STORAGE.cookiesAreEnabled()) {
+          return YANDEX_EXT_COOKIE_NAMES.reduce((acc, cookieName) => ({
+            ...acc,
+            [cookieName]: PREBID_STORAGE.getCookie(cookieName),
+          }), {});
+        }
+      },
+    },
+  },
+};
+
+/**
+ * @param {SubmoduleConfig} submoduleConfig
+ * @returns {boolean} `true` - when there are errors, `false` - otherwise.
+ */
+function checkConfigHasErrorsAndReport(submoduleConfig) {
+  let error = false;
+
+  const READABLE_MODULE_NAME = 'Yandex ID module';
+
+  if (submoduleConfig.storage == null) {
+    logError(`Misconfigured ${READABLE_MODULE_NAME}. "storage" is required.`);
+    return true;
+  }
+
+  if (submoduleConfig.storage.name !== YANDEX_USER_ID_KEY) {
+    logError(`Misconfigured ${READABLE_MODULE_NAME}, "storage.name" is expected to be "${YANDEX_USER_ID_KEY}", actual is "${submoduleConfig.storage.name}"`);
+    error = true;
+  }
+
+  if (submoduleConfig.storage.type !== YANDEX_STORAGE_TYPE) {
+    logError(`Misconfigured ${READABLE_MODULE_NAME}, "storage.type" is expected to be "${YANDEX_STORAGE_TYPE}", actual is "${submoduleConfig.storage.type}"`);
+    error = true;
+  }
+
+  if ((submoduleConfig.storage.expires ?? 0) < YANDEX_MIN_EXPIRE_DAYS) {
+    logError(`Misconfigured ${READABLE_MODULE_NAME}, "storage.expires" is expected not to be less than "${YANDEX_MIN_EXPIRE_DAYS}", actual is "${submoduleConfig.storage.expires}"`);
+    error = true;
+  }
+
+  return error;
+}
+
+/**
+ * Yandex-specific generator for uid. Needs to be compatible with Yandex Metrica tag.
+ * @see https://github.com/yandex/metrica-tag/blob/main/src/utils/uid/uid.ts#L51
+ */
+class YandexIdGenerator {
+  generate() {
+    const yandexId = [
+      this._getCurrentSecTimestamp(),
+      this._getRandomInteger(1000000, 999999999),
+    ].join('');
+
+    logInfo(`Generated ${YANDEX_ID_KEY}`, yandexId);
+
+    return yandexId;
+  }
+
+  _getCurrentSecTimestamp() {
+    return Math.round(Date.now() / 1000);
+  }
+
+  /**
+   * @param {number} min
+   * @param {number} max
+   */
+  _getRandomInteger(min, max) {
+    const generateRandom = this._getRandomGenerator();
+
+    /**
+     * Needs to be compatible with Yandex Metrica `getRandom` function.
+     * @see https://github.com/yandex/metrica-tag/blob/main/src/utils/number/random.ts#L12
+     */
+    return Math.floor(generateRandom() * (max - min)) + min;
+  }
+
+  _getRandomGenerator() {
+    if (window.crypto) {
+      return () => {
+        const buffer = new Uint32Array(1);
+        crypto.getRandomValues(buffer);
+
+        return buffer[0] / 0xffffffff;
+      };
+    }
+
+    // Polyfill for environments that don't support Crypto API
+    return () => Math.random();
+  }
+}
+
+submodule('userId', yandexIdSubmodule);
diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index b0136cd21ea..9be01096084 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -1,10 +1,19 @@
-import { _each, deepAccess, isArray, isFn, isPlainObject, timestamp } from '../src/utils.js';
+import { _each, deepAccess, isArray, isEmptyStr, isFn, isPlainObject, timestamp } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { find } from '../src/polyfill.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { Renderer } from '../src/Renderer.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
 const ENDPOINT = 'https://ad.yieldlab.net';
 const BIDDER_CODE = 'yieldlab';
 const BID_RESPONSE_TTL_SEC = 300;
@@ -25,10 +34,7 @@ export const spec = {
    * @returns {boolean}
    */
   isBidRequestValid(bid) {
-    if (bid && bid.params && bid.params.adslotId && bid.params.supplyId) {
-      return true;
-    }
-    return false;
+    return !!(bid && bid.params && bid.params.adslotId && bid.params.supplyId);
   },
 
   /**
@@ -97,6 +103,40 @@ export const spec = {
           query.consent = bidderRequest.gdprConsent.consentString;
         }
       }
+
+      if (bidderRequest.ortb2?.regs?.ext?.dsa !== undefined) {
+        const dsa = bidderRequest.ortb2.regs.ext.dsa;
+
+        assignIfNotUndefined(query, 'dsarequired', dsa.dsarequired);
+        assignIfNotUndefined(query, 'dsapubrender', dsa.pubrender);
+        assignIfNotUndefined(query, 'dsadatatopub', dsa.datatopub);
+
+        if (Array.isArray(dsa.transparency)) {
+          const filteredTransparencies = dsa.transparency.filter(({ domain, dsaparams }) => {
+            return domain && !domain.includes('~') && Array.isArray(dsaparams) && dsaparams.length > 0 && dsaparams.every(param => typeof param === 'number');
+          });
+
+          if (filteredTransparencies.length === 1) {
+            const { domain, dsaparams } = filteredTransparencies[0];
+            assignIfNotUndefined(query, 'dsadomain', domain);
+            assignIfNotUndefined(query, 'dsaparams', dsaparams.join(','));
+          } else if (filteredTransparencies.length > 1) {
+            const dsatransparency = filteredTransparencies.map(({ domain, dsaparams }) =>
+              `${domain}~${dsaparams.join('_')}`
+            ).join('~~');
+            if (dsatransparency) {
+              query.dsatransparency = dsatransparency;
+            }
+          }
+        }
+      }
+
+      const topics = getGoogleTopics(bidderRequest);
+      if (topics) {
+        assignIfNotUndefined(query, 'segtax', topics.segtax);
+        assignIfNotUndefined(query, 'segclass', topics.segclass);
+        assignIfNotUndefined(query, 'segments', topics.segments);
+      }
     }
 
     const adslots = adslotIds.join(',');
@@ -161,10 +201,15 @@ export const spec = {
           referrer: '',
           ad: ``,
           meta: {
-            advertiserDomains: (matchedBid.advertiser) ? matchedBid.advertiser : 'n/a',
+            advertiserDomains: [(matchedBid.advertiser) ? matchedBid.advertiser : 'n/a'],
           },
         };
 
+        const dsa = getDigitalServicesActObjectFromMatchedBid(matchedBid)
+        if (dsa !== undefined) {
+          bidResponse.meta = { ...bidResponse.meta, dsa: dsa };
+        }
+
         if (isVideo(bidRequest, adType)) {
           const playersize = getPlayerSize(bidRequest);
           if (playersize) {
@@ -510,7 +555,7 @@ function getBidFloor(bid, sizes) {
     mediaType: mediaType !== undefined && spec.supportedMediaTypes.includes(mediaType) ? mediaType : '*',
     size: sizes.length !== 1 ? '*' : sizes[0].split(DIMENSION_SIGN),
   });
-  if (floor.currency === CURRENCY_CODE) {
+  if (floor?.currency === CURRENCY_CODE) {
     return (floor.floor * 100).toFixed(0);
   }
   return undefined;
@@ -536,4 +581,55 @@ function isImageAssetOfType(type) {
   return asset => asset?.img?.type === type;
 }
 
+/**
+ * Retrieves the Digital Services Act (DSA) object from a matched bid.
+ * Only includes specific attributes (behalf, paid, transparency, adrender) from the DSA object.
+ *
+ * @param {Object} matchedBid - The server response body to inspect for the DSA information.
+ * @returns {Object|undefined} A copy of the DSA object if it exists, or undefined if not.
+ */
+function getDigitalServicesActObjectFromMatchedBid(matchedBid) {
+  if (matchedBid.dsa) {
+    const { behalf, paid, transparency, adrender } = matchedBid.dsa;
+    return {
+      ...(behalf !== undefined && { behalf }),
+      ...(paid !== undefined && { paid }),
+      ...(transparency !== undefined && { transparency }),
+      ...(adrender !== undefined && { adrender })
+    };
+  }
+  return undefined;
+}
+
+/**
+ * Conditionally assigns a value to a specified key on an object if the value is not undefined.
+ *
+ * @param {Object} obj - The object to which the value will be assigned.
+ * @param {string} key - The key under which the value should be assigned.
+ * @param {*} value - The value to be assigned, if it is not undefined.
+ */
+function assignIfNotUndefined(obj, key, value) {
+  if (value !== undefined) {
+    obj[key] = value;
+  }
+}
+
+function getGoogleTopics(bid) {
+  const userData = deepAccess(bid, 'ortb2.user.data') || [];
+  const validData = userData.filter(dataObj =>
+    dataObj.segment && isArray(dataObj.segment) && dataObj.segment.length > 0 &&
+      dataObj.segment.every(seg => (seg.id && !isEmptyStr(seg.id) && isFinite(seg.id)))
+  )[0];
+
+  if (validData) {
+    return {
+      segtax: validData.ext?.segtax,
+      segclass: validData.ext?.segclass,
+      segments: validData.segment.map(seg => Number(seg.id)).join(','),
+    };
+  }
+
+  return undefined;
+}
+
 registerBidder(spec);
diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index d2e97f5178e..af01ee73f09 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -18,6 +18,14 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {Renderer} from '../src/Renderer.js';
 import {find, includes} from '../src/polyfill.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerRequest} ServerRequest
+ */
+
 const BIDDER_CODE = 'yieldmo';
 const GVLID = 173;
 const CURRENCY = 'USD';
@@ -29,7 +37,7 @@ const VIDEO_PATH = '/exchange/prebidvideo';
 const STAGE_DOMAIN = 'https://ads-stg.yieldmo.com';
 const PROD_DOMAIN = 'https://ads.yieldmo.com';
 const OUTSTREAM_VIDEO_PLAYER_URL = 'https://prebid-outstream.yieldmo.com/bundle.js';
-const OPENRTB_VIDEO_BIDPARAMS = ['mimes', 'startdelay', 'placement', 'startdelay', 'skipafter', 'protocols', 'api',
+const OPENRTB_VIDEO_BIDPARAMS = ['mimes', 'startdelay', 'placement', 'plcmt', 'skipafter', 'protocols', 'api',
   'playbackmethod', 'maxduration', 'minduration', 'pos', 'skip', 'skippable'];
 const OPENRTB_VIDEO_SITEPARAMS = ['name', 'domain', 'cat', 'keywords'];
 const LOCAL_WINDOW = getWindowTop();
@@ -45,8 +53,8 @@ export const spec = {
   gvlid: GVLID,
   /**
    * Determines whether or not the given bid request is valid.
-   * @param {object} bid, bid to validate
-   * @return boolean, true if valid, otherwise false
+   * @param {object} bid bid to validate
+   * @return {boolean} true if valid, otherwise false
    */
   isBidRequestValid: function (bid) {
     return !!(bid && bid.adUnitCode && bid.bidId && (hasBannerMediaType(bid) || hasVideoMediaType(bid)) &&
@@ -68,7 +76,8 @@ export const spec = {
     const videoBidRequests = bidRequests.filter(request => hasVideoMediaType(request));
     let serverRequests = [];
     const eids = getEids(bidRequests[0]) || [];
-
+    const topicsData = getTopics(bidderRequest);
+    const cdep = getCdep(bidderRequest);
     if (bannerBidRequests.length > 0) {
       let serverRequest = {
         pbav: '$prebid.version$',
@@ -78,15 +87,28 @@ export const spec = {
         bust: new Date().getTime().toString(),
         dnt: getDNT(),
         description: getPageDescription(),
+        tmax: bidderRequest.timeout || 400,
         userConsent: JSON.stringify({
           // case of undefined, stringify will remove param
-          gdprApplies: deepAccess(bidderRequest, 'gdprConsent.gdprApplies') || '',
+          gdprApplies:
+            deepAccess(bidderRequest, 'gdprConsent.gdprApplies') || '',
           cmp: deepAccess(bidderRequest, 'gdprConsent.consentString') || '',
           gpp: deepAccess(bidderRequest, 'gppConsent.gppString') || '',
-          gpp_sid: deepAccess(bidderRequest, 'gppConsent.applicableSections') || []
+          gpp_sid:
+            deepAccess(bidderRequest, 'gppConsent.applicableSections') || [],
         }),
-        us_privacy: deepAccess(bidderRequest, 'uspConsent') || ''
+        us_privacy: deepAccess(bidderRequest, 'uspConsent') || '',
       };
+      if (topicsData) {
+        serverRequest.topics = JSON.stringify(topicsData);
+      }
+      const gpc = getGPCSignal(bidderRequest);
+      if (gpc) {
+        serverRequest.gpc = gpc;
+      }
+      if (cdep) {
+        serverRequest.cdep = cdep;
+      }
 
       if (canAccessTopWindow()) {
         serverRequest.pr = (LOCAL_WINDOW.document && LOCAL_WINDOW.document.referrer) || '';
@@ -151,8 +173,11 @@ export const spec = {
 
     if (videoBidRequests.length > 0) {
       const serverRequest = openRtbRequest(videoBidRequests, bidderRequest);
+      if (topicsData) {
+        serverRequest.topics = topicsData;
+      }
       if (eids.length) {
-        serverRequest.user = { eids };
+        deepSetValue(serverRequest, 'user.ext.eids', eids);
       };
       serverRequests.push({
         method: 'POST',
@@ -232,7 +257,7 @@ function hasVideoMediaType(bidRequest) {
  * @param request bid request
  */
 function addPlacement(request) {
-  const gpid = deepAccess(request, 'ortb2Imp.ext.data.pbadslot');
+  const gpid = deepAccess(request, 'ortb2Imp.ext.gpid') || deepAccess(request, 'ortb2Imp.ext.data.pbadslot');
   const placementInfo = {
     placement_id: request.adUnitCode,
     callback_id: request.bidId,
@@ -312,8 +337,7 @@ function createNewVideoBid(response, bidRequest) {
       mediaType: VIDEO,
     },
   };
-
-  if (imp.video.placement && imp.video.placement !== 1) {
+  if (imp.video.plcmt && imp.video.plcmt !== 1) {
     const renderer = Renderer.install({
       url: OUTSTREAM_VIDEO_PLAYER_URL,
       config: {
@@ -324,7 +348,7 @@ function createNewVideoBid(response, bidRequest) {
         allowVpaid: true,
         autoPlay: true,
         preload: true,
-        mute: true
+        mute: true,
       },
       id: imp.tagid,
       loaded: false,
@@ -401,21 +425,52 @@ function openRtbRequest(bidRequests, bidderRequest) {
   if (schain) {
     openRtbRequest.schain = schain;
   }
-
+  const gpc = getGPCSignal(bidderRequest);
+  if (gpc) {
+    deepSetValue(openRtbRequest, 'regs.ext.gpc', gpc);
+  }
   if (bidRequests[0].auctionId) {
     openRtbRequest.auctionId = bidRequests[0].auctionId;
   }
   populateOpenRtbGdpr(openRtbRequest, bidderRequest);
-
   return openRtbRequest;
 }
 
+function getGPCSignal(bidderRequest) {
+  const gpc = deepAccess(bidderRequest, 'ortb2.regs.ext.gpc');
+  return gpc;
+}
+
+function getCdep(bidderRequest) {
+  const cdep = deepAccess(bidderRequest, 'ortb2.device.ext.cdep') || null;
+  return cdep;
+}
+
+function getTopics(bidderRequest) {
+  const userData = deepAccess(bidderRequest, 'ortb2.user.data') || [];
+  const topicsData = userData.filter((dataObj) => {
+    const segtax = dataObj.ext?.segtax;
+    return segtax >= 600 && segtax <= 609;
+  })[0];
+
+  if (topicsData) {
+    let topicsObject = {
+      taxonomy: topicsData.ext.segtax,
+      classifier: topicsData.ext.segclass,
+      // topics needs to be array of numbers
+      topics: Object.values(topicsData.segment).map(i => Number(i)),
+    };
+    return topicsObject;
+  }
+  return null;
+}
+
 /**
  * @param {BidRequest} bidRequest bidder request object.
  * @return Object OpenRTB's 'imp' (impression) object
  */
 function openRtbImpression(bidRequest) {
-  const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
+  const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid') || deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
   const size = extractPlayerSize(bidRequest);
   const imp = {
     id: bidRequest.bidId,
@@ -446,7 +501,7 @@ function openRtbImpression(bidRequest) {
     imp.video.skip = 1;
     delete imp.video.skippable;
   }
-  if (imp.video.placement !== 1) {
+  if (imp.video.plcmt !== 1 || imp.video.placement !== 1) {
     imp.video.startdelay = DEFAULT_START_DELAY;
     imp.video.playbackmethod = [ DEFAULT_PLAYBACK_METHOD ];
   }
@@ -537,8 +592,8 @@ function populateOpenRtbGdpr(openRtbRequest, bidderRequest) {
 
 /**
  * Determines whether or not the given video bid request is valid. If it's not a video bid, returns true.
- * @param {object} bid, bid to validate
- * @return boolean, true if valid, otherwise false
+ * @param {object} bid bid to validate
+ * @return {boolean} true if valid, otherwise false
  */
 function validateVideoParams(bid) {
   if (!hasVideoMediaType(bid)) {
@@ -597,24 +652,7 @@ function validateVideoParams(bid) {
     validate('video.mimes', val => isDefined(val), paramRequired);
     validate('video.mimes', val => isArray(val) && val.every(v => isStr(v)), paramInvalid,
       'array of strings, ex: ["video/mp4"]');
-
-    const placement = validate('video.placement', val => isDefined(val), paramRequired);
-    validate('video.placement', val => val >= 1 && val <= 5, paramInvalid);
-    if (placement === 1) {
-      validate('video.startdelay', val => isDefined(val),
-        (field, v) => paramRequired(field, v, 'placement == 1'));
-      validate('video.startdelay', val => isNumber(val), paramInvalid, 'number, ex: 5');
-    }
-
     validate('video.protocols', val => isDefined(val), paramRequired);
-    validate(
-      'video.protocols',
-      (val) =>
-        isArrayOfNums(val) &&
-        val.every((v) => v >= 1 && v <= 12 && v != 9 && v != 10), // 9 and 10 are for DAST which are not supported.
-      paramInvalid,
-      'array of numbers between 1 and 12 except for 9 or 10 , ex: [2,3, 7, 11]'
-    );
 
     validate('video.api', val => isDefined(val), paramRequired);
     validate('video.api', val => isArrayOfNums(val) && val.every(v => (v >= 1 && v <= 6)),
@@ -643,9 +681,9 @@ function validateVideoParams(bid) {
 /**
  * Shortcut object property and check if required characters count was deleted
  *
- * @param {number} extraCharacters, count of characters to remove
- * @param {object} target, object on which string property length should be reduced
- * @param {string} propertyName, name of property to reduce
+ * @param {number} extraCharacters count of characters to remove
+ * @param {object} target object on which string property length should be reduced
+ * @param {string} propertyName name of property to reduce
  * @return {number} 0 if required characters count was removed otherwise count of how many left
  */
 function shortcutProperty(extraCharacters, target, propertyName) {
@@ -664,7 +702,7 @@ function shortcutProperty(extraCharacters, target, propertyName) {
 
 /**
  * Creates and returnes eids arr using createEidsArray from './userId/eids.js' module;
- * @param {Object} openRtbRequest OpenRTB's request as a cource of userId.
+ * @param {Object} bidRequest OpenRTB's request as a cource of userId.
  * @return array of eids objects
  */
 function getEids(bidRequest) {
diff --git a/modules/yieldoneAnalyticsAdapter.js b/modules/yieldoneAnalyticsAdapter.js
index 0663ecb3f76..23fa0e0eec9 100644
--- a/modules/yieldoneAnalyticsAdapter.js
+++ b/modules/yieldoneAnalyticsAdapter.js
@@ -1,7 +1,7 @@
 import { isArray, deepClone } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS } from '../src/constants.js';
 import adapterManager from '../src/adapterManager.js';
 import { targeting } from '../src/targeting.js';
 import { auctionManager } from '../src/auctionManager.js';
@@ -14,9 +14,9 @@ const requestedBidders = {};
 const requestedBids = {};
 const referrers = {};
 const ignoredEvents = {};
-ignoredEvents[CONSTANTS.EVENTS.BID_ADJUSTMENT] = true;
-ignoredEvents[CONSTANTS.EVENTS.BIDDER_DONE] = true;
-ignoredEvents[CONSTANTS.EVENTS.AUCTION_END] = true;
+ignoredEvents[EVENTS.BID_ADJUSTMENT] = true;
+ignoredEvents[EVENTS.BIDDER_DONE] = true;
+ignoredEvents[EVENTS.AUCTION_END] = true;
 
 let currentAuctionId = '';
 let url = defaultUrl;
@@ -69,7 +69,7 @@ function addAdUnitName(params, map) {
 const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
   getUrl() { return url; },
   track({eventType, args = {}}) {
-    if (eventType === CONSTANTS.EVENTS.BID_REQUESTED) {
+    if (eventType === EVENTS.BID_REQUESTED) {
       const reqBidderId = `${args.bidderCode}_${args.auctionId}`;
       requestedBidders[reqBidderId] = deepClone(args);
       requestedBidders[reqBidderId].bids = [];
@@ -77,7 +77,7 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
         requestedBids[`${bid.bidId}_${bid.auctionId}`] = bid;
       });
     }
-    if (eventType === CONSTANTS.EVENTS.BID_TIMEOUT && isArray(args)) {
+    if (eventType === EVENTS.BID_TIMEOUT && isArray(args)) {
       const eventsStorage = yieldoneAnalytics.eventsStorage;
       const reqBidders = {};
       args.forEach((bid) => {
@@ -118,7 +118,7 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
         }
 
         if (
-          eventType === CONSTANTS.EVENTS.AUCTION_END || eventType === CONSTANTS.EVENTS.BID_WON
+          eventType === EVENTS.AUCTION_END || eventType === EVENTS.BID_WON
         ) {
           params.adServerTargeting = targeting.getAllTargeting(
             auctionManager.getAdUnitCodes(),
diff --git a/modules/yuktamediaAnalyticsAdapter.js b/modules/yuktamediaAnalyticsAdapter.js
index 820e6365a9f..19825041589 100644
--- a/modules/yuktamediaAnalyticsAdapter.js
+++ b/modules/yuktamediaAnalyticsAdapter.js
@@ -1,12 +1,11 @@
 import {buildUrl, generateUUID, getWindowLocation, logError, logInfo, parseSizesInput, parseUrl} from '../src/utils.js';
-import {ajax} from '../src/ajax.js';
+import {ajax, fetch} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import { EVENTS, STATUS } from '../src/constants.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {includes as strIncludes} from '../src/polyfill.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
 
 const MODULE_CODE = 'yuktamedia';
@@ -37,7 +36,7 @@ const _pageInfo = {
   referer: referer,
   refererDomain: parseUrl(referer).host,
   yuktamediaAnalyticsVersion: yuktamediaAnalyticsVersion,
-  prebidVersion: getGlobal().version
+  prebidVersion: 'v' + 'prebid.version$'
 };
 
 function getParameterByName(param) {
@@ -51,10 +50,6 @@ function getParameterByName(param) {
   return vars[param] ? vars[param] : '';
 }
 
-function isNavigatorSendBeaconSupported() {
-  return ('navigator' in window) && ('sendBeacon' in window.navigator);
-}
-
 function updateSessionId() {
   if (isSessionIdTimeoutExpired()) {
     let newSessionId = generateUUID();
@@ -89,24 +84,27 @@ function send(data, status) {
     hostname: 'analytics-prebid.yuktamedia.com',
     pathname: '/api/bids'
   });
-  if (isNavigatorSendBeaconSupported()) {
-    window.navigator.sendBeacon(yuktamediaAnalyticsRequestUrl, JSON.stringify(data));
-  } else {
+  fetch(yuktamediaAnalyticsRequestUrl, {
+    body: JSON.stringify(data),
+    keepalive: true,
+    withCredentials: true,
+    method: 'POST'
+  }).catch((_e) => {
     ajax(yuktamediaAnalyticsRequestUrl, undefined, JSON.stringify(data), { method: 'POST', contentType: 'text/plain' });
-  }
+  });
 }
 
 var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoint' }), {
   track({ eventType, args }) {
     if (typeof args !== 'undefined') {
       switch (eventType) {
-        case CONSTANTS.EVENTS.AUCTION_INIT:
+        case EVENTS.AUCTION_INIT:
           logInfo(localStoragePrefix + 'AUCTION_INIT:', JSON.stringify(args));
           if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
             events.auctions[args.auctionId] = { bids: {} };
           }
           break;
-        case CONSTANTS.EVENTS.BID_REQUESTED:
+        case EVENTS.BID_REQUESTED:
           logInfo(localStoragePrefix + 'BID_REQUESTED:', JSON.stringify(args));
           if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
             if (typeof events.auctions[args.auctionId] === 'undefined') {
@@ -135,14 +133,14 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
             });
           }
           break;
-        case CONSTANTS.EVENTS.BID_RESPONSE:
+        case EVENTS.BID_RESPONSE:
           logInfo(localStoragePrefix + 'BID_RESPONSE:', JSON.stringify(args));
           if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
             if (typeof events.auctions[args.auctionId] === 'undefined') {
               events.auctions[args.auctionId] = { bids: {} };
             } else if (Object.keys(events.auctions[args.auctionId]['bids']).length) {
               let bidResponse = events.auctions[args.auctionId]['bids'][args.requestId];
-              bidResponse.isBid = args.getStatusCode() === CONSTANTS.STATUS.GOOD;
+              bidResponse.isBid = args.getStatusCode() === STATUS.GOOD;
               bidResponse.cpm = args.cpm;
               bidResponse.currency = args.currency;
               bidResponse.netRevenue = args.netRevenue;
@@ -165,7 +163,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
             }
           }
           break;
-        case CONSTANTS.EVENTS.NO_BID:
+        case EVENTS.NO_BID:
           logInfo(localStoragePrefix + 'NO_BID:', JSON.stringify(args));
           if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
             if (typeof events.auctions[args.auctionId] === 'undefined') {
@@ -176,7 +174,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
             }
           }
           break;
-        case CONSTANTS.EVENTS.BID_WON:
+        case EVENTS.BID_WON:
           logInfo(localStoragePrefix + 'BID_WON:', JSON.stringify(args));
           if (typeof initOptions.enableSession !== 'undefined' && initOptions.enableSession) {
             updateSessionId();
@@ -192,7 +190,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
             }
           }
           break;
-        case CONSTANTS.EVENTS.BID_TIMEOUT:
+        case EVENTS.BID_TIMEOUT:
           logInfo(localStoragePrefix + 'BID_TIMEOUT:', JSON.stringify(args));
           if (args.length) {
             args.forEach(timeout => {
@@ -208,7 +206,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
             });
           }
           break;
-        case CONSTANTS.EVENTS.AUCTION_END:
+        case EVENTS.AUCTION_END:
           logInfo(localStoragePrefix + 'AUCTION_END:', JSON.stringify(args));
           if (typeof initOptions.enableSession !== 'undefined' && initOptions.enableSession) {
             updateSessionId();
diff --git a/modules/zeotapIdPlusIdSystem.js b/modules/zeotapIdPlusIdSystem.js
index ab7bf7c237b..32b7a5b77ad 100644
--- a/modules/zeotapIdPlusIdSystem.js
+++ b/modules/zeotapIdPlusIdSystem.js
@@ -9,6 +9,11 @@ import {submodule} from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
+/**
+ * @typedef {import('../modules/userId/index.js').Submodule} Submodule
+ * @typedef {import('../modules/userId/index.js').SubmoduleConfig} SubmoduleConfig
+ */
+
 const ZEOTAP_COOKIE_NAME = 'IDP';
 const ZEOTAP_VENDOR_ID = 301;
 const ZEOTAP_MODULE_NAME = 'zeotapIdPlus';
diff --git a/modules/zetaBidAdapter.js b/modules/zetaBidAdapter.js
index 527030efc9a..658d3198df0 100644
--- a/modules/zetaBidAdapter.js
+++ b/modules/zetaBidAdapter.js
@@ -2,6 +2,16 @@ import {deepAccess, logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').Bids} Bids
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory.js').UserSync} UserSync
+ */
+
 const BIDDER_CODE = 'zeta_global';
 const PREBID_DEFINER_ID = '44253'
 const ENDPOINT_URL = 'https://prebid.rfihub.com/prebid';
@@ -15,11 +25,11 @@ export const spec = {
   supportedMediaTypes: [BANNER],
 
   /**
-     * Determines whether or not the given bid request is valid.
-     *
-     * @param {BidRequest} bid The bid params to validate.
-     * @return boolean True if this is a valid bid, and false otherwise.
-     */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     // check for all required bid fields
     if (!(bid &&
@@ -50,12 +60,12 @@ export const spec = {
   },
 
   /**
-     * Make a server request from the list of BidRequests.
-     *
-     * @param {Bids[]} validBidRequests - an array of bidRequest objects
-     * @param {BidderRequest} bidderRequest - master bidRequest object
-     * @return ServerRequest Info describing the request to the server.
-     */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Bids[]} validBidRequests - an array of bidRequest objects
+   * @param {BidderRequest} bidderRequest - master bidRequest object
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     const secure = 1; // treat all requests as secure
     const request = validBidRequests[0];
@@ -117,12 +127,12 @@ export const spec = {
   },
 
   /**
-     * Unpack the response from the server into a list of bids.
-     *
-     * @param {ServerResponse} serverResponse A successful response from the server.
-     * @param bidRequest The payload from the server's response.
-     * @return {Bid[]} An array of bids which were nested inside the server.
-     */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param bidRequest The payload from the server's response.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, bidRequest) {
     let bidResponse = [];
     if (Object.keys(serverResponse.body).length !== 0) {
diff --git a/modules/zeta_global_sspAnalyticsAdapter.js b/modules/zeta_global_sspAnalyticsAdapter.js
index 3d5466dd906..805e2c51c81 100644
--- a/modules/zeta_global_sspAnalyticsAdapter.js
+++ b/modules/zeta_global_sspAnalyticsAdapter.js
@@ -1,7 +1,7 @@
-import {logInfo, logError} from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
+import {logError} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
 import adapterManager from '../src/adapterManager.js';
-import CONSTANTS from '../src/constants.json';
+import {EVENTS} from '../src/constants.js';
 
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 
@@ -10,13 +10,9 @@ const ADAPTER_CODE = 'zeta_global_ssp';
 const BASE_URL = 'https://ssp.disqus.com/prebid/event';
 const LOG_PREFIX = 'ZetaGlobalSsp-Analytics: ';
 
-const cache = {
-  auctions: {}
-};
-
 /// /////////// VARIABLES ////////////////////////////////////
 
-let publisherId; // int
+let zetaParams;
 
 /// /////////// HELPER FUNCTIONS /////////////////////////////
 
@@ -28,95 +24,116 @@ function sendEvent(eventType, event) {
   );
 }
 
-function getZetaParams(event) {
-  if (event.adUnits) {
-    for (const i in event.adUnits) {
-      const unit = event.adUnits[i];
-      if (unit.bids) {
-        for (const j in unit.bids) {
-          const bid = unit.bids[j];
-          if (bid.bidder === ADAPTER_CODE && bid.params) {
-            return bid.params;
-          }
-        }
-      }
-    }
-  }
-  return null;
-}
-
 /// /////////// ADAPTER EVENT HANDLER FUNCTIONS //////////////
 
 function adRenderSucceededHandler(args) {
-  let eventType = CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED
-  logInfo(LOG_PREFIX + 'handle ' + eventType + ' event');
-
-  // set zetaParams from cache
-  if (args.bid && args.bid.auctionId) {
-    const zetaParams = cache.auctions[args.bid.auctionId];
-    if (zetaParams) {
-      args.bid.params = [ zetaParams ];
+  const event = {
+    zetaParams: zetaParams,
+    domain: args.doc?.location?.host,
+    page: args.doc?.location?.host + args.doc?.location?.pathname,
+    bid: {
+      adId: args.bid?.adId,
+      requestId: args.bid?.requestId,
+      auctionId: args.bid?.auctionId,
+      creativeId: args.bid?.creativeId,
+      bidder: args.bid?.bidderCode,
+      mediaType: args.bid?.mediaType,
+      size: args.bid?.size,
+      adomain: args.bid?.adserverTargeting?.hb_adomain,
+      timeToRespond: args.bid?.timeToRespond,
+      cpm: args.bid?.cpm,
+      adUnitCode: args.bid?.adUnitCode
+    },
+    device: {
+      ua: navigator.userAgent
     }
   }
-
-  sendEvent(eventType, args);
+  sendEvent(EVENTS.AD_RENDER_SUCCEEDED, event);
 }
 
 function auctionEndHandler(args) {
-  let eventType = CONSTANTS.EVENTS.AUCTION_END;
-  logInfo(LOG_PREFIX + 'handle ' + eventType + ' event');
-
-  // save zetaParams to cache
-  const zetaParams = getZetaParams(args);
-  if (zetaParams && args.auctionId) {
-    cache.auctions[args.auctionId] = zetaParams;
+  const event = {
+    zetaParams: zetaParams,
+    bidderRequests: args.bidderRequests?.map(br => ({
+      bidderCode: br?.bidderCode,
+      domain: br?.refererInfo?.domain,
+      page: br?.refererInfo?.page,
+      bids: br?.bids?.map(b => ({
+        bidId: b?.bidId,
+        auctionId: b?.auctionId,
+        bidder: b?.bidder,
+        mediaType: b?.mediaTypes?.video ? 'VIDEO' : (b?.mediaTypes?.banner ? 'BANNER' : undefined),
+        size: b?.sizes?.filter(s => s && s.length === 2).filter(s => Number.isInteger(s[0]) && Number.isInteger(s[1])).map(s => s[0] + 'x' + s[1]).find(s => s),
+        device: b?.ortb2?.device,
+        adUnitCode: b?.adUnitCode
+      }))
+    })),
+    bidsReceived: args.bidsReceived?.map(br => ({
+      adId: br?.adId,
+      requestId: br?.requestId,
+      creativeId: br?.creativeId,
+      bidder: br?.bidder,
+      mediaType: br?.mediaType,
+      size: br?.size,
+      adomain: br?.adserverTargeting?.hb_adomain,
+      timeToRespond: br?.timeToRespond,
+      cpm: br?.cpm,
+      adUnitCode: br?.adUnitCode
+    }))
   }
+  sendEvent(EVENTS.AUCTION_END, event);
+}
 
-  sendEvent(eventType, args);
+function bidTimeoutHandler(args) {
+  const event = {
+    zetaParams: zetaParams,
+    domain: args.find(t => t?.ortb2?.site?.domain)?.ortb2?.site?.domain,
+    page: args.find(t => t?.ortb2?.site?.page)?.ortb2?.site?.page,
+    timeouts: args.map(t => ({
+      bidId: t?.bidId,
+      auctionId: t?.auctionId,
+      bidder: t?.bidder,
+      mediaType: t?.mediaTypes?.video ? 'VIDEO' : (t?.mediaTypes?.banner ? 'BANNER' : undefined),
+      size: t?.sizes?.filter(s => s && s.length === 2).filter(s => Number.isInteger(s[0]) && Number.isInteger(s[1])).map(s => s[0] + 'x' + s[1]).find(s => s),
+      timeout: t?.timeout,
+      device: t?.ortb2?.device,
+      adUnitCode: t?.adUnitCode
+    }))
+  }
+  sendEvent(EVENTS.BID_TIMEOUT, event);
 }
 
 /// /////////// ADAPTER DEFINITION ///////////////////////////
 
-let baseAdapter = adapter({ analyticsType: 'endpoint' });
+let baseAdapter = adapter({analyticsType: 'endpoint'});
 let zetaAdapter = Object.assign({}, baseAdapter, {
 
   enableAnalytics(config = {}) {
-    let error = false;
-
-    if (typeof config.options === 'object') {
-      if (config.options.sid) {
-        publisherId = Number(config.options.sid);
-      }
+    if (config.options && config.options.sid) {
+      zetaParams = config.options;
+      baseAdapter.enableAnalytics.call(this, config);
     } else {
       logError(LOG_PREFIX + 'Config not found');
-      error = true;
-    }
-
-    if (!publisherId) {
-      logError(LOG_PREFIX + 'Missing sid (publisher id)');
-      error = true;
-    }
-
-    if (error) {
       logError(LOG_PREFIX + 'Analytics is disabled due to error(s)');
-    } else {
-      baseAdapter.enableAnalytics.call(this, config);
     }
   },
 
   disableAnalytics() {
-    publisherId = undefined;
+    zetaParams = undefined;
     baseAdapter.disableAnalytics.apply(this, arguments);
   },
 
-  track({ eventType, args }) {
+  track({eventType, args}) {
     switch (eventType) {
-      case CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED:
+      case EVENTS.AD_RENDER_SUCCEEDED:
         adRenderSucceededHandler(args);
         break;
-      case CONSTANTS.EVENTS.AUCTION_END:
+      case EVENTS.AUCTION_END:
         auctionEndHandler(args);
         break;
+      case EVENTS.BID_TIMEOUT:
+        bidTimeoutHandler(args);
+        break;
     }
   }
 });
diff --git a/modules/zeta_global_sspBidAdapter.js b/modules/zeta_global_sspBidAdapter.js
index 687afb6c692..62e60db020f 100644
--- a/modules/zeta_global_sspBidAdapter.js
+++ b/modules/zeta_global_sspBidAdapter.js
@@ -3,11 +3,17 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import {parseDomain} from '../src/refererDetection.js';
-import {ajax} from '../src/ajax.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory.js').Bids} Bids
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ */
 
 const BIDDER_CODE = 'zeta_global_ssp';
 const ENDPOINT_URL = 'https://ssp.disqus.com/bid/prebid';
-const TIMEOUT_URL = 'https://ssp.disqus.com/timeout/prebid';
 const USER_SYNC_URL_IFRAME = 'https://ssp.disqus.com/sync?type=iframe';
 const USER_SYNC_URL_IMAGE = 'https://ssp.disqus.com/sync?type=image';
 const DEFAULT_CUR = 'USD';
@@ -42,10 +48,11 @@ const VIDEO_CUSTOM_PARAMS = {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 469,
   supportedMediaTypes: [BANNER, VIDEO],
 
   /**
-   * Determines whether or not the given bid request is valid.
+   * Determines whether the given bid request is valid.
    *
    * @param {BidRequest} bid The bid params to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
@@ -54,7 +61,8 @@ export const spec = {
     // check for all required bid fields
     if (!(bid &&
       bid.bidId &&
-      bid.params)) {
+      bid.params &&
+      bid.params.sid)) {
       logWarn('Invalid bid request - missing required bid data');
       return false;
     }
@@ -76,8 +84,9 @@ export const spec = {
         id: request.bidId,
         secure: secure
       };
-      if (params.tagid) {
-        impData.tagid = params.tagid;
+      const tagid = request.params?.tagid;
+      if (tagid) {
+        impData.tagid = tagid;
       }
       if (request.mediaTypes) {
         for (const mediaType in request.mediaTypes) {
@@ -105,8 +114,11 @@ export const spec = {
           impData.bidfloor = floorInfo.floor;
         }
       }
-      if (!impData.bidfloor && params.bidfloor) {
-        impData.bidfloor = params.bidfloor;
+      if (!impData.bidfloor) {
+        const bidfloor = request.params?.bidfloor;
+        if (bidfloor) {
+          impData.bidfloor = bidfloor;
+        }
       }
 
       return impData;
@@ -116,8 +128,8 @@ export const spec = {
       id: bidderRequest.bidderRequestId,
       cur: [DEFAULT_CUR],
       imp: imps,
-      site: params.site ? params.site : {},
-      device: {...(bidderRequest.ortb2?.device || {}), ...params.device},
+      site: {...bidderRequest?.ortb2?.site, ...params?.site},
+      device: {...bidderRequest?.ortb2?.device, ...params?.device},
       user: params.user ? params.user : {},
       app: params.app ? params.app : {},
       ext: {
@@ -127,11 +139,29 @@ export const spec = {
     };
     const rInfo = bidderRequest.refererInfo;
     // TODO: do the fallbacks make sense here?
-    payload.site.page = rInfo.page || rInfo.topmostLocation;
+    payload.site.page = cropPage(rInfo.page || rInfo.topmostLocation);
     payload.site.domain = parseDomain(payload.site.page, {noLeadingWww: true});
 
     payload.device.ua = navigator.userAgent;
     payload.device.language = navigator.language;
+    payload.device.w = screen.width;
+    payload.device.h = screen.height;
+
+    if (bidderRequest.ortb2?.user?.geo && bidderRequest.ortb2?.device?.geo) {
+      payload.device.geo = { ...payload.device.geo, ...bidderRequest.ortb2?.device.geo };
+      payload.user.geo = { ...payload.user.geo, ...bidderRequest.ortb2?.user.geo };
+    } else {
+      if (bidderRequest.ortb2?.user?.geo) {
+        payload.user.geo = payload.device.geo = { ...payload.user.geo, ...bidderRequest.ortb2?.user.geo };
+      }
+      if (bidderRequest.ortb2?.device?.geo) {
+        payload.user.geo = payload.device.geo = { ...payload.user.geo, ...bidderRequest.ortb2?.device.geo };
+      }
+    }
+
+    if (bidderRequest?.ortb2?.device?.sua) {
+      payload.device.sua = bidderRequest.ortb2.device.sua;
+    }
 
     if (params.test) {
       payload.test = params.test;
@@ -161,12 +191,21 @@ export const spec = {
       payload.tmax = bidderRequest.timeout;
     }
 
+    if (bidderRequest?.ortb2?.bcat) {
+      payload.bcat = bidderRequest.ortb2.bcat;
+    }
+
+    if (bidderRequest?.ortb2?.badv) {
+      payload.badv = bidderRequest.ortb2.badv;
+    }
+
     provideEids(validBidRequests[0], payload);
-    const url = params.shortname ? ENDPOINT_URL.concat('?shortname=', params.shortname) : ENDPOINT_URL;
+    provideSegments(bidderRequest, payload);
+    const url = params.sid ? ENDPOINT_URL.concat('?sid=', params.sid) : ENDPOINT_URL;
     return {
       method: 'POST',
       url: url,
-      data: JSON.stringify(payload),
+      data: JSON.stringify(clearEmpties(payload)),
     };
   },
 
@@ -182,6 +221,7 @@ export const spec = {
     const response = (serverResponse || {}).body;
     if (response && response.seatbid && response.seatbid[0].bid && response.seatbid[0].bid.length) {
       response.seatbid.forEach(zetaSeatbid => {
+        const seat = zetaSeatbid.seat;
         zetaSeatbid.bid.forEach(zetaBid => {
           let bid = {
             requestId: zetaBid.impid,
@@ -203,6 +243,9 @@ export const spec = {
           if (bid.mediaType === VIDEO) {
             bid.vastXml = bid.ad;
           }
+          if (seat) {
+            bid.dspId = seat;
+          }
           bidResponses.push(bid);
         })
       })
@@ -243,18 +286,6 @@ export const spec = {
         url: USER_SYNC_URL_IMAGE + syncurl
       }];
     }
-  },
-
-  onTimeout: function(timeoutData) {
-    if (timeoutData) {
-      ajax(TIMEOUT_URL, null, JSON.stringify(timeoutData), {
-        method: 'POST',
-        options: {
-          withCredentials: false,
-          contentType: 'application/json'
-        }
-      });
-    }
   }
 }
 
@@ -334,6 +365,25 @@ function provideEids(request, payload) {
   }
 }
 
+function provideSegments(bidderRequest, payload) {
+  const data = bidderRequest.ortb2?.user?.data;
+  if (isArray(data)) {
+    const segments = data.filter(d => d?.segment).map(d => d.segment).filter(s => isArray(s)).flatMap(s => s).filter(s => s?.id);
+    if (segments.length > 0) {
+      if (!payload.user) {
+        payload.user = {};
+      }
+      if (!isArray(payload.user.data)) {
+        payload.user.data = [];
+      }
+      const payloadData = {
+        segment: segments
+      };
+      payload.user.data.push(payloadData);
+    }
+  }
+}
+
 function provideMediaType(zetaBid, bid, bidRequest) {
   if (zetaBid.ext && zetaBid.ext.prebid && zetaBid.ext.prebid.type) {
     bid.mediaType = zetaBid.ext.prebid.type === VIDEO ? VIDEO : BANNER;
@@ -342,4 +392,45 @@ function provideMediaType(zetaBid, bid, bidRequest) {
   }
 }
 
+function cropPage(page) {
+  if (page) {
+    if (page.length > 100) {
+      page = page.substring(0, 100);
+    }
+    if (page.startsWith('https://')) {
+      page = page.substring(8);
+    } else if (page.startsWith('http://')) {
+      page = page.substring(7);
+    }
+    if (page.startsWith('www.')) {
+      page = page.substring(4);
+    }
+    for (let i = 3; i < page.length; i++) {
+      const c = page[i];
+      if (c === '#' || c === '?') {
+        return page.substring(0, i);
+      }
+    }
+    return page;
+  }
+  return '';
+}
+
+function clearEmpties(o) {
+  for (let k in o) {
+    if (o[k] === null) {
+      delete o[k];
+      continue;
+    }
+    if (!o[k] || typeof o[k] !== 'object') {
+      continue;
+    }
+    clearEmpties(o[k]);
+    if (Object.keys(o[k]).length === 0) {
+      delete o[k];
+    }
+  }
+  return o;
+}
+
 registerBidder(spec);
diff --git a/modules/zmaticooBidAdapter.js b/modules/zmaticooBidAdapter.js
new file mode 100644
index 00000000000..905da191ab7
--- /dev/null
+++ b/modules/zmaticooBidAdapter.js
@@ -0,0 +1,302 @@
+import {deepAccess, isArray, isBoolean, isNumber, isStr, logWarn, triggerPixel} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory.js').Bids} Bids
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').ServerResponse} ServerResponse
+ */
+
+const BIDDER_CODE = 'zmaticoo';
+const ENDPOINT_URL = 'https://bid.zmaticoo.com/prebid/bid';
+const DEFAULT_CUR = 'USD';
+const TTL = 200;
+const NET_REV = true;
+
+const DATA_TYPES = {
+  'NUMBER': 'number', 'STRING': 'string', 'BOOLEAN': 'boolean', 'ARRAY': 'array', 'OBJECT': 'object'
+};
+const VIDEO_CUSTOM_PARAMS = {
+  'mimes': DATA_TYPES.ARRAY,
+  'minduration': DATA_TYPES.NUMBER,
+  'maxduration': DATA_TYPES.NUMBER,
+  'startdelay': DATA_TYPES.NUMBER,
+  'playbackmethod': DATA_TYPES.ARRAY,
+  'api': DATA_TYPES.ARRAY,
+  'protocols': DATA_TYPES.ARRAY,
+  'w': DATA_TYPES.NUMBER,
+  'h': DATA_TYPES.NUMBER,
+  'battr': DATA_TYPES.ARRAY,
+  'linearity': DATA_TYPES.NUMBER,
+  'placement': DATA_TYPES.NUMBER,
+  'plcmt': DATA_TYPES.NUMBER,
+  'minbitrate': DATA_TYPES.NUMBER,
+  'maxbitrate': DATA_TYPES.NUMBER,
+  'skip': DATA_TYPES.NUMBER
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    // check for all required bid fields
+    if (!(hasBannerMediaType(bid) || hasVideoMediaType(bid))) {
+      logWarn('Invalid bid request - missing required mediaTypes');
+      return false;
+    }
+    if (!(bid && bid.params)) {
+      logWarn('Invalid bid request - missing required bid data');
+      return false;
+    }
+
+    if (!(bid.params.pubId)) {
+      logWarn('Invalid bid request - missing required field pubId');
+      return false;
+    }
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Bids[]} validBidRequests - an array of bidRequest objects
+   * @param {BidderRequest} bidderRequest - master bidRequest object
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const secure = 1;
+    const request = validBidRequests[0];
+    const params = request.params;
+    const imps = validBidRequests.map(request => {
+      const impData = {
+        id: request.bidId,
+        secure: secure,
+        ext: {
+          bidder: {
+            pubId: params.pubId
+          }
+        }
+      };
+      if (params.tagid) {
+        impData.tagid = params.tagid;
+      }
+      if (request.mediaTypes) {
+        for (const mediaType in request.mediaTypes) {
+          switch (mediaType) {
+            case BANNER:
+              impData.banner = buildBanner(request);
+              break;
+            case VIDEO:
+              impData.video = buildVideo(request);
+              break;
+          }
+        }
+      }
+      if (typeof bidderRequest.getFloor === 'function') {
+        const floorInfo = bidderRequest.getFloor({
+          currency: 'USD',
+          mediaType: impData.video ? 'video' : 'banner',
+          size: [impData.video ? impData.video.w : impData.banner.w, impData.video ? impData.video.h : impData.banner.h]
+        });
+        if (floorInfo && floorInfo.floor) {
+          impData.bidfloor = floorInfo.floor;
+        }
+      }
+      if (!impData.bidfloor && params.bidfloor) {
+        impData.bidfloor = params.bidfloor;
+      }
+      return impData;
+    });
+    let payload = {
+      id: bidderRequest.bidderRequestId,
+      imp: imps,
+      site: params.site ? params.site : {},
+      app: params.app ? params.app : {},
+      device: params.device ? params.device : {},
+      user: params.user ? params.user : {},
+      at: params.at,
+      tmax: params.tmax,
+      wseat: params.wseat,
+      bseat: params.bseat,
+      allimps: params.allimps,
+      cur: [DEFAULT_CUR],
+      wlang: params.wlang,
+      bcat: deepAccess(bidderRequest.ortb2Imp, 'bcat') || params.bcat,
+      badv: params.badv,
+      bapp: params.bapp,
+      source: params.source ? params.source : {},
+      regs: params.regs ? params.regs : {},
+      ext: params.ext ? params.ext : {}
+    };
+    payload.regs.ext = {}
+    payload.user.ext = {}
+    payload.device.ua = navigator.userAgent;
+    payload.device.ip = navigator.ip;
+    payload.site.page = bidderRequest?.refererInfo?.page || window.location.href;
+    payload.site.domain = _getDomainFromURL(payload.site.page);
+    payload.site.mobile = /(ios|ipod|ipad|iphone|android)/i.test(navigator.userAgent) ? 1 : 0;
+    if (params.test) {
+      payload.test = params.test;
+    }
+    if (bidderRequest.gdprConsent) {
+      payload.regs.ext = Object.assign(payload.regs.ext, {gdpr: bidderRequest.gdprConsent.gdprApplies == true ? 1 : 0});
+    }
+    if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+      payload.user.ext = Object.assign(payload.user.ext, {consent: bidderRequest.gdprConsent.consentString});
+    }
+    const postUrl = ENDPOINT_URL;
+    return {
+      method: 'POST', url: postUrl, data: JSON.stringify(payload),
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidRequest The payload from the server's response.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    let bidResponses = [];
+    const response = (serverResponse || {}).body;
+    if (response && response.seatbid && response.seatbid.length && response.seatbid[0].bid && response.seatbid[0].bid.length) {
+      response.seatbid.forEach(zmSeatbid => {
+        zmSeatbid.bid.forEach(zmBid => {
+          let bid = {
+            requestId: zmBid.impid,
+            cpm: zmBid.price,
+            currency: response.cur,
+            width: zmBid.w,
+            height: zmBid.h,
+            ad: zmBid.adm,
+            ttl: TTL,
+            creativeId: zmBid.crid,
+            netRevenue: NET_REV,
+            nurl: zmBid.nurl,
+          };
+          bid.meta = {
+            advertiserDomains: (zmBid.adomain && zmBid.adomain.length) ? zmBid.adomain : []
+          };
+          if (zmBid.ext && zmBid.ext.vast_url) {
+            bid.vastXml = zmBid.ext.vast_url;
+          }
+          if (zmBid.ext && zmBid.ext.prebid) {
+            bid.mediaType = zmBid.ext.prebid.type
+          } else {
+            bid.mediaType = BANNER
+          }
+          bidResponses.push(bid);
+        })
+      })
+    }
+    return bidResponses;
+  },
+  onBidWon: function (bid) {
+    if (!bid['nurl']) {
+      return false
+    }
+    const winCpm = (bid.hasOwnProperty('originalCpm')) ? bid.originalCpm : bid.cpm
+    const winCurr = (bid.hasOwnProperty('originalCurrency') && bid.hasOwnProperty('originalCpm')) ? bid.originalCurrency : bid.currency
+    const winUrl = bid.nurl.replace(
+      /\$\{AUCTION_PRICE\}/,
+      winCpm
+    ).replace(
+      /\$\{AUCTION_IMP_ID\}/,
+      bid.requestId
+    ).replace(
+      /\$\{AUCTION_CURRENCY\}/,
+      winCurr
+    ).replace(
+      /\$\{AUCTON_BID_ID\}/,
+      bid.bidId
+    ).replace(
+      /\$\{AUCTION_ID\}/,
+      bid.auctionId
+    )
+    triggerPixel(winUrl);
+    return true
+  }
+}
+
+function buildBanner(request) {
+  let sizes = request.sizes;
+  if (request.mediaTypes && request.mediaTypes.banner && request.mediaTypes.banner.sizes) {
+    sizes = request.mediaTypes.banner.sizes;
+  }
+  return {
+    w: sizes[0][0], h: sizes[0][1]
+  };
+}
+
+function buildVideo(request) {
+  let video = {};
+  const videoParams = deepAccess(request, 'mediaTypes.video', {});
+  for (const key in VIDEO_CUSTOM_PARAMS) {
+    if (videoParams.hasOwnProperty(key)) {
+      video[key] = checkParamDataType(key, videoParams[key], VIDEO_CUSTOM_PARAMS[key]);
+    }
+  }
+  if (videoParams.playerSize) {
+    if (isArray(videoParams.playerSize[0])) {
+      video.w = parseInt(videoParams.playerSize[0][0], 10);
+      video.h = parseInt(videoParams.playerSize[0][1], 10);
+    } else if (isNumber(videoParams.playerSize[0])) {
+      video.w = parseInt(videoParams.playerSize[0], 10);
+      video.h = parseInt(videoParams.playerSize[1], 10);
+    }
+  }
+  return video;
+}
+
+export function checkParamDataType(key, value, datatype) {
+  let functionToExecute;
+  switch (datatype) {
+    case DATA_TYPES.BOOLEAN:
+      functionToExecute = isBoolean;
+      break;
+    case DATA_TYPES.NUMBER:
+      functionToExecute = isNumber;
+      break;
+    case DATA_TYPES.STRING:
+      functionToExecute = isStr;
+      break;
+    case DATA_TYPES.ARRAY:
+      functionToExecute = isArray;
+      break;
+  }
+  if (functionToExecute(value)) {
+    return value;
+  }
+  logWarn('Ignoring param key: ' + key + ', expects ' + datatype + ', found ' + typeof value);
+  return undefined;
+}
+
+function hasBannerMediaType(bidRequest) {
+  return !!deepAccess(bidRequest, 'mediaTypes.banner');
+}
+
+/**
+ * @param {BidRequest} bidRequest bid request
+ */
+function hasVideoMediaType(bidRequest) {
+  return !!deepAccess(bidRequest, 'mediaTypes.video');
+}
+
+export function _getDomainFromURL(url) {
+  let anchor = document.createElement('a');
+  anchor.href = url;
+  return anchor.hostname;
+}
+
+registerBidder(spec);
diff --git a/modules/zmaticooBidAdapter.md b/modules/zmaticooBidAdapter.md
new file mode 100644
index 00000000000..98e0371bc11
--- /dev/null
+++ b/modules/zmaticooBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: zMaticoo Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: adam.li@eclicktech.com.cn
+```
+
+# Description
+
+zMaticoo Bidder Adapter for Prebid.js.
+
+# Test Parameters
+
+## banner
+
+```
+        var adUnits = [
+            {
+                mediaTypes: {
+                    banner: {
+                        sizes: [[320, 50]],  // a display size
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'zmaticoo',
+                        params: {
+                            user: {
+                                uid: '12345',
+                                buyeruid: '12345'
+                            },
+                            pubId: 'prebid-fgh',
+                            test: 1
+                        }
+                    }
+                ]
+            }
+        ];
+```
+
+## video
+
+```
+     var adUnits = [{
+    code: 'test1',
+    mediaTypes: {
+        video: {
+            playerSize: [480, 320],
+            mimes: ['video/mp4'],
+            context: 'instream',
+            placement: 1,       // required, integer
+            maxduration: 30,    // required, integer
+            minduration: 15,    // optional, integer
+            pos: 1,             // optional, integer
+            startdelay: 10,     // required if placement == 1
+            protocols: [2, 3],  // required, array of integers
+            api: [2, 3],        // required, array of integers
+            playbackmethod: [2, 6], // required, array of integers
+            skippable: true,    // optional, boolean
+            skipafter: 10       // optional, integer
+        }
+    },
+    bids: [{
+        bidder: "zmaticoo",
+        params: {
+            pubId: 'prebid-test',
+            site: {domain: "test.com"}
+        }
+    }]
+}];
+```
diff --git a/package-lock.json b/package-lock.json
index e2f0f242d86..cf2b8a35c1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,43 +1,42 @@
 {
   "name": "prebid.js",
-  "version": "8.17.0-pre",
+  "version": "9.24.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "8.8.0-pre",
+      "version": "9.24.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
-        "@babel/core": "^7.16.7",
+        "@babel/core": "^7.25.2",
         "@babel/plugin-transform-runtime": "^7.18.9",
         "@babel/preset-env": "^7.16.8",
         "@babel/runtime": "^7.18.9",
         "core-js": "^3.13.0",
         "core-js-pure": "^3.13.0",
-        "criteo-direct-rsa-validate": "^1.1.0",
-        "crypto-js": "^3.3.0",
+        "crypto-js": "^4.2.0",
         "dlv": "1.1.3",
-        "dset": "3.1.2",
+        "dset": "3.1.4",
         "express": "^4.15.4",
         "fun-hooks": "^0.9.9",
-        "just-clone": "^1.0.2",
-        "live-connect-js": "^6.0.1"
+        "gulp-wrap": "^0.15.0",
+        "klona": "^2.0.6",
+        "live-connect-js": "^7.1.0"
       },
       "devDependencies": {
         "@babel/eslint-parser": "^7.16.5",
-        "@wdio/browserstack-service": "~7.16.0",
-        "@wdio/cli": "~7.5.2",
-        "@wdio/concise-reporter": "~7.5.2",
-        "@wdio/local-runner": "~7.5.2",
-        "@wdio/mocha-framework": "~7.5.2",
-        "@wdio/spec-reporter": "~7.19.0",
-        "@wdio/sync": "~7.5.2",
+        "@babel/register": "^7.24.6",
+        "@wdio/browserstack-service": "^9.0.5",
+        "@wdio/cli": "^9.0.5",
+        "@wdio/concise-reporter": "^8.29.0",
+        "@wdio/local-runner": "^9.0.5",
+        "@wdio/mocha-framework": "^8.29.0",
+        "@wdio/spec-reporter": "^8.29.0",
         "ajv": "6.12.3",
         "assert": "^2.0.0",
         "babel-loader": "^8.0.5",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-register": "^6.26.0",
         "body-parser": "^1.19.0",
         "chai": "^4.2.0",
         "coveralls": "^3.1.0",
@@ -46,7 +45,8 @@
         "es5-shim": "^4.5.14",
         "eslint": "^7.27.0",
         "eslint-config-standard": "^10.2.1",
-        "eslint-plugin-import": "^2.20.2",
+        "eslint-plugin-import": "^2.30.0",
+        "eslint-plugin-jsdoc": "^48.5.0",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-prebid": "file:./plugins/eslint",
         "eslint-plugin-promise": "^5.1.0",
@@ -54,13 +54,14 @@
         "execa": "^1.0.0",
         "faker": "^5.5.3",
         "fs.extra": "^1.3.2",
-        "gulp": "^4.0.0",
+        "gulp": "^4.0.2",
         "gulp-clean": "^0.4.0",
         "gulp-concat": "^2.6.0",
         "gulp-connect": "^5.7.0",
         "gulp-eslint": "^6.0.0",
         "gulp-if": "^3.0.0",
         "gulp-js-escape": "^1.0.1",
+        "gulp-rename": "^2.0.0",
         "gulp-replace": "^1.0.0",
         "gulp-shell": "^0.8.0",
         "gulp-sourcemaps": "^3.0.0",
@@ -88,19 +89,20 @@
         "karma-spec-reporter": "^0.0.32",
         "karma-webpack": "^5.0.0",
         "lodash": "^4.17.21",
-        "mocha": "^10.0.0",
+        "mocha": "^10.7.3",
         "morgan": "^1.10.0",
+        "node-html-parser": "^6.1.5",
         "opn": "^5.4.0",
         "resolve-from": "^5.0.0",
-        "sinon": "^4.1.3",
+        "sinon": "^4.5.0",
         "through2": "^4.0.2",
         "url": "^0.11.0",
         "url-parse": "^1.0.5",
         "video.js": "^7.17.0",
         "videojs-contrib-ads": "^6.9.0",
-        "videojs-ima": "^1.11.0",
+        "videojs-ima": "^2.3.0",
         "videojs-playlist": "^5.0.0",
-        "webdriverio": "^7.6.1",
+        "webdriverio": "^9.0.9",
         "webpack": "^5.70.0",
         "webpack-bundle-analyzer": "^4.5.0",
         "webpack-manifest-plugin": "^5.0.0",
@@ -108,63 +110,64 @@
         "yargs": "^1.3.1"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=20.0.0"
       },
       "optionalDependencies": {
         "fsevents": "^2.3.2"
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz",
-      "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
-      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.6",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helpers": "^7.19.4",
-        "@babel/parser": "^7.19.6",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4",
-        "convert-source-map": "^1.7.0",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -175,101 +178,89 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
-      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.7.tgz",
+      "integrity": "sha512-SO5E3bVxDuxyNxM5agFv480YA2HO6ohZbGxbazZdIk3KQOPOGVNw6q78I9/lbviIf95eq6tPozeYnJLbjnC8IA==",
       "dev": true,
       "dependencies": {
         "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
         "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
       },
       "peerDependencies": {
-        "@babel/core": ">=7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0"
+        "@babel/core": "^7.11.0",
+        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.1.tgz",
-      "integrity": "sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
       "dependencies": {
-        "@babel/types": "^7.20.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
+        "@babel/types": "^7.25.6",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
+      "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
-      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
       "dependencies": {
-        "@babel/compat-data": "^7.20.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz",
+      "integrity": "sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -279,12 +270,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
+      "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.1.0"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -294,131 +286,122 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+      "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+        "resolve": "^1.14.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
       "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz",
+      "integrity": "sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==",
       "dependencies": {
-        "@babel/types": "^7.18.9"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
-      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.19.4",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.2"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
+      "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
+      "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
+      "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-wrap-function": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -428,121 +411,127 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
+      "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.19.1",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
-      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
       "dependencies": {
-        "@babel/types": "^7.19.4"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
+      "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
       "dependencies": {
-        "@babel/types": "^7.20.0"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
+      "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==",
       "dependencies": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/template": "^7.24.7",
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz",
-      "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
       "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.1",
-        "@babel/types": "^7.20.0"
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.1.tgz",
-      "integrity": "sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+      "dependencies": {
+        "@babel/types": "^7.25.6"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -550,12 +539,13 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz",
+      "integrity": "sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -564,234 +554,55 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz",
-      "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==",
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
-      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
-      "dependencies": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.18.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
+      "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
+      "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz",
+      "integrity": "sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "engines": {
         "node": ">=6.9.0"
       },
@@ -799,21 +610,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -873,11 +669,11 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
-      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
+      "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -886,6 +682,31 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
+      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
@@ -991,28 +812,60 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
       },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
+      "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz",
+      "integrity": "sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-remap-async-to-generator": "^7.24.7",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
+      "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-remap-async-to-generator": "^7.18.6"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-remap-async-to-generator": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1022,11 +875,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
+      "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1036,11 +889,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz",
-      "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
+      "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1049,19 +902,49 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
+      "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
+      "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz",
+      "integrity": "sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1072,11 +955,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
+      "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/template": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1086,11 +970,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz",
-      "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz",
+      "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1100,12 +984,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
+      "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1115,11 +999,26 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
+      "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
+      "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1129,12 +1028,27 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
+      "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
+      "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1144,11 +1058,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
+      "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1158,13 +1073,28 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
+      "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
+      "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1174,11 +1104,26 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
+      "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
+      "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1188,11 +1133,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
+      "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1202,12 +1147,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
-      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
+      "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1217,13 +1162,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
-      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz",
+      "integrity": "sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-simple-access": "^7.19.4"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1233,14 +1178,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
-      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
+      "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-identifier": "^7.19.1"
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1250,12 +1195,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
+      "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1265,12 +1210,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
+      "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1280,11 +1225,58 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
+      "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
+      "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
+      "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
+      "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1294,12 +1286,43 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
+      "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
+      "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz",
+      "integrity": "sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1309,11 +1332,43 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz",
-      "integrity": "sha512-nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
+      "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
+      "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
+      "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1323,11 +1378,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
+      "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1337,12 +1392,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
+      "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "regenerator-transform": "^0.15.0"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "regenerator-transform": "^0.15.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1352,11 +1407,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
+      "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1366,16 +1421,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
-      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "semver": "^6.3.0"
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz",
+      "integrity": "sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.1",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1385,11 +1440,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
+      "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1399,12 +1454,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
+      "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1414,11 +1469,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
+      "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1428,11 +1483,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
+      "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1442,11 +1497,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz",
+      "integrity": "sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1456,11 +1511,26 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
+      "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
+      "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1470,12 +1540,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
+      "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1484,38 +1554,43 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
+      "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/preset-env": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
-      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
-      "dependencies": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.18.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.7.tgz",
+      "integrity": "sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ==",
+      "dependencies": {
+        "@babel/compat-data": "^7.24.7",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.7",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.18.6",
+        "@babel/plugin-syntax-import-assertions": "^7.24.7",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -1525,45 +1600,61 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.18.6",
-        "@babel/plugin-transform-async-to-generator": "^7.18.6",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.19.4",
-        "@babel/plugin-transform-classes": "^7.19.0",
-        "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.19.4",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.18.8",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.18.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.18.8",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.18.6",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.19.0",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.19.4",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
-        "semver": "^6.3.0"
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.24.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.24.7",
+        "@babel/plugin-transform-async-to-generator": "^7.24.7",
+        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
+        "@babel/plugin-transform-block-scoping": "^7.24.7",
+        "@babel/plugin-transform-class-properties": "^7.24.7",
+        "@babel/plugin-transform-class-static-block": "^7.24.7",
+        "@babel/plugin-transform-classes": "^7.24.7",
+        "@babel/plugin-transform-computed-properties": "^7.24.7",
+        "@babel/plugin-transform-destructuring": "^7.24.7",
+        "@babel/plugin-transform-dotall-regex": "^7.24.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
+        "@babel/plugin-transform-dynamic-import": "^7.24.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
+        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
+        "@babel/plugin-transform-for-of": "^7.24.7",
+        "@babel/plugin-transform-function-name": "^7.24.7",
+        "@babel/plugin-transform-json-strings": "^7.24.7",
+        "@babel/plugin-transform-literals": "^7.24.7",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
+        "@babel/plugin-transform-modules-amd": "^7.24.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.24.7",
+        "@babel/plugin-transform-modules-systemjs": "^7.24.7",
+        "@babel/plugin-transform-modules-umd": "^7.24.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
+        "@babel/plugin-transform-new-target": "^7.24.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+        "@babel/plugin-transform-numeric-separator": "^7.24.7",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
+        "@babel/plugin-transform-object-super": "^7.24.7",
+        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.7",
+        "@babel/plugin-transform-parameters": "^7.24.7",
+        "@babel/plugin-transform-private-methods": "^7.24.7",
+        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
+        "@babel/plugin-transform-property-literals": "^7.24.7",
+        "@babel/plugin-transform-regenerator": "^7.24.7",
+        "@babel/plugin-transform-reserved-words": "^7.24.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
+        "@babel/plugin-transform-spread": "^7.24.7",
+        "@babel/plugin-transform-sticky-regex": "^7.24.7",
+        "@babel/plugin-transform-template-literals": "^7.24.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.24.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
+        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.4",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1573,71 +1664,199 @@
       }
     },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
         "@babel/types": "^7.4.4",
         "esutils": "^2.0.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/runtime": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
-      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
+    "node_modules/@babel/register": {
+      "version": "7.24.6",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.24.6.tgz",
+      "integrity": "sha512-WSuFCc2wCqMeXkz/i3yfAAsxwWflEgbVkZzivgAmXl/MxrXeoYFZOOPllbC8R8WTF7u61wSRQtDVZ1879cdu6w==",
+      "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.13.10"
+        "clone-deep": "^4.0.1",
+        "find-cache-dir": "^2.0.0",
+        "make-dir": "^2.1.0",
+        "pirates": "^4.0.6",
+        "source-map-support": "^0.5.16"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/register/node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@babel/register/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@babel/register/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@babel/register/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@babel/register/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@babel/register/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/register/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@babel/register/node_modules/pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@babel/register/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/register/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.1.tgz",
-      "integrity": "sha512-CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg==",
+    "node_modules/@babel/register/node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "dependencies": {
-        "core-js-pure": "^3.25.1",
-        "regenerator-runtime": "^0.13.10"
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
+      "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.18.10",
-        "@babel/types": "^7.18.10"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz",
-      "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==",
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.1",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.1",
-        "@babel/types": "^7.20.0",
-        "debug": "^4.1.0",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.6",
+        "@babel/parser": "^7.25.6",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1645,18 +1864,28 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz",
-      "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@browserstack/ai-sdk-node": {
+      "version": "1.5.8",
+      "resolved": "https://registry.npmjs.org/@browserstack/ai-sdk-node/-/ai-sdk-node-1.5.8.tgz",
+      "integrity": "sha512-34snogSnvskHxUZYOX61ga1/oTlyXwneRtd7Epu2bEdSsRR1rMm8xXhO6DVrLsHPwPHz+ljAlwVwhcE2uKysxw==",
+      "dev": true,
+      "dependencies": {
+        "axios": "^1.6.2",
+        "uuid": "9.0.1"
+      }
+    },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -1666,6 +1895,416 @@
         "node": ">=0.1.90"
       }
     },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.43.1",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.43.1.tgz",
+      "integrity": "sha512-I238eDtOolvCuvtxrnqtlBaw0BwdQuYqK7eA6XIonicMdOOOb75mqdIzkGDUbS04+1Di007rgm9snFRNeVrOog==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "^8.56.5",
+        "@types/estree": "^1.0.5",
+        "@typescript-eslint/types": "^7.2.0",
+        "comment-parser": "1.4.1",
+        "esquery": "^1.5.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
+      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
+      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
+      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
+      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
+      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
+      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
+      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
+      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
+      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
+      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
+      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
+      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
+      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
+      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
+      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
+      "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
+      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
+      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
+      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
+      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -1703,9 +2342,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1877,6 +2516,7 @@
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
       "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.0",
@@ -1891,100 +2531,454 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "deprecated": "Use @eslint/object-schema instead",
       "dev": true
     },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+    "node_modules/@inquirer/checkbox": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.4.7.tgz",
+      "integrity": "sha512-5YwCySyV1UEgqzz34gNsC38eKxRBtlRDpJLlKcRtTjlYA/yDKuc1rfw+hjw+2WJxbAZtaDPsRl5Zk7J14SBoBw==",
       "dev": true,
       "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.2",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+    "node_modules/@inquirer/confirm": {
+      "version": "3.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz",
+      "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==",
       "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/types": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+    "node_modules/@inquirer/core": {
+      "version": "9.0.10",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz",
+      "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==",
       "dev": true,
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^4.0.0"
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.2",
+        "@types/mute-stream": "^0.0.4",
+        "@types/node": "^22.1.0",
+        "@types/wrap-ansi": "^3.0.0",
+        "ansi-escapes": "^4.3.2",
+        "cli-spinners": "^2.9.2",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^1.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/types/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@inquirer/core/node_modules/@types/node": {
+      "version": "22.4.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.4.1.tgz",
+      "integrity": "sha512-1tbpb9325+gPnKK0dMm+/LMriX0vKxf6RnB0SZUqfyVkQ4fMgUSySqhxE/y8Jvs4NyF1yHzTfG9KlnkIODxPKg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/cli-spinners": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@inquirer/core/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@jest/types/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@inquirer/core/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@jest/types/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/@inquirer/core/node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
       "dev": true
     },
-    "node_modules/@jest/types/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/@inquirer/editor": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.1.22.tgz",
+      "integrity": "sha512-K1QwTu7GCK+nKOVRBp5HY9jt3DXOfPGPr6WRDrPImkcJRelG9UTx2cAtK1liXmibRrzJlTWOwqgWT3k2XnS62w==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2",
+        "external-editor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/expand": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.1.22.tgz",
+      "integrity": "sha512-wTZOBkzH+ItPuZ3ZPa9lynBsdMp6kQ9zbjVPYEtSBG7UulGjg2kQiAnUjgyG4SlntpTce5bOmXAPvE4sguXjpA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/figures": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz",
+      "integrity": "sha512-79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/input": {
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.2.9.tgz",
+      "integrity": "sha512-7Z6N+uzkWM7+xsE+3rJdhdG/+mQgejOVqspoW+w0AbSZnL6nq5tGMEVASaYVWbkoSzecABWwmludO2evU3d31g==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/number": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.0.10.tgz",
+      "integrity": "sha512-kWTxRF8zHjQOn2TJs+XttLioBih6bdc5CcosXIzZsrTY383PXI35DuhIllZKu7CdXFi2rz2BWPN9l0dPsvrQOA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/password": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.1.22.tgz",
+      "integrity": "sha512-5Fxt1L9vh3rAKqjYwqsjU4DZsEvY/2Gll+QkqR4yEpy6wvzLxdSgFhUcxfDAOtO4BEoTreWoznC0phagwLU5Kw==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2",
+        "ansi-escapes": "^4.3.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/prompts": {
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz",
+      "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/checkbox": "^2.4.7",
+        "@inquirer/confirm": "^3.1.22",
+        "@inquirer/editor": "^2.1.22",
+        "@inquirer/expand": "^2.1.22",
+        "@inquirer/input": "^2.2.9",
+        "@inquirer/number": "^1.0.10",
+        "@inquirer/password": "^2.1.22",
+        "@inquirer/rawlist": "^2.2.4",
+        "@inquirer/search": "^1.0.7",
+        "@inquirer/select": "^2.4.7"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/rawlist": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.2.4.tgz",
+      "integrity": "sha512-pb6w9pWrm7EfnYDgQObOurh2d2YH07+eDo3xQBsNAM2GRhliz6wFXGi1thKQ4bN6B0xDd6C3tBsjdr3obsCl3Q==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/search": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.0.7.tgz",
+      "integrity": "sha512-p1wpV+3gd1eST/o5N3yQpYEdFNCzSP0Klrl+5bfD3cTTz8BGG6nf4Z07aBW0xjlKIj1Rp0y3x/X4cZYi6TfcLw==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/select": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.4.7.tgz",
+      "integrity": "sha512-JH7XqPEkBpNWp3gPCqWqY8ECbyMoFcCZANlL6pV9hf59qK6dGmkOlx1ydyhY+KZ0c5X74+W6Mtp+nm2QX0/MAQ==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.2",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.2.tgz",
+      "integrity": "sha512-w9qFkumYDCNyDZmNQjf/n6qQuvQ4dMC3BJesY4oF+yr0CxR5vxujflAVeIcS6U336uzi9GM0kAfZlLrZ9UTkpA==",
+      "dev": true,
+      "dependencies": {
+        "mute-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^29.6.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/types/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@jest/types/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/types/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/types/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/types/node_modules/has-flag": {
+      "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
@@ -2005,69 +2999,56 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
@@ -2079,28 +3060,186 @@
         "eslint-scope": "5.1.1"
       }
     },
+    "node_modules/@open-draft/until": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-1.0.3.tgz",
+      "integrity": "sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==",
+      "dev": true
+    },
+    "node_modules/@percy/appium-app": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@percy/appium-app/-/appium-app-2.0.6.tgz",
+      "integrity": "sha512-0NT8xgaq4UOhcqVc4H3D440M7H5Zko8mDpY5j30TRpjOQ3ctLPJalmUVKOCFv4rSzjd2LmyE2F9KXTPA3zqQsw==",
+      "dev": true,
+      "dependencies": {
+        "@percy/sdk-utils": "^1.28.2",
+        "tmp": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@percy/sdk-utils": {
+      "version": "1.28.7",
+      "resolved": "https://registry.npmjs.org/@percy/sdk-utils/-/sdk-utils-1.28.7.tgz",
+      "integrity": "sha512-LIhfHnkcS0fyIdo3gvKn7rwodZjbEtyLkgiDRSRulcBOatI2mhn2Bh269sXXiiFTyAW2BDQjyE3DWc4hkGbsbQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@percy/selenium-webdriver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@percy/selenium-webdriver/-/selenium-webdriver-2.0.5.tgz",
+      "integrity": "sha512-bNj52xQm02dY872loFa+8OwyuGcdYHYvCKflmSEsF9EDRiSDj0Wr+XP+DDIgDAl9xXschA7OOdXCLTWV4zEQWA==",
+      "dev": true,
+      "dependencies": {
+        "@percy/sdk-utils": "^1.28.0",
+        "node-request-interceptor": "^0.6.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@pkgr/core": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.21",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
-      "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
+      "version": "1.0.0-next.25",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
+      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
       "dev": true
     },
-    "node_modules/@sindresorhus/is": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+    "node_modules/@promptbook/utils": {
+      "version": "0.50.0-10",
+      "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.50.0-10.tgz",
+      "integrity": "sha512-Z94YoY/wcZb5m1QoXgmIC1rVeDguGK5bWmUTYdWCqh/LHVifRdJ1C+tBzS0h+HMOD0XzMjZhBQ/mBgTZ/QNW/g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://buymeacoffee.com/hejny"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/webgptorg/promptbook/blob/main/README.md#%EF%B8%8F-contributing"
+        }
+      ],
+      "dependencies": {
+        "moment": "2.30.1",
+        "prettier": "2.8.1",
+        "spacetrim": "0.11.25"
+      }
+    },
+    "node_modules/@puppeteer/browsers": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.9.1.tgz",
+      "integrity": "sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4.3.4",
+        "extract-zip": "2.0.1",
+        "progress": "2.0.3",
+        "proxy-agent": "6.3.1",
+        "tar-fs": "3.0.4",
+        "unbzip2-stream": "1.4.3",
+        "yargs": "17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=16.3.0"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true
+    },
+    "node_modules/@sec-ant/readable-stream": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
+      "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
+      "dev": true
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
+    },
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz",
+      "integrity": "sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
       "dev": true,
       "dependencies": {
         "type-detect": "4.0.8"
@@ -2127,47 +3266,23 @@
       }
     },
     "node_modules/@sinonjs/text-encoding": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
-      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz",
+      "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==",
       "dev": true
     },
     "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
       "dev": true
     },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "dev": true,
-      "dependencies": {
-        "defer-to-connect": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@types/aria-query": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
-      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
       "dev": true
     },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
-      }
-    },
     "node_modules/@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -2175,65 +3290,37 @@
       "dev": true
     },
     "node_modules/@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "version": "2.8.17",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
+      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/debug": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
-      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
       "dev": true,
       "dependencies": {
         "@types/ms": "*"
       }
     },
-    "node_modules/@types/diff": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.2.tgz",
-      "integrity": "sha512-uw8eYMIReOwstQ0QKF0sICefSy8cNO/v7gOTiIy9SbwuHyEecJUm7qlgueOO5S1udZ5I/irVydHVwMchgzbKTg==",
-      "dev": true
-    },
-    "node_modules/@types/easy-table": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-0.0.33.tgz",
-      "integrity": "sha512-/vvqcJPmZUfQwCgemL0/34G7bIQnCuvgls379ygRlcC1FqNqk3n+VZ15dAO51yl6JNDoWd8vsk+kT8zfZ1VZSw==",
-      "dev": true
-    },
-    "node_modules/@types/ejs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.1.tgz",
-      "integrity": "sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==",
-      "dev": true
-    },
     "node_modules/@types/eslint": {
-      "version": "8.4.9",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz",
-      "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==",
+      "version": "8.56.10",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz",
+      "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
       "dev": true
     },
     "node_modules/@types/expect": {
@@ -2243,85 +3330,54 @@
       "dev": true
     },
     "node_modules/@types/extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha512-R1g/VyKFFI2HLC1QGAeTtCBWCo6n75l41OnsVYNbmKG+kempOESaodf6BeJyUM3Q0rKa/NQcTHbB2+66lNnxLw==",
-      "dev": true
-    },
-    "node_modules/@types/fibers": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@types/fibers/-/fibers-3.1.1.tgz",
-      "integrity": "sha512-yHoUi46uika0snoTpNcVqUSvgbRndaIps4TUCotrXjtc0DHDoPQckmyXEZ2bX3e4mpJmyEW3hRhCwQa/ISCPaA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.4.tgz",
+      "integrity": "sha512-ArMouDUTJEz1SQRpFsT2rIw7DeqICFv5aaVzLSIYMYQSLcwcGOfT3VyglQs/p7K3F7fT4zxr0NWxYZIdifD6dA==",
       "dev": true
     },
-    "node_modules/@types/fs-extra": {
-      "version": "9.0.13",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
-      "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/github-slugger": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@types/github-slugger/-/github-slugger-1.3.0.tgz",
-      "integrity": "sha512-J/rMZa7RqiH/rT29TEVZO4nBoDP9XJOjnbbIofg7GQKs4JIduEO3WLpte+6WeUz/TcrXKlY+bM7FYrp8yFB+3g==",
+    "node_modules/@types/gitconfiglocal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/gitconfiglocal/-/gitconfiglocal-2.0.3.tgz",
+      "integrity": "sha512-W6hyZux6TrtKfF2I9XNLVcsFr4xRr0T+S6hrJ9nDkhA2vzsFPIEAbnY4vgb6v2yKXQ9MJVcbLsARNlMfg4EVtQ==",
       "dev": true
     },
     "node_modules/@types/hast": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
-      "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "*"
-      }
-    },
-    "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-      "dev": true
-    },
-    "node_modules/@types/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
+      "integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==",
       "dev": true,
       "dependencies": {
-        "@types/through": "*",
-        "rxjs": "^6.4.0"
+        "@types/unist": "^2"
       }
     },
     "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
       "dev": true
     },
     "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
     },
     "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "dev": true
     },
     "node_modules/@types/json5": {
@@ -2330,167 +3386,91 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
-    "node_modules/@types/keyv": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-4.2.0.tgz",
-      "integrity": "sha512-xoBtGl5R9jeKUhc8ZqeYaRDx04qqJ10yhhXYGmJ4Jr8qKpvMsDQQrNUvF/wUJ4klOtmJeJM+p2Xo3zp9uaC3tw==",
-      "deprecated": "This is a stub types definition. keyv provides its own type definitions, so you do not need this installed.",
-      "dev": true,
-      "dependencies": {
-        "keyv": "*"
-      }
-    },
-    "node_modules/@types/lodash": {
-      "version": "4.14.187",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.187.tgz",
-      "integrity": "sha512-MrO/xLXCaUgZy3y96C/iOsaIqZSeupyTImKClHunL5GrmaiII2VwvWmLBu2hwa0Kp0sV19CsyjtrTc/Fx8rg/A==",
-      "dev": true
-    },
-    "node_modules/@types/lodash.flattendeep": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.7.tgz",
-      "integrity": "sha512-1h6GW/AeZw/Wej6uxrqgmdTDZX1yFS39lRsXYkg+3kWvOWWrlGCI6H7lXxlUHOzxDT4QeYGmgPpQ3BX9XevzOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
-    "node_modules/@types/lodash.pickby": {
-      "version": "4.6.7",
-      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.7.tgz",
-      "integrity": "sha512-4ebXRusuLflfscbD0PUX4eVknDHD9Yf+uMtBIvA/hrnTqeAzbuHuDjvnYriLjUrI9YrhCPVKUf4wkRSXJQ6gig==",
-      "dev": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
-    "node_modules/@types/lodash.union": {
-      "version": "4.6.7",
-      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.7.tgz",
-      "integrity": "sha512-6HXM6tsnHJzKgJE0gA/LhTGf/7AbjUk759WZ1MziVm+OBNAATHhdgj+a3KVE8g76GCLAnN4ZEQQG1EGgtBIABA==",
-      "dev": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
     "node_modules/@types/mdast": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
-      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
+      "version": "3.0.15",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz",
+      "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==",
       "dev": true,
       "dependencies": {
-        "@types/unist": "*"
+        "@types/unist": "^2"
       }
     },
     "node_modules/@types/mocha": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz",
-      "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==",
+      "version": "10.0.6",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz",
+      "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==",
       "dev": true
     },
     "node_modules/@types/ms": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
-      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "17.0.45",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
-      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
-      "dev": true
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "node_modules/@types/object-inspect": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.8.1.tgz",
-      "integrity": "sha512-0JTdf3CGV0oWzE6Wa40Ayv2e2GhpP3pEJMcrlM74vBSJPuuNkVwfDnl0SZxyFCXETcB4oKA/MpTVfuYSMOelBg==",
+      "version": "0.7.34",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
+      "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==",
       "dev": true
     },
-    "node_modules/@types/puppeteer": {
-      "version": "5.4.7",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.7.tgz",
-      "integrity": "sha512-JdGWZZYL0vKapXF4oQTC5hLVNfOgdPrqeZ1BiQnGk5cB7HeE91EWUiTdVSdQPobRN8rIcdffjiOgCYJ/S8QrnQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/recursive-readdir": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.1.tgz",
-      "integrity": "sha512-Xd+Ptc4/F2ueInqy5yK2FI5FxtwwbX2+VZpcg+9oYsFJVen8qQKGapCr+Bi5wQtHU1cTXT8s+07lo/nKPgu8Gg==",
+    "node_modules/@types/mute-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
+      "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
-    "node_modules/@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+    "node_modules/@types/node": {
+      "version": "20.14.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz",
+      "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*"
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
       "dev": true
     },
-    "node_modules/@types/stream-buffers": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.4.tgz",
-      "integrity": "sha512-qU/K1tb2yUdhXkLIATzsIPwbtX6BpZk0l3dPW6xqWyhfzzM1ECaQ/8faEnu3CNraLiQ9LHyQQPBGp7N9Fbs25w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
+    "node_modules/@types/parse5": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz",
+      "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==",
+      "dev": true
     },
-    "node_modules/@types/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
+    "node_modules/@types/sinonjs__fake-timers": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz",
+      "integrity": "sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ==",
       "dev": true
     },
-    "node_modules/@types/through": {
-      "version": "0.0.30",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
-      "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true
     },
-    "node_modules/@types/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==",
+    "node_modules/@types/supports-color": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.3.tgz",
+      "integrity": "sha512-Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg==",
       "dev": true
     },
-    "node_modules/@types/ua-parser-js": {
-      "version": "0.7.36",
-      "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz",
-      "integrity": "sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ==",
+    "node_modules/@types/triple-beam": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz",
+      "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
       "dev": true
     },
     "node_modules/@types/unist": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
-      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz",
+      "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==",
       "dev": true
     },
     "node_modules/@types/vinyl": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz",
-      "integrity": "sha512-ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz",
+      "integrity": "sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==",
       "dev": true,
       "dependencies": {
         "@types/expect": "^1.20.4",
@@ -2498,54 +3478,76 @@
       }
     },
     "node_modules/@types/which": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.2.tgz",
-      "integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw==",
       "dev": true
     },
+    "node_modules/@types/wrap-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
+      "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==",
+      "dev": true
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.12",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
+      "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/yargs": {
-      "version": "15.0.14",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
-      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
       "dev": true
     },
     "node_modules/@types/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
-    "node_modules/@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
+    "node_modules/@typescript-eslint/types": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.15.0.tgz",
+      "integrity": "sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
     },
     "node_modules/@videojs/http-streaming": {
-      "version": "2.14.3",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.3.tgz",
-      "integrity": "sha512-2tFwxCaNbcEZzQugWf8EERwNMyNtspfHnvxRGRABQs09W/5SqmkWFuGWfUAm4wQKlXGfdPyAJ1338ASl459xAA==",
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.16.3.tgz",
+      "integrity": "sha512-91CJv5PnFBzNBvyEjt+9cPzTK/xoVixARj2g7ZAvItA+5bx8VKdk5RxCz/PP2kdzz9W+NiDUMPkdmTsosmy69Q==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@videojs/vhs-utils": "3.0.5",
         "aes-decrypter": "3.1.3",
         "global": "^4.4.0",
-        "m3u8-parser": "4.7.1",
-        "mpd-parser": "0.21.1",
+        "m3u8-parser": "4.8.0",
+        "mpd-parser": "^0.22.1",
         "mux.js": "6.0.1",
         "video.js": "^6 || ^7"
       },
@@ -2583,169 +3585,223 @@
         "is-function": "^1.0.1"
       }
     },
-    "node_modules/@vue/compiler-core": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz",
-      "integrity": "sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==",
+    "node_modules/@vitest/pretty-format": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.5.tgz",
+      "integrity": "sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==",
       "dev": true,
-      "optional": true,
       "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.41",
-        "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vue/compiler-core/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/@vitest/snapshot": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz",
+      "integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "magic-string": "^0.30.5",
+        "pathe": "^1.1.1",
+        "pretty-format": "^29.7.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vue/compiler-dom": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz",
-      "integrity": "sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==",
+    "node_modules/@vue/compiler-core": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+      "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
       "dev": true,
       "optional": true,
       "dependencies": {
-        "@vue/compiler-core": "3.2.41",
-        "@vue/shared": "3.2.41"
-      }
-    },
-    "node_modules/@vue/compiler-sfc": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz",
-      "integrity": "sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.41",
-        "@vue/compiler-dom": "3.2.41",
-        "@vue/compiler-ssr": "3.2.41",
-        "@vue/reactivity-transform": "3.2.41",
-        "@vue/shared": "3.2.41",
+        "@babel/parser": "^7.24.4",
+        "@vue/shared": "3.4.27",
+        "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
-        "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
+        "source-map-js": "^1.2.0"
       }
     },
-    "node_modules/@vue/compiler-sfc/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+      "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
       "dev": true,
       "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@vue/compiler-core": "3.4.27",
+        "@vue/shared": "3.4.27"
       }
     },
-    "node_modules/@vue/compiler-ssr": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz",
-      "integrity": "sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==",
+    "node_modules/@vue/compiler-sfc": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+      "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
       "dev": true,
       "optional": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.2.41",
-        "@vue/shared": "3.2.41"
+        "@babel/parser": "^7.24.4",
+        "@vue/compiler-core": "3.4.27",
+        "@vue/compiler-dom": "3.4.27",
+        "@vue/compiler-ssr": "3.4.27",
+        "@vue/shared": "3.4.27",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.10",
+        "postcss": "^8.4.38",
+        "source-map-js": "^1.2.0"
       }
     },
-    "node_modules/@vue/reactivity-transform": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz",
-      "integrity": "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==",
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+      "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
       "dev": true,
       "optional": true,
       "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.41",
-        "@vue/shared": "3.2.41",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
+        "@vue/compiler-dom": "3.4.27",
+        "@vue/shared": "3.4.27"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz",
-      "integrity": "sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==",
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+      "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
       "dev": true,
       "optional": true
     },
     "node_modules/@wdio/browserstack-service": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-7.16.16.tgz",
-      "integrity": "sha512-q4wUh/j0MR2SwhTkmIFif2DaXgH5yzdgOer6G/fac2n81zLCSpQHWO5aQ9T0An9CAd4L2A+t3dmChpBJPkHWSw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "^17.0.4",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "browserstack-local": "^1.4.5",
-        "got": "^11.0.2",
-        "webdriverio": "7.16.16"
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-9.0.5.tgz",
+      "integrity": "sha512-pJNb9jJwPf+FEwAEnnUc6d9s6/QlvcZbh9NtjO23a/wr3HvXdzhlRHwzUV1RWboDpGsww5PFmtGcIo7GdDQL+g==",
+      "dev": true,
+      "dependencies": {
+        "@browserstack/ai-sdk-node": "1.5.8",
+        "@percy/appium-app": "^2.0.1",
+        "@percy/selenium-webdriver": "^2.0.3",
+        "@types/gitconfiglocal": "^2.0.1",
+        "@wdio/logger": "9.0.4",
+        "@wdio/reporter": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "browserstack-local": "^1.5.1",
+        "chalk": "^5.3.0",
+        "csv-writer": "^1.6.0",
+        "formdata-node": "5.0.1",
+        "git-repo-info": "^2.1.1",
+        "gitconfiglocal": "^2.1.0",
+        "uuid": "^10.0.0",
+        "webdriverio": "9.0.5",
+        "winston-transport": "^4.5.0",
+        "yauzl": "^3.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@wdio/cli": "^7.0.0"
+        "@wdio/cli": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0"
       }
     },
-    "node_modules/@wdio/browserstack-service/node_modules/@wdio/config": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.16.16.tgz",
-      "integrity": "sha512-K/ObPuo6Da2liz++OKOIfbdpFwI7UWiFcBylfJkCYbweuXCoW1aUqlKI6rmKPwCH9Uqr/RHWu6p8eo0zWe6xVA==",
+    "node_modules/@wdio/browserstack-service/node_modules/@puppeteer/browsers": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+      "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
       "dev": true,
       "dependencies": {
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "deepmerge": "^4.0.0",
-        "glob": "^7.1.2"
+        "debug": "^4.3.5",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/logger": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+      "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/browserstack-service/node_modules/@wdio/protocols": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.16.7.tgz",
-      "integrity": "sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==",
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/reporter": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-9.0.4.tgz",
+      "integrity": "sha512-g55MiqToKEZ+L5quk7Ddk3m1fKgh2U2rq3zLG8bZUYU+3KFglfRC/Ld5yTso8S1tG4EDgl5HKSN5Bl8I5gncbg==",
       "dev": true,
+      "dependencies": {
+        "@types/node": "^20.1.0",
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "diff": "^5.0.0",
+        "object-inspect": "^1.12.0"
+      },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/browserstack-service/node_modules/@wdio/repl": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.16.14.tgz",
-      "integrity": "sha512-Ezih0Y+lsGkKv3H3U56hdWgZiQGA3VaAYguSLd9+g1xbQq+zMKqSmfqECD9bAy+OgCCiVTRstES6lHZxJVPhAg==",
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/types": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+      "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
       "dev": true,
       "dependencies": {
-        "@wdio/utils": "7.16.14"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
     "node_modules/@wdio/browserstack-service/node_modules/@wdio/utils": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.16.14.tgz",
-      "integrity": "sha512-wwin8nVpIlhmXJkq6GJw9aDDzgLOJKgXTcEua0T2sdXjoW78u5Ly/GZrFXTjMGhacFvoZfitTrjyfyy4CxMVvw==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+      "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
+      "dev": true,
+      "dependencies": {
+        "@puppeteer/browsers": "^2.2.0",
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "edgedriver": "^5.6.1",
+        "geckodriver": "^4.3.3",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.2.24",
+        "safaridriver": "^0.1.2",
+        "split2": "^4.2.0",
+        "wait-port": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dev": true,
       "dependencies": {
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "p-iteration": "^1.1.8"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">= 14"
       }
     },
     "node_modules/@wdio/browserstack-service/node_modules/brace-expansion": {
@@ -2757,433 +3813,701 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@wdio/browserstack-service/node_modules/devtools": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
-      "integrity": "sha512-M0kzkuSgfEhpqIis3gdtWsNjn/HQ+vRAmEzDnbYx/7FfjFxhSv1d+rOOT20pvd60soItMYpsOova1igACEGkGQ==",
+    "node_modules/@wdio/browserstack-service/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
-      "dependencies": {
-        "@types/node": "^17.0.4",
-        "@types/ua-parser-js": "^0.7.33",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/protocols": "7.16.7",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
-        "chrome-launcher": "^0.15.0",
-        "edge-paths": "^2.1.0",
-        "puppeteer-core": "^13.1.3",
-        "query-selector-shadow-dom": "^1.0.0",
-        "ua-parser-js": "^1.0.1",
-        "uuid": "^8.0.0"
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/deepmerge-ts": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+      "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+      "dev": true,
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/@wdio/browserstack-service/node_modules/devtools-protocol": {
-      "version": "0.0.973690",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.973690.tgz",
-      "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
-      "dev": true
+      "version": "0.0.1312386",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/@wdio/browserstack-service/node_modules/minimatch": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@wdio/browserstack-service/node_modules/ua-parser-js": {
-      "version": "1.0.33",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.33.tgz",
-      "integrity": "sha512-RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ==",
+    "node_modules/@wdio/browserstack-service/node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        }
-      ],
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
       "engines": {
-        "node": "*"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/browserstack-service/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+    "node_modules/@wdio/browserstack-service/node_modules/puppeteer-core": {
+      "version": "22.15.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz",
+      "integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@puppeteer/browsers": "2.3.0",
+        "chromium-bidi": "0.6.3",
+        "debug": "^4.3.6",
+        "devtools-protocol": "0.0.1312386",
+        "ws": "^8.18.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
       "bin": {
-        "uuid": "dist/bin/uuid"
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@wdio/browserstack-service/node_modules/webdriver": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.16.16.tgz",
-      "integrity": "sha512-x8UoG9k/P8KDrfSh1pOyNevt9tns3zexoMxp9cKnyA/7HYSErhZYTLGlgxscAXLtQG41cMH/Ba/oBmOx7Hgd8w==",
+    "node_modules/@wdio/browserstack-service/node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^17.0.4",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/protocols": "7.16.7",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
-        "got": "^11.0.2",
-        "ky": "^0.29.0",
-        "lodash.merge": "^4.6.1"
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
       },
-      "engines": {
-        "node": ">=12.0.0"
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/@wdio/browserstack-service/node_modules/webdriverio": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.16.16.tgz",
-      "integrity": "sha512-caPaEWyuD3Qoa7YkW4xCCQA4v9Pa9wmhFGPvNZh3ERtjMCNi8L/XXOdkekWNZmFh3tY0kFguBj7+fAwSY7HAGw==",
-      "dev": true,
-      "dependencies": {
-        "@types/aria-query": "^5.0.0",
-        "@types/node": "^17.0.4",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/protocols": "7.16.7",
-        "@wdio/repl": "7.16.14",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
-        "archiver": "^5.0.0",
-        "aria-query": "^5.0.0",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.5.tgz",
+      "integrity": "sha512-80zhuLBT5W5wiLNZ0maT1cVUrxmwpMuBgCprwZjI8lFe+KUhGLClrJXud/RrVT9x9rDCYa6pGCtQ4UqA+2U+sw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^20.11.30",
+        "@types/sinonjs__fake-timers": "^8.1.5",
+        "@wdio/config": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/protocols": "9.0.4",
+        "@wdio/repl": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "archiver": "^7.0.1",
+        "aria-query": "^5.3.0",
+        "cheerio": "^1.0.0-rc.12",
         "css-shorthand-properties": "^1.1.1",
         "css-value": "^0.0.1",
-        "devtools": "7.16.16",
-        "devtools-protocol": "^0.0.973690",
-        "fs-extra": "^10.0.0",
-        "get-port": "^5.1.1",
-        "grapheme-splitter": "^1.0.2",
+        "grapheme-splitter": "^1.0.4",
+        "htmlfy": "^0.2.1",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
         "lodash.clonedeep": "^4.5.0",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isplainobject": "^4.0.6",
         "lodash.zip": "^4.2.0",
-        "minimatch": "^5.0.0",
-        "puppeteer-core": "^13.1.3",
-        "query-selector-shadow-dom": "^1.0.0",
-        "resq": "^1.9.1",
+        "minimatch": "^9.0.3",
+        "query-selector-shadow-dom": "^1.0.1",
+        "resq": "^1.11.0",
         "rgb2hex": "0.2.5",
-        "serialize-error": "^8.0.0",
-        "webdriver": "7.16.16"
+        "serialize-error": "^11.0.3",
+        "urlpattern-polyfill": "^10.0.0",
+        "webdriver": "9.0.5"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "puppeteer-core": "^22.3.0"
+      },
+      "peerDependenciesMeta": {
+        "puppeteer-core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/@wdio/cli": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.5.7.tgz",
-      "integrity": "sha512-nOQJLskrY+UECDd3NxE7oBzb6cDA7e7x02YWQugOlOgnZ4a+PJmkFoSsO8C2uNCpdFngy5rJKGUo5vbtAHEF9Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/ejs": "^3.0.5",
-        "@types/fs-extra": "^9.0.4",
-        "@types/inquirer": "^7.3.1",
-        "@types/lodash.flattendeep": "^4.4.6",
-        "@types/lodash.pickby": "^4.6.6",
-        "@types/lodash.union": "^4.6.6",
-        "@types/recursive-readdir": "^2.2.0",
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.0.5.tgz",
+      "integrity": "sha512-D/QBlodNIdxuNpUPbuhk+mLidVLT+Vsb0Q0Fd4lh57Jy8kw5nJ56ykqiI0WE1oI0i+XtyJ7iFOPUztuCjjhX3A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^20.1.1",
+        "@vitest/snapshot": "^1.2.1",
+        "@wdio/config": "9.0.5",
+        "@wdio/globals": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/protocols": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
         "async-exit-hook": "^2.0.1",
-        "chalk": "^4.0.0",
-        "chokidar": "^3.0.0",
-        "cli-spinners": "^2.1.0",
-        "ejs": "^3.0.1",
-        "fs-extra": "^10.0.0",
-        "inquirer": "^8.0.0",
+        "chalk": "^5.2.0",
+        "chokidar": "^3.5.3",
+        "cli-spinners": "^3.0.0",
+        "dotenv": "^16.3.1",
+        "ejs": "^3.1.9",
+        "execa": "^9.2.0",
+        "import-meta-resolve": "^4.0.0",
+        "inquirer": "^10.1.8",
         "lodash.flattendeep": "^4.4.0",
         "lodash.pickby": "^4.6.0",
         "lodash.union": "^4.6.0",
-        "mkdirp": "^1.0.4",
-        "recursive-readdir": "^2.2.2",
-        "webdriverio": "7.5.7",
-        "yargs": "^17.0.0",
-        "yarn-install": "^1.0.0"
+        "read-pkg-up": "^10.0.0",
+        "recursive-readdir": "^2.2.3",
+        "tsx": "^4.7.2",
+        "webdriverio": "9.0.5",
+        "yargs": "^17.7.2"
       },
       "bin": {
         "wdio": "bin/wdio.js"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/cli/node_modules/@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
-      "dev": true
+    "node_modules/@wdio/cli/node_modules/@puppeteer/browsers": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
+      "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.6",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/@wdio/cli/node_modules/@wdio/logger": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+      "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.0.0",
+        "chalk": "^5.1.2",
         "loglevel": "^1.6.0",
         "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
     "node_modules/@wdio/cli/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+      "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
       "dev": true,
       "dependencies": {
-        "got": "^11.8.1"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@wdio/cli/node_modules/@wdio/utils": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+      "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@puppeteer/browsers": "^2.2.0",
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "edgedriver": "^5.6.1",
+        "geckodriver": "^4.3.3",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.2.24",
+        "safaridriver": "^0.1.2",
+        "split2": "^4.2.0",
+        "wait-port": "^1.1.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/cli/node_modules/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+    "node_modules/@wdio/cli/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dev": true,
       "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@wdio/cli/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/cli/node_modules/chrome-launcher": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
-      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+    "node_modules/@wdio/cli/node_modules/deepmerge-ts": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+      "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/devtools-protocol": {
+      "version": "0.0.1312386",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/cli/node_modules/execa": {
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-9.4.0.tgz",
+      "integrity": "sha512-yKHlle2YGxZE842MERVIplWwNH5VYmqqcPFgtnlU//K8gxuFFXu0pwd/CrfXTumFpeEiufsP7+opT/bPJa1yVw==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*",
-        "escape-string-regexp": "^1.0.5",
-        "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0",
-        "mkdirp": "^0.5.3",
-        "rimraf": "^3.0.2"
+        "@sindresorhus/merge-streams": "^4.0.0",
+        "cross-spawn": "^7.0.3",
+        "figures": "^6.1.0",
+        "get-stream": "^9.0.0",
+        "human-signals": "^8.0.0",
+        "is-plain-obj": "^4.1.0",
+        "is-stream": "^4.0.1",
+        "npm-run-path": "^6.0.0",
+        "pretty-ms": "^9.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^4.0.0",
+        "yoctocolors": "^2.0.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.5.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/@wdio/cli/node_modules/chrome-launcher/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+    "node_modules/@wdio/cli/node_modules/get-stream": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
+      "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.6"
+        "@sec-ant/readable-stream": "^0.4.1",
+        "is-stream": "^4.0.1"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@wdio/cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@wdio/cli/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "agent-base": "^7.0.2",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/@wdio/cli/node_modules/is-stream": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
+      "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/@wdio/cli/node_modules/devtools": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
-      "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+    "node_modules/@wdio/cli/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/protocols": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "chrome-launcher": "^0.13.1",
-        "edge-paths": "^2.1.0",
-        "puppeteer-core": "^9.1.0",
-        "query-selector-shadow-dom": "^1.0.0",
-        "ua-parser-js": "^0.7.21",
-        "uuid": "^8.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@wdio/cli/node_modules/devtools-protocol": {
-      "version": "0.0.878340",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
-      "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
-      "dev": true
+    "node_modules/@wdio/cli/node_modules/npm-run-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
+      "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^4.0.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "node_modules/@wdio/cli/node_modules/has-flag": {
+    "node_modules/@wdio/cli/node_modules/parse-ms": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
+      "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@wdio/cli/node_modules/puppeteer-core": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
-      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+    "node_modules/@wdio/cli/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/pretty-ms": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz",
+      "integrity": "sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.1.0",
-        "devtools-protocol": "0.0.869402",
-        "extract-zip": "^2.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "node-fetch": "^2.6.1",
-        "pkg-dir": "^4.2.0",
-        "progress": "^2.0.1",
+        "parse-ms": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
         "proxy-from-env": "^1.1.0",
-        "rimraf": "^3.0.2",
-        "tar-fs": "^2.0.0",
-        "unbzip2-stream": "^1.3.3",
-        "ws": "^7.2.3"
+        "socks-proxy-agent": "^8.0.2"
       },
       "engines": {
-        "node": ">=10.18.1"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/cli/node_modules/puppeteer-core/node_modules/devtools-protocol": {
-      "version": "0.0.869402",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
-      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
-      "dev": true
+    "node_modules/@wdio/cli/node_modules/puppeteer-core": {
+      "version": "22.15.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz",
+      "integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@puppeteer/browsers": "2.3.0",
+        "chromium-bidi": "0.6.3",
+        "debug": "^4.3.6",
+        "devtools-protocol": "0.0.1312386",
+        "ws": "^8.18.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
     },
-    "node_modules/@wdio/cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/cli/node_modules/puppeteer-core/node_modules/@puppeteer/browsers": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+      "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "debug": "^4.3.5",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/cli/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+    "node_modules/@wdio/cli/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
       "bin": {
-        "uuid": "dist/bin/uuid"
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
+      },
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
       }
     },
     "node_modules/@wdio/cli/node_modules/webdriverio": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
-      "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
-      "dev": true,
-      "dependencies": {
-        "@types/aria-query": "^4.2.1",
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/protocols": "7.5.3",
-        "@wdio/repl": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "archiver": "^5.0.0",
-        "aria-query": "^4.2.2",
-        "atob": "^2.1.2",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.5.tgz",
+      "integrity": "sha512-80zhuLBT5W5wiLNZ0maT1cVUrxmwpMuBgCprwZjI8lFe+KUhGLClrJXud/RrVT9x9rDCYa6pGCtQ4UqA+2U+sw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^20.11.30",
+        "@types/sinonjs__fake-timers": "^8.1.5",
+        "@wdio/config": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/protocols": "9.0.4",
+        "@wdio/repl": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "archiver": "^7.0.1",
+        "aria-query": "^5.3.0",
+        "cheerio": "^1.0.0-rc.12",
         "css-shorthand-properties": "^1.1.1",
         "css-value": "^0.0.1",
-        "devtools": "7.5.7",
-        "devtools-protocol": "^0.0.878340",
-        "fs-extra": "^10.0.0",
-        "get-port": "^5.1.1",
-        "grapheme-splitter": "^1.0.2",
+        "grapheme-splitter": "^1.0.4",
+        "htmlfy": "^0.2.1",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
         "lodash.clonedeep": "^4.5.0",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isplainobject": "^4.0.6",
         "lodash.zip": "^4.2.0",
-        "minimatch": "^3.0.4",
-        "puppeteer-core": "^9.1.0",
-        "query-selector-shadow-dom": "^1.0.0",
-        "resq": "^1.9.1",
+        "minimatch": "^9.0.3",
+        "query-selector-shadow-dom": "^1.0.1",
+        "resq": "^1.11.0",
         "rgb2hex": "0.2.5",
-        "serialize-error": "^8.0.0",
-        "webdriver": "7.5.3"
+        "serialize-error": "^11.0.3",
+        "urlpattern-polyfill": "^10.0.0",
+        "webdriver": "9.0.5"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "puppeteer-core": "^22.3.0"
+      },
+      "peerDependenciesMeta": {
+        "puppeteer-core": {
+          "optional": true
+        }
       }
     },
     "node_modules/@wdio/cli/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -3195,9 +4519,9 @@
       }
     },
     "node_modules/@wdio/cli/node_modules/yargs": {
-      "version": "17.6.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
-      "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "dependencies": {
         "cliui": "^8.0.1",
@@ -3206,1637 +4530,1143 @@
         "require-directory": "^2.1.1",
         "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^21.0.0"
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@wdio/concise-reporter": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-7.5.7.tgz",
-      "integrity": "sha512-964i7eQ4sboSla2bdR8714Er82QBgS6u39GmDFX8Izy9Ge38xaE75HuF5S7mnOWGzSojCWgqtwy5k7Rfg6GE3g==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/reporter": "7.5.7",
-        "@wdio/types": "7.5.3",
-        "chalk": "^4.0.0",
-        "pretty-ms": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@wdio/cli": "^7.0.0"
-      }
-    },
-    "node_modules/@wdio/concise-reporter/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^11.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/concise-reporter/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-8.38.2.tgz",
+      "integrity": "sha512-wE36By4Z9iCtRzihpYrmCehsmNc8t3gHviBsUxV4tmYh/SQr+WX/dysWnojer6KWIJ2rT0rOzyQPmrwhdFKAFg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@wdio/reporter": "8.38.2",
+        "@wdio/types": "8.38.2",
+        "chalk": "^5.0.1",
+        "pretty-ms": "^7.0.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^16.13 || >=18"
       }
     },
     "node_modules/@wdio/concise-reporter/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/concise-reporter/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@wdio/config": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.0.5.tgz",
+      "integrity": "sha512-+dxUU2SLXLkqQhVU/wauU1VgqEKIFubOyUb6B0ueAMpM1aolc62zhE9D9rrQYbjkPOM7nFsjuuGR5+9+zaoZ6g==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@wdio/concise-reporter/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@wdio/concise-reporter/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/concise-reporter/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/config/node_modules/@puppeteer/browsers": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
+      "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "debug": "^4.3.6",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/config": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.5.3.tgz",
-      "integrity": "sha512-udvVizYoilOxuWj/BmoN6y7ZCd4wPdYNlSfWznrbCezAdaLZ4/pNDOO0WRWx2C4+q1wdkXZV/VuQPUGfL0lEHQ==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "deepmerge": "^4.0.0",
-        "glob": "^7.1.2"
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
     "node_modules/@wdio/config/node_modules/@wdio/logger": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+      "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.0.0",
+        "chalk": "^5.1.2",
         "loglevel": "^1.6.0",
         "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
     "node_modules/@wdio/config/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+      "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
       "dev": true,
       "dependencies": {
-        "got": "^11.8.1"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/config/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@wdio/config/node_modules/@wdio/utils": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+      "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@puppeteer/browsers": "^2.2.0",
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "edgedriver": "^5.6.1",
+        "geckodriver": "^4.3.3",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.2.24",
+        "safaridriver": "^0.1.2",
+        "split2": "^4.2.0",
+        "wait-port": "^1.1.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/config/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@wdio/config/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/config/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@wdio/config/node_modules/deepmerge-ts": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+      "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "agent-base": "^7.0.2",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/config/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@wdio/config/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/@wdio/config/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
-    "node_modules/@wdio/config/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/config/node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/local-runner": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.5.7.tgz",
-      "integrity": "sha512-aYc0XUV+/e3cg8Fp+CWlC4FbwSSG3mKAv1iuy/+Hwzg2kJE+aa+Rf2p2BQYc7HPRtKNW0bM8o+aCImZLAiPM+A==",
+    "node_modules/@wdio/config/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "@types/stream-buffers": "^3.0.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/repl": "7.5.3",
-        "@wdio/runner": "7.5.7",
-        "@wdio/types": "7.5.3",
-        "async-exit-hook": "^2.0.1",
-        "split2": "^3.2.2",
-        "stream-buffers": "^3.0.2"
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@wdio/cli": "^7.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/@wdio/local-runner/node_modules/@wdio/logger": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+    "node_modules/@wdio/config/node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
       },
-      "engines": {
-        "node": ">=12.0.0"
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
       }
     },
-    "node_modules/@wdio/local-runner/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+    "node_modules/@wdio/config/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "dependencies": {
-        "got": "^11.8.1"
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@wdio/local-runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@wdio/globals": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.0.5.tgz",
+      "integrity": "sha512-ZkopKj1qEDNKuF1a87JTLfTKCBFgCHLUns5ob5D1oEmMFp0NwB89HHGBWgtuJpCUmxJAbf4rCKglVeKhB9rY7A==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "optionalDependencies": {
+        "expect-webdriverio": "^5.0.1",
+        "webdriverio": "9.0.5"
       }
     },
-    "node_modules/@wdio/local-runner/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@wdio/globals/node_modules/@puppeteer/browsers": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+      "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "debug": "^4.3.5",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
       },
-      "engines": {
-        "node": ">=10"
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/local-runner/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@wdio/globals/node_modules/@vitest/snapshot": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.5.tgz",
+      "integrity": "sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@vitest/pretty-format": "2.0.5",
+        "magic-string": "^0.30.10",
+        "pathe": "^1.1.2"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@wdio/local-runner/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@wdio/local-runner/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/@wdio/globals/node_modules/@wdio/logger": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+      "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
       "dev": true,
+      "optional": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/local-runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/globals/node_modules/@wdio/types": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+      "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/logger": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.16.0.tgz",
-      "integrity": "sha512-/6lOGb2Iow5eSsy7RJOl1kCwsP4eMlG+/QKro5zUJsuyNJSQXf2ejhpkzyKWLgQbHu83WX6cM1014AZuLkzoQg==",
+    "node_modules/@wdio/globals/node_modules/@wdio/utils": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+      "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
+        "@puppeteer/browsers": "^2.2.0",
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "edgedriver": "^5.6.1",
+        "geckodriver": "^4.3.3",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.2.24",
+        "safaridriver": "^0.1.2",
+        "split2": "^4.2.0",
+        "wait-port": "^1.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/logger/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@wdio/globals/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/logger/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@wdio/globals/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "optional": true,
       "engines": {
-        "node": ">=10"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/logger/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@wdio/globals/node_modules/deepmerge-ts": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+      "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+      "optional": true,
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@wdio/logger/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/@wdio/globals/node_modules/devtools-protocol": {
+      "version": "0.0.1312386",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
-    "node_modules/@wdio/logger/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/@wdio/globals/node_modules/expect-webdriverio": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-5.0.1.tgz",
+      "integrity": "sha512-tYJaXtu5qQr/oEXzDKoVzyA/g2wyeE1YsuVJQC8/bKnp1lX3I4NQ2Yb9u1rJ9vdpFha6pki8PzHlTk5PVZBQWQ==",
       "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@vitest/snapshot": "^2.0.5",
+        "expect": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "lodash.isequal": "^4.5.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18 || >=20 || >=22"
+      },
+      "peerDependencies": {
+        "@wdio/globals": "^9.0.0-alpha.350",
+        "@wdio/logger": "^9.0.0-alpha.350",
+        "webdriverio": "^9.0.0-alpha.350"
+      },
+      "peerDependenciesMeta": {
+        "@wdio/globals": {
+          "optional": false
+        },
+        "@wdio/logger": {
+          "optional": false
+        },
+        "webdriverio": {
+          "optional": false
+        }
       }
     },
-    "node_modules/@wdio/logger/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/globals/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "agent-base": "^7.0.2",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/mocha-framework": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.5.3.tgz",
-      "integrity": "sha512-96QCVWsiyZxEgOZP3oTq2B2T7zne5dCdehLa2n4q/BLjk96Rj0jifidJZfd/1+vdNPKX0gWWAzpy98Znn8MVMw==",
+    "node_modules/@wdio/globals/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "@types/mocha": "^8.0.0",
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "expect-webdriverio": "^2.0.0",
-        "mocha": "^8.0.1"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/@wdio/logger": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+    "node_modules/@wdio/globals/node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+    "node_modules/@wdio/globals/node_modules/puppeteer-core": {
+      "version": "22.15.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz",
+      "integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "got": "^11.8.1"
+        "@puppeteer/browsers": "2.3.0",
+        "chromium-bidi": "0.6.3",
+        "debug": "^4.3.6",
+        "devtools-protocol": "0.0.1312386",
+        "ws": "^8.18.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+    "node_modules/@wdio/globals/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@wdio/globals/node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/@wdio/mocha-framework/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@wdio/globals/node_modules/webdriverio": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.5.tgz",
+      "integrity": "sha512-80zhuLBT5W5wiLNZ0maT1cVUrxmwpMuBgCprwZjI8lFe+KUhGLClrJXud/RrVT9x9rDCYa6pGCtQ4UqA+2U+sw==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@types/node": "^20.11.30",
+        "@types/sinonjs__fake-timers": "^8.1.5",
+        "@wdio/config": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/protocols": "9.0.4",
+        "@wdio/repl": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "archiver": "^7.0.1",
+        "aria-query": "^5.3.0",
+        "cheerio": "^1.0.0-rc.12",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "grapheme-splitter": "^1.0.4",
+        "htmlfy": "^0.2.1",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^9.0.3",
+        "query-selector-shadow-dom": "^1.0.1",
+        "resq": "^1.11.0",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^11.0.3",
+        "urlpattern-polyfill": "^10.0.0",
+        "webdriver": "9.0.5"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "puppeteer-core": "^22.3.0"
+      },
+      "peerDependenciesMeta": {
+        "puppeteer-core": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/chokidar": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+    "node_modules/@wdio/globals/node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
-      "dependencies": {
-        "anymatch": "~3.1.1",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.0",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
-      },
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">= 8.10.0"
+        "node": ">=10.0.0"
       },
-      "optionalDependencies": {
-        "fsevents": "~2.3.1"
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+    "node_modules/@wdio/globals/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@wdio/local-runner": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-9.0.5.tgz",
+      "integrity": "sha512-BFZ/e7z1s2cYsix1evijydaDn0YffeIHjPsMoa9b+zhW8BoZfTEDGKblYvzRgjUDD4elXs+YRZpA6EhjcGJTxQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@types/node": "^20.1.0",
+        "@wdio/logger": "9.0.4",
+        "@wdio/repl": "9.0.4",
+        "@wdio/runner": "9.0.5",
+        "@wdio/types": "9.0.4",
+        "async-exit-hook": "^2.0.1",
+        "split2": "^4.1.0",
+        "stream-buffers": "^3.0.2"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@wdio/mocha-framework/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+    "node_modules/@wdio/local-runner/node_modules/@wdio/logger": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+      "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+    "node_modules/@wdio/local-runner/node_modules/@wdio/types": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+      "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
       "dev": true,
+      "dependencies": {
+        "@types/node": "^20.1.0"
+      },
       "engines": {
-        "node": ">=0.3.1"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/@wdio/local-runner/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+    "node_modules/@wdio/logger/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
       "engines": {
-        "node": "*"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@wdio/mocha-framework/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/js-yaml": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
-      "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
+    "node_modules/@wdio/mocha-framework": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-8.38.2.tgz",
+      "integrity": "sha512-qJmRL5E6/ypjCUACH4hvCAAmTdU4YUrUlp9o/IKvTIAHMnZPE0/HgUFixCeu8Mop+rdzTPVBrbqxpRDdSnraYA==",
       "dev": true,
       "dependencies": {
-        "argparse": "^2.0.1"
+        "@types/mocha": "^10.0.0",
+        "@types/node": "^20.1.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.38.2",
+        "@wdio/utils": "8.38.2",
+        "mocha": "^10.0.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+    "node_modules/@wdio/protocols": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.4.tgz",
+      "integrity": "sha512-T9v8Jkp94NxLLil5J7uJ/+YHk5/7fhOggzGcN+LvuCHS6jbJFZ/11c4SUEuXw27Yqk01fFXPBbF6TwcTTOuW/Q==",
+      "dev": true
+    },
+    "node_modules/@wdio/repl": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-9.0.4.tgz",
+      "integrity": "sha512-5Bc5ARjWA7t6MZNnVJ9WvO1iDsy6iOsrSDWiP7APWAdaF/SJCP3SFE2c+PdQJpJWhr2Kk0fRGuyDM+GdsmZhwg==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^5.0.0"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/log-symbols": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
-      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+    "node_modules/@wdio/reporter": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-8.38.2.tgz",
+      "integrity": "sha512-R78UdAtAnkaV22NYlCCcbPPhmYweiDURiw64LYhlVIQrKNuXUQcafR2kRlWKy31rZc9thSLs5LzrZDReENUlFQ==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.0.0"
+        "@types/node": "^20.1.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.38.2",
+        "diff": "^5.0.0",
+        "object-inspect": "^1.12.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+    "node_modules/@wdio/runner": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-9.0.5.tgz",
+      "integrity": "sha512-qZF7k3BeQaM7pQRwIvedbfaC7xBU1xRY+wFkp44U/wvYZOOrqWiwv/Synk1iCFkOdxl/b+Gqp68dDmS9BrVDmw==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "@types/node": "^20.11.28",
+        "@wdio/config": "9.0.5",
+        "@wdio/globals": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "deepmerge-ts": "^7.0.3",
+        "expect-webdriverio": "^5.0.1",
+        "gaze": "^1.1.3",
+        "webdriver": "9.0.5",
+        "webdriverio": "9.0.5"
       },
       "engines": {
-        "node": "*"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/mocha": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
-      "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
-      "dev": true,
-      "dependencies": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.1",
-        "debug": "4.3.1",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.1.6",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.0.0",
-        "log-symbols": "4.0.0",
-        "minimatch": "3.0.4",
-        "ms": "2.1.3",
-        "nanoid": "3.1.20",
-        "serialize-javascript": "5.0.1",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "wide-align": "1.1.3",
-        "workerpool": "6.1.0",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
+    "node_modules/@wdio/runner/node_modules/@puppeteer/browsers": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
+      "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.6",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
       },
       "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
+        "browsers": "lib/cjs/main-cli.js"
       },
       "engines": {
-        "node": ">= 10.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/mocha/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/@wdio/mocha-framework/node_modules/mocha/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/@wdio/runner/node_modules/@vitest/snapshot": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.5.tgz",
+      "integrity": "sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@vitest/pretty-format": "2.0.5",
+        "magic-string": "^0.30.10",
+        "pathe": "^1.1.2"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/nanoid": {
-      "version": "3.1.20",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
-      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+    "node_modules/@wdio/runner/node_modules/@wdio/logger": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+      "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
       "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+    "node_modules/@wdio/runner/node_modules/@wdio/types": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+      "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
       "dev": true,
       "dependencies": {
-        "yocto-queue": "^0.1.0"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+    "node_modules/@wdio/runner/node_modules/@wdio/utils": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+      "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^3.0.2"
+        "@puppeteer/browsers": "^2.2.0",
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "edgedriver": "^5.6.1",
+        "geckodriver": "^4.3.3",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.2.24",
+        "safaridriver": "^0.1.2",
+        "split2": "^4.2.0",
+        "wait-port": "^1.1.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/readdirp": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+    "node_modules/@wdio/runner/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dev": true,
       "dependencies": {
-        "picomatch": "^2.2.1"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+    "node_modules/@wdio/runner/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "dependencies": {
-        "randombytes": "^2.1.0"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+    "node_modules/@wdio/runner/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/runner/node_modules/deepmerge-ts": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+      "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/workerpool": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
-      "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
-      "dev": true
+    "node_modules/@wdio/runner/node_modules/devtools-protocol": {
+      "version": "0.0.1312386",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
-    "node_modules/@wdio/mocha-framework/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+    "node_modules/@wdio/runner/node_modules/expect-webdriverio": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-5.0.1.tgz",
+      "integrity": "sha512-tYJaXtu5qQr/oEXzDKoVzyA/g2wyeE1YsuVJQC8/bKnp1lX3I4NQ2Yb9u1rJ9vdpFha6pki8PzHlTk5PVZBQWQ==",
       "dev": true,
       "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
+        "@vitest/snapshot": "^2.0.5",
+        "expect": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "lodash.isequal": "^4.5.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18 || >=20 || >=22"
+      },
+      "peerDependencies": {
+        "@wdio/globals": "^9.0.0-alpha.350",
+        "@wdio/logger": "^9.0.0-alpha.350",
+        "webdriverio": "^9.0.0-alpha.350"
+      },
+      "peerDependenciesMeta": {
+        "@wdio/globals": {
+          "optional": false
+        },
+        "@wdio/logger": {
+          "optional": false
+        },
+        "webdriverio": {
+          "optional": false
+        }
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/yargs-parser": {
-      "version": "20.2.4",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+    "node_modules/@wdio/runner/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/protocols": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.5.3.tgz",
-      "integrity": "sha512-lpNaKwxYhDSL6neDtQQYXvzMAw+u4PXx65ryeMEX82mkARgzSZps5Kyrg9ub7X4T17K1NPfnY6UhZEWg6cKJCg==",
+    "node_modules/@wdio/runner/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "dev": true,
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@wdio/repl": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.5.3.tgz",
-      "integrity": "sha512-jfNJwNoc2nWdnLsFoGHmOJR9zaWfDTBMWM3W1eR5kXIjevD6gAfWsB5ZoA4IdybujCXxdnhlsm4o2jIzp/6f7A==",
+    "node_modules/@wdio/runner/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
-        "@wdio/utils": "7.5.3"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@wdio/reporter": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.5.7.tgz",
-      "integrity": "sha512-9PXqZtCXDtU6UYLNDPu9MZQ8BiABGnRlJTrlbYB3gBfZDibMkJMvwXzPderipBv2+ifDZXmGe3Njf1ao2TkbFA==",
+    "node_modules/@wdio/runner/node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
       "dev": true,
       "dependencies": {
-        "@wdio/types": "7.5.3",
-        "fs-extra": "^10.0.0"
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/reporter/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+    "node_modules/@wdio/runner/node_modules/puppeteer-core": {
+      "version": "22.15.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz",
+      "integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "got": "^11.8.1"
+        "@puppeteer/browsers": "2.3.0",
+        "chromium-bidi": "0.6.3",
+        "debug": "^4.3.6",
+        "devtools-protocol": "0.0.1312386",
+        "ws": "^8.18.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/runner": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.5.7.tgz",
-      "integrity": "sha512-RzVXd+xnwK/thkx1/xo9K5iscQ0Ofobgsx5dNVtwLDVMn9V7jCW/WX4dSCPAPaVSqnUCmkcQp3P5AoSBPpCZnQ==",
+    "node_modules/@wdio/runner/node_modules/puppeteer-core/node_modules/@puppeteer/browsers": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+      "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "deepmerge": "^4.0.0",
-        "gaze": "^1.1.2",
-        "webdriver": "7.5.3",
-        "webdriverio": "7.5.7"
+        "debug": "^4.3.5",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@wdio/runner/node_modules/@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
-      "dev": true
-    },
-    "node_modules/@wdio/runner/node_modules/@wdio/logger": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+    "node_modules/@wdio/runner/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^11.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/chrome-launcher": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
-      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "escape-string-regexp": "^1.0.5",
-        "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0",
-        "mkdirp": "^0.5.3",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@wdio/runner/node_modules/devtools": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
-      "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/protocols": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "chrome-launcher": "^0.13.1",
-        "edge-paths": "^2.1.0",
-        "puppeteer-core": "^9.1.0",
-        "query-selector-shadow-dom": "^1.0.0",
-        "ua-parser-js": "^0.7.21",
-        "uuid": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/devtools-protocol": {
-      "version": "0.0.878340",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
-      "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
-      "dev": true
-    },
-    "node_modules/@wdio/runner/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
       "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/puppeteer-core": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
-      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "devtools-protocol": "0.0.869402",
-        "extract-zip": "^2.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "node-fetch": "^2.6.1",
-        "pkg-dir": "^4.2.0",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.1.0",
-        "rimraf": "^3.0.2",
-        "tar-fs": "^2.0.0",
-        "unbzip2-stream": "^1.3.3",
-        "ws": "^7.2.3"
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=10.18.1"
+        "node": ">=10"
       }
     },
-    "node_modules/@wdio/runner/node_modules/puppeteer-core/node_modules/devtools-protocol": {
-      "version": "0.0.869402",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
-      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
-      "dev": true
-    },
-    "node_modules/@wdio/runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/runner/node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
       }
     },
     "node_modules/@wdio/runner/node_modules/webdriverio": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
-      "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
-      "dev": true,
-      "dependencies": {
-        "@types/aria-query": "^4.2.1",
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/protocols": "7.5.3",
-        "@wdio/repl": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "archiver": "^5.0.0",
-        "aria-query": "^4.2.2",
-        "atob": "^2.1.2",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.5.tgz",
+      "integrity": "sha512-80zhuLBT5W5wiLNZ0maT1cVUrxmwpMuBgCprwZjI8lFe+KUhGLClrJXud/RrVT9x9rDCYa6pGCtQ4UqA+2U+sw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^20.11.30",
+        "@types/sinonjs__fake-timers": "^8.1.5",
+        "@wdio/config": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/protocols": "9.0.4",
+        "@wdio/repl": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "archiver": "^7.0.1",
+        "aria-query": "^5.3.0",
+        "cheerio": "^1.0.0-rc.12",
         "css-shorthand-properties": "^1.1.1",
         "css-value": "^0.0.1",
-        "devtools": "7.5.7",
-        "devtools-protocol": "^0.0.878340",
-        "fs-extra": "^10.0.0",
-        "get-port": "^5.1.1",
-        "grapheme-splitter": "^1.0.2",
+        "grapheme-splitter": "^1.0.4",
+        "htmlfy": "^0.2.1",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
         "lodash.clonedeep": "^4.5.0",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isplainobject": "^4.0.6",
         "lodash.zip": "^4.2.0",
-        "minimatch": "^3.0.4",
-        "puppeteer-core": "^9.1.0",
-        "query-selector-shadow-dom": "^1.0.0",
-        "resq": "^1.9.1",
+        "minimatch": "^9.0.3",
+        "query-selector-shadow-dom": "^1.0.1",
+        "resq": "^1.11.0",
         "rgb2hex": "0.2.5",
-        "serialize-error": "^8.0.0",
-        "webdriver": "7.5.3"
+        "serialize-error": "^11.0.3",
+        "urlpattern-polyfill": "^10.0.0",
+        "webdriver": "9.0.5"
       },
       "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/runner/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.3.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "puppeteer-core": "^22.3.0"
       },
       "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
+        "puppeteer-core": {
           "optional": true
         }
       }
     },
-    "node_modules/@wdio/spec-reporter": {
-      "version": "7.19.7",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.7.tgz",
-      "integrity": "sha512-BDBZU2EK/GuC9VxtfqPtoW43FmvKxYDsvcDVDi3F7o+9fkcuGSJiWbw1AX251ZzzVQ7YP9ImTitSpdpUKXkilQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/easy-table": "^0.0.33",
-        "@wdio/reporter": "7.19.7",
-        "@wdio/types": "7.19.5",
-        "chalk": "^4.0.0",
-        "easy-table": "^1.1.1",
-        "pretty-ms": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@wdio/cli": "^7.0.0"
-      }
-    },
-    "node_modules/@wdio/spec-reporter/node_modules/@wdio/reporter": {
-      "version": "7.19.7",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.7.tgz",
-      "integrity": "sha512-Dum19gpfru66FnIq78/4HTuW87B7ceLDp6PJXwQM5kXyN7Gb7zhMgp6FZTM0FCYLyi6U/zXZSvpNUYl77caS6g==",
-      "dev": true,
-      "dependencies": {
-        "@types/diff": "^5.0.0",
-        "@types/node": "^17.0.4",
-        "@types/object-inspect": "^1.8.0",
-        "@types/supports-color": "^8.1.0",
-        "@types/tmp": "^0.2.0",
-        "@wdio/types": "7.19.5",
-        "diff": "^5.0.0",
-        "fs-extra": "^10.0.0",
-        "object-inspect": "^1.10.3",
-        "supports-color": "8.1.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/spec-reporter/node_modules/@wdio/types": {
-      "version": "7.19.5",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.5.tgz",
-      "integrity": "sha512-S1lC0pmtEO7NVH/2nM1c7NHbkgxLZH3VVG/z6ym3Bbxdtcqi2LMsEvvawMAU/fmhyiIkMsGZCO8vxG9cRw4z4A==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "^17.0.4",
-        "got": "^11.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
-      }
-    },
-    "node_modules/@wdio/spec-reporter/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/spec-reporter/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/spec-reporter/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/spec-reporter/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@wdio/spec-reporter/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@wdio/spec-reporter/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/spec-reporter/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/sync": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-7.5.7.tgz",
-      "integrity": "sha512-Zu/AYLjwqbFSbaOU1US7ownv3ov8JrtoGHq51JfJ4masefJDXNkHix2cZ0qEgl3IvkkWQ0ewL0G8GTXb3KOemA==",
-      "dev": true,
-      "dependencies": {
-        "@types/fibers": "^3.1.0",
-        "@types/puppeteer": "^5.4.0",
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "fibers": "^5.0.0",
-        "webdriverio": "7.5.7"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
-      "dev": true
-    },
-    "node_modules/@wdio/sync/node_modules/@wdio/logger": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^11.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/chrome-launcher": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
-      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "escape-string-regexp": "^1.0.5",
-        "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0",
-        "mkdirp": "^0.5.3",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@wdio/sync/node_modules/devtools": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
-      "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/protocols": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "chrome-launcher": "^0.13.1",
-        "edge-paths": "^2.1.0",
-        "puppeteer-core": "^9.1.0",
-        "query-selector-shadow-dom": "^1.0.0",
-        "ua-parser-js": "^0.7.21",
-        "uuid": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/devtools-protocol": {
-      "version": "0.0.878340",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
-      "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
-      "dev": true
-    },
-    "node_modules/@wdio/sync/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/puppeteer-core": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
-      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "devtools-protocol": "0.0.869402",
-        "extract-zip": "^2.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "node-fetch": "^2.6.1",
-        "pkg-dir": "^4.2.0",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.1.0",
-        "rimraf": "^3.0.2",
-        "tar-fs": "^2.0.0",
-        "unbzip2-stream": "^1.3.3",
-        "ws": "^7.2.3"
-      },
-      "engines": {
-        "node": ">=10.18.1"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/puppeteer-core/node_modules/devtools-protocol": {
-      "version": "0.0.869402",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
-      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
-      "dev": true
-    },
-    "node_modules/@wdio/sync/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/webdriverio": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
-      "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
-      "dev": true,
-      "dependencies": {
-        "@types/aria-query": "^4.2.1",
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/protocols": "7.5.3",
-        "@wdio/repl": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "archiver": "^5.0.0",
-        "aria-query": "^4.2.2",
-        "atob": "^2.1.2",
-        "css-shorthand-properties": "^1.1.1",
-        "css-value": "^0.0.1",
-        "devtools": "7.5.7",
-        "devtools-protocol": "^0.0.878340",
-        "fs-extra": "^10.0.0",
-        "get-port": "^5.1.1",
-        "grapheme-splitter": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.zip": "^4.2.0",
-        "minimatch": "^3.0.4",
-        "puppeteer-core": "^9.1.0",
-        "query-selector-shadow-dom": "^1.0.0",
-        "resq": "^1.9.1",
-        "rgb2hex": "0.2.5",
-        "serialize-error": "^8.0.0",
-        "webdriver": "7.5.3"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/sync/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+    "node_modules/@wdio/runner/node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -4847,279 +5677,238 @@
         }
       }
     },
-    "node_modules/@wdio/types": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.16.14.tgz",
-      "integrity": "sha512-AyNI9iBSos9xWBmiFAF3sBs6AJXO/55VppU/eeF4HRdbZMtMarnvMuahM+jlUrA3vJSmDW+ufelG0MT//6vrnw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "^17.0.4",
-        "got": "^11.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/utils": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.5.3.tgz",
-      "integrity": "sha512-nlLDKr8v8abLOHCKroBwQkGPdCIxjID2MllgWX23xqkYZylM9RdwPBdL8osQt9m3rq2TxiPAT4OlbzNt2WtN6Q==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/utils/node_modules/@wdio/logger": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/utils/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+    "node_modules/@wdio/runner/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "dependencies": {
-        "got": "^11.8.1"
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@wdio/utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@wdio/spec-reporter": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-8.38.2.tgz",
+      "integrity": "sha512-Dntk+lmrp+0I3HRRWkkXED+smshvgsW5cdLKwJhEJ1liI48MdBpdNGf9IHTVckE6nfxcWDyFI4icD9qYv/5bFA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@wdio/reporter": "8.38.2",
+        "@wdio/types": "8.38.2",
+        "chalk": "^5.1.2",
+        "easy-table": "^1.2.0",
+        "pretty-ms": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@wdio/spec-reporter/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@wdio/types": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.38.2.tgz",
+      "integrity": "sha512-+wj1c1OSLdnN4WO5b44Ih4263dTl/eSwMGSI4/pCgIyXIuYQH38JQ+6WRa+c8vJEskUzboq2cSgEQumVZ39ozQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@wdio/utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@wdio/utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/utils/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/utils": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.38.2.tgz",
+      "integrity": "sha512-y5AnBwsGcu/XuCBGCgKmlvKdwEIFyzLA+Cr+denySxY3jbWDONtPUcGaVdFALwsIa5jcIjcATqGmZcCPGnkd7g==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.38.2",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^16.13 || >=18"
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/ast": "1.12.1",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.8.tgz",
-      "integrity": "sha512-PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==",
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
@@ -5137,12 +5926,35 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
+    "node_modules/@zip.js/zip.js": {
+      "version": "2.7.48",
+      "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.48.tgz",
+      "integrity": "sha512-J7cliimZ2snAbr0IhLx2U8BwfA1pKucahKzTpFtYq4hEgKxwvFJcIjCIVNPwQpfVab7iVP+AKmoH1gidBlyhiQ==",
+      "dev": true,
+      "engines": {
+        "bun": ">=0.7.0",
+        "deno": ">=1.0.0",
+        "node": ">=16.5.0"
+      }
+    },
     "node_modules/abbrev": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
       "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==",
       "dev": true
     },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dev": true,
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -5177,9 +5989,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
@@ -5328,15 +6140,14 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
       "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
@@ -5359,62 +6170,164 @@
       }
     },
     "node_modules/archiver": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
-      "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
       "dev": true,
       "dependencies": {
-        "archiver-utils": "^2.1.0",
-        "async": "^3.2.3",
-        "buffer-crc32": "^0.2.1",
-        "readable-stream": "^3.6.0",
-        "readdir-glob": "^1.0.0",
-        "tar-stream": "^2.2.0",
-        "zip-stream": "^4.1.0"
+        "archiver-utils": "^5.0.2",
+        "async": "^3.2.4",
+        "buffer-crc32": "^1.0.0",
+        "readable-stream": "^4.0.0",
+        "readdir-glob": "^1.1.2",
+        "tar-stream": "^3.0.0",
+        "zip-stream": "^6.0.1"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 14"
       }
     },
     "node_modules/archiver-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
-      "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
       "dev": true,
       "dependencies": {
-        "glob": "^7.1.4",
+        "glob": "^10.0.0",
         "graceful-fs": "^4.2.0",
+        "is-stream": "^2.0.1",
         "lazystream": "^1.0.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.union": "^4.6.0",
+        "lodash": "^4.17.15",
         "normalize-path": "^3.0.0",
-        "readable-stream": "^2.0.0"
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
+      }
+    },
+    "node_modules/archiver-utils/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/archiver-utils/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/archiver-utils/node_modules/readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+      "dev": true,
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/archiver-utils/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/archiver/node_modules/async": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
       "dev": true
     },
+    "node_modules/archiver/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/archiver/node_modules/buffer-crc32": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/archiver/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
       "dev": true,
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/archiver/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/archy": {
@@ -5423,22 +6336,30 @@
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
+    "node_modules/are-docs-informative": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+      "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
     "node_modules/aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
       "dev": true,
       "dependencies": {
-        "deep-equal": "^2.0.5"
+        "dequal": "^2.0.3"
       }
     },
     "node_modules/arr-diff": {
@@ -5505,6 +6426,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-differ": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
@@ -5535,15 +6472,16 @@
       "dev": true
     },
     "node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -5619,6 +6557,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/array-sort/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
@@ -5637,15 +6584,35 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -5655,6 +6622,46 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -5665,15 +6672,16 @@
       }
     },
     "node_modules/assert": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
+      "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
       "dev": true,
       "dependencies": {
-        "es6-object-assign": "^1.1.0",
-        "is-nan": "^1.2.1",
-        "object-is": "^1.0.1",
-        "util": "^0.12.0"
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
       }
     },
     "node_modules/assert-plus": {
@@ -5698,11 +6706,28 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ast-types/node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "dev": true
+    },
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -5734,10 +6759,16 @@
       }
     },
     "node_modules/async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
+      "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
     "node_modules/async-exit-hook": {
       "version": "2.0.1",
@@ -5779,10 +6810,13 @@
       }
     },
     "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -5800,173 +6834,46 @@
       }
     },
     "node_modules/aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.0.tgz",
+      "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==",
       "dev": true
     },
-    "node_modules/babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+    "node_modules/axios": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/babel-code-frame/node_modules/js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
-      "dev": true
-    },
-    "node_modules/babel-code-frame/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+    "node_modules/axios/node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^2.0.0"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/babel-core": {
-      "version": "6.26.3",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
-      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
-      "dev": true,
-      "dependencies": {
-        "babel-code-frame": "^6.26.0",
-        "babel-generator": "^6.26.0",
-        "babel-helpers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "convert-source-map": "^1.5.1",
-        "debug": "^2.6.9",
-        "json5": "^0.5.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.4",
-        "path-is-absolute": "^1.0.1",
-        "private": "^0.1.8",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.7"
-      }
-    },
-    "node_modules/babel-core/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/babel-core/node_modules/json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
+        "node": ">= 6"
       }
     },
-    "node_modules/babel-core/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+    "node_modules/b4a": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
       "dev": true
     },
-    "node_modules/babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-      "dev": true,
-      "dependencies": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
-      }
-    },
-    "node_modules/babel-generator/node_modules/jsesc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/babel-helpers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
-      "dev": true,
-      "dependencies": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
     "node_modules/babel-loader": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
+      "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
       "dev": true,
       "dependencies": {
         "find-cache-dir": "^3.3.1",
@@ -5982,15 +6889,6 @@
         "webpack": ">=2"
       }
     },
-    "node_modules/babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
-      "dev": true,
-      "dependencies": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -6008,182 +6906,39 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+      "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
       "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "semver": "^6.1.1"
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "semver": "^6.3.1"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz",
+      "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
+        "@babel/helper-define-polyfill-provider": "^0.6.1",
+        "core-js-compat": "^3.36.1"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
+      "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
+        "@babel/helper-define-polyfill-provider": "^0.6.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-register": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
-      "dev": true,
-      "dependencies": {
-        "babel-core": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "home-or-tmp": "^2.0.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.15"
-      }
-    },
-    "node_modules/babel-register/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/babel-register/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
-      "dev": true,
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
-    "node_modules/babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
-      "dev": true,
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "node_modules/babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
-      "dev": true,
-      "dependencies": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      }
-    },
-    "node_modules/babel-traverse/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/babel-traverse/node_modules/globals": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-traverse/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
-      "dev": true,
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      }
-    },
-    "node_modules/babel-types/node_modules/to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true,
-      "bin": {
-        "babylon": "bin/babylon.js"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/bach": {
@@ -6222,6 +6977,52 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "node_modules/bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-fs": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
+      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
+      }
+    },
+    "node_modules/bare-os": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.3.0.tgz",
+      "integrity": "sha512-oPb8oMM1xZbhRQBngTgpcQ5gXw6kjOaRsSWsIeNyRxGed2w/ARyP7ScBYpWR1qfX2E5rS3gBw6OWcSQo+s+kUg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-path": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
+      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-os": "^2.1.0"
+      }
+    },
+    "node_modules/bare-stream": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
+      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "streamx": "^2.18.0"
+      }
+    },
     "node_modules/base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
@@ -6299,6 +7100,15 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
+    "node_modules/basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -6324,9 +7134,9 @@
       }
     },
     "node_modules/big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
+      "version": "1.6.52",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
+      "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
       "dev": true,
       "engines": {
         "node": ">=0.6"
@@ -6355,12 +7165,15 @@
       }
     },
     "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "dev": true,
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/binaryextensions": {
@@ -6385,36 +7198,10 @@
         "file-uri-to-path": "1.0.0"
       }
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/bl/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/bluebird": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
-      "dev": true
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
     "node_modules/body": {
       "version": "5.1.0",
@@ -6429,20 +7216,20 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -6489,6 +7276,12 @@
       "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
       "dev": true
     },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -6500,12 +7293,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -6518,9 +7311,9 @@
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.21.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "version": "4.23.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
+      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
       "funding": [
         {
           "type": "opencollective",
@@ -6529,13 +7322,17 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001400",
-        "electron-to-chromium": "^1.4.251",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.9"
+        "caniuse-lite": "^1.0.30001629",
+        "electron-to-chromium": "^1.4.796",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.16"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -6554,9 +7351,9 @@
       }
     },
     "node_modules/browserstack-local": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.5.1.tgz",
-      "integrity": "sha512-T/wxyWDzvBHbDvl7fZKpFU7mYze6nrUkBhNy+d+8bXBqgQX10HTYvajIGO0wb49oGSLCPM0CMZTV/s7e6LF0sA==",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.5.5.tgz",
+      "integrity": "sha512-jKne7yosrMcptj3hqxp36TP9k0ZW2sCqhyurX24rUL4G3eT7OLgv+CSQN8iq5dtkv5IK+g+v8fWvsiC/S9KxMg==",
       "dev": true,
       "dependencies": {
         "agent-base": "^6.0.2",
@@ -6716,164 +7513,44 @@
         "node": ">=0.2.0"
       }
     },
-    "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cac": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
-      "integrity": "sha512-hq4rxE3NT5PlaEiVV39Z45d6MoFcQZG5dsgJqtAUeOz3408LEQAElToDkf9i5IYSCOmK0If/81dLg7nKxqPR0w==",
-      "dev": true,
-      "dependencies": {
-        "camelcase-keys": "^3.0.0",
-        "chalk": "^1.1.3",
-        "indent-string": "^3.0.0",
-        "minimist": "^1.2.0",
-        "read-pkg-up": "^1.0.1",
-        "suffix": "^0.1.0",
-        "text-table": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cac/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/cac/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/cac/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/read-pkg-up": {
+    "node_modules/bufferstreams": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
+      "integrity": "sha512-LZmiIfQprMLS6/k42w/PTc7awhU8AdNNcUerxTgr01WlP9agR2SgMv0wjlYYFD6eDOi8WvofrTX8RayjR/AeUQ==",
       "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "readable-stream": "^1.0.33"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/cac/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
+    "node_modules/bufferstreams/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
     },
-    "node_modules/cac/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-      "dev": true,
+    "node_modules/bufferstreams/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
       "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
       }
     },
-    "node_modules/cac/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
+    "node_modules/bufferstreams/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 0.8"
       }
     },
     "node_modules/cache-base": {
@@ -6896,55 +7573,19 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.6.0"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dependencies": {
-        "pump": "^3.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6968,28 +7609,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/camelcase-keys": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
-      "integrity": "sha512-U4E6A6aFyYnNW+tDt5/yIUKQURKXe3WMFPfX4FxrQFcwZ/R08AUk1xWcUtlr7oq6CV07Ji+aa69V2g7BSpblnQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/camelcase-keys/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/can-autoplay": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
@@ -6997,9 +7616,9 @@
       "dev": true
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001429",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz",
-      "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg==",
+      "version": "1.0.30001633",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001633.tgz",
+      "integrity": "sha512-6sT0yf/z5jqf8tISAgpJDrmwOpLsrpnyCdD/lOZKvKkkJK4Dn0X5i7KF7THEZhOq+30bmhwBlNEaqPUiHiKtZg==",
       "funding": [
         {
           "type": "opencollective",
@@ -7008,6 +7627,10 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ]
     },
@@ -7028,18 +7651,18 @@
       }
     },
     "node_modules/chai": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
-      "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
+      "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
       "dev": true,
       "dependencies": {
         "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
         "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "type-detect": "^4.0.8"
       },
       "engines": {
         "node": ">=4"
@@ -7107,25 +7730,76 @@
       "dev": true
     },
     "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
       "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.2"
+      },
       "engines": {
         "node": "*"
       }
     },
+    "node_modules/cheerio": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz",
+      "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==",
+      "dev": true,
+      "dependencies": {
+        "cheerio-select": "^2.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.1.0",
+        "encoding-sniffer": "^0.2.0",
+        "htmlparser2": "^9.1.0",
+        "parse5": "^7.1.2",
+        "parse5-htmlparser2-tree-adapter": "^7.0.0",
+        "parse5-parser-stream": "^7.1.2",
+        "undici": "^6.19.5",
+        "whatwg-mimetype": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18.17"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+      }
+    },
+    "node_modules/cheerio-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
+      "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-select": "^5.1.0",
+        "css-what": "^6.1.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cheerio/node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -7138,53 +7812,51 @@
       "engines": {
         "node": ">= 8.10.0"
       },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/chrome-launcher": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.1.tgz",
-      "integrity": "sha512-UugC8u59/w2AyX5sHLZUHoxBAiSiunUhZa3zZwMH6zPVis0C3dDKiRWyUGIo14tTbZHGVviWxv3PQWZ7taZ4fg==",
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "escape-string-regexp": "^4.0.0",
-        "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0"
-      },
-      "bin": {
-        "print-chrome-path": "bin/print-chrome-path.js"
-      },
       "engines": {
-        "node": ">=12.13.0"
+        "node": ">=6.0"
       }
     },
-    "node_modules/chrome-launcher/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/chromium-bidi": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.3.tgz",
+      "integrity": "sha512-qXlsCmpCZJAnoTYI83Iu6EdYQpMYdVkCfq08KDh2pmlVqK5t5IA9mGs4/LwCwp4fqisSOMXZxP3HIh8w8aRn0A==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "mitt": "3.0.1",
+        "urlpattern-polyfill": "10.0.0",
+        "zod": "3.23.8"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "devtools-protocol": "*"
       }
     },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
       "engines": {
-        "node": ">=6.0"
+        "node": ">=8"
       }
     },
     "node_modules/class-utils": {
@@ -7223,119 +7895,126 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "restore-cursor": "^3.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/class-utils/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+    "node_modules/cli-spinners": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.1.0.tgz",
+      "integrity": "sha512-2MH0N34TpDAs9ROPVkZJfBWFoYfv4zfkJF14PBHY4v/qRY75SLcm4WaEKNCLScsXieosa/tY/+slJ+BDswJxHQ==",
       "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+    "node_modules/cli-width": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
       "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 12"
       }
     },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+    "node_modules/cliui/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "restore-cursor": "^3.1.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/cli-spinners": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
-      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
+    "node_modules/cliui/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "color-name": "~1.1.4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+    "node_modules/cliui/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">=8"
       }
     },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/clone": {
@@ -7356,16 +8035,30 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "dependencies": {
-        "mimic-response": "^1.0.0"
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-deep/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/clone-stats": {
@@ -7465,9 +8158,9 @@
       }
     },
     "node_modules/comma-separated-tokens": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz",
-      "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -7480,6 +8173,15 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "node_modules/comment-parser": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+      "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -7487,38 +8189,89 @@
       "dev": true
     },
     "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/compress-commons": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz",
-      "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
       "dev": true,
       "dependencies": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.2",
+        "crc-32": "^1.2.0",
+        "crc32-stream": "^6.0.0",
+        "is-stream": "^2.0.1",
         "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 14"
+      }
+    },
+    "node_modules/compress-commons/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/compress-commons/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/compress-commons/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
       "dev": true,
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/compress-commons/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/concat-map": {
@@ -7638,6 +8391,18 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/consolidate": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+      "deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
+      "dependencies": {
+        "bluebird": "^3.1.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -7650,9 +8415,9 @@
       }
     },
     "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -7664,14 +8429,14 @@
       "dev": true
     },
     "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -7701,9 +8466,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
-      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==",
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz",
+      "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -7711,11 +8476,11 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
-      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz",
+      "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==",
       "dependencies": {
-        "browserslist": "^4.21.4"
+        "browserslist": "^4.23.0"
       },
       "funding": {
         "type": "opencollective",
@@ -7723,9 +8488,9 @@
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.0.tgz",
-      "integrity": "sha512-LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA==",
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.37.1.tgz",
+      "integrity": "sha512-J/r5JTHSmzTxbiYYrzXg9w1VpqrYt+gexenBE9pugeyhwPZTAEJddyiReJWsLO6uNQ8xJZFbod6XC7KKwatCiA==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -7735,8 +8500,7 @@
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
     "node_modules/cors": {
       "version": "2.8.5",
@@ -7783,44 +8547,65 @@
       }
     },
     "node_modules/crc32-stream": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz",
-      "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
       "dev": true,
       "dependencies": {
         "crc-32": "^1.2.0",
-        "readable-stream": "^3.4.0"
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 14"
+      }
+    },
+    "node_modules/crc32-stream/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
       }
     },
     "node_modules/crc32-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
       "dev": true,
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/criteo-direct-rsa-validate": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz",
-      "integrity": "sha512-7gQ3zX+d+hS/vOxzLrZ4aRAceB7qNJ0VzaGNpcWjDCmtOpASB50USJDupTik/H2nHgiSAA3VNZ3SFuONs8LR9Q=="
-    },
-    "node_modules/cross-fetch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+    "node_modules/crc32-stream/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "dependencies": {
-        "node-fetch": "2.6.7"
+        "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/cross-spawn": {
@@ -7837,10 +8622,31 @@
         "node": ">= 8"
       }
     },
+    "node_modules/cross-spawn/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/cross-spawn/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/crypto-js": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
-      "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
     },
     "node_modules/css": {
       "version": "3.0.0",
@@ -7853,6 +8659,22 @@
         "source-map-resolve": "^0.6.0"
       }
     },
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
     "node_modules/css-shorthand-properties": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz",
@@ -7865,6 +8687,18 @@
       "integrity": "sha512-FUV3xaJ63buRLgHrLQVlVgQnQdR4yqdLGaDu7g8CQcWjInDfM9plBTPI9FRfpahju1UBSaMckeb2/46ApS/V1Q==",
       "dev": true
     },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
     "node_modules/css/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -7874,6 +8708,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/csv-writer": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/csv-writer/-/csv-writer-1.6.0.tgz",
+      "integrity": "sha512-NOx7YDFWEsM/fTRAJjRpPp8t+MKRVvniAg9wQlUKx20MFrPs73WLJhFf5iteqrxNYnsy924K3Iroh3yNHeYd2g==",
+      "dev": true
+    },
     "node_modules/custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -7881,13 +8721,16 @@
       "dev": true
     },
     "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
+      "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
       "dev": true,
       "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
+        "es5-ext": "^0.10.64",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/dashdash": {
@@ -7896,10 +8739,70 @@
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "dependencies": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/date-format": {
@@ -7927,10 +8830,16 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/debounce": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
+      "dev": true
+    },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -7964,12 +8873,12 @@
       }
     },
     "node_modules/decamelize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -7997,66 +8906,45 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decompress-response/node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+      "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
       "dev": true,
       "dependencies": {
         "type-detect": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.12"
+        "node": ">=6"
       }
     },
     "node_modules/deep-equal": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
-      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
+      "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "es-get-iterator": "^1.1.1",
-        "get-intrinsic": "^1.0.1",
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.2",
-        "is-regex": "^1.1.1",
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.5",
+        "es-get-iterator": "^1.1.3",
+        "get-intrinsic": "^1.2.2",
+        "is-arguments": "^1.1.1",
+        "is-array-buffer": "^3.0.2",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
         "isarray": "^2.0.5",
-        "object-is": "^1.1.4",
+        "object-is": "^1.1.5",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.3",
-        "which-boxed-primitive": "^1.0.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.1",
+        "side-channel": "^1.0.4",
+        "which-boxed-primitive": "^1.0.2",
         "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.2"
+        "which-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8068,13 +8956,13 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+    "node_modules/deepmerge-ts": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-5.1.0.tgz",
+      "integrity": "sha512-eS8dRJOckyo9maw9Tu5O5RUi/4inFLrnoLkBe3cPfDMx3WZioXtmOew4TXQaxq7Rhl4xjDtR7c6x8nNTxOvbFw==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/default-compare": {
@@ -8089,6 +8977,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/default-compare/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/default-resolution": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
@@ -8103,6 +9000,7 @@
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
       "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "clone": "^1.0.2"
       },
@@ -8115,25 +9013,34 @@
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
       "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=0.8"
       }
     },
-    "node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true,
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
       "dependencies": {
+        "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
       },
@@ -8157,6 +9064,73 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "dev": true,
+      "dependencies": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/degenerator/node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/degenerator/node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/degenerator/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/degenerator/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -8201,30 +9175,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
-      "dev": true,
-      "dependencies": {
-        "repeating": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "dev": true,
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/detect-newline": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
@@ -8234,254 +9184,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/devtools": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.25.4.tgz",
-      "integrity": "sha512-R6/S/dCqxoX4Y6PxIGM9JFAuSRZzUeV5r+CoE/frhmno6mTe7dEEgwkJlfit3LkKRoul8n4DsL2A3QtWOvq5IA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "^18.0.0",
-        "@types/ua-parser-js": "^0.7.33",
-        "@wdio/config": "7.25.4",
-        "@wdio/logger": "7.19.0",
-        "@wdio/protocols": "7.22.0",
-        "@wdio/types": "7.25.4",
-        "@wdio/utils": "7.25.4",
-        "chrome-launcher": "^0.15.0",
-        "edge-paths": "^2.1.0",
-        "puppeteer-core": "^13.1.3",
-        "query-selector-shadow-dom": "^1.0.0",
-        "ua-parser-js": "^1.0.1",
-        "uuid": "^9.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "node_modules/devtools-protocol": {
-      "version": "0.0.1061995",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1061995.tgz",
-      "integrity": "sha512-pKZZWTjWa/IF4ENCg6GN8bu/AxSZgdhjSa26uc23wz38Blt2Tnm9icOPcSG3Cht55rMq35in1w3rWVPcZ60ArA==",
-      "dev": true
-    },
-    "node_modules/devtools/node_modules/@types/node": {
-      "version": "18.11.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
-      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
-      "dev": true
-    },
-    "node_modules/devtools/node_modules/@wdio/config": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
-      "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/logger": "7.19.0",
-        "@wdio/types": "7.25.4",
-        "@wdio/utils": "7.25.4",
-        "deepmerge": "^4.0.0",
-        "glob": "^8.0.3"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/devtools/node_modules/@wdio/logger": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
-      "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/devtools/node_modules/@wdio/protocols": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
-      "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/devtools/node_modules/@wdio/types": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
-      "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "^18.0.0",
-        "got": "^11.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/devtools/node_modules/@wdio/utils": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
-      "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/logger": "7.19.0",
-        "@wdio/types": "7.25.4",
-        "p-iteration": "^1.1.8"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/devtools/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/devtools/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/devtools/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/devtools/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/devtools/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/devtools/node_modules/glob": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/devtools/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/devtools/node_modules/minimatch": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/devtools/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/devtools/node_modules/ua-parser-js": {
-      "version": "1.0.33",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.33.tgz",
-      "integrity": "sha512-RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/devtools/node_modules/uuid": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
-      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+      "version": "0.0.1260888",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1260888.tgz",
+      "integrity": "sha512-9rTIZ4ZjWwalCPiaY+kPiALLfOKgAz5CTi/Zb1L+qSZ8PH3zVo1T8JcgXIIqg1iM3pZ6hF+n9xO5r2jZ/SF+jg==",
       "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
+      "optional": true,
+      "peer": true
     },
     "node_modules/di": {
       "version": "0.0.1",
@@ -8490,21 +9199,21 @@
       "dev": true
     },
     "node_modules/diff": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "dev": true,
       "engines": {
         "node": ">=0.3.1"
       }
     },
     "node_modules/diff-sequences": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
-      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/dlv": {
@@ -8537,9 +9246,9 @@
       }
     },
     "node_modules/documentation": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.1.tgz",
-      "integrity": "sha512-Y/brACCE3sNnDJPFiWlhXrqGY+NelLYVZShLGse5bT1KdohP4JkPf5T2KNq1YWhIEbDYl/1tebRLC0WYbPQxVw==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.3.tgz",
+      "integrity": "sha512-B7cAviVKN9Rw7Ofd+9grhVuxiHwly6Ieh+d/ceMw8UdBOv/irkuwnDEJP8tq0wgdLJDUVuIkovV+AX9mTrZFxg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.18.10",
@@ -8607,9 +9316,9 @@
       }
     },
     "node_modules/documentation/node_modules/chalk": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
-      "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -8618,10 +9327,27 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/documentation/node_modules/find-up": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/documentation/node_modules/glob": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -8637,6 +9363,18 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/documentation/node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/documentation/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -8649,10 +9387,49 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/documentation/node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/documentation/node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/documentation/node_modules/locate-path": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/documentation/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/documentation/node_modules/minimatch": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -8661,10 +9438,147 @@
         "node": ">=10"
       }
     },
+    "node_modules/documentation/node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/documentation/node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/documentation/node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/documentation/node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/documentation/node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/documentation/node_modules/read-pkg": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
+      "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.1",
+        "normalize-package-data": "^3.0.2",
+        "parse-json": "^5.2.0",
+        "type-fest": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/documentation/node_modules/read-pkg-up": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz",
+      "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^6.3.0",
+        "read-pkg": "^7.1.0",
+        "type-fest": "^2.5.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/documentation/node_modules/semver": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/documentation/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/documentation/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/documentation/node_modules/yargs": {
-      "version": "17.6.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
-      "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "dependencies": {
         "cliui": "^8.0.1",
@@ -8673,7 +9587,7 @@
         "require-directory": "^2.1.1",
         "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^21.0.0"
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
         "node": ">=12"
@@ -8691,16 +9605,83 @@
         "void-elements": "^2.0.0"
       }
     },
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
     "node_modules/dom-walk": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
       "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
       "dev": true
     },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dotenv": {
+      "version": "16.4.5",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/dset": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
-      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.4.tgz",
+      "integrity": "sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==",
       "engines": {
         "node": ">=4"
       }
@@ -8745,21 +9726,21 @@
       "dev": true
     },
     "node_modules/duplexify": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
-      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz",
+      "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==",
       "dev": true,
       "dependencies": {
         "end-of-stream": "^1.4.1",
         "inherits": "^2.0.3",
         "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
+        "stream-shift": "^1.0.2"
       }
     },
     "node_modules/duplexify/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
@@ -8820,14 +9801,66 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "node_modules/ecc-jsbn/node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "dev": true
+    },
     "node_modules/edge-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-2.2.1.tgz",
-      "integrity": "sha512-AI5fC7dfDmCdKo3m5y7PkYE8m6bMqR6pvVpgtrZkkhcJXFLelUgkjrhk3kXXx8Kbw2cRaTT4LkOR7hqf39KJdw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-3.0.5.tgz",
+      "integrity": "sha512-sB7vSrDnFa4ezWQk9nZ/n0FdpdUuC6R1EOrlU3DL+bovcNFK28rqu2emmAUjujYEJTWIgQGqgVVWUZXMnc8iWg==",
       "dev": true,
       "dependencies": {
-        "@types/which": "^1.3.2",
+        "@types/which": "^2.0.1",
         "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/shirshak55"
+      }
+    },
+    "node_modules/edge-paths/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/edge-paths/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/edgedriver": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/edgedriver/-/edgedriver-5.6.1.tgz",
+      "integrity": "sha512-3Ve9cd5ziLByUdigw6zovVeWJjVs8QHVmqOB0sJ0WNeVPcwf4p18GnxMmVvlFmYRloUwf5suNuorea4QzwBIOA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@wdio/logger": "^8.38.0",
+        "@zip.js/zip.js": "^2.7.48",
+        "decamelize": "^6.0.0",
+        "edge-paths": "^3.0.5",
+        "fast-xml-parser": "^4.4.1",
+        "node-fetch": "^3.3.2",
+        "which": "^4.0.0"
+      },
+      "bin": {
+        "edgedriver": "bin/edgedriver.js"
       }
     },
     "node_modules/ee-first": {
@@ -8836,9 +9869,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/ejs": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
-      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "dev": true,
       "dependencies": {
         "jake": "^10.8.5"
@@ -8851,9 +9884,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.284",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
+      "version": "1.4.802",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz",
+      "integrity": "sha512-TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA=="
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
@@ -8874,10 +9907,36 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
     },
+    "node_modules/encoding-sniffer": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz",
+      "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.3",
+        "whatwg-encoding": "^3.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/encoding-sniffer?sponsor=1"
+      }
+    },
+    "node_modules/encoding-sniffer/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -8888,9 +9947,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
-      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
+      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
       "dev": true,
       "dependencies": {
         "@types/cookie": "^0.4.1",
@@ -8898,38 +9957,38 @@
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
-        "cookie": "~0.4.1",
+        "cookie": "~0.7.2",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=10.2.0"
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
-      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/engine.io/node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-      "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -8940,23 +9999,48 @@
       }
     },
     "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "dependencies": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8.6"
       }
     },
+    "node_modules/enquirer/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
       "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
       "dev": true
     },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -8988,35 +10072,57 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
         "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
         "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
         "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
+        "is-shared-array-buffer": "^1.0.3",
         "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
+        "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9025,38 +10131,84 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-get-iterator": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.1.0",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "is-arguments": "^1.1.1",
         "is-map": "^2.0.2",
         "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
+        "is-string": "^1.0.7",
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz",
+      "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==",
       "dev": true
     },
-    "node_modules/es-shim-unscopables": {
+    "node_modules/es-object-atoms": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "node_modules/es-to-primitive": {
@@ -9077,14 +10229,15 @@
       }
     },
     "node_modules/es5-ext": {
-      "version": "0.10.62",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
-      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+      "version": "0.10.64",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
+      "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
         "es6-iterator": "^2.0.3",
         "es6-symbol": "^3.1.3",
+        "esniff": "^2.0.1",
         "next-tick": "^1.1.0"
       },
       "engines": {
@@ -9111,17 +10264,10 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "node_modules/es6-object-assign": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-      "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
-      "dev": true
-    },
     "node_modules/es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
     },
     "node_modules/es6-promisify": {
       "version": "5.0.0",
@@ -9133,13 +10279,16 @@
       }
     },
     "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz",
+      "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
       "dev": true,
       "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
+        "d": "^1.0.2",
+        "ext": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/es6-weak-map": {
@@ -9154,10 +10303,49 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "node_modules/esbuild": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz",
+      "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.23.1",
+        "@esbuild/android-arm": "0.23.1",
+        "@esbuild/android-arm64": "0.23.1",
+        "@esbuild/android-x64": "0.23.1",
+        "@esbuild/darwin-arm64": "0.23.1",
+        "@esbuild/darwin-x64": "0.23.1",
+        "@esbuild/freebsd-arm64": "0.23.1",
+        "@esbuild/freebsd-x64": "0.23.1",
+        "@esbuild/linux-arm": "0.23.1",
+        "@esbuild/linux-arm64": "0.23.1",
+        "@esbuild/linux-ia32": "0.23.1",
+        "@esbuild/linux-loong64": "0.23.1",
+        "@esbuild/linux-mips64el": "0.23.1",
+        "@esbuild/linux-ppc64": "0.23.1",
+        "@esbuild/linux-riscv64": "0.23.1",
+        "@esbuild/linux-s390x": "0.23.1",
+        "@esbuild/linux-x64": "0.23.1",
+        "@esbuild/netbsd-x64": "0.23.1",
+        "@esbuild/openbsd-arm64": "0.23.1",
+        "@esbuild/openbsd-x64": "0.23.1",
+        "@esbuild/sunos-x64": "0.23.1",
+        "@esbuild/win32-arm64": "0.23.1",
+        "@esbuild/win32-ia32": "0.23.1",
+        "@esbuild/win32-x64": "0.23.1"
+      }
+    },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "engines": {
         "node": ">=6"
       }
@@ -9341,13 +10529,14 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -9360,9 +10549,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz",
+      "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -9405,24 +10594,29 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz",
+      "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.9.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
@@ -9432,12 +10626,12 @@
       }
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
@@ -9452,11 +10646,63 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "48.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.5.0.tgz",
+      "integrity": "sha512-ukXPNpGby3KjCveCizIS8t1EbuJEHYEu/tBg8GCbn/YbHcXwphyvYCdvRZ/oMRfTscGSSzfsWoZ+ZkAP0/6YMQ==",
+      "dev": true,
+      "dependencies": {
+        "@es-joy/jsdoccomment": "~0.43.1",
+        "are-docs-informative": "^0.0.2",
+        "comment-parser": "1.4.1",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.5.0",
+        "parse-imports": "^2.1.0",
+        "semver": "^7.6.2",
+        "spdx-expression-parse": "^4.0.0",
+        "synckit": "^0.9.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/spdx-expression-parse": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+      "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
     },
     "node_modules/eslint-plugin-node": {
       "version": "11.1.0",
@@ -9479,9 +10725,9 @@
       }
     },
     "node_modules/eslint-plugin-node/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -9629,9 +10875,9 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -9653,13 +10899,10 @@
       }
     },
     "node_modules/eslint/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -9667,6 +10910,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/eslint/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/eslint/node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -9703,6 +10958,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/esniff": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
+      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/espree": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
@@ -9740,9 +11010,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -9844,6 +11114,15 @@
       "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
       "dev": true
     },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -9893,6 +11172,12 @@
         "node": ">=4.8"
       }
     },
+    "node_modules/execa/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
     "node_modules/execa/node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -9995,72 +11280,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/expand-brackets/node_modules/is-extendable": {
@@ -10091,96 +11321,52 @@
       }
     },
     "node_modules/expect": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
-      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "ansi-styles": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-regex-util": "^26.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/expect-webdriverio": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-2.0.2.tgz",
-      "integrity": "sha512-dst0tqP1aZ2p7TPmbatqoIQ+7hRTw+IeKNi830XxKhu2DNNe5vQ85i9ttf9rpXgbnUf91HxKcocn4G7A5bQxDA==",
-      "dev": true,
-      "dependencies": {
-        "expect": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2"
-      }
-    },
-    "node_modules/expect/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/expect/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/expect/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -10189,6 +11375,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/debug": {
@@ -10199,11 +11389,66 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/express/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/express/node_modules/send": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/express/node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
     "node_modules/ext": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
@@ -10213,12 +11458,6 @@
         "type": "^2.7.2"
       }
     },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-      "dev": true
-    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -10260,6 +11499,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/external-editor/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
     "node_modules/extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -10347,6 +11598,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/extract-zip/node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -10383,6 +11644,12 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "dev": true
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -10395,6 +11662,28 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "node_modules/fast-xml-parser": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
+      "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        }
+      ],
+      "dependencies": {
+        "strnum": "^1.0.5"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
     "node_modules/faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
@@ -10416,29 +11705,54 @@
         "pend": "~1.2.0"
       }
     },
-    "node_modules/fibers": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.3.tgz",
-      "integrity": "sha512-/qYTSoZydQkM21qZpGLDLuCq8c+B8KhuCQ1kLPvnRNhxhVbvrpmH9l2+Lblf5neDuEsY4bfT7LeO553TXQDvJw==",
+    "node_modules/fecha": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
+      "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==",
+      "dev": true
+    },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
       "dev": true,
-      "hasInstallScript": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
       "dependencies": {
-        "detect-libc": "^1.0.3"
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": "^12.20 || >= 14.13"
+      }
+    },
+    "node_modules/fetch-blob/node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
       }
     },
     "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz",
+      "integrity": "sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==",
       "dev": true,
       "dependencies": {
-        "escape-string-regexp": "^1.0.5"
+        "is-unicode-supported": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -10482,9 +11796,9 @@
       }
     },
     "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -10494,9 +11808,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -10506,12 +11820,12 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -10530,6 +11844,14 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/finalhandler/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -10710,15 +12032,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/findup-sync/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/findup-sync/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -10803,12 +12116,13 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "dev": true,
       "dependencies": {
-        "flatted": "^3.1.0",
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
         "rimraf": "^3.0.2"
       },
       "engines": {
@@ -10816,9 +12130,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
       "dev": true
     },
     "node_modules/flush-write-stream": {
@@ -10832,9 +12146,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true,
       "funding": [
         {
@@ -10887,6 +12201,34 @@
       "integrity": "sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==",
       "dev": true
     },
+    "node_modules/foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -10916,6 +12258,31 @@
         "node": ">= 0.12"
       }
     },
+    "node_modules/formdata-node": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-5.0.1.tgz",
+      "integrity": "sha512-8xnIjMYGKPj+rY2BTbAmpqVpi8der/2FT4d9f7J32FlsCpO5EzZPq3C/N56zdv8KweHzVF6TGijsS1JT6r1H2g==",
+      "dev": true,
+      "dependencies": {
+        "node-domexception": "1.0.0",
+        "web-streams-polyfill": "4.0.0-beta.3"
+      },
+      "engines": {
+        "node": ">= 14.17"
+      }
+    },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dev": true,
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -10950,24 +12317,33 @@
       "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
       "dev": true
     },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
     "node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
+      "integrity": "sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==",
       "dev": true,
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "jsonfile": "~1.0.1",
+        "mkdirp": "0.3.x",
+        "ncp": "~0.4.2",
+        "rimraf": "~2.2.0"
+      }
+    },
+    "node_modules/fs-extra/node_modules/mkdirp": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+      "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true
+    },
+    "node_modules/fs-extra/node_modules/rimraf": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+      "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "bin": {
+        "rimraf": "bin.js"
       }
     },
     "node_modules/fs-mkdirp-stream": {
@@ -10993,6 +12369,14 @@
         "xtend": "~4.0.1"
       }
     },
+    "node_modules/fs-readfile-promise": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-3.0.1.tgz",
+      "integrity": "sha512-LsSxMeaJdYH27XrW7Dmq0Gx63mioULCRel63B5VeELYLavi1wF5s0XfsIdKDFdCL9hsfQ2qBvXJszQtQJ9h17A==",
+      "dependencies": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
     "node_modules/fs.extra": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz",
@@ -11007,24 +12391,6 @@
         "node": "*"
       }
     },
-    "node_modules/fs.extra/node_modules/fs-extra": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
-      "integrity": "sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==",
-      "dev": true,
-      "dependencies": {
-        "jsonfile": "~1.0.1",
-        "mkdirp": "0.3.x",
-        "ncp": "~0.4.2",
-        "rimraf": "~2.2.0"
-      }
-    },
-    "node_modules/fs.extra/node_modules/jsonfile": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
-      "integrity": "sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==",
-      "dev": true
-    },
     "node_modules/fs.extra/node_modules/mkdirp": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
@@ -11032,15 +12398,6 @@
       "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
       "dev": true
     },
-    "node_modules/fs.extra/node_modules/rimraf": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-      "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
-      "dev": true,
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -11048,9 +12405,9 @@
       "dev": true
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -11064,6 +12421,7 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
       "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "deprecated": "This package is no longer supported.",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.1.2",
@@ -11075,22 +12433,32 @@
         "node": ">=0.6"
       }
     },
-    "node_modules/fstream/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+    "node_modules/fstream/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.6"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/fstream/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
@@ -11108,20 +12476,23 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11157,6 +12528,68 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/geckodriver": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-4.4.1.tgz",
+      "integrity": "sha512-nnAdIrwLkMcDu4BitWXF23pEMeZZ0Cj7HaWWFdSpeedBP9z6ft150JYiGO2mwzw6UiR823Znk1JeIf07RyzloA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@wdio/logger": "^8.28.0",
+        "@zip.js/zip.js": "^2.7.44",
+        "decamelize": "^6.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.4",
+        "node-fetch": "^3.3.2",
+        "tar-fs": "^3.0.6",
+        "which": "^4.0.0"
+      },
+      "bin": {
+        "geckodriver": "bin/geckodriver.js"
+      },
+      "engines": {
+        "node": "^16.13 || >=18 || >=20"
+      }
+    },
+    "node_modules/geckodriver/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/geckodriver/node_modules/https-proxy-agent": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/geckodriver/node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
+      },
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -11175,22 +12608,27 @@
       }
     },
     "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -11206,12 +12644,12 @@
       }
     },
     "node_modules/get-port": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
-      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-7.1.0.tgz",
+      "integrity": "sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -11230,13 +12668,14 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11245,6 +12684,68 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-tsconfig": {
+      "version": "4.7.6",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.6.tgz",
+      "integrity": "sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==",
+      "dev": true,
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
+    "node_modules/get-uri": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
+      "dev": true,
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.2.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/get-uri/node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/get-uri/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/get-uri/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "node_modules/get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -11263,6 +12764,15 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "node_modules/git-repo-info": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/git-repo-info/-/git-repo-info-2.1.1.tgz",
+      "integrity": "sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
     "node_modules/git-up": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz",
@@ -11274,14 +12784,29 @@
       }
     },
     "node_modules/git-url-parse": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz",
-      "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==",
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.1.tgz",
+      "integrity": "sha512-PCFJyeSSdtnbfhSNRw9Wk96dDCNx+sogTe4YNXeXSJxt7xz5hvXekuRn9JX7m+Mf4OscCu8h+mtAl3+h5Fo8lQ==",
       "dev": true,
       "dependencies": {
         "git-up": "^7.0.0"
       }
     },
+    "node_modules/gitconfiglocal": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz",
+      "integrity": "sha512-qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg==",
+      "dev": true,
+      "dependencies": {
+        "ini": "^1.3.2"
+      }
+    },
+    "node_modules/gitconfiglocal/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
     "node_modules/github-slugger": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz",
@@ -11289,20 +12814,20 @@
       "dev": true
     },
     "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": "*"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -11341,6 +12866,27 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/glob-stream/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/glob-stream/node_modules/glob-parent": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -11452,7 +12998,6 @@
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
       "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
       "dev": true,
       "dependencies": {
         "anymatch": "^2.0.0",
@@ -11502,7 +13047,7 @@
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
@@ -11578,25 +13123,25 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+    "node_modules/glob-watcher/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
-        "isobject": "^3.0.1"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+    "node_modules/glob-watcher/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "isobject": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -11651,15 +13196,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/glob-watcher/node_modules/readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -11687,6 +13223,30 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/global": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
@@ -11733,6 +13293,12 @@
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
+    "node_modules/global-prefix/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
     "node_modules/global-prefix/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -11759,6 +13325,22 @@
       "integrity": "sha512-qpPnUKkWnz8NESjrCvnlGklsgiQzlq+rcCxoG5uNQ+dNA7cFMCmn231slLAwS2N/PlkzZ3COL8CcS10jXmLHqg==",
       "dev": true
     },
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/globule": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz",
@@ -11777,6 +13359,7 @@
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
       "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -11817,36 +13400,21 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/got": {
-      "version": "11.8.5",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
-      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
-      "dev": true,
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.2",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
+        "get-intrinsic": "^1.1.3"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "node_modules/grapheme-splitter": {
       "version": "1.0.4",
@@ -11854,15 +13422,6 @@
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
       "dev": true
     },
-    "node_modules/growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.x"
-      }
-    },
     "node_modules/gulp": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
@@ -11897,10 +13456,32 @@
         "node": ">=0.9"
       }
     },
+    "node_modules/gulp-clean/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/gulp-clean/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
@@ -12227,117 +13808,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/gulp-connect/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/gulp-connect/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/gulp-connect/node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
-      "dev": true
-    },
-    "node_modules/gulp-connect/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/gulp-connect/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/gulp-connect/node_modules/mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      }
-    },
-    "node_modules/gulp-connect/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/gulp-connect/node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/gulp-connect/node_modules/send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/gulp-connect/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "node_modules/gulp-connect/node_modules/statuses": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/gulp-eslint": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz",
@@ -12361,15 +13831,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-eslint/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/gulp-eslint/node_modules/arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -12397,6 +13858,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/gulp-eslint/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -12521,18 +13991,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/gulp-eslint/node_modules/eslint/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/gulp-eslint/node_modules/espree": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
@@ -12560,6 +14018,21 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/gulp-eslint/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -12592,6 +14065,27 @@
       "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
       "dev": true
     },
+    "node_modules/gulp-eslint/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/globals": {
       "version": "12.4.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
@@ -12671,6 +14165,18 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/gulp-eslint/node_modules/inquirer/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -12680,6 +14186,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/gulp-eslint/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
     "node_modules/gulp-eslint/node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -12693,17 +14205,11 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/gulp-eslint/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
+    "node_modules/gulp-eslint/node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
     },
     "node_modules/gulp-eslint/node_modules/optionator": {
       "version": "0.8.3",
@@ -12768,6 +14274,7 @@
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
       "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
@@ -12776,6 +14283,27 @@
         "rimraf": "bin.js"
       }
     },
+    "node_modules/gulp-eslint/node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -12811,6 +14339,27 @@
         "node": ">=6"
       }
     },
+    "node_modules/gulp-eslint/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -12864,18 +14413,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/gulp-eslint/node_modules/table/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/gulp-eslint/node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -12982,13 +14519,22 @@
         "minimatch": "^3.0.3"
       }
     },
+    "node_modules/gulp-rename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
+      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/gulp-replace": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz",
-      "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.4.tgz",
+      "integrity": "sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^14.14.41",
+        "@types/node": "*",
         "@types/vinyl": "^2.0.4",
         "istextorbinary": "^3.0.0",
         "replacestream": "^4.0.3",
@@ -12998,12 +14544,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/gulp-replace/node_modules/@types/node": {
-      "version": "14.18.33",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz",
-      "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==",
-      "dev": true
-    },
     "node_modules/gulp-shell": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.8.0.tgz",
@@ -13190,6 +14730,12 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/gulp-sourcemaps/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
     "node_modules/gulp-sourcemaps/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -13442,6 +14988,89 @@
         "node": ">= 0.9"
       }
     },
+    "node_modules/gulp-wrap": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/gulp-wrap/-/gulp-wrap-0.15.0.tgz",
+      "integrity": "sha512-f17zkGObA+hE/FThlg55gfA0nsXbdmHK1WqzjjB2Ytq1TuhLR7JiCBJ3K4AlMzCyoFaCjfowos+VkToUNE0WTQ==",
+      "dependencies": {
+        "consolidate": "^0.15.1",
+        "es6-promise": "^4.2.6",
+        "fs-readfile-promise": "^3.0.1",
+        "js-yaml": "^3.13.0",
+        "lodash": "^4.17.11",
+        "node.extend": "2.0.2",
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.1",
+        "tryit": "^1.0.1",
+        "vinyl-bufferstream": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6.14",
+        "npm": ">=1.4.3"
+      }
+    },
+    "node_modules/gulp-wrap/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-wrap/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-wrap/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-wrap/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-wrap/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-wrap/node_modules/through2": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "2 || 3"
+      }
+    },
     "node_modules/gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
@@ -13470,13 +15099,13 @@
       }
     },
     "node_modules/handlebars": {
-      "version": "4.7.7",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
-      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+      "version": "4.7.8",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.5",
-        "neo-async": "^2.6.0",
+        "neo-async": "^2.6.2",
         "source-map": "^0.6.1",
         "wordwrap": "^1.0.0"
       },
@@ -13523,12 +15152,9 @@
       }
     },
     "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -13584,12 +15210,22 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -13607,12 +15243,12 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13690,14 +15326,66 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hast-util-is-element": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
-      "integrity": "sha512-thjnlGAnwP8ef/GSO1Q8BfVk2gundnc2peGQqEg2kUt/IqesiGg/5mSwN2fE7nLzy61pg88NG6xV+UrGOrx9EA==",
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hast-util-from-parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-7.1.2.tgz",
+      "integrity": "sha512-Nz7FfPBuljzsN3tCQ4kCBKqdNhQE2l0Tn+X1ubgKBPRoiDIu1mL08Cfw4k7q71+Duyaw7DXDN+VTAp4Vh3oCOw==",
       "dev": true,
       "dependencies": {
         "@types/hast": "^2.0.0",
-        "@types/unist": "^2.0.0"
+        "@types/unist": "^2.0.0",
+        "hastscript": "^7.0.0",
+        "property-information": "^6.0.0",
+        "vfile": "^5.0.0",
+        "vfile-location": "^4.0.0",
+        "web-namespaces": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-parse-selector": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-3.1.1.tgz",
+      "integrity": "sha512-jdlwBjEexy1oGz0aJ2f4GKMaVKkA9jwjr4MjAAI22E5fM/TXVZHuS5OpONtdeIkRKqAaryQ2E9xNQxijoThSZA==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-7.2.3.tgz",
+      "integrity": "sha512-RujVQfVsOrxzPOPSzZFiwofMArbQke6DJjnFfceiEbFh7S05CbPt0cYN+A5YeD3pso0JQk6O1aHBnx9+Pm2uqg==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0",
+        "@types/parse5": "^6.0.0",
+        "hast-util-from-parse5": "^7.0.0",
+        "hast-util-to-parse5": "^7.0.0",
+        "html-void-elements": "^2.0.0",
+        "parse5": "^6.0.0",
+        "unist-util-position": "^4.0.0",
+        "unist-util-visit": "^4.0.0",
+        "vfile": "^5.0.0",
+        "web-namespaces": "^2.0.0",
+        "zwitch": "^2.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -13705,9 +15393,9 @@
       }
     },
     "node_modules/hast-util-sanitize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-4.0.0.tgz",
-      "integrity": "sha512-pw56+69jq+QSr/coADNvWTmBPDy+XsmwaF5KnUys4/wM1jt/fZdl7GPxhXXXYdXnz3Gj3qMkbUCH2uKjvX0MgQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-4.1.0.tgz",
+      "integrity": "sha512-Hd9tU0ltknMGRDv+d6Ro/4XKzBqQnP/EZrpiTbpFYfXv/uOhWeKc+2uajcbEvAEH98VZd7eII2PiXm13RihnLw==",
       "dev": true,
       "dependencies": {
         "@types/hast": "^2.0.0"
@@ -13718,21 +15406,40 @@
       }
     },
     "node_modules/hast-util-to-html": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-8.0.3.tgz",
-      "integrity": "sha512-/D/E5ymdPYhHpPkuTHOUkSatxr4w1ZKrZsG0Zv/3C2SRVT0JFJG53VS45AMrBtYk0wp5A7ksEhiC8QaOZM95+A==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-8.0.4.tgz",
+      "integrity": "sha512-4tpQTUOr9BMjtYyNlt0P50mH7xj0Ks2xpo8M943Vykljf99HW6EzulIoJP1N3eKOSScEHzyzi9dm7/cn0RfGwA==",
       "dev": true,
       "dependencies": {
         "@types/hast": "^2.0.0",
+        "@types/unist": "^2.0.0",
         "ccount": "^2.0.0",
         "comma-separated-tokens": "^2.0.0",
-        "hast-util-is-element": "^2.0.0",
+        "hast-util-raw": "^7.0.0",
         "hast-util-whitespace": "^2.0.0",
         "html-void-elements": "^2.0.0",
         "property-information": "^6.0.0",
         "space-separated-tokens": "^2.0.0",
-        "stringify-entities": "^4.0.2",
-        "unist-util-is": "^5.0.0"
+        "stringify-entities": "^4.0.0",
+        "zwitch": "^2.0.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-to-parse5": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-7.1.0.tgz",
+      "integrity": "sha512-YNRgAJkH2Jky5ySkIqFXTQiaqcAtJyVE+D5lkN6CdtOqrnkLfGYYrEcKuHOJZlp+MwjSwuD3fZuawI+sic/RBw==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "web-namespaces": "^2.0.0",
+        "zwitch": "^2.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -13740,10 +15447,27 @@
       }
     },
     "node_modules/hast-util-whitespace": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz",
-      "integrity": "sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz",
+      "integrity": "sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hastscript": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-7.2.0.tgz",
+      "integrity": "sha512-TtYPq24IldU8iKoJQqvZOuhi5CyCQRAbvDOX0x1eW6rsHSxa/1i2CCiptNTotGHJ3VoHRGmqiv6/D3q113ikkw==",
       "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-parse-selector": "^3.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
@@ -13758,28 +15482,21 @@
         "he": "bin/he"
       }
     },
+    "node_modules/headers-utils": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/headers-utils/-/headers-utils-1.2.5.tgz",
+      "integrity": "sha512-DAzV5P/pk3wTU/8TLZN+zFTDv4Xa1QDTU8pRvovPetcOMbmqq8CwsAvZBLPZHH6usxyy31zMp7I4aCYb6XIf6w==",
+      "dev": true
+    },
     "node_modules/highlight.js": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz",
-      "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
+      "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==",
       "dev": true,
       "engines": {
         "node": ">=12.0.0"
       }
     },
-    "node_modules/home-or-tmp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
-      "dev": true,
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/homedir-polyfill": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
@@ -13793,15 +15510,24 @@
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
+        "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
+      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "dev": true,
+      "engines": {
+        "node": "14 || >=16.14"
       }
     },
     "node_modules/html-escaper": {
@@ -13820,12 +15546,31 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+    "node_modules/htmlfy": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/htmlfy/-/htmlfy-0.2.1.tgz",
+      "integrity": "sha512-HoomFHQ3av1uhq+7FxJTq4Ns0clAD+tGbQNrSd0WFY3UAjjUk6G3LaWEqdgmIXYkY4pexZiyZ3ykZJhQlM0J5A==",
       "dev": true
     },
+    "node_modules/htmlparser2": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
+      "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.1.0",
+        "entities": "^4.5.0"
+      }
+    },
     "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -13861,6 +15606,31 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/http-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -13876,19 +15646,6 @@
         "npm": ">=1.3.7"
       }
     },
-    "node_modules/http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-      "dev": true,
-      "dependencies": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      }
-    },
     "node_modules/https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
@@ -13902,6 +15659,15 @@
         "node": ">= 6"
       }
     },
+    "node_modules/human-signals": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.0.tgz",
+      "integrity": "sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -13942,6 +15708,12 @@
         "node": ">= 4"
       }
     },
+    "node_modules/immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+      "dev": true
+    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -13967,6 +15739,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/import-meta-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
+      "integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -13976,15 +15758,6 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/indent-string": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-      "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/individual": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
@@ -13995,6 +15768,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "dependencies": {
         "once": "^1.3.0",
@@ -14016,124 +15790,31 @@
       }
     },
     "node_modules/inquirer": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.5.tgz",
-      "integrity": "sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==",
+      "version": "10.1.8",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-10.1.8.tgz",
+      "integrity": "sha512-syxGpOzLyqVeZi1KDBjRTnCn5PiGWySGHP0BbqXbqsEK0ckkZk3egAepEWslUjZXj0rhkUapVXM/IpADWe4D6w==",
       "dev": true,
       "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/inquirer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inquirer/node_modules/rxjs": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "@inquirer/prompts": "^5.3.8",
+        "@inquirer/type": "^1.5.2",
+        "@types/mute-stream": "^0.0.4",
+        "ansi-escapes": "^4.3.2",
+        "mute-stream": "^1.0.0",
+        "run-async": "^3.0.0",
+        "rxjs": "^7.8.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/inquirer/node_modules/tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
-      "dev": true
-    },
     "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       },
       "engines": {
@@ -14149,15 +15830,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "node_modules/invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
@@ -14167,6 +15839,25 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/ip-address/node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true
+    },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -14175,6 +15866,14 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/is": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
+      "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
@@ -14189,24 +15888,15 @@
       }
     },
     "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "hasown": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.10"
       }
     },
     "node_modules/is-arguments": {
@@ -14225,6 +15915,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -14307,35 +16013,44 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "hasown": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
       "dev": true,
+      "dependencies": {
+        "is-typed-array": "^1.1.13"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-date-object": {
@@ -14354,26 +16069,16 @@
       }
     },
     "node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/is-docker": {
@@ -14395,7 +16100,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
@@ -14407,7 +16111,6 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -14424,18 +16127,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -14478,20 +16169,14 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -14522,9 +16207,9 @@
       }
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -14619,21 +16304,27 @@
       "dev": true
     },
     "node_modules/is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -14688,16 +16379,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-      "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
-        "for-each": "^0.3.3",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14725,12 +16412,12 @@
       }
     },
     "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
+      "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -14752,10 +16439,13 @@
       }
     },
     "node_modules/is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -14773,13 +16463,16 @@
       }
     },
     "node_modules/is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
+      "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -14825,16 +16518,18 @@
       }
     },
     "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
     },
     "node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14872,9 +16567,9 @@
       }
     },
     "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -14897,17 +16592,17 @@
       }
     },
     "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
+        "make-dir": "^4.0.0",
         "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-report/node_modules/has-flag": {
@@ -14919,6 +16614,33 @@
         "node": ">=8"
       }
     },
+    "node_modules/istanbul-lib-report/node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/semver": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/istanbul-lib-report/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -14955,9 +16677,9 @@
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
@@ -14971,6 +16693,7 @@
       "version": "5.0.15",
       "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
       "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "inflight": "^1.0.4",
@@ -14992,17 +16715,11 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/istanbul/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
+    "node_modules/istanbul/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
     },
     "node_modules/istanbul/node_modules/resolve": {
       "version": "1.1.7",
@@ -15050,16 +16767,31 @@
         "url": "https://bevry.me/fund"
       }
     },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/jake": {
-      "version": "10.8.5",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz",
+      "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==",
       "dev": true,
       "dependencies": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
       },
       "bin": {
         "jake": "bin/cli.js"
@@ -15084,9 +16816,9 @@
       }
     },
     "node_modules/jake/node_modules/async": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
       "dev": true
     },
     "node_modules/jake/node_modules/chalk": {
@@ -15145,18 +16877,18 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-diff/node_modules/ansi-styles": {
@@ -15230,27 +16962,27 @@
       }
     },
     "node_modules/jest-get-type": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "dev": true,
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
-      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
@@ -15324,23 +17056,23 @@
       }
     },
     "node_modules/jest-message-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
-      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.6.2",
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.2"
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-message-util/node_modules/ansi-styles": {
@@ -15422,13 +17154,91 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-regex-util": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/jest-worker": {
@@ -15469,14 +17279,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/js-cookie": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
-      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -15486,7 +17288,6 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -15499,7 +17300,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -15509,11 +17309,20 @@
       }
     },
     "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
       "dev": true
     },
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -15532,10 +17341,13 @@
       "dev": true
     },
     "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
@@ -15562,9 +17374,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -15573,16 +17385,10 @@
       }
     },
     "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
+      "integrity": "sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==",
+      "dev": true
     },
     "node_modules/jsprim": {
       "version": "1.4.2",
@@ -15599,10 +17405,17 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/just-clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
-      "integrity": "sha512-p93GINPwrve0w3HUzpXmpTl7MyzzWz1B5ag44KEtq/hP1mtK8lA2b9Q0VQaPlnY87352osJcE6uBmN0e8kuFMw=="
+    "node_modules/jszip": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+      "dev": true,
+      "dependencies": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "^1.0.5"
+      }
     },
     "node_modules/just-debounce": {
       "version": "1.1.0",
@@ -15617,9 +17430,9 @@
       "dev": true
     },
     "node_modules/karma": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz",
-      "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==",
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz",
+      "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==",
       "dev": true,
       "dependencies": {
         "@colors/colors": "1.5.0",
@@ -15641,7 +17454,7 @@
         "qjobs": "^1.2.0",
         "range-parser": "^1.2.1",
         "rimraf": "^3.0.2",
-        "socket.io": "^4.4.1",
+        "socket.io": "^4.7.2",
         "source-map": "^0.6.1",
         "tmp": "^0.2.1",
         "ua-parser-js": "^0.7.30",
@@ -15691,14 +17504,20 @@
       }
     },
     "node_modules/karma-chrome-launcher": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz",
-      "integrity": "sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz",
+      "integrity": "sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==",
       "dev": true,
       "dependencies": {
         "which": "^1.2.1"
       }
     },
+    "node_modules/karma-chrome-launcher/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
     "node_modules/karma-chrome-launcher/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -15712,9 +17531,9 @@
       }
     },
     "node_modules/karma-coverage": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.0.tgz",
-      "integrity": "sha512-gPVdoZBNDZ08UCzdMHHhEImKrw1+PAOQOIiffv1YsvxFhBjqvo/SVXNk4tqn1SYqX0BJZT6S/59zgxiBe+9OuA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.1.tgz",
+      "integrity": "sha512-yj7hbequkQP2qOSb20GuNSIyE//PgJWHwC2IydLE6XRtsnaflv+/OSGNssPjobYUlhVVagy99TQpqUt3vAUG7A==",
       "dev": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.2.0",
@@ -15744,6 +17563,27 @@
         "url": "https://github.com/sponsors/mattlewis92"
       }
     },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/karma-coverage-istanbul-reporter/node_modules/istanbul-lib-source-maps": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
@@ -15795,6 +17635,7 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
@@ -15831,13 +17672,34 @@
       }
     },
     "node_modules/karma-firefox-launcher": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.2.tgz",
-      "integrity": "sha512-VV9xDQU1QIboTrjtGVD4NCfzIH7n01ZXqy/qpBhnOeGVOkG5JYPEm8kuSd7psHE6WouZaQ9Ool92g8LFweSNMA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.3.tgz",
+      "integrity": "sha512-LMM2bseebLbYjODBOVt7TCPP9OI2vZIXCavIXhkO9m+10Uj5l7u/SKoeRmYx8FYHTVGZSpk6peX+3BMHC1WwNw==",
       "dev": true,
       "dependencies": {
         "is-wsl": "^2.2.0",
-        "which": "^2.0.1"
+        "which": "^3.0.0"
+      }
+    },
+    "node_modules/karma-firefox-launcher/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/karma-firefox-launcher/node_modules/which": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/karma-ie-launcher": {
@@ -15958,22 +17820,94 @@
       }
     },
     "node_modules/karma-webpack": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz",
-      "integrity": "sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.1.tgz",
+      "integrity": "sha512-oo38O+P3W2mSPCSUrQdySSPv1LvPpXP+f+bBimNomS5sW+1V4SuhCuW8TfJzV+rDv921w2fDSDw0xJbPe6U+kQ==",
       "dev": true,
       "dependencies": {
         "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
+        "minimatch": "^9.0.3",
         "webpack-merge": "^4.1.5"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 18"
       },
       "peerDependencies": {
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/karma-webpack/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/karma-webpack/node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/karma-webpack/node_modules/minimatch": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/karma-webpack/node_modules/minimatch/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/karma/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/karma/node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -15985,16 +17919,43 @@
         "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/karma/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+    "node_modules/karma/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.6"
+        "color-name": "~1.1.4"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/karma/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/karma/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/karma/node_modules/source-map": {
@@ -16006,16 +17967,33 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/karma/node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+    "node_modules/karma/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "dependencies": {
-        "rimraf": "^3.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
-        "node": ">=8.17.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/karma/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/karma/node_modules/yargs": {
@@ -16052,18 +18030,18 @@
       "dev": true
     },
     "node_modules/keyv": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.0.tgz",
-      "integrity": "sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
       "dependencies": {
         "json-buffer": "3.0.1"
       }
     },
     "node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -16078,6 +18056,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/klona": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/konan": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/konan/-/konan-2.1.1.tgz",
@@ -16088,18 +18074,6 @@
         "@babel/traverse": "^7.10.5"
       }
     },
-    "node_modules/ky": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/ky/-/ky-0.29.0.tgz",
-      "integrity": "sha512-01TBSOqlHmLfcQhHseugGHLxPtU03OyZWaLDWt5MfzCkijG6xWFvAQPhKVn0cR2MMjYvBP9keQ8A3+rQEhLO5g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/ky?sponsor=1"
-      }
-    },
     "node_modules/last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -16171,6 +18145,15 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dev": true,
+      "dependencies": {
+        "immediate": "~3.0.5"
+      }
+    },
     "node_modules/liftoff": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
@@ -16202,37 +18185,15 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/lighthouse-logger": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz",
-      "integrity": "sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "marky": "^1.2.2"
-      }
-    },
-    "node_modules/lighthouse-logger/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/lines-and-columns": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz",
+      "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==",
       "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
-    "node_modules/lighthouse-logger/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
     "node_modules/listenercount": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
@@ -16240,36 +18201,23 @@
       "dev": true
     },
     "node_modules/live-connect-common": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/live-connect-common/-/live-connect-common-3.0.0.tgz",
-      "integrity": "sha512-pa1SuzCg8ovsB6OziAQZpDid/OT8k37VgWFQkE8OUmG52Kf9PUtJM8wqaGdMXd/rNAe/NH8m+Kxx9MZuOvn5zg==",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/live-connect-handlers": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/live-connect-handlers/-/live-connect-handlers-2.1.0.tgz",
-      "integrity": "sha512-uABe9D6yRp7HRgO6vhdIM5j88l17/ROzYGIOHc2Rv1TacLFH6IJ8sbmunY5mIJ9L6ArOVmL4WHY+QgOIkabhxg==",
-      "dependencies": {
-        "js-cookie": "^3.0.5",
-        "live-connect-common": "^3.0.0"
-      },
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/live-connect-common/-/live-connect-common-4.1.0.tgz",
+      "integrity": "sha512-sRklgbe13377aR+G0qCBiZPayQw5oZZozkuxKEoyipxscLbVzwe9gtA7CPpbmo6UcOdQxdCE6A7J1tI0wTSmqw==",
       "engines": {
-        "node": ">=8"
+        "node": ">=20"
       }
     },
     "node_modules/live-connect-js": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-6.0.1.tgz",
-      "integrity": "sha512-+TwM7cjgyutqaMNlTQKNY9nJFDPpSWfoazSHmlWxOPlimp10PSZGABIbtulNGGpYbR/Zxgc+C/uW5OxqcNEPXg==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-7.1.0.tgz",
+      "integrity": "sha512-fFxvQjOsHkCjulWsbirjxb6Y8xuAoWdgYqZvBLoSVKry48IyvVnLfvWgJg66qENjxig+8RH9bvlE16I6hJ7J7Q==",
       "dependencies": {
-        "live-connect-common": "^3.0.0",
-        "live-connect-handlers": "^2.1.0",
+        "live-connect-common": "^v4.1.0",
         "tiny-hashes": "1.0.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/livereload-js": {
@@ -16350,6 +18298,39 @@
         "node": ">=8.9.0"
       }
     },
+    "node_modules/locate-app": {
+      "version": "2.4.15",
+      "resolved": "https://registry.npmjs.org/locate-app/-/locate-app-2.4.15.tgz",
+      "integrity": "sha512-oAGHATXPUHSQ74Om+3dXBRNYtCzU7Wzuhlj/WIZchqHb/5/TGJRzLEtHipMDOak0UZG9U365RMXyBzgV/fhOww==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://buymeacoffee.com/hejny"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/hejny/locate-app/blob/main/README.md#%EF%B8%8F-contributing"
+        }
+      ],
+      "dependencies": {
+        "@promptbook/utils": "0.50.0-10",
+        "type-fest": "2.13.0",
+        "userhome": "1.0.0"
+      }
+    },
+    "node_modules/locate-app/node_modules/type-fest": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.0.tgz",
+      "integrity": "sha512-lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -16365,8 +18346,7 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash._basecopy": {
       "version": "3.0.1",
@@ -16439,18 +18419,6 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "node_modules/lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true
-    },
-    "node_modules/lodash.difference": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
-      "dev": true
-    },
     "node_modules/lodash.escape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
@@ -16460,12 +18428,6 @@
         "lodash._root": "^3.0.0"
       }
     },
-    "node_modules/lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true
-    },
     "node_modules/lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
@@ -16490,16 +18452,10 @@
       "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
       "dev": true
     },
-    "node_modules/lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==",
-      "dev": true
-    },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
       "dev": true
     },
     "node_modules/lodash.keys": {
@@ -16596,25 +18552,51 @@
       }
     },
     "node_modules/log4js": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
-      "integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
+      "integrity": "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==",
       "dev": true,
       "dependencies": {
         "date-format": "^4.0.14",
         "debug": "^4.3.4",
         "flatted": "^3.2.7",
         "rfdc": "^1.3.0",
-        "streamroller": "^3.1.3"
+        "streamroller": "^3.1.5"
       },
       "engines": {
         "node": ">=8.0"
       }
     },
+    "node_modules/logform": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz",
+      "integrity": "sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==",
+      "dev": true,
+      "dependencies": {
+        "@colors/colors": "1.6.0",
+        "@types/triple-beam": "^1.3.2",
+        "fecha": "^4.2.0",
+        "ms": "^2.1.1",
+        "safe-stable-stringify": "^2.3.1",
+        "triple-beam": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
+    "node_modules/logform/node_modules/@colors/colors": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
+      "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
     "node_modules/loglevel": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz",
-      "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.1.tgz",
+      "integrity": "sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6.0"
@@ -16637,55 +18619,30 @@
       "dev": true
     },
     "node_modules/longest-streak": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.0.1.tgz",
-      "integrity": "sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
+      "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
       "dev": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
     "node_modules/loupe": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
-      "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
       "dev": true,
       "dependencies": {
-        "get-func-name": "^2.0.0"
-      }
-    },
-    "node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "get-func-name": "^2.0.1"
       }
     },
     "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "yallist": "^3.0.2"
       }
     },
     "node_modules/lru-queue": {
@@ -16698,9 +18655,9 @@
       }
     },
     "node_modules/m3u8-parser": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.1.tgz",
-      "integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.8.0.tgz",
+      "integrity": "sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
@@ -16709,13 +18666,12 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "version": "0.30.10",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
+      "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
       "dev": true,
-      "optional": true,
       "dependencies": {
-        "sourcemap-codec": "^1.4.8"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       }
     },
     "node_modules/make-dir": {
@@ -16745,15 +18701,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/make-iterator/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -16763,15 +18710,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
@@ -16791,21 +18729,15 @@
       }
     },
     "node_modules/markdown-table": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
-      "integrity": "sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.3.tgz",
+      "integrity": "sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==",
       "dev": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/marky": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
-      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
-      "dev": true
-    },
     "node_modules/matchdep": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
@@ -16978,15 +18910,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/matchdep/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/matchdep/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -17025,9 +18948,9 @@
       }
     },
     "node_modules/mdast-util-definitions": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
-      "integrity": "sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz",
+      "integrity": "sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -17040,11 +18963,12 @@
       }
     },
     "node_modules/mdast-util-find-and-replace": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz",
-      "integrity": "sha512-SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.2.tgz",
+      "integrity": "sha512-MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw==",
       "dev": true,
       "dependencies": {
+        "@types/mdast": "^3.0.0",
         "escape-string-regexp": "^5.0.0",
         "unist-util-is": "^5.0.0",
         "unist-util-visit-parents": "^5.0.0"
@@ -17067,9 +18991,9 @@
       }
     },
     "node_modules/mdast-util-from-markdown": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz",
-      "integrity": "sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz",
+      "integrity": "sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -17091,19 +19015,22 @@
       }
     },
     "node_modules/mdast-util-from-markdown/node_modules/mdast-util-to-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
-      "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz",
+      "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==",
       "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
     "node_modules/mdast-util-gfm": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.1.tgz",
-      "integrity": "sha512-42yHBbfWIFisaAfV1eixlabbsa6q7vHeSPY+cg+BBjX51M8xhgMacqH9g6TftB/9+YkcI0ooV4ncfrJslzm/RQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.2.tgz",
+      "integrity": "sha512-qvZ608nBppZ4icQlhQQIAdc6S3Ffj9RGmzwUKUWuEICFnd1LVkN3EktF7ZHAgfcEdvZB5owU9tQgt99e2TlLjg==",
       "dev": true,
       "dependencies": {
         "mdast-util-from-markdown": "^1.0.0",
@@ -17120,9 +19047,9 @@
       }
     },
     "node_modules/mdast-util-gfm-autolink-literal": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz",
-      "integrity": "sha512-FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.3.tgz",
+      "integrity": "sha512-My8KJ57FYEy2W2LyNom4n3E7hKTuQk/0SES0u16tjA9Z3oFkF4RrC/hPAPgjlSpezsOvI8ObcXcElo92wn5IGA==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -17136,9 +19063,9 @@
       }
     },
     "node_modules/mdast-util-gfm-footnote": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz",
-      "integrity": "sha512-p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.2.tgz",
+      "integrity": "sha512-56D19KOGbE00uKVj3sgIykpwKL179QsVFwx/DCW0u/0+URsryacI4MAdNJl0dh+u2PSsD9FtxPFbHCzJ78qJFQ==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -17151,9 +19078,9 @@
       }
     },
     "node_modules/mdast-util-gfm-strikethrough": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz",
-      "integrity": "sha512-zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.3.tgz",
+      "integrity": "sha512-DAPhYzTYrRcXdMjUtUjKvW9z/FNAMTdU0ORyMcbmkwYNbKocDpdk+PX1L1dQgOID/+vVs1uBQ7ElrBQfZ0cuiQ==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -17165,9 +19092,9 @@
       }
     },
     "node_modules/mdast-util-gfm-table": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.6.tgz",
-      "integrity": "sha512-uHR+fqFq3IvB3Rd4+kzXW8dmpxUhvgCQZep6KdjsLK4O6meK5dYZEayLtIxNus1XO3gfjfcIFe8a7L0HZRGgag==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.7.tgz",
+      "integrity": "sha512-jjcpmNnQvrmN5Vx7y7lEc2iIOEytYv7rTvu+MeyAsSHTASGCCRA79Igg2uKssgOs1i1po8s3plW0sTu1wkkLGg==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -17181,9 +19108,9 @@
       }
     },
     "node_modules/mdast-util-gfm-task-list-item": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz",
-      "integrity": "sha512-KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.2.tgz",
+      "integrity": "sha512-PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -17203,10 +19130,24 @@
         "mdast-util-to-string": "^1.0.0"
       }
     },
+    "node_modules/mdast-util-phrasing": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-3.0.1.tgz",
+      "integrity": "sha512-WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "unist-util-is": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/mdast-util-to-hast": {
-      "version": "12.2.4",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz",
-      "integrity": "sha512-a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg==",
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.3.0.tgz",
+      "integrity": "sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==",
       "dev": true,
       "dependencies": {
         "@types/hast": "^2.0.0",
@@ -17214,7 +19155,6 @@
         "mdast-util-definitions": "^5.0.0",
         "micromark-util-sanitize-uri": "^1.1.0",
         "trim-lines": "^3.0.0",
-        "unist-builder": "^3.0.0",
         "unist-util-generated": "^2.0.0",
         "unist-util-position": "^4.0.0",
         "unist-util-visit": "^4.0.0"
@@ -17225,14 +19165,15 @@
       }
     },
     "node_modules/mdast-util-to-markdown": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz",
-      "integrity": "sha512-6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.5.0.tgz",
+      "integrity": "sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
         "@types/unist": "^2.0.0",
         "longest-streak": "^3.0.0",
+        "mdast-util-phrasing": "^3.0.0",
         "mdast-util-to-string": "^3.0.0",
         "micromark-util-decode-string": "^1.0.0",
         "unist-util-visit": "^4.0.0",
@@ -17244,10 +19185,13 @@
       }
     },
     "node_modules/mdast-util-to-markdown/node_modules/mdast-util-to-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
-      "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz",
+      "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==",
       "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
@@ -17264,58 +19208,37 @@
       }
     },
     "node_modules/mdast-util-toc": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-6.1.0.tgz",
-      "integrity": "sha512-0PuqZELXZl4ms1sF7Lqigrqik4Ll3UhbI+jdTrfw7pZ9QPawgl7LD4GQ8MkU7bT/EwiVqChNTbifa2jLLKo76A==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-6.1.1.tgz",
+      "integrity": "sha512-Er21728Kow8hehecK2GZtb7Ny3omcoPUVrmObiSUwmoRYVZaXLR751QROEFjR8W/vAQdHMLj49Lz20J55XaNpw==",
       "dev": true,
       "dependencies": {
         "@types/extend": "^3.0.0",
-        "@types/github-slugger": "^1.0.0",
         "@types/mdast": "^3.0.0",
         "extend": "^3.0.0",
-        "github-slugger": "^1.0.0",
+        "github-slugger": "^2.0.0",
         "mdast-util-to-string": "^3.1.0",
         "unist-util-is": "^5.0.0",
-        "unist-util-visit": "^3.0.0"
+        "unist-util-visit": "^4.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/mdast-util-toc/node_modules/mdast-util-to-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
-      "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-toc/node_modules/unist-util-visit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-3.1.0.tgz",
-      "integrity": "sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0",
-        "unist-util-visit-parents": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
+    "node_modules/mdast-util-toc/node_modules/github-slugger": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz",
+      "integrity": "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==",
+      "dev": true
     },
-    "node_modules/mdast-util-toc/node_modules/unist-util-visit-parents": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz",
-      "integrity": "sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==",
+    "node_modules/mdast-util-toc/node_modules/mdast-util-to-string": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz",
+      "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==",
       "dev": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0"
+        "@types/mdast": "^3.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -17331,19 +19254,22 @@
       }
     },
     "node_modules/memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
+      "version": "0.4.17",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.17.tgz",
+      "integrity": "sha512-DGqD7Hjpi/1or4F/aYAspXKNm5Yili0QDAFAY4QYvpqpgiY6+1jOfqpmByzjxbWd/T9mChbCArXAbDAsTm5oXA==",
       "dev": true,
       "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
+        "d": "^1.0.2",
+        "es5-ext": "^0.10.64",
         "es6-weak-map": "^2.0.3",
         "event-emitter": "^0.3.5",
         "is-promise": "^2.2.2",
         "lru-queue": "^0.1.0",
         "next-tick": "^1.1.0",
         "timers-ext": "^0.1.7"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/memory-fs": {
@@ -17360,9 +19286,12 @@
       }
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
@@ -17379,9 +19308,9 @@
       }
     },
     "node_modules/micromark": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.1.0.tgz",
-      "integrity": "sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.2.0.tgz",
+      "integrity": "sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==",
       "dev": true,
       "funding": [
         {
@@ -17414,9 +19343,9 @@
       }
     },
     "node_modules/micromark-core-commonmark": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz",
-      "integrity": "sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz",
+      "integrity": "sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==",
       "dev": true,
       "funding": [
         {
@@ -17448,9 +19377,9 @@
       }
     },
     "node_modules/micromark-extension-gfm": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-2.0.1.tgz",
-      "integrity": "sha512-p2sGjajLa0iYiGQdT0oelahRYtMWvLjy8J9LOCxzIQsllMCGLbsLW+Nc+N4vi02jcRJvedVJ68cjelKIO6bpDA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-2.0.3.tgz",
+      "integrity": "sha512-vb9OoHqrhCmbRidQv/2+Bc6pkP0FrtlhurxZofvOEy5o8RtuuvTq+RQ1Vw5ZDNrVraQZu3HixESqbG+0iKk/MQ==",
       "dev": true,
       "dependencies": {
         "micromark-extension-gfm-autolink-literal": "^1.0.0",
@@ -17468,16 +19397,15 @@
       }
     },
     "node_modules/micromark-extension-gfm-autolink-literal": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.3.tgz",
-      "integrity": "sha512-i3dmvU0htawfWED8aHMMAzAVp/F0Z+0bPh3YrbTPPL1v4YAlCZpy5rBO5p0LPYiZo0zFVkoYh7vDU7yQSiCMjg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.5.tgz",
+      "integrity": "sha512-z3wJSLrDf8kRDOh2qBtoTRD53vJ+CWIyo7uyZuxf/JAbNJjiHsOpG1y5wxk8drtv3ETAHutCu6N3thkOOgueWg==",
       "dev": true,
       "dependencies": {
         "micromark-util-character": "^1.0.0",
         "micromark-util-sanitize-uri": "^1.0.0",
         "micromark-util-symbol": "^1.0.0",
-        "micromark-util-types": "^1.0.0",
-        "uvu": "^0.5.0"
+        "micromark-util-types": "^1.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -17485,9 +19413,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-footnote": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.4.tgz",
-      "integrity": "sha512-E/fmPmDqLiMUP8mLJ8NbJWJ4bTw6tS+FEQS8CcuDtZpILuOb2kjLqPEeAePF1djXROHXChM/wPJw0iS4kHCcIg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.1.2.tgz",
+      "integrity": "sha512-Yxn7z7SxgyGWRNa4wzf8AhYYWNrwl5q1Z8ii+CSTTIqVkmGZF1CElX2JI8g5yGoM3GAman9/PVCUFUSJ0kB/8Q==",
       "dev": true,
       "dependencies": {
         "micromark-core-commonmark": "^1.0.0",
@@ -17505,9 +19433,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-strikethrough": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.4.tgz",
-      "integrity": "sha512-/vjHU/lalmjZCT5xt7CcHVJGq8sYRm80z24qAKXzaHzem/xsDYb2yLL+NNVbYvmpLx3O7SYPuGL5pzusL9CLIQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.7.tgz",
+      "integrity": "sha512-sX0FawVE1o3abGk3vRjOH50L5TTLr3b5XMqnP9YDRb34M0v5OoZhG+OHFz1OffZ9dlwgpTBKaT4XW/AsUVnSDw==",
       "dev": true,
       "dependencies": {
         "micromark-util-chunked": "^1.0.0",
@@ -17523,9 +19451,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-table": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.5.tgz",
-      "integrity": "sha512-xAZ8J1X9W9K3JTJTUL7G6wSKhp2ZYHrFk5qJgY/4B33scJzE2kpfRL6oiw/veJTbt7jiM/1rngLlOKPWr1G+vg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.7.tgz",
+      "integrity": "sha512-3ZORTHtcSnMQEKtAOsBQ9/oHp9096pI/UvdPtN7ehKvrmZZ2+bbWhi0ln+I9drmwXMt5boocn6OlwQzNXeVeqw==",
       "dev": true,
       "dependencies": {
         "micromark-factory-space": "^1.0.0",
@@ -17540,9 +19468,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-tagfilter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.1.tgz",
-      "integrity": "sha512-Ty6psLAcAjboRa/UKUbbUcwjVAv5plxmpUTy2XC/3nJFL37eHej8jrHrRzkqcpipJliuBH30DTs7+3wqNcQUVA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.2.tgz",
+      "integrity": "sha512-5XWB9GbAUSHTn8VPU8/1DBXMuKYT5uOgEjJb8gN3mW0PNW5OPHpSdojoqf+iq1xo7vWzw/P8bAHY0n6ijpXF7g==",
       "dev": true,
       "dependencies": {
         "micromark-util-types": "^1.0.0"
@@ -17553,9 +19481,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-task-list-item": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.3.tgz",
-      "integrity": "sha512-PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.5.tgz",
+      "integrity": "sha512-RMFXl2uQ0pNQy6Lun2YBYT9g9INXtWJULgbt01D/x8/6yJ2qpKyzdZD3pi6UIkzF++Da49xAelVKUeUMqd5eIQ==",
       "dev": true,
       "dependencies": {
         "micromark-factory-space": "^1.0.0",
@@ -17570,9 +19498,9 @@
       }
     },
     "node_modules/micromark-factory-destination": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz",
-      "integrity": "sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz",
+      "integrity": "sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg==",
       "dev": true,
       "funding": [
         {
@@ -17591,9 +19519,9 @@
       }
     },
     "node_modules/micromark-factory-label": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz",
-      "integrity": "sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz",
+      "integrity": "sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w==",
       "dev": true,
       "funding": [
         {
@@ -17613,9 +19541,9 @@
       }
     },
     "node_modules/micromark-factory-space": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz",
-      "integrity": "sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz",
+      "integrity": "sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==",
       "dev": true,
       "funding": [
         {
@@ -17633,9 +19561,9 @@
       }
     },
     "node_modules/micromark-factory-title": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz",
-      "integrity": "sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz",
+      "integrity": "sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ==",
       "dev": true,
       "funding": [
         {
@@ -17651,14 +19579,13 @@
         "micromark-factory-space": "^1.0.0",
         "micromark-util-character": "^1.0.0",
         "micromark-util-symbol": "^1.0.0",
-        "micromark-util-types": "^1.0.0",
-        "uvu": "^0.5.0"
+        "micromark-util-types": "^1.0.0"
       }
     },
     "node_modules/micromark-factory-whitespace": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz",
-      "integrity": "sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz",
+      "integrity": "sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ==",
       "dev": true,
       "funding": [
         {
@@ -17678,9 +19605,9 @@
       }
     },
     "node_modules/micromark-util-character": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.1.0.tgz",
-      "integrity": "sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.2.0.tgz",
+      "integrity": "sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==",
       "dev": true,
       "funding": [
         {
@@ -17698,9 +19625,9 @@
       }
     },
     "node_modules/micromark-util-chunked": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz",
-      "integrity": "sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz",
+      "integrity": "sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ==",
       "dev": true,
       "funding": [
         {
@@ -17717,9 +19644,9 @@
       }
     },
     "node_modules/micromark-util-classify-character": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz",
-      "integrity": "sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz",
+      "integrity": "sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw==",
       "dev": true,
       "funding": [
         {
@@ -17738,9 +19665,9 @@
       }
     },
     "node_modules/micromark-util-combine-extensions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz",
-      "integrity": "sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz",
+      "integrity": "sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA==",
       "dev": true,
       "funding": [
         {
@@ -17758,9 +19685,9 @@
       }
     },
     "node_modules/micromark-util-decode-numeric-character-reference": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz",
-      "integrity": "sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz",
+      "integrity": "sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw==",
       "dev": true,
       "funding": [
         {
@@ -17777,9 +19704,9 @@
       }
     },
     "node_modules/micromark-util-decode-string": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz",
-      "integrity": "sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz",
+      "integrity": "sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ==",
       "dev": true,
       "funding": [
         {
@@ -17799,9 +19726,9 @@
       }
     },
     "node_modules/micromark-util-encode": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz",
-      "integrity": "sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz",
+      "integrity": "sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==",
       "dev": true,
       "funding": [
         {
@@ -17815,9 +19742,9 @@
       ]
     },
     "node_modules/micromark-util-html-tag-name": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz",
-      "integrity": "sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz",
+      "integrity": "sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q==",
       "dev": true,
       "funding": [
         {
@@ -17831,9 +19758,9 @@
       ]
     },
     "node_modules/micromark-util-normalize-identifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz",
-      "integrity": "sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz",
+      "integrity": "sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q==",
       "dev": true,
       "funding": [
         {
@@ -17850,9 +19777,9 @@
       }
     },
     "node_modules/micromark-util-resolve-all": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz",
-      "integrity": "sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz",
+      "integrity": "sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA==",
       "dev": true,
       "funding": [
         {
@@ -17869,9 +19796,9 @@
       }
     },
     "node_modules/micromark-util-sanitize-uri": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz",
-      "integrity": "sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz",
+      "integrity": "sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==",
       "dev": true,
       "funding": [
         {
@@ -17890,9 +19817,9 @@
       }
     },
     "node_modules/micromark-util-subtokenize": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz",
-      "integrity": "sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz",
+      "integrity": "sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A==",
       "dev": true,
       "funding": [
         {
@@ -17912,9 +19839,9 @@
       }
     },
     "node_modules/micromark-util-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz",
-      "integrity": "sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz",
+      "integrity": "sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==",
       "dev": true,
       "funding": [
         {
@@ -17928,9 +19855,9 @@
       ]
     },
     "node_modules/micromark-util-types": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.0.2.tgz",
-      "integrity": "sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz",
+      "integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==",
       "dev": true,
       "funding": [
         {
@@ -17944,12 +19871,12 @@
       ]
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -17996,15 +19923,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/min-document": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
@@ -18027,14 +19945,31 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -18049,15 +19984,15 @@
       }
     },
     "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
       "bin": {
         "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
       }
     },
     "node_modules/mkdirp-classic": {
@@ -18067,32 +20002,31 @@
       "dev": true
     },
     "node_modules/mocha": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
-      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
+      "version": "10.7.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
+      "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
       "dev": true,
       "dependencies": {
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.3",
-        "debug": "4.3.4",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.2.0",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "5.0.1",
-        "ms": "2.1.3",
-        "nanoid": "3.3.3",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "workerpool": "6.2.1",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
+        "ansi-colors": "^4.1.3",
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.5",
+        "diff": "^5.2.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^8.1.0",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^5.1.6",
+        "ms": "^2.1.3",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^6.5.1",
+        "yargs": "^16.2.0",
+        "yargs-parser": "^20.2.9",
+        "yargs-unparser": "^2.0.0"
       },
       "bin": {
         "_mocha": "bin/_mocha",
@@ -18100,19 +20034,6 @@
       },
       "engines": {
         "node": ">= 14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
-      }
-    },
-    "node_modules/mocha/node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
       }
     },
     "node_modules/mocha/node_modules/ansi-styles": {
@@ -18136,6 +20057,15 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
+    "node_modules/mocha/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/mocha/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -18193,15 +20123,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/mocha/node_modules/diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
     "node_modules/mocha/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -18231,37 +20152,25 @@
       }
     },
     "node_modules/mocha/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/mocha/node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/mocha/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -18271,6 +20180,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/mocha/node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/mocha/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -18315,9 +20236,9 @@
       }
     },
     "node_modules/mocha/node_modules/minimatch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -18326,15 +20247,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/mocha/node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -18371,6 +20283,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/mocha/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/mocha/node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -18398,6 +20322,23 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/mocha/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/mocha/node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -18417,12 +20358,33 @@
       }
     },
     "node_modules/mocha/node_modules/yargs-parser": {
-      "version": "20.2.4",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha/node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "dev": true,
+      "engines": {
+        "node": "*"
       }
     },
     "node_modules/morgan": {
@@ -18469,14 +20431,14 @@
       }
     },
     "node_modules/mpd-parser": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.21.1.tgz",
-      "integrity": "sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==",
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.22.1.tgz",
+      "integrity": "sha512-fwBebvpyPUU8bOzvhX0VQZgSohncbgYwUyJJoTSNpmy7ccD2ryiCvM7oRkn/xQH5cv73/xU7rJSNCLjdGFor0Q==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@videojs/vhs-utils": "^3.0.5",
-        "@xmldom/xmldom": "^0.7.2",
+        "@xmldom/xmldom": "^0.8.3",
         "global": "^4.4.0"
       },
       "bin": {
@@ -18493,9 +20455,9 @@
       }
     },
     "node_modules/mrmime": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
-      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
+      "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -18525,10 +20487,13 @@
       }
     },
     "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
     },
     "node_modules/mux.js": {
       "version": "6.0.1",
@@ -18548,17 +20513,24 @@
       }
     },
     "node_modules/nan": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
+      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
       "dev": true,
       "optional": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "optional": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -18610,15 +20582,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/nanomatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -18648,6 +20611,15 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
@@ -18699,38 +20671,89 @@
       }
     },
     "node_modules/nise/node_modules/path-to-regexp": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
+      "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
       "dev": true,
       "dependencies": {
         "isarray": "0.0.1"
       }
     },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
     "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
       "dev": true,
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
+    "node_modules/node-html-parser": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.13.tgz",
+      "integrity": "sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "^5.1.0",
+        "he": "1.2.0"
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+    },
+    "node_modules/node-request-interceptor": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/node-request-interceptor/-/node-request-interceptor-0.6.3.tgz",
+      "integrity": "sha512-8I2V7H2Ch0NvW7qWcjmS0/9Lhr0T6x7RD6PDirhvWEkUQvy83x8BA4haYMr09r/rig7hcgYSjYh6cd4U7G1vLA==",
+      "dev": true,
+      "dependencies": {
+        "@open-draft/until": "^1.0.3",
+        "debug": "^4.3.0",
+        "headers-utils": "^1.2.0",
+        "strict-event-emitter": "^0.1.0"
+      }
+    },
+    "node_modules/node.extend": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
+      "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
+      "dependencies": {
+        "has": "^1.0.3",
+        "is": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
     "node_modules/nopt": {
       "version": "3.0.6",
@@ -18745,28 +20768,25 @@
       }
     },
     "node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.1.tgz",
+      "integrity": "sha512-6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==",
       "dev": true,
       "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
+        "hosted-git-info": "^7.0.0",
+        "is-core-module": "^2.8.1",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -18783,18 +20803,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/now-and-later": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
@@ -18828,6 +20836,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
     "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -18881,57 +20901,23 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-copy/node_modules/is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/object-copy/node_modules/kind-of": {
@@ -18947,21 +20933,21 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
+      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18992,13 +20978,13 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
         "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       },
@@ -19024,6 +21010,38 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
@@ -19063,14 +21081,14 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -19154,9 +21172,9 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
       "dependencies": {
         "deep-is": "^0.1.3",
@@ -19164,121 +21182,12 @@
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
         "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ordered-read-streams": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
@@ -19288,15 +21197,6 @@
         "readable-stream": "^2.0.1"
       }
     },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
@@ -19318,15 +21218,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -19336,15 +21227,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/p-iteration": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/p-iteration/-/p-iteration-1.1.8.tgz",
-      "integrity": "sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -19381,6 +21263,75 @@
         "node": ">=6"
       }
     },
+    "node_modules/pac-proxy-agent": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
+      "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "pac-resolver": "^7.0.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "dev": true,
+      "dependencies": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "dev": true
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -19407,19 +21358,45 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/parse-imports": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.0.tgz",
+      "integrity": "sha512-JQWgmK2o4w8leUkZeZPatWdAny6vXGU/3siIUvMF6J2rDCud9aTt8h/px9oZJ6U3EcfhngBJ635uPFI0q0VAeA==",
+      "dev": true,
+      "dependencies": {
+        "es-module-lexer": "^1.5.3",
+        "slashes": "^3.0.12"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz",
+      "integrity": "sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
+        "@babel/code-frame": "^7.21.4",
+        "error-ex": "^1.3.2",
+        "json-parse-even-better-errors": "^3.0.0",
+        "lines-and-columns": "^2.0.3",
+        "type-fest": "^3.8.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-json/node_modules/type-fest": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
+      "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -19470,6 +21447,61 @@
         "parse-path": "^7.0.0"
       }
     },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
+      "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
+      "dev": true,
+      "dependencies": {
+        "domhandler": "^5.0.2",
+        "parse5": "^7.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5-parser-stream": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz",
+      "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==",
+      "dev": true,
+      "dependencies": {
+        "parse5": "^7.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5-parser-stream/node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -19546,10 +21578,32 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/path-type": {
       "version": "1.1.0",
@@ -19574,6 +21628,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/pathe": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "dev": true
+    },
     "node_modules/pathval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -19605,9 +21665,9 @@
       "dev": true
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -19654,6 +21714,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/pkcs7": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
@@ -19703,10 +21772,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "version": "8.4.38",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "dev": true,
       "funding": [
         {
@@ -19716,31 +21794,22 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "optional": true,
       "dependencies": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "source-map-js": "^1.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/postcss/node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -19750,54 +21819,47 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/pretty-format": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+    "node_modules/prettier": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz",
+      "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^17.0.1"
+      "bin": {
+        "prettier": "bin-prettier.js"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/pretty-format/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/pretty-format/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -19822,15 +21884,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -19843,8 +21896,7 @@
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "node_modules/progress": {
       "version": "2.0.3",
@@ -19856,9 +21908,9 @@
       }
     },
     "node_modules/property-information": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.1.1.tgz",
-      "integrity": "sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
+      "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -19883,6 +21935,59 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxy-agent": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
+      "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -19910,12 +22015,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-      "dev": true
-    },
     "node_modules/psl": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@@ -19966,68 +22065,19 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/puppeteer-core": {
-      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.7.0.tgz",
-      "integrity": "sha512-rXja4vcnAzFAP1OVLq/5dWNfwBGuzcOARJ6qGV7oAZhnLmVRU8G5MsdeQEAOy332ZhkIOnn9jp15R89LKHyp2Q==",
-      "dev": true,
-      "dependencies": {
-        "cross-fetch": "3.1.5",
-        "debug": "4.3.4",
-        "devtools-protocol": "0.0.981744",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.5.0"
-      },
-      "engines": {
-        "node": ">=10.18.1"
-      }
-    },
-    "node_modules/puppeteer-core/node_modules/devtools-protocol": {
-      "version": "0.0.981744",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
-      "integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
-      "dev": true
-    },
-    "node_modules/puppeteer-core/node_modules/ws": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
       "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+      "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
       "dev": true,
       "engines": {
         "node": ">=0.6.0",
@@ -20044,11 +22094,11 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -20058,38 +22108,22 @@
       }
     },
     "node_modules/query-selector-shadow-dom": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.0.tgz",
-      "integrity": "sha512-bK0/0cCI+R8ZmOF1QjT7HupDUYCxbf/9TJgAmSXQxZpftXmTAeil9DRoCnTDkWbvOyZzhcMBwKpptWcdkGFIMg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.1.tgz",
+      "integrity": "sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw==",
       "dev": true
     },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
-    "node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+    "node_modules/queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
+      "dev": true
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
@@ -20109,9 +22143,9 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -20123,41 +22157,41 @@
       }
     },
     "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true
     },
     "node_modules/read-pkg": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
-      "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz",
+      "integrity": "sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==",
       "dev": true,
       "dependencies": {
         "@types/normalize-package-data": "^2.4.1",
-        "normalize-package-data": "^3.0.2",
-        "parse-json": "^5.2.0",
-        "type-fest": "^2.0.0"
+        "normalize-package-data": "^6.0.0",
+        "parse-json": "^7.0.0",
+        "type-fest": "^4.2.0"
       },
       "engines": {
-        "node": ">=12.20"
+        "node": ">=16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg-up": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz",
-      "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-10.0.0.tgz",
+      "integrity": "sha512-jgmKiS//w2Zs+YbX039CorlkOp8FIVbSAN8r8GJHDsGlmNPXo+VeHkqAwCiQVTTx5/LwLZTcEw59z3DvcLbr0g==",
       "dev": true,
       "dependencies": {
         "find-up": "^6.3.0",
-        "read-pkg": "^7.1.0",
-        "type-fest": "^2.5.0"
+        "read-pkg": "^8.0.0",
+        "type-fest": "^3.12.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -20180,9 +22214,9 @@
       }
     },
     "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz",
-      "integrity": "sha512-vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
       "dev": true,
       "dependencies": {
         "p-locate": "^6.0.0"
@@ -20234,46 +22268,33 @@
       }
     },
     "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
+      "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
       "dev": true,
       "engines": {
-        "node": ">=12.20"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "version": "4.20.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.20.0.tgz",
+      "integrity": "sha512-MBh+PHUHHisjXf4tlx0CFWoMdjx8zCMLJHOjnV1prABYZFHqtFOyauCIK2/7w4oIfwkF8iNhLtnJEfVY2vn3iw==",
       "dev": true,
       "engines": {
-        "node": ">=12.20"
+        "node": ">=16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -20287,19 +22308,17 @@
     "node_modules/readable-stream/node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
     },
     "node_modules/readable-stream/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/readdir-glob": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz",
-      "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
+      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
       "dev": true,
       "dependencies": {
         "minimatch": "^5.1.0"
@@ -20315,9 +22334,9 @@
       }
     },
     "node_modules/readdir-glob/node_modules/minimatch": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -20368,9 +22387,9 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -20379,14 +22398,14 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "node_modules/regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
@@ -20418,14 +22437,15 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -20447,26 +22467,21 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
       "dependencies": {
+        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.1.0",
-        "regjsgen": "^0.7.1",
         "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
+        "unicode-match-property-value-ecmascript": "^2.1.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/regjsgen": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
-    },
     "node_modules/regjsparser": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
@@ -20487,9 +22502,9 @@
       }
     },
     "node_modules/remark": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-14.0.2.tgz",
-      "integrity": "sha512-A3ARm2V4BgiRXaUo5K0dRvJ1lbogrbXnhkJRmD0yw092/Yl0kOCZt1k9ZeElEwkZsWGsMumz6qL5MfNJH9nOBA==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-14.0.3.tgz",
+      "integrity": "sha512-bfmJW1dmR2LvaMJuAnE88pZP9DktIFYXazkTfOIKZzi3Knk9lT0roItIA24ydOucI3bV/g/tXBA6hzqq3FV9Ew==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -20519,9 +22534,9 @@
       }
     },
     "node_modules/remark-html": {
-      "version": "15.0.1",
-      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-15.0.1.tgz",
-      "integrity": "sha512-7ta5UPRqj8nP0GhGMYUAghZ/DRno7dgq7alcW90A7+9pgJsXzGJlFgwF8HOP1b1tMgT3WwbeANN+CaTimMfyNQ==",
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-15.0.2.tgz",
+      "integrity": "sha512-/CIOI7wzHJzsh48AiuIyIe1clxVkUtreul73zcCXLub0FmnevQE0UMFDQm7NUx8/3rl/4zCshlMfqBdWScQthw==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -20536,9 +22551,9 @@
       }
     },
     "node_modules/remark-parse": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.1.tgz",
-      "integrity": "sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.2.tgz",
+      "integrity": "sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -20566,9 +22581,9 @@
       }
     },
     "node_modules/remark-stringify": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-10.0.2.tgz",
-      "integrity": "sha512-6wV3pvbPvHkbNnWB0wdDvVFHOe1hBRAx1Q/5g/EpH4RppAII6J8Gnwe7VbHuXaoKIF6LAg6ExTel/+kNqSQ7lw==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-10.0.3.tgz",
+      "integrity": "sha512-koyOzCMYoUHudypbj4XpnAKFbkddRMYZHwghnxd7ue5210WzGw6kOBwauJTRUMq16jsovXx8dYNvSSWP89kZ3A==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -20662,18 +22677,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
-      "dev": true,
-      "dependencies": {
-        "is-finite": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/replace-ext": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
@@ -20749,6 +22752,16 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/request/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -20780,11 +22793,11 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dependencies": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -20795,12 +22808,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/resolve-alpn": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-      "dev": true
-    },
     "node_modules/resolve-dir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
@@ -20835,6 +22842,15 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
     "node_modules/resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -20842,22 +22858,10 @@
       "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
-    "node_modules/responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-      "dev": true,
-      "dependencies": {
-        "lowercase-keys": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/resq": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/resq/-/resq-1.10.2.tgz",
-      "integrity": "sha512-HmgVS3j+FLrEDBTDYysPdPVF9/hioDMJ/otOiQDKqk77YfZeeLOj0qi34yObumcud1gBpk+wpBTEg4kMicD++A==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/resq/-/resq-1.11.0.tgz",
+      "integrity": "sha512-G10EBz+zAAy3zUd/CDoBbXRL6ia9kOo3xRHrMDsHljI0GDkhYlyjwoCx5+3eCC4swi1uCoZQhskuJkj7Gp57Bw==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^2.0.1"
@@ -20892,9 +22896,9 @@
       }
     },
     "node_modules/rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true
     },
     "node_modules/rgb2hex": {
@@ -20907,6 +22911,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
@@ -20918,10 +22923,31 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/rimraf/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
+      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
       "dev": true,
       "engines": {
         "node": ">=0.12.0"
@@ -20937,17 +22963,20 @@
       }
     },
     "node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
       "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
+        "tslib": "^2.1.0"
       }
     },
+    "node_modules/rxjs/node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "dev": true
+    },
     "node_modules/sade": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
@@ -20960,6 +22989,30 @@
         "node": ">=6"
       }
     },
+    "node_modules/safaridriver": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/safaridriver/-/safaridriver-0.1.2.tgz",
+      "integrity": "sha512-4R309+gWflJktzPXBQCobbWEHlzC4aK3a+Ov3tz2Ib2aBxiwd11phkdIBH1l0EO22x24CJMUQkpKFumRriCSRg==",
+      "dev": true
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -20995,19 +23048,31 @@
       }
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
         "is-regex": "^1.1.4"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/safe-stable-stringify": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
+      "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -21075,23 +23140,24 @@
       }
     },
     "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -21101,62 +23167,120 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    "node_modules/send/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/send/node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/send/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
     },
     "node_modules/send/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+      "dev": true,
       "bin": {
         "mime": "cli.js"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    "node_modules/send/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
     "node_modules/serialize-error": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz",
-      "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz",
+      "integrity": "sha512-2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "type-fest": "^2.12.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/serialize-error/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=12.20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
@@ -21241,25 +23365,124 @@
       }
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-static/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/serve-static/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/serve-static/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/serve-static/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/serve-static/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/serve-static/node_modules/send": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/serve-static/node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -21319,6 +23542,18 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -21341,13 +23576,17 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -21363,6 +23602,7 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz",
       "integrity": "sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==",
+      "deprecated": "16.1.1",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -21385,27 +23625,24 @@
       }
     },
     "node_modules/sirv": {
-      "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
-      "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
       "dev": true,
       "dependencies": {
-        "@polka/url": "^1.0.0-next.20",
-        "mrmime": "^1.0.0",
-        "totalist": "^1.0.0"
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
       },
       "engines": {
         "node": ">= 10"
       }
     },
-    "node_modules/slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/slashes": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz",
+      "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==",
+      "dev": true
     },
     "node_modules/slice-ansi": {
       "version": "4.0.0",
@@ -21457,6 +23694,16 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -21565,72 +23812,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/snapdragon/node_modules/is-extendable": {
@@ -21663,35 +23855,38 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz",
-      "integrity": "sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
+      "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
+        "cors": "~2.8.5",
         "debug": "~4.3.2",
-        "engine.io": "~6.4.1",
+        "engine.io": "~6.6.0",
         "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.1"
+        "socket.io-parser": "~4.2.4"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=10.2.0"
       }
     },
     "node_modules/socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
+      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ws": "~8.11.0"
+        "debug": "~4.3.4",
+        "ws": "~8.17.1"
       }
     },
     "node_modules/socket.io-parser": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz",
-      "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
       "dev": true,
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
@@ -21701,6 +23896,46 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dev": true,
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz",
+      "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.7.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -21717,9 +23952,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "dev": true,
       "optional": true,
       "engines": {
@@ -21737,15 +23972,6 @@
         "decode-uri-component": "^0.2.0"
       }
     },
-    "node_modules/source-map-support": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.5.6"
-      }
-    },
     "node_modules/source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
@@ -21753,23 +23979,32 @@
       "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/space-separated-tokens": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz",
-      "integrity": "sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
       "dev": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/spacetrim": {
+      "version": "0.11.25",
+      "resolved": "https://registry.npmjs.org/spacetrim/-/spacetrim-0.11.25.tgz",
+      "integrity": "sha512-SWxXDROciuJs9YEYXUBjot5k/cqNGPPbT3QmkInFne4AGc1y+76It+jqU8rfsXKt57RRiunzZn1m9+KfuuNklw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://buymeacoffee.com/hejny"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/hejny/spacetrim/blob/main/README.md#%EF%B8%8F-contributing"
+        }
+      ]
+    },
     "node_modules/sparkles": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
@@ -21780,9 +24015,9 @@
       }
     },
     "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "dev": true,
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
@@ -21790,9 +24025,9 @@
       }
     },
     "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
       "dev": true
     },
     "node_modules/spdx-expression-parse": {
@@ -21806,9 +24041,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "version": "3.0.18",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
+      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
       "dev": true
     },
     "node_modules/split": {
@@ -21849,38 +24084,23 @@
       }
     },
     "node_modules/split2": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^3.0.0"
-      }
-    },
-    "node_modules/split2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
       "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 10.x"
       }
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
     "node_modules/sshpk": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "dependencies": {
         "asn1": "~0.2.3",
@@ -21902,6 +24122,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sshpk/node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "dev": true
+    },
     "node_modules/stack-trace": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
@@ -21912,9 +24138,9 @@
       }
     },
     "node_modules/stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
       "dev": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
@@ -21957,72 +24183,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/statuses": {
@@ -22033,6 +24204,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+      "dev": true,
+      "dependencies": {
+        "internal-slot": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/stream-buffers": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
@@ -22058,15 +24241,15 @@
       "dev": true
     },
     "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
+      "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
       "dev": true
     },
     "node_modules/streamroller": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
-      "integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
+      "integrity": "sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==",
       "dev": true,
       "dependencies": {
         "date-format": "^4.0.14",
@@ -22109,11 +24292,30 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/streamx": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
+      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
+        "text-decoder": "^1.1.0"
+      },
+      "optionalDependencies": {
+        "bare-events": "^2.2.0"
+      }
+    },
+    "node_modules/strict-event-emitter": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.1.0.tgz",
+      "integrity": "sha512-8hSYfU+WKLdNcHVXJ0VxRXiPESalzRe7w1l8dg9+/22Ry+iZQUoQuoJ27R30GMD1TiyYINWsIEGY05WrskhSKw==",
+      "dev": true
+    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -22121,8 +24323,7 @@
     "node_modules/string_decoder/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/string-template": {
       "version": "0.2.1",
@@ -22144,38 +24345,98 @@
         "node": ">=8"
       }
     },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/stringify-entities": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz",
-      "integrity": "sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
       "dev": true,
       "dependencies": {
         "character-entities-html4": "^2.0.0",
@@ -22187,6 +24448,22 @@
       }
     },
     "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
@@ -22198,6 +24475,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
     "node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -22225,27 +24514,36 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/strip-json-comments": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
-      "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
+    "node_modules/strip-final-newline": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-4.0.0.tgz",
+      "integrity": "sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==",
       "dev": true,
       "engines": {
-        "node": ">=14.16"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/suffix": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
-      "integrity": "sha512-j5uf6MJtMCfC4vBe5LFktSe4bGyNTBk7I2Kdri0jeLrcv5B9pWfxVa5JQpoxgtR8vaVB7bVxsWgnfQbX5wkhAA==",
+    "node_modules/strip-json-comments": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
+      "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
+      "dev": true
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -22278,10 +24576,32 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "node_modules/synckit": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.0.tgz",
+      "integrity": "sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==",
+      "dev": true,
+      "dependencies": {
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
+    "node_modules/synckit/node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "dev": true
+    },
     "node_modules/table": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
+      "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
       "dev": true,
       "dependencies": {
         "ajv": "^8.0.1",
@@ -22295,15 +24615,15 @@
       }
     },
     "node_modules/table/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
+      "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
         "json-schema-traverse": "^1.0.0",
         "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "uri-js": "^4.4.1"
       },
       "funding": {
         "type": "github",
@@ -22316,6 +24636,18 @@
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
+    "node_modules/table/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -22326,45 +24658,25 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+      "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
       "dev": true,
       "dependencies": {
-        "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
+        "tar-stream": "^3.1.5"
       }
     },
     "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tar-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dev": true,
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
       }
     },
     "node_modules/temp-fs": {
@@ -22379,10 +24691,32 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/temp-fs/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/temp-fs/node_modules/rimraf": {
       "version": "2.5.4",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
       "integrity": "sha512-Lw7SHMjssciQb/rRz7JyPIy9+bbUshEucPoLRvWqy09vC5zQixl8Uet+Zl+SROBB/JMWHJRdCk1qdxNWHNMvlQ==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "dependencies": {
         "glob": "^7.0.5"
@@ -22414,13 +24748,13 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
-      "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
+      "version": "5.31.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz",
+      "integrity": "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -22432,16 +24766,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
-      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
+      "version": "5.3.10",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.14",
+        "@jridgewell/trace-mapping": "^0.3.20",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "terser": "^5.14.1"
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -22482,9 +24816,9 @@
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -22500,9 +24834,9 @@
       }
     },
     "node_modules/terser/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -22544,6 +24878,36 @@
         "node": ">=8"
       }
     },
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/text-decoder": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz",
+      "integrity": "sha512-TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -22598,9 +24962,9 @@
       }
     },
     "node_modules/through2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
@@ -22621,13 +24985,16 @@
       }
     },
     "node_modules/timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.8.tgz",
+      "integrity": "sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww==",
       "dev": true,
       "dependencies": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
+        "es5-ext": "^0.10.64",
+        "next-tick": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/tiny-hashes": {
@@ -22658,16 +25025,22 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/tinyrainbow": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
       "dev": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
       "engines": {
-        "node": ">=0.6.0"
+        "node": ">=14.14"
       }
     },
     "node_modules/to-absolute-glob": {
@@ -22792,9 +25165,9 @@
       }
     },
     "node_modules/totalist": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
-      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -22813,12 +25186,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true
-    },
     "node_modules/traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
@@ -22838,41 +25205,46 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
+    "node_modules/triple-beam": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz",
+      "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 14.0.0"
       }
     },
     "node_modules/trough": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
-      "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz",
+      "integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==",
       "dev": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/tryit": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
+      "integrity": "sha512-6C5h3CE+0qjGp+YKYTs74xR0k/Nw/ePtl/Lp6CCf44hqBQ66qnH1sDFR5mV/Gc48EsrHLB53lCFSffQCkka3kg=="
+    },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.0"
@@ -22887,6 +25259,25 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
+    "node_modules/tsx": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.17.0.tgz",
+      "integrity": "sha512-eN4mnDA5UMKDt4YZixo9tBioibaMBpoxBkD+rIPAjVmYERSG0/dWEY1CEFuV89CgASlKL499q8AhmkMnnjtOJg==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "~0.23.0",
+        "get-tsconfig": "^4.7.5"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -22906,9 +25297,9 @@
       "dev": true
     },
     "node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
+      "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
       "dev": true
     },
     "node_modules/type-check": {
@@ -22956,26 +25347,85 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-      "dev": true
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
-    "node_modules/typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
       "dev": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "dev": true
+    },
     "node_modules/typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -22998,9 +25448,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==",
+      "version": "0.7.38",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.38.tgz",
+      "integrity": "sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA==",
       "dev": true,
       "funding": [
         {
@@ -23010,6 +25460,10 @@
         {
           "type": "paypal",
           "url": "https://paypal.me/faisalman"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/faisalman"
         }
       ],
       "engines": {
@@ -23017,9 +25471,9 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "version": "3.18.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz",
+      "integrity": "sha512-SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -23099,6 +25553,21 @@
       "integrity": "sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==",
       "dev": true
     },
+    "node_modules/undici": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz",
+      "integrity": "sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=18.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -23120,9 +25589,9 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
       "engines": {
         "node": ">=4"
       }
@@ -23135,6 +25604,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/unified": {
       "version": "10.1.2",
       "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
@@ -23198,9 +25679,9 @@
       }
     },
     "node_modules/unist-builder": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.0.tgz",
-      "integrity": "sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.1.tgz",
+      "integrity": "sha512-gnpOw7DIpCA0vpr6NqdPvTWnlPTApCTRzr+38E6hCWx3rz/cjo83SsKIlS1Z+L5ttScQ2AwutNnb8+tAvpb6qQ==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0"
@@ -23211,9 +25692,9 @@
       }
     },
     "node_modules/unist-util-generated": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.0.tgz",
-      "integrity": "sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.1.tgz",
+      "integrity": "sha512-qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -23221,19 +25702,22 @@
       }
     },
     "node_modules/unist-util-is": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.1.1.tgz",
-      "integrity": "sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.1.tgz",
+      "integrity": "sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==",
       "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
     "node_modules/unist-util-position": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz",
-      "integrity": "sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.4.tgz",
+      "integrity": "sha512-kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0"
@@ -23244,9 +25728,9 @@
       }
     },
     "node_modules/unist-util-stringify-position": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz",
-      "integrity": "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
+      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0"
@@ -23257,9 +25741,9 @@
       }
     },
     "node_modules/unist-util-visit": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.1.tgz",
-      "integrity": "sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz",
+      "integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -23272,9 +25756,9 @@
       }
     },
     "node_modules/unist-util-visit-parents": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz",
-      "integrity": "sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz",
+      "integrity": "sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -23286,9 +25770,9 @@
       }
     },
     "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
@@ -23373,6 +25857,12 @@
         "setimmediate": "~1.0.4"
       }
     },
+    "node_modules/unzipper/node_modules/bluebird": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
+      "dev": true
+    },
     "node_modules/unzipper/node_modules/duplexer2": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
@@ -23393,9 +25883,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz",
+      "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -23404,14 +25894,18 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       },
       "bin": {
-        "browserslist-lint": "cli.js"
+        "update-browserslist-db": "cli.js"
       },
       "peerDependencies": {
         "browserslist": ">= 4.21.0"
@@ -23434,13 +25928,13 @@
       "dev": true
     },
     "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
       "dev": true,
       "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
+        "punycode": "^1.4.1",
+        "qs": "^6.11.2"
       }
     },
     "node_modules/url-parse": {
@@ -23460,9 +25954,15 @@
       "dev": true
     },
     "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+      "dev": true
+    },
+    "node_modules/urlpattern-polyfill": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==",
       "dev": true
     },
     "node_modules/use": {
@@ -23474,6 +25974,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/userhome": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/userhome/-/userhome-1.0.0.tgz",
+      "integrity": "sha512-ayFKY3H+Pwfy4W98yPdtH1VqH4psDeyW8lYYFzfecR9d6hqLpqhecktvYR3SEEXt7vG0S1JEpciI3g94pMErig==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/util": {
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
@@ -23490,8 +25999,7 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
@@ -23502,13 +26010,16 @@
       }
     },
     "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
       "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "bin": {
-        "uuid": "bin/uuid"
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/uvu": {
@@ -23530,9 +26041,9 @@
       }
     },
     "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
+      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
       "dev": true
     },
     "node_modules/v8flags": {
@@ -23595,9 +26106,9 @@
       "dev": true
     },
     "node_modules/vfile": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.5.tgz",
-      "integrity": "sha512-U1ho2ga33eZ8y8pkbQLH54uKqGhFJ6GYIHnnG5AhRpAh3OWjkrRHKa/KogbmQn8We+c0KVV3rTOgR9V/WowbXQ==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
+      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -23610,10 +26121,24 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/vfile-location": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-4.1.0.tgz",
+      "integrity": "sha512-YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "vfile": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/vfile-message": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz",
-      "integrity": "sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
+      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -23625,15 +26150,17 @@
       }
     },
     "node_modules/vfile-reporter": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.4.tgz",
-      "integrity": "sha512-4cWalUnLrEnbeUQ+hARG5YZtaHieVK3Jp4iG5HslttkVl+MHunSGNAIrODOTLbtjWsNZJRMCkL66AhvZAYuJ9A==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.5.tgz",
+      "integrity": "sha512-NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw==",
       "dev": true,
       "dependencies": {
         "@types/supports-color": "^8.0.0",
         "string-width": "^5.0.0",
         "supports-color": "^9.0.0",
         "unist-util-stringify-position": "^3.0.0",
+        "vfile": "^5.0.0",
+        "vfile-message": "^3.0.0",
         "vfile-sort": "^3.0.0",
         "vfile-statistics": "^2.0.0"
       },
@@ -23642,18 +26169,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/vfile-reporter/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
     "node_modules/vfile-reporter/node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -23677,25 +26192,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/vfile-reporter/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/vfile-reporter/node_modules/supports-color": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.3.tgz",
-      "integrity": "sha512-aszYUX/DVK/ed5rFLb/dDinVJrQjG/vmU433wtqVSD800rYsJNWxh2R3USV90aLSU+UsyQkbNeffVLzc6B6foA==",
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
+      "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -23705,11 +26205,12 @@
       }
     },
     "node_modules/vfile-sort": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.0.tgz",
-      "integrity": "sha512-fJNctnuMi3l4ikTVcKpxTbzHeCgvDhnI44amA3NVDvA6rTC6oKCFpCVyT5n2fFMr3ebfr+WVQZedOCd73rzSxg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.1.tgz",
+      "integrity": "sha512-1os1733XY6y0D5x0ugqSeaVJm9lYgj0j5qdcZQFyxlZOSy1jYarL77lLyb5gK4Wqr1d5OxmuyflSO3zKyFnTFw==",
       "dev": true,
       "dependencies": {
+        "vfile": "^5.0.0",
         "vfile-message": "^3.0.0"
       },
       "funding": {
@@ -23718,11 +26219,12 @@
       }
     },
     "node_modules/vfile-statistics": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.0.tgz",
-      "integrity": "sha512-foOWtcnJhKN9M2+20AOTlWi2dxNfAoeNIoxD5GXcO182UJyId4QrXa41fWrgcfV3FWTjdEDy3I4cpLVcQscIMA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.1.tgz",
+      "integrity": "sha512-W6dkECZmP32EG/l+dp2jCLdYzmnDBIw6jwiLZSER81oR5AHRcVqL+k3Z+pfH1R73le6ayDkJRMk0sutj1bMVeg==",
       "dev": true,
       "dependencies": {
+        "vfile": "^5.0.0",
         "vfile-message": "^3.0.0"
       },
       "funding": {
@@ -23731,24 +26233,24 @@
       }
     },
     "node_modules/video.js": {
-      "version": "7.20.3",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.3.tgz",
-      "integrity": "sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==",
+      "version": "7.21.6",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.21.6.tgz",
+      "integrity": "sha512-m41TbODrUCToVfK1aljVd296CwDQnCRewpIm5tTXMuV87YYSGw1H+VDOaV45HlpcWSsTWWLF++InDgGJfthfUw==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "2.14.3",
+        "@videojs/http-streaming": "2.16.3",
         "@videojs/vhs-utils": "^3.0.4",
         "@videojs/xhr": "2.6.0",
         "aes-decrypter": "3.1.3",
         "global": "^4.4.0",
         "keycode": "^2.2.0",
-        "m3u8-parser": "4.7.1",
-        "mpd-parser": "0.21.1",
+        "m3u8-parser": "4.8.0",
+        "mpd-parser": "0.22.1",
         "mux.js": "6.0.1",
         "safe-json-parse": "4.0.0",
         "videojs-font": "3.2.0",
-        "videojs-vtt.js": "^0.15.4"
+        "videojs-vtt.js": "^0.15.5"
       }
     },
     "node_modules/video.js/node_modules/safe-json-parse": {
@@ -23781,42 +26283,40 @@
       "dev": true
     },
     "node_modules/videojs-ima": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/videojs-ima/-/videojs-ima-1.11.0.tgz",
-      "integrity": "sha512-ZRoWuGyJ75zamwZgpr0i/gZ6q7Evda/Q6R46gpW88WN7u0ORU7apw/lM1MSG4c3YDXW8LDENgzMAvMZUdifWhg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/videojs-ima/-/videojs-ima-2.3.0.tgz",
+      "integrity": "sha512-8r0BZGT+WCTO6PePyKZHikV79Ojqh4yLMx4+DmPyXeRcKUVsQ7Va0R7Ok8GRcA8Zy3l1PM6jzLrD/W1rwKhZ8g==",
       "dev": true,
       "dependencies": {
         "@hapi/cryptiles": "^5.1.0",
-        "can-autoplay": "^3.0.0",
+        "can-autoplay": "^3.0.2",
         "extend": ">=3.0.2",
-        "lodash": ">=4.17.19",
-        "lodash.template": ">=4.5.0",
-        "videojs-contrib-ads": "^6.6.5"
+        "videojs-contrib-ads": "^6.9.0"
       },
       "engines": {
         "node": ">=0.8.0"
       },
       "peerDependencies": {
-        "video.js": "^5.19.2 || ^6 || ^7"
+        "video.js": "^5.19.2 || ^6 || ^7 || ^8"
       }
     },
     "node_modules/videojs-playlist": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/videojs-playlist/-/videojs-playlist-5.0.0.tgz",
-      "integrity": "sha512-TM9bytwKqkE05wdWPEKDpkwMGhS/VgMCIsEuNxmX1J1JO9zaTIl4Wm3egf5j1dhIw19oWrqGUV/nK0YNIelCpA==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/videojs-playlist/-/videojs-playlist-5.1.2.tgz",
+      "integrity": "sha512-8YgNq/iL17RLTXpfWAkuhM0Sq4w/x5YPVaNbUycjfqqGL/bp3Nrmc2W0qkPfh0ryB7r4cHfJbtHYP7zlW3ZkdQ==",
       "dev": true,
       "dependencies": {
         "global": "^4.3.2",
-        "video.js": "^6 || ^7"
+        "video.js": "^6 || ^7 || ^8"
       },
       "engines": {
         "node": ">=4.4.0"
       }
     },
     "node_modules/videojs-vtt.js": {
-      "version": "0.15.4",
-      "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
-      "integrity": "sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==",
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.5.tgz",
+      "integrity": "sha512-yZbBxvA7QMYn15Lr/ZfhhLPrNpI/RmCSCqgIff57GC2gIrV5YfyzLfLyZMj0NnZSAz8syB4N0nHXpZg9MyrMOQ==",
       "dev": true,
       "dependencies": {
         "global": "^4.3.1"
@@ -23839,6 +26339,14 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/vinyl-bufferstream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz",
+      "integrity": "sha512-yCCIoTf26Q9SQ0L9cDSavSL7Nt6wgQw8TU1B/bb9b9Z4A3XTypXCGdc5BvXl4ObQvVY8JrDkFnWa/UqBqwM2IA==",
+      "dependencies": {
+        "bufferstreams": "1.0.1"
+      }
+    },
     "node_modules/vinyl-fs": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
@@ -23895,6 +26403,12 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/vinyl-sourcemap/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
     "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -23935,9 +26449,9 @@
       }
     },
     "node_modules/vue-template-compiler": {
-      "version": "2.7.13",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz",
-      "integrity": "sha512-jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+      "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -23945,6 +26459,102 @@
         "he": "^1.2.0"
       }
     },
+    "node_modules/wait-port": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-1.1.0.tgz",
+      "integrity": "sha512-3e04qkoN3LxTMLakdqeWth8nih8usyg+sf1Bgdf9wwUkp05iuK1eSY/QpLvscT/+F/gA89+LpUmmgBtesbqI2Q==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4"
+      },
+      "bin": {
+        "wait-port": "bin/wait-port.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/wait-port/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wait-port/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/wait-port/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wait-port/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/wait-port/node_modules/commander": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/wait-port/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wait-port/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/walk": {
       "version": "2.3.15",
       "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.15.tgz",
@@ -23955,9 +26565,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
       "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -23972,269 +26582,406 @@
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
       "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "defaults": "^1.0.3"
       }
     },
+    "node_modules/web-namespaces": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
+      "integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/web-streams-polyfill": {
+      "version": "4.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
+      "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/webdriver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.5.3.tgz",
-      "integrity": "sha512-cDTn/hYj5x8BYwXxVb/WUwqGxrhCMP2rC8ttIWCfzmiVtmOnJGulC7CyxU3+p9Q5R/gIKTzdJOss16dhb+5CoA==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.0.5.tgz",
+      "integrity": "sha512-+xkdfbmG1IZrXxiPwab450Xuh9QClOcxTJ6tnde0rzxlPxdUqZqzwuMtM+VXZybxF4yCLrJWbeT0BpwJFAz1nA==",
       "dev": true,
       "dependencies": {
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/protocols": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "got": "^11.0.2",
-        "lodash.merge": "^4.6.1"
+        "@types/node": "^20.1.0",
+        "@types/ws": "^8.5.3",
+        "@wdio/config": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/protocols": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "deepmerge-ts": "^7.0.3",
+        "ws": "^8.8.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
+      }
+    },
+    "node_modules/webdriver/node_modules/@puppeteer/browsers": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
+      "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.6",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/webdriver/node_modules/@wdio/logger": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+      "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.0.0",
+        "chalk": "^5.1.2",
         "loglevel": "^1.6.0",
         "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
     "node_modules/webdriver/node_modules/@wdio/types": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+      "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
       "dev": true,
       "dependencies": {
-        "got": "^11.8.1"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/webdriver/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/webdriver/node_modules/@wdio/utils": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+      "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@puppeteer/browsers": "^2.2.0",
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "edgedriver": "^5.6.1",
+        "geckodriver": "^4.3.3",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.2.24",
+        "safaridriver": "^0.1.2",
+        "split2": "^4.2.0",
+        "wait-port": "^1.1.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/webdriver/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/webdriver/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 14"
+      }
+    },
+    "node_modules/webdriver/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/webdriver/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/webdriver/node_modules/deepmerge-ts": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+      "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/webdriver/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "agent-base": "^7.0.2",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/webdriver/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/webdriver/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/webdriver/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/webdriver/node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
       "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14"
       }
     },
-    "node_modules/webdriver/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/webdriver/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/webdriver/node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
+      },
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
+      }
+    },
+    "node_modules/webdriver/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/webdriverio": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.25.4.tgz",
-      "integrity": "sha512-agkgwn2SIk5cAJ03uue1GnGZcUZUDN3W4fUMY9/VfO8bVJrPEgWg31bPguEWPu+YhEB/aBJD8ECxJ3OEKdy4qQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/aria-query": "^5.0.0",
-        "@types/node": "^18.0.0",
-        "@wdio/config": "7.25.4",
-        "@wdio/logger": "7.19.0",
-        "@wdio/protocols": "7.22.0",
-        "@wdio/repl": "7.25.4",
-        "@wdio/types": "7.25.4",
-        "@wdio/utils": "7.25.4",
-        "archiver": "^5.0.0",
-        "aria-query": "^5.0.0",
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.9.tgz",
+      "integrity": "sha512-IwvKzhcJ9NjOL55xwj27uTTKkfxsg77dmAfqoKFSP5dQ70JzU+NgxiALEjjWQDybtt1yGIkHk7wjjxjboMU1uw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^20.11.30",
+        "@types/sinonjs__fake-timers": "^8.1.5",
+        "@wdio/config": "9.0.8",
+        "@wdio/logger": "9.0.8",
+        "@wdio/protocols": "9.0.8",
+        "@wdio/repl": "9.0.8",
+        "@wdio/types": "9.0.8",
+        "@wdio/utils": "9.0.8",
+        "archiver": "^7.0.1",
+        "aria-query": "^5.3.0",
+        "cheerio": "^1.0.0-rc.12",
         "css-shorthand-properties": "^1.1.1",
         "css-value": "^0.0.1",
-        "devtools": "7.25.4",
-        "devtools-protocol": "^0.0.1061995",
-        "fs-extra": "^10.0.0",
-        "grapheme-splitter": "^1.0.2",
+        "grapheme-splitter": "^1.0.4",
+        "htmlfy": "^0.2.1",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
         "lodash.clonedeep": "^4.5.0",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isplainobject": "^4.0.6",
         "lodash.zip": "^4.2.0",
-        "minimatch": "^5.0.0",
-        "puppeteer-core": "^13.1.3",
-        "query-selector-shadow-dom": "^1.0.0",
-        "resq": "^1.9.1",
+        "minimatch": "^9.0.3",
+        "query-selector-shadow-dom": "^1.0.1",
+        "resq": "^1.11.0",
         "rgb2hex": "0.2.5",
-        "serialize-error": "^8.0.0",
-        "webdriver": "7.25.4"
+        "serialize-error": "^11.0.3",
+        "urlpattern-polyfill": "^10.0.0",
+        "webdriver": "9.0.8"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18.20.0"
+      },
+      "peerDependencies": {
+        "puppeteer-core": "^22.3.0"
+      },
+      "peerDependenciesMeta": {
+        "puppeteer-core": {
+          "optional": true
+        }
       }
     },
-    "node_modules/webdriverio/node_modules/@types/node": {
-      "version": "18.11.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
-      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
-      "dev": true
+    "node_modules/webdriverio/node_modules/@puppeteer/browsers": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz",
+      "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.6",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/webdriverio/node_modules/@wdio/config": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
-      "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.0.8.tgz",
+      "integrity": "sha512-37L+hd+A1Nyehd/pgfTrLC6w+Ngbu0CIoFh9Vv6v8Cgu5Hih0TLofvlg+J1BNbcTd5eQ2tFKZBDeFMhQaIiTpg==",
       "dev": true,
       "dependencies": {
-        "@wdio/logger": "7.19.0",
-        "@wdio/types": "7.25.4",
-        "@wdio/utils": "7.25.4",
-        "deepmerge": "^4.0.0",
-        "glob": "^8.0.3"
+        "@wdio/logger": "9.0.8",
+        "@wdio/types": "9.0.8",
+        "@wdio/utils": "9.0.8",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18.20.0"
       }
     },
     "node_modules/webdriverio/node_modules/@wdio/logger": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
-      "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.8.tgz",
+      "integrity": "sha512-uIyYIDBwLczmsp9JE5hN3ME8Xg+9WNBfSNXD69ICHrY9WPTzFf94UeTuavK7kwSKF3ro2eJbmNZItYOfnoovnw==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.0.0",
+        "chalk": "^5.1.2",
         "loglevel": "^1.6.0",
         "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18.20.0"
       }
     },
     "node_modules/webdriverio/node_modules/@wdio/protocols": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
-      "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0.0"
-      }
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.8.tgz",
+      "integrity": "sha512-xRH54byFf623/w/KW62xkf/C2mGyigSfMm+UT3tNEAd5ZA9X2VAWQWQBPzdcrsck7Fxk4zlQX8Kb34RSs7Cy4Q==",
+      "dev": true
     },
     "node_modules/webdriverio/node_modules/@wdio/repl": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.25.4.tgz",
-      "integrity": "sha512-kYhj9gLsUk4HmlXLqkVre+gwbfvw9CcnrHjqIjrmMS4mR9D8zvBb5CItb3ZExfPf9jpFzIFREbCAYoE9x/kMwg==",
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-9.0.8.tgz",
+      "integrity": "sha512-3iubjl4JX5zD21aFxZwQghqC3lgu+mSs8c3NaiYYNCC+IT5cI/8QuKlgh9s59bu+N3gG988jqMJeCYlKuUv/iw==",
       "dev": true,
       "dependencies": {
-        "@wdio/utils": "7.25.4"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18.20.0"
       }
     },
     "node_modules/webdriverio/node_modules/@wdio/types": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
-      "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.8.tgz",
+      "integrity": "sha512-pmz2iRWddTanrv8JC7v3wUGm17KRv2WyyJhQfklMSANn9V1ep6pw1RJG2WJnKq4NojMvH1nVv1sMZxXrYPhpYw==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^18.0.0",
-        "got": "^11.8.1"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "node": ">=18.20.0"
       }
     },
     "node_modules/webdriverio/node_modules/@wdio/utils": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
-      "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.8.tgz",
+      "integrity": "sha512-p3EgOdkhCvMxJFd3WTtSChqYFQu2mz69/5tOsljDaL+4QYwnRR7O8M9wFsL3/9XMVcHdnC4Ija2VRxQ/lb+hHQ==",
       "dev": true,
       "dependencies": {
-        "@wdio/logger": "7.19.0",
-        "@wdio/types": "7.25.4",
-        "p-iteration": "^1.1.8"
+        "@puppeteer/browsers": "^2.2.0",
+        "@wdio/logger": "9.0.8",
+        "@wdio/types": "9.0.8",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "edgedriver": "^5.6.1",
+        "geckodriver": "^4.3.3",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.2.24",
+        "safaridriver": "^0.1.2",
+        "split2": "^4.2.0",
+        "wait-port": "^1.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18.20.0"
       }
     },
-    "node_modules/webdriverio/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/webdriverio/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 14"
       }
     },
     "node_modules/webdriverio/node_modules/brace-expansion": {
@@ -24247,158 +26994,174 @@
       }
     },
     "node_modules/webdriverio/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/webdriverio/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/webdriverio/node_modules/deepmerge-ts": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+      "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/webdriverio/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "agent-base": "^7.0.2",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/webdriverio/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/webdriverio/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/webdriverio/node_modules/glob": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+    "node_modules/webdriverio/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/webdriverio/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/webdriverio/node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
       "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14"
       }
     },
-    "node_modules/webdriverio/node_modules/ky": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/ky/-/ky-0.30.0.tgz",
-      "integrity": "sha512-X/u76z4JtDVq10u1JA5UQfatPxgPaVDMYTrgHyiTpGN2z4TMEJkIHsoSBBSg9SWZEIXTKsi9kHgiQ9o3Y/4yog==",
+    "node_modules/webdriverio/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "engines": {
-        "node": ">=12"
+      "bin": {
+        "semver": "bin/semver.js"
       },
-      "funding": {
-        "url": "https://github.com/sindresorhus/ky?sponsor=1"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/webdriverio/node_modules/minimatch": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+    "node_modules/webdriverio/node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
       },
-      "engines": {
-        "node": ">=10"
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
       }
     },
-    "node_modules/webdriverio/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/webdriverio/node_modules/webdriver": {
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.0.8.tgz",
+      "integrity": "sha512-UnV0ANriSTUgypGk0pz8lApeQuHt+72WEDQG5hFwkkSvggtKLyWdT7+PQkNoXvDajTmiLIqUOq8XPI/Pm71rtw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@types/node": "^20.1.0",
+        "@types/ws": "^8.5.3",
+        "@wdio/config": "9.0.8",
+        "@wdio/logger": "9.0.8",
+        "@wdio/protocols": "9.0.8",
+        "@wdio/types": "9.0.8",
+        "@wdio/utils": "9.0.8",
+        "deepmerge-ts": "^7.0.3",
+        "ws": "^8.8.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18.20.0"
       }
     },
-    "node_modules/webdriverio/node_modules/webdriver": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.25.4.tgz",
-      "integrity": "sha512-6nVDwenh0bxbtUkHASz9B8T9mB531Fn1PcQjUGj2t5dolLPn6zuK1D7XYVX40hpn6r3SlYzcZnEBs4X0az5Txg==",
+    "node_modules/webdriverio/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^18.0.0",
-        "@wdio/config": "7.25.4",
-        "@wdio/logger": "7.19.0",
-        "@wdio/protocols": "7.22.0",
-        "@wdio/types": "7.25.4",
-        "@wdio/utils": "7.25.4",
-        "got": "^11.0.2",
-        "ky": "0.30.0",
-        "lodash.merge": "^4.6.1"
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true
-    },
     "node_modules/webpack": {
-      "version": "5.76.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz",
-      "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==",
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
       "dev": true,
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.10.0",
-        "es-module-lexer": "^0.9.0",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
+        "graceful-fs": "^4.2.11",
         "json-parse-even-better-errors": "^2.3.1",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.4.0",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
         "webpack-sources": "^3.2.3"
       },
       "bin": {
@@ -24418,19 +27181,22 @@
       }
     },
     "node_modules/webpack-bundle-analyzer": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
-      "integrity": "sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==",
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
+      "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
       "dev": true,
       "dependencies": {
+        "@discoveryjs/json-ext": "0.5.7",
         "acorn": "^8.0.4",
         "acorn-walk": "^8.0.0",
-        "chalk": "^4.1.0",
         "commander": "^7.2.0",
+        "debounce": "^1.2.1",
+        "escape-string-regexp": "^4.0.0",
         "gzip-size": "^6.0.0",
-        "lodash": "^4.17.20",
+        "html-escaper": "^2.0.2",
         "opener": "^1.5.2",
-        "sirv": "^1.0.7",
+        "picocolors": "^1.0.0",
+        "sirv": "^2.0.3",
         "ws": "^7.3.1"
       },
       "bin": {
@@ -24441,9 +27207,9 @@
       }
     },
     "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -24452,55 +27218,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/webpack-bundle-analyzer/node_modules/commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -24510,32 +27227,24 @@
         "node": ">= 10"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
+    "node_modules/webpack-bundle-analyzer/node_modules/escape-string-regexp": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "node": ">=10"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/webpack-bundle-analyzer/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -24713,9 +27422,9 @@
       }
     },
     "node_modules/webpack/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -24724,10 +27433,10 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/webpack/node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+    "node_modules/webpack/node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "dev": true,
       "peerDependencies": {
         "acorn": "^8"
@@ -24749,10 +27458,16 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/webpack/node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
     "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -24790,29 +27505,52 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+    "node_modules/whatwg-encoding": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
       "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dev": true,
       "dependencies": {
-        "isexe": "^2.0.0"
+        "isexe": "^3.1.1"
       },
       "bin": {
-        "node-which": "bin/node-which"
+        "node-which": "bin/which.js"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/which-boxed-primitive": {
@@ -24832,15 +27570,18 @@
       }
     },
     "node_modules/which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
       "dev": true,
       "dependencies": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -24853,17 +27594,16 @@
       "dev": true
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-      "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -24872,62 +27612,38 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "node_modules/wide-align/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+    "node_modules/winston-transport": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz",
+      "integrity": "sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==",
       "dev": true,
       "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "logform": "^2.3.2",
+        "readable-stream": "^3.6.0",
+        "triple-beam": "^1.3.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 12.0.0"
       }
     },
-    "node_modules/wide-align/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+    "node_modules/winston-transport/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^3.0.0"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 6"
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -24940,12 +27656,27 @@
       "dev": true
     },
     "node_modules/workerpool": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
-      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
       "dev": true
     },
     "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
@@ -24962,6 +27693,51 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -24995,6 +27771,18 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -25013,29 +27801,18 @@
         "node": ">=4"
       }
     },
-    "node_modules/write/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -25065,10 +27842,9 @@
       }
     },
     "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/yargs": {
       "version": "1.3.3",
@@ -25112,6 +27888,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/yargs-unparser/node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/yargs-unparser/node_modules/is-plain-obj": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
@@ -25121,171 +27909,133 @@
         "node": ">=8"
       }
     },
-    "node_modules/yarn-install": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz",
-      "integrity": "sha512-VO1u181msinhPcGvQTVMnHVOae8zjX/NSksR17e6eXHRveDvHCF5mGjh9hkN8mzyfnCqcBe42LdTs7bScuTaeg==",
+    "node_modules/yauzl": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.3.tgz",
+      "integrity": "sha512-JCCdmlJJWv7L0q/KylOekyRaUrdEoUxWkWVcgorosTROCFWiS9p2NNPE9Yb91ak7b1N5SxAZEliWpspbZccivw==",
       "dev": true,
       "dependencies": {
-        "cac": "^3.0.3",
-        "chalk": "^1.1.3",
-        "cross-spawn": "^4.0.2"
-      },
-      "bin": {
-        "yarn-install": "bin/yarn-install.js",
-        "yarn-remove": "bin/yarn-remove.js"
+        "buffer-crc32": "~0.2.3",
+        "pend": "~1.2.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
-    "node_modules/yarn-install/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+    "node_modules/yocto-queue": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yarn-install/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+    "node_modules/yoctocolors": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz",
+      "integrity": "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+        "node": ">=18"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yarn-install/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+    "node_modules/yoctocolors-cjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
       "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yarn-install/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+    "node_modules/zip-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+      "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^2.0.0"
+        "archiver-utils": "^5.0.0",
+        "compress-commons": "^6.0.2",
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/yarn-install/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+    "node_modules/zip-stream/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
       }
     },
-    "node_modules/yarn-install/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-      "dev": true
-    },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+    "node_modules/zip-stream/node_modules/readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
       "dev": true,
       "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/zip-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz",
-      "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",
+    "node_modules/zip-stream/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "dependencies": {
-        "archiver-utils": "^2.1.0",
-        "compress-commons": "^4.1.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">= 10"
+        "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/zip-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+    "node_modules/zod": {
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
       "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+      "optional": true,
+      "peer": true,
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
       }
     },
     "node_modules/zwitch": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.2.tgz",
-      "integrity": "sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -25301,480 +28051,348 @@
   },
   "dependencies": {
     "@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "requires": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "requires": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       }
     },
     "@babel/compat-data": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz",
-      "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ=="
     },
     "@babel/core": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
-      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
-      "requires": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.6",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helpers": "^7.19.4",
-        "@babel/parser": "^7.19.6",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4",
-        "convert-source-map": "^1.7.0",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "requires": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
       }
     },
     "@babel/eslint-parser": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
-      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.7.tgz",
+      "integrity": "sha512-SO5E3bVxDuxyNxM5agFv480YA2HO6ohZbGxbazZdIk3KQOPOGVNw6q78I9/lbviIf95eq6tPozeYnJLbjnC8IA==",
       "dev": true,
       "requires": {
         "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
         "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       }
     },
     "@babel/generator": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.1.tgz",
-      "integrity": "sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
       "requires": {
-        "@babel/types": "^7.20.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
+        "@babel/types": "^7.25.6",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-          "requires": {
-            "@jridgewell/set-array": "^1.0.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
-          }
-        }
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
+      "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
-      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
       "requires": {
-        "@babel/compat-data": "^7.20.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz",
+      "integrity": "sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "semver": "^6.3.1"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
+      "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.1.0"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.1"
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+      "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
       "requires": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+        "resolve": "^1.14.2"
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
       "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz",
+      "integrity": "sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==",
       "requires": {
-        "@babel/types": "^7.18.9"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
-      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.19.4",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.19.1",
-        "@babel/types": "^7.19.0"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
-      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
-      "requires": {
-        "@babel/types": "^7.19.4"
-      }
-    },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
-      "requires": {
-        "@babel/types": "^7.20.0"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
-      "requires": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz",
-      "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==",
-      "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.1",
-        "@babel/types": "^7.20.0"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.1.tgz",
-      "integrity": "sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw=="
-    },
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz",
-      "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.2"
       }
     },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
+      "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/types": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
+    "@babel/helper-plugin-utils": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
+      "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg=="
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
+      "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-wrap-function": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
+    "@babel/helper-replace-supers": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
+      "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
+    "@babel/helper-simple-access": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
+      "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
+    "@babel/helper-split-export-declaration": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/types": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+    "@babel/helper-string-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ=="
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q=="
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
+      "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/template": "^7.24.7",
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+    "@babel/helpers": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6"
       }
     },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
-      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
+    "@babel/highlight": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "requires": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.18.8"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       }
     },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+    "@babel/parser": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/types": "^7.25.6"
       }
     },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz",
+      "integrity": "sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
+      "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
+      "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.7"
       }
     },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz",
+      "integrity": "sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+      "requires": {}
+    },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -25816,11 +28434,27 @@
       }
     },
     "@babel/plugin-syntax-import-assertions": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
-      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
+      "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-syntax-import-attributes": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
+      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-json-strings": {
@@ -25895,333 +28529,485 @@
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-arrow-functions": {
+    "@babel/plugin-syntax-unicode-sets-regex": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
+      "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-async-generator-functions": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz",
+      "integrity": "sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-remap-async-to-generator": "^7.24.7",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      }
+    },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
+      "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
       "requires": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-remap-async-to-generator": "^7.18.6"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-remap-async-to-generator": "^7.24.7"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
+      "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz",
-      "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
+      "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-class-properties": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
+      "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-class-static-block": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
+      "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz",
+      "integrity": "sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
+      "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/template": "^7.24.7"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz",
-      "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz",
+      "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
+      "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
+      "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-dynamic-import": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
+      "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
+      "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-export-namespace-from": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
+      "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
+      "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
+      "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==",
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-json-strings": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
+      "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
       "requires": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
+      "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
+      "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
+      "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
-      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
+      "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
-      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz",
+      "integrity": "sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-simple-access": "^7.19.4"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
-      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
+      "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==",
       "requires": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-identifier": "^7.19.1"
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
+      "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
+      "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
+      "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
+      "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-numeric-separator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
+      "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-object-rest-spread": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
+      "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.24.7"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
+      "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
+      "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-optional-chaining": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz",
+      "integrity": "sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz",
-      "integrity": "sha512-nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
+      "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-private-methods": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
+      "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-private-property-in-object": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
+      "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
+      "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
+      "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "regenerator-transform": "^0.15.0"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "regenerator-transform": "^0.15.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
+      "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
-      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "semver": "^6.3.0"
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz",
+      "integrity": "sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.1",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "semver": "^6.3.1"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
+      "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
+      "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
+      "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
+      "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz",
+      "integrity": "sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
+      "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
+      "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
+      "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
+      "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/preset-env": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
-      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
-      "requires": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.18.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.7.tgz",
+      "integrity": "sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ==",
+      "requires": {
+        "@babel/compat-data": "^7.24.7",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.7",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.18.6",
+        "@babel/plugin-syntax-import-assertions": "^7.24.7",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -26231,120 +29017,431 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.18.6",
-        "@babel/plugin-transform-async-to-generator": "^7.18.6",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.19.4",
-        "@babel/plugin-transform-classes": "^7.19.0",
-        "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.19.4",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.18.8",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.18.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.18.8",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.18.6",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.19.0",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.19.4",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
-        "semver": "^6.3.0"
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.24.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.24.7",
+        "@babel/plugin-transform-async-to-generator": "^7.24.7",
+        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
+        "@babel/plugin-transform-block-scoping": "^7.24.7",
+        "@babel/plugin-transform-class-properties": "^7.24.7",
+        "@babel/plugin-transform-class-static-block": "^7.24.7",
+        "@babel/plugin-transform-classes": "^7.24.7",
+        "@babel/plugin-transform-computed-properties": "^7.24.7",
+        "@babel/plugin-transform-destructuring": "^7.24.7",
+        "@babel/plugin-transform-dotall-regex": "^7.24.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
+        "@babel/plugin-transform-dynamic-import": "^7.24.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
+        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
+        "@babel/plugin-transform-for-of": "^7.24.7",
+        "@babel/plugin-transform-function-name": "^7.24.7",
+        "@babel/plugin-transform-json-strings": "^7.24.7",
+        "@babel/plugin-transform-literals": "^7.24.7",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
+        "@babel/plugin-transform-modules-amd": "^7.24.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.24.7",
+        "@babel/plugin-transform-modules-systemjs": "^7.24.7",
+        "@babel/plugin-transform-modules-umd": "^7.24.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
+        "@babel/plugin-transform-new-target": "^7.24.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+        "@babel/plugin-transform-numeric-separator": "^7.24.7",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
+        "@babel/plugin-transform-object-super": "^7.24.7",
+        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.7",
+        "@babel/plugin-transform-parameters": "^7.24.7",
+        "@babel/plugin-transform-private-methods": "^7.24.7",
+        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
+        "@babel/plugin-transform-property-literals": "^7.24.7",
+        "@babel/plugin-transform-regenerator": "^7.24.7",
+        "@babel/plugin-transform-reserved-words": "^7.24.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
+        "@babel/plugin-transform-spread": "^7.24.7",
+        "@babel/plugin-transform-sticky-regex": "^7.24.7",
+        "@babel/plugin-transform-template-literals": "^7.24.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.24.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
+        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.4",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
         "@babel/types": "^7.4.4",
         "esutils": "^2.0.2"
       }
     },
-    "@babel/runtime": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
-      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
+    "@babel/register": {
+      "version": "7.24.6",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.24.6.tgz",
+      "integrity": "sha512-WSuFCc2wCqMeXkz/i3yfAAsxwWflEgbVkZzivgAmXl/MxrXeoYFZOOPllbC8R8WTF7u61wSRQtDVZ1879cdu6w==",
+      "dev": true,
       "requires": {
-        "regenerator-runtime": "^0.13.10"
+        "clone-deep": "^4.0.1",
+        "find-cache-dir": "^2.0.0",
+        "make-dir": "^2.1.0",
+        "pirates": "^4.0.6",
+        "source-map-support": "^0.5.16"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "semver": {
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.21",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        }
       }
     },
-    "@babel/runtime-corejs3": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.1.tgz",
-      "integrity": "sha512-CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg==",
-      "dev": true,
+    "@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
+    },
+    "@babel/runtime": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
+      "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
       "requires": {
-        "core-js-pure": "^3.25.1",
-        "regenerator-runtime": "^0.13.10"
+        "regenerator-runtime": "^0.14.0"
       }
     },
     "@babel/template": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
       "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.18.10",
-        "@babel/types": "^7.18.10"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
       }
     },
     "@babel/traverse": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz",
-      "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==",
-      "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.1",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.1",
-        "@babel/types": "^7.20.0",
-        "debug": "^4.1.0",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
+      "requires": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.6",
+        "@babel/parser": "^7.25.6",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz",
-      "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
       "requires": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@browserstack/ai-sdk-node": {
+      "version": "1.5.8",
+      "resolved": "https://registry.npmjs.org/@browserstack/ai-sdk-node/-/ai-sdk-node-1.5.8.tgz",
+      "integrity": "sha512-34snogSnvskHxUZYOX61ga1/oTlyXwneRtd7Epu2bEdSsRR1rMm8xXhO6DVrLsHPwPHz+ljAlwVwhcE2uKysxw==",
+      "dev": true,
+      "requires": {
+        "axios": "^1.6.2",
+        "uuid": "9.0.1"
+      }
+    },
     "@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
       "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
       "dev": true
     },
+    "@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true
+    },
+    "@es-joy/jsdoccomment": {
+      "version": "0.43.1",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.43.1.tgz",
+      "integrity": "sha512-I238eDtOolvCuvtxrnqtlBaw0BwdQuYqK7eA6XIonicMdOOOb75mqdIzkGDUbS04+1Di007rgm9snFRNeVrOog==",
+      "dev": true,
+      "requires": {
+        "@types/eslint": "^8.56.5",
+        "@types/estree": "^1.0.5",
+        "@typescript-eslint/types": "^7.2.0",
+        "comment-parser": "1.4.1",
+        "esquery": "^1.5.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
+      }
+    },
+    "@esbuild/aix-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
+      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
+      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
+      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
+      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
+      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
+      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
+      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
+      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
+      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
+      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
+      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-mips64el": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
+      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
+      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-riscv64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
+      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-s390x": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
+      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
+      "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/netbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openbsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/sunos-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
+      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
+      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
+      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
+      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
+      "dev": true,
+      "optional": true
+    },
     "@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -26375,9 +29472,9 @@
           }
         },
         "globals": {
-          "version": "13.17.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+          "version": "13.24.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -26522,6 +29619,260 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
+    "@inquirer/checkbox": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.4.7.tgz",
+      "integrity": "sha512-5YwCySyV1UEgqzz34gNsC38eKxRBtlRDpJLlKcRtTjlYA/yDKuc1rfw+hjw+2WJxbAZtaDPsRl5Zk7J14SBoBw==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.2",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/confirm": {
+      "version": "3.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz",
+      "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2"
+      }
+    },
+    "@inquirer/core": {
+      "version": "9.0.10",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz",
+      "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==",
+      "dev": true,
+      "requires": {
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.2",
+        "@types/mute-stream": "^0.0.4",
+        "@types/node": "^22.1.0",
+        "@types/wrap-ansi": "^3.0.0",
+        "ansi-escapes": "^4.3.2",
+        "cli-spinners": "^2.9.2",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^1.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "22.4.1",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-22.4.1.tgz",
+          "integrity": "sha512-1tbpb9325+gPnKK0dMm+/LMriX0vKxf6RnB0SZUqfyVkQ4fMgUSySqhxE/y8Jvs4NyF1yHzTfG9KlnkIODxPKg==",
+          "dev": true,
+          "requires": {
+            "undici-types": "~6.19.2"
+          }
+        },
+        "cli-spinners": {
+          "version": "2.9.2",
+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+          "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+          "dev": true
+        },
+        "signal-exit": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        },
+        "undici-types": {
+          "version": "6.19.8",
+          "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+          "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+          "dev": true
+        }
+      }
+    },
+    "@inquirer/editor": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.1.22.tgz",
+      "integrity": "sha512-K1QwTu7GCK+nKOVRBp5HY9jt3DXOfPGPr6WRDrPImkcJRelG9UTx2cAtK1liXmibRrzJlTWOwqgWT3k2XnS62w==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2",
+        "external-editor": "^3.1.0"
+      }
+    },
+    "@inquirer/expand": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.1.22.tgz",
+      "integrity": "sha512-wTZOBkzH+ItPuZ3ZPa9lynBsdMp6kQ9zbjVPYEtSBG7UulGjg2kQiAnUjgyG4SlntpTce5bOmXAPvE4sguXjpA==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/figures": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz",
+      "integrity": "sha512-79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA==",
+      "dev": true
+    },
+    "@inquirer/input": {
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.2.9.tgz",
+      "integrity": "sha512-7Z6N+uzkWM7+xsE+3rJdhdG/+mQgejOVqspoW+w0AbSZnL6nq5tGMEVASaYVWbkoSzecABWwmludO2evU3d31g==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2"
+      }
+    },
+    "@inquirer/number": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.0.10.tgz",
+      "integrity": "sha512-kWTxRF8zHjQOn2TJs+XttLioBih6bdc5CcosXIzZsrTY383PXI35DuhIllZKu7CdXFi2rz2BWPN9l0dPsvrQOA==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2"
+      }
+    },
+    "@inquirer/password": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.1.22.tgz",
+      "integrity": "sha512-5Fxt1L9vh3rAKqjYwqsjU4DZsEvY/2Gll+QkqR4yEpy6wvzLxdSgFhUcxfDAOtO4BEoTreWoznC0phagwLU5Kw==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2",
+        "ansi-escapes": "^4.3.2"
+      }
+    },
+    "@inquirer/prompts": {
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz",
+      "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==",
+      "dev": true,
+      "requires": {
+        "@inquirer/checkbox": "^2.4.7",
+        "@inquirer/confirm": "^3.1.22",
+        "@inquirer/editor": "^2.1.22",
+        "@inquirer/expand": "^2.1.22",
+        "@inquirer/input": "^2.2.9",
+        "@inquirer/number": "^1.0.10",
+        "@inquirer/password": "^2.1.22",
+        "@inquirer/rawlist": "^2.2.4",
+        "@inquirer/search": "^1.0.7",
+        "@inquirer/select": "^2.4.7"
+      }
+    },
+    "@inquirer/rawlist": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.2.4.tgz",
+      "integrity": "sha512-pb6w9pWrm7EfnYDgQObOurh2d2YH07+eDo3xQBsNAM2GRhliz6wFXGi1thKQ4bN6B0xDd6C3tBsjdr3obsCl3Q==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/search": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.0.7.tgz",
+      "integrity": "sha512-p1wpV+3gd1eST/o5N3yQpYEdFNCzSP0Klrl+5bfD3cTTz8BGG6nf4Z07aBW0xjlKIj1Rp0y3x/X4cZYi6TfcLw==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/select": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.4.7.tgz",
+      "integrity": "sha512-JH7XqPEkBpNWp3gPCqWqY8ECbyMoFcCZANlL6pV9hf59qK6dGmkOlx1ydyhY+KZ0c5X74+W6Mtp+nm2QX0/MAQ==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.2",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/type": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.2.tgz",
+      "integrity": "sha512-w9qFkumYDCNyDZmNQjf/n6qQuvQ4dMC3BJesY4oF+yr0CxR5vxujflAVeIcS6U336uzi9GM0kAfZlLrZ9UTkpA==",
+      "dev": true,
+      "requires": {
+        "mute-stream": "^1.0.0"
+      }
+    },
+    "@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+          "dev": true,
+          "requires": {
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
+          }
+        },
+        "wrap-ansi": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+          "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^6.1.0",
+            "string-width": "^5.0.1",
+            "strip-ansi": "^7.0.1"
+          }
+        }
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -26541,16 +29892,35 @@
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true
     },
+    "@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dev": true,
+      "requires": {
+        "jest-get-type": "^29.6.3"
+      }
+    },
+    "@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
+      "requires": {
+        "@sinclair/typebox": "^0.27.8"
+      }
+    },
     "@jest/types": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "requires": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^15.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "dependencies": {
@@ -26606,86 +29976,189 @@
       }
     },
     "@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "requires": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="
     },
     "@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
     },
     "@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "requires": {
+        "eslint-scope": "5.1.1"
+      }
+    },
+    "@open-draft/until": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-1.0.3.tgz",
+      "integrity": "sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==",
+      "dev": true
+    },
+    "@percy/appium-app": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@percy/appium-app/-/appium-app-2.0.6.tgz",
+      "integrity": "sha512-0NT8xgaq4UOhcqVc4H3D440M7H5Zko8mDpY5j30TRpjOQ3ctLPJalmUVKOCFv4rSzjd2LmyE2F9KXTPA3zqQsw==",
+      "dev": true,
+      "requires": {
+        "@percy/sdk-utils": "^1.28.2",
+        "tmp": "^0.2.1"
+      }
+    },
+    "@percy/sdk-utils": {
+      "version": "1.28.7",
+      "resolved": "https://registry.npmjs.org/@percy/sdk-utils/-/sdk-utils-1.28.7.tgz",
+      "integrity": "sha512-LIhfHnkcS0fyIdo3gvKn7rwodZjbEtyLkgiDRSRulcBOatI2mhn2Bh269sXXiiFTyAW2BDQjyE3DWc4hkGbsbQ==",
+      "dev": true
+    },
+    "@percy/selenium-webdriver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@percy/selenium-webdriver/-/selenium-webdriver-2.0.5.tgz",
+      "integrity": "sha512-bNj52xQm02dY872loFa+8OwyuGcdYHYvCKflmSEsF9EDRiSDj0Wr+XP+DDIgDAl9xXschA7OOdXCLTWV4zEQWA==",
+      "dev": true,
+      "requires": {
+        "@percy/sdk-utils": "^1.28.0",
+        "node-request-interceptor": "^0.6.3"
+      }
+    },
+    "@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true
+    },
+    "@pkgr/core": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+      "dev": true
+    },
+    "@polka/url": {
+      "version": "1.0.0-next.25",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
+      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
+      "dev": true
+    },
+    "@promptbook/utils": {
+      "version": "0.50.0-10",
+      "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.50.0-10.tgz",
+      "integrity": "sha512-Z94YoY/wcZb5m1QoXgmIC1rVeDguGK5bWmUTYdWCqh/LHVifRdJ1C+tBzS0h+HMOD0XzMjZhBQ/mBgTZ/QNW/g==",
+      "dev": true,
+      "requires": {
+        "moment": "2.30.1",
+        "prettier": "2.8.1",
+        "spacetrim": "0.11.25"
+      }
+    },
+    "@puppeteer/browsers": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.9.1.tgz",
+      "integrity": "sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==",
       "dev": true,
       "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "debug": "4.3.4",
+        "extract-zip": "2.0.1",
+        "progress": "2.0.3",
+        "proxy-agent": "6.3.1",
+        "tar-fs": "3.0.4",
+        "unbzip2-stream": "1.4.3",
+        "yargs": "17.7.2"
       },
       "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
-            "@jridgewell/set-array": "^1.0.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
+            "ms": "2.1.2"
+          }
+        },
+        "yargs": {
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+          "dev": true,
+          "requires": {
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
           }
         }
       }
     },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
-      "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      }
+    "@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true
     },
-    "@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "dev": true,
-      "requires": {
-        "eslint-scope": "5.1.1"
-      }
+    "@sec-ant/readable-stream": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
+      "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
+      "dev": true
     },
-    "@polka/url": {
-      "version": "1.0.0-next.21",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
-      "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
+    "@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
       "dev": true
     },
-    "@sindresorhus/is": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+    "@sindresorhus/merge-streams": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz",
+      "integrity": "sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==",
       "dev": true
     },
     "@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
@@ -26712,44 +30185,23 @@
       }
     },
     "@sinonjs/text-encoding": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
-      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz",
+      "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==",
       "dev": true
     },
     "@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
       "dev": true
     },
-    "@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "dev": true,
-      "requires": {
-        "defer-to-connect": "^2.0.0"
-      }
-    },
-    "@types/aria-query": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
-      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
+    "@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
       "dev": true
     },
-    "@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-      "dev": true,
-      "requires": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
-      }
-    },
     "@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -26757,65 +30209,37 @@
       "dev": true
     },
     "@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "version": "2.8.17",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
+      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/debug": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
-      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
       "dev": true,
       "requires": {
         "@types/ms": "*"
       }
     },
-    "@types/diff": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.2.tgz",
-      "integrity": "sha512-uw8eYMIReOwstQ0QKF0sICefSy8cNO/v7gOTiIy9SbwuHyEecJUm7qlgueOO5S1udZ5I/irVydHVwMchgzbKTg==",
-      "dev": true
-    },
-    "@types/easy-table": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-0.0.33.tgz",
-      "integrity": "sha512-/vvqcJPmZUfQwCgemL0/34G7bIQnCuvgls379ygRlcC1FqNqk3n+VZ15dAO51yl6JNDoWd8vsk+kT8zfZ1VZSw==",
-      "dev": true
-    },
-    "@types/ejs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.1.tgz",
-      "integrity": "sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==",
-      "dev": true
-    },
     "@types/eslint": {
-      "version": "8.4.9",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz",
-      "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==",
+      "version": "8.56.10",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz",
+      "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
       "dev": true,
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
-    "@types/eslint-scope": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-      "dev": true,
-      "requires": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
       "dev": true
     },
     "@types/expect": {
@@ -26825,85 +30249,54 @@
       "dev": true
     },
     "@types/extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha512-R1g/VyKFFI2HLC1QGAeTtCBWCo6n75l41OnsVYNbmKG+kempOESaodf6BeJyUM3Q0rKa/NQcTHbB2+66lNnxLw==",
-      "dev": true
-    },
-    "@types/fibers": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@types/fibers/-/fibers-3.1.1.tgz",
-      "integrity": "sha512-yHoUi46uika0snoTpNcVqUSvgbRndaIps4TUCotrXjtc0DHDoPQckmyXEZ2bX3e4mpJmyEW3hRhCwQa/ISCPaA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.4.tgz",
+      "integrity": "sha512-ArMouDUTJEz1SQRpFsT2rIw7DeqICFv5aaVzLSIYMYQSLcwcGOfT3VyglQs/p7K3F7fT4zxr0NWxYZIdifD6dA==",
       "dev": true
     },
-    "@types/fs-extra": {
-      "version": "9.0.13",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
-      "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/github-slugger": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@types/github-slugger/-/github-slugger-1.3.0.tgz",
-      "integrity": "sha512-J/rMZa7RqiH/rT29TEVZO4nBoDP9XJOjnbbIofg7GQKs4JIduEO3WLpte+6WeUz/TcrXKlY+bM7FYrp8yFB+3g==",
+    "@types/gitconfiglocal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/gitconfiglocal/-/gitconfiglocal-2.0.3.tgz",
+      "integrity": "sha512-W6hyZux6TrtKfF2I9XNLVcsFr4xRr0T+S6hrJ9nDkhA2vzsFPIEAbnY4vgb6v2yKXQ9MJVcbLsARNlMfg4EVtQ==",
       "dev": true
     },
     "@types/hast": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
-      "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "*"
-      }
-    },
-    "@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-      "dev": true
-    },
-    "@types/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
+      "integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==",
       "dev": true,
       "requires": {
-        "@types/through": "*",
-        "rxjs": "^6.4.0"
+        "@types/unist": "^2"
       }
     },
     "@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
       "dev": true
     },
     "@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "*"
       }
     },
     "@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "dev": true
     },
     "@types/json5": {
@@ -26912,166 +30305,91 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
-    "@types/keyv": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-4.2.0.tgz",
-      "integrity": "sha512-xoBtGl5R9jeKUhc8ZqeYaRDx04qqJ10yhhXYGmJ4Jr8qKpvMsDQQrNUvF/wUJ4klOtmJeJM+p2Xo3zp9uaC3tw==",
-      "dev": true,
-      "requires": {
-        "keyv": "*"
-      }
-    },
-    "@types/lodash": {
-      "version": "4.14.187",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.187.tgz",
-      "integrity": "sha512-MrO/xLXCaUgZy3y96C/iOsaIqZSeupyTImKClHunL5GrmaiII2VwvWmLBu2hwa0Kp0sV19CsyjtrTc/Fx8rg/A==",
-      "dev": true
-    },
-    "@types/lodash.flattendeep": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.7.tgz",
-      "integrity": "sha512-1h6GW/AeZw/Wej6uxrqgmdTDZX1yFS39lRsXYkg+3kWvOWWrlGCI6H7lXxlUHOzxDT4QeYGmgPpQ3BX9XevzOg==",
-      "dev": true,
-      "requires": {
-        "@types/lodash": "*"
-      }
-    },
-    "@types/lodash.pickby": {
-      "version": "4.6.7",
-      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.7.tgz",
-      "integrity": "sha512-4ebXRusuLflfscbD0PUX4eVknDHD9Yf+uMtBIvA/hrnTqeAzbuHuDjvnYriLjUrI9YrhCPVKUf4wkRSXJQ6gig==",
-      "dev": true,
-      "requires": {
-        "@types/lodash": "*"
-      }
-    },
-    "@types/lodash.union": {
-      "version": "4.6.7",
-      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.7.tgz",
-      "integrity": "sha512-6HXM6tsnHJzKgJE0gA/LhTGf/7AbjUk759WZ1MziVm+OBNAATHhdgj+a3KVE8g76GCLAnN4ZEQQG1EGgtBIABA==",
-      "dev": true,
-      "requires": {
-        "@types/lodash": "*"
-      }
-    },
     "@types/mdast": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
-      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
+      "version": "3.0.15",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz",
+      "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==",
       "dev": true,
       "requires": {
-        "@types/unist": "*"
+        "@types/unist": "^2"
       }
     },
     "@types/mocha": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz",
-      "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==",
+      "version": "10.0.6",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz",
+      "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==",
       "dev": true
     },
     "@types/ms": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
-      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "17.0.45",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
-      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
-      "dev": true
-    },
-    "@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "@types/object-inspect": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.8.1.tgz",
-      "integrity": "sha512-0JTdf3CGV0oWzE6Wa40Ayv2e2GhpP3pEJMcrlM74vBSJPuuNkVwfDnl0SZxyFCXETcB4oKA/MpTVfuYSMOelBg==",
+      "version": "0.7.34",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
+      "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==",
       "dev": true
     },
-    "@types/puppeteer": {
-      "version": "5.4.7",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.7.tgz",
-      "integrity": "sha512-JdGWZZYL0vKapXF4oQTC5hLVNfOgdPrqeZ1BiQnGk5cB7HeE91EWUiTdVSdQPobRN8rIcdffjiOgCYJ/S8QrnQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/recursive-readdir": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.1.tgz",
-      "integrity": "sha512-Xd+Ptc4/F2ueInqy5yK2FI5FxtwwbX2+VZpcg+9oYsFJVen8qQKGapCr+Bi5wQtHU1cTXT8s+07lo/nKPgu8Gg==",
+    "@types/mute-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
+      "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
-    "@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+    "@types/node": {
+      "version": "20.14.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz",
+      "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
       "dev": true,
       "requires": {
-        "@types/node": "*"
+        "undici-types": "~5.26.4"
       }
     },
-    "@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+    "@types/normalize-package-data": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
       "dev": true
     },
-    "@types/stream-buffers": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.4.tgz",
-      "integrity": "sha512-qU/K1tb2yUdhXkLIATzsIPwbtX6BpZk0l3dPW6xqWyhfzzM1ECaQ/8faEnu3CNraLiQ9LHyQQPBGp7N9Fbs25w==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
+    "@types/parse5": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz",
+      "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==",
+      "dev": true
     },
-    "@types/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
+    "@types/sinonjs__fake-timers": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz",
+      "integrity": "sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ==",
       "dev": true
     },
-    "@types/through": {
-      "version": "0.0.30",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
-      "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
+    "@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true
     },
-    "@types/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==",
+    "@types/supports-color": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.3.tgz",
+      "integrity": "sha512-Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg==",
       "dev": true
     },
-    "@types/ua-parser-js": {
-      "version": "0.7.36",
-      "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz",
-      "integrity": "sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ==",
+    "@types/triple-beam": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz",
+      "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
       "dev": true
     },
     "@types/unist": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
-      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz",
+      "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==",
       "dev": true
     },
     "@types/vinyl": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz",
-      "integrity": "sha512-ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz",
+      "integrity": "sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==",
       "dev": true,
       "requires": {
         "@types/expect": "^1.20.4",
@@ -27079,54 +30397,69 @@
       }
     },
     "@types/which": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.2.tgz",
-      "integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw==",
+      "dev": true
+    },
+    "@types/wrap-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
+      "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==",
       "dev": true
     },
+    "@types/ws": {
+      "version": "8.5.12",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
+      "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/yargs": {
-      "version": "15.0.14",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
-      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
       "dev": true
     },
     "@types/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "dev": true,
       "optional": true,
       "requires": {
         "@types/node": "*"
       }
     },
-    "@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+    "@typescript-eslint/types": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.15.0.tgz",
+      "integrity": "sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==",
       "dev": true
     },
     "@videojs/http-streaming": {
-      "version": "2.14.3",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.3.tgz",
-      "integrity": "sha512-2tFwxCaNbcEZzQugWf8EERwNMyNtspfHnvxRGRABQs09W/5SqmkWFuGWfUAm4wQKlXGfdPyAJ1338ASl459xAA==",
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.16.3.tgz",
+      "integrity": "sha512-91CJv5PnFBzNBvyEjt+9cPzTK/xoVixARj2g7ZAvItA+5bx8VKdk5RxCz/PP2kdzz9W+NiDUMPkdmTsosmy69Q==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
         "@videojs/vhs-utils": "3.0.5",
         "aes-decrypter": "3.1.3",
         "global": "^4.4.0",
-        "m3u8-parser": "4.7.1",
-        "mpd-parser": "0.21.1",
+        "m3u8-parser": "4.8.0",
+        "mpd-parser": "^0.22.1",
         "mux.js": "6.0.1",
         "video.js": "^6 || ^7"
       }
@@ -27153,2003 +30486,1783 @@
         "is-function": "^1.0.1"
       }
     },
-    "@vue/compiler-core": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz",
-      "integrity": "sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==",
+    "@vitest/pretty-format": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.5.tgz",
+      "integrity": "sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.41",
-        "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        }
+        "tinyrainbow": "^1.2.0"
       }
     },
-    "@vue/compiler-dom": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz",
-      "integrity": "sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==",
+    "@vitest/snapshot": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz",
+      "integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "@vue/compiler-core": "3.2.41",
-        "@vue/shared": "3.2.41"
+        "magic-string": "^0.30.5",
+        "pathe": "^1.1.1",
+        "pretty-format": "^29.7.0"
       }
     },
-    "@vue/compiler-sfc": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz",
-      "integrity": "sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==",
+    "@vue/compiler-core": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+      "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
       "dev": true,
       "optional": true,
       "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.41",
-        "@vue/compiler-dom": "3.2.41",
-        "@vue/compiler-ssr": "3.2.41",
-        "@vue/reactivity-transform": "3.2.41",
-        "@vue/shared": "3.2.41",
+        "@babel/parser": "^7.24.4",
+        "@vue/shared": "3.4.27",
+        "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
-        "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        }
+        "source-map-js": "^1.2.0"
       }
     },
-    "@vue/compiler-ssr": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz",
-      "integrity": "sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==",
+    "@vue/compiler-dom": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+      "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
       "dev": true,
       "optional": true,
       "requires": {
-        "@vue/compiler-dom": "3.2.41",
-        "@vue/shared": "3.2.41"
+        "@vue/compiler-core": "3.4.27",
+        "@vue/shared": "3.4.27"
       }
     },
-    "@vue/reactivity-transform": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz",
-      "integrity": "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==",
+    "@vue/compiler-sfc": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+      "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
       "dev": true,
       "optional": true,
       "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.41",
-        "@vue/shared": "3.2.41",
+        "@babel/parser": "^7.24.4",
+        "@vue/compiler-core": "3.4.27",
+        "@vue/compiler-dom": "3.4.27",
+        "@vue/compiler-ssr": "3.4.27",
+        "@vue/shared": "3.4.27",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
+        "magic-string": "^0.30.10",
+        "postcss": "^8.4.38",
+        "source-map-js": "^1.2.0"
       }
     },
-    "@vue/shared": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz",
-      "integrity": "sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==",
-      "dev": true,
-      "optional": true
-    },
-    "@wdio/browserstack-service": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-7.16.16.tgz",
-      "integrity": "sha512-q4wUh/j0MR2SwhTkmIFif2DaXgH5yzdgOer6G/fac2n81zLCSpQHWO5aQ9T0An9CAd4L2A+t3dmChpBJPkHWSw==",
+    "@vue/compiler-ssr": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+      "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "@types/node": "^17.0.4",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "browserstack-local": "^1.4.5",
-        "got": "^11.0.2",
-        "webdriverio": "7.16.16"
-      },
-      "dependencies": {
-        "@wdio/config": {
-          "version": "7.16.16",
-          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.16.16.tgz",
-          "integrity": "sha512-K/ObPuo6Da2liz++OKOIfbdpFwI7UWiFcBylfJkCYbweuXCoW1aUqlKI6rmKPwCH9Uqr/RHWu6p8eo0zWe6xVA==",
-          "dev": true,
-          "requires": {
-            "@wdio/logger": "7.16.0",
-            "@wdio/types": "7.16.14",
-            "deepmerge": "^4.0.0",
-            "glob": "^7.1.2"
-          }
-        },
-        "@wdio/protocols": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.16.7.tgz",
-          "integrity": "sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==",
-          "dev": true
-        },
-        "@wdio/repl": {
-          "version": "7.16.14",
-          "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.16.14.tgz",
-          "integrity": "sha512-Ezih0Y+lsGkKv3H3U56hdWgZiQGA3VaAYguSLd9+g1xbQq+zMKqSmfqECD9bAy+OgCCiVTRstES6lHZxJVPhAg==",
-          "dev": true,
-          "requires": {
-            "@wdio/utils": "7.16.14"
-          }
-        },
-        "@wdio/utils": {
-          "version": "7.16.14",
-          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.16.14.tgz",
-          "integrity": "sha512-wwin8nVpIlhmXJkq6GJw9aDDzgLOJKgXTcEua0T2sdXjoW78u5Ly/GZrFXTjMGhacFvoZfitTrjyfyy4CxMVvw==",
-          "dev": true,
-          "requires": {
-            "@wdio/logger": "7.16.0",
-            "@wdio/types": "7.16.14",
-            "p-iteration": "^1.1.8"
-          }
-        },
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "devtools": {
-          "version": "7.16.16",
-          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
-          "integrity": "sha512-M0kzkuSgfEhpqIis3gdtWsNjn/HQ+vRAmEzDnbYx/7FfjFxhSv1d+rOOT20pvd60soItMYpsOova1igACEGkGQ==",
-          "dev": true,
-          "requires": {
-            "@types/node": "^17.0.4",
-            "@types/ua-parser-js": "^0.7.33",
-            "@wdio/config": "7.16.16",
-            "@wdio/logger": "7.16.0",
-            "@wdio/protocols": "7.16.7",
-            "@wdio/types": "7.16.14",
-            "@wdio/utils": "7.16.14",
-            "chrome-launcher": "^0.15.0",
-            "edge-paths": "^2.1.0",
-            "puppeteer-core": "^13.1.3",
-            "query-selector-shadow-dom": "^1.0.0",
-            "ua-parser-js": "^1.0.1",
-            "uuid": "^8.0.0"
-          }
-        },
-        "devtools-protocol": {
-          "version": "0.0.973690",
-          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.973690.tgz",
-          "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        },
-        "ua-parser-js": {
-          "version": "1.0.33",
-          "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.33.tgz",
-          "integrity": "sha512-RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ==",
-          "dev": true
-        },
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-          "dev": true
-        },
-        "webdriver": {
-          "version": "7.16.16",
-          "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.16.16.tgz",
-          "integrity": "sha512-x8UoG9k/P8KDrfSh1pOyNevt9tns3zexoMxp9cKnyA/7HYSErhZYTLGlgxscAXLtQG41cMH/Ba/oBmOx7Hgd8w==",
-          "dev": true,
-          "requires": {
-            "@types/node": "^17.0.4",
-            "@wdio/config": "7.16.16",
-            "@wdio/logger": "7.16.0",
-            "@wdio/protocols": "7.16.7",
-            "@wdio/types": "7.16.14",
-            "@wdio/utils": "7.16.14",
-            "got": "^11.0.2",
-            "ky": "^0.29.0",
-            "lodash.merge": "^4.6.1"
-          }
-        },
-        "webdriverio": {
-          "version": "7.16.16",
-          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.16.16.tgz",
-          "integrity": "sha512-caPaEWyuD3Qoa7YkW4xCCQA4v9Pa9wmhFGPvNZh3ERtjMCNi8L/XXOdkekWNZmFh3tY0kFguBj7+fAwSY7HAGw==",
-          "dev": true,
-          "requires": {
-            "@types/aria-query": "^5.0.0",
-            "@types/node": "^17.0.4",
-            "@wdio/config": "7.16.16",
-            "@wdio/logger": "7.16.0",
-            "@wdio/protocols": "7.16.7",
-            "@wdio/repl": "7.16.14",
-            "@wdio/types": "7.16.14",
-            "@wdio/utils": "7.16.14",
-            "archiver": "^5.0.0",
-            "aria-query": "^5.0.0",
-            "css-shorthand-properties": "^1.1.1",
-            "css-value": "^0.0.1",
-            "devtools": "7.16.16",
-            "devtools-protocol": "^0.0.973690",
-            "fs-extra": "^10.0.0",
-            "get-port": "^5.1.1",
-            "grapheme-splitter": "^1.0.2",
-            "lodash.clonedeep": "^4.5.0",
-            "lodash.isobject": "^3.0.2",
-            "lodash.isplainobject": "^4.0.6",
-            "lodash.zip": "^4.2.0",
-            "minimatch": "^5.0.0",
-            "puppeteer-core": "^13.1.3",
-            "query-selector-shadow-dom": "^1.0.0",
-            "resq": "^1.9.1",
-            "rgb2hex": "0.2.5",
-            "serialize-error": "^8.0.0",
-            "webdriver": "7.16.16"
-          }
-        }
-      }
-    },
-    "@wdio/cli": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.5.7.tgz",
-      "integrity": "sha512-nOQJLskrY+UECDd3NxE7oBzb6cDA7e7x02YWQugOlOgnZ4a+PJmkFoSsO8C2uNCpdFngy5rJKGUo5vbtAHEF9Q==",
-      "dev": true,
-      "requires": {
-        "@types/ejs": "^3.0.5",
-        "@types/fs-extra": "^9.0.4",
-        "@types/inquirer": "^7.3.1",
-        "@types/lodash.flattendeep": "^4.4.6",
-        "@types/lodash.pickby": "^4.6.6",
-        "@types/lodash.union": "^4.6.6",
-        "@types/recursive-readdir": "^2.2.0",
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "async-exit-hook": "^2.0.1",
-        "chalk": "^4.0.0",
-        "chokidar": "^3.0.0",
-        "cli-spinners": "^2.1.0",
-        "ejs": "^3.0.1",
-        "fs-extra": "^10.0.0",
-        "inquirer": "^8.0.0",
-        "lodash.flattendeep": "^4.4.0",
-        "lodash.pickby": "^4.6.0",
-        "lodash.union": "^4.6.0",
-        "mkdirp": "^1.0.4",
-        "recursive-readdir": "^2.2.2",
-        "webdriverio": "7.5.7",
-        "yargs": "^17.0.0",
-        "yarn-install": "^1.0.0"
-      },
-      "dependencies": {
-        "@types/aria-query": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-          "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
-          "dev": true
-        },
-        "@wdio/logger": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
-          "dev": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "loglevel": "^1.6.0",
-            "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
-          "dev": true,
-          "requires": {
-            "got": "^11.8.1"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "aria-query": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.10.2",
-            "@babel/runtime-corejs3": "^7.10.2"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "chrome-launcher": {
-          "version": "0.13.4",
-          "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
-          "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
-          "dev": true,
-          "requires": {
-            "@types/node": "*",
-            "escape-string-regexp": "^1.0.5",
-            "is-wsl": "^2.2.0",
-            "lighthouse-logger": "^1.0.0",
-            "mkdirp": "^0.5.3",
-            "rimraf": "^3.0.2"
-          },
-          "dependencies": {
-            "mkdirp": {
-              "version": "0.5.6",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-              "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-              "dev": true,
-              "requires": {
-                "minimist": "^1.2.6"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "devtools": {
-          "version": "7.5.7",
-          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
-          "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
-          "dev": true,
-          "requires": {
-            "@wdio/config": "7.5.3",
-            "@wdio/logger": "7.5.3",
-            "@wdio/protocols": "7.5.3",
-            "@wdio/types": "7.5.3",
-            "@wdio/utils": "7.5.3",
-            "chrome-launcher": "^0.13.1",
-            "edge-paths": "^2.1.0",
-            "puppeteer-core": "^9.1.0",
-            "query-selector-shadow-dom": "^1.0.0",
-            "ua-parser-js": "^0.7.21",
-            "uuid": "^8.0.0"
-          }
-        },
-        "devtools-protocol": {
-          "version": "0.0.878340",
-          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
-          "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "puppeteer-core": {
-          "version": "9.1.1",
-          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
-          "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.1.0",
-            "devtools-protocol": "0.0.869402",
-            "extract-zip": "^2.0.0",
-            "https-proxy-agent": "^5.0.0",
-            "node-fetch": "^2.6.1",
-            "pkg-dir": "^4.2.0",
-            "progress": "^2.0.1",
-            "proxy-from-env": "^1.1.0",
-            "rimraf": "^3.0.2",
-            "tar-fs": "^2.0.0",
-            "unbzip2-stream": "^1.3.3",
-            "ws": "^7.2.3"
-          },
-          "dependencies": {
-            "devtools-protocol": {
-              "version": "0.0.869402",
-              "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
-              "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-          "dev": true
-        },
-        "webdriverio": {
-          "version": "7.5.7",
-          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
-          "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
-          "dev": true,
-          "requires": {
-            "@types/aria-query": "^4.2.1",
-            "@wdio/config": "7.5.3",
-            "@wdio/logger": "7.5.3",
-            "@wdio/protocols": "7.5.3",
-            "@wdio/repl": "7.5.3",
-            "@wdio/types": "7.5.3",
-            "@wdio/utils": "7.5.3",
-            "archiver": "^5.0.0",
-            "aria-query": "^4.2.2",
-            "atob": "^2.1.2",
-            "css-shorthand-properties": "^1.1.1",
-            "css-value": "^0.0.1",
-            "devtools": "7.5.7",
-            "devtools-protocol": "^0.0.878340",
-            "fs-extra": "^10.0.0",
-            "get-port": "^5.1.1",
-            "grapheme-splitter": "^1.0.2",
-            "lodash.clonedeep": "^4.5.0",
-            "lodash.isobject": "^3.0.2",
-            "lodash.isplainobject": "^4.0.6",
-            "lodash.zip": "^4.2.0",
-            "minimatch": "^3.0.4",
-            "puppeteer-core": "^9.1.0",
-            "query-selector-shadow-dom": "^1.0.0",
-            "resq": "^1.9.1",
-            "rgb2hex": "0.2.5",
-            "serialize-error": "^8.0.0",
-            "webdriver": "7.5.3"
-          }
-        },
-        "ws": {
-          "version": "7.5.9",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-          "dev": true,
-          "requires": {}
-        },
-        "yargs": {
-          "version": "17.6.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
-          "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
-          "dev": true,
-          "requires": {
-            "cliui": "^8.0.1",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.3",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^21.0.0"
-          }
-        }
+        "@vue/compiler-dom": "3.4.27",
+        "@vue/shared": "3.4.27"
       }
     },
-    "@wdio/concise-reporter": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-7.5.7.tgz",
-      "integrity": "sha512-964i7eQ4sboSla2bdR8714Er82QBgS6u39GmDFX8Izy9Ge38xaE75HuF5S7mnOWGzSojCWgqtwy5k7Rfg6GE3g==",
+    "@vue/shared": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+      "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
       "dev": true,
-      "requires": {
-        "@wdio/reporter": "7.5.7",
-        "@wdio/types": "7.5.3",
-        "chalk": "^4.0.0",
-        "pretty-ms": "^7.0.0"
-      },
-      "dependencies": {
-        "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
-          "dev": true,
-          "requires": {
-            "got": "^11.8.1"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
+      "optional": true
     },
-    "@wdio/config": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.5.3.tgz",
-      "integrity": "sha512-udvVizYoilOxuWj/BmoN6y7ZCd4wPdYNlSfWznrbCezAdaLZ4/pNDOO0WRWx2C4+q1wdkXZV/VuQPUGfL0lEHQ==",
-      "dev": true,
-      "requires": {
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "deepmerge": "^4.0.0",
-        "glob": "^7.1.2"
-      },
-      "dependencies": {
-        "@wdio/logger": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
-          "dev": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "loglevel": "^1.6.0",
-            "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
-          "dev": true,
-          "requires": {
-            "got": "^11.8.1"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "@wdio/browserstack-service": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-9.0.5.tgz",
+      "integrity": "sha512-pJNb9jJwPf+FEwAEnnUc6d9s6/QlvcZbh9NtjO23a/wr3HvXdzhlRHwzUV1RWboDpGsww5PFmtGcIo7GdDQL+g==",
+      "dev": true,
+      "requires": {
+        "@browserstack/ai-sdk-node": "1.5.8",
+        "@percy/appium-app": "^2.0.1",
+        "@percy/selenium-webdriver": "^2.0.3",
+        "@types/gitconfiglocal": "^2.0.1",
+        "@wdio/logger": "9.0.4",
+        "@wdio/reporter": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "browserstack-local": "^1.5.1",
+        "chalk": "^5.3.0",
+        "csv-writer": "^1.6.0",
+        "formdata-node": "5.0.1",
+        "git-repo-info": "^2.1.1",
+        "gitconfiglocal": "^2.1.0",
+        "uuid": "^10.0.0",
+        "webdriverio": "9.0.5",
+        "winston-transport": "^4.5.0",
+        "yauzl": "^3.0.0"
+      },
+      "dependencies": {
+        "@puppeteer/browsers": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+          "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "debug": "^4.3.5",
+            "extract-zip": "^2.0.1",
+            "progress": "^2.0.3",
+            "proxy-agent": "^6.4.0",
+            "semver": "^7.6.3",
+            "tar-fs": "^3.0.6",
+            "unbzip2-stream": "^1.4.3",
+            "yargs": "^17.7.2"
           }
-        }
-      }
-    },
-    "@wdio/local-runner": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.5.7.tgz",
-      "integrity": "sha512-aYc0XUV+/e3cg8Fp+CWlC4FbwSSG3mKAv1iuy/+Hwzg2kJE+aa+Rf2p2BQYc7HPRtKNW0bM8o+aCImZLAiPM+A==",
-      "dev": true,
-      "requires": {
-        "@types/stream-buffers": "^3.0.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/repl": "7.5.3",
-        "@wdio/runner": "7.5.7",
-        "@wdio/types": "7.5.3",
-        "async-exit-hook": "^2.0.1",
-        "split2": "^3.2.2",
-        "stream-buffers": "^3.0.2"
-      },
-      "dependencies": {
+        },
         "@wdio/logger": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+          "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
           "dev": true,
           "requires": {
-            "chalk": "^4.0.0",
+            "chalk": "^5.1.2",
             "loglevel": "^1.6.0",
             "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
+            "strip-ansi": "^7.1.0"
           }
         },
-        "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+        "@wdio/reporter": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-9.0.4.tgz",
+          "integrity": "sha512-g55MiqToKEZ+L5quk7Ddk3m1fKgh2U2rq3zLG8bZUYU+3KFglfRC/Ld5yTso8S1tG4EDgl5HKSN5Bl8I5gncbg==",
           "dev": true,
           "requires": {
-            "got": "^11.8.1"
+            "@types/node": "^20.1.0",
+            "@wdio/logger": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "diff": "^5.0.0",
+            "object-inspect": "^1.12.0"
           }
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "@wdio/types": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+          "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "@types/node": "^20.1.0"
           }
         },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+        "@wdio/utils": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+          "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
+          "dev": true,
+          "requires": {
+            "@puppeteer/browsers": "^2.2.0",
+            "@wdio/logger": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "decamelize": "^6.0.0",
+            "deepmerge-ts": "^7.0.3",
+            "edgedriver": "^5.6.1",
+            "geckodriver": "^4.3.3",
+            "get-port": "^7.0.0",
+            "import-meta-resolve": "^4.0.0",
+            "locate-app": "^2.2.24",
+            "safaridriver": "^0.1.2",
+            "split2": "^4.2.0",
+            "wait-port": "^1.1.0"
+          }
+        },
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "debug": "^4.3.4"
           }
         },
-        "color-convert": {
+        "brace-expansion": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "balanced-match": "^1.0.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "chalk": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
           "dev": true
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "deepmerge-ts": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+          "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "devtools-protocol": {
+          "version": "0.0.1312386",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+          "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "https-proxy-agent": {
+          "version": "7.0.5",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+          "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "agent-base": "^7.0.2",
+            "debug": "4"
           }
-        }
-      }
-    },
-    "@wdio/logger": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.16.0.tgz",
-      "integrity": "sha512-/6lOGb2Iow5eSsy7RJOl1kCwsP4eMlG+/QKro5zUJsuyNJSQXf2ejhpkzyKWLgQbHu83WX6cM1014AZuLkzoQg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        },
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "brace-expansion": "^2.0.1"
           }
         },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+        "proxy-agent": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+          "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "agent-base": "^7.0.2",
+            "debug": "^4.3.4",
+            "http-proxy-agent": "^7.0.1",
+            "https-proxy-agent": "^7.0.3",
+            "lru-cache": "^7.14.1",
+            "pac-proxy-agent": "^7.0.1",
+            "proxy-from-env": "^1.1.0",
+            "socks-proxy-agent": "^8.0.2"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "puppeteer-core": {
+          "version": "22.15.0",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz",
+          "integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "@puppeteer/browsers": "2.3.0",
+            "chromium-bidi": "0.6.3",
+            "debug": "^4.3.6",
+            "devtools-protocol": "0.0.1312386",
+            "ws": "^8.18.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
           "dev": true
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "tar-fs": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+          "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+          "dev": true,
+          "requires": {
+            "bare-fs": "^2.1.1",
+            "bare-path": "^2.1.0",
+            "pump": "^3.0.0",
+            "tar-stream": "^3.1.5"
+          }
+        },
+        "uuid": {
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+          "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "webdriverio": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.5.tgz",
+          "integrity": "sha512-80zhuLBT5W5wiLNZ0maT1cVUrxmwpMuBgCprwZjI8lFe+KUhGLClrJXud/RrVT9x9rDCYa6pGCtQ4UqA+2U+sw==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^20.11.30",
+            "@types/sinonjs__fake-timers": "^8.1.5",
+            "@wdio/config": "9.0.5",
+            "@wdio/logger": "9.0.4",
+            "@wdio/protocols": "9.0.4",
+            "@wdio/repl": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "@wdio/utils": "9.0.5",
+            "archiver": "^7.0.1",
+            "aria-query": "^5.3.0",
+            "cheerio": "^1.0.0-rc.12",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "grapheme-splitter": "^1.0.4",
+            "htmlfy": "^0.2.1",
+            "import-meta-resolve": "^4.0.0",
+            "is-plain-obj": "^4.1.0",
+            "jszip": "^3.10.1",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^9.0.3",
+            "query-selector-shadow-dom": "^1.0.1",
+            "resq": "^1.11.0",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^11.0.3",
+            "urlpattern-polyfill": "^10.0.0",
+            "webdriver": "9.0.5"
+          }
+        },
+        "ws": {
+          "version": "8.18.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+          "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {}
+        },
+        "yargs": {
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
           }
         }
       }
     },
-    "@wdio/mocha-framework": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.5.3.tgz",
-      "integrity": "sha512-96QCVWsiyZxEgOZP3oTq2B2T7zne5dCdehLa2n4q/BLjk96Rj0jifidJZfd/1+vdNPKX0gWWAzpy98Znn8MVMw==",
-      "dev": true,
-      "requires": {
-        "@types/mocha": "^8.0.0",
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "expect-webdriverio": "^2.0.0",
-        "mocha": "^8.0.1"
+    "@wdio/cli": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.0.5.tgz",
+      "integrity": "sha512-D/QBlodNIdxuNpUPbuhk+mLidVLT+Vsb0Q0Fd4lh57Jy8kw5nJ56ykqiI0WE1oI0i+XtyJ7iFOPUztuCjjhX3A==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^20.1.1",
+        "@vitest/snapshot": "^1.2.1",
+        "@wdio/config": "9.0.5",
+        "@wdio/globals": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/protocols": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "async-exit-hook": "^2.0.1",
+        "chalk": "^5.2.0",
+        "chokidar": "^3.5.3",
+        "cli-spinners": "^3.0.0",
+        "dotenv": "^16.3.1",
+        "ejs": "^3.1.9",
+        "execa": "^9.2.0",
+        "import-meta-resolve": "^4.0.0",
+        "inquirer": "^10.1.8",
+        "lodash.flattendeep": "^4.4.0",
+        "lodash.pickby": "^4.6.0",
+        "lodash.union": "^4.6.0",
+        "read-pkg-up": "^10.0.0",
+        "recursive-readdir": "^2.2.3",
+        "tsx": "^4.7.2",
+        "webdriverio": "9.0.5",
+        "yargs": "^17.7.2"
       },
       "dependencies": {
+        "@puppeteer/browsers": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
+          "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.6",
+            "extract-zip": "^2.0.1",
+            "progress": "^2.0.3",
+            "proxy-agent": "^6.4.0",
+            "semver": "^7.6.3",
+            "tar-fs": "^3.0.6",
+            "unbzip2-stream": "^1.4.3",
+            "yargs": "^17.7.2"
+          }
+        },
         "@wdio/logger": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+          "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
           "dev": true,
           "requires": {
-            "chalk": "^4.0.0",
+            "chalk": "^5.1.2",
             "loglevel": "^1.6.0",
             "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
+            "strip-ansi": "^7.1.0"
           }
         },
         "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+          "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
           "dev": true,
           "requires": {
-            "got": "^11.8.1"
+            "@types/node": "^20.1.0"
           }
         },
-        "ansi-colors": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-          "dev": true
+        "@wdio/utils": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+          "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
+          "dev": true,
+          "requires": {
+            "@puppeteer/browsers": "^2.2.0",
+            "@wdio/logger": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "decamelize": "^6.0.0",
+            "deepmerge-ts": "^7.0.3",
+            "edgedriver": "^5.6.1",
+            "geckodriver": "^4.3.3",
+            "get-port": "^7.0.0",
+            "import-meta-resolve": "^4.0.0",
+            "locate-app": "^2.2.24",
+            "safaridriver": "^0.1.2",
+            "split2": "^4.2.0",
+            "wait-port": "^1.1.0"
+          }
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "debug": "^4.3.4"
           }
         },
-        "argparse": {
+        "brace-expansion": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "balanced-match": "^1.0.0"
           }
         },
-        "chokidar": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+        "chalk": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+          "dev": true
+        },
+        "deepmerge-ts": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+          "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+          "dev": true
+        },
+        "devtools-protocol": {
+          "version": "0.0.1312386",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+          "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
           "dev": true,
-          "requires": {
-            "anymatch": "~3.1.1",
-            "braces": "~3.0.2",
-            "fsevents": "~2.3.1",
-            "glob-parent": "~5.1.0",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.5.0"
-          }
+          "optional": true,
+          "peer": true
         },
-        "cliui": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+        "execa": {
+          "version": "9.4.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-9.4.0.tgz",
+          "integrity": "sha512-yKHlle2YGxZE842MERVIplWwNH5VYmqqcPFgtnlU//K8gxuFFXu0pwd/CrfXTumFpeEiufsP7+opT/bPJa1yVw==",
           "dev": true,
           "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^7.0.0"
+            "@sindresorhus/merge-streams": "^4.0.0",
+            "cross-spawn": "^7.0.3",
+            "figures": "^6.1.0",
+            "get-stream": "^9.0.0",
+            "human-signals": "^8.0.0",
+            "is-plain-obj": "^4.1.0",
+            "is-stream": "^4.0.1",
+            "npm-run-path": "^6.0.0",
+            "pretty-ms": "^9.0.0",
+            "signal-exit": "^4.1.0",
+            "strip-final-newline": "^4.0.0",
+            "yoctocolors": "^2.0.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "get-stream": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
+          "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "@sec-ant/readable-stream": "^0.4.1",
+            "is-stream": "^4.0.1"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+        "https-proxy-agent": {
+          "version": "7.0.5",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+          "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "agent-base": "^7.0.2",
+            "debug": "4"
           }
         },
-        "diff": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-          "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+        "is-stream": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
+          "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
           "dev": true
         },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
           "dev": true
         },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+        "minimatch": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
           "dev": true,
           "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
+            "brace-expansion": "^2.0.1"
           }
         },
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+        "npm-run-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
+          "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "path-key": "^4.0.0",
+            "unicorn-magic": "^0.3.0"
           }
         },
-        "has-flag": {
+        "parse-ms": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
+          "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
           "dev": true
         },
-        "js-yaml": {
+        "path-key": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
-          "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+          "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+          "dev": true
         },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+        "pretty-ms": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz",
+          "integrity": "sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==",
           "dev": true,
           "requires": {
-            "p-locate": "^5.0.0"
+            "parse-ms": "^4.0.0"
           }
         },
-        "log-symbols": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
-          "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+        "proxy-agent": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+          "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
           "dev": true,
           "requires": {
-            "chalk": "^4.0.0"
+            "agent-base": "^7.0.2",
+            "debug": "^4.3.4",
+            "http-proxy-agent": "^7.0.1",
+            "https-proxy-agent": "^7.0.3",
+            "lru-cache": "^7.14.1",
+            "pac-proxy-agent": "^7.0.1",
+            "proxy-from-env": "^1.1.0",
+            "socks-proxy-agent": "^8.0.2"
           }
         },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+        "puppeteer-core": {
+          "version": "22.15.0",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz",
+          "integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "mocha": {
-          "version": "8.4.0",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
-          "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
-          "dev": true,
-          "requires": {
-            "@ungap/promise-all-settled": "1.1.2",
-            "ansi-colors": "4.1.1",
-            "browser-stdout": "1.3.1",
-            "chokidar": "3.5.1",
-            "debug": "4.3.1",
-            "diff": "5.0.0",
-            "escape-string-regexp": "4.0.0",
-            "find-up": "5.0.0",
-            "glob": "7.1.6",
-            "growl": "1.10.5",
-            "he": "1.2.0",
-            "js-yaml": "4.0.0",
-            "log-symbols": "4.0.0",
-            "minimatch": "3.0.4",
-            "ms": "2.1.3",
-            "nanoid": "3.1.20",
-            "serialize-javascript": "5.0.1",
-            "strip-json-comments": "3.1.1",
-            "supports-color": "8.1.1",
-            "which": "2.0.2",
-            "wide-align": "1.1.3",
-            "workerpool": "6.1.0",
-            "yargs": "16.2.0",
-            "yargs-parser": "20.2.4",
-            "yargs-unparser": "2.0.0"
+            "@puppeteer/browsers": "2.3.0",
+            "chromium-bidi": "0.6.3",
+            "debug": "^4.3.6",
+            "devtools-protocol": "0.0.1312386",
+            "ws": "^8.18.0"
           },
           "dependencies": {
-            "ms": {
-              "version": "2.1.3",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "8.1.1",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "@puppeteer/browsers": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+              "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
               "dev": true,
+              "optional": true,
+              "peer": true,
               "requires": {
-                "has-flag": "^4.0.0"
+                "debug": "^4.3.5",
+                "extract-zip": "^2.0.1",
+                "progress": "^2.0.3",
+                "proxy-agent": "^6.4.0",
+                "semver": "^7.6.3",
+                "tar-fs": "^3.0.6",
+                "unbzip2-stream": "^1.4.3",
+                "yargs": "^17.7.2"
               }
             }
           }
         },
-        "nanoid": {
-          "version": "3.1.20",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
-          "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
           "dev": true
         },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+        "signal-exit": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+          "dev": true
+        },
+        "tar-fs": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+          "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
           "dev": true,
           "requires": {
-            "yocto-queue": "^0.1.0"
+            "bare-fs": "^2.1.1",
+            "bare-path": "^2.1.0",
+            "pump": "^3.0.0",
+            "tar-stream": "^3.1.5"
           }
         },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+        "webdriverio": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.5.tgz",
+          "integrity": "sha512-80zhuLBT5W5wiLNZ0maT1cVUrxmwpMuBgCprwZjI8lFe+KUhGLClrJXud/RrVT9x9rDCYa6pGCtQ4UqA+2U+sw==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^20.11.30",
+            "@types/sinonjs__fake-timers": "^8.1.5",
+            "@wdio/config": "9.0.5",
+            "@wdio/logger": "9.0.4",
+            "@wdio/protocols": "9.0.4",
+            "@wdio/repl": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "@wdio/utils": "9.0.5",
+            "archiver": "^7.0.1",
+            "aria-query": "^5.3.0",
+            "cheerio": "^1.0.0-rc.12",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "grapheme-splitter": "^1.0.4",
+            "htmlfy": "^0.2.1",
+            "import-meta-resolve": "^4.0.0",
+            "is-plain-obj": "^4.1.0",
+            "jszip": "^3.10.1",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^9.0.3",
+            "query-selector-shadow-dom": "^1.0.1",
+            "resq": "^1.11.0",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^11.0.3",
+            "urlpattern-polyfill": "^10.0.0",
+            "webdriver": "9.0.5"
+          }
+        },
+        "ws": {
+          "version": "8.18.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+          "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {}
+        },
+        "yargs": {
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
           "dev": true,
           "requires": {
-            "p-limit": "^3.0.2"
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
+          }
+        }
+      }
+    },
+    "@wdio/concise-reporter": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-8.38.2.tgz",
+      "integrity": "sha512-wE36By4Z9iCtRzihpYrmCehsmNc8t3gHviBsUxV4tmYh/SQr+WX/dysWnojer6KWIJ2rT0rOzyQPmrwhdFKAFg==",
+      "dev": true,
+      "requires": {
+        "@wdio/reporter": "8.38.2",
+        "@wdio/types": "8.38.2",
+        "chalk": "^5.0.1",
+        "pretty-ms": "^7.0.1"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+          "dev": true
+        }
+      }
+    },
+    "@wdio/config": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.0.5.tgz",
+      "integrity": "sha512-+dxUU2SLXLkqQhVU/wauU1VgqEKIFubOyUb6B0ueAMpM1aolc62zhE9D9rrQYbjkPOM7nFsjuuGR5+9+zaoZ6g==",
+      "dev": true,
+      "requires": {
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^7.0.3",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
+      },
+      "dependencies": {
+        "@puppeteer/browsers": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
+          "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.6",
+            "extract-zip": "^2.0.1",
+            "progress": "^2.0.3",
+            "proxy-agent": "^6.4.0",
+            "semver": "^7.6.3",
+            "tar-fs": "^3.0.6",
+            "unbzip2-stream": "^1.4.3",
+            "yargs": "^17.7.2"
           }
         },
-        "readdirp": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+        "@wdio/logger": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+          "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
           "dev": true,
           "requires": {
-            "picomatch": "^2.2.1"
+            "chalk": "^5.1.2",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^7.1.0"
           }
         },
-        "serialize-javascript": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-          "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+        "@wdio/types": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+          "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
           "dev": true,
           "requires": {
-            "randombytes": "^2.1.0"
+            "@types/node": "^20.1.0"
           }
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+        "@wdio/utils": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+          "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
+          "dev": true,
+          "requires": {
+            "@puppeteer/browsers": "^2.2.0",
+            "@wdio/logger": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "decamelize": "^6.0.0",
+            "deepmerge-ts": "^7.0.3",
+            "edgedriver": "^5.6.1",
+            "geckodriver": "^4.3.3",
+            "get-port": "^7.0.0",
+            "import-meta-resolve": "^4.0.0",
+            "locate-app": "^2.2.24",
+            "safaridriver": "^0.1.2",
+            "split2": "^4.2.0",
+            "wait-port": "^1.1.0"
+          }
+        },
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        },
+        "chalk": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "deepmerge-ts": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+          "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+          "dev": true
+        },
+        "https-proxy-agent": {
+          "version": "7.0.5",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+          "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "agent-base": "^7.0.2",
+            "debug": "4"
           }
         },
-        "workerpool": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
-          "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        },
+        "proxy-agent": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+          "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
+          "dev": true,
+          "requires": {
+            "agent-base": "^7.0.2",
+            "debug": "^4.3.4",
+            "http-proxy-agent": "^7.0.1",
+            "https-proxy-agent": "^7.0.3",
+            "lru-cache": "^7.14.1",
+            "pac-proxy-agent": "^7.0.1",
+            "proxy-from-env": "^1.1.0",
+            "socks-proxy-agent": "^8.0.2"
+          }
+        },
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
           "dev": true
         },
+        "tar-fs": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+          "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+          "dev": true,
+          "requires": {
+            "bare-fs": "^2.1.1",
+            "bare-path": "^2.1.0",
+            "pump": "^3.0.0",
+            "tar-stream": "^3.1.5"
+          }
+        },
         "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
           "dev": true,
           "requires": {
-            "cliui": "^7.0.2",
+            "cliui": "^8.0.1",
             "escalade": "^3.1.1",
             "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
+            "string-width": "^4.2.3",
             "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
+            "yargs-parser": "^21.1.1"
           }
-        },
-        "yargs-parser": {
-          "version": "20.2.4",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-          "dev": true
         }
       }
     },
-    "@wdio/protocols": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.5.3.tgz",
-      "integrity": "sha512-lpNaKwxYhDSL6neDtQQYXvzMAw+u4PXx65ryeMEX82mkARgzSZps5Kyrg9ub7X4T17K1NPfnY6UhZEWg6cKJCg==",
-      "dev": true
-    },
-    "@wdio/repl": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.5.3.tgz",
-      "integrity": "sha512-jfNJwNoc2nWdnLsFoGHmOJR9zaWfDTBMWM3W1eR5kXIjevD6gAfWsB5ZoA4IdybujCXxdnhlsm4o2jIzp/6f7A==",
-      "dev": true,
-      "requires": {
-        "@wdio/utils": "7.5.3"
-      }
-    },
-    "@wdio/reporter": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.5.7.tgz",
-      "integrity": "sha512-9PXqZtCXDtU6UYLNDPu9MZQ8BiABGnRlJTrlbYB3gBfZDibMkJMvwXzPderipBv2+ifDZXmGe3Njf1ao2TkbFA==",
+    "@wdio/globals": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.0.5.tgz",
+      "integrity": "sha512-ZkopKj1qEDNKuF1a87JTLfTKCBFgCHLUns5ob5D1oEmMFp0NwB89HHGBWgtuJpCUmxJAbf4rCKglVeKhB9rY7A==",
       "dev": true,
       "requires": {
-        "@wdio/types": "7.5.3",
-        "fs-extra": "^10.0.0"
+        "expect-webdriverio": "^5.0.1",
+        "webdriverio": "9.0.5"
       },
       "dependencies": {
-        "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+        "@puppeteer/browsers": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+          "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "got": "^11.8.1"
+            "debug": "^4.3.5",
+            "extract-zip": "^2.0.1",
+            "progress": "^2.0.3",
+            "proxy-agent": "^6.4.0",
+            "semver": "^7.6.3",
+            "tar-fs": "^3.0.6",
+            "unbzip2-stream": "^1.4.3",
+            "yargs": "^17.7.2"
+          }
+        },
+        "@vitest/snapshot": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.5.tgz",
+          "integrity": "sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@vitest/pretty-format": "2.0.5",
+            "magic-string": "^0.30.10",
+            "pathe": "^1.1.2"
           }
-        }
-      }
-    },
-    "@wdio/runner": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.5.7.tgz",
-      "integrity": "sha512-RzVXd+xnwK/thkx1/xo9K5iscQ0Ofobgsx5dNVtwLDVMn9V7jCW/WX4dSCPAPaVSqnUCmkcQp3P5AoSBPpCZnQ==",
-      "dev": true,
-      "requires": {
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "deepmerge": "^4.0.0",
-        "gaze": "^1.1.2",
-        "webdriver": "7.5.3",
-        "webdriverio": "7.5.7"
-      },
-      "dependencies": {
-        "@types/aria-query": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-          "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
-          "dev": true
         },
         "@wdio/logger": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+          "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "chalk": "^4.0.0",
+            "chalk": "^5.1.2",
             "loglevel": "^1.6.0",
             "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
+            "strip-ansi": "^7.1.0"
           }
         },
         "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+          "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "got": "^11.8.1"
+            "@types/node": "^20.1.0"
           }
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "@wdio/utils": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+          "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "@puppeteer/browsers": "^2.2.0",
+            "@wdio/logger": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "decamelize": "^6.0.0",
+            "deepmerge-ts": "^7.0.3",
+            "edgedriver": "^5.6.1",
+            "geckodriver": "^4.3.3",
+            "get-port": "^7.0.0",
+            "import-meta-resolve": "^4.0.0",
+            "locate-app": "^2.2.24",
+            "safaridriver": "^0.1.2",
+            "split2": "^4.2.0",
+            "wait-port": "^1.1.0"
           }
         },
-        "aria-query": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "@babel/runtime": "^7.10.2",
-            "@babel/runtime-corejs3": "^7.10.2"
+            "debug": "^4.3.4"
           }
         },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "balanced-match": "^1.0.0"
           }
         },
-        "chrome-launcher": {
-          "version": "0.13.4",
-          "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
-          "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+        "chalk": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+          "dev": true,
+          "optional": true
+        },
+        "deepmerge-ts": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+          "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+          "dev": true,
+          "optional": true
+        },
+        "devtools-protocol": {
+          "version": "0.0.1312386",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+          "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "expect-webdriverio": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-5.0.1.tgz",
+          "integrity": "sha512-tYJaXtu5qQr/oEXzDKoVzyA/g2wyeE1YsuVJQC8/bKnp1lX3I4NQ2Yb9u1rJ9vdpFha6pki8PzHlTk5PVZBQWQ==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "@types/node": "*",
-            "escape-string-regexp": "^1.0.5",
-            "is-wsl": "^2.2.0",
-            "lighthouse-logger": "^1.0.0",
-            "mkdirp": "^0.5.3",
-            "rimraf": "^3.0.2"
+            "@vitest/snapshot": "^2.0.5",
+            "expect": "^29.7.0",
+            "jest-matcher-utils": "^29.7.0",
+            "lodash.isequal": "^4.5.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "https-proxy-agent": {
+          "version": "7.0.5",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+          "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "agent-base": "^7.0.2",
+            "debug": "4"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true,
+          "optional": true
         },
-        "devtools": {
-          "version": "7.5.7",
-          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
-          "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+        "minimatch": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "@wdio/config": "7.5.3",
-            "@wdio/logger": "7.5.3",
-            "@wdio/protocols": "7.5.3",
-            "@wdio/types": "7.5.3",
-            "@wdio/utils": "7.5.3",
-            "chrome-launcher": "^0.13.1",
-            "edge-paths": "^2.1.0",
-            "puppeteer-core": "^9.1.0",
-            "query-selector-shadow-dom": "^1.0.0",
-            "ua-parser-js": "^0.7.21",
-            "uuid": "^8.0.0"
+            "brace-expansion": "^2.0.1"
           }
         },
-        "devtools-protocol": {
-          "version": "0.0.878340",
-          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
-          "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+        "proxy-agent": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+          "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "minimist": "^1.2.6"
+            "agent-base": "^7.0.2",
+            "debug": "^4.3.4",
+            "http-proxy-agent": "^7.0.1",
+            "https-proxy-agent": "^7.0.3",
+            "lru-cache": "^7.14.1",
+            "pac-proxy-agent": "^7.0.1",
+            "proxy-from-env": "^1.1.0",
+            "socks-proxy-agent": "^8.0.2"
           }
         },
         "puppeteer-core": {
-          "version": "9.1.1",
-          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
-          "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.1.0",
-            "devtools-protocol": "0.0.869402",
-            "extract-zip": "^2.0.0",
-            "https-proxy-agent": "^5.0.0",
-            "node-fetch": "^2.6.1",
-            "pkg-dir": "^4.2.0",
-            "progress": "^2.0.1",
-            "proxy-from-env": "^1.1.0",
-            "rimraf": "^3.0.2",
-            "tar-fs": "^2.0.0",
-            "unbzip2-stream": "^1.3.3",
-            "ws": "^7.2.3"
-          },
-          "dependencies": {
-            "devtools-protocol": {
-              "version": "0.0.869402",
-              "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
-              "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
-              "dev": true
-            }
+          "version": "22.15.0",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz",
+          "integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@puppeteer/browsers": "2.3.0",
+            "chromium-bidi": "0.6.3",
+            "debug": "^4.3.6",
+            "devtools-protocol": "0.0.1312386",
+            "ws": "^8.18.0"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+          "dev": true,
+          "optional": true
+        },
+        "tar-fs": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+          "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "bare-fs": "^2.1.1",
+            "bare-path": "^2.1.0",
+            "pump": "^3.0.0",
+            "tar-stream": "^3.1.5"
           }
         },
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-          "dev": true
-        },
         "webdriverio": {
-          "version": "7.5.7",
-          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
-          "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
-          "dev": true,
-          "requires": {
-            "@types/aria-query": "^4.2.1",
-            "@wdio/config": "7.5.3",
-            "@wdio/logger": "7.5.3",
-            "@wdio/protocols": "7.5.3",
-            "@wdio/repl": "7.5.3",
-            "@wdio/types": "7.5.3",
-            "@wdio/utils": "7.5.3",
-            "archiver": "^5.0.0",
-            "aria-query": "^4.2.2",
-            "atob": "^2.1.2",
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.5.tgz",
+          "integrity": "sha512-80zhuLBT5W5wiLNZ0maT1cVUrxmwpMuBgCprwZjI8lFe+KUhGLClrJXud/RrVT9x9rDCYa6pGCtQ4UqA+2U+sw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@types/node": "^20.11.30",
+            "@types/sinonjs__fake-timers": "^8.1.5",
+            "@wdio/config": "9.0.5",
+            "@wdio/logger": "9.0.4",
+            "@wdio/protocols": "9.0.4",
+            "@wdio/repl": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "@wdio/utils": "9.0.5",
+            "archiver": "^7.0.1",
+            "aria-query": "^5.3.0",
+            "cheerio": "^1.0.0-rc.12",
             "css-shorthand-properties": "^1.1.1",
             "css-value": "^0.0.1",
-            "devtools": "7.5.7",
-            "devtools-protocol": "^0.0.878340",
-            "fs-extra": "^10.0.0",
-            "get-port": "^5.1.1",
-            "grapheme-splitter": "^1.0.2",
+            "grapheme-splitter": "^1.0.4",
+            "htmlfy": "^0.2.1",
+            "import-meta-resolve": "^4.0.0",
+            "is-plain-obj": "^4.1.0",
+            "jszip": "^3.10.1",
             "lodash.clonedeep": "^4.5.0",
-            "lodash.isobject": "^3.0.2",
-            "lodash.isplainobject": "^4.0.6",
             "lodash.zip": "^4.2.0",
-            "minimatch": "^3.0.4",
-            "puppeteer-core": "^9.1.0",
-            "query-selector-shadow-dom": "^1.0.0",
-            "resq": "^1.9.1",
+            "minimatch": "^9.0.3",
+            "query-selector-shadow-dom": "^1.0.1",
+            "resq": "^1.11.0",
             "rgb2hex": "0.2.5",
-            "serialize-error": "^8.0.0",
-            "webdriver": "7.5.3"
+            "serialize-error": "^11.0.3",
+            "urlpattern-polyfill": "^10.0.0",
+            "webdriver": "9.0.5"
           }
         },
-        "ws": {
-          "version": "7.5.9",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+        "ws": {
+          "version": "8.18.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+          "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {}
+        },
+        "yargs": {
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
           "dev": true,
-          "requires": {}
+          "optional": true,
+          "requires": {
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
+          }
         }
       }
     },
-    "@wdio/spec-reporter": {
-      "version": "7.19.7",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.7.tgz",
-      "integrity": "sha512-BDBZU2EK/GuC9VxtfqPtoW43FmvKxYDsvcDVDi3F7o+9fkcuGSJiWbw1AX251ZzzVQ7YP9ImTitSpdpUKXkilQ==",
+    "@wdio/local-runner": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-9.0.5.tgz",
+      "integrity": "sha512-BFZ/e7z1s2cYsix1evijydaDn0YffeIHjPsMoa9b+zhW8BoZfTEDGKblYvzRgjUDD4elXs+YRZpA6EhjcGJTxQ==",
       "dev": true,
       "requires": {
-        "@types/easy-table": "^0.0.33",
-        "@wdio/reporter": "7.19.7",
-        "@wdio/types": "7.19.5",
-        "chalk": "^4.0.0",
-        "easy-table": "^1.1.1",
-        "pretty-ms": "^7.0.0"
+        "@types/node": "^20.1.0",
+        "@wdio/logger": "9.0.4",
+        "@wdio/repl": "9.0.4",
+        "@wdio/runner": "9.0.5",
+        "@wdio/types": "9.0.4",
+        "async-exit-hook": "^2.0.1",
+        "split2": "^4.1.0",
+        "stream-buffers": "^3.0.2"
       },
       "dependencies": {
-        "@wdio/reporter": {
-          "version": "7.19.7",
-          "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.7.tgz",
-          "integrity": "sha512-Dum19gpfru66FnIq78/4HTuW87B7ceLDp6PJXwQM5kXyN7Gb7zhMgp6FZTM0FCYLyi6U/zXZSvpNUYl77caS6g==",
+        "@wdio/logger": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+          "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
           "dev": true,
           "requires": {
-            "@types/diff": "^5.0.0",
-            "@types/node": "^17.0.4",
-            "@types/object-inspect": "^1.8.0",
-            "@types/supports-color": "^8.1.0",
-            "@types/tmp": "^0.2.0",
-            "@wdio/types": "7.19.5",
-            "diff": "^5.0.0",
-            "fs-extra": "^10.0.0",
-            "object-inspect": "^1.10.3",
-            "supports-color": "8.1.1"
+            "chalk": "^5.1.2",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^7.1.0"
           }
         },
         "@wdio/types": {
-          "version": "7.19.5",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.5.tgz",
-          "integrity": "sha512-S1lC0pmtEO7NVH/2nM1c7NHbkgxLZH3VVG/z6ym3Bbxdtcqi2LMsEvvawMAU/fmhyiIkMsGZCO8vxG9cRw4z4A==",
-          "dev": true,
-          "requires": {
-            "@types/node": "^17.0.4",
-            "got": "^11.8.1"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+          "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "@types/node": "^20.1.0"
           }
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
-    "@wdio/sync": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-7.5.7.tgz",
-      "integrity": "sha512-Zu/AYLjwqbFSbaOU1US7ownv3ov8JrtoGHq51JfJ4masefJDXNkHix2cZ0qEgl3IvkkWQ0ewL0G8GTXb3KOemA==",
+    "@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
       "dev": true,
       "requires": {
-        "@types/fibers": "^3.1.0",
-        "@types/puppeteer": "^5.4.0",
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "fibers": "^5.0.0",
-        "webdriverio": "7.5.7"
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
       },
       "dependencies": {
-        "@types/aria-query": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-          "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+        "chalk": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
           "dev": true
+        }
+      }
+    },
+    "@wdio/mocha-framework": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-8.38.2.tgz",
+      "integrity": "sha512-qJmRL5E6/ypjCUACH4hvCAAmTdU4YUrUlp9o/IKvTIAHMnZPE0/HgUFixCeu8Mop+rdzTPVBrbqxpRDdSnraYA==",
+      "dev": true,
+      "requires": {
+        "@types/mocha": "^10.0.0",
+        "@types/node": "^20.1.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.38.2",
+        "@wdio/utils": "8.38.2",
+        "mocha": "^10.0.0"
+      }
+    },
+    "@wdio/protocols": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.4.tgz",
+      "integrity": "sha512-T9v8Jkp94NxLLil5J7uJ/+YHk5/7fhOggzGcN+LvuCHS6jbJFZ/11c4SUEuXw27Yqk01fFXPBbF6TwcTTOuW/Q==",
+      "dev": true
+    },
+    "@wdio/repl": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-9.0.4.tgz",
+      "integrity": "sha512-5Bc5ARjWA7t6MZNnVJ9WvO1iDsy6iOsrSDWiP7APWAdaF/SJCP3SFE2c+PdQJpJWhr2Kk0fRGuyDM+GdsmZhwg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^20.1.0"
+      }
+    },
+    "@wdio/reporter": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-8.38.2.tgz",
+      "integrity": "sha512-R78UdAtAnkaV22NYlCCcbPPhmYweiDURiw64LYhlVIQrKNuXUQcafR2kRlWKy31rZc9thSLs5LzrZDReENUlFQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^20.1.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.38.2",
+        "diff": "^5.0.0",
+        "object-inspect": "^1.12.0"
+      }
+    },
+    "@wdio/runner": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-9.0.5.tgz",
+      "integrity": "sha512-qZF7k3BeQaM7pQRwIvedbfaC7xBU1xRY+wFkp44U/wvYZOOrqWiwv/Synk1iCFkOdxl/b+Gqp68dDmS9BrVDmw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^20.11.28",
+        "@wdio/config": "9.0.5",
+        "@wdio/globals": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "deepmerge-ts": "^7.0.3",
+        "expect-webdriverio": "^5.0.1",
+        "gaze": "^1.1.3",
+        "webdriver": "9.0.5",
+        "webdriverio": "9.0.5"
+      },
+      "dependencies": {
+        "@puppeteer/browsers": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
+          "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.6",
+            "extract-zip": "^2.0.1",
+            "progress": "^2.0.3",
+            "proxy-agent": "^6.4.0",
+            "semver": "^7.6.3",
+            "tar-fs": "^3.0.6",
+            "unbzip2-stream": "^1.4.3",
+            "yargs": "^17.7.2"
+          }
+        },
+        "@vitest/snapshot": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.5.tgz",
+          "integrity": "sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==",
+          "dev": true,
+          "requires": {
+            "@vitest/pretty-format": "2.0.5",
+            "magic-string": "^0.30.10",
+            "pathe": "^1.1.2"
+          }
         },
         "@wdio/logger": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+          "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
           "dev": true,
           "requires": {
-            "chalk": "^4.0.0",
+            "chalk": "^5.1.2",
             "loglevel": "^1.6.0",
             "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
+            "strip-ansi": "^7.1.0"
           }
         },
         "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+          "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
           "dev": true,
           "requires": {
-            "got": "^11.8.1"
+            "@types/node": "^20.1.0"
           }
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "@wdio/utils": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+          "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
+          "dev": true,
+          "requires": {
+            "@puppeteer/browsers": "^2.2.0",
+            "@wdio/logger": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "decamelize": "^6.0.0",
+            "deepmerge-ts": "^7.0.3",
+            "edgedriver": "^5.6.1",
+            "geckodriver": "^4.3.3",
+            "get-port": "^7.0.0",
+            "import-meta-resolve": "^4.0.0",
+            "locate-app": "^2.2.24",
+            "safaridriver": "^0.1.2",
+            "split2": "^4.2.0",
+            "wait-port": "^1.1.0"
+          }
+        },
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "debug": "^4.3.4"
           }
         },
-        "aria-query": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.10.2",
-            "@babel/runtime-corejs3": "^7.10.2"
+            "balanced-match": "^1.0.0"
           }
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+          "dev": true
+        },
+        "deepmerge-ts": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+          "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+          "dev": true
+        },
+        "devtools-protocol": {
+          "version": "0.0.1312386",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+          "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
           "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
+          "optional": true,
+          "peer": true
         },
-        "chrome-launcher": {
-          "version": "0.13.4",
-          "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
-          "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+        "expect-webdriverio": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-5.0.1.tgz",
+          "integrity": "sha512-tYJaXtu5qQr/oEXzDKoVzyA/g2wyeE1YsuVJQC8/bKnp1lX3I4NQ2Yb9u1rJ9vdpFha6pki8PzHlTk5PVZBQWQ==",
           "dev": true,
           "requires": {
-            "@types/node": "*",
-            "escape-string-regexp": "^1.0.5",
-            "is-wsl": "^2.2.0",
-            "lighthouse-logger": "^1.0.0",
-            "mkdirp": "^0.5.3",
-            "rimraf": "^3.0.2"
+            "@vitest/snapshot": "^2.0.5",
+            "expect": "^29.7.0",
+            "jest-matcher-utils": "^29.7.0",
+            "lodash.isequal": "^4.5.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "https-proxy-agent": {
+          "version": "7.0.5",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+          "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "agent-base": "^7.0.2",
+            "debug": "4"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
           "dev": true
         },
-        "devtools": {
-          "version": "7.5.7",
-          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
-          "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+        "minimatch": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
           "dev": true,
           "requires": {
-            "@wdio/config": "7.5.3",
-            "@wdio/logger": "7.5.3",
-            "@wdio/protocols": "7.5.3",
-            "@wdio/types": "7.5.3",
-            "@wdio/utils": "7.5.3",
-            "chrome-launcher": "^0.13.1",
-            "edge-paths": "^2.1.0",
-            "puppeteer-core": "^9.1.0",
-            "query-selector-shadow-dom": "^1.0.0",
-            "ua-parser-js": "^0.7.21",
-            "uuid": "^8.0.0"
+            "brace-expansion": "^2.0.1"
           }
         },
-        "devtools-protocol": {
-          "version": "0.0.878340",
-          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
-          "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+        "proxy-agent": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+          "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.6"
+            "agent-base": "^7.0.2",
+            "debug": "^4.3.4",
+            "http-proxy-agent": "^7.0.1",
+            "https-proxy-agent": "^7.0.3",
+            "lru-cache": "^7.14.1",
+            "pac-proxy-agent": "^7.0.1",
+            "proxy-from-env": "^1.1.0",
+            "socks-proxy-agent": "^8.0.2"
           }
         },
         "puppeteer-core": {
-          "version": "9.1.1",
-          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
-          "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.1.0",
-            "devtools-protocol": "0.0.869402",
-            "extract-zip": "^2.0.0",
-            "https-proxy-agent": "^5.0.0",
-            "node-fetch": "^2.6.1",
-            "pkg-dir": "^4.2.0",
-            "progress": "^2.0.1",
-            "proxy-from-env": "^1.1.0",
-            "rimraf": "^3.0.2",
-            "tar-fs": "^2.0.0",
-            "unbzip2-stream": "^1.3.3",
-            "ws": "^7.2.3"
+          "version": "22.15.0",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz",
+          "integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@puppeteer/browsers": "2.3.0",
+            "chromium-bidi": "0.6.3",
+            "debug": "^4.3.6",
+            "devtools-protocol": "0.0.1312386",
+            "ws": "^8.18.0"
           },
           "dependencies": {
-            "devtools-protocol": {
-              "version": "0.0.869402",
-              "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
-              "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
-              "dev": true
+            "@puppeteer/browsers": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+              "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
+              "dev": true,
+              "optional": true,
+              "peer": true,
+              "requires": {
+                "debug": "^4.3.5",
+                "extract-zip": "^2.0.1",
+                "progress": "^2.0.3",
+                "proxy-agent": "^6.4.0",
+                "semver": "^7.6.3",
+                "tar-fs": "^3.0.6",
+                "unbzip2-stream": "^1.4.3",
+                "yargs": "^17.7.2"
+              }
             }
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+          "dev": true
+        },
+        "tar-fs": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+          "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "bare-fs": "^2.1.1",
+            "bare-path": "^2.1.0",
+            "pump": "^3.0.0",
+            "tar-stream": "^3.1.5"
           }
         },
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-          "dev": true
-        },
         "webdriverio": {
-          "version": "7.5.7",
-          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
-          "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
-          "dev": true,
-          "requires": {
-            "@types/aria-query": "^4.2.1",
-            "@wdio/config": "7.5.3",
-            "@wdio/logger": "7.5.3",
-            "@wdio/protocols": "7.5.3",
-            "@wdio/repl": "7.5.3",
-            "@wdio/types": "7.5.3",
-            "@wdio/utils": "7.5.3",
-            "archiver": "^5.0.0",
-            "aria-query": "^4.2.2",
-            "atob": "^2.1.2",
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.5.tgz",
+          "integrity": "sha512-80zhuLBT5W5wiLNZ0maT1cVUrxmwpMuBgCprwZjI8lFe+KUhGLClrJXud/RrVT9x9rDCYa6pGCtQ4UqA+2U+sw==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^20.11.30",
+            "@types/sinonjs__fake-timers": "^8.1.5",
+            "@wdio/config": "9.0.5",
+            "@wdio/logger": "9.0.4",
+            "@wdio/protocols": "9.0.4",
+            "@wdio/repl": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "@wdio/utils": "9.0.5",
+            "archiver": "^7.0.1",
+            "aria-query": "^5.3.0",
+            "cheerio": "^1.0.0-rc.12",
             "css-shorthand-properties": "^1.1.1",
             "css-value": "^0.0.1",
-            "devtools": "7.5.7",
-            "devtools-protocol": "^0.0.878340",
-            "fs-extra": "^10.0.0",
-            "get-port": "^5.1.1",
-            "grapheme-splitter": "^1.0.2",
+            "grapheme-splitter": "^1.0.4",
+            "htmlfy": "^0.2.1",
+            "import-meta-resolve": "^4.0.0",
+            "is-plain-obj": "^4.1.0",
+            "jszip": "^3.10.1",
             "lodash.clonedeep": "^4.5.0",
-            "lodash.isobject": "^3.0.2",
-            "lodash.isplainobject": "^4.0.6",
             "lodash.zip": "^4.2.0",
-            "minimatch": "^3.0.4",
-            "puppeteer-core": "^9.1.0",
-            "query-selector-shadow-dom": "^1.0.0",
-            "resq": "^1.9.1",
+            "minimatch": "^9.0.3",
+            "query-selector-shadow-dom": "^1.0.1",
+            "resq": "^1.11.0",
             "rgb2hex": "0.2.5",
-            "serialize-error": "^8.0.0",
-            "webdriver": "7.5.3"
+            "serialize-error": "^11.0.3",
+            "urlpattern-polyfill": "^10.0.0",
+            "webdriver": "9.0.5"
           }
         },
         "ws": {
-          "version": "7.5.9",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "version": "8.18.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+          "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {}
+        },
+        "yargs": {
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+          "dev": true,
+          "requires": {
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
+          }
         }
       }
     },
-    "@wdio/types": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.16.14.tgz",
-      "integrity": "sha512-AyNI9iBSos9xWBmiFAF3sBs6AJXO/55VppU/eeF4HRdbZMtMarnvMuahM+jlUrA3vJSmDW+ufelG0MT//6vrnw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "^17.0.4",
-        "got": "^11.8.1"
-      }
-    },
-    "@wdio/utils": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.5.3.tgz",
-      "integrity": "sha512-nlLDKr8v8abLOHCKroBwQkGPdCIxjID2MllgWX23xqkYZylM9RdwPBdL8osQt9m3rq2TxiPAT4OlbzNt2WtN6Q==",
+    "@wdio/spec-reporter": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-8.38.2.tgz",
+      "integrity": "sha512-Dntk+lmrp+0I3HRRWkkXED+smshvgsW5cdLKwJhEJ1liI48MdBpdNGf9IHTVckE6nfxcWDyFI4icD9qYv/5bFA==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "7.5.3",
-        "@wdio/types": "7.5.3"
+        "@wdio/reporter": "8.38.2",
+        "@wdio/types": "8.38.2",
+        "chalk": "^5.1.2",
+        "easy-table": "^1.2.0",
+        "pretty-ms": "^7.0.0"
       },
       "dependencies": {
-        "@wdio/logger": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
-          "dev": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "loglevel": "^1.6.0",
-            "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
-          "dev": true,
-          "requires": {
-            "got": "^11.8.1"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
+    "@wdio/types": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.38.2.tgz",
+      "integrity": "sha512-+wj1c1OSLdnN4WO5b44Ih4263dTl/eSwMGSI4/pCgIyXIuYQH38JQ+6WRa+c8vJEskUzboq2cSgEQumVZ39ozQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^20.1.0"
+      }
+    },
+    "@wdio/utils": {
+      "version": "8.38.2",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.38.2.tgz",
+      "integrity": "sha512-y5AnBwsGcu/XuCBGCgKmlvKdwEIFyzLA+Cr+denySxY3jbWDONtPUcGaVdFALwsIa5jcIjcATqGmZcCPGnkd7g==",
+      "dev": true,
+      "requires": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.38.2",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
+      }
+    },
     "@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
       "dev": true
     },
     "@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/ast": "1.12.1",
         "@xtuc/long": "4.2.2"
       }
     },
     "@xmldom/xmldom": {
-      "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.8.tgz",
-      "integrity": "sha512-PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==",
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
       "dev": true
     },
     "@xtuc/ieee754": {
@@ -29164,12 +32277,27 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
+    "@zip.js/zip.js": {
+      "version": "2.7.48",
+      "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.48.tgz",
+      "integrity": "sha512-J7cliimZ2snAbr0IhLx2U8BwfA1pKucahKzTpFtYq4hEgKxwvFJcIjCIVNPwQpfVab7iVP+AKmoH1gidBlyhiQ==",
+      "dev": true
+    },
     "abbrev": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
       "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==",
       "dev": true
     },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dev": true,
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
     "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -29193,9 +32321,9 @@
       "requires": {}
     },
     "acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
       "dev": true
     },
     "aes-decrypter": {
@@ -29304,13 +32432,12 @@
     "ansi-wrap": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
-      "dev": true
+      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw=="
     },
     "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -29327,55 +32454,119 @@
       }
     },
     "archiver": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
-      "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
       "dev": true,
       "requires": {
-        "archiver-utils": "^2.1.0",
-        "async": "^3.2.3",
-        "buffer-crc32": "^0.2.1",
-        "readable-stream": "^3.6.0",
-        "readdir-glob": "^1.0.0",
-        "tar-stream": "^2.2.0",
-        "zip-stream": "^4.1.0"
+        "archiver-utils": "^5.0.2",
+        "async": "^3.2.4",
+        "buffer-crc32": "^1.0.0",
+        "readable-stream": "^4.0.0",
+        "readdir-glob": "^1.1.2",
+        "tar-stream": "^3.0.0",
+        "zip-stream": "^6.0.1"
       },
       "dependencies": {
         "async": {
-          "version": "3.2.4",
-          "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+          "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+          "dev": true
+        },
+        "buffer": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.2.1"
+          }
+        },
+        "buffer-crc32": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+          "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
           "dev": true
         },
         "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "version": "4.5.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+          "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "abort-controller": "^3.0.0",
+            "buffer": "^6.0.3",
+            "events": "^3.3.0",
+            "process": "^0.11.10",
+            "string_decoder": "^1.3.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
           }
         }
       }
     },
     "archiver-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
-      "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
       "dev": true,
       "requires": {
-        "glob": "^7.1.4",
+        "glob": "^10.0.0",
         "graceful-fs": "^4.2.0",
+        "is-stream": "^2.0.1",
         "lazystream": "^1.0.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.union": "^4.6.0",
+        "lodash": "^4.17.15",
         "normalize-path": "^3.0.0",
-        "readable-stream": "^2.0.0"
+        "readable-stream": "^4.0.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.2.1"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "4.5.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+          "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+          "dev": true,
+          "requires": {
+            "abort-controller": "^3.0.0",
+            "buffer": "^6.0.3",
+            "events": "^3.3.0",
+            "process": "^0.11.10",
+            "string_decoder": "^1.3.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        }
       }
     },
     "archy": {
@@ -29384,22 +32575,27 @@
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
+    "are-docs-informative": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+      "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
+      "dev": true
+    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
       }
     },
     "aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
       "dev": true,
       "requires": {
-        "deep-equal": "^2.0.5"
+        "dequal": "^2.0.3"
       }
     },
     "arr-diff": {
@@ -29450,6 +32646,16 @@
       "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
       "dev": true
     },
+    "array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      }
+    },
     "array-differ": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
@@ -29474,15 +32680,16 @@
       "dev": true
     },
     "array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
         "is-string": "^1.0.7"
       }
     },
@@ -29536,6 +32743,14 @@
         "default-compare": "^1.0.0",
         "get-value": "^2.0.6",
         "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
       }
     },
     "array-uniq": {
@@ -29550,18 +32765,60 @@
       "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
       "dev": true
     },
+    "array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      }
+    },
     "array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       }
     },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      }
+    },
     "asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -29572,15 +32829,16 @@
       }
     },
     "assert": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
+      "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
       "dev": true,
       "requires": {
-        "es6-object-assign": "^1.1.0",
-        "is-nan": "^1.2.1",
-        "object-is": "^1.0.1",
-        "util": "^0.12.0"
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
       }
     },
     "assert-plus": {
@@ -29598,8 +32856,24 @@
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="
+    },
+    "ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+          "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+          "dev": true
+        }
+      }
     },
     "astral-regex": {
       "version": "2.0.0",
@@ -29622,207 +32896,97 @@
         "end-of-stream": "^1.1.0",
         "once": "^1.3.2",
         "process-nextick-args": "^2.0.0",
-        "stream-exhaust": "^1.0.1"
-      }
-    },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
-    "async-exit-hook": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
-      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
-      "dev": true
-    },
-    "async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==",
-      "dev": true,
-      "requires": {
-        "async-done": "^1.2.2"
-      }
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-      "dev": true
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-          "dev": true
-        }
+        "stream-exhaust": "^1.0.1"
       }
     },
-    "babel-core": {
-      "version": "6.26.3",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
-      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+    "async-each": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
+      "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
+      "dev": true
+    },
+    "async-exit-hook": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
+      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
+      "dev": true
+    },
+    "async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-generator": "^6.26.0",
-        "babel-helpers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "convert-source-map": "^1.5.1",
-        "debug": "^2.6.9",
-        "json5": "^0.5.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.4",
-        "path-is-absolute": "^1.0.1",
-        "private": "^0.1.8",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
+        "async-done": "^1.2.2"
       }
     },
-    "babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
       "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-          "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==",
-          "dev": true
-        }
+        "possible-typed-array-names": "^1.0.0"
       }
     },
-    "babel-helpers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.0.tgz",
+      "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==",
+      "dev": true
+    },
+    "axios": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
       }
     },
+    "b4a": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
+      "dev": true
+    },
     "babel-loader": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
+      "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
       "dev": true,
       "requires": {
         "find-cache-dir": "^3.3.1",
@@ -29831,15 +32995,6 @@
         "schema-utils": "^2.6.5"
       }
     },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
     "babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -29854,167 +33009,32 @@
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+      "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
       "requires": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "semver": "^6.1.1"
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "semver": "^6.3.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz",
+      "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
+        "@babel/helper-define-polyfill-provider": "^0.6.1",
+        "core-js-compat": "^3.36.1"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
-      }
-    },
-    "babel-register": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
-      "dev": true,
-      "requires": {
-        "babel-core": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "home-or-tmp": "^2.0.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.15"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.6"
-          }
-        }
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-          "dev": true
-        }
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "globals": {
-          "version": "9.18.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
-      "dev": true,
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
+      "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      },
-      "dependencies": {
-        "to-fast-properties": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-          "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
-          "dev": true
-        }
+        "@babel/helper-define-polyfill-provider": "^0.6.2"
       }
     },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
     "bach": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
@@ -30044,6 +33064,52 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "dev": true,
+      "optional": true
+    },
+    "bare-fs": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
+      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
+      }
+    },
+    "bare-os": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.3.0.tgz",
+      "integrity": "sha512-oPb8oMM1xZbhRQBngTgpcQ5gXw6kjOaRsSWsIeNyRxGed2w/ARyP7ScBYpWR1qfX2E5rS3gBw6OWcSQo+s+kUg==",
+      "dev": true,
+      "optional": true
+    },
+    "bare-path": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
+      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bare-os": "^2.1.0"
+      }
+    },
+    "bare-stream": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
+      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "streamx": "^2.18.0"
+      }
+    },
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
@@ -30099,6 +33165,12 @@
         }
       }
     },
+    "basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "dev": true
+    },
     "batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -30121,9 +33193,9 @@
       "dev": true
     },
     "big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
+      "version": "1.6.52",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
+      "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
       "dev": true
     },
     "big.js": {
@@ -30143,9 +33215,9 @@
       }
     },
     "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "dev": true
     },
     "binaryextensions": {
@@ -30164,35 +33236,10 @@
         "file-uri-to-path": "1.0.0"
       }
     },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "bluebird": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
-      "dev": true
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
     "body": {
       "version": "5.1.0",
@@ -30231,20 +33278,20 @@
       }
     },
     "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "requires": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -30264,6 +33311,12 @@
         }
       }
     },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -30275,12 +33328,12 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "browser-stdout": {
@@ -30290,14 +33343,14 @@
       "dev": true
     },
     "browserslist": {
-      "version": "4.21.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "version": "4.23.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
+      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
       "requires": {
-        "caniuse-lite": "^1.0.30001400",
-        "electron-to-chromium": "^1.4.251",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.9"
+        "caniuse-lite": "^1.0.30001629",
+        "electron-to-chromium": "^1.4.796",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.16"
       }
     },
     "browserstack": {
@@ -30340,9 +33393,9 @@
       }
     },
     "browserstack-local": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.5.1.tgz",
-      "integrity": "sha512-T/wxyWDzvBHbDvl7fZKpFU7mYze6nrUkBhNy+d+8bXBqgQX10HTYvajIGO0wb49oGSLCPM0CMZTV/s7e6LF0sA==",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.5.5.tgz",
+      "integrity": "sha512-jKne7yosrMcptj3hqxp36TP9k0ZW2sCqhyurX24rUL4G3eT7OLgv+CSQN8iq5dtkv5IK+g+v8fWvsiC/S9KxMg==",
       "dev": true,
       "requires": {
         "agent-base": "^6.0.2",
@@ -30432,132 +33485,42 @@
       "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
       "dev": true
     },
-    "bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-    },
-    "cac": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
-      "integrity": "sha512-hq4rxE3NT5PlaEiVV39Z45d6MoFcQZG5dsgJqtAUeOz3408LEQAElToDkf9i5IYSCOmK0If/81dLg7nKxqPR0w==",
-      "dev": true,
+    "bufferstreams": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
+      "integrity": "sha512-LZmiIfQprMLS6/k42w/PTc7awhU8AdNNcUerxTgr01WlP9agR2SgMv0wjlYYFD6eDOi8WvofrTX8RayjR/AeUQ==",
       "requires": {
-        "camelcase-keys": "^3.0.0",
-        "chalk": "^1.1.3",
-        "indent-string": "^3.0.0",
-        "minimist": "^1.2.0",
-        "read-pkg-up": "^1.0.1",
-        "suffix": "^0.1.0",
-        "text-table": "^0.2.0"
+        "readable-stream": "^1.0.33"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-          "dev": true
-        },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
-          "dev": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-          "dev": true
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-          "dev": true,
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
           }
         },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-          "dev": true
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
         }
       }
     },
+    "bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+    },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -30575,45 +33538,16 @@
         "unset-value": "^1.0.0"
       }
     },
-    "cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "dev": true
-    },
-    "cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dev": true,
-      "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
-      }
-    },
     "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
       }
     },
     "callsites": {
@@ -30628,24 +33562,6 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
-    "camelcase-keys": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
-      "integrity": "sha512-U4E6A6aFyYnNW+tDt5/yIUKQURKXe3WMFPfX4FxrQFcwZ/R08AUk1xWcUtlr7oq6CV07Ji+aa69V2g7BSpblnQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^3.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
-          "dev": true
-        }
-      }
-    },
     "can-autoplay": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
@@ -30653,9 +33569,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001429",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz",
-      "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg=="
+      "version": "1.0.30001633",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001633.tgz",
+      "integrity": "sha512-6sT0yf/z5jqf8tISAgpJDrmwOpLsrpnyCdD/lOZKvKkkJK4Dn0X5i7KF7THEZhOq+30bmhwBlNEaqPUiHiKtZg=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -30670,18 +33586,18 @@
       "dev": true
     },
     "chai": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
-      "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
+      "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
       "dev": true,
       "requires": {
         "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
         "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "type-detect": "^4.0.8"
       }
     },
     "chainsaw": {
@@ -30728,15 +33644,62 @@
       "dev": true
     },
     "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
-      "dev": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.2"
+      }
+    },
+    "cheerio": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz",
+      "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==",
+      "dev": true,
+      "requires": {
+        "cheerio-select": "^2.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.1.0",
+        "encoding-sniffer": "^0.2.0",
+        "htmlparser2": "^9.1.0",
+        "parse5": "^7.1.2",
+        "parse5-htmlparser2-tree-adapter": "^7.0.0",
+        "parse5-parser-stream": "^7.1.2",
+        "undici": "^6.19.5",
+        "whatwg-mimetype": "^4.0.0"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+          "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+          "dev": true,
+          "requires": {
+            "entities": "^4.4.0"
+          }
+        }
+      }
+    },
+    "cheerio-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
+      "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-select": "^5.1.0",
+        "css-what": "^6.1.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1"
+      }
     },
     "chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
       "requires": {
         "anymatch": "~3.1.2",
@@ -30749,36 +33712,29 @@
         "readdirp": "~3.6.0"
       }
     },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+    "chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true
     },
-    "chrome-launcher": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.1.tgz",
-      "integrity": "sha512-UugC8u59/w2AyX5sHLZUHoxBAiSiunUhZa3zZwMH6zPVis0C3dDKiRWyUGIo14tTbZHGVviWxv3PQWZ7taZ4fg==",
+    "chromium-bidi": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.3.tgz",
+      "integrity": "sha512-qXlsCmpCZJAnoTYI83Iu6EdYQpMYdVkCfq08KDh2pmlVqK5t5IA9mGs4/LwCwp4fqisSOMXZxP3HIh8w8aRn0A==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@types/node": "*",
-        "escape-string-regexp": "^4.0.0",
-        "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        }
+        "mitt": "3.0.1",
+        "urlpattern-polyfill": "10.0.0",
+        "zod": "3.23.8"
       }
     },
-    "chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+    "ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true
     },
     "class-utils": {
@@ -30808,61 +33764,14 @@
             "is-descriptor": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         }
       }
@@ -30877,15 +33786,15 @@
       }
     },
     "cli-spinners": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
-      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.1.0.tgz",
+      "integrity": "sha512-2MH0N34TpDAs9ROPVkZJfBWFoYfv4zfkJF14PBHY4v/qRY75SLcm4WaEKNCLScsXieosa/tY/+slJ+BDswJxHQ==",
       "dev": true
     },
     "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
       "dev": true
     },
     "cliui": {
@@ -30897,6 +33806,52 @@
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
         "wrap-ansi": "^7.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        }
       }
     },
     "clone": {
@@ -30911,13 +33866,26 @@
       "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
       "dev": true
     },
-    "clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+    "clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "requires": {
-        "mimic-response": "^1.0.0"
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        }
       }
     },
     "clone-stats": {
@@ -30999,9 +33967,9 @@
       }
     },
     "comma-separated-tokens": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz",
-      "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
       "dev": true
     },
     "commander": {
@@ -31010,6 +33978,12 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "comment-parser": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+      "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
+      "dev": true
+    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -31017,32 +33991,60 @@
       "dev": true
     },
     "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
       "dev": true
     },
     "compress-commons": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz",
-      "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
       "dev": true,
       "requires": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.2",
+        "crc-32": "^1.2.0",
+        "crc32-stream": "^6.0.0",
+        "is-stream": "^2.0.1",
         "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
+        "readable-stream": "^4.0.0"
       },
       "dependencies": {
+        "buffer": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.2.1"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+          "dev": true
+        },
         "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "version": "4.5.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+          "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "abort-controller": "^3.0.0",
+            "buffer": "^6.0.3",
+            "events": "^3.3.0",
+            "process": "^0.11.10",
+            "string_decoder": "^1.3.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
           }
         }
       }
@@ -31147,6 +34149,14 @@
       "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==",
       "dev": true
     },
+    "consolidate": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+      "requires": {
+        "bluebird": "^3.1.1"
+      }
+    },
     "content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -31156,9 +34166,9 @@
       }
     },
     "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
     },
     "continuable-cache": {
       "version": "0.3.1",
@@ -31167,14 +34177,14 @@
       "dev": true
     },
     "convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="
     },
     "cookie-signature": {
       "version": "1.0.6",
@@ -31198,28 +34208,27 @@
       }
     },
     "core-js": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
-      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz",
+      "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw=="
     },
     "core-js-compat": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
-      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz",
+      "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==",
       "requires": {
-        "browserslist": "^4.21.4"
+        "browserslist": "^4.23.0"
       }
     },
     "core-js-pure": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.0.tgz",
-      "integrity": "sha512-LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA=="
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.37.1.tgz",
+      "integrity": "sha512-J/r5JTHSmzTxbiYYrzXg9w1VpqrYt+gexenBE9pugeyhwPZTAEJddyiReJWsLO6uNQ8xJZFbod6XC7KKwatCiA=="
     },
     "core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
     "cors": {
       "version": "2.8.5",
@@ -31251,42 +34260,49 @@
       "dev": true
     },
     "crc32-stream": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz",
-      "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
       "dev": true,
       "requires": {
         "crc-32": "^1.2.0",
-        "readable-stream": "^3.4.0"
+        "readable-stream": "^4.0.0"
       },
       "dependencies": {
+        "buffer": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.2.1"
+          }
+        },
         "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "version": "4.5.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+          "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "abort-controller": "^3.0.0",
+            "buffer": "^6.0.3",
+            "events": "^3.3.0",
+            "process": "^0.11.10",
+            "string_decoder": "^1.3.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
           }
         }
       }
     },
-    "criteo-direct-rsa-validate": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz",
-      "integrity": "sha512-7gQ3zX+d+hS/vOxzLrZ4aRAceB7qNJ0VzaGNpcWjDCmtOpASB50USJDupTik/H2nHgiSAA3VNZ3SFuONs8LR9Q=="
-    },
-    "cross-fetch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
-      "dev": true,
-      "requires": {
-        "node-fetch": "2.6.7"
-      }
-    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -31296,12 +34312,29 @@
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
         "which": "^2.0.1"
+      },
+      "dependencies": {
+        "isexe": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+          "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
     },
     "crypto-js": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
-      "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
     },
     "css": {
       "version": "3.0.0",
@@ -31322,6 +34355,19 @@
         }
       }
     },
+    "css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      }
+    },
     "css-shorthand-properties": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz",
@@ -31334,6 +34380,18 @@
       "integrity": "sha512-FUV3xaJ63buRLgHrLQVlVgQnQdR4yqdLGaDu7g8CQcWjInDfM9plBTPI9FRfpahju1UBSaMckeb2/46ApS/V1Q==",
       "dev": true
     },
+    "css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true
+    },
+    "csv-writer": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/csv-writer/-/csv-writer-1.6.0.tgz",
+      "integrity": "sha512-NOx7YDFWEsM/fTRAJjRpPp8t+MKRVvniAg9wQlUKx20MFrPs73WLJhFf5iteqrxNYnsy924K3Iroh3yNHeYd2g==",
+      "dev": true
+    },
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -31341,13 +34399,13 @@
       "dev": true
     },
     "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
+      "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
       "dev": true,
       "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
+        "es5-ext": "^0.10.64",
+        "type": "^2.7.2"
       }
     },
     "dashdash": {
@@ -31359,6 +34417,45 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "dev": true
+    },
+    "data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      }
+    },
+    "data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      }
+    },
+    "data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      }
+    },
     "date-format": {
       "version": "4.0.14",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
@@ -31378,10 +34475,16 @@
       "dev": true,
       "optional": true
     },
+    "debounce": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
+      "dev": true
+    },
     "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -31409,9 +34512,9 @@
       }
     },
     "decamelize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
       "dev": true
     },
     "decode-named-character-reference": {
@@ -31429,53 +34532,39 @@
       "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true
     },
-    "decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^3.1.0"
-      },
-      "dependencies": {
-        "mimic-response": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-          "dev": true
-        }
-      }
-    },
     "deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+      "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
       "dev": true,
       "requires": {
         "type-detect": "^4.0.0"
       }
     },
     "deep-equal": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
-      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
+      "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "es-get-iterator": "^1.1.1",
-        "get-intrinsic": "^1.0.1",
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.2",
-        "is-regex": "^1.1.1",
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.5",
+        "es-get-iterator": "^1.1.3",
+        "get-intrinsic": "^1.2.2",
+        "is-arguments": "^1.1.1",
+        "is-array-buffer": "^3.0.2",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
         "isarray": "^2.0.5",
-        "object-is": "^1.1.4",
+        "object-is": "^1.1.5",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.3",
-        "which-boxed-primitive": "^1.0.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.1",
+        "side-channel": "^1.0.4",
+        "which-boxed-primitive": "^1.0.2",
         "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.2"
+        "which-typed-array": "^1.1.13"
       }
     },
     "deep-is": {
@@ -31484,10 +34573,10 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+    "deepmerge-ts": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-5.1.0.tgz",
+      "integrity": "sha512-eS8dRJOckyo9maw9Tu5O5RUi/4inFLrnoLkBe3cPfDMx3WZioXtmOew4TXQaxq7Rhl4xjDtR7c6x8nNTxOvbFw==",
       "dev": true
     },
     "default-compare": {
@@ -31497,6 +34586,14 @@
       "dev": true,
       "requires": {
         "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
       }
     },
     "default-resolution": {
@@ -31510,6 +34607,7 @@
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
       "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "clone": "^1.0.2"
       },
@@ -31518,22 +34616,28 @@
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
           "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
-    "defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
     },
     "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
       "requires": {
+        "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
       }
@@ -31548,6 +34652,50 @@
         "isobject": "^3.0.1"
       }
     },
+    "degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "dev": true,
+      "requires": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "dependencies": {
+        "escodegen": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+          "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+          "dev": true,
+          "requires": {
+            "esprima": "^4.0.1",
+            "estraverse": "^5.2.0",
+            "esutils": "^2.0.2",
+            "source-map": "~0.6.1"
+          }
+        },
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+          "dev": true
+        },
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -31576,205 +34724,19 @@
       "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
       "dev": true
     },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "dev": true
-    },
     "detect-newline": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
       "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==",
       "dev": true
     },
-    "devtools": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.25.4.tgz",
-      "integrity": "sha512-R6/S/dCqxoX4Y6PxIGM9JFAuSRZzUeV5r+CoE/frhmno6mTe7dEEgwkJlfit3LkKRoul8n4DsL2A3QtWOvq5IA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "^18.0.0",
-        "@types/ua-parser-js": "^0.7.33",
-        "@wdio/config": "7.25.4",
-        "@wdio/logger": "7.19.0",
-        "@wdio/protocols": "7.22.0",
-        "@wdio/types": "7.25.4",
-        "@wdio/utils": "7.25.4",
-        "chrome-launcher": "^0.15.0",
-        "edge-paths": "^2.1.0",
-        "puppeteer-core": "^13.1.3",
-        "query-selector-shadow-dom": "^1.0.0",
-        "ua-parser-js": "^1.0.1",
-        "uuid": "^9.0.0"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "18.11.9",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
-          "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
-          "dev": true
-        },
-        "@wdio/config": {
-          "version": "7.25.4",
-          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
-          "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
-          "dev": true,
-          "requires": {
-            "@wdio/logger": "7.19.0",
-            "@wdio/types": "7.25.4",
-            "@wdio/utils": "7.25.4",
-            "deepmerge": "^4.0.0",
-            "glob": "^8.0.3"
-          }
-        },
-        "@wdio/logger": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
-          "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
-          "dev": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "loglevel": "^1.6.0",
-            "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "@wdio/protocols": {
-          "version": "7.22.0",
-          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
-          "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
-          "dev": true
-        },
-        "@wdio/types": {
-          "version": "7.25.4",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
-          "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
-          "dev": true,
-          "requires": {
-            "@types/node": "^18.0.0",
-            "got": "^11.8.1"
-          }
-        },
-        "@wdio/utils": {
-          "version": "7.25.4",
-          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
-          "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
-          "dev": true,
-          "requires": {
-            "@wdio/logger": "7.19.0",
-            "@wdio/types": "7.25.4",
-            "p-iteration": "^1.1.8"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "glob": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^5.0.1",
-            "once": "^1.3.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "ua-parser-js": {
-          "version": "1.0.33",
-          "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.33.tgz",
-          "integrity": "sha512-RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ==",
-          "dev": true
-        },
-        "uuid": {
-          "version": "9.0.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
-          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
-          "dev": true
-        }
-      }
-    },
     "devtools-protocol": {
-      "version": "0.0.1061995",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1061995.tgz",
-      "integrity": "sha512-pKZZWTjWa/IF4ENCg6GN8bu/AxSZgdhjSa26uc23wz38Blt2Tnm9icOPcSG3Cht55rMq35in1w3rWVPcZ60ArA==",
-      "dev": true
+      "version": "0.0.1260888",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1260888.tgz",
+      "integrity": "sha512-9rTIZ4ZjWwalCPiaY+kPiALLfOKgAz5CTi/Zb1L+qSZ8PH3zVo1T8JcgXIIqg1iM3pZ6hF+n9xO5r2jZ/SF+jg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "di": {
       "version": "0.0.1",
@@ -31783,15 +34745,15 @@
       "dev": true
     },
     "diff": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "dev": true
     },
     "diff-sequences": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
-      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true
     },
     "dlv": {
@@ -31818,9 +34780,9 @@
       }
     },
     "documentation": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.1.tgz",
-      "integrity": "sha512-Y/brACCE3sNnDJPFiWlhXrqGY+NelLYVZShLGse5bT1KdohP4JkPf5T2KNq1YWhIEbDYl/1tebRLC0WYbPQxVw==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.3.tgz",
+      "integrity": "sha512-B7cAviVKN9Rw7Ofd+9grhVuxiHwly6Ieh+d/ceMw8UdBOv/irkuwnDEJP8tq0wgdLJDUVuIkovV+AX9mTrZFxg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.18.10",
@@ -31880,15 +34842,25 @@
           }
         },
         "chalk": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
-          "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
           "dev": true
         },
+        "find-up": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+          "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^7.1.0",
+            "path-exists": "^5.0.0"
+          }
+        },
         "glob": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+          "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -31898,6 +34870,15 @@
             "once": "^1.3.0"
           }
         },
+        "hosted-git-info": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -31907,19 +34888,138 @@
             "argparse": "^2.0.1"
           }
         },
+        "json-parse-even-better-errors": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+          "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+          "dev": true
+        },
+        "lines-and-columns": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+          "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+          "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^6.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
           }
         },
+        "normalize-package-data": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+          "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^4.0.1",
+            "is-core-module": "^2.5.0",
+            "semver": "^7.3.4",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "p-limit": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+          "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+          "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^4.0.0"
+          }
+        },
+        "parse-json": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+          "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "error-ex": "^1.3.1",
+            "json-parse-even-better-errors": "^2.3.0",
+            "lines-and-columns": "^1.1.6"
+          }
+        },
+        "path-exists": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+          "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
+          "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
+          "dev": true,
+          "requires": {
+            "@types/normalize-package-data": "^2.4.1",
+            "normalize-package-data": "^3.0.2",
+            "parse-json": "^5.2.0",
+            "type-fest": "^2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz",
+          "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==",
+          "dev": true,
+          "requires": {
+            "find-up": "^6.3.0",
+            "read-pkg": "^7.1.0",
+            "type-fest": "^2.5.0"
+          }
+        },
+        "semver": {
+          "version": "7.6.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+          "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        },
         "yargs": {
-          "version": "17.6.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
-          "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
           "dev": true,
           "requires": {
             "cliui": "^8.0.1",
@@ -31928,7 +35028,7 @@
             "require-directory": "^2.1.1",
             "string-width": "^4.2.3",
             "y18n": "^5.0.5",
-            "yargs-parser": "^21.0.0"
+            "yargs-parser": "^21.1.1"
           }
         }
       }
@@ -31945,16 +35045,59 @@
         "void-elements": "^2.0.0"
       }
     },
+    "dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      }
+    },
     "dom-walk": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
       "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
       "dev": true
     },
+    "domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.3.0"
+      }
+    },
+    "domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      }
+    },
+    "dotenv": {
+      "version": "16.4.5",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+      "dev": true
+    },
     "dset": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
-      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q=="
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.4.tgz",
+      "integrity": "sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA=="
     },
     "duplexer": {
       "version": "0.1.2",
@@ -31998,21 +35141,21 @@
       }
     },
     "duplexify": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
-      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz",
+      "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.4.1",
         "inherits": "^2.0.3",
         "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
+        "stream-shift": "^1.0.2"
       },
       "dependencies": {
         "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -32067,16 +35210,56 @@
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
+      },
+      "dependencies": {
+        "jsbn": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+          "dev": true
+        }
       }
     },
     "edge-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-2.2.1.tgz",
-      "integrity": "sha512-AI5fC7dfDmCdKo3m5y7PkYE8m6bMqR6pvVpgtrZkkhcJXFLelUgkjrhk3kXXx8Kbw2cRaTT4LkOR7hqf39KJdw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-3.0.5.tgz",
+      "integrity": "sha512-sB7vSrDnFa4ezWQk9nZ/n0FdpdUuC6R1EOrlU3DL+bovcNFK28rqu2emmAUjujYEJTWIgQGqgVVWUZXMnc8iWg==",
       "dev": true,
       "requires": {
-        "@types/which": "^1.3.2",
+        "@types/which": "^2.0.1",
         "which": "^2.0.2"
+      },
+      "dependencies": {
+        "isexe": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+          "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "edgedriver": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/edgedriver/-/edgedriver-5.6.1.tgz",
+      "integrity": "sha512-3Ve9cd5ziLByUdigw6zovVeWJjVs8QHVmqOB0sJ0WNeVPcwf4p18GnxMmVvlFmYRloUwf5suNuorea4QzwBIOA==",
+      "dev": true,
+      "requires": {
+        "@wdio/logger": "^8.38.0",
+        "@zip.js/zip.js": "^2.7.48",
+        "decamelize": "^6.0.0",
+        "edge-paths": "^3.0.5",
+        "fast-xml-parser": "^4.4.1",
+        "node-fetch": "^3.3.2",
+        "which": "^4.0.0"
       }
     },
     "ee-first": {
@@ -32085,18 +35268,18 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "ejs": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
-      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "dev": true,
       "requires": {
         "jake": "^10.8.5"
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.284",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
+      "version": "1.4.802",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz",
+      "integrity": "sha512-TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA=="
     },
     "emoji-regex": {
       "version": "8.0.0",
@@ -32113,7 +35296,29 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true
+    },
+    "encoding-sniffer": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz",
+      "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "^0.6.3",
+        "whatwg-encoding": "^3.1.1"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
+      }
     },
     "end-of-stream": {
       "version": "1.4.4",
@@ -32125,9 +35330,9 @@
       }
     },
     "engine.io": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
-      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
+      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
       "dev": true,
       "requires": {
         "@types/cookie": "^0.4.1",
@@ -32135,31 +35340,31 @@
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
-        "cookie": "~0.4.1",
+        "cookie": "~0.7.2",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1"
       },
       "dependencies": {
         "cookie": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+          "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
           "dev": true
         }
       }
     },
     "engine.io-parser": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
-      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
       "dev": true
     },
     "enhanced-resolve": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-      "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.4",
@@ -32167,12 +35372,24 @@
       }
     },
     "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
       }
     },
     "ent": {
@@ -32181,6 +35398,12 @@
       "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
       "dev": true
     },
+    "entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true
+    },
     "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -32209,66 +35432,122 @@
       }
     },
     "es-abstract": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
         "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
         "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
         "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
+        "is-shared-array-buffer": "^1.0.3",
         "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
+        "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      }
+    },
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.4"
       }
     },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+    },
     "es-get-iterator": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.1.0",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "is-arguments": "^1.1.1",
         "is-map": "^2.0.2",
         "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
+        "is-string": "^1.0.7",
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
       }
     },
     "es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz",
+      "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==",
       "dev": true
     },
-    "es-shim-unscopables": {
+    "es-object-atoms": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0"
+      }
+    },
+    "es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      }
+    },
+    "es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
       "requires": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "es-to-primitive": {
@@ -32283,13 +35562,14 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.62",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
-      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+      "version": "0.10.64",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
+      "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
       "dev": true,
       "requires": {
         "es6-iterator": "^2.0.3",
         "es6-symbol": "^3.1.3",
+        "esniff": "^2.0.1",
         "next-tick": "^1.1.0"
       }
     },
@@ -32310,17 +35590,10 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "es6-object-assign": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-      "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
-      "dev": true
-    },
     "es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
     },
     "es6-promisify": {
       "version": "5.0.0",
@@ -32332,13 +35605,13 @@
       }
     },
     "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz",
+      "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
       "dev": true,
       "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
+        "d": "^1.0.2",
+        "ext": "^1.7.0"
       }
     },
     "es6-weak-map": {
@@ -32353,10 +35626,42 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "esbuild": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz",
+      "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==",
+      "dev": true,
+      "requires": {
+        "@esbuild/aix-ppc64": "0.23.1",
+        "@esbuild/android-arm": "0.23.1",
+        "@esbuild/android-arm64": "0.23.1",
+        "@esbuild/android-x64": "0.23.1",
+        "@esbuild/darwin-arm64": "0.23.1",
+        "@esbuild/darwin-x64": "0.23.1",
+        "@esbuild/freebsd-arm64": "0.23.1",
+        "@esbuild/freebsd-x64": "0.23.1",
+        "@esbuild/linux-arm": "0.23.1",
+        "@esbuild/linux-arm64": "0.23.1",
+        "@esbuild/linux-ia32": "0.23.1",
+        "@esbuild/linux-loong64": "0.23.1",
+        "@esbuild/linux-mips64el": "0.23.1",
+        "@esbuild/linux-ppc64": "0.23.1",
+        "@esbuild/linux-riscv64": "0.23.1",
+        "@esbuild/linux-s390x": "0.23.1",
+        "@esbuild/linux-x64": "0.23.1",
+        "@esbuild/netbsd-x64": "0.23.1",
+        "@esbuild/openbsd-arm64": "0.23.1",
+        "@esbuild/openbsd-x64": "0.23.1",
+        "@esbuild/sunos-x64": "0.23.1",
+        "@esbuild/win32-arm64": "0.23.1",
+        "@esbuild/win32-ia32": "0.23.1",
+        "@esbuild/win32-x64": "0.23.1"
+      }
+    },
     "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA=="
     },
     "escape-html": {
       "version": "1.0.3",
@@ -32536,9 +35841,9 @@
           "dev": true
         },
         "globals": {
-          "version": "13.17.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+          "version": "13.24.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -32551,12 +35856,18 @@
           "dev": true
         },
         "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "version": "7.6.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+          "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
           "dev": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "ansi-regex": "^5.0.1"
           }
         },
         "strip-json-comments": {
@@ -32590,13 +35901,14 @@
       "requires": {}
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       },
       "dependencies": {
         "debug": {
@@ -32611,9 +35923,9 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz",
+      "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7"
@@ -32641,33 +35953,38 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz",
+      "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.9.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "doctrine": {
@@ -32678,12 +35995,48 @@
           "requires": {
             "esutils": "^2.0.2"
           }
+        }
+      }
+    },
+    "eslint-plugin-jsdoc": {
+      "version": "48.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.5.0.tgz",
+      "integrity": "sha512-ukXPNpGby3KjCveCizIS8t1EbuJEHYEu/tBg8GCbn/YbHcXwphyvYCdvRZ/oMRfTscGSSzfsWoZ+ZkAP0/6YMQ==",
+      "dev": true,
+      "requires": {
+        "@es-joy/jsdoccomment": "~0.43.1",
+        "are-docs-informative": "^0.0.2",
+        "comment-parser": "1.4.1",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.5.0",
+        "parse-imports": "^2.1.0",
+        "semver": "^7.6.2",
+        "spdx-expression-parse": "^4.0.0",
+        "synckit": "^0.9.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+        "semver": {
+          "version": "7.6.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+          "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
           "dev": true
+        },
+        "spdx-expression-parse": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+          "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
+          "dev": true,
+          "requires": {
+            "spdx-exceptions": "^2.1.0",
+            "spdx-license-ids": "^3.0.0"
+          }
         }
       }
     },
@@ -32702,9 +36055,9 @@
       },
       "dependencies": {
         "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+          "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
           "dev": true
         }
       }
@@ -32759,6 +36112,18 @@
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
+    "esniff": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
+      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+      "dev": true,
+      "requires": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
+      }
+    },
     "espree": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
@@ -32785,9 +36150,9 @@
       "dev": true
     },
     "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
@@ -32874,6 +36239,12 @@
         }
       }
     },
+    "event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "dev": true
+    },
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -32914,6 +36285,12 @@
             "which": "^1.2.9"
           }
         },
+        "isexe": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+          "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+          "dev": true
+        },
         "path-key": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -32994,61 +36371,14 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
         "is-extendable": {
@@ -33075,86 +36405,49 @@
       }
     },
     "expect": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
-      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
-        "ansi-styles": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-regex-util": "^26.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
-      }
-    },
-    "expect-webdriverio": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-2.0.2.tgz",
-      "integrity": "sha512-dst0tqP1aZ2p7TPmbatqoIQ+7hRTw+IeKNi830XxKhu2DNNe5vQ85i9ttf9rpXgbnUf91HxKcocn4G7A5bQxDA==",
-      "dev": true,
-      "requires": {
-        "expect": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2"
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
       }
     },
     "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -33170,10 +36463,52 @@
             "ms": "2.0.0"
           }
         },
+        "encodeurl": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+          "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
+        },
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "send": {
+          "version": "0.19.0",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+          "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "2.0.0",
+            "mime": "1.6.0",
+            "ms": "2.1.3",
+            "on-finished": "2.4.1",
+            "range-parser": "~1.2.1",
+            "statuses": "2.0.1"
+          },
+          "dependencies": {
+            "encodeurl": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+              "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+            },
+            "ms": {
+              "version": "2.1.3",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+            }
+          }
         }
       }
     },
@@ -33184,14 +36519,6 @@
       "dev": true,
       "requires": {
         "type": "^2.7.2"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.7.2",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-          "dev": true
-        }
       }
     },
     "extend": {
@@ -33226,6 +36553,17 @@
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
         "tmp": "^0.0.33"
+      },
+      "dependencies": {
+        "tmp": {
+          "version": "0.0.33",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "~1.0.2"
+          }
+        }
       }
     },
     "extglob": {
@@ -33290,6 +36628,16 @@
           "requires": {
             "pump": "^3.0.0"
           }
+        },
+        "yauzl": {
+          "version": "2.10.0",
+          "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+          "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+          "dev": true,
+          "requires": {
+            "buffer-crc32": "~0.2.3",
+            "fd-slicer": "~1.1.0"
+          }
         }
       }
     },
@@ -33323,6 +36671,12 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "dev": true
+    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -33335,6 +36689,15 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "fast-xml-parser": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
+      "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+      "dev": true,
+      "requires": {
+        "strnum": "^1.0.5"
+      }
+    },
     "faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
@@ -33353,22 +36716,37 @@
         "pend": "~1.2.0"
       }
     },
-    "fibers": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.3.tgz",
-      "integrity": "sha512-/qYTSoZydQkM21qZpGLDLuCq8c+B8KhuCQ1kLPvnRNhxhVbvrpmH9l2+Lblf5neDuEsY4bfT7LeO553TXQDvJw==",
+    "fecha": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
+      "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==",
+      "dev": true
+    },
+    "fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
       "dev": true,
       "requires": {
-        "detect-libc": "^1.0.3"
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "dependencies": {
+        "web-streams-polyfill": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+          "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+          "dev": true
+        }
       }
     },
     "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz",
+      "integrity": "sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5"
+        "is-unicode-supported": "^2.0.0"
       }
     },
     "file-entry-cache": {
@@ -33406,9 +36784,9 @@
           }
         },
         "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
@@ -33417,21 +36795,21 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
     },
     "finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -33447,6 +36825,11 @@
             "ms": "2.0.0"
           }
         },
+        "encodeurl": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+          "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -33593,12 +36976,6 @@
             }
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -33669,19 +37046,20 @@
       "dev": true
     },
     "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "dev": true,
       "requires": {
-        "flatted": "^3.1.0",
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
         "rimraf": "^3.0.2"
       }
     },
     "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
       "dev": true
     },
     "flush-write-stream": {
@@ -33695,9 +37073,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true
     },
     "for-each": {
@@ -33730,6 +37108,24 @@
       "integrity": "sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==",
       "dev": true
     },
+    "foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "dependencies": {
+        "signal-exit": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+          "dev": true
+        }
+      }
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -33753,6 +37149,25 @@
         "mime-types": "^2.1.12"
       }
     },
+    "formdata-node": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-5.0.1.tgz",
+      "integrity": "sha512-8xnIjMYGKPj+rY2BTbAmpqVpi8der/2FT4d9f7J32FlsCpO5EzZPq3C/N56zdv8KweHzVF6TGijsS1JT6r1H2g==",
+      "dev": true,
+      "requires": {
+        "node-domexception": "1.0.0",
+        "web-streams-polyfill": "4.0.0-beta.3"
+      }
+    },
+    "formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dev": true,
+      "requires": {
+        "fetch-blob": "^3.1.2"
+      }
+    },
     "forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -33778,21 +37193,30 @@
       "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
       "dev": true
     },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
     "fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
+      "integrity": "sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "jsonfile": "~1.0.1",
+        "mkdirp": "0.3.x",
+        "ncp": "~0.4.2",
+        "rimraf": "~2.2.0"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
+          "dev": true
+        }
       }
     },
     "fs-mkdirp-stream": {
@@ -33817,6 +37241,14 @@
         }
       }
     },
+    "fs-readfile-promise": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-3.0.1.tgz",
+      "integrity": "sha512-LsSxMeaJdYH27XrW7Dmq0Gx63mioULCRel63B5VeELYLavi1wF5s0XfsIdKDFdCL9hsfQ2qBvXJszQtQJ9h17A==",
+      "requires": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
     "fs.extra": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz",
@@ -33828,35 +37260,11 @@
         "walk": "^2.3.9"
       },
       "dependencies": {
-        "fs-extra": {
-          "version": "0.6.4",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
-          "integrity": "sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==",
-          "dev": true,
-          "requires": {
-            "jsonfile": "~1.0.1",
-            "mkdirp": "0.3.x",
-            "ncp": "~0.4.2",
-            "rimraf": "~2.2.0"
-          }
-        },
-        "jsonfile": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
-          "integrity": "sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==",
-          "dev": true
-        },
         "mkdirp": {
           "version": "0.3.5",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
           "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
           "dev": true
-        },
-        "rimraf": {
-          "version": "2.2.8",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-          "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
-          "dev": true
         }
       }
     },
@@ -33867,9 +37275,9 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "optional": true
     },
     "fstream": {
@@ -33884,13 +37292,18 @@
         "rimraf": "2"
       },
       "dependencies": {
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.6"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "rimraf": {
@@ -33913,20 +37326,20 @@
       }
     },
     "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
     },
     "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       }
     },
     "functional-red-black-tree": {
@@ -33950,6 +37363,55 @@
         "globule": "^1.0.0"
       }
     },
+    "geckodriver": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-4.4.1.tgz",
+      "integrity": "sha512-nnAdIrwLkMcDu4BitWXF23pEMeZZ0Cj7HaWWFdSpeedBP9z6ft150JYiGO2mwzw6UiR823Znk1JeIf07RyzloA==",
+      "dev": true,
+      "requires": {
+        "@wdio/logger": "^8.28.0",
+        "@zip.js/zip.js": "^2.7.44",
+        "decamelize": "^6.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.4",
+        "node-fetch": "^3.3.2",
+        "tar-fs": "^3.0.6",
+        "which": "^4.0.0"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+          "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+          "dev": true,
+          "requires": {
+            "agent-base": "^7.0.2",
+            "debug": "4"
+          }
+        },
+        "tar-fs": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+          "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+          "dev": true,
+          "requires": {
+            "bare-fs": "^2.1.1",
+            "bare-path": "^2.1.0",
+            "pump": "^3.0.0",
+            "tar-stream": "^3.1.5"
+          }
+        }
+      }
+    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -33962,19 +37424,21 @@
       "dev": true
     },
     "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       }
     },
     "get-package-type": {
@@ -33984,9 +37448,9 @@
       "dev": true
     },
     "get-port": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
-      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-7.1.0.tgz",
+      "integrity": "sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==",
       "dev": true
     },
     "get-stream": {
@@ -33999,13 +37463,64 @@
       }
     },
     "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
+      }
+    },
+    "get-tsconfig": {
+      "version": "4.7.6",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.6.tgz",
+      "integrity": "sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==",
+      "dev": true,
+      "requires": {
+        "resolve-pkg-maps": "^1.0.0"
+      }
+    },
+    "get-uri": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
+      "dev": true,
+      "requires": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.2.0"
+      },
+      "dependencies": {
+        "data-uri-to-buffer": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+          "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+          "dev": true
+        },
+        "fs-extra": {
+          "version": "11.2.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+          "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        }
       }
     },
     "get-value": {
@@ -34023,6 +37538,12 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "git-repo-info": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/git-repo-info/-/git-repo-info-2.1.1.tgz",
+      "integrity": "sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==",
+      "dev": true
+    },
     "git-up": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz",
@@ -34034,14 +37555,31 @@
       }
     },
     "git-url-parse": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz",
-      "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==",
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.1.tgz",
+      "integrity": "sha512-PCFJyeSSdtnbfhSNRw9Wk96dDCNx+sogTe4YNXeXSJxt7xz5hvXekuRn9JX7m+Mf4OscCu8h+mtAl3+h5Fo8lQ==",
       "dev": true,
       "requires": {
         "git-up": "^7.0.0"
       }
     },
+    "gitconfiglocal": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz",
+      "integrity": "sha512-qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg==",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.2"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+          "dev": true
+        }
+      }
+    },
     "github-slugger": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz",
@@ -34049,17 +37587,37 @@
       "dev": true
     },
     "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
       }
     },
     "glob-parent": {
@@ -34089,6 +37647,20 @@
         "unique-stream": "^2.0.2"
       },
       "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -34283,6 +37855,17 @@
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
         "is-plain-object": {
@@ -34294,15 +37877,6 @@
             "isobject": "^3.0.1"
           }
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -34342,12 +37916,6 @@
               "requires": {
                 "is-plain-object": "^2.0.4"
               }
-            },
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
             }
           }
         },
@@ -34414,6 +37982,12 @@
           "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
           "dev": true
         },
+        "isexe": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+          "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+          "dev": true
+        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -34436,6 +38010,16 @@
       "integrity": "sha512-qpPnUKkWnz8NESjrCvnlGklsgiQzlq+rcCxoG5uNQ+dNA7cFMCmn231slLAwS2N/PlkzZ3COL8CcS10jXmLHqg==",
       "dev": true
     },
+    "globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      }
+    },
     "globule": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz",
@@ -34481,30 +38065,18 @@
         "sparkles": "^1.0.0"
       }
     },
-    "got": {
-      "version": "11.8.5",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
-      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
-      "dev": true,
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "requires": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.2",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
+        "get-intrinsic": "^1.1.3"
       }
     },
     "graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "grapheme-splitter": {
       "version": "1.0.4",
@@ -34512,12 +38084,6 @@
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
       "dev": true
     },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
     "gulp": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
@@ -34543,6 +38109,20 @@
         "vinyl": "^2.1.0"
       },
       "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -34821,99 +38401,6 @@
           "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz",
           "integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==",
           "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "depd": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-          "dev": true
-        },
-        "destroy": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-          "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
-          "dev": true
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-          "dev": true,
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-          "dev": true
-        },
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "on-finished": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-          "dev": true,
-          "requires": {
-            "ee-first": "1.1.1"
-          }
-        },
-        "send": {
-          "version": "0.16.2",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-          "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-          "dev": true,
-          "requires": {
-            "debug": "2.6.9",
-            "depd": "~1.1.2",
-            "destroy": "~1.0.4",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
-            "fresh": "0.5.2",
-            "http-errors": "~1.6.2",
-            "mime": "1.4.1",
-            "ms": "2.0.0",
-            "on-finished": "~2.3.0",
-            "range-parser": "~1.2.0",
-            "statuses": "~1.4.0"
-          }
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
-        },
-        "statuses": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-          "dev": true
         }
       }
     },
@@ -34937,12 +38424,6 @@
             "ansi-wrap": "^0.1.0"
           }
         },
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
         "arr-diff": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -34961,6 +38442,12 @@
           "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
           "dev": true
         },
+        "cli-width": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+          "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+          "dev": true
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -35046,17 +38533,6 @@
             "table": "^5.2.3",
             "text-table": "^0.2.0",
             "v8-compile-cache": "^2.0.3"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
-            }
           }
         },
         "eslint-utils": {
@@ -35095,6 +38571,15 @@
             "is-extendable": "^1.0.1"
           }
         },
+        "figures": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+          "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
         "file-entry-cache": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -35121,6 +38606,20 @@
           "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
           "dev": true
         },
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "globals": {
           "version": "12.4.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
@@ -35175,6 +38674,15 @@
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
               }
+            },
+            "strip-ansi": {
+              "version": "6.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^5.0.1"
+              }
             }
           }
         },
@@ -35184,6 +38692,12 @@
           "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
           "dev": true
         },
+        "isexe": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+          "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+          "dev": true
+        },
         "levn": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -35194,14 +38708,11 @@
             "type-check": "~0.3.2"
           }
         },
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.6"
-          }
+        "mute-stream": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+          "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+          "dev": true
         },
         "optionator": {
           "version": "0.8.3",
@@ -35256,6 +38767,21 @@
             "glob": "^7.1.3"
           }
         },
+        "run-async": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+          "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
         "shebang-command": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -35282,6 +38808,23 @@
             "is-fullwidth-code-point": "^2.0.0"
           }
         },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+              "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+              "dev": true
+            }
+          }
+        },
         "strip-json-comments": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -35319,15 +38862,6 @@
                 "is-fullwidth-code-point": "^2.0.0",
                 "strip-ansi": "^5.1.0"
               }
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
             }
           }
         },
@@ -35434,25 +38968,23 @@
         "minimatch": "^3.0.3"
       }
     },
+    "gulp-rename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
+      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
+      "dev": true
+    },
     "gulp-replace": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz",
-      "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.4.tgz",
+      "integrity": "sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==",
       "dev": true,
       "requires": {
-        "@types/node": "^14.14.41",
+        "@types/node": "*",
         "@types/vinyl": "^2.0.4",
         "istextorbinary": "^3.0.0",
         "replacestream": "^4.0.3",
         "yargs-parser": ">=5.0.0-security.0"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "14.18.33",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz",
-          "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==",
-          "dev": true
-        }
       }
     },
     "gulp-shell": {
@@ -35598,6 +39130,12 @@
           "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
           "dev": true
         },
+        "convert-source-map": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+          "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -35807,6 +39345,72 @@
         }
       }
     },
+    "gulp-wrap": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/gulp-wrap/-/gulp-wrap-0.15.0.tgz",
+      "integrity": "sha512-f17zkGObA+hE/FThlg55gfA0nsXbdmHK1WqzjjB2Ytq1TuhLR7JiCBJ3K4AlMzCyoFaCjfowos+VkToUNE0WTQ==",
+      "requires": {
+        "consolidate": "^0.15.1",
+        "es6-promise": "^4.2.6",
+        "fs-readfile-promise": "^3.0.1",
+        "js-yaml": "^3.13.0",
+        "lodash": "^4.17.11",
+        "node.extend": "2.0.2",
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.1",
+        "tryit": "^1.0.1",
+        "vinyl-bufferstream": "^1.0.1"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "requires": {
+            "ansi-wrap": "^0.1.0"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="
+        },
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "arr-diff": "^4.0.0",
+            "arr-union": "^3.1.0",
+            "extend-shallow": "^3.0.2"
+          }
+        },
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
     "gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
@@ -35826,13 +39430,13 @@
       }
     },
     "handlebars": {
-      "version": "4.7.7",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
-      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+      "version": "4.7.8",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.5",
-        "neo-async": "^2.6.0",
+        "neo-async": "^2.6.2",
         "source-map": "^0.6.1",
         "uglify-js": "^3.1.4",
         "wordwrap": "^1.0.0"
@@ -35863,12 +39467,9 @@
       }
     },
     "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ=="
     },
     "has-ansi": {
       "version": "2.0.0",
@@ -35908,26 +39509,30 @@
       }
     },
     "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "requires": {
-        "get-intrinsic": "^1.1.1"
+        "es-define-property": "^1.0.0"
       }
     },
+    "has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
+    },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
     "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       }
     },
     "has-value": {
@@ -35988,70 +39593,135 @@
         }
       }
     },
-    "hast-util-is-element": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
-      "integrity": "sha512-thjnlGAnwP8ef/GSO1Q8BfVk2gundnc2peGQqEg2kUt/IqesiGg/5mSwN2fE7nLzy61pg88NG6xV+UrGOrx9EA==",
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
+    },
+    "hast-util-from-parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-7.1.2.tgz",
+      "integrity": "sha512-Nz7FfPBuljzsN3tCQ4kCBKqdNhQE2l0Tn+X1ubgKBPRoiDIu1mL08Cfw4k7q71+Duyaw7DXDN+VTAp4Vh3oCOw==",
       "dev": true,
       "requires": {
         "@types/hast": "^2.0.0",
-        "@types/unist": "^2.0.0"
+        "@types/unist": "^2.0.0",
+        "hastscript": "^7.0.0",
+        "property-information": "^6.0.0",
+        "vfile": "^5.0.0",
+        "vfile-location": "^4.0.0",
+        "web-namespaces": "^2.0.0"
+      }
+    },
+    "hast-util-parse-selector": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-3.1.1.tgz",
+      "integrity": "sha512-jdlwBjEexy1oGz0aJ2f4GKMaVKkA9jwjr4MjAAI22E5fM/TXVZHuS5OpONtdeIkRKqAaryQ2E9xNQxijoThSZA==",
+      "dev": true,
+      "requires": {
+        "@types/hast": "^2.0.0"
+      }
+    },
+    "hast-util-raw": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-7.2.3.tgz",
+      "integrity": "sha512-RujVQfVsOrxzPOPSzZFiwofMArbQke6DJjnFfceiEbFh7S05CbPt0cYN+A5YeD3pso0JQk6O1aHBnx9+Pm2uqg==",
+      "dev": true,
+      "requires": {
+        "@types/hast": "^2.0.0",
+        "@types/parse5": "^6.0.0",
+        "hast-util-from-parse5": "^7.0.0",
+        "hast-util-to-parse5": "^7.0.0",
+        "html-void-elements": "^2.0.0",
+        "parse5": "^6.0.0",
+        "unist-util-position": "^4.0.0",
+        "unist-util-visit": "^4.0.0",
+        "vfile": "^5.0.0",
+        "web-namespaces": "^2.0.0",
+        "zwitch": "^2.0.0"
       }
     },
     "hast-util-sanitize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-4.0.0.tgz",
-      "integrity": "sha512-pw56+69jq+QSr/coADNvWTmBPDy+XsmwaF5KnUys4/wM1jt/fZdl7GPxhXXXYdXnz3Gj3qMkbUCH2uKjvX0MgQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-4.1.0.tgz",
+      "integrity": "sha512-Hd9tU0ltknMGRDv+d6Ro/4XKzBqQnP/EZrpiTbpFYfXv/uOhWeKc+2uajcbEvAEH98VZd7eII2PiXm13RihnLw==",
       "dev": true,
       "requires": {
         "@types/hast": "^2.0.0"
       }
     },
     "hast-util-to-html": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-8.0.3.tgz",
-      "integrity": "sha512-/D/E5ymdPYhHpPkuTHOUkSatxr4w1ZKrZsG0Zv/3C2SRVT0JFJG53VS45AMrBtYk0wp5A7ksEhiC8QaOZM95+A==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-8.0.4.tgz",
+      "integrity": "sha512-4tpQTUOr9BMjtYyNlt0P50mH7xj0Ks2xpo8M943Vykljf99HW6EzulIoJP1N3eKOSScEHzyzi9dm7/cn0RfGwA==",
       "dev": true,
       "requires": {
         "@types/hast": "^2.0.0",
+        "@types/unist": "^2.0.0",
         "ccount": "^2.0.0",
         "comma-separated-tokens": "^2.0.0",
-        "hast-util-is-element": "^2.0.0",
+        "hast-util-raw": "^7.0.0",
         "hast-util-whitespace": "^2.0.0",
         "html-void-elements": "^2.0.0",
         "property-information": "^6.0.0",
         "space-separated-tokens": "^2.0.0",
-        "stringify-entities": "^4.0.2",
-        "unist-util-is": "^5.0.0"
+        "stringify-entities": "^4.0.0",
+        "zwitch": "^2.0.4"
+      }
+    },
+    "hast-util-to-parse5": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-7.1.0.tgz",
+      "integrity": "sha512-YNRgAJkH2Jky5ySkIqFXTQiaqcAtJyVE+D5lkN6CdtOqrnkLfGYYrEcKuHOJZlp+MwjSwuD3fZuawI+sic/RBw==",
+      "dev": true,
+      "requires": {
+        "@types/hast": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "web-namespaces": "^2.0.0",
+        "zwitch": "^2.0.0"
       }
     },
     "hast-util-whitespace": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz",
-      "integrity": "sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz",
+      "integrity": "sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==",
       "dev": true
     },
+    "hastscript": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-7.2.0.tgz",
+      "integrity": "sha512-TtYPq24IldU8iKoJQqvZOuhi5CyCQRAbvDOX0x1eW6rsHSxa/1i2CCiptNTotGHJ3VoHRGmqiv6/D3q113ikkw==",
+      "dev": true,
+      "requires": {
+        "@types/hast": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-parse-selector": "^3.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0"
+      }
+    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true
     },
-    "highlight.js": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz",
-      "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
+    "headers-utils": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/headers-utils/-/headers-utils-1.2.5.tgz",
+      "integrity": "sha512-DAzV5P/pk3wTU/8TLZN+zFTDv4Xa1QDTU8pRvovPetcOMbmqq8CwsAvZBLPZHH6usxyy31zMp7I4aCYb6XIf6w==",
       "dev": true
     },
-    "home-or-tmp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
-      }
+    "highlight.js": {
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
+      "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==",
+      "dev": true
     },
     "homedir-polyfill": {
       "version": "1.0.3",
@@ -36063,12 +39733,20 @@
       }
     },
     "hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
       "dev": true,
       "requires": {
-        "lru-cache": "^6.0.0"
+        "lru-cache": "^10.0.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "10.2.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
+          "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+          "dev": true
+        }
       }
     },
     "html-escaper": {
@@ -36083,12 +39761,24 @@
       "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==",
       "dev": true
     },
-    "http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+    "htmlfy": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/htmlfy/-/htmlfy-0.2.1.tgz",
+      "integrity": "sha512-HoomFHQ3av1uhq+7FxJTq4Ns0clAD+tGbQNrSd0WFY3UAjjUk6G3LaWEqdgmIXYkY4pexZiyZ3ykZJhQlM0J5A==",
       "dev": true
     },
+    "htmlparser2": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
+      "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.1.0",
+        "entities": "^4.5.0"
+      }
+    },
     "http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -36118,6 +39808,27 @@
         "requires-port": "^1.0.0"
       }
     },
+    "http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        }
+      }
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -36129,16 +39840,6 @@
         "sshpk": "^1.7.0"
       }
     },
-    "http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-      "dev": true,
-      "requires": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
-      }
-    },
     "https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
@@ -36149,6 +39850,12 @@
         "debug": "4"
       }
     },
+    "human-signals": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.0.tgz",
+      "integrity": "sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==",
+      "dev": true
+    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -36169,6 +39876,12 @@
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true
     },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+      "dev": true
+    },
     "import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -36187,18 +39900,18 @@
         }
       }
     },
+    "import-meta-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
+      "integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==",
+      "dev": true
+    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true
     },
-    "indent-string": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-      "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
-      "dev": true
-    },
     "individual": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
@@ -36227,102 +39940,28 @@
       "dev": true
     },
     "inquirer": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.5.tgz",
-      "integrity": "sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==",
+      "version": "10.1.8",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-10.1.8.tgz",
+      "integrity": "sha512-syxGpOzLyqVeZi1KDBjRTnCn5PiGWySGHP0BbqXbqsEK0ckkZk3egAepEWslUjZXj0rhkUapVXM/IpADWe4D6w==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "7.5.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-          "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
-          "dev": true
-        }
+        "@inquirer/prompts": "^5.3.8",
+        "@inquirer/type": "^1.5.2",
+        "@types/mute-stream": "^0.0.4",
+        "ansi-escapes": "^4.3.2",
+        "mute-stream": "^1.0.0",
+        "run-async": "^3.0.0",
+        "rxjs": "^7.8.1"
       }
     },
     "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
       "dev": true,
       "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       }
     },
@@ -36332,26 +39971,40 @@
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
       "dev": true
     },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
       "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
       "dev": true
     },
+    "ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "requires": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "dependencies": {
+        "sprintf-js": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+          "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+          "dev": true
+        }
+      }
+    },
     "ipaddr.js": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
+    "is": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
+      "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg=="
+    },
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
@@ -36363,20 +40016,12 @@
       }
     },
     "is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+        "hasown": "^2.0.0"
       }
     },
     "is-arguments": {
@@ -36389,6 +40034,16 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -36436,28 +40091,29 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "requires": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.2"
       }
     },
     "is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+        "hasown": "^2.0.0"
+      }
+    },
+    "is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "dev": true,
+      "requires": {
+        "is-typed-array": "^1.1.13"
       }
     },
     "is-date-object": {
@@ -36470,22 +40126,13 @@
       }
     },
     "is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       }
     },
     "is-docker": {
@@ -36498,7 +40145,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
       "requires": {
         "is-plain-object": "^2.0.4"
       },
@@ -36507,7 +40153,6 @@
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
           "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
           "requires": {
             "isobject": "^3.0.1"
           }
@@ -36520,12 +40165,6 @@
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true
     },
-    "is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true
-    },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -36556,16 +40195,10 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true
-    },
     "is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "dev": true
     },
     "is-nan": {
@@ -36585,9 +40218,9 @@
       "dev": true
     },
     "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "dev": true
     },
     "is-number": {
@@ -36649,18 +40282,18 @@
       "dev": true
     },
     "is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
       "dev": true
     },
     "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.7"
       }
     },
     "is-ssh": {
@@ -36697,16 +40330,12 @@
       }
     },
     "is-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-      "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dev": true,
       "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
-        "for-each": "^0.3.3",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.14"
       }
     },
     "is-typedarray": {
@@ -36725,9 +40354,9 @@
       }
     },
     "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
+      "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
       "dev": true
     },
     "is-utf8": {
@@ -36743,9 +40372,9 @@
       "dev": true
     },
     "is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
       "dev": true
     },
     "is-weakref": {
@@ -36758,13 +40387,13 @@
       }
     },
     "is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
+      "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4"
       }
     },
     "is-windows": {
@@ -36795,16 +40424,15 @@
       "dev": true
     },
     "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "dev": true
     },
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
     },
     "isstream": {
       "version": "0.1.2",
@@ -36853,14 +40481,11 @@
           "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
           "dev": true
         },
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.6"
-          }
+        "isexe": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+          "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+          "dev": true
         },
         "resolve": {
           "version": "1.1.7",
@@ -36889,9 +40514,9 @@
       }
     },
     "istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true
     },
     "istanbul-lib-instrument": {
@@ -36908,13 +40533,13 @@
       }
     },
     "istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "requires": {
         "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
+        "make-dir": "^4.0.0",
         "supports-color": "^7.1.0"
       },
       "dependencies": {
@@ -36924,6 +40549,21 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "make-dir": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+          "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+          "dev": true,
+          "requires": {
+            "semver": "^7.5.3"
+          }
+        },
+        "semver": {
+          "version": "7.6.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+          "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -36955,9 +40595,9 @@
       }
     },
     "istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
       "requires": {
         "html-escaper": "^2.0.0",
@@ -36974,16 +40614,26 @@
         "textextensions": "^3.2.0"
       }
     },
+    "jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "requires": {
+        "@isaacs/cliui": "^8.0.2",
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "jake": {
-      "version": "10.8.5",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz",
+      "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==",
       "dev": true,
       "requires": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -36996,9 +40646,9 @@
           }
         },
         "async": {
-          "version": "3.2.4",
-          "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+          "version": "3.2.5",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+          "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
           "dev": true
         },
         "chalk": {
@@ -37044,15 +40694,15 @@
       }
     },
     "jest-diff": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -37107,21 +40757,21 @@
       }
     },
     "jest-get-type": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "dev": true
     },
     "jest-matcher-utils": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
-      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -37176,20 +40826,20 @@
       }
     },
     "jest-message-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
-      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.6.2",
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.2"
+        "stack-utils": "^2.0.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -37249,11 +40899,70 @@
         }
       }
     },
-    "jest-regex-util": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-      "dev": true
+    "jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
     },
     "jest-worker": {
       "version": "27.5.1",
@@ -37283,11 +40992,6 @@
         }
       }
     },
-    "js-cookie": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
-      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -37297,7 +41001,6 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -37306,15 +41009,20 @@
         "esprima": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-          "dev": true
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
         }
       }
     },
     "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
+    "jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
       "dev": true
     },
     "jsesc": {
@@ -37329,9 +41037,9 @@
       "dev": true
     },
     "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
       "dev": true
     },
     "json-schema": {
@@ -37359,19 +41067,15 @@
       "dev": true
     },
     "json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
     },
     "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
+      "integrity": "sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==",
+      "dev": true
     },
     "jsprim": {
       "version": "1.4.2",
@@ -37385,10 +41089,17 @@
         "verror": "1.10.0"
       }
     },
-    "just-clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
-      "integrity": "sha512-p93GINPwrve0w3HUzpXmpTl7MyzzWz1B5ag44KEtq/hP1mtK8lA2b9Q0VQaPlnY87352osJcE6uBmN0e8kuFMw=="
+    "jszip": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+      "dev": true,
+      "requires": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "^1.0.5"
+      }
     },
     "just-debounce": {
       "version": "1.1.0",
@@ -37403,9 +41114,9 @@
       "dev": true
     },
     "karma": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz",
-      "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==",
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz",
+      "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==",
       "dev": true,
       "requires": {
         "@colors/colors": "1.5.0",
@@ -37427,13 +41138,22 @@
         "qjobs": "^1.2.0",
         "range-parser": "^1.2.1",
         "rimraf": "^3.0.2",
-        "socket.io": "^4.4.1",
+        "socket.io": "^4.7.2",
         "source-map": "^0.6.1",
         "tmp": "^0.2.1",
         "ua-parser-js": "^0.7.30",
         "yargs": "^16.1.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cliui": {
           "version": "7.0.4",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -37445,13 +41165,33 @@
             "wrap-ansi": "^7.0.0"
           }
         },
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.6"
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "source-map": {
@@ -37460,13 +41200,24 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "tmp": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-          "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
           "dev": true,
           "requires": {
-            "rimraf": "^3.0.0"
+            "ansi-regex": "^5.0.1"
+          }
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
           }
         },
         "yargs": {
@@ -37518,14 +41269,20 @@
       "requires": {}
     },
     "karma-chrome-launcher": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz",
-      "integrity": "sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz",
+      "integrity": "sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==",
       "dev": true,
       "requires": {
         "which": "^1.2.1"
       },
       "dependencies": {
+        "isexe": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+          "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+          "dev": true
+        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -37538,9 +41295,9 @@
       }
     },
     "karma-coverage": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.0.tgz",
-      "integrity": "sha512-gPVdoZBNDZ08UCzdMHHhEImKrw1+PAOQOIiffv1YsvxFhBjqvo/SVXNk4tqn1SYqX0BJZT6S/59zgxiBe+9OuA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.1.tgz",
+      "integrity": "sha512-yj7hbequkQP2qOSb20GuNSIyE//PgJWHwC2IydLE6XRtsnaflv+/OSGNssPjobYUlhVVagy99TQpqUt3vAUG7A==",
       "dev": true,
       "requires": {
         "istanbul-lib-coverage": "^3.2.0",
@@ -37564,6 +41321,20 @@
         "minimatch": "^3.0.4"
       },
       "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "istanbul-lib-source-maps": {
           "version": "3.0.6",
           "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
@@ -37634,13 +41405,30 @@
       }
     },
     "karma-firefox-launcher": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.2.tgz",
-      "integrity": "sha512-VV9xDQU1QIboTrjtGVD4NCfzIH7n01ZXqy/qpBhnOeGVOkG5JYPEm8kuSd7psHE6WouZaQ9Ool92g8LFweSNMA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.3.tgz",
+      "integrity": "sha512-LMM2bseebLbYjODBOVt7TCPP9OI2vZIXCavIXhkO9m+10Uj5l7u/SKoeRmYx8FYHTVGZSpk6peX+3BMHC1WwNw==",
       "dev": true,
       "requires": {
         "is-wsl": "^2.2.0",
-        "which": "^2.0.1"
+        "which": "^3.0.0"
+      },
+      "dependencies": {
+        "isexe": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+          "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+          "dev": true
+        },
+        "which": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+          "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
     },
     "karma-ie-launcher": {
@@ -37736,14 +41524,61 @@
       }
     },
     "karma-webpack": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz",
-      "integrity": "sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.1.tgz",
+      "integrity": "sha512-oo38O+P3W2mSPCSUrQdySSPv1LvPpXP+f+bBimNomS5sW+1V4SuhCuW8TfJzV+rDv921w2fDSDw0xJbPe6U+kQ==",
       "dev": true,
       "requires": {
         "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
+        "minimatch": "^9.0.3",
         "webpack-merge": "^4.1.5"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          },
+          "dependencies": {
+            "minimatch": {
+              "version": "3.1.2",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+              "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+              "dev": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            }
+          }
+        },
+        "minimatch": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+          "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          },
+          "dependencies": {
+            "brace-expansion": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+              "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+              "dev": true,
+              "requires": {
+                "balanced-match": "^1.0.0"
+              }
+            }
+          }
+        }
       }
     },
     "keycode": {
@@ -37753,18 +41588,18 @@
       "dev": true
     },
     "keyv": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.0.tgz",
-      "integrity": "sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
       "requires": {
         "json-buffer": "3.0.1"
       }
     },
     "kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "kleur": {
@@ -37773,6 +41608,11 @@
       "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
       "dev": true
     },
+    "klona": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="
+    },
     "konan": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/konan/-/konan-2.1.1.tgz",
@@ -37783,12 +41623,6 @@
         "@babel/traverse": "^7.10.5"
       }
     },
-    "ky": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/ky/-/ky-0.29.0.tgz",
-      "integrity": "sha512-01TBSOqlHmLfcQhHseugGHLxPtU03OyZWaLDWt5MfzCkijG6xWFvAQPhKVn0cR2MMjYvBP9keQ8A3+rQEhLO5g==",
-      "dev": true
-    },
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -37842,6 +41676,15 @@
         "type-check": "~0.4.0"
       }
     },
+    "lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dev": true,
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
     "liftoff": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
@@ -37869,37 +41712,10 @@
         }
       }
     },
-    "lighthouse-logger": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz",
-      "integrity": "sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==",
-      "dev": true,
-      "requires": {
-        "debug": "^2.6.9",
-        "marky": "^1.2.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
-      }
-    },
     "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz",
+      "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==",
       "dev": true
     },
     "listenercount": {
@@ -37909,26 +41725,16 @@
       "dev": true
     },
     "live-connect-common": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/live-connect-common/-/live-connect-common-3.0.0.tgz",
-      "integrity": "sha512-pa1SuzCg8ovsB6OziAQZpDid/OT8k37VgWFQkE8OUmG52Kf9PUtJM8wqaGdMXd/rNAe/NH8m+Kxx9MZuOvn5zg=="
-    },
-    "live-connect-handlers": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/live-connect-handlers/-/live-connect-handlers-2.1.0.tgz",
-      "integrity": "sha512-uABe9D6yRp7HRgO6vhdIM5j88l17/ROzYGIOHc2Rv1TacLFH6IJ8sbmunY5mIJ9L6ArOVmL4WHY+QgOIkabhxg==",
-      "requires": {
-        "js-cookie": "^3.0.5",
-        "live-connect-common": "^3.0.0"
-      }
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/live-connect-common/-/live-connect-common-4.1.0.tgz",
+      "integrity": "sha512-sRklgbe13377aR+G0qCBiZPayQw5oZZozkuxKEoyipxscLbVzwe9gtA7CPpbmo6UcOdQxdCE6A7J1tI0wTSmqw=="
     },
     "live-connect-js": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-6.0.1.tgz",
-      "integrity": "sha512-+TwM7cjgyutqaMNlTQKNY9nJFDPpSWfoazSHmlWxOPlimp10PSZGABIbtulNGGpYbR/Zxgc+C/uW5OxqcNEPXg==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-7.1.0.tgz",
+      "integrity": "sha512-fFxvQjOsHkCjulWsbirjxb6Y8xuAoWdgYqZvBLoSVKry48IyvVnLfvWgJg66qENjxig+8RH9bvlE16I6hJ7J7Q==",
       "requires": {
-        "live-connect-common": "^3.0.0",
-        "live-connect-handlers": "^2.1.0",
+        "live-connect-common": "^v4.1.0",
         "tiny-hashes": "1.0.1"
       }
     },
@@ -37994,6 +41800,25 @@
         "json5": "^2.1.2"
       }
     },
+    "locate-app": {
+      "version": "2.4.15",
+      "resolved": "https://registry.npmjs.org/locate-app/-/locate-app-2.4.15.tgz",
+      "integrity": "sha512-oAGHATXPUHSQ74Om+3dXBRNYtCzU7Wzuhlj/WIZchqHb/5/TGJRzLEtHipMDOak0UZG9U365RMXyBzgV/fhOww==",
+      "dev": true,
+      "requires": {
+        "@promptbook/utils": "0.50.0-10",
+        "type-fest": "2.13.0",
+        "userhome": "1.0.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.0.tgz",
+          "integrity": "sha512-lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw==",
+          "dev": true
+        }
+      }
+    },
     "locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -38006,8 +41831,7 @@
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash._basecopy": {
       "version": "3.0.1",
@@ -38080,18 +41904,6 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true
-    },
-    "lodash.difference": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
-      "dev": true
-    },
     "lodash.escape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
@@ -38101,12 +41913,6 @@
         "lodash._root": "^3.0.0"
       }
     },
-    "lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true
-    },
     "lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
@@ -38131,16 +41937,10 @@
       "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
       "dev": true
     },
-    "lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==",
-      "dev": true
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
       "dev": true
     },
     "lodash.keys": {
@@ -38231,22 +42031,44 @@
       }
     },
     "log4js": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
-      "integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
+      "integrity": "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==",
       "dev": true,
       "requires": {
         "date-format": "^4.0.14",
         "debug": "^4.3.4",
         "flatted": "^3.2.7",
         "rfdc": "^1.3.0",
-        "streamroller": "^3.1.3"
+        "streamroller": "^3.1.5"
+      }
+    },
+    "logform": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz",
+      "integrity": "sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==",
+      "dev": true,
+      "requires": {
+        "@colors/colors": "1.6.0",
+        "@types/triple-beam": "^1.3.2",
+        "fecha": "^4.2.0",
+        "ms": "^2.1.1",
+        "safe-stable-stringify": "^2.3.1",
+        "triple-beam": "^1.3.0"
+      },
+      "dependencies": {
+        "@colors/colors": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
+          "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
+          "dev": true
+        }
       }
     },
     "loglevel": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz",
-      "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.1.tgz",
+      "integrity": "sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==",
       "dev": true
     },
     "loglevel-plugin-prefix": {
@@ -38262,42 +42084,26 @@
       "dev": true
     },
     "longest-streak": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.0.1.tgz",
-      "integrity": "sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
+      "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
       "dev": true
     },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
     "loupe": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
-      "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
       "dev": true,
       "requires": {
-        "get-func-name": "^2.0.0"
+        "get-func-name": "^2.0.1"
       }
     },
-    "lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true
-    },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "requires": {
-        "yallist": "^4.0.0"
+        "yallist": "^3.0.2"
       }
     },
     "lru-queue": {
@@ -38310,9 +42116,9 @@
       }
     },
     "m3u8-parser": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.1.tgz",
-      "integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.8.0.tgz",
+      "integrity": "sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
@@ -38321,13 +42127,12 @@
       }
     },
     "magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "version": "0.30.10",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
+      "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "sourcemap-codec": "^1.4.8"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       }
     },
     "make-dir": {
@@ -38346,14 +42151,6 @@
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
       }
     },
     "map-cache": {
@@ -38362,12 +42159,6 @@
       "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
       "dev": true
     },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-      "dev": true
-    },
     "map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
@@ -38384,15 +42175,9 @@
       }
     },
     "markdown-table": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
-      "integrity": "sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==",
-      "dev": true
-    },
-    "marky": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
-      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.3.tgz",
+      "integrity": "sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==",
       "dev": true
     },
     "matchdep": {
@@ -38534,12 +42319,6 @@
             }
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -38574,9 +42353,9 @@
       }
     },
     "mdast-util-definitions": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
-      "integrity": "sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz",
+      "integrity": "sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -38585,11 +42364,12 @@
       }
     },
     "mdast-util-find-and-replace": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz",
-      "integrity": "sha512-SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.2.tgz",
+      "integrity": "sha512-MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw==",
       "dev": true,
       "requires": {
+        "@types/mdast": "^3.0.0",
         "escape-string-regexp": "^5.0.0",
         "unist-util-is": "^5.0.0",
         "unist-util-visit-parents": "^5.0.0"
@@ -38604,9 +42384,9 @@
       }
     },
     "mdast-util-from-markdown": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz",
-      "integrity": "sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz",
+      "integrity": "sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -38624,17 +42404,20 @@
       },
       "dependencies": {
         "mdast-util-to-string": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
-          "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
-          "dev": true
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz",
+          "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==",
+          "dev": true,
+          "requires": {
+            "@types/mdast": "^3.0.0"
+          }
         }
       }
     },
     "mdast-util-gfm": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.1.tgz",
-      "integrity": "sha512-42yHBbfWIFisaAfV1eixlabbsa6q7vHeSPY+cg+BBjX51M8xhgMacqH9g6TftB/9+YkcI0ooV4ncfrJslzm/RQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.2.tgz",
+      "integrity": "sha512-qvZ608nBppZ4icQlhQQIAdc6S3Ffj9RGmzwUKUWuEICFnd1LVkN3EktF7ZHAgfcEdvZB5owU9tQgt99e2TlLjg==",
       "dev": true,
       "requires": {
         "mdast-util-from-markdown": "^1.0.0",
@@ -38647,9 +42430,9 @@
       }
     },
     "mdast-util-gfm-autolink-literal": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz",
-      "integrity": "sha512-FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.3.tgz",
+      "integrity": "sha512-My8KJ57FYEy2W2LyNom4n3E7hKTuQk/0SES0u16tjA9Z3oFkF4RrC/hPAPgjlSpezsOvI8ObcXcElo92wn5IGA==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -38659,9 +42442,9 @@
       }
     },
     "mdast-util-gfm-footnote": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz",
-      "integrity": "sha512-p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.2.tgz",
+      "integrity": "sha512-56D19KOGbE00uKVj3sgIykpwKL179QsVFwx/DCW0u/0+URsryacI4MAdNJl0dh+u2PSsD9FtxPFbHCzJ78qJFQ==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -38670,9 +42453,9 @@
       }
     },
     "mdast-util-gfm-strikethrough": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz",
-      "integrity": "sha512-zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.3.tgz",
+      "integrity": "sha512-DAPhYzTYrRcXdMjUtUjKvW9z/FNAMTdU0ORyMcbmkwYNbKocDpdk+PX1L1dQgOID/+vVs1uBQ7ElrBQfZ0cuiQ==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -38680,9 +42463,9 @@
       }
     },
     "mdast-util-gfm-table": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.6.tgz",
-      "integrity": "sha512-uHR+fqFq3IvB3Rd4+kzXW8dmpxUhvgCQZep6KdjsLK4O6meK5dYZEayLtIxNus1XO3gfjfcIFe8a7L0HZRGgag==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.7.tgz",
+      "integrity": "sha512-jjcpmNnQvrmN5Vx7y7lEc2iIOEytYv7rTvu+MeyAsSHTASGCCRA79Igg2uKssgOs1i1po8s3plW0sTu1wkkLGg==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -38692,9 +42475,9 @@
       }
     },
     "mdast-util-gfm-task-list-item": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz",
-      "integrity": "sha512-KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.2.tgz",
+      "integrity": "sha512-PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -38710,10 +42493,20 @@
         "mdast-util-to-string": "^1.0.0"
       }
     },
+    "mdast-util-phrasing": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-3.0.1.tgz",
+      "integrity": "sha512-WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "unist-util-is": "^5.0.0"
+      }
+    },
     "mdast-util-to-hast": {
-      "version": "12.2.4",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz",
-      "integrity": "sha512-a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg==",
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.3.0.tgz",
+      "integrity": "sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==",
       "dev": true,
       "requires": {
         "@types/hast": "^2.0.0",
@@ -38721,21 +42514,21 @@
         "mdast-util-definitions": "^5.0.0",
         "micromark-util-sanitize-uri": "^1.1.0",
         "trim-lines": "^3.0.0",
-        "unist-builder": "^3.0.0",
         "unist-util-generated": "^2.0.0",
         "unist-util-position": "^4.0.0",
         "unist-util-visit": "^4.0.0"
       }
     },
     "mdast-util-to-markdown": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz",
-      "integrity": "sha512-6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.5.0.tgz",
+      "integrity": "sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
         "@types/unist": "^2.0.0",
         "longest-streak": "^3.0.0",
+        "mdast-util-phrasing": "^3.0.0",
         "mdast-util-to-string": "^3.0.0",
         "micromark-util-decode-string": "^1.0.0",
         "unist-util-visit": "^4.0.0",
@@ -38743,10 +42536,13 @@
       },
       "dependencies": {
         "mdast-util-to-string": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
-          "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
-          "dev": true
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz",
+          "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==",
+          "dev": true,
+          "requires": {
+            "@types/mdast": "^3.0.0"
+          }
         }
       }
     },
@@ -38757,46 +42553,33 @@
       "dev": true
     },
     "mdast-util-toc": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-6.1.0.tgz",
-      "integrity": "sha512-0PuqZELXZl4ms1sF7Lqigrqik4Ll3UhbI+jdTrfw7pZ9QPawgl7LD4GQ8MkU7bT/EwiVqChNTbifa2jLLKo76A==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-6.1.1.tgz",
+      "integrity": "sha512-Er21728Kow8hehecK2GZtb7Ny3omcoPUVrmObiSUwmoRYVZaXLR751QROEFjR8W/vAQdHMLj49Lz20J55XaNpw==",
       "dev": true,
       "requires": {
         "@types/extend": "^3.0.0",
-        "@types/github-slugger": "^1.0.0",
         "@types/mdast": "^3.0.0",
         "extend": "^3.0.0",
-        "github-slugger": "^1.0.0",
+        "github-slugger": "^2.0.0",
         "mdast-util-to-string": "^3.1.0",
         "unist-util-is": "^5.0.0",
-        "unist-util-visit": "^3.0.0"
+        "unist-util-visit": "^4.0.0"
       },
       "dependencies": {
-        "mdast-util-to-string": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
-          "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
+        "github-slugger": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz",
+          "integrity": "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==",
           "dev": true
         },
-        "unist-util-visit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-3.1.0.tgz",
-          "integrity": "sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^5.0.0",
-            "unist-util-visit-parents": "^4.0.0"
-          }
-        },
-        "unist-util-visit-parents": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz",
-          "integrity": "sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==",
+        "mdast-util-to-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz",
+          "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==",
           "dev": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^5.0.0"
+            "@types/mdast": "^3.0.0"
           }
         }
       }
@@ -38807,13 +42590,13 @@
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
+      "version": "0.4.17",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.17.tgz",
+      "integrity": "sha512-DGqD7Hjpi/1or4F/aYAspXKNm5Yili0QDAFAY4QYvpqpgiY6+1jOfqpmByzjxbWd/T9mChbCArXAbDAsTm5oXA==",
       "dev": true,
       "requires": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
+        "d": "^1.0.2",
+        "es5-ext": "^0.10.64",
         "es6-weak-map": "^2.0.3",
         "event-emitter": "^0.3.5",
         "is-promise": "^2.2.2",
@@ -38833,9 +42616,9 @@
       }
     },
     "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="
     },
     "merge-stream": {
       "version": "2.0.0",
@@ -38849,9 +42632,9 @@
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
     "micromark": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.1.0.tgz",
-      "integrity": "sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.2.0.tgz",
+      "integrity": "sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==",
       "dev": true,
       "requires": {
         "@types/debug": "^4.0.0",
@@ -38874,9 +42657,9 @@
       }
     },
     "micromark-core-commonmark": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz",
-      "integrity": "sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz",
+      "integrity": "sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==",
       "dev": true,
       "requires": {
         "decode-named-character-reference": "^1.0.0",
@@ -38898,9 +42681,9 @@
       }
     },
     "micromark-extension-gfm": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-2.0.1.tgz",
-      "integrity": "sha512-p2sGjajLa0iYiGQdT0oelahRYtMWvLjy8J9LOCxzIQsllMCGLbsLW+Nc+N4vi02jcRJvedVJ68cjelKIO6bpDA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-2.0.3.tgz",
+      "integrity": "sha512-vb9OoHqrhCmbRidQv/2+Bc6pkP0FrtlhurxZofvOEy5o8RtuuvTq+RQ1Vw5ZDNrVraQZu3HixESqbG+0iKk/MQ==",
       "dev": true,
       "requires": {
         "micromark-extension-gfm-autolink-literal": "^1.0.0",
@@ -38914,22 +42697,21 @@
       }
     },
     "micromark-extension-gfm-autolink-literal": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.3.tgz",
-      "integrity": "sha512-i3dmvU0htawfWED8aHMMAzAVp/F0Z+0bPh3YrbTPPL1v4YAlCZpy5rBO5p0LPYiZo0zFVkoYh7vDU7yQSiCMjg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.5.tgz",
+      "integrity": "sha512-z3wJSLrDf8kRDOh2qBtoTRD53vJ+CWIyo7uyZuxf/JAbNJjiHsOpG1y5wxk8drtv3ETAHutCu6N3thkOOgueWg==",
       "dev": true,
       "requires": {
         "micromark-util-character": "^1.0.0",
         "micromark-util-sanitize-uri": "^1.0.0",
         "micromark-util-symbol": "^1.0.0",
-        "micromark-util-types": "^1.0.0",
-        "uvu": "^0.5.0"
+        "micromark-util-types": "^1.0.0"
       }
     },
     "micromark-extension-gfm-footnote": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.4.tgz",
-      "integrity": "sha512-E/fmPmDqLiMUP8mLJ8NbJWJ4bTw6tS+FEQS8CcuDtZpILuOb2kjLqPEeAePF1djXROHXChM/wPJw0iS4kHCcIg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.1.2.tgz",
+      "integrity": "sha512-Yxn7z7SxgyGWRNa4wzf8AhYYWNrwl5q1Z8ii+CSTTIqVkmGZF1CElX2JI8g5yGoM3GAman9/PVCUFUSJ0kB/8Q==",
       "dev": true,
       "requires": {
         "micromark-core-commonmark": "^1.0.0",
@@ -38943,9 +42725,9 @@
       }
     },
     "micromark-extension-gfm-strikethrough": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.4.tgz",
-      "integrity": "sha512-/vjHU/lalmjZCT5xt7CcHVJGq8sYRm80z24qAKXzaHzem/xsDYb2yLL+NNVbYvmpLx3O7SYPuGL5pzusL9CLIQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.7.tgz",
+      "integrity": "sha512-sX0FawVE1o3abGk3vRjOH50L5TTLr3b5XMqnP9YDRb34M0v5OoZhG+OHFz1OffZ9dlwgpTBKaT4XW/AsUVnSDw==",
       "dev": true,
       "requires": {
         "micromark-util-chunked": "^1.0.0",
@@ -38957,9 +42739,9 @@
       }
     },
     "micromark-extension-gfm-table": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.5.tgz",
-      "integrity": "sha512-xAZ8J1X9W9K3JTJTUL7G6wSKhp2ZYHrFk5qJgY/4B33scJzE2kpfRL6oiw/veJTbt7jiM/1rngLlOKPWr1G+vg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.7.tgz",
+      "integrity": "sha512-3ZORTHtcSnMQEKtAOsBQ9/oHp9096pI/UvdPtN7ehKvrmZZ2+bbWhi0ln+I9drmwXMt5boocn6OlwQzNXeVeqw==",
       "dev": true,
       "requires": {
         "micromark-factory-space": "^1.0.0",
@@ -38970,18 +42752,18 @@
       }
     },
     "micromark-extension-gfm-tagfilter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.1.tgz",
-      "integrity": "sha512-Ty6psLAcAjboRa/UKUbbUcwjVAv5plxmpUTy2XC/3nJFL37eHej8jrHrRzkqcpipJliuBH30DTs7+3wqNcQUVA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.2.tgz",
+      "integrity": "sha512-5XWB9GbAUSHTn8VPU8/1DBXMuKYT5uOgEjJb8gN3mW0PNW5OPHpSdojoqf+iq1xo7vWzw/P8bAHY0n6ijpXF7g==",
       "dev": true,
       "requires": {
         "micromark-util-types": "^1.0.0"
       }
     },
     "micromark-extension-gfm-task-list-item": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.3.tgz",
-      "integrity": "sha512-PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.5.tgz",
+      "integrity": "sha512-RMFXl2uQ0pNQy6Lun2YBYT9g9INXtWJULgbt01D/x8/6yJ2qpKyzdZD3pi6UIkzF++Da49xAelVKUeUMqd5eIQ==",
       "dev": true,
       "requires": {
         "micromark-factory-space": "^1.0.0",
@@ -38992,9 +42774,9 @@
       }
     },
     "micromark-factory-destination": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz",
-      "integrity": "sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz",
+      "integrity": "sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg==",
       "dev": true,
       "requires": {
         "micromark-util-character": "^1.0.0",
@@ -39003,9 +42785,9 @@
       }
     },
     "micromark-factory-label": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz",
-      "integrity": "sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz",
+      "integrity": "sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w==",
       "dev": true,
       "requires": {
         "micromark-util-character": "^1.0.0",
@@ -39015,9 +42797,9 @@
       }
     },
     "micromark-factory-space": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz",
-      "integrity": "sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz",
+      "integrity": "sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==",
       "dev": true,
       "requires": {
         "micromark-util-character": "^1.0.0",
@@ -39025,22 +42807,21 @@
       }
     },
     "micromark-factory-title": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz",
-      "integrity": "sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz",
+      "integrity": "sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ==",
       "dev": true,
       "requires": {
         "micromark-factory-space": "^1.0.0",
         "micromark-util-character": "^1.0.0",
         "micromark-util-symbol": "^1.0.0",
-        "micromark-util-types": "^1.0.0",
-        "uvu": "^0.5.0"
+        "micromark-util-types": "^1.0.0"
       }
     },
     "micromark-factory-whitespace": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz",
-      "integrity": "sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz",
+      "integrity": "sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ==",
       "dev": true,
       "requires": {
         "micromark-factory-space": "^1.0.0",
@@ -39050,9 +42831,9 @@
       }
     },
     "micromark-util-character": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.1.0.tgz",
-      "integrity": "sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.2.0.tgz",
+      "integrity": "sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==",
       "dev": true,
       "requires": {
         "micromark-util-symbol": "^1.0.0",
@@ -39060,18 +42841,18 @@
       }
     },
     "micromark-util-chunked": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz",
-      "integrity": "sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz",
+      "integrity": "sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ==",
       "dev": true,
       "requires": {
         "micromark-util-symbol": "^1.0.0"
       }
     },
     "micromark-util-classify-character": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz",
-      "integrity": "sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz",
+      "integrity": "sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw==",
       "dev": true,
       "requires": {
         "micromark-util-character": "^1.0.0",
@@ -39080,9 +42861,9 @@
       }
     },
     "micromark-util-combine-extensions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz",
-      "integrity": "sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz",
+      "integrity": "sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA==",
       "dev": true,
       "requires": {
         "micromark-util-chunked": "^1.0.0",
@@ -39090,18 +42871,18 @@
       }
     },
     "micromark-util-decode-numeric-character-reference": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz",
-      "integrity": "sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz",
+      "integrity": "sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw==",
       "dev": true,
       "requires": {
         "micromark-util-symbol": "^1.0.0"
       }
     },
     "micromark-util-decode-string": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz",
-      "integrity": "sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz",
+      "integrity": "sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ==",
       "dev": true,
       "requires": {
         "decode-named-character-reference": "^1.0.0",
@@ -39111,39 +42892,39 @@
       }
     },
     "micromark-util-encode": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz",
-      "integrity": "sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz",
+      "integrity": "sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==",
       "dev": true
     },
     "micromark-util-html-tag-name": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz",
-      "integrity": "sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz",
+      "integrity": "sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q==",
       "dev": true
     },
     "micromark-util-normalize-identifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz",
-      "integrity": "sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz",
+      "integrity": "sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q==",
       "dev": true,
       "requires": {
         "micromark-util-symbol": "^1.0.0"
       }
     },
     "micromark-util-resolve-all": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz",
-      "integrity": "sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz",
+      "integrity": "sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA==",
       "dev": true,
       "requires": {
         "micromark-util-types": "^1.0.0"
       }
     },
     "micromark-util-sanitize-uri": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz",
-      "integrity": "sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz",
+      "integrity": "sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==",
       "dev": true,
       "requires": {
         "micromark-util-character": "^1.0.0",
@@ -39152,9 +42933,9 @@
       }
     },
     "micromark-util-subtokenize": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz",
-      "integrity": "sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz",
+      "integrity": "sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A==",
       "dev": true,
       "requires": {
         "micromark-util-chunked": "^1.0.0",
@@ -39164,24 +42945,24 @@
       }
     },
     "micromark-util-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz",
-      "integrity": "sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz",
+      "integrity": "sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==",
       "dev": true
     },
     "micromark-util-types": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.0.2.tgz",
-      "integrity": "sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz",
+      "integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==",
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "requires": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       }
     },
@@ -39210,12 +42991,6 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true
-    },
     "min-document": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
@@ -39235,11 +43010,25 @@
       }
     },
     "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true
     },
+    "minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true
+    },
+    "mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -39251,10 +43040,13 @@
       }
     },
     "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.6"
+      }
     },
     "mkdirp-classic": {
       "version": "0.5.3",
@@ -39263,40 +43055,33 @@
       "dev": true
     },
     "mocha": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
-      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
+      "version": "10.7.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
+      "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
       "dev": true,
       "requires": {
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.3",
-        "debug": "4.3.4",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.2.0",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "5.0.1",
-        "ms": "2.1.3",
-        "nanoid": "3.3.3",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "workerpool": "6.2.1",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
+        "ansi-colors": "^4.1.3",
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.5",
+        "diff": "^5.2.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^8.1.0",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^5.1.6",
+        "ms": "^2.1.3",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^6.5.1",
+        "yargs": "^16.2.0",
+        "yargs-parser": "^20.2.9",
+        "yargs-unparser": "^2.0.0"
       },
       "dependencies": {
-        "ansi-colors": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -39312,6 +43097,15 @@
           "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
           "dev": true
         },
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -39359,12 +43153,6 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "diff": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-          "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-          "dev": true
-        },
         "escape-string-regexp": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -39382,28 +43170,16 @@
           }
         },
         "glob": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+          "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
             "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          },
-          "dependencies": {
-            "minimatch": {
-              "version": "3.1.2",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-              "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-              "dev": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              }
-            }
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
           }
         },
         "has-flag": {
@@ -39412,6 +43188,12 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-unicode-supported": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+          "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+          "dev": true
+        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -39441,23 +43223,12 @@
           }
         },
         "minimatch": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
-          },
-          "dependencies": {
-            "brace-expansion": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-              "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-              "dev": true,
-              "requires": {
-                "balanced-match": "^1.0.0"
-              }
-            }
           }
         },
         "ms": {
@@ -39484,6 +43255,15 @@
             "p-limit": "^3.0.2"
           }
         },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        },
         "strip-json-comments": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -39499,6 +43279,17 @@
             "has-flag": "^4.0.0"
           }
         },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
         "yargs": {
           "version": "16.2.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -39515,13 +43306,25 @@
           }
         },
         "yargs-parser": {
-          "version": "20.2.4",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+          "version": "20.2.9",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+          "dev": true
+        },
+        "yocto-queue": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+          "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
           "dev": true
         }
       }
     },
+    "moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "dev": true
+    },
     "morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
@@ -39562,14 +43365,14 @@
       }
     },
     "mpd-parser": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.21.1.tgz",
-      "integrity": "sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==",
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.22.1.tgz",
+      "integrity": "sha512-fwBebvpyPUU8bOzvhX0VQZgSohncbgYwUyJJoTSNpmy7ccD2ryiCvM7oRkn/xQH5cv73/xU7rJSNCLjdGFor0Q==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
         "@videojs/vhs-utils": "^3.0.5",
-        "@xmldom/xmldom": "^0.7.2",
+        "@xmldom/xmldom": "^0.8.3",
         "global": "^4.4.0"
       }
     },
@@ -39580,9 +43383,9 @@
       "dev": true
     },
     "mrmime": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
-      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
+      "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
       "dev": true
     },
     "ms": {
@@ -39606,9 +43409,9 @@
       "dev": true
     },
     "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
       "dev": true
     },
     "mux.js": {
@@ -39622,17 +43425,18 @@
       }
     },
     "nan": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
+      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
       "dev": true,
       "optional": true
     },
     "nanoid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
-      "dev": true
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "dev": true,
+      "optional": true
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -39668,12 +43472,6 @@
             "assign-symbols": "^1.0.0",
             "is-extendable": "^1.0.1"
           }
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
         }
       }
     },
@@ -39700,6 +43498,12 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true
+    },
     "next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
@@ -39751,9 +43555,9 @@
           }
         },
         "path-to-regexp": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-          "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
+          "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
           "dev": true,
           "requires": {
             "isarray": "0.0.1"
@@ -39761,19 +43565,58 @@
         }
       }
     },
+    "node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "dev": true
+    },
     "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
       "dev": true,
       "requires": {
-        "whatwg-url": "^5.0.0"
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      }
+    },
+    "node-html-parser": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.13.tgz",
+      "integrity": "sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==",
+      "dev": true,
+      "requires": {
+        "css-select": "^5.1.0",
+        "he": "1.2.0"
       }
     },
     "node-releases": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+    },
+    "node-request-interceptor": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/node-request-interceptor/-/node-request-interceptor-0.6.3.tgz",
+      "integrity": "sha512-8I2V7H2Ch0NvW7qWcjmS0/9Lhr0T6x7RD6PDirhvWEkUQvy83x8BA4haYMr09r/rig7hcgYSjYh6cd4U7G1vLA==",
+      "dev": true,
+      "requires": {
+        "@open-draft/until": "^1.0.3",
+        "debug": "^4.3.0",
+        "headers-utils": "^1.2.0",
+        "strict-event-emitter": "^0.1.0"
+      }
+    },
+    "node.extend": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
+      "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
+      "requires": {
+        "has": "^1.0.3",
+        "is": "^3.2.1"
+      }
     },
     "nopt": {
       "version": "3.0.6",
@@ -39785,25 +43628,22 @@
       }
     },
     "normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.1.tgz",
+      "integrity": "sha512-6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
+        "hosted-git-info": "^7.0.0",
+        "is-core-module": "^2.8.1",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
       },
       "dependencies": {
         "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
+          "version": "7.6.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+          "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+          "dev": true
         }
       }
     },
@@ -39813,12 +43653,6 @@
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
-    "normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true
-    },
     "now-and-later": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
@@ -39845,6 +43679,15 @@
         }
       }
     },
+    "nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0"
+      }
+    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -39883,47 +43726,20 @@
             "is-descriptor": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
         "is-buffer": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
           "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
         "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
         "kind-of": {
@@ -39938,18 +43754,18 @@
       }
     },
     "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
     },
     "object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
+      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1"
       }
     },
     "object-keys": {
@@ -39968,13 +43784,13 @@
       }
     },
     "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
         "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       }
@@ -39991,6 +43807,29 @@
         "isobject": "^3.0.0"
       }
     },
+    "object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      }
+    },
+    "object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      }
+    },
     "object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
@@ -40021,14 +43860,14 @@
       }
     },
     "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "on-finished": {
@@ -40087,9 +43926,9 @@
       }
     },
     "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
       "requires": {
         "deep-is": "^0.1.3",
@@ -40097,85 +43936,7 @@
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
         "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "requires": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "log-symbols": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "is-unicode-supported": "^0.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+        "word-wrap": "^1.2.5"
       }
     },
     "ordered-read-streams": {
@@ -40187,12 +43948,6 @@
         "readable-stream": "^2.0.1"
       }
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true
-    },
     "os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
@@ -40208,24 +43963,12 @@
       "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "dev": true
     },
-    "p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "dev": true
-    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
       "dev": true
     },
-    "p-iteration": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/p-iteration/-/p-iteration-1.1.8.tgz",
-      "integrity": "sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==",
-      "dev": true
-    },
     "p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -40250,6 +43993,65 @@
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
+    "pac-proxy-agent": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
+      "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==",
+      "dev": true,
+      "requires": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "pac-resolver": "^7.0.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+          "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+          "dev": true,
+          "requires": {
+            "agent-base": "^7.0.2",
+            "debug": "4"
+          }
+        }
+      }
+    },
+    "pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "dev": true,
+      "requires": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      }
+    },
+    "package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "dev": true
+    },
+    "pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -40270,16 +44072,35 @@
         "path-root": "^0.1.1"
       }
     },
+    "parse-imports": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.0.tgz",
+      "integrity": "sha512-JQWgmK2o4w8leUkZeZPatWdAny6vXGU/3siIUvMF6J2rDCud9aTt8h/px9oZJ6U3EcfhngBJ635uPFI0q0VAeA==",
+      "dev": true,
+      "requires": {
+        "es-module-lexer": "^1.5.3",
+        "slashes": "^3.0.12"
+      }
+    },
     "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz",
+      "integrity": "sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
+        "@babel/code-frame": "^7.21.4",
+        "error-ex": "^1.3.2",
+        "json-parse-even-better-errors": "^3.0.0",
+        "lines-and-columns": "^2.0.3",
+        "type-fest": "^3.8.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
+          "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
+          "dev": true
+        }
       }
     },
     "parse-ms": {
@@ -40318,6 +44139,53 @@
         "parse-path": "^7.0.0"
       }
     },
+    "parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "parse5-htmlparser2-tree-adapter": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
+      "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
+      "dev": true,
+      "requires": {
+        "domhandler": "^5.0.2",
+        "parse5": "^7.0.0"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+          "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+          "dev": true,
+          "requires": {
+            "entities": "^4.4.0"
+          }
+        }
+      }
+    },
+    "parse5-parser-stream": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz",
+      "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==",
+      "dev": true,
+      "requires": {
+        "parse5": "^7.0.0"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+          "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+          "dev": true,
+          "requires": {
+            "entities": "^4.4.0"
+          }
+        }
+      }
+    },
     "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -40373,10 +44241,28 @@
       "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
       "dev": true
     },
+    "path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "10.4.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+          "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+          "dev": true
+        }
+      }
+    },
     "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "path-type": {
       "version": "1.1.0",
@@ -40397,6 +44283,12 @@
         }
       }
     },
+    "pathe": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "dev": true
+    },
     "pathval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -40425,9 +44317,9 @@
       "dev": true
     },
     "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
     },
     "picomatch": {
       "version": "2.3.1",
@@ -40456,6 +44348,12 @@
         "pinkie": "^2.0.0"
       }
     },
+    "pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "dev": true
+    },
     "pkcs7": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
@@ -40493,25 +44391,22 @@
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
       "dev": true
     },
+    "possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true
+    },
     "postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "version": "8.4.38",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "dev": true,
       "optional": true,
       "requires": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "dependencies": {
-        "nanoid": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-          "dev": true,
-          "optional": true
-        }
+        "source-map-js": "^1.2.0"
       }
     },
     "prelude-ls": {
@@ -40520,40 +44415,27 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
+    "prettier": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz",
+      "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==",
+      "dev": true
+    },
     "pretty-format": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^17.0.1"
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
           "dev": true
         }
       }
@@ -40573,12 +44455,6 @@
         "parse-ms": "^2.1.0"
       }
     },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
-    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -40588,8 +44464,7 @@
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "progress": {
       "version": "2.0.3",
@@ -40598,9 +44473,9 @@
       "dev": true
     },
     "property-information": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.1.1.tgz",
-      "integrity": "sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
+      "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
       "dev": true
     },
     "protocols": {
@@ -40618,6 +44493,49 @@
         "ipaddr.js": "1.9.1"
       }
     },
+    "proxy-agent": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
+      "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+          "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+          "dev": true,
+          "requires": {
+            "agent-base": "^7.0.2",
+            "debug": "4"
+          }
+        },
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        }
+      }
+    },
     "proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -40639,12 +44557,6 @@
         "event-stream": "=3.3.4"
       }
     },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-      "dev": true
-    },
     "psl": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@@ -40697,46 +44609,11 @@
       }
     },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true
     },
-    "puppeteer-core": {
-      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.7.0.tgz",
-      "integrity": "sha512-rXja4vcnAzFAP1OVLq/5dWNfwBGuzcOARJ6qGV7oAZhnLmVRU8G5MsdeQEAOy332ZhkIOnn9jp15R89LKHyp2Q==",
-      "dev": true,
-      "requires": {
-        "cross-fetch": "3.1.5",
-        "debug": "4.3.4",
-        "devtools-protocol": "0.0.981744",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.5.0"
-      },
-      "dependencies": {
-        "devtools-protocol": {
-          "version": "0.0.981744",
-          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
-          "integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
-          "dev": true
-        },
-        "ws": {
-          "version": "8.5.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-          "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
     "q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
@@ -40750,23 +44627,17 @@
       "dev": true
     },
     "qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "requires": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       }
     },
     "query-selector-shadow-dom": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.0.tgz",
-      "integrity": "sha512-bK0/0cCI+R8ZmOF1QjT7HupDUYCxbf/9TJgAmSXQxZpftXmTAeil9DRoCnTDkWbvOyZzhcMBwKpptWcdkGFIMg==",
-      "dev": true
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.1.tgz",
+      "integrity": "sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw==",
       "dev": true
     },
     "querystringify": {
@@ -40775,10 +44646,10 @@
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
-    "quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+    "queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
       "dev": true
     },
     "randombytes": {
@@ -40796,9 +44667,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "requires": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -40807,40 +44678,40 @@
       }
     },
     "react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true
     },
     "read-pkg": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
-      "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz",
+      "integrity": "sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==",
       "dev": true,
       "requires": {
         "@types/normalize-package-data": "^2.4.1",
-        "normalize-package-data": "^3.0.2",
-        "parse-json": "^5.2.0",
-        "type-fest": "^2.0.0"
+        "normalize-package-data": "^6.0.0",
+        "parse-json": "^7.0.0",
+        "type-fest": "^4.2.0"
       },
       "dependencies": {
         "type-fest": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+          "version": "4.20.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.20.0.tgz",
+          "integrity": "sha512-MBh+PHUHHisjXf4tlx0CFWoMdjx8zCMLJHOjnV1prABYZFHqtFOyauCIK2/7w4oIfwkF8iNhLtnJEfVY2vn3iw==",
           "dev": true
         }
       }
     },
     "read-pkg-up": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz",
-      "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-10.0.0.tgz",
+      "integrity": "sha512-jgmKiS//w2Zs+YbX039CorlkOp8FIVbSAN8r8GJHDsGlmNPXo+VeHkqAwCiQVTTx5/LwLZTcEw59z3DvcLbr0g==",
       "dev": true,
       "requires": {
         "find-up": "^6.3.0",
-        "read-pkg": "^7.1.0",
-        "type-fest": "^2.5.0"
+        "read-pkg": "^8.0.0",
+        "type-fest": "^3.12.0"
       },
       "dependencies": {
         "find-up": {
@@ -40854,9 +44725,9 @@
           }
         },
         "locate-path": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz",
-          "integrity": "sha512-vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+          "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
           "dev": true,
           "requires": {
             "p-locate": "^6.0.0"
@@ -40887,24 +44758,17 @@
           "dev": true
         },
         "type-fest": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-          "dev": true
-        },
-        "yocto-queue": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-          "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
+          "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
           "dev": true
         }
       }
     },
     "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -40918,21 +44782,19 @@
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-          "dev": true
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
         },
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         }
       }
     },
     "readdir-glob": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz",
-      "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
+      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
       "dev": true,
       "requires": {
         "minimatch": "^5.1.0"
@@ -40948,9 +44810,9 @@
           }
         },
         "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
@@ -40991,22 +44853,22 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerate-unicode-properties": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
       "requires": {
         "regenerate": "^1.4.2"
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "requires": {
         "@babel/runtime": "^7.8.4"
       }
@@ -41034,14 +44896,15 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       }
     },
     "regexpp": {
@@ -41051,23 +44914,18 @@
       "dev": true
     },
     "regexpu-core": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
       "requires": {
+        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.1.0",
-        "regjsgen": "^0.7.1",
         "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
+        "unicode-match-property-value-ecmascript": "^2.1.0"
       }
     },
-    "regjsgen": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
-    },
     "regjsparser": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
@@ -41084,9 +44942,9 @@
       }
     },
     "remark": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-14.0.2.tgz",
-      "integrity": "sha512-A3ARm2V4BgiRXaUo5K0dRvJ1lbogrbXnhkJRmD0yw092/Yl0kOCZt1k9ZeElEwkZsWGsMumz6qL5MfNJH9nOBA==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-14.0.3.tgz",
+      "integrity": "sha512-bfmJW1dmR2LvaMJuAnE88pZP9DktIFYXazkTfOIKZzi3Knk9lT0roItIA24ydOucI3bV/g/tXBA6hzqq3FV9Ew==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -41108,9 +44966,9 @@
       }
     },
     "remark-html": {
-      "version": "15.0.1",
-      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-15.0.1.tgz",
-      "integrity": "sha512-7ta5UPRqj8nP0GhGMYUAghZ/DRno7dgq7alcW90A7+9pgJsXzGJlFgwF8HOP1b1tMgT3WwbeANN+CaTimMfyNQ==",
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-15.0.2.tgz",
+      "integrity": "sha512-/CIOI7wzHJzsh48AiuIyIe1clxVkUtreul73zcCXLub0FmnevQE0UMFDQm7NUx8/3rl/4zCshlMfqBdWScQthw==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -41121,9 +44979,9 @@
       }
     },
     "remark-parse": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.1.tgz",
-      "integrity": "sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.2.tgz",
+      "integrity": "sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -41143,9 +45001,9 @@
       }
     },
     "remark-stringify": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-10.0.2.tgz",
-      "integrity": "sha512-6wV3pvbPvHkbNnWB0wdDvVFHOe1hBRAx1Q/5g/EpH4RppAII6J8Gnwe7VbHuXaoKIF6LAg6ExTel/+kNqSQ7lw==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-10.0.3.tgz",
+      "integrity": "sha512-koyOzCMYoUHudypbj4XpnAKFbkddRMYZHwghnxd7ue5210WzGw6kOBwauJTRUMq16jsovXx8dYNvSSWP89kZ3A==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
@@ -41223,15 +45081,6 @@
       "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
       "dev": true
     },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
     "replace-ext": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
@@ -41293,6 +45142,12 @@
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
           "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
           "dev": true
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
         }
       }
     },
@@ -41321,21 +45176,15 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "requires": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
-    "resolve-alpn": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-      "dev": true
-    },
     "resolve-dir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
@@ -41361,25 +45210,22 @@
         "value-or-function": "^3.0.0"
       }
     },
+    "resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true
+    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
       "dev": true
     },
-    "responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-      "dev": true,
-      "requires": {
-        "lowercase-keys": "^2.0.0"
-      }
-    },
     "resq": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/resq/-/resq-1.10.2.tgz",
-      "integrity": "sha512-HmgVS3j+FLrEDBTDYysPdPVF9/hioDMJ/otOiQDKqk77YfZeeLOj0qi34yObumcud1gBpk+wpBTEg4kMicD++A==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/resq/-/resq-1.11.0.tgz",
+      "integrity": "sha512-G10EBz+zAAy3zUd/CDoBbXRL6ia9kOo3xRHrMDsHljI0GDkhYlyjwoCx5+3eCC4swi1uCoZQhskuJkj7Gp57Bw==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1"
@@ -41410,9 +45256,9 @@
       "dev": true
     },
     "rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true
     },
     "rgb2hex": {
@@ -41428,12 +45274,28 @@
       "dev": true,
       "requires": {
         "glob": "^7.1.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
       }
     },
     "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
+      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
       "dev": true
     },
     "rust-result": {
@@ -41446,12 +45308,20 @@
       }
     },
     "rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+          "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+          "dev": true
+        }
       }
     },
     "sade": {
@@ -41463,6 +45333,24 @@
         "mri": "^1.1.0"
       }
     },
+    "safaridriver": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/safaridriver/-/safaridriver-0.1.2.tgz",
+      "integrity": "sha512-4R309+gWflJktzPXBQCobbWEHlzC4aK3a+Ov3tz2Ib2aBxiwd11phkdIBH1l0EO22x24CJMUQkpKFumRriCSRg==",
+      "dev": true
+    },
+    "safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      }
+    },
     "safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -41484,16 +45372,22 @@
       }
     },
     "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
         "is-regex": "^1.1.4"
       }
     },
+    "safe-stable-stringify": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
+      "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
+      "dev": true
+    },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -41545,73 +45439,121 @@
       }
     },
     "send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
       },
       "dependencies": {
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-            }
           }
         },
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+          "dev": true
+        },
+        "destroy": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+          "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
+          "dev": true
+        },
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+          "dev": true
+        },
         "mime": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "dev": true
         },
         "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+          "dev": true
         }
       }
     },
     "serialize-error": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz",
-      "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz",
+      "integrity": "sha512-2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==",
       "dev": true,
       "requires": {
-        "type-fest": "^0.20.2"
+        "type-fest": "^2.12.2"
       },
       "dependencies": {
         "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
           "dev": true
         }
       }
     },
     "serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -41686,14 +45628,73 @@
       }
     },
     "serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "requires": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+            }
+          }
+        },
+        "encodeurl": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+          "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
+        },
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        },
+        "send": {
+          "version": "0.19.0",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+          "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "2.0.0",
+            "mime": "1.6.0",
+            "ms": "2.1.3",
+            "on-finished": "2.4.1",
+            "range-parser": "~1.2.1",
+            "statuses": "2.0.1"
+          },
+          "dependencies": {
+            "encodeurl": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+              "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+            }
+          }
+        }
       }
     },
     "set-blocking": {
@@ -41702,6 +45703,31 @@
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
+    "set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      }
+    },
+    "set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      }
+    },
     "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -41751,6 +45777,15 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
+    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -41767,13 +45802,14 @@
       "dev": true
     },
     "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
       }
     },
     "signal-exit": {
@@ -41806,20 +45842,20 @@
       }
     },
     "sirv": {
-      "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
-      "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
       "dev": true,
       "requires": {
-        "@polka/url": "^1.0.0-next.20",
-        "mrmime": "^1.0.0",
-        "totalist": "^1.0.0"
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
       }
     },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
+    "slashes": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz",
+      "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==",
       "dev": true
     },
     "slice-ansi": {
@@ -41859,6 +45895,12 @@
         }
       }
     },
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -41902,61 +45944,14 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
         "is-extendable": {
@@ -42035,38 +46030,72 @@
       }
     },
     "socket.io": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz",
-      "integrity": "sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
+      "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
+        "cors": "~2.8.5",
         "debug": "~4.3.2",
-        "engine.io": "~6.4.1",
+        "engine.io": "~6.6.0",
         "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.1"
+        "socket.io-parser": "~4.2.4"
       }
     },
     "socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
+      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
       "dev": true,
       "requires": {
-        "ws": "~8.11.0"
+        "debug": "~4.3.4",
+        "ws": "~8.17.1"
       }
     },
     "socket.io-parser": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz",
-      "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
       "dev": true,
       "requires": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
       }
     },
+    "socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dev": true,
+      "requires": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz",
+      "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.7.1"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        }
+      }
+    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -42080,9 +46109,9 @@
       "dev": true
     },
     "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "dev": true,
       "optional": true
     },
@@ -42096,32 +46125,22 @@
         "decode-uri-component": "^0.2.0"
       }
     },
-    "source-map-support": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.5.6"
-      }
-    },
     "source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "dev": true,
-      "optional": true
-    },
     "space-separated-tokens": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz",
-      "integrity": "sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+      "dev": true
+    },
+    "spacetrim": {
+      "version": "0.11.25",
+      "resolved": "https://registry.npmjs.org/spacetrim/-/spacetrim-0.11.25.tgz",
+      "integrity": "sha512-SWxXDROciuJs9YEYXUBjot5k/cqNGPPbT3QmkInFne4AGc1y+76It+jqU8rfsXKt57RRiunzZn1m9+KfuuNklw==",
       "dev": true
     },
     "sparkles": {
@@ -42131,9 +46150,9 @@
       "dev": true
     },
     "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
@@ -42141,9 +46160,9 @@
       }
     },
     "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
       "dev": true
     },
     "spdx-expression-parse": {
@@ -42157,9 +46176,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "version": "3.0.18",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
+      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
       "dev": true
     },
     "split": {
@@ -42193,37 +46212,20 @@
       }
     },
     "split2": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^3.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "dev": true
     },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
     "sshpk": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "requires": {
         "asn1": "~0.2.3",
@@ -42235,6 +46237,14 @@
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
+      },
+      "dependencies": {
+        "jsbn": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+          "dev": true
+        }
       }
     },
     "stack-trace": {
@@ -42244,9 +46254,9 @@
       "dev": true
     },
     "stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
@@ -42279,61 +46289,14 @@
             "is-descriptor": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         }
       }
@@ -42343,6 +46306,15 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
+    "stop-iteration-iterator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+      "dev": true,
+      "requires": {
+        "internal-slot": "^1.0.4"
+      }
+    },
     "stream-buffers": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
@@ -42365,15 +46337,15 @@
       "dev": true
     },
     "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
+      "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
       "dev": true
     },
     "streamroller": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
-      "integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
+      "integrity": "sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==",
       "dev": true,
       "requires": {
         "date-format": "^4.0.14",
@@ -42409,11 +46381,28 @@
         }
       }
     },
+    "streamx": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
+      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
+      "dev": true,
+      "requires": {
+        "bare-events": "^2.2.0",
+        "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
+        "text-decoder": "^1.1.0"
+      }
+    },
+    "strict-event-emitter": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.1.0.tgz",
+      "integrity": "sha512-8hSYfU+WKLdNcHVXJ0VxRXiPESalzRe7w1l8dg9+/22Ry+iZQUoQuoJ27R30GMD1TiyYINWsIEGY05WrskhSKw==",
+      "dev": true
+    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
       },
@@ -42421,8 +46410,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         }
       }
     },
@@ -42441,34 +46429,79 @@
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
         "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
+      }
+    },
+    "string-width-cjs": {
+      "version": "npm:string-width@4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
+      }
+    },
+    "string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "stringify-entities": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz",
-      "integrity": "sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
       "dev": true,
       "requires": {
         "character-entities-html4": "^2.0.0",
@@ -42476,7 +46509,24 @@
       }
     },
     "strip-ansi": {
-      "version": "6.0.1",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^6.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
+        }
+      }
+    },
+    "strip-ansi-cjs": {
+      "version": "npm:strip-ansi@6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
@@ -42502,16 +46552,22 @@
       "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
       "dev": true
     },
+    "strip-final-newline": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-4.0.0.tgz",
+      "integrity": "sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==",
+      "dev": true
+    },
     "strip-json-comments": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
-      "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
+      "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
       "dev": true
     },
-    "suffix": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
-      "integrity": "sha512-j5uf6MJtMCfC4vBe5LFktSe4bGyNTBk7I2Kdri0jeLrcv5B9pWfxVa5JQpoxgtR8vaVB7bVxsWgnfQbX5wkhAA==",
+    "strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
       "dev": true
     },
     "supports-color": {
@@ -42537,10 +46593,28 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "synckit": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.0.tgz",
+      "integrity": "sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==",
+      "dev": true,
+      "requires": {
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+          "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+          "dev": true
+        }
+      }
+    },
     "table": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
+      "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
       "dev": true,
       "requires": {
         "ajv": "^8.0.1",
@@ -42551,15 +46625,15 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "version": "8.16.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
+          "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
+            "fast-deep-equal": "^3.1.3",
             "json-schema-traverse": "^1.0.0",
             "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
+            "uri-js": "^4.4.1"
           }
         },
         "json-schema-traverse": {
@@ -42567,6 +46641,15 @@
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
         }
       }
     },
@@ -42577,41 +46660,25 @@
       "dev": true
     },
     "tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+      "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
       "dev": true,
       "requires": {
-        "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
+        "tar-stream": "^3.1.5"
       }
     },
     "tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dev": true,
       "requires": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
       }
     },
     "temp-fs": {
@@ -42623,6 +46690,20 @@
         "rimraf": "~2.5.2"
       },
       "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "rimraf": {
           "version": "2.5.4",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
@@ -42659,21 +46740,21 @@
       }
     },
     "terser": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
-      "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
+      "version": "5.31.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz",
+      "integrity": "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==",
       "dev": true,
       "requires": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+          "version": "8.11.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+          "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
           "dev": true
         },
         "source-map": {
@@ -42695,16 +46776,16 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
-      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
+      "version": "5.3.10",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
       "dev": true,
       "requires": {
-        "@jridgewell/trace-mapping": "^0.3.14",
+        "@jridgewell/trace-mapping": "^0.3.20",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "terser": "^5.14.1"
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
       },
       "dependencies": {
         "ajv": {
@@ -42720,9 +46801,9 @@
           }
         },
         "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+          "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
@@ -42741,6 +46822,31 @@
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
         "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "text-decoder": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz",
+      "integrity": "sha512-TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw==",
+      "dev": true,
+      "requires": {
+        "b4a": "^1.6.4"
       }
     },
     "text-table": {
@@ -42771,9 +46877,9 @@
       },
       "dependencies": {
         "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -42812,13 +46918,13 @@
       "dev": true
     },
     "timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.8.tgz",
+      "integrity": "sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww==",
       "dev": true,
       "requires": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
+        "es5-ext": "^0.10.64",
+        "next-tick": "^1.1.0"
       }
     },
     "tiny-hashes": {
@@ -42851,14 +46957,17 @@
         }
       }
     },
+    "tinyrainbow": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
+      "dev": true
+    },
     "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "dev": true
     },
     "to-absolute-glob": {
       "version": "2.0.2",
@@ -42961,9 +47070,9 @@
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
     "totalist": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
-      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
       "dev": true
     },
     "tough-cookie": {
@@ -42976,12 +47085,6 @@
         "punycode": "^2.1.1"
       }
     },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true
-    },
     "traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
@@ -42994,34 +47097,39 @@
       "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
       "dev": true
     },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
+    "triple-beam": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz",
+      "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==",
       "dev": true
     },
     "trough": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
-      "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz",
+      "integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==",
       "dev": true
     },
+    "tryit": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
+      "integrity": "sha512-6C5h3CE+0qjGp+YKYTs74xR0k/Nw/ePtl/Lp6CCf44hqBQ66qnH1sDFR5mV/Gc48EsrHLB53lCFSffQCkka3kg=="
+    },
     "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
       "requires": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
         "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
           "dev": true,
           "requires": {
             "minimist": "^1.2.0"
@@ -43035,6 +47143,17 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
+    "tsx": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.17.0.tgz",
+      "integrity": "sha512-eN4mnDA5UMKDt4YZixo9tBioibaMBpoxBkD+rIPAjVmYERSG0/dWEY1CEFuV89CgASlKL499q8AhmkMnnjtOJg==",
+      "dev": true,
+      "requires": {
+        "esbuild": "~0.23.0",
+        "fsevents": "~2.3.3",
+        "get-tsconfig": "^4.7.5"
+      }
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -43051,9 +47170,9 @@
       "dev": true
     },
     "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
+      "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
       "dev": true
     },
     "type-check": {
@@ -43086,19 +47205,64 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      }
+    },
+    "typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      }
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
       "dev": true
     },
-    "typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
-      "dev": true,
-      "peer": true
-    },
     "typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -43121,15 +47285,15 @@
       }
     },
     "ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==",
+      "version": "0.7.38",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.38.tgz",
+      "integrity": "sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA==",
       "dev": true
     },
     "uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "version": "3.18.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz",
+      "integrity": "sha512-SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A==",
       "dev": true,
       "optional": true
     },
@@ -43193,6 +47357,18 @@
       "integrity": "sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==",
       "dev": true
     },
+    "undici": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz",
+      "integrity": "sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==",
+      "dev": true
+    },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -43208,15 +47384,21 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="
     },
     "unicode-property-aliases-ecmascript": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
     },
+    "unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "dev": true
+    },
     "unified": {
       "version": "10.1.2",
       "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
@@ -43269,48 +47451,51 @@
       }
     },
     "unist-builder": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.0.tgz",
-      "integrity": "sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.1.tgz",
+      "integrity": "sha512-gnpOw7DIpCA0vpr6NqdPvTWnlPTApCTRzr+38E6hCWx3rz/cjo83SsKIlS1Z+L5ttScQ2AwutNnb8+tAvpb6qQ==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0"
       }
     },
     "unist-util-generated": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.0.tgz",
-      "integrity": "sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.1.tgz",
+      "integrity": "sha512-qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A==",
       "dev": true
     },
     "unist-util-is": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.1.1.tgz",
-      "integrity": "sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==",
-      "dev": true
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.1.tgz",
+      "integrity": "sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0"
+      }
     },
     "unist-util-position": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz",
-      "integrity": "sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.4.tgz",
+      "integrity": "sha512-kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0"
       }
     },
     "unist-util-stringify-position": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz",
-      "integrity": "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
+      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0"
       }
     },
     "unist-util-visit": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.1.tgz",
-      "integrity": "sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz",
+      "integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
@@ -43319,9 +47504,9 @@
       }
     },
     "unist-util-visit-parents": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz",
-      "integrity": "sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz",
+      "integrity": "sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
@@ -43329,9 +47514,9 @@
       }
     },
     "universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true
     },
     "unpipe": {
@@ -43402,6 +47587,12 @@
         "setimmediate": "~1.0.4"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.4.7",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+          "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
+          "dev": true
+        },
         "duplexer2": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
@@ -43420,12 +47611,12 @@
       "dev": true
     },
     "update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz",
+      "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==",
       "requires": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       }
     },
     "uri-js": {
@@ -43444,19 +47635,19 @@
       "dev": true
     },
     "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
       "dev": true,
       "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
+        "punycode": "^1.4.1",
+        "qs": "^6.11.2"
       },
       "dependencies": {
         "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
           "dev": true
         }
       }
@@ -43477,12 +47668,24 @@
       "integrity": "sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==",
       "dev": true
     },
+    "urlpattern-polyfill": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==",
+      "dev": true
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
+    "userhome": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/userhome/-/userhome-1.0.0.tgz",
+      "integrity": "sha512-ayFKY3H+Pwfy4W98yPdtH1VqH4psDeyW8lYYFzfecR9d6hqLpqhecktvYR3SEEXt7vG0S1JEpciI3g94pMErig==",
+      "dev": true
+    },
     "util": {
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
@@ -43499,8 +47702,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "utils-merge": {
       "version": "1.0.1",
@@ -43508,9 +47710,9 @@
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
       "dev": true
     },
     "uvu": {
@@ -43526,9 +47728,9 @@
       }
     },
     "v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
+      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
       "dev": true
     },
     "v8flags": {
@@ -43581,9 +47783,9 @@
       }
     },
     "vfile": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.5.tgz",
-      "integrity": "sha512-U1ho2ga33eZ8y8pkbQLH54uKqGhFJ6GYIHnnG5AhRpAh3OWjkrRHKa/KogbmQn8We+c0KVV3rTOgR9V/WowbXQ==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
+      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
@@ -43592,10 +47794,20 @@
         "vfile-message": "^3.0.0"
       }
     },
+    "vfile-location": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-4.1.0.tgz",
+      "integrity": "sha512-YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0",
+        "vfile": "^5.0.0"
+      }
+    },
     "vfile-message": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz",
-      "integrity": "sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
+      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
@@ -43603,25 +47815,21 @@
       }
     },
     "vfile-reporter": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.4.tgz",
-      "integrity": "sha512-4cWalUnLrEnbeUQ+hARG5YZtaHieVK3Jp4iG5HslttkVl+MHunSGNAIrODOTLbtjWsNZJRMCkL66AhvZAYuJ9A==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.5.tgz",
+      "integrity": "sha512-NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw==",
       "dev": true,
       "requires": {
         "@types/supports-color": "^8.0.0",
         "string-width": "^5.0.0",
         "supports-color": "^9.0.0",
         "unist-util-stringify-position": "^3.0.0",
+        "vfile": "^5.0.0",
+        "vfile-message": "^3.0.0",
         "vfile-sort": "^3.0.0",
         "vfile-statistics": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-          "dev": true
-        },
+      },
+      "dependencies": {
         "emoji-regex": {
           "version": "9.2.2",
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -43639,60 +47847,53 @@
             "strip-ansi": "^7.0.1"
           }
         },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^6.0.1"
-          }
-        },
         "supports-color": {
-          "version": "9.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.3.tgz",
-          "integrity": "sha512-aszYUX/DVK/ed5rFLb/dDinVJrQjG/vmU433wtqVSD800rYsJNWxh2R3USV90aLSU+UsyQkbNeffVLzc6B6foA==",
+          "version": "9.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
+          "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
           "dev": true
         }
       }
     },
     "vfile-sort": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.0.tgz",
-      "integrity": "sha512-fJNctnuMi3l4ikTVcKpxTbzHeCgvDhnI44amA3NVDvA6rTC6oKCFpCVyT5n2fFMr3ebfr+WVQZedOCd73rzSxg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.1.tgz",
+      "integrity": "sha512-1os1733XY6y0D5x0ugqSeaVJm9lYgj0j5qdcZQFyxlZOSy1jYarL77lLyb5gK4Wqr1d5OxmuyflSO3zKyFnTFw==",
       "dev": true,
       "requires": {
+        "vfile": "^5.0.0",
         "vfile-message": "^3.0.0"
       }
     },
     "vfile-statistics": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.0.tgz",
-      "integrity": "sha512-foOWtcnJhKN9M2+20AOTlWi2dxNfAoeNIoxD5GXcO182UJyId4QrXa41fWrgcfV3FWTjdEDy3I4cpLVcQscIMA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.1.tgz",
+      "integrity": "sha512-W6dkECZmP32EG/l+dp2jCLdYzmnDBIw6jwiLZSER81oR5AHRcVqL+k3Z+pfH1R73le6ayDkJRMk0sutj1bMVeg==",
       "dev": true,
       "requires": {
+        "vfile": "^5.0.0",
         "vfile-message": "^3.0.0"
       }
     },
     "video.js": {
-      "version": "7.20.3",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.3.tgz",
-      "integrity": "sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==",
+      "version": "7.21.6",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.21.6.tgz",
+      "integrity": "sha512-m41TbODrUCToVfK1aljVd296CwDQnCRewpIm5tTXMuV87YYSGw1H+VDOaV45HlpcWSsTWWLF++InDgGJfthfUw==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "2.14.3",
+        "@videojs/http-streaming": "2.16.3",
         "@videojs/vhs-utils": "^3.0.4",
         "@videojs/xhr": "2.6.0",
         "aes-decrypter": "3.1.3",
         "global": "^4.4.0",
         "keycode": "^2.2.0",
-        "m3u8-parser": "4.7.1",
-        "mpd-parser": "0.21.1",
+        "m3u8-parser": "4.8.0",
+        "mpd-parser": "0.22.1",
         "mux.js": "6.0.1",
         "safe-json-parse": "4.0.0",
         "videojs-font": "3.2.0",
-        "videojs-vtt.js": "^0.15.4"
+        "videojs-vtt.js": "^0.15.5"
       },
       "dependencies": {
         "safe-json-parse": {
@@ -43723,33 +47924,31 @@
       "dev": true
     },
     "videojs-ima": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/videojs-ima/-/videojs-ima-1.11.0.tgz",
-      "integrity": "sha512-ZRoWuGyJ75zamwZgpr0i/gZ6q7Evda/Q6R46gpW88WN7u0ORU7apw/lM1MSG4c3YDXW8LDENgzMAvMZUdifWhg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/videojs-ima/-/videojs-ima-2.3.0.tgz",
+      "integrity": "sha512-8r0BZGT+WCTO6PePyKZHikV79Ojqh4yLMx4+DmPyXeRcKUVsQ7Va0R7Ok8GRcA8Zy3l1PM6jzLrD/W1rwKhZ8g==",
       "dev": true,
       "requires": {
         "@hapi/cryptiles": "^5.1.0",
-        "can-autoplay": "^3.0.0",
+        "can-autoplay": "^3.0.2",
         "extend": ">=3.0.2",
-        "lodash": ">=4.17.19",
-        "lodash.template": ">=4.5.0",
-        "videojs-contrib-ads": "^6.6.5"
+        "videojs-contrib-ads": "^6.9.0"
       }
     },
     "videojs-playlist": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/videojs-playlist/-/videojs-playlist-5.0.0.tgz",
-      "integrity": "sha512-TM9bytwKqkE05wdWPEKDpkwMGhS/VgMCIsEuNxmX1J1JO9zaTIl4Wm3egf5j1dhIw19oWrqGUV/nK0YNIelCpA==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/videojs-playlist/-/videojs-playlist-5.1.2.tgz",
+      "integrity": "sha512-8YgNq/iL17RLTXpfWAkuhM0Sq4w/x5YPVaNbUycjfqqGL/bp3Nrmc2W0qkPfh0ryB7r4cHfJbtHYP7zlW3ZkdQ==",
       "dev": true,
       "requires": {
         "global": "^4.3.2",
-        "video.js": "^6 || ^7"
+        "video.js": "^6 || ^7 || ^8"
       }
     },
     "videojs-vtt.js": {
-      "version": "0.15.4",
-      "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
-      "integrity": "sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==",
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.5.tgz",
+      "integrity": "sha512-yZbBxvA7QMYn15Lr/ZfhhLPrNpI/RmCSCqgIff57GC2gIrV5YfyzLfLyZMj0NnZSAz8syB4N0nHXpZg9MyrMOQ==",
       "dev": true,
       "requires": {
         "global": "^4.3.1"
@@ -43777,6 +47976,14 @@
         }
       }
     },
+    "vinyl-bufferstream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz",
+      "integrity": "sha512-yCCIoTf26Q9SQ0L9cDSavSL7Nt6wgQw8TU1B/bb9b9Z4A3XTypXCGdc5BvXl4ObQvVY8JrDkFnWa/UqBqwM2IA==",
+      "requires": {
+        "bufferstreams": "1.0.1"
+      }
+    },
     "vinyl-fs": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
@@ -43829,6 +48036,12 @@
         "vinyl": "^2.0.0"
       },
       "dependencies": {
+        "convert-source-map": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+          "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+          "dev": true
+        },
         "normalize-path": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -43856,9 +48069,9 @@
       "dev": true
     },
     "vue-template-compiler": {
-      "version": "2.7.13",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz",
-      "integrity": "sha512-jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+      "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -43866,6 +48079,74 @@
         "he": "^1.2.0"
       }
     },
+    "wait-port": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-1.1.0.tgz",
+      "integrity": "sha512-3e04qkoN3LxTMLakdqeWth8nih8usyg+sf1Bgdf9wwUkp05iuK1eSY/QpLvscT/+F/gA89+LpUmmgBtesbqI2Q==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.2",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "commander": {
+          "version": "9.5.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+          "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "walk": {
       "version": "2.3.15",
       "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.15.tgz",
@@ -43876,9 +48157,9 @@
       }
     },
     "watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
       "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
@@ -43890,206 +48171,316 @@
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
       "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "defaults": "^1.0.3"
       }
     },
+    "web-namespaces": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
+      "integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
+      "dev": true
+    },
+    "web-streams-polyfill": {
+      "version": "4.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
+      "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==",
+      "dev": true
+    },
     "webdriver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.5.3.tgz",
-      "integrity": "sha512-cDTn/hYj5x8BYwXxVb/WUwqGxrhCMP2rC8ttIWCfzmiVtmOnJGulC7CyxU3+p9Q5R/gIKTzdJOss16dhb+5CoA==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.0.5.tgz",
+      "integrity": "sha512-+xkdfbmG1IZrXxiPwab450Xuh9QClOcxTJ6tnde0rzxlPxdUqZqzwuMtM+VXZybxF4yCLrJWbeT0BpwJFAz1nA==",
       "dev": true,
       "requires": {
-        "@wdio/config": "7.5.3",
-        "@wdio/logger": "7.5.3",
-        "@wdio/protocols": "7.5.3",
-        "@wdio/types": "7.5.3",
-        "@wdio/utils": "7.5.3",
-        "got": "^11.0.2",
-        "lodash.merge": "^4.6.1"
+        "@types/node": "^20.1.0",
+        "@types/ws": "^8.5.3",
+        "@wdio/config": "9.0.5",
+        "@wdio/logger": "9.0.4",
+        "@wdio/protocols": "9.0.4",
+        "@wdio/types": "9.0.4",
+        "@wdio/utils": "9.0.5",
+        "deepmerge-ts": "^7.0.3",
+        "ws": "^8.8.0"
       },
       "dependencies": {
+        "@puppeteer/browsers": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
+          "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.6",
+            "extract-zip": "^2.0.1",
+            "progress": "^2.0.3",
+            "proxy-agent": "^6.4.0",
+            "semver": "^7.6.3",
+            "tar-fs": "^3.0.6",
+            "unbzip2-stream": "^1.4.3",
+            "yargs": "^17.7.2"
+          }
+        },
         "@wdio/logger": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
-          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz",
+          "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==",
           "dev": true,
           "requires": {
-            "chalk": "^4.0.0",
+            "chalk": "^5.1.2",
             "loglevel": "^1.6.0",
             "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
+            "strip-ansi": "^7.1.0"
           }
         },
         "@wdio/types": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
-          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz",
+          "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==",
           "dev": true,
           "requires": {
-            "got": "^11.8.1"
+            "@types/node": "^20.1.0"
           }
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "@wdio/utils": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.5.tgz",
+          "integrity": "sha512-FOA+t2ixLZ9a7eEH4IZXDsR/ABPTFOTslVzRvIDIkXcxGys3Cn3LQP2tpcIV1NxI+7OOAD0fIZ9Ig3gPBoVZRQ==",
+          "dev": true,
+          "requires": {
+            "@puppeteer/browsers": "^2.2.0",
+            "@wdio/logger": "9.0.4",
+            "@wdio/types": "9.0.4",
+            "decamelize": "^6.0.0",
+            "deepmerge-ts": "^7.0.3",
+            "edgedriver": "^5.6.1",
+            "geckodriver": "^4.3.3",
+            "get-port": "^7.0.0",
+            "import-meta-resolve": "^4.0.0",
+            "locate-app": "^2.2.24",
+            "safaridriver": "^0.1.2",
+            "split2": "^4.2.0",
+            "wait-port": "^1.1.0"
+          }
+        },
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "debug": "^4.3.4"
           }
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+          "dev": true
+        },
+        "deepmerge-ts": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+          "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+          "dev": true
+        },
+        "https-proxy-agent": {
+          "version": "7.0.5",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+          "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "agent-base": "^7.0.2",
+            "debug": "4"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        },
+        "proxy-agent": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+          "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "agent-base": "^7.0.2",
+            "debug": "^4.3.4",
+            "http-proxy-agent": "^7.0.1",
+            "https-proxy-agent": "^7.0.3",
+            "lru-cache": "^7.14.1",
+            "pac-proxy-agent": "^7.0.1",
+            "proxy-from-env": "^1.1.0",
+            "socks-proxy-agent": "^8.0.2"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
           "dev": true
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
+        "tar-fs": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+          "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+          "dev": true,
+          "requires": {
+            "bare-fs": "^2.1.1",
+            "bare-path": "^2.1.0",
+            "pump": "^3.0.0",
+            "tar-stream": "^3.1.5"
+          }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "yargs": {
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
           }
         }
       }
     },
     "webdriverio": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.25.4.tgz",
-      "integrity": "sha512-agkgwn2SIk5cAJ03uue1GnGZcUZUDN3W4fUMY9/VfO8bVJrPEgWg31bPguEWPu+YhEB/aBJD8ECxJ3OEKdy4qQ==",
-      "dev": true,
-      "requires": {
-        "@types/aria-query": "^5.0.0",
-        "@types/node": "^18.0.0",
-        "@wdio/config": "7.25.4",
-        "@wdio/logger": "7.19.0",
-        "@wdio/protocols": "7.22.0",
-        "@wdio/repl": "7.25.4",
-        "@wdio/types": "7.25.4",
-        "@wdio/utils": "7.25.4",
-        "archiver": "^5.0.0",
-        "aria-query": "^5.0.0",
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.9.tgz",
+      "integrity": "sha512-IwvKzhcJ9NjOL55xwj27uTTKkfxsg77dmAfqoKFSP5dQ70JzU+NgxiALEjjWQDybtt1yGIkHk7wjjxjboMU1uw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^20.11.30",
+        "@types/sinonjs__fake-timers": "^8.1.5",
+        "@wdio/config": "9.0.8",
+        "@wdio/logger": "9.0.8",
+        "@wdio/protocols": "9.0.8",
+        "@wdio/repl": "9.0.8",
+        "@wdio/types": "9.0.8",
+        "@wdio/utils": "9.0.8",
+        "archiver": "^7.0.1",
+        "aria-query": "^5.3.0",
+        "cheerio": "^1.0.0-rc.12",
         "css-shorthand-properties": "^1.1.1",
         "css-value": "^0.0.1",
-        "devtools": "7.25.4",
-        "devtools-protocol": "^0.0.1061995",
-        "fs-extra": "^10.0.0",
-        "grapheme-splitter": "^1.0.2",
+        "grapheme-splitter": "^1.0.4",
+        "htmlfy": "^0.2.1",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
         "lodash.clonedeep": "^4.5.0",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isplainobject": "^4.0.6",
         "lodash.zip": "^4.2.0",
-        "minimatch": "^5.0.0",
-        "puppeteer-core": "^13.1.3",
-        "query-selector-shadow-dom": "^1.0.0",
-        "resq": "^1.9.1",
+        "minimatch": "^9.0.3",
+        "query-selector-shadow-dom": "^1.0.1",
+        "resq": "^1.11.0",
         "rgb2hex": "0.2.5",
-        "serialize-error": "^8.0.0",
-        "webdriver": "7.25.4"
+        "serialize-error": "^11.0.3",
+        "urlpattern-polyfill": "^10.0.0",
+        "webdriver": "9.0.8"
       },
       "dependencies": {
-        "@types/node": {
-          "version": "18.11.9",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
-          "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
-          "dev": true
+        "@puppeteer/browsers": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz",
+          "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.6",
+            "extract-zip": "^2.0.1",
+            "progress": "^2.0.3",
+            "proxy-agent": "^6.4.0",
+            "semver": "^7.6.3",
+            "tar-fs": "^3.0.6",
+            "unbzip2-stream": "^1.4.3",
+            "yargs": "^17.7.2"
+          }
         },
         "@wdio/config": {
-          "version": "7.25.4",
-          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
-          "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
+          "version": "9.0.8",
+          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.0.8.tgz",
+          "integrity": "sha512-37L+hd+A1Nyehd/pgfTrLC6w+Ngbu0CIoFh9Vv6v8Cgu5Hih0TLofvlg+J1BNbcTd5eQ2tFKZBDeFMhQaIiTpg==",
           "dev": true,
           "requires": {
-            "@wdio/logger": "7.19.0",
-            "@wdio/types": "7.25.4",
-            "@wdio/utils": "7.25.4",
-            "deepmerge": "^4.0.0",
-            "glob": "^8.0.3"
+            "@wdio/logger": "9.0.8",
+            "@wdio/types": "9.0.8",
+            "@wdio/utils": "9.0.8",
+            "decamelize": "^6.0.0",
+            "deepmerge-ts": "^7.0.3",
+            "glob": "^10.2.2",
+            "import-meta-resolve": "^4.0.0"
           }
         },
         "@wdio/logger": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
-          "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
+          "version": "9.0.8",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.8.tgz",
+          "integrity": "sha512-uIyYIDBwLczmsp9JE5hN3ME8Xg+9WNBfSNXD69ICHrY9WPTzFf94UeTuavK7kwSKF3ro2eJbmNZItYOfnoovnw==",
           "dev": true,
           "requires": {
-            "chalk": "^4.0.0",
+            "chalk": "^5.1.2",
             "loglevel": "^1.6.0",
             "loglevel-plugin-prefix": "^0.8.4",
-            "strip-ansi": "^6.0.0"
+            "strip-ansi": "^7.1.0"
           }
         },
         "@wdio/protocols": {
-          "version": "7.22.0",
-          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
-          "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
+          "version": "9.0.8",
+          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.8.tgz",
+          "integrity": "sha512-xRH54byFf623/w/KW62xkf/C2mGyigSfMm+UT3tNEAd5ZA9X2VAWQWQBPzdcrsck7Fxk4zlQX8Kb34RSs7Cy4Q==",
           "dev": true
         },
         "@wdio/repl": {
-          "version": "7.25.4",
-          "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.25.4.tgz",
-          "integrity": "sha512-kYhj9gLsUk4HmlXLqkVre+gwbfvw9CcnrHjqIjrmMS4mR9D8zvBb5CItb3ZExfPf9jpFzIFREbCAYoE9x/kMwg==",
+          "version": "9.0.8",
+          "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-9.0.8.tgz",
+          "integrity": "sha512-3iubjl4JX5zD21aFxZwQghqC3lgu+mSs8c3NaiYYNCC+IT5cI/8QuKlgh9s59bu+N3gG988jqMJeCYlKuUv/iw==",
           "dev": true,
           "requires": {
-            "@wdio/utils": "7.25.4"
+            "@types/node": "^20.1.0"
           }
         },
         "@wdio/types": {
-          "version": "7.25.4",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
-          "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
+          "version": "9.0.8",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.8.tgz",
+          "integrity": "sha512-pmz2iRWddTanrv8JC7v3wUGm17KRv2WyyJhQfklMSANn9V1ep6pw1RJG2WJnKq4NojMvH1nVv1sMZxXrYPhpYw==",
           "dev": true,
           "requires": {
-            "@types/node": "^18.0.0",
-            "got": "^11.8.1"
+            "@types/node": "^20.1.0"
           }
         },
         "@wdio/utils": {
-          "version": "7.25.4",
-          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
-          "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
-          "dev": true,
-          "requires": {
-            "@wdio/logger": "7.19.0",
-            "@wdio/types": "7.25.4",
-            "p-iteration": "^1.1.8"
+          "version": "9.0.8",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.8.tgz",
+          "integrity": "sha512-p3EgOdkhCvMxJFd3WTtSChqYFQu2mz69/5tOsljDaL+4QYwnRR7O8M9wFsL3/9XMVcHdnC4Ija2VRxQ/lb+hHQ==",
+          "dev": true,
+          "requires": {
+            "@puppeteer/browsers": "^2.2.0",
+            "@wdio/logger": "9.0.8",
+            "@wdio/types": "9.0.8",
+            "decamelize": "^6.0.0",
+            "deepmerge-ts": "^7.0.3",
+            "edgedriver": "^5.6.1",
+            "geckodriver": "^4.3.3",
+            "get-port": "^7.0.0",
+            "import-meta-resolve": "^4.0.0",
+            "locate-app": "^2.2.24",
+            "safaridriver": "^0.1.2",
+            "split2": "^4.2.0",
+            "wait-port": "^1.1.0"
           }
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "debug": "^4.3.4"
           }
         },
         "brace-expansion": {
@@ -44102,140 +48493,151 @@
           }
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+          "dev": true
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "deepmerge-ts": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz",
+          "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==",
+          "dev": true
+        },
+        "https-proxy-agent": {
+          "version": "7.0.5",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+          "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "agent-base": "^7.0.2",
+            "debug": "4"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
           "dev": true
         },
-        "glob": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+        "minimatch": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^5.0.1",
-            "once": "^1.3.0"
+            "brace-expansion": "^2.0.1"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
+        "proxy-agent": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+          "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
+          "dev": true,
+          "requires": {
+            "agent-base": "^7.0.2",
+            "debug": "^4.3.4",
+            "http-proxy-agent": "^7.0.1",
+            "https-proxy-agent": "^7.0.3",
+            "lru-cache": "^7.14.1",
+            "pac-proxy-agent": "^7.0.1",
+            "proxy-from-env": "^1.1.0",
+            "socks-proxy-agent": "^8.0.2"
+          }
         },
-        "ky": {
-          "version": "0.30.0",
-          "resolved": "https://registry.npmjs.org/ky/-/ky-0.30.0.tgz",
-          "integrity": "sha512-X/u76z4JtDVq10u1JA5UQfatPxgPaVDMYTrgHyiTpGN2z4TMEJkIHsoSBBSg9SWZEIXTKsi9kHgiQ9o3Y/4yog==",
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
           "dev": true
         },
-        "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+        "tar-fs": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+          "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
           "dev": true,
           "requires": {
-            "brace-expansion": "^2.0.1"
+            "bare-fs": "^2.1.1",
+            "bare-path": "^2.1.0",
+            "pump": "^3.0.0",
+            "tar-stream": "^3.1.5"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "webdriver": {
+          "version": "9.0.8",
+          "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.0.8.tgz",
+          "integrity": "sha512-UnV0ANriSTUgypGk0pz8lApeQuHt+72WEDQG5hFwkkSvggtKLyWdT7+PQkNoXvDajTmiLIqUOq8XPI/Pm71rtw==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "@types/node": "^20.1.0",
+            "@types/ws": "^8.5.3",
+            "@wdio/config": "9.0.8",
+            "@wdio/logger": "9.0.8",
+            "@wdio/protocols": "9.0.8",
+            "@wdio/types": "9.0.8",
+            "@wdio/utils": "9.0.8",
+            "deepmerge-ts": "^7.0.3",
+            "ws": "^8.8.0"
           }
         },
-        "webdriver": {
-          "version": "7.25.4",
-          "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.25.4.tgz",
-          "integrity": "sha512-6nVDwenh0bxbtUkHASz9B8T9mB531Fn1PcQjUGj2t5dolLPn6zuK1D7XYVX40hpn6r3SlYzcZnEBs4X0az5Txg==",
+        "yargs": {
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
           "dev": true,
           "requires": {
-            "@types/node": "^18.0.0",
-            "@wdio/config": "7.25.4",
-            "@wdio/logger": "7.19.0",
-            "@wdio/protocols": "7.22.0",
-            "@wdio/types": "7.25.4",
-            "@wdio/utils": "7.25.4",
-            "got": "^11.0.2",
-            "ky": "0.30.0",
-            "lodash.merge": "^4.6.1"
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
           }
         }
       }
     },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true
-    },
     "webpack": {
-      "version": "5.76.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz",
-      "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==",
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
       "dev": true,
       "requires": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.10.0",
-        "es-module-lexer": "^0.9.0",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
+        "graceful-fs": "^4.2.11",
         "json-parse-even-better-errors": "^2.3.1",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.4.0",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
         "webpack-sources": "^3.2.3"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+          "version": "8.11.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+          "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
           "dev": true
         },
-        "acorn-import-assertions": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-          "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+        "acorn-import-attributes": {
+          "version": "1.9.5",
+          "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+          "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
           "dev": true,
           "requires": {}
         },
@@ -44251,10 +48653,16 @@
             "uri-js": "^4.2.2"
           }
         },
+        "json-parse-even-better-errors": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+          "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+          "dev": true
+        },
         "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+          "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
@@ -44265,60 +48673,29 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
-      "integrity": "sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==",
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
+      "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
       "dev": true,
       "requires": {
+        "@discoveryjs/json-ext": "0.5.7",
         "acorn": "^8.0.4",
         "acorn-walk": "^8.0.0",
-        "chalk": "^4.1.0",
         "commander": "^7.2.0",
+        "debounce": "^1.2.1",
+        "escape-string-regexp": "^4.0.0",
         "gzip-size": "^6.0.0",
-        "lodash": "^4.17.20",
+        "html-escaper": "^2.0.2",
         "opener": "^1.5.2",
-        "sirv": "^1.0.7",
+        "picocolors": "^1.0.0",
+        "sirv": "^2.0.3",
         "ws": "^7.3.1"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "version": "8.11.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+          "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
           "dev": true
         },
         "commander": {
@@ -44327,25 +48704,16 @@
           "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
           "dev": true
         },
-        "has-flag": {
+        "escape-string-regexp": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "ws": {
-          "version": "7.5.9",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "version": "7.5.10",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+          "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
           "dev": true,
           "requires": {}
         }
@@ -44487,23 +48855,39 @@
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+    "whatwg-encoding": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
       "dev": true,
       "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+        "iconv-lite": "0.6.3"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
       }
     },
+    "whatwg-mimetype": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+      "dev": true
+    },
     "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dev": true,
       "requires": {
-        "isexe": "^2.0.0"
+        "isexe": "^3.1.1"
       }
     },
     "which-boxed-primitive": {
@@ -44520,15 +48904,15 @@
       }
     },
     "which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
       "dev": true,
       "requires": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
       }
     },
     "which-module": {
@@ -44538,65 +48922,46 @@
       "dev": true
     },
     "which-typed-array": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-      "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
       "dev": true,
       "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
       }
     },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+    "winston-transport": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz",
+      "integrity": "sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "logform": "^2.3.2",
+        "readable-stream": "^3.6.0",
+        "triple-beam": "^1.3.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         }
       }
     },
     "word-wrap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true
     },
     "wordwrap": {
@@ -44606,13 +48971,59 @@
       "dev": true
     },
     "workerpool": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
-      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
       "dev": true
     },
     "wrap-ansi": {
-      "version": "7.0.0",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
+      }
+    },
+    "wrap-ansi-cjs": {
+      "version": "npm:wrap-ansi@7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
@@ -44645,6 +49056,15 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
         }
       }
     },
@@ -44661,23 +49081,12 @@
       "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.6"
-          }
-        }
       }
     },
     "ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "dev": true,
       "requires": {}
     },
@@ -44694,10 +49103,9 @@
       "dev": true
     },
     "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "yargs": {
       "version": "1.3.3",
@@ -44729,6 +49137,12 @@
           "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
           "dev": true
         },
+        "decamelize": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+          "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+          "dev": true
+        },
         "is-plain-obj": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
@@ -44737,138 +49151,91 @@
         }
       }
     },
-    "yarn-install": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz",
-      "integrity": "sha512-VO1u181msinhPcGvQTVMnHVOae8zjX/NSksR17e6eXHRveDvHCF5mGjh9hkN8mzyfnCqcBe42LdTs7bScuTaeg==",
-      "dev": true,
-      "requires": {
-        "cac": "^3.0.3",
-        "chalk": "^1.1.3",
-        "cross-spawn": "^4.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "cross-spawn": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-          "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
-          }
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-          "dev": true
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
-        }
-      }
-    },
     "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.3.tgz",
+      "integrity": "sha512-JCCdmlJJWv7L0q/KylOekyRaUrdEoUxWkWVcgorosTROCFWiS9p2NNPE9Yb91ak7b1N5SxAZEliWpspbZccivw==",
       "dev": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
+        "pend": "~1.2.0"
       }
     },
     "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+      "dev": true
+    },
+    "yoctocolors": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz",
+      "integrity": "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==",
+      "dev": true
+    },
+    "yoctocolors-cjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
       "dev": true
     },
     "zip-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz",
-      "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+      "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==",
       "dev": true,
       "requires": {
-        "archiver-utils": "^2.1.0",
-        "compress-commons": "^4.1.0",
-        "readable-stream": "^3.6.0"
+        "archiver-utils": "^5.0.0",
+        "compress-commons": "^6.0.2",
+        "readable-stream": "^4.0.0"
       },
       "dependencies": {
+        "buffer": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.2.1"
+          }
+        },
         "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "version": "4.5.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+          "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "abort-controller": "^3.0.0",
+            "buffer": "^6.0.3",
+            "events": "^3.3.0",
+            "process": "^0.11.10",
+            "string_decoder": "^1.3.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
           }
         }
       }
     },
+    "zod": {
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "zwitch": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.2.tgz",
-      "integrity": "sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index 0bffde226f6..fa9031dbf54 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,17 @@
 {
   "name": "prebid.js",
-  "version": "8.17.0-pre",
+  "version": "9.24.0-pre",
   "description": "Header Bidding Management Library",
-  "main": "src/prebid.js",
+  "main": "src/prebid.public.js",
+  "exports": {
+    ".": "./src/prebid.public.js",
+    "./prebid.js": "./src/prebid.public.js",
+    "./prebid": "./src/prebid.public.js",
+    "./.babelrc.js": "./.babelrc.js",
+    "./babelConfig.js": "./babelConfig.js",
+    "./modules/*": "./modules/*",
+    "./modules/*.js": "./modules/*.js"
+  },
   "scripts": {
     "serve": "gulp serve",
     "test": "gulp test",
@@ -30,25 +39,24 @@
   ],
   "globalVarName": "pbjs",
   "defineGlobal": true,
-  "author": "the prebid.js contributors",
+  "author": "The prebid.js contributors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.9.0"
+    "node": ">=20.0.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.5",
-    "@wdio/browserstack-service": "~7.16.0",
-    "@wdio/cli": "~7.5.2",
-    "@wdio/concise-reporter": "~7.5.2",
-    "@wdio/local-runner": "~7.5.2",
-    "@wdio/mocha-framework": "~7.5.2",
-    "@wdio/spec-reporter": "~7.19.0",
-    "@wdio/sync": "~7.5.2",
+    "@babel/register": "^7.24.6",
+    "@wdio/browserstack-service": "^9.0.5",
+    "@wdio/cli": "^9.0.5",
+    "@wdio/concise-reporter": "^8.29.0",
+    "@wdio/local-runner": "^9.0.5",
+    "@wdio/mocha-framework": "^8.29.0",
+    "@wdio/spec-reporter": "^8.29.0",
     "ajv": "6.12.3",
     "assert": "^2.0.0",
     "babel-loader": "^8.0.5",
     "babel-plugin-istanbul": "^6.1.1",
-    "babel-register": "^6.26.0",
     "body-parser": "^1.19.0",
     "chai": "^4.2.0",
     "coveralls": "^3.1.0",
@@ -57,7 +65,8 @@
     "es5-shim": "^4.5.14",
     "eslint": "^7.27.0",
     "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-jsdoc": "^48.5.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prebid": "file:./plugins/eslint",
     "eslint-plugin-promise": "^5.1.0",
@@ -65,13 +74,14 @@
     "execa": "^1.0.0",
     "faker": "^5.5.3",
     "fs.extra": "^1.3.2",
-    "gulp": "^4.0.0",
+    "gulp": "^4.0.2",
     "gulp-clean": "^0.4.0",
     "gulp-concat": "^2.6.0",
     "gulp-connect": "^5.7.0",
     "gulp-eslint": "^6.0.0",
     "gulp-if": "^3.0.0",
     "gulp-js-escape": "^1.0.1",
+    "gulp-rename": "^2.0.0",
     "gulp-replace": "^1.0.0",
     "gulp-shell": "^0.8.0",
     "gulp-sourcemaps": "^3.0.0",
@@ -99,19 +109,20 @@
     "karma-spec-reporter": "^0.0.32",
     "karma-webpack": "^5.0.0",
     "lodash": "^4.17.21",
-    "mocha": "^10.0.0",
+    "mocha": "^10.7.3",
     "morgan": "^1.10.0",
+    "node-html-parser": "^6.1.5",
     "opn": "^5.4.0",
     "resolve-from": "^5.0.0",
-    "sinon": "^4.1.3",
+    "sinon": "^4.5.0",
     "through2": "^4.0.2",
     "url": "^0.11.0",
     "url-parse": "^1.0.5",
     "video.js": "^7.17.0",
     "videojs-contrib-ads": "^6.9.0",
-    "videojs-ima": "^1.11.0",
+    "videojs-ima": "^2.3.0",
     "videojs-playlist": "^5.0.0",
-    "webdriverio": "^7.6.1",
+    "webdriverio": "^9.0.9",
     "webpack": "^5.70.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-manifest-plugin": "^5.0.0",
@@ -119,20 +130,20 @@
     "yargs": "^1.3.1"
   },
   "dependencies": {
-    "@babel/core": "^7.16.7",
+    "@babel/core": "^7.25.2",
     "@babel/plugin-transform-runtime": "^7.18.9",
     "@babel/preset-env": "^7.16.8",
     "@babel/runtime": "^7.18.9",
     "core-js": "^3.13.0",
     "core-js-pure": "^3.13.0",
-    "criteo-direct-rsa-validate": "^1.1.0",
-    "crypto-js": "^3.3.0",
+    "crypto-js": "^4.2.0",
     "dlv": "1.1.3",
-    "dset": "3.1.2",
+    "dset": "3.1.4",
     "express": "^4.15.4",
     "fun-hooks": "^0.9.9",
-    "just-clone": "^1.0.2",
-    "live-connect-js": "^6.0.1"
+    "gulp-wrap": "^0.15.0",
+    "klona": "^2.0.6",
+    "live-connect-js": "^7.1.0"
   },
   "optionalDependencies": {
     "fsevents": "^2.3.2"
diff --git a/plugins/eslint/index.js b/plugins/eslint/index.js
new file mode 100644
index 00000000000..f8acf54683b
--- /dev/null
+++ b/plugins/eslint/index.js
@@ -0,0 +1,104 @@
+const _ = require('lodash');
+const { flagErrors } = require('./validateImports.js');
+const noGlobal = require('eslint/lib/rules/no-restricted-globals.js');
+
+function getName(node) {
+  return node.type === 'Literal' ? node.value : node.name;
+}
+
+module.exports = {
+  rules: {
+    'validate-imports': {
+      meta: {
+        docs: {
+          description: 'validates module imports can be found without custom webpack resolvers, are in module whitelist, and not module entry points'
+        }
+      },
+      create: function(context) {
+        return {
+          "CallExpression[callee.name='require']"(node) {
+            let importPath = _.get(node, ['arguments', 0, 'value']);
+            if (importPath) {
+              flagErrors(context, node, importPath);
+            }
+          },
+          ImportDeclaration(node) {
+            let importPath = node.source.value.trim();
+            flagErrors(context, node, importPath);
+          },
+          'ExportNamedDeclaration[source]'(node) {
+            let importPath = node.source.value.trim();
+            flagErrors(context, node, importPath);
+          }
+        };
+      }
+    },
+    'no-member': {
+      meta: {
+        schema: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              target: { type: 'string' },
+              name: { type: 'string' },
+              message: { type: 'string' }
+            },
+            required: ['name', 'message'],
+            additionalProperties: false
+          },
+          uniqueItems: true,
+          minItems: 1
+        },
+
+        messages: {
+          noMember: "Unexpected use of '{{target}}.{{name}}'. {{message}}",
+        }
+      },
+
+      create(context) {
+        return {
+          MemberExpression(node) {
+            context.options.forEach(({name, target, message}) => {
+              if (target === node.object.name && getName(node.property) === name) {
+                context.report({
+                  node,
+                  messageId: 'noMember',
+                  data: {
+                    name,
+                    target: target || '',
+                    message
+                  }
+                });
+              }
+            });
+          }
+        }
+      }
+    },
+    'no-global': Object.assign({}, noGlobal, {
+      // no-restricted-global that also looks for `window.GLOBAL`
+      create(context) {
+        const globals = Object.fromEntries(
+          context.options.map(option => typeof option === 'string' ? [option, null] : [option.name, option.message])
+        )
+        return Object.assign(noGlobal.create(context), {
+          MemberExpression(node) {
+            const name = getName(node.property);
+            if (node.object.name === 'window' && globals.hasOwnProperty(name)) {
+              const customMessage = globals[name];
+              context.report({
+                node,
+                messageId: customMessage == null ? 'defaultMessage' : 'customMessage',
+                data: {
+                  name,
+                  customMessage
+                }
+              })
+            }
+          }
+        })
+      }
+    }),
+  }
+};
diff --git a/plugins/eslint/package.json b/plugins/eslint/package.json
index fa18ad83718..446f63945fa 100644
--- a/plugins/eslint/package.json
+++ b/plugins/eslint/package.json
@@ -2,7 +2,7 @@
   "name": "eslint-plugin-prebid",
   "version": "1.0.0",
   "description": "validates module imports can be found without custom webpack resolvers, are in module whitelist, and not module entry points",
-  "main": "validateImports.js",
+  "main": "index.js",
   "author": "the prebid.js contributors",
   "license": "Apache-2.0"
 }
diff --git a/plugins/eslint/validateImports.js b/plugins/eslint/validateImports.js
index 324b75c4ce7..e38f0532238 100644
--- a/plugins/eslint/validateImports.js
+++ b/plugins/eslint/validateImports.js
@@ -3,6 +3,7 @@ const path = require('path');
 const _ = require('lodash');
 const resolveFrom = require('resolve-from');
 const MODULES_PATH = path.resolve(__dirname, '../../modules');
+const CREATIVE_PATH = path.resolve(__dirname, '../../creative');
 
 function isInDirectory(filename, dir) {
   const rel = path.relative(dir, filename);
@@ -31,6 +32,16 @@ function flagErrors(context, node, importPath) {
       context.report(node, `import "${importPath}": importing from modules is not allowed`);
     }
 
+    // do not allow imports into `creative`
+    if (isInDirectory(absImportPath, CREATIVE_PATH) && !isInDirectory(absFileDir, CREATIVE_PATH) && absFileDir !== CREATIVE_PATH) {
+      context.report(node, `import "${importPath}": importing from creative is not allowed`);
+    }
+
+    // do not allow imports outside `creative`
+    if (isInDirectory(absFileDir, CREATIVE_PATH) && !isInDirectory(absImportPath, CREATIVE_PATH) && absImportPath !== CREATIVE_PATH) {
+      context.report(node, `import "${importPath}": importing from outside creative is not allowed`);
+    }
+
     // don't allow extension-less local imports
     if (
       !importPath.match(/^\w+/) &&
@@ -42,31 +53,5 @@ function flagErrors(context, node, importPath) {
 }
 
 module.exports = {
-  rules: {
-    'validate-imports': {
-      meta: {
-        docs: {
-          description: 'validates module imports can be found without custom webpack resolvers, are in module whitelist, and not module entry points'
-        }
-      },
-      create: function(context) {
-        return {
-          "CallExpression[callee.name='require']"(node) {
-            let importPath = _.get(node, ['arguments', 0, 'value']);
-            if (importPath) {
-              flagErrors(context, node, importPath);
-            }
-          },
-          ImportDeclaration(node) {
-            let importPath = node.source.value.trim();
-            flagErrors(context, node, importPath);
-          },
-          'ExportNamedDeclaration[source]'(node) {
-            let importPath = node.source.value.trim();
-            flagErrors(context, node, importPath);
-          }
-        }
-      }
-    }
-  }
-};
+  flagErrors
+}
diff --git a/plugins/pbjsGlobals.js b/plugins/pbjsGlobals.js
index 6d1eeb0c57d..62d29b567ed 100644
--- a/plugins/pbjsGlobals.js
+++ b/plugins/pbjsGlobals.js
@@ -34,7 +34,8 @@ module.exports = function(api, options) {
     '$$PREBID_GLOBAL$$': pbGlobal,
     '$$DEFINE_PREBID_GLOBAL$$': defineGlobal,
     '$$REPO_AND_VERSION$$': `${prebid.repository.url.split('/')[3]}_prebid_${prebid.version}`,
-    '$$PREBID_DIST_URL_BASE$$': options.prebidDistUrlBase || `https://cdn.jsdelivr.net/npm/prebid.js@${getNpmVersion(prebid.version)}/dist/`
+    '$$PREBID_DIST_URL_BASE$$': options.prebidDistUrlBase || `https://cdn.jsdelivr.net/npm/prebid.js@${getNpmVersion(prebid.version)}/dist/`,
+    '$$LIVE_INTENT_MODULE_MODE$$': (process && process.env && process.env.LiveConnectMode) || 'standard'
   };
 
   let identifierToStringLiteral = [
diff --git a/src/Renderer.js b/src/Renderer.js
index 2f9b2e025cb..772d8d93655 100644
--- a/src/Renderer.js
+++ b/src/Renderer.js
@@ -1,9 +1,10 @@
 import { loadExternalScript } from './adloader.js';
 import {
-  logError, logWarn, logMessage, deepAccess
+  logError, logWarn, logMessage
 } from './utils.js';
 import {find} from './polyfill.js';
 import {getGlobal} from './prebidGlobal.js';
+import { MODULE_TYPE_PREBID } from './activities/modules.js';
 
 const pbjsInstance = getGlobal();
 const moduleCode = 'outstream';
@@ -62,7 +63,7 @@ export function Renderer(options) {
     } else {
       // we expect to load a renderer url once only so cache the request to load script
       this.cmd.unshift(runRender) // should render run first ?
-      loadExternalScript(url, moduleCode, this.callback, this.documentContext);
+      loadExternalScript(url, MODULE_TYPE_PREBID, moduleCode, this.callback, this.documentContext);
     }
   }.bind(this); // bind the function to this object to avoid 'this' errors
 }
@@ -143,11 +144,11 @@ function isRendererPreferredFromAdUnit(adUnitCode) {
   }
 
   // renderer defined at adUnit level
-  const adUnitRenderer = deepAccess(adUnit, 'renderer');
+  const adUnitRenderer = adUnit?.renderer;
   const hasValidAdUnitRenderer = !!(adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render);
 
   // renderer defined at adUnit.mediaTypes level
-  const mediaTypeRenderer = deepAccess(adUnit, 'mediaTypes.video.renderer');
+  const mediaTypeRenderer = adUnit?.mediaTypes?.video?.renderer;
   const hasValidMediaTypeRenderer = !!(mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render)
 
   return !!(
diff --git a/src/activities/activities.js b/src/activities/activities.js
index 0a17750b0b0..40f43fb9114 100644
--- a/src/activities/activities.js
+++ b/src/activities/activities.js
@@ -50,3 +50,8 @@ export const ACTIVITY_TRANSMIT_PRECISE_GEO = 'transmitPreciseGeo';
  * transmit TID: some component wants access ot (and send along) transaction IDs
  */
 export const ACTIVITY_TRANSMIT_TID = 'transmitTid';
+
+/**
+ * loadExternalScript: adLoader.js is allowed to load external script
+ */
+export const LOAD_EXTERNAL_SCRIPT = 'loadExternalScript';
diff --git a/src/activities/params.js b/src/activities/params.js
index 036a6657cf8..859f5d5beed 100644
--- a/src/activities/params.js
+++ b/src/activities/params.js
@@ -40,8 +40,10 @@ export const ACTIVITY_PARAM_SYNC_TYPE = 'syncType'
 export const ACTIVITY_PARAM_SYNC_URL = 'syncUrl';
 /**
  * @private
- * configuration options for analytics adapter - the argument passed to `enableAnalytics`.
- * relevant for: reportAnalytics
+ * Configuration options for analytics adapter - the argument passed to `enableAnalytics`.
+ * Relevant for: reportAnalytics.
+ * @constant
+ * @type {string}
  */
 export const ACTIVITY_PARAM_ANL_CONFIG = '_config';
 
diff --git a/src/activities/redactor.js b/src/activities/redactor.js
index d052c029c13..65d14722ce5 100644
--- a/src/activities/redactor.js
+++ b/src/activities/redactor.js
@@ -7,6 +7,7 @@ import {
   ACTIVITY_TRANSMIT_TID,
   ACTIVITY_TRANSMIT_UFPD
 } from './activities.js';
+import { scrubIPv4, scrubIPv6 } from '../utils/ipUtils.js';
 
 export const ORTB_UFPD_PATHS = [
   'data',
@@ -18,9 +19,11 @@ export const ORTB_UFPD_PATHS = [
   'id',
   'buyeruid',
   'customdata'
-].map(f => `user.${f}`);
+].map(f => `user.${f}`).concat('device.ext.cdep');
 export const ORTB_EIDS_PATHS = ['user.eids', 'user.ext.eids'];
 export const ORTB_GEO_PATHS = ['user.geo.lat', 'user.geo.lon', 'device.geo.lat', 'device.geo.lon'];
+export const ORTB_IPV4_PATHS = ['device.ip']
+export const ORTB_IPV6_PATHS = ['device.ipv6']
 
 /**
  * @typedef TransformationRuleDef
@@ -157,6 +160,22 @@ export function ortb2TransmitRules(isAllowed = isActivityAllowed) {
         return Math.round((val + Number.EPSILON) * 100) / 100;
       }
     },
+    {
+      name: ACTIVITY_TRANSMIT_PRECISE_GEO,
+      paths: ORTB_IPV4_PATHS,
+      applies: appliesWhenActivityDenied(ACTIVITY_TRANSMIT_PRECISE_GEO, isAllowed),
+      get(val) {
+        return scrubIPv4(val);
+      }
+    },
+    {
+      name: ACTIVITY_TRANSMIT_PRECISE_GEO,
+      paths: ORTB_IPV6_PATHS,
+      applies: appliesWhenActivityDenied(ACTIVITY_TRANSMIT_PRECISE_GEO, isAllowed),
+      get(val) {
+        return scrubIPv6(val);
+      }
+    },
     {
       name: ACTIVITY_TRANSMIT_TID,
       paths: ['source.tid'],
diff --git a/src/activities/rules.js b/src/activities/rules.js
index f84f1080843..7b4f4634f07 100644
--- a/src/activities/rules.js
+++ b/src/activities/rules.js
@@ -40,19 +40,19 @@ export function ruleRegistry(logger = prefixLog('Activity control:')) {
     /**
      * Register an activity control rule.
      *
-     * @param {string} activity activity name - set is defined in `activities.js`
-     * @param {string} ruleName a name for this rule; used for logging.
-     * @param {function({}): {allow: boolean, reason?: string}} rule definition function. Takes in activity
+     * @param {string} activity - Activity name, as defined in `activities.js`.
+     * @param {string} ruleName - A name for this rule, used for logging.
+     * @param {function(Object): {allow: boolean, reason?: string}} rule - Rule definition function. Takes in activity
      *        parameters as a single map; MAY return an object {allow, reason}, where allow is true/false,
      *        and reason is an optional message used for logging.
      *
-     *        {allow: true} will allow this activity AS LONG AS no other rules with same or higher priority return {allow: false};
+     *        {allow: true} will allow this activity AS LONG AS no other rules with the same or higher priority return {allow: false};
      *        {allow: false} will deny this activity AS LONG AS no other rules with higher priority return {allow: true};
-     *        returning null/undefined has no effect - the decision is left to other rules.
+     *        Returning null/undefined has no effect - the decision is left to other rules.
      *        If no rule returns an allow value, the default is to allow the activity.
      *
-     * @param {number} priority rule priority; lower number means higher priority
-     * @returns {function(void): void} a function that unregisters the rule when called.
+     * @param {number} [priority=10] - Rule priority; lower number means higher priority.
+     * @returns {function(): void} - A function that unregisters the rule when called.
      */
     function registerActivityControl(activity, ruleName, rule, priority = 10) {
       const rules = getRules(activity);
diff --git a/src/adRendering.js b/src/adRendering.js
index 0a847d7cc25..502721dea38 100644
--- a/src/adRendering.js
+++ b/src/adRendering.js
@@ -1,38 +1,315 @@
-import {logError} from './utils.js';
+import {
+  createIframe,
+  createInvisibleIframe,
+  inIframe,
+  insertElement,
+  logError,
+  logWarn,
+  replaceMacros
+} from './utils.js';
 import * as events from './events.js';
-import CONSTANTS from './constants.json';
+import {AD_RENDER_FAILED_REASON, BID_STATUS, EVENTS, MESSAGES, PB_LOCATOR} from './constants.js';
+import {config} from './config.js';
+import {executeRenderer, isRendererRequired} from './Renderer.js';
+import {VIDEO} from './mediaTypes.js';
+import {auctionManager} from './auctionManager.js';
+import {getCreativeRenderer} from './creativeRenderers.js';
+import {hook} from './hook.js';
+import {fireNativeTrackers} from './native.js';
+import {GreedyPromise} from './utils/promise.js';
+import adapterManager from './adapterManager.js';
+import {useMetrics} from './utils/perfMetrics.js';
+import {filters} from './targeting.js';
 
-const {AD_RENDER_FAILED, AD_RENDER_SUCCEEDED} = CONSTANTS.EVENTS;
+const { AD_RENDER_FAILED, AD_RENDER_SUCCEEDED, STALE_RENDER, BID_WON, EXPIRED_RENDER } = EVENTS;
+const { EXCEPTION } = AD_RENDER_FAILED_REASON;
+
+export const getBidToRender = hook('sync', function (adId, forRender = true, override = GreedyPromise.resolve()) {
+  return override
+    .then(bid => bid ?? auctionManager.findBidByAdId(adId))
+    .catch(() => {})
+})
+
+export const markWinningBid = hook('sync', function (bid) {
+  events.emit(BID_WON, bid);
+  auctionManager.addWinningBid(bid);
+})
 
 /**
  * Emit the AD_RENDER_FAILED event.
  *
- * @param reason one of the values in CONSTANTS.AD_RENDER_FAILED_REASON
- * @param message failure description
- * @param bid? bid response object that failed to render
- * @param id? adId that failed to render
+ * @param {Object} data
+ * @param data.reason one of the values in AD_RENDER_FAILED_REASON
+ * @param data.message failure description
+ * @param [data.bid] bid response object that failed to render
+ * @param [data.id] adId that failed to render
  */
 export function emitAdRenderFail({ reason, message, bid, id }) {
   const data = { reason, message };
-  if (bid) data.bid = bid;
+  if (bid) {
+    data.bid = bid;
+    data.adId = bid.adId;
+  }
   if (id) data.adId = id;
 
-  logError(message);
+  logError(`Error rendering ad (id: ${id}): ${message}`);
   events.emit(AD_RENDER_FAILED, data);
 }
 
 /**
  * Emit the AD_RENDER_SUCCEEDED event.
  * (Note: Invocation of this function indicates that the render function did not generate an error, it does not guarantee that tracking for this event has occurred yet.)
- * @param doc document object that was used to `.write` the ad. Should be `null` if unavailable (e.g. for documents in
+ * @param {Object} data
+ * @param data.doc document object that was used to `.write` the ad. Should be `null` if unavailable (e.g. for documents in
  * a cross-origin frame).
- * @param bid bid response object for the ad that was rendered
- * @param id adId that was rendered.
+ * @param [data.bid] bid response object for the ad that was rendered
+ * @param [data.id] adId that was rendered.
  */
 export function emitAdRenderSucceeded({ doc, bid, id }) {
   const data = { doc };
   if (bid) data.bid = bid;
   if (id) data.adId = id;
 
+  adapterManager.callAdRenderSucceededBidder(bid.adapterCode || bid.bidder, bid);
+
   events.emit(AD_RENDER_SUCCEEDED, data);
 }
+
+export function handleCreativeEvent(data, bidResponse) {
+  switch (data.event) {
+    case EVENTS.AD_RENDER_FAILED:
+      emitAdRenderFail({
+        bid: bidResponse,
+        id: bidResponse.adId,
+        reason: data.info.reason,
+        message: data.info.message
+      });
+      break;
+    case EVENTS.AD_RENDER_SUCCEEDED:
+      emitAdRenderSucceeded({
+        doc: null,
+        bid: bidResponse,
+        id: bidResponse.adId
+      });
+      break;
+    default:
+      logError(`Received event request for unsupported event: '${data.event}' (adId: '${bidResponse.adId}')`);
+  }
+}
+
+export function handleNativeMessage(data, bidResponse, {resizeFn, fireTrackers = fireNativeTrackers}) {
+  switch (data.action) {
+    case 'resizeNativeHeight':
+      resizeFn(data.width, data.height);
+      break;
+    default:
+      fireTrackers(data, bidResponse);
+  }
+}
+
+const HANDLERS = {
+  [MESSAGES.EVENT]: handleCreativeEvent
+}
+
+if (FEATURES.NATIVE) {
+  HANDLERS[MESSAGES.NATIVE] = handleNativeMessage;
+}
+
+function creativeMessageHandler(deps) {
+  return function (type, data, bidResponse) {
+    if (HANDLERS.hasOwnProperty(type)) {
+      HANDLERS[type](data, bidResponse, deps);
+    }
+  }
+}
+
+export const getRenderingData = hook('sync', function (bidResponse, options) {
+  const {ad, adUrl, cpm, originalCpm, width, height} = bidResponse
+  const repl = {
+    AUCTION_PRICE: originalCpm || cpm,
+    CLICKTHROUGH: options?.clickUrl || ''
+  }
+  return {
+    ad: replaceMacros(ad, repl),
+    adUrl: replaceMacros(adUrl, repl),
+    width,
+    height
+  };
+})
+
+export const doRender = hook('sync', function({renderFn, resizeFn, bidResponse, options, doc, isMainDocument = doc === document && !inIframe()}) {
+  const videoBid = (FEATURES.VIDEO && bidResponse.mediaType === VIDEO)
+  if (isMainDocument || videoBid) {
+    emitAdRenderFail({
+      reason: AD_RENDER_FAILED_REASON.PREVENT_WRITING_ON_MAIN_DOCUMENT,
+      message: videoBid ? 'Cannot render video ad without a renderer' : `renderAd was prevented from writing to the main document.`,
+      bid: bidResponse,
+      id: bidResponse.adId
+    });
+    return;
+  }
+  const data = getRenderingData(bidResponse, options);
+  renderFn(Object.assign({adId: bidResponse.adId}, data));
+  const {width, height} = data;
+  if ((width ?? height) != null) {
+    resizeFn(width, height);
+  }
+});
+
+doRender.before(function (next, args) {
+  // run renderers from a high priority hook to allow the video module to insert itself between this and "normal" rendering.
+  const {bidResponse, doc} = args;
+  if (isRendererRequired(bidResponse.renderer)) {
+    executeRenderer(bidResponse.renderer, bidResponse, doc);
+    emitAdRenderSucceeded({doc, bid: bidResponse, id: bidResponse.adId})
+    next.bail();
+  } else {
+    next(args);
+  }
+}, 100)
+
+export function handleRender({renderFn, resizeFn, adId, options, bidResponse, doc}) {
+  deferRendering(bidResponse, () => {
+    if (bidResponse == null) {
+      emitAdRenderFail({
+        reason: AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
+        message: `Cannot find ad '${adId}'`,
+        id: adId
+      });
+      return;
+    }
+    if (bidResponse.status === BID_STATUS.RENDERED) {
+      logWarn(`Ad id ${adId} has been rendered before`);
+      events.emit(STALE_RENDER, bidResponse);
+      if (config.getConfig('auctionOptions')?.suppressStaleRender) {
+        return;
+      }
+    }
+    if (!filters.isBidNotExpired(bidResponse)) {
+      logWarn(`Ad id ${adId} has been expired`);
+      events.emit(EXPIRED_RENDER, bidResponse);
+      if (config.getConfig('auctionOptions')?.suppressExpiredRender) {
+        return;
+      }
+    }
+
+    try {
+      doRender({renderFn, resizeFn, bidResponse, options, doc});
+    } catch (e) {
+      emitAdRenderFail({
+        reason: AD_RENDER_FAILED_REASON.EXCEPTION,
+        message: e.message,
+        id: adId,
+        bid: bidResponse
+      });
+    }
+  })
+}
+
+export function markBidAsRendered(bidResponse) {
+  const metrics = useMetrics(bidResponse.metrics);
+  metrics.checkpoint('bidRender');
+  metrics.timeBetween('bidWon', 'bidRender', 'render.deferred');
+  metrics.timeBetween('auctionEnd', 'bidRender', 'render.pending');
+  metrics.timeBetween('requestBids', 'bidRender', 'render.e2e');
+  bidResponse.status = BID_STATUS.RENDERED;
+}
+
+const DEFERRED_RENDER = new WeakMap();
+const WINNERS = new WeakSet();
+
+export function deferRendering(bidResponse, renderFn) {
+  if (bidResponse == null) {
+    // if the bid is missing, let renderFn deal with it now
+    renderFn();
+    return;
+  }
+  DEFERRED_RENDER.set(bidResponse, renderFn);
+  if (!bidResponse.deferRendering) {
+    renderIfDeferred(bidResponse);
+  }
+  markWinner(bidResponse);
+}
+
+export function markWinner(bidResponse) {
+  if (!WINNERS.has(bidResponse)) {
+    WINNERS.add(bidResponse);
+    markWinningBid(bidResponse);
+  }
+}
+
+export function renderIfDeferred(bidResponse) {
+  const renderFn = DEFERRED_RENDER.get(bidResponse);
+  if (renderFn) {
+    renderFn();
+    markBidAsRendered(bidResponse);
+    DEFERRED_RENDER.delete(bidResponse);
+  }
+}
+
+export function renderAdDirect(doc, adId, options) {
+  let bid;
+  function fail(reason, message) {
+    emitAdRenderFail(Object.assign({id: adId, bid}, {reason, message}));
+  }
+  function resizeFn(width, height) {
+    if (doc.defaultView && doc.defaultView.frameElement) {
+      width && (doc.defaultView.frameElement.width = width);
+      height && (doc.defaultView.frameElement.height = height);
+    }
+  }
+  const messageHandler = creativeMessageHandler({resizeFn});
+  function renderFn(adData) {
+    if (adData.ad) {
+      doc.write(adData.ad);
+      doc.close();
+      emitAdRenderSucceeded({doc, bid, id: bid.adId});
+    } else {
+      getCreativeRenderer(bid)
+        .then(render => render(adData, {
+          sendMessage: (type, data) => messageHandler(type, data, bid),
+          mkFrame: createIframe,
+        }, doc.defaultView))
+        .then(
+          () => emitAdRenderSucceeded({doc, bid, id: bid.adId}),
+          (e) => {
+            fail(e?.reason || AD_RENDER_FAILED_REASON.EXCEPTION, e?.message)
+            e?.stack && logError(e);
+          }
+        );
+    }
+    // TODO: this is almost certainly the wrong way to do this
+    const creativeComment = document.createComment(`Creative ${bid.creativeId} served by ${bid.bidder} Prebid.js Header Bidding`);
+    insertElement(creativeComment, doc, 'html');
+  }
+  try {
+    if (!adId || !doc) {
+      fail(AD_RENDER_FAILED_REASON.MISSING_DOC_OR_ADID, `missing ${adId ? 'doc' : 'adId'}`);
+    } else {
+      getBidToRender(adId).then(bidResponse => {
+        bid = bidResponse;
+        handleRender({renderFn, resizeFn, adId, options: {clickUrl: options?.clickThrough}, bidResponse, doc});
+      });
+    }
+  } catch (e) {
+    fail(EXCEPTION, e.message);
+  }
+}
+
+/**
+ * Insert an invisible, named iframe that can be used by creatives to locate the window Prebid is running in
+ * (by looking for one that has `.frames[PB_LOCATOR]` defined).
+ * This is necessary because in some situations creatives may be rendered inside nested iframes - Prebid is not necessarily
+ * in the immediate parent window.
+ */
+export function insertLocatorFrame() {
+  if (!window.frames[PB_LOCATOR]) {
+    if (!document.body) {
+      window.requestAnimationFrame(insertLocatorFrame);
+    } else {
+      const frame = createInvisibleIframe();
+      frame.name = PB_LOCATOR;
+      document.body.appendChild(frame);
+    }
+  }
+}
diff --git a/src/adServerManager.js b/src/adServerManager.js
index af8fe34920e..7e1290b3983 100644
--- a/src/adServerManager.js
+++ b/src/adServerManager.js
@@ -34,7 +34,7 @@ const prebid = getGlobal();
 /**
  * @typedef {Object} VideoSupport
  *
- * @function {VideoAdUrlBuilder} buildVideoAdUrl
+ * @property {VideoAdUrlBuilder} buildVideoAdUrl
  */
 
 /**
diff --git a/src/adUnits.js b/src/adUnits.js
index cdac649c5b8..5c07718bbea 100644
--- a/src/adUnits.js
+++ b/src/adUnits.js
@@ -1,6 +1,7 @@
-import { deepAccess } from './utils.js';
-
 let adUnits = {};
+export function reset() {
+  adUnits = {}
+}
 
 function ensureAdUnit(adunit, bidderCode) {
   let adUnit = adUnits[adunit] = adUnits[adunit] || { bidders: {} };
@@ -21,7 +22,7 @@ function incrementAdUnitCount(adunit, counter, bidderCode) {
  * @param {string} adunit id
  * @returns {number} current adunit count
  */
-function incrementRequestsCounter(adunit) {
+export function incrementRequestsCounter(adunit) {
   return incrementAdUnitCount(adunit, 'requestsCounter');
 }
 
@@ -31,7 +32,7 @@ function incrementRequestsCounter(adunit) {
  * @param {string} bidderCode code
  * @returns {number} current adunit bidder requests count
  */
-function incrementBidderRequestsCounter(adunit, bidderCode) {
+export function incrementBidderRequestsCounter(adunit, bidderCode) {
   return incrementAdUnitCount(adunit, 'requestsCounter', bidderCode);
 }
 
@@ -41,17 +42,26 @@ function incrementBidderRequestsCounter(adunit, bidderCode) {
  * @param {string} bidderCode code
  * @returns {number} current adunit bidder requests count
  */
-function incrementBidderWinsCounter(adunit, bidderCode) {
+export function incrementBidderWinsCounter(adunit, bidderCode) {
   return incrementAdUnitCount(adunit, 'winsCounter', bidderCode);
 }
 
+/**
+ * Increments and returns current Adunit auctions counter
+ * @param {string} adunit id
+ * @returns {number} current adunit auctions count
+ */
+export function incrementAuctionsCounter(adunit) {
+  return incrementAdUnitCount(adunit, 'auctionsCounter');
+}
+
 /**
  * Returns current Adunit counter
  * @param {string} adunit id
  * @returns {number} current adunit count
  */
-function getRequestsCounter(adunit) {
-  return deepAccess(adUnits, `${adunit}.requestsCounter`) || 0;
+export function getRequestsCounter(adunit) {
+  return adUnits?.[adunit]?.requestsCounter || 0;
 }
 
 /**
@@ -60,8 +70,8 @@ function getRequestsCounter(adunit) {
  * @param {string} bidder code
  * @returns {number} current adunit bidder requests count
  */
-function getBidderRequestsCounter(adunit, bidder) {
-  return deepAccess(adUnits, `${adunit}.bidders.${bidder}.requestsCounter`) || 0;
+export function getBidderRequestsCounter(adunit, bidder) {
+  return adUnits?.[adunit]?.bidders?.[bidder]?.requestsCounter || 0;
 }
 
 /**
@@ -70,21 +80,15 @@ function getBidderRequestsCounter(adunit, bidder) {
  * @param {string} bidder code
  * @returns {number} current adunit bidder requests count
  */
-function getBidderWinsCounter(adunit, bidder) {
-  return deepAccess(adUnits, `${adunit}.bidders.${bidder}.winsCounter`) || 0;
+export function getBidderWinsCounter(adunit, bidder) {
+  return adUnits?.[adunit]?.bidders?.[bidder]?.winsCounter || 0;
 }
 
 /**
- * A module which counts how many times an adunit was called
- * @module adunitCounter
+ * Returns current Adunit auctions counter
+ * @param {string} adunit id
+ * @returns {number} current adunit auctions count
  */
-let adunitCounter = {
-  incrementRequestsCounter,
-  incrementBidderRequestsCounter,
-  incrementBidderWinsCounter,
-  getRequestsCounter,
-  getBidderRequestsCounter,
-  getBidderWinsCounter
+export function getAuctionsCounter(adunit) {
+  return adUnits?.[adunit]?.auctionsCounter || 0;
 }
-
-export { adunitCounter };
diff --git a/src/adapterManager.js b/src/adapterManager.js
index 575d28b35fa..04bac6eb273 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -1,7 +1,6 @@
 /** @module adaptermanger */
 
 import {
-  deepAccess,
   deepClone,
   flatten,
   generateUUID,
@@ -10,6 +9,7 @@ import {
   getUniqueIdentifierStr,
   getUserConfiguredParams,
   groupBy,
+  internal,
   isArray,
   isPlainObject,
   isValidMediaTypes,
@@ -20,6 +20,7 @@ import {
   mergeDeep,
   shuffle,
   timestamp,
+  uniques,
 } from './utils.js';
 import {decorateAdUnitsWithNativeParams, nativeAdapters} from './native.js';
 import {newBidder} from './adapters/bidderFactory.js';
@@ -27,11 +28,20 @@ import {ajaxBuilder} from './ajax.js';
 import {config, RANDOM} from './config.js';
 import {hook} from './hook.js';
 import {find, includes} from './polyfill.js';
-import {adunitCounter} from './adUnits.js';
+import {
+  getAuctionsCounter,
+  getBidderRequestsCounter,
+  getBidderWinsCounter,
+  getRequestsCounter,
+  incrementAuctionsCounter,
+  incrementBidderRequestsCounter,
+  incrementBidderWinsCounter,
+  incrementRequestsCounter
+} from './adUnits.js';
 import {getRefererInfo} from './refererDetection.js';
 import {GDPR_GVLIDS, gdprDataHandler, gppDataHandler, uspDataHandler, } from './consentHandler.js';
 import * as events from './events.js';
-import CONSTANTS from './constants.json';
+import {EVENTS, S2S} from './constants.js';
 import {useMetrics} from './utils/perfMetrics.js';
 import {auctionManager} from './auctionManager.js';
 import {MODULE_TYPE_ANALYTICS, MODULE_TYPE_BIDDER, MODULE_TYPE_PREBID} from './activities/modules.js';
@@ -112,18 +122,25 @@ function getBids({bidderCode, auctionId, bidderRequestId, adUnits, src, metrics}
           );
         }
 
+        if (src === 'client') {
+          incrementBidderRequestsCounter(adUnit.code, bidderCode);
+        }
+
         bids.push(Object.assign({}, bid, {
           adUnitCode: adUnit.code,
           transactionId: adUnit.transactionId,
-          sizes: deepAccess(mediaTypes, 'banner.sizes') || deepAccess(mediaTypes, 'video.playerSize') || [],
+          adUnitId: adUnit.adUnitId,
+          sizes: mediaTypes?.banner?.sizes || mediaTypes?.video?.playerSize || [],
           bidId: bid.bid_id || getUniqueIdentifierStr(),
           bidderRequestId,
           auctionId,
           src,
           metrics,
-          bidRequestsCount: adunitCounter.getRequestsCounter(adUnit.code),
-          bidderRequestsCount: adunitCounter.getBidderRequestsCounter(adUnit.code, bid.bidder),
-          bidderWinsCount: adunitCounter.getBidderWinsCounter(adUnit.code, bid.bidder),
+          auctionsCount: getAuctionsCounter(adUnit.code),
+          bidRequestsCount: getRequestsCounter(adUnit.code),
+          bidderRequestsCount: getBidderRequestsCounter(adUnit.code, bid.bidder),
+          bidderWinsCount: getBidderWinsCounter(adUnit.code, bid.bidder),
+          deferBilling: !!adUnit.deferBilling
         }));
         return bids;
       }, [])
@@ -220,9 +237,11 @@ export function getS2SBidderSet(s2sConfigs) {
 }
 
 /**
- * @returns {{[PARTITIONS.CLIENT]: Array, [PARTITIONS.SERVER]: Array}}
- *           All the bidder codes in the given `adUnits`, divided in two arrays -
- *           those that should be routed to client, and server adapters (according to the configuration in `s2sConfigs`).
+ * @param {Array} adUnits - The ad units to be processed.
+ * @param {Object} s2sConfigs - The server-to-server configurations.
+ * @returns {Object} - An object containing arrays of bidder codes for client and server.
+ * @returns {Object} return.client - Array of bidder codes that should be routed to client adapters.
+ * @returns {Object} return.server - Array of bidder codes that should be routed to server adapters.
  */
 export function _partitionBidders (adUnits, s2sConfigs, {getS2SBidders = getS2SBidderSet} = {}) {
   const serverBidders = getS2SBidders(s2sConfigs);
@@ -241,10 +260,14 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
    * emit and pass adunits for external modification
    * @see {@link https://github.com/prebid/Prebid.js/issues/4149|Issue}
    */
-  events.emit(CONSTANTS.EVENTS.BEFORE_REQUEST_BIDS, adUnits);
+  events.emit(EVENTS.BEFORE_REQUEST_BIDS, adUnits);
   if (FEATURES.NATIVE) {
     decorateAdUnitsWithNativeParams(adUnits);
   }
+  adUnits
+    .map(adUnit => adUnit.code)
+    .filter(uniques)
+    .forEach(incrementAuctionsCounter);
 
   adUnits.forEach(au => {
     if (!isPlainObject(au.mediaTypes)) {
@@ -252,6 +275,7 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
     }
     // filter out bidders that cannot participate in the auction
     au.bids = au.bids.filter((bid) => !bid.bidder || dep.isAllowed(ACTIVITY_FETCH_BIDS, activityParams(MODULE_TYPE_BIDDER, bid.bidder)))
+    incrementRequestsCounter(au.code);
   });
 
   adUnits = setupAdUnitMediaTypes(adUnits, labels);
@@ -299,10 +323,10 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
           auctionId,
           bidderRequestId,
           uniquePbsTid,
-          bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsS2SCopy), src: CONSTANTS.S2S.SRC, metrics}),
+          bids: hookedGetBids({ bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsS2SCopy), src: S2S.SRC, metrics }),
           auctionStart: auctionStart,
           timeout: s2sConfig.timeout,
-          src: CONSTANTS.S2S.SRC,
+          src: S2S.SRC,
           refererInfo,
           metrics,
         }, s2sParams);
@@ -374,7 +398,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
   }
 
   let [clientBidderRequests, serverBidderRequests] = bidRequests.reduce((partitions, bidRequest) => {
-    partitions[Number(typeof bidRequest.src !== 'undefined' && bidRequest.src === CONSTANTS.S2S.SRC)].push(bidRequest);
+    partitions[Number(typeof bidRequest.src !== 'undefined' && bidRequest.src === S2S.SRC)].push(bidRequest);
     return partitions;
   }, [[], []]);
 
@@ -409,12 +433,14 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
       let uniqueServerRequests = serverBidderRequests.filter(serverBidRequest => serverBidRequest.uniquePbsTid === uniquePbsTid);
 
       if (s2sAdapter) {
-        let s2sBidRequest = {'ad_units': adUnitsS2SCopy, s2sConfig, ortb2Fragments};
+        let s2sBidRequest = {'ad_units': adUnitsS2SCopy, s2sConfig, ortb2Fragments, requestBidsTimeout};
         if (s2sBidRequest.ad_units.length) {
           let doneCbs = uniqueServerRequests.map(bidRequest => {
             bidRequest.start = timestamp();
-            return function () {
-              onTimelyResponse(bidRequest.bidderRequestId);
+            return function (timedOut) {
+              if (!timedOut) {
+                onTimelyResponse(bidRequest.bidderRequestId);
+              }
               doneCb.apply(bidRequest, arguments);
             }
           });
@@ -425,7 +451,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
           // fire BID_REQUESTED event for each s2s bidRequest
           uniqueServerRequests.forEach(bidRequest => {
             // add the new sourceTid
-            events.emit(CONSTANTS.EVENTS.BID_REQUESTED, {...bidRequest, tid: bidRequest.auctionId});
+            events.emit(EVENTS.BID_REQUESTED, { ...bidRequest, tid: bidRequest.auctionId });
           });
 
           // make bid requests
@@ -433,7 +459,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
             s2sBidRequest,
             serverBidderRequests,
             addBidResponse,
-            () => doneCbs.forEach(done => done()),
+            (timedOut) => doneCbs.forEach(done => done(timedOut)),
             s2sAjax
           );
         }
@@ -451,7 +477,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
     const adapter = _bidderRegistry[bidderRequest.bidderCode];
     config.runWithBidder(bidderRequest.bidderCode, () => {
       logMessage(`CALLING BIDDER`);
-      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidderRequest);
+      events.emit(EVENTS.BID_REQUESTED, bidderRequest);
     });
     let ajax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
       request: requestCallbacks.request.bind(null, bidderRequest.bidderCode),
@@ -538,11 +564,13 @@ adapterManager.aliasBidAdapter = function (bidderCode, alias, options) {
           newAdapter = new bidAdapter.constructor();
           newAdapter.setBidderCode(alias);
         } else {
+          const { useBaseGvlid = false } = options || {};
           let spec = bidAdapter.getSpec();
-          let gvlid = options && options.gvlid;
-          if (spec.gvlid != null && gvlid == null) {
+          const gvlid = useBaseGvlid ? spec.gvlid : options?.gvlid;
+          if (gvlid == null && spec.gvlid != null) {
             logWarn(`Alias '${alias}' will NOT re-use the GVL ID of the original adapter ('${spec.code}', gvlid: ${spec.gvlid}). Functionality that requires TCF consent may not work as expected.`)
           }
+
           let skipPbsAliasing = options && options.skipPbsAliasing;
           newAdapter = newBidder(Object.assign({}, spec, { code: alias, gvlid, skipPbsAliasing }));
           _aliasRegistry[alias] = bidderCode;
@@ -627,7 +655,7 @@ function invokeBidderMethod(bidder, method, spec, fn, ...params) {
 }
 
 function tryCallBidderMethod(bidder, method, param) {
-  if (param?.src !== CONSTANTS.S2S.SRC) {
+  if (param?.source !== S2S.SRC) {
     const target = getBidderMethod(bidder, method);
     if (target != null) {
       invokeBidderMethod(bidder, method, ...target, param);
@@ -652,13 +680,22 @@ adapterManager.callTimedOutBidders = function(adUnits, timedOutBidders, cbTimeou
 adapterManager.callBidWonBidder = function(bidder, bid, adUnits) {
   // Adding user configured params to bidWon event data
   bid.params = getUserConfiguredParams(adUnits, bid.adUnitCode, bid.bidder);
-  adunitCounter.incrementBidderWinsCounter(bid.adUnitCode, bid.bidder);
+  incrementBidderWinsCounter(bid.adUnitCode, bid.bidder);
   tryCallBidderMethod(bidder, 'onBidWon', bid);
 };
 
-adapterManager.callBidBillableBidder = function(bid) {
-  tryCallBidderMethod(bid.bidder, 'onBidBillable', bid);
-};
+adapterManager.triggerBilling = (() => {
+  const BILLED = new WeakSet();
+  return (bid) => {
+    if (!BILLED.has(bid)) {
+      BILLED.add(bid);
+      if (bid.source === S2S.SRC && bid.burl) {
+        internal.triggerPixel(bid.burl);
+      }
+      tryCallBidderMethod(bid.bidder, 'onBidBillable', bid);
+    }
+  }
+})();
 
 adapterManager.callSetTargetingBidder = function(bidder, bid) {
   tryCallBidderMethod(bidder, 'onSetTargeting', bid);
@@ -673,6 +710,10 @@ adapterManager.callBidderError = function(bidder, error, bidderRequest) {
   tryCallBidderMethod(bidder, 'onBidderError', param);
 };
 
+adapterManager.callAdRenderSucceededBidder = function (bidder, bid) {
+  tryCallBidderMethod(bidder, 'onAdRenderSucceeded', bid);
+}
+
 function resolveAlias(alias) {
   const seen = new Set();
   while (_aliasRegistry.hasOwnProperty(alias) && !seen.has(alias)) {
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index df97d820c96..e4829d76a1d 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -5,7 +5,7 @@ import {createBid} from '../bidfactory.js';
 import {userSync} from '../userSync.js';
 import {nativeBidIsValid} from '../native.js';
 import {isValidVideoBid} from '../video.js';
-import CONSTANTS from '../constants.json';
+import { EVENTS, STATUS, REJECTION_REASON } from '../constants.js';
 import * as events from '../events.js';
 import {includes} from '../polyfill.js';
 import {
@@ -27,6 +27,11 @@ import {activityParams} from '../activities/activityParams.js';
 import {MODULE_TYPE_BIDDER} from '../activities/modules.js';
 import {ACTIVITY_TRANSMIT_TID, ACTIVITY_TRANSMIT_UFPD} from '../activities/activities.js';
 
+/**
+ * @typedef {import('../mediaTypes.js').MediaType} MediaType
+ * @typedef {import('../Renderer.js').Renderer} Renderer
+ */
+
 /**
  * This file aims to support Adapters during the Prebid 0.x -> 1.x transition.
  *
@@ -57,7 +62,7 @@ import {ACTIVITY_TRANSMIT_TID, ACTIVITY_TRANSMIT_UFPD} from '../activities/activ
  * @property {string} code A code which will be used to uniquely identify this bidder. This should be the same
  *   one as is used in the call to registerBidAdapter
  * @property {string[]} [aliases] A list of aliases which should also resolve to this bidder.
- * @property {MediaType[]} [supportedMediaTypes]: A list of Media Types which the adapter supports.
+ * @property {MediaType[]} [supportedMediaTypes] A list of Media Types which the adapter supports.
  * @property {function(object): boolean} isBidRequestValid Determines whether or not the given bid has all the params
  *   needed to make a valid request.
  * @property {function(BidRequest[], bidderRequest): ServerRequest|ServerRequest[]} buildRequests Build the request to the Server
@@ -84,8 +89,8 @@ import {ACTIVITY_TRANSMIT_TID, ACTIVITY_TRANSMIT_UFPD} from '../activities/activ
 /**
  * @typedef {object} BidderAuctionResponse An object encapsulating an adapter response for current Auction
  *
- * @property {Array} bids Contextual bids returned by this adapter, if any
- * @property {object|null} fledgeAuctionConfigs Optional FLEDGE response, as a map of impid -> auction_config
+ * @property {Array} bids? Contextual bids returned by this adapter, if any
+ * @property {Array<{bidId: String, config: {}}>} paapiAuctionConfigs? Array of paapi auction configs, each scoped to a particular bidId
  */
 
 /**
@@ -105,7 +110,7 @@ import {ACTIVITY_TRANSMIT_TID, ACTIVITY_TRANSMIT_UFPD} from '../activities/activ
  *
  * @property {*} body The response body. If this is legal JSON, then it will be parsed. Otherwise it'll be a
  *   string with the body's content.
- * @property {{get: function(string): string} headers The response headers.
+ * @property {{get: function(string): string}} headers The response headers.
  *   Call this like `ServerResponse.headers.get("Content-Type")`
  */
 
@@ -126,7 +131,7 @@ import {ACTIVITY_TRANSMIT_TID, ACTIVITY_TRANSMIT_UFPD} from '../activities/activ
  * @property {object} [video] Object for storing video response data
  * @property {object} [meta] Object for storing bid meta data
  * @property {string} [meta.primaryCatId] The IAB primary category ID
- * @property [Renderer] renderer A Renderer which can be used as a default for this bid,
+ * @property {Renderer} renderer A Renderer which can be used as a default for this bid,
  *   if the publisher doesn't override it. This is only relevant for Outstream Video bids.
  */
 
@@ -185,7 +190,7 @@ export function registerBidder(spec) {
   }
 }
 
-export function guardTids(bidderCode) {
+export const guardTids = memoize(({bidderCode}) => {
   if (isActivityAllowed(ACTIVITY_TRANSMIT_TID, activityParams(MODULE_TYPE_BIDDER, bidderCode))) {
     return {
       bidRequest: (br) => br,
@@ -223,7 +228,7 @@ export function guardTids(bidderCode) {
       }
     })
   }
-}
+});
 
 /**
  * Make a new bidder from the given spec. This is exported mainly for testing.
@@ -241,7 +246,7 @@ export function newBidder(spec) {
       if (!Array.isArray(bidderRequest.bids)) {
         return;
       }
-      const tidGuard = guardTids(bidderRequest.bidderCode);
+      const tidGuard = guardTids(bidderRequest);
 
       const adUnitCodesHandled = {};
       function addBidWithCode(adUnitCode, bid) {
@@ -251,7 +256,7 @@ export function newBidder(spec) {
         if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnitCode, bid))) {
           addBidResponse(adUnitCode, bid);
         } else {
-          addBidResponse.reject(adUnitCode, bid, CONSTANTS.REJECTION_REASON.INVALID)
+          addBidResponse.reject(adUnitCode, bid, REJECTION_REASON.INVALID)
         }
       }
 
@@ -261,7 +266,7 @@ export function newBidder(spec) {
       function afterAllResponses() {
         done();
         config.runWithBidder(spec.code, () => {
-          events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest);
+          events.emit(EVENTS.BIDDER_DONE, bidderRequest);
           registerSyncs(responses, bidderRequest.gdprConsent, bidderRequest.uspConsent, bidderRequest.gppConsent);
         });
       }
@@ -282,27 +287,27 @@ export function newBidder(spec) {
         }
       });
 
-      processBidderRequests(spec, validBidRequests.map(tidGuard.bidRequest), tidGuard.bidderRequest(bidderRequest), ajax, configEnabledCallback, {
-        onRequest: requestObject => events.emit(CONSTANTS.EVENTS.BEFORE_BIDDER_HTTP, bidderRequest, requestObject),
+      processBidderRequests(spec, validBidRequests, bidderRequest, ajax, configEnabledCallback, {
+        onRequest: requestObject => events.emit(EVENTS.BEFORE_BIDDER_HTTP, bidderRequest, requestObject),
         onResponse: (resp) => {
           onTimelyResponse(spec.code);
           responses.push(resp)
         },
-        onFledgeAuctionConfigs: (fledgeAuctionConfigs) => {
-          fledgeAuctionConfigs.forEach((fledgeAuctionConfig) => {
-            const bidRequest = bidRequestMap[fledgeAuctionConfig.bidId];
-            if (bidRequest) {
-              addComponentAuction(bidRequest.auctionId, bidRequest.adUnitCode, fledgeAuctionConfig.config);
-            } else {
-              logWarn('Received fledge auction configuration for an unknown bidId', fledgeAuctionConfig);
-            }
-          });
+        onPaapi: (paapiConfig) => {
+          const bidRequest = bidRequestMap[paapiConfig.bidId];
+          if (bidRequest) {
+            addPaapiConfig(bidRequest, paapiConfig);
+          } else {
+            logWarn('Received fledge auction configuration for an unknown bidId', paapiConfig);
+          }
         },
         // If the server responds with an error, there's not much we can do beside logging.
         onError: (errorMessage, error) => {
-          onTimelyResponse(spec.code);
+          if (!error.timedOut) {
+            onTimelyResponse(spec.code);
+          }
           adapterManager.callBidderError(spec.code, error, bidderRequest)
-          events.emit(CONSTANTS.EVENTS.BIDDER_ERROR, { error, bidderRequest });
+          events.emit(EVENTS.BIDDER_ERROR, { error, bidderRequest });
           logError(`Server call for ${spec.code} failed: ${errorMessage} ${error.status}. Continuing without bids.`);
         },
         onBid: (bid) => {
@@ -311,18 +316,20 @@ export function newBidder(spec) {
             bid.adapterCode = bidRequest.bidder;
             if (isInvalidAlternateBidder(bid.bidderCode, bidRequest.bidder)) {
               logWarn(`${bid.bidderCode} is not a registered partner or known bidder of ${bidRequest.bidder}, hence continuing without bid. If you wish to support this bidder, please mark allowAlternateBidderCodes as true in bidderSettings.`);
-              addBidResponse.reject(bidRequest.adUnitCode, bid, CONSTANTS.REJECTION_REASON.BIDDER_DISALLOWED)
+              addBidResponse.reject(bidRequest.adUnitCode, bid, REJECTION_REASON.BIDDER_DISALLOWED)
               return;
             }
             // creating a copy of original values as cpm and currency are modified later
             bid.originalCpm = bid.cpm;
             bid.originalCurrency = bid.currency;
             bid.meta = bid.meta || Object.assign({}, bid[bidRequest.bidder]);
-            const prebidBid = Object.assign(createBid(CONSTANTS.STATUS.GOOD, bidRequest), bid, pick(bidRequest, TIDS));
+            bid.deferBilling = bidRequest.deferBilling;
+            bid.deferRendering = bid.deferBilling && (bid.deferRendering ?? typeof spec.onBidBillable !== 'function');
+            const prebidBid = Object.assign(createBid(STATUS.GOOD, bidRequest), bid, pick(bidRequest, TIDS));
             addBidWithCode(bidRequest.adUnitCode, prebidBid);
           } else {
             logWarn(`Bidder ${spec.code} made bid for unknown request ID: ${bid.requestId}. Ignoring.`);
-            addBidResponse.reject(null, bid, CONSTANTS.REJECTION_REASON.INVALID_REQUEST_ID);
+            addBidResponse.reject(null, bid, REJECTION_REASON.INVALID_REQUEST_ID);
           }
         },
         onCompletion: afterAllResponses,
@@ -356,6 +363,8 @@ export function newBidder(spec) {
   }
 }
 
+const RESPONSE_PROPS = ['bids', 'paapi']
+
 /**
  * Run a set of bid requests - that entails converting them to HTTP requests, sending
  * them over the network, and parsing the responses.
@@ -371,11 +380,11 @@ export function newBidder(spec) {
  * @param onBid {function({})} invoked once for each bid in the response - with the bid as returned by interpretResponse
  * @param onCompletion {function()} invoked once when all bid requests have been processed
  */
-export const processBidderRequests = hook('sync', function (spec, bids, bidderRequest, ajax, wrapCallback, {onRequest, onResponse, onFledgeAuctionConfigs, onError, onBid, onCompletion}) {
+export const processBidderRequests = hook('sync', function (spec, bids, bidderRequest, ajax, wrapCallback, {onRequest, onResponse, onPaapi, onError, onBid, onCompletion}) {
   const metrics = adapterMetrics(bidderRequest);
   onCompletion = metrics.startTiming('total').stopBefore(onCompletion);
-
-  let requests = metrics.measureTime('buildRequests', () => spec.buildRequests(bids, bidderRequest));
+  const tidGuard = guardTids(bidderRequest);
+  let requests = metrics.measureTime('buildRequests', () => spec.buildRequests(bids.map(tidGuard.bidRequest), tidGuard.bidderRequest(bidderRequest)));
 
   if (!requests || requests.length === 0) {
     onCompletion();
@@ -417,15 +426,21 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
         return;
       }
 
-      let bids;
-      // Extract additional data from a structured {BidderAuctionResponse} response
-      if (response && isArray(response.fledgeAuctionConfigs)) {
-        onFledgeAuctionConfigs(response.fledgeAuctionConfigs);
+      // adapters can reply with:
+      // a single bid
+      // an array of bids
+      // a BidderAuctionResponse object
+
+      let bids, paapiConfigs;
+      if (response && !Object.keys(response).some(key => !RESPONSE_PROPS.includes(key))) {
         bids = response.bids;
+        paapiConfigs = response.paapi;
       } else {
         bids = response;
       }
-
+      if (isArray(paapiConfigs)) {
+        paapiConfigs.forEach(onPaapi);
+      }
       if (bids) {
         if (isArray(bids)) {
           bids.forEach(addBid);
@@ -457,7 +472,7 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
       return Object.assign(defaults, ro, {
         browsingTopics: ro?.hasOwnProperty('browsingTopics') && !ro.browsingTopics
           ? false
-          : isActivityAllowed(ACTIVITY_TRANSMIT_UFPD, activityParams(MODULE_TYPE_BIDDER, spec.code))
+          : (bidderSettings.get(spec.code, 'topicsHeader') ?? true) && isActivityAllowed(ACTIVITY_TRANSMIT_UFPD, activityParams(MODULE_TYPE_BIDDER, spec.code))
       })
     }
     switch (request.method) {
@@ -525,8 +540,8 @@ export const registerSyncInner = hook('async', function(spec, responses, gdprCon
   }
 }, 'registerSyncs')
 
-export const addComponentAuction = hook('sync', (adUnitCode, fledgeAuctionConfig) => {
-}, 'addComponentAuction');
+export const addPaapiConfig = hook('sync', (request, paapiConfig) => {
+}, 'addPaapiConfig');
 
 // check that the bid has a width and height set
 function validBidSize(adUnitCode, bid, {index = auctionManager.index} = {}) {
@@ -596,6 +611,6 @@ export function isValid(adUnitCode, bid, {index = auctionManager.index} = {}) {
   return true;
 }
 
-function adapterMetrics(bidderRequest) {
+export function adapterMetrics(bidderRequest) {
   return useMetrics(bidderRequest.metrics).renameWith(n => [`adapter.client.${n}`, `adapters.client.${bidderRequest.bidderCode}.${n}`])
 }
diff --git a/src/adloader.js b/src/adloader.js
index a87b930b7df..bf695dd627b 100644
--- a/src/adloader.js
+++ b/src/adloader.js
@@ -1,44 +1,64 @@
-import {includes} from './polyfill.js';
-import { logError, logWarn, insertElement, setScriptAttributes } from './utils.js';
+import { LOAD_EXTERNAL_SCRIPT } from './activities/activities.js';
+import { activityParams } from './activities/activityParams.js';
+import { isActivityAllowed } from './activities/rules.js';
+import { includes } from './polyfill.js';
+import { insertElement, logError, logWarn, setScriptAttributes } from './utils.js';
 
 const _requestCache = new WeakMap();
 // The below list contains modules or vendors whom Prebid allows to load external JS.
 const _approvedLoadExternalJSList = [
+  // Prebid maintained modules:
   'debugging',
-  'adloox',
-  'criteo',
   'outstream',
-  'adagio',
-  'spotx',
-  'browsi',
-  'brandmetrics',
-  'justtag',
-  'tncId',
-  'akamaidap',
-  'ftrackId',
-  'inskin',
-  'hadron',
-  'medianet',
+  // Bid Modules - only exception is on rendering edge cases, to clean up in Prebid 10:
   'improvedigital',
+  'showheroes-bs',
+  // RTD modules:
   'aaxBlockmeter',
-  'confiant',
+  'adagio',
+  'adloox',
+  'akamaidap',
   'arcspan',
   'airgrid',
+  'browsi',
+  'brandmetrics',
   'clean.io',
+  'humansecurity',
+  'confiant',
+  'contxtful',
+  'hadron',
+  'mediafilter',
+  'medianet',
+  'azerionedge',
   'a1Media',
   'geoedge',
-]
+  'qortex',
+  'dynamicAdBoost',
+  '51Degrees',
+  'symitridap',
+  'wurfl',
+  // UserId Submodules
+  'justtag',
+  'tncId',
+  'ftrackId',
+  'id5',
+];
 
 /**
  * Loads external javascript. Can only be used if external JS is approved by Prebid. See https://github.com/prebid/prebid-js-external-js-template#policy
  * Each unique URL will be loaded at most 1 time.
  * @param {string} url the url to load
+ * @param {string} moduleType moduleType of the module requesting this resource
  * @param {string} moduleCode bidderCode or module code of the module requesting this resource
  * @param {function} [callback] callback function to be called after the script is loaded
  * @param {Document} [doc] the context document, in which the script will be loaded, defaults to loaded document
- * @param {object} an object of attributes to be added to the script with setAttribute by [key] and [value]; Only the attributes passed in the first request of a url will be added.
+ * @param {object} attributes an object of attributes to be added to the script with setAttribute by [key] and [value]; Only the attributes passed in the first request of a url will be added.
  */
-export function loadExternalScript(url, moduleCode, callback, doc, attributes) {
+export function loadExternalScript(url, moduleType, moduleCode, callback, doc, attributes) {
+  if (!isActivityAllowed(LOAD_EXTERNAL_SCRIPT, activityParams(moduleType, moduleCode))) {
+    return;
+  }
+
   if (!moduleCode || !url) {
     logError('cannot load external script without url and moduleCode');
     return;
diff --git a/src/ajax.js b/src/ajax.js
index 0601cc0e22b..0178f95eadf 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -47,10 +47,17 @@ export function toFetchRequest(url, data, options = {}) {
   if (options.withCredentials) {
     rqOpts.credentials = 'include';
   }
-  if (options.browsingTopics && isSecureContext) {
-    // the Request constructor will throw an exception if the browser supports topics
-    // but we're not in a secure context
-    rqOpts.browsingTopics = true;
+  if (isSecureContext) {
+    ['browsingTopics', 'adAuctionHeaders'].forEach(opt => {
+      // the Request constructor will throw an exception if the browser supports topics/fledge
+      // but we're not in a secure context
+      if (options[opt]) {
+        rqOpts[opt] = true;
+      }
+    })
+  }
+  if (options.keepalive) {
+    rqOpts.keepalive = true;
   }
   return dep.makeRequest(url, rqOpts);
 }
@@ -89,7 +96,19 @@ export function fetcherFactory(timeout = 3000, {request, done} = {}) {
 
 function toXHR({status, statusText = '', headers, url}, responseText) {
   let xml = 0;
+  function getXML(onError) {
+    if (xml === 0) {
+      try {
+        xml = new DOMParser().parseFromString(responseText, headers?.get(CTYPE)?.split(';')?.[0])
+      } catch (e) {
+        xml = null;
+        onError && onError(e)
+      }
+    }
+    return xml;
+  }
   return {
+    // eslint-disable-next-line prebid/no-global
     readyState: XMLHttpRequest.DONE,
     status,
     statusText,
@@ -98,17 +117,13 @@ function toXHR({status, statusText = '', headers, url}, responseText) {
     responseType: '',
     responseURL: url,
     get responseXML() {
-      if (xml === 0) {
-        try {
-          xml = new DOMParser().parseFromString(responseText, headers?.get(CTYPE)?.split(';')?.[0])
-        } catch (e) {
-          xml = null;
-          logError(e);
-        }
-      }
-      return xml;
+      return getXML(logError);
     },
     getResponseHeader: (header) => headers?.has(header) ? headers.get(header) : null,
+    toJSON() {
+      return Object.assign({responseXML: getXML()}, this)
+    },
+    timedOut: false
   }
 }
 
@@ -120,11 +135,14 @@ export function attachCallbacks(fetchPm, callback) {
     success: typeof callback === 'function' ? callback : () => null,
     error: (e, x) => logError('Network error', e, x)
   };
-  fetchPm.then(response => response.text().then((responseText) => [response, responseText]))
+  return fetchPm.then(response => response.text().then((responseText) => [response, responseText]))
     .then(([response, responseText]) => {
       const xhr = toXHR(response, responseText);
       response.ok || response.status === 304 ? success(responseText, xhr) : error(response.statusText, xhr);
-    }, () => error('', toXHR({status: 0}, '')));
+    }, (reason) => error('', Object.assign(
+      toXHR({status: 0}, ''),
+      {reason, timedOut: reason?.name === 'AbortError'}))
+    );
 }
 
 export function ajaxBuilder(timeout = 3000, {request, done} = {}) {
@@ -134,5 +152,19 @@ export function ajaxBuilder(timeout = 3000, {request, done} = {}) {
   };
 }
 
+/**
+ * simple wrapper around sendBeacon such that invocations of navigator.sendBeacon can be centrally maintained.
+ * verifies that the navigator and sendBeacon are defined for maximum compatibility
+ * @param {string} url The URL that will receive the data. Can be relative or absolute.
+ * @param {*} data An ArrayBuffer, a TypedArray, a DataView, a Blob, a string literal or object, a FormData or a URLSearchParams object containing the data to send.
+ * @returns {boolean} true if the user agent successfully queued the data for transfer. Otherwise, it returns false.
+ */
+export function sendBeacon(url, data) {
+  if (!window.navigator || !window.navigator.sendBeacon) {
+    return false;
+  }
+  return window.navigator.sendBeacon(url, data);
+}
+
 export const ajax = ajaxBuilder();
 export const fetch = fetcherFactory();
diff --git a/src/auction.js b/src/auction.js
index 4bdd590f7ea..3945e0bfe53 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -9,14 +9,21 @@
  */
 
 /**
-  * @typedef {Object} AdUnit An object containing the adUnit configuration.
-  *
-  * @property {string} code A code which will be used to uniquely identify this bidder. This should be the same
-  *   one as is used in the call to registerBidAdapter
-  * @property {Array.} sizes A list of size for adUnit.
-  * @property {object} params Any bidder-specific params which the publisher used in their bid request.
-  *   This is guaranteed to have passed the spec.areParamsValid() test.
-  */
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ * @typedef {import('../src/config.js').MediaTypePriceGranularity} MediaTypePriceGranularity
+ * @typedef {import('../src/mediaTypes.js').MediaType} MediaType
+ */
+
+/**
+ * @typedef {Object} AdUnit An object containing the adUnit configuration.
+ *
+ * @property {string} code A code which will be used to uniquely identify this bidder. This should be the same
+ *   one as is used in the call to registerBidAdapter
+ * @property {Array.} sizes A list of size for adUnit.
+ * @property {object} params Any bidder-specific params which the publisher used in their bid request.
+ *   This is guaranteed to have passed the spec.areParamsValid() test.
+ */
 
 /**
  * @typedef {Array.} size
@@ -38,6 +45,7 @@
  * @property {refererInfo} refererInfo - referer info object
  * @property {string} [tid] - random UUID (used for s2s)
  * @property {string} [src] - s2s or client (used for s2s)
+ * @property {import('./types/ortb2.js').Ortb2.BidRequest} [ortb2] Global (not specific to any adUnit) first party data to use for all requests in this auction.
  */
 
 /**
@@ -58,9 +66,7 @@
  */
 
 import {
-  deepAccess,
   generateUUID,
-  getValue,
   isEmpty,
   isEmptyStr,
   isFn,
@@ -72,8 +78,8 @@ import {
   timestamp
 } from './utils.js';
 import {getPriceBucketString} from './cpmBucketManager.js';
-import {getNativeTargeting, toLegacyResponse} from './native.js';
-import {getCacheUrl, store} from './videoCache.js';
+import {getNativeTargeting, isNativeResponse, setNativeResponseProperties} from './native.js';
+import {batchAndStore} from './videoCache.js';
 import {Renderer} from './Renderer.js';
 import {config} from './config.js';
 import {userSync} from './userSync.js';
@@ -85,11 +91,13 @@ import {auctionManager} from './auctionManager.js';
 import {bidderSettings} from './bidderSettings.js';
 import * as events from './events.js';
 import adapterManager from './adapterManager.js';
-import CONSTANTS from './constants.json';
+import {EVENTS, GRANULARITY_OPTIONS, JSON_MAPPING, REJECTION_REASON, S2S, TARGETING_KEYS} from './constants.js';
 import {defer, GreedyPromise} from './utils/promise.js';
 import {useMetrics} from './utils/perfMetrics.js';
 import {adjustCpm} from './utils/cpm.js';
 import {getGlobal} from './prebidGlobal.js';
+import {ttlCollection} from './utils/ttlCollection.js';
+import {getMinBidCacheTTL, onMinBidCacheTTLChange} from './bidTTL.js';
 
 const { syncUsers } = userSync;
 
@@ -98,7 +106,7 @@ export const AUCTION_IN_PROGRESS = 'inProgress';
 export const AUCTION_COMPLETED = 'completed';
 
 // register event for bid adjustment
-events.on(CONSTANTS.EVENTS.BID_ADJUSTMENT, function (bid) {
+events.on(EVENTS.BID_ADJUSTMENT, function (bid) {
   adjustBids(bid);
 });
 
@@ -118,19 +126,20 @@ export function resetAuctionState() {
 }
 
 /**
-  * Creates new auction instance
-  *
-  * @param {Object} requestConfig
-  * @param {AdUnit} requestConfig.adUnits
-  * @param {AdUnitCode} requestConfig.adUnitCodes
-  * @param {function():void} requestConfig.callback
-  * @param {number} requestConfig.cbTimeout
-  * @param {Array.} requestConfig.labels
-  * @param {string} requestConfig.auctionId
-  * @param {{global: {}, bidder: {}}} ortb2Fragments first party data, separated into global
-  *    (from getConfig('ortb2') + requestBids({ortb2})) and bidder (a map from bidderCode to ortb2)
-  * @returns {Auction} auction instance
-  */
+ * Creates new auction instance
+ *
+ * @param {Object} requestConfig
+ * @param {AdUnit} requestConfig.adUnits
+ * @param {AdUnitCode} requestConfig.adUnitCodes
+ * @param {function():void} requestConfig.callback
+ * @param {number} requestConfig.cbTimeout
+ * @param {Array.} requestConfig.labels
+ * @param {string} requestConfig.auctionId
+ * @param {{global: {}, bidder: {}}} requestConfig.ortb2Fragments first party data, separated into global
+ *    (from getConfig('ortb2') + requestBids({ortb2})) and bidder (a map from bidderCode to ortb2)
+ * @param {Object} requestConfig.metrics
+ * @returns {Auction} auction instance
+ */
 export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, auctionId, ortb2Fragments, metrics}) {
   metrics = useMetrics(metrics);
   const _adUnits = adUnits;
@@ -140,10 +149,14 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
   const _timeout = cbTimeout;
   const _timelyRequests = new Set();
   const done = defer();
+  const requestsDone = defer();
   let _bidsRejected = [];
   let _callback = callback;
   let _bidderRequests = [];
-  let _bidsReceived = [];
+  let _bidsReceived = ttlCollection({
+    startTime: (bid) => bid.responseTimestamp,
+    ttl: (bid) => getMinBidCacheTTL() == null ? null : Math.max(getMinBidCacheTTL(), bid.ttl) * 1000
+  });
   let _noBids = [];
   let _winningBids = [];
   let _auctionStart;
@@ -152,8 +165,10 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
   let _auctionStatus;
   let _nonBids = [];
 
+  onMinBidCacheTTLChange(() => _bidsReceived.refresh());
+
   function addBidRequests(bidderRequests) { _bidderRequests = _bidderRequests.concat(bidderRequests); }
-  function addBidReceived(bidsReceived) { _bidsReceived = _bidsReceived.concat(bidsReceived); }
+  function addBidReceived(bid) { _bidsReceived.add(bid); }
   function addBidRejected(bidsRejected) { _bidsRejected = _bidsRejected.concat(bidsRejected); }
   function addNoBid(noBid) { _noBids = _noBids.concat(noBid); }
   function addNonBids(seatnonbids) { _nonBids = _nonBids.concat(seatnonbids); }
@@ -169,7 +184,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
       labels: _labels,
       bidderRequests: _bidderRequests,
       noBids: _noBids,
-      bidsReceived: _bidsReceived,
+      bidsReceived: _bidsReceived.toArray(),
       bidsRejected: _bidsRejected,
       winningBids: _winningBids,
       timeout: _timeout,
@@ -185,6 +200,8 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
   function executeCallback(timedOut) {
     if (!timedOut) {
       clearTimeout(_timeoutTimer);
+    } else {
+      events.emit(EVENTS.AUCTION_TIMEOUT, getProperties());
     }
     if (_auctionEnd === undefined) {
       let timedOutRequests = [];
@@ -192,7 +209,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
         logMessage(`Auction ${_auctionId} timedOut`);
         timedOutRequests = _bidderRequests.filter(rq => !_timelyRequests.has(rq.bidderRequestId)).flatMap(br => br.bids)
         if (timedOutRequests.length) {
-          events.emit(CONSTANTS.EVENTS.BID_TIMEOUT, timedOutRequests);
+          events.emit(EVENTS.BID_TIMEOUT, timedOutRequests);
         }
       }
 
@@ -203,11 +220,11 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
       metrics.timeBetween('callBids', 'auctionEnd', 'requestBids.callBids');
       done.resolve();
 
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, getProperties());
+      events.emit(EVENTS.AUCTION_END, getProperties());
       bidsBackCallback(_adUnits, function () {
         try {
           if (_callback != null) {
-            const bids = _bidsReceived
+            const bids = _bidsReceived.toArray()
               .filter(bid => _adUnitCodes.includes(bid.adUnitCode))
               .reduce(groupByPlacement, {});
             _callback.apply(pbjsInstance, [bids, timedOut, _auctionId]);
@@ -234,7 +251,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
   function auctionDone() {
     config.resetBidder();
     // when all bidders have called done callback atleast once it means auction is complete
-    logInfo(`Bids Received for Auction with id: ${_auctionId}`, _bidsReceived);
+    logInfo(`Bids Received for Auction with id: ${_auctionId}`, _bidsReceived.toArray());
     _auctionStatus = AUCTION_COMPLETED;
     executeCallback(false);
   }
@@ -281,7 +298,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
 
         _auctionStatus = AUCTION_IN_PROGRESS;
 
-        events.emit(CONSTANTS.EVENTS.AUCTION_INIT, getProperties());
+        events.emit(EVENTS.AUCTION_INIT, getProperties());
 
         let callbacks = auctionCallbacks(auctionDone, this);
         adapterManager.callBids(_adUnits, bidRequests, callbacks.addBidResponse, callbacks.adapterDone, {
@@ -308,6 +325,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
             }
           }
         }, _timeout, onTimelyResponse, ortb2Fragments);
+        requestsDone.resolve();
       }
     };
 
@@ -323,7 +341,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
 
       call.bidRequests.some(bidRequest => {
         let requests = 1;
-        let source = (typeof bidRequest.src !== 'undefined' && bidRequest.src === CONSTANTS.S2S.SRC) ? 's2s'
+        let source = (typeof bidRequest.src !== 'undefined' && bidRequest.src === S2S.SRC) ? 's2s'
           : bidRequest.bidderCode;
         // if we have no previous info on this source just let them through
         if (sourceInfo[source]) {
@@ -358,17 +376,18 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
   }
 
   function addWinningBid(winningBid) {
-    const winningAd = adUnits.find(adUnit => adUnit.transactionId === winningBid.transactionId);
     _winningBids = _winningBids.concat(winningBid);
     adapterManager.callBidWonBidder(winningBid.adapterCode || winningBid.bidder, winningBid, adUnits);
-    if (winningAd && !winningAd.deferBilling) adapterManager.callBidBillableBidder(winningBid);
+    if (!winningBid.deferBilling) {
+      adapterManager.triggerBilling(winningBid)
+    }
   }
 
   function setBidTargeting(bid) {
     adapterManager.callSetTargetingBidder(bid.adapterCode || bid.bidder, bid);
   }
 
-  events.on(CONSTANTS.EVENTS.SEAT_NON_BID, (event) => {
+  events.on(EVENTS.SEAT_NON_BID, (event) => {
     if (event.auctionId === _auctionId) {
       addNonBids(event.seatnonbid)
     }
@@ -390,26 +409,40 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
     getAdUnits: () => _adUnits,
     getAdUnitCodes: () => _adUnitCodes,
     getBidRequests: () => _bidderRequests,
-    getBidsReceived: () => _bidsReceived,
+    getBidsReceived: () => _bidsReceived.toArray(),
     getNoBids: () => _noBids,
     getNonBids: () => _nonBids,
     getFPD: () => ortb2Fragments,
     getMetrics: () => metrics,
-    end: done.promise
+    end: done.promise,
+    requestsDone: requestsDone.promise
   };
 }
 
 /**
  * Hook into this to intercept bids before they are added to an auction.
  *
+ * @type {Function}
  * @param adUnitCode
  * @param bid
- * @param {function(String)} reject: a function that, when called, rejects `bid` with the given reason.
+ * @param {function(String): void} reject a function that, when called, rejects `bid` with the given reason.
  */
 export const addBidResponse = hook('sync', function(adUnitCode, bid, reject) {
-  this.dispatch.call(null, adUnitCode, bid);
+  if (!isValidPrice(bid)) {
+    reject(REJECTION_REASON.PRICE_TOO_HIGH)
+  } else {
+    this.dispatch.call(null, adUnitCode, bid);
+  }
 }, 'addBidResponse');
 
+/**
+ * Delay hook for adapter responses.
+ *
+ * `ready` is a promise; auctions wait for it to resolve before closing. Modules can hook into this
+ * to delay the end of auctions while they perform initialization that does not need to delay their start.
+ */
+export const responsesReady = hook('sync', (ready) => ready, 'responsesReady');
+
 export const addBidderRequests = hook('sync', function(bidderRequests) {
   this.dispatch.call(this.context, bidderRequests);
 }, 'addBidderRequests');
@@ -425,32 +458,6 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
   let allAdapterCalledDone = false;
   let bidderRequestsDone = new Set();
   let bidResponseMap = {};
-  const ready = {};
-
-  function waitFor(requestId, result) {
-    if (ready[requestId] == null) {
-      ready[requestId] = GreedyPromise.resolve();
-    }
-    ready[requestId] = ready[requestId].then(() => GreedyPromise.resolve(result).catch(() => {}))
-  }
-
-  function guard(bidderRequest, fn) {
-    let timeout = bidderRequest.timeout;
-    if (timeout == null || timeout > auctionInstance.getTimeout()) {
-      timeout = auctionInstance.getTimeout();
-    }
-    const timeRemaining = auctionInstance.getAuctionStart() + timeout - Date.now();
-    const wait = ready[bidderRequest.bidderRequestId];
-    const orphanWait = ready['']; // also wait for "orphan" responses that are not associated with any request
-    if ((wait != null || orphanWait != null) && timeRemaining > 0) {
-      GreedyPromise.race([
-        GreedyPromise.timeout(timeRemaining),
-        GreedyPromise.resolve(orphanWait).then(() => wait)
-      ]).then(fn);
-    } else {
-      fn();
-    }
-  }
 
   function afterBidAdded() {
     outstandingBidsAdded--;
@@ -469,14 +476,12 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
   function acceptBidResponse(adUnitCode, bid) {
     handleBidResponse(adUnitCode, bid, (done) => {
       let bidResponse = getPreparedBidForAuction(bid);
-
+      events.emit(EVENTS.BID_ACCEPTED, bidResponse);
       if (FEATURES.VIDEO && bidResponse.mediaType === VIDEO) {
         tryAddVideoBid(auctionInstance, bidResponse, done);
       } else {
-        if (FEATURES.NATIVE && bidResponse.native != null && typeof bidResponse.native === 'object') {
-          // NOTE: augment bidResponse.native even if bidResponse.mediaType !== NATIVE; it's possible
-          // to treat banner responses as native
-          addLegacyFieldsIfNeeded(bidResponse);
+        if (FEATURES.NATIVE && isNativeResponse(bidResponse)) {
+          setNativeResponseProperties(bidResponse, index.getAdUnit(bidResponse));
         }
         addBidToAuction(auctionInstance, bidResponse);
         done();
@@ -488,7 +493,7 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
     return handleBidResponse(adUnitCode, bid, (done) => {
       bid.rejectionReason = reason;
       logWarn(`Bid from ${bid.bidder || 'unknown bidder'} was rejected: ${reason}`, bid)
-      events.emit(CONSTANTS.EVENTS.BID_REJECTED, bid);
+      events.emit(EVENTS.BID_REJECTED, bid);
       auctionInstance.addBidRejected(bid);
       done();
     })
@@ -513,7 +518,7 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
     bidderRequest.bids.forEach(bid => {
       if (!bidResponseMap[bid.bidId]) {
         auctionInstance.addNoBid(bid);
-        events.emit(CONSTANTS.EVENTS.NO_BID, bid);
+        events.emit(EVENTS.NO_BID, bid);
       }
     });
 
@@ -525,8 +530,7 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
   return {
     addBidResponse: (function () {
       function addBid(adUnitCode, bid) {
-        const bidderRequest = index.getBidderRequest(bid);
-        waitFor((bidderRequest && bidderRequest.bidderRequestId) || '', addBidResponse.call({
+        addBidResponse.call({
           dispatch: acceptBidResponse,
         }, adUnitCode, bid, (() => {
           let rejected = false;
@@ -536,13 +540,13 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
               rejected = true;
             }
           }
-        })()));
+        })())
       }
       addBid.reject = rejectBidResponse;
       return addBid;
     })(),
     adapterDone: function () {
-      guard(this, adapterDone.bind(this))
+      responsesReady(GreedyPromise.resolve()).finally(() => adapterDone.call(this));
     }
   }
 }
@@ -553,20 +557,19 @@ export function addBidToAuction(auctionInstance, bidResponse) {
 
   useMetrics(bidResponse.metrics).timeSince('addBidResponse', 'addBidResponse.total');
   auctionInstance.addBidReceived(bidResponse);
-  events.emit(CONSTANTS.EVENTS.BID_RESPONSE, bidResponse);
+  events.emit(EVENTS.BID_RESPONSE, bidResponse);
 }
 
 // Video bids may fail if the cache is down, or there's trouble on the network.
 function tryAddVideoBid(auctionInstance, bidResponse, afterBidAdded, {index = auctionManager.index} = {}) {
   let addBid = true;
 
-  const videoMediaType = deepAccess(
-    index.getMediaTypes({
-      requestId: bidResponse.originalRequestId || bidResponse.requestId,
-      transactionId: bidResponse.transactionId
-    }), 'video');
-  const context = videoMediaType && deepAccess(videoMediaType, 'context');
-  const useCacheKey = videoMediaType && deepAccess(videoMediaType, 'useCacheKey');
+  const videoMediaType = index.getMediaTypes({
+    requestId: bidResponse.originalRequestId || bidResponse.requestId,
+    adUnitId: bidResponse.adUnitId
+  })?.video;
+  const context = videoMediaType && videoMediaType?.context;
+  const useCacheKey = videoMediaType && videoMediaType?.useCacheKey;
 
   if (config.getConfig('cache.url') && (useCacheKey || context !== OUTSTREAM)) {
     if (!bidResponse.videoCacheKey || config.getConfig('cache.ignoreBidderCacheKey')) {
@@ -583,79 +586,10 @@ function tryAddVideoBid(auctionInstance, bidResponse, afterBidAdded, {index = au
   }
 }
 
-// Native bid response might be in ortb2 format - adds legacy field for backward compatibility
-const addLegacyFieldsIfNeeded = (bidResponse) => {
-  const nativeOrtbRequest = auctionManager.index.getAdUnit(bidResponse)?.nativeOrtbRequest;
-  const nativeOrtbResponse = bidResponse.native?.ortb
-
-  if (nativeOrtbRequest && nativeOrtbResponse) {
-    const legacyResponse = toLegacyResponse(nativeOrtbResponse, nativeOrtbRequest);
-    Object.assign(bidResponse.native, legacyResponse);
-  }
-}
-
-const _storeInCache = (batch) => {
-  store(batch.map(entry => entry.bidResponse), function (error, cacheIds) {
-    cacheIds.forEach((cacheId, i) => {
-      const { auctionInstance, bidResponse, afterBidAdded } = batch[i];
-      if (error) {
-        logWarn(`Failed to save to the video cache: ${error}. Video bid must be discarded.`);
-      } else {
-        if (cacheId.uuid === '') {
-          logWarn(`Supplied video cache key was already in use by Prebid Cache; caching attempt was rejected. Video bid must be discarded.`);
-        } else {
-          bidResponse.videoCacheKey = cacheId.uuid;
-          if (!bidResponse.vastUrl) {
-            bidResponse.vastUrl = getCacheUrl(bidResponse.videoCacheKey);
-          }
-          addBidToAuction(auctionInstance, bidResponse);
-          afterBidAdded();
-        }
-      }
-    });
-  });
-};
-
-const storeInCache = FEATURES.VIDEO ? _storeInCache : () => {};
-
-let batchSize, batchTimeout;
-config.getConfig('cache', (cacheConfig) => {
-  batchSize = typeof cacheConfig.cache.batchSize === 'number' && cacheConfig.cache.batchSize > 0
-    ? cacheConfig.cache.batchSize
-    : 1;
-  batchTimeout = typeof cacheConfig.cache.batchTimeout === 'number' && cacheConfig.cache.batchTimeout > 0
-    ? cacheConfig.cache.batchTimeout
-    : 0;
-});
-
-export const batchingCache = (timeout = setTimeout, cache = storeInCache) => {
-  let batches = [[]];
-  let debouncing = false;
-  const noTimeout = cb => cb();
-
-  return function(auctionInstance, bidResponse, afterBidAdded) {
-    const batchFunc = batchTimeout > 0 ? timeout : noTimeout;
-    if (batches[batches.length - 1].length >= batchSize) {
-      batches.push([]);
-    }
-
-    batches[batches.length - 1].push({auctionInstance, bidResponse, afterBidAdded});
-
-    if (!debouncing) {
-      debouncing = true;
-      batchFunc(() => {
-        batches.forEach(cache);
-        batches = [[]];
-        debouncing = false;
-      }, batchTimeout);
-    }
-  }
-};
-
-const batchAndStore = batchingCache();
-
 export const callPrebidCache = hook('async', function(auctionInstance, bidResponse, afterBidAdded, videoMediaType) {
-  batchAndStore(auctionInstance, bidResponse, afterBidAdded);
+  if (FEATURES.VIDEO) {
+    batchAndStore(auctionInstance, bidResponse, afterBidAdded);
+  }
 }, 'callPrebidCache');
 
 /**
@@ -690,7 +624,7 @@ function getPreparedBidForAuction(bid, {index = auctionManager.index} = {}) {
   //
   // CAREFUL: Publishers rely on certain bid properties to be available (like cpm),
   // but others to not be set yet (like priceStrings). See #1372 and #1389.
-  events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, bid);
+  events.emit(EVENTS.BID_ADJUSTMENT, bid);
 
   // a publisher-defined renderer can be used to render bids
   const bidRenderer = index.getBidRequest(bid)?.renderer || index.getAdUnit(bid).renderer;
@@ -705,15 +639,15 @@ function getPreparedBidForAuction(bid, {index = auctionManager.index} = {}) {
   var renderer = null;
 
   // the renderer for the mediaType takes precendence
-  if (mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render && !(mediaTypeRenderer.backupOnly === true && bid.renderer)) {
+  if (mediaTypeRenderer && mediaTypeRenderer.render && !(mediaTypeRenderer.backupOnly === true && bid.renderer)) {
     renderer = mediaTypeRenderer;
-  } else if (bidRenderer && bidRenderer.url && bidRenderer.render && !(bidRenderer.backupOnly === true && bid.renderer)) {
+  } else if (bidRenderer && bidRenderer.render && !(bidRenderer.backupOnly === true && bid.renderer)) {
     renderer = bidRenderer;
   }
 
   if (renderer) {
     // be aware, an adapter could already have installed the bidder, in which case this overwrite's the existing adapter
-    bid.renderer = Renderer.install({ url: renderer.url, config: renderer.options });// rename options to config, to make it consistent?
+    bid.renderer = Renderer.install({ url: renderer.url, config: renderer.options, renderNow: renderer.url == null });// rename options to config, to make it consistent?
     bid.renderer.setRender(renderer.render);
   }
 
@@ -754,7 +688,7 @@ function setupBidTargeting(bidObject) {
 export function getMediaTypeGranularity(mediaType, mediaTypes, mediaTypePriceGranularity) {
   if (mediaType && mediaTypePriceGranularity) {
     if (FEATURES.VIDEO && mediaType === VIDEO) {
-      const context = deepAccess(mediaTypes, `${VIDEO}.context`, 'instream');
+      const context = mediaTypes?.[VIDEO]?.context ?? 'instream';
       if (mediaTypePriceGranularity[`${VIDEO}-${context}`]) {
         return mediaTypePriceGranularity[`${VIDEO}-${context}`];
       }
@@ -765,8 +699,9 @@ export function getMediaTypeGranularity(mediaType, mediaTypes, mediaTypePriceGra
 
 /**
  * This function returns the price granularity defined. It can be either publisher defined or default value
- * @param bid bid response object
- * @param index
+ * @param {Bid} bid bid response object
+ * @param {object} obj
+ * @param {object} obj.index
  * @returns {string} granularity
  */
 export const getPriceGranularity = (bid, {index = auctionManager.index} = {}) => {
@@ -784,17 +719,17 @@ export const getPriceGranularity = (bid, {index = auctionManager.index} = {}) =>
 export const getPriceByGranularity = (granularity) => {
   return (bid) => {
     const bidGranularity = granularity || getPriceGranularity(bid);
-    if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.AUTO) {
+    if (bidGranularity === GRANULARITY_OPTIONS.AUTO) {
       return bid.pbAg;
-    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.DENSE) {
+    } else if (bidGranularity === GRANULARITY_OPTIONS.DENSE) {
       return bid.pbDg;
-    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.LOW) {
+    } else if (bidGranularity === GRANULARITY_OPTIONS.LOW) {
       return bid.pbLg;
-    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.MEDIUM) {
+    } else if (bidGranularity === GRANULARITY_OPTIONS.MEDIUM) {
       return bid.pbMg;
-    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.HIGH) {
+    } else if (bidGranularity === GRANULARITY_OPTIONS.HIGH) {
       return bid.pbHg;
-    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.CUSTOM) {
+    } else if (bidGranularity === GRANULARITY_OPTIONS.CUSTOM) {
       return bid.pbCg;
     }
   }
@@ -826,7 +761,7 @@ export const getAdvertiserDomain = () => {
  */
 export const getDSP = () => {
   return (bid) => {
-    return (bid.meta && (bid.meta.networkId || bid.meta.networkName)) ? deepAccess(bid, 'meta.networkName') || deepAccess(bid, 'meta.networkId') : '';
+    return (bid.meta && (bid.meta.networkId || bid.meta.networkName)) ? bid?.meta?.networkName || bid?.meta?.networkId : '';
   }
 }
 
@@ -849,13 +784,12 @@ function createKeyVal(key, value) {
         return value(bidResponse, bidReq);
       }
       : function (bidResponse) {
-        return getValue(bidResponse, value);
+        return bidResponse[value];
       }
   };
 }
 
 function defaultAdserverTargeting() {
-  const TARGETING_KEYS = CONSTANTS.TARGETING_KEYS;
   return [
     createKeyVal(TARGETING_KEYS.BIDDER, 'bidderCode'),
     createKeyVal(TARGETING_KEYS.AD_ID, 'adId'),
@@ -874,19 +808,17 @@ function defaultAdserverTargeting() {
 /**
  * @param {string} mediaType
  * @param {string} bidderCode
- * @param {BidRequest} bidReq
  * @returns {*}
  */
 export function getStandardBidderSettings(mediaType, bidderCode) {
-  const TARGETING_KEYS = CONSTANTS.TARGETING_KEYS;
   const standardSettings = Object.assign({}, bidderSettings.settingsFor(null));
-  if (!standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) {
-    standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = defaultAdserverTargeting();
+  if (!standardSettings[JSON_MAPPING.ADSERVER_TARGETING]) {
+    standardSettings[JSON_MAPPING.ADSERVER_TARGETING] = defaultAdserverTargeting();
   }
 
   if (FEATURES.VIDEO && mediaType === 'video') {
-    const adserverTargeting = standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING].slice();
-    standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = adserverTargeting;
+    const adserverTargeting = standardSettings[JSON_MAPPING.ADSERVER_TARGETING].slice();
+    standardSettings[JSON_MAPPING.ADSERVER_TARGETING] = adserverTargeting;
 
     // Adding hb_uuid + hb_cache_id
     [TARGETING_KEYS.UUID, TARGETING_KEYS.CACHE_ID].forEach(targetingKeyVal => {
@@ -901,8 +833,7 @@ export function getStandardBidderSettings(mediaType, bidderCode) {
 
       if (typeof find(adserverTargeting, targetingKeyVal => targetingKeyVal.key === TARGETING_KEYS.CACHE_HOST) === 'undefined') {
         adserverTargeting.push(createKeyVal(TARGETING_KEYS.CACHE_HOST, function(bidResponse) {
-          return deepAccess(bidResponse, `adserverTargeting.${TARGETING_KEYS.CACHE_HOST}`)
-            ? bidResponse.adserverTargeting[TARGETING_KEYS.CACHE_HOST] : urlInfo.hostname;
+          return bidResponse?.adserverTargeting?.[TARGETING_KEYS.CACHE_HOST] || urlInfo.hostname;
         }));
       }
     }
@@ -924,7 +855,7 @@ export function getKeyValueTargetingPairs(bidderCode, custBidObj, {index = aucti
   setKeys(keyValues, standardSettings, custBidObj, bidRequest);
 
   // 2) set keys from specific bidder setting override if they exist
-  if (bidderCode && bidderSettings.getOwn(bidderCode, CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING)) {
+  if (bidderCode && bidderSettings.getOwn(bidderCode, JSON_MAPPING.ADSERVER_TARGETING)) {
     setKeys(keyValues, bidderSettings.ownSettingsFor(bidderCode), custBidObj, bidRequest);
     custBidObj.sendStandardTargeting = bidderSettings.get(bidderCode, 'sendStandardTargeting');
   }
@@ -938,7 +869,7 @@ export function getKeyValueTargetingPairs(bidderCode, custBidObj, {index = aucti
 }
 
 function setKeys(keyValues, bidderSettings, custBidObj, bidReq) {
-  var targeting = bidderSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING];
+  var targeting = bidderSettings[JSON_MAPPING.ADSERVER_TARGETING];
   custBidObj.size = custBidObj.getSize();
 
   (targeting || []).forEach(function (kvPair) {
@@ -959,7 +890,7 @@ function setKeys(keyValues, bidderSettings, custBidObj, bidReq) {
 
     if (
       ((typeof bidderSettings.suppressEmptyKeys !== 'undefined' && bidderSettings.suppressEmptyKeys === true) ||
-      key === CONSTANTS.TARGETING_KEYS.DEAL || key === CONSTANTS.TARGETING_KEYS.ACAT || key === CONSTANTS.TARGETING_KEYS.DSP || key === CONSTANTS.TARGETING_KEYS.CRID) && // hb_deal & hb_acat are suppressed automatically if not set
+        key === TARGETING_KEYS.DEAL || key === TARGETING_KEYS.ACAT || key === TARGETING_KEYS.DSP || key === TARGETING_KEYS.CRID) && // hb_deal & hb_acat are suppressed automatically if not set
       (
         isEmptyStr(value) ||
         value === null ||
@@ -994,3 +925,17 @@ function groupByPlacement(bidsByPlacement, bid) {
   bidsByPlacement[bid.adUnitCode].bids.push(bid);
   return bidsByPlacement;
 }
+
+/**
+ * isValidPrice is price validation function
+ * which checks if price from bid response
+ * is not higher than top limit set in config
+ * @type {Function}
+ * @param bid
+ * @returns {boolean}
+ */
+function isValidPrice(bid) {
+  const maxBidValue = config.getConfig('maxBid');
+  if (!maxBidValue || !bid.cpm) return true;
+  return maxBidValue >= Number(bid.cpm);
+}
diff --git a/src/auctionIndex.js b/src/auctionIndex.js
index bdd2b42f9c6..d0b8355352a 100644
--- a/src/auctionIndex.js
+++ b/src/auctionIndex.js
@@ -1,59 +1,50 @@
+/**
+ * @typedef {Object} AuctionIndex
+ *
+ * @property {function({ auctionId: * }): *} getAuction Returns auction instance for `auctionId`
+ * @property {function({ adUnitId: * }): *} getAdUnit Returns `adUnit` object for `transactionId`.
+ * You should prefer `getMediaTypes` for looking up bid media types.
+ * @property {function({ adUnitId: *, requestId: * }): *} getMediaTypes Returns mediaTypes object from bidRequest (through `requestId`) falling back to the adUnit (through `transactionId`).
+ * The bidRequest is given precedence because its mediaTypes can differ from the adUnit's (if bidder-specific labels are in use).
+ * Bids that have no associated request do not have labels either, and use the adUnit's mediaTypes.
+ * @property {function({ requestId: *, bidderRequestId: * }): *} getBidderRequest Returns bidderRequest that matches both requestId and bidderRequestId (if either or both are provided).
+ * Bid responses are not guaranteed to have a corresponding request.
+ * @property {function({ requestId: * }): *} getBidRequest Returns bidRequest object for requestId.
+ * Bid responses are not guaranteed to have a corresponding request.
+ */
+
 /**
  * Retrieves request-related bid data.
  * All methods are designed to work with Bid (response) objects returned by bid adapters.
  */
 export function AuctionIndex(getAuctions) {
   Object.assign(this, {
-    /**
-     * @param auctionId
-     * @returns {*} Auction instance for `auctionId`
-     */
     getAuction({auctionId}) {
       if (auctionId != null) {
         return getAuctions()
           .find(auction => auction.getAuctionId() === auctionId);
       }
     },
-    /**
-     * NOTE: you should prefer {@link #getMediaTypes} for looking up bid media types.
-     * @param transactionId
-     * @returns adUnit object for `transactionId`
-     */
-    getAdUnit({transactionId}) {
-      if (transactionId != null) {
+    getAdUnit({adUnitId}) {
+      if (adUnitId != null) {
         return getAuctions()
           .flatMap(a => a.getAdUnits())
-          .find(au => au.transactionId === transactionId);
+          .find(au => au.adUnitId === adUnitId);
       }
     },
-    /**
-     * @param transactionId
-     * @param requestId?
-     * @returns {*} mediaTypes object from bidRequest (through requestId) falling back to the adUnit (through transactionId).
-     *
-     * The bidRequest is given precedence because its mediaTypes can differ from the adUnit's (if bidder-specific labels are in use).
-     * Bids that have no associated request do not have labels either, and use the adUnit's mediaTypes.
-     */
-    getMediaTypes({transactionId, requestId}) {
+    getMediaTypes({adUnitId, requestId}) {
       if (requestId != null) {
         const req = this.getBidRequest({requestId});
-        if (req != null && (transactionId == null || req.transactionId === transactionId)) {
+        if (req != null && (adUnitId == null || req.adUnitId === adUnitId)) {
           return req.mediaTypes;
         }
-      } else if (transactionId != null) {
-        const au = this.getAdUnit({transactionId});
+      } else if (adUnitId != null) {
+        const au = this.getAdUnit({adUnitId});
         if (au != null) {
           return au.mediaTypes;
         }
       }
     },
-    /**
-     * @param requestId?
-     * @param bidderRequestId?
-     * @returns {*} bidderRequest that matches both requestId and bidderRequestId (if either or both are provided).
-     *
-     * NOTE: Bid responses are not guaranteed to have a corresponding request.
-     */
     getBidderRequest({requestId, bidderRequestId}) {
       if (requestId != null || bidderRequestId != null) {
         let bers = getAuctions().flatMap(a => a.getBidRequests());
@@ -67,12 +58,6 @@ export function AuctionIndex(getAuctions) {
         }
       }
     },
-    /**
-     * @param requestId
-     * @returns {*} bidRequest object for requestId
-     *
-     * NOTE: Bid responses are not guaranteed to have a corresponding request.
-     */
     getBidRequest({requestId}) {
       if (requestId != null) {
         return getAuctions()
@@ -80,6 +65,9 @@ export function AuctionIndex(getAuctions) {
           .flatMap(ber => ber.bids)
           .find(br => br && br.bidId === requestId);
       }
+    },
+    getOrtb2(bid) {
+      return this.getBidderRequest(bid)?.ortb2 || this.getAuction(bid)?.getFPD()?.global?.ortb2
     }
   });
 }
diff --git a/src/auctionManager.js b/src/auctionManager.js
index 498c200ba21..ab2947b96b4 100644
--- a/src/auctionManager.js
+++ b/src/auctionManager.js
@@ -17,18 +17,16 @@
  * @property {function(): Object} getStandardBidderAdServerTargeting - returns standard bidder targeting for all the adapters. Refer http://prebid.org/dev-docs/publisher-api-reference.html#module_pbjs.bidderSettings for more details
  * @property {function(Object): void} addWinningBid - add a winning bid to an auction based on auctionId
  * @property {function(): void} clearAllAuctions - clear all auctions for testing
+ * @property {AuctionIndex} index
  */
 
 import { uniques, logWarn } from './utils.js';
 import { newAuction, getStandardBidderSettings, AUCTION_COMPLETED } from './auction.js';
 import {AuctionIndex} from './auctionIndex.js';
-import CONSTANTS from './constants.json';
+import { BID_STATUS, JSON_MAPPING } from './constants.js';
 import {useMetrics} from './utils/perfMetrics.js';
 import {ttlCollection} from './utils/ttlCollection.js';
-import {getTTL, onTTLBufferChange} from './bidTTL.js';
-import {config} from './config.js';
-
-const CACHE_TTL_SETTING = 'minBidCacheTTL';
+import {getMinBidCacheTTL, onMinBidCacheTTLChange} from './bidTTL.js';
 
 /**
  * Creates new instance of auctionManager. There will only be one instance of auctionManager but
@@ -37,29 +35,18 @@ const CACHE_TTL_SETTING = 'minBidCacheTTL';
  * @returns {AuctionManager} auctionManagerInstance
  */
 export function newAuctionManager() {
-  let minCacheTTL = null;
-
   const _auctions = ttlCollection({
     startTime: (au) => au.end.then(() => au.getAuctionEnd()),
-    ttl: (au) => minCacheTTL == null ? null : au.end.then(() => {
-      return Math.max(minCacheTTL, ...au.getBidsReceived().map(getTTL)) * 1000
+    ttl: (au) => getMinBidCacheTTL() == null ? null : au.end.then(() => {
+      return Math.max(getMinBidCacheTTL(), ...au.getBidsReceived().map(bid => bid.ttl)) * 1000
     }),
   });
 
-  onTTLBufferChange(() => {
-    if (minCacheTTL != null) _auctions.refresh();
-  })
+  onMinBidCacheTTLChange(() => _auctions.refresh());
 
-  config.getConfig(CACHE_TTL_SETTING, (cfg) => {
-    const prev = minCacheTTL;
-    minCacheTTL = cfg?.[CACHE_TTL_SETTING];
-    minCacheTTL = typeof minCacheTTL === 'number' ? minCacheTTL : null;
-    if (prev !== minCacheTTL) {
-      _auctions.refresh();
-    }
-  })
-
-  const auctionManager = {};
+  const auctionManager = {
+    onExpiry: _auctions.onExpiry
+  };
 
   function getAuction(auctionId) {
     for (const auction of _auctions) {
@@ -70,11 +57,10 @@ export function newAuctionManager() {
   auctionManager.addWinningBid = function(bid) {
     const metrics = useMetrics(bid.metrics);
     metrics.checkpoint('bidWon');
-    metrics.timeBetween('auctionEnd', 'bidWon', 'render.pending');
-    metrics.timeBetween('requestBids', 'bidWon', 'render.e2e');
+    metrics.timeBetween('auctionEnd', 'bidWon', 'adserver.pending');
+    metrics.timeBetween('requestBids', 'bidWon', 'adserver.e2e');
     const auction = getAuction(bid.auctionId);
     if (auction) {
-      bid.status = CONSTANTS.BID_STATUS.RENDERED;
       auction.addWinningBid(bid);
     } else {
       logWarn(`Auction not found when adding winning bid`);
@@ -131,14 +117,14 @@ export function newAuctionManager() {
   };
 
   auctionManager.getStandardBidderAdServerTargeting = function() {
-    return getStandardBidderSettings()[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING];
+    return getStandardBidderSettings()[JSON_MAPPING.ADSERVER_TARGETING];
   };
 
   auctionManager.setStatusForBids = function(adId, status) {
     let bid = auctionManager.findBidByAdId(adId);
     if (bid) bid.status = status;
 
-    if (bid && status === CONSTANTS.BID_STATUS.BID_TARGETING_SET) {
+    if (bid && status === BID_STATUS.BID_TARGETING_SET) {
       const auction = getAuction(bid.auctionId);
       if (auction) auction.setBidTargeting(bid);
     }
diff --git a/src/banner.js b/src/banner.js
new file mode 100644
index 00000000000..25da06b6669
--- /dev/null
+++ b/src/banner.js
@@ -0,0 +1,21 @@
+import { isArrayOfNums, isInteger, isStr } from './utils.js';
+
+/**
+ * List of OpenRTB 2.x banner object properties with simple validators.
+ * Not included: `ext`
+ * reference: https://github.com/InteractiveAdvertisingBureau/openrtb2.x/blob/main/2.6.md
+ */
+export const ORTB_BANNER_PARAMS = new Map([
+  [ 'format', value => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'object') ],
+  [ 'w', isInteger ],
+  [ 'h', isInteger ],
+  [ 'btype', isArrayOfNums ],
+  [ 'battr', isArrayOfNums ],
+  [ 'pos', isInteger ],
+  [ 'mimes', value => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string') ],
+  [ 'topframe', value => [1, 0].includes(value) ],
+  [ 'expdir', isArrayOfNums ],
+  [ 'api', isArrayOfNums ],
+  [ 'id', isStr ],
+  [ 'vcm', value => [1, 0].includes(value) ]
+]);
diff --git a/src/bidTTL.js b/src/bidTTL.js
index 55ba0c026b0..d685c4aa4f0 100644
--- a/src/bidTTL.js
+++ b/src/bidTTL.js
@@ -1,25 +1,35 @@
 import {config} from './config.js';
 import {logError} from './utils.js';
+const CACHE_TTL_SETTING = 'minBidCacheTTL';
 let TTL_BUFFER = 1;
-
+let minCacheTTL = null;
 const listeners = [];
 
 config.getConfig('ttlBuffer', (cfg) => {
   if (typeof cfg.ttlBuffer === 'number') {
-    const prev = TTL_BUFFER;
     TTL_BUFFER = cfg.ttlBuffer;
-    if (prev !== TTL_BUFFER) {
-      listeners.forEach(l => l(TTL_BUFFER))
-    }
   } else {
     logError('Invalid value for ttlBuffer', cfg.ttlBuffer);
   }
 })
 
-export function getTTL(bid) {
+export function getBufferedTTL(bid) {
   return bid.ttl - (bid.hasOwnProperty('ttlBuffer') ? bid.ttlBuffer : TTL_BUFFER);
 }
 
-export function onTTLBufferChange(listener) {
+export function getMinBidCacheTTL() {
+  return minCacheTTL;
+}
+
+config.getConfig(CACHE_TTL_SETTING, (cfg) => {
+  const prev = minCacheTTL;
+  minCacheTTL = cfg?.[CACHE_TTL_SETTING];
+  minCacheTTL = typeof minCacheTTL === 'number' ? minCacheTTL : null;
+  if (prev !== minCacheTTL) {
+    listeners.forEach(l => l(minCacheTTL))
+  }
+})
+
+export function onMinBidCacheTTLChange(listener) {
   listeners.push(listener);
 }
diff --git a/src/bidderSettings.js b/src/bidderSettings.js
index b39bf480511..4d97ed2b95e 100644
--- a/src/bidderSettings.js
+++ b/src/bidderSettings.js
@@ -1,6 +1,6 @@
 import {deepAccess, mergeDeep} from './utils.js';
 import {getGlobal} from './prebidGlobal.js';
-import CONSTANTS from './constants.json';
+import { JSON_MAPPING } from './constants.js';
 
 export class ScopedSettings {
   constructor(getSettings, defaultScope) {
@@ -65,4 +65,4 @@ export class ScopedSettings {
   }
 }
 
-export const bidderSettings = new ScopedSettings(() => getGlobal().bidderSettings || {}, CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD);
+export const bidderSettings = new ScopedSettings(() => getGlobal().bidderSettings || {}, JSON_MAPPING.BD_SETTING_STANDARD);
diff --git a/src/bidfactory.js b/src/bidfactory.js
index 4c2e4cf3ffb..d3bac4a0030 100644
--- a/src/bidfactory.js
+++ b/src/bidfactory.js
@@ -14,20 +14,23 @@ import { getUniqueIdentifierStr } from './utils.js';
  dealId,
  priceKeyString;
  */
-function Bid(statusCode, {src = 'client', bidder = '', bidId, transactionId, auctionId} = {}) {
+function Bid(statusCode, {src = 'client', bidder = '', bidId, transactionId, adUnitId, auctionId} = {}) {
   var _bidSrc = src;
   var _statusCode = statusCode || 0;
 
-  this.bidderCode = bidder;
-  this.width = 0;
-  this.height = 0;
-  this.statusMessage = _getStatus();
-  this.adId = getUniqueIdentifierStr();
-  this.requestId = bidId;
-  this.transactionId = transactionId;
-  this.auctionId = auctionId;
-  this.mediaType = 'banner';
-  this.source = _bidSrc;
+  Object.assign(this, {
+    bidderCode: bidder,
+    width: 0,
+    height: 0,
+    statusMessage: _getStatus(),
+    adId: getUniqueIdentifierStr(),
+    requestId: bidId,
+    transactionId,
+    adUnitId,
+    auctionId,
+    mediaType: 'banner',
+    source: _bidSrc
+  })
 
   function _getStatus() {
     switch (_statusCode) {
@@ -57,6 +60,7 @@ function Bid(statusCode, {src = 'client', bidder = '', bidId, transactionId, auc
       bidder: this.bidderCode,
       bidId: this.requestId,
       transactionId: this.transactionId,
+      adUnitId: this.adUnitId,
       auctionId: this.auctionId
     }
   };
diff --git a/src/config.js b/src/config.js
index d4dc07989af..88affc40faf 100644
--- a/src/config.js
+++ b/src/config.js
@@ -27,17 +27,18 @@ import {
   logWarn,
   mergeDeep
 } from './utils.js';
-import CONSTANTS from './constants.json';
+import {DEBUG_MODE} from './constants.js';
 
-const DEFAULT_DEBUG = getParameterByName(CONSTANTS.DEBUG_MODE).toUpperCase() === 'TRUE';
+const DEFAULT_DEBUG = getParameterByName(DEBUG_MODE).toUpperCase() === 'TRUE';
 const DEFAULT_BIDDER_TIMEOUT = 3000;
 const DEFAULT_ENABLE_SEND_ALL_BIDS = true;
 const DEFAULT_DISABLE_AJAX_TIMEOUT = false;
 const DEFAULT_BID_CACHE = false;
 const DEFAULT_DEVICE_ACCESS = true;
 const DEFAULT_MAX_NESTED_IFRAMES = 10;
+const DEFAULT_MAXBID_VALUE = 5000
 
-const DEFAULT_TIMEOUTBUFFER = 400;
+const DEFAULT_IFRAMES_CONFIG = {};
 
 export const RANDOM = 'random';
 const FIXED = 'fixed';
@@ -59,96 +60,159 @@ const GRANULARITY_OPTIONS = {
 
 const ALL_TOPICS = '*';
 
-/**
- * @typedef {object} PrebidConfig
- *
- * @property {string} cache.url Set a url if we should use prebid-cache to store video bids before adding
- *   bids to the auction. **NOTE** This must be set if you want to use the dfpAdServerVideo module.
- */
-
-export function newConfig() {
-  let listeners = [];
-  let defaults;
-  let config;
-  let bidderConfig;
-  let currBidder = null;
-
-  function resetConfig() {
-    defaults = {};
-
-    function getProp(name) {
-      return props[name].val;
-    }
+function attachProperties(config, useDefaultValues = true) {
+  const values = useDefaultValues ? {
+    priceGranularity: GRANULARITY_OPTIONS.MEDIUM,
+    customPriceBucket: {},
+    mediaTypePriceGranularity: {},
+    bidderSequence: DEFAULT_BIDDER_SEQUENCE,
+    auctionOptions: {}
+  } : {}
+
+  function getProp(name) {
+    return values[name];
+  }
 
-    function setProp(name, val) {
-      props[name].val = val;
+  function setProp(name, val) {
+    if (!values.hasOwnProperty(name)) {
+      Object.defineProperty(config, name, {enumerable: true});
     }
+    values[name] = val;
+  }
 
-    const props = {
-      publisherDomain: {
-        set(val) {
-          if (val != null) {
-            logWarn('publisherDomain is deprecated and has no effect since v7 - use pageUrl instead')
+  const props = {
+    publisherDomain: {
+      set(val) {
+        if (val != null) {
+          logWarn('publisherDomain is deprecated and has no effect since v7 - use pageUrl instead')
+        }
+        setProp('publisherDomain', val);
+      }
+    },
+    priceGranularity: {
+      set(val) {
+        if (validatePriceGranularity(val)) {
+          if (typeof val === 'string') {
+            setProp('priceGranularity', (hasGranularity(val)) ? val : GRANULARITY_OPTIONS.MEDIUM);
+          } else if (isPlainObject(val)) {
+            setProp('customPriceBucket', val);
+            setProp('priceGranularity', GRANULARITY_OPTIONS.CUSTOM)
+            logMessage('Using custom price granularity');
           }
-          setProp('publisherDomain', val);
         }
-      },
-      priceGranularity: {
-        val: GRANULARITY_OPTIONS.MEDIUM,
-        set(val) {
-          if (validatePriceGranularity(val)) {
+      }
+    },
+    customPriceBucket: {},
+    mediaTypePriceGranularity: {
+      set(val) {
+        val != null && setProp('mediaTypePriceGranularity', Object.keys(val).reduce((aggregate, item) => {
+          if (validatePriceGranularity(val[item])) {
             if (typeof val === 'string') {
-              setProp('priceGranularity', (hasGranularity(val)) ? val : GRANULARITY_OPTIONS.MEDIUM);
+              aggregate[item] = (hasGranularity(val[item])) ? val[item] : getProp('priceGranularity');
             } else if (isPlainObject(val)) {
-              setProp('customPriceBucket', val);
-              setProp('priceGranularity', GRANULARITY_OPTIONS.CUSTOM)
-              logMessage('Using custom price granularity');
+              aggregate[item] = val[item];
+              logMessage(`Using custom price granularity for ${item}`);
             }
+          } else {
+            logWarn(`Invalid price granularity for media type: ${item}`);
           }
+          return aggregate;
+        }, {}));
+      }
+    },
+    bidderSequence: {
+      set(val) {
+        if (VALID_ORDERS[val]) {
+          setProp('bidderSequence', val);
+        } else {
+          logWarn(`Invalid order: ${val}. Bidder Sequence was not set.`);
         }
-      },
-      customPriceBucket: {
-        val: {},
-        set() {}
-      },
-      mediaTypePriceGranularity: {
-        val: {},
-        set(val) {
-          val != null && setProp('mediaTypePriceGranularity', Object.keys(val).reduce((aggregate, item) => {
-            if (validatePriceGranularity(val[item])) {
-              if (typeof val === 'string') {
-                aggregate[item] = (hasGranularity(val[item])) ? val[item] : getProp('priceGranularity');
-              } else if (isPlainObject(val)) {
-                aggregate[item] = val[item];
-                logMessage(`Using custom price granularity for ${item}`);
-              }
-            } else {
-              logWarn(`Invalid price granularity for media type: ${item}`);
-            }
-            return aggregate;
-          }, {}));
+      }
+    },
+    auctionOptions: {
+      set(val) {
+        if (validateauctionOptions(val)) {
+          setProp('auctionOptions', val);
         }
-      },
-      bidderSequence: {
-        val: DEFAULT_BIDDER_SEQUENCE,
-        set(val) {
-          if (VALID_ORDERS[val]) {
-            setProp('bidderSequence', val);
-          } else {
-            logWarn(`Invalid order: ${val}. Bidder Sequence was not set.`);
-          }
+      }
+    }
+  }
+
+  Object.defineProperties(config, Object.fromEntries(
+    Object.entries(props)
+      .map(([k, def]) => [k, Object.assign({
+        get: getProp.bind(null, k),
+        set: setProp.bind(null, k),
+        enumerable: values.hasOwnProperty(k),
+        configurable: !values.hasOwnProperty(k)
+      }, def)])
+  ));
+
+  return config;
+
+  function hasGranularity(val) {
+    return find(Object.keys(GRANULARITY_OPTIONS), option => val === GRANULARITY_OPTIONS[option]);
+  }
+
+  function validatePriceGranularity(val) {
+    if (!val) {
+      logError('Prebid Error: no value passed to `setPriceGranularity()`');
+      return false;
+    }
+    if (typeof val === 'string') {
+      if (!hasGranularity(val)) {
+        logWarn('Prebid Warning: setPriceGranularity was called with invalid setting, using `medium` as default.');
+      }
+    } else if (isPlainObject(val)) {
+      if (!isValidPriceConfig(val)) {
+        logError('Invalid custom price value passed to `setPriceGranularity()`');
+        return false;
+      }
+    }
+    return true;
+  }
+
+  function validateauctionOptions(val) {
+    if (!isPlainObject(val)) {
+      logWarn('Auction Options must be an object')
+      return false
+    }
+
+    for (let k of Object.keys(val)) {
+      if (k !== 'secondaryBidders' && k !== 'suppressStaleRender' && k !== 'suppressExpiredRender') {
+        logWarn(`Auction Options given an incorrect param: ${k}`)
+        return false
+      }
+      if (k === 'secondaryBidders') {
+        if (!isArray(val[k])) {
+          logWarn(`Auction Options ${k} must be of type Array`);
+          return false
+        } else if (!val[k].every(isStr)) {
+          logWarn(`Auction Options ${k} must be only string`);
+          return false
         }
-      },
-      auctionOptions: {
-        val: {},
-        set(val) {
-          if (validateauctionOptions(val)) {
-            setProp('auctionOptions', val);
-          }
+      } else if (k === 'suppressStaleRender' || k === 'suppressExpiredRender') {
+        if (!isBoolean(val[k])) {
+          logWarn(`Auction Options ${k} must be of type boolean`);
+          return false;
         }
       }
     }
-    let newConfig = {
+    return true;
+  }
+}
+
+export function newConfig() {
+  let listeners = [];
+  let defaults;
+  let config;
+  let bidderConfig;
+  let currBidder = null;
+
+  function resetConfig() {
+    defaults = {};
+
+    let newConfig = attachProperties({
       // `debug` is equivalent to legacy `pbjs.logging` property
       debug: DEFAULT_DEBUG,
       bidderTimeout: DEFAULT_BIDDER_TIMEOUT,
@@ -161,22 +225,17 @@ export function newConfig() {
        */
       deviceAccess: DEFAULT_DEVICE_ACCESS,
 
-      // timeout buffer to adjust for bidder CDN latency
-      timeoutBuffer: DEFAULT_TIMEOUTBUFFER,
       disableAjaxTimeout: DEFAULT_DISABLE_AJAX_TIMEOUT,
 
       // default max nested iframes for referer detection
       maxNestedIframes: DEFAULT_MAX_NESTED_IFRAMES,
-    };
 
-    Object.defineProperties(newConfig,
-      Object.fromEntries(Object.entries(props)
-        .map(([k, def]) => [k, Object.assign({
-          get: getProp.bind(null, k),
-          set: setProp.bind(null, k),
-          enumerable: true,
-        }, def)]))
-    );
+      // default max bid
+      maxBid: DEFAULT_MAXBID_VALUE,
+      userSync: {
+        topics: DEFAULT_IFRAMES_CONFIG
+      }
+    });
 
     if (config) {
       callSubscribers(
@@ -192,57 +251,6 @@ export function newConfig() {
 
     config = newConfig;
     bidderConfig = {};
-
-    function hasGranularity(val) {
-      return find(Object.keys(GRANULARITY_OPTIONS), option => val === GRANULARITY_OPTIONS[option]);
-    }
-
-    function validatePriceGranularity(val) {
-      if (!val) {
-        logError('Prebid Error: no value passed to `setPriceGranularity()`');
-        return false;
-      }
-      if (typeof val === 'string') {
-        if (!hasGranularity(val)) {
-          logWarn('Prebid Warning: setPriceGranularity was called with invalid setting, using `medium` as default.');
-        }
-      } else if (isPlainObject(val)) {
-        if (!isValidPriceConfig(val)) {
-          logError('Invalid custom price value passed to `setPriceGranularity()`');
-          return false;
-        }
-      }
-      return true;
-    }
-
-    function validateauctionOptions(val) {
-      if (!isPlainObject(val)) {
-        logWarn('Auction Options must be an object')
-        return false
-      }
-
-      for (let k of Object.keys(val)) {
-        if (k !== 'secondaryBidders' && k !== 'suppressStaleRender') {
-          logWarn(`Auction Options given an incorrect param: ${k}`)
-          return false
-        }
-        if (k === 'secondaryBidders') {
-          if (!isArray(val[k])) {
-            logWarn(`Auction Options ${k} must be of type Array`);
-            return false
-          } else if (!val[k].every(isStr)) {
-            logWarn(`Auction Options ${k} must be only string`);
-            return false
-          }
-        } else if (k === 'suppressStaleRender') {
-          if (!isBoolean(val[k])) {
-            logWarn(`Auction Options ${k} must be of type boolean`);
-            return false;
-          }
-        }
-      }
-      return true;
-    }
   }
 
   /**
@@ -453,14 +461,14 @@ export function newConfig() {
       check(config);
       config.bidders.forEach(bidder => {
         if (!bidderConfig[bidder]) {
-          bidderConfig[bidder] = {};
+          bidderConfig[bidder] = attachProperties({}, false);
         }
         Object.keys(config.config).forEach(topic => {
           let option = config.config[topic];
-
-          if (isPlainObject(option)) {
+          const currentConfig = bidderConfig[bidder][topic];
+          if (isPlainObject(option) && (currentConfig == null || isPlainObject(currentConfig))) {
             const func = mergeFlag ? mergeDeep : Object.assign;
-            bidderConfig[bidder][topic] = func({}, bidderConfig[bidder][topic] || {}, option);
+            bidderConfig[bidder][topic] = func({}, currentConfig || {}, option);
           } else {
             bidderConfig[bidder][topic] = option;
           }
@@ -551,4 +559,8 @@ export function newConfig() {
   };
 }
 
+/**
+ * Set a `cache.url` if we should use prebid-cache to store video bids before adding bids to the auction.
+ * This must be set if you want to use the dfpAdServerVideo module.
+ */
 export const config = newConfig();
diff --git a/src/consentHandler.js b/src/consentHandler.js
index 9e3ee5b4c40..87d1e1a6e23 100644
--- a/src/consentHandler.js
+++ b/src/consentHandler.js
@@ -100,7 +100,6 @@ class UspConsentHandler extends ConsentHandler {
     const consentData = this.getConsentData();
     if (consentData && this.generatedTime) {
       return {
-        usp: consentData,
         generatedAt: this.generatedTime
       };
     }
@@ -155,14 +154,19 @@ export function gvlidRegistry() {
         }
       }
     },
+    /**
+     * @typedef {Object} GvlIdResult
+     * @property {Object.} modules - A map from module type to that module's GVL ID.
+     * @property {number} [gvlid] - The single GVL ID for this family of modules (only defined if all modules with this name declared the same ID).
+     */
+
     /**
      * Get a module's GVL ID(s).
      *
-     * @param {string} moduleName
-     * @return {{modules: {[moduleType]: number}, gvlid?: number}} an object where:
+     * @param {string} moduleName - The name of the module.
+     * @return {GvlIdResult} An object where:
      *   `modules` is a map from module type to that module's GVL ID;
-     *   `gvlid` is the single GVL ID for this family of modules (only defined
-     *   if all modules with this name declared the same ID).
+     *   `gvlid` is the single GVL ID for this family of modules (only defined if all modules with this name declare the same ID).
      */
     get(moduleName) {
       const result = {modules: registry[moduleName] || {}};
diff --git a/src/constants.js b/src/constants.js
new file mode 100644
index 00000000000..1a17cf3eec0
--- /dev/null
+++ b/src/constants.js
@@ -0,0 +1,199 @@
+export const JSON_MAPPING = {
+  PL_CODE: 'code',
+  PL_SIZE: 'sizes',
+  PL_BIDS: 'bids',
+  BD_BIDDER: 'bidder',
+  BD_ID: 'paramsd',
+  BD_PL_ID: 'placementId',
+  ADSERVER_TARGETING: 'adserverTargeting',
+  BD_SETTING_STANDARD: 'standard'
+};
+
+export const DEBUG_MODE = 'pbjs_debug';
+
+export const STATUS = {
+  GOOD: 1
+};
+
+export const EVENTS = {
+  AUCTION_INIT: 'auctionInit',
+  AUCTION_TIMEOUT: 'auctionTimeout',
+  AUCTION_END: 'auctionEnd',
+  BID_ADJUSTMENT: 'bidAdjustment',
+  BID_TIMEOUT: 'bidTimeout',
+  BID_REQUESTED: 'bidRequested',
+  BID_RESPONSE: 'bidResponse',
+  BID_REJECTED: 'bidRejected',
+  NO_BID: 'noBid',
+  SEAT_NON_BID: 'seatNonBid',
+  BID_WON: 'bidWon',
+  BIDDER_DONE: 'bidderDone',
+  BIDDER_ERROR: 'bidderError',
+  SET_TARGETING: 'setTargeting',
+  BEFORE_REQUEST_BIDS: 'beforeRequestBids',
+  BEFORE_BIDDER_HTTP: 'beforeBidderHttp',
+  REQUEST_BIDS: 'requestBids',
+  ADD_AD_UNITS: 'addAdUnits',
+  AD_RENDER_FAILED: 'adRenderFailed',
+  AD_RENDER_SUCCEEDED: 'adRenderSucceeded',
+  TCF2_ENFORCEMENT: 'tcf2Enforcement',
+  AUCTION_DEBUG: 'auctionDebug',
+  BID_VIEWABLE: 'bidViewable',
+  STALE_RENDER: 'staleRender',
+  EXPIRED_RENDER: 'expiredRender',
+  BILLABLE_EVENT: 'billableEvent',
+  BID_ACCEPTED: 'bidAccepted',
+  RUN_PAAPI_AUCTION: 'paapiRunAuction',
+  PBS_ANALYTICS: 'pbsAnalytics',
+  PAAPI_BID: 'paapiBid',
+  PAAPI_NO_BID: 'paapiNoBid',
+  PAAPI_ERROR: 'paapiError',
+};
+
+export const AD_RENDER_FAILED_REASON = {
+  PREVENT_WRITING_ON_MAIN_DOCUMENT: 'preventWritingOnMainDocument',
+  NO_AD: 'noAd',
+  EXCEPTION: 'exception',
+  CANNOT_FIND_AD: 'cannotFindAd',
+  MISSING_DOC_OR_ADID: 'missingDocOrAdid'
+};
+
+export const EVENT_ID_PATHS = {
+  bidWon: 'adUnitCode'
+};
+
+export const GRANULARITY_OPTIONS = {
+  LOW: 'low',
+  MEDIUM: 'medium',
+  HIGH: 'high',
+  AUTO: 'auto',
+  DENSE: 'dense',
+  CUSTOM: 'custom'
+};
+
+export const TARGETING_KEYS = {
+  BIDDER: 'hb_bidder',
+  AD_ID: 'hb_adid',
+  PRICE_BUCKET: 'hb_pb',
+  SIZE: 'hb_size',
+  DEAL: 'hb_deal',
+  SOURCE: 'hb_source',
+  FORMAT: 'hb_format',
+  UUID: 'hb_uuid',
+  CACHE_ID: 'hb_cache_id',
+  CACHE_HOST: 'hb_cache_host',
+  ADOMAIN: 'hb_adomain',
+  ACAT: 'hb_acat',
+  CRID: 'hb_crid',
+  DSP: 'hb_dsp'
+};
+
+export const DEFAULT_TARGETING_KEYS = {
+  BIDDER: 'hb_bidder',
+  AD_ID: 'hb_adid',
+  PRICE_BUCKET: 'hb_pb',
+  SIZE: 'hb_size',
+  DEAL: 'hb_deal',
+  FORMAT: 'hb_format',
+  UUID: 'hb_uuid',
+  CACHE_HOST: 'hb_cache_host'
+};
+
+export const NATIVE_KEYS = {
+  title: 'hb_native_title',
+  body: 'hb_native_body',
+  body2: 'hb_native_body2',
+  privacyLink: 'hb_native_privacy',
+  privacyIcon: 'hb_native_privicon',
+  sponsoredBy: 'hb_native_brand',
+  image: 'hb_native_image',
+  icon: 'hb_native_icon',
+  clickUrl: 'hb_native_linkurl',
+  displayUrl: 'hb_native_displayurl',
+  cta: 'hb_native_cta',
+  rating: 'hb_native_rating',
+  address: 'hb_native_address',
+  downloads: 'hb_native_downloads',
+  likes: 'hb_native_likes',
+  phone: 'hb_native_phone',
+  price: 'hb_native_price',
+  salePrice: 'hb_native_saleprice',
+  rendererUrl: 'hb_renderer_url',
+  adTemplate: 'hb_adTemplate'
+};
+
+export const S2S = {
+  SRC: 's2s',
+  DEFAULT_ENDPOINT: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
+  SYNCED_BIDDERS_KEY: 'pbjsSyncs'
+};
+
+export const BID_STATUS = {
+  BID_TARGETING_SET: 'targetingSet',
+  RENDERED: 'rendered',
+  BID_REJECTED: 'bidRejected'
+};
+
+export const REJECTION_REASON = {
+  INVALID: 'Bid has missing or invalid properties',
+  INVALID_REQUEST_ID: 'Invalid request ID',
+  BIDDER_DISALLOWED: 'Bidder code is not allowed by allowedAlternateBidderCodes / allowUnknownBidderCodes',
+  FLOOR_NOT_MET: 'Bid does not meet price floor',
+  CANNOT_CONVERT_CURRENCY: 'Unable to convert currency',
+  DSA_REQUIRED: 'Bid does not provide required DSA transparency info',
+  DSA_MISMATCH: 'Bid indicates inappropriate DSA rendering method',
+  PRICE_TOO_HIGH: 'Bid price exceeds maximum value'
+};
+
+export const PREBID_NATIVE_DATA_KEYS_TO_ORTB = {
+  body: 'desc',
+  body2: 'desc2',
+  sponsoredBy: 'sponsored',
+  cta: 'ctatext',
+  rating: 'rating',
+  address: 'address',
+  downloads: 'downloads',
+  likes: 'likes',
+  phone: 'phone',
+  price: 'price',
+  salePrice: 'saleprice',
+  displayUrl: 'displayurl'
+};
+
+export const NATIVE_ASSET_TYPES = {
+  sponsored: 1,
+  desc: 2,
+  rating: 3,
+  likes: 4,
+  downloads: 5,
+  price: 6,
+  saleprice: 7,
+  phone: 8,
+  address: 9,
+  desc2: 10,
+  displayurl: 11,
+  ctatext: 12
+};
+
+export const NATIVE_IMAGE_TYPES = {
+  ICON: 1,
+  MAIN: 3
+};
+
+export const NATIVE_KEYS_THAT_ARE_NOT_ASSETS = [
+  'privacyIcon',
+  'clickUrl',
+  'sendTargetingKeys',
+  'adTemplate',
+  'rendererUrl',
+  'type'
+];
+
+export const MESSAGES = {
+  REQUEST: 'Prebid Request',
+  RESPONSE: 'Prebid Response',
+  NATIVE: 'Prebid Native',
+  EVENT: 'Prebid Event'
+};
+
+export const PB_LOCATOR = '__pb_locator__';
diff --git a/src/constants.json b/src/constants.json
deleted file mode 100644
index c763090f6d0..00000000000
--- a/src/constants.json
+++ /dev/null
@@ -1,180 +0,0 @@
-{
-  "JSON_MAPPING": {
-    "PL_CODE": "code",
-    "PL_SIZE": "sizes",
-    "PL_BIDS": "bids",
-    "BD_BIDDER": "bidder",
-    "BD_ID": "paramsd",
-    "BD_PL_ID": "placementId",
-    "ADSERVER_TARGETING": "adserverTargeting",
-    "BD_SETTING_STANDARD": "standard"
-  },
-  "DEBUG_MODE": "pbjs_debug",
-  "STATUS": {
-    "GOOD": 1
-  },
-  "CB": {
-    "TYPE": {
-      "ALL_BIDS_BACK": "allRequestedBidsBack",
-      "AD_UNIT_BIDS_BACK": "adUnitBidsBack",
-      "BID_WON": "bidWon",
-      "REQUEST_BIDS": "requestBids"
-    }
-  },
-  "EVENTS": {
-    "AUCTION_INIT": "auctionInit",
-    "AUCTION_END": "auctionEnd",
-    "BID_ADJUSTMENT": "bidAdjustment",
-    "BID_TIMEOUT": "bidTimeout",
-    "BID_REQUESTED": "bidRequested",
-    "BID_RESPONSE": "bidResponse",
-    "BID_REJECTED": "bidRejected",
-    "NO_BID": "noBid",
-    "SEAT_NON_BID": "seatNonBid",
-    "BID_WON": "bidWon",
-    "BIDDER_DONE": "bidderDone",
-    "BIDDER_ERROR": "bidderError",
-    "SET_TARGETING": "setTargeting",
-    "BEFORE_REQUEST_BIDS": "beforeRequestBids",
-    "BEFORE_BIDDER_HTTP": "beforeBidderHttp",
-    "REQUEST_BIDS": "requestBids",
-    "ADD_AD_UNITS": "addAdUnits",
-    "AD_RENDER_FAILED": "adRenderFailed",
-    "AD_RENDER_SUCCEEDED": "adRenderSucceeded",
-    "TCF2_ENFORCEMENT": "tcf2Enforcement",
-    "AUCTION_DEBUG": "auctionDebug",
-    "BID_VIEWABLE": "bidViewable",
-    "STALE_RENDER": "staleRender",
-    "BILLABLE_EVENT": "billableEvent"
-  },
-  "AD_RENDER_FAILED_REASON": {
-    "PREVENT_WRITING_ON_MAIN_DOCUMENT": "preventWritingOnMainDocument",
-    "NO_AD": "noAd",
-    "EXCEPTION": "exception",
-    "CANNOT_FIND_AD": "cannotFindAd",
-    "MISSING_DOC_OR_ADID": "missingDocOrAdid"
-  },
-  "EVENT_ID_PATHS": {
-    "bidWon": "adUnitCode"
-  },
-  "GRANULARITY_OPTIONS": {
-    "LOW": "low",
-    "MEDIUM": "medium",
-    "HIGH": "high",
-    "AUTO": "auto",
-    "DENSE": "dense",
-    "CUSTOM": "custom"
-  },
-  "TARGETING_KEYS": {
-    "BIDDER": "hb_bidder",
-    "AD_ID": "hb_adid",
-    "PRICE_BUCKET": "hb_pb",
-    "SIZE": "hb_size",
-    "DEAL": "hb_deal",
-    "SOURCE": "hb_source",
-    "FORMAT": "hb_format",
-    "UUID": "hb_uuid",
-    "CACHE_ID": "hb_cache_id",
-    "CACHE_HOST": "hb_cache_host",
-    "ADOMAIN": "hb_adomain",
-    "ACAT": "hb_acat",
-    "CRID": "hb_crid",
-    "DSP": "hb_dsp"
-  },
-  "DEFAULT_TARGETING_KEYS": {
-    "BIDDER": "hb_bidder",
-    "AD_ID": "hb_adid",
-    "PRICE_BUCKET": "hb_pb",
-    "SIZE": "hb_size",
-    "DEAL": "hb_deal",
-    "FORMAT": "hb_format",
-    "UUID": "hb_uuid",
-    "CACHE_HOST": "hb_cache_host"
-  },
-  "NATIVE_KEYS": {
-    "title": "hb_native_title",
-    "body": "hb_native_body",
-    "body2": "hb_native_body2",
-    "privacyLink": "hb_native_privacy",
-    "privacyIcon": "hb_native_privicon",
-    "sponsoredBy": "hb_native_brand",
-    "image": "hb_native_image",
-    "icon": "hb_native_icon",
-    "clickUrl": "hb_native_linkurl",
-    "displayUrl": "hb_native_displayurl",
-    "cta": "hb_native_cta",
-    "rating": "hb_native_rating",
-    "address": "hb_native_address",
-    "downloads": "hb_native_downloads",
-    "likes": "hb_native_likes",
-    "phone": "hb_native_phone",
-    "price": "hb_native_price",
-    "salePrice": "hb_native_saleprice",
-    "rendererUrl": "hb_renderer_url",
-    "adTemplate": "hb_adTemplate"
-  },
-  "S2S": {
-    "SRC": "s2s",
-    "DEFAULT_ENDPOINT": "https://prebid.adnxs.com/pbs/v1/openrtb2/auction",
-    "SYNCED_BIDDERS_KEY": "pbjsSyncs"
-  },
-  "BID_STATUS": {
-    "BID_TARGETING_SET": "targetingSet",
-    "RENDERED": "rendered",
-    "BID_REJECTED": "bidRejected"
-  },
-  "REJECTION_REASON": {
-    "INVALID": "Bid has missing or invalid properties",
-    "INVALID_REQUEST_ID": "Invalid request ID",
-    "BIDDER_DISALLOWED": "Bidder code is not allowed by allowedAlternateBidderCodes / allowUnknownBidderCodes",
-    "FLOOR_NOT_MET": "Bid does not meet price floor",
-    "CANNOT_CONVERT_CURRENCY": "Unable to convert currency"
-  },
-  "PREBID_NATIVE_DATA_KEYS_TO_ORTB": {
-    "body": "desc",
-    "body2": "desc2",
-    "sponsoredBy": "sponsored",
-    "cta": "ctatext",
-    "rating": "rating",
-    "address": "address",
-    "downloads": "downloads",
-    "likes": "likes",
-    "phone": "phone",
-    "price": "price",
-    "salePrice": "saleprice",
-    "displayUrl": "displayurl"
-  },
-  "NATIVE_ASSET_TYPES": {
-    "sponsored": 1,
-    "desc": 2,
-    "rating": 3,
-    "likes": 4,
-    "downloads": 5,
-    "price": 6,
-    "saleprice": 7,
-    "phone": 8,
-    "address": 9,
-    "desc2": 10,
-    "displayurl": 11,
-    "ctatext": 12
-  },
-  "NATIVE_IMAGE_TYPES": {
-    "ICON": 1,
-    "MAIN": 3
-  },
-  "NATIVE_KEYS_THAT_ARE_NOT_ASSETS": [
-    "privacyIcon",
-    "clickUrl",
-    "sendTargetingKeys",
-    "adTemplate",
-    "rendererUrl",
-    "type"
-  ],
-  "FLOOR_VALUES": {
-	"NO_DATA": "noData",
-	"AD_UNIT": "adUnit",
-	"SET_CONFIG": "setConfig",
-	"FETCH": "fetch",
-	"SUCCESS": "success"
-  }
-}
diff --git a/src/creativeRenderers.js b/src/creativeRenderers.js
new file mode 100644
index 00000000000..8331c23c8de
--- /dev/null
+++ b/src/creativeRenderers.js
@@ -0,0 +1,24 @@
+import {GreedyPromise} from './utils/promise.js';
+import {createInvisibleIframe} from './utils.js';
+import {RENDERER} from '../libraries/creative-renderer-display/renderer.js';
+import {hook} from './hook.js';
+
+export const getCreativeRendererSource = hook('sync', function (bidResponse) {
+  return RENDERER;
+})
+
+export const getCreativeRenderer = (function() {
+  const renderers = {};
+  return function (bidResponse) {
+    const src = getCreativeRendererSource(bidResponse);
+    if (!renderers.hasOwnProperty(src)) {
+      renderers[src] = new GreedyPromise((resolve) => {
+        const iframe = createInvisibleIframe();
+        iframe.srcdoc = ``;
+        iframe.onload = () => resolve(iframe.contentWindow.render);
+        document.body.appendChild(iframe);
+      })
+    }
+    return renderers[src];
+  }
+})();
diff --git a/src/debugging.js b/src/debugging.js
index f5d13d1a134..69c129da9a2 100644
--- a/src/debugging.js
+++ b/src/debugging.js
@@ -5,6 +5,7 @@ import {logMessage, prefixLog} from './utils.js';
 import {createBid} from './bidfactory.js';
 import {loadExternalScript} from './adloader.js';
 import {GreedyPromise} from './utils/promise.js';
+import { MODULE_TYPE_PREBID } from './activities/modules.js';
 
 export const DEBUG_KEY = '__$$PREBID_GLOBAL$$_debugging__';
 
@@ -14,7 +15,7 @@ function isDebuggingInstalled() {
 
 function loadScript(url) {
   return new GreedyPromise((resolve) => {
-    loadExternalScript(url, 'debugging', resolve);
+    loadExternalScript(url, MODULE_TYPE_PREBID, 'debugging', resolve);
   });
 }
 
@@ -73,6 +74,7 @@ export const reset = ctl.reset;
 export function loadSession() {
   let storage = null;
   try {
+    // eslint-disable-next-line prebid/no-global
     storage = window.sessionStorage;
   } catch (e) {}
 
diff --git a/src/events.js b/src/events.js
index 7a1e25e0e49..38e7f633d16 100644
--- a/src/events.js
+++ b/src/events.js
@@ -2,7 +2,7 @@
  * events.js
  */
 import * as utils from './utils.js'
-import CONSTANTS from './constants.json';
+import { EVENTS, EVENT_ID_PATHS } from './constants.js';
 import {ttlCollection} from './utils/ttlCollection.js';
 import {config} from './config.js';
 const TTL_CONFIG = 'eventHistoryTTL';
@@ -28,9 +28,9 @@ let slice = Array.prototype.slice;
 let push = Array.prototype.push;
 
 // define entire events
-let allEvents = Object.values(CONSTANTS.EVENTS);
+let allEvents = Object.values(EVENTS);
 
-const idPaths = CONSTANTS.EVENT_ID_PATHS;
+const idPaths = EVENT_ID_PATHS;
 
 const _public = (function () {
   let _handlers = {};
@@ -61,12 +61,13 @@ const _public = (function () {
       elapsedTime: utils.getPerformanceNow(),
     });
 
-    /** Push each specific callback to the `callbacks` array.
+    /**
+     * Push each specific callback to the `callbacks` array.
      * If the `event` map has a key that matches the value of the
      * event payload id path, e.g. `eventPayload[idPath]`, then apply
      * each function in the `que` array as an argument to push to the
      * `callbacks` array
-     * */
+     */
     if (key && eventKeys.includes(key)) {
       push.apply(callbacks, event[key].que);
     }
@@ -80,7 +81,7 @@ const _public = (function () {
       try {
         fn.apply(null, args);
       } catch (e) {
-        utils.logError('Error executing handler:', 'events.js', e);
+        utils.logError('Error executing handler:', 'events.js', e, eventString);
       }
     });
   }
@@ -89,6 +90,8 @@ const _public = (function () {
     return allEvents.includes(event)
   }
 
+  _public.has = _checkAvailableEvent;
+
   _public.on = function (eventString, handler, id) {
     // check whether available event or not
     if (_checkAvailableEvent(eventString)) {
@@ -163,7 +166,7 @@ const _public = (function () {
 
 utils._setEventEmitter(_public.emit.bind(_public));
 
-export const {on, off, get, getEvents, emit, addEvents} = _public;
+export const {on, off, get, getEvents, emit, addEvents, has} = _public;
 
 export function clearEvents() {
   eventsFired.clear();
diff --git a/src/fpd/enrichment.js b/src/fpd/enrichment.js
index f812d8435d9..ec5047238a2 100644
--- a/src/fpd/enrichment.js
+++ b/src/fpd/enrichment.js
@@ -6,6 +6,10 @@ import {config} from '../config.js';
 import {getHighEntropySUA, getLowEntropySUA} from './sua.js';
 import {GreedyPromise} from '../utils/promise.js';
 import {CLIENT_SECTIONS, clientSectionChecker, hasSection} from './oneClient.js';
+import {isActivityAllowed} from '../activities/rules.js';
+import {activityParams} from '../activities/activityParams.js';
+import {ACTIVITY_ACCESS_DEVICE} from '../activities/activities.js';
+import {MODULE_TYPE_PREBID} from '../activities/modules.js';
 
 export const dep = {
   getRefererInfo,
@@ -19,24 +23,34 @@ export const dep = {
 const oneClient = clientSectionChecker('FPD')
 
 /**
- * Enrich an ortb2 object with first party data.
- * @param {Promise[{}]} fpd: a promise to an ortb2 object.
- * @returns: {Promise[{}]}: a promise to an enriched ortb2 object.
+ * Enrich an ortb2 object with first-party data.
+ * @param {Promise} fpd - A promise that resolves to an ortb2 object.
+ * @returns {Promise} - A promise that resolves to an enriched ortb2 object.
  */
 export const enrichFPD = hook('sync', (fpd) => {
-  return GreedyPromise.all([fpd, getSUA().catch(() => null)])
-    .then(([ortb2, sua]) => {
+  const promArr = [fpd, getSUA().catch(() => null), tryToGetCdepLabel().catch(() => null)];
+
+  return GreedyPromise.all(promArr)
+    .then(([ortb2, sua, cdep]) => {
       const ri = dep.getRefererInfo();
-      mergeLegacySetConfigs(ortb2);
       Object.entries(ENRICHMENTS).forEach(([section, getEnrichments]) => {
         const data = getEnrichments(ortb2, ri);
         if (data && Object.keys(data).length > 0) {
           ortb2[section] = mergeDeep({}, data, ortb2[section]);
         }
       });
+
       if (sua) {
         deepSetValue(ortb2, 'device.sua', Object.assign({}, sua, ortb2.device.sua));
       }
+
+      if (cdep) {
+        const ext = {
+          cdep
+        }
+        deepSetValue(ortb2, 'device.ext', Object.assign({}, ext, ortb2.device.ext));
+      }
+
       ortb2 = oneClient(ortb2);
       for (let section of CLIENT_SECTIONS) {
         if (hasSection(ortb2, section)) {
@@ -44,21 +58,11 @@ export const enrichFPD = hook('sync', (fpd) => {
           break;
         }
       }
+
       return ortb2;
     });
 });
 
-function mergeLegacySetConfigs(ortb2) {
-  // merge in values from "legacy" setConfig({app, site, device})
-  // TODO: deprecate these eventually
-  ['app', 'site', 'device'].forEach(prop => {
-    const cfg = config.getConfig(prop);
-    if (cfg != null) {
-      ortb2[prop] = mergeDeep({}, cfg, ortb2[prop]);
-    }
-  })
-}
-
 function winFallback(fn) {
   try {
     return fn(dep.getWindowTop());
@@ -78,6 +82,10 @@ function removeUndef(obj) {
   return getDefinedParams(obj, Object.keys(obj))
 }
 
+function tryToGetCdepLabel() {
+  return GreedyPromise.resolve('cookieDeprecationLabel' in navigator && isActivityAllowed(ACTIVITY_ACCESS_DEVICE, activityParams(MODULE_TYPE_PREBID, 'cdep')) && navigator.cookieDeprecationLabel.getValue());
+}
+
 const ENRICHMENTS = {
   site(ortb2, ri) {
     if (CLIENT_SECTIONS.filter(p => p !== 'site').some(hasSection.bind(null, ortb2))) {
@@ -91,21 +99,37 @@ const ENRICHMENTS = {
   },
   device() {
     return winFallback((win) => {
-      const w = win.innerWidth || win.document.documentElement.clientWidth || win.document.body.clientWidth;
-      const h = win.innerHeight || win.document.documentElement.clientHeight || win.document.body.clientHeight;
-      return {
+      // screen.width and screen.height are the physical dimensions of the screen
+      const w = win.screen.width;
+      const h = win.screen.height;
+
+      // vpw and vph are the viewport dimensions of the browser window
+      const vpw = win.innerWidth || win.document.documentElement.clientWidth || win.document.body.clientWidth;
+      const vph = win.innerHeight || win.document.documentElement.clientHeight || win.document.body.clientHeight;
+
+      const device = {
         w,
         h,
         dnt: getDNT() ? 1 : 0,
         ua: win.navigator.userAgent,
         language: win.navigator.language.split('-').shift(),
+        ext: {
+          vpw,
+          vph,
+        },
       };
+
+      if (win.navigator?.webdriver) {
+        deepSetValue(device, 'ext.webdriver', true);
+      }
+
+      return device;
     })
   },
   regs() {
     const regs = {};
     if (winFallback((win) => win.navigator.globalPrivacyControl)) {
-      deepSetValue(regs, 'ext.gpc', 1);
+      deepSetValue(regs, 'ext.gpc', '1');
     }
     const coppa = config.getConfig('coppa');
     if (typeof coppa === 'boolean') {
diff --git a/src/mediaTypes.js b/src/mediaTypes.js
index eea286f7af5..2afa2aefaf9 100644
--- a/src/mediaTypes.js
+++ b/src/mediaTypes.js
@@ -10,11 +10,11 @@
  * @typedef {('adpod')} VideoContext
  */
 
-/** @type MediaType */
+/** @type {MediaType} */
 export const NATIVE = 'native';
-/** @type MediaType */
+/** @type {MediaType} */
 export const VIDEO = 'video';
-/** @type MediaType */
+/** @type {MediaType} */
 export const BANNER = 'banner';
-/** @type VideoContext */
+/** @type {VideoContext} */
 export const ADPOD = 'adpod';
diff --git a/src/native.js b/src/native.js
index c4709dd77e2..19833406451 100644
--- a/src/native.js
+++ b/src/native.js
@@ -1,6 +1,5 @@
 import {
-  deepAccess,
-  deepClone,
+  deepClone, getDefinedParams,
   insertHtmlIntoIframe,
   isArray,
   isBoolean,
@@ -13,13 +12,20 @@ import {
 } from './utils.js';
 import {includes} from './polyfill.js';
 import {auctionManager} from './auctionManager.js';
-import CONSTANTS from './constants.json';
+import {NATIVE_ASSET_TYPES, NATIVE_IMAGE_TYPES, PREBID_NATIVE_DATA_KEYS_TO_ORTB, NATIVE_KEYS_THAT_ARE_NOT_ASSETS, NATIVE_KEYS} from './constants.js';
 import {NATIVE} from './mediaTypes.js';
+import {getRenderingData} from './adRendering.js';
+import {getCreativeRendererSource} from './creativeRenderers.js';
+
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
+ */
 
 export const nativeAdapters = [];
 
-export const NATIVE_TARGETING_KEYS = Object.keys(CONSTANTS.NATIVE_KEYS).map(
-  key => CONSTANTS.NATIVE_KEYS[key]
+export const NATIVE_TARGETING_KEYS = Object.keys(NATIVE_KEYS).map(
+  key => NATIVE_KEYS[key]
 );
 
 export const IMAGE = {
@@ -79,8 +85,6 @@ const SUPPORTED_TYPES = {
   image: IMAGE
 };
 
-const { NATIVE_ASSET_TYPES, NATIVE_IMAGE_TYPES, PREBID_NATIVE_DATA_KEYS_TO_ORTB, NATIVE_KEYS_THAT_ARE_NOT_ASSETS, NATIVE_KEYS } = CONSTANTS;
-
 // inverse native maps useful for converting to legacy
 const PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE = inverse(PREBID_NATIVE_DATA_KEYS_TO_ORTB);
 const NATIVE_ASSET_TYPES_INVERSE = inverse(NATIVE_ASSET_TYPES);
@@ -99,6 +103,12 @@ const TRACKER_EVENTS = {
   'viewable-video50': 4,
 }
 
+export function isNativeResponse(bidResponse) {
+  // check for native data and not mediaType; it's possible
+  // to treat banner responses as native
+  return bidResponse.native && typeof bidResponse.native === 'object';
+}
+
 /**
  * Recieves nativeParams from an adUnit. If the params were not of type 'type',
  * passes them on directly. If they were of type 'type', translate
@@ -118,7 +128,7 @@ export function processNativeAdUnitParams(params) {
 export function decorateAdUnitsWithNativeParams(adUnits) {
   adUnits.forEach(adUnit => {
     const nativeParams =
-      adUnit.nativeParams || deepAccess(adUnit, 'mediaTypes.native');
+      adUnit.nativeParams || adUnit?.mediaTypes?.native;
     if (nativeParams) {
       adUnit.nativeParams = processNativeAdUnitParams(nativeParams);
     }
@@ -202,7 +212,7 @@ function typeIsSupported(type) {
  */
 export const nativeAdUnit = adUnit => {
   const mediaType = adUnit.mediaType === 'native';
-  const mediaTypes = deepAccess(adUnit, 'mediaTypes.native');
+  const mediaTypes = adUnit?.mediaTypes?.native;
   return mediaType || mediaTypes;
 }
 export const nativeBidder = bid => includes(nativeAdapters, bid.bidder);
@@ -225,7 +235,7 @@ export function nativeBidIsValid(bid, {index = auctionManager.index} = {}) {
 }
 
 export function isNativeOpenRTBBidValid(bidORTB, bidRequestORTB) {
-  if (!deepAccess(bidORTB, 'link.url')) {
+  if (!bidORTB?.link?.url) {
     logError(`native response doesn't have 'link' property. Ortb response: `, bidORTB);
     return false;
   }
@@ -327,6 +337,23 @@ export function fireClickTrackers(nativeResponse, assetId = null, {fetchURL = tr
   }
 }
 
+export function setNativeResponseProperties(bid, adUnit) {
+  const nativeOrtbRequest = adUnit?.nativeOrtbRequest;
+  const nativeOrtbResponse = bid.native?.ortb;
+
+  if (nativeOrtbRequest && nativeOrtbResponse) {
+    const legacyResponse = toLegacyResponse(nativeOrtbResponse, nativeOrtbRequest);
+    Object.assign(bid.native, legacyResponse);
+  }
+
+  ['rendererUrl', 'adTemplate'].forEach(prop => {
+    const val = adUnit?.nativeParams?.[prop];
+    if (val) {
+      bid.native[prop] = getAssetValue(val);
+    }
+  });
+}
+
 /**
  * Gets native targeting key-value pairs
  * @param {Object} bid
@@ -335,16 +362,8 @@ export function fireClickTrackers(nativeResponse, assetId = null, {fetchURL = tr
 export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
   let keyValues = {};
   const adUnit = index.getAdUnit(bid);
-  if (deepAccess(adUnit, 'nativeParams.rendererUrl')) {
-    bid['native']['rendererUrl'] = getAssetValue(adUnit.nativeParams['rendererUrl']);
-  } else if (deepAccess(adUnit, 'nativeParams.adTemplate')) {
-    bid['native']['adTemplate'] = getAssetValue(adUnit.nativeParams['adTemplate']);
-  }
 
-  const globalSendTargetingKeys = deepAccess(
-    adUnit,
-    `nativeParams.sendTargetingKeys`
-  ) !== false;
+  const globalSendTargetingKeys = adUnit?.nativeParams?.ortb == null && adUnit?.nativeParams?.sendTargetingKeys !== false;
 
   const nativeKeys = getNativeKeys(adUnit);
 
@@ -353,15 +372,15 @@ export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
 
   Object.keys(flatBidNativeKeys).forEach(asset => {
     const key = nativeKeys[asset];
-    let value = getAssetValue(bid.native[asset]) || getAssetValue(deepAccess(bid, `native.ext.${asset}`));
+    let value = getAssetValue(bid.native[asset]) || getAssetValue(bid?.native?.ext?.[asset]);
 
     if (asset === 'adTemplate' || !key || !value) {
       return;
     }
 
-    let sendPlaceholder = deepAccess(adUnit, `nativeParams.${asset}.sendId`);
+    let sendPlaceholder = adUnit?.nativeParams?.[asset]?.sendId;
     if (typeof sendPlaceholder !== 'boolean') {
-      sendPlaceholder = deepAccess(adUnit, `nativeParams.ext.${asset}.sendId`);
+      sendPlaceholder = adUnit?.nativeParams?.ext?.[asset]?.sendId;
     }
 
     if (sendPlaceholder) {
@@ -369,9 +388,9 @@ export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
       value = placeholder;
     }
 
-    let assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.${asset}.sendTargetingKeys`);
+    let assetSendTargetingKeys = adUnit?.nativeParams?.[asset]?.sendTargetingKeys;
     if (typeof assetSendTargetingKeys !== 'boolean') {
-      assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.ext.${asset}.sendTargetingKeys`);
+      assetSendTargetingKeys = adUnit?.nativeParams?.ext?.[asset]?.sendTargetingKeys;
     }
 
     const sendTargeting = typeof assetSendTargetingKeys === 'boolean' ? assetSendTargetingKeys : globalSendTargetingKeys;
@@ -384,44 +403,56 @@ export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
   return keyValues;
 }
 
-function assetsMessage(data, adObject, keys, {index = auctionManager.index} = {}) {
-  const message = {
-    message: 'assetResponse',
-    adId: data.adId,
-  };
-
-  const adUnit = index.getAdUnit(adObject);
-  let nativeResp = adObject.native;
+function getNativeAssets(nativeProps, keys, ext = false) {
+  let assets = [];
+  Object.entries(nativeProps)
+    .filter(([k, v]) => v && ((ext === false && k === 'ext') || keys == null || keys.includes(k)))
+    .forEach(([key, value]) => {
+      if (ext === false && key === 'ext') {
+        assets.push(...getNativeAssets(value, keys, true));
+      } else if (ext || NATIVE_KEYS.hasOwnProperty(key)) {
+        assets.push({key, value: getAssetValue(value)});
+      }
+    });
+  return assets;
+}
 
-  if (adObject.native.ortb) {
-    message.ortb = adObject.native.ortb;
+export function getNativeRenderingData(bid, adUnit, keys) {
+  const data = {
+    ...getDefinedParams(bid.native, ['rendererUrl', 'adTemplate']),
+    assets: getNativeAssets(bid.native, keys),
+    nativeKeys: NATIVE_KEYS
+  };
+  if (bid.native.ortb) {
+    data.ortb = bid.native.ortb;
   } else if (adUnit.mediaTypes?.native?.ortb) {
-    message.ortb = toOrtbNativeResponse(adObject.native, adUnit.nativeOrtbRequest);
+    data.ortb = toOrtbNativeResponse(bid.native, adUnit.nativeOrtbRequest);
   }
-  message.assets = [];
-
-  (keys == null ? Object.keys(nativeResp) : keys).forEach(function(key) {
-    if (key === 'adTemplate' && nativeResp[key]) {
-      message.adTemplate = getAssetValue(nativeResp[key]);
-    } else if (key === 'rendererUrl' && nativeResp[key]) {
-      message.rendererUrl = getAssetValue(nativeResp[key]);
-    } else if (key === 'ext') {
-      Object.keys(nativeResp[key]).forEach(extKey => {
-        if (nativeResp[key][extKey]) {
-          const value = getAssetValue(nativeResp[key][extKey]);
-          message.assets.push({ key: extKey, value });
-        }
-      })
-    } else if (nativeResp[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
-      const value = getAssetValue(nativeResp[key]);
+  return data;
+}
 
-      message.assets.push({ key, value });
+function assetsMessage(data, adObject, keys, {index = auctionManager.index} = {}) {
+  const msg = {
+    message: 'assetResponse',
+    adId: data.adId,
+  };
+  let renderData = getRenderingData(adObject).native;
+  if (renderData) {
+    // if we have native rendering data (set up by the nativeRendering module)
+    // include it in full ("all assets") together with the renderer.
+    // this is to allow PUC to use dynamic renderers without requiring changes in creative setup
+    msg.native = Object.assign({}, renderData);
+    msg.renderer = getCreativeRendererSource(adObject);
+    if (keys != null) {
+      renderData.assets = renderData.assets.filter(({key}) => keys.includes(key))
     }
-  });
-  return message;
+  } else {
+    renderData = getNativeRenderingData(adObject, index.getAdUnit(adObject), keys);
+  }
+  return Object.assign(msg, renderData);
 }
 
-const NATIVE_KEYS_INVERTED = Object.fromEntries(Object.entries(CONSTANTS.NATIVE_KEYS).map(([k, v]) => [v, k]));
+const NATIVE_KEYS_INVERTED = Object.fromEntries(Object.entries(NATIVE_KEYS).map(([k, v]) => [v, k]));
 
 /**
  * Constructs a message object containing asset values for each of the
@@ -447,14 +478,14 @@ function getAssetValue(value) {
 function getNativeKeys(adUnit) {
   const extraNativeKeys = {}
 
-  if (deepAccess(adUnit, 'nativeParams.ext')) {
+  if (adUnit?.nativeParams?.ext) {
     Object.keys(adUnit.nativeParams.ext).forEach(extKey => {
       extraNativeKeys[extKey] = `hb_native_${extKey}`;
     })
   }
 
   return {
-    ...CONSTANTS.NATIVE_KEYS,
+    ...NATIVE_KEYS,
     ...extraNativeKeys
   }
 }
@@ -771,20 +802,20 @@ export function toOrtbNativeResponse(legacyResponse, ortbRequest) {
 export function toLegacyResponse(ortbResponse, ortbRequest) {
   const legacyResponse = {};
   const requestAssets = ortbRequest?.assets || [];
-  legacyResponse.clickUrl = ortbResponse.link.url;
+  legacyResponse.clickUrl = ortbResponse.link?.url;
   legacyResponse.privacyLink = ortbResponse.privacy;
   for (const asset of ortbResponse?.assets || []) {
     const requestAsset = requestAssets.find(reqAsset => asset.id === reqAsset.id);
     if (asset.title) {
       legacyResponse.title = asset.title.text;
     } else if (asset.img) {
-      legacyResponse[requestAsset.img.type === NATIVE_IMAGE_TYPES.MAIN ? 'image' : 'icon'] = {
+      legacyResponse[requestAsset?.img?.type === NATIVE_IMAGE_TYPES.MAIN ? 'image' : 'icon'] = {
         url: asset.img.url,
         width: asset.img.w,
         height: asset.img.h
       };
     } else if (asset.data) {
-      legacyResponse[PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE[NATIVE_ASSET_TYPES_INVERSE[requestAsset.data.type]]] = asset.data.value;
+      legacyResponse[PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE[NATIVE_ASSET_TYPES_INVERSE[requestAsset?.data?.type]]] = asset.data.value;
     }
   }
 
diff --git a/src/prebid.js b/src/prebid.js
index 6ad5120ce82..a536add9a96 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -2,15 +2,11 @@
 
 import {getGlobal} from './prebidGlobal.js';
 import {
-  callBurl,
-  createInvisibleIframe,
   deepAccess,
   deepClone,
   deepSetValue,
   flatten,
   generateUUID,
-  inIframe,
-  insertElement,
   isArray,
   isArrayOfNums,
   isEmpty,
@@ -22,8 +18,6 @@ import {
   logMessage,
   logWarn,
   mergeDeep,
-  replaceAuctionPrice,
-  replaceClickThrough,
   transformAdServerTargetingObj,
   uniques,
   unsupportedBidderMessage
@@ -36,27 +30,32 @@ import {isBidUsable, targeting} from './targeting.js';
 import {hook, wrapHook} from './hook.js';
 import {loadSession} from './debugging.js';
 import {includes} from './polyfill.js';
-import {adunitCounter} from './adUnits.js';
-import {executeRenderer, isRendererRequired} from './Renderer.js';
 import {createBid} from './bidfactory.js';
 import {storageCallbacks} from './storageManager.js';
-import {emitAdRenderFail, emitAdRenderSucceeded} from './adRendering.js';
 import {default as adapterManager, getS2SBidderSet} from './adapterManager.js';
-import CONSTANTS from './constants.json';
+import { BID_STATUS, EVENTS, NATIVE_KEYS } from './constants.js';
 import * as events from './events.js';
 import {newMetrics, useMetrics} from './utils/perfMetrics.js';
 import {defer, GreedyPromise} from './utils/promise.js';
 import {enrichFPD} from './fpd/enrichment.js';
 import {allConsent} from './consentHandler.js';
+import {
+  insertLocatorFrame,
+  markBidAsRendered,
+  markWinningBid,
+  renderAdDirect,
+  renderIfDeferred
+} from './adRendering.js';
 import {getHighestCpm} from './utils/reducers.js';
-import {fillVideoDefaults} from './video.js';
+import {ORTB_VIDEO_PARAMS, fillVideoDefaults, validateOrtbVideoFields} from './video.js';
+import { ORTB_BANNER_PARAMS } from './banner.js';
+import { BANNER, VIDEO } from './mediaTypes.js';
 
 const pbjsInstance = getGlobal();
 const { triggerUserSyncs } = userSync;
 
 /* private variables */
-const { ADD_AD_UNITS, BID_WON, REQUEST_BIDS, SET_TARGETING, STALE_RENDER } = CONSTANTS.EVENTS;
-const { PREVENT_WRITING_ON_MAIN_DOCUMENT, NO_AD, EXCEPTION, CANNOT_FIND_AD, MISSING_DOC_OR_ADID } = CONSTANTS.AD_RENDER_FAILED_REASON;
+const { ADD_AD_UNITS, REQUEST_BIDS, SET_TARGETING } = EVENTS;
 
 const eventValidators = {
   bidWon: checkDefinedPlacement
@@ -96,13 +95,6 @@ function checkDefinedPlacement(id) {
   return true;
 }
 
-function setRenderSize(doc, width, height) {
-  if (doc.defaultView && doc.defaultView.frameElement) {
-    doc.defaultView.frameElement.width = width;
-    doc.defaultView.frameElement.height = height;
-  }
-}
-
 function validateSizes(sizes, targLength) {
   let cleanSizes = [];
   if (isArray(sizes) && ((targLength) ? sizes.length === targLength : sizes.length > 0)) {
@@ -116,6 +108,42 @@ function validateSizes(sizes, targLength) {
   return cleanSizes;
 }
 
+// synchronize fields between mediaTypes[mediaType] and ortb2Imp[mediaType]
+export function syncOrtb2(adUnit, mediaType) {
+  const ortb2Imp = deepAccess(adUnit, `ortb2Imp.${mediaType}`);
+  const mediaTypes = deepAccess(adUnit, `mediaTypes.${mediaType}`);
+
+  if (!ortb2Imp && !mediaTypes) {
+    // omitting sync due to not present mediaType
+    return;
+  }
+
+  const fields = {
+    [VIDEO]: FEATURES.VIDEO && ORTB_VIDEO_PARAMS,
+    [BANNER]: ORTB_BANNER_PARAMS
+  }[mediaType];
+
+  if (!fields) {
+    return;
+  }
+
+  [...fields].forEach(([key, validator]) => {
+    const mediaTypesFieldValue = deepAccess(adUnit, `mediaTypes.${mediaType}.${key}`);
+    const ortbFieldValue = deepAccess(adUnit, `ortb2Imp.${mediaType}.${key}`);
+
+    if (mediaTypesFieldValue == undefined && ortbFieldValue == undefined) {
+      // omitting the params if it's not defined on either of sides
+    } else if (mediaTypesFieldValue == undefined) {
+      deepSetValue(adUnit, `mediaTypes.${mediaType}.${key}`, ortbFieldValue);
+    } else if (ortbFieldValue == undefined) {
+      deepSetValue(adUnit, `ortb2Imp.${mediaType}.${key}`, mediaTypesFieldValue);
+    } else {
+      logWarn(`adUnit ${adUnit.code}: specifies conflicting ortb2Imp.${mediaType}.${key} and mediaTypes.${mediaType}.${key}, the latter will be ignored`, adUnit);
+      deepSetValue(adUnit, `mediaTypes.${mediaType}.${key}`, ortbFieldValue);
+    }
+  });
+}
+
 function validateBannerMediaType(adUnit) {
   const validatedAdUnit = deepClone(adUnit);
   const banner = validatedAdUnit.mediaTypes.banner;
@@ -128,6 +156,7 @@ function validateBannerMediaType(adUnit) {
     logError('Detected a mediaTypes.banner object without a proper sizes field.  Please ensure the sizes are listed like: [[300, 250], ...].  Removing invalid mediaTypes.banner object from request.');
     delete validatedAdUnit.mediaTypes.banner
   }
+  syncOrtb2(validatedAdUnit, 'banner')
   return validatedAdUnit;
 }
 
@@ -150,21 +179,44 @@ function validateVideoMediaType(adUnit) {
       delete validatedAdUnit.mediaTypes.video.playerSize;
     }
   }
+  validateOrtbVideoFields(validatedAdUnit);
+  syncOrtb2(validatedAdUnit, 'video');
   return validatedAdUnit;
 }
 
 function validateNativeMediaType(adUnit) {
+  function err(msg) {
+    logError(`Error in adUnit "${adUnit.code}": ${msg}. Removing native request from ad unit`, adUnit);
+    delete validatedAdUnit.mediaTypes.native;
+    return validatedAdUnit;
+  }
+  function checkDeprecated(onDeprecated) {
+    for (const key of ['sendTargetingKeys', 'types']) {
+      if (native.hasOwnProperty(key)) {
+        const res = onDeprecated(key);
+        if (res) return res;
+      }
+    }
+  }
   const validatedAdUnit = deepClone(adUnit);
   const native = validatedAdUnit.mediaTypes.native;
   // if native assets are specified in OpenRTB format, remove legacy assets and print a warn.
   if (native.ortb) {
-    const legacyNativeKeys = Object.keys(CONSTANTS.NATIVE_KEYS).filter(key => CONSTANTS.NATIVE_KEYS[key].includes('hb_native_'));
+    if (native.ortb.assets?.some(asset => !isNumber(asset.id) || asset.id < 0 || asset.id % 1 !== 0)) {
+      return err('native asset ID must be a nonnegative integer');
+    }
+    if (checkDeprecated(key => err(`ORTB native requests cannot specify "${key}"`))) {
+      return validatedAdUnit;
+    }
+    const legacyNativeKeys = Object.keys(NATIVE_KEYS).filter(key => NATIVE_KEYS[key].includes('hb_native_'));
     const nativeKeys = Object.keys(native);
     const intersection = nativeKeys.filter(nativeKey => legacyNativeKeys.includes(nativeKey));
     if (intersection.length > 0) {
       logError(`when using native OpenRTB format, you cannot use legacy native properties. Deleting ${intersection} keys from request.`);
       intersection.forEach(legacyKey => delete validatedAdUnit.mediaTypes.native[legacyKey]);
     }
+  } else {
+    checkDeprecated(key => `mediaTypes.native.${key} is deprecated, consider using native ORTB instead`, adUnit);
   }
   if (native.image && native.image.sizes && !Array.isArray(native.image.sizes)) {
     logError('Please use an array of sizes for native.image.sizes field.  Removing invalid mediaTypes.native.image.sizes property from request.');
@@ -182,13 +234,12 @@ function validateNativeMediaType(adUnit) {
 }
 
 function validateAdUnitPos(adUnit, mediaType) {
-  let pos = deepAccess(adUnit, `mediaTypes.${mediaType}.pos`);
+  let pos = adUnit?.mediaTypes?.[mediaType]?.pos;
 
   if (!isNumber(pos) || isNaN(pos) || !isFinite(pos)) {
     let warning = `Value of property 'pos' on ad unit ${adUnit.code} should be of type: Number`;
 
     logWarn(warning);
-    events.emit(CONSTANTS.EVENTS.AUCTION_DEBUG, {type: 'WARNING', arguments: warning});
     delete adUnit.mediaTypes[mediaType].pos;
   }
 
@@ -299,7 +350,7 @@ pbjsInstance.getAdserverTargetingForAdUnitCodeStr = function (adunitCode) {
 
 /**
  * This function returns the query string targeting parameters available at this moment for a given ad unit. Note that some bidder's response may not have been received if you call this function too quickly after the requests are sent.
- * @param adUnitCode {string} adUnitCode to get the bid responses for
+ * @param adunitCode {string} adUnitCode to get the bid responses for
  * @alias module:pbjs.getHighestUnusedBidResponseForAdUnitCode
  * @returns {Object}  returnObj return bid
  */
@@ -409,7 +460,7 @@ pbjsInstance.getBidResponsesForAdUnitCode = function (adUnitCode) {
 /**
  * Set query string targeting on one or more GPT ad units.
  * @param {(string|string[])} adUnit a single `adUnit.code` or multiple.
- * @param {function(object)} customSlotMatching gets a GoogleTag slot and returns a filter function for adUnitCode, so you can decide to match on either eg. return slot => { return adUnitCode => { return slot.getSlotElementId() === 'myFavoriteDivId'; } };
+ * @param {function(object): function(string): boolean} customSlotMatching gets a GoogleTag slot and returns a filter function for adUnitCode, so you can decide to match on either eg. return slot => { return adUnitCode => { return slot.getSlotElementId() === 'myFavoriteDivId'; } };
  * @alias module:pbjs.setTargetingForGPTAsync
  */
 pbjsInstance.setTargetingForGPTAsync = function (adUnit, customSlotMatching) {
@@ -418,31 +469,12 @@ pbjsInstance.setTargetingForGPTAsync = function (adUnit, customSlotMatching) {
     logError('window.googletag is not defined on the page');
     return;
   }
-
-  // get our ad unit codes
-  let targetingSet = targeting.getAllTargeting(adUnit);
-
-  // first reset any old targeting
-  targeting.resetPresetTargeting(adUnit, customSlotMatching);
-
-  // now set new targeting keys
-  targeting.setTargetingForGPT(targetingSet, customSlotMatching);
-
-  Object.keys(targetingSet).forEach((adUnitCode) => {
-    Object.keys(targetingSet[adUnitCode]).forEach((targetingKey) => {
-      if (targetingKey === 'hb_adid') {
-        auctionManager.setStatusForBids(targetingSet[adUnitCode][targetingKey], CONSTANTS.BID_STATUS.BID_TARGETING_SET);
-      }
-    });
-  });
-
-  // emit event
-  events.emit(SET_TARGETING, targetingSet);
+  targeting.setTargetingForGPT(adUnit, customSlotMatching);
 };
 
 /**
  * Set query string targeting on all AST (AppNexus Seller Tag) ad units. Note that this function has to be called after all ad units on page are defined. For working example code, see [Using Prebid.js with AppNexus Publisher Ad Server](http://prebid.org/dev-docs/examples/use-prebid-with-appnexus-ad-server.html).
- * @param  {(string|string[])} adUnitCode adUnitCode or array of adUnitCodes
+ * @param  {(string|string[])} adUnitCodes adUnitCode or array of adUnitCodes
  * @alias module:pbjs.setTargetingForAst
  */
 pbjsInstance.setTargetingForAst = function (adUnitCodes) {
@@ -458,19 +490,6 @@ pbjsInstance.setTargetingForAst = function (adUnitCodes) {
   events.emit(SET_TARGETING, targeting.getAllTargeting());
 };
 
-/**
- * This function will check for presence of given node in given parent. If not present - will inject it.
- * @param {Node} node node, whose existance is in question
- * @param {Document} doc document element do look in
- * @param {string} tagName tag name to look in
- */
-function reinjectNodeIfRemoved(node, doc, tagName) {
-  const injectionNode = doc.querySelector(tagName);
-  if (!node.parentNode || node.parentNode !== injectionNode) {
-    insertElement(node, doc, tagName);
-  }
-}
-
 /**
  * This function will render the ad (based on params) in the given iframe document passed through.
  * Note that doc SHOULD NOT be the parent document page as we can't doc.write() asynchronously
@@ -481,103 +500,7 @@ function reinjectNodeIfRemoved(node, doc, tagName) {
 pbjsInstance.renderAd = hook('async', function (doc, id, options) {
   logInfo('Invoking $$PREBID_GLOBAL$$.renderAd', arguments);
   logMessage('Calling renderAd with adId :' + id);
-
-  if (!id) {
-    const message = `Error trying to write ad Id :${id} to the page. Missing adId`;
-    emitAdRenderFail({ reason: MISSING_DOC_OR_ADID, message, id });
-    return;
-  }
-
-  try {
-    // lookup ad by ad Id
-    const bid = auctionManager.findBidByAdId(id);
-    if (!bid) {
-      const message = `Error trying to write ad. Cannot find ad by given id : ${id}`;
-      emitAdRenderFail({ reason: CANNOT_FIND_AD, message, id });
-      return;
-    }
-
-    if (bid.status === CONSTANTS.BID_STATUS.RENDERED) {
-      logWarn(`Ad id ${bid.adId} has been rendered before`);
-      events.emit(STALE_RENDER, bid);
-      if (deepAccess(config.getConfig('auctionOptions'), 'suppressStaleRender')) {
-        return;
-      }
-    }
-
-    // replace macros according to openRTB with price paid = bid.cpm
-    bid.ad = replaceAuctionPrice(bid.ad, bid.originalCpm || bid.cpm);
-    bid.adUrl = replaceAuctionPrice(bid.adUrl, bid.originalCpm || bid.cpm);
-    // replacing clickthrough if submitted
-    if (options && options.clickThrough) {
-      const {clickThrough} = options;
-      bid.ad = replaceClickThrough(bid.ad, clickThrough);
-      bid.adUrl = replaceClickThrough(bid.adUrl, clickThrough);
-    }
-
-    // save winning bids
-    auctionManager.addWinningBid(bid);
-
-    // emit 'bid won' event here
-    events.emit(BID_WON, bid);
-
-    const {height, width, ad, mediaType, adUrl, renderer} = bid;
-
-    // video module
-    if (FEATURES.VIDEO) {
-      const adUnitCode = bid.adUnitCode;
-      const adUnit = pbjsInstance.adUnits.filter(adUnit => adUnit.code === adUnitCode);
-      const videoModule = pbjsInstance.videoModule;
-      if (adUnit.video && videoModule) {
-        videoModule.renderBid(adUnit.video.divId, bid);
-        return;
-      }
-    }
-
-    if (!doc) {
-      const message = `Error trying to write ad Id :${id} to the page. Missing document`;
-      emitAdRenderFail({ reason: MISSING_DOC_OR_ADID, message, id });
-      return;
-    }
-
-    const creativeComment = document.createComment(`Creative ${bid.creativeId} served by ${bid.bidder} Prebid.js Header Bidding`);
-    insertElement(creativeComment, doc, 'html');
-
-    if (isRendererRequired(renderer)) {
-      executeRenderer(renderer, bid, doc);
-      reinjectNodeIfRemoved(creativeComment, doc, 'html');
-      emitAdRenderSucceeded({ doc, bid, id });
-    } else if ((doc === document && !inIframe()) || mediaType === 'video') {
-      const message = `Error trying to write ad. Ad render call ad id ${id} was prevented from writing to the main document.`;
-      emitAdRenderFail({reason: PREVENT_WRITING_ON_MAIN_DOCUMENT, message, bid, id});
-    } else if (ad) {
-      doc.write(ad);
-      doc.close();
-      setRenderSize(doc, width, height);
-      reinjectNodeIfRemoved(creativeComment, doc, 'html');
-      callBurl(bid);
-      emitAdRenderSucceeded({ doc, bid, id });
-    } else if (adUrl) {
-      const iframe = createInvisibleIframe();
-      iframe.height = height;
-      iframe.width = width;
-      iframe.style.display = 'inline';
-      iframe.style.overflow = 'hidden';
-      iframe.src = adUrl;
-
-      insertElement(iframe, doc, 'body');
-      setRenderSize(doc, width, height);
-      reinjectNodeIfRemoved(creativeComment, doc, 'html');
-      callBurl(bid);
-      emitAdRenderSucceeded({ doc, bid, id });
-    } else {
-      const message = `Error trying to write ad. No ad for bid response id: ${id}`;
-      emitAdRenderFail({reason: NO_AD, message, bid, id});
-    }
-  } catch (e) {
-    const message = `Error trying to write ad Id :${id} to the page:${e.message}`;
-    emitAdRenderFail({ reason: EXCEPTION, message, id });
-  }
+  renderAdDirect(doc, id, options);
 });
 
 /**
@@ -625,6 +548,9 @@ pbjsInstance.requestBids = (function() {
     events.emit(REQUEST_BIDS);
     const cbTimeout = timeout || config.getConfig('bidderTimeout');
     logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
+    if (adUnitCodes != null && !Array.isArray(adUnitCodes)) {
+      adUnitCodes = [adUnitCodes];
+    }
     if (adUnitCodes && adUnitCodes.length) {
       // if specific adUnitCodes supplied filter adUnits for those codes
       adUnits = adUnits.filter(unit => includes(adUnitCodes, unit.code));
@@ -632,9 +558,10 @@ pbjsInstance.requestBids = (function() {
       // otherwise derive adUnitCodes from adUnits
       adUnitCodes = adUnits && adUnits.map(unit => unit.code);
     }
+    adUnitCodes = adUnitCodes.filter(uniques);
     const ortb2Fragments = {
       global: mergeDeep({}, config.getAnyConfig('ortb2') || {}, ortb2 || {}),
-      bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, cfg.ortb2]).filter(([_, ortb2]) => ortb2 != null))
+      bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, deepClone(cfg.ortb2)]).filter(([_, ortb2]) => ortb2 != null))
     }
     return enrichFPD(GreedyPromise.resolve(ortb2Fragments.global)).then(global => {
       ortb2Fragments.global = global;
@@ -676,6 +603,8 @@ export const startAuction = hook('async', function ({ bidsBackHandler, timeout:
     defer.resolve({bids, timedOut, auctionId})
   }
 
+  const tids = {};
+
   /*
    * for a given adunit which supports a set of mediaTypes
    * and a given bidder which supports a set of mediaTypes
@@ -691,15 +620,18 @@ export const startAuction = hook('async', function ({ bidsBackHandler, timeout:
     const bidderRegistry = adapterManager.bidderRegistry;
 
     const bidders = allBidders.filter(bidder => !s2sBidders.has(bidder));
-
-    const tid = adUnit.ortb2Imp?.ext?.tid || generateUUID();
-    adUnit.transactionId = tid;
+    adUnit.adUnitId = generateUUID();
+    const tid = adUnit.ortb2Imp?.ext?.tid;
+    if (tid) {
+      if (tids.hasOwnProperty(adUnit.code)) {
+        logWarn(`Multiple distinct ortb2Imp.ext.tid were provided for twin ad units '${adUnit.code}'`)
+      } else {
+        tids[adUnit.code] = tid;
+      }
+    }
     if (ttlBuffer != null && !adUnit.hasOwnProperty('ttlBuffer')) {
       adUnit.ttlBuffer = ttlBuffer;
     }
-    // Populate ortb2Imp.ext.tid with transactionId. Specifying a transaction ID per item in the ortb impression array, lets multiple transaction IDs be transmitted in a single bid request.
-    deepSetValue(adUnit, 'ortb2Imp.ext.tid', tid);
-
     bidders.forEach(bidder => {
       const adapter = bidderRegistry[bidder];
       const spec = adapter && adapter.getSpec && adapter.getSpec();
@@ -712,17 +644,21 @@ export const startAuction = hook('async', function ({ bidsBackHandler, timeout:
         // drop the bidder from the ad unit if it's not compatible
         logWarn(unsupportedBidderMessage(adUnit, bidder));
         adUnit.bids = adUnit.bids.filter(bid => bid.bidder !== bidder);
-      } else {
-        adunitCounter.incrementBidderRequestsCounter(adUnit.code, bidder);
       }
     });
-    adunitCounter.incrementRequestsCounter(adUnit.code);
   });
-
   if (!adUnits || adUnits.length === 0) {
     logMessage('No adUnits configured. No bids requested.');
     auctionDone();
   } else {
+    adUnits.forEach(au => {
+      const tid = au.ortb2Imp?.ext?.tid || tids[au.code] || generateUUID();
+      if (!tids.hasOwnProperty(au.code)) {
+        tids[au.code] = tid;
+      }
+      au.transactionId = tid;
+      deepSetValue(au, 'ortb2Imp.ext.tid', tid);
+    });
     const auction = auctionManager.createAuction({
       adUnits,
       adUnitCodes,
@@ -757,7 +693,7 @@ export function executeCallbacks(fn, reqBidsConfigObj) {
   }
 }
 
-// This hook will execute all storage callbacks which were registered before gdpr enforcement hook was added. Some bidders, user id modules use storage functions when module is parsed but gdpr enforcement hook is not added at that stage as setConfig callbacks are yet to be called. Hence for such calls we execute all the stored callbacks just before requestBids. At this hook point we will know for sure that gdprEnforcement module is added or not
+// This hook will execute all storage callbacks which were registered before gdpr enforcement hook was added. Some bidders, user id modules use storage functions when module is parsed but gdpr enforcement hook is not added at that stage as setConfig callbacks are yet to be called. Hence for such calls we execute all the stored callbacks just before requestBids. At this hook point we will know for sure that tcfControl module is added or not
 pbjsInstance.requestBids.before(executeCallbacks, 49);
 
 /**
@@ -969,7 +905,7 @@ pbjsInstance.getAllWinningBids = function () {
  */
 pbjsInstance.getAllPrebidWinningBids = function () {
   return auctionManager.getBidsReceived()
-    .filter(bid => bid.status === CONSTANTS.BID_STATUS.BID_TARGETING_SET);
+    .filter(bid => bid.status === BID_STATUS.BID_TARGETING_SET);
 };
 
 /**
@@ -983,6 +919,10 @@ pbjsInstance.getHighestCpmBids = function (adUnitCode) {
   return targeting.getWinningBids(adUnitCode);
 };
 
+pbjsInstance.clearAllAuctions = function () {
+  auctionManager.clearAllAuctions();
+};
+
 if (FEATURES.VIDEO) {
   /**
    * Mark the winning bid as used, should only be used in conjunction with video
@@ -992,32 +932,26 @@ if (FEATURES.VIDEO) {
    *
    * @alias module:pbjs.markWinningBidAsUsed
    */
-  pbjsInstance.markWinningBidAsUsed = function (markBidRequest) {
-    const bids = fetchReceivedBids(markBidRequest, 'Improper use of markWinningBidAsUsed. It needs an adUnitCode or an adId to function.');
-
+  pbjsInstance.markWinningBidAsUsed = function ({adId, adUnitCode, analytics = false}) {
+    let bids;
+    if (adUnitCode && adId == null) {
+      bids = targeting.getWinningBids(adUnitCode);
+    } else if (adId) {
+      bids = auctionManager.getBidsReceived().filter(bid => bid.adId === adId)
+    } else {
+      logWarn('Improper use of markWinningBidAsUsed. It needs an adUnitCode or an adId to function.');
+    }
     if (bids.length > 0) {
-      auctionManager.addWinningBid(bids[0]);
+      if (analytics) {
+        markWinningBid(bids[0]);
+      } else {
+        auctionManager.addWinningBid(bids[0]);
+      }
+      markBidAsRendered(bids[0])
     }
   }
 }
 
-const fetchReceivedBids = (bidRequest, warningMessage) => {
-  let bids = [];
-
-  if (bidRequest.adUnitCode && bidRequest.adId) {
-    bids = auctionManager.getBidsReceived()
-      .filter(bid => bid.adId === bidRequest.adId && bid.adUnitCode === bidRequest.adUnitCode);
-  } else if (bidRequest.adUnitCode) {
-    bids = targeting.getWinningBids(bidRequest.adUnitCode);
-  } else if (bidRequest.adId) {
-    bids = auctionManager.getBidsReceived().filter(bid => bid.adId === bidRequest.adId);
-  } else {
-    logWarn(warningMessage);
-  }
-
-  return bids;
-};
-
 /**
  * Get Prebid config options
  * @param {Object} options
@@ -1054,12 +988,12 @@ pbjsInstance.que.push(() => listenMessagesFromCreative());
  * by prebid once it's done loading. If it runs after prebid loads, then this monkey-patch causes their
  * function to execute immediately.
  *
- * @memberof pbjs
  * @param  {function} command A function which takes no arguments. This is guaranteed to run exactly once, and only after
  *                            the Prebid script has been fully loaded.
  * @alias module:pbjs.cmd.push
+ * @alias module:pbjs.que.push
  */
-pbjsInstance.cmd.push = function (command) {
+function quePush(command) {
   if (typeof command === 'function') {
     try {
       command.call();
@@ -1069,9 +1003,7 @@ pbjsInstance.cmd.push = function (command) {
   } else {
     logError('Commands written into $$PREBID_GLOBAL$$.cmd.push must be wrapped in a function');
   }
-};
-
-pbjsInstance.que.push = pbjsInstance.cmd.push;
+}
 
 function processQueue(queue) {
   queue.forEach(function (cmd) {
@@ -1090,6 +1022,8 @@ function processQueue(queue) {
  * @alias module:pbjs.processQueue
  */
 pbjsInstance.processQueue = function () {
+  pbjsInstance.que.push = pbjsInstance.cmd.push = quePush;
+  insertLocatorFrame();
   hook.ready();
   processQueue(pbjsInstance.que);
   processQueue(pbjsInstance.cmd);
@@ -1098,19 +1032,13 @@ pbjsInstance.processQueue = function () {
 /**
  * @alias module:pbjs.triggerBilling
  */
-pbjsInstance.triggerBilling = (winningBid) => {
-  const bids = fetchReceivedBids(winningBid, 'Improper use of triggerBilling. It requires a bid with at least an adUnitCode or an adId to function.');
-  const triggerBillingBid = bids.find(bid => bid.requestId === winningBid.requestId) || bids[0];
-
-  if (bids.length > 0 && triggerBillingBid) {
-    try {
-      adapterManager.callBidBillableBidder(triggerBillingBid);
-    } catch (e) {
-      logError('Error when triggering billing :', e);
-    }
-  } else {
-    logWarn('The bid provided to triggerBilling did not match any bids received.');
-  }
+pbjsInstance.triggerBilling = ({adId, adUnitCode}) => {
+  auctionManager.getAllWinningBids()
+    .filter((bid) => bid.adId === adId || (adId == null && bid.adUnitCode === adUnitCode))
+    .forEach((bid) => {
+      adapterManager.triggerBilling(bid);
+      renderIfDeferred(bid);
+    });
 };
 
 export default pbjsInstance;
diff --git a/src/prebid.public.js b/src/prebid.public.js
new file mode 100644
index 00000000000..f05e671ac24
--- /dev/null
+++ b/src/prebid.public.js
@@ -0,0 +1 @@
+export {default} from './prebid.js';
diff --git a/src/refererDetection.js b/src/refererDetection.js
index 93ebf085dd5..bfe7fb02671 100644
--- a/src/refererDetection.js
+++ b/src/refererDetection.js
@@ -34,9 +34,11 @@ export function ensureProtocol(url, win = window) {
 
 /**
  * Extract the domain portion from a URL.
- * @param url
- * @param noLeadingWww: if true, remove 'www.' appearing at the beginning of the domain.
- * @param noPort: if true, do not include the ':[port]' portion
+ * @param {string} url - The URL to extract the domain from.
+ * @param {Object} options - Options for parsing the domain.
+ * @param {boolean} options.noLeadingWww - If true, remove 'www.' appearing at the beginning of the domain.
+ * @param {boolean} options.noPort - If true, do not include the ':[port]' portion.
+ * @return {string|undefined} - The extracted domain or undefined if the URL is invalid.
  */
 export function parseDomain(url, {noLeadingWww = false, noPort = false} = {}) {
   try {
@@ -108,13 +110,13 @@ export function detectReferer(win) {
    * @property {string|null} ref the referrer (document.referrer) to the current page, or null if not available (due to cross-origin restrictions)
    * @property {string} topmostLocation of the top-most frame for which we could guess the location. Outside of cross-origin scenarios, this is equivalent to `location`.
    * @property {number} numIframes number of steps between window.self and window.top
-   * @property {Array[string|null]} stack our best guess at the location for each frame, in the direction top -> self.
+   * @property {Array} stack our best guess at the location for each frame, in the direction top -> self.
    */
 
   /**
    * Walk up the windows to get the origin stack and best available referrer, canonical URL, etc.
    *
-   * @returns {refererInfo}
+   * @returns {refererInfo} An object containing referer information.
    */
   function refererInfo() {
     const stack = [];
diff --git a/src/secureCreatives.js b/src/secureCreatives.js
index c719bc191f2..baa8a82eec7 100644
--- a/src/secureCreatives.js
+++ b/src/secureCreatives.js
@@ -3,50 +3,60 @@
    access to a publisher page from creative payloads.
  */
 
-import * as events from './events.js';
-import {fireNativeTrackers, getAllAssetsMessage, getAssetMessage} from './native.js';
-import constants from './constants.json';
-import {deepAccess, isApnGetTagDefined, isGptPubadsDefined, logError, logWarn, replaceAuctionPrice} from './utils.js';
-import {auctionManager} from './auctionManager.js';
+import {getAllAssetsMessage, getAssetMessage} from './native.js';
+import {BID_STATUS, MESSAGES} from './constants.js';
+import {isApnGetTagDefined, isGptPubadsDefined, logError, logWarn} from './utils.js';
 import {find, includes} from './polyfill.js';
-import {executeRenderer, isRendererRequired} from './Renderer.js';
-import {config} from './config.js';
-import {emitAdRenderFail, emitAdRenderSucceeded} from './adRendering.js';
-
-const BID_WON = constants.EVENTS.BID_WON;
-const STALE_RENDER = constants.EVENTS.STALE_RENDER;
-const WON_AD_IDS = new WeakSet();
+import {
+  deferRendering,
+  getBidToRender,
+  handleCreativeEvent,
+  handleNativeMessage,
+  handleRender,
+  markWinner
+} from './adRendering.js';
+import {getCreativeRendererSource} from './creativeRenderers.js';
+
+const { REQUEST, RESPONSE, NATIVE, EVENT } = MESSAGES;
 
 const HANDLER_MAP = {
-  'Prebid Request': handleRenderRequest,
-  'Prebid Event': handleEventRequest,
-}
+  [REQUEST]: handleRenderRequest,
+  [EVENT]: handleEventRequest,
+};
 
 if (FEATURES.NATIVE) {
   Object.assign(HANDLER_MAP, {
-    'Prebid Native': handleNativeRequest,
-  })
+    [NATIVE]: handleNativeRequest,
+  });
 }
 
 export function listenMessagesFromCreative() {
-  window.addEventListener('message', receiveMessage, false);
+  window.addEventListener('message', function (ev) {
+    receiveMessage(ev);
+  }, false);
 }
 
 export function getReplier(ev) {
   if (ev.origin == null && ev.ports.length === 0) {
     return function () {
-      const msg = 'Cannot post message to a frame with null origin. Please update creatives to use MessageChannel, see https://github.com/prebid/Prebid.js/issues/7870'
-      logError(msg)
+      const msg = 'Cannot post message to a frame with null origin. Please update creatives to use MessageChannel, see https://github.com/prebid/Prebid.js/issues/7870';
+      logError(msg);
       throw new Error(msg);
-    }
+    };
   } else if (ev.ports.length > 0) {
     return function (message) {
       ev.ports[0].postMessage(JSON.stringify(message));
-    }
+    };
   } else {
     return function (message) {
       ev.source.postMessage(JSON.stringify(message), ev.origin);
-    }
+    };
+  }
+}
+
+function ensureAdId(adId, reply) {
+  return function (data, ...args) {
+    return reply(Object.assign({}, data, {adId}), ...args);
   }
 }
 
@@ -59,49 +69,34 @@ export function receiveMessage(ev) {
     return;
   }
 
-  if (data && data.adId && data.message) {
-    const adObject = find(auctionManager.getBidsReceived(), function (bid) {
-      return bid.adId === data.adId;
-    });
-    if (HANDLER_MAP.hasOwnProperty(data.message)) {
-      HANDLER_MAP[data.message](getReplier(ev), data, adObject);
-    }
+  if (data && data.adId && data.message && HANDLER_MAP.hasOwnProperty(data.message)) {
+    return getBidToRender(data.adId, data.message === MESSAGES.REQUEST).then(adObject => {
+      HANDLER_MAP[data.message](ensureAdId(data.adId, getReplier(ev)), data, adObject);
+    })
   }
 }
 
-function handleRenderRequest(reply, data, adObject) {
-  if (adObject == null) {
-    emitAdRenderFail({
-      reason: constants.AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
-      message: `Cannot find ad for cross-origin render request: '${data.adId}'`,
-      id: data.adId
-    });
-    return;
-  }
-  if (adObject.status === constants.BID_STATUS.RENDERED) {
-    logWarn(`Ad id ${adObject.adId} has been rendered before`);
-    events.emit(STALE_RENDER, adObject);
-    if (deepAccess(config.getConfig('auctionOptions'), 'suppressStaleRender')) {
-      return;
-    }
+function getResizer(adId, bidResponse) {
+  // in some situations adId !== bidResponse.adId
+  // the first is the one that was requested and is tied to the element
+  // the second is the one that is being rendered (sometimes different, e.g. in some paapi setups)
+  return function (width, height) {
+    resizeRemoteCreative({...bidResponse, width, height, adId});
   }
-
-  try {
-    _sendAdToCreative(adObject, reply);
-  } catch (e) {
-    emitAdRenderFail({
-      reason: constants.AD_RENDER_FAILED_REASON.EXCEPTION,
-      message: e.message,
-      id: data.adId,
-      bid: adObject
-    });
-    return;
-  }
-
-  // save winning bids
-  auctionManager.addWinningBid(adObject);
-
-  events.emit(BID_WON, adObject);
+}
+function handleRenderRequest(reply, message, bidResponse) {
+  handleRender({
+    renderFn(adData) {
+      reply(Object.assign({
+        message: RESPONSE,
+        renderer: getCreativeRendererSource(bidResponse)
+      }, adData));
+    },
+    resizeFn: getResizer(message.adId, bidResponse),
+    options: message.options,
+    adId: message.adId,
+    bidResponse
+  });
 }
 
 function handleNativeRequest(reply, data, adObject) {
@@ -114,27 +109,16 @@ function handleNativeRequest(reply, data, adObject) {
     logError(`Cannot find ad for x-origin event request: '${data.adId}'`);
     return;
   }
-
-  if (!WON_AD_IDS.has(adObject)) {
-    WON_AD_IDS.add(adObject);
-    auctionManager.addWinningBid(adObject);
-    events.emit(BID_WON, adObject);
-  }
-
   switch (data.action) {
     case 'assetRequest':
-      reply(getAssetMessage(data, adObject));
+      deferRendering(adObject, () => reply(getAssetMessage(data, adObject)));
       break;
     case 'allAssetRequest':
-      reply(getAllAssetsMessage(data, adObject));
-      break;
-    case 'resizeNativeHeight':
-      adObject.height = data.height;
-      adObject.width = data.width;
-      resizeRemoteCreative(adObject);
+      deferRendering(adObject, () => reply(getAllAssetsMessage(data, adObject)));
       break;
     default:
-      fireNativeTrackers(data, adObject);
+      handleNativeMessage(data, adObject, {resizeFn: getResizer(data.adId, adObject)});
+      markWinner(adObject);
   }
 }
 
@@ -143,60 +127,27 @@ function handleEventRequest(reply, data, adObject) {
     logError(`Cannot find ad '${data.adId}' for x-origin event request`);
     return;
   }
-  if (adObject.status !== constants.BID_STATUS.RENDERED) {
-    logWarn(`Received x-origin event request without corresponding render request for ad '${data.adId}'`);
+  if (adObject.status !== BID_STATUS.RENDERED) {
+    logWarn(`Received x-origin event request without corresponding render request for ad '${adObject.adId}'`);
     return;
   }
-  switch (data.event) {
-    case constants.EVENTS.AD_RENDER_FAILED:
-      emitAdRenderFail({
-        bid: adObject,
-        id: data.adId,
-        reason: data.info.reason,
-        message: data.info.message
-      });
-      break;
-    case constants.EVENTS.AD_RENDER_SUCCEEDED:
-      emitAdRenderSucceeded({
-        doc: null,
-        bid: adObject,
-        id: data.adId
-      });
-      break;
-    default:
-      logError(`Received x-origin event request for unsupported event: '${data.event}' (adId: '${data.adId}')`)
-  }
+  return handleCreativeEvent(data, adObject);
 }
 
-export function _sendAdToCreative(adObject, reply) {
-  const { adId, ad, adUrl, width, height, renderer, cpm, originalCpm } = adObject;
-  // rendering for outstream safeframe
-  if (isRendererRequired(renderer)) {
-    executeRenderer(renderer, adObject);
-  } else if (adId) {
-    resizeRemoteCreative(adObject);
-    reply({
-      message: 'Prebid Response',
-      ad: replaceAuctionPrice(ad, originalCpm || cpm),
-      adUrl: replaceAuctionPrice(adUrl, originalCpm || cpm),
-      adId,
-      width,
-      height
-    });
+export function resizeRemoteCreative({adId, adUnitCode, width, height}) {
+  function getDimension(value) {
+    return value ? value + 'px' : '100%';
   }
-}
-
-function resizeRemoteCreative({ adId, adUnitCode, width, height }) {
   // resize both container div + iframe
   ['div', 'iframe'].forEach(elmType => {
     // not select element that gets removed after dfp render
     let element = getElementByAdUnit(elmType + ':not([style*="display: none"])');
     if (element) {
       let elementStyle = element.style;
-      elementStyle.width = width ? width + 'px' : '100%';
-      elementStyle.height = height + 'px';
+      elementStyle.width = getDimension(width)
+      elementStyle.height = getDimension(height);
     } else {
-      logWarn(`Unable to locate matching page element for adUnitCode ${adUnitCode}.  Can't resize it to ad's dimensions.  Please review setup.`);
+      logError(`Unable to locate matching page element for adUnitCode ${adUnitCode}.  Can't resize it to ad's dimensions.  Please review setup.`);
     }
   });
 
@@ -208,9 +159,9 @@ function resizeRemoteCreative({ adId, adUnitCode, width, height }) {
 
   function getElementIdBasedOnAdServer(adId, adUnitCode) {
     if (isGptPubadsDefined()) {
-      return getDfpElementId(adId)
+      return getDfpElementId(adId);
     } else if (isApnGetTagDefined()) {
-      return getAstElementId(adUnitCode)
+      return getAstElementId(adUnitCode);
     } else {
       return adUnitCode;
     }
diff --git a/src/storageManager.js b/src/storageManager.js
index 87d714f77b8..0c0d29dbee4 100644
--- a/src/storageManager.js
+++ b/src/storageManager.js
@@ -18,6 +18,8 @@ export const STORAGE_TYPE_COOKIES = 'cookie';
 
 export let storageCallbacks = [];
 
+/* eslint-disable prebid/no-global */
+
 /*
  *  Storage manager constructor. Consumers should prefer one of `getStorageManager` or `getCoreStorageManager`.
  */
@@ -56,6 +58,7 @@ export function newStorageManager({moduleName, moduleType} = {}, {isAllowed = is
    * If not specified, defaults to the host portion of the current document location.
    * If a domain is specified, subdomains are always included.
    * Domain must match the domain of the JavaScript origin. Setting cookies to foreign domains will be silently ignored.
+   * @param {function} [done]
    */
   const setCookie = function (key, value, expires, sameSite, domain, done) {
     let cb = function (result) {
@@ -64,6 +67,7 @@ export function newStorageManager({moduleName, moduleType} = {}, {isAllowed = is
         const expiresPortion = (expires && expires !== '') ? ` ;expires=${expires}` : '';
         const isNone = (sameSite != null && sameSite.toLowerCase() == 'none')
         const secure = (isNone) ? '; Secure' : '';
+        // eslint-disable-next-line prebid/no-member
         document.cookie = `${key}=${encodeURIComponent(value)}${expiresPortion}; path=/${domainPortion}${sameSite ? `; SameSite=${sameSite}` : ''}${secure}`;
       }
     }
@@ -72,6 +76,7 @@ export function newStorageManager({moduleName, moduleType} = {}, {isAllowed = is
 
   /**
    * @param {string} name
+   * @param {function} [done]
    * @returns {(string|null)}
    */
   const getCookie = function(name, done) {
@@ -86,27 +91,7 @@ export function newStorageManager({moduleName, moduleType} = {}, {isAllowed = is
   };
 
   /**
-   * @returns {boolean}
-   */
-  const localStorageIsEnabled = function (done) {
-    let cb = function (result) {
-      if (result && result.valid) {
-        try {
-          localStorage.setItem('prebid.cookieTest', '1');
-          return localStorage.getItem('prebid.cookieTest') === '1';
-        } catch (error) {
-        } finally {
-          try {
-            localStorage.removeItem('prebid.cookieTest');
-          } catch (error) {}
-        }
-      }
-      return false;
-    }
-    return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
-  }
-
-  /**
+   * @param {function} [done]
    * @returns {boolean}
    */
   const cookiesAreEnabled = function (done) {
@@ -119,73 +104,84 @@ export function newStorageManager({moduleName, moduleType} = {}, {isAllowed = is
     return schedule(cb, STORAGE_TYPE_COOKIES, done);
   }
 
-  /**
-   * @param {string} key
-   * @param {string} value
-   */
-  const setDataInLocalStorage = function (key, value, done) {
-    let cb = function (result) {
-      if (result && result.valid && hasLocalStorage()) {
-        window.localStorage.setItem(key, value);
-      }
-    }
-    return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
-  }
+  function storageMethods(name) {
+    const capName = name.charAt(0).toUpperCase() + name.substring(1);
+    const backend = () => window[name];
 
-  /**
-   * @param {string} key
-   * @returns {(string|null)}
-   */
-  const getDataFromLocalStorage = function (key, done) {
-    let cb = function (result) {
-      if (result && result.valid && hasLocalStorage()) {
-        return window.localStorage.getItem(key);
-      }
-      return null;
-    }
-    return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
-  }
-
-  /**
-   * @param {string} key
-   */
-  const removeDataFromLocalStorage = function (key, done) {
-    let cb = function (result) {
-      if (result && result.valid && hasLocalStorage()) {
-        window.localStorage.removeItem(key);
+    const hasStorage = function (done) {
+      let cb = function (result) {
+        if (result && result.valid) {
+          try {
+            return !!backend();
+          } catch (e) {
+            logError(`${name} api disabled`);
+          }
+        }
+        return false;
       }
+      return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
     }
-    return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
-  }
 
-  /**
-   * @returns {boolean}
-   */
-  const hasLocalStorage = function (done) {
-    let cb = function (result) {
-      if (result && result.valid) {
-        try {
-          return !!window.localStorage;
-        } catch (e) {
-          logError('Local storage api disabled');
+    return {
+      [`has${capName}`]: hasStorage,
+      [`${name}IsEnabled`](done) {
+        let cb = function (result) {
+          if (result && result.valid) {
+            try {
+              backend().setItem('prebid.cookieTest', '1');
+              return backend().getItem('prebid.cookieTest') === '1';
+            } catch (error) {
+            } finally {
+              try {
+                backend().removeItem('prebid.cookieTest');
+              } catch (error) {}
+            }
+          }
+          return false;
         }
+        return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
+      },
+      [`setDataIn${capName}`](key, value, done) {
+        let cb = function (result) {
+          if (result && result.valid && hasStorage()) {
+            backend().setItem(key, value);
+          }
+        }
+        return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
+      },
+      [`getDataFrom${capName}`](key, done) {
+        let cb = function (result) {
+          if (result && result.valid && hasStorage()) {
+            return backend().getItem(key);
+          }
+          return null;
+        }
+        return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
+      },
+      [`removeDataFrom${capName}`](key, done) {
+        let cb = function (result) {
+          if (result && result.valid && hasStorage()) {
+            backend().removeItem(key);
+          }
+        }
+        return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
       }
-      return false;
     }
-    return schedule(cb, STORAGE_TYPE_LOCALSTORAGE, done);
   }
 
   /**
    * Returns all cookie values from the jar whose names contain the `keyLike`
    * Needs to exist in `utils.js` as it follows the StorageHandler interface defined in live-connect-js. If that module were to be removed, this function can go as well.
    * @param {string} keyLike
-   * @return {[]}
+   * @param {function} [done]
+   * @returns {string[]}
    */
   const findSimilarCookies = function(keyLike, done) {
     let cb = function (result) {
       if (result && result.valid) {
         const all = [];
         if (hasDeviceAccess()) {
+          // eslint-disable-next-line prebid/no-member
           const cookies = document.cookie.split(';');
           while (cookies.length) {
             const cookie = cookies.pop();
@@ -207,12 +203,9 @@ export function newStorageManager({moduleName, moduleType} = {}, {isAllowed = is
   return {
     setCookie,
     getCookie,
-    localStorageIsEnabled,
     cookiesAreEnabled,
-    setDataInLocalStorage,
-    getDataFromLocalStorage,
-    removeDataFromLocalStorage,
-    hasLocalStorage,
+    ...storageMethods('localStorage'),
+    ...storageMethods('sessionStorage'),
     findSimilarCookies
   }
 }
diff --git a/src/targeting.js b/src/targeting.js
index 0aa395aa9a3..1903524984b 100644
--- a/src/targeting.js
+++ b/src/targeting.js
@@ -1,3 +1,21 @@
+import { auctionManager } from './auctionManager.js';
+import { getBufferedTTL } from './bidTTL.js';
+import { bidderSettings } from './bidderSettings.js';
+import { config } from './config.js';
+import {
+  BID_STATUS,
+  DEFAULT_TARGETING_KEYS,
+  EVENTS,
+  JSON_MAPPING,
+  NATIVE_KEYS,
+  STATUS,
+  TARGETING_KEYS
+} from './constants.js';
+import * as events from './events.js';
+import { hook } from './hook.js';
+import { ADPOD } from './mediaTypes.js';
+import { NATIVE_TARGETING_KEYS } from './native.js';
+import { find, includes } from './polyfill.js';
 import {
   deepAccess,
   deepClone,
@@ -11,19 +29,11 @@ import {
   logInfo,
   logMessage,
   logWarn,
+  sortByHighestCpm,
   timestamp,
   uniques,
 } from './utils.js';
-import {config} from './config.js';
-import {NATIVE_TARGETING_KEYS} from './native.js';
-import {auctionManager} from './auctionManager.js';
-import {ADPOD} from './mediaTypes.js';
-import {hook} from './hook.js';
-import {bidderSettings} from './bidderSettings.js';
-import {find, includes} from './polyfill.js';
-import CONSTANTS from './constants.json';
-import {getHighestCpm, getOldestHighestCpmBid} from './utils/reducers.js';
-import {getTTL} from './bidTTL.js';
+import { getHighestCpm, getOldestHighestCpmBid } from './utils/reducers.js';
 
 var pbTargetingKeys = [];
 
@@ -33,19 +43,19 @@ const CFG_ALLOW_TARGETING_KEYS = `targetingControls.allowTargetingKeys`;
 const CFG_ADD_TARGETING_KEYS = `targetingControls.addTargetingKeys`;
 const TARGETING_KEY_CONFIGURATION_ERROR_MSG = `Only one of "${CFG_ALLOW_TARGETING_KEYS}" or "${CFG_ADD_TARGETING_KEYS}" can be set`;
 
-export const TARGETING_KEYS = Object.keys(CONSTANTS.TARGETING_KEYS).map(
-  key => CONSTANTS.TARGETING_KEYS[key]
+export const TARGETING_KEYS_ARR = Object.keys(TARGETING_KEYS).map(
+  key => TARGETING_KEYS[key]
 );
 
 // return unexpired bids
-const isBidNotExpired = (bid) => (bid.responseTimestamp + getTTL(bid) * 1000) > timestamp();
+const isBidNotExpired = (bid) => (bid.responseTimestamp + getBufferedTTL(bid) * 1000) > timestamp();
 
 // return bids whose status is not set. Winning bids can only have a status of `rendered`.
-const isUnusedBid = (bid) => bid && ((bid.status && !includes([CONSTANTS.BID_STATUS.RENDERED], bid.status)) || !bid.status);
+const isUnusedBid = (bid) => bid && ((bid.status && !includes([BID_STATUS.RENDERED], bid.status)) || !bid.status);
 
 export let filters = {
   isActualBid(bid) {
-    return bid.getStatusCode() === CONSTANTS.STATUS.GOOD
+    return bid.getStatusCode() === STATUS.GOOD
   },
   isBidNotExpired,
   isUnusedBid
@@ -58,7 +68,7 @@ export function isBidUsable(bid) {
 // If two bids are found for same adUnitCode, we will use the highest one to take part in auction
 // This can happen in case of concurrent auctions
 // If adUnitBidLimit is set above 0 return top N number of bids
-export const getHighestCpmBidsFromBidPool = hook('sync', function(bidsReceived, highestCpmCallback, adUnitBidLimit = 0, hasModified = false) {
+export const getHighestCpmBidsFromBidPool = hook('sync', function(bidsReceived, winReducer, adUnitBidLimit = 0, hasModified = false, winSorter = sortByHighestCpm) {
   if (!hasModified) {
     const bids = [];
     const dealPrioritization = config.getConfig('sendBidsControl.dealPrioritization');
@@ -67,13 +77,14 @@ export const getHighestCpmBidsFromBidPool = hook('sync', function(bidsReceived,
     // filter top bid for each bucket by bidder
     Object.keys(buckets).forEach(bucketKey => {
       let bucketBids = [];
-      let bidsByBidder = groupBy(buckets[bucketKey], 'bidderCode');
-      Object.keys(bidsByBidder).forEach(key => bucketBids.push(bidsByBidder[key].reduce(highestCpmCallback)));
+      let bidsByBidder = groupBy(buckets[bucketKey], 'bidderCode')
+      Object.keys(bidsByBidder).forEach(key => { bucketBids.push(bidsByBidder[key].reduce(winReducer)) });
       // if adUnitBidLimit is set, pass top N number bids
-      if (adUnitBidLimit > 0) {
+      if (adUnitBidLimit) {
         bucketBids = dealPrioritization ? bucketBids.sort(sortByDealAndPriceBucketOrCpm(true)) : bucketBids.sort((a, b) => b.cpm - a.cpm);
         bids.push(...bucketBids.slice(0, adUnitBidLimit));
       } else {
+        bucketBids = bucketBids.sort(winSorter)
         bids.push(...bucketBids);
       }
     });
@@ -85,26 +96,26 @@ export const getHighestCpmBidsFromBidPool = hook('sync', function(bidsReceived,
 });
 
 /**
-* A descending sort function that will sort the list of objects based on the following two dimensions:
-*  - bids with a deal are sorted before bids w/o a deal
-*  - then sort bids in each grouping based on the hb_pb value
-* eg: the following list of bids would be sorted like:
-*  [{
-*    "hb_adid": "vwx",
-*    "hb_pb": "28",
-*    "hb_deal": "7747"
-*  }, {
-*    "hb_adid": "jkl",
-*    "hb_pb": "10",
-*    "hb_deal": "9234"
-*  }, {
-*    "hb_adid": "stu",
-*    "hb_pb": "50"
-*  }, {
-*    "hb_adid": "def",
-*    "hb_pb": "2"
-*  }]
-*/
+ * A descending sort function that will sort the list of objects based on the following two dimensions:
+ *  - bids with a deal are sorted before bids w/o a deal
+ *  - then sort bids in each grouping based on the hb_pb value
+ * eg: the following list of bids would be sorted like:
+ *  [{
+ *    "hb_adid": "vwx",
+ *    "hb_pb": "28",
+ *    "hb_deal": "7747"
+ *  }, {
+ *    "hb_adid": "jkl",
+ *    "hb_pb": "10",
+ *    "hb_deal": "9234"
+ *  }, {
+ *    "hb_adid": "stu",
+ *    "hb_pb": "50"
+ *  }, {
+ *    "hb_adid": "def",
+ *    "hb_pb": "2"
+ *  }]
+ */
 export function sortByDealAndPriceBucketOrCpm(useCpm = false) {
   return function(a, b) {
     if (a.adserverTargeting.hb_deal !== undefined && b.adserverTargeting.hb_deal === undefined) {
@@ -124,6 +135,33 @@ export function sortByDealAndPriceBucketOrCpm(useCpm = false) {
   }
 }
 
+/**
+ * Return a map where each code in `adUnitCodes` maps to a list of GPT slots that match it.
+ *
+ * @param {Array} adUnitCodes
+ * @param customSlotMatching
+ * @param getSlots
+ * @return {Object.}
+ */
+export function getGPTSlotsForAdUnits(adUnitCodes, customSlotMatching, getSlots = () => window.googletag.pubads().getSlots()) {
+  return getSlots().reduce((auToSlots, slot) => {
+    const customMatch = isFn(customSlotMatching) && customSlotMatching(slot);
+    Object.keys(auToSlots).filter(isFn(customMatch) ? customMatch : isAdUnitCodeMatchingSlot(slot)).forEach(au => auToSlots[au].push(slot));
+    return auToSlots;
+  }, Object.fromEntries(adUnitCodes.map(au => [au, []])));
+}
+
+/**
+ * Clears targeting for bids
+ */
+function clearTargeting(slot) {
+  pbTargetingKeys.forEach(key => {
+    if (slot.getTargeting(key)) {
+      slot.clearTargeting(key)
+    }
+  })
+}
+
 /**
  * @typedef {Object.} targeting
  * @property {string} targeting_key
@@ -144,22 +182,11 @@ export function newTargeting(auctionManager) {
   targeting.resetPresetTargeting = function(adUnitCode, customSlotMatching) {
     if (isGptPubadsDefined()) {
       const adUnitCodes = getAdUnitCodes(adUnitCode);
-      const adUnits = auctionManager.getAdUnits().filter(adUnit => includes(adUnitCodes, adUnit.code));
-      let unsetKeys = pbTargetingKeys.reduce((reducer, key) => {
-        reducer[key] = null;
-        return reducer;
-      }, {});
-      window.googletag.pubads().getSlots().forEach(slot => {
-        let customSlotMatchingFunc = isFn(customSlotMatching) && customSlotMatching(slot);
-        // reset only registered adunits
-        adUnits.forEach(unit => {
-          if (unit.code === slot.getAdUnitPath() ||
-              unit.code === slot.getSlotElementId() ||
-              (isFn(customSlotMatchingFunc) && customSlotMatchingFunc(unit.code))) {
-            slot.updateTargetingFromMap(unsetKeys);
-          }
-        });
-      });
+      Object.values(getGPTSlotsForAdUnits(adUnitCodes, customSlotMatching)).forEach((slots) => {
+        slots.forEach(slot => {
+          clearTargeting(slot)
+        })
+      })
     }
   };
 
@@ -180,39 +207,33 @@ export function newTargeting(auctionManager) {
     });
   };
 
-  /**
-   * checks if bid has targeting set and belongs based on matching ad unit codes
-   * @return {boolean} true or false
-   */
-  function bidShouldBeAddedToTargeting(bid, adUnitCodes) {
-    return bid.adserverTargeting && adUnitCodes &&
-      ((isArray(adUnitCodes) && includes(adUnitCodes, bid.adUnitCode)) ||
-      (typeof adUnitCodes === 'string' && bid.adUnitCode === adUnitCodes));
-  };
+  function addBidToTargeting(bids, enableSendAllBids = false, deals = false) {
+    const standardKeys = FEATURES.NATIVE ? TARGETING_KEYS_ARR.concat(NATIVE_TARGETING_KEYS) : TARGETING_KEYS_ARR.slice();
+    const allowSendAllBidsTargetingKeys = config.getConfig('targetingControls.allowSendAllBidsTargetingKeys');
 
-  /**
-   * Returns targeting for any bids which have deals if alwaysIncludeDeals === true
-   */
-  function getDealBids(adUnitCodes, bidsReceived) {
-    if (config.getConfig('targetingControls.alwaysIncludeDeals') === true) {
-      const standardKeys = FEATURES.NATIVE ? TARGETING_KEYS.concat(NATIVE_TARGETING_KEYS) : TARGETING_KEYS.slice();
-
-      // we only want the top bid from bidders who have multiple entries per ad unit code
-      const bids = getHighestCpmBidsFromBidPool(bidsReceived, getHighestCpm);
-
-      // populate targeting keys for the remaining bids if they have a dealId
-      return bids.map(bid => {
-        if (bid.dealId && bidShouldBeAddedToTargeting(bid, adUnitCodes)) {
-          return {
-            [bid.adUnitCode]: getTargetingMap(bid, standardKeys.filter(
-              key => typeof bid.adserverTargeting[key] !== 'undefined')
-            )
-          };
+    const allowedSendAllBidTargeting = allowSendAllBidsTargetingKeys
+      ? allowSendAllBidsTargetingKeys.map((key) => TARGETING_KEYS[key])
+      : standardKeys;
+
+    return bids.reduce((result, bid) => {
+      if (enableSendAllBids || (deals && bid.dealId)) {
+        const targetingValue = getTargetingMap(bid, standardKeys.filter(
+          key => typeof bid.adserverTargeting[key] !== 'undefined' &&
+          (deals || allowedSendAllBidTargeting.indexOf(key) !== -1)));
+
+        if (targetingValue) {
+          result.push({[bid.adUnitCode]: targetingValue})
         }
-      }).filter(bid => bid); // removes empty elements in array
-    }
-    return [];
-  };
+      }
+      return result;
+    }, []);
+  }
+
+  function getBidderTargeting(bids) {
+    const alwaysIncludeDeals = config.getConfig('targetingControls.alwaysIncludeDeals');
+    const enableSendAllBids = config.getConfig('enableSendAllBids');
+    return addBidToTargeting(bids, enableSendAllBids, alwaysIncludeDeals);
+  }
 
   /**
    * Returns filtered ad server targeting for custom and allowed keys.
@@ -221,7 +242,7 @@ export function newTargeting(auctionManager) {
    * @return {targetingArray} filtered targeting
    */
   function getAllowedTargetingKeyValues(targeting, allowedKeys) {
-    const defaultKeyring = Object.assign({}, CONSTANTS.TARGETING_KEYS, CONSTANTS.NATIVE_KEYS);
+    const defaultKeyring = Object.assign({}, TARGETING_KEYS, NATIVE_KEYS);
     const defaultKeys = Object.keys(defaultKeyring);
     const keyDispositions = {};
     logInfo(`allowTargetingKeys - allowed keys [ ${allowedKeys.map(k => defaultKeyring[k]).join(', ')} ]`);
@@ -261,28 +282,17 @@ export function newTargeting(auctionManager) {
    * @param {string=} adUnitCode
    * @return {Object.} targeting
    */
-  targeting.getAllTargeting = function(adUnitCode, bidsReceived = getBidsReceived()) {
+  targeting.getAllTargeting = function(adUnitCode, bidLimit, bidsReceived, winReducer = getHighestCpm, winSorter = sortByHighestCpm) {
+    bidsReceived ||= getBidsReceived(winReducer, winSorter);
     const adUnitCodes = getAdUnitCodes(adUnitCode);
-
-    // Get targeting for the winning bid. Add targeting for any bids that have
-    // `alwaysUseBid=true`. If sending all bids is enabled, add targeting for losing bids.
-    var targeting = getWinningBidTargeting(adUnitCodes, bidsReceived)
-      .concat(getCustomBidTargeting(adUnitCodes, bidsReceived))
-      .concat(config.getConfig('enableSendAllBids') ? getBidLandscapeTargeting(adUnitCodes, bidsReceived) : getDealBids(adUnitCodes, bidsReceived))
-      .concat(getAdUnitTargeting(adUnitCodes));
-
-    // store a reference of the targeting keys
-    targeting.map(adUnitCode => {
-      Object.keys(adUnitCode).map(key => {
-        adUnitCode[key].map(targetKey => {
-          if (pbTargetingKeys.indexOf(Object.keys(targetKey)[0]) === -1) {
-            pbTargetingKeys = Object.keys(targetKey).concat(pbTargetingKeys);
-          }
-        });
-      });
-    });
-
-    const defaultKeys = Object.keys(Object.assign({}, CONSTANTS.DEFAULT_TARGETING_KEYS, CONSTANTS.NATIVE_KEYS));
+    const sendAllBids = config.getConfig('enableSendAllBids');
+    const bidLimitConfigValue = config.getConfig('sendBidsControl.bidLimit');
+    const adUnitBidLimit = (sendAllBids && (bidLimit || bidLimitConfigValue)) || 0;
+    const { customKeysByUnit, filteredBids } = getfilteredBidsAndCustomKeys(adUnitCodes, bidsReceived);
+    const bidsSorted = getHighestCpmBidsFromBidPool(filteredBids, winReducer, adUnitBidLimit, undefined, winSorter);
+    let targeting = getTargetingLevels(bidsSorted, customKeysByUnit);
+
+    const defaultKeys = Object.keys(Object.assign({}, DEFAULT_TARGETING_KEYS, NATIVE_KEYS));
     let allowedKeys = config.getConfig(CFG_ALLOW_TARGETING_KEYS);
     const addedKeys = config.getConfig(CFG_ADD_TARGETING_KEYS);
 
@@ -316,6 +326,63 @@ export function newTargeting(auctionManager) {
     return targeting;
   };
 
+  function updatePBTargetingKeys(adUnitCode) {
+    (Object.keys(adUnitCode)).forEach(key => {
+      adUnitCode[key].forEach(targetKey => {
+        const targetKeys = Object.keys(targetKey);
+        if (pbTargetingKeys.indexOf(targetKeys[0]) === -1) {
+          pbTargetingKeys = targetKeys.concat(pbTargetingKeys);
+        }
+      });
+    });
+  }
+
+  function getTargetingLevels(bidsSorted, customKeysByUnit) {
+    const targeting = getWinningBidTargeting(bidsSorted)
+      .concat(getCustomBidTargeting(bidsSorted, customKeysByUnit))
+      .concat(getBidderTargeting(bidsSorted))
+      .concat(getAdUnitTargeting());
+
+    targeting.forEach(adUnitCode => {
+      updatePBTargetingKeys(adUnitCode);
+    });
+
+    return targeting;
+  }
+
+  function getfilteredBidsAndCustomKeys(adUnitCodes, bidsReceived) {
+    const filteredBids = [];
+    const customKeysByUnit = {};
+    const alwaysIncludeDeals = config.getConfig('targetingControls.alwaysIncludeDeals');
+
+    bidsReceived.forEach(bid => {
+      const adUnitIsEligible = includes(adUnitCodes, bid.adUnitCode);
+      const cpmAllowed = bidderSettings.get(bid.bidderCode, 'allowZeroCpmBids') === true ? bid.cpm >= 0 : bid.cpm > 0;
+      const isPreferredDeal = alwaysIncludeDeals && bid.dealId;
+
+      if (adUnitIsEligible && (isPreferredDeal || cpmAllowed)) {
+        filteredBids.push(bid);
+        Object.keys(bid.adserverTargeting)
+          .filter(getCustomKeys())
+          .forEach(key => {
+            const truncKey = key.substring(0, MAX_DFP_KEYLENGTH);
+            const data = customKeysByUnit[bid.adUnitCode] || {};
+            const value = [bid.adserverTargeting[key]];
+
+            if (data[truncKey]) {
+              data[truncKey] = data[truncKey].concat(value).filter(uniques);
+            } else {
+              data[truncKey] = value;
+            }
+
+            customKeysByUnit[bid.adUnitCode] = data;
+          })
+      }
+    });
+
+    return {filteredBids, customKeysByUnit};
+  }
+
   // warn about conflicting configuration
   config.getConfig('targetingControls', function (config) {
     if (deepAccess(config, CFG_ALLOW_TARGETING_KEYS) != null && deepAccess(config, CFG_ADD_TARGETING_KEYS) != null) {
@@ -407,35 +474,56 @@ export function newTargeting(auctionManager) {
             };
           }).reduce((p, c) => Object.assign(c, p), {})
       };
-    }).reduce(function (accumulator, targeting) {
+    })
+
+    targetingObj = targetingObj.reduce(function (accumulator, targeting) {
       var key = Object.keys(targeting)[0];
       accumulator[key] = Object.assign({}, accumulator[key], targeting[key]);
       return accumulator;
     }, {});
+
     return targetingObj;
   }
 
-  /**
-   * Sets targeting for DFP
-   * @param {Object.>} targetingConfig
-   */
-  targeting.setTargetingForGPT = function(targetingConfig, customSlotMatching) {
-    window.googletag.pubads().getSlots().forEach(slot => {
-      Object.keys(targetingConfig).filter(customSlotMatching ? customSlotMatching(slot) : isAdUnitCodeMatchingSlot(slot))
-        .forEach(targetId => {
-          Object.keys(targetingConfig[targetId]).forEach(key => {
-            let value = targetingConfig[targetId][key];
-            if (typeof value === 'string' && value.indexOf(',') !== -1) {
-              // due to the check the array will be formed only if string has ',' else plain string will be assigned as value
-              value = value.split(',');
-            }
-            targetingConfig[targetId][key] = value;
-          });
-          logMessage(`Attempting to set targeting-map for slot: ${slot.getSlotElementId()} with targeting-map:`, targetingConfig[targetId]);
-          slot.updateTargetingFromMap(targetingConfig[targetId])
-        })
+  targeting.setTargetingForGPT = hook('sync', function (adUnit, customSlotMatching) {
+  // get our ad unit codes
+    let targetingSet = targeting.getAllTargeting(adUnit);
+
+    let resetMap = Object.fromEntries(pbTargetingKeys.map(key => [key, null]));
+
+    Object.entries(getGPTSlotsForAdUnits(Object.keys(targetingSet), customSlotMatching)).forEach(([targetId, slots]) => {
+      slots.forEach(slot => {
+      // now set new targeting keys
+        Object.keys(targetingSet[targetId]).forEach(key => {
+          let value = targetingSet[targetId][key];
+          if (typeof value === 'string' && value.indexOf(',') !== -1) {
+          // due to the check the array will be formed only if string has ',' else plain string will be assigned as value
+            value = value.split(',');
+          }
+          targetingSet[targetId][key] = value;
+        });
+        logMessage(`Attempting to set targeting-map for slot: ${slot.getSlotElementId()} with targeting-map:`, targetingSet[targetId]);
+        slot.updateTargetingFromMap(Object.assign({}, resetMap, targetingSet[targetId]))
+      })
     })
-  };
+
+    Object.keys(targetingSet).forEach((adUnitCode) => {
+      Object.keys(targetingSet[adUnitCode]).forEach((targetingKey) => {
+        if (targetingKey === 'hb_adid') {
+          auctionManager.setStatusForBids(targetingSet[adUnitCode][targetingKey], BID_STATUS.BID_TARGETING_SET);
+        }
+      });
+    });
+
+    targeting.targetingDone(targetingSet);
+
+    // emit event
+    events.emit(EVENTS.SET_TARGETING, targetingSet);
+  }, 'setTargetingForGPT');
+
+  targeting.targetingDone = hook('sync', function (targetingSet) {
+    return targetingSet;
+  }, 'targetingDone');
 
   /**
    * normlizes input to a `adUnit.code` array
@@ -451,47 +539,58 @@ export function newTargeting(auctionManager) {
     return auctionManager.getAdUnitCodes() || [];
   }
 
-  function getBidsReceived() {
-    let bidsReceived = auctionManager.getBidsReceived();
-
-    if (!config.getConfig('useBidCache')) {
-      // don't use bid cache (i.e. filter out bids not in the latest auction)
-      bidsReceived = bidsReceived.filter(bid => latestAuctionForAdUnit[bid.adUnitCode] === bid.auctionId)
-    } else {
-      // if custom bid cache filter function exists, run for each bid from
-      // previous auctions. If it returns true, include bid in bid pool
+  function getBidsReceived(winReducer = getOldestHighestCpmBid, winSorter = undefined) {
+    let bidsReceived = auctionManager.getBidsReceived().reduce((bids, bid) => {
+      const bidCacheEnabled = config.getConfig('useBidCache');
       const filterFunction = config.getConfig('bidCacheFilterFunction');
-      if (typeof filterFunction === 'function') {
-        bidsReceived = bidsReceived.filter(bid => latestAuctionForAdUnit[bid.adUnitCode] === bid.auctionId || !!filterFunction(bid))
+      const isBidFromLastAuction = latestAuctionForAdUnit[bid.adUnitCode] === bid.auctionId;
+      const filterFunctionResult = bidCacheEnabled && !isBidFromLastAuction && typeof filterFunction === 'function' ? !!filterFunction(bid) : true;
+      const cacheFilter = bidCacheEnabled || isBidFromLastAuction;
+      const bidFilter = cacheFilter && filterFunctionResult;
+
+      if (bidFilter && deepAccess(bid, 'video.context') !== ADPOD && isBidUsable(bid)) {
+        bid.latestTargetedAuctionId = latestAuctionForAdUnit[bid.adUnitCode];
+        bids.push(bid)
       }
-    }
 
-    bidsReceived = bidsReceived
-      .filter(bid => deepAccess(bid, 'video.context') !== ADPOD)
-      .filter(isBidUsable);
+      return bids;
+    }, []);
 
-    return getHighestCpmBidsFromBidPool(bidsReceived, getOldestHighestCpmBid);
+    return getHighestCpmBidsFromBidPool(bidsReceived, winReducer, undefined, undefined, undefined, winSorter);
   }
 
   /**
    * Returns top bids for a given adUnit or set of adUnits.
    * @param  {(string|string[])} adUnitCode adUnitCode or array of adUnitCodes
-   * @return {[type]}            [description]
+   * @param  {(Array|undefined)} bids - The received bids, defaulting to the result of getBidsReceived().
+   * @param  {function(Array): Array} [winReducer = getHighestCpm] - reducer method
+   * @param  {function(Array): Array} [winSorter = sortByHighestCpm] - sorter method
+   * @return {Array} - An array of winning bids.
    */
-  targeting.getWinningBids = function(adUnitCode, bidsReceived = getBidsReceived()) {
+  targeting.getWinningBids = function(adUnitCode, bids, winReducer = getHighestCpm, winSorter = sortByHighestCpm) {
+    const usedCodes = [];
+    const bidsReceived = bids || getBidsReceived(winReducer, winSorter);
     const adUnitCodes = getAdUnitCodes(adUnitCode);
+
     return bidsReceived
-      .filter(bid => includes(adUnitCodes, bid.adUnitCode))
-      .filter(bid => (bidderSettings.get(bid.bidderCode, 'allowZeroCpmBids') === true) ? bid.cpm >= 0 : bid.cpm > 0)
-      .map(bid => bid.adUnitCode)
-      .filter(uniques)
-      .map(adUnitCode => bidsReceived
-        .filter(bid => bid.adUnitCode === adUnitCode ? bid : null)
-        .reduce(getHighestCpm));
+      .reduce((result, bid) => {
+        const code = bid.adUnitCode;
+        const cpmEligible = bidderSettings.get(code, 'allowZeroCpmBids') === true ? bid.cpm >= 0 : bid.cpm > 0;
+        const isPreferredDeal = config.getConfig('targetingControls.alwaysIncludeDeals') && bid.dealId;
+        const eligible = includes(adUnitCodes, code) &&
+          !includes(usedCodes, code) &&
+          (isPreferredDeal || cpmEligible)
+        if (eligible) {
+          result.push(bid);
+          usedCodes.push(code);
+        }
+
+        return result;
+      }, []);
   };
 
   /**
-   * @param  {(string|string[])} adUnitCode adUnitCode or array of adUnitCodes
+   * @param  {(string|string[])} adUnitCodes adUnitCode or array of adUnitCodes
    * Sets targeting for AST
    */
   targeting.setTargetingForAst = function(adUnitCodes) {
@@ -524,11 +623,20 @@ export function newTargeting(auctionManager) {
 
   /**
    * Get targeting key value pairs for winning bid.
-   * @param {string[]}    AdUnit code array
-   * @return {targetingArray}   winning bids targeting
+   * @param {Array} bidsReceived code array
+   * @return {targetingArray} winning bids targeting
    */
-  function getWinningBidTargeting(adUnitCodes, bidsReceived) {
-    let winners = targeting.getWinningBids(adUnitCodes, bidsReceived);
+  function getWinningBidTargeting(bidsReceived) {
+    let usedAdUnitCodes = [];
+    let winners = bidsReceived
+      .reduce((bids, bid) => {
+        if (!includes(usedAdUnitCodes, bid.adUnitCode)) {
+          bids.push(bid);
+          usedAdUnitCodes.push(bid.adUnitCode);
+        }
+        return bids;
+      }, []);
+
     let standardKeys = getStandardKeys();
 
     winners = winners.map(winner => {
@@ -541,7 +649,7 @@ export function newTargeting(auctionManager) {
           .reduce((acc, key) => {
             const targetingValue = [winner.adserverTargeting[key]];
             const targeting = { [key.substring(0, MAX_DFP_KEYLENGTH)]: targetingValue };
-            if (key === CONSTANTS.TARGETING_KEYS.DEAL) {
+            if (key === TARGETING_KEYS.DEAL) {
               const bidderCodeTargetingKey = `${key}_${winner.bidderCode}`.substring(0, MAX_DFP_KEYLENGTH);
               const bidderCodeTargeting = { [bidderCodeTargetingKey]: targetingValue };
               return [...acc, targeting, bidderCodeTargeting];
@@ -557,45 +665,7 @@ export function newTargeting(auctionManager) {
   function getStandardKeys() {
     return auctionManager.getStandardBidderAdServerTargeting() // in case using a custom standard key set
       .map(targeting => targeting.key)
-      .concat(TARGETING_KEYS).filter(uniques); // standard keys defined in the library.
-  }
-
-  /**
-   * Merge custom adserverTargeting with same key name for same adUnitCode.
-   * e.g: Appnexus defining custom keyvalue pair foo:bar and Rubicon defining custom keyvalue pair foo:baz will be merged to foo: ['bar','baz']
-   *
-   * @param {Object[]} acc Accumulator for reducer. It will store updated bidResponse objects
-   * @param {Object} bid BidResponse
-   * @param {number} index current index
-   * @param {Array} arr original array
-   */
-  function mergeAdServerTargeting(acc, bid, index, arr) {
-    function concatTargetingValue(key) {
-      return function(currentBidElement) {
-        if (!isArray(currentBidElement.adserverTargeting[key])) {
-          currentBidElement.adserverTargeting[key] = [currentBidElement.adserverTargeting[key]];
-        }
-        currentBidElement.adserverTargeting[key] = currentBidElement.adserverTargeting[key].concat(bid.adserverTargeting[key]).filter(uniques);
-        delete bid.adserverTargeting[key];
-      }
-    }
-
-    function hasSameAdunitCodeAndKey(key) {
-      return function(currentBidElement) {
-        return currentBidElement.adUnitCode === bid.adUnitCode && currentBidElement.adserverTargeting[key]
-      }
-    }
-
-    Object.keys(bid.adserverTargeting)
-      .filter(getCustomKeys())
-      .forEach(key => {
-        if (acc.length) {
-          acc.filter(hasSameAdunitCodeAndKey(key))
-            .forEach(concatTargetingValue(key));
-        }
-      });
-    acc.push(bid);
-    return acc;
+      .concat(TARGETING_KEYS_ARR).filter(uniques); // standard keys defined in the library.
   }
 
   function getCustomKeys() {
@@ -608,73 +678,44 @@ export function newTargeting(auctionManager) {
     }
   }
 
-  function truncateCustomKeys(bid) {
-    return {
-      [bid.adUnitCode]: Object.keys(bid.adserverTargeting)
-        // Get only the non-standard keys of the losing bids, since we
-        // don't want to override the standard keys of the winning bid.
-        .filter(getCustomKeys())
-        .map(key => {
-          return {
-            [key.substring(0, MAX_DFP_KEYLENGTH)]: [bid.adserverTargeting[key]]
-          };
-        })
-    }
-  }
-
   /**
    * Get custom targeting key value pairs for bids.
-   * @param {string[]}    AdUnit code array
-   * @return {targetingArray}   bids with custom targeting defined in bidderSettings
+   * @param {Array} bidsSorted code array
+   * @param {Object} customKeysByUnit code array
+   * @return {targetingArray} bids with custom targeting defined in bidderSettings
    */
-  function getCustomBidTargeting(adUnitCodes, bidsReceived) {
-    return bidsReceived
-      .filter(bid => includes(adUnitCodes, bid.adUnitCode))
-      .map(bid => Object.assign({}, bid))
-      .reduce(mergeAdServerTargeting, [])
-      .map(truncateCustomKeys)
-      .filter(bid => bid); // removes empty elements in array;
-  }
-
-  /**
-   * Get targeting key value pairs for non-winning bids.
-   * @param {string[]}    AdUnit code array
-   * @return {targetingArray}   all non-winning bids targeting
-   */
-  function getBidLandscapeTargeting(adUnitCodes, bidsReceived) {
-    const standardKeys = FEATURES.NATIVE ? TARGETING_KEYS.concat(NATIVE_TARGETING_KEYS) : TARGETING_KEYS.slice();
-    const adUnitBidLimit = config.getConfig('sendBidsControl.bidLimit');
-    const bids = getHighestCpmBidsFromBidPool(bidsReceived, getHighestCpm, adUnitBidLimit);
-    const allowSendAllBidsTargetingKeys = config.getConfig('targetingControls.allowSendAllBidsTargetingKeys');
+  function getCustomBidTargeting(bidsSorted, customKeysByUnit) {
+    return bidsSorted
+      .reduce((acc, bid) => {
+        const newBid = Object.assign({}, bid);
+        const customKeysForUnit = customKeysByUnit[newBid.adUnitCode];
+        const targeting = [];
+
+        if (customKeysForUnit) {
+          Object.keys(customKeysForUnit).forEach(key => {
+            if (key && customKeysForUnit[key]) targeting.push({[key]: customKeysForUnit[key]});
+          })
+        }
 
-    const allowedSendAllBidTargeting = allowSendAllBidsTargetingKeys
-      ? allowSendAllBidsTargetingKeys.map((key) => CONSTANTS.TARGETING_KEYS[key])
-      : standardKeys;
+        acc.push({[newBid.adUnitCode]: targeting});
 
-    // populate targeting keys for the remaining bids
-    return bids.map(bid => {
-      if (bidShouldBeAddedToTargeting(bid, adUnitCodes)) {
-        return {
-          [bid.adUnitCode]: getTargetingMap(bid, standardKeys.filter(
-            key => typeof bid.adserverTargeting[key] !== 'undefined' &&
-            allowedSendAllBidTargeting.indexOf(key) !== -1)
-          )
-        };
-      }
-    }).filter(bid => bid); // removes empty elements in array
+        return acc;
+      }, []);
   }
 
   function getTargetingMap(bid, keys) {
-    return keys.map(key => {
-      return {
-        [`${key}_${bid.bidderCode}`.substring(0, MAX_DFP_KEYLENGTH)]: [bid.adserverTargeting[key]]
-      };
-    });
+    return keys.reduce((targeting, key) => {
+      const value = bid.adserverTargeting[key];
+      if (value) {
+        targeting.push({[`${key}_${bid.bidderCode}`.substring(0, MAX_DFP_KEYLENGTH)]: [bid.adserverTargeting[key]]})
+      }
+      return targeting;
+    }, []);
   }
 
-  function getAdUnitTargeting(adUnitCodes) {
+  function getAdUnitTargeting() {
     function getTargetingObj(adUnit) {
-      return deepAccess(adUnit, CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING);
+      return deepAccess(adUnit, JSON_MAPPING.ADSERVER_TARGETING);
     }
 
     function getTargetingValues(adUnit) {
@@ -689,10 +730,13 @@ export function newTargeting(auctionManager) {
     }
 
     return auctionManager.getAdUnits()
-      .filter(adUnit => includes(adUnitCodes, adUnit.code) && getTargetingObj(adUnit))
-      .map(adUnit => {
-        return {[adUnit.code]: getTargetingValues(adUnit)}
-      });
+      .filter(adUnit => getTargetingObj(adUnit))
+      .reduce((result, adUnit) => {
+        const targetingValues = getTargetingValues(adUnit);
+
+        if (targetingValues)result.push({[adUnit.code]: targetingValues});
+        return result;
+      }, []);
   }
 
   targeting.isApntagDefined = function() {
diff --git a/src/types/ortb2.d.ts b/src/types/ortb2.d.ts
new file mode 100644
index 00000000000..f38545c0c31
--- /dev/null
+++ b/src/types/ortb2.d.ts
@@ -0,0 +1,59 @@
+/**
+ * @see https://iabtechlab.com/standards/openrtb/
+ */
+export namespace Ortb2 {
+  type Site = {
+    page?: string;
+    ref?: string;
+    domain?: string;
+    publisher?: {
+      domain?: string;
+    };
+    keywords?: string;
+    ext?: Record;
+  };
+
+  type Device = {
+    w?: number;
+    h?: number;
+    dnt?: 0 | 1;
+    ua?: string;
+    language?: string;
+    sua?: {
+      source?: number;
+      platform?: unknown;
+      browsers?: unknown[];
+      mobile?: number;
+    };
+    ext?: {
+      webdriver?: true;
+      [key: string]: unknown;
+    };
+  };
+
+  type Regs = {
+    coppa?: unknown;
+    ext?: {
+      gdpr?: unknown;
+      us_privacy?: unknown;
+      [key: string]: unknown;
+    };
+  };
+
+  type User = {
+    ext?: Record;
+  };
+
+  /**
+   * Ortb2 info provided in bidder request. Some of the sections are mutually exclusive.
+   * @see clientSectionChecker
+   */
+  type BidRequest = {
+    device?: Device;
+    regs?: Regs;
+    user?: User;
+    site?: Site;
+    app?: unknown;
+    dooh?: unknown;
+  };
+}
diff --git a/src/userSync.js b/src/userSync.js
index 936836eb12e..d8f2238007d 100644
--- a/src/userSync.js
+++ b/src/userSync.js
@@ -25,7 +25,7 @@ export const USERSYNC_DEFAULT_CONFIG = {
   },
   syncsPerBidder: 5,
   syncDelay: 3000,
-  auctionDelay: 0
+  auctionDelay: 500
 };
 
 // Set userSync default values
@@ -182,8 +182,8 @@ export function newUserSync(deps) {
    * @function incrementAdapterBids
    * @summary Increment the count of user syncs queue for the adapter
    * @private
-   * @params {object} numAdapterBids The object contain counts for all adapters
-   * @params {string} bidder The name of the bidder adding a sync
+   * @param {object} numAdapterBids The object contain counts for all adapters
+   * @param {string} bidder The name of the bidder adding a sync
    * @returns {object} The updated version of numAdapterBids
    */
   function incrementAdapterBids(numAdapterBids, bidder) {
@@ -199,10 +199,9 @@ export function newUserSync(deps) {
    * @function registerSync
    * @summary Add sync for this bidder to a queue to be fired later
    * @public
-   * @params {string} type The type of the sync including image, iframe
-   * @params {string} bidder The name of the adapter. e.g. "rubicon"
-   * @params {string} url Either the pixel url or iframe url depending on the type
-
+   * @param {string} type The type of the sync including image, iframe
+   * @param {string} bidder The name of the adapter. e.g. "rubicon"
+   * @param {string} url Either the pixel url or iframe url depending on the type
    * @example Using Image Sync
    * // registerSync(type, adapter, pixelUrl)
    * userSync.registerSync('image', 'rubicon', 'http://example.com/pixel')
@@ -244,7 +243,7 @@ export function newUserSync(deps) {
    * @param {string} type The type of the sync; either image or iframe
    * @param {string} bidder The name of the adapter. e.g. "rubicon"
    * @returns {boolean} true => bidder is not allowed to register; false => bidder can register
-    */
+   */
   function shouldBidderBeBlocked(type, bidder) {
     let filterConfig = usConfig.filterSettings;
 
@@ -309,7 +308,7 @@ export function newUserSync(deps) {
    * @function syncUsers
    * @summary Trigger all the user syncs based on publisher-defined timeout
    * @public
-   * @params {int} timeout The delay in ms before syncing data - default 0
+   * @param {number} timeout The delay in ms before syncing data - default 0
    */
   publicApi.syncUsers = (timeout = 0) => {
     if (timeout) {
@@ -358,7 +357,7 @@ export const userSync = newUserSync(Object.defineProperties({
  *
  * @property {boolean} enableOverride
  * @property {boolean} syncEnabled
- * @property {int} syncsPerBidder
+ * @property {number} syncsPerBidder
  * @property {string[]} enabledBidders
  * @property {Object} filterSettings
  */
diff --git a/src/utils.js b/src/utils.js
index 256dfb15174..015b1142d47 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,11 +1,12 @@
 import {config} from './config.js';
-import clone from 'just-clone';
+import {klona} from 'klona/json';
 import {includes} from './polyfill.js';
-import CONSTANTS from './constants.json';
+import {EVENTS} from './constants.js';
 import {GreedyPromise} from './utils/promise.js';
 import {getGlobal} from './prebidGlobal.js';
+import { default as deepAccess } from 'dlv/index.js';
 
-export { default as deepAccess } from 'dlv/index.js';
+export { deepAccess };
 export { dset as deepSetValue } from 'dset';
 
 var tStr = 'String';
@@ -41,6 +42,7 @@ export const internal = {
   createTrackPixelIframeHtml,
   getWindowSelf,
   getWindowTop,
+  canAccessWindowTop,
   getWindowLocation,
   insertUserSyncIframe,
   insertElement,
@@ -129,37 +131,55 @@ export function transformAdServerTargetingObj(targeting) {
 }
 
 /**
- * Parse a GPT-Style general size Array like `[[300, 250]]` or `"300x250,970x90"` into an array of sizes `["300x250"]` or '['300x250', '970x90']'
- * @param  {(Array.|Array.)} sizeObj Input array or double array [300,250] or [[300,250], [728,90]]
- * @return {Array.}  Array of strings like `["300x250"]` or `["300x250", "728x90"]`
+ * Parse a GPT-Style general size Array like `[[300, 250]]` or `"300x250,970x90"` into an array of width, height tuples `[[300, 250]]` or '[[300,250], [970,90]]'
  */
-export function parseSizesInput(sizeObj) {
-  if (typeof sizeObj === 'string') {
+export function sizesToSizeTuples(sizes) {
+  if (typeof sizes === 'string') {
     // multiple sizes will be comma-separated
-    return sizeObj.split(',').filter(sz => sz.match(/^(\d)+x(\d)+$/i))
-  } else if (typeof sizeObj === 'object') {
-    if (sizeObj.length === 2 && typeof sizeObj[0] === 'number' && typeof sizeObj[1] === 'number') {
-      return [parseGPTSingleSizeArray(sizeObj)];
-    } else {
-      return sizeObj.map(parseGPTSingleSizeArray)
+    return sizes
+      .split(/\s*,\s*/)
+      .map(sz => sz.match(/^(\d+)x(\d+)$/i))
+      .filter(match => match)
+      .map(([_, w, h]) => [parseInt(w, 10), parseInt(h, 10)])
+  } else if (Array.isArray(sizes)) {
+    if (isValidGPTSingleSize(sizes)) {
+      return [sizes]
     }
+    return sizes.filter(isValidGPTSingleSize);
   }
   return [];
 }
 
+/**
+ * Parse a GPT-Style general size Array like `[[300, 250]]` or `"300x250,970x90"` into an array of sizes `["300x250"]` or '['300x250', '970x90']'
+ * @param  {(Array.|Array.)} sizeObj Input array or double array [300,250] or [[300,250], [728,90]]
+ * @return {Array.}  Array of strings like `["300x250"]` or `["300x250", "728x90"]`
+ */
+export function parseSizesInput(sizeObj) {
+  return sizesToSizeTuples(sizeObj).map(sizeTupleToSizeString);
+}
+
+export function sizeTupleToSizeString(size) {
+  return size[0] + 'x' + size[1]
+}
+
 // Parse a GPT style single size array, (i.e [300, 250])
 // into an AppNexus style string, (i.e. 300x250)
 export function parseGPTSingleSizeArray(singleSize) {
   if (isValidGPTSingleSize(singleSize)) {
-    return singleSize[0] + 'x' + singleSize[1];
+    return sizeTupleToSizeString(singleSize);
   }
 }
 
+export function sizeTupleToRtbSize(size) {
+  return {w: size[0], h: size[1]};
+}
+
 // Parse a GPT style single size array, (i.e [300, 250])
 // into OpenRTB-compatible (imp.banner.w/h, imp.banner.format.w/h, imp.video.w/h) object(i.e. {w:300, h:250})
 export function parseGPTSingleSizeArrayToRtbSize(singleSize) {
   if (isValidGPTSingleSize(singleSize)) {
-    return {w: singleSize[0], h: singleSize[1]};
+    return sizeTupleToRtbSize(singleSize)
   }
 }
 
@@ -180,6 +200,16 @@ export function getWindowLocation() {
   return window.location;
 }
 
+export function canAccessWindowTop() {
+  try {
+    if (internal.getWindowTop().location.href) {
+      return true;
+    }
+  } catch (e) {
+    return false;
+  }
+}
+
 /**
  * Wrappers to console.(log | info | warn | error). Takes N arguments, the same as the native methods
  */
@@ -202,7 +232,7 @@ export function logWarn() {
     // eslint-disable-next-line no-console
     console.warn.apply(console, decorateLog(arguments, 'WARNING:'));
   }
-  emitEvent(CONSTANTS.EVENTS.AUCTION_DEBUG, {type: 'WARNING', arguments: arguments});
+  emitEvent(EVENTS.AUCTION_DEBUG, { type: 'WARNING', arguments: arguments });
 }
 
 export function logError() {
@@ -210,7 +240,7 @@ export function logError() {
     // eslint-disable-next-line no-console
     console.error.apply(console, decorateLog(arguments, 'ERROR:'));
   }
-  emitEvent(CONSTANTS.EVENTS.AUCTION_DEBUG, {type: 'ERROR', arguments: arguments});
+  emitEvent(EVENTS.AUCTION_DEBUG, { type: 'ERROR', arguments: arguments });
 }
 
 export function prefixLog(prefix) {
@@ -252,25 +282,37 @@ export function debugTurnedOn() {
   return !!config.getConfig('debug');
 }
 
+export const createIframe = (() => {
+  const DEFAULTS = {
+    border: '0px',
+    hspace: '0',
+    vspace: '0',
+    marginWidth: '0',
+    marginHeight: '0',
+    scrolling: 'no',
+    frameBorder: '0',
+    allowtransparency: 'true'
+  }
+  return (doc, attrs, style = {}) => {
+    const f = doc.createElement('iframe');
+    Object.assign(f, Object.assign({}, DEFAULTS, attrs));
+    Object.assign(f.style, style);
+    return f;
+  }
+})();
+
 export function createInvisibleIframe() {
-  var f = document.createElement('iframe');
-  f.id = getUniqueIdentifierStr();
-  f.height = 0;
-  f.width = 0;
-  f.border = '0px';
-  f.hspace = '0';
-  f.vspace = '0';
-  f.marginWidth = '0';
-  f.marginHeight = '0';
-  f.style.border = '0';
-  f.scrolling = 'no';
-  f.frameBorder = '0';
-  f.src = 'about:blank';
-  f.style.display = 'none';
-  f.style.height = '0px';
-  f.style.width = '0px';
-  f.allowtransparency = 'true';
-  return f;
+  return createIframe(document, {
+    id: getUniqueIdentifierStr(),
+    width: 0,
+    height: 0,
+    src: 'about:blank'
+  }, {
+    display: 'none',
+    height: '0px',
+    width: '0px',
+    border: '0px'
+  });
 }
 
 /*
@@ -341,7 +383,8 @@ export function isEmptyStr(str) {
  * Iterate object with the function
  * falls back to es5 `forEach`
  * @param {Array|Object} object
- * @param {Function(value, key, object)} fn
+ * @param {Function} fn - The function to execute for each element. It receives three arguments: value, key, and the original object.
+ * @returns {void}
  */
 export function _each(object, fn) {
   if (isFn(object?.forEach)) return object.forEach(fn, this);
@@ -356,7 +399,7 @@ export function contains(a, obj) {
  * Map an array or object into another array
  * given a function
  * @param {Array|Object} object
- * @param {Function(value, key, object)} callback
+ * @param {Function} callback - The function to execute for each element. It receives three arguments: value, key, and the original object.
  * @return {Array}
  */
 export function _map(object, callback) {
@@ -431,12 +474,6 @@ export function triggerPixel(url, done, timeout) {
   img.src = url;
 }
 
-export function callBurl({ source, burl }) {
-  if (source === CONSTANTS.S2S.SRC && burl) {
-    internal.triggerPixel(burl);
-  }
-}
-
 /**
  * Inserts an empty iframe with the specified `html`, primarily used for tracking purposes
  * (though could be for other purposes)
@@ -459,7 +496,6 @@ export function insertHtmlIntoIframe(htmlCode) {
 /**
  * Inserts empty iframe with the specified `url` for cookie sync
  * @param  {string} url URL to be requested
- * @param  {string} encodeUri boolean if URL should be encoded before inserted. Defaults to true
  * @param  {function} [done] an optional exit callback, used when this usersync pixel is added during an async process
  * @param  {Number} [timeout] an optional timeout in milliseconds for the iframe to load before calling `done`
  */
@@ -477,19 +513,32 @@ export function insertUserSyncIframe(url, done, timeout) {
 /**
  * Creates a snippet of HTML that retrieves the specified `url`
  * @param  {string} url URL to be requested
+ * @param encode
  * @return {string}     HTML snippet that contains the img src = set to `url`
  */
-export function createTrackPixelHtml(url) {
+export function createTrackPixelHtml(url, encode = encodeURI) {
   if (!url) {
     return '';
   }
 
-  let escapedUrl = encodeURI(url);
+  let escapedUrl = encode(url);
   let img = '
';
   img += '
';
   return img;
 };
 
+/**
+ * encodeURI, but preserves macros of the form '${MACRO}' (e.g. '${AUCTION_PRICE}')
+ * @param url
+ * @return {string}
+ */
+export function encodeMacroURI(url) {
+  const macros = Array.from(url.matchAll(/\$({[^}]+})/g)).map(match => match[1]);
+  return macros.reduce((str, macro) => {
+    return str.replace('$' + encodeURIComponent(macro), '$' + macro)
+  }, encodeURI(url))
+}
+
 /**
  * Creates a snippet of Iframe HTML that retrieves the specified `url`
  * @param  {string} url plain URL to be requested
@@ -557,6 +606,10 @@ export function isApnGetTagDefined() {
   }
 }
 
+export const sortByHighestCpm = (a, b) => {
+  return b.cpm - a.cpm;
+}
+
 /**
  * Fisher–Yates shuffle
  * http://stackoverflow.com/a/6274398
@@ -584,7 +637,7 @@ export function shuffle(array) {
 }
 
 export function deepClone(obj) {
-  return clone(obj);
+  return klona(obj) || {};
 }
 
 export function inIframe() {
@@ -595,13 +648,46 @@ export function inIframe() {
   }
 }
 
+/**
+ * https://iabtechlab.com/wp-content/uploads/2016/03/SafeFrames_v1.1_final.pdf
+ */
+export function isSafeFrameWindow() {
+  if (!inIframe()) {
+    return false;
+  }
+
+  const ws = internal.getWindowSelf();
+  return !!(ws.$sf && ws.$sf.ext);
+}
+
+/**
+ * Returns the result of calling the function $sf.ext.geom() if it exists
+ * @see https://iabtechlab.com/wp-content/uploads/2016/03/SafeFrames_v1.1_final.pdf — 5.4 Function $sf.ext.geom
+ * @returns {Object | undefined} geometric information about the container
+ */
+export function getSafeframeGeometry() {
+  try {
+    const ws = getWindowSelf();
+    return (typeof ws.$sf.ext.geom === 'function') ? ws.$sf.ext.geom() : undefined;
+  } catch (e) {
+    logError('Error getting SafeFrame geometry', e);
+    return undefined;
+  }
+}
+
 export function isSafariBrowser() {
   return /^((?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent);
 }
 
-export function replaceAuctionPrice(str, cpm) {
+export function replaceMacros(str, subs) {
   if (!str) return;
-  return str.replace(/\$\{AUCTION_PRICE\}/g, cpm);
+  return Object.entries(subs).reduce((str, [key, val]) => {
+    return str.replace(new RegExp('\\$\\{' + key + '\\}', 'g'), val || '');
+  }, str);
+}
+
+export function replaceAuctionPrice(str, cpm) {
+  return replaceMacros(str, {AUCTION_PRICE: cpm})
 }
 
 export function replaceClickThrough(str, clicktag) {
@@ -621,6 +707,33 @@ export function getPerformanceNow() {
   return (window.performance && window.performance.now && window.performance.now()) || 0;
 }
 
+/**
+ * Retuns the difference between `timing.domLoading` and `timing.navigationStart`.
+ * This function uses the deprecated `Performance.timing` API and should be removed in future.
+ * It has not been updated yet because it is still used in some modules.
+ * @deprecated
+ * @param {Window} w The window object used to perform the api call. default to window.self
+ * @returns {number}
+ */
+export function getDomLoadingDuration(w) {
+  let domLoadingDuration = -1;
+
+  w = w || getWindowSelf();
+
+  const performance = w.performance;
+
+  if (w.performance?.timing) {
+    if (w.performance.timing.navigationStart > 0) {
+      const val = performance.timing.domLoading - performance.timing.navigationStart;
+      if (val > 0) {
+        domLoadingDuration = val;
+      }
+    }
+  }
+
+  return domLoadingDuration;
+}
+
 /**
  * When the deviceAccess flag config option is false, no cookies should be read or set
  * @returns {boolean}
@@ -633,6 +746,7 @@ export function hasDeviceAccess() {
  * @returns {(boolean|undefined)}
  */
 export function checkCookieSupport() {
+  // eslint-disable-next-line prebid/no-member
   if (window.navigator.cookieEnabled || !!document.cookie.length) {
     return true;
   }
@@ -647,7 +761,7 @@ export function checkCookieSupport() {
  *
  * @param {function} func The function which should be executed, once the returned function has been executed
  *   numRequiredCalls times.
- * @param {int} numRequiredCalls The number of times which the returned function needs to be called before
+ * @param {number} numRequiredCalls The number of times which the returned function needs to be called before
  *   func is.
  */
 export function delayExecution(func, numRequiredCalls) {
@@ -665,8 +779,7 @@ export function delayExecution(func, numRequiredCalls) {
 
 /**
  * https://stackoverflow.com/a/34890276/428704
- * @export
- * @param {array} xs
+ * @param {Array} xs
  * @param {string} key
  * @returns {Object} {${key_value}: ${groupByArray}, key_value: {groupByArray}}
  */
@@ -881,9 +994,9 @@ export function buildUrl(obj) {
  * This function deeply compares two objects checking for their equivalence.
  * @param {Object} obj1
  * @param {Object} obj2
- * @param checkTypes {boolean} if set, two objects with identical properties but different constructors will *not*
- * be considered equivalent.
- * @returns {boolean}
+ * @param {Object} [options] - Options for comparison.
+ * @param {boolean} [options.checkTypes=false] - If set, two objects with identical properties but different constructors will *not* be considered equivalent.
+ * @returns {boolean} - Returns `true` if the objects are equivalent, `false` otherwise.
  */
 export function deepEqual(obj1, obj2, {checkTypes = false} = {}) {
   if (obj1 === obj2) return true;
@@ -892,8 +1005,9 @@ export function deepEqual(obj1, obj2, {checkTypes = false} = {}) {
     (typeof obj2 === 'object' && obj2 !== null) &&
     (!checkTypes || (obj1.constructor === obj2.constructor))
   ) {
-    if (Object.keys(obj1).length !== Object.keys(obj2).length) return false;
-    for (let prop in obj1) {
+    const props1 = Object.keys(obj1);
+    if (props1.length !== Object.keys(obj2).length) return false;
+    for (let prop of props1) {
       if (obj2.hasOwnProperty(prop)) {
         if (!deepEqual(obj1[prop], obj2[prop], {checkTypes})) {
           return false;
@@ -994,6 +1108,14 @@ export function safeJSONParse(data) {
   } catch (e) {}
 }
 
+export function safeJSONEncode(data) {
+  try {
+    return JSON.stringify(data);
+  } catch (e) {
+    return '';
+  }
+}
+
 /**
  * Returns a memoized version of `fn`.
  *
@@ -1015,9 +1137,36 @@ export function memoize(fn, key = function (arg) { return arg; }) {
   return memoized;
 }
 
+/**
+ * Returns a Unix timestamp for given time value and unit.
+ * @param {number} timeValue numeric value, defaults to 0 (which means now)
+ * @param {string} timeUnit defaults to days (or 'd'), use 'm' for minutes. Any parameter that isn't 'd' or 'm' will return Date.now().
+ * @returns {number}
+ */
+export function getUnixTimestampFromNow(timeValue = 0, timeUnit = 'd') {
+  const acceptableUnits = ['m', 'd'];
+  if (acceptableUnits.indexOf(timeUnit) < 0) {
+    return Date.now();
+  }
+  const multiplication = timeValue / (timeUnit === 'm' ? 1440 : 1);
+  return Date.now() + (timeValue && timeValue > 0 ? (1000 * 60 * 60 * 24 * multiplication) : 0);
+}
+
+/**
+ * Converts given object into an array, so {key: 1, anotherKey: 'fred', third: ['fred']} is turned
+ * into [{key: 1}, {anotherKey: 'fred'}, {third: ['fred']}]
+ * @param {Object} obj the object
+ * @returns {Array}
+ */
+export function convertObjectToArray(obj) {
+  return Object.keys(obj).map(key => {
+    return {[key]: obj[key]};
+  });
+}
+
 /**
  * Sets dataset attributes on a script
- * @param {Script} script
+ * @param {HTMLScriptElement} script
  * @param {object} attributes
  */
 export function setScriptAttributes(script, attributes) {
@@ -1051,3 +1200,87 @@ export function binarySearch(arr, el, key = (el) => el) {
   }
   return left;
 }
+
+/**
+ * Checks if an object has non-serializable properties.
+ * Non-serializable properties are functions and RegExp objects.
+ *
+ * @param {Object} obj - The object to check.
+ * @param {Set} checkedObjects - A set of properties that have already been checked.
+ * @returns {boolean} - Returns true if the object has non-serializable properties, false otherwise.
+ */
+export function hasNonSerializableProperty(obj, checkedObjects = new Set()) {
+  for (const key in obj) {
+    const value = obj[key];
+    const type = typeof value;
+
+    if (
+      value === undefined ||
+      type === 'function' ||
+      type === 'symbol' ||
+      value instanceof RegExp ||
+      value instanceof Map ||
+      value instanceof Set ||
+      value instanceof Date ||
+      (value !== null && type === 'object' && value.hasOwnProperty('toJSON'))
+    ) {
+      return true;
+    }
+    if (value !== null && type === 'object' && value.constructor === Object) {
+      if (checkedObjects.has(value)) {
+        // circular reference, means we have a non-serializable property
+        return true;
+      }
+      checkedObjects.add(value);
+      if (hasNonSerializableProperty(value, checkedObjects)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+/**
+ * Returns the value of a nested property in an array of objects.
+ *
+ * @param {Array} collection - Array of objects.
+ * @param {String} key - Key of nested property.
+ * @returns {any, undefined} - Value of nested property.
+ */
+export function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+  return undefined;
+}
+
+export function extractDomainFromHost(pageHost) {
+  let domain = null;
+  try {
+    let domains = /[-\w]+\.([-\w]+|[-\w]{3,}|[-\w]{1,3}\.[-\w]{2})$/i.exec(pageHost);
+    if (domains != null && domains.length > 0) {
+      domain = domains[0];
+      for (let i = 1; i < domains.length; i++) {
+        if (domains[i].length > domain.length) {
+          domain = domains[i];
+        }
+      }
+    }
+  } catch (e) {
+    domain = null;
+  }
+  return domain;
+}
+
+export function triggerNurlWithCpm(bid, cpm) {
+  if (isStr(bid.nurl) && bid.nurl !== '') {
+    bid.nurl = bid.nurl.replace(
+      /\${AUCTION_PRICE}/,
+      cpm
+    );
+    triggerPixel(bid.nurl);
+  }
+}
diff --git a/src/utils/focusTimeout.js b/src/utils/focusTimeout.js
new file mode 100644
index 00000000000..0c54bacec97
--- /dev/null
+++ b/src/utils/focusTimeout.js
@@ -0,0 +1,52 @@
+let outOfFocusStart = null; // enforce null otherwise it could be undefined and the callback wouldn't execute
+let timeOutOfFocus = 0;
+let suspendedTimeouts = [];
+
+function trackTimeOutOfFocus() {
+  if (document.hidden) {
+    outOfFocusStart = Date.now()
+  } else {
+    timeOutOfFocus += Date.now() - (outOfFocusStart ?? 0); // when the page is loaded in hidden state outOfFocusStart is undefined, which results in timeoutOffset being NaN
+    outOfFocusStart = null;
+    suspendedTimeouts.forEach(({ callback, startTime, setTimerId }) => setTimerId(setFocusTimeout(callback, timeOutOfFocus - startTime)()));
+    suspendedTimeouts = [];
+  }
+}
+
+document.addEventListener('visibilitychange', trackTimeOutOfFocus);
+
+export function reset() {
+  outOfFocusStart = null;
+  timeOutOfFocus = 0;
+  suspendedTimeouts = [];
+  document.removeEventListener('visibilitychange', trackTimeOutOfFocus);
+  document.addEventListener('visibilitychange', trackTimeOutOfFocus);
+}
+
+/**
+ * Wraps native setTimeout function in order to count time only when page is focused
+ *
+ * @param {function(*): ()} [callback] - A function that will be invoked after passed time
+ * @param {number} [milliseconds] - Minimum duration (in milliseconds) that the callback will be executed after
+ * @returns {function(*): (number)} - Getter function for current timer id
+ */
+export function setFocusTimeout(callback, milliseconds) {
+  const startTime = timeOutOfFocus;
+  let timerId = setTimeout(() => {
+    if (timeOutOfFocus === startTime && outOfFocusStart == null) {
+      callback();
+    } else if (outOfFocusStart != null) {
+      // case when timeout ended during page is out of focus
+      suspendedTimeouts.push({
+        callback,
+        startTime,
+        setTimerId(newId) {
+          timerId = newId;
+        }
+      })
+    } else {
+      timerId = setFocusTimeout(callback, timeOutOfFocus - startTime)();
+    }
+  }, milliseconds);
+  return () => timerId;
+}
diff --git a/src/utils/gpdr.js b/src/utils/gdpr.js
similarity index 72%
rename from src/utils/gpdr.js
rename to src/utils/gdpr.js
index 19c7126b7d7..6151861a67b 100644
--- a/src/utils/gpdr.js
+++ b/src/utils/gdpr.js
@@ -1,5 +1,3 @@
-import {deepAccess} from '../utils.js';
-
 /**
  * Check if GDPR purpose 1 consent was given.
  *
@@ -8,7 +6,7 @@ import {deepAccess} from '../utils.js';
  */
 export function hasPurpose1Consent(gdprConsent) {
   if (gdprConsent?.gdprApplies) {
-    return deepAccess(gdprConsent, 'vendorData.purpose.consents.1') === true;
+    return gdprConsent?.vendorData?.purpose?.consents?.[1] === true;
   }
   return true;
 }
diff --git a/src/utils/ipUtils.js b/src/utils/ipUtils.js
new file mode 100644
index 00000000000..600c0e75087
--- /dev/null
+++ b/src/utils/ipUtils.js
@@ -0,0 +1,52 @@
+export function scrubIPv4(ip) {
+  if (!ip) {
+    return null;
+  }
+
+  const ones = 24;
+
+  let ipParts = ip.split('.').map(Number)
+
+  if (ipParts.length != 4) {
+    return null;
+  }
+
+  let mask = [];
+  for (let i = 0; i < 4; i++) {
+    let n = Math.max(0, Math.min(8, ones - (i * 8)));
+    mask.push((0xff << (8 - n)) & 0xff);
+  }
+
+  let maskedIP = ipParts.map((part, i) => part & mask[i]);
+
+  return maskedIP.join('.');
+}
+
+export function scrubIPv6(ip) {
+  if (!ip) {
+    return null;
+  }
+
+  const ones = 64;
+
+  let ipParts = ip.split(':').map(part => parseInt(part, 16));
+
+  ipParts = ipParts.map(part => isNaN(part) ? 0 : part);
+  while (ipParts.length < 8) {
+    ipParts.push(0);
+  }
+
+  if (ipParts.length != 8) {
+    return null;
+  }
+
+  let mask = [];
+  for (let i = 0; i < 8; i++) {
+    let n = Math.max(0, Math.min(16, ones - (i * 16)));
+    mask.push((0xffff << (16 - n)) & 0xffff);
+  }
+
+  let maskedIP = ipParts.map((part, i) => part & mask[i]);
+
+  return maskedIP.map(part => part.toString(16)).join(':');
+}
diff --git a/src/utils/perfMetrics.js b/src/utils/perfMetrics.js
index b1fdb38effe..d0736b71554 100644
--- a/src/utils/perfMetrics.js
+++ b/src/utils/perfMetrics.js
@@ -63,9 +63,9 @@ export function metricsFactory({now = getTime, mkNode = makeNode, mkTimer = make
       /**
        * Get the tame passed since `checkpoint`, and optionally save it as a metric.
        *
-       * @param checkpoint checkpoint name
-       * @param metric? metric name
-       * @return {number} time between now and `checkpoint`
+       * @param {string} checkpoint checkpoint name
+       * @param {string} [metric] - The name of the metric to save. Optional.
+       * @returns {number|null} - The time in milliseconds between now and the checkpoint, or `null` if the checkpoint is not found.
        */
       function timeSince(checkpoint, metric) {
         const ts = getTimestamp(checkpoint);
@@ -79,10 +79,10 @@ export function metricsFactory({now = getTime, mkNode = makeNode, mkTimer = make
       /**
        * Get the time passed between `startCheckpoint` and `endCheckpoint`, optionally saving it as a metric.
        *
-       * @param startCheckpoint begin checkpoint
-       * @param endCheckpoint end checkpoint
-       * @param metric? metric name
-       * @return {number} time passed between `startCheckpoint` and `endCheckpoint`
+       * @param {string} startCheckpoint - The name of the starting checkpoint.
+       * @param {string} endCheckpoint - The name of the ending checkpoint.
+       * @param {string} [metric] - The name of the metric to save. Optional.
+       * @returns {number|null} - The time in milliseconds between `startCheckpoint` and `endCheckpoint`, or `null` if either checkpoint is not found.
        */
       function timeBetween(startCheckpoint, endCheckpoint, metric) {
         const start = getTimestamp(startCheckpoint);
@@ -128,12 +128,12 @@ export function metricsFactory({now = getTime, mkNode = makeNode, mkTimer = make
       }
 
       /**
-       * @typedef {function: T} HookFn
-       * @property {function(T): void} bail
+       * @typedef {Function} HookFn
+       * @property {Function(T): void} bail
        *
        * @template T
-       * @typedef {T: HookFn} TimedHookFn
-       * @property {function(): void} stopTiming
+       * @typedef {HookFn} TimedHookFn
+       * @property {Function(): void} stopTiming
        * @property {T} untimed
        */
 
@@ -141,12 +141,12 @@ export function metricsFactory({now = getTime, mkNode = makeNode, mkTimer = make
        * Convenience method for measuring time spent in a `.before` or `.after` hook.
        *
        * @template T
-       * @param name metric name
-       * @param {HookFn} next the hook's `next` (first) argument
-       * @param {function(TimedHookFn): T} fn a function that will be run immediately; it takes `next`,
+       * @param {string} name - The metric name.
+       * @param {HookFn} next - The hook's `next` (first) argument.
+       * @param {function(TimedHookFn): T} fn - A function that will be run immediately; it takes `next`,
        *    where both `next` and `next.bail` automatically
        *    call `stopTiming` before continuing with the original hook.
-       * @return {T} fn's return value
+       * @return {T} - The return value of `fn`.
        */
       function measureHookTime(name, next, fn) {
         const stopTiming = startTiming(name);
@@ -208,10 +208,11 @@ export function metricsFactory({now = getTime, mkNode = makeNode, mkTimer = make
        * ```
        *
        *
-       * @param propagate if false, the forked metrics will not be propagated here
-       * @param stopPropagation if true, propagation from the new metrics is stopped here - instead of
-       *   continuing up the chain (if for example these metrics were themselves created through `.fork()`)
-       * @param includeGroups if true, the forked metrics will also replicate metrics that were propagated
+       * @param {Object} [options={}] - Options for forking the metrics.
+       * @param {boolean} [options.propagate=true] - If false, the forked metrics will not be propagated here.
+       * @param {boolean} [options.stopPropagation=false] - If true, propagation from the new metrics is stopped here, instead of
+       *   continuing up the chain (if for example these metrics were themselves created through `.fork()`).
+       * @param {boolean} [options.includeGroups=false] - If true, the forked metrics will also replicate metrics that were propagated
        *   here from elsewhere. For example:
        *   ```
        *   const metrics = newMetrics();
@@ -222,6 +223,7 @@ export function metricsFactory({now = getTime, mkNode = makeNode, mkTimer = make
        *   withoutGroups.getMetrics() // {}
        *   withGroups.getMetrics() // {foo: ['bar']}
        *   ```
+       * @returns {Object} - The new metrics object.
        */
       function fork({propagate = true, stopPropagation = false, includeGroups = false} = {}) {
         return makeMetrics(mkNode([[self, {propagate, stopPropagation, includeGroups}]]), rename);
diff --git a/src/utils/ttlCollection.js b/src/utils/ttlCollection.js
index 392ed1c9ad7..ffc11433d06 100644
--- a/src/utils/ttlCollection.js
+++ b/src/utils/ttlCollection.js
@@ -1,22 +1,30 @@
 import {GreedyPromise} from './promise.js';
-import {binarySearch, timestamp} from '../utils.js';
+import {binarySearch, logError, timestamp} from '../utils.js';
+import {setFocusTimeout} from './focusTimeout.js';
 
 /**
  * Create a set-like collection that automatically forgets items after a certain time.
  *
- * @param {({}) => Number|Promise} startTime? a function taking an item added to this collection,
+ * @param {function(*): (number|Promise)} [startTime=timestamp] - A function taking an item added to this collection,
  *   and returning (a promise to) a timestamp to be used as the starting time for the item
  *   (the item will be dropped after `ttl(item)` milliseconds have elapsed since this timestamp).
  *   Defaults to the time the item was added to the collection.
- * @param {({}) => Number|void|Promise} ttl a function taking an item added to this collection,
+ * @param {function(*): (number|void|Promise)} [ttl=() => null] - A function taking an item added to this collection,
  *   and returning (a promise to) the duration (in milliseconds) the item should be kept in it.
  *   May return null to indicate that the item should be persisted indefinitely.
- * @param {boolean} monotonic? set to true for better performance, but only if, given any two items A and B in this collection:
+ * @param {boolean} [monotonic=false] - Set to true for better performance, but only if, given any two items A and B in this collection:
  *   if A was added before B, then:
  *     - startTime(A) + ttl(A) <= startTime(B) + ttl(B)
  *     - Promise.all([startTime(A), ttl(A)]) never resolves later than Promise.all([startTime(B), ttl(B)])
- * @param {number} slack? maximum duration (in milliseconds) that an item is allowed to persist
+ * @param {number} [slack=5000] - Maximum duration (in milliseconds) that an item is allowed to persist
  *   once past its TTL. This is also roughly the interval between "garbage collection" sweeps.
+ * @returns {Object} A set-like collection with automatic TTL expiration.
+ * @returns {function(*): void} return.add - Add an item to the collection.
+ * @returns {function(): void} return.clear - Clear the collection.
+ * @returns {function(): Array<*>} return.toArray - Get all the items in the collection, in insertion order.
+ * @returns {function(): void} return.refresh - Refresh the TTL for each item in the collection.
+ * @returns {function(function(*)): function(): void} return.onExpiry - Register a callback to be run when an item has expired and is about to be
+ *   removed from the collection. Returns an un-registration function
  */
 export function ttlCollection(
   {
@@ -27,6 +35,7 @@ export function ttlCollection(
   } = {}
 ) {
   const items = new Map();
+  const callbacks = [];
   const pendingPurge = [];
   const markForPurge = monotonic
     ? (entry) => pendingPurge.push(entry)
@@ -38,11 +47,18 @@ export function ttlCollection(
     if (pendingPurge.length > 0) {
       const now = timestamp();
       nextPurge = Math.max(now, pendingPurge[0].expiry + slack);
-      task = setTimeout(() => {
+      task = setFocusTimeout(() => {
         const now = timestamp();
         let cnt = 0;
         for (const entry of pendingPurge) {
           if (entry.expiry > now) break;
+          callbacks.forEach(cb => {
+            try {
+              cb(entry.item)
+            } catch (e) {
+              logError(e);
+            }
+          });
           items.delete(entry.item)
           cnt++;
         }
@@ -135,5 +151,20 @@ export function ttlCollection(
         entry.refresh();
       }
     },
+    /**
+     * Register a callback to be run when an item has expired and is about to be
+     * removed the from the collection.
+     * @param cb a callback that takes the expired item as argument
+     * @return an unregistration function.
+     */
+    onExpiry(cb) {
+      callbacks.push(cb);
+      return () => {
+        const idx = callbacks.indexOf(cb);
+        if (idx >= 0) {
+          callbacks.splice(idx, 1);
+        }
+      }
+    }
   };
 }
diff --git a/src/video.js b/src/video.js
index ff137892a2b..a859fcb17bd 100644
--- a/src/video.js
+++ b/src/video.js
@@ -1,4 +1,4 @@
-import {deepAccess, logError} from './utils.js';
+import {isArrayOfNums, isInteger, isNumber, isPlainObject, isStr, logError, logWarn} from './utils.js';
 import {config} from '../src/config.js';
 import {hook} from './hook.js';
 import {auctionManager} from './auctionManager.js';
@@ -6,6 +6,47 @@ import {auctionManager} from './auctionManager.js';
 export const OUTSTREAM = 'outstream';
 export const INSTREAM = 'instream';
 
+/**
+ * List of OpenRTB 2.x video object properties with simple validators.
+ * Not included: `companionad`, `durfloors`, `ext`
+ * reference: https://github.com/InteractiveAdvertisingBureau/openrtb2.x/blob/main/2.6.md
+ */
+export const ORTB_VIDEO_PARAMS = new Map([
+  [ 'mimes', value => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string') ],
+  [ 'minduration', isInteger ],
+  [ 'maxduration', isInteger ],
+  [ 'startdelay', isInteger ],
+  [ 'maxseq', isInteger ],
+  [ 'poddur', isInteger ],
+  [ 'protocols', isArrayOfNums ],
+  [ 'w', isInteger ],
+  [ 'h', isInteger ],
+  [ 'podid', isStr ],
+  [ 'podseq', isInteger ],
+  [ 'rqddurs', isArrayOfNums ],
+  [ 'placement', isInteger ], // deprecated, see plcmt
+  [ 'plcmt', isInteger ],
+  [ 'linearity', isInteger ],
+  [ 'skip', value => [1, 0].includes(value) ],
+  [ 'skipmin', isInteger ],
+  [ 'skipafter', isInteger ],
+  [ 'sequence', isInteger ], // deprecated
+  [ 'slotinpod', isInteger ],
+  [ 'mincpmpersec', isNumber ],
+  [ 'battr', isArrayOfNums ],
+  [ 'maxextended', isInteger ],
+  [ 'minbitrate', isInteger ],
+  [ 'maxbitrate', isInteger ],
+  [ 'boxingallowed', isInteger ],
+  [ 'playbackmethod', isArrayOfNums ],
+  [ 'playbackend', isInteger ],
+  [ 'delivery', isArrayOfNums ],
+  [ 'pos', isInteger ],
+  [ 'api', isArrayOfNums ],
+  [ 'companiontype', isArrayOfNums ],
+  [ 'poddedupe', isArrayOfNums ]
+]);
+
 export function fillVideoDefaults(adUnit) {
   const video = adUnit?.mediaTypes?.video;
   if (video != null && video.plcmt == null) {
@@ -17,6 +58,42 @@ export function fillVideoDefaults(adUnit) {
   }
 }
 
+/**
+ * validateOrtbVideoFields mutates the `adUnit.mediaTypes.video` object by removing invalid ortb properties (default).
+ * The onInvalidParam callback can be used to handle invalid properties differently.
+ * Other properties are ignored and kept as is.
+ *
+ * @param {Object} adUnit - The adUnit object.
+ * @param {Function} onInvalidParam - The callback function to be called with key, value, and adUnit.
+ * @returns {void}
+ */
+export function validateOrtbVideoFields(adUnit, onInvalidParam) {
+  const videoParams = adUnit?.mediaTypes?.video;
+
+  if (!isPlainObject(videoParams)) {
+    logWarn(`validateOrtbVideoFields: videoParams must be an object.`);
+    return;
+  }
+
+  if (videoParams != null) {
+    Object.entries(videoParams)
+      .forEach(([key, value]) => {
+        if (!ORTB_VIDEO_PARAMS.has(key)) {
+          return
+        }
+        const isValid = ORTB_VIDEO_PARAMS.get(key)(value);
+        if (!isValid) {
+          if (typeof onInvalidParam === 'function') {
+            onInvalidParam(key, value, adUnit);
+          } else {
+            delete videoParams[key];
+            logWarn(`Invalid prop in adUnit "${adUnit.code}": Invalid value for mediaTypes.video.${key} ORTB property. The property has been removed.`);
+          }
+        }
+      });
+  }
+}
+
 /**
  * @typedef {object} VideoBid
  * @property {string} adId id of the bid
@@ -25,13 +102,14 @@ export function fillVideoDefaults(adUnit) {
 /**
  * Validate that the assets required for video context are present on the bid
  * @param {VideoBid} bid Video bid to validate
- * @param index
+ * @param {Object} [options] - Options object
+ * @param {Object} [options.index=auctionManager.index] - Index object, defaulting to `auctionManager.index`
  * @return {Boolean} If object is valid
  */
 export function isValidVideoBid(bid, {index = auctionManager.index} = {}) {
-  const videoMediaType = deepAccess(index.getMediaTypes(bid), 'video');
-  const context = videoMediaType && deepAccess(videoMediaType, 'context');
-  const useCacheKey = videoMediaType && deepAccess(videoMediaType, 'useCacheKey');
+  const videoMediaType = index.getMediaTypes(bid)?.video;
+  const context = videoMediaType && videoMediaType?.context;
+  const useCacheKey = videoMediaType && videoMediaType?.useCacheKey;
   const adUnit = index.getAdUnit(bid);
 
   // if context not defined assume default 'instream' for video bids
diff --git a/src/videoCache.js b/src/videoCache.js
index 88fc27625fd..cf39c1c9452 100644
--- a/src/videoCache.js
+++ b/src/videoCache.js
@@ -12,6 +12,8 @@
 import {ajaxBuilder} from './ajax.js';
 import {config} from './config.js';
 import {auctionManager} from './auctionManager.js';
+import {logError, logWarn} from './utils.js';
+import {addBidToAuction} from './auction.js';
 
 /**
  * Might be useful to be configurable in the future
@@ -39,20 +41,21 @@ const ttlBufferInSeconds = 15;
  * Function which wraps a URI that serves VAST XML, so that it can be loaded.
  *
  * @param {string} uri The URI where the VAST content can be found.
- * @param {string} impUrl An impression tracker URL for the delivery of the video ad
+ * @param {(string|string[])} impTrackerURLs An impression tracker URL for the delivery of the video ad
  * @return A VAST URL which loads XML from the given URI.
  */
-function wrapURI(uri, impUrl) {
+function wrapURI(uri, impTrackerURLs) {
+  impTrackerURLs = impTrackerURLs && (Array.isArray(impTrackerURLs) ? impTrackerURLs : [impTrackerURLs]);
   // Technically, this is vulnerable to cross-script injection by sketchy vastUrl bids.
   // We could make sure it's a valid URI... but since we're loading VAST XML from the
   // URL they provide anyway, that's probably not a big deal.
-  let vastImp = (impUrl) ? `` : ``;
+  let impressions = impTrackerURLs ? impTrackerURLs.map(trk => ``).join('') : '';
   return `
     
       
         prebid.org wrapper
         
-        ${vastImp}
+        ${impressions}
         
       
     
@@ -64,7 +67,9 @@ function wrapURI(uri, impUrl) {
  * the bid can't be converted cleanly.
  *
  * @param {CacheableBid} bid
- * @param index
+ * @param {Object} [options] - Options object.
+ * @param {Object} [options.index=auctionManager.index] - Index object, defaulting to `auctionManager.index`.
+ * @return {Object|null} - The payload to be sent to the prebid-server endpoints, or null if the bid can't be converted cleanly.
  */
 function toStorageRequest(bid, {index = auctionManager.index} = {}) {
   const vastValue = bid.vastXml ? bid.vastXml : wrapURI(bid.vastUrl, bid.vastImpUrl);
@@ -156,3 +161,73 @@ export function store(bids, done, getAjax = ajaxBuilder) {
 export function getCacheUrl(id) {
   return `${config.getConfig('cache.url')}?uuid=${id}`;
 }
+
+export const _internal = {
+  store
+}
+
+export function storeBatch(batch) {
+  const bids = batch.map(entry => entry.bidResponse)
+  function err(msg) {
+    logError(`Failed to save to the video cache: ${msg}. Video bids will be discarded:`, bids)
+  }
+  _internal.store(bids, function (error, cacheIds) {
+    if (error) {
+      err(error)
+    } else if (batch.length !== cacheIds.length) {
+      logError(`expected ${batch.length} cache IDs, got ${cacheIds.length} instead`)
+    } else {
+      cacheIds.forEach((cacheId, i) => {
+        const {auctionInstance, bidResponse, afterBidAdded} = batch[i];
+        if (cacheId.uuid === '') {
+          logWarn(`Supplied video cache key was already in use by Prebid Cache; caching attempt was rejected. Video bid must be discarded.`);
+        } else {
+          bidResponse.videoCacheKey = cacheId.uuid;
+          if (!bidResponse.vastUrl) {
+            bidResponse.vastUrl = getCacheUrl(bidResponse.videoCacheKey);
+          }
+          addBidToAuction(auctionInstance, bidResponse);
+          afterBidAdded();
+        }
+      });
+    }
+  });
+};
+
+let batchSize, batchTimeout;
+if (FEATURES.VIDEO) {
+  config.getConfig('cache', (cacheConfig) => {
+    batchSize = typeof cacheConfig.cache.batchSize === 'number' && cacheConfig.cache.batchSize > 0
+      ? cacheConfig.cache.batchSize
+      : 1;
+    batchTimeout = typeof cacheConfig.cache.batchTimeout === 'number' && cacheConfig.cache.batchTimeout > 0
+      ? cacheConfig.cache.batchTimeout
+      : 0;
+  });
+}
+
+export const batchingCache = (timeout = setTimeout, cache = storeBatch) => {
+  let batches = [[]];
+  let debouncing = false;
+  const noTimeout = cb => cb();
+
+  return function (auctionInstance, bidResponse, afterBidAdded) {
+    const batchFunc = batchTimeout > 0 ? timeout : noTimeout;
+    if (batches[batches.length - 1].length >= batchSize) {
+      batches.push([]);
+    }
+
+    batches[batches.length - 1].push({auctionInstance, bidResponse, afterBidAdded});
+
+    if (!debouncing) {
+      debouncing = true;
+      batchFunc(() => {
+        batches.forEach(cache);
+        batches = [[]];
+        debouncing = false;
+      }, batchTimeout);
+    }
+  };
+};
+
+export const batchAndStore = batchingCache();
diff --git a/test/fake-server/fake-responder.js b/test/fake-server/fake-responder.js
index a44d02260e7..13bf3bc816f 100644
--- a/test/fake-server/fake-responder.js
+++ b/test/fake-server/fake-responder.js
@@ -9,7 +9,7 @@ const fixturesPath = path.join(__dirname, 'fixtures');
 /**
  * Matches 'req.body' with the responseBody pair
  * @param {object} requestBody - `req.body` of incoming request hitting middleware 'fakeResponder'.
- * @returns {objct} responseBody
+ * @returns {object} responseBody
  */
 const matchResponse = function (requestBody) {
   let actualUuids = [];
diff --git a/test/fake-server/fixtures/basic-outstream/request.json b/test/fake-server/fixtures/basic-outstream/request.json
index e9f3302ab4c..6d522058cff 100644
--- a/test/fake-server/fixtures/basic-outstream/request.json
+++ b/test/fake-server/fixtures/basic-outstream/request.json
@@ -19,6 +19,7 @@
         "prebid": true,
         "disable_psa": true,
         "video": {
+          "context": 4,
           "skippable": true,
           "playback_method": 2
         },
@@ -39,6 +40,7 @@
         "prebid": true,
         "disable_psa": true,
         "video": {
+          "context": 4,
           "skippable": true,
           "playback_method": 2
         },
diff --git a/test/fixtures/fixtures.js b/test/fixtures/fixtures.js
index 7317ea039d1..b282d9006a6 100644
--- a/test/fixtures/fixtures.js
+++ b/test/fixtures/fixtures.js
@@ -1,17 +1,17 @@
 // jscs:disable
-import CONSTANTS from 'src/constants.json';
+import { TARGETING_KEYS, STATUS } from 'src/constants.js';
 import {createBid} from '../../src/bidfactory.js';
 const utils = require('src/utils.js');
 
 function convertTargetingsFromOldToNew(targetings) {
   var mapOfOldToNew = {
-    'hb_bidder': CONSTANTS.TARGETING_KEYS.BIDDER,
-    'hb_adid': CONSTANTS.TARGETING_KEYS.AD_ID,
-    'hb_pb': CONSTANTS.TARGETING_KEYS.PRICE_BUCKET,
-    'hb_size': CONSTANTS.TARGETING_KEYS.SIZE,
-    'hb_deal': CONSTANTS.TARGETING_KEYS.DEAL,
-    'hb_source': CONSTANTS.TARGETING_KEYS.SOURCE,
-    'hb_format': CONSTANTS.TARGETING_KEYS.FORMAT
+    'hb_bidder': TARGETING_KEYS.BIDDER,
+    'hb_adid': TARGETING_KEYS.AD_ID,
+    'hb_pb': TARGETING_KEYS.PRICE_BUCKET,
+    'hb_size': TARGETING_KEYS.SIZE,
+    'hb_deal': TARGETING_KEYS.DEAL,
+    'hb_source': TARGETING_KEYS.SOURCE,
+    'hb_format': TARGETING_KEYS.FORMAT
   };
   var newTargetings = {};
   utils._each(targetings, function(value, currentKey) {
@@ -822,6 +822,68 @@ export function getAdUnits() {
   ];
 };
 
+export function getTwinAdUnits() {
+  return [
+    {
+      'code': '/19968336/header-bid-tag1',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [
+            [
+              728,
+              90
+            ]
+          ]
+        }
+      },
+      'bids': [
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'publisherId': 1234567,
+            'adSlot': '1234567@728x90'
+          }
+        },
+        {
+          'bidder': 'medianet',
+          'params': {
+            'cid': '8CUWQS47C',
+            'crid': '241882766'
+          },
+        },
+      ]
+    },
+    {
+      'code': '/19968336/header-bid-tag1',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [
+            [
+              970,
+              90
+            ]
+          ]
+        }
+      },
+      'bids': [
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '543221'
+          }
+        },
+        {
+          'bidder': 'medianet',
+          'params': {
+            'cid': '8CUWQS47C',
+            'crid': '241882764'
+          },
+        },
+      ]
+    }
+  ]
+}
+
 export function getBidResponsesFromAPI() {
   return {
     '/19968336/header-bid-tag-0': {
@@ -966,7 +1028,7 @@ export function getBidResponsesFromAPI() {
 export function getAdServerTargeting() {
   return {
     '/19968336/header-bid-tag-0': convertTargetingsFromOldToNew({
-      'foobar': '0x0,300x250,300x600',
+      'foobar': '300x250,300x600,0x0',
       'hb_size': '300x250',
       'hb_pb': '10.00',
       'hb_adid': '233bcbee889d46d',
@@ -1018,24 +1080,24 @@ export function getAdServerTargeting() {
 export function getTargetingKeys() {
   return [
     [
-      CONSTANTS.TARGETING_KEYS.BIDDER,
+      TARGETING_KEYS.BIDDER,
       'appnexus'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.AD_ID,
+      TARGETING_KEYS.AD_ID,
       '233bcbee889d46d'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.PRICE_BUCKET,
+      TARGETING_KEYS.PRICE_BUCKET,
       '10.00'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.SIZE,
+      TARGETING_KEYS.SIZE,
       '300x250'
     ],
     [
       'foobar',
-      ['0x0', '300x250', '300x600']
+      ['300x250', '300x600', '0x0']
     ]
   ];
 }
@@ -1045,131 +1107,131 @@ export function getTargetingKeys() {
 export function getTargetingKeysBidLandscape() {
   return [
     [
-      CONSTANTS.TARGETING_KEYS.BIDDER,
+      TARGETING_KEYS.BIDDER,
       'appnexus'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.AD_ID + '_appnexus',
+      TARGETING_KEYS.AD_ID + '_appnexus',
       '233bcbee889d46d'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.PRICE_BUCKET,
+      TARGETING_KEYS.PRICE_BUCKET,
       '10.00'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.SIZE,
+      TARGETING_KEYS.SIZE,
       '300x250'
     ],
     [
       'foobar',
-      ['0x0', '300x250', '300x600']
+      ['300x250', '300x600', '0x0']
     ],
     [
-      CONSTANTS.TARGETING_KEYS.BIDDER + '_triplelift',
+      TARGETING_KEYS.BIDDER + '_triplelift',
       'triplelift'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.AD_ID + '_triplelift',
+      TARGETING_KEYS.AD_ID + '_triplelift',
       '222bb26f9e8bd'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_triplelift',
+      TARGETING_KEYS.PRICE_BUCKET + '_triplelift',
       '10.00'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.SIZE + '_triplelift',
+      TARGETING_KEYS.SIZE + '_triplelift',
       '0x0'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.BIDDER + '_appnexus',
+      TARGETING_KEYS.BIDDER + '_appnexus',
       'appnexus'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_appnexus',
+      TARGETING_KEYS.PRICE_BUCKET + '_appnexus',
       '10.00'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.SIZE + '_appnexus',
+      TARGETING_KEYS.SIZE + '_appnexus',
       '300x250'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.BIDDER + '_pagescienc',
+      TARGETING_KEYS.BIDDER + '_pagescienc',
       'pagescience'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.AD_ID + '_pagescience',
+      TARGETING_KEYS.AD_ID + '_pagescience',
       '25bedd4813632d7'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_pagescience',
+      TARGETING_KEYS.PRICE_BUCKET + '_pagescience',
       '10.00'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.SIZE + '_pagescience',
+      TARGETING_KEYS.SIZE + '_pagescience',
       '300x250'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.BIDDER + '_brightcom',
+      TARGETING_KEYS.BIDDER + '_brightcom',
       'brightcom'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.AD_ID + '_brightcom',
+      TARGETING_KEYS.AD_ID + '_brightcom',
       '26e0795ab963896'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_brightcom',
+      TARGETING_KEYS.PRICE_BUCKET + '_brightcom',
       '10.00'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.SIZE + '_brightcom',
+      TARGETING_KEYS.SIZE + '_brightcom',
       '300x250'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.BIDDER + '_brealtime',
+      TARGETING_KEYS.BIDDER + '_brealtime',
       'brealtime'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.AD_ID + '_brealtime',
+      TARGETING_KEYS.AD_ID + '_brealtime',
       '275bd666f5a5a5d'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_brealtime',
+      TARGETING_KEYS.PRICE_BUCKET + '_brealtime',
       '10.00'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.SIZE + '_brealtime',
+      TARGETING_KEYS.SIZE + '_brealtime',
       '300x250'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.BIDDER + '_pubmatic',
+      TARGETING_KEYS.BIDDER + '_pubmatic',
       'pubmatic'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.AD_ID + '_pubmatic',
+      TARGETING_KEYS.AD_ID + '_pubmatic',
       '28f4039c636b6a7'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_pubmatic',
+      TARGETING_KEYS.PRICE_BUCKET + '_pubmatic',
       '10.00'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.SIZE + '_pubmatic',
+      TARGETING_KEYS.SIZE + '_pubmatic',
       '300x250'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.BIDDER + '_rubicon',
+      TARGETING_KEYS.BIDDER + '_rubicon',
       'rubicon'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.AD_ID + '_rubicon',
+      TARGETING_KEYS.AD_ID + '_rubicon',
       '29019e2ab586a5a'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_rubicon',
+      TARGETING_KEYS.PRICE_BUCKET + '_rubicon',
       '10.00'
     ],
     [
-      CONSTANTS.TARGETING_KEYS.SIZE + '_rubicon',
+      TARGETING_KEYS.SIZE + '_rubicon',
       '300x600'
     ]
   ];
@@ -1262,7 +1324,7 @@ export function createBidReceived({bidder, cpm, auctionId, responseTimestamp, ad
   if (typeof status !== 'undefined') {
     bid.status = status;
   }
-  return Object.assign(createBid(CONSTANTS.STATUS.GOOD), bid);
+  return Object.assign(createBid(STATUS.GOOD), bid);
 }
 
 export function getServerTestingsAds() {
diff --git a/test/helpers/analytics.js b/test/helpers/analytics.js
index b376118dc6f..d36bcf44f64 100644
--- a/test/helpers/analytics.js
+++ b/test/helpers/analytics.js
@@ -1,12 +1,12 @@
 import * as pbEvents from 'src/events.js';
-import constants from '../../src/constants.json';
+import { EVENTS } from '../../src/constants.js';
 
 export function fireEvents(events = [
-  constants.EVENTS.AUCTION_INIT,
-  constants.EVENTS.AUCTION_END,
-  constants.EVENTS.BID_REQUESTED,
-  constants.EVENTS.BID_RESPONSE,
-  constants.EVENTS.BID_WON
+  EVENTS.AUCTION_INIT,
+  EVENTS.AUCTION_END,
+  EVENTS.BID_REQUESTED,
+  EVENTS.BID_RESPONSE,
+  EVENTS.BID_WON
 ]) {
   return events.map((ev, i) => {
     ev = Array.isArray(ev) ? ev : [ev, {i: i}];
diff --git a/test/helpers/cookies.js b/test/helpers/cookies.js
new file mode 100644
index 00000000000..a0d9da3c595
--- /dev/null
+++ b/test/helpers/cookies.js
@@ -0,0 +1,5 @@
+export function clearAllCookies() {
+  document.cookie.split(';').forEach(function (c) {
+    document.cookie = c.replace(/^ +/, '').replace(/=.*/, '=;expires=' + new Date().toUTCString() + ';path=/');
+  });
+}
diff --git a/test/helpers/indexStub.js b/test/helpers/indexStub.js
index 2916b60ae32..5202106c9cf 100644
--- a/test/helpers/indexStub.js
+++ b/test/helpers/indexStub.js
@@ -1,6 +1,6 @@
 import {AuctionIndex} from '../../src/auctionIndex.js';
 
-export function stubAuctionIndex({bidRequests, bidderRequests, adUnits}) {
+export function stubAuctionIndex({bidRequests, bidderRequests, adUnits, auctionId = 'mock-auction'}) {
   if (adUnits == null) {
     adUnits = []
   }
@@ -15,7 +15,7 @@ export function stubAuctionIndex({bidRequests, bidderRequests, adUnits}) {
   }
   const auction = {
     getAuctionId() {
-      return 'mock-auction'
+      return auctionId;
     },
     getBidRequests() {
       return bidderRequests;
diff --git a/test/helpers/index_adapter_utils.js b/test/helpers/index_adapter_utils.js
index f01145b573d..0eb7af88d14 100644
--- a/test/helpers/index_adapter_utils.js
+++ b/test/helpers/index_adapter_utils.js
@@ -1,3 +1,5 @@
+import { deepClone } from '../../src/utils';
+
 var AllowedAdUnits = [[728, 90], [120, 600], [300, 250], [160, 600], [336, 280], [234, 60], [300, 600], [300, 50], [320, 50], [970, 250], [300, 1050], [970, 90], [180, 150]];
 var UnsupportedAdUnits = [[700, 100], [100, 600], [300, 200], [100, 600], [300, 200], [200, 60], [900, 200], [300, 1000], [900, 90], [100, 100]];
 
@@ -117,7 +119,7 @@ exports.getExpectedIndexSlots = function(bids) {
 }
 
 function clone(x) {
-  return JSON.parse(JSON.stringify(x));
+  return deepClone(x);
 }
 
 // returns the difference(lhs, rhs), difference(rhs,lhs), and intersection(lhs, rhs) based on the object keys
diff --git a/test/helpers/karma-init.js b/test/helpers/karma-init.js
deleted file mode 100644
index 56e936aa741..00000000000
--- a/test/helpers/karma-init.js
+++ /dev/null
@@ -1,6 +0,0 @@
-(function (window) {
-  if (!window.parent.pbjsKarmaInitDone && window.location.pathname === '/context.html') {
-    window.parent.pbjsKarmaInitDone = true;
-    window.open('/debug.html', '_blank');
-  }
-})(window);
diff --git a/test/helpers/testing-utils.js b/test/helpers/testing-utils.js
index 1336a90ecbf..3f59411ff6c 100644
--- a/test/helpers/testing-utils.js
+++ b/test/helpers/testing-utils.js
@@ -7,23 +7,23 @@ const utils = {
   testPageURL: function(name) {
     return `${utils.protocol}://${utils.host}:9999/test/pages/${name}`
   },
-  waitForElement: function(elementRef, time = DEFAULT_TIMEOUT) {
+  waitForElement: async function(elementRef, time = DEFAULT_TIMEOUT) {
     let element = $(elementRef);
-    element.waitForExist({timeout: time});
+    await element.waitForExist({timeout: time});
   },
-  switchFrame: function(frameRef) {
-    let iframe = $(frameRef);
+  switchFrame: async function(frameRef) {
+    let iframe = await $(frameRef);
     browser.switchToFrame(iframe);
   },
-  loadAndWaitForElement(url, selector, pause = 3000, timeout = DEFAULT_TIMEOUT, retries = 3, attempt = 1) {
-    browser.url(url);
-    browser.pause(pause);
+  async loadAndWaitForElement(url, selector, pause = 3000, timeout = DEFAULT_TIMEOUT, retries = 3, attempt = 1) {
+    await browser.url(url);
+    await browser.pause(pause);
     if (selector != null) {
       try {
-        utils.waitForElement(selector, timeout);
+        await utils.waitForElement(selector, timeout);
       } catch (e) {
         if (attempt < retries) {
-          utils.loadAndWaitForElement(url, selector, pause, timeout, retries, attempt + 1);
+          await utils.loadAndWaitForElement(url, selector, pause, timeout, retries, attempt + 1);
         }
       }
     }
@@ -35,14 +35,15 @@ const utils = {
       fn.call(this);
       if (expectGAMCreative) {
         expectGAMCreative = expectGAMCreative === true ? waitFor : expectGAMCreative;
-        it(`should render GAM creative`, () => {
-          utils.switchFrame(expectGAMCreative);
+        it(`should render GAM creative`, async () => {
+          await utils.switchFrame(expectGAMCreative);
           const creative = [
             '> a > img', // banner
             '> div[class="card"]' // native
           ].map((child) => `body > div[class="GoogleActiveViewElement"] ${child}`)
             .join(', ');
-          expect($(creative).isExisting()).to.be.true;
+          const existing = await $(creative).isExisting();
+          expect(existing).to.be.true;
         });
       }
     });
diff --git a/test/mocks/adloaderStub.js b/test/mocks/adloaderStub.js
index 6e7f5756100..24f5781dfc4 100644
--- a/test/mocks/adloaderStub.js
+++ b/test/mocks/adloaderStub.js
@@ -8,9 +8,7 @@ export let loadExternalScriptStub = createStub();
 
 function createStub() {
   return sinon.stub(adloader, 'loadExternalScript').callsFake((...args) => {
-    if (typeof args[2] === 'function') {
-      args[2]();
-    } else if (typeof args[3] === 'function') {
+    if (typeof args[3] === 'function') {
       args[3]();
     }
     return document.createElement('script');
diff --git a/test/mocks/ortbConverter.js b/test/mocks/ortbConverter.js
new file mode 100644
index 00000000000..446fac4629a
--- /dev/null
+++ b/test/mocks/ortbConverter.js
@@ -0,0 +1,8 @@
+import {defaultProcessors} from '../../libraries/ortbConverter/converter.js';
+import {pbsExtensions} from '../../libraries/pbsExtensions/pbsExtensions.js';
+
+beforeEach(() => {
+  // disable caching of default processors so that tests do not freeze a subset for other tests
+  defaultProcessors.clear();
+  pbsExtensions.clear();
+});
diff --git a/test/mocks/videoCacheStub.js b/test/mocks/videoCacheStub.js
index 7ce899cae35..acae5cd6a32 100644
--- a/test/mocks/videoCacheStub.js
+++ b/test/mocks/videoCacheStub.js
@@ -1,4 +1,4 @@
-import * as videoCache from 'src/videoCache.js';
+import {_internal as videoCache} from 'src/videoCache.js';
 
 /**
  * Function which can be called from unit tests to stub out the video cache.
diff --git a/test/pages/banner_sync.html b/test/pages/banner_sync.html
new file mode 100644
index 00000000000..71403ba5570
--- /dev/null
+++ b/test/pages/banner_sync.html
@@ -0,0 +1,97 @@
+
+
+
+
+
+    
+    Prebid.js Banner Example
+
+    
+    
+
+    
+    
+
+    
+
+    
+
+    
+
+
+
+
Prebid.js Banner Ad Unit Test

+

+    
+

+

+
+
+
diff --git a/test/pages/consent_mgt_gdpr.html b/test/pages/consent_mgt_gdpr.html
index b22d1e958e0..6ff24938bf3 100644
--- a/test/pages/consent_mgt_gdpr.html
+++ b/test/pages/consent_mgt_gdpr.html
@@ -1,6 +1,6 @@
 
 
-  
+  
   
   ');
+    iframe.onload = function () {
+      expect(iframe.contentWindow.ran).to.be.true;
+      done();
+    }
+    document.body.appendChild(iframe);
+  })
+
+  describe('listens and', () => {
+    function reply(msg, index = 0) {
+      messages[index].transfer[0].postMessage(JSON.stringify(msg));
+    }
+
+    it('ignores messages that are not a prebid response message', () => {
+      renderAd({adId: '123', pubUrl: ORIGIN});
+      reply({adId: '123', ad: 'markup'});
+      sinon.assert.notCalled(mkIframe);
+    })
+
+    it('signals AD_RENDER_FAILED on exceptions', () => {
+      mkIframe.callsFake(() => { throw new Error('error message') });
+      renderAd({adId: '123', pubUrl: ORIGIN});
+      reply({message: MESSAGE_RESPONSE, adId: '123', ad: 'markup'});
+      return waitFor(() => messages[1]?.payload).then(() => {
+        expect(messages[1].payload).to.eql({
+          message: MESSAGE_EVENT,
+          adId: '123',
+          event: EVENT_AD_RENDER_FAILED,
+          info: {
+            reason: ERROR_EXCEPTION,
+            message: 'error message'
+          }
+        })
+      })
+    });
+
+    describe('renderer', () => {
+      beforeEach(() => {
+        win.document.createElement.callsFake(document.createElement.bind(document));
+        win.document.body.appendChild.callsFake(document.body.appendChild.bind(document.body));
+      });
+
+      it('sets up and runs renderer', () => {
+        window._render = sinon.stub();
+        const data = {
+          message: MESSAGE_RESPONSE,
+          adId: '123',
+          renderer: 'window.render = window.parent._render'
+        }
+        renderAd({adId: '123', pubUrl: ORIGIN});
+        reply(data);
+        return waitFor(() => window._render.args.length).then(() => {
+          sinon.assert.calledWith(window._render, data, sinon.match.any, win);
+        }).finally(() => {
+          delete window._render;
+        })
+      });
+
+      Object.entries({
+        'throws (w/error)': ['window.render = function() { throw new Error("msg") }'],
+        'throws (w/reason)': ['window.render = function() { throw {reason: "other", message: "msg"}}', 'other'],
+        'is missing': [null, ERROR_EXCEPTION, null],
+        'rejects (w/error)': ['window.render = function() { return Promise.reject(new Error("msg")) }'],
+        'rejects (w/reason)': ['window.render = function() { return Promise.reject({reason: "other", message: "msg"}) }', 'other'],
+      }).forEach(([t, [renderer, reason = ERROR_EXCEPTION, message = 'msg']]) => {
+        it(`signals AD_RENDER_FAILED on renderer that ${t}`, () => {
+          renderAd({adId: '123', pubUrl: ORIGIN});
+          reply({
+            message: MESSAGE_RESPONSE,
+            adId: '123',
+            renderer
+          });
+          return waitFor(() => messages[1]?.payload).then(() => {
+            sinon.assert.match(messages[1].payload, {
+              adId: '123',
+              message: MESSAGE_EVENT,
+              event: EVENT_AD_RENDER_FAILED,
+              info: {
+                reason,
+                message: sinon.match(val => message == null || message === val)
+              }
+            });
+          })
+        })
+      });
+
+      it('signals AD_RENDER_SUCCEEDED when renderer resolves', () => {
+        renderAd({adId: '123', pubUrl: ORIGIN});
+        reply({
+          message: MESSAGE_RESPONSE,
+          adId: '123',
+          renderer: 'window.render = function() { return new Promise((resolve) => { window.parent._resolve = resolve })}'
+        });
+        return waitFor(() => window._resolve).then(() => {
+          expect(messages[1]).to.not.exist;
+          window._resolve();
+          return waitFor(() => messages[1]?.payload)
+        }).then(() => {
+          sinon.assert.match(messages[1].payload, {
+            adId: '123',
+            message: MESSAGE_EVENT,
+            event: EVENT_AD_RENDER_SUCCEEDED
+          })
+        }).finally(() => {
+          delete window._resolve;
+        })
+      })
+
+      it('is provided a sendMessage that accepts replies', () => {
+        renderAd({adId: '123', pubUrl: ORIGIN});
+        window._reply = sinon.stub();
+        reply({
+          adId: '123',
+          message: MESSAGE_RESPONSE,
+          renderer: 'window.render = function(_, {sendMessage}) { sendMessage("test", "data", function(reply) { window.parent._reply(reply) }) }'
+        });
+        return waitFor(() => messages[1]?.payload).then(() => {
+          reply('response', 1);
+          return waitFor(() => window._reply.args.length)
+        }).then(() => {
+          sinon.assert.calledWith(window._reply, sinon.match({data: JSON.stringify('response')}));
+        }).finally(() => {
+          delete window._reply;
+        })
+      });
+    });
+  });
+});
diff --git a/test/spec/creative/displayRenderer_spec.js b/test/spec/creative/displayRenderer_spec.js
new file mode 100644
index 00000000000..6be6e90813a
--- /dev/null
+++ b/test/spec/creative/displayRenderer_spec.js
@@ -0,0 +1,55 @@
+import {render} from 'creative/renderers/display/renderer.js';
+import {ERROR_NO_AD} from '../../../creative/renderers/display/constants.js';
+
+describe('Creative renderer - display', () => {
+  let doc, mkFrame, sendMessage;
+  beforeEach(() => {
+    mkFrame = sinon.stub().callsFake((doc, attrs) => Object.assign({doc}, attrs));
+    sendMessage = sinon.stub();
+    doc = {
+      body: {
+        appendChild: sinon.stub()
+      }
+    };
+  });
+
+  function runRenderer(data) {
+    return render(data, {sendMessage, mkFrame}, {document: doc});
+  }
+
+  it('throws when both ad and adUrl are missing', () => {
+    expect(() => {
+      try {
+        runRenderer({})
+      } catch (e) {
+        expect(e.reason).to.eql(ERROR_NO_AD);
+        throw e;
+      }
+    }).to.throw();
+  })
+
+  Object.entries({
+    ad: 'srcdoc',
+    adUrl: 'src'
+  }).forEach(([adProp, frameProp]) => {
+    describe(`when ad has ${adProp}`, () => {
+      let data;
+      beforeEach(() => {
+        data = {
+          [adProp]: 'ad',
+          width: 123,
+          height: 321
+        }
+      })
+      it(`drops iframe with ${frameProp} = ${adProp}`, () => {
+        runRenderer(data);
+        sinon.assert.calledWith(doc.body.appendChild, {
+          doc,
+          [frameProp]: 'ad',
+          width: data.width,
+          height: data.height
+        })
+      })
+    })
+  })
+})
diff --git a/test/spec/creative/nativeRenderer_spec.js b/test/spec/creative/nativeRenderer_spec.js
new file mode 100644
index 00000000000..66e81a517c7
--- /dev/null
+++ b/test/spec/creative/nativeRenderer_spec.js
@@ -0,0 +1,298 @@
+import {getAdMarkup, getReplacements, getReplacer} from '../../../creative/renderers/native/renderer.js';
+import {ACTION_CLICK, ACTION_IMP, ACTION_RESIZE, MESSAGE_NATIVE} from '../../../creative/renderers/native/constants.js';
+
+describe('Native creative renderer', () => {
+  let win;
+  beforeEach(() => {
+    win = {};
+  });
+
+  describe('getAdMarkup', () => {
+    let loadScript;
+    beforeEach(() => {
+      loadScript = sinon.stub();
+    });
+    it('uses rendererUrl if present', () => {
+      win.document = {}
+      const data = {
+        assets: ['1', '2'],
+        ortb: 'ortb',
+        rendererUrl: 'renderer'
+      };
+      const renderAd = sinon.stub().returns('markup');
+      loadScript.returns(Promise.resolve().then(() => {
+        win.renderAd = renderAd;
+      }));
+      return getAdMarkup('123', data, null, win, loadScript).then((markup) => {
+        expect(markup).to.eql('markup');
+        sinon.assert.calledWith(loadScript, data.rendererUrl, sinon.match(arg => arg === win.document));
+        sinon.assert.calledWith(renderAd, sinon.match(arg => {
+          expect(arg).to.have.members(data.assets);
+          expect(arg.ortb).to.eql(data.ortb);
+          return true;
+        }));
+      });
+    });
+    describe('otherwise, calls replacer', () => {
+      let replacer;
+      beforeEach(() => {
+        replacer = sinon.stub().returns('markup');
+      });
+      it('with adTemplate, if present', () => {
+        return getAdMarkup('123', {adTemplate: 'tpl'}, replacer, win).then((result) => {
+          expect(result).to.eql('markup');
+          sinon.assert.calledWith(replacer, 'tpl');
+        });
+      });
+      it('with document body otherwise', () => {
+        win.document = {body: {innerHTML: 'body'}};
+        return getAdMarkup('123', {}, replacer, win).then((result) => {
+          expect(result).to.eql('markup');
+          sinon.assert.calledWith(replacer, 'body');
+        })
+      })
+    })
+  });
+
+  describe('getReplacer', () => {
+    function expectReplacements(replacer, replacements) {
+      Object.entries(replacements).forEach(([placeholder, repl]) => {
+        expect(replacer(`.${placeholder}.${placeholder}.`)).to.eql(`.${repl}.${repl}.`);
+      })
+    }
+    it('uses empty strings for missing legacy assets', () => {
+      const repl = getReplacer('123', {
+        nativeKeys: {
+          'k': 'hb_native_k'
+        }
+      });
+      expectReplacements(repl, {
+        '##hb_native_k##': '',
+        'hb_native_k:123': ''
+      })
+    });
+
+    it('uses empty string for missing ORTB assets', () => {
+      const repl = getReplacer('', {
+        ortb: {
+          assets: [{
+            id: 1,
+            link: {url: 'l1'},
+            data: {value: 'v1'}
+          }]
+        }
+      });
+      expectReplacements(repl, {
+        '##hb_native_asset_id_1##': 'v1',
+        '##hb_native_asset_id_2##': '',
+        '##hb_native_asset_link_id_1##': 'l1',
+        '##hb_native_asset_link_id_2##': ''
+      });
+    });
+
+    it('replaces placeholders for for legacy assets', () => {
+      const repl = getReplacer('123', {
+        assets: [
+          {key: 'k1', value: 'v1'}, {key: 'k2', value: 'v2'}
+        ],
+        nativeKeys: {
+          k1: 'hb_native_k1',
+          k2: 'hb_native_k2'
+        }
+      });
+      expectReplacements(repl, {
+        '##hb_native_k1##': 'v1',
+        'hb_native_k1:123': 'v1',
+        '##hb_native_k2##': 'v2',
+        'hb_native_k2:123': 'v2'
+      })
+    });
+
+    describe('ORTB response top-level (non-asset) fields', () => {
+      const ortb = {
+        link: {
+          url: 'link.url'
+        },
+        privacy: 'privacy.url'
+      };
+      const expected = {
+        '##hb_native_linkurl##': 'link.url',
+        '##hb_native_privacy##': 'privacy.url'
+      };
+      it('replaces placeholders', () => {
+        const repl = getReplacer('123', {
+          ortb
+        });
+        expectReplacements(repl, expected);
+      });
+      it('gives them precedence over legacy counterparts', () => {
+        const repl = getReplacer('123', {
+          ortb,
+          assets: [
+            {key: 'clickUrl', value: 'overridden'},
+            {key: 'privacyLink', value: 'overridden'}
+          ],
+          nativeKeys: {
+            clickUrl: 'hb_native_linkurl',
+            privacyLink: 'hb_native_privacy'
+          }
+        });
+        expectReplacements(repl, expected);
+      });
+      it('uses empty string for missing assets', () => {
+        const repl = getReplacer('123', {
+          ortb: {}
+        });
+        expectReplacements(repl, {
+          '##hb_native_linkurl##': '',
+          '##hb_native_privacy##': '',
+        })
+      });
+    });
+
+    Object.entries({
+      title: {text: 'val'},
+      data: {value: 'val'},
+      img: {url: 'val'},
+      video: {vasttag: 'val'}
+    }).forEach(([type, contents]) => {
+      describe(`for ortb ${type} asset`, () => {
+        let ortb;
+        beforeEach(() => {
+          ortb = {
+            assets: [
+              {
+                id: 123,
+                [type]: contents
+              }
+            ]
+          };
+        });
+        it('replaces placeholder', () => {
+          const repl = getReplacer('', {ortb});
+          expectReplacements(repl, {
+            '##hb_native_asset_id_123##': 'val'
+          })
+        });
+        it('replaces link placeholders', () => {
+          ortb.assets[0].link = {url: 'link'};
+          const repl = getReplacer('', {ortb});
+          expectReplacements(repl, {
+            '##hb_native_asset_link_id_123##': 'link'
+          })
+        });
+      });
+    });
+  });
+
+  describe('render', () => {
+    let getMarkup, sendMessage, adId, nativeData, exc;
+    beforeEach(() => {
+      adId = '123';
+      nativeData = {}
+      getMarkup = sinon.stub();
+      sendMessage = sinon.stub()
+      exc = sinon.stub();
+      win.document = {
+        querySelectorAll() { return [] },
+        body: {}
+      }
+    });
+
+    function runRender() {
+      return render({adId, native: nativeData}, {sendMessage, exc}, win, getMarkup)
+    }
+
+    it('replaces placeholders in head, if present', () => {
+      getMarkup.returns(Promise.resolve(''))
+      win.document.head = {innerHTML: '##hb_native_asset_id_1##'};
+      nativeData.ortb = {
+        assets: [
+          {id: 1, data: {value: 'repl'}}
+        ]
+      };
+      return runRender().then(() => {
+        expect(win.document.head.innerHTML).to.eql('repl');
+      })
+    });
+
+    it('drops markup on body, and fires imp trackers', () => {
+      getMarkup.returns(Promise.resolve('markup'));
+      return runRender().then(() => {
+        expect(win.document.body.innerHTML).to.eql('markup');
+        sinon.assert.calledWith(sendMessage, MESSAGE_NATIVE, {action: ACTION_IMP});
+      })
+    });
+
+    it('runs postRenderAd if defined', () => {
+      win.postRenderAd = sinon.stub();
+      getMarkup.returns(Promise.resolve('markup'));
+      return runRender().then(() => {
+        sinon.assert.calledWith(win.postRenderAd, sinon.match({
+          adId,
+          ...nativeData
+        }))
+      })
+    })
+
+    it('rejects on error', (done) => {
+      const err = new Error('failure');
+      getMarkup.returns(Promise.reject(err));
+      runRender().catch((e) => {
+        expect(e).to.eql(err);
+        done();
+      })
+    });
+
+    describe('requests resize', () => {
+      beforeEach(() => {
+        getMarkup.returns(Promise.resolve('markup'));
+        win.document.body.offsetHeight = 123;
+        win.document.body.offsetWidth = 321;
+      });
+
+      it('immediately, if document is loaded', () => {
+        win.document.readyState = 'complete';
+        return runRender().then(() => {
+          sinon.assert.calledWith(sendMessage, MESSAGE_NATIVE, {action: ACTION_RESIZE, height: 123, width: 321})
+        })
+      });
+
+      it('on document load otherwise', () => {
+        return runRender().then(() => {
+          sinon.assert.neverCalledWith(sendMessage, MESSAGE_NATIVE, sinon.match({action: ACTION_RESIZE}));
+          win.onload();
+          sinon.assert.calledWith(sendMessage, MESSAGE_NATIVE, {action: ACTION_RESIZE, height: 123, width: 321});
+        })
+      })
+    })
+
+    describe('click trackers', () => {
+      let iframe;
+      beforeEach(() => {
+        iframe = document.createElement('iframe');
+        document.body.appendChild(iframe);
+        win.document = iframe.contentDocument;
+      })
+      afterEach(() => {
+        document.body.removeChild(iframe);
+      })
+
+      it('are fired on click', () => {
+        getMarkup.returns(Promise.resolve('
'));
+        return runRender().then(() => {
+          win.document.querySelector('#target').click();
+          sinon.assert.calledWith(sendMessage, MESSAGE_NATIVE, sinon.match({action: ACTION_CLICK}));
+        })
+      });
+
+      it('pass assetId if provided', () => {
+        getMarkup.returns(Promise.resolve('
'));
+        return runRender().then(() => {
+          win.document.querySelector('#target').click();
+          sinon.assert.calledWith(sendMessage, MESSAGE_NATIVE, {action: ACTION_CLICK, assetId: '123'})
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/e2e/banner/basic_banner_ad.spec.js b/test/spec/e2e/banner/basic_banner_ad.spec.js
index e8103581d9d..2d055743e8f 100644
--- a/test/spec/e2e/banner/basic_banner_ad.spec.js
+++ b/test/spec/e2e/banner/basic_banner_ad.spec.js
@@ -2,6 +2,7 @@ const expect = require('chai').expect;
 const {setupTest, testPageURL} = require('../../../helpers/testing-utils');
 
 const TEST_PAGE_URL = testPageURL('banner.html?pbjs_debug=true');
+const SYNC_PAGE_URL = testPageURL('banner_sync.html?pbjs_debug=true');
 const CREATIVE_IFRAME_ID = 'google_ads_iframe_/19968336/header-bid-tag-0_0';
 const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="' + CREATIVE_IFRAME_ID + '"]';
 
@@ -14,20 +15,25 @@ const EXPECTED_TARGETING_KEYS = {
   'hb_bidder_appnexus': 'appnexus'
 };
 
-setupTest({
-  url: TEST_PAGE_URL,
-  waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
-  expectGAMCreative: true
-}, 'Prebid.js Banner Ad Unit Test', function () {
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
-      return window.pbjs.getAdserverTargeting('div-gpt-ad-1460505748561-1');
-    });
-    const targetingKeys = result['div-gpt-ad-1460505748561-1'];
+Object.entries({
+  'synchronously': SYNC_PAGE_URL,
+  'asynchronously': TEST_PAGE_URL,
+}).forEach(([t, testPage]) => {
+  setupTest({
+    url: testPage,
+    waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
+    expectGAMCreative: true
+  }, `Prebid.js Banner Ad Unit Test (loading ${t})`, function () {
+    it('should load the targeting keys with correct values', async function () {
+      const result = await browser.execute(function () {
+        return window.pbjs.getAdserverTargeting('div-gpt-ad-1460505748561-1');
+      });
+      const targetingKeys = result['div-gpt-ad-1460505748561-1'];
 
-    expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
-    expect(targetingKeys.hb_adid).to.be.a('string');
-    expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
-    expect(targetingKeys.hb_size).to.satisfy((size) => size === '300x250' || '300x600');
+      expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
+      expect(targetingKeys.hb_adid).to.be.a('string');
+      expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
+      expect(targetingKeys.hb_size).to.satisfy((size) => size === '300x250' || '300x600');
+    });
   });
 });
diff --git a/test/spec/e2e/instream/basic_instream_video_ad.spec.js b/test/spec/e2e/instream/basic_instream_video_ad.spec.js
index 02d218f9175..ca5296f050c 100644
--- a/test/spec/e2e/instream/basic_instream_video_ad.spec.js
+++ b/test/spec/e2e/instream/basic_instream_video_ad.spec.js
@@ -18,8 +18,8 @@ setupTest({
   url: TEST_PAGE_URL,
   waitFor: ALERT_BOX_CSS_SELECTOR,
 }, 'Prebid.js Instream Video Ad Test', function () {
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
+  it('should load the targeting keys with correct values', async function () {
+    const result = await browser.execute(function () {
       return window.top.pbjs.getAdserverTargeting('video1');
     });
 
diff --git a/test/spec/e2e/longform/basic_w_bidderSettings.spec.js b/test/spec/e2e/longform/basic_w_bidderSettings.spec.js
index e8bdbcf3b4f..1b884aeca1b 100644
--- a/test/spec/e2e/longform/basic_w_bidderSettings.spec.js
+++ b/test/spec/e2e/longform/basic_w_bidderSettings.spec.js
@@ -10,25 +10,25 @@ const uuidRegex = /(\d|\w){8}-((\d|\w){4}-){3}(\d|\w){12}/;
 
 describe('longform ads not using requireExactDuration field', function() {
   this.retries(3);
-  it('process the bids successfully', function() {
-    browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_w_bidderSettings.html?pbjs_debug=true');
-    browser.pause(7000);
+  it('process the bids successfully', async function() {
+    await browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_w_bidderSettings.html?pbjs_debug=true');
+    await browser.pause(7000);
 
     const loadPrebidBtnXpath = '//*[@id="loadPrebidRequestBtn"]';
-    waitForElement(loadPrebidBtnXpath, 3000);
-    const prebidBtn = $(loadPrebidBtnXpath);
-    prebidBtn.click();
-    browser.pause(5000);
+    await waitForElement(loadPrebidBtnXpath, 3000);
+    const prebidBtn = await $(loadPrebidBtnXpath);
+    await prebidBtn.click();
+    await browser.pause(5000);
 
     const listOfCpmsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[2]';
     const listOfCategoriesXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[3]';
     const listOfDurationsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[4]';
 
-    waitForElement(listOfCpmsXpath, 3000);
+    await waitForElement(listOfCpmsXpath, 3000);
 
-    let listOfCpms = $$(listOfCpmsXpath);
-    let listOfCats = $$(listOfCategoriesXpath);
-    let listOfDuras = $$(listOfDurationsXpath);
+    let listOfCpms = await $$(listOfCpmsXpath);
+    let listOfCats = await $$(listOfCategoriesXpath);
+    let listOfDuras = await $$(listOfDurationsXpath);
 
     expect(listOfCpms.length).to.equal(listOfCats.length).and.to.equal(listOfDuras.length);
     for (let i = 0; i < listOfCpms.length; i++) {
@@ -41,14 +41,14 @@ describe('longform ads not using requireExactDuration field', function() {
     }
   });
 
-  it('formats the targeting keys properly', function () {
+  it('formats the targeting keys properly', async function () {
     const listOfKeyElementsXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[1]';
     const listOfKeyValuesXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[2]';
-    waitForElement(listOfKeyElementsXpath);
-    waitForElement(listOfKeyValuesXpath);
+    await waitForElement(listOfKeyElementsXpath);
+    await waitForElement(listOfKeyValuesXpath);
 
-    let listOfKeyElements = $$(listOfKeyElementsXpath);
-    let listOfKeyValues = $$(listOfKeyValuesXpath);
+    let listOfKeyElements = await $$(listOfKeyElementsXpath);
+    let listOfKeyValues = await $$(listOfKeyValuesXpath);
 
     let firstKey = listOfKeyElements[0].getText();
     expect(firstKey).to.equal('hb_pb_cat_dur');
diff --git a/test/spec/e2e/longform/basic_w_custom_adserver_translation.spec.js b/test/spec/e2e/longform/basic_w_custom_adserver_translation.spec.js
index e4ea87bab1a..e66c9eb0cd5 100644
--- a/test/spec/e2e/longform/basic_w_custom_adserver_translation.spec.js
+++ b/test/spec/e2e/longform/basic_w_custom_adserver_translation.spec.js
@@ -10,25 +10,25 @@ const uuidRegex = /(\d|\w){8}-((\d|\w){4}-){3}(\d|\w){12}/;
 
 describe('longform ads using custom adserver translation file', function() {
   this.retries(3);
-  it('process the bids successfully', function() {
-    browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_w_custom_adserver_translation.html?pbjs_debug=true');
-    browser.pause(7000);
+  it('process the bids successfully', async function() {
+    await browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_w_custom_adserver_translation.html?pbjs_debug=true');
+    await browser.pause(7000);
 
     const loadPrebidBtnXpath = '//*[@id="loadPrebidRequestBtn"]';
-    waitForElement(loadPrebidBtnXpath, 3000);
-    const prebidBtn = $(loadPrebidBtnXpath);
-    prebidBtn.click();
-    browser.pause(5000);
+    await waitForElement(loadPrebidBtnXpath, 3000);
+    const prebidBtn = await $(loadPrebidBtnXpath);
+    await prebidBtn.click();
+    await browser.pause(5000);
 
     const listOfCpmsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[2]';
     const listOfCategoriesXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[3]';
     const listOfDurationsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[4]';
 
-    waitForElement(listOfCpmsXpath);
+    await waitForElement(listOfCpmsXpath);
 
-    let listOfCpms = $$(listOfCpmsXpath);
-    let listOfCats = $$(listOfCategoriesXpath);
-    let listOfDuras = $$(listOfDurationsXpath);
+    let listOfCpms = await $$(listOfCpmsXpath);
+    let listOfCats = await $$(listOfCategoriesXpath);
+    let listOfDuras = await $$(listOfDurationsXpath);
 
     expect(listOfCpms.length).to.equal(listOfCats.length).and.to.equal(listOfDuras.length);
     for (let i = 0; i < listOfCpms.length; i++) {
@@ -41,14 +41,14 @@ describe('longform ads using custom adserver translation file', function() {
     }
   });
 
-  it('formats the targeting keys properly', function () {
+  it('formats the targeting keys properly', async function () {
     const listOfKeyElementsXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[1]';
     const listOfKeyValuesXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[2]';
-    waitForElement(listOfKeyElementsXpath);
-    waitForElement(listOfKeyValuesXpath);
+    await waitForElement(listOfKeyElementsXpath);
+    await waitForElement(listOfKeyValuesXpath);
 
-    let listOfKeyElements = $$(listOfKeyElementsXpath);
-    let listOfKeyValues = $$(listOfKeyValuesXpath);
+    let listOfKeyElements = await $$(listOfKeyElementsXpath);
+    let listOfKeyValues = await $$(listOfKeyValuesXpath);
 
     let firstKey = listOfKeyElements[0].getText();
     expect(firstKey).to.equal('hb_pb_cat_dur');
diff --git a/test/spec/e2e/longform/basic_w_priceGran.spec.js b/test/spec/e2e/longform/basic_w_priceGran.spec.js
index b4a5272a69c..df375fb1d39 100644
--- a/test/spec/e2e/longform/basic_w_priceGran.spec.js
+++ b/test/spec/e2e/longform/basic_w_priceGran.spec.js
@@ -10,25 +10,25 @@ const uuidRegex = /(\d|\w){8}-((\d|\w){4}-){3}(\d|\w){12}/;
 
 describe('longform ads not using requireExactDuration field', function() {
   this.retries(3);
-  it('process the bids successfully', function() {
-    browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_w_priceGran.html?pbjs_debug=true');
-    browser.pause(7000);
+  it('process the bids successfully', async function() {
+    await browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_w_priceGran.html?pbjs_debug=true');
+    await browser.pause(7000);
 
     const loadPrebidBtnXpath = '//*[@id="loadPrebidRequestBtn"]';
-    waitForElement(loadPrebidBtnXpath);
-    const prebidBtn = $(loadPrebidBtnXpath);
-    prebidBtn.click();
-    browser.pause(5000);
+    await waitForElement(loadPrebidBtnXpath);
+    const prebidBtn = await $(loadPrebidBtnXpath);
+    await prebidBtn.click();
+    await browser.pause(5000);
 
     const listOfCpmsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[2]';
     const listOfCategoriesXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[3]';
     const listOfDurationsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[4]';
 
-    waitForElement(listOfCpmsXpath);
+    await waitForElement(listOfCpmsXpath);
 
-    let listOfCpms = $$(listOfCpmsXpath);
-    let listOfCats = $$(listOfCategoriesXpath);
-    let listOfDuras = $$(listOfDurationsXpath);
+    let listOfCpms = await $$(listOfCpmsXpath);
+    let listOfCats = await $$(listOfCategoriesXpath);
+    let listOfDuras = await $$(listOfDurationsXpath);
 
     expect(listOfCpms.length).to.equal(listOfCats.length).and.to.equal(listOfDuras.length);
     for (let i = 0; i < listOfCpms.length; i++) {
@@ -41,14 +41,14 @@ describe('longform ads not using requireExactDuration field', function() {
     }
   });
 
-  it('formats the targeting keys properly', function () {
+  it('formats the targeting keys properly', async function () {
     const listOfKeyElementsXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[1]';
     const listOfKeyValuesXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[2]';
-    waitForElement(listOfKeyElementsXpath);
-    waitForElement(listOfKeyValuesXpath);
+    await waitForElement(listOfKeyElementsXpath);
+    await waitForElement(listOfKeyValuesXpath);
 
-    let listOfKeyElements = $$(listOfKeyElementsXpath);
-    let listOfKeyValues = $$(listOfKeyValuesXpath);
+    let listOfKeyElements = await $$(listOfKeyElementsXpath);
+    let listOfKeyValues = await $$(listOfKeyValuesXpath);
 
     let firstKey = listOfKeyElements[0].getText();
     expect(firstKey).to.equal('hb_pb_cat_dur');
diff --git a/test/spec/e2e/longform/basic_w_requireExactDuration.spec.js b/test/spec/e2e/longform/basic_w_requireExactDuration.spec.js
index 6f9acf33061..f36c5815750 100644
--- a/test/spec/e2e/longform/basic_w_requireExactDuration.spec.js
+++ b/test/spec/e2e/longform/basic_w_requireExactDuration.spec.js
@@ -10,25 +10,25 @@ const uuidRegex = /(\d|\w){8}-((\d|\w){4}-){3}(\d|\w){12}/;
 
 describe('longform ads using requireExactDuration field', function() {
   this.retries(3);
-  it('process the bids successfully', function() {
-    browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_w_requireExactDuration.html?pbjs_debug=true');
-    browser.pause(7000);
+  it('process the bids successfully', async function() {
+    await browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_w_requireExactDuration.html?pbjs_debug=true');
+    await browser.pause(7000);
 
     const loadPrebidBtnXpath = '//*[@id="loadPrebidRequestBtn"]';
-    waitForElement(loadPrebidBtnXpath);
-    const prebidBtn = $(loadPrebidBtnXpath);
-    prebidBtn.click();
-    browser.pause(5000);
+    await waitForElement(loadPrebidBtnXpath);
+    const prebidBtn = await $(loadPrebidBtnXpath);
+    await prebidBtn.click();
+    await browser.pause(5000);
 
     const listOfCpmsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[2]';
     const listOfCategoriesXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[3]';
     const listOfDurationsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[4]';
 
-    waitForElement(listOfCpmsXpath);
+    await waitForElement(listOfCpmsXpath);
 
-    let listOfCpms = $$(listOfCpmsXpath);
-    let listOfCats = $$(listOfCategoriesXpath);
-    let listOfDuras = $$(listOfDurationsXpath);
+    let listOfCpms = await $$(listOfCpmsXpath);
+    let listOfCats = await $$(listOfCategoriesXpath);
+    let listOfDuras = await $$(listOfDurationsXpath);
 
     expect(listOfCpms.length).to.equal(listOfCats.length).and.to.equal(listOfDuras.length);
     for (let i = 0; i < listOfCpms.length; i++) {
@@ -41,14 +41,14 @@ describe('longform ads using requireExactDuration field', function() {
     }
   });
 
-  it('formats the targeting keys properly', function () {
+  it('formats the targeting keys properly', async function () {
     const listOfKeyElementsXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[1]';
     const listOfKeyValuesXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[2]';
-    waitForElement(listOfKeyElementsXpath);
-    waitForElement(listOfKeyValuesXpath);
+    await waitForElement(listOfKeyElementsXpath);
+    await waitForElement(listOfKeyValuesXpath);
 
-    let listOfKeyElements = $$(listOfKeyElementsXpath);
-    let listOfKeyValues = $$(listOfKeyValuesXpath);
+    let listOfKeyElements = await $$(listOfKeyElementsXpath);
+    let listOfKeyValues = await $$(listOfKeyValuesXpath);
 
     let firstKey = listOfKeyElements[0].getText();
     expect(firstKey).to.equal('hb_pb_cat_dur');
diff --git a/test/spec/e2e/longform/basic_wo_brandCategoryExclusion.spec.js b/test/spec/e2e/longform/basic_wo_brandCategoryExclusion.spec.js
index 1775bfafa77..2a10e46fc6d 100644
--- a/test/spec/e2e/longform/basic_wo_brandCategoryExclusion.spec.js
+++ b/test/spec/e2e/longform/basic_wo_brandCategoryExclusion.spec.js
@@ -9,23 +9,23 @@ const uuidRegex = /(\d|\w){8}-((\d|\w){4}-){3}(\d|\w){12}/;
 
 describe('longform ads without using brandCategoryExclusion', function() {
   this.retries(3);
-  it('process the bids successfully', function() {
-    browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_wo_brandCategoryExclusion.html?pbjs_debug=true');
-    browser.pause(7000);
+  it('process the bids successfully', async function() {
+    await browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_wo_brandCategoryExclusion.html?pbjs_debug=true');
+    await browser.pause(7000);
 
     const loadPrebidBtnXpath = '//*[@id="loadPrebidRequestBtn"]';
-    waitForElement(loadPrebidBtnXpath);
-    const prebidBtn = $(loadPrebidBtnXpath);
-    prebidBtn.click();
-    browser.pause(5000);
+    await waitForElement(loadPrebidBtnXpath);
+    const prebidBtn = await $(loadPrebidBtnXpath);
+    await prebidBtn.click();
+    await browser.pause(5000);
 
     const listOfCpmsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[2]';
     const listOfDurationsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[4]';
 
-    waitForElement(listOfCpmsXpath);
+    await waitForElement(listOfCpmsXpath);
 
-    let listOfCpms = $$(listOfCpmsXpath);
-    let listOfDuras = $$(listOfDurationsXpath);
+    let listOfCpms = await $$(listOfCpmsXpath);
+    let listOfDuras = await $$(listOfDurationsXpath);
 
     expect(listOfCpms.length).to.equal(listOfDuras.length);
     for (let i = 0; i < listOfCpms.length; i++) {
@@ -36,14 +36,14 @@ describe('longform ads without using brandCategoryExclusion', function() {
     }
   });
 
-  it('formats the targeting keys properly', function () {
+  it('formats the targeting keys properly', async function () {
     const listOfKeyElementsXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[1]';
     const listOfKeyValuesXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[2]';
-    waitForElement(listOfKeyElementsXpath);
-    waitForElement(listOfKeyValuesXpath);
+    await waitForElement(listOfKeyElementsXpath);
+    await waitForElement(listOfKeyValuesXpath);
 
-    let listOfKeyElements = $$(listOfKeyElementsXpath);
-    let listOfKeyValues = $$(listOfKeyValuesXpath);
+    let listOfKeyElements = await $$(listOfKeyElementsXpath);
+    let listOfKeyValues = await $$(listOfKeyValuesXpath);
 
     let firstKey = listOfKeyElements[0].getText();
     expect(firstKey).to.equal('hb_pb_cat_dur');
diff --git a/test/spec/e2e/longform/basic_wo_requireExactDuration.spec.js b/test/spec/e2e/longform/basic_wo_requireExactDuration.spec.js
index 9e92c15e5f5..a2974edca11 100644
--- a/test/spec/e2e/longform/basic_wo_requireExactDuration.spec.js
+++ b/test/spec/e2e/longform/basic_wo_requireExactDuration.spec.js
@@ -10,25 +10,25 @@ const uuidRegex = /(\d|\w){8}-((\d|\w){4}-){3}(\d|\w){12}/;
 
 describe('longform ads not using requireExactDuration field', function() {
   this.retries(3);
-  it('process the bids successfully', function() {
+  it('process the bids successfully', async function() {
     browser.url(protocol + '://' + host + ':9999/integrationExamples/longform/basic_wo_requireExactDuration.html?pbjs_debug=true');
     browser.pause(7000);
 
     const loadPrebidBtnXpath = '//*[@id="loadPrebidRequestBtn"]';
-    waitForElement(loadPrebidBtnXpath);
-    const prebidBtn = $(loadPrebidBtnXpath);
-    prebidBtn.click();
-    browser.pause(5000);
+    await waitForElement(loadPrebidBtnXpath);
+    const prebidBtn = await $(loadPrebidBtnXpath);
+    await prebidBtn.click();
+    await browser.pause(5000);
 
     const listOfCpmsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[2]';
     const listOfCategoriesXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[3]';
     const listOfDurationsXpath = '/html/body/div[1]/div/div/div/div[1]/div[2]/div/table/tbody/tr/td[4]';
 
-    waitForElement(listOfCpmsXpath);
+    await waitForElement(listOfCpmsXpath);
 
-    let listOfCpms = $$(listOfCpmsXpath);
-    let listOfCats = $$(listOfCategoriesXpath);
-    let listOfDuras = $$(listOfDurationsXpath);
+    let listOfCpms = await $$(listOfCpmsXpath);
+    let listOfCats = await $$(listOfCategoriesXpath);
+    let listOfDuras = await $$(listOfDurationsXpath);
 
     expect(listOfCpms.length).to.equal(listOfCats.length).and.to.equal(listOfDuras.length);
     for (let i = 0; i < listOfCpms.length; i++) {
@@ -41,14 +41,14 @@ describe('longform ads not using requireExactDuration field', function() {
     }
   });
 
-  it('formats the targeting keys properly', function () {
+  it('formats the targeting keys properly', async function () {
     const listOfKeyElementsXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[1]';
     const listOfKeyValuesXpath = '/html/body/div[1]/div/div/div/div[2]/div[2]/div/table/tbody/tr/td[2]';
-    waitForElement(listOfKeyElementsXpath);
-    waitForElement(listOfKeyValuesXpath);
+    await waitForElement(listOfKeyElementsXpath);
+    await waitForElement(listOfKeyValuesXpath);
 
-    let listOfKeyElements = $$(listOfKeyElementsXpath);
-    let listOfKeyValues = $$(listOfKeyValuesXpath);
+    let listOfKeyElements = await $$(listOfKeyElementsXpath);
+    let listOfKeyValues = await $$(listOfKeyValuesXpath);
 
     let firstKey = listOfKeyElements[0].getText();
     expect(firstKey).to.equal('hb_pb_cat_dur');
diff --git a/test/spec/e2e/modules/e2e_bidderSettings.spec.js b/test/spec/e2e/modules/e2e_bidderSettings.spec.js
index f8aedfea652..46251d39be3 100644
--- a/test/spec/e2e/modules/e2e_bidderSettings.spec.js
+++ b/test/spec/e2e/modules/e2e_bidderSettings.spec.js
@@ -26,8 +26,8 @@ setupTest({
   waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
   expectGAMCreative: true
 }, 'Prebid.js Bidder Settings Ad Unit Test', function () {
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
+  it('should load the targeting keys with correct values', async function () {
+    const result = await browser.execute(function () {
       return window.pbjs.getAdserverTargeting('/19968336/prebid_native_example_2');
     });
 
diff --git a/test/spec/e2e/modules/e2e_consent_mgt_gdpr.spec.js b/test/spec/e2e/modules/e2e_consent_mgt_gdpr.spec.js
index 5b5ea2ef2cd..d1803c9784a 100644
--- a/test/spec/e2e/modules/e2e_consent_mgt_gdpr.spec.js
+++ b/test/spec/e2e/modules/e2e_consent_mgt_gdpr.spec.js
@@ -1,4 +1,4 @@
-/**
+/*
  TODO: old CMP no longer works; see if we can fix this with https://github.com/prebid/Prebid.js/issues/6377
 const expect = require('chai').expect;
 const { testPageURL, switchFrame, waitForElement } = require('../../../helpers/testing-utils');
@@ -59,4 +59,4 @@ describe('Prebid.js GDPR Ad Unit Test', function () {
     expect(ele.isExisting()).to.be.true;
   });
 });
-**/
+ */
diff --git a/test/spec/e2e/modules/e2e_currency.spec.js b/test/spec/e2e/modules/e2e_currency.spec.js
index e4eeeab4f5e..865c24cbeb1 100644
--- a/test/spec/e2e/modules/e2e_currency.spec.js
+++ b/test/spec/e2e/modules/e2e_currency.spec.js
@@ -13,8 +13,8 @@ setupTest({
   waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
   expectGAMCreative: true
 }, 'Prebid.js Currency Ad Unit Test', function () {
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
+  it('should load the targeting keys with correct values', async function () {
+    const result = await browser.execute(function () {
       return window.pbjs.getAdserverTargeting('/19968336/prebid_native_example_2');
     });
 
diff --git a/test/spec/e2e/multi-bidder/e2e_multiple_bidders.spec.js b/test/spec/e2e/multi-bidder/e2e_multiple_bidders.spec.js
index ef34cdc98f1..098dee3647d 100644
--- a/test/spec/e2e/multi-bidder/e2e_multiple_bidders.spec.js
+++ b/test/spec/e2e/multi-bidder/e2e_multiple_bidders.spec.js
@@ -26,8 +26,8 @@ setupTest({
   waitFor: CREATIVE_BANNER_CSS_SELECTOR,
   expectGAMCreative: true,
 }, 'Prebid.js Multiple Bidder Ad Unit Test', function () {
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
+  it('should load the targeting keys with correct values', async function () {
+    const result = await browser.execute(function () {
       return window.pbjs.getAdserverTargeting('div-banner-native-2');
     });
 
diff --git a/test/spec/e2e/native/basic_native_ad.spec.js b/test/spec/e2e/native/basic_native_ad.spec.js
index 4167046b553..ded7ba610f2 100644
--- a/test/spec/e2e/native/basic_native_ad.spec.js
+++ b/test/spec/e2e/native/basic_native_ad.spec.js
@@ -26,8 +26,8 @@ setupTest({
   waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
   expectGAMCreative: true
 }, 'Prebid.js Native Ad Unit Test', function () {
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
+  it('should load the targeting keys with correct values', async function () {
+    const result = await browser.execute(function () {
       return window.pbjs.getAdserverTargeting('/19968336/prebid_native_example_2');
     });
 
diff --git a/test/spec/e2e/outstream/basic_outstream_video_ad.spec.js b/test/spec/e2e/outstream/basic_outstream_video_ad.spec.js
index 427839fa92a..4b5c8566f28 100644
--- a/test/spec/e2e/outstream/basic_outstream_video_ad.spec.js
+++ b/test/spec/e2e/outstream/basic_outstream_video_ad.spec.js
@@ -19,8 +19,8 @@ setupTest({
   url: TEST_PAGE_URL,
   waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
 }, 'Prebid.js Outstream Video Ad Test', function () {
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
+  it('should load the targeting keys with correct values', async function () {
+    const result = await browser.execute(function () {
       return window.pbjs.getAdserverTargeting('video_ad_unit_2');
     });
 
@@ -30,13 +30,13 @@ setupTest({
     expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
   });
 
-  it('should render the video ad on the page', function() {
+  it('should render the video ad on the page', async function() {
     // skipping test in Edge due to wdio bug: https://github.com/webdriverio/webdriverio/issues/3880
     // the iframe for the video does not have a name property and id is generated automatically...
     if (browser.capabilities.browserName !== 'edge') {
-      switchFrame(CREATIVE_IFRAME_CSS_SELECTOR);
-      const ele = $('body > div[id*="an_video_ad_player"] > video');
-      expect(ele.isExisting()).to.be.true;
+      await switchFrame(CREATIVE_IFRAME_CSS_SELECTOR);
+      const existing = await $('body > div[id*="an_video_ad_player"] > video').isExisting();
+      expect(existing).to.be.true;
     }
   });
 });
diff --git a/test/spec/fpd/enrichment_spec.js b/test/spec/fpd/enrichment_spec.js
index 3b3afb15f8c..5bf1dbc22a4 100644
--- a/test/spec/fpd/enrichment_spec.js
+++ b/test/spec/fpd/enrichment_spec.js
@@ -3,7 +3,10 @@ import {hook} from '../../../src/hook.js';
 import {expect} from 'chai/index.mjs';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
+import * as activities from 'src/activities/rules.js'
 import {CLIENT_SECTIONS} from '../../../src/fpd/oneClient.js';
+import {ACTIVITY_ACCESS_DEVICE} from '../../../src/activities/activities.js';
+import {ACTIVITY_PARAM_COMPONENT} from '../../../src/activities/params.js';
 
 describe('FPD enrichment', () => {
   let sandbox;
@@ -31,7 +34,11 @@ describe('FPD enrichment', () => {
       },
       document: {
         querySelector: sinon.stub()
-      }
+      },
+      screen: {
+        width: 1,
+        height: 1,
+      },
     };
   }
 
@@ -144,26 +151,6 @@ describe('FPD enrichment', () => {
         expect(ortb2.site.publisher.domain).to.eql('pub.com');
       });
     });
-
-    it('respects config set through setConfig({site})', () => {
-      sandbox.stub(dep, 'getRefererInfo').callsFake(() => ({
-        page: 'www.example.com',
-        ref: 'referrer.com',
-      }));
-      config.setConfig({
-        site: {
-          ref: 'override.com',
-          priority: 'lower'
-        }
-      });
-      return fpd({site: {priority: 'highest'}}).then(ortb2 => {
-        sinon.assert.match(ortb2.site, {
-          page: 'www.example.com',
-          ref: 'override.com',
-          priority: 'highest'
-        })
-      })
-    })
   });
 
   describe('device', () => {
@@ -173,8 +160,8 @@ describe('FPD enrichment', () => {
     });
     testWindows(() => win, () => {
       it('sets w/h', () => {
-        win.innerHeight = 123;
-        win.innerWidth = 321;
+        win.screen.width = 321;
+        win.screen.height = 123;
         return fpd().then(ortb2 => {
           sinon.assert.match(ortb2.device, {
             w: 321,
@@ -183,6 +170,32 @@ describe('FPD enrichment', () => {
         });
       });
 
+      it('sets ext.vpw/vph', () => {
+        win.innerWidth = 12;
+        win.innerHeight = 21;
+        return fpd().then(ortb2 => {
+          sinon.assert.match(ortb2.device.ext, {
+            vpw: 12,
+            vph: 21,
+          });
+        });
+      });
+
+      describe('ext.webdriver', () => {
+        it('when navigator.webdriver is available', () => {
+          win.navigator.webdriver = true;
+          return fpd().then(ortb2 => {
+            expect(ortb2.device.ext?.webdriver).to.eql(true);
+          });
+        });
+
+        it('when navigator.webdriver is not present', () => {
+          return fpd().then(ortb2 => {
+            expect(ortb2.device.ext?.webdriver).to.not.exist;
+          });
+        });
+      });
+
       it('sets ua', () => {
         win.navigator.userAgent = 'mock-ua';
         return fpd().then(ortb2 => {
@@ -196,44 +209,9 @@ describe('FPD enrichment', () => {
           expect(ortb2.device.language).to.eql('lang');
         })
       });
-
-      it('respects setConfig({device})', () => {
-        win.navigator.userAgent = 'ua';
-        win.navigator.language = 'lang';
-        config.setConfig({
-          device: {
-            language: 'override',
-            priority: 'lower'
-          }
-        });
-        return fpd({device: {priority: 'highest'}}).then(ortb2 => {
-          sinon.assert.match(ortb2.device, {
-            language: 'override',
-            priority: 'highest',
-            ua: 'ua'
-          })
-        })
-      })
     });
   });
 
-  describe('app', () => {
-    it('respects setConfig({app})', () => {
-      config.setConfig({
-        app: {
-          priority: 'lower',
-          prop: 'value'
-        }
-      });
-      return fpd({app: {priority: 'highest'}}).then(ortb2 => {
-        sinon.assert.match(ortb2.app, {
-          priority: 'highest',
-          prop: 'value'
-        })
-      })
-    })
-  })
-
   describe('regs', () => {
     describe('gpc', () => {
       let win;
@@ -244,7 +222,7 @@ describe('FPD enrichment', () => {
         it('is set if globalPrivacyControl is set', () => {
           win.navigator.globalPrivacyControl = true;
           return fpd().then(ortb2 => {
-            expect(ortb2.regs.ext.gpc).to.eql(1);
+            expect(ortb2.regs.ext.gpc).to.eql('1');
           });
         });
 
@@ -310,6 +288,71 @@ describe('FPD enrichment', () => {
     });
   });
 
+  describe('privacy sandbox cookieDeprecationLabel', () => {
+    let isAllowed, cdep, shouldCleanupNav = false;
+
+    before(() => {
+      if (!navigator.cookieDeprecationLabel) {
+        navigator.cookieDeprecationLabel = {};
+        shouldCleanupNav = true;
+      }
+    });
+
+    after(() => {
+      if (shouldCleanupNav) {
+        delete navigator.cookieDeprecationLabel;
+      }
+    });
+
+    beforeEach(() => {
+      isAllowed = true;
+      sandbox.stub(activities, 'isActivityAllowed').callsFake((activity, params) => {
+        if (activity === ACTIVITY_ACCESS_DEVICE && params[ACTIVITY_PARAM_COMPONENT] === 'prebid.cdep') {
+          return isAllowed;
+        } else {
+          throw new Error('Unexpected activity check');
+        }
+      });
+      sandbox.stub(window.navigator, 'cookieDeprecationLabel').value({
+        getValue: sinon.stub().callsFake(() => cdep)
+      })
+    })
+
+    it('enrichment sets device.ext.cdep when allowed and navigator.getCookieDeprecationLabel exists', () => {
+      cdep = Promise.resolve('example-test-label');
+      return fpd().then(ortb2 => {
+        expect(ortb2.device.ext.cdep).to.eql('example-test-label');
+      })
+    });
+
+    Object.entries({
+      'not allowed'() {
+        isAllowed = false;
+      },
+      'not supported'() {
+        delete navigator.cookieDeprecationLabel
+      }
+    }).forEach(([t, setup]) => {
+      it(`if ${t}, the navigator API is not called and no enrichment happens`, () => {
+        setup();
+        cdep = Promise.resolve('example-test-label');
+        return fpd().then(ortb2 => {
+          expect(ortb2.device.ext?.cdep).to.not.exist;
+          if (navigator.cookieDeprecationLabel) {
+            sinon.assert.notCalled(navigator.cookieDeprecationLabel.getValue);
+          }
+        })
+      });
+    })
+
+    it('if the navigator API returns a promise that rejects, the enrichment does not halt forever', () => {
+      cdep = Promise.reject(new Error('oops, something went wrong'));
+      return fpd().then(ortb2 => {
+        expect(ortb2.device.ext?.cdep).to.not.exist;
+      })
+    });
+  });
+
   it('leaves only one of app, site, dooh', () => {
     return fpd({
       app: {p: 'val'},
diff --git a/test/spec/fpd/gdpr_spec.js b/test/spec/fpd/gdpr_spec.js
index 8fc04815112..c37e6b7682c 100644
--- a/test/spec/fpd/gdpr_spec.js
+++ b/test/spec/fpd/gdpr_spec.js
@@ -1,5 +1,7 @@
 import {gdprDataHandler} from '../../../src/adapterManager.js';
-import {enrichFPDHook} from '../../../modules/consentManagement.js';
+import {enrichFPDHook} from '../../../modules/consentManagementTcf.js';
+import {config} from 'src/config.js';
+import 'src/prebid.js';
 
 describe('GDPR FPD enrichment', () => {
   let sandbox, consent;
@@ -12,9 +14,9 @@ describe('GDPR FPD enrichment', () => {
     sandbox.restore();
   })
 
-  function callHook() {
+  function callHook(ortb2 = {}) {
     let result;
-    enrichFPDHook((res) => { result = res }, Promise.resolve({}));
+    enrichFPDHook((res) => { result = res }, Promise.resolve(ortb2));
     return result;
   }
 
@@ -32,7 +34,7 @@ describe('GDPR FPD enrichment', () => {
     })
   });
 
-  it('sets user.ext.consent, but not regs.ext.gdpr, if gpdrApplies is not a boolean', () => {
+  it('sets user.ext.consent, but not regs.ext.gdpr, if gdprApplies is not a boolean', () => {
     consent = {consentString: 'mock-consent'};
     return callHook().then(ortb2 => {
       expect(ortb2).to.eql({
@@ -44,4 +46,24 @@ describe('GDPR FPD enrichment', () => {
       })
     })
   });
+
+  describe('dsa', () => {
+    describe('when dsaPlaform is set', () => {
+      beforeEach(() => {
+        config.setConfig({
+          consentManagement: {
+            gdpr: {
+              dsaPlatform: true
+            }
+          }
+        });
+      });
+
+      it('sets dsarequired', () => {
+        return callHook().then(ortb2 => {
+          expect(ortb2.regs.ext.dsa.dsarequired).to.equal(3);
+        });
+      });
+    });
+  });
 });
diff --git a/test/spec/fpd/oneClient.js b/test/spec/fpd/oneClient_spec.js
similarity index 100%
rename from test/spec/fpd/oneClient.js
rename to test/spec/fpd/oneClient_spec.js
diff --git a/test/spec/libraries/mspa/activityControls_spec.js b/test/spec/libraries/mspa/activityControls_spec.js
index f232dc2563f..80d9fc500b1 100644
--- a/test/spec/libraries/mspa/activityControls_spec.js
+++ b/test/spec/libraries/mspa/activityControls_spec.js
@@ -181,13 +181,18 @@ describe('mspaRule', () => {
       expect(mkRule()().allow).to.equal(false);
     });
 
+    it('should deny when consent is using version != 1', () => {
+      consent = {Version: 2};
+      expect(mkRule()().allow).to.equal(false);
+    })
+
     Object.entries({
       'denies': true,
       'allows': false
     }).forEach(([t, denied]) => {
       it(`should check if deny fn ${t}`, () => {
         denies.returns(denied);
-        consent = {mock: 'value'};
+        consent = {mock: 'value', Version: 1};
         const result = mkRule()();
         sinon.assert.calledWith(denies, consent);
         if (denied) {
@@ -212,6 +217,7 @@ describe('setupRules', () => {
       parsedSections: {
         mockApi: [
           {
+            Version: 1,
             mock: 'consent'
           }
         ]
@@ -226,9 +232,16 @@ describe('setupRules', () => {
   it('should use flatten section data for the given api', () => {
     runSetup('mockApi', [1]);
     expect(isAllowed('mockActivity', {})).to.equal(false);
-    sinon.assert.calledWith(rules.mockActivity, {mock: 'consent'})
+    sinon.assert.calledWith(rules.mockActivity, consent.parsedSections.mockApi[0])
   });
 
+  it('should accept already flattened section data', () => {
+    consent.parsedSections.mockApi = {flat: 'consent', Version: 1};
+    runSetup('mockApi', [1]);
+    isAllowed('mockActivity', {});
+    sinon.assert.calledWith(rules.mockActivity, consent.parsedSections.mockApi)
+  })
+
   it('should not choke when no consent data is available', () => {
     consent = null;
     runSetup('mockApi', [1]);
@@ -241,11 +254,11 @@ describe('setupRules', () => {
   });
 
   it('should pass flattened consent through normalizeConsent', () => {
-    const normalize = sinon.stub().returns({normalized: 'consent'})
+    const normalize = sinon.stub().returns({normalized: 'consent', Version: 1})
     runSetup('mockApi', [1], normalize);
     expect(isAllowed('mockActivity', {})).to.equal(false);
-    sinon.assert.calledWith(normalize, {mock: 'consent'});
-    sinon.assert.calledWith(rules.mockActivity, {normalized: 'consent'});
+    sinon.assert.calledWith(normalize, {mock: 'consent', Version: 1});
+    sinon.assert.calledWith(rules.mockActivity, {normalized: 'consent', Version: 1});
   });
 
   it('should return a function that unregisters activity controls', () => {
diff --git a/test/spec/libraries/precisoUtils/bidNativeUtils_spec.js b/test/spec/libraries/precisoUtils/bidNativeUtils_spec.js
new file mode 100644
index 00000000000..edbc078a740
--- /dev/null
+++ b/test/spec/libraries/precisoUtils/bidNativeUtils_spec.js
@@ -0,0 +1,78 @@
+import {expect} from 'chai';
+import { NATIVE } from '../../../../src/mediaTypes';
+import { interpretNativeBid, OPENRTB } from '../../../../libraries/precisoUtils/bidNativeUtils';
+
+const DEFAULT_PRICE = 1
+const DEFAULT_BANNER_WIDTH = 300
+const DEFAULT_BANNER_HEIGHT = 250
+const BIDDER_CODE = 'test';
+
+describe('bidNativeUtils', function () {
+  describe('interpretNativeBid', function () {
+    it('should get correct native bid response', function () {
+      const adm = {
+        native: {
+          ver: 1.2,
+          link: {
+            url: 'https://example.com',
+            clicktrackers: 'https://example.com/clktracker'
+          },
+          eventtrackers: [
+            {
+              url: 'https://example.com/imptracker'
+            }
+          ],
+          imptrackers: [
+            'https://example.com/imptracker'
+          ],
+          assets: [{
+            id: OPENRTB.NATIVE.ASSET_ID.IMAGE,
+            required: 1,
+            img: {
+              url: 'https://example.com/image.jpg',
+              w: 150,
+              h: 50
+            }
+          }],
+        }
+      }
+      let bid = {
+        id: '123',
+        impid: 'b4f290d7-d4ab-4778-ab94-2baf06420b22',
+        price: DEFAULT_PRICE,
+        adm: JSON.stringify(adm),
+        cid: 'test_cid',
+        crid: 'test_banner_crid',
+        w: DEFAULT_BANNER_WIDTH,
+        h: DEFAULT_BANNER_HEIGHT,
+        adomain: [],
+      }
+
+      let expectedResponse = {
+        requestId: 'b4f290d7-d4ab-4778-ab94-2baf06420b22',
+        mediaType: NATIVE,
+        cpm: DEFAULT_PRICE,
+        creativeId: 'test_banner_crid',
+        width: 1,
+        height: 1,
+        ttl: 300,
+        netRevenue: true,
+        currency: 'USD',
+        meta: { advertiserDomains: [] },
+        native: {
+          clickUrl: encodeURI('https://example.com'),
+          impressionTrackers: ['https://example.com/imptracker'],
+          image: {
+            url: encodeURI('https://example.com/image.jpg'),
+            width: 150,
+            height: 50
+          },
+        }
+      }
+
+      let result = interpretNativeBid(bid);
+
+      expect(Object.keys(result)).to.have.members(Object.keys(expectedResponse));
+    })
+  });
+});
diff --git a/test/spec/libraries/precisoUtils/bidUtilsCommon_spec.js b/test/spec/libraries/precisoUtils/bidUtilsCommon_spec.js
new file mode 100644
index 00000000000..754b104d96d
--- /dev/null
+++ b/test/spec/libraries/precisoUtils/bidUtilsCommon_spec.js
@@ -0,0 +1,267 @@
+import {expect} from 'chai';
+
+import { BANNER } from '../../../../src/mediaTypes.js';
+import * as utils from '../../../../src/utils.js';
+import { interpretResponse, isBidRequestValid, buildUserSyncs, buildBidRequests, bidWinReport } from '../../../../libraries/precisoUtils/bidUtilsCommon.js';
+
+const BIDDER_CODE = 'bidder';
+const TESTDOMAIN = 'test.org'
+const AD_URL = `https://${TESTDOMAIN}/pbjs`;
+const SYNC_URL = `https://${TESTDOMAIN}/sync`;
+
+describe('bidUtilsCommon', function () {
+  const bid = {
+    bidId: '23dc19818e5293',
+    bidder: BIDDER_CODE,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 23611,
+    }
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'test.com'
+    }
+  };
+
+  const spec = {
+    isBidRequestValid: isBidRequestValid,
+    buildRequests: buildBidRequests(AD_URL),
+    interpretResponse,
+    getUserSyncs: buildUserSyncs,
+    onBidWon: bidWinReport
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      delete bid.params.placementId;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid data if array of bids is valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'host', 'page', 'placements');
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.gdpr).to.not.exist;
+      expect(data.ccpa).to.not.exist;
+      let placement = data['placements'][0];
+      expect(placement).to.have.keys('placementId', 'bidId', 'adFormat', 'sizes', 'schain', 'bidfloor');
+      expect(placement.placementId).to.equal(23611);
+      expect(placement.bidId).to.equal('23dc19818e5293');
+      expect(placement.adFormat).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.sizes).to.be.an('array');
+      expect(placement.bidfloor).to.exist.and.to.equal(0);
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      bidderRequest.gdprConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([]);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23dc19818e5293',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {}
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23dc19818e5293');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.width).to.equal(300);
+      expect(dataItem.height).to.equal(250);
+      expect(dataItem.ad).to.equal('Test');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23dc19818e5293',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should do nothing on getUserSyncs', function () {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true
+      }, {}, SYNC_URL);
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal(`https://${TESTDOMAIN}/sync/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0`)
+    });
+  });
+
+  describe('on bidWon', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('should replace nurl for banner', function () {
+      const nurl = 'nurl/?ap=${' + 'AUCTION_PRICE}';
+      const bid = {
+        'bidderCode': 'redtram',
+        'width': 300,
+        'height': 250,
+        'statusMessage': 'Bid available',
+        'adId': '5691dd18ba6ab6',
+        'requestId': '23dc19818e5293',
+        'transactionId': '948c716b-bf64-4303-bcf4-395c2f6a9770',
+        'auctionId': 'a6b7c61f-15a9-481b-8f64-e859787e9c07',
+        'mediaType': 'banner',
+        'source': 'client',
+        'ad': "
\n",
+        'cpm': 0.68,
+        'nurl': nurl,
+        'creativeId': 'test',
+        'currency': 'USD',
+        'dealId': '',
+        'meta': {
+          'advertiserDomains': [],
+          'dchain': {
+            'ver': '1.0',
+            'complete': 0,
+            'nodes': [
+              {
+                'name': 'redtram'
+              }
+            ]
+          }
+        },
+        'netRevenue': true,
+        'ttl': 120,
+        'metrics': {},
+        'adapterCode': 'redtram',
+        'originalCpm': 0.68,
+        'originalCurrency': 'USD',
+        'responseTimestamp': 1668162732297,
+        'requestTimestamp': 1668162732292,
+        'bidder': 'redtram',
+        'adUnitCode': 'div-prebid',
+        'timeToRespond': 5,
+        'pbLg': '0.50',
+        'pbMg': '0.60',
+        'pbHg': '0.68',
+        'pbAg': '0.65',
+        'pbDg': '0.68',
+        'pbCg': '',
+        'size': '300x250',
+        'adserverTargeting': {
+          'hb_bidder': 'redtram',
+          'hb_adid': '5691dd18ba6ab6',
+          'hb_pb': '0.68',
+          'hb_size': '300x250',
+          'hb_source': 'client',
+          'hb_format': 'banner',
+          'hb_adomain': ''
+        },
+        'status': 'rendered',
+        'params': [
+          {
+            'placementId': 23611
+          }
+        ]
+      };
+      spec.onBidWon(bid);
+      expect(bid.nurl).to.deep.equal('nurl/?ap=0.68');
+    });
+  });
+});
diff --git a/test/spec/libraries/precisoUtils/bidUtils_spec.js b/test/spec/libraries/precisoUtils/bidUtils_spec.js
new file mode 100644
index 00000000000..05c480f41bc
--- /dev/null
+++ b/test/spec/libraries/precisoUtils/bidUtils_spec.js
@@ -0,0 +1,150 @@
+
+import { expect } from 'chai';
+import { buildRequests, interpretResponse } from '../../../../libraries/precisoUtils/bidUtils.js';
+
+const DEFAULT_PRICE = 1
+const DEFAULT_CURRENCY = 'USD'
+const DEFAULT_BANNER_WIDTH = 300
+const DEFAULT_BANNER_HEIGHT = 250
+const BIDDER_CODE = 'preciso';
+const TESTDOMAIN = 'test.org'
+const bidEndPoint = `https://${TESTDOMAIN}/bid_request/openrtb`;
+
+describe('bidUtils', function () {
+  let bid = {
+    bidId: '23fhj33i987f',
+    bidder: BIDDER_CODE,
+    buyerUid: 'testuid',
+    mediaTypes: {
+      banner: {
+        sizes: [[DEFAULT_BANNER_WIDTH, DEFAULT_BANNER_HEIGHT]]
+      }
+    },
+    params: {
+      host: 'prebid',
+      sourceid: '0',
+      publisherId: '0',
+      mediaType: 'banner',
+      region: 'IND'
+
+    },
+    userId: {
+      pubcid: '12355454test'
+
+    },
+    user: {
+      geo: {
+        region: 'IND',
+      }
+    },
+    ortb2: {
+      device: {
+        w: 1920,
+        h: 166,
+        dnt: 0,
+      },
+      site: {
+        domain: 'localHost'
+      },
+      source: {
+        tid: 'eaff09b-a1ab-4ec6-a81e-c5a75bc1dde3'
+      }
+
+    }
+
+  };
+
+  const spec = {
+    // isBidRequestValid: isBidRequestValid(),
+    buildRequests: buildRequests(bidEndPoint),
+    interpretResponse,
+    // buildUserSyncs: buildUserSyncs(syncEndPoint)
+  };
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid]);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal(`https://${TESTDOMAIN}/bid_request/openrtb`);
+    });
+    it('Returns valid data if array of bids is valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data.device).to.be.a('object');
+      expect(data.user).to.be.a('object');
+      expect(data.source).to.be.a('object');
+      expect(data.site).to.be.a('object');
+    });
+    it('Returns data.device is undefined  if no valid device object is passed', function () {
+      delete bid.ortb2.device;
+      serverRequest = spec.buildRequests([bid]);
+      let data = serverRequest.data;
+      expect(data.device).to.be.undefined;
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should get correct bid response', function () {
+      let response = {
+        bidderRequestId: 'f6adb85f-4e19-45a0-b41e-2a5b9a48f23a',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '123',
+                impid: 'b4f290d7-d4ab-4778-ab94-2baf06420b22',
+                price: DEFAULT_PRICE,
+                adm: 'hi',
+                cid: 'test_cid',
+                crid: 'test_banner_crid',
+                w: DEFAULT_BANNER_WIDTH,
+                h: DEFAULT_BANNER_HEIGHT,
+                adomain: [],
+              }
+            ],
+            seat: BIDDER_CODE
+          }
+        ],
+      }
+      let expectedResponse = [
+        {
+          requestId: 'b4f290d7-d4ab-4778-ab94-2baf06420b22',
+          cpm: DEFAULT_PRICE,
+          width: DEFAULT_BANNER_WIDTH,
+          height: DEFAULT_BANNER_HEIGHT,
+          creativeId: 'test_banner_crid',
+          ad: 'hi',
+          currency: DEFAULT_CURRENCY,
+          netRevenue: true,
+          ttl: 300,
+          meta: { advertiserDomains: [] },
+        }
+      ]
+      let result = spec.interpretResponse({ body: response })
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]))
+    })
+  });
+  // describe('getUserSyncs', function () {
+  //   const syncUrl = `https://${TESTDOMAIN}/rtb/user/usersync.aspx?/iframe?pbjs=1&coppa=0`;
+  //   const syncOptions = {
+  //     iframeEnabled: true
+  //   };
+  //   let userSync = spec.buildUserSyncs(syncOptions);
+  //   it('Returns valid URL and type', function () {
+  //     expect(userSync).to.be.an('array').with.lengthOf(1);
+  //     expect(userSync[0].type).to.exist;
+  //     expect(userSync[0].url).to.exist;
+  //     expect(userSync).to.deep.equal([
+  //       { type: 'iframe', url: syncUrl }
+  //     ]);
+  //   });
+  // });
+});
diff --git a/test/spec/libraries/processResponse_spec.js b/test/spec/libraries/processResponse_spec.js
new file mode 100644
index 00000000000..8f682bd87f5
--- /dev/null
+++ b/test/spec/libraries/processResponse_spec.js
@@ -0,0 +1,60 @@
+import { getBidFromResponse } from '../../../libraries/processResponse/index.js';
+import {expect} from 'chai/index.js';
+
+describe('processResponse', function () {
+  const respItem = {
+    'bid': [
+      {
+        'price': 0.504,
+        'ext': {
+          'visx': {
+            'events': {
+              'runtime': '//t.visx.net/track/status/RFTFjZflStSUyuXuyT2IKOZMVPUIiPkzebpPWYwKvNkE_IybYfFxk2P5feBnt9LhiR7291KTG11JjrnyHyhVKfolH_VRCmGppbnHXHfHJ9AgNqjhFB_yTg3m18wGO9k4LOddGAg3mk8qc5zYEIzNsPFnZzos1EkHh5WNs0EjrBpwCgTERUqM3PJD_Zy60nMDA-LCuq-Z4JNBGC_GHx4LwvwXipQsjdGHS-HkqHHf9sES45OlRrW4wMf69dsmey1gvwqFAhJwii2lzo9wfOohLCMRa3Vxd-zvzx-uw71maWOyKnJXWiP6c5xkyrfV4gukNYaDUgrHc0mA0yhqyiHxe8KzEl32rxQXJRCg4FoJcJ1g9jmpZQBnIh2QrKm5iC159elwzwf31_v3Uw97Zpek8j0CCLa8FjxSjvXm1Mq8x4jcwlt0ngfWU6WwyyKwX_GMbKWuAL_nrfxSvs1hZCb4eunEFyXb2lN2olWo8ezMEzZ8YRxF_mx0hDB3NXyV0Tb4b6KXQq7tvxV-1rKPRt7DySRTbLPht0hO3mjTHxutfihnuL6ROEr372gSAiDodnbdCq_lPsCsUSEpG7DmN-4In10uSp2MemjfbqI6tllOCO-j6Pm9mhdl_rT4anHmRG2DG_dLsfD7pLaAsgf2zl2bpawhxxLVjTxikoWjNKAvr_GNh4adHGj5EHbqaBaHovB573Yk-koHkyBNrebeiy-1-Knc28MWOpFi9XKjNsXx756jAXLx2H098ptaXF3mFiuT2Iv6sTVjqOI/{STATUS_CODE}'
+            }
+          },
+          'prebid': {
+            'events': {
+              'pending': '//t.visx.net/track/pending/RFTFjZflStSUyuXuyT2IKOZMVPUIiPkzebpPWYwKvNkE_IybYfFxk2P5feBnt9LhiR7291KTG11JjrnyHyhVKfolH_VRCmGppbnHXHfHJ9AgNqjhFB_yTg3m18wGO9k4LOddGAg3mk8qc5zYEIzNsPFnZzos1EkHh5WNs0EjrBpwCgTERUqM3PJD_Zy60nMDA-LCuq-Z4JNBGC_GHx4LwvwXipQsjdGHS-HkqHHf9sES45OlRrW4wMf69dsmey1gvwqFAhJwii2lzo9wfOohLCMRa3Vxd-zvzx-uw71maWOyKnJXWiP6c5xkyrfV4gukNYaDUgrHc0mA0yhqyiHxe8KzEl32rxQXJRCg4FoJcJ1g9jmpZQBnIh2QrKm5iC159elwzwf31_v3Uw97Zpek8j0CCLa8FjxSjvXm1Mq8x4jcwlt0ngfWU6WwyyKwX_GMbKWuAL_nrfxSvs1hZCb4eunEFyXb2lN2olWo8ezMEzZ8YRxF_mx0hDB3NXyV0Tb4b6KXQq7tvxV-1rKPRt7DySRTbLPht0hO3mjTHxutfihnuL6ROEr372gSAiDodnbdCq_lPsCsUSEpG7DmN-4In10uSp2MemjfbqI6tllOCO-j6Pm9mhdl_rT4anHmRG2DG_dLsfD7pLaAsgf2zl2bpawhxxLVjTxikoWjNKAvr_GNh4adHGj5EHbqaBaHovB573Yk-koHkyBNrebeiy-1-Knc28MWOpFi9XKjNsXx756jAXLx2H098ptaXF3mFiuT2Iv6sTVjqOI/',
+              'win': '//t.visx.net/track/win/RFTFjZflStSUyuXuyT2IKOZMVPUIiPkzebpPWYwKvNkE_IybYfFxk2P5feBnt9LhiR7291KTG11JjrnyHyhVKfolH_VRCmGppbnHXHfHJ9AgNqjhFB_yTg3m18wGO9k4LOddGAg3mk8qc5zYEIzNsPFnZzos1EkHh5WNs0EjrBpwCgTERUqM3PJD_Zy60nMDA-LCuq-Z4JNBGC_GHx4LwvwXipQsjdGHS-HkqHHf9sES45OlRrW4wMf69dsmey1gvwqFAhJwii2lzo9wfOohLCMRa3Vxd-zvzx-uw71maWOyKnJXWiP6c5xkyrfV4gukNYaDUgrHc0mA0yhqyiHxe8KzEl32rxQXJRCg4FoJcJ1g9jmpZQBnIh2QrKm5iC159elwzwf31_v3Uw97Zpek8j0CCLa8FjxSjvXm1Mq8x4jcwlt0ngfWU6WwyyKwX_GMbKWuAL_nrfxSvs1hZCb4eunEFyXb2lN2olWo8ezMEzZ8YRxF_mx0hDB3NXyV0Tb4b6KXQq7tvxV-1rKPRt7DySRTbLPht0hO3mjTHxutfihnuL6ROEr372gSAiDodnbdCq_lPsCsUSEpG7DmN-4In10uSp2MemjfbqI6tllOCO-j6Pm9mhdl_rT4anHmRG2DG_dLsfD7pLaAsgf2zl2bpawhxxLVjTxikoWjNKAvr_GNh4adHGj5EHbqaBaHovB573Yk-koHkyBNrebeiy-1-Knc28MWOpFi9XKjNsXx756jAXLx2H098ptaXF3mFiuT2Iv6sTVjqOI/',
+              'bid_timeout': '//t.visx.net/track/bid_timeout/RFTFjZflStSUyuXuyT2IKOZMVPUIiPkzebpPWYwKvNkE_IybYfFxk2P5feBnt9LhiR7291KTG11JjrnyHyhVKfolH_VRCmGppbnHXHfHJ9AgNqjhFB_yTg3m18wGO9k4LOddGAg3mk8qc5zYEIzNsPFnZzos1EkHh5WNs0EjrBpwCgTERUqM3PJD_Zy60nMDA-LCuq-Z4JNBGC_GHx4LwvwXipQsjdGHS-HkqHHf9sES45OlRrW4wMf69dsmey1gvwqFAhJwii2lzo9wfOohLCMRa3Vxd-zvzx-uw71maWOyKnJXWiP6c5xkyrfV4gukNYaDUgrHc0mA0yhqyiHxe8KzEl32rxQXJRCg4FoJcJ1g9jmpZQBnIh2QrKm5iC159elwzwf31_v3Uw97Zpek8j0CCLa8FjxSjvXm1Mq8x4jcwlt0ngfWU6WwyyKwX_GMbKWuAL_nrfxSvs1hZCb4eunEFyXb2lN2olWo8ezMEzZ8YRxF_mx0hDB3NXyV0Tb4b6KXQq7tvxV-1rKPRt7DySRTbLPht0hO3mjTHxutfihnuL6ROEr372gSAiDodnbdCq_lPsCsUSEpG7DmN-4In10uSp2MemjfbqI6tllOCO-j6Pm9mhdl_rT4anHmRG2DG_dLsfD7pLaAsgf2zl2bpawhxxLVjTxikoWjNKAvr_GNh4adHGj5EHbqaBaHovB573Yk-koHkyBNrebeiy-1-Knc28MWOpFi9XKjNsXx756jAXLx2H098ptaXF3mFiuT2Iv6sTVjqOI/',
+              'runtime': '//t.visx.net/track/status/RFTFjZflStSUyuXuyT2IKOZMVPUIiPkzebpPWYwKvNkE_IybYfFxk2P5feBnt9LhiR7291KTG11JjrnyHyhVKfolH_VRCmGppbnHXHfHJ9AgNqjhFB_yTg3m18wGO9k4LOddGAg3mk8qc5zYEIzNsPFnZzos1EkHh5WNs0EjrBpwCgTERUqM3PJD_Zy60nMDA-LCuq-Z4JNBGC_GHx4LwvwXipQsjdGHS-HkqHHf9sES45OlRrW4wMf69dsmey1gvwqFAhJwii2lzo9wfOohLCMRa3Vxd-zvzx-uw71maWOyKnJXWiP6c5xkyrfV4gukNYaDUgrHc0mA0yhqyiHxe8KzEl32rxQXJRCg4FoJcJ1g9jmpZQBnIh2QrKm5iC159elwzwf31_v3Uw97Zpek8j0CCLa8FjxSjvXm1Mq8x4jcwlt0ngfWU6WwyyKwX_GMbKWuAL_nrfxSvs1hZCb4eunEFyXb2lN2olWo8ezMEzZ8YRxF_mx0hDB3NXyV0Tb4b6KXQq7tvxV-1rKPRt7DySRTbLPht0hO3mjTHxutfihnuL6ROEr372gSAiDodnbdCq_lPsCsUSEpG7DmN-4In10uSp2MemjfbqI6tllOCO-j6Pm9mhdl_rT4anHmRG2DG_dLsfD7pLaAsgf2zl2bpawhxxLVjTxikoWjNKAvr_GNh4adHGj5EHbqaBaHovB573Yk-koHkyBNrebeiy-1-Knc28MWOpFi9XKjNsXx756jAXLx2H098ptaXF3mFiuT2Iv6sTVjqOI/{STATUS_CODE}'
+            },
+            'meta': {
+              'mediaType': 'banner'
+            }
+          }
+        },
+        'impid': '2b642c27bdcf8f',
+        'auid': 929004,
+        'h': 250,
+        'cur': 'EUR',
+        'adomain': [
+          ''
+        ],
+        'w': 300,
+        'id': '9b6c7e04-0a09-4add-8ba9-0c8b98304de3'
+      }
+    ],
+    'seat': '1429601'
+  };
+  const LOG_ERROR_MESS = {
+    'noAuid': 'Bid from response has no auid parameter - ',
+    'noAdm': 'Bid from response has no adm parameter - ',
+    'noBid': 'Array of bid objects is empty',
+    'noImpId': 'Bid from response has no impid parameter - ',
+    'noPlacementCode': 'Can\'t find in requested bids the bid with auid - ',
+    'emptyUids': 'Uids should not be empty',
+    'emptySeatbid': 'Seatbid array from response has an empty item',
+    'emptyResponse': 'Response is empty',
+    'hasEmptySeatbidArray': 'Response has empty seatbid array',
+    'hasNoArrayOfBids': 'Seatbid from response has no array of bid objects - ',
+    'notAllowedCurrency': 'Currency is not supported - ',
+    'currencyMismatch': 'Currency from the request is not match currency from the response - ',
+    'onlyVideoInstream': 'Only video instream supported',
+    'videoMissing': 'Bid request videoType property is missing - '
+  };
+  it('returns bid when respItem and LOG_ERROR_MESS is passed', function () {
+    let response = getBidFromResponse(respItem, LOG_ERROR_MESS);
+    expect(response).not.include.any.keys('emptyResponse', 'hasNoArrayOfBids', 'emptySeatbid');
+  });
+});
diff --git a/test/spec/libraries/teqblazeUtils/bidderUtils_spec.js b/test/spec/libraries/teqblazeUtils/bidderUtils_spec.js
new file mode 100644
index 00000000000..ba8b986163b
--- /dev/null
+++ b/test/spec/libraries/teqblazeUtils/bidderUtils_spec.js
@@ -0,0 +1,541 @@
+import { expect } from 'chai';
+import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../../../../libraries/teqblazeUtils/bidderUtils.js';
+import { BANNER, VIDEO, NATIVE } from '../../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../../src/utils.js';
+
+const bidder = 'bidder';
+const DOMAIN = 'test.org';
+const AD_URL = `https://${DOMAIN}/pbjs`;
+const SYNC_URL = `https://${DOMAIN}`;
+
+describe('TeqBlazeBidderUtils', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
+  };
+
+  const spec = {
+    isBidRequestValid: isBidRequestValid(),
+    buildRequests: buildRequests(AD_URL),
+    interpretResponse,
+    getUserSyncs: getUserSyncs(SYNC_URL)
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Handles ORTB2 device data', function () {
+      const ortb2Device = {
+        w: 980,
+        h: 1720,
+        dnt: 0,
+        ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+        language: 'en',
+        devicetype: 1,
+        make: 'Apple',
+        model: 'iPhone 12 Pro Max',
+        os: 'iOS',
+        osv: '17.4',
+        ext: {fiftyonedegrees_deviceId: '17595-133085-133468-18092'},
+      };
+      const _bidderRequest = JSON.parse(JSON.stringify(bidderRequest));
+      _bidderRequest.ortb2.device = ortb2Device;
+      const _request = spec.buildRequests(bids, _bidderRequest);
+
+      expect(_request.data.device).to.deep.equal(ortb2Device);
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal(`https://${DOMAIN}/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0`)
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal(`https://${DOMAIN}/image?pbjs=1&ccpa_consent=1---&coppa=0`)
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal(`https://${DOMAIN}/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0`)
+    });
+  });
+});
diff --git a/test/spec/libraries/userAgentUtils_spec.js b/test/spec/libraries/userAgentUtils_spec.js
new file mode 100644
index 00000000000..0a72b51588b
--- /dev/null
+++ b/test/spec/libraries/userAgentUtils_spec.js
@@ -0,0 +1,109 @@
+/* globals describe, beforeEach, afterEach, sinon */
+import { expect } from 'chai';
+import { getDeviceType, getBrowser, getOS } from 'libraries/userAgentUtils';
+import { deviceTypes, browserTypes, osTypes } from 'libraries/userAgentUtils/userAgentTypes.enums';
+
+const ORIGINAL_USER_AGENT = window.navigator.userAgent;
+const ORIGINAL_VENDOR = window.navigator.vendor;
+const ORIGINAL_APP_VERSION = window.navigator.appVersion;
+
+describe('Test user agent categorization', () => {
+  afterEach(() => {
+    window.navigator.__defineGetter__('userAgent', () => ORIGINAL_USER_AGENT);
+    window.navigator.__defineGetter__('vendor', () => ORIGINAL_VENDOR);
+    window.navigator.__defineGetter__('appVersion', () => ORIGINAL_APP_VERSION);
+  })
+
+  describe('test getDeviceType', () => {
+    it('user agent device type is tablet', () => {
+      const tabletUserAgent = 'Mozilla/5.0 (iPad; CPU OS 8_4_1 like Mac OS X) AppleWebKit/600.1.4.17.9 (KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3'
+      window.navigator.__defineGetter__('userAgent', () => tabletUserAgent);
+      expect(getDeviceType()).to.equal(deviceTypes.TABLET);
+    })
+    it('user agent device type is mobile', () => {
+      const mobileUserAgent = 'Mozilla/5.0 (Linux; Android 12; M2102J20SG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Mobile Safari/537.36'
+      window.navigator.__defineGetter__('userAgent', () => mobileUserAgent);
+      expect(getDeviceType()).to.equal(deviceTypes.MOBILE);
+    })
+    it('user agent device type is desktop', () => {
+      const desktopUserAgent = 'Mozilla/5.0 (X11; CrOS x86_64 8172.45.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.64 Safari/537.36'
+      window.navigator.__defineGetter__('userAgent', () => desktopUserAgent);
+      expect(getDeviceType()).to.equal(deviceTypes.DESKTOP);
+    })
+  })
+
+  describe('test getBrowser', () => {
+    it('user agent browser is edge', () => {
+      const edgeUserAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10532'
+      window.navigator.__defineGetter__('userAgent', () => edgeUserAgent);
+      expect(getBrowser()).to.equal(browserTypes.EDGE);
+    })
+    it('user agent browser is chrome', () => {
+      const chromeUserAgent = 'Mozilla/5.0 (iPad; CPU OS 8_4 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) CriOS/44.0.2403.67 Mobile/12H143 Safari/600.1.4'
+      window.navigator.__defineGetter__('userAgent', () => chromeUserAgent);
+      expect(getBrowser()).to.equal(browserTypes.CHROME);
+    })
+    it('user agent browser is firefox', () => {
+      const firefoxUserAgent = 'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:40.0) Gecko/20100101 Firefox/40.0.2 Waterfox/40.0.2'
+      window.navigator.__defineGetter__('userAgent', () => firefoxUserAgent);
+      expect(getBrowser()).to.equal(browserTypes.FIREFOX);
+    })
+    it('user agent browser is safari', () => {
+      const safariUserAgent = 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36'
+      window.navigator.__defineGetter__('userAgent', () => safariUserAgent);
+      window.navigator.__defineGetter__('vendor', () => 'Apple Computer, Inc.');
+      expect(getBrowser()).to.equal(browserTypes.SAFARI);
+    })
+    it('user agent browser is internet explorer', () => {
+      const internetexplorerUserAgent = 'Mozilla/5.0 (MSIE 9.0; Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko'
+      window.navigator.__defineGetter__('userAgent', () => internetexplorerUserAgent);
+      expect(getBrowser()).to.equal(browserTypes.INTERNET_EXPLORER);
+    })
+    it('user agent is other', () => {
+      const otherUserAgent = 'Dalvik/2.1.0 (Linux; U; Android 9; ADT-2 Build/PTT5.181126.002)'
+      window.navigator.__defineGetter__('userAgent', () => otherUserAgent);
+      expect(getBrowser()).to.equal(browserTypes.OTHER);
+    })
+  })
+
+  describe('test getOS', () => {
+    it('user agent is android', () => {
+      const androidUserAgent = 'Mozilla/5.0 (Android; Mobile; rv:40.0) Gecko/40.0 Firefox/40.0'
+      window.navigator.__defineGetter__('userAgent', () => androidUserAgent);
+      expect(getOS()).to.equal(osTypes.ANDROID);
+    })
+    it('user agent is ios', () => {
+      const iosUserAgent = 'Mozilla/5.0 (iPad; CPU OS 8_4_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12H321 Safari/600.1.4'
+      window.navigator.__defineGetter__('userAgent', () => iosUserAgent);
+      expect(getOS()).to.equal(osTypes.IOS);
+    })
+    it('user agent is windows', () => {
+      const windowsUserAgent = 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.154 Safari/537.36'
+      window.navigator.__defineGetter__('userAgent', () => windowsUserAgent);
+      expect(getOS()).to.equal(osTypes.WINDOWS);
+    })
+    it('user agent is mac', () => {
+      const macUserAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:33.0) Gecko/20100101 Firefox/33.0'
+      window.navigator.__defineGetter__('userAgent', () => macUserAgent);
+      expect(getOS()).to.equal(osTypes.MAC);
+    })
+    it('user agent is linux', () => {
+      const linuxUserAgent = 'Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Firefox/31.0'
+      window.navigator.__defineGetter__('userAgent', () => linuxUserAgent);
+      expect(getOS()).to.equal(osTypes.LINUX);
+    })
+    it('user agent is unix', () => {
+      const unixUserAgent = 'Mozilla/5.0 (X11; CrOS armv7l 7077.134.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.156 Safari/537.36'
+      const unixappVersion = '5.0 (X11; CrOS armv7l 7077.134.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.156 Safari/537.36'
+      window.navigator.__defineGetter__('userAgent', () => unixUserAgent);
+      window.navigator.__defineGetter__('appVersion', () => unixappVersion);
+      expect(getOS()).to.equal(osTypes.UNIX);
+    })
+    it('user agent is other', () => {
+      const otherUserAgent = 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
+      window.navigator.__defineGetter__('userAgent', () => otherUserAgent);
+      window.navigator.__defineGetter__('appVersion', () => '');
+      expect(getOS()).to.equal(osTypes.OTHER);
+    })
+  })
+})
diff --git a/test/spec/libraries/vastTrackers_spec.js b/test/spec/libraries/vastTrackers_spec.js
new file mode 100644
index 00000000000..3e8a8456e9c
--- /dev/null
+++ b/test/spec/libraries/vastTrackers_spec.js
@@ -0,0 +1,88 @@
+import {
+  addImpUrlToTrackers,
+  addTrackersToResponse,
+  getVastTrackers,
+  insertVastTrackers,
+  registerVastTrackers,
+  reset, responseHook,
+  disable
+} from 'libraries/vastTrackers/vastTrackers.js';
+import {MODULE_TYPE_ANALYTICS} from '../../../src/activities/modules.js';
+import {AuctionIndex} from '../../../src/auctionIndex.js';
+
+describe('vast trackers', () => {
+  let sandbox, tracker, auction, bid, bidRequest, index;
+  beforeEach(() => {
+    bid = {
+      requestId: 'bid',
+      cpm: 1.0,
+      auctionId: 'aid',
+      mediaType: 'video',
+    }
+    bidRequest = {
+      auctionId: 'aid',
+      bidId: 'bid',
+    }
+    auction = {
+      getAuctionId() {
+        return 'aid';
+      },
+      getProperties() {
+        return {auction: 'props'};
+      },
+      getBidRequests() {
+        return [{bids: [bidRequest]}]
+      }
+    };
+    sandbox = sinon.sandbox.create();
+    index = new AuctionIndex(() => [auction]);
+    tracker = sinon.stub().callsFake(function (bidResponse) {
+      return [
+        {'event': 'impressions', 'url': `https://vasttracking.mydomain.com/vast?cpm=${bidResponse.cpm}`}
+      ];
+    });
+    registerVastTrackers(MODULE_TYPE_ANALYTICS, 'test', tracker);
+  })
+  afterEach(() => {
+    reset();
+    sandbox.restore();
+  });
+
+  after(disable);
+
+  it('insert into tracker list', function () {
+    const trackers = getVastTrackers(bid, {index});
+    expect(trackers).to.be.a('map');
+    expect(trackers.get('impressions')).to.exists;
+    expect(trackers.get('impressions').has('https://vasttracking.mydomain.com/vast?cpm=1')).to.be.true;
+  });
+
+  it('insert trackers in vastXml', function () {
+    const trackers = getVastTrackers(bid, {index});
+    let vastXml = '';
+    vastXml = insertVastTrackers(trackers, vastXml);
+    expect(vastXml).to.equal('');
+  });
+
+  it('should pass request and auction properties to trackerFn', () => {
+    const bid = {requestId: 'bid', auctionId: 'aid'};
+    getVastTrackers(bid, {index});
+    sinon.assert.calledWith(tracker, bid, sinon.match({auction: auction.getProperties(), bidRequest}))
+  })
+
+  it('test addImpUrlToTrackers', function () {
+    const trackers = addImpUrlToTrackers({'vastImpUrl': 'imptracker.com'}, getVastTrackers(bid, {index}));
+    expect(trackers).to.be.a('map');
+    expect(trackers.get('impressions')).to.exists;
+    expect(trackers.get('impressions').has('imptracker.com')).to.be.true;
+  });
+
+  if (FEATURES.VIDEO) {
+    it('should add trackers to bid response', () => {
+      responseHook({index})(sinon.stub(), 'au', bid);
+      expect(bid.vastImpUrl).to.eql([
+        'https://vasttracking.mydomain.com/vast?cpm=1'
+      ])
+    });
+  }
+})
diff --git a/test/spec/libraries/weakStore_spec.js b/test/spec/libraries/weakStore_spec.js
new file mode 100644
index 00000000000..407b83391ef
--- /dev/null
+++ b/test/spec/libraries/weakStore_spec.js
@@ -0,0 +1,32 @@
+import {weakStore} from '../../../libraries/weakStore/weakStore.js';
+
+describe('weakStore', () => {
+  let targets, store;
+  beforeEach(() => {
+    targets = {
+      id: {}
+    };
+    store = weakStore((id) => targets[id]);
+  });
+
+  it('returns undef if getter returns undef', () => {
+    expect(store('missing')).to.not.exist;
+  });
+
+  it('inits to empty object by default', () => {
+    expect(store('id')).to.eql({});
+  });
+
+  it('inits to given value', () => {
+    expect(store('id', {initial: 'value'})).to.eql({'initial': 'value'});
+  });
+
+  it('returns the same object as long as the target does not change', () => {
+    expect(store('id')).to.equal(store('id'));
+  });
+
+  it('ignores init value if already initialized', () => {
+    store('id', {initial: 'value'});
+    expect(store('id', {second: 'value'})).to.eql({initial: 'value'});
+  })
+});
diff --git a/test/spec/modules/1plusXRtdProvider_spec.js b/test/spec/modules/1plusXRtdProvider_spec.js
index 4e4092ea26e..1059f43fb4d 100644
--- a/test/spec/modules/1plusXRtdProvider_spec.js
+++ b/test/spec/modules/1plusXRtdProvider_spec.js
@@ -12,6 +12,7 @@ import {
   updateBidderConfig,
 } from 'modules/1plusXRtdProvider';
 import {deepClone} from '../../../src/utils.js';
+import { STORAGE_TYPE_COOKIES, STORAGE_TYPE_LOCALSTORAGE } from 'src/storageManager.js';
 
 describe('1plusXRtdProvider', () => {
   // Fake server config
@@ -126,6 +127,7 @@ describe('1plusXRtdProvider', () => {
     const customerId = 'test';
     const timeout = 1000;
     const bidders = ['appnexus'];
+    const fpidStorageType = STORAGE_TYPE_LOCALSTORAGE
 
     it('Throws an error if no customerId is specified', () => {
       const moduleConfig = { params: { timeout, bidders } };
@@ -141,13 +143,14 @@ describe('1plusXRtdProvider', () => {
       expect(() => extractConfig(moduleConfig, reqBidsConfigEmpty)).to.throw();
     })
     it('Returns an object containing the parameters specified', () => {
-      const moduleConfig = { params: { customerId, timeout, bidders } };
-      const expectedKeys = ['customerId', 'timeout', 'bidders']
+      const moduleConfig = { params: { customerId, timeout, bidders, fpidStorageType } };
+      const expectedKeys = ['customerId', 'timeout', 'bidders', 'fpidStorageType']
       const extractedConfig = extractConfig(moduleConfig, reqBidsConfigObj);
       expect(extractedConfig).to.be.an('object').and.to.have.all.keys(expectedKeys);
       expect(extractedConfig.customerId).to.equal(customerId);
       expect(extractedConfig.timeout).to.equal(timeout);
       expect(extractedConfig.bidders).to.deep.equal(bidders);
+      expect(extractedConfig.fpidStorageType).to.equal(fpidStorageType)
     })
     /* 1plusX RTD module may only use bidders that are both specified in :
         - the bid request configuration
@@ -166,6 +169,20 @@ describe('1plusXRtdProvider', () => {
       const moduleConfig = { params: { customerId, timeout, bidders } };
       expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
     })
+    it('Throws an error if wrong fpidStorageType is provided', () => {
+      const moduleConfig = { params: { customerId, timeout, bidders, fpidStorageType: 'bogus' } };
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj).to.throw())
+    })
+    it('Defaults fpidStorageType to localStorage', () => {
+      const moduleConfig = { params: { customerId, timeout, bidders } };
+      const extractedConfig = extractConfig(moduleConfig, reqBidsConfigObj);
+      expect(extractedConfig.fpidStorageType).to.equal(STORAGE_TYPE_LOCALSTORAGE)
+    })
+    it('Correctly instantiates fpidStorageType to cookie store if instructed', () => {
+      const moduleConfig = { params: { customerId, timeout, bidders, fpidStorageType: STORAGE_TYPE_COOKIES } };
+      const extractedConfig = extractConfig(moduleConfig, reqBidsConfigObj);
+      expect(extractedConfig.fpidStorageType).to.equal(STORAGE_TYPE_COOKIES)
+    })
   })
 
   describe('buildOrtb2Updates', () => {
@@ -284,17 +301,6 @@ describe('1plusXRtdProvider', () => {
     })
   })
 
-  describe('extractFpid', () => {
-    it('correctly extracts an ope fpid if present', () => {
-      window.localStorage.setItem('ope_fpid', 'oneplusx_test_key')
-      const id1 = extractFpid()
-      window.localStorage.removeItem('ope_fpid')
-      const id2 = extractFpid()
-      expect(id1).to.equal('oneplusx_test_key')
-      expect(id2).to.equal(null)
-    })
-  })
-
   describe('getPapiUrl', () => {
     const customer = 'acme'
     const consent = {
diff --git a/test/spec/modules/33acrossAnalyticsAdapter_spec.js b/test/spec/modules/33acrossAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..5089f12a461
--- /dev/null
+++ b/test/spec/modules/33acrossAnalyticsAdapter_spec.js
@@ -0,0 +1,1162 @@
+// @ts-nocheck
+import analyticsAdapter from 'modules/33acrossAnalyticsAdapter.js';
+import { log } from 'modules/33acrossAnalyticsAdapter.js';
+import * as mockGpt from 'test/spec/integration/faker/googletag.js';
+import * as events from 'src/events.js';
+import * as faker from 'faker';
+import { EVENTS } from 'src/constants.js';
+import { gdprDataHandler, gppDataHandler, uspDataHandler } from '../../../src/adapterManager';
+import { DEFAULT_ENDPOINT, POST_GAM_TIMEOUT, locals } from '../../../modules/33acrossAnalyticsAdapter';
+
+describe('33acrossAnalyticsAdapter:', function () {
+  let sandbox;
+  let assert = getLocalAssert();
+
+  beforeEach(function () {
+    mockGpt.reset();
+
+    sandbox = sinon.createSandbox({
+      useFakeTimers: {
+        now: new Date(2023, 3, 3, 0, 1, 33, 425),
+      },
+    });
+
+    sandbox.stub(events, 'getEvents').returns([]);
+
+    sandbox.spy(log, 'info');
+    sandbox.spy(log, 'warn');
+    sandbox.spy(log, 'error');
+
+    sandbox.stub(navigator, 'sendBeacon').callsFake(function (url, data) {
+      const json = JSON.parse(data);
+      assert.isValidAnalyticsReport(json);
+
+      return true;
+    });
+  });
+
+  afterEach(function () {
+    analyticsAdapter.disableAnalytics();
+    mockGpt.enable();
+    sandbox.restore();
+  });
+
+  describe('enableAnalytics:', function () {
+    context('When pid is given', function () {
+      context('but endpoint is not', function () {
+        it('uses the default endpoint', function () {
+          analyticsAdapter.enableAnalytics({
+            options: {
+              pid: 'test-pid',
+            },
+          });
+
+          assert.equal(analyticsAdapter.getUrl(), DEFAULT_ENDPOINT);
+        });
+      });
+
+      context('but the endpoint is invalid', function () {
+        it('logs an info message', function () {
+          analyticsAdapter.enableAnalytics({
+            options: {
+              pid: 'test-pid',
+              endpoint: 'foo'
+            },
+          });
+
+          assert.calledWithExactly(log.info, 'Invalid endpoint provided for "options.endpoint". Using default endpoint.');
+        });
+      });
+    });
+
+    context('When endpoint is given', function () {
+      context('but pid is not', function () {
+        it('logs an error message', function () {
+          analyticsAdapter.enableAnalytics({
+            options: {
+              endpoint: faker.internet.url()
+            },
+          });
+
+          assert.calledWithExactly(log.error, 'No partnerId provided for "options.pid". No analytics will be sent.');
+        });
+      });
+    });
+
+    context('When pid and endpoint are given', function () {
+      context('and an invalid timeout config value is given', function () {
+        it('logs an info message', function () {
+          [null, 'foo', -1].forEach(timeout => {
+            analyticsAdapter.enableAnalytics({
+              options: {
+                pid: 'test-pid',
+                endpoint: 'http://test-endpoint',
+                timeout
+              },
+            });
+            analyticsAdapter.disableAnalytics();
+
+            assert.calledWithExactly(log.info, 'Invalid timeout provided for "options.timeout". Using default timeout of 10000ms.');
+            log.info.resetHistory();
+          });
+        });
+      });
+    });
+  });
+
+  // check that upcoming tests are derived from a valid report
+  describe('Report Mocks', function () {
+    it('the report should have the correct format', function () {
+      assert.isValidAnalyticsReport(createReportWithThreeBidWonEvents());
+    });
+  });
+
+  describe('Event Handling', function () {
+    beforeEach(function () {
+      this.defaultTimeout = 10000;
+      this.enableAnalytics = (options) => {
+        analyticsAdapter.enableAnalytics({
+          options: {
+            endpoint: 'http://test-endpoint',
+            pid: 'test-pid',
+            timeout: this.defaultTimeout,
+            ...options
+          },
+        });
+        window.googletag.cmd.forEach(cmd => cmd());
+      }
+    });
+
+    context('when an auction is complete', function () {
+      context('and the AnalyticsReport is sent successfully to the given endpoint', function () {
+        it('calls "sendBeacon" with all won bids', function () {
+          const endpoint = faker.internet.url();
+          this.enableAnalytics({ endpoint });
+
+          navigator.sendBeacon
+            .withArgs(endpoint, JSON.stringify(createReportWithThreeBidWonEvents()));
+
+          performStandardAuction();
+          sandbox.clock.tick(this.defaultTimeout + 1000);
+
+          const [url, jsonString] = navigator.sendBeacon.firstCall.args;
+          const { auctions } = JSON.parse(jsonString);
+
+          assert.lengthOf(mapToBids(auctions).filter(bid => bid.hasWon), 3);
+        });
+
+        it('calls "sendBeacon" with the correct report string', function () {
+          const endpoint = faker.internet.url();
+          this.enableAnalytics({ endpoint });
+
+          navigator.sendBeacon
+            .withArgs(endpoint, JSON.stringify(createReportWithThreeBidWonEvents()));
+
+          performStandardAuction();
+          sandbox.clock.tick(this.defaultTimeout + 1000);
+
+          assert.calledOnceWithStringJsonEquivalent(navigator.sendBeacon, endpoint, createReportWithThreeBidWonEvents());
+        });
+
+        it('logs an info message containing the report', function () {
+          const endpoint = faker.internet.url();
+          this.enableAnalytics({ endpoint });
+
+          navigator.sendBeacon
+            .withArgs(endpoint, JSON.stringify(createReportWithThreeBidWonEvents()))
+            .returns(true);
+
+          performStandardAuction();
+          sandbox.clock.tick(this.defaultTimeout + 1000);
+
+          assert.calledWithExactly(log.info, `Analytics report sent to ${endpoint}`, createReportWithThreeBidWonEvents());
+        });
+
+        it('calls "sendBeacon" as soon as all values are available (before timeout)', function () {
+          const endpoint = faker.internet.url();
+          this.enableAnalytics({ endpoint });
+
+          navigator.sendBeacon
+            .withArgs(endpoint, JSON.stringify(createReportWithThreeBidWonEvents()));
+
+          performStandardAuction();
+          sandbox.clock.tick(1);
+
+          assert.calledOnceWithStringJsonEquivalent(navigator.sendBeacon, endpoint, createReportWithThreeBidWonEvents());
+        });
+      });
+
+      context('and a valid US Privacy configuration is present', function () {
+        ['1YNY', '1---', '1NY-', '1Y--', '1--Y', '1N--', '1--N', '1NNN'].forEach(consent => {
+          it(`calls "sendBeacon" with a report containing the "${consent}" privacy string`, function () {
+            sandbox.stub(uspDataHandler, 'getConsentData').returns(consent);
+            this.enableAnalytics();
+
+            const reportWithConsent = {
+              ...createReportWithThreeBidWonEvents(),
+              usPrivacy: consent
+            };
+            navigator.sendBeacon
+              .withArgs('http://test-endpoint', reportWithConsent);
+
+            performStandardAuction();
+            sandbox.clock.tick(this.defaultTimeout + 1000);
+
+            assert.calledOnceWithStringJsonEquivalent(navigator.sendBeacon, 'http://test-endpoint', reportWithConsent);
+          });
+        });
+      });
+
+      context('and a GDPR Privacy configuration is present', function () {
+        it('it calls "sendBeacon" with a report containing the GDPR consent string', function () {
+          sandbox.stub(gdprDataHandler, 'getConsentData').returns({
+            consentString: 'foo',
+            gdprApplies: true
+          });
+          this.enableAnalytics();
+
+          const reportWithConsent = {
+            ...createReportWithThreeBidWonEvents(),
+            gdpr: 1,
+            gdprConsent: 'foo'
+          };
+          navigator.sendBeacon
+            .withArgs('http://test-endpoint', reportWithConsent);
+
+          performStandardAuction();
+          sandbox.clock.tick(this.defaultTimeout + 1);
+
+          assert.calledOnceWithStringJsonEquivalent(navigator.sendBeacon, 'http://test-endpoint', reportWithConsent);
+        });
+      });
+    });
+
+    context('when an auction is complete and a GPP configuration is present', function () {
+      it('it calls "sendBeacon" with a report containing the GPP consent string', function () {
+        sandbox.stub(gppDataHandler, 'getConsentData').returns({
+          gppString: 'gppString',
+          applicableSections: [7]
+        });
+        this.enableAnalytics();
+
+        const reportWithConsent = {
+          ...createReportWithThreeBidWonEvents(),
+          gpp: 'gppString',
+          gppSid: [7]
+        };
+        navigator.sendBeacon
+          .withArgs('http://test-endpoint', reportWithConsent);
+
+        performStandardAuction();
+        sandbox.clock.tick(this.defaultTimeout + 1);
+
+        assert.calledOnceWithStringJsonEquivalent(navigator.sendBeacon, 'http://test-endpoint', reportWithConsent);
+      });
+    });
+
+    context('when an error occurs while sending the AnalyticsReport', function () {
+      it('logs an error', function () {
+        this.enableAnalytics();
+        navigator.sendBeacon.returns(false);
+
+        performStandardAuction();
+        sandbox.clock.tick(this.defaultTimeout + 1000);
+
+        assert.calledWithExactly(log.error, 'Analytics report exceeded User-Agent data limits and was not sent.', createReportWithThreeBidWonEvents());
+      });
+    });
+
+    context('when an auction report was already sent', function () {
+      context('and a new bid won event is returned after the report completes', function () {
+        it('finishes the auction without error', function () {
+          const incompleteAnalyticsReport = createReportWithThreeBidWonEvents();
+          incompleteAnalyticsReport.auctions.forEach(auction => {
+            auction.adUnits.forEach(adUnit => {
+              adUnit.bids.forEach(bid => {
+                delete bid.bidResponse;
+                bid.hasWon = 0;
+                bid.status = 'pending';
+              });
+            });
+          });
+
+          this.enableAnalytics();
+          const { prebid: [auction] } = getMockEvents();
+
+          events.emit(EVENTS.AUCTION_INIT, auction.AUCTION_INIT);
+          for (let bidRequestedEvent of auction.BID_REQUESTED) {
+            events.emit(EVENTS.BID_REQUESTED, bidRequestedEvent);
+          };
+
+          sandbox.clock.tick(this.defaultTimeout + 1000);
+
+          for (let bidResponseEvent of auction.BID_RESPONSE) {
+            events.emit(EVENTS.BID_RESPONSE, bidResponseEvent);
+          };
+          for (let bidWonEvent of auction.BID_WON) {
+            events.emit(EVENTS.BID_WON, bidWonEvent);
+          };
+
+          events.emit(EVENTS.AUCTION_END, auction.AUCTION_END);
+
+          sandbox.clock.tick(1);
+
+          assert.calledOnceWithStringJsonEquivalent(navigator.sendBeacon, 'http://test-endpoint', incompleteAnalyticsReport);
+        });
+      });
+
+      context('and another auction completes after that', function () {
+        it('sends the new report', function () {
+          const endpoint = faker.internet.url();
+          this.enableAnalytics({ endpoint });
+
+          navigator.sendBeacon
+            .withArgs(endpoint, JSON.stringify(createReportWithThreeBidWonEvents()));
+
+          performStandardAuction();
+          sandbox.clock.tick(this.defaultTimeout + 1000);
+
+          performStandardAuction();
+          sandbox.clock.tick(this.defaultTimeout + 1000);
+
+          assert.calledTwice(navigator.sendBeacon);
+        });
+      });
+    });
+
+    context('when two auctions overlap', function() {
+      it('sends a report for each auction', function () {
+        const endpoint = faker.internet.url();
+        this.enableAnalytics({ endpoint });
+
+        navigator.sendBeacon
+          .withArgs(endpoint, JSON.stringify(createReportWithThreeBidWonEvents()));
+
+        performStandardAuction();
+        performStandardAuction();
+        sandbox.clock.tick(this.defaultTimeout + 1000);
+
+        assert.calledTwice(navigator.sendBeacon);
+      });
+    });
+
+    context('when an AUCTION_END event is received before BID_WON events', function () {
+      it('sends a report with the bids that have won after all bids are won', function () {
+        const endpoint = faker.internet.url();
+        this.enableAnalytics({ endpoint });
+
+        navigator.sendBeacon
+          .withArgs(endpoint, JSON.stringify(createReportWithThreeBidWonEvents()));
+
+        const { prebid: [auction] } = getMockEvents();
+
+        performStandardAuction({ exclude: [EVENTS.BID_WON] });
+
+        assert.notCalled(navigator.sendBeacon);
+        for (let bidWon of auction.BID_WON) {
+          events.emit(EVENTS.BID_WON, bidWon);
+        }
+        assert.calledOnceWithStringJsonEquivalent(navigator.sendBeacon, endpoint, createReportWithThreeBidWonEvents());
+      });
+    });
+
+    context('when a BID_WON event is received', function () {
+      context('and there is no record of that bid being requested', function () {
+        it('logs a warning message', function () {
+          this.enableAnalytics();
+
+          const mockEvents = getMockEvents();
+          const { prebid } = mockEvents;
+          const [auction] = prebid;
+
+          events.emit(EVENTS.AUCTION_INIT, auction.AUCTION_INIT);
+
+          const fakeBidWonEvent = Object.assign(auction.BID_WON[0], {
+            transactionId: 'foo'
+          })
+
+          events.emit(EVENTS.BID_WON, fakeBidWonEvent);
+
+          const { auctionId, requestId } = fakeBidWonEvent;
+          assert.calledWithExactly(log.error, `Cannot find bid "${requestId}" in auction "${auctionId}".`);
+        });
+      });
+    });
+
+    context('when a BID_REJECTED event is received', function () {
+      it(`marks the rejected bid as "rejected"`, function () {
+        this.enableAnalytics();
+
+        const auction = getMockEvents().prebid[0];
+
+        // Start the auction
+        events.emit(EVENTS.AUCTION_INIT, auction.AUCTION_INIT);
+        for (let bidRequestedEvent of auction.BID_REQUESTED) {
+          events.emit(EVENTS.BID_REQUESTED, bidRequestedEvent);
+        };
+
+        // Reject first bid
+        const bidToReject = auction.BID_REQUESTED[0].bids[0];
+        events.emit(EVENTS.BID_REJECTED, auction.BID_REJECTED[0]);
+
+        // Accept remaining bids
+        for (let i = 1; i < auction.BID_RESPONSE.length; ++i) {
+          events.emit(EVENTS.BID_RESPONSE, auction.BID_RESPONSE[i]);
+        };
+
+        // Complete the auction
+        events.emit(EVENTS.AUCTION_END, auction.AUCTION_END);
+
+        sandbox.clock.tick(this.defaultTimeout + 1);
+
+        // Verify that we detected that the first bid was rejected
+        const expectedRejectedBid = JSON.parse(navigator.sendBeacon.firstCall.args[1]).auctions[0].adUnits[0].bids[0];
+        assert.strictEqual(expectedRejectedBid.status, 'rejected');
+      });
+    });
+
+    context('when a transaction does not reach its complete state', function () {
+      context('and a timeout config value has been given', function () {
+        context('and the timeout value has elapsed', function () {
+          it('logs a warning', function () {
+            const timeout = 2000;
+            this.enableAnalytics({ timeout });
+
+            performStandardAuction({exclude: ['bidWon', 'slotRenderEnded', 'auctionEnd']});
+
+            sandbox.clock.tick(timeout + 1000);
+
+            assert.calledWithExactly(log.warn, 'Timed out waiting for ad transactions to complete. Sending report.');
+          });
+
+          it(`marks timed out bids as "timeout"`, function () {
+            const timeout = 2000;
+            this.enableAnalytics({ timeout });
+            const request = getMockEvents().prebid[0].BID_REQUESTED[0];
+            const bidToTimeout = request.bids[0];
+
+            performStandardAuction({exclude: ['bidWon', 'slotRenderEnded', 'auctionEnd']});
+            sandbox.clock.tick(1);
+            events.emit(EVENTS.BID_TIMEOUT, [{
+              auctionId: request.auctionId,
+              bidId: bidToTimeout.bidId,
+              transactionId: bidToTimeout.transactionId,
+            }]);
+            sandbox.clock.tick(timeout + 1000);
+
+            const timeoutBid = JSON.parse(navigator.sendBeacon.firstCall.args[1]).auctions[0].adUnits[0].bids[0];
+            assert.strictEqual(timeoutBid.status, 'timeout');
+          });
+        });
+      });
+
+      context('and a timeout config value has not been given', function () {
+        context('and the default timeout has elapsed', function () {
+          it('logs an error', function () {
+            this.enableAnalytics();
+
+            performStandardAuction({exclude: ['bidWon', 'slotRenderEnded', 'auctionEnd']});
+
+            sandbox.clock.tick(this.defaultTimeout + 1000);
+
+            assert.calledWithExactly(log.warn, 'Timed out waiting for ad transactions to complete. Sending report.');
+          });
+        })
+      });
+
+      context('and the `slotRenderEnded` event fired for all bids, but not all bids have won', function () {
+        context('and the GAM slot IDs are configured as the ad unit codes', function () {
+          it('sends a report after the all `slotRenderEnded` events have fired and timed out', function () {
+            const timeout = POST_GAM_TIMEOUT + 2000;
+            this.enableAnalytics({ timeout });
+
+            performStandardAuction({exclude: ['bidWon', 'auctionEnd']});
+            sandbox.clock.tick(POST_GAM_TIMEOUT + 1);
+
+            assert.strictEqual(navigator.sendBeacon.callCount, 1);
+          });
+        });
+
+        context('and the slot element IDs are configured as the ad unit codes', function () {
+          it('sends a report after the all `slotRenderEnded` events have fired and timed out', function () {
+            const timeout = POST_GAM_TIMEOUT + 2000;
+            this.enableAnalytics({ timeout });
+
+            performStandardAuction({exclude: ['bidWon', 'auctionEnd'], useSlotElementIds: true});
+            sandbox.clock.tick(POST_GAM_TIMEOUT + 1);
+
+            assert.strictEqual(navigator.sendBeacon.callCount, 1);
+          });
+        });
+
+        it('does NOT send a report if not all `slotRenderEnded` events have timed out', function () {
+          const timeout = POST_GAM_TIMEOUT + 2000;
+          this.enableAnalytics({ timeout });
+
+          performStandardAuction({exclude: ['bidWon', 'auctionEnd']});
+          sandbox.clock.tick(POST_GAM_TIMEOUT - 1);
+
+          assert.strictEqual(navigator.sendBeacon.callCount, 0);
+        });
+      });
+
+      context('and the `slotRenderEnded` event has fired for an unknown slot code', function () {
+        it('logs a warning message', function () {
+          this.enableAnalytics();
+
+          const { prebid: [auction], gam } = getMockEvents();
+          auction.AUCTION_INIT.adUnits[0].code = 'INVALID_AD_UNIT_CODE';
+
+          const slotRenderEnded = gam.slotRenderEnded[0];
+          events.emit(EVENTS.AUCTION_INIT, auction.AUCTION_INIT);
+          events.emit(EVENTS.BID_REQUESTED, auction.BID_REQUESTED[0]);
+          mockGpt.emitEvent('slotRenderEnded', slotRenderEnded);
+
+          sandbox.clock.tick(POST_GAM_TIMEOUT + 1);
+
+          assert.calledWithExactly(log.warn,
+            'Could not find configured ad unit matching GAM render of slot:',
+            { slotName: `${adUnitCodes[0]} - ${adSlotElementIds[0]}` });
+        });
+      });
+
+      context('and the incomplete report has been sent successfully', function () {
+        it('sends a report string with any bids with rendered status set to hasWon: 1', function () {
+          navigator.sendBeacon.returns(true);
+
+          this.enableAnalytics();
+
+          performStandardAuction({exclude: ['auctionEnd']});
+          sandbox.clock.tick(this.defaultTimeout + 1000);
+
+          const incompleteSentBid = JSON.parse(navigator.sendBeacon.firstCall.args[1]).auctions[0].adUnits[1].bids[0];
+          assert.strictEqual(incompleteSentBid.hasWon, 1);
+        });
+
+        it('reports bids with only targetingSet status as hasWon: 0', function () {
+          navigator.sendBeacon.returns(true);
+
+          this.enableAnalytics();
+
+          performStandardAuction({exclude: ['bidWon', 'auctionEnd']});
+          sandbox.clock.tick(this.defaultTimeout + 1000);
+
+          const incompleteSentBid = JSON.parse(navigator.sendBeacon.firstCall.args[1]).auctions[0].adUnits[1].bids[0];
+          assert.strictEqual(incompleteSentBid.hasWon, 0);
+        });
+
+        it('logs an info message', function () {
+          navigator.sendBeacon.returns(true);
+
+          const endpoint = faker.internet.url();
+          this.enableAnalytics({ endpoint });
+
+          performStandardAuction({exclude: ['bidWon', 'auctionEnd']});
+          sandbox.clock.tick(this.defaultTimeout + 1000);
+
+          assert.calledWith(log.info, `Analytics report sent to ${endpoint}`);
+        });
+      });
+    });
+
+    context('when the transaction manager has open transactions', function () {
+      it('reports those transactions as pending', function () {
+        this.enableAnalytics();
+
+        const { prebid: [auction] } = getMockEvents();
+        events.emit(EVENTS.AUCTION_INIT, auction.AUCTION_INIT);
+        events.emit(EVENTS.BID_REQUESTED, auction.BID_REQUESTED[0]);
+
+        const manager = locals.transactionManagers[auction.AUCTION_INIT.auctionId];
+        assert.equal(manager.status().pending.length, auction.BID_REQUESTED[0].bids.length);
+      });
+
+      context('and a single bidWon event has triggered', function () {
+        it('completes the transaction', function () {
+          this.enableAnalytics();
+
+          const { prebid: [auction] } = getMockEvents();
+          events.emit(EVENTS.AUCTION_INIT, auction.AUCTION_INIT);
+          events.emit(EVENTS.BID_REQUESTED, auction.BID_REQUESTED[0]);
+          events.emit(EVENTS.BID_WON, auction.BID_WON[0]);
+
+          const manager = locals.transactionManagers[auction.AUCTION_INIT.auctionId];
+          assert.deepEqual({
+            completed: manager.status().completed.length,
+            pending: manager.status().pending.length
+          }, {
+            completed: 1,
+            pending: auction.BID_REQUESTED[0].bids.length - 1
+          });
+        });
+      });
+
+      context('and a single slotRenderEnded event has triggered', function () {
+        context('and the Google Ad Manager timeout has not elapsed', function () {
+          it('does NOT complete the transaction', function () {
+            this.enableAnalytics();
+
+            const { prebid: [auction], gam } = getMockEvents();
+            const slotRenderEnded = gam.slotRenderEnded[0];
+            events.emit(EVENTS.AUCTION_INIT, auction.AUCTION_INIT);
+            events.emit(EVENTS.BID_REQUESTED, auction.BID_REQUESTED[0]);
+            mockGpt.emitEvent('slotRenderEnded', slotRenderEnded);
+
+            const manager = locals.transactionManagers[auction.AUCTION_INIT.auctionId];
+            assert.deepEqual({
+              completed: manager.status().completed.length,
+              pending: manager.status().pending.length
+            }, {
+              completed: 0,
+              pending: auction.BID_REQUESTED[0].bids.length
+            });
+          });
+        });
+
+        context('and the Google Ad Manager timeout has elapsed', function () {
+          it('completes the transaction', function () {
+            const timeout = POST_GAM_TIMEOUT + 2000;
+            this.enableAnalytics({timeout});
+
+            const { prebid: [auction], gam } = getMockEvents();
+            const slotRenderEnded = gam.slotRenderEnded[0];
+            events.emit(EVENTS.AUCTION_INIT, auction.AUCTION_INIT);
+            events.emit(EVENTS.BID_REQUESTED, auction.BID_REQUESTED[0]);
+            mockGpt.emitEvent('slotRenderEnded', slotRenderEnded);
+
+            sandbox.clock.tick(POST_GAM_TIMEOUT + 1);
+            const manager = locals.transactionManagers[auction.AUCTION_INIT.auctionId];
+            assert.deepEqual({
+              completed: manager.status().completed.length,
+              pending: manager.status().pending.length
+            }, {
+              completed: 1,
+              pending: auction.BID_REQUESTED[0].bids.length - 1
+            });
+          });
+        });
+      });
+    });
+  });
+});
+
+const adUnitCodes = ['/19968336/header-bid-tag-0', '/19968336/header-bid-tag-1', '/17118521/header-bid-tag-2'];
+const adSlotElementIds = ['ad-slot-div-0', 'ad-slot-div-1', 'ad-slot-div-2'];
+
+function performStandardAuction({ exclude = [], useSlotElementIds = false } = {}) {
+  const mockEvents = getMockEvents();
+  const { prebid, gam } = mockEvents;
+  const [auction] = prebid;
+
+  if (!exclude.includes(EVENTS.AUCTION_INIT)) {
+    if (useSlotElementIds) {
+      // With this option, identify the ad units by slot element IDs instead of GAM paths
+      auction.AUCTION_INIT.adUnits.forEach((adUnit, i) => {
+        adUnit.code = adSlotElementIds[i];
+      });
+    }
+    events.emit(EVENTS.AUCTION_INIT, auction.AUCTION_INIT);
+  }
+
+  if (!exclude.includes(EVENTS.BID_REQUESTED)) {
+    for (let bidRequestedEvent of auction.BID_REQUESTED) {
+      events.emit(EVENTS.BID_REQUESTED, bidRequestedEvent);
+    };
+  }
+
+  if (!exclude.includes(EVENTS.BID_RESPONSE)) {
+    for (let bidResponseEvent of auction.BID_RESPONSE) {
+      events.emit(EVENTS.BID_RESPONSE, bidResponseEvent);
+    };
+  }
+
+  if (!exclude.includes(EVENTS.AUCTION_END)) {
+    events.emit(EVENTS.AUCTION_END, auction.AUCTION_END);
+  }
+
+  if (!exclude.includes('slotRenderEnded')) {
+    for (let gEvent of gam.slotRenderEnded) {
+      mockGpt.emitEvent('slotRenderEnded', gEvent);
+    }
+  }
+
+  if (!exclude.includes(EVENTS.BID_WON)) {
+    for (let bidWonEvent of auction.BID_WON) {
+      events.emit(EVENTS.BID_WON, bidWonEvent);
+    };
+  }
+}
+
+function mapToBids(auctions) {
+  return auctions.flatMap(
+    auction => auction.adUnits.flatMap(
+      au => au.bids
+    )
+  );
+}
+
+function getLocalAssert() {
+  function isValidAnalyticsReport(report) {
+    assert.containsAllKeys(report, ['analyticsVersion', 'pid', 'src', 'pbjsVersion', 'auctions']);
+    if ('usPrivacy' in report) {
+      assert.match(report.usPrivacy, /[0|1][Y|N|-]{3}/);
+    }
+    if ('gdpr' in report) {
+      assert.oneOf(report.gdpr, [0, 1]);
+    }
+    if (report.gdpr === 1) {
+      assert.isString(report.gdprConsent);
+    }
+    if ('gpp' in report) {
+      assert.isString(report.gpp);
+      assert.isArray(report.gppSid);
+    }
+    if ('coppa' in report) {
+      assert.oneOf(report.coppa, [0, 1]);
+    }
+
+    assert.equal(report.analyticsVersion, '1.0.0');
+    assert.isString(report.pid);
+    assert.isString(report.src);
+    assert.equal(report.pbjsVersion, '$prebid.version$');
+    assert.isArray(report.auctions);
+    assert.isAbove(report.auctions.length, 0);
+    report.auctions.forEach(isValidAuction);
+  }
+  function isValidAuction(auction) {
+    assert.hasAllKeys(auction, ['adUnits', 'auctionId', 'userIds']);
+    assert.isArray(auction.adUnits);
+    assert.isString(auction.auctionId);
+    assert.isArray(auction.userIds);
+    auction.adUnits.forEach(isValidAdUnit);
+  }
+  function isValidAdUnit(adUnit) {
+    assert.hasAllKeys(adUnit, ['transactionId', 'adUnitCode', 'slotId', 'mediaTypes', 'sizes', 'bids']);
+    assert.isString(adUnit.transactionId);
+    assert.isString(adUnit.adUnitCode);
+    assert.isString(adUnit.slotId);
+    assert.isArray(adUnit.mediaTypes);
+    assert.isArray(adUnit.sizes);
+    assert.isArray(adUnit.bids);
+    adUnit.mediaTypes.forEach(isValidMediaType);
+    adUnit.sizes.forEach(isValidSizeString);
+    adUnit.bids.forEach(isValidBid);
+  }
+  function isValidBid(bid) {
+    assert.containsAllKeys(bid, ['bidder', 'bidId', 'source', 'status', 'hasWon']);
+    if ('bidResponse' in bid) {
+      isValidBidResponse(bid.bidResponse);
+    }
+    assert.isString(bid.bidder);
+    assert.isString(bid.bidId);
+    assert.isString(bid.source);
+    assert.oneOf(bid.status, ['pending', 'timeout', 'targetingSet', 'rendered', 'success', 'rejected', 'no-bid', 'error']);
+    assert.oneOf(bid.hasWon, [0, 1]);
+  }
+  function isValidBidResponse(bidResponse) {
+    assert.containsAllKeys(bidResponse, ['mediaType', 'size', 'cur', 'cpm', 'cpmFloor']);
+    if ('cpmOrig' in bidResponse) {
+      assert.isNumber(bidResponse.cpmOrig);
+    }
+    isValidMediaType(bidResponse.mediaType);
+    isValidSizeString(bidResponse.size);
+    assert.isString(bidResponse.cur);
+    assert.isNumber(bidResponse.cpm);
+    assert.isNumber(bidResponse.cpmFloor);
+  }
+  function isValidMediaType(mediaType) {
+    assert.oneOf(mediaType, ['banner', 'video', 'native']);
+  }
+  function isValidSizeString(size) {
+    assert.match(size, /[0-9]+x[0-9]+/);
+  }
+
+  function calledOnceWithStringJsonEquivalent(sinonSpy, ...args) {
+    sinon.assert.calledOnce(sinonSpy);
+    args.forEach((arg, i) => {
+      const stubCallArgs = sinonSpy.firstCall.args[i]
+
+      if (typeof arg === 'object') {
+        assert.deepEqual(JSON.parse(stubCallArgs), arg);
+      } else {
+        assert.strictEqual(stubCallArgs, arg);
+      }
+    });
+  }
+
+  sinon.assert.expose(assert, { prefix: '' });
+  return {
+    ...assert,
+    calledOnceWithStringJsonEquivalent,
+    isValidAnalyticsReport,
+    isValidAuction,
+    isValidAdUnit,
+    isValidBid,
+    isValidBidResponse,
+    isValidMediaType,
+    isValidSizeString,
+  }
+};
+
+function createReportWithThreeBidWonEvents() {
+  return {
+    pid: 'test-pid',
+    src: 'pbjs',
+    analyticsVersion: '1.0.0',
+    pbjsVersion: '$prebid.version$',
+    auctions: [{
+      adUnits: [{
+        transactionId: 'ef947609-7b55-4420-8407-599760d0e373',
+        adUnitCode: adUnitCodes[0],
+        slotId: adUnitCodes[0],
+        mediaTypes: ['banner'],
+        sizes: ['300x250', '300x600'],
+        bids: [{
+          bidder: 'bidder0',
+          bidId: '20661fc5fbb5d9b',
+          source: 'client',
+          status: 'rendered',
+          bidResponse: {
+            cpm: 1.5,
+            cur: 'USD',
+            cpmOrig: 1.5,
+            cpmFloor: 1,
+            mediaType: 'banner',
+            size: '300x250'
+          },
+          hasWon: 1
+        }]
+      }, {
+        transactionId: 'abab4423-d962-41aa-adc7-0681f686c330',
+        adUnitCode: adUnitCodes[1],
+        slotId: adUnitCodes[1],
+        mediaTypes: ['banner'],
+        sizes: ['728x90', '970x250'],
+        bids: [{
+          bidder: 'bidder0',
+          bidId: '21ad295f40dd7ab',
+          source: 'client',
+          status: 'rendered',
+          bidResponse: {
+            cpm: 1.5,
+            cur: 'USD',
+            cpmOrig: 1.5,
+            cpmFloor: 1,
+            mediaType: 'banner',
+            size: '728x90'
+          },
+          hasWon: 1
+        }]
+      }, {
+        transactionId: 'b43e7487-0a52-4689-a0f7-d139d08b1f9f',
+        adUnitCode: adUnitCodes[2],
+        slotId: adUnitCodes[2],
+        mediaTypes: ['banner'],
+        sizes: ['300x250'],
+        bids: [{
+          bidder: 'bidder0',
+          bidId: '22108ac7b778717',
+          source: 'client',
+          status: 'rendered',
+          bidResponse: {
+            cpm: 1.5,
+            cur: 'USD',
+            cpmOrig: 1.5,
+            cpmFloor: 1,
+            mediaType: 'banner',
+            size: '728x90'
+          },
+          hasWon: 1
+        }]
+      }],
+      auctionId: 'auction-000',
+      userIds: ['33acrossId']
+    }],
+  };
+}
+
+function getMockEvents() {
+  const auctionId = 'auction-000';
+  const userId = {
+    '33acrossId': {
+      envelope: 'v1.0014',
+    },
+  };
+
+  return {
+    gam: {
+      slotRenderEnded: [
+        {
+          serviceName: 'publisher_ads',
+          slot: mockGpt.makeSlot({ code: adUnitCodes[0], divId: adSlotElementIds[0] }),
+          isEmpty: true,
+          slotContentChanged: true,
+          size: null,
+          advertiserId: null,
+          campaignId: null,
+          creativeId: null,
+          creativeTemplateId: null,
+          labelIds: null,
+          lineItemId: null,
+          isBackfill: false,
+        },
+        {
+          serviceName: 'publisher_ads',
+          slot: mockGpt.makeSlot({ code: adUnitCodes[1], divId: adSlotElementIds[1] }),
+          isEmpty: false,
+          slotContentChanged: true,
+          size: [1, 1],
+          advertiserId: 12345,
+          campaignId: 400000001,
+          creativeId: 6789,
+          creativeTemplateId: null,
+          labelIds: null,
+          lineItemId: 1011,
+          isBackfill: false,
+          yieldGroupIds: null,
+          companyIds: null,
+        },
+        {
+          serviceName: 'publisher_ads',
+          slot: mockGpt.makeSlot({ code: adUnitCodes[2], divId: adSlotElementIds[2] }),
+          isEmpty: false,
+          slotContentChanged: true,
+          size: [728, 90],
+          advertiserId: 12346,
+          campaignId: 299999000,
+          creativeId: 6790,
+          creativeTemplateId: null,
+          labelIds: null,
+          lineItemId: 1012,
+          isBackfill: false,
+          yieldGroupIds: null,
+          companyIds: null,
+        },
+      ],
+    },
+    prebid: [{
+      AUCTION_INIT: {
+        auctionId,
+        adUnits: [
+          {
+            code: adUnitCodes[0],
+            mediaTypes: {
+              banner: {
+                sizes: [
+                  [300, 250],
+                  [300, 600],
+                ],
+              },
+            },
+            bids: [
+              {
+                bidder: 'bidder0',
+                userId,
+              },
+            ],
+            sizes: [
+              [300, 250],
+              [300, 600],
+            ],
+            transactionId: 'ef947609-7b55-4420-8407-599760d0e373',
+            ortb2Imp: {
+              ext: {
+                gpid: adUnitCodes[0],
+              },
+            },
+          },
+          {
+            code: adUnitCodes[1],
+            mediaTypes: {
+              banner: {
+                sizes: [
+                  [728, 90],
+                  [970, 250],
+                ],
+              },
+            },
+            bids: [
+              {
+                bidder: 'bidder0',
+                userId,
+              },
+            ],
+            sizes: [
+              [728, 90],
+              [970, 250],
+            ],
+            transactionId: 'abab4423-d962-41aa-adc7-0681f686c330',
+            ortb2Imp: {
+              ext: {
+                gpid: adUnitCodes[1],
+              },
+            },
+          },
+          {
+            code: adUnitCodes[2],
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250]],
+              },
+            },
+            bids: [
+              {
+                bidder: '33across',
+                userId,
+              },
+              {
+                bidder: 'bidder0',
+                userId,
+              },
+            ],
+            sizes: [[300, 250]],
+            transactionId: 'b43e7487-0a52-4689-a0f7-d139d08b1f9f',
+            ortb2Imp: {
+              ext: {
+                gpid: adUnitCodes[2],
+              },
+            },
+          },
+        ],
+        bidderRequests: [
+          {
+            bids: [
+              { userId },
+            ],
+          }
+        ],
+      },
+      BID_REQUESTED: [
+        {
+          auctionId,
+          bids: [
+            {
+              bidder: 'bidder0',
+              transactionId: 'ef947609-7b55-4420-8407-599760d0e373',
+              bidId: '20661fc5fbb5d9b',
+              src: 'client',
+            },
+            {
+              bidder: 'bidder0',
+              transactionId: 'abab4423-d962-41aa-adc7-0681f686c330',
+              bidId: '21ad295f40dd7ab',
+              src: 'client',
+            },
+            {
+              bidder: 'bidder0',
+              transactionId: 'b43e7487-0a52-4689-a0f7-d139d08b1f9f',
+              bidId: '22108ac7b778717',
+              src: 'client',
+            },
+          ],
+        }],
+      BID_RESPONSE: [{
+        auctionId,
+        cpm: 1.5,
+        currency: 'USD',
+        floorData: {
+          floorValue: 1
+        },
+        mediaType: 'banner',
+        originalCpm: 1.5,
+        requestId: '20661fc5fbb5d9b',
+        size: '300x250',
+        source: 'client',
+        status: 'targetingSet'
+      },
+      {
+        auctionId,
+        cpm: 1.5,
+        currency: 'USD',
+        floorData: {
+          floorValue: 1
+        },
+        mediaType: 'banner',
+        originalCpm: 1.5,
+        requestId: '21ad295f40dd7ab',
+        size: '728x90',
+        source: 'client',
+        status: 'targetingSet',
+      },
+      {
+        auctionId,
+        cpm: 1.5,
+        currency: 'USD',
+        floorData: {
+          floorValue: 1
+        },
+        mediaType: 'banner',
+        originalCpm: 1.5,
+        requestId: '22108ac7b778717',
+        size: '728x90',
+        source: 'client',
+        status: 'targetingSet',
+      }],
+      BID_WON: [{
+        auctionId,
+        cpm: 1.5,
+        currency: 'USD',
+        floorData: {
+          floorValue: 1
+        },
+        mediaType: 'banner',
+        originalCpm: 1.5,
+        requestId: '20661fc5fbb5d9b',
+        size: '300x250',
+        source: 'client',
+        status: 'rendered',
+        transactionId: 'ef947609-7b55-4420-8407-599760d0e373',
+      },
+      {
+        auctionId,
+        cpm: 1.5,
+        currency: 'USD',
+        floorData: {
+          floorValue: 1
+        },
+        mediaType: 'banner',
+        originalCpm: 1.5,
+        requestId: '21ad295f40dd7ab',
+        size: '728x90',
+        source: 'client',
+        status: 'rendered',
+        transactionId: 'abab4423-d962-41aa-adc7-0681f686c330',
+      },
+      {
+        auctionId,
+        cpm: 1.5,
+        currency: 'USD',
+        floorData: {
+          floorValue: 1
+        },
+        mediaType: 'banner',
+        originalCpm: 1.5,
+        requestId: '22108ac7b778717',
+        size: '728x90',
+        source: 'client',
+        status: 'rendered',
+        transactionId: 'b43e7487-0a52-4689-a0f7-d139d08b1f9f',
+      }],
+      BID_REJECTED: [{
+        auctionId,
+        cpm: 1.5,
+        currency: 'USD',
+        floorData: {
+          floorValue: 2
+        },
+        mediaType: 'banner',
+        originalCpm: 1.5,
+        requestId: '20661fc5fbb5d9b',
+        width: 300,
+        height: 250,
+        source: 'client',
+        transactionId: 'ef947609-7b55-4420-8407-599760d0e373',
+        statusMessage: 'Bid available',
+        rejectionReason: 'Bid does not meet price floor',
+      }],
+      AUCTION_END: {
+        auctionId,
+      },
+    }],
+  };
+}
diff --git a/test/spec/modules/33acrossBidAdapter_spec.js b/test/spec/modules/33acrossBidAdapter_spec.js
index 9cc038428bc..ff05f412d58 100644
--- a/test/spec/modules/33acrossBidAdapter_spec.js
+++ b/test/spec/modules/33acrossBidAdapter_spec.js
@@ -121,7 +121,7 @@ describe('33acrossBidAdapter:', function () {
           video: {
             w: 300,
             h: 250,
-            placement: 2,
+            plcmt: 2,
             ...params
           }
         });
@@ -527,27 +527,6 @@ describe('33acrossBidAdapter:', function () {
         });
       });
 
-      it('returns false for invalid bidder name values', function() {
-        const invalidBidderName = [
-          undefined,
-          '33',
-          '33x',
-          'thirtythree',
-          ''
-        ];
-
-        invalidBidderName.forEach((bidderName) => {
-          const bid = {
-            bidder: bidderName,
-            params: {
-              siteId: 'sample33xGUID123456789'
-            }
-          };
-
-          expect(spec.isBidRequestValid(bid)).to.be.false;
-        });
-      });
-
       it('returns true for valid guid values', function() {
         // NOTE: We ignore whitespace at the start and end since
         // in our experience these are common typos
@@ -733,6 +712,11 @@ describe('33acrossBidAdapter:', function () {
           'foo'
         ];
 
+        invalidPlacement.forEach((placement) => {
+          this.bid.mediaTypes.video.plcmt = placement;
+          expect(spec.isBidRequestValid(this.bid)).to.be.false;
+        });
+
         invalidPlacement.forEach((placement) => {
           this.bid.mediaTypes.video.placement = placement;
           expect(spec.isBidRequestValid(this.bid)).to.be.false;
@@ -1520,89 +1504,141 @@ describe('33acrossBidAdapter:', function () {
       });
     });
 
-    context('when mediaType has video only and context is instream', function() {
-      it('builds instream request with default params', function() {
-        const bidRequests = (
-          new BidRequestsBuilder()
-            .withVideo({context: 'instream'})
-            .build()
-        );
+    context('when mediaType has video only', function() {
+      context('and context is instream', function() {
+        it('builds instream request with default params', function() {
+          const bidRequests = (
+            new BidRequestsBuilder()
+              .withVideo({context: 'instream'})
+              .build()
+          );
 
-        const ttxRequest = new TtxRequestBuilder()
-          .withVideo()
-          .withProduct('instream')
-          .build();
+          const ttxRequest = new TtxRequestBuilder()
+            .withVideo()
+            .withProduct('instream')
+            .build();
 
-        ttxRequest.imp[0].video.placement = 1;
-        ttxRequest.imp[0].video.startdelay = 0;
+          ttxRequest.imp[0].video.startdelay = 0;
 
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
-          .build();
-        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+          const serverRequest = new ServerRequestBuilder()
+            .withData(ttxRequest)
+            .build();
+          const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        validateBuiltServerRequest(builtServerRequest, serverRequest);
-      });
+          validateBuiltServerRequest(builtServerRequest, serverRequest);
+        });
 
-      it('builds instream request with params passed', function() {
-        const bidRequests = (
-          new BidRequestsBuilder()
-            .withVideo({context: 'instream', startdelay: -2})
-            .build()
-        );
+        it('builds instream request with params passed', function() {
+          const bidRequests = (
+            new BidRequestsBuilder()
+              .withVideo({context: 'instream', startdelay: -2})
+              .build()
+          );
 
-        const ttxRequest = new TtxRequestBuilder()
-          .withVideo({startdelay: -2, placement: 1})
-          .withProduct('instream')
-          .build();
+          const ttxRequest = new TtxRequestBuilder()
+            .withVideo({startdelay: -2})
+            .withProduct('instream')
+            .build();
 
-        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+          const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+          expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+        });
+
+        context('when the placement is still specified in the DEPRECATED `placement` field', function() {
+          it('does not overwrite its value and does not set it in the recent `plcmt` field as well', function() {
+            const bidRequests = (
+              new BidRequestsBuilder()
+                .withVideo({
+                  placement: 2, // Incorrect placement for an instream video
+                  context: 'instream'
+                })
+                .build()
+            );
+
+            const ttxRequest = new TtxRequestBuilder()
+              .withVideo()
+              .withProduct('instream')
+              .build();
+
+            ttxRequest.imp[0].video.placement = 2;
+            ttxRequest.imp[0].video.startdelay = 0;
+
+            const serverRequest = new ServerRequestBuilder()
+              .withData(ttxRequest)
+              .build();
+            const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+            expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+          });
+        });
       });
-    });
 
-    context('when mediaType has video only and context is outstream', function() {
-      it('builds siab request with video only with default params', function() {
-        const bidRequests = (
-          new BidRequestsBuilder()
-            .withVideo({context: 'outstream'})
-            .build()
-        );
+      context('and context is outstream', function() {
+        it('builds siab request with video only with default params', function() {
+          const bidRequests = (
+            new BidRequestsBuilder()
+              .withVideo({context: 'outstream'})
+              .build()
+          );
 
-        const ttxRequest = new TtxRequestBuilder()
-          .withVideo()
-          .withProduct('siab')
-          .build();
+          const ttxRequest = new TtxRequestBuilder()
+            .withVideo()
+            .withProduct('siab')
+            .build();
 
-        ttxRequest.imp[0].video.placement = 2;
+          // No placement specified, final value should default to 2.
+          ttxRequest.imp[0].video.plcmt = 2;
 
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
-          .build();
-        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+          const serverRequest = new ServerRequestBuilder()
+            .withData(ttxRequest)
+            .build();
+          const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        validateBuiltServerRequest(builtServerRequest, serverRequest);
-      });
+          validateBuiltServerRequest(builtServerRequest, serverRequest);
+        });
 
-      it('builds siab request with video params passed', function() {
-        const bidRequests = (
-          new BidRequestsBuilder()
-            .withVideo({context: 'outstream', placement: 3, playbackmethod: [2]})
-            .build()
-        );
+        it('builds siab request with video params passed', function() {
+          const bidRequests = (
+            new BidRequestsBuilder()
+              .withVideo({context: 'outstream', plcmt: 3, playbackmethod: [2]})
+              .build()
+          );
 
-        const ttxRequest = new TtxRequestBuilder()
-          .withVideo({placement: 3, playbackmethod: [2]})
-          .withProduct('siab')
-          .build();
+          const ttxRequest = new TtxRequestBuilder()
+            .withVideo({plcmt: 3, playbackmethod: [2]})
+            .withProduct('siab')
+            .build();
 
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
-          .build();
-        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+          const serverRequest = new ServerRequestBuilder()
+            .withData(ttxRequest)
+            .build();
+          const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        validateBuiltServerRequest(builtServerRequest, serverRequest);
+          validateBuiltServerRequest(builtServerRequest, serverRequest);
+        });
+
+        context('and the placement is specified in the DEPRECATED `placement` field', function() {
+          it('sets the recent `plcmt` field', function() {
+            const bidRequests = (
+              new BidRequestsBuilder()
+                .withVideo({context: 'outstream', placement: 3, playbackmethod: [2]})
+                .build()
+            );
+
+            const ttxRequest = new TtxRequestBuilder()
+              .withVideo({plcmt: 3, placement: 3, playbackmethod: [2]})
+              .withProduct('siab')
+              .build();
+
+            const serverRequest = new ServerRequestBuilder()
+              .withData(ttxRequest)
+              .build();
+            const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+            validateBuiltServerRequest(builtServerRequest, serverRequest);
+          });
+        });
       });
     });
 
@@ -1686,7 +1722,7 @@ describe('33acrossBidAdapter:', function () {
           .withProduct('siab')
           .build();
 
-        ttxRequest.imp[0].video.placement = 2;
+        ttxRequest.imp[0].video.plcmt = 2;
 
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
diff --git a/test/spec/modules/33acrossIdSystem_spec.js b/test/spec/modules/33acrossIdSystem_spec.js
index 4f6d7c4a6c5..6ec3554d353 100644
--- a/test/spec/modules/33acrossIdSystem_spec.js
+++ b/test/spec/modules/33acrossIdSystem_spec.js
@@ -1,8 +1,11 @@
-import { thirthyThreeAcrossIdSubmodule } from 'modules/33acrossIdSystem.js';
+import { thirthyThreeAcrossIdSubmodule, storage, domainUtils } from 'modules/33acrossIdSystem.js';
 import * as utils from 'src/utils.js';
 
 import { server } from 'test/mocks/xhr.js';
 import { uspDataHandler, coppaDataHandler, gppDataHandler } from 'src/adapterManager.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
+import {attachIdSystem} from '../../../modules/userId/index.js';
 
 describe('33acrossIdSystem', () => {
   describe('name', () => {
@@ -50,60 +53,575 @@ describe('33acrossIdSystem', () => {
       expect(completeCallback.calledOnceWithExactly('foo')).to.be.true;
     });
 
-    context('when GDPR applies', () => {
-      it('should call endpoint with \'gdpr=1\'', () => {
+    const additionalOptions = {
+      'by an option': { storeFpid: true, storeTpid: true },
+      'by default': { } // No storeFpid, default value should be true
+    };
+
+    Object.entries(additionalOptions).forEach(([caseTitle, opts]) => {
+      context(`if the use of a first-party ID has been enabled ${caseTitle}`, () => {
+        context('and the response includes a first-party ID', () => {
+          context('and the enabled storage types include "cookie"', () => {
+            it('should store the provided first-party ID in a cookie', () => {
+              const completeCallback = () => {};
+
+              const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+                params: {
+                  pid: '12345',
+                  ...opts
+                },
+                enabledStorageTypes: [ 'cookie' ],
+                storage: { expires: 30 }
+              });
+
+              callback(completeCallback);
+
+              const [request] = server.requests;
+
+              const setCookie = sinon.stub(storage, 'setCookie');
+              sinon.stub(domainUtils, 'domainOverride').returns('foo.com');
+
+              request.respond(200, {
+                'Content-Type': 'application/json'
+              }, JSON.stringify({
+                succeeded: true,
+                data: {
+                  envelope: 'foo',
+                  fp: 'bar'
+                },
+                expires: 1645667805067
+              }));
+
+              expect(setCookie.calledWithExactly('33acrossIdFp', 'bar', sinon.match.string, 'Lax', 'foo.com')).to.be.true;
+
+              setCookie.restore();
+              domainUtils.domainOverride.restore();
+            });
+          });
+
+          context('and the enabled storage types include "html5"', () => {
+            it('should store the provided first-party ID in local storage', () => {
+              const completeCallback = () => {};
+
+              const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+                params: {
+                  pid: '12345',
+                  ...opts
+                },
+                enabledStorageTypes: [ 'html5' ],
+                storage: {}
+              });
+
+              callback(completeCallback);
+
+              const [request] = server.requests;
+
+              const setDataInLocalStorage = sinon.stub(storage, 'setDataInLocalStorage');
+
+              request.respond(200, {
+                'Content-Type': 'application/json'
+              }, JSON.stringify({
+                succeeded: true,
+                data: {
+                  envelope: 'foo',
+                  fp: 'bar'
+                },
+                expires: 1645667805067
+              }));
+
+              expect(setDataInLocalStorage.calledWithExactly('33acrossIdFp', 'bar')).to.be.true;
+
+              setDataInLocalStorage.restore();
+            });
+          });
+
+          context('and the enabled storage types are "cookie" and "html5"', () => {
+            it('should store the provided first-party ID in each storage type', () => {
+              const completeCallback = () => {};
+
+              const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+                params: {
+                  pid: '12345',
+                  ...opts
+                },
+                enabledStorageTypes: [ 'cookie', 'html5' ],
+                storage: {}
+              });
+
+              callback(completeCallback);
+
+              const [request] = server.requests;
+
+              const setCookie = sinon.stub(storage, 'setCookie');
+              sinon.stub(domainUtils, 'domainOverride').returns('foo.com');
+              const setDataInLocalStorage = sinon.stub(storage, 'setDataInLocalStorage');
+
+              request.respond(200, {
+                'Content-Type': 'application/json'
+              }, JSON.stringify({
+                succeeded: true,
+                data: {
+                  envelope: 'foo',
+                  fp: 'bar'
+                },
+                expires: 1645667805067
+              }));
+
+              expect(setCookie.calledWithExactly('33acrossIdFp', 'bar', sinon.match.string, 'Lax', 'foo.com')).to.be.true;
+              expect(setDataInLocalStorage.calledWithExactly('33acrossIdFp', 'bar')).to.be.true;
+
+              setCookie.restore();
+              domainUtils.domainOverride.restore();
+              setDataInLocalStorage.restore();
+            });
+          });
+        });
+
+        context('and the response lacks a first-party ID', () => {
+          it('should wipe any existing first-party ID from storage', () => {
+            const completeCallback = () => {};
+
+            const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+              params: {
+                pid: '12345',
+                ...opts
+              },
+              enabledStorageTypes: [ 'html5' ],
+              storage: {}
+            });
+
+            callback(completeCallback);
+
+            const [request] = server.requests;
+
+            const removeDataFromLocalStorage = sinon.stub(storage, 'removeDataFromLocalStorage');
+            const setCookie = sinon.stub(storage, 'setCookie');
+            sinon.stub(domainUtils, 'domainOverride').returns('foo.com');
+
+            request.respond(200, {
+              'Content-Type': 'application/json'
+            }, JSON.stringify({
+              succeeded: true,
+              data: {
+                envelope: 'foo' // no 'fp' field
+              },
+              expires: 1645667805067
+            }));
+
+            expect(removeDataFromLocalStorage.calledWithExactly('33acrossIdFp')).to.be.true;
+            expect(setCookie.calledWithExactly('33acrossIdFp', '', sinon.match.string, 'Lax', 'foo.com')).to.be.true;
+
+            removeDataFromLocalStorage.restore();
+            setCookie.restore();
+            domainUtils.domainOverride.restore();
+          });
+        });
+      });
+
+      context(`if the use of a supplemental third-party ID has been enabled ${caseTitle}`, () => {
+        context('and the response includes a third-party ID', () => {
+          context('and the enabled storage type include "cookie"', () => {
+            it('should store the provided third-party ID in a cookie', () => {
+              const completeCallback = () => {};
+
+              const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+                params: {
+                  pid: '12345',
+                  ...opts
+                },
+                enabledStorageTypes: [ 'cookie' ],
+                storage: { expires: 30 }
+              });
+
+              callback(completeCallback);
+
+              const [request] = server.requests;
+
+              const setCookie = sinon.stub(storage, 'setCookie');
+              sinon.stub(domainUtils, 'domainOverride').returns('foo.com');
+
+              request.respond(200, {
+                'Content-Type': 'application/json'
+              }, JSON.stringify({
+                succeeded: true,
+                data: {
+                  envelope: 'foo',
+                  tp: 'bar'
+                },
+                expires: 1645667805067
+              }));
+
+              expect(setCookie.calledWithExactly('33acrossIdTp', 'bar', sinon.match.string, 'Lax', 'foo.com')).to.be.true;
+
+              setCookie.restore();
+              domainUtils.domainOverride.restore();
+            });
+          });
+
+          context('and the enabled storage types include "html5"', () => {
+            it('should store the provided third-party ID in local storage', () => {
+              const completeCallback = () => {};
+
+              const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+                params: {
+                  pid: '12345',
+                  ...opts
+                },
+                enabledStorageTypes: [ 'html5' ],
+                storage: {}
+              });
+
+              callback(completeCallback);
+
+              const [request] = server.requests;
+
+              const setDataInLocalStorage = sinon.stub(storage, 'setDataInLocalStorage');
+
+              request.respond(200, {
+                'Content-Type': 'application/json'
+              }, JSON.stringify({
+                succeeded: true,
+                data: {
+                  envelope: 'foo',
+                  tp: 'bar'
+                },
+                expires: 1645667805067
+              }));
+
+              expect(setDataInLocalStorage.calledWithExactly('33acrossIdTp', 'bar')).to.be.true;
+
+              setDataInLocalStorage.restore();
+            });
+          });
+
+          context('and the enabled storage types are "cookie" and "html5"', () => {
+            it('should store the provided third-party ID in each storage type', () => {
+              const completeCallback = () => {};
+
+              const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+                params: {
+                  pid: '12345',
+                  ...opts
+                },
+                enabledStorageTypes: [ 'cookie', 'html5' ],
+                storage: {}
+              });
+
+              callback(completeCallback);
+
+              const [request] = server.requests;
+
+              const setCookie = sinon.stub(storage, 'setCookie');
+              sinon.stub(domainUtils, 'domainOverride').returns('foo.com');
+              const setDataInLocalStorage = sinon.stub(storage, 'setDataInLocalStorage');
+
+              request.respond(200, {
+                'Content-Type': 'application/json'
+              }, JSON.stringify({
+                succeeded: true,
+                data: {
+                  envelope: 'foo',
+                  tp: 'bar'
+                },
+                expires: 1645667805067
+              }));
+
+              expect(setCookie.calledWithExactly('33acrossIdTp', 'bar', sinon.match.string, 'Lax', 'foo.com')).to.be.true;
+              expect(setDataInLocalStorage.calledWithExactly('33acrossIdTp', 'bar')).to.be.true;
+
+              setCookie.restore();
+              domainUtils.domainOverride.restore();
+              setDataInLocalStorage.restore();
+            });
+          });
+        });
+
+        context('and the response lacks a third-party ID', () => {
+          it('should wipe any existing third-party ID from storage', () => {
+            const completeCallback = () => {};
+
+            const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+              params: {
+                pid: '12345',
+                ...opts
+              },
+              enabledStorageTypes: [ 'html5' ],
+              storage: {}
+            });
+
+            callback(completeCallback);
+
+            const [request] = server.requests;
+
+            const removeDataFromLocalStorage = sinon.stub(storage, 'removeDataFromLocalStorage');
+            const setCookie = sinon.stub(storage, 'setCookie');
+            sinon.stub(domainUtils, 'domainOverride').returns('foo.com');
+
+            request.respond(200, {
+              'Content-Type': 'application/json'
+            }, JSON.stringify({
+              succeeded: true,
+              data: {
+                envelope: 'foo' // no 'tp' field
+              },
+              expires: 1645667805067
+            }));
+
+            expect(removeDataFromLocalStorage.calledWithExactly('33acrossIdTp')).to.be.true;
+            expect(setCookie.calledWithExactly('33acrossIdTp', '', sinon.match.string, 'Lax', 'foo.com')).to.be.true;
+
+            removeDataFromLocalStorage.restore();
+            setCookie.restore();
+            domainUtils.domainOverride.restore();
+          });
+        });
+      });
+    });
+
+    context('if the use of a first-party ID has been disabled', () => {
+      context('and the response includes a first-party ID', () => {
+        it('should not store the provided first-party ID in a cookie', () => {
+          const completeCallback = () => {};
+
+          const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+            params: {
+              pid: '12345',
+              storeFpid: false
+            },
+            enabledStorageTypes: [ 'cookie' ],
+            storage: {
+              expires: 30
+            }
+          });
+
+          callback(completeCallback);
+
+          const [request] = server.requests;
+
+          const setCookie = sinon.stub(storage, 'setCookie');
+          sinon.stub(domainUtils, 'domainOverride').returns('foo.com');
+
+          request.respond(200, {
+            'Content-Type': 'application/json'
+          }, JSON.stringify({
+            succeeded: true,
+            data: {
+              envelope: 'foo',
+              fp: 'bar'
+            },
+            expires: 1645667805067
+          }));
+
+          expect(setCookie.calledWithExactly('33acrossIdFp', 'bar', sinon.match.string, 'Lax', 'foo.com')).to.be.false;
+
+          setCookie.restore();
+          domainUtils.domainOverride.restore();
+        });
+
+        it('should not store the provided first-party ID in local storage', () => {
+          const completeCallback = () => {};
+
+          const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+            params: {
+              pid: '12345',
+              storeFpid: false
+            },
+            enabledStorageTypes: [ 'html5' ],
+            storage: {}
+          });
+
+          callback(completeCallback);
+
+          const [request] = server.requests;
+
+          const setDataInLocalStorage = sinon.stub(storage, 'setDataInLocalStorage');
+
+          request.respond(200, {
+            'Content-Type': 'application/json'
+          }, JSON.stringify({
+            succeeded: true,
+            data: {
+              envelope: 'foo',
+              fp: 'bar'
+            },
+            expires: 1645667805067
+          }));
+
+          expect(setDataInLocalStorage.calledWithExactly('33acrossIdFp', 'bar')).to.be.false;
+
+          setDataInLocalStorage.restore();
+        });
+      });
+    });
+
+    context('if the use of a supplemental third-party ID has been disabled', () => {
+      context('and the response includes a third-party ID', () => {
+        it('should not store the provided third-party ID in a cookie', () => {
+          const completeCallback = () => {};
+
+          const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+            params: {
+              pid: '12345',
+              storeTpid: false
+            },
+            enabledStorageTypes: [ 'cookie' ],
+            storage: {
+              expires: 30
+            }
+          });
+
+          callback(completeCallback);
+
+          const [request] = server.requests;
+
+          const setCookie = sinon.stub(storage, 'setCookie');
+
+          request.respond(200, {
+            'Content-Type': 'application/json'
+          }, JSON.stringify({
+            succeeded: true,
+            data: {
+              envelope: 'foo',
+              tp: 'bar'
+            },
+            expires: 1645667805067
+          }));
+
+          expect(setCookie.calledWithExactly('33acrossIdTp', 'bar', sinon.match.string, 'Lax')).to.be.false;
+
+          setCookie.restore();
+        });
+
+        it('should not store the provided third-party ID in local storage', () => {
+          const completeCallback = () => {};
+
+          const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+            params: {
+              pid: '12345',
+              storeTpid: false
+            },
+            enabledStorageTypes: [ 'html5' ],
+            storage: {}
+          });
+
+          callback(completeCallback);
+
+          const [request] = server.requests;
+
+          const setDataInLocalStorage = sinon.stub(storage, 'setDataInLocalStorage');
+
+          request.respond(200, {
+            'Content-Type': 'application/json'
+          }, JSON.stringify({
+            succeeded: true,
+            data: {
+              envelope: 'foo',
+              tp: 'bar'
+            },
+            expires: 1645667805067
+          }));
+
+          expect(setDataInLocalStorage.calledWithExactly('33acrossIdTp', 'bar')).to.be.false;
+
+          setDataInLocalStorage.restore();
+        });
+      });
+    });
+
+    context('if the response lacks the 33across "envelope" ID', () => {
+      it('should wipe any existing "envelope" ID from storage', () => {
         const completeCallback = () => {};
+
         const { callback } = thirthyThreeAcrossIdSubmodule.getId({
           params: {
             pid: '12345'
-          }
-        }, {
-          gdprApplies: true
+          },
+          enabledStorageTypes: [ 'html5' ],
+          storage: {}
         });
 
         callback(completeCallback);
 
         const [request] = server.requests;
 
-        expect(request.url).to.contain('gdpr=1');
+        const removeDataFromLocalStorage = sinon.stub(storage, 'removeDataFromLocalStorage');
+        const setCookie = sinon.stub(storage, 'setCookie');
+        sinon.stub(domainUtils, 'domainOverride').returns('foo.com');
+
+        request.respond(200, {
+          'Content-Type': 'application/json'
+        }, JSON.stringify({
+          succeeded: true,
+          data: {
+            envelope: '' // no 'envelope' field
+          },
+          expires: 1645667805067
+        }));
+
+        expect(removeDataFromLocalStorage.calledWith('33acrossId')).to.be.true;
+        expect(setCookie.calledWithExactly('33acrossId', '', sinon.match.string, 'Lax', 'foo.com')).to.be.true;
+
+        removeDataFromLocalStorage.restore();
+        setCookie.restore();
+        domainUtils.domainOverride.restore();
       });
     });
 
-    context('when GDPR doesn\'t apply', () => {
-      it('should call endpoint with \'gdpr=0\'', () => {
-        const completeCallback = () => {};
-        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+    context('when GDPR applies', () => {
+      it('should log a warning and don\'t expect a call to the endpoint', () => {
+        const logWarnSpy = sinon.spy(utils, 'logWarn');
+
+        const result = thirthyThreeAcrossIdSubmodule.getId({
           params: {
             pid: '12345'
           }
         }, {
-          gdprApplies: false
+          gdprApplies: true
         });
 
-        callback(completeCallback);
-
-        const [request] = server.requests;
+        expect(logWarnSpy.calledOnceWithExactly('33acrossId: Submodule cannot be used where GDPR applies')).to.be.true;
+        expect(result).to.be.undefined;
 
-        expect(request.url).to.contain('gdpr=0');
+        logWarnSpy.restore();
       });
     });
 
-    context('when the GDPR consent string is given', () => {
-      it('should call endpoint with the GDPR consent string', () => {
+    context('when GDPR doesn\'t apply', () => {
+      it('should call endpoint with \'gdpr=0\'', () => {
         const completeCallback = () => {};
         const { callback } = thirthyThreeAcrossIdSubmodule.getId({
           params: {
             pid: '12345'
           }
         }, {
-          consentString: 'foo'
+          gdprApplies: false
         });
 
         callback(completeCallback);
 
         const [request] = server.requests;
 
-        expect(request.url).to.contain('gdpr_consent=foo');
+        expect(request.url).to.contain('gdpr=0');
+      });
+
+      context('but the GDPR consent string is given', () => {
+        it('should call endpoint with the GDPR consent string', () => {
+          const completeCallback = () => {};
+          const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+            params: {
+              pid: '12345'
+            }
+          }, {
+            gdprApplies: false,
+            consentString: 'foo'
+          });
+
+          callback(completeCallback);
+
+          const [request] = server.requests;
+
+          expect(request.url).to.contain('gdpr_consent=foo');
+        });
       });
     });
 
@@ -252,6 +770,140 @@ describe('33acrossIdSystem', () => {
       });
     });
 
+    context('when a first-party ID is present in local storage', () => {
+      it('should call endpoint with the encoded first-party ID included', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          },
+          enabledStorageTypes: [ 'html5' ],
+          storage: {}
+        });
+
+        sinon.stub(storage, 'getDataFromLocalStorage')
+          .withArgs('33acrossIdFp')
+          .returns('33acrossIdFpValue+');
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).to.contain('fp=33acrossIdFpValue%2B');
+
+        storage.getDataFromLocalStorage.restore();
+      });
+    });
+
+    context('when a first-party ID is present in cookie storage', () => {
+      it('should call endpoint with the first-party ID included', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          },
+          enabledStorageTypes: [ 'cookie' ],
+          storage: {}
+        });
+
+        sinon.stub(storage, 'getCookie')
+          .withArgs('33acrossIdFp')
+          .returns('33acrossIdFpValue');
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).to.contain('fp=33acrossIdFpValue');
+
+        storage.getCookie.restore();
+      });
+    });
+
+    context('when a first-party ID is not present in storage', () => {
+      it('should not call endpoint with the first-party ID included', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).not.to.contain('fp=');
+      });
+    });
+
+    context('when a third-party ID is present in local storage', () => {
+      it('should call endpoint with the encoded third-party ID included', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          },
+          enabledStorageTypes: [ 'html5' ],
+          storage: {}
+        });
+
+        sinon.stub(storage, 'getDataFromLocalStorage')
+          .withArgs('33acrossIdTp')
+          .returns('33acrossIdTpValue+');
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).to.contain('tp=33acrossIdTpValue%2B');
+
+        storage.getDataFromLocalStorage.restore();
+      });
+    });
+
+    context('when a third-party ID is present in cookie storage', () => {
+      it('should call endpoint with the third-party ID included', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          },
+          enabledStorageTypes: [ 'cookie' ],
+          storage: {}
+        });
+
+        sinon.stub(storage, 'getCookie')
+          .withArgs('33acrossIdTp')
+          .returns('33acrossIdTpValue');
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).to.contain('tp=33acrossIdTpValue');
+
+        storage.getCookie.restore();
+      });
+    });
+
+    context('when a third-party ID is not present in storage', () => {
+      it('should not call endpoint with the third-party ID included', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).not.to.contain('tp=');
+      });
+    });
+
     context('when the partner ID is not given', () => {
       it('should log an error', () => {
         const logErrorSpy = sinon.spy(utils, 'logError');
@@ -508,4 +1160,25 @@ describe('33acrossIdSystem', () => {
       });
     });
   });
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(thirthyThreeAcrossIdSubmodule);
+    })
+    it('33acrossId', function() {
+      const userId = {
+        '33acrossId': {
+          envelope: 'some-random-id-value'
+        }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: '33across.com',
+        uids: [{
+          id: 'some-random-id-value',
+          atype: 1
+        }]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/51DegreesRtdProvider_spec.js b/test/spec/modules/51DegreesRtdProvider_spec.js
new file mode 100644
index 00000000000..7b60a08b906
--- /dev/null
+++ b/test/spec/modules/51DegreesRtdProvider_spec.js
@@ -0,0 +1,485 @@
+import {
+  extractConfig,
+  get51DegreesJSURL,
+  is51DegreesMetaPresent,
+  deepSetNotEmptyValue,
+  convert51DegreesDataToOrtb2,
+  convert51DegreesDeviceToOrtb2,
+  getBidRequestData,
+  fiftyOneDegreesSubmodule,
+} from 'modules/51DegreesRtdProvider';
+import {mergeDeep} from '../../../src/utils';
+
+const inject51DegreesMeta = () => {
+  const meta = document.createElement('meta');
+  meta.httpEquiv = 'Delegate-CH';
+  meta.content = 'sec-ch-ua-full-version-list https://cloud.51degrees.com; sec-ch-ua-model https://cloud.51degrees.com; sec-ch-ua-platform https://cloud.51degrees.com; sec-ch-ua-platform-version https://cloud.51degrees.com';
+  document.head.appendChild(meta);
+};
+
+describe('51DegreesRtdProvider', function() {
+  const fiftyOneDegreesDevice = {
+    screenpixelswidth: 5120,
+    screenpixelsheight: 1440,
+    hardwarevendor: 'Apple',
+    hardwaremodel: 'Macintosh',
+    hardwarename: [
+      'Macintosh',
+    ],
+    platformname: 'macOS',
+    platformversion: '14.1.2',
+    screeninchesheight: 13.27,
+    screenincheswidth: 47.17,
+    devicetype: 'Desktop',
+    pixelratio: 1,
+    deviceid: '17595-131215-132535-18092',
+  };
+
+  const fiftyOneDegreesDeviceX2scaling = {
+    ...fiftyOneDegreesDevice,
+    screenpixelsheight: fiftyOneDegreesDevice.screenpixelsheight / 2,
+    screenpixelswidth: fiftyOneDegreesDevice.screenpixelswidth / 2,
+    screenpixelsphysicalheight: fiftyOneDegreesDevice.screenpixelsheight,
+    screenpixelsphysicalwidth: fiftyOneDegreesDevice.screenpixelswidth,
+    pixelratio: fiftyOneDegreesDevice.pixelratio * 2,
+  };
+
+  const fiftyOneDegreesData = {
+    device: fiftyOneDegreesDevice,
+  };
+
+  const expectedORTB2DeviceResult = {
+    device: {
+      devicetype: 2,
+      make: 'Apple',
+      model: 'Macintosh',
+      os: 'macOS',
+      osv: '14.1.2',
+      h: 1440,
+      w: 5120,
+      ppi: 109,
+      pxratio: 1,
+      ext: {
+        fiftyonedegrees_deviceId: '17595-131215-132535-18092',
+      },
+    },
+  };
+
+  const expectedORTB2Result = {};
+  mergeDeep(
+    expectedORTB2Result,
+    expectedORTB2DeviceResult,
+    // placeholder for the next 51Degrees RTD submodule update
+  );
+
+  describe('extractConfig', function() {
+    it('returns the resourceKey from the moduleConfig', function() {
+      const reqBidsConfigObj = {};
+      const moduleConfig = {params: {resourceKey: 'TEST_RESOURCE_KEY'}};
+      expect(extractConfig(moduleConfig, reqBidsConfigObj)).to.deep.equal({
+        resourceKey: 'TEST_RESOURCE_KEY',
+        onPremiseJSUrl: undefined,
+      });
+    });
+
+    it('returns the onPremiseJSUrl from the moduleConfig', function() {
+      const reqBidsConfigObj = {};
+      const moduleConfig = {params: {onPremiseJSUrl: 'https://example.com/51Degrees.core.js'}};
+      expect(extractConfig(moduleConfig, reqBidsConfigObj)).to.deep.equal({
+        onPremiseJSUrl: 'https://example.com/51Degrees.core.js',
+        resourceKey: undefined,
+      });
+    });
+
+    it('throws an error if neither resourceKey nor onPremiseJSUrl is provided', function() {
+      const reqBidsConfigObj = {};
+      const moduleConfig = {params: {}};
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
+    });
+
+    it('throws an error if both resourceKey and onPremiseJSUrl are provided', function() {
+      const reqBidsConfigObj = {};
+      const moduleConfig = {params: {
+        resourceKey: 'TEST_RESOURCE_KEY',
+        onPremiseJSUrl: 'https://example.com/51Degrees.core.js',
+      }};
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
+    });
+
+    it('throws an error if the resourceKey is equal to "" from example', function() {
+      const reqBidsConfigObj = {};
+      const moduleConfig = {params: {resourceKey: ''}};
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
+    });
+
+    it('sets the resourceKey to undefined if it was set to "0"', function() {
+      const moduleConfig = {params: {
+        resourceKey: '0',
+        onPremiseJSUrl: 'https://example.com/51Degrees.core.js',
+      }};
+      expect(extractConfig(moduleConfig, {})).to.deep.equal({
+        resourceKey: undefined,
+        onPremiseJSUrl: 'https://example.com/51Degrees.core.js',
+      });
+    });
+
+    it('sets the onPremiseJSUrl to undefined if it was set to "0"', function() {
+      const moduleConfig = {params: {
+        resourceKey: 'TEST_RESOURCE_KEY',
+        onPremiseJSUrl: '0',
+      }};
+      expect(extractConfig(moduleConfig, {})).to.deep.equal({
+        resourceKey: 'TEST_RESOURCE_KEY',
+        onPremiseJSUrl: undefined,
+      });
+    });
+
+    it('throws an error if the onPremiseJSUrl is not a valid URL', function() {
+      expect(() => extractConfig({
+        params: {onPremiseJSUrl: 'invalid URL'}
+      }, {})).to.throw();
+      expect(() => extractConfig({
+        params: {onPremiseJSUrl: 'www.example.com/51Degrees.core.js'}
+      }, {})).to.throw();
+    });
+
+    it('allows the onPremiseJSUrl to be a valid URL', function() {
+      const VALID_URLS = [
+        'https://www.example.com/51Degrees.core.js',
+        'http://example.com/51Degrees.core.js',
+        '//example.com/51Degrees.core.js',
+        '/51Degrees.core.js',
+      ];
+
+      VALID_URLS.forEach(url => {
+        expect(() => extractConfig({
+          params: {onPremiseJSUrl: url}
+        }, {})).to.not.throw();
+      });
+    });
+  });
+
+  describe('get51DegreesJSURL', function() {
+    const hev = {
+      'brands': [
+        {
+          'brand': 'Chromium',
+          'version': '130'
+        },
+        {
+          'brand': 'Google Chrome',
+          'version': '130'
+        },
+        {
+          'brand': 'Not?A_Brand',
+          'version': '99'
+        }
+      ],
+      'fullVersionList': [
+        {
+          'brand': 'Chromium',
+          'version': '130.0.6723.92'
+        },
+        {
+          'brand': 'Google Chrome',
+          'version': '130.0.6723.92'
+        },
+        {
+          'brand': 'Not?A_Brand',
+          'version': '99.0.0.0'
+        }
+      ],
+      'mobile': false,
+      'model': '',
+      'platform': 'macOS',
+      'platformVersion': '14.6.1'
+    };
+    const mockWindow = {
+      ...window,
+      screen: {
+        height: 1117,
+        width: 1728,
+      },
+      devicePixelRatio: 2,
+    };
+
+    it('returns the cloud URL if the resourceKey is provided', function() {
+      const config = {resourceKey: 'TEST_RESOURCE_KEY'};
+      expect(get51DegreesJSURL(config, mockWindow)).to.equal(
+        'https://cloud.51degrees.com/api/v4/TEST_RESOURCE_KEY.js?' +
+        `51D_ScreenPixelsHeight=${mockWindow.screen.height}&` +
+        `51D_ScreenPixelsWidth=${mockWindow.screen.width}&` +
+        `51D_PixelRatio=${mockWindow.devicePixelRatio}`
+      );
+    });
+
+    it('returns the on-premise URL if the onPremiseJSUrl is provided', function () {
+      const config = {onPremiseJSUrl: 'https://example.com/51Degrees.core.js'};
+      expect(get51DegreesJSURL(config, mockWindow)).to.equal(
+        `https://example.com/51Degrees.core.js?` +
+        `51D_ScreenPixelsHeight=${mockWindow.screen.height}&` +
+        `51D_ScreenPixelsWidth=${mockWindow.screen.width}&` +
+        `51D_PixelRatio=${mockWindow.devicePixelRatio}`
+      );
+    });
+
+    it('doesn\'t override static query string parameters', function () {
+      const config = {onPremiseJSUrl: 'https://example.com/51Degrees.core.js?test=1'};
+      expect(get51DegreesJSURL(config, mockWindow)).to.equal(
+        `https://example.com/51Degrees.core.js?test=1&` +
+        `51D_ScreenPixelsHeight=${mockWindow.screen.height}&` +
+        `51D_ScreenPixelsWidth=${mockWindow.screen.width}&` +
+        `51D_PixelRatio=${mockWindow.devicePixelRatio}`
+      );
+    });
+
+    it('adds high entropy values to the query string, if available', async function () {
+      const config = {
+        onPremiseJSUrl: 'https://example.com/51Degrees.core.js',
+        hev,
+      };
+      expect(get51DegreesJSURL(config, mockWindow)).to.equal(
+        `https://example.com/51Degrees.core.js?` +
+        `51D_GetHighEntropyValues=${btoa(JSON.stringify(hev))}&` +
+        `51D_ScreenPixelsHeight=${mockWindow.screen.height}&` +
+        `51D_ScreenPixelsWidth=${mockWindow.screen.width}&` +
+        `51D_PixelRatio=${mockWindow.devicePixelRatio}`
+      );
+    });
+
+    it('doesn\'t add high entropy values to the query string if object is empty', function () {
+      const config = {
+        onPremiseJSUrl: 'https://example.com/51Degrees.core.js',
+        hev: {},
+      };
+      expect(get51DegreesJSURL(config, mockWindow)).to.equal(
+        `https://example.com/51Degrees.core.js?` +
+        `51D_ScreenPixelsHeight=${mockWindow.screen.height}&` +
+        `51D_ScreenPixelsWidth=${mockWindow.screen.width}&` +
+        `51D_PixelRatio=${mockWindow.devicePixelRatio}`
+      );
+    });
+
+    it('keeps the original URL if none of the additional parameters are available', function () {
+      // delete screen and devicePixelRatio properties to test the case when they are not available
+      delete mockWindow.screen;
+      delete mockWindow.devicePixelRatio;
+
+      const config = {onPremiseJSUrl: 'https://example.com/51Degrees.core.js'};
+      expect(get51DegreesJSURL(config, mockWindow)).to.equal('https://example.com/51Degrees.core.js');
+      expect(get51DegreesJSURL(config, window)).to.not.equal('https://example.com/51Degrees.core.js');
+    });
+  });
+
+  describe('is51DegreesMetaPresent', function() {
+    let initialHeadInnerHTML;
+
+    before(function() {
+      initialHeadInnerHTML = document.head.innerHTML;
+    });
+
+    afterEach(function() {
+      document.head.innerHTML = initialHeadInnerHTML;
+    });
+
+    it('returns true if the 51Degrees meta tag is present', function () {
+      inject51DegreesMeta();
+      expect(is51DegreesMetaPresent()).to.be.true;
+    });
+
+    it('returns false if the 51Degrees meta tag is not present', function() {
+      expect(is51DegreesMetaPresent()).to.be.false;
+    });
+
+    it('works with multiple meta tags, even if those are not to include any `content`', function() {
+      const meta1 = document.createElement('meta');
+      meta1.httpEquiv = 'Delegate-CH';
+      document.head.appendChild(meta1);
+
+      inject51DegreesMeta();
+
+      const meta2 = document.createElement('meta');
+      meta2.httpEquiv = 'Delegate-CH';
+      document.head.appendChild(meta2);
+
+      expect(is51DegreesMetaPresent()).to.be.true;
+    });
+  });
+
+  describe('deepSetNotEmptyValue', function() {
+    it('sets value of ORTB2 key if it is not empty', function() {
+      const data = {};
+      deepSetNotEmptyValue(data, 'TEST_ORTB2_KEY', 'TEST_ORTB2_VALUE');
+      expect(data).to.deep.equal({TEST_ORTB2_KEY: 'TEST_ORTB2_VALUE'});
+      deepSetNotEmptyValue(data, 'test2.TEST_ORTB2_KEY_2', 'TEST_ORTB2_VALUE_2');
+      expect(data).to.deep.equal({
+        TEST_ORTB2_KEY: 'TEST_ORTB2_VALUE',
+        test2: {
+          TEST_ORTB2_KEY_2: 'TEST_ORTB2_VALUE_2'
+        },
+      });
+    });
+
+    it('throws an error if the key is empty', function() {
+      const data = {};
+      expect(() => deepSetNotEmptyValue(data, '', 'TEST_ORTB2_VALUE')).to.throw();
+    });
+
+    it('does not set value of ORTB2 key if it is empty', function() {
+      const data = {};
+      deepSetNotEmptyValue(data, 'TEST_ORTB2_KEY', '');
+      deepSetNotEmptyValue(data, 'TEST_ORTB2_KEY', 0);
+      deepSetNotEmptyValue(data, 'TEST_ORTB2_KEY', null);
+      deepSetNotEmptyValue(data, 'TEST_ORTB2_KEY', undefined);
+      deepSetNotEmptyValue(data, 'TEST.TEST_ORTB2_KEY', undefined);
+      expect(data).to.deep.equal({});
+    });
+  });
+
+  describe('convert51DegreesDataToOrtb2', function() {
+    it('returns empty object if data is null, undefined or empty', () => {
+      expect(convert51DegreesDataToOrtb2(null)).to.deep.equal({});
+      expect(convert51DegreesDataToOrtb2(undefined)).to.deep.equal({});
+      expect(convert51DegreesDataToOrtb2({})).to.deep.equal({});
+    });
+
+    it('converts all 51Degrees data to ORTB2 format', function() {
+      expect(convert51DegreesDataToOrtb2(fiftyOneDegreesData)).to.deep.equal(expectedORTB2Result);
+    });
+  });
+
+  describe('convert51DegreesDeviceToOrtb2', function() {
+    it('converts 51Degrees device data to ORTB2 format', function() {
+      expect(
+        convert51DegreesDeviceToOrtb2(fiftyOneDegreesDevice)
+      ).to.deep.equal(expectedORTB2DeviceResult);
+    });
+
+    it('returns an empty object if the device data is not provided', function() {
+      expect(convert51DegreesDeviceToOrtb2()).to.deep.equal({});
+    });
+
+    it('does not set the deviceid if it is not provided', function() {
+      const device = {...fiftyOneDegreesDevice};
+      delete device.deviceid;
+      expect(convert51DegreesDeviceToOrtb2(device).device).to.not.have.any.keys('ext');
+    });
+
+    it('sets the model to hardwarename if hardwaremodel is not provided', function() {
+      const device = {...fiftyOneDegreesDevice};
+      delete device.hardwaremodel;
+      expect(convert51DegreesDeviceToOrtb2(device).device).to.deep.include({model: 'Macintosh'});
+    });
+
+    it('does not set the model if hardwarename is empty', function() {
+      const device = {...fiftyOneDegreesDevice};
+      delete device.hardwaremodel;
+      device.hardwarename = [];
+      expect(convert51DegreesDeviceToOrtb2(device).device).to.not.have.any.keys('model');
+    });
+
+    it('does not set the ppi if screeninchesheight is not provided', function() {
+      const device = {...fiftyOneDegreesDevice};
+      delete device.screeninchesheight;
+      expect(convert51DegreesDeviceToOrtb2(device).device).to.not.have.any.keys('ppi');
+    });
+
+    it('sets correct ppi if screenpixelsphysicalheight & screeninchesheight are provided', function() {
+      expect(convert51DegreesDeviceToOrtb2(fiftyOneDegreesDeviceX2scaling).device).to.deep.include({
+        ppi: expectedORTB2DeviceResult.device.ppi,
+      });
+    });
+
+    it('if screenpixelsphysical properties are available, use them for screen size', function() {
+      expect(fiftyOneDegreesDevice.screenpixelswidth).to.not.equal(fiftyOneDegreesDeviceX2scaling.screenpixelswidth);
+      expect(fiftyOneDegreesDevice.screenpixelsheight).to.not.equal(fiftyOneDegreesDeviceX2scaling.screenpixelsheight);
+      expect(fiftyOneDegreesDevice.screenpixelsphysicalwidth).to.equal(undefined);
+      expect(fiftyOneDegreesDevice.screenpixelsphysicalheight).to.equal(undefined);
+      expect(convert51DegreesDeviceToOrtb2(fiftyOneDegreesDeviceX2scaling).device).to.deep.include({
+        h: expectedORTB2DeviceResult.device.h,
+        w: expectedORTB2DeviceResult.device.w,
+      });
+    });
+  });
+
+  describe('getBidRequestData', function() {
+    let initialHeadInnerHTML;
+    let reqBidsConfigObj = {};
+    const resetReqBidsConfigObj = () => {
+      reqBidsConfigObj = {
+        ortb2Fragments: {
+          global: {
+            device: {},
+          },
+        },
+      };
+    };
+
+    before(function() {
+      initialHeadInnerHTML = document.head.innerHTML;
+
+      const mockScript = document.createElement('script');
+      mockScript.innerHTML = `
+      window.fod = {complete: (_callback) => _callback(${JSON.stringify(fiftyOneDegreesData)})};
+      `;
+      document.head.appendChild(mockScript);
+    });
+
+    beforeEach(function() {
+      resetReqBidsConfigObj();
+    });
+
+    after(function() {
+      document.head.innerHTML = initialHeadInnerHTML;
+    });
+
+    it('calls the callback even if submodule fails (wrong config)', function() {
+      const callback = sinon.spy();
+      const moduleConfig = {params: {}};
+      getBidRequestData(reqBidsConfigObj, callback, moduleConfig, {});
+      expect(callback.calledOnce).to.be.true;
+    });
+
+    it('calls the callback even if submodule fails (on-premise, non-working URL)', async function() {
+      const callback = sinon.spy();
+      const moduleConfig = {params: {onPremiseJSUrl: 'http://localhost:12345/test/51Degrees.core.js'}};
+
+      getBidRequestData(reqBidsConfigObj, callback, moduleConfig, {});
+      await new Promise(resolve => setTimeout(resolve, 100));
+      expect(callback.calledOnce).to.be.true;
+    });
+
+    it('calls the callback even if submodule fails (invalid resource key)', async function() {
+      const callback = sinon.spy();
+      const moduleConfig = {params: {resourceKey: 'INVALID_RESOURCE_KEY'}};
+
+      getBidRequestData(reqBidsConfigObj, callback, moduleConfig, {});
+      await new Promise(resolve => setTimeout(resolve, 100));
+      expect(callback.calledOnce).to.be.true;
+    });
+
+    it('works with Delegate-CH meta tag', async function() {
+      inject51DegreesMeta();
+      const callback = sinon.spy();
+      const moduleConfig = {params: {resourceKey: 'INVALID_RESOURCE_KEY'}};
+      getBidRequestData(reqBidsConfigObj, callback, moduleConfig, {});
+      await new Promise(resolve => setTimeout(resolve, 100));
+      expect(callback.calledOnce).to.be.true;
+    });
+
+    it('has the correct ORTB2 data', async function() {
+      const callback = sinon.spy();
+      const moduleConfig = {params: {resourceKey: 'INVALID_RESOURCE_KEY'}};
+      getBidRequestData(reqBidsConfigObj, callback, moduleConfig, {});
+      await new Promise(resolve => setTimeout(resolve, 100));
+      expect(callback.calledOnce).to.be.true;
+      expect(reqBidsConfigObj.ortb2Fragments.global).to.deep.equal(expectedORTB2Result);
+    });
+  });
+
+  describe('init', function() {
+    it('initialises the 51Degrees RTD provider', function() {
+      expect(fiftyOneDegreesSubmodule.init()).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js b/test/spec/modules/AsteriobidPbmAnalyticsAdapter_spec.js
similarity index 96%
rename from test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
rename to test/spec/modules/AsteriobidPbmAnalyticsAdapter_spec.js
index 25834e8574d..57fb5b9a32b 100644
--- a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
+++ b/test/spec/modules/AsteriobidPbmAnalyticsAdapter_spec.js
@@ -1,11 +1,11 @@
-import prebidmanagerAnalytics, {storage} from 'modules/prebidmanagerAnalyticsAdapter.js';
+import prebidmanagerAnalytics, {storage} from 'modules/AsteriobidPbmAnalyticsAdapter.js';
 import {expect} from 'chai';
 import {server} from 'test/mocks/xhr.js';
 import * as utils from 'src/utils.js';
 import {expectEvents} from '../../helpers/analytics.js';
+import { EVENTS } from 'src/constants.js';
 
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('Prebid Manager Analytics Adapter', function () {
   let bidWonEvent = {
@@ -66,7 +66,7 @@ describe('Prebid Manager Analytics Adapter', function () {
         }
       });
 
-      events.emit(constants.EVENTS.BID_WON, bidWonEvent);
+      events.emit(EVENTS.BID_WON, bidWonEvent);
       prebidmanagerAnalytics.flush();
 
       expect(server.requests.length).to.equal(1);
diff --git a/test/spec/modules/BTBidAdapter_spec.js b/test/spec/modules/BTBidAdapter_spec.js
new file mode 100644
index 00000000000..2ec0acc424e
--- /dev/null
+++ b/test/spec/modules/BTBidAdapter_spec.js
@@ -0,0 +1,208 @@
+import { expect } from 'chai';
+import { spec } from 'modules/BTBidAdapter.js';
+import { BANNER } from '../../../src/mediaTypes.js';
+// load modules that register ORTB processors
+import 'src/prebid.js';
+import 'modules/currency.js';
+import 'modules/userId/index.js';
+import 'modules/multibid/index.js';
+import 'modules/priceFloors.js';
+import 'modules/consentManagementTcf.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/consentManagementGpp.js';
+import 'modules/tcfControl.js';
+import 'modules/gppControl_usnat.js';
+import 'modules/schain.js';
+
+describe('BT Bid Adapter', () => {
+  const ENDPOINT_URL = 'https://pbs.btloader.com/openrtb2/auction';
+  const validBidRequests = [
+    {
+      bidId: '2e9f38ea93bb9e',
+      bidder: 'blockthrough',
+      adUnitCode: 'adunit-code',
+      mediaTypes: { [BANNER]: { sizes: [[300, 250]] } },
+      params: {
+        bidderA: {
+          pubId: '11111',
+        },
+      },
+      bidderRequestId: 'test-bidder-request-id',
+    },
+  ];
+  const bidderRequest = {
+    bidderCode: 'blockthrough',
+    bidderRequestId: 'test-bidder-request-id',
+    bids: validBidRequests,
+  };
+
+  describe('isBidRequestValid', function () {
+    it('should validate bid request with valid params', () => {
+      const validBid = {
+        params: {
+          pubmatic: {
+            publisherId: 55555,
+          },
+        },
+        sizes: [[300, 250]],
+        bidId: '123',
+        adUnitCode: 'leaderboard',
+      };
+
+      const isValid = spec.isBidRequestValid(validBid);
+
+      expect(isValid).to.be.true;
+    });
+
+    it('should not validate bid request with invalid params', () => {
+      const invalidBid = {
+        params: {},
+        sizes: [[300, 250]],
+        bidId: '123',
+        adUnitCode: 'leaderboard',
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.be.false;
+    });
+  });
+
+  describe('buildRequests', () => {
+    it('should build post request when ortb2 fields are present', () => {
+      const impExtParams = {
+        bidderA: {
+          pubId: '11111',
+        },
+      };
+
+      const requests = spec.buildRequests(validBidRequests, bidderRequest);
+
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(ENDPOINT_URL);
+      expect(requests[0].data).to.exist;
+      expect(requests[0].data.ext.prebid.channel).to.deep.equal({
+        name: 'pbjs',
+        version: '$prebid.version$',
+      });
+      expect(requests[0].data.imp[0].ext).to.deep.equal(impExtParams);
+    });
+  });
+
+  describe('interpretResponse', () => {
+    it('should return empty array if serverResponse is not defined', () => {
+      const bidRequest = spec.buildRequests(validBidRequests, bidderRequest);
+      const bids = spec.interpretResponse(undefined, bidRequest);
+
+      expect(bids.length).to.equal(0);
+    });
+
+    it('should return bids array when serverResponse is defined and seatbid array is not empty', () => {
+      const bidResponse = {
+        body: {
+          id: 'bid-response',
+          cur: 'USD',
+          seatbid: [
+            {
+              bid: [
+                {
+                  impid: '2e9f38ea93bb9e',
+                  crid: 'creative-id',
+                  cur: 'USD',
+                  price: 2,
+                  w: 300,
+                  h: 250,
+                  mtype: 1,
+                  adomain: ['test.com'],
+                },
+              ],
+              seat: 'test-seat',
+            },
+          ],
+        },
+      };
+
+      const expectedBids = [
+        {
+          btBidderCode: 'test-seat',
+          cpm: 2,
+          creativeId: 'creative-id',
+          creative_id: 'creative-id',
+          currency: 'USD',
+          height: 250,
+          mediaType: 'banner',
+          meta: {
+            advertiserDomains: ['test.com'],
+          },
+          netRevenue: true,
+          requestId: '2e9f38ea93bb9e',
+          ttl: 60,
+          width: 300,
+        },
+      ];
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest)[0];
+      const bids = spec.interpretResponse(bidResponse, request);
+
+      expect(bids).to.deep.equal(expectedBids);
+    });
+  });
+
+  describe('getUserSyncs', () => {
+    const SYNC_URL = 'https://cdn.btloader.com/user_sync.html';
+
+    it('should return an empty array if no sync options are provided', () => {
+      const syncs = spec.getUserSyncs({}, [], null, null, null);
+
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should return an empty array if no server responses are provided', () => {
+      const syncs = spec.getUserSyncs(
+        { iframeEnabled: true },
+        [],
+        null,
+        null,
+        null
+      );
+
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should pass consent parameters and bidder codes in sync URL if they are provided', () => {
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: 'GDPRConsentString123',
+      };
+      const gppConsent = {
+        gppString: 'GPPString123',
+        applicableSections: ['sectionA'],
+      };
+      const us_privacy = '1YNY';
+      const expectedSyncUrl = new URL(SYNC_URL);
+      expectedSyncUrl.searchParams.set('bidders', 'pubmatic,ix');
+      expectedSyncUrl.searchParams.set('gdpr', 1);
+      expectedSyncUrl.searchParams.set(
+        'gdpr_consent',
+        gdprConsent.consentString
+      );
+      expectedSyncUrl.searchParams.set('gpp', gppConsent.gppString);
+      expectedSyncUrl.searchParams.set('gpp_sid', 'sectionA');
+      expectedSyncUrl.searchParams.set('us_privacy', us_privacy);
+      const syncs = spec.getUserSyncs(
+        { iframeEnabled: true },
+        [
+          { body: { ext: { responsetimemillis: { pubmatic: 123 } } } },
+          { body: { ext: { responsetimemillis: { pubmatic: 123, ix: 123 } } } },
+        ],
+        gdprConsent,
+        us_privacy,
+        gppConsent
+      );
+
+      expect(syncs).to.deep.equal([
+        { type: 'iframe', url: expectedSyncUrl.href },
+      ]);
+    });
+  });
+});
diff --git a/test/spec/modules/a1MediaBidAdapter_spec.js b/test/spec/modules/a1MediaBidAdapter_spec.js
index 060fe3b5a65..8031b584d65 100644
--- a/test/spec/modules/a1MediaBidAdapter_spec.js
+++ b/test/spec/modules/a1MediaBidAdapter_spec.js
@@ -3,6 +3,7 @@ import { config } from 'src/config.js';
 import { BANNER, VIDEO, NATIVE } from 'src/mediaTypes.js';
 import 'modules/currency.js';
 import 'modules/priceFloors.js';
+import { replaceAuctionPrice } from '../../../src/utils';
 
 const ortbBlockParams = {
   battr: [ 13 ],
@@ -74,7 +75,8 @@ const getConvertedBidReq = () => {
         },
         bidfloor: 0,
         bidfloorcur: 'JPY',
-        id: '2e9f38ea93bb9e'
+        id: '2e9f38ea93bb9e',
+        secure: 1
       }
     ],
     test: 0,
@@ -102,6 +104,9 @@ const getBidderResponse = () => {
 const bannerAdm = '
';
 const videoAdm = 'testvast1';
 const nativeAdm = '{"ver":"1.2","link":{"url":"test_url"},"assets":[{"id":1,"required":1,"title":{"text":"native_title"}}]}';
+const macroAdm = '
';
+const macroNurl = 'https://d11.contentsfeed.com/dsp/win/example.com/SITE/a1/${AUCTION_PRICE}';
+const interpretedNurl = `
`;
 
 describe('a1MediaBidAdapter', function() {
   describe('isValidRequest', function() {
@@ -216,5 +221,29 @@ describe('a1MediaBidAdapter', function() {
         expect(interpretedRes[0].mediaType).equal(BANNER);
       });
     });
+
+    describe('resolve the AUCTION_PRICE macro', function() {
+      let bidRequest;
+      beforeEach(function() {
+        const bidderRequest = getBidderRequest(true);
+        bidRequest = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      });
+      it('should return empty array when bid response has not contents', function() {
+        const emptyResponse = { body: '' };
+        const interpretedRes = spec.interpretResponse(emptyResponse, bidRequest);
+        expect(interpretedRes.length).equal(0);
+      });
+      it('should replace macro keyword if is exist', function() {
+        const bidderResponse = getBidderResponse();
+        bidderResponse.body.seatbid[0].bid[0].adm = macroAdm;
+        bidderResponse.body.seatbid[0].bid[0].nurl = macroNurl;
+        const interpretedRes = spec.interpretResponse(bidderResponse, bidRequest);
+
+        const expectedResPrice = 9;
+        const expectedAd = replaceAuctionPrice(macroAdm, expectedResPrice) + replaceAuctionPrice(interpretedNurl, expectedResPrice);
+
+        expect(interpretedRes[0].ad).equal(expectedAd);
+      });
+    });
   });
 })
diff --git a/test/spec/modules/acuityadsBidAdapter_spec.js b/test/spec/modules/acuityadsBidAdapter_spec.js
index 31ef9dd6466..ecc40025c95 100644
--- a/test/spec/modules/acuityadsBidAdapter_spec.js
+++ b/test/spec/modules/acuityadsBidAdapter_spec.js
@@ -1,11 +1,21 @@
 import { expect } from 'chai';
-import { spec } from '../../../modules/acuityadsBidAdapter';
+import { spec } from '../../../modules/acuityadsBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'acuityads'
+const bidder = 'acuityads';
 
 describe('AcuityAdsBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -16,8 +26,9 @@ describe('AcuityAdsBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -30,8 +41,9 @@ describe('AcuityAdsBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -53,8 +65,9 @@ describe('AcuityAdsBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -73,12 +86,22 @@ describe('AcuityAdsBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
-    timeout: 500,
-    ortb2: {}
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
@@ -113,6 +136,7 @@ describe('AcuityAdsBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -130,7 +154,7 @@ describe('AcuityAdsBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -146,6 +170,7 @@ describe('AcuityAdsBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -171,8 +196,10 @@ describe('AcuityAdsBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -187,40 +214,38 @@ describe('AcuityAdsBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
 
-    describe('Returns data with gppConsent', function () {
-      it('bidderRequest.gppConsent', () => {
-        bidderRequest.gppConsent = {
-          gppString: 'abc123',
-          applicableSections: [8]
-        };
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-        serverRequest = spec.buildRequests(bids, bidderRequest);
-        let data = serverRequest.data;
-        expect(data).to.be.an('object');
-        expect(data).to.have.property('gpp');
-        expect(data).to.have.property('gpp_sid');
-        delete bidderRequest.gppConsent;
-      })
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
 
-      it('bidderRequest.ortb2.regs.gpp', () => {
-        bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
-        bidderRequest.ortb2.regs.gpp = 'abc123';
-        bidderRequest.ortb2.regs.gpp_sid = [8];
+      delete bidderRequest.gppConsent;
+    })
 
-        serverRequest = spec.buildRequests(bids, bidderRequest);
-        let data = serverRequest.data;
-        expect(data).to.be.an('object');
-        expect(data).to.have.property('gpp');
-        expect(data).to.have.property('gpp_sid');
-      })
-    });
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -424,5 +449,17 @@ describe('AcuityAdsBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://cs.admanmedia.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.admanmedia.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/ad2ictionBidAdapter_spec.js b/test/spec/modules/ad2ictionBidAdapter_spec.js
new file mode 100644
index 00000000000..99800c6dd01
--- /dev/null
+++ b/test/spec/modules/ad2ictionBidAdapter_spec.js
@@ -0,0 +1,223 @@
+import { expect } from 'chai';
+import {
+  spec,
+  API_ENDPOINT,
+  API_VERSION_NUMBER,
+} from 'modules/ad2ictionBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+describe('ad2ictionBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      bidder: 'ad2iction',
+      params: { id: '11ab384c-e936-11ed-a6a7-f23c9173ed43' },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [336, 280],
+          ],
+        },
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [
+        [300, 250],
+        [336, 280],
+      ],
+      bidId: '2a7a3b48778a1b',
+      bidderRequestId: '1e6509293abe6b',
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when params id is not valid (letters)', function () {
+      const mockBid = {
+        ...bid,
+        params: { id: 1234 },
+      };
+
+      expect(spec.isBidRequestValid(mockBid)).to.equal(false);
+    });
+
+    it('should return false when params id is not exist', function () {
+      const mockBid = {
+        ...bid,
+      };
+      delete mockBid.params.id;
+
+      expect(spec.isBidRequestValid(mockBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const mockValidBidRequests = [
+      {
+        bidder: 'ad2iction',
+        params: { id: '11ab384c-e936-11ed-a6a7-f23c9173ed43' },
+        adUnitCode: 'adunit-code',
+        sizes: [
+          [300, 250],
+          [336, 280],
+        ],
+        bidId: '57ffc0667379e1',
+        bidderRequestId: '4ddea14478a651',
+      },
+    ];
+
+    const mockBidderRequest = {
+      bidderCode: 'ad2iction',
+      bidderRequestId: '4ddea14478a651',
+      bids: [
+        {
+          bidder: 'ad2iction',
+          params: { id: '11ab384c-e936-11ed-a6a7-f23c9173ed43' },
+          adUnitCode: 'adunit-code',
+          transactionId: null,
+          sizes: [
+            [300, 250],
+            [336, 280],
+          ],
+          bidId: '57ffc0667379e1',
+          bidderRequestId: '4ddea14478a651',
+        },
+      ],
+      timeout: 1200,
+      refererInfo: {
+        ref: 'https://example.com/referer.html',
+      },
+      ortb2: {
+        source: {},
+        site: {
+          ref: 'https://example.com/referer.html',
+        },
+        device: {
+          w: 390,
+          h: 844,
+          language: 'zh',
+        },
+      },
+      start: 1702526505498,
+    };
+
+    it('should send bid request to API_ENDPOINT via POST', function () {
+      const request = spec.buildRequests(
+        mockValidBidRequests,
+        mockBidderRequest
+      );
+
+      expect(request.url).to.equal(API_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send bid request with API version', function () {
+      const request = spec.buildRequests(
+        mockValidBidRequests,
+        mockBidderRequest
+      );
+
+      expect(request.data.v).to.equal(API_VERSION_NUMBER);
+    });
+
+    it('should send bid request with dada fields', function () {
+      const request = spec.buildRequests(
+        mockValidBidRequests,
+        mockBidderRequest
+      );
+
+      expect(request.data).to.include.all.keys('udid', '_');
+      expect(request.data).to.have.property('refererInfo');
+      expect(request.data).to.have.property('ortb2');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return an empty array to indicate no valid bids', function () {
+      const mockServerResponse = {};
+
+      const bidResponses = spec.interpretResponse(mockServerResponse);
+
+      expect(bidResponses).is.an('array').that.is.empty;
+    });
+
+    it('should return a valid bid response', function () {
+      const MOCK_AD_DOM = "
"
+      const mockServerResponse = {
+        body: [
+          {
+            requestId: '23a3d87fb6bde9',
+            cpm: 1.61,
+            currency: 'USD',
+            width: '336',
+            height: '280',
+            creativeId: '46271',
+            netRevenue: 'false',
+            ad: MOCK_AD_DOM,
+            meta: {
+              advertiserDomains: [''],
+            },
+            ttl: 360,
+          },
+          {
+            requestId: '3ce3efc40c890b',
+            cpm: 1.61,
+            currency: 'USD',
+            width: '336',
+            height: '280',
+            creativeId: '46271',
+            netRevenue: 'false',
+            ad: MOCK_AD_DOM,
+            meta: {
+              advertiserDomains: [''],
+            },
+            ttl: 360,
+          },
+        ],
+      };
+
+      const exceptServerResponse = [
+        {
+          requestId: '23a3d87fb6bde9',
+          cpm: 1.61,
+          currency: 'USD',
+          width: '336',
+          height: '280',
+          creativeId: '46271',
+          netRevenue: 'false',
+          ad: MOCK_AD_DOM,
+          meta: {
+            advertiserDomains: [''],
+          },
+          ttl: 360,
+        },
+        {
+          requestId: '3ce3efc40c890b',
+          cpm: 1.61,
+          currency: 'USD',
+          width: '336',
+          height: '280',
+          creativeId: '46271',
+          netRevenue: 'false',
+          ad: MOCK_AD_DOM,
+          meta: {
+            advertiserDomains: [''],
+          },
+          ttl: 360,
+        },
+      ]
+
+      const bidResponses = spec.interpretResponse(mockServerResponse);
+
+      expect(bidResponses).to.eql(exceptServerResponse);
+    });
+  });
+});
diff --git a/test/spec/modules/adWMGAnalyticsAdapter_spec.js b/test/spec/modules/adWMGAnalyticsAdapter_spec.js
index 1e0da1bb3c8..92e1fcbe4db 100644
--- a/test/spec/modules/adWMGAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adWMGAnalyticsAdapter_spec.js
@@ -2,9 +2,9 @@ import adWMGAnalyticsAdapter from 'modules/adWMGAnalyticsAdapter.js';
 import { expect } from 'chai';
 import { server } from 'test/mocks/xhr.js';
 import {expectEvents} from '../../helpers/analytics.js';
+import {EVENTS} from 'src/constants.js';
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('adWMG Analytics', function () {
   let timestamp = new Date() - 256;
@@ -142,31 +142,31 @@ describe('adWMG Analytics', function () {
       });
 
       expectEvents([
-        [constants.EVENTS.AUCTION_INIT, {timestamp, auctionId, timeout, adUnits}],
-        [constants.EVENTS.BID_REQUESTED, {}],
-        [constants.EVENTS.BID_RESPONSE, bidResponse],
-        [constants.EVENTS.NO_BID, {}],
-        [constants.EVENTS.BID_TIMEOUT, bidTimeoutArgs],
-        [constants.EVENTS.AUCTION_END, {}],
-        [constants.EVENTS.BID_WON, wonRequest],
+        [EVENTS.AUCTION_INIT, {timestamp, auctionId, timeout, adUnits}],
+        [EVENTS.BID_REQUESTED, {}],
+        [EVENTS.BID_RESPONSE, bidResponse],
+        [EVENTS.NO_BID, {}],
+        [EVENTS.BID_TIMEOUT, bidTimeoutArgs],
+        [EVENTS.AUCTION_END, {}],
+        [EVENTS.BID_WON, wonRequest],
       ]).to.beTrackedBy(adWMGAnalyticsAdapter.track);
     });
 
     it('should be two xhr requests', function () {
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_WON, wonRequest);
+      events.emit(EVENTS.AUCTION_END, {});
+      events.emit(EVENTS.BID_WON, wonRequest);
       expect(server.requests.length).to.equal(2);
     });
 
     it('second request should be bidWon', function () {
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_WON, wonRequest);
+      events.emit(EVENTS.AUCTION_END, {});
+      events.emit(EVENTS.BID_WON, wonRequest);
       expect(JSON.parse(server.requests[1].requestBody).events[0].status).to.equal(expectedBidWonData.events[0].status);
     });
 
     it('check bidWon data', function () {
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_WON, wonRequest);
+      events.emit(EVENTS.AUCTION_END, {});
+      events.emit(EVENTS.BID_WON, wonRequest);
       let realBidWonData = JSON.parse(server.requests[1].requestBody);
       expect(realBidWonData.publisher_id).to.equal(expectedBidWonData.publisher_id);
       expect(realBidWonData.site).to.equal(expectedBidWonData.site);
diff --git a/test/spec/modules/adagioAnalyticsAdapter_spec.js b/test/spec/modules/adagioAnalyticsAdapter_spec.js
index 39fb5d2d068..d1058170f44 100644
--- a/test/spec/modules/adagioAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adagioAnalyticsAdapter_spec.js
@@ -1,12 +1,12 @@
-import adagioAnalyticsAdapter from 'modules/adagioAnalyticsAdapter.js';
-import { expect } from 'chai';
+import * as prebidGlobal from 'src/prebidGlobal.js';
 import * as utils from 'src/utils.js';
-import { getGlobal } from 'src/prebidGlobal.js';
+import adagioAnalyticsAdapter, { _internal } from 'modules/adagioAnalyticsAdapter.js';
+import { EVENTS } from 'src/constants.js';
+import { expect } from 'chai';
 import { server } from 'test/mocks/xhr.js';
 
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('adagio analytics adapter - adagio.js', () => {
   let sandbox;
@@ -14,30 +14,35 @@ describe('adagio analytics adapter - adagio.js', () => {
 
   beforeEach(() => {
     sandbox = sinon.createSandbox();
-
     sandbox.stub(events, 'getEvents').returns([]);
 
-    const w = utils.getWindowTop();
+    sandbox.stub(prebidGlobal, 'getGlobal').returns({
+      installedModules: ['adagioRtdProvider', 'rtdModule']
+    });
 
     adapterManager.registerAnalyticsAdapter({
       code: 'adagio',
       adapter: adagioAnalyticsAdapter
     });
 
-    w.ADAGIO = w.ADAGIO || {};
-    w.ADAGIO.queue = w.ADAGIO.queue || [];
+    _internal.getAdagioNs().pageviewId = 'a68e6d70-213b-496c-be0a-c468ff387106';
 
-    adagioQueuePushSpy = sandbox.spy(w.ADAGIO.queue, 'push');
+    adagioQueuePushSpy = sandbox.spy(_internal.getAdagioNs().queue, 'push');
   });
 
   afterEach(() => {
+    _internal.getAdagioNs().queue = [];
     sandbox.restore();
   });
 
   describe('track', () => {
     beforeEach(() => {
       adapterManager.enableAnalytics({
-        provider: 'adagio'
+        provider: 'adagio',
+        options: {
+          organizationId: '1001',
+          site: 'test-com',
+        }
       });
     });
 
@@ -86,14 +91,13 @@ describe('adagio analytics adapter - adagio.js', () => {
       };
 
       const testEvents = {
-        [constants.EVENTS.BID_REQUESTED]: bidRequest,
-        [constants.EVENTS.BID_RESPONSE]: bidResponse,
-        [constants.EVENTS.AUCTION_END]: {}
+        [EVENTS.BID_REQUESTED]: bidRequest,
+        [EVENTS.BID_RESPONSE]: bidResponse,
+        [EVENTS.AUCTION_END]: {}
       };
 
       // Step 1-3: Send events
       Object.entries(testEvents).forEach(([ev, payload]) => events.emit(ev, payload));
-
       function eventItem(eventName, args) {
         return sinon.match({
           action: 'pb-analytics-event',
@@ -108,78 +112,15 @@ describe('adagio analytics adapter - adagio.js', () => {
       Object.entries(testEvents).forEach(([ev, payload]) => sinon.assert.calledWith(adagioQueuePushSpy, eventItem(ev, payload)));
     });
   });
-
-  describe('no track', () => {
-    beforeEach(() => {
-      sandbox.stub(utils, 'getWindowTop').throws();
-
-      adapterManager.enableAnalytics({
-        provider: 'adagio'
-      });
-    });
-
-    afterEach(() => {
-      adagioAnalyticsAdapter.disableAnalytics();
-      sandbox.restore();
-    });
-
-    it('builds and sends auction data', () => {
-      let bidRequest = {
-        bids: [{
-          adUnitCode: 'div-1',
-          params: {
-            features: {
-              siteId: '2',
-              placement: 'pave_top',
-              pagetype: 'article',
-              category: 'IAB12,IAB12-2',
-              device: '2',
-            }
-          }
-        }, {
-          adUnitCode: 'div-2',
-          params: {
-            features: {
-              siteId: '2',
-              placement: 'ban_top',
-              pagetype: 'article',
-              category: 'IAB12,IAB12-2',
-              device: '2',
-            }
-          },
-        }],
-      };
-      let bidResponse = {
-        bidderCode: 'adagio',
-        width: 300,
-        height: 250,
-        statusMessage: 'Bid available',
-        cpm: 6.2189757658226075,
-        currency: '',
-        netRevenue: false,
-        adUnitCode: 'div-1',
-        timeToRespond: 132,
-      };
-
-      // Step 1: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
-
-      // Step 2: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
-
-      // Step 3: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
-
-      utils.getWindowTop.restore();
-
-      sandbox.assert.callCount(adagioQueuePushSpy, 0);
-    });
-  });
 });
 
 const AUCTION_ID = '25c6d7f5-699a-4bfc-87c9-996f915341fa';
+const RTD_AUCTION_ID = '753b3784-12a1-44c2-9d08-d0e4ee910e69';
+const RTD_AUCTION_ID_CACHE = '04d991be-8f7d-4491-930b-2b7eefb3c447';
+const AUCTION_ID_CACHE = 'b43d24a0-13d4-406d-8176-3181402bafc4';
+const SESSION_ID = 'c4f9e517-a592-45af-9560-ca191823d591';
 
-const BID_ADAGIO = Object.assign({}, BID_ADAGIO, {
+const BID_ADAGIO = {
   bidder: 'adagio',
   auctionId: AUCTION_ID,
   adUnitCode: '/19968336/header-bid-tag-1',
@@ -208,10 +149,13 @@ const BID_ADAGIO = Object.assign({}, BID_ADAGIO, {
   meta: {
     advertiserDomains: ['example.com']
   },
-  seatId: '42',
-});
+  pba: {
+    sid: '42',
+    e_pba_test: true
+  }
+};
 
-const BID_ANOTHER = Object.assign({}, BID_ANOTHER, {
+const BID_ANOTHER = {
   bidder: 'another',
   auctionId: AUCTION_ID,
   adUnitCode: '/19968336/header-bid-tag-1',
@@ -240,101 +184,177 @@ const BID_ANOTHER = Object.assign({}, BID_ANOTHER, {
   meta: {
     advertiserDomains: ['example.com']
   }
+};
+
+const BID_CACHED = Object.assign({}, BID_ADAGIO, {
+  auctionId: AUCTION_ID_CACHE,
+  latestTargetedAuctionId: BID_ADAGIO.auctionId,
 });
 
 const PARAMS_ADG = {
-  organizationId: '1001',
-  site: 'test-com',
-  pageviewId: 'a68e6d70-213b-496c-be0a-c468ff387106',
   environment: 'desktop',
+};
+
+const ORTB_DATA = {
   pagetype: 'article',
-  placement: 'pave_top'
 };
 
-const MOCK = {
-  SET_TARGETING: {
-    [BID_ADAGIO.adUnitCode]: BID_ADAGIO.adserverTargeting,
-    [BID_ANOTHER.adUnitCode]: BID_ANOTHER.adserverTargeting
-  },
-  AUCTION_INIT: {
-    'auctionId': AUCTION_ID,
-    'timestamp': 1519767010567,
-    'auctionStatus': 'inProgress',
-    'adUnits': [ {
-      'code': '/19968336/header-bid-tag-1',
-      'mediaTypes': {
-        'banner': {
-          'sizes': [
-            [
-              640,
-              480
-            ],
-            [
-              640,
-              100
-            ]
+const ADG_RTD = {
+  'uid': RTD_AUCTION_ID,
+  'session': {
+    'testName': 'test',
+    'testVersion': 'version',
+    'id': SESSION_ID,
+  }
+};
+
+const AUCTION_INIT_ANOTHER = {
+  'auctionId': AUCTION_ID,
+  'timestamp': 1519767010567,
+  'auctionStatus': 'inProgress',
+  'adUnits': [ {
+    'code': '/19968336/header-bid-tag-1',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            640,
+            480
+          ],
+          [
+            640,
+            100
           ]
-        }
+        ]
+      }
+    },
+    'sizes': [[640, 480]],
+    'bids': [ {
+      'bidder': 'another',
+      'params': {
+        'publisherId': '1001'
       },
-      'sizes': [[640, 480]],
-      'bids': [ {
-        'bidder': 'another',
-        'params': {
-          'publisherId': '1001'
-        },
-      }, {
-        'bidder': 'adagio',
-        'params': {
-          ...PARAMS_ADG
-        },
-      }, ],
-      'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014'
     }, {
-      'code': '/19968336/footer-bid-tag-1',
-      'mediaTypes': {
-        'banner': {
-          'sizes': [
-            [
-              640,
-              480
-            ]
-          ]
+      'bidder': 'nobid',
+      'params': {
+        'publisherId': '1002'
+      },
+    }, {
+      'bidder': 'adagio',
+      'params': {
+        ...PARAMS_ADG
+      },
+    }, {
+      'bidder': 'anotherWithAlias',
+      'params': {
+        'publisherId': '1001'
+      },
+    }, ],
+    'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+    'ortb2Imp': {
+      'ext': {
+        'data': {
+          'placement': 'pave_top',
         }
+      }
+    },
+  }, {
+    'code': '/19968336/footer-bid-tag-1',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            640,
+            480
+          ]
+        ]
+      }
+    },
+    'sizes': [[640, 480]],
+    'bids': [ {
+      'bidder': 'another',
+      'params': {
+        'publisherId': '1001'
       },
-      'sizes': [[640, 480]],
-      'bids': [ {
-        'bidder': 'another',
-        'params': {
-          'publisherId': '1001'
-        },
-      } ],
-      'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014'
     } ],
-    'adUnitCodes': ['/19968336/header-bid-tag-1', '/19968336/footer-bid-tag-1'],
-    'bidderRequests': [ {
+    'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+    'ortb2Imp': {
+      'ext': {
+        'data': {
+          'placement': 'pave_top',
+        }
+      }
+    },
+  } ],
+  'adUnitCodes': ['/19968336/header-bid-tag-1', '/19968336/footer-bid-tag-1'],
+  'bidderRequests': [
+    {
       'bidderCode': 'another',
       'auctionId': AUCTION_ID,
       'bidderRequestId': '1be65d7958826a',
-      'bids': [ {
-        'bidder': 'another',
-        'params': {
-          'publisherId': '1001',
+      'bids': [
+        {
+          'bidder': 'another',
+          'params': {
+            'publisherId': '1001',
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[640, 480]]
+            }
+          },
+          'adUnitCode': '/19968336/header-bid-tag-1',
+          'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+          'sizes': [[640, 480]],
+          'bidId': '2ecff0db240757',
+          'bidderRequestId': '1be65d7958826a',
+          'auctionId': AUCTION_ID,
+          'src': 'client',
+          'bidRequestsCount': 1
         },
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[640, 480]]
-          }
+        {
+          'bidder': 'another',
+          'params': {
+            'publisherId': '1001'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[640, 480]]
+            }
+          },
+          'adUnitCode': '/19968336/footer-bid-tag-1',
+          'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+          'sizes': [[640, 480]],
+          'bidId': '2ecff0db240757',
+          'bidderRequestId': '1be65d7958826a',
+          'auctionId': AUCTION_ID,
+          'src': 'client',
+          'bidRequestsCount': 1
         },
-        'adUnitCode': '/19968336/header-bid-tag-1',
-        'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
-        'sizes': [[640, 480]],
-        'bidId': '2ecff0db240757',
-        'bidderRequestId': '1be65d7958826a',
-        'auctionId': AUCTION_ID,
-        'src': 'client',
-        'bidRequestsCount': 1
-      }, {
-        'bidder': 'another',
+      ],
+      'timeout': 3000,
+      'refererInfo': {
+        'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+      },
+      'ortb2': {
+        'site': {
+          'ext': {
+            'data': {
+              'adg_rtd': {
+                ...ADG_RTD
+              },
+              ...ORTB_DATA
+            }
+          }
+        }
+      }
+    },
+    {
+      'bidderCode': 'nobid',
+      'auctionId': AUCTION_ID,
+      'bidderRequestId': '1be65d7958826a',
+      'bids': [{
+        'bidder': 'nobid',
         'params': {
           'publisherId': '1001'
         },
@@ -343,7 +363,7 @@ const MOCK = {
             'sizes': [[640, 480]]
           }
         },
-        'adUnitCode': '/19968336/footer-bid-tag-1',
+        'adUnitCode': '/19968336/header-bid-tag-1',
         'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
         'sizes': [[640, 480]],
         'bidId': '2ecff0db240757',
@@ -356,16 +376,70 @@ const MOCK = {
       'timeout': 3000,
       'refererInfo': {
         'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+      },
+      'ortb2': {
+        'site': {
+          'ext': {
+            'data': {
+              'adg_rtd': {
+                ...ADG_RTD
+              },
+              ...ORTB_DATA
+            }
+          }
+        }
       }
-    }, {
+    },
+    {
+      bidderCode: 'anotherWithAlias',
+      'auctionId': AUCTION_ID,
+      'bidderRequestId': '1be65d7958826a',
+      'bids': [
+        {
+          'bidder': 'anotherWithAlias',
+          'params': {
+            'publisherId': '1001',
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[640, 480]]
+            }
+          },
+          'adUnitCode': '/19968336/header-bid-tag-1',
+          'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+          'sizes': [[640, 480]],
+          'bidId': '2ecff0db240757',
+          'bidderRequestId': '1be65d7958826a',
+          'auctionId': AUCTION_ID,
+          'src': 'client',
+          'bidRequestsCount': 1
+        },
+      ],
+      'timeout': 3000,
+      'refererInfo': {
+        'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+      },
+      'ortb2': {
+        'site': {
+          'ext': {
+            'data': {
+              'adg_rtd': {
+                ...ADG_RTD
+              },
+              ...ORTB_DATA
+            }
+          }
+        }
+      }
+    },
+    {
       'bidderCode': 'adagio',
       'auctionId': AUCTION_ID,
       'bidderRequestId': '1be65d7958826a',
       'bids': [ {
         'bidder': 'adagio',
         'params': {
-          ...PARAMS_ADG,
-          adagioAuctionId: '6fc53663-bde5-427b-ab63-baa9ed296f47'
+          ...PARAMS_ADG
         },
         'mediaTypes': {
           'banner': {
@@ -385,40 +459,313 @@ const MOCK = {
       'timeout': 3000,
       'refererInfo': {
         'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+      },
+      'ortb2': {
+        'site': {
+          'ext': {
+            'data': {
+              'adg_rtd': {
+                ...ADG_RTD
+              },
+              ...ORTB_DATA
+            }
+          }
+        }
+      }
+    }
+  ],
+  'bidsReceived': [],
+  'winningBids': [],
+  'timeout': 3000
+};
+
+const AUCTION_INIT_CACHE = {
+  'auctionId': AUCTION_ID_CACHE,
+  'timestamp': 1519767010567,
+  'auctionStatus': 'inProgress',
+  'adUnits': [ {
+    'code': '/19968336/header-bid-tag-1',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            640,
+            480
+          ],
+          [
+            640,
+            100
+          ]
+        ]
+      }
+    },
+    'sizes': [[640, 480]],
+    'bids': [ {
+      'bidder': 'another',
+      'params': {
+        'publisherId': '1001'
+      },
+    }, {
+      'bidder': 'adagio',
+      'params': {
+        ...PARAMS_ADG
+      },
+    }, ],
+    'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+    'ortb2Imp': {
+      'ext': {
+        'data': {
+          'placement': 'pave_top',
+        }
+      }
+    },
+  }, {
+    'code': '/19968336/footer-bid-tag-1',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            640,
+            480
+          ]
+        ]
+      }
+    },
+    'sizes': [[640, 480]],
+    'bids': [ {
+      'bidder': 'another',
+      'params': {
+        'publisherId': '1001'
+      },
+    } ],
+    'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+    'ortb2Imp': {
+      'ext': {
+        'data': {
+          'placement': 'pave_top',
+        }
+      }
+    },
+  } ],
+  'adUnitCodes': ['/19968336/header-bid-tag-1', '/19968336/footer-bid-tag-1'],
+  'bidderRequests': [ {
+    'bidderCode': 'another',
+    'auctionId': AUCTION_ID_CACHE,
+    'bidderRequestId': '1be65d7958826a',
+    'bids': [ {
+      'bidder': 'another',
+      'params': {
+        'publisherId': '1001',
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[640, 480]]
+        }
+      },
+      'adUnitCode': '/19968336/header-bid-tag-1',
+      'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+      'sizes': [[640, 480]],
+      'bidId': '2ecff0db240757',
+      'bidderRequestId': '1be65d7958826a',
+      'auctionId': AUCTION_ID_CACHE,
+      'src': 'client',
+      'bidRequestsCount': 1
+    }, {
+      'bidder': 'another',
+      'params': {
+        'publisherId': '1001'
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[640, 480]]
+        }
+      },
+      'adUnitCode': '/19968336/footer-bid-tag-1',
+      'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+      'sizes': [[640, 480]],
+      'bidId': '2ecff0db240757',
+      'bidderRequestId': '1be65d7958826a',
+      'auctionId': AUCTION_ID_CACHE,
+      'src': 'client',
+      'bidRequestsCount': 1
+    }
+    ],
+    'timeout': 3000,
+    'refererInfo': {
+      'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+    },
+    'ortb2': {
+      'site': {
+        'ext': {
+          'data': {
+            'adg_rtd': {
+              ...ADG_RTD,
+              'uid': RTD_AUCTION_ID_CACHE
+            },
+            ...ORTB_DATA
+          }
+        }
       }
     }
+  }, {
+    'bidderCode': 'adagio',
+    'auctionId': AUCTION_ID_CACHE,
+    'bidderRequestId': '1be65d7958826a',
+    'bids': [ {
+      'bidder': 'adagio',
+      'params': {
+        ...PARAMS_ADG
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[640, 480]]
+        }
+      },
+      'adUnitCode': '/19968336/header-bid-tag-1',
+      'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+      'sizes': [[640, 480]],
+      'bidId': '2ecff0db240757',
+      'bidderRequestId': '1be65d7958826a',
+      'auctionId': AUCTION_ID_CACHE,
+      'src': 'client',
+      'bidRequestsCount': 1
+    }
     ],
-    'bidsReceived': [],
-    'winningBids': [],
-    'timeout': 3000
+    'timeout': 3000,
+    'refererInfo': {
+      'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+    },
+    'ortb2': {
+      'site': {
+        'ext': {
+          'data': {
+            'adg_rtd': {
+              ...ADG_RTD,
+              'uid': RTD_AUCTION_ID_CACHE
+            },
+            ...ORTB_DATA
+          }
+        }
+      }
+    }
+  }
+  ],
+  'bidsReceived': [],
+  'winningBids': [],
+  'timeout': 3000
+};
+
+const AUCTION_END_ANOTHER = Object.assign({}, AUCTION_INIT_ANOTHER, {
+  bidsReceived: [BID_ANOTHER, BID_ADAGIO]
+});
+
+const AUCTION_END_ANOTHER_NOBID = Object.assign({}, AUCTION_INIT_ANOTHER, {
+  bidsReceived: []
+});
+
+const PBS_ANALYTICS_ANOTHER = {
+  atag: [
+    {
+      stage: 'auction-response',
+      module: 'adg-pba',
+      pba: {
+        '/19968336/header-bid-tag-1': {
+          st_id: '53',
+          splt_cs_id: '731'
+        }
+      }
+    }
+  ],
+  auctionId: AUCTION_ID,
+}
+
+const MOCK = {
+  SET_TARGETING: {
+    [BID_ADAGIO.adUnitCode]: BID_ADAGIO.adserverTargeting,
+    [BID_ANOTHER.adUnitCode]: BID_ANOTHER.adserverTargeting
+  },
+  AUCTION_INIT: {
+    another: AUCTION_INIT_ANOTHER,
+    bidcached: AUCTION_INIT_CACHE
   },
   BID_RESPONSE: {
     adagio: BID_ADAGIO,
     another: BID_ANOTHER
   },
+  BID_TIMEOUT: {
+    another: [
+      {
+        auctionId: AUCTION_ID,
+        adUnitCode: '/19968336/header-bid-tag-1',
+        bidder: 'another',
+      },
+      {
+        auctionId: AUCTION_ID,
+        adUnitCode: '/19968336/footer-bid-tag-1',
+        bidder: 'another',
+      },
+    ]
+  },
+  AUCTION_END: {
+    another: AUCTION_END_ANOTHER,
+    another_nobid: AUCTION_END_ANOTHER_NOBID
+  },
   BID_WON: {
     adagio: Object.assign({}, BID_ADAGIO, {
       'status': 'rendered'
     }),
     another: Object.assign({}, BID_ANOTHER, {
       'status': 'rendered'
-    })
+    }),
+    bidcached: Object.assign({}, BID_CACHED, {
+      'status': 'rendered'
+    }),
   },
   AD_RENDER_SUCCEEDED: {
-    ad: '
ad
',
-    adId: 'fake_ad_id_2',
-    bid: BID_ANOTHER
+    another: {
+      ad: '
ad
',
+      adId: 'fake_ad_id_2',
+      bid: BID_ANOTHER
+    },
+    bidcached: {
+      ad: '
ad
',
+      adId: 'fake_ad_id_2',
+      bid: BID_CACHED
+    }
   },
+  AD_RENDER_FAILED: {
+    bidcached: {
+      adId: 'fake_ad_id_2',
+      bid: BID_CACHED
+    }
+  }
 };
 
 describe('adagio analytics adapter', () => {
   let sandbox;
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.createSandbox();
 
     sandbox.stub(events, 'getEvents').returns([]);
 
+    sandbox.stub(prebidGlobal, 'getGlobal').returns({
+      installedModules: ['adagioRtdProvider', 'rtdModule'],
+      convertCurrency: (cpm, from, to) => {
+        const convKeys = {
+          'GBP-EUR': 0.7,
+          'EUR-GBP': 1.3,
+          'USD-EUR': 0.8,
+          'EUR-USD': 1.2,
+          'USD-GBP': 0.6,
+          'GBP-USD': 1.6,
+        };
+        return cpm * (convKeys[`${from}-${to}`] || 1);
+      }
+    });
+
+    _internal.getAdagioNs().pageviewId = 'a68e6d70-213b-496c-be0a-c468ff387106';
+
     adapterManager.registerAnalyticsAdapter({
       code: 'adagio',
       adapter: adagioAnalyticsAdapter
@@ -426,40 +773,36 @@ describe('adagio analytics adapter', () => {
   });
 
   afterEach(() => {
+    _internal.getAdagioNs().queue = [];
     sandbox.restore();
   });
 
   describe('track', () => {
     beforeEach(() => {
       adapterManager.enableAnalytics({
-        provider: 'adagio'
+        provider: 'adagio',
+        options: {
+          organizationId: '1001',
+          site: 'test-com',
+        }
       });
+      adapterManager.aliasRegistry['anotherWithAlias'] = 'another';
     });
 
     afterEach(() => {
       adagioAnalyticsAdapter.disableAnalytics();
+      delete adapterManager.aliasRegistry['anotherWithAlias'];
     });
 
     it('builds and sends auction data', () => {
-      getGlobal().convertCurrency = (cpm, from, to) => {
-        const convKeys = {
-          'GBP-EUR': 0.7,
-          'EUR-GBP': 1.3,
-          'USD-EUR': 0.8,
-          'EUR-USD': 1.2,
-          'USD-GBP': 0.6,
-          'GBP-USD': 1.6,
-        };
-        return cpm * (convKeys[`${from}-${to}`] || 1);
-      };
-
-      events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
-      events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
-      events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
-      events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON.another);
-      events.emit(constants.EVENTS.AD_RENDER_SUCCEEDED, MOCK.AD_RENDER_SUCCEEDED);
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another);
+      events.emit(EVENTS.BID_WON, MOCK.BID_WON.another);
+      events.emit(EVENTS.AD_RENDER_SUCCEEDED, MOCK.AD_RENDER_SUCCEEDED.another);
 
-      expect(server.requests.length).to.equal(3);
+      expect(server.requests.length).to.equal(5, 'requests count');
       {
         const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[0].url);
         expect(protocol).to.equal('https');
@@ -467,18 +810,20 @@ describe('adagio analytics adapter', () => {
         expect(pathname).to.equal('/pba.gif');
         expect(search.v).to.equal('1');
         expect(search.pbjsv).to.equal('$prebid.version$');
-        expect(search.auct_id).to.equal('6fc53663-bde5-427b-ab63-baa9ed296f47');
+        expect(search.s_id).to.equal(SESSION_ID);
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID);
         expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
         expect(search.org_id).to.equal('1001');
         expect(search.site).to.equal('test-com');
         expect(search.pv_id).to.equal('a68e6d70-213b-496c-be0a-c468ff387106');
         expect(search.url_dmn).to.equal(window.location.hostname);
-        expect(search.dvc).to.equal('desktop');
         expect(search.pgtyp).to.equal('article');
         expect(search.plcmt).to.equal('pave_top');
         expect(search.mts).to.equal('ban');
         expect(search.ban_szs).to.equal('640x100,640x480');
-        expect(search.bdrs).to.equal('adagio,another');
+        expect(search.bdrs).to.equal('adagio,another,anotherWithAlias,nobid');
+        expect(search.bdrs_code).to.equal('adagio,another,another,nobid');
+        expect(search.bdrs_timeout).to.not.exist;
         expect(search.adg_mts).to.equal('ban');
       }
 
@@ -487,19 +832,109 @@ describe('adagio analytics adapter', () => {
         expect(protocol).to.equal('https');
         expect(hostname).to.equal('c.4dex.io');
         expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('1');
+      }
+
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[2].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
         expect(search.v).to.equal('2');
-        expect(search.auct_id).to.equal('6fc53663-bde5-427b-ab63-baa9ed296f47');
         expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
-        expect(search.adg_sid).to.equal('42');
+        expect(search.e_sid).to.equal('42');
+        expect(search.e_pba_test).to.equal('true');
+        expect(search.bdrs_bid).to.equal('1,1,0,0');
+        expect(search.bdrs_cpm).to.equal('1.42,2.052,,');
+        expect(search.bdrs_timeout).to.equal('0,0,0,0');
+      }
+
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[3].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('2');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID);
+        expect(search.adu_code).to.equal('/19968336/footer-bid-tag-1');
+        expect(search.bdrs_timeout).to.equal('0');
+      }
+
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[4].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('3');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID);
+        expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
         expect(search.win_bdr).to.equal('another');
         expect(search.win_mt).to.equal('ban');
         expect(search.win_ban_sz).to.equal('728x90');
-        expect(search.win_cpm).to.equal('1.71');
-        expect(search.cur).to.equal('EUR');
-        expect(search.cur_rate).to.equal('1.2');
-        expect(search.og_cpm).to.equal('1.62');
-        expect(search.og_cur).to.equal('GBP');
-        expect(search.og_cur_rate).to.equal('1.6');
+        expect(search.win_net_cpm).to.equal('2.052');
+        expect(search.win_og_cpm).to.equal('2.592');
+        expect(search.bdrs_timeout).to.equal('0,0,0,0');
+      }
+    });
+
+    it('builds and sends auction data with a cached bid win', () => {
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.bidcached);
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another_nobid);
+      events.emit(EVENTS.BID_WON, MOCK.BID_WON.bidcached);
+      events.emit(EVENTS.AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED.bidcached);
+
+      expect(server.requests.length).to.equal(8, 'requests count');
+      {
+        // the first request is getting cached we expect to see its auction id later when it's re-used
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[0].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('1');
+        expect(search.pbjsv).to.equal('$prebid.version$');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID_CACHE);
+        expect(search.s_id).to.equal(SESSION_ID);
+        expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
+        expect(search.org_id).to.equal('1001');
+        expect(search.site).to.equal('test-com');
+        expect(search.pv_id).to.equal('a68e6d70-213b-496c-be0a-c468ff387106');
+        expect(search.url_dmn).to.equal(window.location.hostname);
+        expect(search.pgtyp).to.equal('article');
+        expect(search.plcmt).to.equal('pave_top');
+        expect(search.mts).to.equal('ban');
+        expect(search.ban_szs).to.equal('640x100,640x480');
+        expect(search.bdrs).to.equal('adagio,another');
+        expect(search.bdrs_code).to.equal('adagio,another');
+        expect(search.bdrs_timeout).to.not.exist;
+        expect(search.adg_mts).to.equal('ban');
+        expect(search.t_n).to.equal('test');
+        expect(search.t_v).to.equal('version');
+      }
+
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[1].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('1');
+        expect(search.pbjsv).to.equal('$prebid.version$');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID_CACHE);
+        expect(search.adu_code).to.equal('/19968336/footer-bid-tag-1');
+        expect(search.org_id).to.equal('1001');
+        expect(search.site).to.equal('test-com');
+        expect(search.pv_id).to.equal('a68e6d70-213b-496c-be0a-c468ff387106');
+        expect(search.url_dmn).to.equal(window.location.hostname);
+        expect(search.pgtyp).to.equal('article');
+        expect(search.plcmt).to.equal('pave_top');
+        expect(search.mts).to.equal('ban');
+        expect(search.ban_szs).to.equal('640x480');
+        expect(search.bdrs).to.equal('another');
+        expect(search.bdrs_code).to.equal('another');
+        expect(search.bdrs_timeout).to.not.exist;
+        expect(search.adg_mts).to.not.exist;
       }
 
       {
@@ -507,10 +942,314 @@ describe('adagio analytics adapter', () => {
         expect(protocol).to.equal('https');
         expect(hostname).to.equal('c.4dex.io');
         expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('1');
+        expect(search.pbjsv).to.equal('$prebid.version$');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID);
+        expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
+        expect(search.org_id).to.equal('1001');
+        expect(search.site).to.equal('test-com');
+        expect(search.pv_id).to.equal('a68e6d70-213b-496c-be0a-c468ff387106');
+        expect(search.url_dmn).to.equal(window.location.hostname);
+        expect(search.pgtyp).to.equal('article');
+        expect(search.plcmt).to.equal('pave_top');
+        expect(search.mts).to.equal('ban');
+        expect(search.ban_szs).to.equal('640x100,640x480');
+        expect(search.bdrs).to.equal('adagio,another,anotherWithAlias,nobid');
+        expect(search.bdrs_code).to.equal('adagio,another,another,nobid');
+        expect(search.bdrs_timeout).to.not.exist;
+        expect(search.adg_mts).to.equal('ban');
+      }
+
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[3].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('1');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID);
+        expect(search.adu_code).to.equal('/19968336/footer-bid-tag-1');
+        expect(search.pv_id).to.equal('a68e6d70-213b-496c-be0a-c468ff387106');
+        expect(search.bdrs_timeout).to.not.exist;
+      }
+
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[4].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('2');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID);
+        expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
+        expect(search.e_sid).to.equal('42');
+        expect(search.e_pba_test).to.equal('true');
+        expect(search.bdrs_bid).to.equal('0,0,0,0');
+        expect(search.bdrs_cpm).to.equal(',,,');
+        expect(search.bdrs_timeout).to.equal('0,0,0,0');
+      }
+
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[5].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('2');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID);
+        expect(search.adu_code).to.equal('/19968336/footer-bid-tag-1');
+        expect(search.rndr).to.not.exist;
+        expect(search.bdrs_timeout).to.equal('0');
+      }
+
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[6].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
         expect(search.v).to.equal('3');
-        expect(search.auct_id).to.equal('6fc53663-bde5-427b-ab63-baa9ed296f47');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID);
+        expect(search.auct_id_c).to.equal(RTD_AUCTION_ID_CACHE);
+        expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
+        expect(search.win_bdr).to.equal('adagio');
+        expect(search.win_mt).to.equal('ban');
+        expect(search.win_ban_sz).to.equal('728x90');
+        expect(search.win_net_cpm).to.equal('1.42');
+        expect(search.win_og_cpm).to.equal('1.42');
+        expect(search.rndr).to.not.exist;
+        expect(search.bdrs_timeout).to.equal('0,0,0,0');
+      }
+
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[7].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('4');
+        expect(search.auct_id).to.equal(RTD_AUCTION_ID);
+        expect(search.auct_id_c).to.equal(RTD_AUCTION_ID_CACHE);
+        expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
+        expect(search.win_bdr).to.equal('adagio');
+        expect(search.win_mt).to.equal('ban');
+        expect(search.win_ban_sz).to.equal('728x90');
+        expect(search.win_net_cpm).to.equal('1.42');
+        expect(search.win_og_cpm).to.equal('1.42');
+        expect(search.rndr).to.equal('0');
+        expect(search.bdrs_timeout).to.equal('0,0,0,0');
+      }
+    });
+
+    it('send an "empty" cpm when adserver currency != USD and convertCurrency() is undefined', () => {
+      sandbox.restore();
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({
+        installedModules: ['adagioRtdProvider', 'rtdModule']
+      });
+
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another);
+      events.emit(EVENTS.BID_WON, MOCK.BID_WON.another);
+      events.emit(EVENTS.AD_RENDER_SUCCEEDED, MOCK.AD_RENDER_SUCCEEDED.another);
+
+      expect(server.requests.length).to.equal(5, 'requests count');
+
+      // fail to compute bidder cpm and send an "empty" cpm
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[2].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.s_id).to.equal(SESSION_ID);
+        expect(search.v).to.equal('2');
+        expect(search.e_sid).to.equal('42');
+        expect(search.e_pba_test).to.equal('true');
+        expect(search.bdrs_bid).to.equal('1,1,0,0');
+        expect(search.bdrs_cpm).to.equal('1.42,,,');
+      }
+    });
+
+    it('set adg-pbs aTags in beacon', () => {
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
+      events.emit(EVENTS.PBS_ANALYTICS, PBS_ANALYTICS_ANOTHER);
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another);
+
+      expect(server.requests.length).to.equal(4, 'requests count');
+
+      // server.requests[0] -> AUCTION_INIT - AdUnit header-bid-tag-1
+      {
+        const { search } = utils.parseUrl(server.requests[0].url);
+
+        expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
+        expect(search.v).to.equal('1');
+
+        expect(search.e_st_id).to.be.undefined;
+        expect(search.e_splt_cs_id).to.be.undefined;
+      }
+
+      // server.requests[1] -> AUCTION_INIT - AdUnit footer-bid-tag-1
+      {
+        const { search } = utils.parseUrl(server.requests[1].url);
+
+        expect(search.adu_code).to.equal('/19968336/footer-bid-tag-1');
+        expect(search.v).to.equal('1');
+
+        expect(search.e_st_id).to.be.undefined;
+        expect(search.e_splt_cs_id).to.be.undefined;
+      }
+
+      // server.requests[2] -> AUCTION_END - AdUnit header-bid-tag-1
+      {
+        const { search } = utils.parseUrl(server.requests[2].url);
+
         expect(search.adu_code).to.equal('/19968336/header-bid-tag-1');
-        expect(search.rndr).to.equal('1');
+        expect(search.v).to.equal('2');
+
+        // The adg-pbs aTags fields are set in the beacon !
+        expect(search.e_st_id).to.equal('53');
+        expect(search.e_splt_cs_id).to.equal('731');
+      }
+
+      // server.requests[3] -> AUCTION_END - AdUnit footer-bid-tag-1
+      {
+        const { search } = utils.parseUrl(server.requests[3].url);
+
+        expect(search.adu_code).to.equal('/19968336/footer-bid-tag-1');
+        expect(search.v).to.equal('2');
+
+        expect(search.e_st_id).to.be.undefined;
+        expect(search.e_splt_cs_id).to.be.undefined;
+      }
+    });
+
+    it('builds and sends auction data with a bid timeout', () => {
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.adagio);
+      events.emit(EVENTS.BID_TIMEOUT, MOCK.BID_TIMEOUT.another);
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another);
+
+      expect(server.requests.length).to.equal(4, 'requests count');
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[0].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('1');
+        expect(search.bdrs_timeout).to.not.exist;
+      }
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[1].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('1');
+        expect(search.bdrs_timeout).to.not.exist;
+      }
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[2].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('2');
+        expect(search.bdrs).to.equal('adagio,another,anotherWithAlias,nobid');
+        expect(search.bdrs_timeout).to.equal('0,1,0,0');
+      }
+      {
+        const { protocol, hostname, pathname, search } = utils.parseUrl(server.requests[3].url);
+        expect(protocol).to.equal('https');
+        expect(hostname).to.equal('c.4dex.io');
+        expect(pathname).to.equal('/pba.gif');
+        expect(search.v).to.equal('2');
+        expect(search.bdrs).to.equal('another');
+        expect(search.bdrs_timeout).to.equal('1');
+      }
+    });
+
+    it('builds and sends auction data with GAM slot callback', () => {
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
+      _internal.gamSlotCallback({
+        slot: {
+          getAdUnitPath() {
+            return '/19968336/header-bid-tag-1'
+          },
+          getSlotElementId() {
+            return '/19968336/header-bid-tag-1'
+          }
+        },
+        isEmpty: true,
+      });
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another);
+
+      expect(server.requests.length).to.equal(4, 'requests count');
+      {
+        const { search } = utils.parseUrl(server.requests[0].url);
+        expect(search.adsrv).to.not.exist;
+        expect(search.adsrv_empty).to.not.exist;
+      }
+      {
+        const { search } = utils.parseUrl(server.requests[1].url);
+        expect(search.v).to.equal('1');
+        expect(search.adsrv).to.not.exist;
+        expect(search.adsrv_empty).to.not.exist;
+      }
+      {
+        const { search } = utils.parseUrl(server.requests[2].url);
+        expect(search.v).to.equal('2');
+        expect(search.adsrv).to.equal('gam');
+        expect(search.adsrv_empty).to.equal('true');
+      }
+      {
+        const { search } = utils.parseUrl(server.requests[3].url);
+        expect(search.v).to.equal('2');
+        expect(search.adsrv).to.not.exist;
+        expect(search.adsrv_empty).to.not.exist;
+      }
+    });
+
+    it('builds and sends auction data with GAM slot callback after auction ended', () => {
+      events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT.another);
+      events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE.another);
+      events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END.another);
+      _internal.gamSlotCallback({
+        slot: {
+          getAdUnitPath() {
+            return '/19968336/header-bid-tag-1'
+          },
+          getSlotElementId() {
+            return '/19968336/header-bid-tag-1'
+          }
+        },
+        isEmpty: true,
+      });
+
+      expect(server.requests.length).to.equal(5, 'requests count');
+      {
+        const { search } = utils.parseUrl(server.requests[0].url);
+        expect(search.adsrv).to.not.exist;
+        expect(search.adsrv_empty).to.not.exist;
+      }
+      {
+        const { search } = utils.parseUrl(server.requests[1].url);
+        expect(search.v).to.equal('1');
+        expect(search.adsrv).to.not.exist;
+        expect(search.adsrv_empty).to.not.exist;
+      }
+      {
+        const { search } = utils.parseUrl(server.requests[2].url);
+        expect(search.v).to.equal('2');
+        expect(search.adsrv).to.not.exist;
+        expect(search.adsrv_empty).to.not.exist;
+      }
+      {
+        const { search } = utils.parseUrl(server.requests[3].url);
+        expect(search.v).to.equal('2');
+        expect(search.adsrv).to.not.exist;
+        expect(search.adsrv_empty).to.not.exist;
+      }
+      {
+        const { search } = utils.parseUrl(server.requests[4].url);
+        expect(search.v).to.equal('3');
+        expect(search.adsrv).to.equal('gam');
+        expect(search.adsrv_empty).to.equal('true');
       }
     });
   });
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index 1f734a6a7fc..75b0635bbef 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -1,22 +1,16 @@
-import { expect } from 'chai';
+import * as utils from '../../../src/utils.js';
 import {
-  _features,
-  internal as adagio,
-  adagioScriptFromLocalStorageCb,
-  getAdagioScript,
-  storage,
-  setExtraParam,
-  spec,
+  BB_RENDERER_URL,
   ENDPOINT,
   VERSION,
-  BB_RENDERER_URL,
-  GlobalExchange
+  _internal,
+  setExtraParam,
+  spec
 } from '../../../modules/adagioBidAdapter.js';
-import { loadExternalScript } from '../../../src/adloader.js';
-import * as utils from '../../../src/utils.js';
-import { config } from '../../../src/config.js';
 import { NATIVE } from '../../../src/mediaTypes.js';
+import { config } from '../../../src/config.js';
 import { executeRenderer } from '../../../src/Renderer.js';
+import { expect } from 'chai';
 import { userSync } from '../../../src/userSync.js';
 
 const BidRequestBuilder = function BidRequestBuilder(options) {
@@ -73,7 +67,6 @@ const BidderRequestBuilder = function BidderRequestBuilder(options) {
 };
 
 describe('Adagio bid adapter', () => {
-  let adagioMock;
   let utilsMock;
   let sandbox;
   let fakeRenderer;
@@ -119,26 +112,16 @@ describe('Adagio bid adapter', () => {
     window.ADAGIO.versions.adagioBidderAdapter = VERSION;
     window.ADAGIO.pageviewId = 'dda61753-4059-4f75-b0bf-3f60bd2c4d9a';
 
-    GlobalExchange.clearFeatures();
-    GlobalExchange.clearExchangeData();
-
-    adagioMock = sinon.mock(adagio);
     utilsMock = sinon.mock(utils);
 
-    $$PREBID_GLOBAL$$.bidderSettings = {
-      adagio: {
-        storageAllowed: true
-      }
-    };
-
     sandbox = sinon.createSandbox();
+    utilsMock = sandbox.mock(utils);
   });
 
   afterEach(() => {
     window.ADAGIO = undefined;
     $$PREBID_GLOBAL$$.bidderSettings = {};
 
-    adagioMock.restore();
     utilsMock.restore();
 
     sandbox.restore();
@@ -192,7 +175,7 @@ describe('Adagio bid adapter', () => {
     });
 
     it('should compute organizationId and site params from global BidderSettings config', function() {
-      sandbox.stub(adagio, 'getRefererInfo').returns({ reachedTop: true });
+      sandbox.stub(_internal, 'getRefererInfo').returns({ reachedTop: true });
       sandbox.stub(config, 'getConfig').withArgs('adagio').returns({
         siteId: '1000:SITE-NAME'
       });
@@ -266,10 +249,9 @@ describe('Adagio bid adapter', () => {
       'user',
       'schain',
       'prebidVersion',
-      'featuresVersion',
+      'hasRtd',
       'data',
       'usIfr',
-      'adgjs',
     ];
 
     it('groups requests by organizationId', function() {
@@ -293,10 +275,8 @@ describe('Adagio bid adapter', () => {
     });
 
     it('should send bid request to ENDPOINT_PB via POST', function() {
-      sandbox.stub(adagio, 'getDevice').returns({ a: 'a' });
-      sandbox.stub(adagio, 'getSite').returns({ domain: 'adagio.io', 'page': 'https://adagio.io/hb' });
-      sandbox.stub(adagio, 'getPageviewId').returns('1234-567');
-      sandbox.stub(utils, 'generateUUID').returns('blabla');
+      sandbox.stub(_internal, 'getDevice').returns({ a: 'a' });
+      sandbox.stub(_internal, 'getSite').returns({ domain: 'adagio.io', 'page': 'https://adagio.io/hb' });
 
       const bid01 = new BidRequestBuilder().withParams().build();
       const bidderRequest = new BidderRequestBuilder().build();
@@ -310,70 +290,52 @@ describe('Adagio bid adapter', () => {
       expect(requests[0].data).to.have.all.keys(expectedDataKeys);
     });
 
-    it('should use a custom generated auctionId and remove transactionId', function() {
+    it('should use a custom generated auctionId from ortb2.site.ext.data.adg_rtd.uid when available', function() {
       const expectedAuctionId = '373bcda7-9794-4f1c-be2c-0d223d11d579'
-      sandbox.stub(utils, 'generateUUID').returns(expectedAuctionId);
 
       const bid01 = new BidRequestBuilder().withParams().build();
-      const bidderRequest = new BidderRequestBuilder().build();
+      let ortb = {
+        ortb2: {
+          site: {
+            ext: {
+              data: {
+                adg_rtd: {
+                  uid: expectedAuctionId
+                }
+              }
+            }
+          }
+        }
+      }
+      const bidderRequest = new BidderRequestBuilder(ortb).build();
 
       const requests = spec.buildRequests([bid01], bidderRequest);
       expect(requests[0].data.adUnits[0].auctionId).eq(expectedAuctionId);
       expect(requests[0].data.adUnits[0].transactionId).to.not.exist;
     });
 
-    it('should enrich prebid bid requests params', function() {
+    it('should use a custom generated auctionId when ortb2.site.ext.data.adg_rtd.uid is absent and remove transactionId', function() {
       const expectedAuctionId = '373bcda7-9794-4f1c-be2c-0d223d11d579'
-      const expectedPageviewId = '56befc26-8cf0-472d-b105-73896df8eb89';
       sandbox.stub(utils, 'generateUUID').returns(expectedAuctionId);
-      sandbox.stub(adagio, 'getPageviewId').returns(expectedPageviewId);
 
       const bid01 = new BidRequestBuilder().withParams().build();
       const bidderRequest = new BidderRequestBuilder().build();
 
-      spec.buildRequests([bid01], bidderRequest);
-
-      expect(bid01.params.adagioAuctionId).eq(expectedAuctionId);
-      expect(bid01.params.pageviewId).eq(expectedPageviewId);
+      const requests = spec.buildRequests([bid01], bidderRequest);
+      expect(requests[0].data.adUnits[0].auctionId).eq(expectedAuctionId);
+      expect(requests[0].data.adUnits[0].transactionId).to.not.exist;
     });
 
-    it('should enqueue computed features for collect usage', function() {
-      sandbox.stub(Date, 'now').returns(12345);
+    it('should enrich prebid bid requests params', function() {
+      const expectedPageviewId = '56befc26-8cf0-472d-b105-73896df8eb89';
+      sandbox.stub(_internal, 'getAdagioNs').returns({ pageviewId: expectedPageviewId });
 
       const bid01 = new BidRequestBuilder().withParams().build();
       const bidderRequest = new BidderRequestBuilder().build();
 
-      adagioMock.expects('enqueue').withArgs(sinon.match({ action: 'features' })).atLeast(1);
-
-      const requests = spec.buildRequests([bid01], bidderRequest);
-
-      expect(requests[0].data).to.have.all.keys(expectedDataKeys);
-
-      adagioMock.verify();
-    });
-
-    it('should filter some props in case refererDetection.reachedTop is false', function() {
-      const bid01 = new BidRequestBuilder().withParams().build();
-      const bidderRequest = new BidderRequestBuilder({
-        refererInfo: {
-          numIframes: 2,
-          reachedTop: false,
-          referer: 'http://example.com/iframe1.html',
-          stack: [
-            null,
-            'http://example.com/iframe1.html',
-            'http://example.com/iframe2.html'
-          ],
-          canonicalUrl: ''
-        }
-      }).build();
-
-      const requests = spec.buildRequests([bid01], bidderRequest);
+      spec.buildRequests([bid01], bidderRequest);
 
-      expect(requests).to.have.lengthOf(1);
-      expect(requests[0].data).to.have.all.keys(expectedDataKeys);
-      expect(requests[0].data.adUnits[0].features).to.exist;
-      expect(requests[0].data.adUnits[0].features.url).to.not.exist;
+      expect(bid01.params.pageviewId).eq(expectedPageviewId);
     });
 
     it('should force split keyword param into a string', function() {
@@ -446,10 +408,102 @@ describe('Adagio bid adapter', () => {
       expect(requests[0].data.adUnits[3].params.dataLayer).to.not.exist;
     });
 
+    describe('with adagioRtdProvider enrichments', function() {
+      const adUnitRtdEnrichments = {
+        ortb2: {
+          site: {
+            ext: {
+              data: {
+                adg_rtd: {
+                  features: {
+                    page_dimensions: '1024x768',
+                    viewport_dimensions: '1024x768',
+                    user_timestamp: '111111111',
+                    dom_loading: '111111111',
+                  }
+                }
+              }}}
+        },
+        ortb2Imp: {
+          ext: {
+            data: {
+              adg_rtd: {
+                adunit_position: '1x1'
+              }
+            }
+          }
+        }
+      }
+      const rtdEnrichments = {
+        ortb2: {
+          site: {
+            ext: {
+              data: {
+                adg_rtd: {
+                  session: {
+                    new: true,
+                    rnd: 0.0666
+                  },
+                }
+              }
+            }
+          }
+        }
+      }
+
+      it('should add features and data to the request if exists', function() {
+        const bid01 = new BidRequestBuilder(adUnitRtdEnrichments).withParams().build();
+        const bidderRequest = new BidderRequestBuilder(rtdEnrichments).build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.data).to.deep.equal({
+          session: {
+            new: true,
+            rnd: 0.0666
+          }
+        });
+
+        expect(requests[0].data.adUnits[0].features).to.deep.equal({
+          page_dimensions: '1024x768',
+          viewport_dimensions: '1024x768',
+          user_timestamp: '111111111',
+          dom_loading: '111111111',
+          adunit_position: '1x1',
+          print_number: '1'
+        })
+      });
+
+      it('should add an only "print_number" in features object if ortb2 is not properly defined', function() {
+        const bid01 = new BidRequestBuilder({
+          ortb2: {},
+          bidderRequestsCount: 2
+        }).withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.adUnits[0].features).to.deep.equal({
+          print_number: '2'
+        });
+      });
+
+      it('should send data.session with default if the ortb2 ext is not properly defined', function() {
+        const bid01 = new BidRequestBuilder().withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+        sandbox.stub(Math, 'random').returns(0.444);
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.data.session).to.exist;
+        expect(requests[0].data.data.session.new).to.equal(true);
+        expect(requests[0].data.data.session.rnd).to.equal(0.444);
+      });
+    });
+
     describe('With video mediatype', function() {
       context('Outstream video', function() {
-        it('should logWarn if user does not set renderer.backupOnly: true', function() {
-          sandbox.spy(utils, 'logWarn');
+        it('should set playerName = "other" if user does not set renderer.backupOnly: true', function() {
           const bid01 = new BidRequestBuilder({
             adUnitCode: 'adunit-code-01',
             mediaTypes: {
@@ -468,7 +522,39 @@ describe('Adagio bid adapter', () => {
           const request = spec.buildRequests([bid01], bidderRequest)[0];
 
           expect(request.data.adUnits[0].mediaTypes.video.playerName).to.equal('other');
-          sinon.assert.calledWith(utils.logWarn, 'Adagio: renderer.backupOnly has not been set. Adagio recommends to use its own player to get expected behavior.');
+        });
+
+        it('should set playerName = "adagio" if user does not set a renderer or set `renderer.backupOnly: true`', function() {
+          const bid01 = new BidRequestBuilder({
+            adUnitCode: 'adunit-code-01',
+            mediaTypes: {
+              banner: { sizes: [[300, 250]] },
+              video: {
+                context: 'outstream',
+                playerSize: [[300, 250]],
+              }
+            },
+          }).withParams().build();
+          const bid02 = new BidRequestBuilder({
+            adUnitCode: 'adunit-code-02',
+            mediaTypes: {
+              banner: { sizes: [[300, 250]] },
+              video: {
+                context: 'outstream',
+                playerSize: [[300, 250]],
+                renderer: {
+                  url: 'https://url.tld',
+                  render: () => true,
+                  backupOnly: true
+                }
+              }
+            },
+          }).withParams().build();
+          const bidderRequest = new BidderRequestBuilder().build();
+          const request = spec.buildRequests([bid01, bid02], bidderRequest)[0];
+
+          expect(request.data.adUnits[0].mediaTypes.video.playerName).to.equal('adagio');
+          expect(request.data.adUnits[1].mediaTypes.video.playerName).to.equal('adagio');
         });
       });
 
@@ -493,7 +579,7 @@ describe('Adagio bid adapter', () => {
             skipafter: 4,
             minduration: 10,
             maxduration: 30,
-            placement: 3,
+            plcmt: 4,
             protocols: [8]
           }
         }).build();
@@ -508,7 +594,7 @@ describe('Adagio bid adapter', () => {
           skipafter: 4,
           minduration: 10,
           maxduration: 30,
-          placement: 3,
+          plcmt: 4,
           protocols: [8],
           w: 300,
           h: 250
@@ -517,7 +603,6 @@ describe('Adagio bid adapter', () => {
         const requests = spec.buildRequests([bid01], bidderRequest);
         expect(requests).to.have.lengthOf(1);
         expect(requests[0].data.adUnits[0].mediaTypes.video).to.deep.equal(expected);
-        sinon.assert.calledTwice(utils.logWarn.withArgs(sinon.match(new RegExp(/^Adagio: The OpenRTB/))));
       });
     });
 
@@ -715,77 +800,24 @@ describe('Adagio bid adapter', () => {
     describe('with GPP', function() {
       const bid01 = new BidRequestBuilder().withParams().build();
 
-      const regsGpp = 'regs_gpp_consent_string';
-      const regsApplicableSections = [2];
-
-      const ortb2Gpp = 'ortb2_gpp_consent_string';
-      const ortb2GppSid = [1];
-
-      context('When GPP in regs module', function() {
-        it('send gpp and gppSid to the server', function() {
-          const bidderRequest = new BidderRequestBuilder({
-            gppConsent: {
-              gppString: regsGpp,
-              applicableSections: regsApplicableSections,
-            }
-          }).build();
-
-          const requests = spec.buildRequests([bid01], bidderRequest);
-
-          expect(requests[0].data.regs.gpp).to.equal(regsGpp);
-          expect(requests[0].data.regs.gppSid).to.equal(regsApplicableSections);
-        });
-      });
-
-      context('When GPP partially defined in regs module', function() {
-        it('send gpp and gppSid coming from ortb2 to the server', function() {
-          const bidderRequest = new BidderRequestBuilder({
-            gppConsent: {
-              gppString: regsGpp,
-            },
-            ortb2: {
-              regs: {
-                gpp: ortb2Gpp,
-                gpp_sid: ortb2GppSid,
-              }
-            }
-          }).build();
-
-          const requests = spec.buildRequests([bid01], bidderRequest);
-
-          expect(requests[0].data.regs.gpp).to.equal(ortb2Gpp);
-          expect(requests[0].data.regs.gppSid).to.equal(ortb2GppSid);
-        });
-
-        it('send empty gpp and gppSid if no ortb2 fields to the server', function() {
-          const bidderRequest = new BidderRequestBuilder({
-            gppConsent: {
-              gppString: regsGpp,
-            }
-          }).build();
-
-          const requests = spec.buildRequests([bid01], bidderRequest);
-
-          expect(requests[0].data.regs.gpp).to.equal('');
-          expect(requests[0].data.regs.gppSid).to.be.empty;
-        });
-      });
+      const gpp = 'gpp_consent_string';
+      const gppSid = [1];
 
-      context('When GPP defined in ortb2 module', function() {
+      context('When GPP is defined', function() {
         it('send gpp and gppSid coming from ortb2 to the server', function() {
           const bidderRequest = new BidderRequestBuilder({
             ortb2: {
               regs: {
-                gpp: ortb2Gpp,
-                gpp_sid: ortb2GppSid,
+                gpp,
+                gpp_sid: gppSid,
               }
             }
           }).build();
 
           const requests = spec.buildRequests([bid01], bidderRequest);
 
-          expect(requests[0].data.regs.gpp).to.equal(ortb2Gpp);
-          expect(requests[0].data.regs.gppSid).to.equal(ortb2GppSid);
+          expect(requests[0].data.regs.gpp).to.equal(gpp);
+          expect(requests[0].data.regs.gppSid).to.equal(gppSid);
         });
       });
 
@@ -861,11 +893,6 @@ describe('Adagio bid adapter', () => {
         }
         const requests = spec.buildRequests([bid01], bidderRequest);
 
-        expect(requests[0].data.adUnits[0].floors.length).to.equal(3);
-        expect(requests[0].data.adUnits[0].floors[0]).to.deep.equal({f: 1, mt: 'banner', s: '300x250'});
-        expect(requests[0].data.adUnits[0].floors[1]).to.deep.equal({f: 1, mt: 'banner', s: '300x600'});
-        expect(requests[0].data.adUnits[0].floors[2]).to.deep.equal({f: 1, mt: 'video', s: '600x480'});
-
         expect(requests[0].data.adUnits[0].mediaTypes.banner.sizes.length).to.equal(2);
         expect(requests[0].data.adUnits[0].mediaTypes.banner.bannerSizes[0]).to.deep.equal({size: [300, 250], floor: 1});
         expect(requests[0].data.adUnits[0].mediaTypes.banner.bannerSizes[1]).to.deep.equal({size: [300, 600], floor: 1});
@@ -890,10 +917,6 @@ describe('Adagio bid adapter', () => {
         }
         const requests = spec.buildRequests([bid01], bidderRequest);
 
-        expect(requests[0].data.adUnits[0].floors.length).to.equal(2);
-        expect(requests[0].data.adUnits[0].floors[0]).to.deep.equal({f: 1, mt: 'video'});
-        expect(requests[0].data.adUnits[0].floors[1]).to.deep.equal({f: 1, mt: 'native'});
-
         expect(requests[0].data.adUnits[0].mediaTypes.video.floor).to.equal(1);
         expect(requests[0].data.adUnits[0].mediaTypes.native.floor).to.equal(1);
       });
@@ -913,8 +936,6 @@ describe('Adagio bid adapter', () => {
         }
         const requests = spec.buildRequests([bid01], bidderRequest);
 
-        expect(requests[0].data.adUnits[0].floors.length).to.equal(1);
-        expect(requests[0].data.adUnits[0].floors[0]).to.deep.equal({mt: 'video'});
         expect(requests[0].data.adUnits[0].mediaTypes.video.floor).to.be.undefined;
       });
     });
@@ -958,6 +979,69 @@ describe('Adagio bid adapter', () => {
         expect(requests[0].data.usIfr).to.equal(false);
       });
     });
+
+    describe('with GPID', function () {
+      const gpid = '/12345/my-gpt-tag-0';
+
+      it('should add preferred gpid to the request', function () {
+        const bid01 = new BidRequestBuilder().withParams().build();
+        bid01.ortb2Imp = {
+          ext: {
+            gpid: gpid
+          }
+        };
+        const bidderRequest = new BidderRequestBuilder().build();
+        const requests = spec.buildRequests([bid01], bidderRequest);
+        expect(requests[0].data.adUnits[0].gpid).to.exist.and.equal(gpid);
+      });
+
+      it('should add backup gpid to the request', function () {
+        const bid01 = new BidRequestBuilder().withParams().build();
+        bid01.ortb2Imp = {
+          ext: {
+            data: { pbadslot: gpid }
+          }
+        };
+        const bidderRequest = new BidderRequestBuilder().build();
+        const requests = spec.buildRequests([bid01], bidderRequest);
+        expect(requests[0].data.adUnits[0].gpid).to.exist.and.equal(gpid);
+      });
+    });
+
+    describe('with DSA', function() {
+      it('should add DSA to the request', function() {
+        const dsaObject = {
+          dsarequired: 1,
+          pubrender: 1,
+          datatopub: 2,
+          transparency: [{
+            domain: 'domain.com',
+            dsaparams: [1, 2]
+          }]
+        }
+
+        const bid01 = new BidRequestBuilder().withParams().build();
+
+        const bidderRequest = new BidderRequestBuilder({
+          ortb2: {
+            regs: {
+              ext: {
+                dsa: dsaObject
+              }
+            }
+          }
+        }).build();
+        const requests = spec.buildRequests([bid01], bidderRequest);
+        expect(requests[0].data.regs.dsa).to.deep.equal(dsaObject);
+      });
+
+      it('should not add DSA to the request if not present', function() {
+        const bid01 = new BidRequestBuilder().withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+        const requests = spec.buildRequests([bid01], bidderRequest);
+        expect(requests[0].data.regs.dsa).to.be.undefined;
+      });
+    })
   });
 
   describe('interpretResponse()', function() {
@@ -1091,28 +1175,27 @@ describe('Adagio bid adapter', () => {
 
     it('should populate ADAGIO queue with ssp-data', function() {
       sandbox.stub(Date, 'now').returns(12345);
+      sandbox.stub(_internal, 'hasRtd').returns(true);
+      const spy = sandbox.spy(_internal.getAdagioNs().queue, 'push')
 
-      adagioMock.expects('enqueue').withExactArgs({
+      spec.interpretResponse(serverResponse, bidRequest);
+
+      expect(spy.withArgs({
         action: 'ssp-data',
         ts: 12345,
         data: serverResponse.body.data
-      }).once();
-
-      spec.interpretResponse(serverResponse, bidRequest);
-
-      adagioMock.verify();
+      }).calledOnce).to.be.true;
     });
 
     it('should properly try-catch an exception and return an empty array', function() {
-      sandbox.stub(adagio, 'enqueue').throws();
-      utilsMock.expects('logError').once();
-
+      sandbox.stub(_internal, 'hasRtd').returns(true);
+      sandbox.stub(_internal, 'getAdagioNs').returns({ queue: () => { throw new Error('test') } });
+      const spy = sandbox.spy(utils, 'logError');
       expect(spec.interpretResponse(serverResponse, bidRequest)).to.be.an('array').length(0);
-
-      utilsMock.verify();
+      expect(spy.calledOnce).to.be.true;
     });
 
-    describe('Response with video outstream', () => {
+    describe('Response with video outstream', function() {
       const bidRequestWithOutstream = utils.deepClone(bidRequest);
       bidRequestWithOutstream.data.adUnits[0].mediaTypes.video = {
         context: 'outstream',
@@ -1185,7 +1268,7 @@ describe('Adagio bid adapter', () => {
       });
     });
 
-    describe('Response with native add', () => {
+    describe('Response with native add', function() {
       const serverResponseWithNative = utils.deepClone(serverResponse)
       serverResponseWithNative.body.bids[0].mediaType = 'native';
       serverResponseWithNative.body.bids[0].admNative = {
@@ -1362,6 +1445,24 @@ describe('Adagio bid adapter', () => {
         expect(r[0].native.javascriptTrackers).to.equal(expected);
       });
     });
+
+    describe('Response with DSA', function() {
+      const dsaResponseObj = {
+        'behalf': 'Advertiser',
+        'paid': 'Advertiser',
+        'transparency': {
+          'domain': 'dsp1domain.com',
+          'params': [1, 2]
+        },
+        'adrender': 1
+      };
+
+      const serverResponseWithDsa = utils.deepClone(serverResponse);
+      serverResponseWithDsa.body.bids[0].meta.dsa = dsaResponseObj;
+
+      const bidResponse = spec.interpretResponse(serverResponseWithDsa, bidRequest)[0];
+      expect(bidResponse.meta.dsa).to.to.deep.equals(dsaResponseObj);
+    })
   });
 
   describe('getUserSyncs()', function() {
@@ -1395,216 +1496,6 @@ describe('Adagio bid adapter', () => {
     });
   });
 
-  describe('transformBidParams', function() {
-    it('Compute additional params in s2s mode', function() {
-      const adUnit = {
-        code: 'adunit-code',
-        params: {
-          organizationId: '1000'
-        }
-      };
-      const bid01 = new BidRequestBuilder({
-        'mediaTypes': {
-          banner: { sizes: [[300, 250]] },
-          video: {
-            context: 'outstream',
-            playerSize: [300, 250],
-            renderer: {
-              url: 'https://url.tld',
-              render: () => true
-            }
-          }
-        }
-      }).withParams().build();
-
-      const params = spec.transformBidParams({ param01: 'test' }, true, adUnit, [{ bidderCode: 'adagio', auctionId: bid01.auctionId, bids: [bid01] }]);
-      expect(params.param01).eq('test');
-    });
-  });
-
-  describe('Adagio features when prebid in top.window', function() {
-    it('should return all expected features when all expected bidder params are available', function() {
-      sandbox.stub(window.top.document, 'getElementById').returns(
-        fixtures.getElementById()
-      );
-      sandbox.stub(window.top, 'getComputedStyle').returns({ display: 'block' });
-      sandbox.stub(utils, 'inIframe').returns(false);
-
-      const bidRequest = new BidRequestBuilder({
-        'mediaTypes': {
-          banner: { sizes: [[300, 250]] }
-        }
-      }).withParams().build();
-
-      const bidderRequest = new BidderRequestBuilder().build();
-
-      const requests = spec.buildRequests([bidRequest], bidderRequest);
-      const result = requests[0].data.adUnits[0].features;
-
-      expect(result.adunit_position).to.match(/^[\d]+x[\d]+$/);
-      expect(result.page_dimensions).to.match(/^[\d]+x[\d]+$/);
-      expect(result.viewport_dimensions).to.match(/^[\d]+x[\d]+$/);
-      expect(result.print_number).to.be.a('String');
-      expect(result.dom_loading).to.be.a('String');
-      expect(result.user_timestamp).to.be.a('String');
-      expect(result.url).to.not.exist;
-      expect(result.device).to.not.exist;
-      expect(result.os).to.not.exist;
-      expect(result.browser).to.not.exist;
-    });
-
-    it('should return all expected features when `adUnitElementId` param is not available', function() {
-      sandbox.stub(utils, 'inIframe').returns(false);
-
-      const bidRequest = new BidRequestBuilder({
-        params: {
-          organizationId: '1000',
-          placement: 'PAVE_ATF',
-          site: 'SITE-NAME'
-        },
-        'mediaTypes': {
-          banner: { sizes: [[300, 250]] }
-        }
-      }).build();
-
-      const bidderRequest = new BidderRequestBuilder().build();
-
-      const requests = spec.buildRequests([bidRequest], bidderRequest);
-      const result = requests[0].data.adUnits[0].features;
-
-      expect(result.adunit_position).to.not.exist;
-      expect(result.page_dimensions).to.be.a('String');
-      expect(result.viewport_dimensions).to.be.a('String');
-      expect(result.print_number).to.be.a('String');
-      expect(result.dom_loading).to.be.a('String');
-      expect(result.user_timestamp).to.be.a('String');
-    });
-
-    it('should return `adunit_position` feature when the slot is hidden', function () {
-      const elem = fixtures.getElementById();
-      sandbox.stub(window.top.document, 'getElementById').returns(elem);
-      sandbox.stub(window.top, 'getComputedStyle').returns({ display: 'none' });
-      sandbox.stub(utils, 'inIframe').returns(false);
-
-      const bidRequest = new BidRequestBuilder({
-        mediaTypes: {
-          banner: { sizes: [[300, 250]] },
-        },
-      })
-        .withParams()
-        .build();
-
-      const bidderRequest = new BidderRequestBuilder().build();
-
-      const requests = spec.buildRequests([bidRequest], bidderRequest);
-      const result = requests[0].data.adUnits[0].features;
-
-      expect(result.adunit_position).to.match(/^[\d]+x[\d]+$/);
-      expect(elem.style.display).to.equal(null); // set null to reset style
-    });
-  });
-
-  describe('Adagio features when prebid in Safeframe', function() {
-    beforeEach(function () {
-      window.$sf = $sf;
-    });
-
-    afterEach(function () {
-      delete window.$sf;
-    });
-
-    it('should return all expected features when prebid is in safeframe iframe', function() {
-      sandbox.stub(window.$sf.ext, 'geom').returns({
-        win: {t: 23, r: 1920, b: 1200, l: 0, w: 1920, h: 1177},
-        self: {t: 210, r: 1159, b: 460, l: 859, w: 300, h: 250},
-      });
-
-      const bidRequest = new BidRequestBuilder({
-        'mediaTypes': {
-          banner: { sizes: [[300, 250]] }
-        }
-      }).withParams().build();
-
-      const bidderRequest = new BidderRequestBuilder().build();
-
-      const requests = spec.buildRequests([bidRequest], bidderRequest);
-      const result = requests[0].data.adUnits[0].features;
-
-      expect(result.page_dimensions).to.not.exist;
-      expect(result.viewport_dimensions).to.be.a('String');
-      expect(result.print_number).to.be.a('String');
-      expect(result.dom_loading).to.be.a('String');
-      expect(result.user_timestamp).to.be.a('String');
-      expect(result.adunit_position).to.exist;
-    });
-
-    it('should return all expected features when prebid safeframe api not properly implemented', function() {
-      const bidRequest = new BidRequestBuilder({
-        'mediaTypes': {
-          banner: { sizes: [[300, 250]] }
-        }
-      }).withParams().build();
-
-      const bidderRequest = new BidderRequestBuilder().build();
-
-      const requests = spec.buildRequests([bidRequest], bidderRequest);
-      const result = requests[0].data.adUnits[0].features;
-
-      expect(result.page_dimensions).to.not.exist;
-      expect(result.viewport_dimensions).to.not.exist;
-      expect(result.print_number).to.be.a('String');
-      expect(result.dom_loading).to.be.a('String');
-      expect(result.user_timestamp).to.be.a('String');
-      expect(result.adunit_position).to.not.exist;
-    });
-
-    it('should return all expected features when prebid safeframe api not properly implemented bis', function() {
-      window.$sf.ext.geom = undefined;
-
-      const bidRequest = new BidRequestBuilder({
-        'mediaTypes': {
-          banner: { sizes: [[300, 250]] }
-        }
-      }).withParams().build();
-
-      const bidderRequest = new BidderRequestBuilder().build();
-
-      const requests = spec.buildRequests([bidRequest], bidderRequest);
-      const result = requests[0].data.adUnits[0].features;
-
-      expect(result.page_dimensions).to.not.exist;
-      expect(result.viewport_dimensions).to.not.exist;
-      expect(result.print_number).to.be.a('String');
-      expect(result.dom_loading).to.be.a('String');
-      expect(result.user_timestamp).to.be.a('String');
-      expect(result.adunit_position).to.not.exist;
-    });
-  });
-
-  describe('Adagio features when prebid in crossdomain iframe', function() {
-    it('should return all expected features', function() {
-      sandbox.stub(utils, 'getWindowTop').throws();
-
-      const bidRequest = new BidRequestBuilder({
-        'mediaTypes': {
-          banner: { sizes: [[300, 250]] }
-        }
-      }).withParams().build();
-
-      const bidderRequest = new BidderRequestBuilder().build();
-
-      const requests = spec.buildRequests([bidRequest], bidderRequest);
-      const result = requests[0].data.adUnits[0].features;
-
-      expect(result.page_dimensions).to.not.exist;
-      expect(result.viewport_dimensions).to.not.exist;
-      expect(result.print_number).to.be.a('String');
-      expect(result.dom_loading).to.be.a('String');
-      expect(result.user_timestamp).to.be.a('String');
-      expect(result.adunit_position).to.not.exist;
-    });
-  });
-
   describe('site information using refererDetection or window.top', function() {
     it('should returns domain, page and window.referrer in a window.top context', function() {
       const bidderRequest = new BidderRequestBuilder({
@@ -1618,7 +1509,7 @@ describe('Adagio bid adapter', () => {
         }
       }).build();
 
-      expect(adagio.getSite(bidderRequest)).to.deep.equal({
+      expect(_internal.getSite(bidderRequest)).to.deep.equal({
         domain: 'test.io',
         page: 'https://test.io/article/a.html',
         referrer: 'https://google.com',
@@ -1627,7 +1518,7 @@ describe('Adagio bid adapter', () => {
     });
 
     it('should returns domain and page in a cross-domain w/ top domain reached context', function() {
-      sandbox.stub(utils, 'getWindowTop').throws();
+      sandbox.stub(utils, 'canAccessWindowTop').returns(false);
       sandbox.stub(utils, 'getWindowSelf').returns({
         document: {
           referrer: 'https://google.com'
@@ -1653,7 +1544,7 @@ describe('Adagio bid adapter', () => {
         refererInfo: info
       }).build();
 
-      expect(adagio.getSite(bidderRequest)).to.deep.equal({
+      expect(_internal.getSite(bidderRequest)).to.deep.equal({
         domain: 'level.io',
         page: 'http://level.io/',
         referrer: 'https://google.com',
@@ -1662,7 +1553,7 @@ describe('Adagio bid adapter', () => {
     });
 
     it('should return info in a cross-domain w/o top domain reached and w/o ancestor context', function() {
-      sandbox.stub(utils, 'getWindowTop').throws();
+      sandbox.stub(utils, 'canAccessWindowTop').returns(false);
 
       const info = {
         numIframes: 2,
@@ -1683,119 +1574,11 @@ describe('Adagio bid adapter', () => {
         refererInfo: info
       }).build();
 
-      const s = adagio.getSite(bidderRequest)
+      const s = _internal.getSite(bidderRequest)
       expect(s.domain).equal('example.com')
       expect(s.page).equal('http://example.com/iframe1.html')
       expect(s.referrer).match(/^https?:\/\/.+/);
       expect(s.top).equal(false)
     });
   });
-
-  describe('adagioScriptFromLocalStorageCb()', function() {
-    const VALID_HASH = 'Lddcw3AADdQDrPtbRJkKxvA+o1CtScGDIMNRpHB3NnlC/FYmy/9RKXelKrYj/sjuWusl5YcOpo+lbGSkk655i8EKuDiOvK6ae/imxSrmdziIp+S/TA6hTFJXcB8k1Q9OIp4CMCT52jjXgHwX6G0rp+uYoCR25B1jHaHnpH26A6I=';
-    const INVALID_HASH = 'invalid';
-    const VALID_SCRIPT_CONTENT = 'var _ADAGIO=function(){};(_ADAGIO)();\n';
-    const INVALID_SCRIPT_CONTENT = 'var _ADAGIO=function(){//corrupted};(_ADAGIO)();\n';
-    const ADAGIO_LOCALSTORAGE_KEY = 'adagioScript';
-
-    beforeEach(function() {
-      localStorage.removeItem(ADAGIO_LOCALSTORAGE_KEY);
-    });
-
-    describe('getAdagioScript', function() {
-      it('should run storage.getDataFromLocalStorage callback and call adagioScriptFromLocalStorageCb() ', function() {
-        sandbox.spy(adagio, 'adagioScriptFromLocalStorageCb');
-        const getDataFromLocalStorageStub = sandbox.stub(storage, 'getDataFromLocalStorage').callsArg(1);
-        localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, '// hash: ' + VALID_HASH + '\n' + VALID_SCRIPT_CONTENT);
-
-        getAdagioScript();
-
-        sinon.assert.callCount(getDataFromLocalStorageStub, 1);
-        sinon.assert.callCount(adagio.adagioScriptFromLocalStorageCb, 1);
-      });
-
-      it('should load external script if the user consent', function() {
-        sandbox.stub(storage, 'localStorageIsEnabled').callsArgWith(0, true);
-        getAdagioScript();
-
-        expect(loadExternalScript.called).to.be.true;
-      });
-
-      it('should not load external script if the user does not consent', function() {
-        sandbox.stub(storage, 'localStorageIsEnabled').callsArgWith(0, false);
-        getAdagioScript();
-
-        expect(loadExternalScript.called).to.be.false;
-      });
-
-      it('should remove the localStorage key if exists and the user does not consent', function() {
-        sandbox.stub(storage, 'localStorageIsEnabled').callsArgWith(0, false);
-        localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, 'the script');
-
-        getAdagioScript();
-
-        expect(loadExternalScript.called).to.be.false;
-        expect(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY)).to.be.null;
-      });
-    });
-
-    it('should verify valid hash with valid script', function () {
-      localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, '// hash: ' + VALID_HASH + '\n' + VALID_SCRIPT_CONTENT);
-
-      utilsMock.expects('logInfo').withExactArgs('Adagio: start script.').once();
-      utilsMock.expects('logWarn').withExactArgs('Adagio: no hash found.').never();
-      utilsMock.expects('logWarn').withExactArgs('Adagio: invalid script found.').never();
-
-      adagioScriptFromLocalStorageCb(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY));
-
-      expect(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY)).to.equals('// hash: ' + VALID_HASH + '\n' + VALID_SCRIPT_CONTENT);
-      utilsMock.verify();
-    });
-
-    it('should verify valid hash with invalid script', function () {
-      localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, '// hash: ' + VALID_HASH + '\n' + INVALID_SCRIPT_CONTENT);
-
-      utilsMock.expects('logInfo').withExactArgs('Adagio: start script').never();
-      utilsMock.expects('logWarn').withExactArgs('Adagio: no hash found.').never();
-      utilsMock.expects('logWarn').withExactArgs('Adagio: invalid script found.').once();
-
-      adagioScriptFromLocalStorageCb(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY));
-
-      expect(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY)).to.be.null;
-      utilsMock.verify();
-    });
-
-    it('should verify invalid hash with valid script', function () {
-      localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, '// hash: ' + INVALID_HASH + '\n' + VALID_SCRIPT_CONTENT);
-
-      utilsMock.expects('logInfo').withExactArgs('Adagio: start script').never();
-      utilsMock.expects('logWarn').withExactArgs('Adagio: no hash found.').never();
-      utilsMock.expects('logWarn').withExactArgs('Adagio: invalid script found.').once();
-
-      adagioScriptFromLocalStorageCb(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY));
-
-      expect(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY)).to.be.null;
-      utilsMock.verify();
-    });
-
-    it('should verify missing hash', function () {
-      localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, VALID_SCRIPT_CONTENT);
-
-      utilsMock.expects('logInfo').withExactArgs('Adagio: start script').never();
-      utilsMock.expects('logWarn').withExactArgs('Adagio: no hash found.').once();
-      utilsMock.expects('logWarn').withExactArgs('Adagio: invalid script found.').never();
-
-      adagioScriptFromLocalStorageCb(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY));
-
-      expect(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY)).to.be.null;
-      utilsMock.verify();
-    });
-
-    it('should return false if content script does not exist in localStorage', function() {
-      sandbox.spy(utils, 'logWarn');
-      expect(adagioScriptFromLocalStorageCb(null)).to.be.undefined;
-      sinon.assert.callCount(utils.logWarn, 1);
-      sinon.assert.calledWith(utils.logWarn, 'Adagio: script not found.');
-    });
-  });
 });
diff --git a/test/spec/modules/adagioRtdProvider_spec.js b/test/spec/modules/adagioRtdProvider_spec.js
new file mode 100644
index 00000000000..7b9fec595b1
--- /dev/null
+++ b/test/spec/modules/adagioRtdProvider_spec.js
@@ -0,0 +1,616 @@
+import {
+  PLACEMENT_SOURCES,
+  _internal,
+  adagioRtdSubmodule,
+  storage,
+} from 'modules/adagioRtdProvider.js';
+import * as utils from 'src/utils.js';
+import { loadExternalScript } from '../../../src/adloader.js';
+import { expect } from 'chai';
+import { getGlobal } from '../../../src/prebidGlobal.js';
+
+describe('Adagio Rtd Provider', function () {
+  const SUBMODULE_NAME = 'adagio';
+
+  function getElementByIdMock(width, height, x, y) {
+    const obj = {
+      x: x || 800,
+      y: y || 300,
+      width: width || 300,
+      height: height || 250,
+    };
+
+    return {
+      ...obj,
+      getBoundingClientRect: () => {
+        return {
+          width: obj.width,
+          height: obj.height,
+          left: obj.x,
+          top: obj.y,
+          right: obj.x + obj.width,
+          bottom: obj.y + obj.height
+        };
+      }
+    };
+  }
+
+  let sandbox;
+  let clock;
+
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    clock = sandbox.useFakeTimers();
+  });
+
+  afterEach(function () {
+    clock.restore();
+    sandbox.restore();
+  });
+
+  describe('submodule `init`', function () {
+    const config = {
+      name: SUBMODULE_NAME,
+      params: {
+        organizationId: '1000',
+        site: 'mysite'
+      }
+    };
+
+    it('exists', function () {
+      expect(adagioRtdSubmodule.init).to.be.a('function');
+    });
+
+    it('returns false missing config params', function () {
+      const value = adagioRtdSubmodule.init({
+        name: SUBMODULE_NAME,
+      });
+      expect(value).to.equal(false);
+    });
+
+    it('returns false if missing providers param', function () {
+      const value = adagioRtdSubmodule.init({
+        name: SUBMODULE_NAME,
+        params: {}
+      });
+      expect(value).to.equal(false);
+    });
+
+    it('returns false if organizationId param is not a string', function () {
+      const value = adagioRtdSubmodule.init({
+        name: SUBMODULE_NAME,
+        params: {
+          organizationId: 1000,
+          site: 'mysite'
+        }
+      });
+      expect(value).to.equal(false);
+    });
+
+    it('returns false if `site` param is not a string', function () {
+      const value = adagioRtdSubmodule.init({
+        name: SUBMODULE_NAME,
+        params: {
+          organizationId: '1000',
+          site: 123
+        }
+      });
+      expect(value).to.equal(false);
+    });
+
+    it('returns true if `organizationId` and `site` params included', function () {
+      const value = adagioRtdSubmodule.init(config);
+      expect(value).to.equal(true);
+    });
+
+    it('load an external script if localStorageIsEnabled is enabled', function () {
+      sandbox.stub(storage, 'localStorageIsEnabled').callsArgWith(0, true)
+      adagioRtdSubmodule.init(config);
+      expect(loadExternalScript.called).to.be.true;
+    });
+
+    it('do not load an external script if localStorageIsEnabled is disabled', function () {
+      sandbox.stub(storage, 'localStorageIsEnabled').callsArgWith(0, false)
+      adagioRtdSubmodule.init(config);
+      expect(loadExternalScript.called).to.be.false;
+    });
+
+    describe('store session data in localStorage', function () {
+      const session = {
+        expiry: 1714116530700,
+        id: 'uid-1234',
+        rnd: 0.5697,
+        vwSmplg: 0.1,
+        vwSmplgNxt: 0.1,
+        pages: 1,
+        v: 2
+      };
+
+      it('store new session data for further usage', function () {
+        const storageValue = null;
+        sandbox.stub(storage, 'getDataFromLocalStorage').callsArgWith(1, storageValue);
+        sandbox.stub(Date, 'now').returns(1714116520710);
+        sandbox.stub(Math, 'random').returns(0.8);
+        sandbox.stub(utils, 'generateUUID').returns('uid-1234');
+
+        const spy = sandbox.spy(_internal.getAdagioNs().queue, 'push')
+
+        adagioRtdSubmodule.init(config);
+
+        const expected = {
+          session: {
+            v: 2,
+            new: true,
+            id: utils.generateUUID(),
+            rnd: Math.random(),
+            pages: 1,
+          }
+        }
+
+        expect(spy.withArgs({
+          action: 'session',
+          ts: Date.now(),
+          data: expected,
+        }).calledOnce).to.be.true;
+      });
+
+      it('store existing session data for further usage', function () {
+        const storageValue = JSON.stringify({session: session});
+        sandbox.stub(storage, 'getDataFromLocalStorage').callsArgWith(1, storageValue);
+        sandbox.stub(Date, 'now').returns(1714116520710);
+        sandbox.stub(Math, 'random').returns(0.8);
+
+        const spy = sandbox.spy(_internal.getAdagioNs().queue, 'push')
+
+        adagioRtdSubmodule.init(config);
+
+        const expected = {
+          session: {
+            ...session,
+            new: false,
+          }
+        }
+
+        expect(spy.withArgs({
+          action: 'session',
+          ts: Date.now(),
+          data: expected,
+        }).calledOnce).to.be.true;
+      });
+
+      it('store new session if old session has expired data for further usage', function () {
+        const storageValue = JSON.stringify({session: session});
+        sandbox.stub(Date, 'now').returns(1715679344351);
+        sandbox.stub(storage, 'getDataFromLocalStorage').callsArgWith(1, storageValue);
+        sandbox.stub(Math, 'random').returns(0.8);
+        sandbox.stub(utils, 'generateUUID').returns('uid-5678');
+
+        const spy = sandbox.spy(_internal.getAdagioNs().queue, 'push')
+
+        adagioRtdSubmodule.init(config);
+
+        const expected = {
+          session: {
+            ...session,
+            new: true,
+            id: utils.generateUUID(),
+            rnd: Math.random(),
+          }
+        }
+
+        expect(spy.withArgs({
+          action: 'session',
+          ts: Date.now(),
+          data: expected,
+        }).calledOnce).to.be.true;
+      });
+    });
+  });
+
+  describe('submodule `getBidRequestData`', function () {
+    const bidReqConfig = {
+      'timeout': 700,
+      'adUnits': [
+        {
+          'code': 'div-gpt-ad-1460505748561-0',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[300, 250]]
+            }
+          },
+          'ortb2Imp': {},
+          'bids': [
+            {
+              'bidder': 'adagio',
+              'params': {
+                'organizationId': '1004',
+                'site': 'maville',
+                'useAdUnitCodeAsPlacement': true,
+                'adUnitElementId': 'div-gpt-ad-1460505748561-0',
+                'pagetype': 'article',
+              }
+            },
+            {
+              'bidder': 'another',
+              'params': {
+                'pubid': 'xxx',
+              }
+            }
+          ]
+        }
+      ],
+      'adUnitCodes': [
+        'div-gpt-ad-1460505748561-0'
+      ],
+      'ortb2Fragments': {
+        'global': {
+          'regs': {
+            'ext': {
+              'gdpr': 1
+            }
+          },
+          'site': {
+            'domain': 'example.com',
+            'publisher': {
+              'domain': 'example.com'
+            },
+            'page': 'http://example.com/page.html',
+          },
+          'device': {
+            'w': 1359,
+            'h': 1253,
+            'dnt': 0,
+            'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+            'language': 'fr'
+          }
+        },
+        'bidder': {}
+      }
+    };
+
+    function cb() {}
+
+    beforeEach(function() {
+      _internal.getFeatures().reset();
+    });
+
+    it('exists', function () {
+      expect(adagioRtdSubmodule.getBidRequestData).to.be.a('function');
+    });
+
+    it('update the ortb2Fragments object with adg_rtd signals', function() {
+      const bidRequest = utils.deepClone(bidReqConfig);
+
+      sandbox.stub(window.top.document, 'getElementById').returns(getElementByIdMock());
+      sandbox.stub(window.top, 'getComputedStyle').returns({ display: 'block' });
+      sandbox.stub(utils, 'inIframe').returns(false);
+
+      adagioRtdSubmodule.getBidRequestData(bidRequest, cb);
+      const signals = bidRequest.ortb2Fragments.global.site.ext.data.adg_rtd;
+      expect(signals).to.have.property('features');
+      expect(signals).to.have.property('session');
+      expect(signals).to.have.property('uid');
+      expect(signals.features.viewport_dimensions).to.match(/\d+x\d+/);
+      expect(signals.features.page_dimensions).to.match(/\d+x\d+/);
+
+      expect(bidRequest.adUnits[0]).to.have.property('ortb2Imp');
+      expect(bidRequest.adUnits[0].ortb2Imp.ext.data.adg_rtd.adunit_position).to.match(/\d+x\d+/);
+    });
+
+    describe('update the ortb2Fragments object a SafeFrame context', function() {
+      it('update', function() {
+        sandbox.stub(utils, 'isSafeFrameWindow').returns(true);
+        sandbox.stub(utils, 'canAccessWindowTop').returns(false);
+
+        window.$sf = {
+          ext: {
+            geom() {
+              return {
+                win: {t: 23, r: 1920, b: 1200, l: 0, w: 1920, h: 1177},
+                self: {t: 210, r: 1159, b: 460, l: 859, w: 300, h: 250},
+              }
+            }
+          }
+        };
+
+        const bidRequest = utils.deepClone(bidReqConfig);
+        adagioRtdSubmodule.getBidRequestData(bidRequest, cb);
+
+        const fragmentExt = bidRequest.ortb2Fragments.global.site.ext.data.adg_rtd;
+        expect(fragmentExt.features.viewport_dimensions).equal('1920x1177');
+        expect(fragmentExt.features.page_dimensions).equal('');
+
+        const ortb2ImpExt = bidRequest.adUnits[0].ortb2Imp.ext.data.adg_rtd;
+        expect(ortb2ImpExt.adunit_position).equal('210x859');
+
+        window.$sf = undefined;
+      });
+
+      it('handle missformated $sf object and update', function() {
+        sandbox.stub(utils, 'isSafeFrameWindow').returns(true);
+        sandbox.stub(utils, 'canAccessWindowTop').returns(false);
+
+        window.$sf = {
+          ext: {
+            geom: ''
+          }
+        };
+
+        const bidRequest = utils.deepClone(bidReqConfig);
+        adagioRtdSubmodule.getBidRequestData(bidRequest, cb);
+
+        const fragmentExt = bidRequest.ortb2Fragments.global.site.ext.data.adg_rtd;
+        expect(fragmentExt.features.viewport_dimensions).equal('');
+        expect(fragmentExt.features.page_dimensions).equal('');
+
+        const ortb2ImpExt = bidRequest.adUnits[0].ortb2Imp.ext.data.adg_rtd;
+        expect(ortb2ImpExt.adunit_position).equal('');
+
+        window.$sf = undefined;
+      });
+    });
+
+    describe('update the ortb2Fragments object in a "inIframe" context', function() {
+      it('update when window.top is accessible', function() {
+        sandbox.stub(utils, 'canAccessWindowTop').returns(true);
+        sandbox.stub(utils, 'isSafeFrameWindow').returns(false);
+        sandbox.stub(utils, 'inIframe').returns(true);
+
+        const bidRequest = utils.deepClone(bidReqConfig);
+        adagioRtdSubmodule.getBidRequestData(bidRequest, cb);
+
+        const ortb2ImpExt = bidRequest.adUnits[0].ortb2Imp.ext.data.adg_rtd;
+        expect(ortb2ImpExt.adunit_position).equal('');
+      });
+
+      it('catch error when window.top is accessible', function() {
+        sandbox.stub(utils, 'canAccessWindowTop').returns(true);
+        sandbox.stub(utils, 'isSafeFrameWindow').returns(false);
+        sandbox.stub(window.document, 'getElementById').throws();
+
+        const bidRequest = utils.deepClone(bidReqConfig);
+        adagioRtdSubmodule.getBidRequestData(bidRequest, cb);
+
+        const ortb2ImpExt = bidRequest.adUnits[0].ortb2Imp.ext.data.adg_rtd;
+        expect(ortb2ImpExt.adunit_position).equal('');
+      });
+    });
+
+    it('update the ortb2Fragments object when window.top is not accessible', function() {
+      sandbox.stub(utils, 'canAccessWindowTop').returns(false);
+      sandbox.stub(utils, 'isSafeFrameWindow').returns(false);
+
+      const bidRequest = utils.deepClone(bidReqConfig);
+      adagioRtdSubmodule.getBidRequestData(bidRequest, cb);
+
+      const fragmentExt = bidRequest.ortb2Fragments.global.site.ext.data.adg_rtd;
+      expect(fragmentExt.features.viewport_dimensions).equal('');
+      expect(fragmentExt.features.page_dimensions).equal('');
+
+      const ortb2ImpExt = bidRequest.adUnits[0].ortb2Imp.ext.data.adg_rtd;
+      expect(ortb2ImpExt.adunit_position).equal('');
+    });
+
+    describe('update the ortb2Imp.ext.data.placement if not present', function() {
+      const config = {
+        name: SUBMODULE_NAME,
+        params: {
+          organizationId: '1000',
+          site: 'mysite'
+        }
+      };
+
+      it('update the placement value with the adUnit.code value', function() {
+        const configCopy = utils.deepClone(config);
+        configCopy.params.placementSource = PLACEMENT_SOURCES.ADUNITCODE;
+
+        const bidRequest = utils.deepClone(bidReqConfig);
+
+        adagioRtdSubmodule.getBidRequestData(bidRequest, cb, configCopy);
+        expect(bidRequest.adUnits[0]).to.have.property('ortb2Imp');
+        expect(bidRequest.adUnits[0].ortb2Imp.ext.data.placement).to.equal('div-gpt-ad-1460505748561-0');
+      });
+
+      it('update the placement value with the gpid value', function() {
+        const configCopy = utils.deepClone(config);
+        configCopy.params.placementSource = PLACEMENT_SOURCES.GPID;
+
+        const bidRequest = utils.deepClone(bidReqConfig);
+        const gpid = '/19968336/header-bid-tag-0'
+        utils.deepSetValue(bidRequest.adUnits[0], 'ortb2Imp.ext.gpid', gpid)
+
+        adagioRtdSubmodule.getBidRequestData(bidRequest, cb, configCopy);
+        expect(bidRequest.adUnits[0]).to.have.property('ortb2Imp');
+        expect(bidRequest.adUnits[0].ortb2Imp.ext.data.placement).to.equal(gpid);
+      });
+
+      it('update the placement value the legacy adUnit[].bids adagio.params.placement value', function() {
+        const placement = 'placement-value';
+
+        const configCopy = utils.deepClone(config);
+
+        const bidRequest = utils.deepClone(bidReqConfig);
+        bidRequest.adUnits[0].bids[0].params.placement = placement;
+
+        adagioRtdSubmodule.getBidRequestData(bidRequest, cb, configCopy);
+        expect(bidRequest.adUnits[0]).to.have.property('ortb2Imp');
+        expect(bidRequest.adUnits[0].ortb2Imp.ext.data.placement).to.equal(placement);
+      });
+
+      it('it does not populate `ortb2Imp.ext.data.placement` if no fallback', function() {
+        const configCopy = utils.deepClone(config);
+        const bidRequest = utils.deepClone(bidReqConfig);
+
+        adagioRtdSubmodule.getBidRequestData(bidRequest, cb, configCopy);
+        expect(bidRequest.adUnits[0]).to.have.property('ortb2Imp');
+        expect(bidRequest.adUnits[0].ortb2Imp.ext.data.placement).to.not.exist;
+      });
+
+      it('ensure we create the `ortb2Imp` object if it does not exist', function() {
+        const configCopy = utils.deepClone(config);
+        configCopy.params.placementSource = PLACEMENT_SOURCES.ADUNITCODE;
+
+        const bidRequest = utils.deepClone(bidReqConfig);
+        delete bidRequest.adUnits[0].ortb2Imp;
+
+        adagioRtdSubmodule.getBidRequestData(bidRequest, cb, configCopy);
+        expect(bidRequest.adUnits[0]).to.have.property('ortb2Imp');
+        expect(bidRequest.adUnits[0].ortb2Imp.ext.data.placement).to.equal('div-gpt-ad-1460505748561-0');
+      });
+    });
+  });
+
+  describe('submodule `onBidRequestEvent`', function() {
+    const bidderRequest = {
+      'bidderCode': 'adagio',
+      'auctionId': '3de10dc0-fe75-480f-95cc-f15f2c4929fe',
+      'bidderRequestId': '4ecd1f17cf829b',
+      'bids': [
+        {
+          'bidder': 'adagio',
+          'params': {
+            'organizationId': '1000',
+            'site': 'example',
+            'adUnitElementId': 'div-gpt-ad-1460505748561-0',
+            'pagetype': 'article',
+            'environment': 'desktop',
+            'placement': 'div-gpt-ad-1460505748561-0',
+            'adagioAuctionId': '4c259968-0158-443d-af93-551bac594b6c',
+            'pageviewId': 'dfb9b067-e5c4-4212-97bb-c67d6313ecaf'
+          },
+          'ortb2Imp': {
+            'ext': {
+              'tid': '235c991e-fcc4-416b-95d3-f60e53575bee',
+              'data': {
+                'adserver': {
+                  'name': 'gam',
+                  'adslot': '/19968336/header-bid-tag-0'
+                },
+                'pbadslot': '/19968336/header-bid-tag-0',
+                'adunit_position': '8x95'
+              },
+              'gpid': '/19968336/header-bid-tag-0'
+            }
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          'adUnitCode': 'div-gpt-ad-1460505748561-0',
+          'transactionId': '235c991e-fcc4-416b-95d3-f60e53575bee',
+          'adUnitId': '79ab5904-0b21-4235-965a-f4905af072b7',
+          'bidId': '534aa529a44e0e',
+          'bidderRequestId': '4ecd1f17cf829b',
+          'auctionId': '3de10dc0-fe75-480f-95cc-f15f2c4929fe',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0,
+          'ortb2': {
+            'site': {
+              'ext': {
+                'data': {
+                  'adg_rtd': {
+                    'uid': 'dfb9b067-e5c4-4212-97bb-c67d6313ecaf',
+                    'features': {
+                      'page_dimensions': '1359x1353',
+                      'viewport_dimensions': '1359x1253',
+                      'user_timestamp': '1715621032',
+                      'dom_loading': '28'
+                    },
+                    'session': {
+                      'new': true,
+                      'rnd': 0.020644826280300954,
+                      'vwSmplg': 0.1,
+                      'vwSmplgNxt': 0.1,
+                      'pages': 1
+                    }
+                  }
+                }
+              }
+            }
+          },
+        },
+      ],
+      'auctionStart': 1715613832791,
+      'timeout': 700,
+      'ortb2': {
+        'site': {
+          'ext': {
+            'data': {
+              'adg_rtd': {
+                'features': {
+                  'page_dimensions': '1359x1353',
+                  'viewport_dimensions': '1359x1253',
+                  'user_timestamp': '1715621032',
+                  'dom_loading': '28'
+                },
+                'session': {
+                  'new': true,
+                  'rnd': 0.020644826280300954,
+                  'vwSmplg': 0.1,
+                  'vwSmplgNxt': 0.1,
+                  'pages': 1
+                }
+              }
+            }
+          }
+        }
+      },
+      'start': 1715613832796
+    }
+
+    it('store a copy of computed property', function() {
+      const spy = sandbox.spy(_internal.getAdagioNs().queue, 'push')
+      sandbox.stub(Date, 'now').returns(12345);
+
+      _internal.getGuard().clear();
+
+      const config = {
+        params: {
+          organizationId: '1000',
+          site: 'example'
+        }
+      };
+      const bidderRequestCopy = utils.deepClone(bidderRequest);
+      adagioRtdSubmodule.onBidRequestEvent(bidderRequestCopy, config);
+
+      clock.tick(1);
+
+      const {
+        bidder,
+        adUnitCode,
+        mediaTypes,
+        params,
+        auctionId,
+        bidderRequestsCount } = bidderRequestCopy.bids[0];
+
+      const expected = {
+        bidder,
+        adUnitCode,
+        mediaTypes,
+        ortb2: bidderRequestCopy.bids[0].ortb2.site.ext.data,
+        ortb2Imp: bidderRequestCopy.bids[0].ortb2Imp.ext.data,
+        params,
+        auctionId,
+        bidderRequestsCount,
+        organizationId: config.params.organizationId,
+        site: config.params.site,
+        localPbjs: 'pbjs',
+        localPbjsRef: getGlobal()
+      }
+
+      expect(spy.withArgs({
+        action: 'store',
+        ts: Date.now(),
+        data: expected,
+      }).calledOnce).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/adbookpspBidAdapter_spec.js b/test/spec/modules/adbookpspBidAdapter_spec.js
deleted file mode 100755
index 3f26cd7749f..00000000000
--- a/test/spec/modules/adbookpspBidAdapter_spec.js
+++ /dev/null
@@ -1,1344 +0,0 @@
-import { expect } from 'chai';
-import * as utils from '../../../src/utils.js';
-import {
-  spec,
-  storage,
-  DEFAULT_BIDDER_CONFIG,
-  VERSION,
-  common,
-} from '../../../modules/adbookpspBidAdapter.js';
-
-describe('adbookpsp bid adapter', () => {
-  let sandbox;
-
-  beforeEach(function () {
-    sandbox = sinon.sandbox.create();
-
-    sandbox
-      .stub(common, 'generateUUID')
-      .returns('54444444-5444-4444-9444-544444444444');
-    sandbox.stub(common, 'getWindowDimensions').returns({
-      innerWidth: 100,
-      innerHeight: 100,
-    });
-  });
-
-  afterEach(function () {
-    sandbox.restore();
-  });
-
-  describe('isBidRequestValid()', () => {
-    it('should return false when there is no banner in mediaTypes', () => {
-      const bid = utils.deepClone(bannerBid);
-      delete bid.mediaTypes.banner;
-
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when orgId and placementId is not defined', () => {
-      const bid = utils.deepClone(bannerBid);
-      delete bid.params.placementId;
-      delete bid.params.orgId;
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-    });
-
-    it('should return true when orgId is set in config', () => {
-      const bid = utils.deepClone(bannerBid);
-
-      delete bid.params.placementId;
-      delete bid.params.orgId;
-
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp.orgId')
-        .returns('129576');
-
-      expect(spec.isBidRequestValid(bid)).to.be.true;
-    });
-
-    it('should return true when required params found', () => {
-      expect(spec.isBidRequestValid(bannerBid)).to.equal(true);
-      expect(spec.isBidRequestValid(videoBid)).to.equal(true);
-      expect(spec.isBidRequestValid(mixedBid)).to.equal(true);
-    });
-
-    it('should return false when sizes for banner are not specified', () => {
-      const bid = utils.deepClone(bannerBid);
-      delete bid.mediaTypes.banner.sizes;
-
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when sizes for banner are invalid', () => {
-      const bid = utils.deepClone(bannerBid);
-      delete bid.mediaTypes.banner.sizes;
-
-      bid.mediaTypes.banner.sizes = [['123', 'foo']];
-
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return true if player size is set via playerSize', () => {
-      expect(spec.isBidRequestValid(videoBid)).to.equal(true);
-    });
-
-    it('should return true if player size is set via w and h', () => {
-      const bid = utils.deepClone(videoBid);
-      delete bid.mediaTypes.video.playerSize;
-
-      bid.mediaTypes.video.w = 400;
-      bid.mediaTypes.video.h = 300;
-
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should reutrn false if player size is not set', () => {
-      const bid = utils.deepClone(videoBid);
-      delete bid.mediaTypes.video.playerSize;
-
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests()', () => {
-    it('should build correct request for banner bid', () => {
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp.orgId')
-        .returns(undefined)
-        .withArgs('adbookpsp.exchangeUrl')
-        .returns('https://ex.fattail.com/openrtb2');
-
-      const requests = spec.buildRequests([bannerBid], bidderRequest);
-
-      expect(requests).to.have.lengthOf(1);
-      expect(requests[0]).to.deep.include({
-        method: 'POST',
-        url: 'https://ex.fattail.com/openrtb2',
-        options: {
-          contentType: 'application/json',
-          withCredentials: true,
-        },
-      });
-      expect(JSON.parse(requests[0].data)).to.deep.equal(bannerExchangeRequest);
-    });
-
-    it('should build correct request for video bid', () => {
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp')
-        .returns(DEFAULT_BIDDER_CONFIG)
-        .withArgs('adbookpsp.exchangeUrl')
-        .returns(DEFAULT_BIDDER_CONFIG.exchangeUrl)
-        .withArgs('adbookpsp.orgId')
-        .returns(undefined);
-
-      const requests = spec.buildRequests([videoBid], bidderRequest);
-
-      expect(requests).to.have.lengthOf(1);
-      expect(requests[0]).to.deep.include({
-        method: 'POST',
-        url: 'https://ex.fattail.com/openrtb2',
-        options: {
-          contentType: 'application/json',
-          withCredentials: true,
-        },
-      });
-      expect(JSON.parse(requests[0].data)).to.deep.include({
-        ...videoExchangeRequest,
-        ext: {
-          adbook: {
-            config: DEFAULT_BIDDER_CONFIG,
-            version: {
-              adapter: VERSION,
-              prebid: '$prebid.version$',
-            },
-          },
-        },
-      });
-    });
-
-    it('should build correct request for video bid with w and h', () => {
-      const bid = utils.deepClone(videoBid);
-
-      delete bid.mediaTypes.video.playerSize;
-
-      bid.mediaTypes.video.w = 400;
-      bid.mediaTypes.video.h = 300;
-
-      const [request] = spec.buildRequests([bid], bidderRequest);
-      const requestData = JSON.parse(request.data);
-
-      expect(requestData.imp[0].video.w).to.equal(400);
-      expect(requestData.imp[0].video.h).to.equal(300);
-    });
-
-    it('should build correct request for video bid with both w, h and playerSize', () => {
-      const bid = utils.deepClone(videoBid);
-
-      bid.mediaTypes.video.w = 640;
-      bid.mediaTypes.video.h = 480;
-
-      const [request] = spec.buildRequests([bid], bidderRequest);
-      const requestData = JSON.parse(request.data);
-
-      expect(requestData.imp[0].video.w).to.equal(640);
-      expect(requestData.imp[0].video.h).to.equal(480);
-    });
-
-    it('should build correct request for mixed bid', () => {
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp.orgId')
-        .returns(undefined)
-        .withArgs('adbookpsp.exchangeUrl')
-        .returns('https://ex.fattail.com/openrtb2');
-
-      const requests = spec.buildRequests([mixedBid], bidderRequest);
-
-      expect(requests).to.have.lengthOf(1);
-      expect(requests[0]).to.deep.include({
-        method: 'POST',
-        url: 'https://ex.fattail.com/openrtb2',
-        options: {
-          contentType: 'application/json',
-          withCredentials: true,
-        },
-      });
-      expect(JSON.parse(requests[0].data)).to.deep.include(
-        mixedExchangeRequest
-      );
-    });
-
-    it('should use orgId from config', () => {
-      const bid = utils.deepClone(bannerBid);
-
-      delete bid.params;
-
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp.orgId')
-        .returns('129576');
-
-      const requests = spec.buildRequests([bid], bidderRequest);
-      const request = JSON.parse(requests[0].data);
-
-      expect(request.imp[0].ext).to.deep.include({
-        adbook: {
-          orgId: '129576',
-        },
-      });
-    });
-
-    it('should use orgId from adUnit when orgId is also set in config', () => {
-      const bid = utils.deepClone(bannerBid);
-
-      delete bid.params.placementId;
-
-      bid.params.orgId = 'adUnitOrgId';
-
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp.orgId')
-        .returns('configOrgId');
-
-      const requests = spec.buildRequests([bid], bidderRequest);
-      const request = JSON.parse(requests[0].data);
-
-      expect(request.imp[0].ext).to.deep.include({
-        adbook: {
-          orgId: 'adUnitOrgId',
-        },
-      });
-    });
-
-    it('should include in request GDPR options if available', () => {
-      const request = utils.deepClone(bidderRequest);
-
-      delete request.uspConsent;
-
-      const requests = spec.buildRequests([bannerBid, mixedBid], request);
-
-      expect(JSON.parse(requests[0].data)).to.deep.include({
-        regs: {
-          coppa: 0,
-          ext: {
-            gdpr: 1,
-            gdprConsentString: 'gdprConsentString',
-          },
-        },
-      });
-    });
-
-    it('should include in request USP (CPPA) options if available', () => {
-      const request = utils.deepClone(bidderRequest);
-
-      delete request.gdprConsent;
-
-      const requests = spec.buildRequests([bannerBid, mixedBid], request);
-
-      expect(JSON.parse(requests[0].data)).to.deep.include({
-        regs: {
-          coppa: 0,
-          ext: {
-            us_privacy: 'uspConsentString',
-          },
-        },
-      });
-    });
-
-    it('should pass valid coppa flag based on config', () => {
-      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
-
-      const request = utils.deepClone(bidderRequest);
-
-      delete request.gdprConsent;
-      delete request.uspConsent;
-
-      const requests = spec.buildRequests([bannerBid, mixedBid], request);
-
-      expect(JSON.parse(requests[0].data)).to.deep.include({
-        regs: {
-          coppa: 1,
-        },
-      });
-    });
-
-    it('should pass GDPR, USP (CCPA) and COPPA options', () => {
-      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
-
-      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
-
-      expect(JSON.parse(requests[0].data)).to.deep.include({
-        regs: {
-          coppa: 1,
-          ext: {
-            gdpr: 1,
-            gdprConsentString: 'gdprConsentString',
-            us_privacy: 'uspConsentString',
-          },
-        },
-      });
-    });
-
-    it('should generate and pass user id when is not present in cookie and local storage is not enabled', () => {
-      sandbox.stub(storage, 'localStorageIsEnabled').returns(false);
-      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
-      const rtbRequest = JSON.parse(requests[0].data);
-
-      expect(rtbRequest.user.id).to.have.lengthOf(36);
-    });
-
-    it('should pass user id when is present in cookie', () => {
-      sandbox.stub(storage, 'localStorageIsEnabled').returns(false);
-      sandbox
-        .stub(storage, 'getCookie')
-        .returns('e35da6bb-f2f8-443b-aeff-3375bef45c9d');
-      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
-      const rtbRequest = JSON.parse(requests[0].data);
-
-      expect(rtbRequest.user.id).to.equal(
-        'e35da6bb-f2f8-443b-aeff-3375bef45c9d'
-      );
-    });
-
-    it('should pass user id if is present in local storage', () => {
-      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
-      sandbox
-        .stub(storage, 'getDataFromLocalStorage')
-        .returns('e35da6bb-f2f8-443b-aeff-3375bef45c9d');
-
-      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
-      const rtbRequest = JSON.parse(requests[0].data);
-      expect(rtbRequest.user.id).to.equal(
-        'e35da6bb-f2f8-443b-aeff-3375bef45c9d'
-      );
-    });
-
-    it('should regenerate user id if it is invalid', () => {
-      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
-      sandbox.stub(storage, 'getDataFromLocalStorage').returns('foo');
-
-      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
-      const rtbRequest = JSON.parse(requests[0].data);
-      expect(rtbRequest.user.id).to.have.lengthOf(36);
-    });
-
-    it('should pass schain if available', () => {
-      const bid = utils.deepClone(bannerBid);
-      const schain = {
-        ver: '1.0',
-        complete: 1,
-        nodes: [
-          {
-            asi: 'exchange1.com',
-            sid: '1234',
-            hp: 1,
-            rid: 'bid-request-1',
-            name: 'publisher',
-            domain: 'publisher.com',
-          },
-        ],
-      };
-
-      bid.schain = schain;
-
-      const requests = spec.buildRequests([bid], bidderRequest);
-
-      expect(JSON.parse(requests[0].data).source).to.deep.include({
-        ext: {
-          schain,
-        },
-      });
-    });
-
-    it('return empty array if there are no valid bid requests', () => {
-      const requests = spec.buildRequests([], bidderRequest);
-
-      expect(requests).to.deep.equal([]);
-    });
-
-    it('should prioritize device information set in config', () => {
-      const ua =
-        'Mozilla/5.0 (iPhone; CPU iPhone OS 13_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.1 Mobile/15E148 Safari/604.1';
-
-      sandbox.stub(common, 'getConfig').withArgs('device').returns({
-        ua,
-      });
-
-      const requests = spec.buildRequests([bannerBid], bidderRequest);
-
-      expect(JSON.parse(requests[0].data).device.ua).to.equal(ua);
-    });
-
-    it('should include bidder config', () => {
-      const bidderConfig = {
-        bidTTL: 500,
-        defaultCurrency: 'USD',
-        exchangeUrl: 'https://exsb.fattail.com/openrtb2',
-        winTrackingEnabled: true,
-        winTrackingUrl: 'https://evsb.fattail.com/wins',
-        orgId: '129576',
-      };
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp')
-        .returns(bidderConfig);
-
-      const requests = spec.buildRequests([bannerBid], bidderRequest);
-      const request = JSON.parse(requests[0].data);
-
-      expect(request.ext).to.deep.include({
-        adbook: {
-          config: bidderConfig,
-          version: {
-            adapter: VERSION,
-            prebid: '$prebid.version$',
-          },
-        },
-      });
-    });
-
-    it('should use bidder video params if they are set', () => {
-      const videoBidWithParams = utils.deepClone(videoBid);
-      const bidderVideoParams = {
-        api: [1, 2],
-        mimes: ['video/mp4', 'video/x-flv'],
-        playbackmethod: [3, 4],
-        protocols: [5, 6],
-        minduration: 10,
-        maxduration: 30,
-      };
-      videoBidWithParams.params.video = bidderVideoParams;
-
-      const requests = spec.buildRequests([videoBidWithParams], bidderRequest);
-      const request = JSON.parse(requests[0].data);
-
-      expect(request.imp[0]).to.deep.include({
-        video: {
-          ...bidderVideoParams,
-          w: videoBidWithParams.mediaTypes.video.playerSize[0][0],
-          h: videoBidWithParams.mediaTypes.video.playerSize[0][1],
-        },
-      });
-    });
-  });
-
-  describe('interpretResponse()', () => {
-    it('should correctly interpret valid response', () => {
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp.defaultCurrency')
-        .returns(DEFAULT_BIDDER_CONFIG.defaultCurrency)
-        .withArgs('adbookpsp.bidTTL')
-        .returns(DEFAULT_BIDDER_CONFIG.bidTTL);
-
-      const response = utils.deepClone(exchangeResponse);
-      const bids = spec.interpretResponse(
-        { body: response },
-        { data: JSON.stringify(exchangeBidRequest) }
-      );
-
-      expect(bids).to.deep.equal([
-        {
-          bidderRequestId: '999ccceeee11',
-          requestId: '9873kfse',
-          bidId: 'bid123456',
-          width: 300,
-          height: 250,
-          ttl: 300,
-          cpm: 0.5,
-          currency: 'USD',
-          creativeId: '123456789',
-          mediaType: 'banner',
-          meta: {
-            advertiserDomains: ['advertiser.com'],
-            mediaType: 'banner',
-            primaryCatId: 'IAB2-1',
-            secondaryCatIds: ['IAB2-2', 'IAB2-3'],
-          },
-          netRevenue: true,
-          nurl: 'http://win.example.url',
-          adUnitCode: 'div-gpt-ad-837465923534-0',
-          ad: '
ad
',
-          adId: '5',
-          adserverTargeting: {
-            hb_ad_ord_adbookpsp: '0_0', // the value to the left of the underscore represents the index of the ad id and the number to the right represents the order index
-            hb_adid_c_adbookpsp: '5',
-            hb_deal_adbookpsp: 'werwetwerw',
-            hb_liid_adbookpsp: '2342345',
-            hb_ordid_adbookpsp: '567843',
-          },
-          referrer: 'http://prebid-test-page.io:8080/banner.html',
-          lineItemId: '2342345',
-        },
-        {
-          ad: '',
-          adId: '10',
-          adUnitCode: 'div-gpt-ad-837465923534-0',
-          adserverTargeting: {
-            hb_ad_ord_adbookpsp: '0_0',
-            hb_adid_c_adbookpsp: '10',
-            hb_deal_adbookpsp: 'dsfxcxcvxc',
-            hb_liid_adbookpsp: '2121221',
-            hb_ordid_adbookpsp: '5678234',
-          },
-          bidId: 'bid4321',
-          bidderRequestId: '999ccceeee11',
-          cpm: 0.45,
-          creativeId: '543123',
-          currency: 'USD',
-          height: 250,
-          lineItemId: '2121221',
-          mediaType: 'video',
-          meta: {
-            advertiserDomains: ['advertiser.com', 'campaign.advertiser.com'],
-            mediaType: 'video',
-            primaryCatId: 'IAB2-3',
-            secondaryCatIds: [],
-          },
-          netRevenue: true,
-          nurl: 'http://win.example.url',
-          referrer: 'http://prebid-test-page.io:8080/banner.html',
-          requestId: '120kfeske',
-          ttl: 300,
-          vastXml:
-            '',
-          width: 300,
-        },
-      ]);
-    });
-
-    it('should place valid GAM targeting for all bids when multiple bids are present for multiple impressions', () => {
-      const response = utils.deepClone(exchangeResponse);
-
-      const bids = spec.interpretResponse(
-        { body: response },
-        { data: JSON.stringify(exchangeBidRequest) }
-      );
-
-      expect(bids).to.have.length(2);
-      expect(bids[0].adserverTargeting).to.deep.equal({
-        hb_ad_ord_adbookpsp: '0_0',
-        hb_adid_c_adbookpsp: '5',
-        hb_deal_adbookpsp: 'werwetwerw',
-        hb_liid_adbookpsp: '2342345',
-        hb_ordid_adbookpsp: '567843',
-      });
-      expect(bids[1].adserverTargeting).to.deep.equal({
-        hb_ad_ord_adbookpsp: '0_0',
-        hb_adid_c_adbookpsp: '10',
-        hb_deal_adbookpsp: 'dsfxcxcvxc',
-        hb_liid_adbookpsp: '2121221',
-        hb_ordid_adbookpsp: '5678234',
-      });
-    });
-
-    it('should place valid GAM targeting for all bids when multiple bids are present for single impression', () => {
-      const response = utils.deepClone(exchangeResponse);
-
-      response.seatbid[1].bid[0].impid = '9873kfse';
-
-      const bids = spec.interpretResponse(
-        { body: response },
-        { data: JSON.stringify(exchangeBidRequest) }
-      );
-
-      expect(bids).to.have.length(2);
-      for (const bid of bids) {
-        expect(bid.adserverTargeting).to.deep.equal({
-          hb_ad_ord_adbookpsp: '0_0,1_0',
-          hb_adid_c_adbookpsp: '5,10',
-          hb_deal_adbookpsp: 'werwetwerw,dsfxcxcvxc',
-          hb_liid_adbookpsp: '2342345,2121221',
-          hb_ordid_adbookpsp: '567843,5678234',
-        });
-      }
-    });
-
-    it('should return no bids if response id does not match bidderRequestId', () => {
-      const body = utils.deepClone(exchangeResponse);
-      body.id = '999';
-
-      const bids = spec.interpretResponse(
-        { body },
-        { data: JSON.stringify(exchangeBidRequest) }
-      );
-
-      expect(bids).to.deep.equal([]);
-    });
-
-    it('should return no bids if response does not include seatbid', () => {
-      const body = utils.deepClone(exchangeResponse);
-      delete body.seatbid;
-
-      const bids = spec.interpretResponse(
-        { body },
-        { data: JSON.stringify(exchangeBidRequest) }
-      );
-
-      expect(bids).to.deep.equal([]);
-    });
-
-    it('should return no bids if response does not include any bids', () => {
-      const body = utils.deepClone(exchangeResponse);
-      body.seatbid = [];
-
-      const bids = spec.interpretResponse(
-        { body },
-        { data: JSON.stringify(exchangeBidRequest) }
-      );
-
-      expect(bids).to.deep.equal([]);
-    });
-
-    it('should exclude invalid video bids', () => {
-      const body = utils.deepClone(exchangeResponse);
-
-      body.seatbid.shift();
-      body.seatbid[0].bid[0].adid = 34;
-
-      const bids = spec.interpretResponse(
-        { body },
-        { data: JSON.stringify(exchangeBidRequest) }
-      );
-
-      expect(bids).to.deep.equal([]);
-    });
-
-    it('should exclude invalid banner bids', () => {
-      const body = utils.deepClone(exchangeResponse);
-      const request = utils.deepClone(exchangeBidRequest);
-
-      body.seatbid.pop();
-
-      delete body.seatbid[0].bid[0].w;
-      delete body.seatbid[0].bid[0].h;
-
-      request.imp[0].banner.format.push({ w: 300, h: 600 });
-
-      const bids = spec.interpretResponse(
-        { body },
-        { data: JSON.stringify(request) }
-      );
-
-      expect(bids).to.deep.equal([]);
-    });
-
-    it('should not include invalid banner bids in targeting map', () => {
-      const body = utils.deepClone(exchangeResponse);
-      const request = utils.deepClone(exchangeBidRequest);
-
-      body.seatbid[0].bid[0].h = '600';
-
-      request.imp[0].banner.format.push({ w: 300, h: 600 });
-
-      const bids = spec.interpretResponse(
-        { body },
-        { data: JSON.stringify(exchangeBidRequest) }
-      );
-
-      expect(bids[0].adserverTargeting).to.deep.equal({
-        hb_ad_ord_adbookpsp: '0_0',
-        hb_adid_c_adbookpsp: '10',
-        hb_deal_adbookpsp: 'dsfxcxcvxc',
-        hb_liid_adbookpsp: '2121221',
-        hb_ordid_adbookpsp: '5678234',
-      });
-    });
-
-    it('should not validate banner bid dimensions if bid request has single size', () => {
-      const body = utils.deepClone(exchangeResponse);
-      const request = utils.deepClone(exchangeBidRequest);
-
-      delete body.seatbid[1];
-      delete body.seatbid[0].bid[0].h;
-      delete body.seatbid[0].bid[0].w;
-
-      const bids = spec.interpretResponse(
-        { body },
-        { data: JSON.stringify(request) }
-      );
-
-      expect(bids.length).to.equal(1);
-    });
-  });
-
-  describe('getUserSyncs()', () => {
-    it('should return user syncs if there are included in the response and syncs are enabled', () => {
-      const syncs = spec.getUserSyncs(
-        {
-          pixelEnabled: true,
-          iframeEnabled: true,
-        },
-        [{ body: exchangeResponse }]
-      );
-
-      expect(syncs).to.deep.equal([
-        {
-          type: 'image',
-          url: 'http://sometest.com/sync/1234567',
-        },
-        {
-          type: 'iframe',
-          url: 'http://sometest.com/sync/1234567',
-        },
-      ]);
-    });
-
-    it('should not return user syncs if syncs are disabled', () => {
-      const syncs = spec.getUserSyncs(
-        {
-          pixelEnabled: false,
-          iframeEnabled: false,
-        },
-        [{ body: exchangeResponse }]
-      );
-
-      expect(syncs).to.deep.equal([]);
-    });
-
-    it('should return image syncs if they are enabled', () => {
-      const syncs = spec.getUserSyncs(
-        {
-          pixelEnabled: true,
-          iframeEnabled: false,
-        },
-        [{ body: exchangeResponse }]
-      );
-
-      expect(syncs).to.deep.equal([
-        {
-          type: 'image',
-          url: 'http://sometest.com/sync/1234567',
-        },
-      ]);
-    });
-
-    it('should return iframe syncs if they are enabled', () => {
-      const syncs = spec.getUserSyncs(
-        {
-          pixelEnabled: false,
-          iframeEnabled: true,
-        },
-        [{ body: exchangeResponse }]
-      );
-
-      expect(syncs).to.deep.equal([
-        {
-          type: 'iframe',
-          url: 'http://sometest.com/sync/1234567',
-        },
-      ]);
-    });
-
-    it('should append COPPA status to sync url', () => {
-      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
-      const syncs = spec.getUserSyncs(
-        {
-          pixelEnabled: false,
-          iframeEnabled: true,
-        },
-        [{ body: utils.deepClone(exchangeResponse) }]
-      );
-
-      expect(syncs).to.deep.equal([
-        {
-          type: 'iframe',
-          url: 'http://sometest.com/sync/1234567?coppa=1',
-        },
-      ]);
-    });
-
-    it('should append GDPR consent data to url', () => {
-      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(false);
-      const syncs = spec.getUserSyncs(
-        {
-          pixelEnabled: false,
-          iframeEnabled: true,
-        },
-        [{ body: utils.deepClone(exchangeResponse) }],
-        { gdprApplies: true, consentString: 'gdprConsentString' }
-      );
-
-      expect(syncs).to.deep.equal([
-        {
-          type: 'iframe',
-          url: 'http://sometest.com/sync/1234567?gdpr=1&consentString=gdprConsentString',
-        },
-      ]);
-    });
-
-    it('should append USP (CCPA) consent string to url', () => {
-      const syncs = spec.getUserSyncs(
-        {
-          pixelEnabled: false,
-          iframeEnabled: true,
-        },
-        [{ body: utils.deepClone(exchangeResponse) }],
-        undefined,
-        'uspConsentString'
-      );
-
-      expect(syncs).to.deep.equal([
-        {
-          type: 'iframe',
-          url: 'http://sometest.com/sync/1234567?us_privacy=uspConsentString',
-        },
-      ]);
-    });
-
-    it('should append COPPA, GDPR and USP (CCPA) url params', () => {
-      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
-      const syncs = spec.getUserSyncs(
-        {
-          pixelEnabled: true,
-          iframeEnabled: true,
-        },
-        [{ body: utils.deepClone(exchangeResponse) }],
-        { gdprApplies: true, consentString: 'gdprConsentString' },
-        'uspConsentString'
-      );
-
-      expect(syncs).to.deep.equal([
-        {
-          type: 'image',
-          url: 'http://sometest.com/sync/1234567?gdpr=1&consentString=gdprConsentString&us_privacy=uspConsentString&coppa=1',
-        },
-        {
-          type: 'iframe',
-          url: 'http://sometest.com/sync/1234567?gdpr=1&consentString=gdprConsentString&us_privacy=uspConsentString&coppa=1',
-        },
-      ]);
-    });
-
-    it('should respect url param syntax when appending params', () => {
-      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
-
-      const response = utils.deepClone(exchangeResponse);
-
-      response.ext.sync[0] = {
-        type: 'image',
-        url: 'http://sometest.com/sync/1234567?horseCount=4',
-      };
-
-      const syncs = spec.getUserSyncs(
-        {
-          pixelEnabled: true,
-          iframeEnabled: false,
-        },
-        [{ body: response }],
-        { gdprApplies: true, consentString: 'gdprConsentString' },
-        'uspConsentString'
-      );
-
-      expect(syncs).to.deep.equal([
-        {
-          type: 'image',
-          url: 'http://sometest.com/sync/1234567?horseCount=4&gdpr=1&consentString=gdprConsentString&us_privacy=uspConsentString&coppa=1',
-        },
-      ]);
-    });
-  });
-
-  describe('onBidWon()', () => {
-    it('should track win if win tracking is enabled', () => {
-      const spy = sandbox.spy(utils, 'triggerPixel');
-
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp.winTrackingEnabled')
-        .returns(true)
-        .withArgs('adbookpsp.winTrackingUrl')
-        .returns('https://ev.fattail.com/wins');
-
-      spec.onBidWon({
-        requestId: 'requestId',
-        bidderRequestId: 'bidderRequestId',
-        bidId: 'bidId',
-      });
-
-      expect(
-        spy.calledWith(
-          'https://ev.fattail.com/wins?impId=requestId&reqId=bidderRequestId&bidId=bidId'
-        )
-      ).to.equal(true);
-    });
-    it('should call bid.nurl if win tracking is enabled', () => {
-      const spy = sandbox.spy(utils, 'triggerPixel');
-
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp.winTrackingEnabled')
-        .returns(true)
-        .withArgs('adbookpsp.winTrackingUrl')
-        .returns('https://ev.fattail.com/wins');
-
-      spec.onBidWon({
-        requestId: 'requestId',
-        bidderRequestId: 'bidderRequestId',
-        bidId: 'bidId',
-        nurl: 'http://win.example.url',
-      });
-
-      expect(spy.calledWith('http://win.example.url')).to.equal(true);
-    });
-    it('should not track win nor call bid.nurl if win tracking is disabled', () => {
-      const spy = sandbox.spy(utils, 'triggerPixel');
-
-      sandbox
-        .stub(common, 'getConfig')
-        .withArgs('adbookpsp.winTrackingEnabled')
-        .returns(false)
-        .withArgs('adbookpsp.winTrackingUrl')
-        .returns('https://ev.fattail.com/wins');
-
-      spec.onBidWon({
-        requestId: 'requestId',
-        bidderRequestId: 'bidderRequestId',
-        bidId: 'bidId',
-        nurl: 'http://win.example.url',
-      });
-
-      expect(spy.notCalled).to.equal(true);
-    });
-  });
-});
-
-const bidderRequest = {
-  auctionId: 'aaccee333311',
-  bidderRequestId: '999ccceeee11',
-  timeout: 200,
-  refererInfo: {
-    page: 'http://mock-page.com',
-    domain: 'mock-page.com',
-    ref: 'http://example-domain.com/foo',
-  },
-  gdprConsent: {
-    gdprApplies: 1,
-    consentString: 'gdprConsentString',
-  },
-  uspConsent: 'uspConsentString',
-  ortb2: {
-    source: {
-      tid: 'aaccee333311'
-    }
-  }
-};
-
-const bannerBid = {
-  bidder: 'adbookpsp',
-  params: {
-    placementId: '12390123',
-  },
-  mediaTypes: {
-    banner: {
-      sizes: [
-        [300, 250],
-        [300, 600],
-      ],
-    },
-  },
-  adUnitCode: 'div-gpt-ad-837465923534-0',
-  transactionId: 'sfsf89e-mck3-asf3-fe45-feksjfi123mfs',
-  bidId: '9873kfse',
-  bidderRequestId: '999ccceeee11',
-  auctionId: 'aaccee333311',
-  lineItemId: 123123123,
-};
-
-const bannerExchangeRequest = {
-  id: '999ccceeee11',
-  device: {
-    h: 100,
-    w: 100,
-    js: true,
-    ua: navigator.userAgent,
-    dnt: 0,
-  },
-  regs: {
-    coppa: 0,
-    ext: {
-      gdpr: 1,
-      gdprConsentString: 'gdprConsentString',
-      us_privacy: 'uspConsentString',
-    },
-  },
-  site: {
-    domain: 'mock-page.com',
-    page: 'http://mock-page.com',
-    ref: 'http://example-domain.com/foo',
-  },
-  source: {
-    fd: 1,
-    tid: 'aaccee333311',
-  },
-  tmax: 200,
-  user: {
-    gdprConsentString: 'gdprConsentString',
-    id: '54444444-5444-4444-9444-544444444444',
-  },
-  imp: [
-    {
-      banner: {
-        format: [
-          {
-            w: 300,
-            h: 250,
-          },
-          {
-            w: 300,
-            h: 600,
-          },
-        ],
-        w: 300,
-        h: 250,
-        topframe: 0,
-        pos: 0,
-      },
-      ext: {
-        adbook: {
-          placementId: '12390123',
-        },
-      },
-      id: '9873kfse',
-      tagid: 'div-gpt-ad-837465923534-0',
-    },
-  ],
-  ext: {
-    adbook: {
-      version: {
-        adapter: VERSION,
-        prebid: '$prebid.version$',
-      },
-    },
-  },
-};
-
-const videoBid = {
-  bidder: 'adbookpsp',
-  params: {
-    placementId: '129576',
-  },
-  mediaTypes: {
-    video: {
-      api: [1, 2, 4, 6],
-      mimes: ['video/mp4'],
-      playbackmethod: [2, 4, 6],
-      playerSize: [[400, 300]],
-      protocols: [3, 4, 7, 8, 10],
-    },
-  },
-  adUnitCode: 'div-gpt-ad-9383743831-6',
-  transactionId: 'aacc3fasf-fere-1335-8m1s-785393mc3fj',
-  bidId: '120kfeske',
-  bidderRequestId: '999ccceeee11',
-  auctionId: 'aaccee333311',
-  lineItemId: 321321321,
-};
-
-const videoExchangeRequest = {
-  id: '999ccceeee11',
-  device: {
-    h: 100,
-    w: 100,
-    js: true,
-    ua: navigator.userAgent,
-    dnt: 0,
-  },
-  regs: {
-    coppa: 0,
-    ext: {
-      gdpr: 1,
-      gdprConsentString: 'gdprConsentString',
-      us_privacy: 'uspConsentString',
-    },
-  },
-  site: {
-    domain: 'mock-page.com',
-    page: 'http://mock-page.com',
-    ref: 'http://example-domain.com/foo',
-  },
-  source: {
-    fd: 1,
-    tid: 'aaccee333311',
-  },
-  tmax: 200,
-  user: {
-    gdprConsentString: 'gdprConsentString',
-    id: '54444444-5444-4444-9444-544444444444',
-  },
-  imp: [
-    {
-      video: {
-        api: [1, 2, 4, 6],
-        h: 300,
-        mimes: ['video/mp4'],
-        playbackmethod: [2, 4, 6],
-        protocols: [3, 4, 7, 8, 10],
-        w: 400,
-      },
-      ext: {
-        adbook: {
-          placementId: '129576',
-        },
-      },
-      id: '120kfeske',
-      tagid: 'div-gpt-ad-9383743831-6',
-    },
-  ],
-  ext: {
-    adbook: {
-      version: {
-        adapter: VERSION,
-        prebid: '$prebid.version$',
-      },
-    },
-  },
-};
-
-const mixedBid = {
-  bidder: 'adbookpsp',
-  params: {
-    orgId: '129576',
-  },
-  mediaTypes: {
-    banner: {
-      sizes: [[300, 600]],
-    },
-    video: {
-      mimes: ['video/mp4'],
-      playerSize: [[300, 600]],
-    },
-  },
-  adUnitCode: 'div-gpt-ad-9383743831-5',
-  transactionId: 'aacc3fasf-fere-1335-8m1s-785393mc3fj',
-  bidId: '120kfeske',
-  bidderRequestId: '999ccceeee11',
-  auctionId: 'aaccee333311',
-  lineItemId: 12341234,
-};
-
-const mixedExchangeRequest = {
-  id: '999ccceeee11',
-  device: {
-    h: 100,
-    w: 100,
-    js: true,
-    ua: navigator.userAgent,
-    dnt: 0,
-  },
-  regs: {
-    coppa: 0,
-    ext: {
-      gdpr: 1,
-      gdprConsentString: 'gdprConsentString',
-      us_privacy: 'uspConsentString',
-    },
-  },
-  site: {
-    domain: 'mock-page.com',
-    page: 'http://mock-page.com',
-    ref: 'http://example-domain.com/foo',
-  },
-  source: {
-    fd: 1,
-    tid: 'aaccee333311',
-  },
-  tmax: 200,
-  user: {
-    gdprConsentString: 'gdprConsentString',
-    id: '54444444-5444-4444-9444-544444444444',
-  },
-  imp: [
-    {
-      banner: {
-        format: [
-          {
-            w: 300,
-            h: 600,
-          },
-        ],
-        w: 300,
-        h: 600,
-        topframe: 0,
-        pos: 0,
-      },
-      video: {
-        h: 600,
-        mimes: ['video/mp4'],
-        w: 300,
-      },
-      ext: {
-        adbook: {
-          orgId: '129576',
-        },
-      },
-      id: '120kfeske',
-      tagid: 'div-gpt-ad-9383743831-5',
-    },
-  ],
-  ext: {
-    adbook: {
-      version: {
-        adapter: VERSION,
-        prebid: '$prebid.version$',
-      },
-    },
-  },
-};
-
-const exchangeBidRequest = {
-  id: '999ccceeee11',
-  tmax: 200,
-  imp: [
-    {
-      id: '9873kfse',
-      banner: {
-        format: [
-          {
-            w: 300,
-            h: 250,
-          },
-        ],
-      },
-      video: {
-        w: 300,
-        h: 250,
-      },
-      tagid: 'div-gpt-ad-837465923534-0',
-    },
-    {
-      id: '120kfeske',
-      banner: {
-        format: [
-          {
-            w: 300,
-            h: 250,
-          },
-        ],
-      },
-      video: {
-        w: 300,
-        h: 250,
-      },
-      tagid: 'div-gpt-ad-837465923534-0',
-    },
-  ],
-  source: {
-    fd: 1,
-    tid: 'aaccee333311',
-  },
-  site: {
-    domain: location.hostname,
-    page: location.href,
-    ref: 'http://prebid-test-page.io:8080/banner.html',
-  },
-};
-
-const exchangeResponse = {
-  id: '999ccceeee11',
-  seatbid: [
-    {
-      seat: 'adbookpsp',
-      group: 0,
-      bid: [
-        {
-          id: 'bid123456',
-          w: 300,
-          h: 250,
-          impid: '9873kfse',
-          price: 0.5,
-          exp: 300,
-          crid: '123456789',
-          adm: '
ad
',
-          adid: '5',
-          dealid: 'werwetwerw',
-          nurl: 'http://win.example.url',
-          ext: {
-            liid: '2342345',
-            ordid: '567843',
-          },
-          cat: ['IAB2-1', 'IAB2-2', 'IAB2-3'],
-          adomain: ['advertiser.com'],
-        },
-      ],
-    },
-    {
-      seat: 'adbookpsp',
-      group: 0,
-      bid: [
-        {
-          id: 'bid4321',
-          impid: '120kfeske',
-          price: 0.45,
-          exp: 300,
-          crid: '543123',
-          adm: '',
-          adid: '10',
-          dealid: 'dsfxcxcvxc',
-          nurl: 'http://win.example.url',
-          ext: {
-            liid: '2121221',
-            ordid: '5678234',
-          },
-          cat: ['IAB2-3'],
-          adomain: ['advertiser.com', 'campaign.advertiser.com'],
-        },
-      ],
-    },
-  ],
-  ext: {
-    sync: [
-      {
-        type: 'image',
-        url: 'http://sometest.com/sync/1234567',
-      },
-      {
-        type: 'iframe',
-        url: 'http://sometest.com/sync/1234567',
-      },
-    ],
-  },
-};
diff --git a/test/spec/modules/adbutlerBidAdapter_spec.js b/test/spec/modules/adbutlerBidAdapter_spec.js
new file mode 100644
index 00000000000..6c38de717a3
--- /dev/null
+++ b/test/spec/modules/adbutlerBidAdapter_spec.js
@@ -0,0 +1,329 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adbutlerBidAdapter.js';
+
+describe('AdButler adapter', function () {
+  let validBidRequests;
+
+  beforeEach(function () {
+    validBidRequests = [
+      {
+        bidder: 'adbutler',
+        params: {
+          accountID: '181556',
+          zoneID: '705374',
+          keyword: 'red',
+          minCPM: '1.00',
+          maxCPM: '5.00',
+        },
+        placementCode: '/19968336/header-bid-tag-1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      },
+    ];
+  });
+
+  describe('for requests', function () {
+    describe('without account ID', function () {
+      it('rejects the bid', function () {
+        const invalidBid = {
+          bidder: 'adbutler',
+          params: {
+            zoneID: '210093',
+          },
+        };
+        const isValid = spec.isBidRequestValid(invalidBid);
+
+        expect(isValid).to.equal(false);
+      });
+    });
+
+    describe('without a zone ID', function () {
+      it('rejects the bid', function () {
+        const invalidBid = {
+          bidder: 'adbutler',
+          params: {
+            accountID: '167283',
+          },
+        };
+        const isValid = spec.isBidRequestValid(invalidBid);
+
+        expect(isValid).to.equal(false);
+      });
+    });
+
+    describe('with a valid bid', function () {
+      describe('with a custom domain', function () {
+        it('uses the custom domain', function () {
+          validBidRequests[0].params.domain = 'customadbutlerdomain.com';
+
+          const requests = spec.buildRequests(validBidRequests);
+          const requestURL = requests[0].url;
+
+          expect(requestURL).to.have.string('customadbutlerdomain.com');
+        });
+      });
+
+      it('accepts the bid', function () {
+        const validBid = {
+          bidder: 'adbutler',
+          params: {
+            accountID: '167283',
+            zoneID: '210093',
+          },
+        };
+        const isValid = spec.isBidRequestValid(validBid);
+
+        expect(isValid).to.equal(true);
+      });
+
+      it('sets default domain', function () {
+        const requests = spec.buildRequests(validBidRequests);
+        const request = requests[0];
+
+        let [domain] = request.url.split('/adserve/');
+
+        expect(domain).to.equal('https://servedbyadbutler.com');
+      });
+
+      it('sets the keyword parameter', function () {
+        const requests = spec.buildRequests(validBidRequests);
+        const requestURL = requests[0].url;
+
+        expect(requestURL).to.have.string(';kw=red;');
+      });
+
+      describe('with extra params', function () {
+        beforeEach(function() {
+          validBidRequests[0].params.extra = {
+            foo: 'bar',
+          };
+        });
+
+        it('sets the extra parameter', function () {
+          const requests = spec.buildRequests(validBidRequests);
+          const requestURL = requests[0].url;
+
+          expect(requestURL).to.have.string(';foo=bar;');
+        });
+      });
+
+      describe('with multiple bids to the same zone', function () {
+        it('increments the place count', function () {
+          const requests = spec.buildRequests([validBidRequests[0], validBidRequests[0]]);
+          const firstRequest = requests[0].url;
+          const secondRequest = requests[1].url;
+
+          expect(firstRequest).to.have.string(';place=0;');
+          expect(secondRequest).to.have.string(';place=1;');
+        });
+      });
+    });
+  });
+
+  describe('for server responses', function () {
+    let serverResponse;
+
+    describe('with no body', function () {
+      beforeEach(function() {
+        serverResponse = {
+          body: null,
+        };
+      });
+
+      it('does not return any bids', function () {
+        const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+
+        expect(bids).to.be.length(0);
+      });
+    });
+
+    describe('with an incorrect size', function () {
+      beforeEach(function() {
+        serverResponse = {
+          body: {
+            status: 'SUCCESS',
+            account_id: 167283,
+            zone_id: 210083,
+            cpm: 1.5,
+            width: 728,
+            height: 90,
+            place: 0,
+          },
+        };
+      });
+
+      it('does not return any bids', function () {
+        const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+
+        expect(bids).to.be.length(0);
+      });
+    });
+
+    describe('with a failed status', function () {
+      beforeEach(function() {
+        serverResponse = {
+          body: {
+            status: 'NO_ELIGIBLE_ADS',
+            zone_id: 210083,
+            width: 300,
+            height: 250,
+            place: 0,
+          },
+        };
+      });
+
+      it('does not return any bids', function () {
+        const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+
+        expect(bids).to.be.length(0);
+      });
+    });
+
+    describe('with low CPM', function () {
+      beforeEach(function() {
+        serverResponse = {
+          body: {
+            status: 'SUCCESS',
+            account_id: 167283,
+            zone_id: 210093,
+            cpm: 0.75,
+            width: 300,
+            height: 250,
+            place: 0,
+            ad_code: '',
+            tracking_pixels: [],
+          },
+        }
+      });
+
+      describe('with a minimum CPM', function () {
+        it('does not return any bids', function () {
+          const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+          expect(bids).to.be.length(0);
+        });
+      });
+
+      describe('with no minimum CPM', function () {
+        beforeEach(function() {
+          delete validBidRequests[0].params.minCPM;
+        });
+
+        it('returns a bid', function() {
+          const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+
+          expect(bids).to.be.length(1);
+        });
+      });
+    });
+
+    describe('with high CPM', function () {
+      beforeEach(function() {
+        serverResponse = {
+          body: {
+            status: 'SUCCESS',
+            account_id: 167283,
+            zone_id: 210093,
+            cpm: 999,
+            width: 300,
+            height: 250,
+            place: 0,
+            ad_code: '',
+            tracking_pixels: [],
+          },
+        }
+      });
+
+      describe('with a maximum CPM', function () {
+        it('does not return any bids', function () {
+          const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+
+          expect(bids).to.be.length(0);
+        });
+      });
+
+      describe('with no maximum CPM', function () {
+        beforeEach(function() {
+          delete validBidRequests[0].params.maxCPM;
+        });
+
+        it('returns a bid', function() {
+          const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+
+          expect(bids).to.be.length(1);
+        });
+      });
+    });
+
+    describe('with a valid ad', function () {
+      beforeEach(function() {
+        serverResponse = {
+          body: {
+            status: 'SUCCESS',
+            account_id: 167283,
+            zone_id: 210093,
+            cpm: 1.5,
+            width: 300,
+            height: 250,
+            place: 0,
+            ad_code: '',
+            tracking_pixels: [
+              'http://tracking.pixel.com/params=info',
+            ],
+          },
+        };
+      });
+
+      it('returns a complete bid', function () {
+        const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+
+        expect(bids).to.be.length(1);
+        expect(bids[0].cpm).to.equal(1.5);
+        expect(bids[0].width).to.equal(300);
+        expect(bids[0].height).to.equal(250);
+        expect(bids[0].currency).to.equal('USD');
+        expect(bids[0].netRevenue).to.equal(true);
+        expect(bids[0].ad).to.have.length.above(1);
+        expect(bids[0].ad).to.have.string('http://tracking.pixel.com/params=info');
+      });
+
+      describe('for a bid request without banner media type', function () {
+        beforeEach(function() {
+          delete validBidRequests[0].mediaTypes.banner;
+        });
+
+        it('does not return any bids', function () {
+          const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+
+          expect(bids).to.be.length(0);
+        });
+      });
+
+      describe('with advertiser meta', function () {
+        beforeEach(function() {
+          serverResponse.body.advertiser = {
+            id: 123,
+            name: 'Advertiser Name',
+            domain: 'advertiser.com',
+          };
+        });
+
+        it('returns a bid including advertiser meta', function () {
+          const bids = spec.interpretResponse(serverResponse, { bidRequest: validBidRequests[0] });
+
+          expect(bids).to.be.length(1);
+          expect(bids[0]).to.have.property('meta');
+          expect(bids[0].meta.advertiserId).to.equal(123);
+          expect(bids[0].meta.advertiserName).to.equal('Advertiser Name');
+          expect(bids[0].meta.advertiserDomains).to.contain('advertiser.com');
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/adfBidAdapter_spec.js b/test/spec/modules/adfBidAdapter_spec.js
index c1acff522c0..14abb33ba68 100644
--- a/test/spec/modules/adfBidAdapter_spec.js
+++ b/test/spec/modules/adfBidAdapter_spec.js
@@ -3,7 +3,8 @@
 import { assert } from 'chai';
 import { spec } from 'modules/adfBidAdapter.js';
 import { config } from 'src/config.js';
-import { createEidsArray } from 'modules/userId/eids.js';
+import { addFPDToBidderRequest } from '../../helpers/fpd';
+import { setConfig as setCurrencyConfig } from '../../../modules/currency';
 
 describe('Adf adapter', function () {
   let bids = [];
@@ -142,6 +143,49 @@ describe('Adf adapter', function () {
         assert.equal(request.user, undefined);
         assert.equal(request.regs, undefined);
       });
+
+      it('should transfer DSA info', function () {
+        let validBidRequests = [ { bidId: 'bidId', params: { siteId: 'siteId' } } ];
+
+        let request = JSON.parse(
+          spec.buildRequests(validBidRequests, {
+            refererInfo: { page: 'page' },
+            ortb2: {
+              regs: {
+                ext: {
+                  dsa: {
+                    dsarequired: '1',
+                    pubrender: '2',
+                    datatopub: '3',
+                    transparency: [
+                      {
+                        domain: 'test.com',
+                        dsaparams: [1, 2, 3]
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          }).data
+        );
+
+        assert.deepEqual(request.regs, {
+          ext: {
+            dsa: {
+              dsarequired: '1',
+              pubrender: '2',
+              datatopub: '3',
+              transparency: [
+                {
+                  domain: 'test.com',
+                  dsaparams: [1, 2, 3]
+                }
+              ]
+            }
+          }
+        });
+      });
     });
 
     it('should add test and is_debug to request, if test is set in parameters', function () {
@@ -278,26 +322,26 @@ describe('Adf adapter', function () {
       let validBidRequests = [{
         bidId: 'bidId',
         params: {},
-        userIdAsEids: createEidsArray({
-          tdid: 'TTD_ID_FROM_USER_ID_MODULE',
-          pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
-        })
+        userIdAsEids: [
+          { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
+          { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
+        ]
       }];
 
       let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
-      assert.deepEqual(request.user.ext.eids, [
-        { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
-        { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
-      ]);
+      assert.deepEqual(request.user.ext.eids, validBidRequests[0].userIdAsEids);
     });
 
     it('should send currency if defined', function () {
-      config.setConfig({ currency: { adServerCurrency: 'EUR' } });
       let validBidRequests = [{ params: {} }];
       let refererInfo = { page: 'page' };
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo }).data);
-
-      assert.deepEqual(request.cur, [ 'EUR' ]);
+      const bidderRequest = { refererInfo };
+      setCurrencyConfig({ adServerCurrency: 'EUR' })
+      return addFPDToBidderRequest(bidderRequest).then(res => {
+        let request = JSON.parse(spec.buildRequests(validBidRequests, res).data);
+        assert.deepEqual(request.cur, [ 'EUR' ]);
+        setCurrencyConfig({});
+      });
     });
 
     it('should pass supply chain object', function () {
@@ -386,6 +430,18 @@ describe('Adf adapter', function () {
         }
       });
 
+      it('should add first party data', function () {
+        let validBidRequests = [
+          { bidId: 'bidId', params: { mid: 1000 }, mediaTypes: { video: {} }, ortb2Imp: { ext: { data: { some: 'value' } } } },
+          { bidId: 'bidId2', params: { mid: 1001 }, mediaTypes: { video: {} }, ortb2Imp: { ext: { data: { some: 'value', another: 1 } } } },
+          { bidId: 'bidId3', params: { mid: 1002 }, mediaTypes: { video: {} }, ortb2Imp: { ext: {} } }
+        ];
+        let imps = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp;
+        for (let i = 0; i < 3; i++) {
+          assert.deepEqual(imps[i].ext.data, validBidRequests[i].ortb2Imp.ext.data);
+        }
+      });
+
       describe('dynamic placement tag', function () {
         it('should add imp parameters correctly', function () {
           const validBidRequests = [
@@ -428,12 +484,14 @@ describe('Adf adapter', function () {
         });
 
         it('should request floor price in adserver currency', function () {
-          config.setConfig({ currency: { adServerCurrency: 'DKK' } });
+          setCurrencyConfig({ adServerCurrency: 'DKK' })
           const validBidRequests = [ getBidWithFloor() ];
-          let imp = getRequestImps(validBidRequests)[0];
-
-          assert.equal(imp.bidfloor, undefined);
-          assert.equal(imp.bidfloorcur, 'DKK');
+          return addFPDToBidderRequest(validBidRequests[0]).then(res => {
+            const imp = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, ...res }).data).imp[0];
+            assert.equal(imp.bidfloor, undefined);
+            assert.equal(imp.bidfloorcur, 'DKK');
+            setCurrencyConfig({});
+          });
         });
 
         it('should add correct floor values', function () {
@@ -453,30 +511,29 @@ describe('Adf adapter', function () {
             playerSize: [ 100, 200 ]
           } };
           const expectedFloors = [ 1, 1.3, 0.5 ];
-          config.setConfig({ currency: { adServerCurrency: 'DKK' } });
+          setCurrencyConfig({ adServerCurrency: 'DKK' });
           let validBidRequests = expectedFloors.map(getBidWithFloorTest);
-          getRequestImps(validBidRequests);
-          assert.deepEqual(result, { currency: 'DKK', size: '*', mediaType: '*' });
+          return addFPDToBidderRequest(validBidRequests[0]).then(res => {
+            getRequestImps(validBidRequests, res);
+            assert.deepEqual(result, { currency: 'DKK', size: '*', mediaType: '*' })
+            mediaTypes = { banner: {
+              sizes: [ [100, 200], [300, 400] ]
+            }};
+            getRequestImps(validBidRequests, res);
 
-          mediaTypes = { banner: {
-            sizes: [ [100, 200], [300, 400] ]
-          }};
-          validBidRequests = expectedFloors.map(getBidWithFloorTest);
-          getRequestImps(validBidRequests);
+            assert.deepEqual(result, { currency: 'DKK', size: '*', mediaType: '*' });
 
-          assert.deepEqual(result, { currency: 'DKK', size: '*', mediaType: '*' });
+            mediaTypes = { native: {} };
+            getRequestImps(validBidRequests, res);
 
-          mediaTypes = { native: {} };
-          validBidRequests = expectedFloors.map(getBidWithFloorTest);
-          getRequestImps(validBidRequests);
+            assert.deepEqual(result, { currency: 'DKK', size: '*', mediaType: '*' });
 
-          assert.deepEqual(result, { currency: 'DKK', size: '*', mediaType: '*' });
+            mediaTypes = {};
+            getRequestImps(validBidRequests, res);
 
-          mediaTypes = {};
-          validBidRequests = expectedFloors.map(getBidWithFloorTest);
-          getRequestImps(validBidRequests);
-
-          assert.deepEqual(result, { currency: 'DKK', size: '*', mediaType: '*' });
+            assert.deepEqual(result, { currency: 'DKK', size: '*', mediaType: '*' });
+            setCurrencyConfig({});
+          });
 
           function getBidWithFloorTest(floor) {
             return {
@@ -861,8 +918,8 @@ describe('Adf adapter', function () {
       });
     });
 
-    function getRequestImps(validBidRequests) {
-      return JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp;
+    function getRequestImps(validBidRequests, enriched = {}) {
+      return JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, ...enriched }).data).imp;
     }
   });
 
@@ -1007,7 +1064,16 @@ describe('Adf adapter', function () {
                 adomain: [ 'demo.com' ],
                 ext: {
                   prebid: {
-                    type: 'native'
+                    type: 'native',
+                  },
+                  dsa: {
+                    behalf: 'some-behalf',
+                    paid: 'some-paid',
+                    transparency: [{
+                      domain: 'test.com',
+                      dsaparams: [1, 2, 3]
+                    }],
+                    adrender: 1
                   }
                 }
               }
@@ -1070,6 +1136,15 @@ describe('Adf adapter', function () {
       assert.deepEqual(bids[0].mediaType, 'native');
       assert.deepEqual(bids[0].meta.mediaType, 'native');
       assert.deepEqual(bids[0].meta.advertiserDomains, [ 'demo.com' ]);
+      assert.deepEqual(bids[0].meta.dsa, {
+        behalf: 'some-behalf',
+        paid: 'some-paid',
+        transparency: [{
+          domain: 'test.com',
+          dsaparams: [1, 2, 3]
+        }],
+        adrender: 1
+      });
       assert.deepEqual(bids[0].dealId, 'deal-id');
     });
     it('should set correct native params', function () {
@@ -1260,6 +1335,32 @@ describe('Adf adapter', function () {
         assert.equal(bids[0].meta.mediaType, 'video');
       });
 
+      it('should set vastUrl if nurl is present in response', function () {
+        let vastUrl = 'http://url.to/vast'
+        let serverResponse = {
+          body: {
+            seatbid: [{
+              bid: [{ impid: '1', adm: '', nurl: vastUrl, ext: { prebid: { type: 'video' } } }]
+            }]
+          }
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { mid: 1000 }
+            }
+          ]
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.equal(bids.length, 1);
+        assert.equal(bids[0].vastUrl, vastUrl);
+        assert.equal(bids[0].mediaType, 'video');
+        assert.equal(bids[0].meta.mediaType, 'video');
+      });
+
       it('should add renderer for outstream bids', function () {
         let serverResponse = {
           body: {
diff --git a/test/spec/modules/adfusionBidAdapter_spec.js b/test/spec/modules/adfusionBidAdapter_spec.js
index 638831c33f3..82705b727b4 100644
--- a/test/spec/modules/adfusionBidAdapter_spec.js
+++ b/test/spec/modules/adfusionBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { spec } from 'modules/adfusionBidAdapter';
 import 'modules/priceFloors.js';
+import 'modules/currency.js';
 import { newBidder } from 'src/adapters/bidderFactory';
 
 describe('adfusionBidAdapter', function () {
@@ -24,7 +25,7 @@ describe('adfusionBidAdapter', function () {
       transactionId: 'test-transactionId-1',
     };
 
-    it('should return true when required params found', function () {
+    it('should return true when required params are found', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
@@ -36,7 +37,7 @@ describe('adfusionBidAdapter', function () {
   });
 
   describe('buildRequests', function () {
-    let bidRequests, bidderRequest;
+    let bidRequests, bannerBidRequest, bidderRequest;
     beforeEach(function () {
       bidRequests = [
         {
@@ -75,6 +76,25 @@ describe('adfusionBidAdapter', function () {
           transactionId: 'test-transactionId-2',
         },
       ];
+      bannerBidRequest = {
+        bidder: 'adfusion',
+        params: {
+          accountId: 1234,
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [300, 250],
+              [300, 600],
+            ],
+          },
+        },
+        adUnitCode: '/adunit-code/test-path',
+        bidId: 'test-bid-id-1',
+        bidderRequestId: 'test-bid-request-1',
+        auctionId: 'test-auction-1',
+        transactionId: 'test-transactionId-1',
+      };
       bidderRequest = { refererInfo: {} };
     });
 
@@ -89,9 +109,22 @@ describe('adfusionBidAdapter', function () {
       expect(request).to.be.an('array');
       expect(request[0].data).to.be.an('object');
       expect(request[0].method).to.equal('POST');
+      expect(request[0].currency).to.not.equal('USD');
       expect(request[0].url).to.not.equal('');
       expect(request[0].url).to.not.equal(undefined);
       expect(request[0].url).to.not.equal(null);
     });
+
+    it('should add bid floor', function () {
+      let bidRequest = Object.assign({}, bannerBidRequest);
+      let payload = spec.buildRequests([bidRequest], bidderRequest)[0].data;
+      expect(payload.imp[0].bidfloorcur).to.not.exist;
+
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      bidRequest.getFloor = () => getFloorResponse;
+      payload = spec.buildRequests([bidRequest], bidderRequest)[0].data;
+      expect(payload.imp[0].bidfloor).to.equal(3);
+      expect(payload.imp[0].bidfloorcur).to.equal('USD');
+    });
   });
 });
diff --git a/test/spec/modules/adgenerationBidAdapter_spec.js b/test/spec/modules/adgenerationBidAdapter_spec.js
index adfd38d22cc..c0bb40a1bf2 100644
--- a/test/spec/modules/adgenerationBidAdapter_spec.js
+++ b/test/spec/modules/adgenerationBidAdapter_spec.js
@@ -4,6 +4,8 @@ import {newBidder} from 'src/adapters/bidderFactory.js';
 import {NATIVE} from 'src/mediaTypes.js';
 import {config} from 'src/config.js';
 import prebid from '../../../package.json';
+import { setConfig as setCurrencyConfig } from '../../../modules/currency';
+import { addFPDToBidderRequest } from '../../helpers/fpd';
 
 describe('AdgenerationAdapter', function () {
   const adapter = newBidder(spec);
@@ -27,10 +29,10 @@ describe('AdgenerationAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -184,12 +186,12 @@ describe('AdgenerationAdapter', function () {
       }
     };
     const data = {
-      banner: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.2&imark=1&tp=https%3A%2F%2Fexample.com`,
-      bannerUSD: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100¤cy=USD&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.2&imark=1&tp=https%3A%2F%2Fexample.com`,
-      native: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=1x1¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.2&tp=https%3A%2F%2Fexample.com`,
-      bannerWithHyperId: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.2&imark=1&tp=https%3A%2F%2Fexample.com&hyper_id=novatiqId`,
-      bannerWithAdgextCriteoId: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.2&adgext_criteo_id=criteo-id-test-1234567890&imark=1&tp=https%3A%2F%2Fexample.com`,
-      bannerWithAdgextIds: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.2&adgext_id5_id=id5-id-test-1234567890&adgext_id5_id_link_type=2&adgext_imuid=i.KrAH6ZAZTJOnH5S4N2sogA&adgext_uid2=AgAAAAVacu1uAxgAxH%2BHJ8%2BnWlS2H4uVqr6i%2BHBDCNREHD8WKsio%2Fx7D8xXFuq1cJycUU86yXfTH9Xe%2F4C8KkH%2B7UCiU7uQxhyD7Qxnv251pEs6K8oK%2BBPLYR%2B8BLY%2FsJKesa%2FkoKwx1FHgUzIBum582tSy2Oo%2B7C6wYUaaV4QcLr%2F4LPA%3D&gpid=%2F1111%2Fhomepage%23300x250&uach=%7B%22source%22%3A2%2C%22platform%22%3A%7B%22brand%22%3A%22macOS%22%7D%2C%22browsers%22%3A%5B%7B%22brand%22%3A%22Chromium%22%2C%22version%22%3A%5B%22112%22%5D%7D%2C%7B%22brand%22%3A%22Google%20Chrome%22%2C%22version%22%3A%5B%22112%22%5D%7D%2C%7B%22brand%22%3A%22Not%3AA-Brand%22%2C%22version%22%3A%5B%2299%22%5D%7D%5D%2C%22mobile%22%3A0%7D&schain=%7B%22ver%22%3A%221.0%22%2C%22complete%22%3A1%2C%22nodes%22%3A%5B%7B%22asi%22%3A%22indirectseller.com%22%2C%22sid%22%3A%2200001%22%2C%22hp%22%3A1%7D%5D%7D&imark=1&tp=https%3A%2F%2Fexample.com`,
+      banner: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.3&imark=1&tp=https%3A%2F%2Fexample.com`,
+      bannerUSD: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100¤cy=USD&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.3&imark=1&tp=https%3A%2F%2Fexample.com`,
+      native: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=1x1¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.3&tp=https%3A%2F%2Fexample.com`,
+      bannerWithHyperId: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.3&imark=1&tp=https%3A%2F%2Fexample.com&hyper_id=novatiqId`,
+      bannerWithAdgextCriteoId: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.3&adgext_criteo_id=criteo-id-test-1234567890&imark=1&tp=https%3A%2F%2Fexample.com`,
+      bannerWithAdgextIds: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100¤cy=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.6.3&adgext_id5_id=id5-id-test-1234567890&adgext_id5_id_link_type=2&adgext_imuid=i.KrAH6ZAZTJOnH5S4N2sogA&adgext_uid2=AgAAAAVacu1uAxgAxH%2BHJ8%2BnWlS2H4uVqr6i%2BHBDCNREHD8WKsio%2Fx7D8xXFuq1cJycUU86yXfTH9Xe%2F4C8KkH%2B7UCiU7uQxhyD7Qxnv251pEs6K8oK%2BBPLYR%2B8BLY%2FsJKesa%2FkoKwx1FHgUzIBum582tSy2Oo%2B7C6wYUaaV4QcLr%2F4LPA%3D&gpid=%2F1111%2Fhomepage%23300x250&uach=%7B%22source%22%3A2%2C%22platform%22%3A%7B%22brand%22%3A%22macOS%22%7D%2C%22browsers%22%3A%5B%7B%22brand%22%3A%22Chromium%22%2C%22version%22%3A%5B%22112%22%5D%7D%2C%7B%22brand%22%3A%22Google%20Chrome%22%2C%22version%22%3A%5B%22112%22%5D%7D%2C%7B%22brand%22%3A%22Not%3AA-Brand%22%2C%22version%22%3A%5B%2299%22%5D%7D%5D%2C%22mobile%22%3A0%7D&schain=%7B%22ver%22%3A%221.0%22%2C%22complete%22%3A1%2C%22nodes%22%3A%5B%7B%22asi%22%3A%22indirectseller.com%22%2C%22sid%22%3A%2200001%22%2C%22hp%22%3A1%7D%5D%7D&imark=1&tp=https%3A%2F%2Fexample.com`,
     };
     it('sends bid request to ENDPOINT via GET', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest)[0];
@@ -248,19 +250,20 @@ describe('AdgenerationAdapter', function () {
       config.resetConfig();
     });
     it('allows setConfig to set bidder currency for USD', function () {
-      config.setConfig({
-        currency: {
-          adServerCurrency: 'USD'
-        }
+      setCurrencyConfig({ adServerCurrency: 'USD' });
+      return addFPDToBidderRequest(bidderRequest).then(res => {
+        const bidRequest = spec.buildRequests(bidRequests, res)[0];
+        expect(bidRequest.data).to.equal(data.bannerUSD);
+        setCurrencyConfig({});
       });
-      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
-      expect(request.data).to.equal(data.bannerUSD);
-      config.resetConfig();
     });
   });
   describe('interpretResponse', function () {
     const bidRequests = {
       banner: {
+        bidderRequest: {
+          ortb2: {ext: {prebid: {adServerCurrency: 'JPY'}}}
+        },
         bidRequest: {
           bidder: 'adg',
           params: {
@@ -275,6 +278,9 @@ describe('AdgenerationAdapter', function () {
         },
       },
       native: {
+        bidderRequest: {
+          ortb2: {ext: {prebid: {adServerCurrency: 'JPY'}}}
+        },
         bidRequest: {
           bidder: 'adg',
           params: {
@@ -312,6 +318,9 @@ describe('AdgenerationAdapter', function () {
         },
       },
       upperBillboard: {
+        bidderRequest: {
+          ortb2: {ext: {prebid: {adServerCurrency: 'JPY'}}}
+        },
         bidRequest: {
           bidder: 'adg',
           params: {
@@ -916,21 +925,26 @@ describe('AdgenerationAdapter', function () {
     });
 
     it('handles ADGBrowserM responses', function () {
-      config.setConfig({
-        currency: {
-          adServerCurrency: 'JPY'
+      setCurrencyConfig({ adServerCurrency: 'JPY' });
+      const bidderRequest = {
+        refererInfo: {
+          page: 'https://example.com'
         }
+      };
+      return addFPDToBidderRequest(bidderRequest).then(res => {
+        spec.buildRequests(bidRequests, res)[0];
+        const result = spec.interpretResponse({body: serverResponse.normal.upperBillboard}, { ...bidRequests.upperBillboard, bidderRequest: res })[0];
+        expect(result.requestId).to.equal(bidResponses.normal.upperBillboard.requestId);
+        expect(result.width).to.equal(bidResponses.normal.upperBillboard.width);
+        expect(result.height).to.equal(bidResponses.normal.upperBillboard.height);
+        expect(result.creativeId).to.equal(bidResponses.normal.upperBillboard.creativeId);
+        expect(result.dealId).to.equal(bidResponses.normal.upperBillboard.dealId);
+        expect(result.currency).to.equal(bidResponses.normal.upperBillboard.currency);
+        expect(result.netRevenue).to.equal(bidResponses.normal.upperBillboard.netRevenue);
+        expect(result.ttl).to.equal(bidResponses.normal.upperBillboard.ttl);
+        expect(result.ad).to.equal(bidResponses.normal.upperBillboard.ad);
+        setCurrencyConfig({});
       });
-      const result = spec.interpretResponse({body: serverResponse.normal.upperBillboard}, bidRequests.upperBillboard)[0];
-      expect(result.requestId).to.equal(bidResponses.normal.upperBillboard.requestId);
-      expect(result.width).to.equal(bidResponses.normal.upperBillboard.width);
-      expect(result.height).to.equal(bidResponses.normal.upperBillboard.height);
-      expect(result.creativeId).to.equal(bidResponses.normal.upperBillboard.creativeId);
-      expect(result.dealId).to.equal(bidResponses.normal.upperBillboard.dealId);
-      expect(result.currency).to.equal(bidResponses.normal.upperBillboard.currency);
-      expect(result.netRevenue).to.equal(bidResponses.normal.upperBillboard.netRevenue);
-      expect(result.ttl).to.equal(bidResponses.normal.upperBillboard.ttl);
-      expect(result.ad).to.equal(bidResponses.normal.upperBillboard.ad);
     });
 
     it('handles banner responses for empty adomain', function () {
diff --git a/test/spec/modules/adgridBidAdapter_spec.js b/test/spec/modules/adgridBidAdapter_spec.js
new file mode 100644
index 00000000000..0d7ad9c245d
--- /dev/null
+++ b/test/spec/modules/adgridBidAdapter_spec.js
@@ -0,0 +1,131 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/adgridBidAdapter.js'
+
+const globalConfig = {
+  method: 'POST',
+  endPoint: 'https://api-prebid.adgrid.io/api/v1/auction'
+};
+
+describe('AdGrid Bid Adapter', function () {
+  const bannerRequest = [{
+    bidId: 123456,
+    auctionId: 98765,
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      }
+    },
+    params: {
+      domainId: 12345
+    }
+  }];
+
+  const videoRequest = [{
+    bidId: 123456,
+    auctionId: 98765,
+    mediaTypes: {
+      video: {
+        playerSize: [
+          [640, 480]
+        ],
+        context: 'instream'
+      }
+    },
+    params: {
+      domainId: 12345
+    }
+  }];
+
+  describe('isBidRequestValid', function () {
+    it('Should return true when domainId exist inside params object', function () {
+      const isBidValid = spec.isBidRequestValid(bannerRequest[0]);
+      expect(isBidValid).to.be.true;
+    });
+
+    it('Should return false when domainId is not exist inside params object', function () {
+      const isBidNotValid = spec.isBidRequestValid(null);
+      expect(isBidNotValid).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const requestVideo = spec.buildRequests(videoRequest, videoRequest[0]);
+    const payload = request.data;
+    const apiURL = request.url;
+    const method = request.method;
+
+    it('Test the request is not empty', function () {
+      expect(request).to.not.be.empty;
+    });
+
+    it('Test the request payload is not empty', function () {
+      expect(payload).to.not.be.empty;
+    });
+
+    it('Test the API End Point', function () {
+      expect(apiURL).to.equal(globalConfig.endPoint);
+    });
+
+    it('should send the correct method', function () {
+      expect(method).to.equal(globalConfig.method);
+    });
+
+    it('should send the correct requestId', function () {
+      expect(request.data.bids[0].requestId).to.equal(bannerRequest[0].bidId);
+      expect(requestVideo.data.bids[0].requestId).to.equal(videoRequest[0].bidId);
+    });
+
+    it('should send the correct sizes array', function () {
+      expect(request.data.bids[0].sizes).to.be.an('array');
+    });
+
+    it('should send the correct media type', function () {
+      expect(request.data.bids[0].mediaType).to.equal('banner')
+      expect(requestVideo.data.bids[0].mediaType).to.equal('video')
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const responseObj = {
+      bids: [
+        {
+          bidId: '4b99f3428651c1',
+          cpm: 7.7,
+          ad: '
Ad Content
',
+          creativeId: '9004',
+          currency: 'USD',
+          mediaType: 'banner',
+          width: 320,
+          height: 50,
+          domainId: '2002',
+          marketplaceId: '703',
+          devices: 'desktop'
+        }
+      ]
+    };
+
+    it('Test the interpretResponse function', function () {
+      const receivedBid = responseObj.bids[0];
+      const response = {};
+      response.body = responseObj;
+
+      const bidRequest = {};
+      bidRequest.currency = 'USD';
+
+      const bidResponse = spec.interpretResponse(response, bidRequest);
+      expect(bidResponse).to.not.be.empty;
+
+      const bid = bidResponse[0];
+      expect(bid).to.not.be.empty;
+      expect(bid.requestId).to.equal(receivedBid.bidId);
+      expect(bid.ad).to.equal(receivedBid.ad);
+      expect(bid.cpm).to.equal(receivedBid.cpm);
+      expect(bid.mediaType).to.equal(receivedBid.mediaType);
+      expect(bid.creativeId).to.equal(receivedBid.creativeId);
+      expect(bid.width).to.equal(receivedBid.width);
+      expect(bid.height).to.equal(receivedBid.height);
+      expect(bid.currency).to.equal(receivedBid.currency);
+    });
+  });
+});
diff --git a/test/spec/modules/adhashBidAdapter_spec.js b/test/spec/modules/adhashBidAdapter_spec.js
index cc643d6d2ab..f3b63a2359b 100644
--- a/test/spec/modules/adhashBidAdapter_spec.js
+++ b/test/spec/modules/adhashBidAdapter_spec.js
@@ -178,105 +178,105 @@ describe('adhashBidAdapter', function () {
     });
 
     it('should return empty array when there are bad words (full)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text badword badword example badword text' + ' word'.repeat(993);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (full cyrillic)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text дума дума example дума text' + ' текст'.repeat(993);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (partial)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text partialbadwordb badwordb example badwordbtext' + ' word'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (partial, compound phrase)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text partialbad wordb bad wordb example bad wordbtext' + ' word'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (starts)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text startsWith starts text startsAgain' + ' word'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (starts cyrillic)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text стартТекст старт text стартТекст' + ' дума'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (ends)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text wordEnds ends text anotherends' + ' word'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (ends cyrillic)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text ДругКрай край text ощеединкрай' + ' дума'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (combo)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'queen of england dies, the queen dies' + ' word'.repeat(993);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (regexp)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text xxxayyy zzxxxAyyyzz text xxxbyyy' + ' word'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return non-empty array when there are not enough bad words (full)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text badword badword example text' + ' word'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
     });
 
     it('should return non-empty array when there are not enough bad words (partial)', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text partialbadwordb example' + ' word'.repeat(996);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
     });
 
     it('should return non-empty array when there are no-bad word matches', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text partialbadword example text' + ' word'.repeat(995);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
     });
 
     it('should return non-empty array when there are bad words and good words', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return 'example text badword badword example badword goodWord goodWord ' + ' word'.repeat(992);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
     });
 
     it('should return non-empty array when there is a problem with the brand-safety', function () {
-      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+      bodyStub = sinon.stub(window.top.document.body, 'textContent').get(function() {
         return null;
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
diff --git a/test/spec/modules/adkernelAdnAnalytics_spec.js b/test/spec/modules/adkernelAdnAnalytics_spec.js
index 7af96c9321c..fc6cba5176b 100644
--- a/test/spec/modules/adkernelAdnAnalytics_spec.js
+++ b/test/spec/modules/adkernelAdnAnalytics_spec.js
@@ -1,7 +1,7 @@
 import analyticsAdapter, {ExpiringQueue, getUmtSource, storage} from 'modules/adkernelAdnAnalyticsAdapter';
 import {expect} from 'chai';
 import adapterManager from 'src/adapterManager';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 
 const events = require('../../../src/events');
 
@@ -230,21 +230,21 @@ describe('', function () {
     });
 
     it('should handle auction init event', function () {
-      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {config: {}, bidderRequests: [REQUEST], timeout: 3000});
+      events.emit(EVENTS.AUCTION_INIT, {config: {}, bidderRequests: [REQUEST], timeout: 3000});
       const ev = analyticsAdapter.context.queue.peekAll();
       expect(ev).to.have.length(1);
       expect(ev[0]).to.be.eql({event: 'auctionInit'});
     });
 
     it('should handle bid request event', function () {
-      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, REQUEST);
+      events.emit(EVENTS.BID_REQUESTED, REQUEST);
       const ev = analyticsAdapter.context.queue.peekAll();
       expect(ev).to.have.length(2);
       expect(ev[1]).to.be.eql({event: 'bidRequested', adapter: 'adapter', tagid: 'container-1'});
     });
 
     it('should handle bid response event', function () {
-      events.emit(CONSTANTS.EVENTS.BID_RESPONSE, RESPONSE);
+      events.emit(EVENTS.BID_RESPONSE, RESPONSE);
       const ev = analyticsAdapter.context.queue.peekAll();
       expect(ev).to.have.length(3);
       expect(ev[2]).to.be.eql({
@@ -258,7 +258,7 @@ describe('', function () {
 
     it('should handle auction end event', function () {
       timer.tick(447);
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, RESPONSE);
+      events.emit(EVENTS.AUCTION_END, RESPONSE);
       let ev = analyticsAdapter.context.queue.peekAll();
       expect(ev).to.have.length(0);
       expect(ajaxStub.calledOnce).to.be.equal(true);
@@ -267,7 +267,7 @@ describe('', function () {
     });
 
     it('should handle winning bid', function () {
-      events.emit(CONSTANTS.EVENTS.BID_WON, RESPONSE);
+      events.emit(EVENTS.BID_WON, RESPONSE);
       timer.tick(4500);
       expect(ajaxStub.calledTwice).to.be.equal(true);
       let ev = JSON.parse(ajaxStub.secondCall.args[0]).hb_ev;
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index ac2e3785780..ceb5d029203 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -125,7 +125,8 @@ describe('Adkernel adapter', function () {
       bidId: 'Bid_01',
       bidderRequestId: 'req-001',
       auctionId: 'auc-001'
-    }, bid_native = {
+    },
+    bid_native = {
       bidder: 'adkernel',
       params: {zoneId: 1, host: 'rtb.adkernel.com'},
       mediaTypes: {
@@ -171,6 +172,33 @@ describe('Adkernel adapter', function () {
           }
         }
       },
+      nativeOrtbRequest: {
+        ver: '1.2',
+        assets: [
+          {
+            id: 0, required: 1, title: {len: 80}
+          }, {
+            id: 1, required: 1, data: {type: 2}},
+          {
+            id: 2, required: 1, data: {type: 10}
+          }, {
+            id: 3, required: 1, img: {type: 1, wmin: 50, hmin: 50}
+          }, {
+            id: 4, required: 1, img: {type: 3, w: 300, h: 200}
+          }, {
+            id: 5, required: 0, data: {type: 3}
+          }, {
+            id: 6, required: 0, data: {type: 6}
+          }, {
+            id: 7, required: 0, data: {type: 12}
+          }, {
+            id: 8, required: 0, data: {type: 1}
+          }, {
+            id: 9, required: 0, data: {type: 11}
+          }
+        ],
+        privacy: 1
+      },
       adUnitCode: 'ad-unit-1',
       transactionId: 'f82c64b8-c602-42a4-9791-4a268f6559ed',
       bidId: 'Bid_01',
@@ -190,7 +218,8 @@ describe('Adkernel adapter', function () {
           adm: '',
           w: 300,
           h: 250,
-          dealid: 'deal'
+          dealid: 'deal',
+          mtype: 1
         }]
       }],
       ext: {
@@ -206,7 +235,8 @@ describe('Adkernel adapter', function () {
           price: 0.00145,
           adid: '158801',
           nurl: 'https://rtb.com/win?i=sZSYq5zYMxo_0&f=nurl',
-          cid: '16855'
+          cid: '16855',
+          mtype: 2
         }]
       }],
     }, usersyncOnlyResponse = {
@@ -241,6 +271,7 @@ describe('Adkernel adapter', function () {
           cat: ['IAB1-4', 'IAB8-16', 'IAB25-5'],
           cid: '1',
           crid: '4',
+          mtype: 4,
           ext: {
             'advertiser_id': 777,
             'advertiser_name': 'advertiser',
@@ -250,6 +281,33 @@ describe('Adkernel adapter', function () {
       }],
       bidid: 'pTuOlf5KHUo',
       cur: 'EUR'
+    },
+    multiformat_response = {
+      id: '47ce4badcf7482',
+      seatbid: [{
+        bid: [{
+          id: 'sZSYq5zYMxo_0',
+          impid: 'Bid_01b__mf',
+          crid: '100_003',
+          price: 0.00145,
+          adid: '158801',
+          adm: '',
+          nurl: 'https://rtb.com/win?i=sZSYq5zYMxo_0&f=nurl',
+          cid: '16855',
+          mtype: 1
+        }, {
+          id: 'sZSYq5zYMxo_1',
+          impid: 'Bid_01v__mf',
+          crid: '100_003',
+          price: 0.25,
+          adid: '158801',
+          nurl: 'https://rtb.com/win?i=sZSYq5zYMxo_1&f=nurl',
+          cid: '16855',
+          mtype: 2
+        }]
+      }],
+      bidid: 'pTuOlf5KHUo',
+      cur: 'USD'
     };
 
   var sandbox;
@@ -460,18 +518,29 @@ describe('Adkernel adapter', function () {
   });
 
   describe('multiformat request building', function () {
-    let _, bidRequests;
+    let pbRequests, bidRequests;
     before(function () {
-      [_, bidRequests] = buildRequest([bid_multiformat]);
+      [pbRequests, bidRequests] = buildRequest([bid_multiformat]);
     });
     it('should contain single request', function () {
       expect(bidRequests).to.have.length(1);
-      expect(bidRequests[0].imp).to.have.length(1);
     });
-    it('should contain banner-only impression', function () {
-      expect(bidRequests[0].imp).to.have.length(1);
+    it('should contain both impression', function () {
+      expect(bidRequests[0].imp).to.have.length(2);
       expect(bidRequests[0].imp[0]).to.have.property('banner');
-      expect(bidRequests[0].imp[0]).to.not.have.property('video');
+      expect(bidRequests[0].imp[1]).to.have.property('video');
+      // check that splitted imps do not share same impid
+      expect(bidRequests[0].imp[0].id).to.be.not.eql('Bid_01');
+      expect(bidRequests[0].imp[1].id).to.be.not.eql('Bid_01');
+      expect(bidRequests[0].imp[1].id).to.be.not.eql(bidRequests[0].imp[0].id);
+    });
+    it('x', function() {
+      let bids = spec.interpretResponse({body: multiformat_response}, pbRequests[0]);
+      expect(bids).to.have.length(2);
+      expect(bids[0].requestId).to.be.eql('Bid_01');
+      expect(bids[0].mediaType).to.be.eql('banner');
+      expect(bids[1].requestId).to.be.eql('Bid_01');
+      expect(bids[1].mediaType).to.be.eql('video');
     });
   });
 
@@ -643,18 +712,18 @@ describe('Adkernel adapter', function () {
       expect(bidRequests[0].imp[0]).to.have.property('native');
       expect(bidRequests[0].imp[0].native).to.have.property('request');
       let request = JSON.parse(bidRequests[0].imp[0].native.request);
-      expect(request).to.have.property('ver', '1.1');
+      expect(request).to.have.property('ver', '1.2');
       expect(request.assets).to.have.length(10);
       expect(request.assets[0]).to.be.eql({id: 0, required: 1, title: {len: 80}});
-      expect(request.assets[1]).to.be.eql({id: 3, required: 1, data: {type: 2}});
-      expect(request.assets[2]).to.be.eql({id: 4, required: 1, data: {type: 10}});
-      expect(request.assets[3]).to.be.eql({id: 1, required: 1, img: {wmin: 50, hmin: 50, type: 1}});
-      expect(request.assets[4]).to.be.eql({id: 2, required: 1, img: {w: 300, h: 200, type: 3}});
-      expect(request.assets[5]).to.be.eql({id: 11, required: 0, data: {type: 3}});
-      expect(request.assets[6]).to.be.eql({id: 8, required: 0, data: {type: 6}});
-      expect(request.assets[7]).to.be.eql({id: 10, required: 0, data: {type: 12}});
-      expect(request.assets[8]).to.be.eql({id: 5, required: 0, data: {type: 1}});
-      expect(request.assets[9]).to.be.eql({id: 14, required: 0, data: {type: 11}});
+      expect(request.assets[1]).to.be.eql({id: 1, required: 1, data: {type: 2}});
+      expect(request.assets[2]).to.be.eql({id: 2, required: 1, data: {type: 10}});
+      expect(request.assets[3]).to.be.eql({id: 3, required: 1, img: {wmin: 50, hmin: 50, type: 1}});
+      expect(request.assets[4]).to.be.eql({id: 4, required: 1, img: {w: 300, h: 200, type: 3}});
+      expect(request.assets[5]).to.be.eql({id: 5, required: 0, data: {type: 3}});
+      expect(request.assets[6]).to.be.eql({id: 6, required: 0, data: {type: 6}});
+      expect(request.assets[7]).to.be.eql({id: 7, required: 0, data: {type: 12}});
+      expect(request.assets[8]).to.be.eql({id: 8, required: 0, data: {type: 1}});
+      expect(request.assets[9]).to.be.eql({id: 9, required: 0, data: {type: 11}});
     });
 
     it('native response processing', () => {
@@ -671,15 +740,21 @@ describe('Adkernel adapter', function () {
       expect(resp.meta.secondaryCatIds).to.be.eql(['IAB1-4', 'IAB8-16', 'IAB25-5']);
       expect(resp).to.have.property('mediaType', NATIVE);
       expect(resp).to.have.property('native');
-      expect(resp.native).to.have.property('clickUrl', 'http://rtb.com/click?i=pTuOlf5KHUo_0');
-      expect(resp.native.impressionTrackers).to.be.eql(['http://rtb.com/win?i=pTuOlf5KHUo_0&f=imp']);
-      expect(resp.native).to.have.property('title', 'Title');
-      expect(resp.native).to.have.property('body', 'Description');
-      expect(resp.native).to.have.property('body2', 'Additional description');
-      expect(resp.native.icon).to.be.eql({url: 'http://rtb.com/thumbnail?i=pTuOlf5KHUo_0&imgt=icon', width: 50, height: 50});
-      expect(resp.native.image).to.be.eql({url: 'http://rtb.com/thumbnail?i=pTuOlf5KHUo_0', width: 300, height: 200});
-      expect(resp.native).to.have.property('sponsoredBy', 'Sponsor.com');
-      expect(resp.native).to.have.property('displayUrl', 'displayurl.com');
+      expect(resp.native).to.have.property('ortb');
+
+      expect(resp.native.ortb).to.be.eql({
+        assets: [
+          {id: 0, title: {text: 'Title'}},
+          {id: 3, data: {value: 'Description'}},
+          {id: 4, data: {value: 'Additional description'}},
+          {id: 1, img: {url: 'http://rtb.com/thumbnail?i=pTuOlf5KHUo_0&imgt=icon', w: 50, h: 50}},
+          {id: 2, img: {url: 'http://rtb.com/thumbnail?i=pTuOlf5KHUo_0', w: 300, h: 200}},
+          {id: 5, data: {value: 'Sponsor.com'}},
+          {id: 14, data: {value: 'displayurl.com'}}
+        ],
+        link: {url: 'http://rtb.com/click?i=pTuOlf5KHUo_0'},
+        imptrackers: ['http://rtb.com/win?i=pTuOlf5KHUo_0&f=imp']
+      });
     });
   });
 });
diff --git a/test/spec/modules/adlooxAnalyticsAdapter_spec.js b/test/spec/modules/adlooxAnalyticsAdapter_spec.js
index 8acd02c7f26..fa8204a9dc5 100644
--- a/test/spec/modules/adlooxAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adlooxAnalyticsAdapter_spec.js
@@ -3,7 +3,7 @@ import analyticsAdapter, { command as analyticsCommand, COMMAND } from 'modules/
 import { AUCTION_COMPLETED } from 'src/auction.js';
 import { expect } from 'chai';
 import * as events from 'src/events.js';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 import * as utils from 'src/utils.js';
 import { loadExternalScriptStub } from 'test/mocks/adloaderStub.js';
 
@@ -143,10 +143,10 @@ describe('Adloox Analytics Adapter', function () {
           return arg.tagName === 'LINK' && arg.getAttribute('rel') === 'preload' && arg.getAttribute('as') === 'script' && href_uri.href === uri.href;
         };
 
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, auctionDetails);
+        events.emit(EVENTS.AUCTION_END, auctionDetails);
         expect(insertElementStub.calledWith(sinon.match(isLinkPreloadAsScript))).to.true;
 
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, auctionDetails);
+        events.emit(EVENTS.AUCTION_END, auctionDetails);
         expect(insertElementStub.callCount).to.equal(1);
 
         done();
@@ -167,9 +167,9 @@ describe('Adloox Analytics Adapter', function () {
         const querySelectorStub = sandbox.stub(document, 'querySelector');
         querySelectorStub.withArgs(`#${bid.adUnitCode}`).returns(slot);
 
-        events.emit(CONSTANTS.EVENTS.BID_WON, bid);
+        events.emit(EVENTS.BID_WON, bid);
 
-        const [urlInserted, moduleCode] = loadExternalScriptStub.getCall(0).args;
+        const [urlInserted, _, moduleCode] = loadExternalScriptStub.getCall(0).args;
 
         expect(urlInserted.substr(0, url.length)).to.equal(url);
         expect(moduleCode).to.equal(analyticsAdapterName);
@@ -196,7 +196,7 @@ describe('Adloox Analytics Adapter', function () {
         const querySelectorStub = sandbox.stub(document, 'querySelector');
         querySelectorStub.withArgs(`#${bid.adUnitCode}`).returns(slot);
 
-        events.emit(CONSTANTS.EVENTS.BID_WON, bidIgnore);
+        events.emit(EVENTS.BID_WON, bidIgnore);
 
         expect(parent.querySelector('script')).is.null;
 
@@ -238,7 +238,7 @@ describe('Adloox Analytics Adapter', function () {
 
       it('should inject tracking event', function (done) {
         const data = {
-          eventType: CONSTANTS.EVENTS.BID_WON,
+          eventType: EVENTS.BID_WON,
           args: bid
         };
 
diff --git a/test/spec/modules/admanBidAdapter_spec.js b/test/spec/modules/admanBidAdapter_spec.js
index a9413860072..ae3b935619e 100644
--- a/test/spec/modules/admanBidAdapter_spec.js
+++ b/test/spec/modules/admanBidAdapter_spec.js
@@ -1,343 +1,467 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/admanBidAdapter.js';
-import {deepClone} from '../../../src/utils'
+import { expect } from 'chai';
+import { spec } from '../../../modules/admanBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-describe('AdmanAdapter', function () {
-  let bidBanner = {
-    bidId: '2dd581a2b6281d',
-    bidder: 'adman',
-    bidderRequestId: '145e1d6a7837c9',
-    params: {
-      placementId: 0
-    },
-    placementCode: 'placementid_0',
-    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250]]
+const bidder = 'adman';
+
+describe('AdmanBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
       }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
-    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
-    schain: {
-      ver: '1.0',
-      complete: 1,
-      nodes: [
-        {
-          asi: 'example.com',
-          sid: '0',
-          hp: 1,
-          rid: 'bidrequestid',
-          // name: 'alladsallthetime',
-          domain: 'example.com'
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
         }
-      ]
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
-  };
+  ];
 
-  let bidVideo = deepClone({
-    ...bidBanner,
-    params: {
-      placementId: 0,
-      traffic: 'video'
-    },
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
     mediaTypes: {
-      video: {
-        playerSize: [300, 250]
+      [BANNER]: {
+        sizes: [[300, 250]]
       }
+    },
+    params: {
+
     }
-  });
+  }
 
-  let bidderRequest = {
-    bidderCode: 'adman',
-    auctionId: 'fffffff-ffff-ffff-ffff-ffffffffffff',
-    bidderRequestId: 'ffffffffffffff',
-    start: 1472239426002,
-    auctionStart: 1472239426000,
-    timeout: 5000,
-    uspConsent: '1YN-',
-    gdprConsent: 'gdprConsent',
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'http://www.example.com',
-      reachedTop: true,
+      referer: 'https://test.com',
+      page: 'https://test.com'
     },
-    bids: [bidBanner, bidVideo]
-  }
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
+  };
 
   describe('isBidRequestValid', function () {
-    it('Should return true when placementId can be cast to a number', function () {
-      expect(spec.isBidRequestValid(bidBanner)).to.be.true;
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
     });
-    it('Should return false when placementId is not a number', function () {
-      bidBanner.params.placementId = 'aaa';
-      expect(spec.isBidRequestValid(bidBanner)).to.be.false;
-      bidBanner.params.placementId = 0;
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
     });
   });
 
   describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bidBanner], bidderRequest);
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
       expect(serverRequest.url).to.exist;
       expect(serverRequest.data).to.exist;
     });
+
     it('Returns POST method', function () {
       expect(serverRequest.method).to.equal('POST');
     });
+
     it('Returns valid URL', function () {
       expect(serverRequest.url).to.equal('https://pub.admanmedia.com/?c=o&m=multi');
     });
-    it('Should contain ccpa', function() {
-      expect(serverRequest.data.ccpa).to.be.an('string')
-    })
 
-    it('Returns valid BANNER data if array of bids is valid', function () {
-      serverRequest = spec.buildRequests([bidBanner], bidderRequest);
+    it('Returns general data valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
       expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
-      let placements = data['placements'];
-      for (let i = 0; i < placements.length; i++) {
-        let placement = placements[i];
-        expect(placement).to.have.all.keys('placementId', 'eids', 'bidId', 'traffic', 'sizes', 'schain', 'bidFloor', 'ext');
-        expect(placement.schain).to.be.an('object')
-        expect(placement.ext).to.be.an('object')
-        expect(placement.ext).to.have.key('tid')
-        expect(placement.ext.tid).to.equal(bidBanner.transactionId);
-        expect(placement.placementId).to.be.a('number');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.traffic).to.be.oneOf([BANNER, VIDEO, NATIVE]);
         expect(placement.bidId).to.be.a('string');
-        expect(placement.traffic).to.be.a('string');
-        expect(placement.sizes).to.be.an('array');
-        expect(placement.bidFloor).to.be.an('number');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.traffic === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.traffic) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.wPlayer).to.be.an('number');
+            expect(placement.hPlayer).to.be.an('number');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
       }
     });
 
-    it('Returns valid VIDEO data if array of bids is valid', function () {
-      serverRequest = spec.buildRequests([bidVideo], bidderRequest);
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr');
-      expect(data.deviceWidth).to.be.a('number');
-      expect(data.deviceHeight).to.be.a('number');
-      expect(data.language).to.be.a('string');
-      expect(data.secure).to.be.within(0, 1);
-      expect(data.host).to.be.a('string');
-      expect(data.page).to.be.a('string');
-      let placements = data['placements'];
-      for (let i = 0; i < placements.length; i++) {
-        let placement = placements[i];
-        expect(placement).to.have.all.keys('placementId', 'eids', 'bidId', 'traffic', 'schain', 'bidFloor',
-          'playerSize', 'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement', 'skip',
-          'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity', 'ext');
-        expect(placement.ext).to.be.an('object')
-        expect(placement.ext).to.have.key('tid')
-        expect(placement.ext.tid).to.equal(bidBanner.transactionId);
-        expect(placement.schain).to.be.an('object')
-        expect(placement.placementId).to.be.a('number');
-        expect(placement.bidId).to.be.a('string');
-        expect(placement.traffic).to.be.a('string');
-        expect(placement.bidFloor).to.be.an('number');
-      }
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
     });
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
     });
   });
 
-  describe('buildRequests with user ids', function () {
-    bidBanner.userId = {}
-    bidBanner.userId.uid2 = { id: 'uid2id123' };
-    let serverRequest = spec.buildRequests([bidBanner], bidderRequest);
-    it('Returns valid data if array of bids is valid', function () {
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      let placements = data['placements'];
       expect(data).to.be.an('object');
-      for (let i = 0; i < placements.length; i++) {
-        let placement = placements[i];
-        expect(placement).to.have.property('eids')
-        expect(placement.eids).to.be.an('array')
-        expect(placement.eids.length).to.be.equal(1)
-        for (let index in placement.eids) {
-          let v = placement.eids[index];
-          expect(v).to.have.all.keys('source', 'uids')
-          expect(v.source).to.be.oneOf(['uidapi.com'])
-          expect(v.uids).to.be.an('array');
-          expect(v.uids.length).to.be.equal(1)
-          expect(v.uids[0]).to.have.property('id')
-        }
-      }
-    });
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
-    it('(BANNER) Returns an array of valid server responses if response object is valid', function () {
-      const resBannerObject = {
-        body: [ {
-          requestId: '123',
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
           mediaType: 'banner',
-          cpm: 0.3,
-          width: 320,
-          height: 50,
-          ad: '
Hello ad
',
-          ttl: 1000,
-          creativeId: '123asd',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          adomain: ['example.com'],
+          dealId: '1',
           meta: {
             advertiserDomains: ['google.com'],
             advertiserId: 1234
           }
-        } ]
+        }]
       };
-
-      const serverResponses = spec.interpretResponse(resBannerObject);
-
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType', 'meta', 'adomain');
-        expect(dataItem.requestId).to.be.a('string');
-        expect(dataItem.cpm).to.be.a('number');
-        expect(dataItem.width).to.be.a('number');
-        expect(dataItem.height).to.be.a('number');
-        expect(dataItem.ad).to.be.a('string');
-        expect(dataItem.ttl).to.be.a('number');
-        expect(dataItem.creativeId).to.be.a('string');
-        expect(dataItem.netRevenue).to.be.a('boolean');
-        expect(dataItem.currency).to.be.a('string');
-        expect(dataItem.mediaType).to.be.a('string');
-        expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
-      }
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
-
-    it('(VIDEO) Returns an array of valid server responses if response object is valid', function () {
-      const resVideoObject = {
-        body: [ {
-          requestId: '123',
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
           mediaType: 'video',
-          cpm: 0.3,
-          width: 320,
-          height: 50,
-          vastUrl: 'https://',
-          ttl: 1000,
-          creativeId: '123asd',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          adomain: ['example.com'],
+          dealId: '1',
           meta: {
             advertiserDomains: ['google.com'],
             advertiserId: 1234
           }
-        } ]
+        }]
       };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
 
-      const serverResponses = spec.interpretResponse(resVideoObject);
-
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastUrl', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType', 'meta', 'adomain');
-        expect(dataItem.requestId).to.be.a('string');
-        expect(dataItem.cpm).to.be.a('number');
-        expect(dataItem.width).to.be.a('number');
-        expect(dataItem.height).to.be.a('number');
-        expect(dataItem.vastUrl).to.be.a('string');
-        expect(dataItem.ttl).to.be.a('number');
-        expect(dataItem.creativeId).to.be.a('string');
-        expect(dataItem.netRevenue).to.be.a('boolean');
-        expect(dataItem.currency).to.be.a('string');
-        expect(dataItem.mediaType).to.be.a('string');
-        expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
-      }
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
-
-    it('(NATIVE) Returns an array of valid server responses if response object is valid', function () {
-      const resNativeObject = {
-        body: [ {
-          requestId: '123',
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
           mediaType: 'native',
-          cpm: 0.3,
-          width: 320,
-          height: 50,
           native: {
-            title: 'title',
-            image: 'image',
-            impressionTrackers: [ 'https://' ]
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
           },
-          ttl: 1000,
-          creativeId: '123asd',
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          adomain: ['example.com'],
           meta: {
             advertiserDomains: ['google.com'],
             advertiserId: 1234
           }
-        } ]
+        }]
       };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
 
-      const serverResponses = spec.interpretResponse(resNativeObject);
-
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'native', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType', 'meta', 'adomain');
-        expect(dataItem.requestId).to.be.a('string');
-        expect(dataItem.cpm).to.be.a('number');
-        expect(dataItem.width).to.be.a('number');
-        expect(dataItem.height).to.be.a('number');
-        expect(dataItem.native).to.be.an('object');
-        expect(dataItem.ttl).to.be.a('number');
-        expect(dataItem.creativeId).to.be.a('string');
-        expect(dataItem.netRevenue).to.be.a('boolean');
-        expect(dataItem.currency).to.be.a('string');
-        expect(dataItem.mediaType).to.be.a('string');
-        expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
-      }
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
-
-    it('Invalid mediaType in response', function () {
-      const resBadObject = {
-        body: [ {
-          mediaType: 'other',
-          requestId: '123',
-          cpm: 0.3,
-          ttl: 1000,
-          creativeId: '123asd',
-          currency: 'USD'
-        } ]
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
       };
 
-      const serverResponses = spec.interpretResponse(resBadObject);
-
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
 
-  describe('getUserSyncs', function () {
-    const gdprConsent = { consentString: 'consentString', gdprApplies: 1 };
-    const consentString = { consentString: 'consentString' }
-    let userSync = spec.getUserSyncs({}, {}, gdprConsent, consentString);
-    it('Returns valid URL and type', function () {
-      expect(userSync).to.be.an('array').with.lengthOf(1);
-      expect(userSync[0].type).to.exist;
-      expect(userSync[0].url).to.exist;
-      expect(userSync[0].type).to.be.equal('image');
-      expect(userSync[0].url).to.be.equal('https://sync.admanmedia.com/image?pbjs=1&gdpr=0&gdpr_consent=consentString&ccpa_consent=consentString&coppa=0');
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.admanmedia.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.admanmedia.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.admanmedia.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
     });
   });
 });
diff --git a/test/spec/modules/admaruBidAdapter_spec.js b/test/spec/modules/admaruBidAdapter_spec.js
index 813a4ed8b29..05ec9eca67f 100644
--- a/test/spec/modules/admaruBidAdapter_spec.js
+++ b/test/spec/modules/admaruBidAdapter_spec.js
@@ -39,12 +39,12 @@ describe('Admaru Adapter', function () {
     });
 
     it('should return false when required params are not passed', () => {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         wrong: 'missing pub_id or adspace_id'
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/admaticBidAdapter_spec.js b/test/spec/modules/admaticBidAdapter_spec.js
index 8c9969e4d46..50700a7b4e1 100644
--- a/test/spec/modules/admaticBidAdapter_spec.js
+++ b/test/spec/modules/admaticBidAdapter_spec.js
@@ -1,12 +1,553 @@
-import {expect} from 'chai';
-import {spec, storage} from 'modules/admaticBidAdapter.js';
-import {newBidder} from 'src/adapters/bidderFactory.js';
-import {getStorageManager} from 'src/storageManager';
+import { expect } from 'chai';
+import { spec } from 'modules/admaticBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
 
 const ENDPOINT = 'https://layer.serve.admatic.com.tr/pb';
 
 describe('admaticBidAdapter', () => {
   const adapter = newBidder(spec);
+  let validRequest = [ {
+    'refererInfo': {
+      'page': 'https://www.admatic.com.tr',
+      'domain': 'https://www.admatic.com.tr',
+    },
+    'bidder': 'admatic',
+    'params': {
+      'networkId': 10433394,
+      'host': 'layer.serve.admatic.com.tr'
+    },
+    'ortb2Imp': { 'ext': { 'instl': 1 } },
+    'ortb2': { 'badv': ['admatic.com.tr'] },
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 250], [728, 90]]
+      },
+      'native': {
+      },
+      'video': {
+      }
+    },
+    getFloor: inputParams => {
+      if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+        return {
+          currency: 'USD',
+          floor: 1.0
+        };
+      } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+        return {
+          currency: 'USD',
+          floor: 2.0
+        };
+      } else if (inputParams.mediaType === VIDEO) {
+        return {
+          currency: 'USD',
+          floor: 1.0
+        };
+      } else if (inputParams.mediaType === NATIVE) {
+        return {
+          currency: 'USD',
+          floor: 1.0
+        };
+      } else {
+        return {}
+      }
+    },
+    'schain': {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [
+        {
+          'asi': 'pixad.com.tr',
+          'sid': 'px-pub-3000856707',
+          'hp': 1
+        }
+      ]
+    },
+    'at': 1,
+    'tmax': 1000,
+    'user': {
+      'ext': {
+        'eids': [
+          {
+            'source': 'id5-sync.com',
+            'uids': [
+              {
+                'id': '0',
+                'atype': 1,
+                'ext': {
+                  'linkType': 0,
+                  'pba': 'wMh3sAXcnhDq7CfSa6ji1g=='
+                }
+              }
+            ]
+          },
+          {
+            'source': 'pubcid.org',
+            'uids': [
+              {
+                'id': '5a49273f-a424-454b-b478-169c3551aa72',
+                'atype': 1
+              }
+            ]
+          }
+        ]
+      }
+    },
+    'ortb': {
+      'badv': [],
+      'bcat': [],
+      'site': {
+        'page': 'http://localhost:8888/admatic.html',
+        'ref': 'http://localhost:8888',
+        'publisher': {
+          'name': 'localhost'
+        }
+      },
+      'device': {
+        'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36'
+      }
+    },
+    'site': {
+      'page': 'http://localhost:8888/admatic.html',
+      'ref': 'http://localhost:8888',
+      'publisher': {
+        'name': 'localhost',
+        'publisherId': 12321312
+      }
+    },
+    'imp': [
+      {
+        'size': [
+          {
+            'w': 300,
+            'h': 250
+          },
+          {
+            'w': 728,
+            'h': 90
+          }
+        ],
+        'mediatype': {},
+        'type': 'banner',
+        'id': 1,
+        'floors': {
+          'banner': {
+            '300x250': { 'currency': 'USD', 'floor': 1 },
+            '728x90': { 'currency': 'USD', 'floor': 2 }
+          }
+        }
+      },
+      {
+        'size': [
+          {
+            'w': 338,
+            'h': 280
+          }
+        ],
+        'type': 'video',
+        'mediatype': {
+          'context': 'instream',
+          'mimes': [
+            'video/mp4'
+          ],
+          'maxduration': 240,
+          'api': [
+            1,
+            2
+          ],
+          'playerSize': [
+            [
+              338,
+              280
+            ]
+          ],
+          'protocols': [
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8
+          ],
+          'skip': 1,
+          'playbackmethod': [
+            2
+          ],
+          'linearity': 1,
+          'placement': 2
+        },
+        'floors': {
+          'video': {
+            '338x280': { 'currency': 'USD', 'floor': 1 }
+          }
+        },
+        'id': '45e86fc7ce7fc93'
+      },
+      {
+        'size': [
+          {
+            'w': 1,
+            'h': 1
+          }
+        ],
+        'type': 'native',
+        'mediatype': {
+          'title': {
+            'required': true,
+            'len': 120
+          },
+          'image': {
+            'required': true
+          },
+          'icon': {
+            'required': false,
+            'sizes': [
+              640,
+              480
+            ]
+          },
+          'sponsoredBy': {
+            'required': false
+          },
+          'body': {
+            'required': false
+          },
+          'clickUrl': {
+            'required': false
+          },
+          'displayUrl': {
+            'required': false
+          }
+        },
+        'ext': {
+          'instl': 0,
+          'gpid': 'native-INS_b1b1269f-9570-fe3c-9bf4-f187827ec94a',
+          'data': {
+            'pbadslot': 'native-INS_b1b1269f-9570-fe3c-9bf4-f187827ec94a'
+          }
+        },
+        'floors': {
+          'native': {
+            '*': { 'currency': 'USD', 'floor': 1 }
+          }
+        },
+        'id': '16e0c8982318f91'
+      }
+    ],
+    'ext': {
+      'cur': 'USD',
+      'bidder': 'admatic'
+    }
+  } ];
+  let bidderRequest = {
+    'refererInfo': {
+      'page': 'https://www.admatic.com.tr',
+      'domain': 'https://www.admatic.com.tr',
+    },
+    'bidder': 'admatic',
+    'params': {
+      'networkId': 10433394,
+      'host': 'layer.serve.admatic.com.tr'
+    },
+    'ortb2Imp': { 'ext': { 'instl': 1 } },
+    'ortb2': { 'badv': ['admatic.com.tr'] },
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 250], [728, 90]]
+      },
+      'native': {
+      },
+      'video': {
+        'playerSize': [
+          336,
+          280
+        ]
+      }
+    },
+    'userId': {
+      'id5id': {
+        'uid': '0',
+        'ext': {
+          'linkType': 0,
+          'pba': 'wMh3sAXcnhDq7CfSa6ji1g=='
+        }
+      },
+      'pubcid': '5a49273f-a424-454b-b478-169c3551aa72'
+    },
+    'userIdAsEids': [
+      {
+        'source': 'id5-sync.com',
+        'uids': [
+          {
+            'id': '0',
+            'atype': 1,
+            'ext': {
+              'linkType': 0,
+              'pba': 'wMh3sAXcnhDq7CfSa6ji1g=='
+            }
+          }
+        ]
+      },
+      {
+        'source': 'pubcid.org',
+        'uids': [
+          {
+            'id': '5a49273f-a424-454b-b478-169c3551aa72',
+            'atype': 1
+          }
+        ]
+      }
+    ],
+    getFloor: inputParams => {
+      if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+        return {
+          currency: 'USD',
+          floor: 1.0
+        };
+      } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+        return {
+          currency: 'USD',
+          floor: 2.0
+        };
+      } else if (inputParams.mediaType === VIDEO) {
+        return {
+          currency: 'USD',
+          floor: 1.0
+        };
+      } else if (inputParams.mediaType === NATIVE) {
+        return {
+          currency: 'USD',
+          floor: 1.0
+        };
+      } else {
+        return {}
+      }
+    },
+    'schain': {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [
+        {
+          'asi': 'pixad.com.tr',
+          'sid': 'px-pub-3000856707',
+          'hp': 1
+        }
+      ]
+    },
+    'at': 1,
+    'tmax': 1000,
+    'user': {
+      'ext': {
+        'eids': [
+          {
+            'source': 'id5-sync.com',
+            'uids': [
+              {
+                'id': '0',
+                'atype': 1,
+                'ext': {
+                  'linkType': 0,
+                  'pba': 'wMh3sAXcnhDq7CfSa6ji1g=='
+                }
+              }
+            ]
+          },
+          {
+            'source': 'pubcid.org',
+            'uids': [
+              {
+                'id': '5a49273f-a424-454b-b478-169c3551aa72',
+                'atype': 1
+              }
+            ]
+          }
+        ]
+      }
+    },
+    'ortb': {
+      'source': {},
+      'site': {
+        'domain': 'localhost:8888',
+        'publisher': {
+          'domain': 'localhost:8888'
+        },
+        'page': 'http://localhost:8888/',
+        'name': 'http://localhost:8888'
+      },
+      'badv': [],
+      'bcat': [],
+      'device': {
+        'w': 896,
+        'h': 979,
+        'dnt': 0,
+        'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+        'language': 'tr',
+        'sua': {
+          'source': 1,
+          'platform': {
+            'brand': 'macOS'
+          },
+          'browsers': [
+            {
+              'brand': 'Google Chrome',
+              'version': [
+                '119'
+              ]
+            },
+            {
+              'brand': 'Chromium',
+              'version': [
+                '119'
+              ]
+            },
+            {
+              'brand': 'Not?A_Brand',
+              'version': [
+                '24'
+              ]
+            }
+          ],
+          'mobile': 0
+        }
+      }
+    },
+    'site': {
+      'page': 'http://localhost:8888/admatic.html',
+      'ref': 'http://localhost:8888',
+      'publisher': {
+        'name': 'localhost',
+        'publisherId': 12321312
+      }
+    },
+    'imp': [
+      {
+        'size': [
+          {
+            'w': 300,
+            'h': 250
+          },
+          {
+            'w': 728,
+            'h': 90
+          }
+        ],
+        'id': 1,
+        'mediatype': {},
+        'type': 'banner',
+        'floors': {
+          'banner': {
+            '300x250': { 'currency': 'USD', 'floor': 1 },
+            '728x90': { 'currency': 'USD', 'floor': 2 }
+          }
+        }
+      },
+      {
+        'size': [
+          {
+            'w': 338,
+            'h': 280
+          }
+        ],
+        'type': 'video',
+        'mediatype': {
+          'context': 'instream',
+          'mimes': [
+            'video/mp4'
+          ],
+          'maxduration': 240,
+          'api': [
+            1,
+            2
+          ],
+          'playerSize': [
+            [
+              338,
+              280
+            ]
+          ],
+          'protocols': [
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8
+          ],
+          'skip': 1,
+          'playbackmethod': [
+            2
+          ],
+          'linearity': 1,
+          'placement': 2
+        },
+        'floors': {
+          'video': {
+            '338x280': { 'currency': 'USD', 'floor': 1 }
+          }
+        },
+        'id': '45e86fc7ce7fc93'
+      },
+      {
+        'size': [
+          {
+            'w': 1,
+            'h': 1
+          }
+        ],
+        'type': 'native',
+        'mediatype': {
+          'title': {
+            'required': true,
+            'len': 120
+          },
+          'image': {
+            'required': true
+          },
+          'icon': {
+            'required': false,
+            'sizes': [
+              640,
+              480
+            ]
+          },
+          'sponsoredBy': {
+            'required': false
+          },
+          'body': {
+            'required': false
+          },
+          'clickUrl': {
+            'required': false
+          },
+          'displayUrl': {
+            'required': false
+          }
+        },
+        'ext': {
+          'instl': 0,
+          'gpid': 'native-INS_b1b1269f-9570-fe3c-9bf4-f187827ec94a',
+          'data': {
+            'pbadslot': 'native-INS_b1b1269f-9570-fe3c-9bf4-f187827ec94a'
+          }
+        },
+        'floors': {
+          'native': {
+            '*': { 'currency': 'USD', 'floor': 1 }
+          }
+        },
+        'id': '16e0c8982318f91'
+      }
+    ],
+    'ext': {
+      'cur': 'USD',
+      'bidder': 'admatic'
+    }
+  };
 
   describe('inherited functions', () => {
     it('exists and is a function', () => {
@@ -16,6 +557,10 @@ describe('admaticBidAdapter', () => {
 
   describe('isBidRequestValid', function() {
     let bid = {
+      'refererInfo': {
+        'page': 'https://www.admatic.com.tr',
+        'domain': 'https://www.admatic.com.tr',
+      },
       'bidder': 'admatic',
       'params': {
         'networkId': 10433394,
@@ -47,255 +592,147 @@ describe('admaticBidAdapter', () => {
 
   describe('buildRequests', function () {
     it('sends bid request to ENDPOINT via POST', function () {
-      let validRequest = [ {
-        'bidder': 'admatic',
-        'params': {
-          'networkId': 10433394,
-          'host': 'layer.serve.admatic.com.tr'
-        },
-        'ortb2Imp': { 'ext': { 'instl': 1 } },
-        'ortb2': { 'badv': ['admatic.com.tr'] },
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[300, 250], [728, 90]]
-          }
-        },
-        getFloor: inputParams => {
-          if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
-            return {
-              currency: 'USD',
-              floor: 1.0
-            };
-          } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
-            return {
-              currency: 'USD',
-              floor: 2.0
-            };
-          } else {
-            return {}
-          }
-        },
-        'user': {
-          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36'
-        },
-        'blacklist': [],
-        'site': {
-          'page': 'http://localhost:8888/admatic.html',
-          'ref': 'http://localhost:8888',
-          'publisher': {
-            'name': 'localhost',
-            'publisherId': 12321312
+      const request = spec.buildRequests(validRequest, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should not populate GDPR if for non-EEA users', function () {
+      let bidRequest = Object.assign([], validRequest);
+      const request = spec.buildRequests(
+        bidRequest,
+        Object.assign({}, bidderRequest, {
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A=='
           }
-        },
-        'imp': [
-          {
-            'size': [
-              {
-                'w': 300,
-                'h': 250
-              },
-              {
-                'w': 728,
-                'h': 90
-              }
-            ],
-            'mediatype': {},
-            'type': 'banner',
-            'id': '2205da7a81846b',
-            'floors': {
-              'banner': {
-                '300x250': { 'currency': 'USD', 'floor': 1 },
-                '728x90': { 'currency': 'USD', 'floor': 2 }
-              }
-            }
-          },
-          {
-            'size': [
-              {
-                'w': 338,
-                'h': 280
-              }
-            ],
-            'type': 'video',
-            'mediatype': {
-              'context': 'instream',
-              'mimes': [
-                'video/mp4'
-              ],
-              'maxduration': 240,
-              'api': [
-                1,
-                2
-              ],
-              'playerSize': [
-                [
-                  338,
-                  280
-                ]
-              ],
-              'protocols': [
-                1,
-                2,
-                3,
-                4,
-                5,
-                6,
-                7,
-                8
-              ],
-              'skip': 1,
-              'playbackmethod': [
-                2
-              ],
-              'linearity': 1,
-              'placement': 2
-            },
-            'id': '45e86fc7ce7fc93'
+        })
+      );
+      expect(request.data.regs.ext.gdpr).to.equal(1);
+      expect(request.data.regs.ext.consent).to.equal('BOJ8RZsOJ8RZsABAB8AAAAAZ-A');
+    });
+
+    it('should populate GDPR and empty consent string if available for EEA users without consent string but with consent', function () {
+      let bidRequest = Object.assign([], validRequest);
+      const request = spec.buildRequests(
+        bidRequest,
+        Object.assign({}, bidderRequest, {
+          gdprConsent: {
+            gdprApplies: true
           }
-        ],
-        'ext': {
-          'cur': 'USD',
-          'bidder': 'admatic'
+        })
+      );
+      expect(request.data.regs.ext.gdpr).to.equal(1);
+      expect(request.data.regs.ext.consent).to.equal('');
+    });
+
+    it('should properly build a request when coppa flag is true', function () {
+      let bidRequest = Object.assign([], validRequest);
+      const request = spec.buildRequests(
+        bidRequest,
+        Object.assign({}, bidderRequest, {
+          coppa: true
+        })
+      );
+      expect(request.data.regs.ext.coppa).to.not.be.undefined;
+      expect(request.data.regs.ext.coppa).to.equal(1);
+    });
+
+    it('should properly build a request with gpp consent field', function () {
+      let bidRequest = Object.assign([], validRequest);
+      const ortb2 = {
+        regs: {
+          gpp: 'gpp_consent_string',
+          gpp_sid: [0, 1, 2]
         }
-      } ];
-      let bidderRequest = {
-        'bidder': 'admatic',
-        'params': {
-          'networkId': 10433394,
-          'host': 'layer.serve.admatic.com.tr'
-        },
-        'ortb2Imp': { 'ext': { 'instl': 1 } },
-        'ortb2': { 'badv': ['admatic.com.tr'] },
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[300, 250], [728, 90]]
-          }
-        },
-        getFloor: inputParams => {
-          if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
-            return {
-              currency: 'USD',
-              floor: 1.0
-            };
-          } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
-            return {
-              currency: 'USD',
-              floor: 2.0
-            };
-          } else {
-            return {}
-          }
-        },
-        'user': {
-          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36'
-        },
-        'blacklist': [],
-        'site': {
-          'page': 'http://localhost:8888/admatic.html',
-          'ref': 'http://localhost:8888',
-          'publisher': {
-            'name': 'localhost',
-            'publisherId': 12321312
-          }
-        },
-        'imp': [
-          {
-            'size': [
-              {
-                'w': 300,
-                'h': 250
-              },
-              {
-                'w': 728,
-                'h': 90
-              }
-            ],
-            'id': '2205da7a81846b',
-            'mediatype': {},
-            'type': 'banner',
-            'floors': {
-              'banner': {
-                '300x250': { 'currency': 'USD', 'floor': 1 },
-                '728x90': { 'currency': 'USD', 'floor': 2 }
-              }
+      };
+      const request = spec.buildRequests(bidRequest, { ...bidderRequest, ortb2 });
+      expect(request.data.regs.ext.gpp).to.equal('gpp_consent_string');
+      expect(request.data.regs.ext.gpp_sid).to.deep.equal([0, 1, 2]);
+    });
+
+    it('should properly build a request with ccpa consent field', function () {
+      let bidRequest = Object.assign([], validRequest);
+      const request = spec.buildRequests(
+        bidRequest,
+        Object.assign({}, bidderRequest, {
+          uspConsent: '1---'
+        })
+      );
+      expect(request.data.regs.ext.uspIab).to.not.be.null;
+      expect(request.data.regs.ext.uspIab).to.equal('1---');
+    });
+
+    it('should properly forward eids', function () {
+      const bidRequests = [
+        {
+          bidder: 'admatic',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
             }
           },
-          {
-            'size': [
-              {
-                'w': 338,
-                'h': 280
-              }
-            ],
-            'type': 'video',
-            'mediatype': {
-              'context': 'instream',
-              'mimes': [
-                'video/mp4'
-              ],
-              'maxduration': 240,
-              'api': [
-                1,
-                2
-              ],
-              'playerSize': [
-                [
-                  338,
-                  280
-                ]
-              ],
-              'protocols': [
-                1,
-                2,
-                3,
-                4,
-                5,
-                6,
-                7,
-                8
-              ],
-              'skip': 1,
-              'playbackmethod': [
-                2
-              ],
-              'linearity': 1,
-              'placement': 2
-            },
-            'id': '45e86fc7ce7fc93'
-          }
-        ],
-        'ext': {
-          'cur': 'USD',
-          'bidder': 'admatic'
+          userIdAsEids: [
+            {
+              source: 'admatic.com.tr',
+              uids: [{
+                id: 'abc',
+                atype: 1
+              }]
+            }
+          ],
+          params: {}
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const ortbRequest = request.data;
+      expect(ortbRequest.user.ext.eids).to.deep.equal([
+        {
+          source: 'admatic.com.tr',
+          uids: [{
+            id: 'abc',
+            atype: 1
+          }]
         }
-      };
-      const request = spec.buildRequests(validRequest, bidderRequest);
-      expect(request.url).to.equal(ENDPOINT);
-      expect(request.method).to.equal('POST');
+      ]);
     });
 
     it('should properly build a banner request with floors', function () {
-      let bidRequests = [
+      const request = spec.buildRequests(validRequest, bidderRequest);
+      request.data.imp[0].floors = {
+        'banner': {
+          '300x250': { 'currency': 'USD', 'floor': 1 },
+          '728x90': { 'currency': 'USD', 'floor': 2 }
+        }
+      };
+    });
+
+    it('should properly build a video request with several player sizes with floors', function () {
+      const bidRequests = [
         {
           'bidder': 'admatic',
-          'params': {
-            'networkId': 10433394,
-            'host': 'layer.serve.admatic.com.tr'
-          },
+          'adUnitCode': 'bid-123',
+          'transactionId': 'transaction-123',
           'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 250], [728, 90]]
+            'video': {
+              'playerSize': [[300, 250], [728, 90]]
             }
           },
           'ortb2Imp': { 'ext': { 'instl': 1 } },
           'ortb2': { 'badv': ['admatic.com.tr'] },
+          'params': {
+            'networkId': 10433394,
+            'host': 'layer.serve.admatic.com.tr'
+          },
           getFloor: inputParams => {
-            if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+            if (inputParams.mediaType === VIDEO && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
               return {
                 currency: 'USD',
                 floor: 1.0
               };
-            } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+            } else if (inputParams.mediaType === VIDEO && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
               return {
                 currency: 'USD',
                 floor: 2.0
@@ -306,33 +743,50 @@ describe('admaticBidAdapter', () => {
           }
         },
       ];
-      let bidderRequest = {
-        'bidder': 'admatic',
-        'params': {
-          'networkId': 10433394,
-          'host': 'layer.serve.admatic.com.tr'
-        },
-        'ortb2Imp': { 'ext': { 'instl': 1 } },
-        'ortb2': { 'badv': ['admatic.com.tr'] },
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250], [728, 90]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-        'creativeId': 'er2ee',
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[300, 250], [728, 90]]
-          }
+      const bidderRequest = {
+        'refererInfo': {
+          'page': 'https://www.admatic.com.tr',
+          'domain': 'https://www.admatic.com.tr',
         }
       };
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      request.data.imp[0].floors = {
-        'banner': {
-          '300x250': { 'currency': 'USD', 'floor': 1 },
-          '728x90': { 'currency': 'USD', 'floor': 2 }
+    });
+
+    it('should properly build a native request with floors', function () {
+      const bidRequests = [
+        {
+          'bidder': 'admatic',
+          'adUnitCode': 'bid-123',
+          'transactionId': 'transaction-123',
+          'mediaTypes': {
+            'native': {
+            }
+          },
+          'ortb2Imp': { 'ext': { 'instl': 1 } },
+          'ortb2': { 'badv': ['admatic.com.tr'] },
+          'params': {
+            'networkId': 10433394,
+            'host': 'layer.serve.admatic.com.tr'
+          },
+          getFloor: inputParams => {
+            if (inputParams.mediaType === NATIVE) {
+              return {
+                currency: 'USD',
+                floor: 1.0
+              };
+            } else {
+              return {}
+            }
+          }
+        },
+      ];
+      const bidderRequest = {
+        'refererInfo': {
+          'page': 'https://www.admatic.com.tr',
+          'domain': 'https://www.admatic.com.tr',
         }
       };
+      const request = spec.buildRequests(bidRequests, bidderRequest);
     });
   });
 
@@ -348,6 +802,11 @@ describe('admaticBidAdapter', () => {
             'price': 0.01,
             'type': 'banner',
             'bidder': 'admatic',
+            'currency': 'TRY',
+            'mime_type': {
+              'name': 'backfill',
+              'force': false
+            },
             'adomain': ['admatic.com.tr'],
             'party_tag': '
',
             'iurl': 'https://www.admatic.com.tr'
@@ -358,7 +817,12 @@ describe('admaticBidAdapter', () => {
             'width': 300,
             'height': 250,
             'price': 0.01,
+            'currency': 'TRY',
             'type': 'video',
+            'mime_type': {
+              'name': 'backfill',
+              'force': false
+            },
             'bidder': 'admatic',
             'adomain': ['admatic.com.tr'],
             'party_tag': '',
@@ -366,17 +830,23 @@ describe('admaticBidAdapter', () => {
           },
           {
             'id': 3,
-            'creative_id': '3741',
-            'width': 300,
-            'height': 250,
+            'creative_id': '3742',
+            'width': 1,
+            'height': 1,
             'price': 0.01,
-            'type': 'video',
+            'currency': 'TRY',
+            'type': 'native',
+            'mime_type': {
+              'name': 'backfill',
+              'force': false
+            },
             'bidder': 'admatic',
             'adomain': ['admatic.com.tr'],
-            'party_tag': 'https://www.admatic.com.tr',
+            'party_tag': '{"native":{"ver":"1.1","assets":[{"id":1,"title":{"text":"title"}},{"id":4,"data":{"value":"body"}},{"id":5,"data":{"value":"sponsored"}},{"id":6,"data":{"value":"cta"}},{"id":2,"img":{"url":"https://www.admatic.com.tr","w":1200,"h":628}},{"id":3,"img":{"url":"https://www.admatic.com.tr","w":640,"h":480}}],"link":{"url":"https://www.admatic.com.tr"},"imptrackers":["https://www.admatic.com.tr"]}}',
             'iurl': 'https://www.admatic.com.tr'
           }
         ],
+        'cur': 'TRY',
         'queryId': 'cdnbh24rlv0hhkpfpln0',
         'status': true
       }};
@@ -387,12 +857,16 @@ describe('admaticBidAdapter', () => {
           cpm: 0.01,
           width: 300,
           height: 250,
-          currency: 'TRY',
           mediaType: 'banner',
           netRevenue: true,
+          currency: 'TRY',
           ad: '
',
           creativeId: '374',
           meta: {
+            model: {
+              'name': 'backfill',
+              'force': false
+            },
             advertiserDomains: ['admatic.com.tr']
           },
           ttl: 60,
@@ -403,13 +877,16 @@ describe('admaticBidAdapter', () => {
           cpm: 0.01,
           width: 300,
           height: 250,
-          currency: 'TRY',
           mediaType: 'video',
           netRevenue: true,
-          vastImpUrl: 'https://www.admatic.com.tr',
+          currency: 'TRY',
           vastXml: '',
           creativeId: '3741',
           meta: {
+            model: {
+              'name': 'backfill',
+              'force': false
+            },
             advertiserDomains: ['admatic.com.tr']
           },
           ttl: 60,
@@ -418,15 +895,35 @@ describe('admaticBidAdapter', () => {
         {
           requestId: 3,
           cpm: 0.01,
-          width: 300,
-          height: 250,
-          currency: 'TRY',
-          mediaType: 'video',
+          width: 1,
+          height: 1,
+          mediaType: 'native',
           netRevenue: true,
-          vastImpUrl: 'https://www.admatic.com.tr',
-          vastXml: 'https://www.admatic.com.tr',
-          creativeId: '3741',
+          currency: 'TRY',
+          native: {
+            'clickUrl': 'https://www.admatic.com.tr',
+            'impressionTrackers': ['https://www.admatic.com.tr'],
+            'title': 'title',
+            'body': 'body',
+            'sponsoredBy': 'sponsored',
+            'cta': 'cta',
+            'image': {
+              'url': 'https://www.admatic.com.tr',
+              'width': 1200,
+              'height': 628
+            },
+            'icon': {
+              'url': 'https://www.admatic.com.tr',
+              'width': 640,
+              'height': 480
+            }
+          },
+          creativeId: '3742',
           meta: {
+            model: {
+              'name': 'backfill',
+              'force': false
+            },
             advertiserDomains: ['admatic.com.tr']
           },
           ttl: 60,
@@ -437,8 +934,206 @@ describe('admaticBidAdapter', () => {
         ext: {
           'cur': 'TRY',
           'type': 'admatic'
-        }
+        },
+        imp: [
+          {
+            'size': [
+              {
+                'w': 320,
+                'h': 100
+              }
+            ],
+            'type': 'banner',
+            'mediatype': {},
+            'ext': {
+              'instl': 0,
+              'gpid': 'desktop-standard',
+              'pxid': [
+                '1111111111'
+              ],
+              'pxtype': 'pixad',
+              'ortbstatus': true,
+              'viewability': 100,
+              'data': {
+                'pbadslot': 'desktop-standard'
+              },
+              'ae': 1
+            },
+            'id': 1,
+            'floors': {
+              'banner': {
+                '320x100': {
+                  'floor': 0.1,
+                  'currency': 'TRY'
+                }
+              }
+            }
+          },
+          {
+            'size': [
+              {
+                'w': 320,
+                'h': 100
+              }
+            ],
+            'type': 'video',
+            'mediatype': {
+              'context': 'instream',
+              'mimes': [
+                'video/mp4'
+              ],
+              'maxduration': 240,
+              'api': [
+                1,
+                2
+              ],
+              'playerSize': [
+                [
+                  320,
+                  100
+                ]
+              ],
+              'protocols': [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8
+              ],
+              'skip': 0,
+              'playbackmethod': [
+                2
+              ],
+              'linearity': 1,
+              'placement': 2,
+              'plcmt': 4
+            },
+            'ext': {
+              'gpid': 'outstream-desktop-standard',
+              'pxtype': 'pixad',
+              'pxid': [
+                '1111111111'
+              ],
+              'ortbstatus': true,
+              'viewability': 100,
+              'data': {
+                'pbadslot': 'outstream-desktop-standard'
+              },
+              'ae': 1
+            },
+            'id': 2,
+            'floors': {
+              'video': {
+                '320x100': {
+                  'floor': 0.1,
+                  'currency': 'TRY'
+                }
+              }
+            }
+          },
+          {
+            'size': [
+              {
+                'w': 1,
+                'h': 1
+              }
+            ],
+            'type': 'native',
+            'mediatype': {
+              'sendTargetingKeys': false,
+              'ortb': {
+                'ver': '1.1',
+                'context': 2,
+                'plcmttype': 1,
+                'privacy': 1,
+                'assets': [
+                  {
+                    'id': 1,
+                    'required': 1,
+                    'title': {
+                      'len': 120
+                    }
+                  },
+                  {
+                    'id': 2,
+                    'required': 1,
+                    'img': {
+                      'type': 3,
+                      'w': 640,
+                      'h': 480
+                    }
+                  },
+                  {
+                    'id': 3,
+                    'required': 0,
+                    'img': {
+                      'type': 1,
+                      'w': 640,
+                      'h': 480
+                    }
+                  },
+                  {
+                    'id': 4,
+                    'required': 0,
+                    'data': {
+                      'type': 2
+                    }
+                  },
+                  {
+                    'id': 5,
+                    'required': 0,
+                    'data': {
+                      'type': 1
+                    }
+                  },
+                  {
+                    'id': 6,
+                    'required': 0,
+                    'data': {
+                      'type': 11
+                    }
+                  }
+                ],
+                'eventtrackers': [
+                  {
+                    'event': 1,
+                    'methods': [
+                      1,
+                      2
+                    ]
+                  }
+                ]
+              }
+            },
+            'ext': {
+              'gpid': 'native-desktop-standard',
+              'pxtype': 'pixad',
+              'pxid': [
+                '1111111111'
+              ],
+              'ortbstatus': true,
+              'viewability': 100,
+              'data': {
+                'pbadslot': 'native-desktop-standard'
+              },
+              'ae': 1
+            },
+            'id': 3,
+            'floors': {
+              'native': {
+                '*': {
+                  'floor': 0.1,
+                  'currency': 'TRY'
+                }
+              }
+            }
+          }
+        ]
       };
+
       let result = spec.interpretResponse(bids, {data: request});
       expect(result).to.eql(expectedResponse);
     });
@@ -453,7 +1148,8 @@ describe('admaticBidAdapter', () => {
       let bids = { body: {
         data: [],
         'queryId': 'cdnbh24rlv0hhkpfpln0',
-        'status': true
+        'status': true,
+        'cur': 'TRY'
       }};
 
       let result = spec.interpretResponse(bids, {data: request});
diff --git a/test/spec/modules/admixerBidAdapter_spec.js b/test/spec/modules/admixerBidAdapter_spec.js
index 8cf433460b7..1da6a58bea3 100644
--- a/test/spec/modules/admixerBidAdapter_spec.js
+++ b/test/spec/modules/admixerBidAdapter_spec.js
@@ -4,11 +4,12 @@ import {newBidder} from 'src/adapters/bidderFactory.js';
 import {config} from '../../../src/config.js';
 
 const BIDDER_CODE = 'admixer';
-const BIDDER_CODE_ADX = 'admixeradx';
+const RTB_BIDDER_CODE = 'rtbstack'
 const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.2.aspx';
 const ENDPOINT_URL_CUSTOM = 'https://custom.admixer.net/prebid.aspx';
-const ENDPOINT_URL_ADX = 'https://inv-nets.admixer.net/adxprebid.1.2.aspx';
 const ZONE_ID = '2eb6bd58-865c-47ce-af7f-a918108c3fd2';
+const CLIENT_ID = 5124;
+const ENDPOINT_ID = 81264;
 
 describe('AdmixerAdapter', function () {
   const adapter = newBidder(spec);
@@ -36,17 +37,43 @@ describe('AdmixerAdapter', function () {
       auctionId: '1d1a030790a475',
     };
 
+    let rtbBid = {
+      bidder: RTB_BIDDER_CODE,
+      params: {
+        tagId: ENDPOINT_ID,
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [
+        [300, 250],
+        [300, 600],
+      ],
+      bidId: '30b31c1838de1e',
+      bidderRequestId: '22edbae2733bf6',
+      auctionId: '1d1a030790a475',
+    };
+
     it('should return true when required params found', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
+    it('should return true when params required by RTB found', function () {
+      expect(spec.isBidRequestValid(rtbBid)).to.equal(true);
+    });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         placementId: 0,
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+    it('should return false when params required by RTB are not passed', function () {
+      let invalidBid = Object.assign({}, rtbBid);
+      delete invalidBid.params;
+      invalidBid.params = {
+        clientId: 0,
+      };
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -90,7 +117,7 @@ describe('AdmixerAdapter', function () {
     it('sends bid request to CUSTOM_ENDPOINT via GET', function () {
       config.setBidderConfig({
         bidders: [BIDDER_CODE], // one or more bidders
-        config: { [BIDDER_CODE]: { endpoint_url: ENDPOINT_URL_CUSTOM } },
+        config: { bidderURL: ENDPOINT_URL_CUSTOM },
       });
       const request = config.runWithBidder(BIDDER_CODE, () =>
         spec.buildRequests(validRequest, bidderRequest)
@@ -105,7 +132,9 @@ describe('AdmixerAdapter', function () {
       validRequest: [
         {
           bidder: bidder,
-          params: {
+          params: bidder === 'rtbstack' ? {
+            tagId: ENDPOINT_ID
+          } : {
             zone: ZONE_ID,
           },
           adUnitCode: 'adunit-code',
@@ -144,12 +173,6 @@ describe('AdmixerAdapter', function () {
       expect(request.url).to.equal('https://inv-nets.admixer.net/prebid.1.2.aspx');
       expect(request.method).to.equal('POST');
     });
-    it('build request for adsyield', function () {
-      const requestParams = requestParamsFor('adsyield');
-      const request = spec.buildRequests(requestParams.validRequest, requestParams.bidderRequest);
-      expect(request.url).to.equal('https://ads.adsyield.com/prebid.1.2.aspx');
-      expect(request.method).to.equal('POST');
-    });
     it('build request for futureads', function () {
       const requestParams = requestParamsFor('futureads');
       const request = spec.buildRequests(requestParams.validRequest, requestParams.bidderRequest);
@@ -168,6 +191,18 @@ describe('AdmixerAdapter', function () {
       expect(request.url).to.equal('https://inv-nets.admixer.net/adxprebid.1.2.aspx');
       expect(request.method).to.equal('POST');
     });
+    it('build request for rtbstack', function () {
+      const requestParams = requestParamsFor('rtbstack');
+      config.setBidderConfig({
+        bidders: ['rtbstack'],
+        config: { bidderURL: ENDPOINT_URL_CUSTOM },
+      });
+      const request = config.runWithBidder(BIDDER_CODE, () =>
+        spec.buildRequests(requestParams.validRequest, requestParams.bidderRequest)
+      );
+      expect(request.url).to.equal(ENDPOINT_URL_CUSTOM);
+      expect(request.method).to.equal('POST');
+    });
   });
 
   describe('checkFloorGetting', function () {
@@ -191,12 +226,12 @@ describe('AdmixerAdapter', function () {
       },
     };
     it('gets floor', function () {
-      bidderRequest.getFloor = () => {
+      validRequest[0].getFloor = () => {
         return { floor: 0.6 };
       };
       const request = spec.buildRequests(validRequest, bidderRequest);
       const payload = request.data;
-      expect(payload.bidFloor).to.deep.equal(0.6);
+      expect(payload.imps[0].bidFloor).to.deep.equal(0.6);
     });
   });
 
diff --git a/test/spec/modules/adnuntiusBidAdapter_spec.js b/test/spec/modules/adnuntiusBidAdapter_spec.js
index 6a77c9205ca..7814c24f4ac 100644
--- a/test/spec/modules/adnuntiusBidAdapter_spec.js
+++ b/test/spec/modules/adnuntiusBidAdapter_spec.js
@@ -1,18 +1,23 @@
 // import or require modules necessary for the test, e.g.:
-import {expect} from 'chai'; // may prefer 'assert' in place of 'expect'
-import {misc, spec} from 'modules/adnuntiusBidAdapter.js';
-import {newBidder} from 'src/adapters/bidderFactory.js';
-import {config} from 'src/config.js';
+import { expect } from 'chai'; // may prefer 'assert' in place of 'expect'
+import { misc, spec } from 'modules/adnuntiusBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
 import * as utils from 'src/utils.js';
-import {getStorageManager} from 'src/storageManager.js';
-import {getGlobal} from '../../../src/prebidGlobal';
+import { getStorageManager } from 'src/storageManager.js';
+import { getGlobal } from '../../../src/prebidGlobal';
+import {getUnixTimestampFromNow} from 'src/utils.js';
 
-describe('adnuntiusBidAdapter', function() {
+describe('adnuntiusBidAdapter', function () {
   const URL = 'https://ads.adnuntius.delivery/i?tzo=';
   const EURO_URL = 'https://europe.delivery.adnuntius.com/i?tzo=';
-  const GVLID = 855;
   const usi = utils.generateUUID()
-  const meta = [{key: 'usi', value: usi}]
+
+  const meta = [{ key: 'valueless' }, { value: 'keyless' }, { key: 'voidAuIds' }, { key: 'voidAuIds', value: [{ auId: '11118b6bc', exp: getUnixTimestampFromNow() }, { exp: getUnixTimestampFromNow(1) }] }, { key: 'valid-withnetwork', value: 'also-valid-network', network: 'the-network', exp: getUnixTimestampFromNow(1) }, { key: 'valid', value: 'also-valid', exp: getUnixTimestampFromNow(1) }, { key: 'expired', value: 'fwefew', exp: getUnixTimestampFromNow() }, { key: 'usi', value: 'should be skipped because timestamp', exp: getUnixTimestampFromNow(), network: 'adnuntius' }, { key: 'usi', value: usi, exp: getUnixTimestampFromNow(100), network: 'adnuntius' }, { key: 'usi', value: 'should be skipped because timestamp', exp: getUnixTimestampFromNow() }]
+  let storage;
+
+  // need this to make the restore work correctly -- something to do with stubbing static prototype methods
+  let stub1 = {}, stub2 = {};
 
   before(() => {
     getGlobal().bidderSettings = {
@@ -20,25 +25,34 @@ describe('adnuntiusBidAdapter', function() {
         storageAllowed: true
       }
     };
-    const storage = getStorageManager({bidderCode: 'adnuntius'})
-    storage.setDataInLocalStorage('adn.metaData', JSON.stringify(meta))
+    storage = getStorageManager({ bidderCode: 'adnuntius' });
+  });
+
+  beforeEach(() => {
+    storage.setDataInLocalStorage('adn.metaData', JSON.stringify(meta));
   });
 
   after(() => {
     getGlobal().bidderSettings = {};
   });
 
-  afterEach(function() {
+  afterEach(function () {
     config.resetConfig();
+
+    if (stub1.restore) {
+      stub1.restore();
+    }
+    if (stub2.restore) {
+      stub2.restore();
+    }
   });
 
   const tzo = new Date().getTimezoneOffset();
-  const ENDPOINT_URL_BASE = `${URL}${tzo}&format=json`;
+  const ENDPOINT_URL_BASE = `${URL}${tzo}&format=prebid`;
   const ENDPOINT_URL = `${ENDPOINT_URL_BASE}&userId=${usi}`;
-  const ENDPOINT_URL_VIDEO = `${ENDPOINT_URL_BASE}&userId=${usi}&tt=vast4`;
   const ENDPOINT_URL_NOCOOKIE = `${ENDPOINT_URL_BASE}&userId=${usi}&noCookies=true`;
   const ENDPOINT_URL_SEGMENTS = `${ENDPOINT_URL_BASE}&segments=segment1,segment2,segment3&userId=${usi}`;
-  const ENDPOINT_URL_CONSENT = `${EURO_URL}${tzo}&format=json&consentString=consentString&userId=${usi}`;
+  const ENDPOINT_URL_CONSENT = `${EURO_URL}${tzo}&format=prebid&consentString=consentString&gdpr=1&userId=${usi}`;
   const adapter = newBidder(spec);
 
   const bidderRequests = [
@@ -47,6 +61,7 @@ describe('adnuntiusBidAdapter', function() {
       bidder: 'adnuntius',
       params: {
         auId: '000000000008b6bc',
+        targetId: '123',
         network: 'adnuntius',
         maxDeals: 1
       },
@@ -86,7 +101,66 @@ describe('adnuntiusBidAdapter', function() {
         }
       },
     }
-  ]
+  ];
+
+  const multiBidderInResponse = {
+    bid: [{
+      bidder: 'adnuntius',
+      bidId: '3a602680158a85',
+      params: {
+        auId: '381535',
+        network: '1287',
+        bidType: 'netBid',
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[200, 200]]
+        },
+        video: {
+          playerSize: [200, 200],
+          context: 'instream'
+        }
+      }
+    },
+    {
+      bidder: 'adnuntius',
+      params: {
+        auId: '381535',
+        network: '1287',
+        bidType: 'netBid',
+        targetId: 'fred',
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[200, 200]]
+        },
+        video: {
+          playerSize: [200, 200],
+          context: 'instream'
+        }
+      }
+    }]
+  };
+
+  const multiBidderRequest = [
+    {
+      bidId: 'adn-0000000000000551',
+      bidder: 'adnuntius',
+      params: {
+        auId: '0000000000000551',
+        network: 'adnuntius',
+      },
+      mediaTypes: {
+        video: {
+          playerSize: [640, 480],
+          context: 'instream'
+        },
+        banner: {
+          sizes: [[1640, 1480], [1600, 1400]],
+        }
+      },
+    }
+  ];
 
   const singleBidRequest = {
     bid: [
@@ -124,6 +198,7 @@ describe('adnuntiusBidAdapter', function() {
       'urlsEsc': {
         'destination': 'https%3A%2F%2Fads.adnuntius.delivery%2Fc%2FyQtMUwYBn5P4v72WJMqLW4z7uJOBFXJTfjoRyz0z_wsAAAAQCtjQz9kbGWD4nuZy3q6HaCYxq6Lckz2kThplNb227EJdQ5032jcIGkf-UrPmXCU2EbXVaQ3Ok6_FNLuIDTONJyx6ZZCB10wGqA3OaSe1EqwQp84u1_5iQZAWDk73UYf7_vcIypn7ev-SICZ3qaevb2jYSRqTVZx6AiBZQQGlzlOOrbZU9AU1F-JwTds-YV3qtJHGlxI2peWFIuxFlOYyeX9Kzg%3Fct%3D673%26r%3Dhttp%253A%252F%252Fadnuntius.com'
       },
+      'advertiserDomains': ['fred.com', 'george.com'],
       'destinationUrls': {
         'destination': 'https://adnuntius.com'
       },
@@ -168,6 +243,131 @@ describe('adnuntiusBidAdapter', function() {
     }
   ];
 
+  const multiFormatServerResponse = {
+    body: {
+      'adUnits': [
+        {
+          'auId': '0000000000381535',
+          'targetId': '3a602680158a85-video',
+          'vastXml': '\n',
+          'matchedAdCount': 1,
+          'responseId': 'adn-rsp-453419729',
+          'ads': [
+            {
+              'cpm': {
+                'amount': 1500.0,
+                'currency': 'NOK'
+              },
+              'bid': {
+                'amount': 1.5,
+                'currency': 'NOK'
+              },
+              'grossBid': {
+                'amount': 1.5,
+                'currency': 'NOK'
+              },
+              'netBid': {
+                'amount': 1.5,
+                'currency': 'NOK'
+              },
+              'cost': {
+                'amount': 1.5,
+                'currency': 'NOK'
+              },
+              creativeWidth: 200,
+              creativeHeight: 240,
+              'adId': 'adn-id-615465411',
+              'vastXml': ''
+            }
+          ]
+        },
+        {
+          'auId': '0000000000381535',
+          'targetId': 'fred-video',
+          'vastXml': '',
+          'matchedAdCount': 1,
+          'responseId': 'adn-rsp--1809523040',
+          'ads': [
+            {
+              'cpm': {
+                'amount': 1500.0,
+                'currency': 'NOK'
+              },
+              'bid': {
+                'amount': 1.5,
+                'currency': 'NOK'
+              },
+              'grossBid': {
+                'amount': 1.5,
+                'currency': 'NOK'
+              },
+              'netBid': {
+                'amount': 1.5,
+                'currency': 'NOK'
+              },
+              'cost': {
+                'amount': 1.5,
+                'currency': 'NOK'
+              },
+              creativeWidth: 200,
+              creativeHeight: 240,
+              'adId': 'adn-id-344789675',
+              'selectedColumn': '0',
+              'selectedColumnPosition': '0',
+              'vastXml': '\n',
+            }
+          ]
+        },
+        {
+          'auId': '0000000000381535',
+          'targetId': '3a602680158a85',
+          'html': '\u003C!DOCTYPE html\u003E\n\n\u003C/html\u003E',
+          'matchedAdCount': 0,
+          'responseId': '',
+          'ads': []
+        },
+        {
+          'auId': '0000000000381535',
+          'renderOption': 'DIV',
+          'targetId': 'fred',
+          'html': '\u003C!DOCTYPE html\u003E\n\u003C\u003E\n\u003C/html\u003E',
+          'matchedAdCount': 1,
+          'responseId': 'adn-rsp-1620340740',
+          'ads': [
+            {
+              'destinationUrlEsc': '',
+              'cpm': {
+                'amount': 1250.0,
+                'currency': 'NOK'
+              },
+              creativeWidth: 200,
+              creativeHeight: 240,
+              'bid': {
+                'amount': 1.75,
+                'currency': 'NOK'
+              },
+              'grossBid': {
+                'amount': 1.75,
+                'currency': 'NOK'
+              },
+              'netBid': {
+                'amount': 1.75,
+                'currency': 'NOK'
+              },
+              'cost': {
+                'amount': 1.75,
+                'currency': 'NOK'
+              },
+              'html': '\u003Ca \'\u003E\u003C/script\u003E',
+            }
+          ]
+        }
+      ],
+      'network': '1287',
+      'keywords': []
+    }
+  };
+
   const serverResponse = {
     body: {
       'adUnits': [
@@ -252,7 +452,8 @@ describe('adnuntiusBidAdapter', function() {
         'usi': 'from-api-server dude',
         'voidAuIds': '00000000000abcde;00000000000fffff',
         'randomApiKey': 'randomApiValue'
-      }
+      },
+      'network': 'some-network-id'
     }
   }
   const serverVideoResponse = {
@@ -437,47 +638,153 @@ describe('adnuntiusBidAdapter', function() {
     }
   }
 
-  describe('inherited functions', function() {
-    it('exists and is a function', function() {
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
   });
 
-  describe('isBidRequestValid', function() {
-    it('should return true when required params found', function() {
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
       expect(spec.isBidRequestValid(bidderRequests[0])).to.equal(true);
     });
   });
 
-  describe('buildRequests', function() {
-    it('Test requests', function() {
+  describe('buildRequests', function () {
+    it('Test requests', function () {
+      stub1 = sinon.stub(URLSearchParams.prototype, 'has').callsFake(() => {
+        return true;
+      });
+      stub2 = sinon.stub(URLSearchParams.prototype, 'get').callsFake(() => {
+        return 'overridden-value';
+      });
+
+      const request = spec.buildRequests(bidderRequests, {
+        refererInfo: {
+          canonicalUrl: 'https://canonical.com/page.html',
+          page: 'https://canonical.com/something-else.html'
+        }
+      });
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('bid');
+      const bid = request[0].bid[0]
+      expect(bid).to.have.property('bidId');
+      expect(request[0]).to.have.property('url');
+      expect(request[0].url).to.equal(ENDPOINT_URL.replace('format=prebid', 'format=prebid&so=overridden-value'));
+      expect(request[0]).to.have.property('data');
+      expect(request[0].data).to.equal('{"adUnits":[{"auId":"000000000008b6bc","targetId":"123","maxDeals":1,"dimensions":[[640,480],[600,400]]},{"auId":"0000000000000551","targetId":"adn-0000000000000551","dimensions":[[1640,1480],[1600,1400]]}],"context":"https://canonical.com/something-else.html","canonical":"https://canonical.com/page.html"}');
+    });
+
+    it('Test requests with no local storage', function () {
+      storage.setDataInLocalStorage('adn.metaData', JSON.stringify([{}]));
       const request = spec.buildRequests(bidderRequests, {});
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('bid');
       const bid = request[0].bid[0]
       expect(bid).to.have.property('bidId');
       expect(request[0]).to.have.property('url');
-      expect(request[0].url).to.equal(ENDPOINT_URL);
+      expect(request[0].url).to.equal(ENDPOINT_URL_BASE);
+      expect(request[0]).to.have.property('data');
+      expect(request[0].data).to.equal('{"adUnits":[{"auId":"000000000008b6bc","targetId":"123","maxDeals":1,"dimensions":[[640,480],[600,400]]},{"auId":"0000000000000551","targetId":"adn-0000000000000551","dimensions":[[1640,1480],[1600,1400]]}]}');
+
+      localStorage.removeItem('adn.metaData');
+      const request2 = spec.buildRequests(bidderRequests, {});
+      expect(request2.length).to.equal(1);
+      expect(request2[0]).to.have.property('url');
+      expect(request2[0].url).to.equal(ENDPOINT_URL_BASE);
+    });
+
+    it('Test request changes for voided au ids', function () {
+      storage.setDataInLocalStorage('adn.metaData', JSON.stringify([{ key: 'voidAuIds', value: [{ auId: '11118b6bc', exp: getUnixTimestampFromNow(1) }, { auId: '0000000000000023', exp: getUnixTimestampFromNow(1) }] }]));
+      const bRequests = bidderRequests.concat([{
+        bidId: 'adn-11118b6bc',
+        bidder: 'adnuntius',
+        params: {
+          auId: '11118b6bc',
+          network: 'adnuntius',
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[1640, 1480], [1600, 1400]],
+          }
+        },
+      }]);
+      bRequests.push({
+        bidId: 'adn-23',
+        bidder: 'adnuntius',
+        params: {
+          auId: '23',
+          network: 'adnuntius',
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[1640, 1480], [1600, 1400]],
+          }
+        },
+      });
+      bRequests.push({
+        bidId: 'adn-13',
+        bidder: 'adnuntius',
+        params: {
+          auId: '13',
+          network: 'adnuntius',
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[164, 140], [10, 1400]],
+          }
+        },
+      });
+      const request = spec.buildRequests(bRequests, {});
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('bid');
+      const bid = request[0].bid[0]
+      expect(bid).to.have.property('bidId');
+      expect(request[0]).to.have.property('url');
+      expect(request[0].url).to.equal(ENDPOINT_URL_BASE);
       expect(request[0]).to.have.property('data');
-      expect(request[0].data).to.equal('{"adUnits":[{"auId":"000000000008b6bc","targetId":"adn-000000000008b6bc","maxDeals":1,"dimensions":[[640,480],[600,400]]},{"auId":"0000000000000551","targetId":"adn-0000000000000551","maxDeals":0,"dimensions":[[1640,1480],[1600,1400]]}],"metaData":{"usi":"' + usi + '"}}');
+      expect(request[0].data).to.equal('{"adUnits":[{"auId":"000000000008b6bc","targetId":"123","maxDeals":1,"dimensions":[[640,480],[600,400]]},{"auId":"0000000000000551","targetId":"adn-0000000000000551","dimensions":[[1640,1480],[1600,1400]]},{"auId":"13","targetId":"adn-13","dimensions":[[164,140],[10,1400]]}]}');
     });
 
-    it('Test Video requests', function() {
+    it('Test Video requests', function () {
       const request = spec.buildRequests(videoBidderRequest, {});
       expect(request.length).to.equal(1);
+
+      const data = JSON.parse(request[0].data);
+      expect(data.adUnits.length).to.equal(1);
+      expect(data.adUnits[0].targetId).to.equal('adn-0000000000000551');
+      expect(data.adUnits[0].adType).to.equal('VAST');
+
       expect(request[0]).to.have.property('bid');
       const bid = request[0].bid[0]
       expect(bid).to.have.property('bidId');
       expect(request[0]).to.have.property('url');
-      expect(request[0].url).to.equal(ENDPOINT_URL_VIDEO);
+      expect(request[0].url).to.equal(ENDPOINT_URL);
     });
 
-    it('should pass segments if available in config', function() {
+    it('Test multiformat requests', function () {
+      const request = spec.buildRequests(multiBidderRequest, {});
+      expect(request.length).to.equal(1);
+      expect(request.data)
+      const data = JSON.parse(request[0].data);
+      expect(data.adUnits.length).to.equal(2);
+      expect(data.adUnits[0].targetId).to.equal('adn-0000000000000551');
+      expect(data.adUnits[0]).not.to.have.property('adType');
+      expect(data.adUnits[1].targetId).to.equal('adn-0000000000000551-video');
+      expect(data.adUnits[1].adType).to.equal('VAST');
+      expect(request[0]).to.have.property('bid');
+      const bid = request[0].bid[0]
+      expect(bid).to.have.property('bidId');
+      expect(request[0]).to.have.property('url');
+      expect(request[0].url).to.equal(ENDPOINT_URL);
+    });
+
+    it('should pass segments if available in config and merge from targeting', function () {
       const ortb2 = {
         user: {
           data: [{
             name: 'adnuntius',
-            segment: [{id: 'segment1'}, {id: 'segment2'}]
+            segment: [{ id: 'segment1' }, { id: 'segment2' }, { invalidSegment: 'invalid' }, { id: 123 }, { id: ['3332'] }]
           },
           {
             name: 'other',
@@ -486,18 +793,151 @@ describe('adnuntiusBidAdapter', function() {
         }
       };
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, {ortb2}));
+      bidderRequests[0].params.targeting = {
+        segments: ['merge-this', 'and-this']
+      };
+
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
-      expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
+      expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS.replace('segment3', 'segment3,merge-this,and-this'));
+
+      delete bidderRequests[0].params.targeting;
+    });
+
+    function countMatches(actualArray, expectedValue) {
+      return actualArray.filter(val => {
+        return JSON.stringify(val) === JSON.stringify(expectedValue);
+      }).length;
+    }
+
+    it('should pass site data ext as key values to ad server', function () {
+      const ortb2 = {
+        site: {
+          ext: {
+            data: {
+              '12345': 'true',
+              '45678': 'true',
+              '9090': 'should-be-retained'
+            }
+          }
+        }
+      };
+      bidderRequests[0].params.targeting = {
+        kv: {
+          'merge': ['this'],
+          '9090': ['take it over']
+        }
+      };
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      const data = JSON.parse(request[0].data);
+      expect(countMatches(data.adUnits[0].kv, {'9090': ['take it over']})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'merge': ['this']})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'9090': 'should-be-retained'})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'45678': 'true'})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'12345': 'true'})).to.equal(1);
+      expect(data.adUnits[0].kv.length).to.equal(5);
+
+      delete bidderRequests[0].params.targeting;
+    });
+
+    it('should pass site data ext as key values to ad server with targeting in different format', function () {
+      const ortb2 = {
+        site: {
+          ext: {
+            data: {
+              '12345': 'true',
+              '45678': 'true',
+              '9090': 'should-be-retained'
+            }
+          }
+        }
+      };
+      bidderRequests[0].params.targeting = {
+        kv: [
+          {'merge': ['this']},
+          {'9090': ['take it over']}
+        ]
+      };
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      const data = JSON.parse(request[0].data);
+      expect(countMatches(data.adUnits[0].kv, {'9090': ['take it over']})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'merge': ['this']})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'9090': 'should-be-retained'})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'45678': 'true'})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'12345': 'true'})).to.equal(1);
+      expect(data.adUnits[0].kv.length).to.equal(5);
+
+      delete bidderRequests[0].params.targeting;
+    });
+
+    it('should pass site data ext as key values to ad server even if no kv targeting specified in params.targeting', function () {
+      const ortb2 = {
+        site: {
+          ext: {
+            data: {
+              '12345': 'true',
+              '45678': 'true',
+              '9090': 'should-be-retained'
+            }
+          }
+        }
+      };
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      const data = JSON.parse(request[0].data);
+      expect(countMatches(data.adUnits[0].kv, {'9090': 'should-be-retained'})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'45678': 'true'})).to.equal(1);
+      expect(countMatches(data.adUnits[0].kv, {'12345': 'true'})).to.equal(1);
+      expect(data.adUnits[0].kv.length).to.equal(3);
+
+      delete bidderRequests[0].params.targeting;
+    });
+
+    it('should skip passing site ext if missing', function () {
+      const ortb2 = {
+        site: {
+          ext: {
+          }
+        }
+      };
+
+      delete bidderRequests[0].params.targeting;
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url');
+      const data = JSON.parse(request[0].data);
+      expect(data.adUnits[0]).to.not.have.property('kv');
+    });
+
+    it('should skip passing site ext data if missing', function () {
+      const ortb2 = {
+        site: {
+          ext: {
+            data: {}
+          }
+        }
+      };
+
+      delete bidderRequests[0].params.targeting;
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url');
+      const data = JSON.parse(request[0].data);
+      expect(data.adUnits[0]).to.not.have.property('kv');
     });
 
-    it('should skip segments in config if not either id or array of strings', function() {
+    it('should skip segments in config if not either id or array of strings', function () {
       const ortb2 = {
         user: {
           data: [{
             name: 'adnuntius',
-            segment: [{id: 'segment1'}, {id: 'segment2'}, {id: 'segment3'}]
+            segment: [{ id: 'segment1' }, { id: 'segment2' }, { id: 'segment3' }]
           },
           {
             name: 'other',
@@ -508,34 +948,34 @@ describe('adnuntiusBidAdapter', function() {
         }
       };
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, {ortb2}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
     });
   });
 
-  describe('user privacy', function() {
-    it('should send GDPR Consent data if gdprApplies', function() {
-      let request = spec.buildRequests(bidderRequests, {gdprConsent: {gdprApplies: true, consentString: 'consentString'}});
+  describe('user privacy', function () {
+    it('should send GDPR Consent data if gdprApplies', function () {
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: true, consentString: 'consentString' } });
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_CONSENT);
     });
 
-    it('should not send GDPR Consent data if gdprApplies equals undefined', function() {
-      let request = spec.buildRequests(bidderRequests, {gdprConsent: {gdprApplies: undefined, consentString: 'consentString'}});
+    it('should not send GDPR Consent data if gdprApplies equals undefined', function () {
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: undefined, consentString: 'consentString' } });
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL);
     });
 
-    it('should pass segments if available in config', function() {
+    it('should pass segments if available in config', function () {
       const ortb2 = {
         user: {
           data: [{
             name: 'adnuntius',
-            segment: [{id: 'segment1'}, {id: 'segment2'}]
+            segment: [{ id: 'segment1' }, { id: 'segment2' }]
           },
           {
             name: 'other',
@@ -544,18 +984,18 @@ describe('adnuntiusBidAdapter', function() {
         }
       }
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, {ortb2}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
     });
 
-    it('should skip segments in config if not either id or array of strings', function() {
+    it('should skip segments in config if not either id or array of strings', function () {
       const ortb2 = {
         user: {
           data: [{
             name: 'adnuntius',
-            segment: [{id: 'segment1'}, {id: 'segment2'}, {id: 'segment3'}]
+            segment: [{ id: 'segment1' }, { id: 'segment2' }, { id: 'segment3' }]
           },
           {
             name: 'other',
@@ -566,60 +1006,102 @@ describe('adnuntiusBidAdapter', function() {
         }
       };
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, {ortb2}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
     });
 
-    it('should user user ID if present in ortb2.user.id field', function() {
+    it('should user user ID if present in ortb2.user.id field', function () {
       const ortb2 = {
         user: {
           id: usi
         }
       };
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, {ortb2}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL);
+    });
+
+    it('should user in user', function () {
+      config.setBidderConfig({
+        bidders: ['adnuntius'],
+      });
+      const req = [
+        {
+          bidId: 'adn-000000000008b6bc',
+          bidder: 'adnuntius',
+          params: {
+            auId: '000000000008b6bc',
+            network: 'adnuntius',
+            userId: 'different_user_id'
+          }
+        }
+      ]
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(req, { bids: req }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(`${ENDPOINT_URL_BASE}&userId=different_user_id`);
+    });
+
+    it('should handle no user specified', function () {
+      config.setBidderConfig({
+        bidders: ['adnuntius'],
+      });
+      const req = [
+        {
+          bidId: 'adn-000000000008b6bc',
+          bidder: 'adnuntius',
+          params: {
+            auId: '000000000008b6bc',
+            network: 'adnuntius'
+          }
+        }
+      ];
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(req, { bids: req }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL);
     });
   });
 
-  describe('user privacy', function() {
-    it('should send GDPR Consent data if gdprApplies', function() {
-      let request = spec.buildRequests(bidderRequests, {gdprConsent: {gdprApplies: true, consentString: 'consentString'}});
+  describe('user privacy', function () {
+    it('should send GDPR Consent data if gdprApplies', function () {
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: true, consentString: 'consentString' } });
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_CONSENT);
     });
 
-    it('should not send GDPR Consent data if gdprApplies equals undefined', function() {
-      let request = spec.buildRequests(bidderRequests, {gdprConsent: {gdprApplies: undefined, consentString: 'consentString'}});
+    it('should not send GDPR Consent data if gdprApplies equals undefined', function () {
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: undefined, consentString: 'consentString' } });
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL);
     });
   });
 
-  describe('use cookie', function() {
-    it('should send noCookie in url if set to false.', function() {
+  describe('use cookie', function () {
+    it('should send noCookie in url if set to false.', function () {
       config.setBidderConfig({
         bidders: ['adnuntius'],
         config: {
-          useCookie: false
+          useCookie: false,
+          advertiserTransparency: true
         }
       });
 
       const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, {}));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
-      expect(request[0].url).to.equal(ENDPOINT_URL_NOCOOKIE);
+      expect(request[0].url).to.equal(ENDPOINT_URL_NOCOOKIE + '&advertiserTransparency=true');
     });
   });
 
-  describe('validate auId', function() {
-    it('should fail when auId is not hexadecimal', function() {
+  describe('validate auId', function () {
+    it('should fail when auId is not hexadecimal', function () {
       const invalidRequest = {
         bidId: 'adn-000000000008b6bc',
         bidder: 'adnuntius',
@@ -631,7 +1113,7 @@ describe('adnuntiusBidAdapter', function() {
       expect(valid).to.equal(false);
     });
 
-    it('should pass when auId is  hexadecimal', function() {
+    it('should pass when auId is  hexadecimal', function () {
       const invalidRequest = {
         bidId: 'adn-000000000008b6bc',
         bidder: 'adnuntius',
@@ -644,8 +1126,8 @@ describe('adnuntiusBidAdapter', function() {
     });
   });
 
-  describe('request deals', function() {
-    it('Should set max deals.', function() {
+  describe('request deals', function () {
+    it('Should set max deals.', function () {
       config.setBidderConfig({
         bidders: ['adnuntius']
       });
@@ -660,9 +1142,9 @@ describe('adnuntiusBidAdapter', function() {
       expect(bidderRequests[0].params.maxDeals).to.equal(1);
       expect(data.adUnits[0].maxDeals).to.equal(bidderRequests[0].params.maxDeals);
       expect(bidderRequests[1].params).to.not.have.property('maxBids');
-      expect(data.adUnits[1].maxDeals).to.equal(0);
+      expect(data.adUnits[1].maxDeals).to.equal(undefined);
     });
-    it('Should allow a maximum of 5 deals.', function() {
+    it('Should allow a maximum of 5 deals.', function () {
       config.setBidderConfig({
         bidders: ['adnuntius'],
       });
@@ -685,7 +1167,7 @@ describe('adnuntiusBidAdapter', function() {
       expect(data.adUnits.length).to.equal(1);
       expect(data.adUnits[0].maxDeals).to.equal(5);
     });
-    it('Should allow a minumum of 0 deals.', function() {
+    it('Should allow a minimum of 0 deals.', function () {
       config.setBidderConfig({
         bidders: ['adnuntius'],
       });
@@ -706,13 +1188,15 @@ describe('adnuntiusBidAdapter', function() {
       expect(request[0]).to.have.property('data');
       const data = JSON.parse(request[0].data);
       expect(data.adUnits.length).to.equal(1);
-      expect(data.adUnits[0].maxDeals).to.equal(0);
+      expect(data.adUnits[0].maxDeals).to.equal(undefined);
     });
-    it('Should set max deals using bidder config.', function() {
+    it('Should set max deals using bidder config.', function () {
       config.setBidderConfig({
         bidders: ['adnuntius'],
         config: {
-          maxDeals: 2
+          maxDeals: 2,
+          useCookie: 'ignore-this',
+          advertiserTransparency: 'ignore-this-as-well'
         }
       });
 
@@ -721,7 +1205,7 @@ describe('adnuntiusBidAdapter', function() {
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL + '&ds=2');
     });
-    it('Should allow a maximum of 5 deals when using bidder config.', function() {
+    it('Should allow a maximum of 5 deals when using bidder config.', function () {
       config.setBidderConfig({
         bidders: ['adnuntius'],
         config: {
@@ -734,7 +1218,7 @@ describe('adnuntiusBidAdapter', function() {
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL + '&ds=5');
     });
-    it('Should allow a minimum of 0 deals when using bidder config.', function() {
+    it('Should allow a minimum of 0 deals when using bidder config.', function () {
       config.setBidderConfig({
         bidders: ['adnuntius'],
         config: {
@@ -750,8 +1234,8 @@ describe('adnuntiusBidAdapter', function() {
     });
   });
 
-  describe('interpretResponse', function() {
-    it('should return valid response when passed valid server response', function() {
+  describe('interpretResponse', function () {
+    it('should return valid response when passed valid server response', function () {
       config.setBidderConfig({
         bidders: ['adnuntius'],
         config: {
@@ -772,8 +1256,9 @@ describe('adnuntiusBidAdapter', function() {
       expect(interpretedResponse[0].currency).to.equal(deal.bid.currency);
       expect(interpretedResponse[0].netRevenue).to.equal(false);
       expect(interpretedResponse[0].meta).to.have.property('advertiserDomains');
-      expect(interpretedResponse[0].meta.advertiserDomains).to.have.lengthOf(1);
-      expect(interpretedResponse[0].meta.advertiserDomains[0]).to.equal('adnuntius.com');
+      expect(interpretedResponse[0].meta.advertiserDomains).to.have.lengthOf(2);
+      expect(interpretedResponse[0].meta.advertiserDomains[0]).to.equal('fred.com');
+      expect(interpretedResponse[0].meta.advertiserDomains[1]).to.equal('george.com');
       expect(interpretedResponse[0].ad).to.equal(serverResponse.body.adUnits[0].deals[0].html);
       expect(interpretedResponse[0].ttl).to.equal(360);
       expect(interpretedResponse[0].dealId).to.equal('abc123xyz');
@@ -794,9 +1279,73 @@ describe('adnuntiusBidAdapter', function() {
       expect(interpretedResponse[1].ttl).to.equal(360);
       expect(interpretedResponse[1].dealId).to.equal('not-in-deal-array-here');
       expect(interpretedResponse[1].dealCount).to.equal(0);
+
+      const results = JSON.parse(storage.getDataFromLocalStorage('adn.metaData'));
+      const usiEntry = results.find(entry => entry.key === 'usi' && entry.network === 'some-network-id');
+      expect(usiEntry.key).to.equal('usi');
+      expect(usiEntry.value).to.equal('from-api-server dude');
+      expect(usiEntry.exp).to.be.greaterThan(getUnixTimestampFromNow(90));
+      expect(usiEntry.network).to.equal('some-network-id')
+
+      const voidAuIdsEntry = results.find(entry => entry.key === 'voidAuIds');
+      expect(voidAuIdsEntry.key).to.equal('voidAuIds');
+      expect(voidAuIdsEntry.exp).to.equal(undefined);
+      expect(voidAuIdsEntry.value[0].auId).to.equal('00000000000abcde');
+      expect(voidAuIdsEntry.value[0].exp).to.be.greaterThan(getUnixTimestampFromNow());
+      expect(voidAuIdsEntry.value[0].exp).to.be.lessThan(getUnixTimestampFromNow(2));
+      expect(voidAuIdsEntry.value[1].auId).to.equal('00000000000fffff');
+      expect(voidAuIdsEntry.value[1].exp).to.be.greaterThan(getUnixTimestampFromNow());
+      expect(voidAuIdsEntry.value[1].exp).to.be.lessThan(getUnixTimestampFromNow(2));
+
+      const validEntry = results.find(entry => entry.key === 'valid');
+      expect(validEntry.key).to.equal('valid');
+      expect(validEntry.value).to.equal('also-valid');
+      expect(validEntry.exp).to.be.greaterThan(getUnixTimestampFromNow());
+      expect(validEntry.exp).to.be.lessThan(getUnixTimestampFromNow(2));
+
+      const randomApiEntry = results.find(entry => entry.key === 'randomApiKey');
+      expect(randomApiEntry.key).to.equal('randomApiKey');
+      expect(randomApiEntry.value).to.equal('randomApiValue');
+      expect(randomApiEntry.network).to.equal('some-network-id');
+      expect(randomApiEntry.exp).to.be.greaterThan(getUnixTimestampFromNow(90));
+    });
+
+    it('should return valid response when passed valid multiformat server response', function () {
+      config.setBidderConfig({
+        bidders: ['adnuntius'],
+        config: {
+          bidType: 'netBid',
+          maxDeals: 0
+        }
+      });
+
+      const interpretedResponse = config.runWithBidder('adnuntius', () => spec.interpretResponse(multiFormatServerResponse, multiBidderInResponse));
+      expect(interpretedResponse).to.have.lengthOf(2);
+
+      let ad = multiFormatServerResponse.body.adUnits[0].ads[0];
+      expect(interpretedResponse[0].bidderCode).to.equal('adnuntius');
+      expect(interpretedResponse[0].cpm).to.equal(ad.netBid.amount * 1000);
+      expect(interpretedResponse[0].width).to.equal(Number(ad.creativeWidth));
+      expect(interpretedResponse[0].height).to.equal(Number(ad.creativeHeight));
+      expect(interpretedResponse[0].creativeId).to.equal(ad.creativeId);
+      expect(interpretedResponse[0].currency).to.equal(ad.bid.currency);
+      expect(interpretedResponse[0].netRevenue).to.equal(false);
+      expect(interpretedResponse[0].ad).to.equal(multiFormatServerResponse.body.adUnits[0].html);
+      expect(interpretedResponse[0].ttl).to.equal(360);
+
+      ad = multiFormatServerResponse.body.adUnits[3].ads[0];
+      expect(interpretedResponse[1].bidderCode).to.equal('adnuntius');
+      expect(interpretedResponse[1].cpm).to.equal(ad.netBid.amount * 1000);
+      expect(interpretedResponse[1].width).to.equal(Number(ad.creativeWidth));
+      expect(interpretedResponse[1].height).to.equal(Number(ad.creativeHeight));
+      expect(interpretedResponse[1].creativeId).to.equal(ad.creativeId);
+      expect(interpretedResponse[1].currency).to.equal(ad.bid.currency);
+      expect(interpretedResponse[1].netRevenue).to.equal(false);
+      expect(interpretedResponse[1].ad).to.equal(multiFormatServerResponse.body.adUnits[3].html);
+      expect(interpretedResponse[1].ttl).to.equal(360);
     });
 
-    it('should not process valid response when passed alt bidder that is an adndeal', function() {
+    it('should not process valid response when passed alt bidder that is an adndeal', function () {
       const altBidder = {
         bid: [
           {
@@ -806,6 +1355,7 @@ describe('adnuntiusBidAdapter', function() {
         ]
       };
       serverResponse.body.adUnits[0].deals = [];
+      delete serverResponse.body.metaData.voidAuIds; // test response with no voidAuIds
 
       const interpretedResponse = spec.interpretResponse(serverResponse, altBidder);
       expect(interpretedResponse).to.have.lengthOf(0);
@@ -813,7 +1363,7 @@ describe('adnuntiusBidAdapter', function() {
       serverResponse.body.adUnits[0].deals = deals;
     });
 
-    it('should return valid response when passed alt bidder', function() {
+    it('should return valid response when passed alt bidder', function () {
       const altBidder = {
         bid: [
           {
@@ -850,8 +1400,8 @@ describe('adnuntiusBidAdapter', function() {
     });
   });
 
-  describe('interpretVideoResponse', function() {
-    it('should return valid response when passed valid server response', function() {
+  describe('interpretVideoResponse', function () {
+    it('should return valid response when passed valid server response', function () {
       const interpretedResponse = spec.interpretResponse(serverVideoResponse, videoBidRequest);
       const ad = serverVideoResponse.body.adUnits[0].ads[0]
       const deal = serverVideoResponse.body.adUnits[0].deals[0]
diff --git a/test/spec/modules/adoceanBidAdapter_spec.js b/test/spec/modules/adoceanBidAdapter_spec.js
index 080b5bd5d1d..cff5e77d95b 100644
--- a/test/spec/modules/adoceanBidAdapter_spec.js
+++ b/test/spec/modules/adoceanBidAdapter_spec.js
@@ -36,13 +36,13 @@ describe('AdoceanAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      const bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      const invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'masterId': 0
       };
 
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/adomikAnalyticsAdapter_spec.js b/test/spec/modules/adomikAnalyticsAdapter_spec.js
deleted file mode 100644
index d872d6f8e08..00000000000
--- a/test/spec/modules/adomikAnalyticsAdapter_spec.js
+++ /dev/null
@@ -1,253 +0,0 @@
-import adomikAnalytics from 'modules/adomikAnalyticsAdapter.js';
-import { expect } from 'chai';
-
-let events = require('src/events');
-let adapterManager = require('src/adapterManager').default;
-let constants = require('src/constants.json');
-
-describe('Adomik Prebid Analytic', function () {
-  let sendEventStub;
-  let sendWonEventStub;
-  let clock;
-
-  beforeEach(function () {
-    clock = sinon.useFakeTimers();
-    sinon.spy(adomikAnalytics, 'track');
-    sendEventStub = sinon.stub(adomikAnalytics, 'sendTypedEvent');
-    sendWonEventStub = sinon.stub(adomikAnalytics, 'sendWonEvent');
-    sinon.stub(events, 'getEvents').returns([]);
-    adomikAnalytics.currentContext = undefined;
-
-    adapterManager.registerAnalyticsAdapter({
-      code: 'adomik',
-      adapter: adomikAnalytics
-    });
-  });
-
-  afterEach(function () {
-    adomikAnalytics.disableAnalytics();
-    clock.restore();
-    adomikAnalytics.track.restore();
-    sendEventStub.restore();
-    sendWonEventStub.restore();
-    events.getEvents.restore();
-  });
-
-  describe('adomikAnalytics.enableAnalytics', function () {
-    it('should catch all events', function (done) {
-      const initOptions = {
-        id: '123456',
-        url: 'testurl'
-      };
-
-      const bid = {
-        bidderCode: 'adomik_test_bid',
-        width: 10,
-        height: 10,
-        statusMessage: 'Bid available',
-        adId: '1234',
-        auctionId: '',
-        responseTimestamp: 1496410856397,
-        requestTimestamp: 1496410856295,
-        cpm: 0.1,
-        bidder: 'biddertest',
-        adUnitCode: '0000',
-        timeToRespond: 100,
-        placementCode: 'placementtest'
-      }
-
-      // Step 1: Initialize adapter
-      adapterManager.enableAnalytics({
-        provider: 'adomik',
-        options: initOptions
-      });
-      expect(adomikAnalytics.currentContext).to.deep.equal({
-        uid: '123456',
-        url: 'testurl',
-        sampling: undefined,
-        id: '',
-        timeouted: false
-      });
-
-      // Step 2: Send init auction event
-      events.emit(constants.EVENTS.AUCTION_INIT, {config: initOptions, auctionId: 'test-test-test'});
-
-      expect(adomikAnalytics.currentContext).to.deep.equal({
-        uid: '123456',
-        url: 'testurl',
-        sampling: undefined,
-        id: 'test-test-test',
-        timeouted: false
-      });
-
-      // Step 3: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, { bids: [bid] });
-
-      expect(adomikAnalytics.bucketEvents.length).to.equal(1);
-      expect(adomikAnalytics.bucketEvents[0]).to.deep.equal({
-        type: 'request',
-        event: {
-          bidder: 'BIDDERTEST',
-          placementCode: '0000',
-        }
-      });
-
-      // Step 4: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bid);
-
-      expect(adomikAnalytics.bucketEvents.length).to.equal(2);
-      expect(adomikAnalytics.bucketEvents[1]).to.deep.equal({
-        type: 'response',
-        event: {
-          bidder: 'ADOMIK_TEST_BID',
-          placementCode: '0000',
-          id: '1234',
-          status: 'VALID',
-          cpm: 0.1,
-          size: {
-            width: 10,
-            height: 10
-          },
-          timeToRespond: 100,
-          afterTimeout: false,
-        }
-      });
-
-      // Step 5: Send bid won event
-      events.emit(constants.EVENTS.BID_WON, bid);
-
-      expect(adomikAnalytics.bucketEvents.length).to.equal(2);
-
-      // Step 6: Send bid timeout event
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
-
-      expect(adomikAnalytics.currentContext.timeouted).to.equal(true);
-
-      // Step 7: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
-
-      setTimeout(function() {
-        sinon.assert.callCount(sendEventStub, 1);
-        sinon.assert.callCount(sendWonEventStub, 1);
-        done();
-      }, 3000);
-
-      clock.tick(5000);
-
-      sinon.assert.callCount(adomikAnalytics.track, 6);
-    });
-
-    describe('when sampling is undefined', function () {
-      beforeEach(function() {
-        adapterManager.enableAnalytics({
-          provider: 'adomik',
-          options: { id: '123456', url: 'testurl' }
-        });
-      });
-
-      it('is enabled', function () {
-        expect(adomikAnalytics.currentContext).is.not.null;
-      });
-    });
-
-    describe('when sampling is 0', function () {
-      beforeEach(function() {
-        adapterManager.enableAnalytics({
-          provider: 'adomik',
-          options: { id: '123456', url: 'testurl', sampling: 0 }
-        });
-      });
-
-      it('is disabled', function () {
-        expect(adomikAnalytics.currentContext).to.equal(undefined);
-      });
-    });
-
-    describe('when sampling is 1', function () {
-      beforeEach(function() {
-        adapterManager.enableAnalytics({
-          provider: 'adomik',
-          options: { id: '123456', url: 'testurl', sampling: 1 }
-        });
-      });
-
-      it('is enabled', function () {
-        expect(adomikAnalytics.currentContext).is.not.null;
-      });
-    });
-
-    describe('when options is not defined', function () {
-      beforeEach(function() {
-        adapterManager.enableAnalytics({ provider: 'adomik' });
-      });
-
-      it('is disabled', function () {
-        expect(adomikAnalytics.currentContext).to.equal(undefined);
-      });
-    });
-
-    describe('when id is not defined in options', function () {
-      beforeEach(function() {
-        adapterManager.enableAnalytics({ provider: 'adomik', url: 'xxx' });
-      });
-
-      it('is disabled', function () {
-        expect(adomikAnalytics.currentContext).to.equal(undefined);
-      });
-    });
-
-    describe('when url is not defined in options', function () {
-      beforeEach(function() {
-        adapterManager.enableAnalytics({ provider: 'adomik', id: 'xxx' });
-      });
-
-      it('is disabled', function () {
-        expect(adomikAnalytics.currentContext).to.equal(undefined);
-      });
-    });
-  });
-
-  describe('adomikAnalytics.getKeyValues', function () {
-    it('returns [undefined, undefined]', function () {
-      let [testId, testValue] = adomikAnalytics.getKeyValues()
-      expect(testId).to.equal(undefined);
-      expect(testValue).to.equal(undefined);
-    });
-
-    describe('when test is in scope', function () {
-      beforeEach(function () {
-        sessionStorage.setItem(window.location.hostname + '_AdomikTestInScope', true);
-      });
-
-      it('returns [undefined, undefined]', function () {
-        let [testId, testValue] = adomikAnalytics.getKeyValues()
-        expect(testId).to.equal(undefined);
-        expect(testValue).to.equal(undefined);
-      });
-
-      describe('when key values are defined', function () {
-        beforeEach(function () {
-          sessionStorage.setItem(window.location.hostname + '_AdomikTest', '{"testId":"12345","testOptionLabel":"1000"}');
-        });
-
-        it('returns key values', function () {
-          let [testId, testValue] = adomikAnalytics.getKeyValues()
-          expect(testId).to.equal('12345');
-          expect(testValue).to.equal('1000');
-        });
-
-        describe('when preventTest is on', function () {
-          beforeEach(function () {
-            sessionStorage.setItem(window.location.hostname + '_NoAdomikTest', true);
-          });
-
-          it('returns [undefined, undefined]', function () {
-            let [testId, testValue] = adomikAnalytics.getKeyValues()
-            expect(testId).to.equal(undefined);
-            expect(testValue).to.equal(undefined);
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/adotBidAdapter_spec.js b/test/spec/modules/adotBidAdapter_spec.js
index 34252e00f9e..df628088bb0 100644
--- a/test/spec/modules/adotBidAdapter_spec.js
+++ b/test/spec/modules/adotBidAdapter_spec.js
@@ -124,7 +124,7 @@ describe('Adot Adapter', function () {
 
     it('should build request (video)', function () {
       const bidderRequestId = 'bidderRequestId';
-      const validBidRequests = [{ bidderRequestId, mediaTypes: {} }, { bidderRequestId, bidId: 'bidId', mediaTypes: { video: { playerSize: [[300, 250]], minduration: 1, maxduration: 2, api: 'api', linearity: 'linearity', mimes: [], placement: 'placement', playbackmethod: 'playbackmethod', protocols: 'protocol', startdelay: 'startdelay' } }, params: { placementId: 'placementId', adUnitCode: 200 } }];
+      const validBidRequests = [{ bidderRequestId, mediaTypes: {} }, { bidderRequestId, bidId: 'bidId', mediaTypes: { video: { playerSize: [[300, 250]], minduration: 1, maxduration: 2, api: 'api', linearity: 'linearity', mimes: [], plcmt: '1', playbackmethod: 'playbackmethod', protocols: 'protocol', startdelay: 'startdelay' } }, params: { placementId: 'placementId', adUnitCode: 200 } }];
       const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true }, userId: { pubProvidedId: 'userId' }, schain: { ver: '1.0' } };
 
       const request = spec.buildRequests(validBidRequests, bidderRequest);
@@ -144,7 +144,7 @@ describe('Adot Adapter', function () {
             maxduration: 2,
             mimes: [],
             minduration: 1,
-            placement: 'placement',
+            placement: '1',
             playbackmethod: 'playbackmethod',
             pos: 0,
             protocols: 'protocol',
diff --git a/test/spec/modules/adpartnerBidAdapter_spec.js b/test/spec/modules/adpartnerBidAdapter_spec.js
index d9f9b0d0074..597974acce8 100644
--- a/test/spec/modules/adpartnerBidAdapter_spec.js
+++ b/test/spec/modules/adpartnerBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {spec, ENDPOINT_PROTOCOL, ENDPOINT_DOMAIN, ENDPOINT_PATH} from 'modules/adpartnerBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import * as miUtils from 'libraries/mediaImpactUtils/index.js';
 
 const BIDDER_CODE = 'adpartner';
 
@@ -117,7 +118,7 @@ describe('AdpartnerAdapter', function () {
 
   describe('joinSizesToString', function () {
     it('success convert sizes list to string', function () {
-      const sizesStr = spec.joinSizesToString([[300, 250], [300, 600]]);
+      const sizesStr = miUtils.joinSizesToString([[300, 250], [300, 600]]);
       expect(sizesStr).to.equal('300x250|300x600');
     });
   });
@@ -238,7 +239,7 @@ describe('AdpartnerAdapter', function () {
     let ajaxStub;
 
     beforeEach(() => {
-      ajaxStub = sinon.stub(spec, 'postRequest')
+      ajaxStub = sinon.stub(miUtils, 'postRequest')
     })
 
     afterEach(() => {
diff --git a/test/spec/modules/adprimeBidAdapter_spec.js b/test/spec/modules/adprimeBidAdapter_spec.js
index 5efed4ec5ab..4199145e80a 100644
--- a/test/spec/modules/adprimeBidAdapter_spec.js
+++ b/test/spec/modules/adprimeBidAdapter_spec.js
@@ -1,131 +1,257 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/adprimeBidAdapter.js';
-import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import { expect } from 'chai';
+import { spec } from '../../../modules/adprimeBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-describe('AdprimebBidAdapter', function () {
-  const bid = {
-    bidId: '23fhj33i987f',
-    bidder: 'adprime',
+const bidder = 'adprime';
+
+describe('AdprimeBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
     mediaTypes: {
-      banner: {
-        sizes: [[300, 250]],
+      [BANNER]: {
+        sizes: [[300, 250]]
       }
     },
     params: {
-      placementId: 'testBanner'
+
     }
-  };
+  }
 
   const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'test.com'
-    }
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
-    it('Should return true if there are bidId, params and placementId parameters present', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
     });
     it('Should return false if at least one of parameters is not present', function () {
-      delete bid.params.placementId;
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
     });
   });
 
   describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
       expect(serverRequest.url).to.exist;
       expect(serverRequest.data).to.exist;
     });
+
     it('Returns POST method', function () {
       expect(serverRequest.method).to.equal('POST');
     });
+
     it('Returns valid URL', function () {
       expect(serverRequest.url).to.equal('https://delta.adprime.com/pbjs');
     });
-    it('Returns valid data if array of bids is valid', function () {
+
+    it('Returns general data valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
       expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
-      expect(data.gdpr).to.not.exist;
-      expect(data.ccpa).to.not.exist;
-      let placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'identeties', 'adFormat', 'sizes', 'hPlayer', 'wPlayer', 'schain', 'keywords', 'audiences', 'bidFloor');
-      expect(placement.placementId).to.equal('testBanner');
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.adFormat).to.equal(BANNER);
-      expect(placement.schain).to.be.an('object');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
     });
 
-    it('Returns valid data for mediatype video', function () {
-      const playerSize = [300, 300];
-      bid.mediaTypes = {};
-      bid.mediaTypes[VIDEO] = {
-        playerSize
-      };
-      serverRequest = spec.buildRequests([bid], bidderRequest);
-      let data = serverRequest.data;
-      expect(data).to.be.an('object');
-      let placement = data['placements'][0];
-      expect(placement).to.be.an('object');
-      expect(placement.adFormat).to.equal(VIDEO);
-      expect(placement.wPlayer).to.equal(playerSize[0]);
-      expect(placement.hPlayer).to.equal(playerSize[1]);
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.wPlayer).to.be.an('number');
+            expect(placement.hPlayer).to.be.an('number');
+            expect(placement.keywords).to.be.an('array');
+            expect(placement.audiences).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
     });
 
     it('Returns data with gdprConsent and without uspConsent', function () {
-      bidderRequest.gdprConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
 
     it('Returns data with uspConsent and without gdprConsent', function () {
-      bidderRequest.uspConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.ccpa).to.exist;
       expect(data.ccpa).to.be.a('string');
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
-  });
-  describe('buildRequests with user ids', function () {
-    bid.userId = {}
-    bid.userId.idl_env = 'idl_env123';
-    let serverRequest = spec.buildRequests([bid], bidderRequest);
-    it('Return bids with user identeties', function () {
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      let placements = data['placements'];
       expect(data).to.be.an('object');
-      for (let i = 0; i < placements.length; i++) {
-        let placement = placements[i];
-        expect(placement).to.have.property('identeties')
-        expect(placement.identeties).to.be.an('object')
-        expect(placement.identeties).to.have.property('identityLink')
-        expect(placement.identeties.identityLink).to.be.equal('idl_env123')
-      }
-    });
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
+
   describe('interpretResponse', function () {
     it('Should interpret banner response', function () {
       const banner = {
@@ -141,7 +267,10 @@ describe('AdprimebBidAdapter', function () {
           netRevenue: true,
           currency: 'USD',
           dealId: '1',
-          meta: {}
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let bannerResponses = spec.interpretResponse(banner);
@@ -149,15 +278,15 @@ describe('AdprimebBidAdapter', function () {
       let dataItem = bannerResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
         'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
-      expect(dataItem.requestId).to.equal('23fhj33i987f');
-      expect(dataItem.cpm).to.equal(0.4);
-      expect(dataItem.width).to.equal(300);
-      expect(dataItem.height).to.equal(250);
-      expect(dataItem.ad).to.equal('Test');
-      expect(dataItem.ttl).to.equal(120);
-      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
       expect(dataItem.netRevenue).to.be.true;
-      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
       expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret video response', function () {
@@ -172,7 +301,10 @@ describe('AdprimebBidAdapter', function () {
           netRevenue: true,
           currency: 'USD',
           dealId: '1',
-          meta: {}
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let videoResponses = spec.interpretResponse(video);
@@ -206,7 +338,10 @@ describe('AdprimebBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          meta: {}
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let nativeResponses = spec.interpretResponse(native);
@@ -293,6 +428,7 @@ describe('AdprimebBidAdapter', function () {
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
+
   describe('getUserSyncs', function() {
     it('Should return array of objects with proper sync config , include GDPR', function() {
       const syncData = spec.getUserSyncs({}, {}, {
@@ -317,5 +453,17 @@ describe('AdprimebBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://sync.adprime.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.adprime.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/adqueryBidAdapter_spec.js b/test/spec/modules/adqueryBidAdapter_spec.js
index e9286329d57..b4aa0992732 100644
--- a/test/spec/modules/adqueryBidAdapter_spec.js
+++ b/test/spec/modules/adqueryBidAdapter_spec.js
@@ -155,11 +155,39 @@ describe('adqueryBidAdapter', function () {
 
   describe('getUserSyncs', function () {
     it('should return iframe sync', function () {
-      let sync = spec.getUserSyncs()
+      let sync = spec.getUserSyncs(
+        {
+          iframeEnabled: true,
+          pixelEnabled: true,
+        },
+        {},
+        {
+          consentString: 'ALL',
+          gdprApplies: true,
+        },
+        {}
+      )
       expect(sync.length).to.equal(1)
       expect(sync[0].type === 'iframe')
       expect(typeof sync[0].url === 'string')
     })
+    it('should return image sync', function () {
+      let sync = spec.getUserSyncs(
+        {
+          iframeEnabled: false,
+          pixelEnabled: true,
+        },
+        {},
+        {
+          consentString: 'ALL',
+          gdprApplies: true,
+        },
+        {}
+      )
+      expect(sync.length).to.equal(1)
+      expect(sync[0].type === 'image')
+      expect(typeof sync[0].url === 'string')
+    })
 
     it('Should return array of objects with proper sync config , include GDPR', function() {
       const syncData = spec.getUserSyncs({}, {}, {
diff --git a/test/spec/modules/adqueryIdSystem_spec.js b/test/spec/modules/adqueryIdSystem_spec.js
index 0a2cd60d89e..9b7304d1984 100644
--- a/test/spec/modules/adqueryIdSystem_spec.js
+++ b/test/spec/modules/adqueryIdSystem_spec.js
@@ -1,6 +1,9 @@
 import {adqueryIdSubmodule, storage} from 'modules/adqueryIdSystem.js';
 import {server} from 'test/mocks/xhr.js';
 import sinon from 'sinon';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
 
 const config = {
   storage: {
@@ -38,24 +41,43 @@ describe('AdqueryIdSystem', function () {
       const callback = adqueryIdSubmodule.getId(config).callback;
       callback(callbackSpy);
       const request = server.requests[0];
-      expect(request.url).to.contains(`https://bidder.adquery.io/prebid/qid?qid=`);
-      request.respond(200, {'Content-Type': 'application/json'}, JSON.stringify({qid: '6dd9eab7dfeab7df6dd9ea'}));
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal('6dd9eab7dfeab7df6dd9ea');
+      expect(request.url).to.contain(`https://bidder.adquery.io/prebid/qid`);
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ qid: 'qid_string' }));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal('qid_string');
     });
 
     it('allows configurable id url', function () {
       const config = {
         params: {
-          url: 'https://another_bidder.adquery.io/qid'
+          url: 'https://bidder2.adquery.io'
         }
       };
       const callbackSpy = sinon.spy();
       const callback = adqueryIdSubmodule.getId(config).callback;
       callback(callbackSpy);
       const request = server.requests[0];
-      expect(request.url).to.contains('https://another_bidder.adquery.io/qid');
-      request.respond(200, {'Content-Type': 'application/json'}, JSON.stringify({qid: 'testqid'}));
+      expect(request.url).to.contains('https://bidder2.adquery.io');
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ qid: 'testqid' }));
       expect(callbackSpy.lastCall.lastArg).to.deep.equal('testqid');
     });
   });
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(adqueryIdSubmodule);
+    });
+    it('qid', function() {
+      const userId = {
+        qid: 'some-random-id-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'adquery.io',
+        uids: [{
+          id: 'some-random-id-value',
+          atype: 1
+        }]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/adrelevantisBidAdapter_spec.js b/test/spec/modules/adrelevantisBidAdapter_spec.js
index 7f24176e850..db637663f39 100644
--- a/test/spec/modules/adrelevantisBidAdapter_spec.js
+++ b/test/spec/modules/adrelevantisBidAdapter_spec.js
@@ -34,12 +34,12 @@ describe('AdrelevantisAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placementId': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/ads_interactiveBidAdapter_spec.js b/test/spec/modules/ads_interactiveBidAdapter_spec.js
new file mode 100644
index 00000000000..273df230287
--- /dev/null
+++ b/test/spec/modules/ads_interactiveBidAdapter_spec.js
@@ -0,0 +1,515 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/ads_interactiveBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'ads_interactive';
+
+describe('AdsInteractiveBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://bntb.adsinteractive.com/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.include.all.keys(
+        'deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cstb.adsinteractive.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cstb.adsinteractive.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cstb.adsinteractive.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/adspiritBidAdapter_spec.js b/test/spec/modules/adspiritBidAdapter_spec.js
new file mode 100644
index 00000000000..022a26da60e
--- /dev/null
+++ b/test/spec/modules/adspiritBidAdapter_spec.js
@@ -0,0 +1,292 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adspiritBidAdapter.js';
+import * as utils from 'src/utils.js';
+import { registerBidder } from 'src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from 'src/mediaTypes.js';
+const RTB_URL = '/rtb/getbid.php?rtbprovider=prebid';
+const SCRIPT_URL = '/adasync.min.js';
+
+describe('Adspirit Bidder Spec', function () {
+  // isBidRequestValid ---case
+  describe('isBidRequestValid', function () {
+    it('should return true if the bid request is valid', function () {
+      const validBid = { bidder: 'adspirit', params: { placementId: '57', host: 'test.adspirit.de' } };
+      const result = spec.isBidRequestValid(validBid);
+      expect(result).to.be.true;
+    });
+
+    it('should return false if the bid request is invalid', function () {
+      const invalidBid = { bidder: 'adspirit', params: {} };
+      const result = spec.isBidRequestValid(invalidBid);
+      expect(result).to.be.false;
+    });
+  });
+
+  // getBidderHost Case
+  describe('getBidderHost', function () {
+    it('should return host for adspirit bidder', function () {
+      const bid = { bidder: 'adspirit', params: { host: 'test.adspirit.de' } };
+      const result = spec.getBidderHost(bid);
+      expect(result).to.equal('test.adspirit.de');
+    });
+
+    it('should return host for twiago bidder', function () {
+      const bid = { bidder: 'twiago' };
+      const result = spec.getBidderHost(bid);
+      expect(result).to.equal('a.twiago.com');
+    });
+    it('should return null for unsupported bidder', function () {
+      const bid = { bidder: 'unsupportedBidder', params: {} };
+      const result = spec.getBidderHost(bid);
+      expect(result).to.be.null;
+    });
+  });
+
+  // Test cases for buildRequests
+  describe('buildRequests', function () {
+    const bidRequestWithGDPRAndSchain = [
+      {
+        id: '26c1ee0038ac11',
+        bidder: 'adspirit',
+        params: {
+          placementId: '57'
+        },
+        schain: {
+          ver: '1.0',
+          nodes: [
+            {
+              asi: 'exchange1.com',
+              sid: '1234',
+              hp: 1,
+              rid: 'bidRequest123',
+              name: 'Publisher',
+              domain: 'publisher.com'
+            },
+            {
+              asi: 'network1.com',
+              sid: '5678',
+              hp: 1,
+              rid: 'bidderRequest123',
+              name: 'Network',
+              domain: 'network1.com'
+            }
+          ]
+        }
+      }
+    ];
+
+    const mockBidderRequestWithGDPR = {
+      refererInfo: {
+        topmostLocation: 'test.adspirit.de'
+      },
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'consentString'
+      },
+      schain: {
+        ver: '1.0',
+        nodes: [
+          {
+            asi: 'network1.com',
+            sid: '5678',
+            hp: 1,
+            rid: 'bidderRequest123',
+            name: 'Network',
+            domain: 'network1.com'
+          }
+        ]
+      }
+    };
+
+    it('should construct valid bid requests with GDPR consent and schain', function () {
+      const requests = spec.buildRequests(bidRequestWithGDPRAndSchain, mockBidderRequestWithGDPR);
+      expect(requests).to.be.an('array').that.is.not.empty;
+      const request = requests[0];
+      expect(request.method).to.equal('GET');
+      expect(request.url).to.include('test.adspirit.de');
+      expect(request.url).to.include('pid=57');
+      expect(request.data).to.have.property('schain');
+      expect(request.data.schain).to.be.an('object');
+      if (request.data.schain && Array.isArray(request.data.schain.nodes)) {
+        const nodeWithGdpr = request.data.schain.nodes.find(node => node.gdpr);
+        if (nodeWithGdpr) {
+          expect(nodeWithGdpr).to.have.property('gdpr');
+          expect(nodeWithGdpr.gdpr).to.be.an('object');
+          expect(nodeWithGdpr.gdpr).to.have.property('applies', true);
+          expect(nodeWithGdpr.gdpr).to.have.property('consent', 'consentString');
+        }
+      }
+    });
+
+    it('should construct valid bid requests without GDPR consent and schain', function () {
+      const bidRequestWithoutGDPR = [
+        {
+          id: '26c1ee0038ac11',
+          bidder: 'adspirit',
+          params: {
+            placementId: '57'
+          }
+        }
+      ];
+
+      const mockBidderRequestWithoutGDPR = {
+        refererInfo: {
+          topmostLocation: 'test.adspirit.de'
+        }
+      };
+
+      const requests = spec.buildRequests(bidRequestWithoutGDPR, mockBidderRequestWithoutGDPR);
+      expect(requests).to.be.an('array').that.is.not.empty;
+      const request = requests[0];
+      expect(request.method).to.equal('GET');
+      expect(request.url).to.include('test.adspirit.de');
+      expect(request.url).to.include('pid=57');
+      expect(request.data).to.deep.equal({});
+    });
+  });
+
+  // interpretResponse For Native
+  describe('interpretResponse', function () {
+    const nativeBidRequestMock = {
+      bidRequest: {
+        bidId: '123456',
+        params: {
+          placementId: '57',
+          adomain: ['test.adspirit.de']
+        },
+        mediaTypes: {
+          native: true
+        }
+      }
+    };
+
+    it('should handle native media type bids and missing cpm in the server response body', function () {
+      const serverResponse = {
+        body: {
+          w: 320,
+          h: 50,
+          title: 'Ad Title',
+          body: 'Ad Body',
+          cta: 'Click Here',
+          image: 'img_url',
+          click: 'click_url',
+          view: 'view_tracker_url'
+        }
+      };
+
+      const result = spec.interpretResponse(serverResponse, nativeBidRequestMock);
+      expect(result.length).to.equal(0);
+    });
+
+    it('should handle native media type bids', function () {
+      const serverResponse = {
+        body: {
+          cpm: 1.0,
+          w: 320,
+          h: 50,
+          title: 'Ad Title',
+          body: 'Ad Body',
+          cta: 'Click Here',
+          image: 'img_url',
+          click: 'click_url',
+          view: 'view_tracker_url'
+        }
+      };
+
+      const result = spec.interpretResponse(serverResponse, nativeBidRequestMock);
+      expect(result.length).to.equal(1);
+      const bid = result[0];
+      expect(bid).to.include({
+        requestId: '123456',
+        cpm: 1.0,
+        width: 320,
+        height: 50,
+        creativeId: '57',
+        currency: 'EUR',
+        netRevenue: true,
+        ttl: 300,
+        mediaType: 'native'
+      });
+      expect(bid.native).to.deep.include({
+        title: 'Ad Title',
+        body: 'Ad Body',
+        cta: 'Click Here',
+        image: { url: 'img_url' },
+        clickUrl: 'click_url',
+        impressionTrackers: ['view_tracker_url']
+      });
+    });
+
+    const bannerBidRequestMock = {
+      bidRequest: {
+        bidId: '123456',
+        params: {
+          placementId: '57',
+          adomain: ['siva.adspirit.de']
+        },
+        mediaTypes: {
+          banner: true
+        }
+      }
+    };
+
+    // Test cases for various scenarios
+    it('should return empty array when serverResponse is missing', function () {
+      const result = spec.interpretResponse(null, { bidRequest: {} });
+      expect(result).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty array when serverResponse.body is missing', function () {
+      const result = spec.interpretResponse({}, { bidRequest: {} });
+      expect(result).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty array when bidObj is missing', function () {
+      const result = spec.interpretResponse({ body: { cpm: 1.0 } }, { bidRequest: null });
+      expect(result).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty array when all required parameters are missing', function () {
+      const result = spec.interpretResponse(null, { bidRequest: null });
+      expect(result).to.be.an('array').that.is.empty;
+    });
+
+    it('should handle banner media type bids and missing cpm in the server response body', function () {
+      const serverResponseBanner = {
+        body: {
+          w: 728,
+          h: 90,
+          adm: '
Ad Content
'
+        }
+      };
+      const result = spec.interpretResponse(serverResponseBanner, bannerBidRequestMock);
+      expect(result.length).to.equal(0);
+    });
+
+    it('should handle banner media type bids', function () {
+      const serverResponse = {
+        body: {
+          cpm: 2.0,
+          w: 728,
+          h: 90,
+          adm: '
Ad Content
'
+        }
+      };
+      const result = spec.interpretResponse(serverResponse, bannerBidRequestMock);
+      expect(result.length).to.equal(1);
+      const bid = result[0];
+      expect(bid).to.include({
+        requestId: '123456',
+        cpm: 2.0,
+        width: 728,
+        height: 90,
+        creativeId: '57',
+        currency: 'EUR',
+        netRevenue: true,
+        ttl: 300,
+        mediaType: 'banner'
+      });
+      expect(bid.ad).to.equal('
Ad Content
');
+    });
+  });
+});
diff --git a/test/spec/modules/adstirBidAdapter_spec.js b/test/spec/modules/adstirBidAdapter_spec.js
new file mode 100644
index 00000000000..a62dce8af97
--- /dev/null
+++ b/test/spec/modules/adstirBidAdapter_spec.js
@@ -0,0 +1,413 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/adstirBidAdapter.js';
+import * as utils from 'src/utils.js';
+import { config } from 'src/config.js';
+
+describe('AdstirAdapter', function () {
+  describe('isBidRequestValid', function () {
+    it('should return true if appId is non-empty string and adSpaceNo is integer', function () {
+      const bid = {
+        params: {
+          appId: 'MEDIA-XXXXXX',
+          adSpaceNo: 6,
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return false if appId is non-empty string, but adSpaceNo is not integer', function () {
+      const bid = {
+        params: {
+          appId: 'MEDIA-XXXXXX',
+          adSpaceNo: 'a',
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false if appId is non-empty string, but adSpaceNo is null', function () {
+      const bid = {
+        params: {
+          appId: 'MEDIA-XXXXXX',
+          adSpaceNo: null,
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false if appId is non-empty string, but adSpaceNo is undefined', function () {
+      const bid = {
+        params: {
+          appId: 'MEDIA-XXXXXX'
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false if adSpaceNo is integer, but appId is empty string', function () {
+      const bid = {
+        params: {
+          appId: '',
+          adSpaceNo: 6,
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false if adSpaceNo is integer, but appId is not string', function () {
+      const bid = {
+        params: {
+          appId: 123,
+          adSpaceNo: 6,
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false if adSpaceNo is integer, but appId is null', function () {
+      const bid = {
+        params: {
+          appId: null,
+          adSpaceNo: 6,
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false if adSpaceNo is integer, but appId is undefined', function () {
+      const bid = {
+        params: {
+          adSpaceNo: 6,
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false if params is empty', function () {
+      const bid = {
+        params: {}
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const validBidRequests = [
+      {
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidder: 'adstir',
+        bidId: 'bidid1111',
+        params: {
+          appId: 'MEDIA-XXXXXX',
+          adSpaceNo: 1,
+        },
+        transactionId: 'transactionid-1111',
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [300, 250],
+              [336, 280],
+            ],
+          }
+        },
+        sizes: [
+          [300, 250],
+          [336, 280],
+        ],
+      },
+      {
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidder: 'adstir',
+        bidId: 'bidid2222',
+        params: {
+          appId: 'MEDIA-XXXXXX',
+          adSpaceNo: 2,
+        },
+        transactionId: 'transactionid-2222',
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [320, 50],
+              [320, 100],
+            ],
+          }
+        },
+        sizes: [
+          [320, 50],
+          [320, 100],
+        ],
+      },
+    ];
+
+    const bidderRequest = {
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      refererInfo: {
+        page: 'https://ad-stir.com/contact',
+        topmostLocation: 'https://ad-stir.com/contact',
+        reachedTop: true,
+        ref: 'https://test.example/q=adstir',
+        isAmp: false,
+        numIframes: 0,
+        stack: [
+          'https://ad-stir.com/contact',
+        ],
+      },
+    };
+
+    it('one entry in validBidRequests corresponds to one server request object.', function () {
+      const requests = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(requests.length).to.equal(validBidRequests.length);
+      requests.forEach(function (r, i) {
+        expect(r.method).to.equal('POST');
+        expect(r.url).to.equal('https://ad.ad-stir.com/prebid');
+        const d = JSON.parse(r.data);
+        expect(d.auctionId).to.equal('b06c5141-fe8f-4cdf-9d7d-54415490a917');
+
+        const v = validBidRequests[i];
+        expect(d.appId).to.equal(v.params.appId);
+        expect(d.adSpaceNo).to.equal(v.params.adSpaceNo);
+        expect(d.bidId).to.equal(v.bidId);
+        expect(d.transactionId).to.equal(v.transactionId);
+        expect(d.mediaTypes).to.deep.equal(v.mediaTypes);
+        expect(d.sizes).to.deep.equal(v.sizes);
+        expect(d.ref.page).to.equal(bidderRequest.refererInfo.page);
+        expect(d.ref.tloc).to.equal(bidderRequest.refererInfo.topmostLocation);
+        expect(d.ref.referrer).to.equal(bidderRequest.refererInfo.ref);
+        expect(d.sua).to.equal(null);
+        expect(d.user).to.equal(null);
+        expect(d.gdpr).to.equal(false);
+        expect(d.usp).to.equal(false);
+        expect(d.schain).to.equal(null);
+        expect(d.eids).to.deep.equal([]);
+      });
+    });
+
+    it('ref.page, ref.tloc and ref.referrer correspond to refererInfo', function () {
+      const [ request ] = spec.buildRequests([validBidRequests[0]], {
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        refererInfo: {
+          page: null,
+          topmostLocation: 'https://adserver.example/iframe1.html',
+          reachedTop: false,
+          ref: null,
+          isAmp: false,
+          numIframes: 2,
+          stack: [
+            null,
+            'https://adserver.example/iframe1.html',
+            'https://adserver.example/iframe2.html'
+          ],
+        },
+      });
+
+      const { ref } = JSON.parse(request.data);
+      expect(ref.page).to.equal(null);
+      expect(ref.tloc).to.equal('https://adserver.example/iframe1.html');
+      expect(ref.referrer).to.equal(null);
+    });
+
+    it('when config.pageUrl is not set, ref.topurl equals to refererInfo.reachedTop', function () {
+      let bidderRequestClone = utils.deepClone(bidderRequest);
+      [true, false].forEach(function (reachedTop) {
+        bidderRequestClone.refererInfo.reachedTop = reachedTop;
+        const requests = spec.buildRequests(validBidRequests, bidderRequestClone);
+        const d = JSON.parse(requests[0].data);
+        expect(d.ref.topurl).to.equal(reachedTop);
+      });
+    });
+
+    describe('when config.pageUrl is set, ref.topurl is always false', function () {
+      before(function () {
+        config.setConfig({ pageUrl: 'https://ad-stir.com/register' });
+      });
+      after(function () {
+        config.resetConfig();
+      });
+
+      it('ref.topurl should be false', function () {
+        let bidderRequestClone = utils.deepClone(bidderRequest);
+        [true, false].forEach(function (reachedTop) {
+          bidderRequestClone.refererInfo.reachedTop = reachedTop;
+          const requests = spec.buildRequests(validBidRequests, bidderRequestClone);
+          const d = JSON.parse(requests[0].data);
+          expect(d.ref.topurl).to.equal(false);
+        });
+      });
+    });
+
+    it('gdprConsent.gdprApplies is sent', function () {
+      let bidderRequestClone = utils.deepClone(bidderRequest);
+      [true, false].forEach(function (gdprApplies) {
+        bidderRequestClone.gdprConsent = { gdprApplies };
+        const requests = spec.buildRequests(validBidRequests, bidderRequestClone);
+        const d = JSON.parse(requests[0].data);
+        expect(d.gdpr).to.equal(gdprApplies);
+      });
+    });
+
+    it('includes in the request parameters whether CCPA applies', function () {
+      let bidderRequestClone = utils.deepClone(bidderRequest);
+      const cases = [
+        { uspConsent: '1---', expected: false },
+        { uspConsent: '1YYY', expected: true },
+        { uspConsent: '1YNN', expected: true },
+        { uspConsent: '1NYN', expected: true },
+        { uspConsent: '1-Y-', expected: true },
+      ];
+      cases.forEach(function ({ uspConsent, expected }) {
+        bidderRequestClone.uspConsent = uspConsent;
+        const requests = spec.buildRequests(validBidRequests, bidderRequestClone);
+        const d = JSON.parse(requests[0].data);
+        expect(d.usp).to.equal(expected);
+      });
+    });
+
+    it('should add schain if available', function() {
+      const schain = {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [
+          {
+            'asi': 'exchange1.example',
+            'sid': '1234!abcd',
+            'hp': 1,
+            'rid': 'bid-request-1',
+            'name': 'publisher, Inc.',
+            'domain': 'publisher.example'
+          },
+          {
+            'asi': 'exchange2.example',
+            'sid': 'abcd',
+            'hp': 1,
+            'rid': 'bid-request-2',
+            'name': 'intermediary',
+            'domain': 'intermediary.example'
+          }
+        ]
+      };
+      const serializedSchain = '1.0,1!exchange1.example,1234%21abcd,1,bid-request-1,publisher%2C%20Inc.,publisher.example!exchange2.example,abcd,1,bid-request-2,intermediary,intermediary.example';
+
+      const [ request ] = spec.buildRequests([utils.mergeDeep(utils.deepClone(validBidRequests[0]), { schain })], bidderRequest);
+      const d = JSON.parse(request.data);
+      expect(d.schain).to.deep.equal(serializedSchain);
+    });
+
+    it('should add schain even if some nodes params are blank', function() {
+      const schain = {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [
+          {
+            'asi': 'exchange1.example',
+            'sid': '1234!abcd',
+            'hp': 1,
+          },
+          {
+          },
+          {
+            'asi': 'exchange2.example',
+            'sid': 'abcd',
+            'hp': 1,
+          },
+        ]
+      };
+      const serializedSchain = '1.0,1!exchange1.example,1234%21abcd,1,,,!,,,,,!exchange2.example,abcd,1,,,';
+
+      const [ request ] = spec.buildRequests([utils.mergeDeep(utils.deepClone(validBidRequests[0]), { schain })], bidderRequest);
+      const d = JSON.parse(request.data);
+      expect(d.schain).to.deep.equal(serializedSchain);
+    });
+
+    it('should add UA client hints to payload if available', function () {
+      const sua = {
+        browsers: [
+          {
+            brand: 'Not?A_Brand',
+            version: [
+              '8',
+              '0',
+              '0',
+              '0'
+            ]
+          },
+          {
+            version: [
+              '108',
+              '0',
+              '5359',
+              '40'
+            ]
+          },
+          {
+            brand: 'Google Chrome',
+            version: [
+              '108',
+              '0',
+              '5359',
+              '40'
+            ]
+          }
+        ],
+        platform: {
+          brand: 'Android',
+          version: [
+            '11'
+          ]
+        },
+        mobile: 1,
+        architecture: '',
+        bitness: '64',
+        model: 'Pixel 5',
+        source: 2
+      }
+
+      const validBidRequestsClone = utils.deepClone(validBidRequests);
+      validBidRequestsClone[0] = utils.mergeDeep(validBidRequestsClone[0], {
+        ortb2: {
+          device: { sua },
+        }
+      });
+
+      const requests = spec.buildRequests(validBidRequestsClone, bidderRequest);
+      requests.forEach(function (r) {
+        const d = JSON.parse(r.data);
+        expect(d.sua).to.deep.equal(sua);
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('return empty array when no content', function () {
+      const bids = spec.interpretResponse({ body: '' });
+      expect(bids).to.deep.equal([]);
+    });
+    it('return empty array when seatbid empty', function () {
+      const bids = spec.interpretResponse({ body: { seatbid: [] } });
+      expect(bids).to.deep.equal([]);
+    });
+    it('return valid bids when serverResponse is valid', function () {
+      const serverResponse = {
+        'body': {
+          'seatbid': [
+            {
+              'bid': {
+                'ad': '
test response
',
+                'cpm': 5250,
+                'creativeId': '5_1234ABCD',
+                'currency': 'JPY',
+                'height': 250,
+                'meta': {
+                  'advertiserDomains': [
+                    'adv.example'
+                  ],
+                  'mediaType': 'banner',
+                  'networkId': 5
+                },
+                'netRevenue': true,
+                'requestId': '22a9457aed98a4',
+                'transactionId': 'f18c078e-4d2a-4ecb-a886-2a0c52187213',
+                'ttl': 60,
+                'width': 300,
+              }
+            }
+          ]
+        },
+        'headers': {}
+      };
+      const bids = spec.interpretResponse(serverResponse);
+      expect(bids[0]).to.deep.equal(serverResponse.body.seatbid[0].bid);
+    });
+  });
+});
diff --git a/test/spec/modules/adtelligentBidAdapter_spec.js b/test/spec/modules/adtelligentBidAdapter_spec.js
index f271f638e98..b03bba95357 100644
--- a/test/spec/modules/adtelligentBidAdapter_spec.js
+++ b/test/spec/modules/adtelligentBidAdapter_spec.js
@@ -16,7 +16,7 @@ const aliasEP = {
   'janet': 'https://ghb.bidder.jmgads.com/v2/auction/',
   'ocm': 'https://ghb.cenarius.orangeclickmedia.com/v2/auction/',
   '9dotsmedia': 'https://ghb.platform.audiodots.com/v2/auction/',
-  'copper6': 'https://ghb.app.copper6.com/v2/auction/',
+  'indicue': 'https://ghb.console.indicue.com/v2/auction/',
 };
 
 const DEFAULT_ADATPER_REQ = { bidderCode: 'adtelligent' };
diff --git a/test/spec/modules/advRedAnalyticsAdapter_spec.js b/test/spec/modules/advRedAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..c493710ab53
--- /dev/null
+++ b/test/spec/modules/advRedAnalyticsAdapter_spec.js
@@ -0,0 +1,114 @@
+import advRedAnalytics from 'modules/advRedAnalyticsAdapter.js';
+import {expect} from 'chai';
+import {server} from 'test/mocks/xhr.js';
+import {expectEvents} from '../../helpers/analytics.js';
+import { EVENTS } from 'src/constants.js';
+import sinon from 'sinon';
+
+let events = require('src/events');
+
+describe('AdvRed Analytics Adapter', function () {
+  let bidWonEvent = {
+    'bidderCode': 'appnexus',
+    'width': 300,
+    'height': 250,
+    'adId': '1ebb82ec35375e',
+    'mediaType': 'banner',
+    'cpm': 0.5,
+    'requestId': '1582271863760569973',
+    'creative_id': '96846035',
+    'creativeId': '96846035',
+    'ttl': 60,
+    'currency': 'USD',
+    'netRevenue': true,
+    'auctionId': '9c7b70b9-b6ab-4439-9e71-b7b382797c18',
+    'responseTimestamp': 1537521629657,
+    'requestTimestamp': 1537521629331,
+    'bidder': 'appnexus',
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'timeToRespond': 326,
+    'size': '300x250',
+    'status': 'rendered',
+    'eventType': 'bidWon',
+    'ad': 'some ad',
+    'adUrl': 'ad url'
+  };
+
+  describe('AdvRed Analytic tests', function () {
+    beforeEach(function () {
+      sinon.stub(events, 'getEvents').returns([]);
+    });
+
+    afterEach(function () {
+      advRedAnalytics.disableAnalytics();
+      events.getEvents.restore();
+    });
+
+    it('support custom endpoint', function () {
+      let custom_endpoint = 'custom url';
+      advRedAnalytics.enableAnalytics({
+        provider: 'advRed',
+        options: {
+          url: custom_endpoint,
+          publisherId: '1234567890'
+        }
+      });
+
+      expect(advRedAnalytics.getOptions().url).to.equal(custom_endpoint);
+    });
+
+    it('bid won event', function() {
+      let publisherId = '1234567890';
+      advRedAnalytics.enableAnalytics({
+        provider: 'advRed',
+        options: {
+          publisherId: publisherId
+        }
+      });
+
+      events.emit(EVENTS.BID_WON, bidWonEvent);
+      advRedAnalytics.sendEvents();
+
+      expect(server.requests.length).to.equal(1);
+      expect(server.requests[0].url).to.equal('https://api.adv.red/api/event');
+
+      const message = JSON.parse(server.requests[0].requestBody);
+      expect(message.pwId).to.exist;
+      expect(message.publisherId).to.equal(publisherId);
+      expect(message.events.length).to.equal(1);
+      expect(message.events[0].eventType).to.equal('bidWon');
+      expect(message.events[0].ad).to.be.undefined;
+      expect(message.events[0].adUrl).to.be.undefined;
+    });
+
+    it('track event', function () {
+      sinon.spy(advRedAnalytics, 'track');
+
+      advRedAnalytics.enableAnalytics({
+        provider: 'advRed',
+        options: {
+          publisherId: '1234567890'
+        }
+      });
+
+      expectEvents().to.beTrackedBy(advRedAnalytics.track);
+    });
+  });
+
+  describe('pageUrl detection', function () {
+    afterEach(function () {
+      advRedAnalytics.disableAnalytics()
+    });
+    it('check pageUrl property', function () {
+      advRedAnalytics.enableAnalytics({
+        provider: 'advRed',
+        options: {
+          publisherId: '1234567890'
+        }
+      });
+
+      const message = JSON.parse(server.requests[0].requestBody);
+      expect(message.pageUrl).to.equal(window.top.location.href);
+    });
+  });
+});
diff --git a/test/spec/modules/advangelistsBidAdapter_spec.js b/test/spec/modules/advangelistsBidAdapter_spec.js
index 143d85a1ab6..57ad2d0e898 100755
--- a/test/spec/modules/advangelistsBidAdapter_spec.js
+++ b/test/spec/modules/advangelistsBidAdapter_spec.js
@@ -44,19 +44,19 @@ describe('advangelistsBidAdapter', function () {
   describe('spec.buildRequests', function () {
     it('should create a POST request for each bid', function () {
       const bidRequest = bidRequests[0];
-      const requests = spec.buildRequests([ bidRequest ]);
+      const requests = spec.buildRequests([ bidRequest ], { timeout: 1000 });
       expect(requests[0].method).to.equal('POST');
     });
 
     it('should create a POST request for each bid in video request', function () {
       const bidRequest = bidRequestsVid[0];
-      const requests = spec.buildRequests([ bidRequest ]);
+      const requests = spec.buildRequests([ bidRequest ], { timeout: 1000 });
       expect(requests[0].method).to.equal('POST');
     });
 
     it('should have domain in request', function () {
       const bidRequest = bidRequests[0];
-      const requests = spec.buildRequests([ bidRequest ]);
+      const requests = spec.buildRequests([ bidRequest ], { timeout: 1000 });
       expect(requests[0].data.site.domain).length !== 0;
     });
   });
diff --git a/test/spec/modules/adverxoBidAdapter_spec.js b/test/spec/modules/adverxoBidAdapter_spec.js
new file mode 100644
index 00000000000..e3b98d49f07
--- /dev/null
+++ b/test/spec/modules/adverxoBidAdapter_spec.js
@@ -0,0 +1,725 @@
+import {expect} from 'chai';
+import {spec} from 'modules/adverxoBidAdapter.js';
+import {config} from 'src/config';
+
+describe('Adverxo Bid Adapter', () => {
+  function makeBidRequestWithParams(params) {
+    return {
+      bidId: '2e9f38ea93bb9e',
+      bidder: 'adverxo',
+      adUnitCode: 'adunit-code',
+      mediaTypes: {banner: {sizes: [[300, 250]]}},
+      params: params,
+      bidderRequestId: 'test-bidder-request-id'
+    };
+  }
+
+  const bannerBidRequests = [
+    {
+      bidId: 'bid-banner',
+      bidder: 'adverxo',
+      adUnitCode: 'adunit-code',
+      userIdAsEids: [{
+        'source': 'pubcid.org',
+        'uids': [{
+          'atype': 1,
+          'id': '01EAJWWNEPN3CYMM5N8M5VXY22'
+        }]
+      }],
+      mediaTypes: {banner: {sizes: [[300, 250]]}},
+      params: {
+        host: 'bid.example.com',
+        adUnitId: 1,
+        auth: 'authExample',
+      },
+      bidderRequestId: 'test-bidder-request-id',
+    },
+  ];
+
+  const bannerBidderRequest = {
+    bidderCode: 'adverxo',
+    bidderRequestId: 'test-bidder-request-id',
+    bids: bannerBidRequests,
+    auctionId: 'new-auction-id'
+  };
+
+  const nativeOrtbRequest = {
+    assets: [
+      {
+        id: 1,
+        required: 1,
+        img: {type: 3, w: 150, h: 50}
+      },
+      {
+        id: 2,
+        required: 1,
+        title: {len: 80}
+      },
+      {
+        id: 3,
+        required: 0,
+        data: {type: 1}
+      }
+    ]
+  };
+
+  const nativeBidRequests = [
+    {
+      bidId: 'bid-native',
+      mediaTypes: {
+        native: {
+          ortb: nativeOrtbRequest
+        }
+      },
+      nativeOrtbRequest,
+      params: {
+        host: 'bid.example.com',
+        adUnitId: 1,
+        auth: 'authExample'
+      }
+    },
+  ];
+
+  const nativeBidderRequest = {
+    bidderCode: 'adverxo',
+    bidderRequestId: 'test-bidder-request-id',
+    bids: nativeBidRequests,
+    auctionId: 'new-auction-id'
+  };
+
+  const videoInstreamBidRequests = [
+    {
+      bidId: 'bid-video',
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [400, 300],
+          w: 400,
+          h: 300,
+          minduration: 5,
+          maxduration: 10,
+          startdelay: 0,
+          skip: 1,
+          minbitrate: 200,
+          protocols: [1, 2, 4]
+        }
+      },
+      params: {
+        host: 'bid.example.com',
+        adUnitId: 1,
+        auth: 'authExample'
+      }
+    }
+  ];
+
+  const videoInstreamBidderRequest = {
+    bidderCode: 'adverxo',
+    bidderRequestId: 'test-bidder-request-id',
+    bids: videoInstreamBidRequests,
+    auctionId: 'new-auction-id'
+  };
+
+  const videoOutstreamBidRequests = [
+    {
+      bidId: 'bid-video',
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [400, 300],
+          w: 400,
+          h: 300,
+          minduration: 5,
+          maxduration: 10,
+          startdelay: 0,
+          skip: 1,
+          minbitrate: 200,
+          protocols: [1, 2, 4]
+        }
+      },
+      params: {
+        host: 'bid.example.com',
+        adUnitId: 1,
+        auth: 'authExample'
+      }
+    }
+  ];
+
+  const videoOutstreamBidderRequest = {
+    bidderCode: 'adverxo',
+    bidderRequestId: 'test-bidder-request-id',
+    bids: videoOutstreamBidRequests,
+    auctionId: 'new-auction-id'
+  };
+
+  afterEach(function () {
+    config.resetConfig();
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should validate bid request with valid params', () => {
+      const validBid = makeBidRequestWithParams({
+        adUnitId: 1,
+        auth: 'authExample',
+        host: 'www.bidExample.com'
+      });
+
+      const isValid = spec.isBidRequestValid(validBid);
+
+      expect(isValid).to.be.true;
+    });
+
+    it('should not validate bid request with empty params', () => {
+      const invalidBid = makeBidRequestWithParams({});
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.be.false;
+    });
+
+    it('should not validate bid request with missing param(adUnitId)', () => {
+      const invalidBid = makeBidRequestWithParams({
+        auth: 'authExample',
+        host: 'www.bidExample.com'
+      });
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.be.false;
+    });
+
+    it('should not validate bid request with missing param(auth)', () => {
+      const invalidBid = makeBidRequestWithParams({
+        adUnitId: 1,
+        host: 'www.bidExample.com'
+      });
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.be.false;
+    });
+
+    it('should validate bid request with missing param(host)', () => {
+      const invalidBid = makeBidRequestWithParams({
+        adUnitId: 1,
+        auth: 'authExample',
+      });
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.be.true;
+    });
+  });
+
+  describe('buildRequests', () => {
+    it('should add eids information to the request', function () {
+      const request = spec.buildRequests(bannerBidRequests, bannerBidderRequest)[0];
+
+      expect(request.data.user.ext.eids).to.exist;
+      expect(request.data.user.ext.eids).to.deep.equal(bannerBidRequests[0].userIdAsEids);
+    });
+
+    it('should use correct bidUrl for an alias', () => {
+      const bidRequests = [
+        {
+          bidder: 'bidsmind',
+          mediaTypes: {banner: {sizes: [[300, 250]]}},
+          params: {
+            adUnitId: 1,
+            auth: 'authExample',
+          }
+        },
+      ];
+
+      const bidderRequest = {
+        bidderCode: 'bidsmind',
+        bids: bidRequests,
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal('https://egrevirda.com/pickpbs?id=1&auth=authExample');
+    });
+
+    it('should use correct default bidUrl', () => {
+      const bidRequests = [
+        {
+          bidder: 'adverxo',
+          mediaTypes: {banner: {sizes: [[300, 250]]}},
+          params: {
+            adUnitId: 1,
+            auth: 'authExample',
+          }
+        },
+      ];
+
+      const bidderRequest = {
+        bidderCode: 'adverxo',
+        bids: bidRequests
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal('https://js.pbsadverxo.com/pickpbs?id=1&auth=authExample');
+    });
+
+    it('should build post request for banner', () => {
+      const request = spec.buildRequests(bannerBidRequests, bannerBidderRequest)[0];
+
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal('https://bid.example.com/pickpbs?id=1&auth=authExample');
+      expect(request.data.device.ip).to.equal('caller');
+      expect(request.data.ext.avx_add_vast_url).to.equal(1);
+    });
+
+    if (FEATURES.NATIVE) {
+      it('should build post request for native', () => {
+        const request = spec.buildRequests(nativeBidRequests, nativeBidderRequest)[0];
+
+        expect(request.method).to.equal('POST');
+        expect(request.url).to.equal('https://bid.example.com/pickpbs?id=1&auth=authExample');
+
+        const nativeRequest = JSON.parse(request.data.imp[0]['native'].request);
+
+        expect(nativeRequest.assets).to.have.lengthOf(3);
+
+        expect(nativeRequest.assets[0]).to.deep.equal({
+          id: 1,
+          required: 1,
+          img: {w: 150, h: 50, type: 3}
+        });
+
+        expect(nativeRequest.assets[1]).to.deep.equal({
+          id: 2,
+          required: 1,
+          title: {len: 80}
+        });
+
+        expect(nativeRequest.assets[2]).to.deep.equal({
+          id: 3,
+          required: 0,
+          data: {type: 1}
+        });
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('should build post request for video', function () {
+        const request = spec.buildRequests(videoInstreamBidRequests, videoInstreamBidderRequest)[0];
+
+        expect(request.method).to.equal('POST');
+        expect(request.url).to.equal('https://bid.example.com/pickpbs?id=1&auth=authExample');
+
+        const ortbRequest = request.data;
+
+        expect(ortbRequest.imp).to.have.lengthOf(1);
+
+        expect(ortbRequest.imp[0]).to.deep.equal({
+          id: 'bid-video',
+          secure: 1,
+          video: {
+            w: 400,
+            h: 300,
+            minduration: 5,
+            maxduration: 10,
+            startdelay: 0,
+            skip: 1,
+            minbitrate: 200,
+            protocols: [1, 2, 4]
+          }
+        });
+      });
+    }
+
+    it('should add bid floor to request', function () {
+      const bannerBidRequestWithFloor = {
+        ...bannerBidRequests[0],
+        getFloor: () => ({currency: 'USD', floor: 3})
+      };
+
+      const request = spec.buildRequests([bannerBidRequestWithFloor], {})[0].data;
+
+      expect(request.imp[0].bidfloor).to.equal(3);
+      expect(request.imp[0].bidfloorcur).to.equal('USD');
+    });
+  });
+
+  describe('interpretResponse', () => {
+    it('should return empty array if serverResponse is not defined', () => {
+      const bidRequest = spec.buildRequests(bannerBidRequests, bannerBidderRequest);
+      const bids = spec.interpretResponse(undefined, bidRequest);
+
+      expect(bids.length).to.equal(0);
+    });
+
+    it('should interpret banner response', () => {
+      const bidResponse = {
+        body: {
+          id: 'bid-response',
+          cur: 'USD',
+          seatbid: [
+            {
+              bid: [
+                {
+                  impid: 'bid-banner',
+                  crid: 'creative-id',
+                  cur: 'USD',
+                  price: 2,
+                  w: 300,
+                  h: 250,
+                  mtype: 1,
+                  adomain: ['test.com'],
+                  adm: '
'
+                },
+              ],
+              seat: 'test-seat',
+            },
+          ],
+        },
+      };
+
+      const expectedBids = [
+        {
+          cpm: 2,
+          creativeId: 'creative-id',
+          creative_id: 'creative-id',
+          currency: 'USD',
+          height: 250,
+          mediaType: 'banner',
+          meta: {
+            advertiserDomains: ['test.com'],
+          },
+          netRevenue: true,
+          requestId: 'bid-banner',
+          ttl: 60,
+          width: 300,
+          ad: '
'
+        },
+      ];
+
+      const request = spec.buildRequests(bannerBidRequests, bannerBidderRequest)[0];
+      const bids = spec.interpretResponse(bidResponse, request);
+
+      expect(bids).to.deep.equal(expectedBids);
+    });
+
+    it('should replace openrtb auction price macro', () => {
+      const bidResponse = {
+        body: {
+          id: 'bid-response',
+          cur: 'USD',
+          seatbid: [
+            {
+              bid: [
+                {
+                  impid: 'bid-banner',
+                  crid: 'creative-id',
+                  cur: 'USD',
+                  price: 2,
+                  w: 300,
+                  h: 250,
+                  mtype: 1,
+                  adomain: ['test.com'],
+                  adm: ''
+                },
+              ],
+              seat: 'test-seat',
+            },
+          ],
+        },
+      };
+
+      const request = spec.buildRequests(bannerBidRequests, bannerBidderRequest)[0];
+      const bids = spec.interpretResponse(bidResponse, request);
+
+      expect(bids[0].ad).to.equal('');
+    });
+
+    if (FEATURES.NATIVE) {
+      it('should interpret native response', () => {
+        const bidResponse = {
+          body: {
+            id: 'native-response',
+            cur: 'USD',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    impid: 'bid-native',
+                    crid: 'creative-id',
+                    cur: 'USD',
+                    price: 2,
+                    w: 300,
+                    h: 250,
+                    mtype: 4,
+                    adomain: ['test.com'],
+                    adm: '{"native":{"assets":[{"id":2,"title":{"text":"Title"}},{"id":3,"data":{"value":"Description"}},{"id":1,"img":{"url":"http://example.com?img","w":150,"h":50}}],"link":{"url":"http://example.com?link"}}}'
+                  },
+                ],
+                seat: 'test-seat',
+              },
+            ],
+          },
+        };
+
+        const expectedBids = [
+          {
+            cpm: 2,
+            creativeId: 'creative-id',
+            creative_id: 'creative-id',
+            currency: 'USD',
+            height: 250,
+            mediaType: 'native',
+            meta: {
+              advertiserDomains: ['test.com'],
+            },
+            netRevenue: true,
+            requestId: 'bid-native',
+            ttl: 60,
+            width: 300,
+            native: {
+              ortb: {
+                assets: [
+                  {id: 2, title: {text: 'Title'}},
+                  {id: 3, data: {value: 'Description'}},
+                  {id: 1, img: {url: 'http://example.com?img', w: 150, h: 50}}
+                ],
+                link: {url: 'http://example.com?link'}
+              }
+            }
+          }
+        ];
+
+        const request = spec.buildRequests(nativeBidRequests, nativeBidderRequest)[0];
+        const bids = spec.interpretResponse(bidResponse, request);
+
+        expect(bids).to.deep.equal(expectedBids);
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('should interpret video instream response', () => {
+        const bidResponse = {
+          body: {
+            id: 'video-response',
+            cur: 'USD',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    impid: 'bid-video',
+                    crid: 'creative-id',
+                    cur: 'USD',
+                    price: 2,
+                    w: 300,
+                    h: 250,
+                    mtype: 2,
+                    adomain: ['test.com'],
+                    adm: 'vastXml',
+                    ext: {
+                      avx_vast_url: 'vastUrl'
+                    }
+                  },
+                ],
+                seat: 'test-seat',
+              },
+            ],
+          },
+        };
+
+        const expectedBids = [
+          {
+            cpm: 2,
+            creativeId: 'creative-id',
+            creative_id: 'creative-id',
+            currency: 'USD',
+            height: 250,
+            mediaType: 'video',
+            meta: {
+              advertiserDomains: ['test.com'],
+            },
+            netRevenue: true,
+            playerHeight: 300,
+            playerWidth: 400,
+            requestId: 'bid-video',
+            ttl: 60,
+            vastUrl: 'vastUrl',
+            vastXml: 'vastXml',
+            width: 300
+          }
+        ];
+
+        const request = spec.buildRequests(videoInstreamBidRequests, videoInstreamBidderRequest)[0];
+        const bids = spec.interpretResponse(bidResponse, request);
+
+        expect(bids).to.deep.equal(expectedBids);
+      });
+
+      it('should interpret video outstream response', () => {
+        const bidResponse = {
+          body: {
+            id: 'video-response',
+            cur: 'USD',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    impid: 'bid-video',
+                    crid: 'creative-id',
+                    cur: 'USD',
+                    price: 2,
+                    w: 300,
+                    h: 250,
+                    mtype: 2,
+                    adomain: ['test.com'],
+                    adm: 'vastXml',
+                    ext: {
+                      avx_vast_url: 'vastUrl',
+                      avx_video_renderer_url: 'videoRendererUrl',
+                    }
+                  },
+                ],
+                seat: 'test-seat',
+              },
+            ],
+          },
+        };
+
+        const expectedBids = [
+          {
+            avxVideoRendererUrl: 'videoRendererUrl',
+            cpm: 2,
+            creativeId: 'creative-id',
+            creative_id: 'creative-id',
+            currency: 'USD',
+            height: 250,
+            mediaType: 'video',
+            meta: {
+              advertiserDomains: ['test.com'],
+            },
+            netRevenue: true,
+            playerHeight: 300,
+            playerWidth: 400,
+            requestId: 'bid-video',
+            ttl: 60,
+            vastUrl: 'vastUrl',
+            vastXml: 'vastXml',
+            width: 300
+          }
+        ];
+
+        const request = spec.buildRequests(videoOutstreamBidRequests, videoOutstreamBidderRequest)[0];
+        const bids = spec.interpretResponse(bidResponse, request);
+
+        expect(bids[0].renderer.url).to.equal('videoRendererUrl');
+
+        delete (bids[0].renderer);
+        expect(bids).to.deep.equal(expectedBids);
+      });
+    }
+  });
+
+  describe('getUserSyncs', () => {
+    const exampleUrl = 'https://example.com/usync?id=5';
+    const iframeConfig = {iframeEnabled: true};
+
+    const responses = [{
+      body: {ext: {avx_usync: [exampleUrl]}}
+    }];
+
+    const responseWithoutQueryString = [{
+      body: {ext: {avx_usync: ['https://example.com/usync/sf/5']}}
+    }];
+
+    it('should not return empty list if not allowed', function () {
+      expect(spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, responses, undefined, undefined, undefined)).to.be.empty;
+    });
+
+    it('should not return iframe if not allowed', function () {
+      expect(spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, responses, undefined, undefined, undefined)).to.deep.equal([{
+        type: 'image', url: `${exampleUrl}&type=image`
+      }]);
+    });
+
+    it('should add query string to url when missing', function () {
+      expect(spec.getUserSyncs(iframeConfig, responseWithoutQueryString, undefined, undefined, undefined)).to.deep.equal([{
+        type: 'iframe', url: `https://example.com/usync/sf/5?type=iframe`
+      }]);
+    });
+
+    it('should not add parameters if not provided', function () {
+      expect(spec.getUserSyncs(iframeConfig, responses, undefined, undefined, undefined)).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe`
+      }]);
+    });
+
+    it('should add GDPR parameters if provided', function () {
+      expect(spec.getUserSyncs(iframeConfig, responses, {gdprApplies: true}, undefined, undefined)).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe&gdpr=1&gdpr_consent=`
+      }]);
+
+      expect(spec.getUserSyncs(iframeConfig, responses,
+        {gdprApplies: true, consentString: 'foo?'}, undefined, undefined)).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe&gdpr=1&gdpr_consent=foo%3F`
+      }]);
+
+      expect(spec.getUserSyncs(iframeConfig, responses,
+        {gdprApplies: false, consentString: 'bar'}, undefined, undefined)).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe&gdpr=0&gdpr_consent=bar`
+      }]);
+    });
+
+    it('should add CCPA parameters if provided', function () {
+      expect(spec.getUserSyncs(iframeConfig, responses, undefined, 'foo?', undefined)).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe&us_privacy=foo%3F`
+      }]);
+    });
+
+    it('should not apply if not gppConsent.gppString', function () {
+      const gppConsent = {gppString: '', applicableSections: [123]};
+      const result = spec.getUserSyncs(iframeConfig, responses, undefined, undefined, gppConsent);
+      expect(result).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe`
+      }]);
+    });
+
+    it('should not apply if not gppConsent.applicableSections', function () {
+      const gppConsent = {gppString: '', applicableSections: undefined};
+      const result = spec.getUserSyncs(iframeConfig, responses, undefined, undefined, gppConsent);
+      expect(result).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe`
+      }]);
+    });
+
+    it('should not apply if empty gppConsent.applicableSections', function () {
+      const gppConsent = {gppString: '', applicableSections: []};
+      const result = spec.getUserSyncs(iframeConfig, responses, undefined, undefined, gppConsent);
+      expect(result).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe`
+      }]);
+    });
+
+    it('should apply if all above are available', function () {
+      const gppConsent = {gppString: 'foo?', applicableSections: [123]};
+      const result = spec.getUserSyncs(iframeConfig, responses, undefined, undefined, gppConsent);
+      expect(result).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe&gpp=foo%3F&gpp_sid=123`
+      }]);
+    });
+
+    it('should support multiple sections', function () {
+      const gppConsent = {gppString: 'foo', applicableSections: [123, 456]};
+      const result = spec.getUserSyncs(iframeConfig, responses, undefined, undefined, gppConsent);
+      expect(result).to.deep.equal([{
+        type: 'iframe', url: `${exampleUrl}&type=iframe&gpp=foo&gpp_sid=123%2C456`
+      }]);
+    });
+  });
+});
diff --git a/test/spec/modules/adxcgAnalyticsAdapter_spec.js b/test/spec/modules/adxcgAnalyticsAdapter_spec.js
index a796e7e966d..40e1347bce3 100644
--- a/test/spec/modules/adxcgAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adxcgAnalyticsAdapter_spec.js
@@ -2,9 +2,9 @@ import adxcgAnalyticsAdapter from 'modules/adxcgAnalyticsAdapter.js';
 import { expect } from 'chai';
 import adapterManager from 'src/adapterManager.js';
 import { server } from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
 
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('adxcg analytics adapter', function () {
   beforeEach(function () {
@@ -171,21 +171,21 @@ describe('adxcg analytics adapter', function () {
 
     it('builds and sends auction data', function () {
       // Step 1: Send auction init event
-      events.emit(constants.EVENTS.AUCTION_INIT, {
+      events.emit(EVENTS.AUCTION_INIT, {
         timestamp: auctionTimestamp
       });
 
       // Step 2: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
+      events.emit(EVENTS.BID_REQUESTED, bidRequest);
 
       // Step 3: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+      events.emit(EVENTS.BID_RESPONSE, bidResponse);
 
       // Step 4: Send bid time out event
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeoutArgsV1);
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeoutArgsV1);
 
       // Step 5: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(EVENTS.AUCTION_END, {});
 
       expect(server.requests.length).to.equal(1);
 
@@ -196,7 +196,7 @@ describe('adxcg analytics adapter', function () {
       expect(realAfterBid.bidTimeout).to.deep.equal(['bidderOne', 'bidderTwo']);
 
       // Step 6: Send auction bid won event
-      events.emit(constants.EVENTS.BID_WON, wonRequest);
+      events.emit(EVENTS.BID_WON, wonRequest);
 
       expect(server.requests.length).to.equal(2);
       let winEventData = JSON.parse(server.requests[1].requestBody);
diff --git a/test/spec/modules/adxcgBidAdapter_spec.js b/test/spec/modules/adxcgBidAdapter_spec.js
index 65c7584b428..25e35a58557 100644
--- a/test/spec/modules/adxcgBidAdapter_spec.js
+++ b/test/spec/modules/adxcgBidAdapter_spec.js
@@ -1,835 +1,19 @@
 // jshint esversion: 6, es3: false, node: true
-import {assert} from 'chai';
-import {spec} from 'modules/adxcgBidAdapter.js';
-import {config} from 'src/config.js';
-import {createEidsArray} from 'modules/userId/eids.js';
+import { assert } from 'chai';
+import { spec } from 'modules/adxcgBidAdapter.js';
+import { config } from 'src/config.js';
+import { createEidsArray } from 'modules/userId/eids.js';
+/* eslint dot-notation:0, quote-props:0 */
+import { expect } from 'chai';
+
+import { syncAddFPDToBidderRequest } from '../../helpers/fpd.js';
+import { deepClone } from '../../../src/utils';
+
 const utils = require('src/utils');
 
 describe('Adxcg adapter', function () {
   let bids = [];
 
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'adxcg',
-      'params': {
-        'adzoneid': '19910113'
-      }
-    };
-
-    it('should return true when required params found', function () {
-      assert(spec.isBidRequestValid(bid));
-
-      bid.params = {
-        adzoneid: 4332,
-      };
-      assert(spec.isBidRequestValid(bid));
-    });
-
-    it('should return false when required params are missing', function () {
-      bid.params = {};
-      assert.isFalse(spec.isBidRequestValid(bid));
-
-      bid.params = {
-        mname: 'some-placement'
-      };
-      assert.isFalse(spec.isBidRequestValid(bid));
-
-      bid.params = {
-        inv: 1234
-      };
-      assert.isFalse(spec.isBidRequestValid(bid));
-    });
-  });
-
-  describe('buildRequests', function () {
-    beforeEach(function () {
-      config.resetConfig();
-    });
-    it('should send request with correct structure', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {
-          adzoneid: '19910113'
-        }
-      }];
-      let request = spec.buildRequests(validBidRequests, {refererInfo: {page: 'page', domain: 'localhost'}});
-
-      assert.equal(request.method, 'POST');
-      assert.equal(request.url, 'https://pbc.adxcg.net/rtb/ortb/pbc?adExchangeId=1');
-      assert.deepEqual(request.options, {contentType: 'application/json'});
-      assert.ok(request.data);
-    });
-
-    describe('user privacy', function () {
-      it('should send GDPR Consent data to exchange if gdprApplies', function () {
-        let validBidRequests = [{bidId: 'bidId', params: {test: 1}}];
-        let bidderRequest = {
-          gdprConsent: {gdprApplies: true, consentString: 'consentDataString'},
-          refererInfo: {referer: 'page'}
-        };
-        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.user.ext.consent, bidderRequest.gdprConsent.consentString);
-        assert.equal(request.regs.ext.gdpr, bidderRequest.gdprConsent.gdprApplies);
-        assert.equal(typeof request.regs.ext.gdpr, 'number');
-      });
-
-      it('should send gdpr as number', function () {
-        let validBidRequests = [{bidId: 'bidId', params: {test: 1}}];
-        let bidderRequest = {
-          gdprConsent: {gdprApplies: true, consentString: 'consentDataString'},
-          refererInfo: {referer: 'page'}
-        };
-        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(typeof request.regs.ext.gdpr, 'number');
-        assert.equal(request.regs.ext.gdpr, 1);
-      });
-
-      it('should send CCPA Consent data to exchange', function () {
-        let validBidRequests = [{bidId: 'bidId', params: {test: 1}}];
-        let bidderRequest = {uspConsent: '1YA-', refererInfo: {referer: 'page'}};
-        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.regs.ext.us_privacy, '1YA-');
-
-        bidderRequest = {
-          uspConsent: '1YA-',
-          gdprConsent: {gdprApplies: true, consentString: 'consentDataString'},
-          refererInfo: {referer: 'page'}
-        };
-        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.regs.ext.us_privacy, '1YA-');
-        assert.equal(request.user.ext.consent, 'consentDataString');
-        assert.equal(request.regs.ext.gdpr, 1);
-      });
-
-      it('should not send GDPR Consent data to adxcg if gdprApplies is undefined', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: {siteId: 'siteId'}
-        }];
-        let bidderRequest = {
-          gdprConsent: {gdprApplies: false, consentString: 'consentDataString'},
-          refererInfo: {referer: 'page'}
-        };
-        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.user.ext.consent, 'consentDataString');
-        assert.equal(request.regs.ext.gdpr, 0);
-
-        bidderRequest = {gdprConsent: {consentString: 'consentDataString'}, refererInfo: {referer: 'page'}};
-        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.user, undefined);
-        assert.equal(request.regs, undefined);
-      });
-      it('should send default GDPR Consent data to exchange', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: {siteId: 'siteId'}
-        }];
-        let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
-
-        assert.equal(request.user, undefined);
-        assert.equal(request.regs, undefined);
-      });
-    });
-
-    it('should add test and is_debug to request, if test is set in parameters', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {test: 1}
-      }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
-
-      assert.ok(request.is_debug);
-      assert.equal(request.test, 1);
-    });
-
-    it('should have default request structure', function () {
-      let keys = 'site,geo,device,source,ext,imp'.split(',');
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {siteId: 'siteId'}
-      }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
-      let data = Object.keys(request);
-
-      assert.deepEqual(keys, data);
-    });
-
-    it('should set request keys correct values', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {siteId: 'siteId'},
-      }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {
-        refererInfo: {referer: 'page'},
-        ortb2: {source: {tid: 'tid'}}
-      }).data);
-
-      assert.equal(request.source.tid, 'tid');
-      assert.equal(request.source.fd, 1);
-    });
-
-    it('should send info about device', function () {
-      config.setConfig({
-        device: {w: 100, h: 100}
-      });
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {adzoneid: '1000'}
-      }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {page: 'page', domain: 'localhost'}}).data);
-
-      assert.equal(request.device.ua, navigator.userAgent);
-      assert.equal(request.device.w, 100);
-      assert.equal(request.device.h, 100);
-    });
-
-    it('should send app info', function () {
-      config.setConfig({
-        app: {id: 'appid'},
-      });
-      const ortb2 = {app: {name: 'appname'}}
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {adzoneid: '1000'},
-        ortb2
-      }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}, ortb2}).data);
-
-      assert.equal(request.app.id, 'appid');
-      assert.equal(request.app.name, 'appname');
-      assert.equal(request.site, undefined);
-    });
-
-    it('should send info about the site', function () {
-      config.setConfig({
-        site: {
-          id: '123123',
-          publisher: {
-            domain: 'publisher.domain.com'
-          }
-        },
-      });
-      const ortb2 = {
-        site: {
-          publisher: {
-            id: 4441,
-            name: 'publisher\'s name'
-          }
-        }
-      };
-
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {adzoneid: '1000'},
-        ortb2
-      }];
-      let refererInfo = {page: 'page', domain: 'localhost'};
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo, ortb2}).data);
-
-      assert.deepEqual(request.site, {
-        domain: 'localhost',
-        id: '123123',
-        page: refererInfo.page,
-        publisher: {
-          domain: 'publisher.domain.com',
-          id: 4441,
-          name: 'publisher\'s name'
-        }
-      });
-    });
-
-    it('should pass extended ids', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {},
-        userIdAsEids: createEidsArray({
-          tdid: 'TTD_ID_FROM_USER_ID_MODULE',
-          pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
-        })
-      }];
-
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
-      assert.deepEqual(request.user.ext.eids, [
-        {source: 'adserver.org', uids: [{id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: {rtiPartner: 'TDID'}}]},
-        {source: 'pubcid.org', uids: [{id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1}]}
-      ]);
-    });
-
-    it('should send currency if defined', function () {
-      config.setConfig({currency: {adServerCurrency: 'EUR'}});
-      let validBidRequests = [{params: {}}];
-      let refererInfo = {referer: 'page'};
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo}).data);
-
-      assert.deepEqual(request.cur, ['EUR']);
-    });
-
-    it('should pass supply chain object', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {},
-        schain: {
-          validation: 'strict',
-          config: {
-            ver: '1.0'
-          }
-        }
-      }];
-
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
-      assert.deepEqual(request.source.ext.schain, {
-        validation: 'strict',
-        config: {
-          ver: '1.0'
-        }
-      });
-    });
-
-    describe('bids', function () {
-      it('should add more than one bid to the request', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: {siteId: 'siteId'}
-        }, {
-          bidId: 'bidId2',
-          params: {siteId: 'siteId'}
-        }];
-        let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
-
-        assert.equal(request.imp.length, 2);
-      });
-      it('should add incrementing values of id', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: {adzoneid: '1000'},
-          mediaTypes: {video: {}}
-        }, {
-          bidId: 'bidId2',
-          params: {adzoneid: '1000'},
-          mediaTypes: {video: {}}
-        }, {
-          bidId: 'bidId3',
-          params: {adzoneid: '1000'},
-          mediaTypes: {video: {}}
-        }];
-        let imps = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp;
-
-        for (let i = 0; i < 3; i++) {
-          assert.equal(imps[i].id, i + 1);
-        }
-      });
-
-      it('should add adzoneid', function () {
-        let validBidRequests = [{bidId: 'bidId', params: {adzoneid: 1000}, mediaTypes: {video: {}}},
-          {bidId: 'bidId2', params: {adzoneid: 1001}, mediaTypes: {video: {}}},
-          {bidId: 'bidId3', params: {adzoneid: 1002}, mediaTypes: {video: {}}}];
-        let imps = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp;
-        for (let i = 0; i < 3; i++) {
-          assert.equal(imps[i].tagid, validBidRequests[i].params.adzoneid);
-        }
-      });
-
-      describe('price floors', function () {
-        it('should not add if floors module not configured', function () {
-          const validBidRequests = [{bidId: 'bidId', params: {adzoneid: 1000}, mediaTypes: {video: {}}}];
-          let imp = getRequestImps(validBidRequests)[0];
-
-          assert.equal(imp.bidfloor, undefined);
-          assert.equal(imp.bidfloorcur, undefined);
-        });
-
-        it('should not add if floor price not defined', function () {
-          const validBidRequests = [getBidWithFloor()];
-          let imp = getRequestImps(validBidRequests)[0];
-
-          assert.equal(imp.bidfloor, undefined);
-          assert.equal(imp.bidfloorcur, 'USD');
-        });
-
-        it('should request floor price in adserver currency', function () {
-          config.setConfig({currency: {adServerCurrency: 'DKK'}});
-          const validBidRequests = [getBidWithFloor()];
-          let imp = getRequestImps(validBidRequests)[0];
-
-          assert.equal(imp.bidfloor, undefined);
-          assert.equal(imp.bidfloorcur, 'DKK');
-        });
-
-        it('should add correct floor values', function () {
-          const expectedFloors = [1, 1.3, 0.5];
-          const validBidRequests = expectedFloors.map(getBidWithFloor);
-          let imps = getRequestImps(validBidRequests);
-
-          expectedFloors.forEach((floor, index) => {
-            assert.equal(imps[index].bidfloor, floor);
-            assert.equal(imps[index].bidfloorcur, 'USD');
-          });
-        });
-
-        function getBidWithFloor(floor) {
-          return {
-            params: {adzoneid: 1},
-            mediaTypes: {video: {}},
-            getFloor: ({currency}) => {
-              return {
-                currency: currency,
-                floor
-              };
-            }
-          };
-        }
-      });
-
-      describe('multiple media types', function () {
-        it('should use all configured media types for bidding', function () {
-          let validBidRequests = [{
-            bidId: 'bidId',
-            params: {adzoneid: 1000},
-            mediaTypes: {
-              banner: {
-                sizes: [[100, 100], [200, 300]]
-              },
-              video: {}
-            }
-          }, {
-            bidId: 'bidId1',
-            params: {adzoneid: 1000},
-            mediaTypes: {
-              video: {},
-              native: {}
-            }
-          }, {
-            bidId: 'bidId2',
-            params: {adzoneid: 1000},
-            nativeParams: {
-              title: {required: true, len: 140}
-            },
-            mediaTypes: {
-              banner: {
-                sizes: [[100, 100], [200, 300]]
-              },
-              native: {},
-              video: {}
-            }
-          }];
-          let [first, second, third] = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp;
-
-          assert.ok(first.banner);
-          assert.ok(first.video);
-          assert.equal(first.native, undefined);
-
-          assert.ok(second.video);
-          assert.equal(second.banner, undefined);
-          assert.equal(second.native, undefined);
-
-          assert.ok(third.native);
-          assert.ok(third.video);
-          assert.ok(third.banner);
-        });
-      });
-
-      describe('banner', function () {
-        it('should convert sizes to openrtb format', function () {
-          let validBidRequests = [{
-            bidId: 'bidId',
-            params: {adzoneid: 1000},
-            mediaTypes: {
-              banner: {
-                sizes: [[100, 100], [200, 300]]
-              }
-            }
-          }];
-          let {banner} = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0];
-          assert.deepEqual(banner, {
-            format: [{w: 100, h: 100}, {w: 200, h: 300}]
-          });
-        });
-      });
-
-      describe('video', function () {
-        it('should pass video mediatype config', function () {
-          let validBidRequests = [{
-            bidId: 'bidId',
-            params: {adzoneid: 1000},
-            mediaTypes: {
-              video: {
-                playerSize: [640, 480],
-                context: 'outstream',
-                mimes: ['video/mp4']
-              }
-            }
-          }];
-          let {video} = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0];
-          assert.deepEqual(video, {
-            playerSize: [640, 480],
-            context: 'outstream',
-            mimes: ['video/mp4']
-          });
-        });
-      });
-
-      describe('native', function () {
-        describe('assets', function () {
-          it('should set correct asset id', function () {
-            let validBidRequests = [{
-              bidId: 'bidId',
-              params: {adzoneid: 1000},
-              nativeParams: {
-                title: {required: true, len: 140},
-                image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
-                body: {len: 140}
-              }
-            }];
-            let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
-            let assets = JSON.parse(nativeRequest).assets;
-
-            assert.equal(assets[0].id, 0);
-            assert.equal(assets[1].id, 3);
-            assert.equal(assets[2].id, 4);
-          });
-          it('should add required key if it is necessary', function () {
-            let validBidRequests = [{
-              bidId: 'bidId',
-              params: {adzoneid: 1000},
-              nativeParams: {
-                title: {required: true, len: 140},
-                image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
-                body: {len: 140},
-                sponsoredBy: {required: true, len: 140}
-              }
-            }];
-
-            let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
-            let assets = JSON.parse(nativeRequest).assets;
-
-            assert.equal(assets[0].required, 1);
-            assert.ok(!assets[1].required);
-            assert.ok(!assets[2].required);
-            assert.equal(assets[3].required, 1);
-          });
-
-          it('should map img and data assets', function () {
-            let validBidRequests = [{
-              bidId: 'bidId',
-              params: {adzoneid: 1000},
-              nativeParams: {
-                title: {required: true, len: 140},
-                image: {required: true, sizes: [150, 50]},
-                icon: {required: false, sizes: [50, 50]},
-                body: {required: false, len: 140},
-                sponsoredBy: {required: true},
-                cta: {required: false},
-                clickUrl: {required: false}
-              }
-            }];
-
-            let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
-            let assets = JSON.parse(nativeRequest).assets;
-            assert.ok(assets[0].title);
-            assert.equal(assets[0].title.len, 140);
-            assert.deepEqual(assets[1].img, {type: 3, w: 150, h: 50});
-            assert.deepEqual(assets[2].img, {type: 1, w: 50, h: 50});
-            assert.deepEqual(assets[3].data, {type: 2, len: 140});
-            assert.deepEqual(assets[4].data, {type: 1});
-            assert.deepEqual(assets[5].data, {type: 12});
-            assert.ok(!assets[6]);
-          });
-
-          describe('icon/image sizing', function () {
-            it('should flatten sizes and utilise first pair', function () {
-              const validBidRequests = [{
-                bidId: 'bidId',
-                params: {adzoneid: 1000},
-                nativeParams: {
-                  image: {
-                    sizes: [[200, 300], [100, 200]]
-                  },
-                }
-              }];
-
-              let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
-              let assets = JSON.parse(nativeRequest).assets;
-              assert.ok(assets[0].img);
-              assert.equal(assets[0].img.w, 200);
-              assert.equal(assets[0].img.h, 300);
-            });
-          });
-
-          it('should utilise aspect_ratios', function () {
-            const validBidRequests = [{
-              bidId: 'bidId',
-              params: {adzoneid: 1000},
-              nativeParams: {
-                image: {
-                  aspect_ratios: [{
-                    min_width: 100,
-                    ratio_height: 3,
-                    ratio_width: 1
-                  }]
-                },
-                icon: {
-                  aspect_ratios: [{
-                    min_width: 10,
-                    ratio_height: 5,
-                    ratio_width: 2
-                  }]
-                }
-              }
-            }];
-
-            let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
-            let assets = JSON.parse(nativeRequest).assets;
-            assert.ok(assets[0].img);
-            assert.equal(assets[0].img.wmin, 100);
-            assert.equal(assets[0].img.hmin, 300);
-
-            assert.ok(assets[1].img);
-            assert.equal(assets[1].img.wmin, 10);
-            assert.equal(assets[1].img.hmin, 25);
-          });
-
-          it('should not throw error if aspect_ratios config is not defined', function () {
-            const validBidRequests = [{
-              bidId: 'bidId',
-              params: {adzoneid: 1000},
-              nativeParams: {
-                image: {
-                  aspect_ratios: []
-                },
-                icon: {
-                  aspect_ratios: []
-                }
-              }
-            }];
-
-            assert.doesNotThrow(() => spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}));
-          });
-        });
-
-        it('should expect any dimensions if min_width not passed', function () {
-          const validBidRequests = [{
-            bidId: 'bidId',
-            params: {adzoneid: 1000},
-            nativeParams: {
-              image: {
-                aspect_ratios: [{
-                  ratio_height: 3,
-                  ratio_width: 1
-                }]
-              }
-            }
-          }];
-
-          let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
-          let assets = JSON.parse(nativeRequest).assets;
-          assert.ok(assets[0].img);
-          assert.equal(assets[0].img.wmin, 0);
-          assert.equal(assets[0].img.hmin, 0);
-          assert.ok(!assets[1]);
-        });
-      });
-    });
-
-    function getRequestImps(validBidRequests) {
-      return JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp;
-    }
-  });
-
-  describe('interpretResponse', function () {
-    it('should return if no body in response', function () {
-      let serverResponse = {};
-      let bidRequest = {};
-
-      assert.ok(!spec.interpretResponse(serverResponse, bidRequest));
-    });
-    it('should return more than one bids', function () {
-      let serverResponse = {
-        body: {
-          seatbid: [{
-            bid: [{
-              impid: '1',
-              native: {ver: '1.1', link: {url: 'link'}, assets: [{id: 1, title: {text: 'Asset title text'}}]}
-            }]
-          }, {
-            bid: [{
-              impid: '2',
-              native: {ver: '1.1', link: {url: 'link'}, assets: [{id: 1, data: {value: 'Asset title text'}}]}
-            }]
-          }]
-        }
-      };
-      let bidRequest = {
-        data: {},
-        bids: [
-          {
-            bidId: 'bidId1',
-            params: {adzoneid: 1000},
-            nativeParams: {
-              title: {required: true, len: 140},
-              image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
-              body: {len: 140}
-            }
-          },
-          {
-            bidId: 'bidId2',
-            params: {adzoneid: 1000},
-            nativeParams: {
-              title: {required: true, len: 140},
-              image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
-              body: {len: 140}
-            }
-          }
-        ]
-      };
-
-      bids = spec.interpretResponse(serverResponse, bidRequest);
-      assert.equal(spec.interpretResponse(serverResponse, bidRequest).length, 2);
-    });
-
-    it('should set correct values to bid', function () {
-      let nativeExample1 = {
-        assets: [],
-        link: {url: 'link'},
-        imptrackers: ['imptrackers url1', 'imptrackers url2']
-      }
-
-      let serverResponse = {
-        body: {
-          id: null,
-          bidid: null,
-          seatbid: [{
-            bid: [
-              {
-                impid: '1',
-                price: 93.1231,
-                crid: '12312312',
-                adm: JSON.stringify(nativeExample1),
-                dealid: 'deal-id',
-                adomain: ['demo.com'],
-                ext: {
-                  crType: 'native',
-                  advertiser_id: 'adv1',
-                  advertiser_name: 'advname',
-                  agency_name: 'agname',
-                  mediaType: 'native'
-                }
-              }
-            ]
-          }],
-          cur: 'EUR'
-        }
-      };
-      let bidRequest = {
-        data: {},
-        bids: [
-          {
-            bidId: 'bidId1',
-            params: {adzoneid: 1000},
-            nativeParams: {
-              title: {required: true, len: 140},
-              image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
-              body: {len: 140}
-            }
-          }
-        ]
-      };
-
-      const bids = spec.interpretResponse(serverResponse, bidRequest);
-      const bid = serverResponse.body.seatbid[0].bid[0];
-      assert.deepEqual(bids[0].requestId, bidRequest.bids[0].bidId);
-      assert.deepEqual(bids[0].cpm, bid.price);
-      assert.deepEqual(bids[0].creativeId, bid.crid);
-      assert.deepEqual(bids[0].ttl, 300);
-      assert.deepEqual(bids[0].netRevenue, false);
-      assert.deepEqual(bids[0].currency, serverResponse.body.cur);
-      assert.deepEqual(bids[0].mediaType, 'native');
-      assert.deepEqual(bids[0].meta.mediaType, 'native');
-      assert.deepEqual(bids[0].meta.advertiserDomains, ['demo.com']);
-
-      assert.deepEqual(bids[0].meta.advertiserName, 'advname');
-      assert.deepEqual(bids[0].meta.agencyName, 'agname');
-
-      assert.deepEqual(bids[0].dealId, 'deal-id');
-    });
-
-    it('should return empty when there is no bids in response', function () {
-      const serverResponse = {
-        body: {
-          id: null,
-          bidid: null,
-          seatbid: [{bid: []}],
-          cur: 'EUR'
-        }
-      };
-      let bidRequest = {
-        data: {},
-        bids: [{bidId: 'bidId1'}]
-      };
-      const result = spec.interpretResponse(serverResponse, bidRequest)[0];
-      assert.ok(!result);
-    });
-
-    describe('banner', function () {
-      it('should set ad content on response', function () {
-        let serverResponse = {
-          body: {
-            seatbid: [{
-              bid: [{impid: '1', adm: '', ext: {crType: 'banner'}}]
-            }]
-          }
-        };
-        let bidRequest = {
-          data: {},
-          bids: [
-            {
-              bidId: 'bidId1',
-              params: {adzoneid: 1000}
-            }
-          ]
-        };
-
-        bids = spec.interpretResponse(serverResponse, bidRequest);
-        assert.equal(bids.length, 1);
-        assert.equal(bids[0].ad, '');
-        assert.equal(bids[0].mediaType, 'banner');
-        assert.equal(bids[0].meta.mediaType, 'banner');
-      });
-    });
-
-    describe('video', function () {
-      it('should set vastXml on response', function () {
-        let serverResponse = {
-          body: {
-            seatbid: [{
-              bid: [{impid: '1', adm: '', ext: {crType: 'video'}}]
-            }]
-          }
-        };
-        let bidRequest = {
-          data: {},
-          bids: [
-            {
-              bidId: 'bidId1',
-              params: {adzoneid: 1000}
-            }
-          ]
-        };
-
-        bids = spec.interpretResponse(serverResponse, bidRequest);
-        assert.equal(bids.length, 1);
-        assert.equal(bids[0].vastXml, '');
-        assert.equal(bids[0].mediaType, 'video');
-        assert.equal(bids[0].meta.mediaType, 'video');
-      });
-    });
-  });
-
   describe('getUserSyncs', function () {
     const usersyncUrl = 'https://usersync-url.com';
     beforeEach(() => {
@@ -846,55 +30,55 @@ describe('Adxcg adapter', function () {
     })
 
     it('should return user sync if pixel enabled with adxcg config', function () {
-      const ret = spec.getUserSyncs({pixelEnabled: true})
-      expect(ret).to.deep.equal([{type: 'image', url: usersyncUrl}])
+      const ret = spec.getUserSyncs({ pixelEnabled: true })
+      expect(ret).to.deep.equal([{ type: 'image', url: usersyncUrl }])
     })
 
     it('should not return user sync if pixel disabled', function () {
-      const ret = spec.getUserSyncs({pixelEnabled: false})
+      const ret = spec.getUserSyncs({ pixelEnabled: false })
       expect(ret).to.be.an('array').that.is.empty
     })
 
     it('should not return user sync if url is not set', function () {
       config.resetConfig()
-      const ret = spec.getUserSyncs({pixelEnabled: true})
+      const ret = spec.getUserSyncs({ pixelEnabled: true })
       expect(ret).to.be.an('array').that.is.empty
     })
 
-    it('should pass GDPR consent', function() {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, undefined)).to.deep.equal([{
+    it('should pass GDPR consent', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, { gdprApplies: true, consentString: 'foo' }, undefined)).to.deep.equal([{
         type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=foo`
       }]);
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: false, consentString: 'foo'}, undefined)).to.deep.equal([{
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, { gdprApplies: false, consentString: 'foo' }, undefined)).to.deep.equal([{
         type: 'image', url: `${usersyncUrl}?gdpr=0&gdpr_consent=foo`
       }]);
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: undefined}, undefined)).to.deep.equal([{
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, { gdprApplies: true, consentString: undefined }, undefined)).to.deep.equal([{
         type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=`
       }]);
     });
 
-    it('should pass US consent', function() {
+    it('should pass US consent', function () {
       expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, '1NYN')).to.deep.equal([{
         type: 'image', url: `${usersyncUrl}?us_privacy=1NYN`
       }]);
     });
 
-    it('should pass GDPR and US consent', function() {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, '1NYN')).to.deep.equal([{
+    it('should pass GDPR and US consent', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, { gdprApplies: true, consentString: 'foo' }, '1NYN')).to.deep.equal([{
         type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=foo&us_privacy=1NYN`
       }]);
     });
   });
 
-  describe('onBidWon', function() {
-    beforeEach(function() {
+  describe('onBidWon', function () {
+    beforeEach(function () {
       sinon.stub(utils, 'triggerPixel');
     });
-    afterEach(function() {
+    afterEach(function () {
       utils.triggerPixel.restore();
     });
 
-    it('Should trigger pixel if bid nurl', function() {
+    it('Should trigger pixel if bid nurl', function () {
       const bid = {
         nurl: 'http://example.com/win/${AUCTION_PRICE}',
         cpm: 2.1,
@@ -904,4 +88,489 @@ describe('Adxcg adapter', function () {
       expect(utils.triggerPixel.callCount).to.equal(1)
     })
   })
+
+  it('should return just to have at least 1 karma test ok', function () {
+    assert(true);
+  });
+});
+
+describe('adxcg v8 oRtbConverter Adapter Tests', function () {
+  const slotConfigs = [{
+    placementCode: '/DfpAccount1/slot1',
+    mediaTypes: {
+      banner: {
+        sizes: [[728, 90], [160, 600]]
+      }
+    },
+    bidId: 'bid12345',
+    params: {
+      adzoneid: '77'
+    }
+  }, {
+    placementCode: '/DfpAccount2/slot2',
+    mediaTypes: {
+      banner: {
+        sizes: [[728, 90]]
+      }
+    },
+    bidId: 'bid23456',
+    params: {
+      adzoneid: '77'
+    }
+  }];
+  const nativeOrtbRequest = {
+    assets: [{
+      id: 1,
+      required: 1,
+      img: {
+        type: 3,
+        w: 150,
+        h: 50,
+      }
+    },
+    {
+      id: 2,
+      required: 1,
+      title: {
+        len: 80
+      }
+    },
+    {
+      id: 3,
+      required: 0,
+      data: {
+        type: 1
+      }
+    }]
+  };
+  const nativeSlotConfig = [{
+    placementCode: '/DfpAccount1/slot3',
+    bidId: 'bid12345',
+    mediaTypes: {
+      native: {
+        sendTargetingKeys: false,
+        ortb: nativeOrtbRequest
+      }
+    },
+    nativeOrtbRequest,
+    params: {
+
+      adzoneid: '77'
+    }
+  }];
+  const videoSlotConfig = [{
+    placementCode: '/DfpAccount1/slotVideo',
+    bidId: 'bid12345',
+    mediaTypes: {
+      video: {
+        playerSize: [400, 300],
+        w: 400,
+        h: 300,
+        minduration: 5,
+        maxduration: 10,
+        startdelay: 0,
+        skip: 1,
+        minbitrate: 200,
+        protocols: [1, 2, 4]
+      }
+    },
+    params: {
+      adzoneid: '77'
+    }
+  }];
+  const additionalParamsConfig = [{
+    placementCode: '/DfpAccount1/slot1',
+    mediaTypes: {
+      banner: {
+        sizes: [[1, 1]]
+      }
+    },
+    bidId: 'bid12345',
+    params: {
+      adzoneid: '77',
+      extra_key1: 'extra_val1',
+      extra_key2: 12345,
+      extra_key3: {
+        key1: 'val1',
+        key2: 23456,
+      },
+      extra_key4: [1, 2, 3]
+    }
+  }];
+
+  const schainParamsSlotConfig = [{
+    placementCode: '/DfpAccount1/slot1',
+    mediaTypes: {
+      banner: {
+        sizes: [[1, 1]]
+      }
+    },
+    bidId: 'bid12345',
+    params: {
+      adzoneid: '77',
+      bcat: ['IAB-1', 'IAB-20'],
+      battr: [1, 2, 3],
+      bidfloor: 1.5,
+      badv: ['cocacola.com', 'lays.com']
+    },
+    schain: {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [
+        {
+          'asi': 'exchange1.com',
+          'sid': '1234',
+          'hp': 1,
+          'rid': 'bid-request-1',
+          'name': 'publisher',
+          'domain': 'publisher.com'
+        }
+      ]
+    },
+  }];
+
+  const bidderRequest = {
+    refererInfo: {
+      page: 'https://publisher.com/home',
+      ref: 'https://referrer'
+    }
+  };
+
+  it('Verify build request', function () {
+    const request = spec.buildRequests(slotConfigs, syncAddFPDToBidderRequest(bidderRequest));
+    expect(request.url).to.equal('https://pbc.adxcg.net/rtb/ortb/pbc?adExchangeId=1');
+    expect(request.method).to.equal('POST');
+    const ortbRequest = request.data;
+    // site object
+    expect(ortbRequest.site).to.not.equal(null);
+    expect(ortbRequest.site.publisher).to.not.equal(null);
+    expect(ortbRequest.site.page).to.equal('https://publisher.com/home');
+    expect(ortbRequest.imp).to.have.lengthOf(2);
+    // device object
+    expect(ortbRequest.device).to.not.equal(null);
+    expect(ortbRequest.device.ua).to.equal(navigator.userAgent);
+    // slot 1
+    expect(ortbRequest.imp[0].banner).to.not.equal(null);
+    expect(ortbRequest.imp[0].banner.format).to.deep.eq([{ 'w': 728, 'h': 90 }, { 'w': 160, 'h': 600 }]);
+    // slot 2
+    expect(ortbRequest.imp[1].banner).to.not.equal(null);
+    expect(ortbRequest.imp[1].banner.format).to.deep.eq([{ 'w': 728, 'h': 90 }]);
+  });
+
+  it('Verify parse response', function () {
+    const request = spec.buildRequests(slotConfigs, syncAddFPDToBidderRequest(bidderRequest));
+    const ortbRequest = request.data;
+    const ortbResponse = {
+      seatbid: [{
+        bid: [{
+          impid: ortbRequest.imp[0].id,
+          price: 1.25,
+          adm: 'This is an Ad',
+          crid: 'Creative#123',
+          mtype: 1,
+          w: 300,
+          h: 250,
+          exp: 20,
+          adomain: ['advertiser.com']
+        }]
+      }]
+    };
+    const bids = spec.interpretResponse({ body: ortbResponse }, request);
+    expect(bids).to.have.lengthOf(1);
+    // verify first bid
+    const bid = bids[0];
+    expect(bid.cpm).to.equal(1.25);
+    expect(bid.ad).to.equal('This is an Ad');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creative_id).to.equal('Creative#123');
+    expect(bid.creativeId).to.equal('Creative#123');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.currency).to.equal('EUR');
+    expect(bid.ttl).to.equal(20);
+    expect(bid.meta).to.not.be.null;
+    expect(bid.meta.advertiserDomains).to.eql(['advertiser.com']);
+  });
+
+  it('Verify full passback', function () {
+    const request = spec.buildRequests(slotConfigs, bidderRequest);
+    const bids = spec.interpretResponse({ body: null }, request)
+    expect(bids).to.have.lengthOf(0);
+  });
+
+  if (FEATURES.NATIVE) {
+    it('Verify Native request', function () {
+      const request = spec.buildRequests(nativeSlotConfig, syncAddFPDToBidderRequest(bidderRequest));
+      expect(request.url).to.equal('https://pbc.adxcg.net/rtb/ortb/pbc?adExchangeId=1');
+      expect(request.method).to.equal('POST');
+      const ortbRequest = request.data;
+      // native impression
+      expect(ortbRequest.imp[0].tagid).to.equal('77');
+      expect(ortbRequest.imp[0].banner).to.be.undefined;
+      const nativePart = ortbRequest.imp[0]['native'];
+      expect(nativePart).to.not.equal(null);
+      expect(nativePart.request).to.not.equal(null);
+      // native request assets
+      const nativeRequest = JSON.parse(ortbRequest.imp[0]['native'].request);
+      expect(nativeRequest).to.not.equal(null);
+      expect(nativeRequest.assets).to.have.lengthOf(3);
+      // image asset
+      expect(nativeRequest.assets[0].id).to.equal(1);
+      expect(nativeRequest.assets[0].required).to.equal(1);
+      expect(nativeRequest.assets[0].title).to.be.undefined;
+      expect(nativeRequest.assets[0].img).to.not.equal(null);
+      expect(nativeRequest.assets[0].img.w).to.equal(150);
+      expect(nativeRequest.assets[0].img.h).to.equal(50);
+      expect(nativeRequest.assets[0].img.type).to.equal(3);
+      // title asset
+      expect(nativeRequest.assets[1].id).to.equal(2);
+      expect(nativeRequest.assets[1].required).to.equal(1);
+      expect(nativeRequest.assets[1].title).to.not.equal(null);
+      expect(nativeRequest.assets[1].title.len).to.equal(80);
+      // data asset
+      expect(nativeRequest.assets[2].id).to.equal(3);
+      expect(nativeRequest.assets[2].required).to.equal(0);
+      expect(nativeRequest.assets[2].title).to.be.undefined;
+      expect(nativeRequest.assets[2].data).to.not.equal(null);
+      expect(nativeRequest.assets[2].data.type).to.equal(1);
+    });
+
+    it('Verify Native response', function () {
+      const request = spec.buildRequests(nativeSlotConfig, syncAddFPDToBidderRequest(bidderRequest));
+      expect(request.url).to.equal('https://pbc.adxcg.net/rtb/ortb/pbc?adExchangeId=1');
+      expect(request.method).to.equal('POST');
+      const ortbRequest = request.data;
+      const nativeResponse = {
+        assets: [
+          { id: 1, img: { type: 3, url: 'https://images.cdn.brand.com/123' } },
+          { id: 2, title: { text: 'Ad Title' } },
+          { id: 3, data: { type: 1, value: 'Sponsored By: Brand' } }
+        ],
+        link: { url: 'https://brand.clickme.com/' },
+        imptrackers: ['https://imp1.trackme.com/', 'https://imp1.contextweb.com/']
+
+      };
+      const ortbResponse = {
+        seatbid: [{
+          bid: [{
+            impid: ortbRequest.imp[0].id,
+            price: 1.25,
+            adm: JSON.stringify(nativeResponse),
+            mtype: 4
+          }]
+        }]
+      };
+      const bids = spec.interpretResponse({ body: ortbResponse }, request);
+      // verify bid
+      const bid = bids[0];
+      expect(bid.cpm).to.equal(1.25);
+      expect(bid.requestId).to.equal('bid12345');
+      expect(bid.ad).to.be.undefined;
+      expect(bid.mediaType).to.equal('native');
+      expect(bid['native']).to.not.be.null;
+      expect(bid['native'].ortb).to.not.be.null;
+      const nativeBid = bid['native'].ortb;
+      expect(nativeBid.assets).to.have.lengthOf(3);
+      expect(nativeBid.assets[0].id).to.equal(1);
+      expect(nativeBid.assets[0].img).to.not.be.null;
+      expect(nativeBid.assets[0].img.type).to.equal(3);
+      expect(nativeBid.assets[0].img.url).to.equal('https://images.cdn.brand.com/123');
+      expect(nativeBid.assets[1].id).to.equal(2);
+      expect(nativeBid.assets[1].title).to.not.be.null;
+      expect(nativeBid.assets[1].title.text).to.equal('Ad Title');
+      expect(nativeBid.assets[2].id).to.equal(3);
+      expect(nativeBid.assets[2].data).to.not.be.null;
+      expect(nativeBid.assets[2].data.type).to.equal(1);
+      expect(nativeBid.assets[2].data.value).to.equal('Sponsored By: Brand');
+      expect(nativeBid.link).to.not.be.null;
+      expect(nativeBid.link.url).to.equal('https://brand.clickme.com/');
+      expect(nativeBid.imptrackers).to.have.lengthOf(2);
+      expect(nativeBid.imptrackers[0]).to.equal('https://imp1.trackme.com/');
+      expect(nativeBid.imptrackers[1]).to.equal('https://imp1.contextweb.com/');
+    });
+  }
+
+  it('Verifies bidder code', function () {
+    expect(spec.code).to.equal('adxcg');
+  });
+
+  it('Verifies bidder aliases', function () {
+    expect(spec.aliases).to.have.lengthOf(1);
+    expect(spec.aliases[0]).to.equal('mediaopti');
+  });
+
+  it('Verifies supported media types', function () {
+    expect(spec.supportedMediaTypes).to.have.lengthOf(3);
+    expect(spec.supportedMediaTypes[0]).to.equal('banner');
+    expect(spec.supportedMediaTypes[1]).to.equal('native');
+    expect(spec.supportedMediaTypes[2]).to.equal('video');
+  });
+
+  if (FEATURES.VIDEO) {
+    it('Verify Video request', function () {
+      const request = spec.buildRequests(videoSlotConfig, syncAddFPDToBidderRequest(bidderRequest));
+      expect(request.url).to.equal('https://pbc.adxcg.net/rtb/ortb/pbc?adExchangeId=1');
+      expect(request.method).to.equal('POST');
+      const ortbRequest = request.data;
+      expect(ortbRequest).to.not.equal(null);
+      expect(ortbRequest.imp).to.have.lengthOf(1);
+      expect(ortbRequest.imp[0].video).to.not.be.null;
+      expect(ortbRequest.imp[0].native).to.be.undefined;
+      expect(ortbRequest.imp[0].banner).to.be.undefined;
+      expect(ortbRequest.imp[0].video.w).to.equal(400);
+      expect(ortbRequest.imp[0].video.h).to.equal(300);
+      expect(ortbRequest.imp[0].video.minduration).to.equal(5);
+      expect(ortbRequest.imp[0].video.maxduration).to.equal(10);
+      expect(ortbRequest.imp[0].video.startdelay).to.equal(0);
+      expect(ortbRequest.imp[0].video.skip).to.equal(1);
+      expect(ortbRequest.imp[0].video.minbitrate).to.equal(200);
+      expect(ortbRequest.imp[0].video.protocols).to.eql([1, 2, 4]);
+    });
+  }
+
+  it('Verify extra parameters', function () {
+    let request = spec.buildRequests(additionalParamsConfig, syncAddFPDToBidderRequest(bidderRequest));
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp).to.have.lengthOf(1);
+    expect(ortbRequest.imp[0].ext).to.not.equal(null);
+    expect(ortbRequest.imp[0].ext.prebid).to.not.equal(null);
+    expect(ortbRequest.imp[0].ext.prebid).to.not.be.null;
+    expect(ortbRequest.imp[0].ext.prebid.extra_key1).to.equal('extra_val1');
+    expect(ortbRequest.imp[0].ext.prebid.extra_key2).to.equal(12345);
+    expect(ortbRequest.imp[0].ext.prebid.extra_key3).to.not.be.null;
+    expect(ortbRequest.imp[0].ext.prebid.extra_key3.key1).to.equal('val1');
+    expect(ortbRequest.imp[0].ext.prebid.extra_key3.key2).to.equal(23456);
+    expect(ortbRequest.imp[0].ext.prebid.extra_key4).to.eql([1, 2, 3]);
+    expect(Object.keys(ortbRequest.imp[0].ext.prebid)).to.eql(['adzoneid', 'extra_key1', 'extra_key2', 'extra_key3', 'extra_key4']);
+    // attempting with a configuration with no unknown params.
+    request = spec.buildRequests(videoSlotConfig, bidderRequest);
+    ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp).to.have.lengthOf(1);
+    // expect(ortbRequest.imp[0].ext).to.be.undefined;
+  });
+
+  it('Verify user level first party data', function () {
+    const bidderRequest = {
+      refererInfo: {
+        page: 'https://publisher.com/home',
+        ref: 'https://referrer'
+      },
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'serialized_gdpr_data'
+      },
+      ortb2: {
+        user: {
+          yob: 1985,
+          gender: 'm',
+          ext: {
+            data: {
+              registered: true,
+              interests: ['cars']
+            }
+          }
+        }
+      }
+    };
+    let request = spec.buildRequests(slotConfigs, syncAddFPDToBidderRequest(bidderRequest));
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.user).to.not.equal(null);
+  });
+
+  it('Verify site level first party data', function () {
+    const bidderRequest = {
+      ortb2: {
+        site: {
+          content: {
+            data: [{
+              name: 'www.iris.com',
+              ext: {
+                segtax: 500,
+                cids: ['iris_c73g5jq96mwso4d8']
+              }
+            }]
+          },
+          page: 'http://pub.com/news',
+          ref: 'http://google.com',
+          publisher: {
+            domain: 'pub.com'
+          }
+        }
+      }
+    };
+    let request = spec.buildRequests(slotConfigs, syncAddFPDToBidderRequest(bidderRequest));
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.site).to.not.equal(null);
+    expect(ortbRequest.site).to.deep.equal({
+      content: {
+        data: [{
+          name: 'www.iris.com',
+          ext: {
+            segtax: 500,
+            cids: ['iris_c73g5jq96mwso4d8']
+          }
+        }]
+      },
+      page: 'http://pub.com/news',
+      ref: 'http://google.com',
+      publisher: {
+        domain: 'pub.com'
+      }
+    });
+  });
+
+  it('Verify impression/slot level first party data', function () {
+    const bidderRequests = [{
+      placementCode: '/DfpAccount1/slot1',
+      mediaTypes: {
+        banner: {
+          sizes: [[1, 1]]
+        }
+      },
+      bidId: 'bid12345',
+      params: {
+        adzoneid: '77',
+        extra_key1: 'extra_val1',
+        extra_key2: 12345
+      },
+      ortb2Imp: {
+        ext: {
+          data: {
+            pbadslot: 'homepage-top-rect',
+            adUnitSpecificAttribute: '123'
+          }
+        }
+      }
+    }];
+    let request = spec.buildRequests(bidderRequests, bidderRequest);
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp).to.not.equal(null);
+    expect(ortbRequest.imp).to.have.lengthOf(1);
+    expect(ortbRequest.imp[0].ext).to.not.equal(null);
+    expect(ortbRequest.imp[0].ext).to.deep.equal({
+      prebid: {
+        adzoneid: '77',
+        extra_key1: 'extra_val1',
+        extra_key2: 12345
+      },
+      data: {
+        pbadslot: 'homepage-top-rect',
+        adUnitSpecificAttribute: '123'
+      }
+    });
+  });
+
+  it('Verify bid request timeouts', function () {
+    const mkRequest = (bidderRequest) => spec.buildRequests(slotConfigs, bidderRequest).data;
+    // assert default is used when no bidderRequest.timeout value is available
+    expect(mkRequest(bidderRequest).tmax).to.equal(500)
+
+    // assert bidderRequest value is used when available
+    expect(mkRequest(Object.assign({}, { timeout: 6000 }, bidderRequest)).tmax).to.equal(6000)
+  });
 });
diff --git a/test/spec/modules/adxpremiumAnalyticsAdapter_spec.js b/test/spec/modules/adxpremiumAnalyticsAdapter_spec.js
index fd698e9e1fd..fe453a1c208 100644
--- a/test/spec/modules/adxpremiumAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adxpremiumAnalyticsAdapter_spec.js
@@ -3,9 +3,9 @@ import { testSend } from 'modules/adxpremiumAnalyticsAdapter.js';
 import { expect } from 'chai';
 import adapterManager from 'src/adapterManager.js';
 import { server } from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
 
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('AdxPremium analytics adapter', function () {
   beforeEach(function () {
@@ -378,19 +378,19 @@ describe('AdxPremium analytics adapter', function () {
 
     it('builds and sends auction data', function () {
       // Step 1: Send auction init event
-      events.emit(constants.EVENTS.AUCTION_INIT, auctionInit);
+      events.emit(EVENTS.AUCTION_INIT, auctionInit);
 
       // Step 2: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
+      events.emit(EVENTS.BID_REQUESTED, bidRequest);
 
       // Step 3: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+      events.emit(EVENTS.BID_RESPONSE, bidResponse);
 
       // Step 4: Send bid time out event
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeoutArgsV1);
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeoutArgsV1);
 
       // Step 5: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(EVENTS.AUCTION_END, {});
 
       testSend();
 
@@ -404,7 +404,7 @@ describe('AdxPremium analytics adapter', function () {
       expect(realAfterBid).to.deep.equal(expectedAfterTimeout);
 
       // Step 6: Send auction bid won event
-      events.emit(constants.EVENTS.BID_WON, wonRequest);
+      events.emit(EVENTS.BID_WON, wonRequest);
 
       expect(server.requests.length).to.equal(3);
       let winEventData = JSON.parse(server.requests[1].requestBody);
diff --git a/test/spec/modules/adyoulikeBidAdapter_spec.js b/test/spec/modules/adyoulikeBidAdapter_spec.js
index ffd6729397a..367fc62c719 100644
--- a/test/spec/modules/adyoulikeBidAdapter_spec.js
+++ b/test/spec/modules/adyoulikeBidAdapter_spec.js
@@ -619,19 +619,19 @@ describe('Adyoulike Adapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.size;
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.sizes;
 
-      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placement': 0
       };
-      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -812,6 +812,12 @@ describe('Adyoulike Adapter', function () {
       }
     });
 
+    it('handles 204 responses', function () {
+      serverResponse.body = '';
+      let result = spec.interpretResponse(serverResponse, []);
+      expect(result).deep.equal([]);
+    });
+
     it('handles nobid responses', function () {
       let response = [{
         BidID: '123dfsdf',
diff --git a/test/spec/modules/agmaAnalyticsAdapter_spec.js b/test/spec/modules/agmaAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..227acacde12
--- /dev/null
+++ b/test/spec/modules/agmaAnalyticsAdapter_spec.js
@@ -0,0 +1,392 @@
+import adapterManager from '../../../src/adapterManager.js';
+import agmaAnalyticsAdapter, {
+  getTiming,
+  getOrtb2Data,
+  getPayload,
+} from '../../../modules/agmaAnalyticsAdapter.js';
+import { gdprDataHandler } from '../../../src/adapterManager.js';
+import { expect } from 'chai';
+import * as events from '../../../src/events.js';
+import { EVENTS } from '../../../src/constants.js';
+import { generateUUID } from '../../../src/utils.js';
+import { server } from '../../mocks/xhr.js';
+import { config } from 'src/config.js';
+
+const INGEST_URL = 'https://pbc.agma-analytics.de/v1';
+const extendedKey = [
+  'auctionIds',
+  'code',
+  'domain',
+  'extended',
+  'gdprApplies',
+  'gdprConsentString',
+  'language',
+  'ortb2',
+  'pageUrl',
+  'pageViewId',
+  'prebidVersion',
+  'referrer',
+  'screenHeight',
+  'screenWidth',
+  'deviceWidth',
+  'deviceHeight',
+  'scriptVersion',
+  'timestamp',
+  'timezoneOffset',
+  'timing',
+  'triggerEvent',
+  'userIdsAsEids',
+];
+const nonExtendedKey = [
+  'auctionIds',
+  'code',
+  'domain',
+  'gdprApplies',
+  'ortb2',
+  'pageUrl',
+  'pageViewId',
+  'prebidVersion',
+  'scriptVersion',
+  'timing',
+  'triggerEvent',
+];
+
+describe('AGMA Analytics Adapter', () => {
+  let agmaConfig, sandbox, clock;
+
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+    clock = sandbox.useFakeTimers();
+    sandbox.stub(events, 'getEvents').returns([]);
+    agmaConfig = {
+      options: {
+        code: 'test',
+      },
+    };
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  describe('configuration', () => {
+    it('registers itself with the adapter manager', () => {
+      const adapter = adapterManager.getAnalyticsAdapter('agma');
+      expect(adapter).to.exist;
+      expect(adapter.gvlid).to.equal(1122);
+    });
+  });
+
+  describe('getPayload', () => {
+    it('should use non extended payload with no consent info', () => {
+      sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(() => null)
+      const payload = getPayload([generateUUID()], {
+        code: 'test',
+      });
+
+      expect(payload).to.have.all.keys([...nonExtendedKey, 'debug']);
+    });
+
+    it('should use non extended payload when agma is not in  the TC String', () => {
+      sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(() => ({
+        vendorData: {
+          vendor: {
+            consents: {
+              1122: false,
+            },
+          },
+        },
+      }));
+      const payload = getPayload([generateUUID()], {
+        code: 'test',
+      });
+      expect(payload).to.have.all.keys([...nonExtendedKey, 'debug']);
+    });
+
+    it('should use extended payload when agma is in the TC String', () => {
+      sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(() => ({
+        vendorData: {
+          vendor: {
+            consents: {
+              1122: true,
+            },
+          },
+        },
+      }));
+      const payload = getPayload([generateUUID()], {
+        code: 'test',
+      });
+      expect(payload).to.have.all.keys([...extendedKey, 'debug']);
+    });
+  });
+
+  describe('getTiming', () => {
+    let originalPerformance;
+    let originalWindowPerformanceNow;
+
+    beforeEach(() => {
+      originalPerformance = global.performance;
+      originalWindowPerformanceNow = window.performance.now;
+    });
+
+    afterEach(() => {
+      global.performance = originalPerformance;
+      window.performance.now = originalWindowPerformanceNow;
+    });
+
+    it('returns TTFB using Timing API V2', () => {
+      global.performance = {
+        getEntriesByType: sinon
+          .stub()
+          .returns([{ responseStart: 100, startTime: 50 }]),
+        now: sinon.stub().returns(150),
+      };
+
+      const result = getTiming();
+
+      expect(result).to.deep.equal({ ttfb: 50, elapsedTime: 150 });
+    });
+
+    it('returns TTFB using Timing API V1 when V2 is not available', () => {
+      global.performance = {
+        getEntriesByType: sinon.stub().throws(),
+        timing: { responseStart: 150, fetchStart: 50 },
+        now: sinon.stub().returns(200),
+      };
+
+      const result = getTiming();
+
+      expect(result).to.deep.equal({ ttfb: 100, elapsedTime: 200 });
+    });
+
+    it('returns null when Timing API is not available', () => {
+      global.performance = {
+        getEntriesByType: sinon.stub().throws(),
+        timing: undefined,
+      };
+
+      const result = getTiming();
+
+      expect(result).to.be.null;
+    });
+
+    it('returns ttfb as 0 if calculated value is negative', () => {
+      global.performance = {
+        getEntriesByType: sinon
+          .stub()
+          .returns([{ responseStart: 50, startTime: 150 }]),
+        now: sinon.stub().returns(200),
+      };
+
+      const result = getTiming();
+
+      expect(result).to.deep.equal({ ttfb: 0, elapsedTime: 200 });
+    });
+
+    it('returns ttfb as 0 if calculated value exceeds performance.now()', () => {
+      global.performance = {
+        getEntriesByType: sinon
+          .stub()
+          .returns([{ responseStart: 50, startTime: 0 }]),
+        now: sinon.stub().returns(40),
+      };
+
+      const result = getTiming();
+
+      expect(result).to.deep.equal({ ttfb: 0, elapsedTime: 40 });
+    });
+  });
+
+  describe('getOrtb2Data', () => {
+    it('returns site and user from options when available', () => {
+      sandbox.stub(config, 'getConfig').callsFake((key) => {
+        return {};
+      });
+
+      const ortb2 = {
+        user: 'user',
+        site: 'site',
+      };
+
+      const result = getOrtb2Data({
+        ortb2,
+      });
+
+      expect(result).to.deep.equal(ortb2);
+    });
+
+    it('returns a combination of data from options and pGlobal.readConfig', () => {
+      sandbox.stub(config, 'getConfig').callsFake((key) => {
+        return {
+          ortb2: {
+            site: {
+              foo: 'bar',
+            },
+          },
+        };
+      });
+
+      const ortb2 = {
+        user: 'user',
+      };
+      const result = getOrtb2Data({
+        ortb2,
+      });
+
+      expect(result).to.deep.equal({
+        site: {
+          foo: 'bar',
+        },
+        user: 'user',
+      });
+    });
+  });
+
+  describe('Event Payload', () => {
+    beforeEach(() => {
+      agmaAnalyticsAdapter.enableAnalytics({
+        ...agmaConfig,
+      });
+      server.respondWith('POST', INGEST_URL, [
+        200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*',
+        },
+        '',
+      ]);
+    });
+
+    afterEach(() => {
+      agmaAnalyticsAdapter.auctionIds = [];
+      if (agmaAnalyticsAdapter.timer) {
+        clearTimeout(agmaAnalyticsAdapter.timer);
+      }
+      agmaAnalyticsAdapter.disableAnalytics();
+    });
+
+    it('should only send once per minute', () => {
+      sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(() => ({
+        gdprApplies: true,
+        consentString: 'consentDataString',
+        vendorData: {
+          vendor: {
+            consents: {
+              1122: true,
+            },
+          },
+        },
+      }));
+      const auction = {
+        auctionId: generateUUID(),
+      };
+
+      events.emit(EVENTS.AUCTION_INIT, {
+        auctionId: generateUUID('1'),
+        auction,
+      });
+
+      clock.tick(200);
+
+      events.emit(EVENTS.AUCTION_INIT, {
+        auctionId: generateUUID('2'),
+        auction,
+      });
+      events.emit(EVENTS.AUCTION_INIT, {
+        auctionId: generateUUID('3'),
+        auction,
+      });
+      events.emit(EVENTS.AUCTION_INIT, {
+        auctionId: generateUUID('4'),
+        auction,
+      });
+
+      clock.tick(900);
+
+      const [request] = server.requests;
+      const requestBody = JSON.parse(request.requestBody);
+      expect(request.url).to.equal(INGEST_URL);
+      expect(requestBody).to.have.all.keys(extendedKey);
+      expect(requestBody.triggerEvent).to.equal(EVENTS.AUCTION_INIT);
+      expect(server.requests).to.have.length(1);
+    });
+
+    it('should send the extended payload with consent', () => {
+      sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(() => ({
+        gdprApplies: true,
+        consentString: 'consentDataString',
+        vendorData: {
+          vendor: {
+            consents: {
+              1122: true,
+            },
+          },
+        },
+      }));
+      const auction = {
+        auctionId: generateUUID(),
+      };
+
+      events.emit(EVENTS.AUCTION_INIT, auction);
+      clock.tick(1100);
+
+      const [request] = server.requests;
+      const requestBody = JSON.parse(request.requestBody);
+      expect(request.url).to.equal(INGEST_URL);
+      expect(requestBody).to.have.all.keys(extendedKey);
+      expect(requestBody.triggerEvent).to.equal(EVENTS.AUCTION_INIT);
+      expect(requestBody.deviceWidth).to.equal(screen.width);
+      expect(requestBody.deviceHeight).to.equal(screen.height);
+      expect(server.requests).to.have.length(1);
+      expect(agmaAnalyticsAdapter.auctionIds).to.have.length(0);
+    });
+
+    it('should send the non extended payload with no explicit consent', () => {
+      sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(() => ({
+        gdprApplies: true,
+        consentString: 'consentDataString',
+      }));
+
+      const auction = {
+        auctionId: generateUUID(),
+      };
+
+      events.emit(EVENTS.AUCTION_INIT, auction);
+      clock.tick(1000);
+
+      const [request] = server.requests;
+      const requestBody = JSON.parse(request.requestBody);
+      expect(request.url).to.equal(INGEST_URL);
+      expect(requestBody.triggerEvent).to.equal(EVENTS.AUCTION_INIT);
+      expect(server.requests).to.have.length(1);
+      expect(agmaAnalyticsAdapter.auctionIds).to.have.length(0);
+    });
+
+    it('should set the trigger Event', () => {
+      sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(() => null);
+      agmaAnalyticsAdapter.disableAnalytics();
+      agmaAnalyticsAdapter.enableAnalytics({
+        provider: 'agma',
+        options: {
+          code: 'test',
+          triggerEvent: EVENTS.AUCTION_END
+        },
+      });
+      const auction = {
+        auctionId: generateUUID(),
+      };
+
+      events.emit(EVENTS.AUCTION_INIT, auction);
+      events.emit(EVENTS.AUCTION_END, auction);
+      clock.tick(1000);
+
+      const [request] = server.requests;
+      const requestBody = JSON.parse(request.requestBody);
+      expect(request.url).to.equal(INGEST_URL);
+      expect(requestBody.auctionIds).to.have.length(1);
+      expect(requestBody.triggerEvent).to.equal(EVENTS.AUCTION_END);
+      expect(server.requests).to.have.length(1);
+      expect(agmaAnalyticsAdapter.auctionIds).to.have.length(0);
+    });
+  });
+});
diff --git a/test/spec/modules/aidemBidAdapter_spec.js b/test/spec/modules/aidemBidAdapter_spec.js
index 3de348197b2..c07b999afe6 100644
--- a/test/spec/modules/aidemBidAdapter_spec.js
+++ b/test/spec/modules/aidemBidAdapter_spec.js
@@ -168,7 +168,7 @@ const DEFAULT_VALID_BANNER_REQUESTS = [
     },
     params: {
       siteId: '1',
-      placementId: '13144370'
+      placementId: '13144370',
     },
     src: 'client',
     transactionId: 'db739693-9b4a-4669-9945-8eab938783cc'
@@ -193,7 +193,7 @@ const DEFAULT_VALID_VIDEO_REQUESTS = [
     },
     params: {
       siteId: '1',
-      placementId: '13144370'
+      placementId: '13144370',
     },
     src: 'client',
     transactionId: 'db739693-9b4a-4669-9945-8eab938783cc'
@@ -209,7 +209,50 @@ const VALID_BIDDER_REQUEST = {
       params: {
         placementId: '13144370',
         siteId: '23434',
-        publisherId: '7689670753'
+        publisherId: '7689670753',
+      },
+    }
+  ],
+  refererInfo: {
+    page: 'test-page',
+    domain: 'test-domain',
+    ref: 'test-referer'
+  },
+}
+
+const VALID_GDPR_BIDDER_REQUEST = {
+  auctionId: '19c97f22-5bd1-4b16-a128-80f75fb0a8a0',
+  bidderCode: 'aidem',
+  bidderRequestId: '1bbb7854dfa0d8',
+  bids: [
+    {
+      params: {
+        placementId: '13144370',
+        siteId: '23434',
+        publisherId: '7689670753',
+      },
+    }
+  ],
+  refererInfo: {
+    page: 'test-page',
+    domain: 'test-domain',
+    ref: 'test-referer'
+  },
+  gdprConsent: {
+    consentString: 'test-gdpr-string'
+  }
+}
+
+const VALID_USP_BIDDER_REQUEST = {
+  auctionId: '19c97f22-5bd1-4b16-a128-80f75fb0a8a0',
+  bidderCode: 'aidem',
+  bidderRequestId: '1bbb7854dfa0d8',
+  bids: [
+    {
+      params: {
+        placementId: '13144370',
+        siteId: '23434',
+        publisherId: '7689670753',
       },
     }
   ],
@@ -218,6 +261,7 @@ const VALID_BIDDER_REQUEST = {
     domain: 'test-domain',
     ref: 'test-referer'
   },
+  uspConsent: '1YYY'
 }
 
 const SERVER_RESPONSE_BANNER = {
@@ -411,7 +455,7 @@ describe('Aidem adapter', () => {
       expect(data.imp).to.be.a('array').that.has.lengthOf(DEFAULT_VALID_BANNER_REQUESTS.length)
 
       expect(data.imp[0]).to.be.a('object').that.has.all.keys(
-        'banner', 'id', 'tagId'
+        'banner', 'id', 'tagId', 'secure'
       )
       expect(data.imp[0].banner).to.be.a('object').that.has.all.keys(
         'format', 'topframe'
@@ -427,7 +471,7 @@ describe('Aidem adapter', () => {
         expect(data.imp).to.be.a('array').that.has.lengthOf(DEFAULT_VALID_VIDEO_REQUESTS.length)
 
         expect(data.imp[0]).to.be.a('object').that.has.all.keys(
-          'video', 'id', 'tagId'
+          'video', 'id', 'tagId', 'secure'
         )
         expect(data.imp[0].video).to.be.a('object').that.has.all.keys(
           'mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h'
@@ -601,47 +645,51 @@ describe('Aidem adapter', () => {
     });
 
     it(`should set gdpr to true`, function () {
-      config.setConfig({
-        consentManagement: {
-          gdpr: {
-            // any data here set gdpr to true
-          },
-        }
-      });
-      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      // config.setConfig({
+      //   consentManagement: {
+      //     gdpr: {
+      //       consentData: {
+      //         getTCData: {
+      //           tcString: 'test-gdpr-string'
+      //         }
+      //       }
+      //     },
+      //   }
+      // });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_GDPR_BIDDER_REQUEST);
       expect(data.regs.gdpr_applies).to.equal(true)
     });
 
     it(`should set usp_consent string`, function () {
-      config.setConfig({
-        consentManagement: {
-          usp: {
-            cmpApi: 'static',
-            consentData: {
-              getUSPData: {
-                uspString: '1YYY'
-              }
-            }
-          }
-        }
-      });
-      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      // config.setConfig({
+      //   consentManagement: {
+      //     usp: {
+      //       cmpApi: 'static',
+      //       consentData: {
+      //         getUSPData: {
+      //           uspString: '1YYY'
+      //         }
+      //       }
+      //     }
+      //   }
+      // });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_USP_BIDDER_REQUEST);
       expect(data.regs.us_privacy).to.equal('1YYY')
     });
 
     it(`should not set usp_consent string`, function () {
-      config.setConfig({
-        consentManagement: {
-          usp: {
-            cmpApi: 'iab',
-            consentData: {
-              getUSPData: {
-                uspString: '1YYY'
-              }
-            }
-          }
-        }
-      });
+      // config.setConfig({
+      //   consentManagement: {
+      //     usp: {
+      //       cmpApi: 'iab',
+      //       consentData: {
+      //         getUSPData: {
+      //           uspString: '1YYY'
+      //         }
+      //       }
+      //     }
+      //   }
+      // });
       const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
       expect(data.regs.us_privacy).to.undefined
     });
diff --git a/test/spec/modules/ajaBidAdapter_spec.js b/test/spec/modules/ajaBidAdapter_spec.js
index 7cf5698f7d4..bd2bdd3e407 100644
--- a/test/spec/modules/ajaBidAdapter_spec.js
+++ b/test/spec/modules/ajaBidAdapter_spec.js
@@ -24,12 +24,12 @@ describe('AjaAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'asi': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -62,11 +62,43 @@ describe('AjaAdapter', function () {
               model: 'SM-G955U',
               bitness: '64',
               architecture: ''
+            },
+            ext: {
+              cdep: 'example_label_1'
             }
           }
-        }
+        },
+        ortb2Imp: {
+          ext: {
+            tid: 'cea1eb09-d970-48dc-8585-634d3a7b0544',
+            gpid: '/1111/homepage#300x250'
+          }
+        },
+        schain: {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              asi: 'exchange1.com',
+              sid: '1234',
+              hp: 1,
+              rid: 'bid-request-1',
+              name: 'publisher',
+              domain: 'publisher.com'
+            },
+            {
+              asi: 'exchange2.com',
+              sid: 'abcd',
+              hp: 1,
+              rid: 'bid-request-2',
+              name: 'intermediary',
+              domain: 'intermediary.com'
+            }
+          ]
+        },
       }
     ];
+    const serializedSchain = encodeURIComponent('1.0,1!exchange1.com,1234,1,bid-request-1,publisher,publisher.com!exchange2.com,abcd,1,bid-request-2,intermediary,intermediary.com')
 
     const bidderRequest = {
       refererInfo: {
@@ -78,7 +110,7 @@ describe('AjaAdapter', function () {
       const requests = spec.buildRequests(bidRequests, bidderRequest);
       expect(requests[0].url).to.equal(ENDPOINT);
       expect(requests[0].method).to.equal('GET');
-      expect(requests[0].data).to.equal('asi=123456&skt=5&prebid_id=30b31c1838de1e&prebid_ver=$prebid.version$&page_url=https%3A%2F%2Fhoge.com&sua=%7B%22source%22%3A2%2C%22platform%22%3A%7B%22brand%22%3A%22Android%22%2C%22version%22%3A%5B%228%22%2C%220%22%2C%220%22%5D%7D%2C%22browsers%22%3A%5B%7B%22brand%22%3A%22Not_A%20Brand%22%2C%22version%22%3A%5B%2299%22%2C%220%22%2C%220%22%2C%220%22%5D%7D%2C%7B%22brand%22%3A%22Google%20Chrome%22%2C%22version%22%3A%5B%22109%22%2C%220%22%2C%225414%22%2C%22119%22%5D%7D%2C%7B%22brand%22%3A%22Chromium%22%2C%22version%22%3A%5B%22109%22%2C%220%22%2C%225414%22%2C%22119%22%5D%7D%5D%2C%22mobile%22%3A1%2C%22model%22%3A%22SM-G955U%22%2C%22bitness%22%3A%2264%22%2C%22architecture%22%3A%22%22%7D&');
+      expect(requests[0].data).to.equal(`asi=123456&skt=5&gpid=%2F1111%2Fhomepage%23300x250&tid=cea1eb09-d970-48dc-8585-634d3a7b0544&cdep=example_label_1&prebid_id=30b31c1838de1e&prebid_ver=$prebid.version$&page_url=https%3A%2F%2Fhoge.com&schain=${serializedSchain}&ad_format_ids=2&sua=%7B%22source%22%3A2%2C%22platform%22%3A%7B%22brand%22%3A%22Android%22%2C%22version%22%3A%5B%228%22%2C%220%22%2C%220%22%5D%7D%2C%22browsers%22%3A%5B%7B%22brand%22%3A%22Not_A%20Brand%22%2C%22version%22%3A%5B%2299%22%2C%220%22%2C%220%22%2C%220%22%5D%7D%2C%7B%22brand%22%3A%22Google%20Chrome%22%2C%22version%22%3A%5B%22109%22%2C%220%22%2C%225414%22%2C%22119%22%5D%7D%2C%7B%22brand%22%3A%22Chromium%22%2C%22version%22%3A%5B%22109%22%2C%220%22%2C%225414%22%2C%22119%22%5D%7D%5D%2C%22mobile%22%3A1%2C%22model%22%3A%22SM-G955U%22%2C%22bitness%22%3A%2264%22%2C%22architecture%22%3A%22%22%7D&`);
     });
   });
 
@@ -116,7 +148,7 @@ describe('AjaAdapter', function () {
       const requests = spec.buildRequests(bidRequests, bidderRequest);
       expect(requests[0].url).to.equal(ENDPOINT);
       expect(requests[0].method).to.equal('GET');
-      expect(requests[0].data).to.equal('asi=123456&skt=5&prebid_id=30b31c1838de1e&prebid_ver=$prebid.version$&page_url=https%3A%2F%2Fhoge.com&eids=%7B%22eids%22%3A%5B%7B%22source%22%3A%22pubcid.org%22%2C%22uids%22%3A%5B%7B%22id%22%3A%22some-random-id-value%22%2C%22atype%22%3A1%7D%5D%7D%5D%7D&');
+      expect(requests[0].data).to.equal('asi=123456&skt=5&prebid_id=30b31c1838de1e&prebid_ver=$prebid.version$&page_url=https%3A%2F%2Fhoge.com&ad_format_ids=2&eids=%7B%22eids%22%3A%5B%7B%22source%22%3A%22pubcid.org%22%2C%22uids%22%3A%5B%7B%22id%22%3A%22some-random-id-value%22%2C%22atype%22%3A1%7D%5D%7D%5D%7D&');
     });
   });
 
@@ -173,138 +205,6 @@ describe('AjaAdapter', function () {
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
     });
 
-    it('handles video responses', function () {
-      let response = {
-        'is_ad_return': true,
-        'ad': {
-          'ad_type': 3,
-          'prebid_id': '51ef8751f9aead',
-          'price': 12.34,
-          'currency': 'JPY',
-          'creative_id': '123abc',
-          'video': {
-            'w': 300,
-            'h': 250,
-            'vtag': '',
-            'purl': 'https://cdn/player',
-            'progress': true,
-            'loop': false,
-            'inread': false,
-            'adomain': [
-              'www.example.com'
-            ]
-          }
-        },
-        'syncs': [
-          'https://example.com'
-        ]
-      };
-
-      let bidderRequest;
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
-      expect(result[0]).to.have.property('vastXml');
-      expect(result[0]).to.have.property('renderer');
-      expect(result[0]).to.have.property('mediaType', 'video');
-    });
-
-    it('handles native response', function () {
-      let response = {
-        'is_ad_return': true,
-        'ad': {
-          'ad_type': 2,
-          'prebid_id': '51ef8751f9aead',
-          'price': 12.34,
-          'currency': 'JPY',
-          'creative_id': '123abc',
-          'native': {
-            'template_and_ads': {
-              'head': '',
-              'body_wrapper': '',
-              'body': '',
-              'ads': [
-                {
-                  'ad_format_id': 10,
-                  'assets': {
-                    'ad_spot_id': '123abc',
-                    'index': 0,
-                    'adchoice_url': 'https://aja-kk.co.jp/optout',
-                    'cta_text': 'cta',
-                    'img_icon': 'https://example.com/img_icon',
-                    'img_icon_width': '50',
-                    'img_icon_height': '50',
-                    'img_main': 'https://example.com/img_main',
-                    'img_main_width': '200',
-                    'img_main_height': '100',
-                    'lp_link': 'https://example.com/lp?k=v',
-                    'sponsor': 'sponsor',
-                    'title': 'ad_title',
-                    'description': 'ad_desc'
-                  },
-                  'imps': [
-                    'https://example.com/imp'
-                  ],
-                  'inviews': [
-                    'https://example.com/inview'
-                  ],
-                  'jstracker': '',
-                  'disable_trimming': false,
-                  'adomain': [
-                    'www.example.com'
-                  ]
-                }
-              ]
-            }
-          }
-        },
-        'syncs': [
-          'https://example.com'
-        ]
-      };
-
-      let expectedResponse = [
-        {
-          'requestId': '51ef8751f9aead',
-          'cpm': 12.34,
-          'creativeId': '123abc',
-          'dealId': undefined,
-          'mediaType': 'native',
-          'currency': 'JPY',
-          'ttl': 300,
-          'netRevenue': true,
-          'native': {
-            'title': 'ad_title',
-            'body': 'ad_desc',
-            'cta': 'cta',
-            'sponsoredBy': 'sponsor',
-            'image': {
-              'url': 'https://example.com/img_main',
-              'width': 200,
-              'height': 100
-            },
-            'icon': {
-              'url': 'https://example.com/img_icon',
-              'width': 50,
-              'height': 50
-            },
-            'clickUrl': 'https://example.com/lp?k=v',
-            'impressionTrackers': [
-              'https://example.com/imp'
-            ],
-            'privacyLink': 'https://aja-kk.co.jp/optout'
-          },
-          'meta': {
-            'advertiserDomains': [
-              'www.example.com'
-            ]
-          }
-        }
-      ];
-
-      let bidderRequest;
-      let result = spec.interpretResponse({ body: response }, {bidderRequest})
-      expect(result).to.deep.equal(expectedResponse)
-    });
-
     it('handles nobid responses', function () {
       let response = {
         'is_ad_return': false,
diff --git a/test/spec/modules/akamaiDapRtdProvider_spec.js b/test/spec/modules/akamaiDapRtdProvider_spec.js
index 337fcf57a33..0787f911591 100644
--- a/test/spec/modules/akamaiDapRtdProvider_spec.js
+++ b/test/spec/modules/akamaiDapRtdProvider_spec.js
@@ -44,7 +44,7 @@ describe('akamaiDapRtdProvider', function() {
       'apiVersion': 'x1',
       'domain': 'prebid.org',
       'identityType': 'dap-signature:1.0.0',
-      'segtax': 503
+      'segtax': 708
     }
   }
 
@@ -56,7 +56,7 @@ describe('akamaiDapRtdProvider', function() {
       'apiVersion': 'x1',
       'domain': 'prebid.org',
       'identityType': 'dap-signature:1.0.0',
-      'segtax': 504
+      'segtax': 710
     }
   }
 
@@ -64,7 +64,7 @@ describe('akamaiDapRtdProvider', function() {
     'api_hostname': 'prebid.dap.akadns.net',
     'api_version': 'x1',
     'domain': 'prebid.org',
-    'segtax': 503,
+    'segtax': 708,
     'identity': sampleIdentity
   }
 
@@ -72,7 +72,7 @@ describe('akamaiDapRtdProvider', function() {
     'api_hostname': 'prebid.dap.akadns.net',
     'api_version': 'x1',
     'domain': 'prebid.org',
-    'segtax': 504,
+    'segtax': 710,
     'identity': sampleIdentity
   }
   let cacheExpiry = Math.round(Date.now() / 1000.0) + 300; // in seconds
@@ -97,7 +97,7 @@ describe('akamaiDapRtdProvider', function() {
   const encRtdUserObj = {
     name: 'www.dataprovider3.com',
     ext: {
-      segtax: 504,
+      segtax: 710,
       taxonomyname: 'iab_audience_taxonomy'
     },
     segment: []
@@ -262,13 +262,13 @@ describe('akamaiDapRtdProvider', function() {
         'api_hostname': 'prebid.dap.akadns.net',
         'api_version': 1,
         'domain': '',
-        'segtax': 503
+        'segtax': 708
       };
       const encConfig = {
         'api_hostname': 'prebid.dap.akadns.net',
         'api_version': 1,
         'domain': '',
-        'segtax': 504
+        'segtax': 710
       };
       let identity = {
         type: 'dap-signature:1.0.0'
@@ -396,7 +396,7 @@ describe('akamaiDapRtdProvider', function() {
         apiHostname: 'prebid.dap.akadns.net',
         apiVersion: 'x1',
         domain: 'prebid.org',
-        segtax: 503
+        segtax: 708
       };
       expect(dapUtils.dapRefreshMembership(ortb2, config, 'token', onDone)).to.equal(undefined)
       const membership = {cohorts: ['1', '5', '7']}
@@ -405,11 +405,11 @@ describe('akamaiDapRtdProvider', function() {
   });
 
   describe('checkAndAddRealtimeData test', function () {
-    it('add realtime data for segtax 503 and 504', function () {
-      dapUtils.checkAndAddRealtimeData(ortb2, cachedEncRtd, 504);
-      dapUtils.checkAndAddRealtimeData(ortb2, cachedEncRtd, 504);
+    it('add realtime data for segtax 708 and 710', function () {
+      dapUtils.checkAndAddRealtimeData(ortb2, cachedEncRtd, 710);
+      dapUtils.checkAndAddRealtimeData(ortb2, cachedEncRtd, 710);
       expect(ortb2.user.data).to.deep.include.members([encRtdUserObj]);
-      dapUtils.checkAndAddRealtimeData(ortb2, cachedRtd, 503);
+      dapUtils.checkAndAddRealtimeData(ortb2, cachedRtd, 708);
       expect(ortb2.user.data).to.deep.include.members([rtdUserObj]);
     });
   });
@@ -466,7 +466,7 @@ describe('akamaiDapRtdProvider', function() {
       let request = server.requests[0];
       responseHeader['Akamai-DAP-Token'] = encMembership;
       request.respond(200, responseHeader, encMembership);
-      let rtdObj = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, 504)
+      let rtdObj = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, 710)
       expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
       expect(JSON.parse(storage.getDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP)).expires_at).to.equal(expiry);
     });
@@ -477,7 +477,7 @@ describe('akamaiDapRtdProvider', function() {
       let request = server.requests[0];
       responseHeader['Akamai-DAP-Token'] = encMembership;
       request.respond(200, responseHeader, encMembership);
-      let rtdObj = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, 504)
+      let rtdObj = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, 710)
       expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
       expect(JSON.parse(storage.getDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP)).expires_at).to.equal(1643830630);
     });
@@ -508,7 +508,7 @@ describe('akamaiDapRtdProvider', function() {
       dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone);
       let request = server.requests[0];
       request.respond(200, responseHeader, JSON.stringify(membership));
-      let rtdObj = dapUtils.dapGetRtdObj(membership, 503);
+      let rtdObj = dapUtils.dapGetRtdObj(membership, 708);
       expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
     });
 
@@ -517,7 +517,7 @@ describe('akamaiDapRtdProvider', function() {
       dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone);
       let request = server.requests[0];
       request.respond(200, responseHeader, JSON.stringify(membership));
-      let rtdObj = dapUtils.dapGetRtdObj(membership, 503)
+      let rtdObj = dapUtils.dapGetRtdObj(membership, 708)
       expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
       expect(JSON.parse(storage.getDataFromLocalStorage(DAP_MEMBERSHIP)).expires_at).to.be.equal(1647971548);
     });
diff --git a/test/spec/modules/alkimiBidAdapter_spec.js b/test/spec/modules/alkimiBidAdapter_spec.js
index 3101fac7500..e551d98fa07 100644
--- a/test/spec/modules/alkimiBidAdapter_spec.js
+++ b/test/spec/modules/alkimiBidAdapter_spec.js
@@ -68,7 +68,7 @@ const BIDDER_VIDEO_RESPONSE = {
     'ttl': 200,
     'creativeId': 2,
     'netRevenue': true,
-    'winUrl': 'http://test.com',
+    'winUrl': 'http://test.com?price=${AUCTION_PRICE}',
     'mediaType': 'video',
     'adomain': ['test.com']
   }]
@@ -91,11 +91,11 @@ describe('alkimiBidAdapter', function () {
     })
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, REQUEST)
+      let bid = JSON.parse(JSON.stringify(REQUEST))
       delete bid.params.token
       expect(spec.isBidRequestValid(bid)).to.equal(false)
 
-      bid = Object.assign({}, REQUEST)
+      bid = JSON.parse(JSON.stringify(REQUEST))
       delete bid.params
       expect(spec.isBidRequestValid(bid)).to.equal(false)
     })
@@ -115,29 +115,35 @@ describe('alkimiBidAdapter', function () {
       uspConsent: 'uspConsent',
       ortb2: {
         site: {
-          keywords: 'test1, test2'
+          keywords: 'test1, test2',
+          cat: ['IAB2'],
+          pagecat: ['IAB3'],
+          sectioncat: ['IAB4']
         },
         at: 2,
         bcat: ['BSW1', 'BSW2'],
         wseat: ['16', '165']
       }
     }
-    const bidderRequest = spec.buildRequests(bidRequests, requestData)
 
     it('should return a properly formatted request with eids defined', function () {
+      const bidderRequest = spec.buildRequests(bidRequests, requestData)
       expect(bidderRequest.data.eids).to.deep.equal(REQUEST.userIdAsEids)
     })
 
     it('should return a properly formatted request with gdpr defined', function () {
+      const bidderRequest = spec.buildRequests(bidRequests, requestData)
       expect(bidderRequest.data.gdprConsent.consentRequired).to.equal(true)
       expect(bidderRequest.data.gdprConsent.consentString).to.equal('test-consent')
     })
 
     it('should return a properly formatted request with uspConsent defined', function () {
+      const bidderRequest = spec.buildRequests(bidRequests, requestData)
       expect(bidderRequest.data.uspConsent).to.equal('uspConsent')
     })
 
     it('sends bid request to ENDPOINT via POST', function () {
+      const bidderRequest = spec.buildRequests(bidRequests, requestData)
       expect(bidderRequest.method).to.equal('POST')
       expect(bidderRequest.data.requestId).to.not.equal(undefined)
       expect(bidderRequest.data.referer).to.equal('http://test.com/path.html')
@@ -146,7 +152,7 @@ describe('alkimiBidAdapter', function () {
       expect(bidderRequest.data.signRequest.randomUUID).to.equal(undefined)
       expect(bidderRequest.data.bidIds).to.deep.contains('456')
       expect(bidderRequest.data.signature).to.equal(undefined)
-      expect(bidderRequest.data.ortb2).to.deep.contains({ at: 2, wseat: ['16', '165'], bcat: ['BSW1', 'BSW2'], site: { keywords: 'test1, test2' }, })
+      expect(bidderRequest.data.ortb2).to.deep.contains({ at: 2, wseat: ['16', '165'], bcat: ['BSW1', 'BSW2'], site: { keywords: 'test1, test2', cat: ['IAB2'], pagecat: ['IAB3'], sectioncat: ['IAB4'] } })
       expect(bidderRequest.options.customHeaders).to.deep.equal({ 'Rtb-Direct': true })
       expect(bidderRequest.options.contentType).to.equal('application/json')
       expect(bidderRequest.url).to.equal(ENDPOINT)
@@ -195,9 +201,9 @@ describe('alkimiBidAdapter', function () {
       expect(result[0]).to.have.property('ttl').equal(200)
       expect(result[0]).to.have.property('creativeId').equal(2)
       expect(result[0]).to.have.property('netRevenue').equal(true)
-      expect(result[0]).to.have.property('winUrl').equal('http://test.com')
+      expect(result[0]).to.have.property('winUrl').equal('http://test.com?price=${AUCTION_PRICE}')
       expect(result[0]).to.have.property('mediaType').equal('video')
-      expect(result[0]).to.have.property('vastXml').equal('vast')
+      expect(result[0]).to.have.property('vastUrl').equal('http://test.com?price=800.4')
       expect(result[0].meta).to.exist.property('advertiserDomains')
       expect(result[0].meta).to.have.property('advertiserDomains').lengthOf(1)
     })
diff --git a/test/spec/modules/ampliffyBidAdapter_spec.js b/test/spec/modules/ampliffyBidAdapter_spec.js
new file mode 100644
index 00000000000..5b86f692d7e
--- /dev/null
+++ b/test/spec/modules/ampliffyBidAdapter_spec.js
@@ -0,0 +1,453 @@
+import {
+  parseXML,
+  isAllowedToBidUp,
+  spec,
+  getDefaultParams,
+  mergeParams,
+  paramsToQueryString, setCurrentURL
+} from 'modules/ampliffyBidAdapter.js';
+import {expect} from 'chai';
+import {BANNER, VIDEO} from 'src/mediaTypes';
+import {newBidder} from 'src/adapters/bidderFactory';
+
+describe('Ampliffy bid adapter Test', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+  // Global definitions for all tests
+  const xmlStr = `
+                  
+                    
+                      
+                              ]]>
+                      
+                    
+                    
+                    ES
+                  `;
+  const xml = new window.DOMParser().parseFromString(xmlStr, 'text/xml');
+  let companion = xml.getElementsByTagName('Companion')[0];
+  let htmlResource = companion.getElementsByTagName('HTMLResource')[0];
+  let htmlContent = document.createElement('html');
+  htmlContent.innerHTML = htmlResource.textContent;
+
+  describe('Is allowed to bid up', function () {
+    it('Should return true using a URL that is in domainMap', () => {
+      let allowedToBidUp = isAllowedToBidUp(htmlContent, 'https://testSports.com?id=131313&text=aaaaa&foo=foo');
+      expect(allowedToBidUp).to.be.true;
+    })
+
+    it('Should return false using an url that is not in domainMap', () => {
+      let allowedToBidUp = isAllowedToBidUp(htmlContent, 'https://test.com');
+      expect(allowedToBidUp).to.be.false;
+    })
+
+    it('Should return false using an url that is excluded.', () => {
+      let allowedToBidUp = isAllowedToBidUp(htmlContent, 'https://www.no-allowed.com/busqueda/sexo/sexo?test=1#item1');
+      expect(allowedToBidUp).to.be.false;
+    })
+  })
+
+  describe('Helper functions', function () {
+    it('Should default params not to be null', () => {
+      const defaultParams = getDefaultParams();
+
+      expect(defaultParams).not.to.be.null;
+    })
+    it('Should the merge two object params into a new object', () => {
+      const params1 = {
+        'hello': 'world',
+        'ampTest': 'this will be replaced'
+      }
+      const params2 = {
+        'test': 1,
+        'ampTest': 'This will be replace the param with the same name in other array'
+      }
+      const allParams = mergeParams(params1, params2);
+
+      const paramsComplete =
+        {
+          'hello': 'world',
+          'ampTest': 'This will be replace the param with the same name in other array',
+          'test': 1,
+        }
+      expect(allParams).not.to.be.null;
+      expect(JSON.stringify(allParams)).to.equal(JSON.stringify(paramsComplete));
+    })
+    it('Params to QueryString', () => {
+      const params = {
+        'test': 1,
+        'ampTest': 'ret',
+        'empty': null,
+        'quoteMark': '?',
+        'test1': undefined
+      }
+      const queryString = paramsToQueryString(params);
+
+      expect(queryString).not.to.be.null;
+      expect(queryString).to.equal('test=1&Test=ret&empty"eMark=%3F');
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    it('Should return true when required params found', function () {
+      const bidRequest = {
+        bidder: 'ampliffy',
+        params: {
+          server: 'bidder.ampliffy.com',
+          placementId: 1235465798,
+          format: 'all'
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [1, 1]
+          }
+        },
+      }
+      expect(spec.isBidRequestValid(bidRequest)).to.be.true;
+    })
+    it('Should return false when param format is display but mediaTypes are for video', function () {
+      const bidRequest = {
+        bidder: 'ampliffy',
+        params: {
+          server: 'bidder.ampliffy.com',
+          placementId: 1235465798,
+          format: 'display'
+        },
+        mediaTypes: {
+          video: {
+            sizes: [1, 1]
+          }
+        },
+      }
+      expect(spec.isBidRequestValid(bidRequest)).to.be.false;
+    })
+    it('Should return false when param format is video but mediaTypes are for banner', function () {
+      const bidRequest = {
+        bidder: 'ampliffy',
+        params: {
+          server: 'bidder.ampliffy.com',
+          placementId: 1235465798,
+          format: 'video'
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [1, 1]
+          }
+        },
+      }
+      expect(spec.isBidRequestValid(bidRequest)).to.be.false;
+    })
+    it('Should return true when param format is video and mediaTypes are for video', function () {
+      const bidRequest = {
+        bidder: 'ampliffy',
+        params: {
+          server: 'bidder.ampliffy.com',
+          placementId: 1235465798,
+          format: 'video'
+        },
+        mediaTypes: {
+          video: {
+            sizes: [1, 1]
+          }
+        },
+      }
+      expect(spec.isBidRequestValid(bidRequest)).to.be.true;
+    })
+    it('Should return true when param format is display and mediaTypes are for banner', function () {
+      const bidRequest = {
+        bidder: 'ampliffy',
+        params: {
+          server: 'bidder.ampliffy.com',
+          placementId: 1235465798,
+          format: 'display'
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [1, 1]
+          }
+        },
+      }
+      expect(spec.isBidRequestValid(bidRequest)).to.be.true;
+    })
+    it('Should return true when param format is all and mediaTypes are for banner', function () {
+      const bidRequest = {
+        bidder: 'ampliffy',
+        params: {
+          server: 'bidder.ampliffy.com',
+          placementId: 1235465798,
+          format: 'all'
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [1, 1]
+          }
+        },
+      }
+      expect(spec.isBidRequestValid(bidRequest)).to.be.true;
+    })
+    it('Should return true when param format is all and mediaTypes are for video', function () {
+      const bidRequest = {
+        bidder: 'ampliffy',
+        params: {
+          server: 'bidder.ampliffy.com',
+          placementId: 1235465798,
+          format: 'all'
+        },
+        mediaTypes: {
+          video: {
+            sizes: [1, 1]
+          }
+        },
+      }
+      expect(spec.isBidRequestValid(bidRequest)).to.be.true;
+    })
+    it('Should return false without placementId param', function () {
+      const bidRequest = {
+        bidder: 'ampliffy',
+        params: {}
+      }
+      expect(spec.isBidRequestValid(bidRequest)).to.be.false;
+    })
+    it('Should return false without param object', function () {
+      const bidRequest = {
+        bidder: 'ampliffy',
+      }
+      expect(spec.isBidRequestValid(bidRequest)).to.be.false;
+    })
+  });
+
+  describe('Build request function', function () {
+    const bidderRequest = {
+      'bidderCode': 'ampliffy',
+      'auctionId': 'c4a771bf-1791-4513-82b3-96c48d19ddff',
+      'bidderRequestId': '1134bdcbe47f25',
+      'bids': [{
+        'bidder': 'ampliffy',
+        'params': {
+          'placementId': 1235465798,
+          'type': 'bidder.',
+          'region': 'alan-development.k8s.',
+          'adnetwork': 'ampliffy.com',
+          'SERVER': 'bidder.ampliffy.com'
+        },
+        'crumbs': {'pubcid': '29844d69-c4e5-4b00-8602-6dd09815363a'},
+        'ortb2Imp': {'ext': {'data': {'pbadslot': 'video1'}}},
+        'mediaTypes': {
+          'video': {
+            'context': 'instream',
+            'playerSize': [[640, 480]],
+            'mimes': ['video/mp4'],
+            'protocols': [1, 2, 3, 4, 5, 6, 7, 8],
+            'playbackmethod': [2],
+            'skip': 1
+          }
+        },
+        'adUnitCode': 'video1',
+        'transactionId': 'f85c1b10-bad3-4c3f-a2bb-2c484c405bc9',
+        'sizes': [[640, 480]],
+        'bidId': '2bc71d9c058842',
+        'bidderRequestId': '1134bdcbe47f25',
+        'auctionId': 'c4a771bf-1791-4513-82b3-96c48d19ddff',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      }],
+      'auctionStart': 1644029483655,
+      'timeout': 3000,
+      'refererInfo': {
+        'referer': 'http://localhost:9999/integrationExamples/gpt/hello_world_video.html?pbjs_debug=true',
+        'reachedTop': true,
+        'isAmp': false,
+        'numIframes': 0,
+        'stack': ['http://localhost:9999/integrationExamples/gpt/hello_world_video.html?pbjs_debug=true'],
+        'canonicalUrl': null
+      },
+      'start': 1644029483708
+    }
+    const validBidRequests = [
+      {
+        'bidder': 'ampliffy',
+        'params': {
+          'placementId': 1235465798,
+          'type': 'bidder.',
+          'region': 'alan-development.k8s.',
+          'adnetwork': 'ampliffy.com',
+          'SERVER': 'bidder.ampliffy.com'
+        },
+        'crumbs': {'pubcid': '29844d69-c4e5-4b00-8602-6dd09815363a'},
+        'ortb2Imp': {'ext': {'data': {'pbadslot': 'video1'}}},
+        'mediaTypes': {
+          'video': {
+            'context': 'instream',
+            'playerSize': [[640, 480]],
+            'mimes': ['video/mp4'],
+            'protocols': [1, 2, 3, 4, 5, 6, 7, 8],
+            'playbackmethod': [2],
+            'skip': 1
+          }
+        },
+        'adUnitCode': 'video1',
+        'transactionId': 'f85c1b10-bad3-4c3f-a2bb-2c484c405bc9',
+        'sizes': [[640, 480]],
+        'bidId': '2bc71d9c058842',
+        'bidderRequestId': '1134bdcbe47f25',
+        'auctionId': 'c4a771bf-1791-4513-82b3-96c48d19ddff',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      }
+    ];
+    it('Should return one or more bid requests', function () {
+      expect(spec.buildRequests(validBidRequests, bidderRequest).length).to.be.greaterThan(0);
+    });
+  })
+  describe('Interpret response', function () {
+    let bidRequest = {
+      bidRequest: {
+        adUnitCode: 'div-gpt-ad-1460505748561-0',
+        auctionId: '469bb2e2-351f-4d01-b782-cdbca5e3e0ed',
+        bidId: '2d40b8dcd02ade',
+        bidRequestsCount: 1,
+        bidder: 'ampliffy',
+        bidderRequestId: '128c07edc4680f',
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0,
+        crumbs: {
+          pubcid: '29844d69-c4e5-4b00-8602-6dd09815363a'
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [300, 250],
+              [300, 600]
+            ]
+          }
+        },
+        ortb2Imp: {ext: {}},
+        params: {placementId: 13144370},
+        sizes: [
+          [300, 250],
+          [300, 600]
+        ],
+        src: 'client',
+        transactionId: '103b2b58-6ed1-45e9-9486-c942d6042e3'
+      },
+      data: {bidId: '2d40b8dcd02ade'},
+      method: 'GET',
+      url: 'https://test.com',
+    };
+
+    it('Should extract a CPM and currency from the xml', () => {
+      let cpmData = parseXML(xml);
+      expect(cpmData).to.not.be.a('null');
+      expect(cpmData.cpm).to.equal('.23');
+      expect(cpmData.currency).to.equal('USD');
+    });
+
+    it('It should return no ads when the CPM is less than zero.', () => {
+      const xmlStr1 = `
+                      
+                      
+                       
+                        
+                          
+                            
+                              
+                                
+                                  

+                                  

+                                    

+                                  

+                                
+                              
+                            ]]>
+                          
+                        
+                        
+                        ES
+                        
+                       
+                      `;
+      let serverResponse = {
+        'body': xmlStr1,
+      }
+      const bidResponses = spec.interpretResponse(serverResponse, bidRequest);
+      expect(bidResponses.length).to.equal(0);
+    })
+
+    it('It should return no ads when the creative url is not in the xml', () => {
+      const xmlStr1 = `
+                        
+                         
+                          
+                            
+                            
+                              
+                                
+                                
+                                  

+                                  

+                                    

+                                  

+                                
+                              ]]>
+                            
+                          
+                          ES
+                          
+                         
+                        `;
+      let serverResponse = {
+        'body': xmlStr1,
+      }
+      const bidResponses = spec.interpretResponse(serverResponse, bidRequest);
+      expect(bidResponses.length).to.equal(0);
+    })
+    it('It should return a banner ad.', () => {
+      let serverResponse = {
+        'body': xmlStr,
+      }
+      setCurrentURL('https://www.sports.com');
+      const bidResponses = spec.interpretResponse(serverResponse, bidRequest);
+      expect(bidResponses.length).greaterThan(0);
+      expect(bidResponses[0].mediaType).to.be.equal(BANNER);
+      expect(bidResponses[0].ad).not.to.be.null;
+    })
+    it('It should return a video ad.', () => {
+      let serverResponse = {
+        'body': xmlStr,
+      }
+      setCurrentURL('https://www.sports.com');
+      bidRequest.bidRequest.mediaTypes = {
+        video: {
+          sizes: [
+            [300, 250],
+            [300, 600]
+          ]
+        }
+      }
+      const bidResponses = spec.interpretResponse(serverResponse, bidRequest);
+      expect(bidResponses.length).greaterThan(0);
+      expect(bidResponses[0].mediaType).to.be.equal(VIDEO);
+      expect(bidResponses[0].vastUrl).not.to.be.null;
+    })
+  });
+});
diff --git a/test/spec/modules/amxBidAdapter_spec.js b/test/spec/modules/amxBidAdapter_spec.js
index 984c443344d..5769afa1b2b 100644
--- a/test/spec/modules/amxBidAdapter_spec.js
+++ b/test/spec/modules/amxBidAdapter_spec.js
@@ -3,6 +3,7 @@ import { spec } from 'modules/amxBidAdapter.js';
 import { createEidsArray } from 'modules/userId/eids.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
 import { config } from 'src/config.js';
+import { server } from 'test/mocks/xhr.js';
 import * as utils from 'src/utils.js';
 
 const sampleRequestId = '82c91e127a9b93e';
@@ -11,7 +12,7 @@ const sampleDisplayCRID = '78827819';
 // minimal example vast
 const sampleVideoAd = (addlImpression) =>
   `
-00:00:15${addlImpression}
+00:00:15${addlImpression}
 `.replace(/\n+/g, '');
 
 const sampleFPD = {
@@ -37,7 +38,7 @@ const sampleBidderRequest = {
   },
   gppConsent: {
     gppString: 'example',
-    applicableSections: 'example'
+    applicableSections: 'example',
   },
 
   auctionId: null,
@@ -209,10 +210,12 @@ describe('AmxBidAdapter', () => {
   describe('getUserSync', () => {
     it('Will perform an iframe sync even if there is no server response..', () => {
       const syncs = spec.getUserSyncs({ iframeEnabled: true });
-      expect(syncs).to.eql([{
-        type: 'iframe',
-        url: 'https://prebid.a-mo.net/isyn?gdpr_consent=&gdpr=0&us_privacy=&gpp=&gpp_sid='
-      }]);
+      expect(syncs).to.eql([
+        {
+          type: 'iframe',
+          url: 'https://prebid.a-mo.net/isyn?gdpr_consent=&gdpr=0&us_privacy=&gpp=&gpp_sid=',
+        },
+      ]);
     });
 
     it('will return valid syncs from a server response', () => {
@@ -276,8 +279,13 @@ describe('AmxBidAdapter', () => {
     });
 
     it('will attach additional referrer info data', () => {
-      const { data } = spec.buildRequests([sampleBidRequestBase], sampleBidderRequest);
-      expect(data.ri.r).to.equal(sampleBidderRequest.refererInfo.topmostLocation);
+      const { data } = spec.buildRequests(
+        [sampleBidRequestBase],
+        sampleBidderRequest
+      );
+      expect(data.ri.r).to.equal(
+        sampleBidderRequest.refererInfo.topmostLocation
+      );
       expect(data.ri.t).to.equal(sampleBidderRequest.refererInfo.reachedTop);
       expect(data.ri.l).to.equal(sampleBidderRequest.refererInfo.numIframes);
       expect(data.ri.s).to.equal(sampleBidderRequest.refererInfo.stack);
@@ -315,7 +323,7 @@ describe('AmxBidAdapter', () => {
         [sampleBidRequestBase],
         sampleBidderRequest
       );
-      delete data.m; // don't deal with "m" in this test
+      delete data.m; // don't deal with 'm' in this test
       expect(data.gs).to.equal(sampleBidderRequest.gdprConsent.gdprApplies);
       expect(data.gc).to.equal(sampleBidderRequest.gdprConsent.consentString);
       expect(data.usp).to.equal(sampleBidderRequest.uspConsent);
@@ -343,10 +351,8 @@ describe('AmxBidAdapter', () => {
     });
 
     it('will attach sync configuration', () => {
-      const request = () => spec.buildRequests(
-        [sampleBidRequestBase],
-        sampleBidderRequest
-      );
+      const request = () =>
+        spec.buildRequests([sampleBidRequestBase], sampleBidderRequest);
 
       const setConfig = (filterSettings) =>
         config.setConfig({
@@ -355,56 +361,73 @@ describe('AmxBidAdapter', () => {
             syncDelay: 2300,
             syncEnabled: true,
             filterSettings,
-          }
+          },
         });
 
       const test = (filterSettings) => {
         setConfig(filterSettings);
         return request().data.sync;
-      }
+      };
 
       const base = { d: 2300, l: 2, e: true };
 
-      const tests = [[
-        undefined,
-        { ...base, t: 0 }
-      ], [{
-        image: {
-          bidders: '*',
-          filter: 'include'
-        },
-        iframe: {
-          bidders: '*',
-          filter: 'include'
-        }
-      }, { ...base, t: 3 }], [{
-        image: {
-          bidders: ['amx'],
-        },
-        iframe: {
-          bidders: '*',
-          filter: 'include'
-        }
-      }, { ...base, t: 3 }], [{
-        image: {
-          bidders: ['other'],
-        },
-        iframe: {
-          bidders: '*'
-        }
-      }, { ...base, t: 2 }], [{
-        image: {
-          bidders: ['amx']
-        },
-        iframe: {
-          bidders: ['amx'],
-          filter: 'exclude'
-        }
-      }, { ...base, t: 1 }]]
+      const tests = [
+        [undefined, { ...base, t: 0 }],
+        [
+          {
+            image: {
+              bidders: '*',
+              filter: 'include',
+            },
+            iframe: {
+              bidders: '*',
+              filter: 'include',
+            },
+          },
+          { ...base, t: 3 },
+        ],
+        [
+          {
+            image: {
+              bidders: ['amx'],
+            },
+            iframe: {
+              bidders: '*',
+              filter: 'include',
+            },
+          },
+          { ...base, t: 3 },
+        ],
+        [
+          {
+            image: {
+              bidders: ['other'],
+            },
+            iframe: {
+              bidders: '*',
+            },
+          },
+          { ...base, t: 2 },
+        ],
+        [
+          {
+            image: {
+              bidders: ['amx'],
+            },
+            iframe: {
+              bidders: ['amx'],
+              filter: 'exclude',
+            },
+          },
+          { ...base, t: 1 },
+        ],
+      ];
 
       for (let i = 0, l = tests.length; i < l; i++) {
         const [result, expected] = tests[i];
-        expect(test(result), `input: ${JSON.stringify(result)}`).to.deep.equal(expected);
+        expect(test(result), `input: ${JSON.stringify(result)}`).to.deep.equal(
+          expected
+        );
       }
     });
 
@@ -419,7 +442,6 @@ describe('AmxBidAdapter', () => {
     it('will collect & forward RTI user IDs', () => {
       const randomRTI = `greatRTI${Math.floor(Math.random() * 100)}`;
       const userId = {
-        britepoolid: 'sample-britepool',
         criteoId: 'sample-criteo',
         digitrustid: { data: { id: 'sample-digitrust' } },
         id5id: { uid: 'sample-id5' },
@@ -497,7 +519,15 @@ describe('AmxBidAdapter', () => {
 
     it('can build a video request', () => {
       const { data } = spec.buildRequests(
-        [{ ...sampleBidRequestVideo, params: { ...sampleBidRequestVideo.params, adUnitId: 'custom-auid' } }],
+        [
+          {
+            ...sampleBidRequestVideo,
+            params: {
+              ...sampleBidRequestVideo.params,
+              adUnitId: 'custom-auid',
+            },
+          },
+        ],
         sampleBidderRequest
       );
       expect(Object.keys(data.m).length).to.equal(1);
@@ -552,6 +582,55 @@ describe('AmxBidAdapter', () => {
       expect(parsed).to.eql([]);
     });
 
+    it('will read an bidderCode override from bid.ext.prebid.meta', () => {
+      const currentConfig = config.getConfig();
+      config.setConfig({
+        ...currentConfig,
+        bidderSettings: {
+          amx: {
+            allowAlternateBidderCodes: true
+          }
+        }
+      });
+
+      const parsed = spec.interpretResponse(
+        { body: {
+          ...sampleServerResponse,
+          r: {
+            [sampleRequestId]: [{
+              ...sampleServerResponse.r[sampleRequestId][0],
+              b: [{
+                ...sampleServerResponse.r[sampleRequestId][0].b[0],
+                ext: {
+                  bc: 'amx-pmp',
+                  ds: 'example',
+                }
+              }]
+            }]
+          }}},
+        baseRequest
+      );
+
+      config.setConfig(currentConfig);
+      expect(parsed.length).to.equal(1); // we removed one
+
+      // we should have display, video, display
+      expect(parsed[0]).to.deep.equal({
+        ...baseBidResponse,
+        meta: {
+          ...baseBidResponse.meta,
+          mediaType: BANNER,
+          demandSource: 'example'
+        },
+        mediaType: BANNER,
+        bidderCode: 'amx-pmp',
+        width: 300,
+        height: 600, // from the bid itself
+        ttl: 90,
+        ad: sampleDisplayAd,
+      });
+    });
+
     it('can parse a display ad', () => {
       const parsed = spec.interpretResponse(
         { body: sampleServerResponse },
@@ -659,15 +738,49 @@ describe('AmxBidAdapter', () => {
     });
 
     it('will log an event for timeout', () => {
-      spec.onTimeout({
-        bidder: 'example',
-        bidId: 'test-bid-id',
-        adUnitCode: 'div-gpt-ad',
-        timeout: 300,
-        auctionId: utils.getUniqueIdentifierStr(),
+      // this will use sendBeacon..
+      spec.onTimeout([
+        {
+          bidder: 'example',
+          bidId: 'test-bid-id',
+          adUnitCode: 'div-gpt-ad',
+          ortb2: {
+            site: {
+              ref: 'https://example.com',
+            },
+          },
+          params: {
+            tagId: 'tag-id',
+          },
+          timeout: 300,
+          auctionId: utils.getUniqueIdentifierStr(),
+        },
+      ]);
+
+      const [request] = server.requests;
+      request.respond(204, {'Content-Type': 'text/html'}, null);
+      expect(request.url).to.equal('https://1x1.a-mo.net/e');
+
+      if (typeof Request !== 'undefined' && 'keepalive' in Request.prototype) {
+        expect(request.fetch.request.keepalive).to.equal(true);
+      }
+
+      const {c: common, e: events} = JSON.parse(request.requestBody)
+      expect(common).to.deep.equal({
+        V: '$prebid.version$',
+        vg: '$$PREBID_GLOBAL$$',
+        U: null,
+        re: 'https://example.com',
       });
-      expect(firedPixels.length).to.equal(1);
-      expect(firedPixels[0]).to.match(/\/hbx\/g_pbto/);
+
+      expect(events.length).to.equal(1);
+      const [event] = events;
+      expect(event.n).to.equal('g_pbto')
+      expect(event.A).to.equal('example');
+      expect(event.mid).to.equal('tag-id');
+      expect(event.cn).to.equal(300);
+      expect(event.bid).to.equal('test-bid-id');
+      expect(event.a).to.equal('div-gpt-ad');
     });
 
     it('will log an event for prebid win', () => {
diff --git a/test/spec/modules/amxIdSystem_spec.js b/test/spec/modules/amxIdSystem_spec.js
index c1ae2c791d5..b509ffe608b 100644
--- a/test/spec/modules/amxIdSystem_spec.js
+++ b/test/spec/modules/amxIdSystem_spec.js
@@ -1,6 +1,9 @@
 import { amxIdSubmodule, storage } from 'modules/amxIdSystem.js';
 import { server } from 'test/mocks/xhr.js';
 import * as utils from 'src/utils.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
 
 const TEST_ID = '51b561e3-0d82-4aea-8487-093fffca4a3a';
 const ERROR_CODES = [404, 501, 500, 403];
@@ -13,177 +16,198 @@ const config = {
     type: 'html5',
   },
 };
+describe('AMX ID', () => {
+  describe('amxid submodule', () => {
+    it('should expose a "name" property containing amxId', () => {
+      expect(amxIdSubmodule.name).to.equal('amxId');
+    });
 
-describe('amxid submodule', () => {
-  it('should expose a "name" property containing amxId', () => {
-    expect(amxIdSubmodule.name).to.equal('amxId');
-  });
-
-  it('should expose a "gvlid" property containing the GVL ID 737', () => {
-    expect(amxIdSubmodule.gvlid).to.equal(737);
+    it('should expose a "gvlid" property containing the GVL ID 737', () => {
+      expect(amxIdSubmodule.gvlid).to.equal(737);
+    });
   });
-});
 
-describe('decode', () => {
-  it('should respond with an object with "amxId" key containing the value', () => {
-    expect(amxIdSubmodule.decode(TEST_ID)).to.deep.equal({
-      amxId: TEST_ID
+  describe('decode', () => {
+    it('should respond with an object with "amxId" key containing the value', () => {
+      expect(amxIdSubmodule.decode(TEST_ID)).to.deep.equal({
+        amxId: TEST_ID
+      });
     });
-  });
 
-  it('should respond with undefined if the value is not a string', () => {
-    [1, null, undefined, NaN, [], {}].forEach((value) => {
-      expect(amxIdSubmodule.decode(value)).to.equal(undefined);
+    it('should respond with undefined if the value is not a string', () => {
+      [1, null, undefined, NaN, [], {}].forEach((value) => {
+        expect(amxIdSubmodule.decode(value)).to.equal(undefined);
+      });
     });
   });
-});
 
-describe('validateConfig', () => {
-  let logErrorSpy;
+  describe('validateConfig', () => {
+    let logErrorSpy;
 
-  beforeEach(() => {
-    logErrorSpy = sinon.spy(utils, 'logError');
-  });
-  afterEach(() => {
-    logErrorSpy.restore();
-  });
+    beforeEach(() => {
+      logErrorSpy = sinon.spy(utils, 'logError');
+    });
+    afterEach(() => {
+      logErrorSpy.restore();
+    });
 
-  it('should allow configuration with no storage', () => {
-    expect(
-      amxIdSubmodule.getId(
-        {
-          ...config,
-          storage: undefined
-        },
-        null,
-        null
-      )
-    ).to.not.equal(undefined);
-  });
+    it('should allow configuration with no storage', () => {
+      expect(
+        amxIdSubmodule.getId(
+          {
+            ...config,
+            storage: undefined
+          },
+          null,
+          null
+        )
+      ).to.not.equal(undefined);
+    });
 
-  it('should return undefined if expires > 30', () => {
-    const expires = Math.floor(Math.random() * 90) + 30.01;
-    expect(
-      amxIdSubmodule.getId(
-        {
-          ...config,
-          storage: {
-            type: 'html5',
-            expires,
+    it('should return undefined if expires > 30', () => {
+      const expires = Math.floor(Math.random() * 90) + 30.01;
+      expect(
+        amxIdSubmodule.getId(
+          {
+            ...config,
+            storage: {
+              type: 'html5',
+              expires,
+            },
           },
-        },
-        null,
-        null
-      )
-    ).to.equal(undefined);
-
-    expect(logErrorSpy.calledOnce).to.be.true;
-    expect(logErrorSpy.lastCall.lastArg).to.contain(expires);
+          null,
+          null
+        )
+      ).to.equal(undefined);
+
+      expect(logErrorSpy.calledOnce).to.be.true;
+      expect(logErrorSpy.lastCall.lastArg).to.contain(expires);
+    });
   });
-});
 
-describe('getId', () => {
-  const spy = sinon.spy();
+  describe('getId', () => {
+    const spy = sinon.spy();
 
-  beforeEach(() => {
-    spy.resetHistory();
-  });
+    beforeEach(() => {
+      spy.resetHistory();
+    });
 
-  it('should call the sync endpoint and accept a valid response', () => {
-    storage.setDataInLocalStorage('__amuidpb', TEST_ID);
+    it('should call the sync endpoint and accept a valid response', () => {
+      storage.setDataInLocalStorage('__amuidpb', TEST_ID);
 
-    const { callback } = amxIdSubmodule.getId(config, null, null);
-    callback(spy);
+      const { callback } = amxIdSubmodule.getId(config, null, null);
+      callback(spy);
 
-    const [request] = server.requests;
-    expect(request.withCredentials).to.be.true
-    expect(request.requestHeaders['Content-Type']).to.match(/text\/plain/)
+      const [request] = server.requests;
+      expect(request.withCredentials).to.be.true
+      expect(request.requestHeaders['Content-Type']).to.match(/text\/plain/)
 
-    const { search } = utils.parseUrl(request.url);
-    expect(search.av).to.equal(amxIdSubmodule.version);
-    expect(search.am).to.equal(TEST_ID);
-    expect(request.method).to.equal('GET');
+      const { search } = utils.parseUrl(request.url);
+      expect(search.av).to.equal(amxIdSubmodule.version);
+      expect(search.am).to.equal(TEST_ID);
+      expect(request.method).to.equal('GET');
 
-    request.respond(
-      200,
-      {},
-      JSON.stringify({
-        id: TEST_ID,
-        v: '1.0a',
-      })
-    );
+      request.respond(
+        200,
+        {},
+        JSON.stringify({
+          id: TEST_ID,
+          v: '1.0a',
+        })
+      );
 
-    expect(spy.calledOnce).to.be.true;
-    expect(spy.lastCall.lastArg).to.equal(TEST_ID);
-  });
+      expect(spy.calledOnce).to.be.true;
+      expect(spy.lastCall.lastArg).to.equal(TEST_ID);
+    });
 
-  it('should return undefined if the server has an error status code', () => {
-    const { callback } = amxIdSubmodule.getId(config, null, null);
-    callback(spy);
+    it('should return undefined if the server has an error status code', () => {
+      const { callback } = amxIdSubmodule.getId(config, null, null);
+      callback(spy);
 
-    const [request] = server.requests;
-    const responseCode =
-      ERROR_CODES[Math.floor(Math.random() * ERROR_CODES.length)];
-    request.respond(responseCode, {}, '');
+      const [request] = server.requests;
+      const responseCode =
+        ERROR_CODES[Math.floor(Math.random() * ERROR_CODES.length)];
+      request.respond(responseCode, {}, '');
 
-    expect(spy.calledOnce).to.be.true;
-    expect(spy.lastCall.lastArg).to.equal(undefined);
-  });
+      expect(spy.calledOnce).to.be.true;
+      expect(spy.lastCall.lastArg).to.equal(undefined);
+    });
 
-  it('should return undefined if the response has invalid keys', () => {
-    const { callback } = amxIdSubmodule.getId(config, null, null);
-    callback(spy);
-
-    const [request] = server.requests;
-    request.respond(
-      200,
-      {},
-      JSON.stringify({
-        test: TEST_ID,
-      })
-    );
-
-    expect(spy.calledOnce).to.be.true;
-    expect(spy.lastCall.lastArg).to.equal(undefined);
-  });
+    it('should return undefined if the response has invalid keys', () => {
+      const { callback } = amxIdSubmodule.getId(config, null, null);
+      callback(spy);
+
+      const [request] = server.requests;
+      request.respond(
+        200,
+        {},
+        JSON.stringify({
+          test: TEST_ID,
+        })
+      );
+
+      expect(spy.calledOnce).to.be.true;
+      expect(spy.lastCall.lastArg).to.equal(undefined);
+    });
 
-  it('should returned undefined if the server JSON is invalid', () => {
-    const { callback } = amxIdSubmodule.getId(config, null, null);
-    callback(spy);
+    it('should returned undefined if the server JSON is invalid', () => {
+      const { callback } = amxIdSubmodule.getId(config, null, null);
+      callback(spy);
 
-    const [request] = server.requests;
-    request.respond(200, {}, '{,,}');
+      const [request] = server.requests;
+      request.respond(200, {}, '{,,}');
 
-    expect(spy.calledOnce).to.be.true;
-    expect(spy.lastCall.lastArg).to.equal(undefined);
-  });
+      expect(spy.calledOnce).to.be.true;
+      expect(spy.lastCall.lastArg).to.equal(undefined);
+    });
 
-  it('should use the intermediate value for the sync server', () => {
-    const { callback } = amxIdSubmodule.getId(config, null, null);
-    callback(spy);
-
-    const [request] = server.requests;
-    const intermediateValue = 'https://example-publisher.com/api/sync';
-
-    request.respond(
-      200,
-      {},
-      JSON.stringify({
-        u: intermediateValue,
-      })
-    );
-
-    const [, secondRequest] = server.requests;
-    expect(secondRequest.url).to.match(new RegExp(`^${intermediateValue}\?`));
-    secondRequest.respond(
-      200,
-      {},
-      JSON.stringify({
-        id: TEST_ID,
-      })
-    );
-
-    expect(spy.calledOnce).to.be.true;
-    expect(spy.lastCall.lastArg).to.equal(TEST_ID);
+    it('should use the intermediate value for the sync server', () => {
+      const { callback } = amxIdSubmodule.getId(config, null, null);
+      callback(spy);
+
+      const [request] = server.requests;
+      const intermediateValue = 'https://example-publisher.com/api/sync';
+
+      request.respond(
+        200,
+        {},
+        JSON.stringify({
+          u: intermediateValue,
+        })
+      );
+
+      const [, secondRequest] = server.requests;
+      expect(secondRequest.url).to.match(new RegExp(`^${intermediateValue}\?`));
+      secondRequest.respond(
+        200,
+        {},
+        JSON.stringify({
+          id: TEST_ID,
+        })
+      );
+
+      expect(spy.calledOnce).to.be.true;
+      expect(spy.lastCall.lastArg).to.equal(TEST_ID);
+    });
   });
-});
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(amxIdSubmodule);
+    });
+    it('amxId', () => {
+      const id = 'c4bcadb0-124f-4468-a91a-d3d44cf311c5'
+      const userId = {
+        amxId: id
+      };
+
+      const [eid] = createEidsArray(userId);
+      expect(eid).to.deep.equal({
+        source: 'amxdt.net',
+        uids: [{
+          atype: 1,
+          id,
+        }]
+      });
+    });
+  })
+})
diff --git a/test/spec/modules/anPspParamsConverter_spec.js b/test/spec/modules/anPspParamsConverter_spec.js
new file mode 100644
index 00000000000..a96730088b8
--- /dev/null
+++ b/test/spec/modules/anPspParamsConverter_spec.js
@@ -0,0 +1,133 @@
+import { expect } from 'chai';
+
+import {convertAnParams} from '../../../modules/anPspParamsConverter';
+import { config } from '../../../src/config.js';
+import { deepClone } from '../../../src/utils';
+import adapterManager from '../../../src/adapterManager.js';
+
+describe('anPspParamsConverter', function () {
+  let configStub;
+  let resolveAliasStub;
+  let didHookRun = false;
+
+  const bidderRequests = [{
+    bidderCode: 'appnexus',
+    bids: [{
+      bidder: 'appnexus',
+      src: 's2s',
+      params: {
+        member: 958,
+        invCode: 12345,
+        placementId: '10001',
+        keywords: {
+          music: 'rock',
+          genre: ['80s', '90s']
+        },
+        publisherId: '111',
+        use_payment_rule: true
+      }
+    }]
+  }];
+
+  beforeEach(function () {
+    configStub = sinon.stub(config, 'getConfig');
+    resolveAliasStub = sinon.stub(adapterManager, 'resolveAlias').callsFake(function (tarBidder) {
+      return (tarBidder === 'rubicon') ? 'rubicon' : 'appnexus';
+    });
+  });
+
+  afterEach(function () {
+    didHookRun = false;
+    configStub.restore();
+    resolveAliasStub.restore();
+  });
+
+  it('does not modify params when appnexus is not in s2sconfig', function () {
+    configStub.callsFake(function () {
+      return {
+        bidders: ['rubicon']
+      };
+    });
+
+    const testBidderRequests = deepClone(bidderRequests);
+
+    convertAnParams(function () {
+      didHookRun = true;
+    }, testBidderRequests);
+
+    expect(didHookRun).to.equal(true);
+    const resultParams = testBidderRequests[0].bids[0].params;
+    expect(resultParams.member).to.equal(958);
+    expect(resultParams.invCode).to.equal(12345);
+    expect(resultParams.placementId).to.equal('10001');
+    expect(resultParams.keywords).to.deep.equal({
+      music: 'rock',
+      genre: ['80s', '90s']
+    });
+    expect(resultParams.publisherId).to.equal('111');
+    expect(resultParams.use_payment_rule).to.equal(true);
+  });
+
+  const tests = [{
+    testName: 'modifies params when appnexus is the bidder',
+    fakeConfigFn: function () {
+      return {
+        bidders: ['appnexus']
+      };
+    },
+    applyBidderRequestChanges: function () {
+      const testBidderRequests = deepClone(bidderRequests);
+
+      return testBidderRequests;
+    }
+  }, {
+    testName: 'modifies params when a registered appnexus alias is used',
+    fakeConfigFn: function () {
+      return {
+        bidders: ['beintoo']
+      };
+    },
+    applyBidderRequestChanges: function () {
+      const testBidderRequests = deepClone(bidderRequests);
+      testBidderRequests.bidderCode = 'beintoo';
+      testBidderRequests[0].bids[0].bidder = 'beintoo';
+
+      return testBidderRequests;
+    }
+  }, {
+    testName: 'modifies params when pbjs.aliasBidder alias is used',
+    fakeConfigFn: function () {
+      return {
+        bidders: ['aliasBidderTest'],
+      };
+    },
+    applyBidderRequestChanges: function () {
+      const testBidderRequests = deepClone(bidderRequests);
+      testBidderRequests.bidderCode = 'aliasBidderTest';
+      testBidderRequests[0].bids[0].bidder = 'aliasBidderTest';
+
+      return testBidderRequests;
+    }
+  }];
+
+  tests.forEach((testCfg) => {
+    it(testCfg.testName, function () {
+      configStub.callsFake(testCfg.fakeConfigFn);
+
+      const testBidderRequests = testCfg.applyBidderRequestChanges();
+
+      convertAnParams(function () {
+        didHookRun = true;
+      }, testBidderRequests);
+
+      expect(didHookRun).to.equal(true);
+      const resultParams = testBidderRequests[0].bids[0].params;
+      expect(resultParams.member).to.equal('958');
+      expect(resultParams.inv_code).to.equal('12345');
+      expect(resultParams.placement_id).to.equal(10001);
+      expect(resultParams.keywords).to.equal('music=rock,genre=80s,genre=90s');
+      expect(resultParams.publisher_id).to.equal(111);
+      expect(resultParams.use_pmt_rule).to.equal(true);
+    });
+  });
+});
diff --git a/test/spec/modules/aniviewBidAdapter_spec.js b/test/spec/modules/aniviewBidAdapter_spec.js
index a9498af046c..726bccaa027 100644
--- a/test/spec/modules/aniviewBidAdapter_spec.js
+++ b/test/spec/modules/aniviewBidAdapter_spec.js
@@ -2,267 +2,401 @@ import { spec } from 'modules/aniviewBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 const { expect } = require('chai');
 
-describe('ANIVIEW Bid Adapter Test', function () {
+const PUBLISHER_ID_1 = 'publisher_id_1';
+const CHANNEL_ID_1 = 'channel_id_1';
+const PUBLISHER_ID_2 = 'publisher_id_2';
+const CHANNEL_ID_2 = 'channel_id_2';
+const BID_ID_1 = 'bid_id_1';
+const BID_ID_2 = 'bid_id_2';
+const BIDDER_REQUEST_ID = 'bidder_request_id';
+const CUSTOM_DOMAIN = 'example.com';
+
+const BASE_URL = 'https://' + CUSTOM_DOMAIN + '/track' +
+  '?rtbbp=10' +
+  '&cpm=${AUCTION_PRICE}' +
+  '&aucid=${AUCTION_ID}' +
+  '&aucbid=${AUCTION_BID_ID}' +
+  '&limid=${AUCTION_IMP_ID}' +
+  '&aucseid=${AUCTION_SEAT_ID}' +
+  '&aucadid=${AUCTION_AD_ID}';
+const LURL = `${BASE_URL}&e=AV_M40&rcd=\${AUCTION_LOSS}`;
+const NURL = `${BASE_URL}&e=AV_M4`;
+
+const VIDEO_VAST = ``
+const BANNER_VAST = VIDEO_VAST;
+const BANNER_HTML = '
HTML BANNER
';
+
+const CURRENCY = 'USD';
+const PRICE = 10;
+const FLOOR_PRICE = PRICE * 0.5;
+const TTL = 600;
+
+const VIDEO_SIZE = { width: 640, height: 360 };
+const BANNER_SIZE = { width: 250, height: 250 };
+
+const CUSTOM_RENDERER_URL = `https://${CUSTOM_DOMAIN}/script/6.1/prebidRenderer.js`;
+const DEFAULT_RENDERER_URL = `https://player.aniview.com/script/6.1/prebidRenderer.js`;
+
+const MOCK = {
+  bidRequest: () => ({
+    bidderCode: 'aniview',
+    auctionId: null,
+    bidderRequestId: BIDDER_REQUEST_ID,
+    bids: [
+      {
+        bidder: 'aniview',
+        params: {
+          AV_PUBLISHERID: PUBLISHER_ID_1,
+          AV_CHANNELID: CHANNEL_ID_1,
+          playerDomain: CUSTOM_DOMAIN,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: [[VIDEO_SIZE.width, VIDEO_SIZE.height]],
+            context: 'outstream',
+            mimes: ['video/mpeg', 'video/mp4', 'application/javascript'],
+          }
+        },
+        bidId: BID_ID_1,
+        bidderRequestId: BIDDER_REQUEST_ID,
+        sizes: [[VIDEO_SIZE.width, VIDEO_SIZE.height]],
+      },
+      {
+        bidder: 'aniview',
+        params: {
+          AV_PUBLISHERID: PUBLISHER_ID_2,
+          AV_CHANNELID: CHANNEL_ID_2,
+          playerDomain: CUSTOM_DOMAIN,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: [[VIDEO_SIZE.width, VIDEO_SIZE.height]],
+            context: 'outstream',
+            mimes: ['video/mpeg', 'video/mp4', 'application/javascript'],
+          }
+        },
+        bidId: BID_ID_2,
+        bidderRequestId: BIDDER_REQUEST_ID,
+        sizes: [[VIDEO_SIZE.width, VIDEO_SIZE.height]],
+        floorData: {
+          currency: CURRENCY,
+          floor: FLOOR_PRICE,
+        },
+        getFloor: _ => ({
+          currency: CURRENCY,
+          floor: FLOOR_PRICE,
+        }),
+      },
+    ],
+    auctionStart: 1722343584268,
+    timeout: 1_000,
+    start: 1722343584269,
+    ortb2: {
+      source: {},
+      site: {
+        page: 'http://localhost:8080/',
+        ref: 'http://localhost:8080/',
+        domain: 'http://localhost:8080',
+        publisher: {
+          domain: 'http://localhost:8080',
+        }
+      },
+      device: {
+        w: 1800,
+        h: 1169,
+        language: 'en',
+      },
+    },
+  }),
+
+  bidderResponse: () => ({
+    body: {
+      id: 'bidder_response_id',
+      bidid: 'bidder_response_bid_id',
+      cur: CURRENCY,
+      ext: {
+        aniview: {
+          sync: [
+            { url: 'https://iframe-1.example.com/sync', e: 'sync', pr: '14', t: 3 },
+            { url: 'https://iframe-2.example.com/sync', e: 'sync', pr: '28', t: 3 },
+            { url: 'https://image.example.com/sync', e: 'sync', pr: 'abc12', t: 1 }
+          ]
+        }
+      },
+      seatbid: [
+        {
+          seat: '',
+          bid: [
+            {
+              adm: VIDEO_VAST,
+              adomain: [''],
+              id: 'seatbid_bid_id_1',
+              impid: BID_ID_1,
+              lurl: LURL,
+              nurl: NURL,
+              price: PRICE,
+            }
+          ]
+        }
+      ]
+    },
+  })
+}
+
+describe('Aniview Bid Adapter', function () {
   const adapter = newBidder(spec);
 
-  describe('inherited functions', function () {
+  describe('Inherited function', function () {
     it('exists and is a function', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
   });
 
   describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'aniview',
-      'params': {
-        'AV_PUBLISHERID': '123456',
-        'AV_CHANNELID': '123456'
-      },
-      'adUnitCode': 'video1',
-      'sizes': [[300, 250], [640, 480]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'requestId': 'a09c66c3-53e3-4428-b296-38fc08e7cd2a',
-      'transactionId': 'd6f6b392-54a9-454c-85fb-a2fd882c4a2d',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    let videoBidRequest;
+
+    beforeEach(() => {
+      videoBidRequest = MOCK.bidRequest();
     });
 
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        something: 'is wrong'
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    it('should return `true` when required params found', function () {
+      expect(spec.isBidRequestValid(videoBidRequest.bids[0])).to.be.true;
+    });
+
+    it('should return `false` when required params are wrong', function () {
+      videoBidRequest.bids[0].params = { something: 'is wrong' };
+
+      expect(spec.isBidRequestValid(videoBidRequest.bids[0])).to.be.false;
     });
   });
 
   describe('buildRequests', function () {
-    let bid2Requests = [
-      {
-        'bidder': 'aniview',
-        'params': {
-          'AV_PUBLISHERID': '123456',
-          'AV_CHANNELID': '123456'
-        },
-        'adUnitCode': 'test1',
-        'sizes': [[300, 250], [640, 480]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'requestId': 'a09c66c3-53e3-4428-b296-38fc08e7cd2a',
-        'transactionId': 'd6f6b392-54a9-454c-85fb-a2fd882c4a2d',
-      }
-    ];
-    let bid1Request = [
-      {
-        'bidder': 'aniview',
-        'params': {
-          'AV_PUBLISHERID': '123456',
-          'AV_CHANNELID': '123456'
-        },
-        'adUnitCode': 'test1',
-        'sizes': [640, 480],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'requestId': 'a09c66c3-53e3-4428-b296-38fc08e7cd2a',
-        'transactionId': 'd6f6b392-54a9-454c-85fb-a2fd882c4a2d',
-      }
-    ];
-
-    it('Test 2 requests', function () {
-      const requests = spec.buildRequests(bid2Requests);
-      expect(requests.length).to.equal(2);
-	  const r1 = requests[0];
-      const d1 = requests[0].data;
-      expect(d1).to.have.property('AV_PUBLISHERID');
-      expect(d1.AV_PUBLISHERID).to.equal('123456');
-      expect(d1).to.have.property('AV_CHANNELID');
-      expect(d1.AV_CHANNELID).to.equal('123456');
-      expect(d1).to.have.property('AV_WIDTH');
-      expect(d1.AV_WIDTH).to.equal(300);
-      expect(d1).to.have.property('AV_HEIGHT');
-      expect(d1.AV_HEIGHT).to.equal(250);
-      expect(d1).to.have.property('AV_URL');
-      expect(d1).to.have.property('cb');
-      expect(d1).to.have.property('s2s');
-      expect(d1.s2s).to.equal('1');
-      expect(d1).to.have.property('pbjs');
-      expect(d1.pbjs).to.equal(1);
-      expect(r1).to.have.property('url');
-      expect(r1.url).to.contain('https://gov.aniview.com/api/adserver/vast3/');
-      const r2 = requests[1];
-	  const d2 = requests[1].data;
-      expect(d2).to.have.property('AV_PUBLISHERID');
-      expect(d2.AV_PUBLISHERID).to.equal('123456');
-      expect(d2).to.have.property('AV_CHANNELID');
-      expect(d2.AV_CHANNELID).to.equal('123456');
-      expect(d2).to.have.property('AV_WIDTH');
-      expect(d2.AV_WIDTH).to.equal(640);
-      expect(d2).to.have.property('AV_HEIGHT');
-      expect(d2.AV_HEIGHT).to.equal(480);
-      expect(d2).to.have.property('AV_URL');
-      expect(d2).to.have.property('cb');
-      expect(d2).to.have.property('s2s');
-      expect(d2.s2s).to.equal('1');
-      expect(d2).to.have.property('pbjs');
-      expect(d2.pbjs).to.equal(1);
-      expect(r2).to.have.property('url');
-      expect(r2.url).to.contain('https://gov.aniview.com/api/adserver/vast3/');
+    let videoBidRequest;
+
+    beforeEach(() => {
+      videoBidRequest = MOCK.bidRequest();
     });
 
-    it('Test 1 request', function () {
-      const requests = spec.buildRequests(bid1Request);
-      expect(requests.length).to.equal(1);
-      const r = requests[0];
-      const d = requests[0].data;
-      expect(d).to.have.property('AV_PUBLISHERID');
-      expect(d.AV_PUBLISHERID).to.equal('123456');
-      expect(d).to.have.property('AV_CHANNELID');
-      expect(d.AV_CHANNELID).to.equal('123456');
-      expect(d).to.have.property('AV_WIDTH');
-      expect(d.AV_WIDTH).to.equal(640);
-      expect(d).to.have.property('AV_HEIGHT');
-      expect(d.AV_HEIGHT).to.equal(480);
-      expect(d).to.have.property('AV_URL');
-      expect(d).to.have.property('cb');
-      expect(d).to.have.property('s2s');
-      expect(d.s2s).to.equal('1');
-      expect(d).to.have.property('pbjs');
-      expect(d.pbjs).to.equal(1);
-      expect(r).to.have.property('url');
-      expect(r.url).to.contain('https://gov.aniview.com/api/adserver/vast3/');
+    it('should return expected request object', function () {
+      const bidRequest = spec.buildRequests(videoBidRequest.bids, videoBidRequest);
+
+      expect(bidRequest).to.exist.and.to.be.a('array').and.to.have.lengthOf(2);
+
+      const { url, method, data } = bidRequest[0];
+      const { ext, imp } = data;
+
+      expect(url).equal('https://rtb.aniview.com/sspRTB2');
+      expect(method).equal('POST');
+      expect(imp[0].tagid).equal(CHANNEL_ID_1);
+      expect(imp[0].id).equal(videoBidRequest.bids[0].bidId);
+      expect(ext.aniview.pbjs).equal(1);
     });
-  });
 
-  describe('interpretResponse', function () {
-    let bidRequest = {
-      'url': 'https://gov.aniview.com/api/adserver/vast3/',
-      'data': {
-        'bidId': '253dcb69fb2577',
-        AV_PUBLISHERID: '55b78633181f4603178b4568',
-        AV_CHANNELID: '55b7904d181f46410f8b4568',
-      }
-    };
-    let serverResponse = {};
-    serverResponse.body = 'FORDFORD00:00:15';
-
-    it('Check bid interpretResponse', function () {
-      const BIDDER_CODE = 'aniview';
-      let bidResponses = spec.interpretResponse(serverResponse, bidRequest);
-      expect(bidResponses.length).to.equal(1);
-      let bidResponse = bidResponses[0];
-      expect(bidResponse.requestId).to.equal(bidRequest.data.bidId);
-      expect(bidResponse.cpm).to.equal('2');
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.currency).to.equal('USD');
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.mediaType).to.equal('video');
-      expect(bidResponse.meta.advertiserDomains).to.be.an('array').that.is.empty;
+    it('should have floor data inside imp', function () {
+      const bidRequest = spec.buildRequests(videoBidRequest.bids, videoBidRequest);
+      const imp = bidRequest[1].data.imp[0];
+
+      expect(imp.bidfloor).equal(FLOOR_PRICE);
+      expect(imp.bidfloorcur).equal(CURRENCY);
     });
 
-    it('safely handles XML parsing failure from invalid bid response', function () {
-      let invalidServerResponse = {};
-      invalidServerResponse.body = '';
+    it('should not have floor data in imp if getFloor returns empty object', function () {
+      videoBidRequest.bids[1].getFloor = () => ({});
+
+      const bidRequest = spec.buildRequests(videoBidRequest.bids, videoBidRequest);
+      const imp = bidRequest[1].data.imp[0];
 
-      let result = spec.interpretResponse(invalidServerResponse, bidRequest);
-      expect(result.length).to.equal(0);
+      expect(imp.bidfloor).not.exist;
+      expect(imp.bidfloorcur).not.exist;
     });
 
-    it('handles nobid responses', function () {
-      let nobidResponse = {};
-      nobidResponse.body = '';
+    it('should use dev environment', function () {
+      const DEV_ENDPOINT = 'https://dev.aniview.com/sspRTB2';
+      videoBidRequest.bids[0].params.dev = { endpoint: DEV_ENDPOINT };
 
-      let result = spec.interpretResponse(nobidResponse, bidRequest);
-      expect(result.length).to.equal(0);
+      const bidRequest = spec.buildRequests(videoBidRequest.bids, videoBidRequest);
+
+      expect(bidRequest[0].url).to.equal(DEV_ENDPOINT);
     });
+  });
 
-    it('should add renderer if outstream context', function () {
-      const bidRequest = spec.buildRequests([
-        {
-          bidId: '253dcb69fb2577',
-          params: {
-            playerDomain: 'example.com',
-            AV_PUBLISHERID: '55b78633181f4603178b4568',
-            AV_CHANNELID: '55b7904d181f46410f8b4568'
-          },
-          mediaTypes: {
-            video: {
-              playerSize: [[640, 480]],
-              context: 'outstream'
-            }
-          }
-        }
-      ])[0]
-      const bidResponse = spec.interpretResponse(serverResponse, bidRequest)[0]
-
-      expect(bidResponse.renderer.url).to.equal('https://example.com/script/6.1/prebidRenderer.js')
-      expect(bidResponse.renderer.config.AV_PUBLISHERID).to.equal('55b78633181f4603178b4568')
-      expect(bidResponse.renderer.config.AV_CHANNELID).to.equal('55b7904d181f46410f8b4568')
-      expect(bidResponse.renderer.loaded).to.equal(false)
-      expect(bidResponse.width).to.equal(640)
-      expect(bidResponse.height).to.equal(480)
+  describe('interpretResponse', function () {
+    describe('Video format', function () {
+      let bidRequests, bidderResponse;
+
+      beforeEach(function() {
+        const videoBidRequest = MOCK.bidRequest();
+
+        bidRequests = spec.buildRequests(videoBidRequest.bids, videoBidRequest);
+        bidderResponse = MOCK.bidderResponse();
+      });
+
+      it('should return empty bids array for empty response', function () {
+        const emptyResponse = bidderResponse.body = {};
+        const bids = spec.interpretResponse(emptyResponse, bidRequests[0]);
+
+        expect(bids).to.be.empty;
+      });
+
+      it('should return valid bids array', function () {
+        const bids = spec.interpretResponse(bidderResponse, bidRequests[0]);
+        const bid = bids[0];
+
+        expect(bids.length).to.greaterThan(0);
+        expect(bid.vastXml).to.exist.and.to.not.have.string('${AUCTION_PRICE}');
+        expect(bid.vastXml).to.have.string('cpm=' + PRICE);
+        expect(bid.vastUrl).to.exist.and.to.not.have.string('${AUCTION_PRICE}');
+        expect(bid.vastUrl).to.have.string('cpm=' + PRICE);
+        expect(bid.requestId).to.equal(bidRequests[0].data.imp[0].id);
+        expect(bid.cpm).to.equal(PRICE);
+        expect(bid.ttl).to.equal(TTL);
+        expect(bid.currency).to.equal(CURRENCY);
+        expect(bid.netRevenue).to.equal(true);
+        expect(bid.mediaType).to.equal('video');
+        expect(bid.meta.advertiserDomains).to.be.an('array');
+        expect(bid.creativeId).to.exist;
+        expect(bid.width).to.exist;
+        expect(bid.height).to.exist;
+      });
+
+      it('should return bid without required properties if cpm less or equal 0', function () {
+        bidderResponse.body.seatbid[0].bid[0].price = 0;
+
+        const bids = spec.interpretResponse(bidderResponse, bidRequests[0]);
+        const bid = bids[0];
+
+        expect(bid.width).to.not.exist;
+        expect(bid.height).to.not.exist;
+        expect(bid.creativeId).to.not.exist;
+      });
+
+      it('should return empty bids array if no bids in response', function () {
+        bidderResponse.body.seatbid[0].bid = [];
+
+        const bids = spec.interpretResponse(bidderResponse, bidRequests[0]);
+
+        expect(bids).to.exist.and.to.be.a('array').and.to.have.lengthOf(0);
+      });
+
+      it('should add renderer if outstream context', function () {
+        const bid = spec.interpretResponse(bidderResponse, bidRequests[0])[0];
+
+        expect(bid.renderer.url).to.equal(CUSTOM_RENDERER_URL);
+        expect(bid.renderer.config.AV_PUBLISHERID).to.equal(PUBLISHER_ID_1);
+        expect(bid.renderer.config.AV_CHANNELID).to.equal(CHANNEL_ID_1);
+        expect(bid.renderer.loaded).to.equal(false);
+        expect(bid.width).to.equal(VIDEO_SIZE.width);
+        expect(bid.height).to.equal(VIDEO_SIZE.height);
+      });
+
+      it('should use default renderer domain', function () {
+        delete bidRequests[0].bids[0].params.playerDomain;
+
+        const bid = spec.interpretResponse(bidderResponse, bidRequests[0])[0];
+
+        expect(bid.renderer.url).to.equal(DEFAULT_RENDERER_URL);
+      });
+
+      it('should not add renderer if context is not outstream', function () {
+        bidRequests[0].bids[0].mediaTypes.video.context = 'instream';
+
+        const bid = spec.interpretResponse(bidderResponse, bidRequests[0])[0];
+
+        expect(bidRequests[0].bids[0].mediaTypes.video.context).to.be.not.equal('outstream');
+        expect(bid.renderer).to.not.exist;
+      });
     });
 
-    it('Support banner format', function () {
-      const bidRequest = spec.buildRequests([
-        {
-          bidId: '253dcb69fb2577',
-          params: {
-            playerDomain: 'example.com',
-            AV_PUBLISHERID: '55b78633181f4603178b4568',
-            AV_CHANNELID: '55b7904d181f46410f8b4568'
-          },
-          mediaTypes: {
-            banner: {
-              sizes: [[640, 480]],
-            }
-          }
-        }
-      ])[0]
-      const bidResponse = spec.interpretResponse(serverResponse, bidRequest)[0]
+    describe('Banner format', function () {
+      let bidRequests, bidderResponse;
 
-      expect(bidResponse.ad).to.have.string('https://example.com/script/6.1/prebidRenderer.js');
-      expect(bidResponse.width).to.equal(640)
-      expect(bidResponse.height).to.equal(480)
-    })
+      beforeEach(function() {
+        const bannerBidRequest = MOCK.bidRequest();
+
+        // Converting video bid request to banner bid request
+
+        delete bannerBidRequest.bids[0].mediaTypes.video;
+
+        bannerBidRequest.bids[0].sizes = [[BANNER_SIZE.width, BANNER_SIZE.height]];
+        bannerBidRequest.bids[0].mediaTypes.banner = {
+          sizes: [
+            [BANNER_SIZE.width, BANNER_SIZE.height],
+            [BANNER_SIZE.width * 2, BANNER_SIZE.height],
+          ],
+        };
+
+        bidRequests = spec.buildRequests(bannerBidRequest.bids, bannerBidRequest);
+        bidderResponse = MOCK.bidderResponse();
+      });
+
+      it('should return valid banner bids (HTML)', function () {
+        bidderResponse.body.seatbid[0].bid[0].adm = BANNER_HTML;
+
+        const bid = spec.interpretResponse(bidderResponse, bidRequests[0])[0];
+
+        expect(bid.ad).to.exist;
+        expect(bid.cpm).to.equal(PRICE);
+        expect(bid.width).to.equal(BANNER_SIZE.width);
+        expect(bid.height).to.equal(BANNER_SIZE.height);
+        expect(bid.renderer).to.not.exist;
+      });
+
+      it('should return valid banner bids (VAST) with renderer', function () {
+        bidderResponse.body.seatbid[0].bid[0].adm = BANNER_VAST;
+
+        const bid = spec.interpretResponse(bidderResponse, bidRequests[0])[0];
+
+        expect(bid.ad).to.exist;
+        expect(bid.ad).to.not.have.string('${AUCTION_PRICE}');
+        expect(bid.ad).to.have.string('cpm=' + PRICE);
+        expect(bid.cpm).to.equal(PRICE);
+        expect(bid.width).to.equal(BANNER_SIZE.width);
+        expect(bid.height).to.equal(BANNER_SIZE.height);
+        expect(bid.renderer.url).to.equal(CUSTOM_RENDERER_URL);
+        expect(bid.renderer.config.AV_PUBLISHERID).to.equal(PUBLISHER_ID_1);
+        expect(bid.renderer.config.AV_CHANNELID).to.equal(CHANNEL_ID_1);
+        expect(bid.renderer.loaded).to.equal(false);
+      });
+    });
   });
 
   describe('getUserSyncs', function () {
-    let pixelUrl = 'https://sync.pixel.url/sync';
-    function createBidResponse (pixelEvent, pixelType) {
-      let pixelStr = '{"url":"' + pixelUrl + '", "e":"' + pixelEvent + '", "t":' + pixelType + '}';
-      return 'FORDFORD00:00:15';
-    }
-
-    it('Check get iframe sync pixels from response on inventory', function () {
-      let pixelEvent = 'inventory';
-      let pixelType = '3';
-      let bidResponse = createBidResponse(pixelEvent, pixelType);
-      let serverResponse = [
-        {body: bidResponse}
-      ];
-      let syncPixels = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
-      expect(syncPixels.length).to.equal(1);
-      let pixel = syncPixels[0];
-      expect(pixel.url).to.equal(pixelUrl);
-      expect(pixel.type).to.equal('iframe');
+    let bidRequest, bidderResponse;
+
+    beforeEach(function() {
+      const videoBidRequest = MOCK.bidRequest();
+
+      bidRequest = spec.buildRequests(videoBidRequest.bids, videoBidRequest);
+      bidderResponse = MOCK.bidderResponse();
     });
 
-    it('Check get image sync pixels from response on sync', function () {
-      let pixelEvent = 'sync';
-      let pixelType = '1';
-      let bidResponse = createBidResponse(pixelEvent, pixelType);
-      let serverResponse = [
-        {body: bidResponse}
-      ];
-      let syncPixels = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
-      expect(syncPixels.length).to.equal(1);
-      let pixel = syncPixels[0];
-      expect(pixel.url).to.equal(pixelUrl);
-      expect(pixel.type).to.equal('image');
+    it('should get syncs from response', function () {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, [bidderResponse]);
+
+      expect(syncs).to.be.a('array').and.to.have.lengthOf(3);
+    });
+
+    it('should get only pixel syncs from response', function () {
+      const syncs = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: true }, [bidderResponse]);
+
+      expect(syncs).to.be.a('array').and.to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
+    });
+
+    it('should return empty array of syncs if no syncs in response', function () {
+      delete bidderResponse.body.ext.aniview.sync
+
+      const syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: false }, [bidderResponse]);
+
+      expect(syncs).to.be.a('array').and.to.have.lengthOf(0);
+    });
+
+    it('should return empty array of syncs if no body in response', function () {
+      delete bidderResponse.body
+
+      const syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, [bidderResponse]);
+
+      expect(syncs).to.be.a('array').and.to.have.lengthOf(0);
     });
   });
 });
diff --git a/test/spec/modules/anonymisedRtdProvider_spec.js b/test/spec/modules/anonymisedRtdProvider_spec.js
new file mode 100644
index 00000000000..89115e5e740
--- /dev/null
+++ b/test/spec/modules/anonymisedRtdProvider_spec.js
@@ -0,0 +1,214 @@
+import {config} from 'src/config.js';
+import {getRealTimeData, anonymisedRtdSubmodule, storage} from 'modules/anonymisedRtdProvider.js';
+
+describe('anonymisedRtdProvider', function() {
+  let getDataFromLocalStorageStub;
+
+  const testReqBidsConfigObj = {
+    adUnits: [
+      {
+        bids: ['bid1', 'bid2']
+      }
+    ]
+  };
+
+  const onDone = function() { return true };
+
+  const cmoduleConfig = {
+    'name': 'anonymised',
+    'params': {
+      'cohortStorageKey': 'cohort_ids'
+    }
+  }
+
+  beforeEach(function() {
+    config.resetConfig();
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage')
+  });
+
+  afterEach(function () {
+    getDataFromLocalStorageStub.restore();
+  });
+
+  describe('anonymisedRtdSubmodule', function() {
+    it('successfully instantiates', function () {
+		  expect(anonymisedRtdSubmodule.init()).to.equal(true);
+    });
+  });
+
+  describe('Get Real-Time Data', function() {
+    it('gets rtd from local storage and set to ortb2.user.data', function() {
+      const rtdConfig = {
+        params: {
+          cohortStorageKey: 'cohort_ids',
+          bidders: ['smartadserver'],
+          segtax: 503
+        }
+      };
+
+      const bidConfig = {
+        ortb2Fragments: {
+          global: {}
+        }
+      };
+
+      const rtdUserObj1 = {
+        name: 'anonymised.io',
+        ext: {
+          segtax: 503
+        },
+        segment: [
+          {
+            id: 'TCZPQOWPEJG3MJOTUQUF793A'
+          },
+          {
+            id: '93SUG3H540WBJMYNT03KX8N3'
+          }
+        ]
+      };
+
+      getDataFromLocalStorageStub.withArgs('cohort_ids')
+        .returns(JSON.stringify(['TCZPQOWPEJG3MJOTUQUF793A', '93SUG3H540WBJMYNT03KX8N3']));
+
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+      expect(bidConfig.ortb2Fragments.global.user.keywords).to.be.undefined;
+    });
+
+    it('gets rtd from local storage and set to ortb2.user.keywords for appnexus bidders parameter', function() {
+      const rtdConfig = {
+        params: {
+          cohortStorageKey: 'cohort_ids',
+          bidders: ['smartadserver', 'appnexus'],
+          segtax: 503
+        }
+      };
+
+      const bidConfig = {
+        ortb2Fragments: {
+          global: {}
+        }
+      };
+
+      const rtdUserObj1 = {
+        name: 'anonymised.io',
+        ext: {
+          segtax: 503
+        },
+        segment: [
+          {
+            id: 'TCZPQOWPEJG3MJOTUQUF793A'
+          },
+          {
+            id: '93SUG3H540WBJMYNT03KX8N3'
+          }
+        ]
+      };
+
+      getDataFromLocalStorageStub.withArgs('cohort_ids')
+        .returns(JSON.stringify(['TCZPQOWPEJG3MJOTUQUF793A', '93SUG3H540WBJMYNT03KX8N3']));
+
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+      expect(bidConfig.ortb2Fragments.global.user.keywords).to.include('perid=TCZPQOWPEJG3MJOTUQUF793A');
+      expect(bidConfig.ortb2Fragments.global.user.keywords).to.include('perid=93SUG3H540WBJMYNT03KX8N3');
+    });
+
+    it('gets rtd from local storage and set to ortb2.user.data if `bidders` parameter undefined', function() {
+      const rtdConfig = {
+        params: {
+          cohortStorageKey: 'cohort_ids',
+          segtax: 503
+        }
+      };
+
+      const bidConfig = {
+        ortb2Fragments: {
+          global: {}
+        }
+      };
+
+      const rtdUserObj1 = {
+        name: 'anonymised.io',
+        ext: {
+          segtax: 503
+        },
+        segment: [
+          {
+            id: 'TCZPQOWPEJG3MJOTUQUF793A'
+          },
+          {
+            id: '93SUG3H540WBJMYNT03KX8N3'
+          }
+        ]
+      };
+
+      getDataFromLocalStorageStub.withArgs('cohort_ids')
+        .returns(JSON.stringify(['TCZPQOWPEJG3MJOTUQUF793A', '93SUG3H540WBJMYNT03KX8N3']));
+
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+      expect(bidConfig.ortb2Fragments.global.user.keywords).to.be.undefined;
+    });
+
+    it('do not set rtd if `cohortStorageKey` parameter undefined', function() {
+      const rtdConfig = {
+        params: {
+          bidders: ['smartadserver']
+        }
+      };
+
+      const bidConfig = {
+        ortb2Fragments: {
+          global: {}
+        }
+      };
+
+      getDataFromLocalStorageStub.withArgs('cohort_ids')
+        .returns(JSON.stringify(['randomsegmentid']));
+
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(bidConfig.ortb2Fragments.global.user).to.be.undefined;
+    });
+
+    it('do not set rtd if local storage empty', function() {
+      const rtdConfig = {
+        params: {
+          cohortStorageKey: 'cohort_ids',
+          segtax: 503
+        }
+      };
+
+      const bidConfig = {};
+
+      getDataFromLocalStorageStub.withArgs('cohort_ids')
+        .returns(null);
+
+      expect(config.getConfig().ortb2).to.be.undefined;
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(config.getConfig().ortb2).to.be.undefined;
+    });
+
+    it('do not set rtd if local storage has incorrect value', function() {
+      const rtdConfig = {
+        params: {
+          cohortStorageKey: 'cohort_ids',
+          segtax: 503
+        }
+      };
+
+      const bidConfig = {};
+
+      getDataFromLocalStorageStub.withArgs('cohort_ids')
+        .returns('wrong cohort ids value');
+
+      expect(config.getConfig().ortb2).to.be.undefined;
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(config.getConfig().ortb2).to.be.undefined;
+    });
+
+    it('should initialize and return with config', function () {
+      expect(getRealTimeData(testReqBidsConfigObj, onDone, cmoduleConfig)).to.equal(undefined)
+    });
+  });
+});
diff --git a/test/spec/modules/anyclipBidAdapter_spec.js b/test/spec/modules/anyclipBidAdapter_spec.js
new file mode 100644
index 00000000000..9f34184d378
--- /dev/null
+++ b/test/spec/modules/anyclipBidAdapter_spec.js
@@ -0,0 +1,458 @@
+import {expect} from 'chai';
+import {config} from 'src/config.js';
+import {spec} from 'modules/anyclipBidAdapter.js';
+import {deepClone} from 'src/utils';
+import {getBidFloor} from '../../../libraries/xeUtils/bidderUtils.js';
+
+const ENDPOINT = 'https://prebid.anyclip.com';
+
+const defaultRequest = {
+  adUnitCode: 'test',
+  bidId: '1',
+  requestId: 'qwerty',
+  ortb2: {
+    source: {
+      tid: 'auctionId'
+    }
+  },
+  ortb2Imp: {
+    ext: {
+      tid: 'tr1',
+    }
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 200]
+      ]
+    }
+  },
+  bidder: 'anyclip',
+  params: {
+    publisherId: 'anyclip',
+    supplyTagId: '40',
+    ext: {}
+  },
+  bidRequestsCount: 1
+};
+
+const defaultRequestVideo = deepClone(defaultRequest);
+defaultRequestVideo.mediaTypes = {
+  video: {
+    playerSize: [640, 480],
+    context: 'instream',
+    skipppable: true
+  }
+};
+
+const videoBidderRequest = {
+  bidderCode: 'anyclip',
+  bids: [{mediaTypes: {video: {}}, bidId: 'qwerty'}]
+};
+
+const displayBidderRequest = {
+  bidderCode: 'anyclip',
+  bids: [{bidId: 'qwerty'}]
+};
+
+describe('anyclipBidAdapter', () => {
+  describe('isBidRequestValid', function () {
+    it('should return false when request params is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when required publisherId param is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params.publisherId;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when required supplyTagId param is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params.supplyTagId;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when video.playerSize is missing', function () {
+      const invalidRequest = deepClone(defaultRequestVideo);
+      delete invalidRequest.mediaTypes.video.playerSize;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(defaultRequest)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+
+    it('should send request with correct structure', function () {
+      const request = spec.buildRequests([defaultRequest], {});
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal(ENDPOINT + '/bid');
+      expect(request.options).to.have.property('contentType').and.to.equal('application/json');
+      expect(request).to.have.property('data');
+    });
+
+    it('should build basic request structure', function () {
+      const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
+      expect(request).to.have.property('bidId').and.to.equal(defaultRequest.bidId);
+      expect(request).to.have.property('auctionId').and.to.equal(defaultRequest.ortb2.source.tid);
+      expect(request).to.have.property('transactionId').and.to.equal(defaultRequest.ortb2Imp.ext.tid);
+      expect(request).to.have.property('tz').and.to.equal(new Date().getTimezoneOffset());
+      expect(request).to.have.property('bc').and.to.equal(1);
+      expect(request).to.have.property('banner').and.to.deep.equal({sizes: [[300, 250], [300, 200]]});
+      expect(request).to.have.property('gdprApplies').and.to.equal(0);
+      expect(request).to.have.property('consentString').and.to.equal('');
+      expect(request).to.have.property('userEids').and.to.deep.equal([]);
+      expect(request).to.have.property('usPrivacy').and.to.equal('');
+      expect(request).to.have.property('sizes').and.to.deep.equal(['300x250', '300x200']);
+      expect(request).to.have.property('ext').and.to.deep.equal({});
+      expect(request).to.have.property('env').and.to.deep.equal({
+        publisherId: 'anyclip',
+        supplyTagId: '40',
+        floor: null
+      });
+      expect(request).to.have.property('device').and.to.deep.equal({
+        ua: navigator.userAgent,
+        lang: navigator.language
+      });
+    });
+
+    it('should build request with schain', function () {
+      const schainRequest = deepClone(defaultRequest);
+      schainRequest.schain = {
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([schainRequest], {}).data)[0];
+      expect(request).to.have.property('schain').and.to.deep.equal({
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      });
+    });
+
+    it('should build request with location', function () {
+      const bidderRequest = {
+        refererInfo: {
+          page: 'page',
+          location: 'location',
+          domain: 'domain',
+          ref: 'ref',
+          isAmp: false
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('location');
+      const location = request.location;
+      expect(location).to.have.property('page').and.to.equal('page');
+      expect(location).to.have.property('location').and.to.equal('location');
+      expect(location).to.have.property('domain').and.to.equal('domain');
+      expect(location).to.have.property('ref').and.to.equal('ref');
+      expect(location).to.have.property('isAmp').and.to.equal(false);
+    });
+
+    it('should build request with ortb2 info', function () {
+      const ortb2Request = deepClone(defaultRequest);
+      ortb2Request.ortb2 = {
+        site: {
+          name: 'name'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([ortb2Request], {}).data)[0];
+      expect(request).to.have.property('ortb2').and.to.deep.equal({
+        site: {
+          name: 'name'
+        }
+      });
+    });
+
+    it('should build request with ortb2Imp info', function () {
+      const ortb2ImpRequest = deepClone(defaultRequest);
+      ortb2ImpRequest.ortb2Imp = {
+        ext: {
+          data: {
+            pbadslot: 'home1',
+            adUnitSpecificAttribute: '1'
+          }
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([ortb2ImpRequest], {}).data)[0];
+      expect(request).to.have.property('ortb2Imp').and.to.deep.equal({
+        ext: {
+          data: {
+            pbadslot: 'home1',
+            adUnitSpecificAttribute: '1'
+          }
+        }
+      });
+    });
+
+    it('should build request with valid bidfloor', function () {
+      const bfRequest = deepClone(defaultRequest);
+      bfRequest.getFloor = () => ({floor: 5, currency: 'USD'});
+      const request = JSON.parse(spec.buildRequests([bfRequest], {}).data)[0].env;
+      expect(request).to.have.property('floor').and.to.equal(5);
+    });
+
+    it('should build request with gdpr consent data if applies', function () {
+      const bidderRequest = {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'qwerty'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('gdprApplies').and.equals(1);
+      expect(request).to.have.property('consentString').and.equals('qwerty');
+    });
+
+    it('should build request with usp consent data if applies', function () {
+      const bidderRequest = {
+        uspConsent: '1YA-'
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('usPrivacy').and.equals('1YA-');
+    });
+
+    it('should build request with extended ids', function () {
+      const idRequest = deepClone(defaultRequest);
+      idRequest.userIdAsEids = [
+        {source: 'adserver.org', uids: [{id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: {rtiPartner: 'TDID'}}]},
+        {source: 'pubcid.org', uids: [{id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1}]}
+      ];
+      const request = JSON.parse(spec.buildRequests([idRequest], {}).data)[0];
+      expect(request).to.have.property('userEids').and.deep.equal(idRequest.userIdAsEids);
+    });
+
+    it('should build request with video', function () {
+      const request = JSON.parse(spec.buildRequests([defaultRequestVideo], {}).data)[0];
+      expect(request).to.have.property('video').and.to.deep.equal({
+        playerSize: [640, 480],
+        context: 'instream',
+        skipppable: true
+      });
+      expect(request).to.have.property('sizes').and.to.deep.equal(['640x480']);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return empty bids', function () {
+      const serverResponse = {
+        body: {
+          data: null
+        }
+      };
+
+      const invalidResponse = spec.interpretResponse(serverResponse, {});
+      expect(invalidResponse).to.be.an('array').that.is.empty;
+    });
+
+    it('should interpret valid response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 300,
+            height: 250,
+            ttl: 600,
+            meta: {
+              advertiserDomains: ['anyclip']
+            },
+            ext: {
+              pixels: [
+                ['iframe', 'surl1'],
+                ['image', 'surl2'],
+              ]
+            }
+          }]
+        }
+      };
+
+      const validResponse = spec.interpretResponse(serverResponse, {bidderRequest: displayBidderRequest});
+      const bid = validResponse[0];
+      expect(validResponse).to.be.an('array').that.is.not.empty;
+      expect(bid.requestId).to.equal('qwerty');
+      expect(bid.cpm).to.equal(1);
+      expect(bid.currency).to.equal('USD');
+      expect(bid.width).to.equal(300);
+      expect(bid.height).to.equal(250);
+      expect(bid.ttl).to.equal(600);
+      expect(bid.meta).to.deep.equal({advertiserDomains: ['anyclip']});
+    });
+
+    it('should interpret valid banner response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 300,
+            height: 250,
+            ttl: 600,
+            mediaType: 'banner',
+            creativeId: 'xe-demo-banner',
+            ad: 'ad',
+            meta: {}
+          }]
+        }
+      };
+
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: displayBidderRequest});
+      const bid = validResponseBanner[0];
+      expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+      expect(bid.mediaType).to.equal('banner');
+      expect(bid.creativeId).to.equal('xe-demo-banner');
+      expect(bid.ad).to.equal('ad');
+    });
+
+    it('should interpret valid video response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 600,
+            height: 480,
+            ttl: 600,
+            mediaType: 'video',
+            creativeId: 'xe-demo-video',
+            ad: 'vast-xml',
+            meta: {}
+          }]
+        }
+      };
+
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: videoBidderRequest});
+      const bid = validResponseBanner[0];
+      expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+      expect(bid.mediaType).to.equal('video');
+      expect(bid.creativeId).to.equal('xe-demo-video');
+      expect(bid.ad).to.equal('vast-xml');
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('shoukd handle no params', function () {
+      const opts = spec.getUserSyncs({}, []);
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty if sync is not allowed', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false});
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should allow iframe sync', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('iframe');
+      expect(opts[0].url).to.equal('surl1?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+    });
+
+    it('should allow pixel sync', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+    });
+
+    it('should allow pixel sync and parse consent params', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }], {
+        gdprApplies: 1,
+        consentString: '1YA-'
+      });
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=1&gdpr_consent=1YA-');
+    });
+  });
+
+  describe('getBidFloor', function () {
+    it('should return null when getFloor is not a function', () => {
+      const bid = {getFloor: 2};
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when getFloor doesnt return an object', () => {
+      const bid = {getFloor: () => 2};
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when floor is not a number', () => {
+      const bid = {
+        getFloor: () => ({floor: 'string', currency: 'USD'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when currency is not USD', () => {
+      const bid = {
+        getFloor: () => ({floor: 5, currency: 'EUR'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return floor value when everything is correct', () => {
+      const bid = {
+        getFloor: () => ({floor: 5, currency: 'USD'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.equal(5);
+    });
+  });
+})
diff --git a/test/spec/modules/apacdexBidAdapter_spec.js b/test/spec/modules/apacdexBidAdapter_spec.js
index 98d07575ee7..d005934d062 100644
--- a/test/spec/modules/apacdexBidAdapter_spec.js
+++ b/test/spec/modules/apacdexBidAdapter_spec.js
@@ -201,8 +201,7 @@ describe('ApacdexBidAdapter', function () {
       },
       'bidder': 'apacdex',
       'params': {
-        'siteId': '1a2b3c4d5e6f1a2b3c4d',
-        'geo': { 'lat': 123.13123456, 'lon': 54.23467311, 'accuracy': 60 }
+        'siteId': '1a2b3c4d5e6f1a2b3c4d'
       },
       'adUnitCode': 'adunit-code-1',
       'sizes': [[300, 250], [300, 600]],
@@ -321,10 +320,6 @@ describe('ApacdexBidAdapter', function () {
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
       expect(bidRequests.data.eids).to.deep.equal(bidRequest[0].userIdAsEids)
     });
-    it('should fail to return a properly formatted request with geo defined', function () {
-      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
-      expect(bidRequests.data.geo).to.not.deep.equal(bidRequest[0].params.geo)
-    });
     it('should return a properly formatted request with us_privacy included', function () {
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
       expect(bidRequests.data.us_privacy).to.equal('someCCPAString');
diff --git a/test/spec/modules/appierAnalyticsAdapter_spec.js b/test/spec/modules/appierAnalyticsAdapter_spec.js
index cd026f64d49..e380672b73c 100644
--- a/test/spec/modules/appierAnalyticsAdapter_spec.js
+++ b/test/spec/modules/appierAnalyticsAdapter_spec.js
@@ -4,7 +4,7 @@ import {
 } from 'modules/appierAnalyticsAdapter.js';
 import {expect} from 'chai';
 const events = require('src/events');
-const constants = require('src/constants.json');
+const constants = require('src/constants.js');
 
 const affiliateId = 'WhctHaViHtI';
 const configId = 'd9cc9a9be9b240eda17cf1c9a8a4b29c';
diff --git a/test/spec/modules/appierBidAdapter_spec.js b/test/spec/modules/appierBidAdapter_spec.js
index 8b6ad5c2f6f..0ad14b1ec61 100644
--- a/test/spec/modules/appierBidAdapter_spec.js
+++ b/test/spec/modules/appierBidAdapter_spec.js
@@ -30,17 +30,17 @@ describe('AppierAdapter', function () {
     });
 
     it('should return false when required param zoneId is missing', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when required param zoneId has wrong type', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {
         'hzid': null
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 193e8aa64f8..b2bdfbcdf5a 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -1,7 +1,6 @@
 import { expect } from 'chai';
 import { spec } from 'modules/appnexusBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
-import * as bidderFactory from 'src/adapters/bidderFactory.js';
 import { auctionManager } from 'src/auctionManager.js';
 import { deepClone } from 'src/utils.js';
 import * as utils from 'src/utils.js';
@@ -76,21 +75,21 @@ describe('AppNexusAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placementId': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placement_id': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -343,7 +342,7 @@ describe('AppNexusAdapter', function () {
         expect(payload.tags[0].hb_source).to.deep.equal(1);
       });
 
-      it('should include ORTB video values when video params were not set', function () {
+      it('should include ORTB video values when matching video params were not all set', function () {
         let bidRequest = deepClone(bidRequests[0]);
         bidRequest.params = {
           placementId: '1234235',
@@ -377,6 +376,97 @@ describe('AppNexusAdapter', function () {
         expect(payload.tags[0].video_frameworks).to.deep.equal([1, 4])
       });
 
+      it('should include ORTB video values when video params is empty - case 1', function () {
+        let bidRequest = deepClone(bidRequests[0]);
+        bidRequest.mediaTypes = {
+          video: {
+            playerSize: [640, 480],
+            context: 'outstream',
+            placement: 3,
+            mimes: ['video/mp4'],
+            skip: 0,
+            minduration: 5,
+            api: [1, 5, 6],
+            playbackmethod: [2, 4]
+          }
+        };
+
+        const request = spec.buildRequests([bidRequest]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].video).to.deep.equal({
+          minduration: 5,
+          playback_method: 2,
+          skippable: false,
+          context: 4
+        });
+        expect(payload.tags[0].video_frameworks).to.deep.equal([1, 4])
+      });
+
+      it('should include ORTB video values when video params is empty - case 2', function () {
+        let bidRequest = deepClone(bidRequests[0]);
+        bidRequest.mediaTypes = {
+          video: {
+            playerSize: [640, 480],
+            context: 'outstream',
+            plcmt: 2,
+            startdelay: 0,
+            mimes: ['video/mp4'],
+            skip: 1,
+            minduration: 5,
+            api: [1, 5, 6],
+            playbackmethod: [2, 4]
+          }
+        };
+
+        const request = spec.buildRequests([bidRequest]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].video).to.deep.equal({
+          minduration: 5,
+          playback_method: 2,
+          skippable: true,
+          context: 8
+        });
+        expect(payload.tags[0].video_frameworks).to.deep.equal([1, 4])
+      });
+
+      it('should convert and include ORTB2 device data when available', function () {
+        const bidRequest = deepClone(bidRequests[0]);
+        const bidderRequest = {
+          ortb2: {
+            device: {
+              w: 980,
+              h: 1720,
+              dnt: 0,
+              ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+              language: 'en',
+              devicetype: 1,
+              make: 'Apple',
+              model: 'iPhone 12 Pro Max',
+              os: 'iOS',
+              osv: '17.4',
+            },
+          },
+        };
+
+        const expectedDeviceResult = {
+          useragent: bidderRequest.ortb2.device.ua,
+          devicetype: 'Mobile/Tablet - General',
+          make: bidderRequest.ortb2.device.make,
+          model: bidderRequest.ortb2.device.model,
+          os: bidderRequest.ortb2.device.os,
+          os_version: bidderRequest.ortb2.device.osv,
+          w: bidderRequest.ortb2.device.w,
+          h: bidderRequest.ortb2.device.h,
+        };
+
+        const request = spec.buildRequests([bidRequest], bidderRequest);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.device).to.deep.equal(expectedDeviceResult);
+      });
+
       it('should add video property when adUnit includes a renderer', function () {
         const videoData = {
           mediaTypes: {
@@ -1204,6 +1294,46 @@ describe('AppNexusAdapter', function () {
       expect(payload.privacy.gpp_sid).to.deep.equal([7]);
     });
 
+    it('should add dsa information to the request via bidderRequest.ortb2.regs.ext.dsa', function () {
+      let bidderRequest = {
+        'bidderCode': 'appnexus',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'ortb2': {
+          'regs': {
+            'ext': {
+              'dsa': {
+                'dsarequired': 1,
+                'pubrender': 0,
+                'datatopub': 1,
+                'transparency': [{
+                  'domain': 'good-domain',
+                  'dsaparams': [1, 2]
+                }, {
+                  'domain': 'bad-setup',
+                  'dsaparams': ['1', 3]
+                }]
+              }
+            }
+          }
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.dsa).to.exist;
+      expect(payload.dsa.dsarequired).to.equal(1);
+      expect(payload.dsa.pubrender).to.equal(0);
+      expect(payload.dsa.datatopub).to.equal(1);
+      expect(payload.dsa.transparency).to.deep.equal([{
+        'domain': 'good-domain',
+        'dsaparams': [1, 2]
+      }]);
+    });
+
     it('supports sending hybrid mobile app parameters', function () {
       let appRequest = Object.assign({},
         bidRequests[0],
@@ -1347,6 +1477,88 @@ describe('AppNexusAdapter', function () {
       config.getConfig.restore();
     });
 
+    describe('ast_override_div', function () {
+      let getParamStub;
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      let bidRequest2 = deepClone(bidRequests[0]);
+      bidRequest2.adUnitCode = 'adUnit_code_2';
+      let bidRequest3 = deepClone(bidRequests[0]);
+      bidRequest3.adUnitCode = 'adUnit_code_3';
+
+      before(function () {
+        getParamStub = sinon.stub(utils, 'getParameterByName');
+      });
+
+      it('should set forced creative id if one adUnitCode passed', function () {
+        getParamStub.callsFake(function(par) {
+          if (par === 'ast_override_div') return 'adunit-code:1234';
+          return '';
+        });
+
+        const request = spec.buildRequests([bidRequest, bidRequest2]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].force_creative_id).to.deep.equal(1234);
+        expect(payload.tags[1].force_creative_id).to.not.exist;
+      });
+
+      it('should set forced creative id if `ast_override_div` is set to override multiple adUnitCode', function () {
+        getParamStub.callsFake(function(par) {
+          if (par === 'ast_override_div') return 'adunit-code:1234,adUnit_code_2:5678';
+          return '';
+        });
+
+        const request = spec.buildRequests([bidRequest, bidRequest2, bidRequest3]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].force_creative_id).to.deep.equal(1234);
+        expect(payload.tags[1].force_creative_id).to.deep.equal(5678);
+        expect(payload.tags[2].force_creative_id).to.not.exist;
+      });
+
+      it('should not set forced creative id if `ast_override_div` is missing creativeId', function () {
+        getParamStub.callsFake(function(par) {
+          if (par === 'ast_override_div') return 'adunit-code';
+          return '';
+        });
+
+        const request = spec.buildRequests([bidRequest, bidRequest2]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].force_creative_id).to.not.exist;
+        expect(payload.tags[1].force_creative_id).to.not.exist;
+      });
+
+      it('should not set forced creative id if `ast_override_div` is in the wrong format', function () {
+        getParamStub.callsFake(function(par) {
+          if (par === 'ast_override_div') return 'adunit-code;adUnit_code_2:5678';
+          return '';
+        }); ;
+
+        const request = spec.buildRequests([bidRequest, bidRequest2]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].force_creative_id).to.not.exist;
+        expect(payload.tags[1].force_creative_id).to.not.exist;
+      });
+
+      it('should not set forced creative id if `ast_override_div` is missing', function () {
+        getParamStub.callsFake(function(par) {
+          return '';
+        }); ;
+
+        const request = spec.buildRequests([bidRequest, bidRequest2]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].force_creative_id).to.not.exist;
+        expect(payload.tags[1].force_creative_id).to.not.exist;
+      });
+
+      after(function () {
+        getParamStub.restore();
+      });
+    });
+
     it('should set the X-Is-Test customHeader if test flag is enabled', function () {
       let bidRequest = Object.assign({}, bidRequests[0]);
       sinon.stub(config, 'getConfig')
@@ -1575,6 +1787,15 @@ describe('AppNexusAdapter', function () {
               'viewability': {
                 'config': ''
               },
+              'dsa': {
+                'behalf': 'test-behalf',
+                'paid': 'test-paid',
+                'transparency': [{
+                  'domain': 'good-domain',
+                  'params': [1, 2, 3]
+                }],
+                'adrender': 1
+              },
               'rtb': {
                 'banner': {
                   'content': '',
@@ -1623,6 +1844,15 @@ describe('AppNexusAdapter', function () {
               'nodes': [{
                 'bsid': '958'
               }]
+            },
+            'dsa': {
+              'behalf': 'test-behalf',
+              'paid': 'test-paid',
+              'transparency': [{
+                'domain': 'good-domain',
+                'params': [1, 2, 3]
+              }],
+              'adrender': 1
             }
           }
         }
@@ -1801,45 +2031,47 @@ describe('AppNexusAdapter', function () {
     }
 
     if (FEATURES.NATIVE) {
+      const BASE_NATIVE = {
+        'title': 'Native Creative',
+        'desc': 'Cool description great stuff',
+        'desc2': 'Additional body text',
+        'ctatext': 'Do it',
+        'sponsored': 'AppNexus',
+        'icon': {
+          'width': 0,
+          'height': 0,
+          'url': 'https://cdn.adnxs.com/icon.png'
+        },
+        'main_img': {
+          'width': 2352,
+          'height': 1516,
+          'url': 'https://cdn.adnxs.com/img.png'
+        },
+        'link': {
+          'url': 'https://www.appnexus.com',
+          'fallback_url': '',
+          'click_trackers': ['https://nym1-ib.adnxs.com/click']
+        },
+        'impression_trackers': ['https://example.com'],
+        'rating': '5',
+        'displayurl': 'https://AppNexus.com/?url=display_url',
+        'likes': '38908320',
+        'downloads': '874983',
+        'price': '9.99',
+        'saleprice': 'FREE',
+        'phone': '1234567890',
+        'address': '28 W 23rd St, New York, NY 10010',
+        'privacy_link': 'https://appnexus.com/?url=privacy_url',
+        'javascriptTrackers': '',
+        'video': {
+          'content': ''
+        }
+      };
+
       it('handles native responses', function () {
         let response1 = deepClone(response);
         response1.tags[0].ads[0].ad_type = 'native';
-        response1.tags[0].ads[0].rtb.native = {
-          'title': 'Native Creative',
-          'desc': 'Cool description great stuff',
-          'desc2': 'Additional body text',
-          'ctatext': 'Do it',
-          'sponsored': 'AppNexus',
-          'icon': {
-            'width': 0,
-            'height': 0,
-            'url': 'https://cdn.adnxs.com/icon.png'
-          },
-          'main_img': {
-            'width': 2352,
-            'height': 1516,
-            'url': 'https://cdn.adnxs.com/img.png'
-          },
-          'link': {
-            'url': 'https://www.appnexus.com',
-            'fallback_url': '',
-            'click_trackers': ['https://nym1-ib.adnxs.com/click']
-          },
-          'impression_trackers': ['https://example.com'],
-          'rating': '5',
-          'displayurl': 'https://AppNexus.com/?url=display_url',
-          'likes': '38908320',
-          'downloads': '874983',
-          'price': '9.99',
-          'saleprice': 'FREE',
-          'phone': '1234567890',
-          'address': '28 W 23rd St, New York, NY 10010',
-          'privacy_link': 'https://appnexus.com/?url=privacy_url',
-          'javascriptTrackers': '',
-          'video': {
-            'content': ''
-          }
-        };
+        response1.tags[0].ads[0].rtb.native = BASE_NATIVE;
         let bidderRequest = {
           bids: [{
             bidId: '3db3773286ee59',
@@ -1850,10 +2082,236 @@ describe('AppNexusAdapter', function () {
         let result = spec.interpretResponse({ body: response1 }, { bidderRequest });
         expect(result[0].native.title).to.equal('Native Creative');
         expect(result[0].native.body).to.equal('Cool description great stuff');
+        expect(result[0].native.body2).to.equal('Additional body text');
         expect(result[0].native.cta).to.equal('Do it');
         expect(result[0].native.image.url).to.equal('https://cdn.adnxs.com/img.png');
+        // Video is technically not a base Prebid native field, so it should be included as part of the ext
+        // But it's also included here for backwards compatibility if people read the bid directly
         expect(result[0].native.video.content).to.equal('');
       });
+
+      it('handles custom native fields as ext', function () {
+        let response1 = deepClone(response);
+        response1.tags[0].ads[0].ad_type = 'native';
+        response1.tags[0].ads[0].rtb.native = {
+          ...BASE_NATIVE,
+          // 'video' is included in base native
+          'title1': 'Custom Title 1',
+          'title2': 'Custom Title 2',
+          'title3': 'Custom Title 3',
+          'title4': 'Custom Title 4',
+          'title5': 'Custom Title 5',
+          // Not to be confused with Prebid's base native body & body2
+          'body1': 'Custom Body 1',
+          'body2': 'Custom Body 2',
+          'body3': 'Custom Body 3',
+          'body4': 'Custom Body 4',
+          'body5': 'Custom Body 5',
+          'image1': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_1.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'image2': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_2.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'image3': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_3.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'image4': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_4.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'image5': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_5.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'icon1': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'icon2': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'icon3': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'icon4': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'icon5': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'socialicon1': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'socialicon2': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'socialicon3': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'socialicon4': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'socialicon5': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'socialurl1': 'https://www.xandr.com/platform/monetize/#socialUrl1',
+          'socialurl2': 'https://www.xandr.com/platform/monetize/#socialUrl2',
+          'socialurl3': 'https://www.xandr.com/platform/monetize/#socialUrl3',
+          'socialurl4': 'https://www.xandr.com/platform/monetize/#socialUrl4',
+          'socialurl5': 'https://www.xandr.com/platform/monetize/#socialUrl5',
+          'displayurl1': 'https://www.xandr.com/platform/monetize/#displayUrl1',
+          'displayurl2': 'https://www.xandr.com/platform/monetize/#displayUrl2',
+          'displayurl3': 'https://www.xandr.com/platform/monetize/#displayUrl3',
+          'displayurl4': 'https://www.xandr.com/platform/monetize/#displayUrl4',
+          'displayurl5': 'https://www.xandr.com/platform/monetize/#displayUrl5',
+          'ctatext1': 'Custom CTA 1',
+          'ctatext2': 'Custom CTA 2',
+          'ctatext3': 'Custom CTA 3',
+          'ctatext4': 'Custom CTA 4',
+          'ctatext5': 'Custom CTA 5',
+        };
+        let bidderRequest = {
+          bids: [{
+            bidId: '3db3773286ee59',
+            adUnitCode: 'code'
+          }]
+        }
+
+        let result = spec.interpretResponse({ body: response1 }, { bidderRequest });
+        expect(result[0].native.ext).to.deep.equal({
+          'video': {
+            'content': ''
+          },
+          'customTitle1': 'Custom Title 1',
+          'customTitle2': 'Custom Title 2',
+          'customTitle3': 'Custom Title 3',
+          'customTitle4': 'Custom Title 4',
+          'customTitle5': 'Custom Title 5',
+          'customBody1': 'Custom Body 1',
+          'customBody2': 'Custom Body 2',
+          'customBody3': 'Custom Body 3',
+          'customBody4': 'Custom Body 4',
+          'customBody5': 'Custom Body 5',
+          'customImage1': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_1.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'customImage2': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_2.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'customImage3': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_3.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'customImage4': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_4.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'customImage5': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/custom_image_5.jpg?[fullhash]',
+            'height': 627,
+            'width': 1200,
+          },
+          'customIcon1': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customIcon2': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customIcon3': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customIcon4': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customIcon5': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customSocialIcon1': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customSocialIcon2': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customSocialIcon3': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customSocialIcon4': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customSocialIcon5': {
+            'url': 'https://monetize.xandr.com/creative-ui/assets/logo.jpg?[fullhash]',
+            'height': 128,
+            'width': 128,
+          },
+          'customSocialUrl1': 'https://www.xandr.com/platform/monetize/#socialUrl1',
+          'customSocialUrl2': 'https://www.xandr.com/platform/monetize/#socialUrl2',
+          'customSocialUrl3': 'https://www.xandr.com/platform/monetize/#socialUrl3',
+          'customSocialUrl4': 'https://www.xandr.com/platform/monetize/#socialUrl4',
+          'customSocialUrl5': 'https://www.xandr.com/platform/monetize/#socialUrl5',
+          'customDisplayUrl1': 'https://www.xandr.com/platform/monetize/#displayUrl1',
+          'customDisplayUrl2': 'https://www.xandr.com/platform/monetize/#displayUrl2',
+          'customDisplayUrl3': 'https://www.xandr.com/platform/monetize/#displayUrl3',
+          'customDisplayUrl4': 'https://www.xandr.com/platform/monetize/#displayUrl4',
+          'customDisplayUrl5': 'https://www.xandr.com/platform/monetize/#displayUrl5',
+          'customCta1': 'Custom CTA 1',
+          'customCta2': 'Custom CTA 2',
+          'customCta3': 'Custom CTA 3',
+          'customCta4': 'Custom CTA 4',
+          'customCta5': 'Custom CTA 5',
+        });
+      });
     }
 
     if (FEATURES.VIDEO) {
@@ -1956,54 +2414,73 @@ describe('AppNexusAdapter', function () {
     });
   });
 
-  describe('transformBidParams', function () {
-    let gcStub;
-    let adUnit = { bids: [{ bidder: 'appnexus' }] }; ;
-
-    before(function () {
-      gcStub = sinon.stub(config, 'getConfig');
+  describe('getUserSyncs', function() {
+    let syncOptions, gdprConsent;
+
+    beforeEach(() => {
+      gdprConsent = {
+        gdprApplies: true,
+        consentString: 'CPJl4C8PJl4C8OoAAAENAwCMAP_AAH_AAAAAAPgAAAAIAPgAAAAIAAA.IGLtV_T9fb2vj-_Z99_tkeYwf95y3p-wzhheMs-8NyZeH_B4Wv2MyvBX4JiQKGRgksjLBAQdtHGlcTQgBwIlViTLMYk2MjzNKJrJEilsbO2dYGD9Pn8HT3ZCY70-vv__7v3ff_3g',
+        vendorData: {
+          purpose: {
+            consents: {
+              '1': true
+            }
+          }
+        }
+      }
     });
 
-    after(function () {
-      gcStub.restore();
+    describe('pixel', function () {
+      beforeEach(() => {
+        syncOptions = { pixelEnabled: true };
+      });
+
+      it('pixelEnabled on', function () {
+        const result = spec.getUserSyncs(syncOptions, [], gdprConsent, null);
+        expect(result).to.have.length(1);
+        expect(result[0].type).to.equal('image');
+        expect(result[0].url).to.equal('https://px.ads.linkedin.com/setuid?partner=appNexus');
+      });
+
+      it('pixelEnabled off', function () {
+        syncOptions.pixelEnabled = false;
+        const result = spec.getUserSyncs(syncOptions, [], gdprConsent, null);
+        expect(result).to.be.undefined;
+      });
     });
 
-    it('convert keywords param differently for psp endpoint with single s2sConfig', function () {
-      gcStub.withArgs('s2sConfig').returns({
-        bidders: ['appnexus'],
-        endpoint: {
-          p1Consent: 'https://ib.adnxs.com/openrtb2/prebid'
-        }
+    describe('iframe', function () {
+      beforeEach(() => {
+        syncOptions = { iframeEnabled: true };
       });
 
-      const oldParams = {
-        keywords: {
-          genre: ['rock', 'pop'],
-          pets: 'dog'
-        }
-      };
+      it('iframeEnabled on with gdpr purpose 1 on', function () {
+        const result = spec.getUserSyncs(syncOptions, [], gdprConsent, null);
+        expect(result).to.have.length(1);
+        expect(result[0].type).to.equal('iframe');
+        expect(result[0].url).to.equal('https://acdn.adnxs.com/dmp/async_usersync.html');
+      });
 
-      const newParams = spec.transformBidParams(oldParams, true, adUnit);
-      expect(newParams.keywords).to.equal('genre=rock,genre=pop,pets=dog');
-    });
+      it('iframeEnabled on with gdpr purpose1 off', function () {
+        gdprConsent.vendorData.purpose.consents['1'] = false
 
-    it('convert keywords param differently for psp endpoint with array s2sConfig', function () {
-      gcStub.withArgs('s2sConfig').returns([{
-        bidders: ['appnexus'],
-        endpoint: {
-          p1Consent: 'https://ib.adnxs.com/openrtb2/prebid'
-        }
-      }]);
+        const result = spec.getUserSyncs(syncOptions, [], gdprConsent, null);
+        expect(result).to.be.undefined;
+      });
 
-      const oldParams = {
-        keywords: {
-          genre: ['rock', 'pop'],
-          pets: 'dog'
-        }
-      };
+      it('iframeEnabled on without gdpr', function () {
+        const result = spec.getUserSyncs(syncOptions, [], null, null);
+        expect(result).to.have.length(1);
+        expect(result[0].type).to.equal('iframe');
+        expect(result[0].url).to.equal('https://acdn.adnxs.com/dmp/async_usersync.html');
+      });
 
-      const newParams = spec.transformBidParams(oldParams, true, adUnit);
-      expect(newParams.keywords).to.equal('genre=rock,genre=pop,pets=dog');
+      it('iframeEnabled off', function () {
+        syncOptions.iframeEnabled = false;
+        const result = spec.getUserSyncs(syncOptions, [], gdprConsent, null);
+        expect(result).to.be.undefined;
+      });
     });
   });
 });
diff --git a/test/spec/modules/asealBidAdapter_spec.js b/test/spec/modules/asealBidAdapter_spec.js
index 2dc1b47b7d0..900bda11390 100644
--- a/test/spec/modules/asealBidAdapter_spec.js
+++ b/test/spec/modules/asealBidAdapter_spec.js
@@ -87,10 +87,10 @@ describe('asealBidAdapter', () => {
     });
 
     it('should return false when required params are not passed', () => {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/asoBidAdapter_spec.js b/test/spec/modules/asoBidAdapter_spec.js
index 88016d1902c..a37e4647c7a 100644
--- a/test/spec/modules/asoBidAdapter_spec.js
+++ b/test/spec/modules/asoBidAdapter_spec.js
@@ -1,30 +1,30 @@
 import {expect} from 'chai';
 import {spec} from 'modules/asoBidAdapter.js';
-import {parseUrl} from 'src/utils.js';
-import {BANNER, VIDEO} from 'src/mediaTypes.js';
+import {BANNER, VIDEO, NATIVE} from 'src/mediaTypes.js';
+import {OUTSTREAM} from 'src/video.js';
+import {syncAddFPDToBidderRequest} from '../../helpers/fpd';
+import {parseUrl} from '../../../src/utils';
+
+import 'modules/priceFloors.js';
+import 'modules/consentManagementTcf.js';
+import 'modules/consentManagementUsp.js';
 
 describe('Adserver.Online bidding adapter', function () {
   const bannerRequest = {
     bidder: 'aso',
     params: {
-      zone: 1,
-      attr: {
-        keywords: ['a', 'b'],
-        tags: ['t1', 't2']
-      }
+      zone: 1
     },
     adUnitCode: 'adunit-banner',
+    bidId: 'bid-banner',
     mediaTypes: {
-      banner: {
+      [BANNER]: {
         sizes: [
           [300, 250],
           [240, 400],
         ]
       }
     },
-    bidId: 'bidid1',
-    bidderRequestId: 'bidreq1',
-    auctionId: 'auctionid1',
     userIdAsEids: [{
       source: 'src1',
       uids: [
@@ -38,32 +38,67 @@ describe('Adserver.Online bidding adapter', function () {
   const videoRequest = {
     bidder: 'aso',
     params: {
-      zone: 2,
-      video: {
-        api: [2],
-        maxduration: 30
-      }
+      zone: 2
     },
+    adUnitCode: 'adunit-video',
+    bidId: 'bid-video',
     mediaTypes: {
-      video: {
-        context: 'outstream',
+      [VIDEO]: {
+        context: OUTSTREAM,
         playerSize: [[640, 480]],
         protocols: [1, 2],
         mimes: ['video/mp4'],
       }
+    }
+  };
+
+  const nativeOrtbRequest = {
+    assets: [
+      {
+        id: 0,
+        required: 1,
+        title: {
+          len: 140
+        }
+      },
+      {
+        id: 1,
+        required: 1,
+        img: {
+          type: 3,
+          w: 300,
+          h: 600
+        }
+      }]
+  };
+
+  const nativeRequest = {
+    bidder: 'aso',
+    params: {
+      zone: 3
     },
-    adUnitCode: 'adunit-video',
-    bidId: 'bidid12',
-    bidderRequestId: 'bidreq2',
-    auctionId: 'auctionid12'
+    adUnitCode: 'adunit-native',
+    bidId: 'bid-native',
+    mediaTypes: {
+      [NATIVE]: {
+        ortb: {
+          ...nativeOrtbRequest
+        }
+      }
+    },
+    nativeOrtbRequest
   };
 
   const bidderRequest = {
     refererInfo: {
-      numIframes: 0,
+      page: 'https://example.com/page.html',
+      topmostLocation: 'https://example.com/page.html',
       reachedTop: true,
-      page: 'https://example.com',
-      domain: 'example.com'
+      numIframes: 1,
+      stack: [
+        'https://example.com/page.html',
+        'https://example.com/iframe1.html'
+      ]
     }
   };
 
@@ -81,6 +116,14 @@ describe('Adserver.Online bidding adapter', function () {
     }
   };
 
+  const gdprNotApplies = {
+    gdprApplies: false,
+    consentString: '',
+    vendorData: {
+      purpose: {}
+    }
+  };
+
   const uspConsent = 'usp_consent';
 
   describe('isBidRequestValid', function () {
@@ -110,81 +153,121 @@ describe('Adserver.Online bidding adapter', function () {
     });
   });
 
-  describe('buildRequests', function () {
-    it('creates a valid banner request', function () {
-      bannerRequest.getFloor = () => ({ currency: 'USD', floor: 0.5 });
+  describe('requests builder', function () {
+    it('should add bid floor', function () {
+      const bidRequest = Object.assign({}, bannerRequest);
+
+      bidRequest.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 0.5
+        }
+      };
+
+      const payload = spec.buildRequests([bidRequest], bidderRequest)[0].data;
 
+      expect(payload.imp[0].bidfloor).to.equal(0.5);
+      expect(payload.imp[0].bidfloorcur).to.equal('USD');
+    });
+
+    it('endpoint is valid', function () {
       const requests = spec.buildRequests([bannerRequest], bidderRequest);
       expect(requests).to.have.lengthOf(1);
       const request = requests[0];
 
       expect(request).to.exist;
       expect(request.method).to.equal('POST');
-      const parsedRequestUrl = parseUrl(request.url);
-      expect(parsedRequestUrl.hostname).to.equal('srv.aso1.net');
-      expect(parsedRequestUrl.pathname).to.equal('/prebid/bidder');
+      const parsedUrl = parseUrl(request.url);
+      expect(parsedUrl.hostname).to.equal('srv.aso1.net');
+      expect(parsedUrl.pathname).to.equal('/prebid/bidder');
 
-      const query = parsedRequestUrl.search;
+      const query = parsedUrl.search;
       expect(query.pbjs).to.contain('$prebid.version$');
       expect(query.zid).to.equal('1');
+    });
 
+    it('creates a valid banner request', function () {
+      const requests = spec.buildRequests([bannerRequest], syncAddFPDToBidderRequest(bidderRequest));
+      expect(requests).to.have.lengthOf(1);
+      const request = requests[0];
+
+      expect(request).to.exist;
       expect(request.data).to.exist;
 
       const payload = request.data;
 
-      expect(payload.site).to.not.equal(null);
-      expect(payload.site.ref).to.equal('');
-      expect(payload.site.page).to.equal('https://example.com');
+      expect(payload.site).to.exist;
+      expect(payload.site.page).to.equal('https://example.com/page.html');
 
-      expect(payload.device).to.not.equal(null);
-      expect(payload.device.w).to.equal(window.innerWidth);
-      expect(payload.device.h).to.equal(window.innerHeight);
+      expect(payload.device).to.exist;
+      expect(payload.device.w).to.equal(window.screen.width);
+      expect(payload.device.h).to.equal(window.screen.height);
 
       expect(payload.imp).to.have.lengthOf(1);
 
       expect(payload.imp[0].tagid).to.equal('adunit-banner');
-      expect(payload.imp[0].banner).to.not.equal(null);
-      expect(payload.imp[0].banner.w).to.equal(300);
-      expect(payload.imp[0].banner.h).to.equal(250);
-      expect(payload.imp[0].bidfloor).to.equal(0.5);
-      expect(payload.imp[0].bidfloorcur).to.equal('USD');
+      expect(payload.imp[0].banner).to.not.null;
+      expect(payload.imp[0].banner.format).to.have.lengthOf(2);
+      expect(payload.imp[0].banner.format[0].w).to.equal(300);
+      expect(payload.imp[0].banner.format[0].h).to.equal(250);
+      expect(payload.imp[0].banner.format[1].w).to.equal(240);
+      expect(payload.imp[0].banner.format[1].h).to.equal(400);
     });
 
-    it('creates a valid video request', function () {
-      const requests = spec.buildRequests([videoRequest], bidderRequest);
-      expect(requests).to.have.lengthOf(1);
-      const request = requests[0];
+    if (FEATURES.VIDEO) {
+      it('creates a valid video request', function () {
+        const requests = spec.buildRequests([videoRequest], syncAddFPDToBidderRequest(bidderRequest));
+        expect(requests).to.have.lengthOf(1);
+        const request = requests[0];
 
-      expect(request).to.exist;
-      expect(request.method).to.equal('POST');
-      const parsedRequestUrl = parseUrl(request.url);
-      expect(parsedRequestUrl.hostname).to.equal('srv.aso1.net');
-      expect(parsedRequestUrl.pathname).to.equal('/prebid/bidder');
+        expect(request).to.exist;
+        expect(request.data).to.not.be.empty;
 
-      const query = parsedRequestUrl.search;
-      expect(query.pbjs).to.contain('$prebid.version$');
-      expect(query.zid).to.equal('2');
+        const payload = request.data;
 
-      expect(request.data).to.not.be.empty;
+        expect(payload.site).to.exist;
+        expect(payload.site.page).to.equal('https://example.com/page.html');
 
-      const payload = request.data;
+        expect(payload.device).to.exist;
+        expect(payload.device.w).to.equal(window.screen.width);
+        expect(payload.device.h).to.equal(window.screen.height);
 
-      expect(payload.site).to.not.equal(null);
-      expect(payload.site.ref).to.equal('');
-      expect(payload.site.page).to.equal('https://example.com');
+        expect(payload.imp).to.have.lengthOf(1);
 
-      expect(payload.device).to.not.equal(null);
-      expect(payload.device.w).to.equal(window.innerWidth);
-      expect(payload.device.h).to.equal(window.innerHeight);
+        expect(payload.imp[0].tagid).to.equal('adunit-video');
+        expect(payload.imp[0].video).to.exist;
 
-      expect(payload.imp).to.have.lengthOf(1);
+        expect(payload.imp[0].video.w).to.equal(640);
+        expect(payload.imp[0].video.h).to.equal(480);
+        expect(payload.imp[0].banner).to.not.exist;
+      });
+    }
 
-      expect(payload.imp[0].tagid).to.equal('adunit-video');
-      expect(payload.imp[0].video).to.not.equal(null);
-      expect(payload.imp[0].video.w).to.equal(640);
-      expect(payload.imp[0].video.h).to.equal(480);
-      expect(payload.imp[0].banner).to.be.undefined;
-    });
+    if (FEATURES.NATIVE) {
+      it('creates a valid native request', function () {
+        const requests = spec.buildRequests([nativeRequest], syncAddFPDToBidderRequest(bidderRequest));
+        expect(requests).to.have.lengthOf(1);
+        const request = requests[0];
+
+        expect(request).to.exist;
+        expect(request.data).to.not.be.empty;
+
+        const payload = request.data;
+
+        expect(payload.site).to.exist;
+        expect(payload.site.page).to.equal('https://example.com/page.html');
+
+        expect(payload.device).to.exist;
+        expect(payload.device.w).to.equal(window.screen.width);
+        expect(payload.device.h).to.equal(window.screen.height);
+
+        expect(payload.imp).to.have.lengthOf(1);
+
+        expect(payload.imp[0].tagid).to.equal('adunit-native');
+        expect(payload.imp[0].native).to.exist;
+        expect(payload.imp[0].native.request).to.exist;
+      });
+    }
   });
 
   describe('GDPR/USP compliance', function () {
@@ -192,7 +275,7 @@ describe('Adserver.Online bidding adapter', function () {
       bidderRequest.gdprConsent = gdprConsent;
       bidderRequest.uspConsent = uspConsent;
 
-      const requests = spec.buildRequests([bannerRequest], bidderRequest);
+      const requests = spec.buildRequests([bannerRequest], syncAddFPDToBidderRequest(bidderRequest));
       expect(requests).to.have.lengthOf(1);
       const request = requests[0];
 
@@ -209,7 +292,7 @@ describe('Adserver.Online bidding adapter', function () {
       bidderRequest.gdprConsent = null;
       bidderRequest.uspConsent = null;
 
-      const requests = spec.buildRequests([bannerRequest], bidderRequest);
+      const requests = spec.buildRequests([bannerRequest], syncAddFPDToBidderRequest(bidderRequest));
       expect(requests).to.have.lengthOf(1);
       const request = requests[0];
 
@@ -226,18 +309,21 @@ describe('Adserver.Online bidding adapter', function () {
   describe('response handler', function () {
     const bannerResponse = {
       body: {
-        id: 'auctionid1',
-        bidid: 'bidid1',
         seatbid: [{
           bid: [
             {
-              impid: 'impid1',
+              impid: 'bid-banner',
               price: 0.3,
               crid: 321,
               adm: '',
               w: 300,
               h: 250,
               adomain: ['example.com'],
+              ext: {
+                prebid: {
+                  type: 'banner'
+                }
+              }
             }
           ]
         }],
@@ -255,18 +341,48 @@ describe('Adserver.Online bidding adapter', function () {
 
     const videoResponse = {
       body: {
-        id: 'auctionid2',
-        bidid: 'bidid2',
         seatbid: [{
           bid: [
             {
-              impid: 'impid2',
+              impid: 'bid-video',
               price: 0.5,
               crid: 123,
               adm: '',
               adomain: ['example.com'],
               w: 640,
               h: 480,
+              ext: {
+                prebid: {
+                  type: 'video'
+                }
+              }
+            }
+          ]
+        }],
+        cur: 'USD'
+      },
+    };
+
+    const nativeResponse = {
+      body: {
+        seatbid: [{
+          bid: [
+            {
+              impid: 'bid-native',
+              price: 0.5,
+              crid: 123,
+              adm: JSON.stringify({
+                assets: [
+                  {id: 0, title: {text: 'Title'}},
+                  {id: 1, img: {type: 3, url: 'https://img'}},
+                ],
+              }),
+              adomain: ['example.com'],
+              ext: {
+                prebid: {
+                  type: 'native'
+                }
+              }
             }
           ]
         }],
@@ -275,47 +391,59 @@ describe('Adserver.Online bidding adapter', function () {
     };
 
     it('handles banner responses', function () {
-      bannerRequest.bidRequest = {
-        mediaType: BANNER
-      };
-      const result = spec.interpretResponse(bannerResponse, bannerRequest);
-
-      expect(result).to.have.lengthOf(1);
-
-      expect(result[0]).to.exist;
-      expect(result[0].width).to.equal(300);
-      expect(result[0].height).to.equal(250);
-      expect(result[0].mediaType).to.equal(BANNER);
-      expect(result[0].creativeId).to.equal(321);
-      expect(result[0].cpm).to.be.within(0.1, 0.5);
-      expect(result[0].ad).to.equal('');
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].netRevenue).to.equal(true);
-      expect(result[0].ttl).to.equal(300);
-      expect(result[0].dealId).to.not.exist;
-      expect(result[0].meta.advertiserDomains[0]).to.equal('example.com');
+      const request = spec.buildRequests([bannerRequest], bidderRequest)[0];
+      const bids = spec.interpretResponse(bannerResponse, request);
+
+      expect(bids).to.have.lengthOf(1);
+
+      expect(bids[0]).to.exist;
+      expect(bids[0].width).to.equal(300);
+      expect(bids[0].height).to.equal(250);
+      expect(bids[0].mediaType).to.equal(BANNER);
+      expect(bids[0].creativeId).to.equal(321);
+      expect(bids[0].cpm).to.be.within(0.1, 0.5);
+      expect(bids[0].ad).to.equal('');
+      expect(bids[0].currency).to.equal('USD');
+      expect(bids[0].netRevenue).to.equal(true);
+      expect(bids[0].ttl).to.equal(300);
+      expect(bids[0].dealId).to.not.exist;
+      expect(bids[0].meta.advertiserDomains[0]).to.equal('example.com');
     });
 
-    it('handles video responses', function () {
-      const request = {
-        bidRequest: videoRequest
-      };
-      request.bidRequest.mediaType = VIDEO;
-
-      const result = spec.interpretResponse(videoResponse, request);
-      expect(result).to.have.lengthOf(1);
-
-      expect(result[0].width).to.equal(640);
-      expect(result[0].height).to.equal(480);
-      expect(result[0].mediaType).to.equal(VIDEO);
-      expect(result[0].creativeId).to.equal(123);
-      expect(result[0].cpm).to.equal(0.5);
-      expect(result[0].vastXml).to.equal('');
-      expect(result[0].renderer).to.be.a('object');
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].netRevenue).to.equal(true);
-      expect(result[0].ttl).to.equal(300);
-    });
+    if (FEATURES.VIDEO) {
+      it('handles video responses', function () {
+        const request = spec.buildRequests([videoRequest], bidderRequest)[0];
+        const bids = spec.interpretResponse(videoResponse, request);
+        expect(bids).to.have.lengthOf(1);
+
+        expect(bids[0].width).to.equal(640);
+        expect(bids[0].height).to.equal(480);
+        expect(bids[0].mediaType).to.equal(VIDEO);
+        expect(bids[0].creativeId).to.equal(123);
+        expect(bids[0].cpm).to.equal(0.5);
+        expect(bids[0].vastXml).to.equal('');
+        expect(bids[0].currency).to.equal('USD');
+        expect(bids[0].netRevenue).to.equal(true);
+        expect(bids[0].ttl).to.equal(300);
+      });
+    }
+
+    if (FEATURES.NATIVE) {
+      it('handles native responses', function () {
+        const request = spec.buildRequests([nativeRequest], bidderRequest)[0];
+        const bids = spec.interpretResponse(nativeResponse, request);
+        expect(bids).to.have.lengthOf(1);
+
+        expect(bids[0].mediaType).to.equal(NATIVE);
+        expect(bids[0].creativeId).to.equal(123);
+        expect(bids[0].cpm).to.equal(0.5);
+        expect(bids[0].currency).to.equal('USD');
+        expect(bids[0].netRevenue).to.equal(true);
+        expect(bids[0].ttl).to.equal(300);
+
+        expect(bids[0].native.ortb.assets).to.have.lengthOf(2);
+      });
+    }
 
     it('handles empty responses', function () {
       const response = [];
@@ -331,11 +459,27 @@ describe('Adserver.Online bidding adapter', function () {
       };
 
       it('should return iframe sync option', function () {
-        expect(spec.getUserSyncs(syncOptions, [bannerResponse], gdprConsent, uspConsent)[0].type).to.equal('iframe');
-        expect(spec.getUserSyncs(syncOptions, [bannerResponse], gdprConsent, uspConsent)[0].url).to.equal(
-          'sync_url?gdpr=1&consents_str=consentString&consents=1%2C2&us_privacy=usp_consent&'
+        const syncs = spec.getUserSyncs(syncOptions, [bannerResponse], gdprConsent, uspConsent);
+        expect(syncs).to.have.lengthOf(1);
+        expect(syncs[0].type).to.equal('iframe');
+        expect(syncs[0].url).to.equal(
+          'sync_url?gdpr=1&consents_str=consentString&consents=1%2C2&us_privacy=usp_consent'
         );
       });
+
+      it('should return iframe sync option - gdpr not applies', function () {
+        const syncs = spec.getUserSyncs(syncOptions, [bannerResponse], gdprNotApplies, uspConsent);
+        expect(syncs).to.have.lengthOf(1);
+
+        expect(syncs[0].url).to.equal(
+          'sync_url?us_privacy=usp_consent'
+        );
+      });
+
+      it('should return no sync option', function () {
+        const syncs = spec.getUserSyncs(syncOptions, [videoResponse], gdprNotApplies, uspConsent);
+        expect(syncs).to.have.lengthOf(0);
+      });
     });
   });
 });
diff --git a/test/spec/modules/asteriobidAnalyticsAdapter_spec.js b/test/spec/modules/asteriobidAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..7c336d2a885
--- /dev/null
+++ b/test/spec/modules/asteriobidAnalyticsAdapter_spec.js
@@ -0,0 +1,151 @@
+import asteriobidAnalytics, {storage} from 'modules/asteriobidAnalyticsAdapter.js';
+import {expect} from 'chai';
+import {server} from 'test/mocks/xhr.js';
+import * as utils from 'src/utils.js';
+import {expectEvents} from '../../helpers/analytics.js';
+import { EVENTS } from 'src/constants.js';
+
+let events = require('src/events');
+
+describe('AsterioBid Analytics Adapter', function () {
+  let bidWonEvent = {
+    'bidderCode': 'appnexus',
+    'width': 300,
+    'height': 250,
+    'adId': '1ebb82ec35375e',
+    'mediaType': 'banner',
+    'cpm': 0.5,
+    'requestId': '1582271863760569973',
+    'creative_id': '96846035',
+    'creativeId': '96846035',
+    'ttl': 60,
+    'currency': 'USD',
+    'netRevenue': true,
+    'auctionId': '9c7b70b9-b6ab-4439-9e71-b7b382797c18',
+    'responseTimestamp': 1537521629657,
+    'requestTimestamp': 1537521629331,
+    'bidder': 'appnexus',
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'timeToRespond': 326,
+    'size': '300x250',
+    'status': 'rendered',
+    'eventType': 'bidWon',
+    'ad': 'some ad',
+    'adUrl': 'ad url'
+  };
+
+  describe('AsterioBid Analytic tests', function () {
+    beforeEach(function () {
+      sinon.stub(events, 'getEvents').returns([]);
+    });
+
+    afterEach(function () {
+      asteriobidAnalytics.disableAnalytics();
+      events.getEvents.restore();
+    });
+
+    it('support custom endpoint', function () {
+      let custom_url = 'custom url';
+      asteriobidAnalytics.enableAnalytics({
+        provider: 'asteriobid',
+        options: {
+          url: custom_url,
+          bundleId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+        }
+      });
+
+      expect(asteriobidAnalytics.getOptions().url).to.equal(custom_url);
+    });
+
+    it('bid won event', function() {
+      let bundleId = 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx';
+      asteriobidAnalytics.enableAnalytics({
+        provider: 'asteriobid',
+        options: {
+          bundleId: bundleId
+        }
+      });
+
+      events.emit(EVENTS.BID_WON, bidWonEvent);
+      asteriobidAnalytics.flush();
+
+      expect(server.requests.length).to.equal(1);
+      expect(server.requests[0].url).to.equal('https://endpt.asteriobid.com/endpoint');
+      expect(server.requests[0].requestBody.substring(0, 2)).to.equal('1:');
+
+      const pmEvents = JSON.parse(server.requests[0].requestBody.substring(2));
+      expect(pmEvents.pageViewId).to.exist;
+      expect(pmEvents.bundleId).to.equal(bundleId);
+      expect(pmEvents.ver).to.equal(1);
+      expect(pmEvents.events.length).to.equal(1);
+      expect(pmEvents.events[0].eventType).to.equal('bidWon');
+      expect(pmEvents.events[0].ad).to.be.undefined;
+      expect(pmEvents.events[0].adUrl).to.be.undefined;
+    });
+
+    it('track event without errors', function () {
+      sinon.spy(asteriobidAnalytics, 'track');
+
+      asteriobidAnalytics.enableAnalytics({
+        provider: 'asteriobid',
+        options: {
+          bundleId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+        }
+      });
+
+      expectEvents().to.beTrackedBy(asteriobidAnalytics.track);
+    });
+  });
+
+  describe('build utm tag data', function () {
+    let getDataFromLocalStorageStub;
+    this.timeout(4000)
+    beforeEach(function () {
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+      getDataFromLocalStorageStub.withArgs('pm_utm_source').returns('utm_source');
+      getDataFromLocalStorageStub.withArgs('pm_utm_medium').returns('utm_medium');
+      getDataFromLocalStorageStub.withArgs('pm_utm_campaign').returns('utm_camp');
+      getDataFromLocalStorageStub.withArgs('pm_utm_term').returns('');
+      getDataFromLocalStorageStub.withArgs('pm_utm_content').returns('');
+    });
+    afterEach(function () {
+      getDataFromLocalStorageStub.restore();
+      asteriobidAnalytics.disableAnalytics()
+    });
+    it('should build utm data from local storage', function () {
+      asteriobidAnalytics.enableAnalytics({
+        provider: 'asteriobid',
+        options: {
+          bundleId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+        }
+      });
+
+      const pmEvents = JSON.parse(server.requests[0].requestBody.substring(2));
+
+      expect(pmEvents.utmTags.utm_source).to.equal('utm_source');
+      expect(pmEvents.utmTags.utm_medium).to.equal('utm_medium');
+      expect(pmEvents.utmTags.utm_campaign).to.equal('utm_camp');
+      expect(pmEvents.utmTags.utm_term).to.equal('');
+      expect(pmEvents.utmTags.utm_content).to.equal('');
+    });
+  });
+
+  describe('build page info', function () {
+    afterEach(function () {
+      asteriobidAnalytics.disableAnalytics()
+    });
+    it('should build page info', function () {
+      asteriobidAnalytics.enableAnalytics({
+        provider: 'asteriobid',
+        options: {
+          bundleId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+        }
+      });
+
+      const pmEvents = JSON.parse(server.requests[0].requestBody.substring(2));
+
+      expect(pmEvents.pageInfo.domain).to.equal(window.location.hostname);
+      expect(pmEvents.pageInfo.referrerDomain).to.equal(utils.parseUrl(document.referrer).hostname);
+    });
+  });
+});
diff --git a/test/spec/modules/atsAnalyticsAdapter_spec.js b/test/spec/modules/atsAnalyticsAdapter_spec.js
index 2316f96ec8e..3440cb1efbb 100644
--- a/test/spec/modules/atsAnalyticsAdapter_spec.js
+++ b/test/spec/modules/atsAnalyticsAdapter_spec.js
@@ -5,10 +5,10 @@ import {server} from '../../mocks/xhr.js';
 import {parseBrowser} from '../../../modules/atsAnalyticsAdapter.js';
 import {getCoreStorageManager, getStorageManager} from '../../../src/storageManager.js';
 import {analyticsUrl} from '../../../modules/atsAnalyticsAdapter.js';
-let utils = require('src/utils');
+import {EVENTS} from 'src/constants.js';
 
+let utils = require('src/utils');
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 const storage = getCoreStorageManager();
 let sandbox;
@@ -160,22 +160,22 @@ describe('ats analytics adapter', function () {
       });
 
       // Step 1: Send auction init event
-      events.emit(constants.EVENTS.AUCTION_INIT, {
+      events.emit(EVENTS.AUCTION_INIT, {
         timestamp: auctionTimestamp
       });
       // Step 2: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
+      events.emit(EVENTS.BID_REQUESTED, bidRequest);
 
       // Step 3: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+      events.emit(EVENTS.BID_RESPONSE, bidResponse);
 
       // Step 4: Send bid time out event
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeoutArgsV1);
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeoutArgsV1);
 
       // Step 5: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(EVENTS.AUCTION_END, {});
       // Step 6: Send bid won event
-      events.emit(constants.EVENTS.BID_WON, wonRequest);
+      events.emit(EVENTS.BID_WON, wonRequest);
 
       sandbox.stub($$PREBID_GLOBAL$$, 'getAllWinningBids').callsFake((key) => {
         return [wonRequest]
diff --git a/test/spec/modules/audiencerunBidAdapter_spec.js b/test/spec/modules/audiencerunBidAdapter_spec.js
index 5c736345068..65349409e5e 100644
--- a/test/spec/modules/audiencerunBidAdapter_spec.js
+++ b/test/spec/modules/audiencerunBidAdapter_spec.js
@@ -60,22 +60,22 @@ describe('AudienceRun bid adapter tests', function () {
     });
 
     it('should return true when zoneId is valid', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         zoneId: '12345abcde',
       };
 
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(true);
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
 
-      bid.params = {};
+      invalidBid.params = {};
 
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/automatadAnalyticsAdapter_spec.js b/test/spec/modules/automatadAnalyticsAdapter_spec.js
index e591f7e8e95..8b566280cc6 100644
--- a/test/spec/modules/automatadAnalyticsAdapter_spec.js
+++ b/test/spec/modules/automatadAnalyticsAdapter_spec.js
@@ -3,9 +3,21 @@ import * as utils from 'src/utils.js';
 
 import spec, {self as exports} from 'modules/automatadAnalyticsAdapter.js';
 
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 import { expect } from 'chai';
 
+const obj = {
+  auctionInitHandler: (args) => {},
+  bidResponseHandler: (args) => {},
+  bidderDoneHandler: (args) => {},
+  bidWonHandler: (args) => {},
+  noBidHandler: (args) => {},
+  auctionDebugHandler: (args) => {},
+  bidderTimeoutHandler: (args) => {},
+  bidRequestedHandler: (args) => {},
+  bidRejectedHandler: (args) => {}
+}
+
 const {
   AUCTION_DEBUG,
   BID_REQUESTED,
@@ -16,7 +28,7 @@ const {
   BID_TIMEOUT,
   BID_WON,
   NO_BID
-} = CONSTANTS.EVENTS
+} = EVENTS
 
 const CONFIG_WITH_DEBUG = {
   provider: 'atmtdAnalyticsAdapter',
@@ -117,20 +129,10 @@ describe('Automatad Analytics Adapter', () => {
   describe('Behaviour of the adapter when the sdk has loaded', () => {
     before(() => {
       spec.enableAnalytics(CONFIG_WITH_DEBUG);
-      const obj = {
-        auctionInitHandler: (args) => {},
-        bidResponseHandler: (args) => {},
-        bidderDoneHandler: (args) => {},
-        bidWonHandler: (args) => {},
-        noBidHandler: (args) => {},
-        auctionDebugHandler: (args) => {},
-        bidderTimeoutHandler: (args) => {},
-        bidRequestedHandler: (args) => {},
-        bidRejectedHandler: (args) => {}
-      }
 
       global.window.atmtdAnalytics = obj
-
+      exports.qBeingUsed = false
+      exports.qTraversalComplete = undefined
       Object.keys(obj).forEach((fn) => sandbox.spy(global.window.atmtdAnalytics, fn))
     })
     beforeEach(() => {
@@ -143,8 +145,12 @@ describe('Automatad Analytics Adapter', () => {
       sandbox.restore();
     });
     after(() => {
+      const handlers = global.window.atmtdAnalytics
+      Object.keys(handlers).forEach((handler) => global.window.atmtdAnalytics[handler].reset())
       global.window.atmtdAnalytics = undefined;
       spec.disableAnalytics();
+      exports.qBeingUsed = false
+      exports.qTraversalComplete = undefined
     })
 
     it('Should call the auctionInitHandler when the auction init event is fired', () => {
@@ -298,6 +304,85 @@ describe('Automatad Analytics Adapter', () => {
     });
   });
 
+  describe('Behaviour of the adapter when the SDK has loaded midway', () => {
+    before(() => {
+      spec.enableAnalytics(CONFIG_WITH_DEBUG);
+    })
+    beforeEach(() => {
+      sandbox = sinon.createSandbox();
+
+      global.window.atmtdAnalytics = undefined
+
+      exports.qBeingUsed = undefined
+      exports.qTraversalComplete = undefined
+      exports.queuePointer = 0
+      exports.retryCount = 0
+      exports.__atmtdAnalyticsQueue.length = 0
+
+      clock = sandbox.useFakeTimers();
+
+      sandbox.spy(exports.__atmtdAnalyticsQueue, 'push')
+    });
+    afterEach(() => {
+      sandbox.restore();
+    });
+    after(() => {
+      spec.disableAnalytics();
+    })
+
+    it('Should push to the que when the auctionInit event is fired and push to the que even after SDK has loaded after auctionInit event', () => {
+      events.emit(BID_RESPONSE, {type: BID_RESPONSE})
+      expect(exports.__atmtdAnalyticsQueue.push.called).to.equal(true)
+      expect(exports.__atmtdAnalyticsQueue).to.be.an('array').to.have.lengthOf(1)
+      expect(exports.__atmtdAnalyticsQueue[0]).to.have.lengthOf(2)
+      expect(exports.__atmtdAnalyticsQueue[0][0]).to.equal(BID_RESPONSE)
+      expect(exports.__atmtdAnalyticsQueue[0][1].type).to.equal(BID_RESPONSE)
+      expect(exports.qBeingUsed).to.equal(true)
+      expect(exports.qTraversalComplete).to.equal(undefined)
+      global.window.atmtdAnalytics = obj
+      events.emit(BID_RESPONSE, {type: BID_RESPONSE})
+      expect(exports.__atmtdAnalyticsQueue.push.calledTwice).to.equal(true)
+      expect(exports.__atmtdAnalyticsQueue).to.be.an('array').to.have.lengthOf(2)
+      expect(exports.__atmtdAnalyticsQueue[1]).to.have.lengthOf(2)
+      expect(exports.__atmtdAnalyticsQueue[1][0]).to.equal(BID_RESPONSE)
+      expect(exports.__atmtdAnalyticsQueue[1][1].type).to.equal(BID_RESPONSE)
+      expect(exports.qBeingUsed).to.equal(true)
+      expect(exports.qTraversalComplete).to.equal(undefined)
+    });
+
+    it('Should push to the que when the auctionInit event is fired and push to the analytics adapter handler after the que is processed', () => {
+      expect(exports.qBeingUsed).to.equal(undefined)
+      events.emit(AUCTION_INIT, {type: AUCTION_INIT})
+      global.window.atmtdAnalytics = {...obj}
+      const handlers = global.window.atmtdAnalytics
+      Object.keys(handlers).forEach((handler) => global.window.atmtdAnalytics[handler].reset())
+      expect(exports.__atmtdAnalyticsQueue.push.called).to.equal(true)
+      expect(exports.__atmtdAnalyticsQueue).to.be.an('array').to.have.lengthOf(1)
+      expect(exports.__atmtdAnalyticsQueue[0]).to.have.lengthOf(2)
+      expect(exports.__atmtdAnalyticsQueue[0][0]).to.equal(AUCTION_INIT)
+      expect(exports.__atmtdAnalyticsQueue[0][1].type).to.equal(AUCTION_INIT)
+      expect(exports.qBeingUsed).to.equal(true)
+      expect(exports.qTraversalComplete).to.equal(undefined)
+      expect(global.window.atmtdAnalytics.auctionInitHandler.callCount).to.equal(0)
+      clock.tick(2000)
+      expect(exports.qBeingUsed).to.equal(true)
+      expect(exports.qTraversalComplete).to.equal(undefined)
+      events.emit(NO_BID, {type: NO_BID})
+      expect(exports.__atmtdAnalyticsQueue).to.be.an('array').to.have.lengthOf(2)
+      expect(exports.__atmtdAnalyticsQueue.push.calledTwice).to.equal(true)
+      clock.tick(1500)
+      expect(exports.qBeingUsed).to.equal(false)
+      expect(exports.qTraversalComplete).to.equal(true)
+      events.emit(BID_RESPONSE, {type: BID_RESPONSE})
+      expect(exports.__atmtdAnalyticsQueue).to.be.an('array').to.have.lengthOf(2)
+      expect(exports.__atmtdAnalyticsQueue.push.calledTwice).to.equal(true)
+      expect(exports.__atmtdAnalyticsQueue.push.calledThrice).to.equal(false)
+      expect(global.window.atmtdAnalytics.auctionInitHandler.calledOnce).to.equal(true)
+      expect(global.window.atmtdAnalytics.noBidHandler.calledOnce).to.equal(true)
+      expect(global.window.atmtdAnalytics.bidResponseHandler.calledOnce).to.equal(true)
+    });
+  });
+
   describe('Process Events from Que when SDK still has not loaded', () => {
     before(() => {
       spec.enableAnalytics({
@@ -312,6 +397,8 @@ describe('Automatad Analytics Adapter', () => {
       sandbox.stub(exports.__atmtdAnalyticsQueue, 'push').callsFake((args) => {
         Array.prototype.push.apply(exports.__atmtdAnalyticsQueue, [args]);
       })
+      exports.queuePointer = 0;
+      exports.retryCount = 0;
     })
     beforeEach(() => {
       sandbox = sinon.createSandbox();
@@ -326,7 +413,6 @@ describe('Automatad Analytics Adapter', () => {
       sandbox.restore();
       exports.queuePointer = 0;
       exports.retryCount = 0;
-      exports.__atmtdAnalyticsQueue = []
       spec.disableAnalytics();
     })
 
@@ -437,7 +523,6 @@ describe('Automatad Analytics Adapter', () => {
         }
       });
       sandbox = sinon.createSandbox();
-      sandbox.reset()
       const obj = {
         auctionInitHandler: (args) => {},
         bidResponseHandler: (args) => {},
@@ -473,8 +558,10 @@ describe('Automatad Analytics Adapter', () => {
         ['impressionViewable', {type: 'impressionViewable'}]
       ]
     });
-    after(() => {
+    afterEach(() => {
       sandbox.restore();
+    })
+    after(() => {
       spec.disableAnalytics();
     })
 
diff --git a/test/spec/modules/axisBidAdapter_spec.js b/test/spec/modules/axisBidAdapter_spec.js
index 083f05f5c0a..2db6c907851 100644
--- a/test/spec/modules/axisBidAdapter_spec.js
+++ b/test/spec/modules/axisBidAdapter_spec.js
@@ -3,9 +3,19 @@ import { spec } from '../../../modules/axisBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'axis'
+const bidder = 'axis';
 
 describe('AxisBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -19,7 +29,8 @@ describe('AxisBidAdapter', function () {
       params: {
         integration: '000000',
         token: '000000'
-      }
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -35,7 +46,8 @@ describe('AxisBidAdapter', function () {
       params: {
         integration: '000000',
         token: '000000'
-      }
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -59,7 +71,8 @@ describe('AxisBidAdapter', function () {
       params: {
         integration: '000000',
         token: '000000'
-      }
+      },
+      userIdAsEids
     }
   ];
 
@@ -78,15 +91,25 @@ describe('AxisBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
     },
     ortb2: {
       site: {
         cat: ['IAB24']
+      },
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
       }
-    }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
@@ -121,6 +144,7 @@ describe('AxisBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -139,7 +163,7 @@ describe('AxisBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.iabCat).to.have.lengthOf(1);
@@ -156,6 +180,7 @@ describe('AxisBidAdapter', function () {
         expect(placement.token).to.be.a('string');
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -183,8 +208,10 @@ describe('AxisBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -199,12 +226,38 @@ describe('AxisBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -410,5 +463,17 @@ describe('AxisBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://cs.axis-marketplace.com/image?pbjs=1&ccpa=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.axis-marketplace.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/azerionedgeRtdProvider_spec.js b/test/spec/modules/azerionedgeRtdProvider_spec.js
new file mode 100644
index 00000000000..0eef82a2512
--- /dev/null
+++ b/test/spec/modules/azerionedgeRtdProvider_spec.js
@@ -0,0 +1,198 @@
+import { config } from 'src/config.js';
+import * as azerionedgeRTD from 'modules/azerionedgeRtdProvider.js';
+import { loadExternalScript } from '../../../src/adloader.js';
+
+describe('Azerion Edge RTD submodule', function () {
+  const STORAGE_KEY = 'ht-pa-v1-a';
+  const USER_AUDIENCES = [
+    { id: '1', visits: 123 },
+    { id: '2', visits: 456 },
+  ];
+  const IMPROVEDIGITAL_GVLID = '253';
+  const key = 'publisher123';
+  const bidders = ['appnexus', 'improvedigital'];
+  const process = { key: 'value' };
+  const dataProvider = { name: 'azerionedge', waitForIt: true };
+  const userConsent = {gdpr: {gdprApplies: 'gdpr-applies', consentString: 'consent-string'}, usp: 'usp'};
+
+  const resetAll = () => {
+    window.azerionPublisherAudiences.resetHistory();
+    loadExternalScript.resetHistory();
+  }
+
+  let reqBidsConfigObj;
+  let storageStub;
+
+  beforeEach(function () {
+    config.resetConfig();
+    reqBidsConfigObj = { ortb2Fragments: { bidder: {} } };
+    window.azerionPublisherAudiences = sinon.spy();
+    storageStub = sinon.stub(azerionedgeRTD.storage, 'getDataFromLocalStorage');
+  });
+
+  afterEach(function () {
+    delete window.azerionPublisherAudiences;
+    storageStub.restore();
+  });
+
+  describe('initialisation', function () {
+    let returned;
+
+    beforeEach(function () {
+      returned = azerionedgeRTD.azerionedgeSubmodule.init(dataProvider, userConsent);
+    });
+
+    it('should have the correct gvlid', () => {
+      expect(azerionedgeRTD.azerionedgeSubmodule.gvlid).to.equal(IMPROVEDIGITAL_GVLID);
+    });
+
+    it('should return true', function () {
+      expect(returned).to.equal(true);
+    });
+
+    it('should load external script', function () {
+      expect(loadExternalScript.called).to.be.true;
+    });
+
+    it('should load external script with default versioned url', function () {
+      const expected = 'https://edge.hyth.io/js/v1/azerion-edge.min.js';
+      expect(loadExternalScript.args[0][0]).to.deep.equal(expected);
+    });
+
+    [
+      ['gdprApplies', userConsent.gdpr.gdprApplies],
+      ['gdprConsent', userConsent.gdpr.consentString],
+      ['uspConsent', userConsent.usp],
+    ].forEach(([key, value]) => {
+      it(`should call azerionPublisherAudiencesStub with ${key}:${value}`, function () {
+        expect(window.azerionPublisherAudiences.args[0][0]).to.include({[key]: value});
+      });
+    });
+
+    describe('with key', function () {
+      beforeEach(function () {
+        resetAll();
+        const config = { ...dataProvider, params: { key } };
+        returned = azerionedgeRTD.azerionedgeSubmodule.init(config, userConsent);
+      });
+
+      it('should return true', function () {
+        expect(returned).to.equal(true);
+      });
+
+      it('should load external script with publisher id url', function () {
+        const expected = `https://edge.hyth.io/js/v1/${key}/azerion-edge.min.js`;
+        expect(loadExternalScript.args[0][0]).to.deep.equal(expected);
+      });
+    });
+
+    describe('with process configuration', function () {
+      beforeEach(function () {
+        resetAll();
+        const config = { ...dataProvider, params: { process } };
+        returned = azerionedgeRTD.azerionedgeSubmodule.init(config, userConsent);
+      });
+
+      it('should return true', function () {
+        expect(returned).to.equal(true);
+      });
+
+      [
+        ['gdprApplies', userConsent.gdpr.gdprApplies],
+        ['gdprConsent', userConsent.gdpr.consentString],
+        ['uspConsent', userConsent.usp],
+        ...Object.entries(process),
+      ].forEach(([key, value]) => {
+        it(`should call azerionPublisherAudiencesStub with ${key}:${value}`, function () {
+          expect(window.azerionPublisherAudiences.args[0][0]).to.include({[key]: value});
+        });
+      });
+    });
+  });
+
+  describe('gets audiences', function () {
+    let callbackStub;
+
+    beforeEach(function () {
+      callbackStub = sinon.mock();
+    });
+
+    describe('with empty storage', function () {
+      beforeEach(function () {
+        azerionedgeRTD.azerionedgeSubmodule.getBidRequestData(
+          reqBidsConfigObj,
+          callbackStub,
+          dataProvider
+        );
+      });
+
+      it('does not apply audiences to bidders', function () {
+        expect(reqBidsConfigObj.ortb2Fragments.bidder).to.deep.equal({});
+      });
+
+      it('calls callback anyway', function () {
+        expect(callbackStub.called).to.be.true;
+      });
+    });
+
+    describe('with populate storage', function () {
+      beforeEach(function () {
+        storageStub
+          .withArgs(STORAGE_KEY)
+          .returns(JSON.stringify(USER_AUDIENCES));
+        azerionedgeRTD.azerionedgeSubmodule.getBidRequestData(
+          reqBidsConfigObj,
+          callbackStub,
+          dataProvider
+        );
+      });
+
+      it('does apply audiences to bidder', function () {
+        const segments =
+          reqBidsConfigObj.ortb2Fragments.bidder['improvedigital'].user.data[0]
+            .segment;
+        expect(segments).to.deep.equal([{ id: '1' }, { id: '2' }]);
+      });
+
+      it('calls callback always', function () {
+        expect(callbackStub.called).to.be.true;
+      });
+    });
+  });
+
+  describe('sets audiences in bidder', function () {
+    const audiences = USER_AUDIENCES.map(({ id }) => id);
+    const expected = {
+      user: {
+        data: [
+          {
+            ext: { segtax: 4 },
+            name: 'azerionedge',
+            segment: [{ id: '1' }, { id: '2' }],
+          },
+        ],
+      },
+    };
+
+    it('for improvedigital by default', function () {
+      azerionedgeRTD.setAudiencesToBidders(
+        reqBidsConfigObj,
+        dataProvider,
+        audiences
+      );
+      expect(
+        reqBidsConfigObj.ortb2Fragments.bidder['improvedigital']
+      ).to.deep.equal(expected);
+    });
+
+    bidders.forEach((bidder) => {
+      it(`for ${bidder}`, function () {
+        const config = { ...dataProvider, params: { bidders } };
+        azerionedgeRTD.setAudiencesToBidders(reqBidsConfigObj, config, audiences);
+        expect(reqBidsConfigObj.ortb2Fragments.bidder[bidder]).to.deep.equal(
+          expected
+        );
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/beachfrontBidAdapter_spec.js b/test/spec/modules/beachfrontBidAdapter_spec.js
index c0994985aae..2e766487951 100644
--- a/test/spec/modules/beachfrontBidAdapter_spec.js
+++ b/test/spec/modules/beachfrontBidAdapter_spec.js
@@ -245,14 +245,14 @@ describe('BeachfrontAdapter', function () {
         const mimes = ['video/webm'];
         const playbackmethod = 2;
         const maxduration = 30;
-        const placement = 4;
+        const plcmt = 4;
         const skip = 1;
         bidRequest.mediaTypes = {
-          video: { mimes, playbackmethod, maxduration, placement, skip }
+          video: { mimes, playbackmethod, maxduration, plcmt, skip }
         };
         const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
-        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, placement, skip });
+        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, plcmt, skip });
       });
 
       it('must override video params from the bidder object', function () {
@@ -260,13 +260,13 @@ describe('BeachfrontAdapter', function () {
         const mimes = ['video/webm'];
         const playbackmethod = 2;
         const maxduration = 30;
-        const placement = 4;
+        const plcmt = 4;
         const skip = 1;
-        bidRequest.mediaTypes = { video: { placement: 3, skip: 0 } };
-        bidRequest.params.video = { mimes, playbackmethod, maxduration, placement, skip };
+        bidRequest.mediaTypes = { video: { plcmt: 3, skip: 0 } };
+        bidRequest.params.video = { mimes, playbackmethod, maxduration, plcmt, skip };
         const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
-        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, placement, skip });
+        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, plcmt, skip });
       });
 
       it('must add US privacy data to the request', function () {
diff --git a/test/spec/modules/bedigitechBidAdapter_spec.js b/test/spec/modules/bedigitechBidAdapter_spec.js
index 20d4e86e0c4..336559e2812 100644
--- a/test/spec/modules/bedigitechBidAdapter_spec.js
+++ b/test/spec/modules/bedigitechBidAdapter_spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { spec } from 'modules/bedigitechBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
-import {BANNER} from 'src/mediaTypes.js';
+import { BANNER } from 'src/mediaTypes.js';
 
 describe('BedigitechAdapter', function () {
   const adapter = newBidder(spec);
@@ -34,13 +34,13 @@ describe('BedigitechAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      const bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      const invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'masterId': 0
       };
 
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -126,7 +126,9 @@ describe('BedigitechAdapter', function () {
         } else if (k === 'meta') {
           expect(result[0][k]).to.deep.equal(expectedResponse[0][k]);
         } else {
-          expect(result[0][k]).to.equal(expectedResponse[0][k]);
+          if (k !== 'requestId') {
+            expect(result[0][k]).to.equal(expectedResponse[0][k]);
+          }
         }
       });
     });
diff --git a/test/spec/modules/beopBidAdapter_spec.js b/test/spec/modules/beopBidAdapter_spec.js
index c77e304e539..3f06cd04910 100644
--- a/test/spec/modules/beopBidAdapter_spec.js
+++ b/test/spec/modules/beopBidAdapter_spec.js
@@ -2,6 +2,8 @@ import { expect } from 'chai';
 import { spec } from 'modules/beopBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { config } from 'src/config.js';
+import { setConfig as setCurrencyConfig } from '../../../modules/currency';
+import { addFPDToBidderRequest } from '../../helpers/fpd';
 const utils = require('src/utils');
 
 const ENDPOINT = 'https://hb.beop.io/bid';
@@ -92,18 +94,27 @@ describe('BeOp Bid Adapter tests', () => {
     bidRequests.push(validBid);
 
     it('should build the request', function () {
-      config.setConfig({'currency': {'adServerCurrency': 'USD'}});
-      const request = spec.buildRequests(bidRequests, {});
-      const payload = JSON.parse(request.data);
-      const url = request.url;
-      expect(url).to.equal(ENDPOINT);
-      expect(payload.pid).to.exist;
-      expect(payload.pid).to.equal('5a8af500c9e77c00017e4cad');
-      expect(payload.gdpr_applies).to.exist;
-      expect(payload.gdpr_applies).to.equals(false);
-      expect(payload.slts[0].name).to.exist;
-      expect(payload.slts[0].name).to.equal('bellow-article');
-      expect(payload.slts[0].flr).to.equal(10);
+      const bidderRequest = {
+        refererInfo: {
+          page: 'https://example.com'
+        }
+      };
+      setCurrencyConfig({ adServerCurrency: 'USD' })
+
+      return addFPDToBidderRequest(bidderRequest).then(res => {
+        const request = spec.buildRequests(bidRequests, res);
+        const payload = JSON.parse(request.data);
+        const url = request.url;
+        expect(url).to.equal(ENDPOINT);
+        expect(payload.pid).to.exist;
+        expect(payload.pid).to.equal('5a8af500c9e77c00017e4cad');
+        expect(payload.gdpr_applies).to.exist;
+        expect(payload.gdpr_applies).to.equals(false);
+        expect(payload.slts[0].name).to.exist;
+        expect(payload.slts[0].name).to.equal('bellow-article');
+        expect(payload.slts[0].flr).to.equal(10);
+        setCurrencyConfig({});
+      });
     });
 
     it('should call the endpoint with GDPR consent and pageURL info if found', function () {
@@ -132,7 +143,7 @@ describe('BeOp Bid Adapter tests', () => {
       expect(payload.url).to.equal('http://test.te');
     });
 
-    it('should call the endpoint with psegs and bpsegs (stringified) data if any or [] if none', function () {
+    it('should call the endpoint with bpsegs (stringified) data if any or [] if none', function () {
       let bidderRequest =
       {
         'ortb2': {
@@ -149,15 +160,14 @@ describe('BeOp Bid Adapter tests', () => {
 
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
-      expect(payload.psegs).to.exist;
-      expect(payload.psegs).to.include(1234);
-      expect(payload.psegs).to.include(5678);
-      expect(payload.psegs).to.include(910);
-      expect(payload.psegs).to.not.include(1);
       expect(payload.bpsegs).to.exist;
       expect(payload.bpsegs).to.include('axed');
       expect(payload.bpsegs).to.include('axec');
       expect(payload.bpsegs).to.include('1234');
+      expect(payload.bpsegs).to.include('1234');
+      expect(payload.bpsegs).to.include('5678');
+      expect(payload.bpsegs).to.include('910');
+      expect(payload.bpsegs).to.not.include('1');
 
       let bidderRequest2 =
       {
@@ -166,8 +176,6 @@ describe('BeOp Bid Adapter tests', () => {
 
       const request2 = spec.buildRequests(bidRequests, bidderRequest2);
       const payload2 = JSON.parse(request2.data);
-      expect(payload2.psegs).to.exist;
-      expect(payload2.psegs).to.be.empty;
       expect(payload2.bpsegs).to.exist;
       expect(payload2.bpsegs).to.be.empty;
     });
@@ -312,4 +320,34 @@ describe('BeOp Bid Adapter tests', () => {
       expect(payload.kwds).to.include('keywords');
     })
   })
+
+  describe('Ensure eids are get', function() {
+    let bidRequests = [];
+    afterEach(function () {
+      bidRequests = [];
+    });
+
+    it(`should get eids from bid`, function () {
+      let bid = Object.assign({}, validBid);
+      bid.userIdAsEids = [{source: 'provider.com', uids: [{id: 'someid', atype: 1, ext: {whatever: true}}]}];
+      bidRequests.push(bid);
+
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      expect(payload.eids).to.exist;
+      expect(payload.eids[0].source).to.equal('provider.com');
+    });
+  })
+
+  describe('Ensure first party cookie is well managed', function () {
+    let bidRequests = [];
+
+    it(`should generate a new uuid`, function () {
+      let bid = Object.assign({}, validBid);
+      bidRequests.push(bid);
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      expect(payload.fg).to.exist;
+    })
+  })
 });
diff --git a/test/spec/modules/beyondmediaBidAdapter_spec.js b/test/spec/modules/beyondmediaBidAdapter_spec.js
index 751b3ae1098..9f31294dc54 100644
--- a/test/spec/modules/beyondmediaBidAdapter_spec.js
+++ b/test/spec/modules/beyondmediaBidAdapter_spec.js
@@ -3,9 +3,19 @@ import { spec } from '../../../modules/beyondmediaBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'beyondmedia'
+const bidder = 'beyondmedia';
 
 describe('AndBeyondMediaBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -16,8 +26,9 @@ describe('AndBeyondMediaBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -30,8 +41,9 @@ describe('AndBeyondMediaBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -53,8 +65,9 @@ describe('AndBeyondMediaBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -73,9 +86,20 @@ describe('AndBeyondMediaBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
     timeout: 500
   };
@@ -83,8 +107,6 @@ describe('AndBeyondMediaBidAdapter', function () {
   describe('isBidRequestValid', function () {
     it('Should return true if there are bidId, params and key parameters present', function () {
       expect(spec.isBidRequestValid(bids[0])).to.be.true;
-      expect(spec.isBidRequestValid(bids[1])).to.be.true;
-      expect(spec.isBidRequestValid(bids[2])).to.be.true;
     });
     it('Should return false if at least one of parameters is not present', function () {
       expect(spec.isBidRequestValid(invalidBid)).to.be.false;
@@ -114,6 +136,7 @@ describe('AndBeyondMediaBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -131,7 +154,7 @@ describe('AndBeyondMediaBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -172,8 +195,10 @@ describe('AndBeyondMediaBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -188,12 +213,38 @@ describe('AndBeyondMediaBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -397,5 +448,17 @@ describe('AndBeyondMediaBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://cookies.andbeyond.media/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cookies.andbeyond.media/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/bidResponseFilter_spec.js b/test/spec/modules/bidResponseFilter_spec.js
new file mode 100644
index 00000000000..c4b4a776243
--- /dev/null
+++ b/test/spec/modules/bidResponseFilter_spec.js
@@ -0,0 +1,176 @@
+import {
+  addBidResponseHook,
+  BID_ADV_DOMAINS_REJECTION_REASON,
+  BID_ATTR_REJECTION_REASON,
+  BID_CATEGORY_REJECTION_REASON,
+  init,
+  MODULE_NAME
+  , reset} from '../../../modules/bidResponseFilter';
+import {config} from '../../../src/config';
+import {addBidResponse} from '../../../src/auction.js';
+
+describe('bidResponseFilter', () => {
+  let mockAuctionIndex
+  beforeEach(() => {
+    mockAuctionIndex = {
+      getBidRequest: () => {
+      },
+      getAdUnit: () => {
+      }
+    };
+  });
+  afterEach(() => {
+    config.resetConfig();
+    reset();
+  })
+
+  describe('enable/disable', () => {
+    let reject, dispatch;
+
+    beforeEach(() => {
+      reject = sinon.stub();
+      dispatch = sinon.stub();
+    });
+
+    it('should not run if not configured', () => {
+      reset();
+      addBidResponse.call({dispatch}, 'au', {}, reject);
+      sinon.assert.notCalled(reject);
+      sinon.assert.called(dispatch);
+    });
+
+    it('should run if configured', () => {
+      config.setConfig({
+        bidResponseFilter: {}
+      });
+      addBidResponse.call({dispatch}, 'au', {}, reject);
+      sinon.assert.called(reject);
+      sinon.assert.notCalled(dispatch);
+    })
+  });
+
+  it('should pass the bid after successful ortb2 rules validation', () => {
+    const call = sinon.stub();
+
+    mockAuctionIndex.getOrtb2 = () => ({
+      badv: [], bcat: ['BANNED_CAT1', 'BANNED_CAT2']
+    });
+
+    const bid = {
+      meta: {
+        advertiserDomains: ['domain1.com', 'domain2.com'],
+        primaryCatId: 'EXAMPLE-CAT-ID',
+        attr: 'attr'
+      }
+    };
+
+    addBidResponseHook(call, 'adcode', bid, () => {
+    }, mockAuctionIndex);
+    sinon.assert.calledOnce(call);
+  });
+
+  it('should reject the bid after failed ortb2 cat rule validation', () => {
+    const reject = sinon.stub();
+    const call = sinon.stub();
+    const bid = {
+      meta: {
+        advertiserDomains: ['domain1.com', 'domain2.com'],
+        primaryCatId: 'BANNED_CAT1',
+        attr: 'attr'
+      }
+    };
+    mockAuctionIndex.getOrtb2 = () => ({
+      badv: [], bcat: ['BANNED_CAT1', 'BANNED_CAT2']
+    });
+
+    addBidResponseHook(call, 'adcode', bid, reject, mockAuctionIndex);
+    sinon.assert.calledWith(reject, BID_CATEGORY_REJECTION_REASON);
+  });
+
+  it('should reject the bid after failed ortb2 adv domains rule validation', () => {
+    const rejection = sinon.stub();
+    const call = sinon.stub();
+    const bid = {
+      meta: {
+        advertiserDomains: ['domain1.com', 'domain2.com'],
+        primaryCatId: 'VALID_CAT',
+        attr: 'attr'
+      }
+    };
+    mockAuctionIndex.getOrtb2 = () => ({
+      badv: ['domain2.com'], bcat: ['BANNED_CAT1', 'BANNED_CAT2']
+    });
+
+    addBidResponseHook(call, 'adcode', bid, rejection, mockAuctionIndex);
+    sinon.assert.calledWith(rejection, BID_ADV_DOMAINS_REJECTION_REASON);
+  });
+
+  it('should reject the bid after failed ortb2 attr rule validation', () => {
+    const reject = sinon.stub();
+    const call = sinon.stub();
+    const bid = {
+      meta: {
+        advertiserDomains: ['validdomain1.com', 'validdomain2.com'],
+        primaryCatId: 'VALID_CAT',
+        attr: 'BANNED_ATTR'
+      },
+      mediaType: 'video'
+    };
+    mockAuctionIndex.getOrtb2 = () => ({
+      badv: ['domain2.com'], bcat: ['BANNED_CAT1', 'BANNED_CAT2']
+    });
+
+    mockAuctionIndex.getBidRequest = () => ({
+      ortb2Imp: {
+        video: {
+          battr: 'BANNED_ATTR'
+        }
+      }
+    })
+
+    addBidResponseHook(call, 'adcode', bid, reject, mockAuctionIndex);
+    sinon.assert.calledWith(reject, BID_ATTR_REJECTION_REASON);
+  });
+
+  it('should omit the validation if the flag is set to false', () => {
+    const call = sinon.stub();
+    const bid = {
+      meta: {
+        advertiserDomains: ['validdomain1.com', 'validdomain2.com'],
+        primaryCatId: 'BANNED_CAT1',
+        attr: 'valid_attr'
+      }
+    };
+
+    mockAuctionIndex.getOrtb2 = () => ({
+      badv: ['domain2.com'], bcat: ['BANNED_CAT1', 'BANNED_CAT2']
+    });
+
+    config.setConfig({[MODULE_NAME]: {cat: {enforce: false}}});
+
+    addBidResponseHook(call, 'adcode', bid, () => {
+    }, mockAuctionIndex);
+    sinon.assert.calledOnce(call);
+  });
+
+  it('should allow bid for unknown flag set to false', () => {
+    const call = sinon.stub();
+    const bid = {
+      meta: {
+        advertiserDomains: ['validdomain1.com', 'validdomain2.com'],
+        primaryCatId: undefined,
+        attr: 'valid_attr'
+      }
+    };
+
+    mockAuctionIndex.getOrtb2 = () => ({
+      badv: ['domain2.com'], bcat: ['BANNED_CAT1', 'BANNED_CAT2']
+    });
+
+    config.setConfig({[MODULE_NAME]: {cat: {blockUnknown: false}}});
+
+    addBidResponseHook(call, 'adcode', bid, () => {
+    });
+    sinon.assert.calledOnce(call);
+  });
+})
diff --git a/test/spec/modules/bidViewabilityIO_spec.js b/test/spec/modules/bidViewabilityIO_spec.js
index 5b4944082bc..e18d3bdca58 100644
--- a/test/spec/modules/bidViewabilityIO_spec.js
+++ b/test/spec/modules/bidViewabilityIO_spec.js
@@ -3,7 +3,7 @@ import * as events from 'src/events.js';
 import * as utils from 'src/utils.js';
 import * as sinon from 'sinon';
 import { expect } from 'chai';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 
 describe('#bidViewabilityIO', function() {
   const makeElement = (id) => {
@@ -97,7 +97,7 @@ describe('#bidViewabilityIO', function() {
       expect(mockObserver.unobserve.calledOnce).to.be.true;
       expect(emitSpy.calledOnce).to.be.true;
       // expect(emitSpy.firstCall.args).to.be.false;
-      expect(emitSpy.firstCall.args[0]).to.eq(CONSTANTS.EVENTS.BID_VIEWABLE);
+      expect(emitSpy.firstCall.args[0]).to.eq(EVENTS.BID_VIEWABLE);
     });
   })
 
diff --git a/test/spec/modules/bidViewability_spec.js b/test/spec/modules/bidViewability_spec.js
index 2d2e51abbe1..5dbf7d84c3c 100644
--- a/test/spec/modules/bidViewability_spec.js
+++ b/test/spec/modules/bidViewability_spec.js
@@ -5,7 +5,7 @@ import * as utils from 'src/utils.js';
 import * as sinon from 'sinon';
 import {expect, spy} from 'chai';
 import * as prebidGlobal from 'src/prebidGlobal.js';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 import adapterManager, { gdprDataHandler, uspDataHandler } from 'src/adapterManager.js';
 import parse from 'url-parse';
 
@@ -245,7 +245,7 @@ describe('#bidViewability', function() {
     let logWinningBidNotFoundSpy;
     let callBidViewableBidderSpy;
     let winningBidsArray;
-    let callBidBillableBidderSpy;
+    let triggerBillingSpy;
     let adUnits = [
       {
         'code': 'abc123',
@@ -262,7 +262,7 @@ describe('#bidViewability', function() {
       triggerPixelSpy = sandbox.spy(utils, ['triggerPixel']);
       eventsEmitSpy = sandbox.spy(events, ['emit']);
       callBidViewableBidderSpy = sandbox.spy(adapterManager, ['callBidViewableBidder']);
-      callBidBillableBidderSpy = sandbox.spy(adapterManager, ['callBidBillableBidder']);
+      triggerBillingSpy = sandbox.spy(adapterManager, ['triggerBilling']);
       // mocking winningBidsArray
       winningBidsArray = [];
       sandbox.stub(prebidGlobal, 'getGlobal').returns({
@@ -292,9 +292,9 @@ describe('#bidViewability', function() {
       let call = callBidViewableBidderSpy.getCall(0);
       expect(call.args[0]).to.equal(PBJS_WINNING_BID.bidder);
       expect(call.args[1]).to.deep.equal(PBJS_WINNING_BID);
-      // CONSTANTS.EVENTS.BID_VIEWABLE is triggered
+      // EVENTS.BID_VIEWABLE is triggered
       call = eventsEmitSpy.getCall(0);
-      expect(call.args[0]).to.equal(CONSTANTS.EVENTS.BID_VIEWABLE);
+      expect(call.args[0]).to.equal(EVENTS.BID_VIEWABLE);
       expect(call.args[1]).to.deep.equal(PBJS_WINNING_BID);
     });
 
@@ -303,26 +303,20 @@ describe('#bidViewability', function() {
       expect(triggerPixelSpy.callCount).to.equal(0);
       // adapterManager.callBidViewableBidder is NOT called
       expect(callBidViewableBidderSpy.callCount).to.equal(0);
-      // CONSTANTS.EVENTS.BID_VIEWABLE is NOT triggered
+      // EVENTS.BID_VIEWABLE is NOT triggered
       expect(eventsEmitSpy.callCount).to.equal(0);
     });
 
-    it('should call the callBidBillableBidder function if the viewable bid is associated with an ad unit with deferBilling set to true', function() {
+    it('should call the triggerBilling function if the viewable bid has deferBilling set to true', function() {
       let moduleConfig = {};
-      const deferredBillingAdUnit = {
-        'code': '/harshad/Jan/2021/',
-        'deferBilling': true,
-        'bids': [
-          {
-            'bidder': 'pubmatic'
-          }
-        ]
-      };
-      adUnits.push(deferredBillingAdUnit);
-      winningBidsArray.push(PBJS_WINNING_BID);
+      const bid = {
+        ...PBJS_WINNING_BID,
+        deferBilling: true
+      }
+      winningBidsArray.push(bid);
       bidViewability.impressionViewableHandler(moduleConfig, GPT_SLOT, null);
-      expect(callBidBillableBidderSpy.callCount).to.equal(1);
-      sinon.assert.calledWith(callBidBillableBidderSpy, PBJS_WINNING_BID);
+      expect(triggerBillingSpy.callCount).to.equal(1);
+      sinon.assert.calledWith(triggerBillingSpy, bid);
     });
   });
 });
diff --git a/test/spec/modules/bidglassAdapter_spec.js b/test/spec/modules/bidglassAdapter_spec.js
index 7b007f7cc1f..e0f85364933 100644
--- a/test/spec/modules/bidglassAdapter_spec.js
+++ b/test/spec/modules/bidglassAdapter_spec.js
@@ -23,10 +23,10 @@ describe('Bid Glass Adapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/bidmaticBidAdapter_spec.js b/test/spec/modules/bidmaticBidAdapter_spec.js
new file mode 100644
index 00000000000..225c2a6dce6
--- /dev/null
+++ b/test/spec/modules/bidmaticBidAdapter_spec.js
@@ -0,0 +1,309 @@
+import { expect } from 'chai';
+import { END_POINT, SYNC_URL, spec, createUserSyncs } from 'modules/bidmaticBidAdapter.js';
+import { deepClone, deepSetValue, mergeDeep } from '../../../src/utils';
+
+const expectedImp = {
+  'secure': 1,
+  'id': '2eb89f0f062afe',
+  'banner': {
+    'topframe': 0,
+    'format': [
+      {
+        'w': 300,
+        'h': 250
+      },
+      {
+        'w': 300,
+        'h': 600
+      }
+    ]
+  },
+  'bidfloor': 0,
+  'bidfloorcur': 'USD',
+  'tagid': 'div-gpt-ad-1460505748561-0'
+}
+
+describe('Bidmatic Bid Adapter', () => {
+  const GPID_RTB_EXT = {
+    'ortb2Imp': {
+      'ext': {
+        'gpid': 'gpId',
+      }
+    },
+  }
+  const FLOOR_RTB_EXT = {
+    'ortb2Imp': {
+      bidfloor: 1
+    },
+  }
+  const DEFAULT_BID_REQUEST = {
+    'id': '10bb57ee-712f-43e9-9769-b26d03df8a39',
+    'bidder': 'bidmatic',
+    'params': {
+      'source': 886409,
+    },
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ]
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'transactionId': '7d79850b-70aa-4c0f-af95-c1def0452825',
+    'sizes': [
+      [
+        300,
+        250
+      ],
+      [
+        300,
+        600
+      ]
+    ],
+    'bidId': '2eb89f0f062afe',
+    'bidderRequestId': '1ae6c8e18f8462',
+    'auctionId': '1286637c-51bc-4fdd-8e35-2435ec11775a',
+    'ortb2': {}
+  };
+
+  describe('adapter interface', () => {
+    const bidRequest = deepClone(DEFAULT_BID_REQUEST);
+
+    it('should validate params', () => {
+      expect(spec.isBidRequestValid({
+        params: {
+          source: 1
+        }
+      })).to.equal(true, 'source param must be a number');
+
+      expect(spec.isBidRequestValid({
+        params: {
+          source: '1'
+        }
+      })).to.equal(false, 'source param must be a number');
+
+      expect(spec.isBidRequestValid({})).to.equal(false, 'source param must be a number');
+    });
+
+    it('should build hb request', () => {
+      const [ortbRequest] = spec.buildRequests([bidRequest], {
+        bids: [bidRequest]
+      });
+
+      expect(ortbRequest.data.imp[0]).to.deep.equal(expectedImp);
+      expect(ortbRequest.data.cur).to.deep.equal(['USD']);
+    });
+
+    it('should request with source in url', () => {
+      const [ortbRequest] = spec.buildRequests([bidRequest], {
+        bids: [bidRequest]
+      });
+      expect(ortbRequest.url).to.equal(`${END_POINT}?source=886409`);
+    });
+
+    it('should split http reqs by sources', () => {
+      const bidRequest2 = mergeDeep(deepClone(DEFAULT_BID_REQUEST), {
+        params: {
+          source: 1111
+        }
+      });
+      const [ortbRequest1, ortbRequest2] = spec.buildRequests([bidRequest2, bidRequest, bidRequest2], {
+        bids: [bidRequest2, bidRequest, bidRequest2]
+      });
+      expect(ortbRequest1.url).to.equal(`${END_POINT}?source=1111`);
+      expect(ortbRequest1.data.imp.length).to.eq(2)
+      expect(ortbRequest2.url).to.equal(`${END_POINT}?source=886409`);
+      expect(ortbRequest2.data.imp.length).to.eq(1)
+    });
+
+    it('should grab bid floor info', () => {
+      const [ortbRequest] = spec.buildRequests([bidRequest], {
+        bids: [bidRequest]
+      });
+
+      expect(ortbRequest.data.imp[0].bidfloor).eq(0)
+      expect(ortbRequest.data.imp[0].bidfloorcur).eq('USD')
+    });
+
+    it('should grab bid floor info from exts', () => {
+      const bidRequest = mergeDeep(deepClone(DEFAULT_BID_REQUEST), FLOOR_RTB_EXT);
+      const [ortbRequest] = spec.buildRequests([bidRequest], {
+        bids: [bidRequest]
+      });
+
+      expect(ortbRequest.data.imp[0].bidfloor).eq(1)
+    });
+
+    it('should grab bid floor info from params', () => {
+      const bidRequest = mergeDeep(deepClone(DEFAULT_BID_REQUEST), {
+        params: {
+          bidfloor: 2
+        }
+      });
+      const [ortbRequest] = spec.buildRequests([bidRequest], {
+        bids: [bidRequest]
+      });
+
+      expect(ortbRequest.data.imp[0].bidfloor).eq(2)
+    });
+
+    it('should set gpid as tagid', () => {
+      const bidRequest = mergeDeep(deepClone(DEFAULT_BID_REQUEST), GPID_RTB_EXT);
+      const [ortbRequest] = spec.buildRequests([bidRequest], {
+        bids: [bidRequest]
+      });
+
+      expect(ortbRequest.data.imp[0].tagid).eq(GPID_RTB_EXT.ortb2Imp.ext.gpid)
+    });
+  })
+
+  describe('syncs creation', () => {
+    const syncOptions = { iframeEnabled: true };
+
+    it('should not operate without syncs enabled', () => {
+      const syncs = createUserSyncs({});
+      expect(syncs).to.eq(undefined);
+    });
+
+    it('should call uniq and unused sources only', () => {
+      const sources = { 111: 0, 222: 0, 333: 1 }
+      const syncs = createUserSyncs(sources, syncOptions);
+
+      expect(syncs.length).to.eq(2);
+
+      expect(syncs[0].type).to.eq('iframe');
+      expect(syncs[0].url).to.eq(`${SYNC_URL}?aid=111`);
+      expect(syncs[1].type).to.eq('iframe');
+      expect(syncs[1].url).to.eq(`${SYNC_URL}?aid=222`);
+
+      expect(sources[111]).to.eq(1);
+      expect(sources[222]).to.eq(1);
+
+      const syncs2 = createUserSyncs(sources, syncOptions);
+      expect(syncs2.length).to.eq(0);
+    });
+
+    it('should add consent info', () => {
+      const [{ url: syncUrl }] = createUserSyncs(
+        { 111: 0 },
+        syncOptions,
+        { gdprApplies: true, consentString: '111' },
+        'yyy',
+        { gppString: '222', applicableSections: [1, 2] });
+
+      expect(syncUrl.includes('gdpr=1&gdpr_consent=111')).to.eq(true);
+      expect(syncUrl.includes('usp=yyy')).to.eq(true);
+      expect(syncUrl.includes('gpp=222&gpp_sid=1,2')).to.eq(true);
+    });
+  })
+
+  describe('response interpreter', () => {
+    const SERVER_RESPONSE = {
+      'body': {
+        'id': '10bb57ee-712f-43e9-9769-b26d03df8a39',
+        'seatbid': [
+          {
+            'bid': [
+              {
+                'id': 'c5BsBD5QHHgx4aS8',
+                'impid': '2eb89f0f062afe',
+                'price': 1,
+                'adid': 'BDhclfXLcGzRMeV',
+                'adm': '123',
+                'adomain': [
+                  'https://test.com'
+                ],
+                'crid': 'display_300x250',
+                'w': 300,
+                'h': 250,
+              }
+            ],
+            'seat': '1'
+          }
+        ],
+        'cur': 'USD'
+      },
+      'headers': {}
+    }
+
+    it('should return empty results', () => {
+      const [req] = spec.buildRequests([deepClone(DEFAULT_BID_REQUEST)], {
+        bids: [deepClone(DEFAULT_BID_REQUEST)]
+      })
+      const result = spec.interpretResponse(null, {
+        data: req.data
+      })
+
+      expect(result.length).to.eq(0);
+    });
+    it('should detect media type based on adm', () => {
+      const [req] = spec.buildRequests([deepClone(DEFAULT_BID_REQUEST)], {
+        bids: [deepClone(DEFAULT_BID_REQUEST)]
+      })
+      const result = spec.interpretResponse(SERVER_RESPONSE, {
+        data: req.data
+      })
+
+      expect(result.length).to.eq(1);
+      expect(result[0].mediaType).to.eq('banner')
+    });
+    it('should detect video adm', () => {
+      const bidRequest = mergeDeep(deepClone(DEFAULT_BID_REQUEST), {
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [300, 250]
+            ]
+          },
+          video: {
+            playerSize: [640, 480]
+          }
+        }
+      })
+      const bannerResponse = deepClone(SERVER_RESPONSE);
+      const [ortbReq] = spec.buildRequests([bidRequest], {
+        bids: [bidRequest]
+      })
+      deepSetValue(bannerResponse, 'body.seatbid.0.bid.0.adm', '');
+      const result = spec.interpretResponse(bannerResponse, {
+        data: ortbReq.data
+      })
+
+      expect(result.length).to.eq(1);
+      expect(result[0].mediaType).to.eq('video')
+    });
+
+    it('should detect banner adm', () => {
+      const bidRequest = mergeDeep(deepClone(DEFAULT_BID_REQUEST), {
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [300, 250]
+            ]
+          },
+          video: {
+            playerSize: [640, 480]
+          }
+        }
+      })
+      const bannerResponse = deepClone(SERVER_RESPONSE);
+      const [ortbReq] = spec.buildRequests([bidRequest], {
+        bids: [bidRequest]
+      })
+      const result = spec.interpretResponse(bannerResponse, {
+        data: ortbReq.data
+      })
+
+      expect(result.length).to.eq(1);
+      expect(result[0].mediaType).to.eq('banner')
+    });
+  })
+})
diff --git a/test/spec/modules/bidtheatreBidAdapter_spec.js b/test/spec/modules/bidtheatreBidAdapter_spec.js
new file mode 100644
index 00000000000..4842c43d1f0
--- /dev/null
+++ b/test/spec/modules/bidtheatreBidAdapter_spec.js
@@ -0,0 +1,266 @@
+import { expect } from 'chai';
+import { spec, ENDPOINT_URL, BIDDER_CODE, DEFAULT_CURRENCY } from 'modules/bidtheatreBidAdapter.js';
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+import { deepClone } from 'src/utils.js';
+
+const VALID_PUBLISHER_ID = '73b20b3a-12a0-4869-b54e-8d42b55786ee';
+const STATIC_IMP_ID = '3263e5dec855c5';
+const BID_PRICE = 5.112871170043945;
+const AUCTION_PRICE_MACRO = '${AUCTION_PRICE}';
+
+const BANNER_BID_REQUEST = [
+  {
+    'bidder': BIDDER_CODE,
+    'params': {
+      'publisherId': VALID_PUBLISHER_ID
+    },
+    'bidId': STATIC_IMP_ID,
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            980,
+            240
+          ]
+        ]
+      }
+    },
+    'sizes': [
+      [
+        980,
+        240
+      ]
+    ]
+  }
+];
+
+const BANNER_BIDDER_REQUEST = {'bidderCode': BIDDER_CODE, 'bids': BANNER_BID_REQUEST};
+
+const BANNER_BID_RESPONSE = {
+  'cur': 'USD',
+  'seatbid': [
+    {
+      'seat': '5',
+      'bid': [
+        {
+          'ext': {
+            'usersync_urls': [
+              'https://match.adsby.bidtheatre.com/usersync?gdpr=1&gdpr_consent=CONSENT_STRING'
+            ]
+          },
+          'crid': '1915538',
+          'h': 240,
+          'adm': "",
+          'mtype': 1,
+          'adid': '1915538',
+          'adomain': [
+            'bidtheatre.com'
+          ],
+          'price': BID_PRICE,
+          'cat': [
+            'IAB3-1'
+          ],
+          'w': 980,
+          'id': STATIC_IMP_ID,
+          'impid': STATIC_IMP_ID,
+          'cid': 'c154375'
+        }
+      ]
+    }
+  ]
+};
+
+const VIDEO_BID_REQUEST = [
+  {
+    'bidder': BIDDER_CODE,
+    'params': {
+      'publisherId': VALID_PUBLISHER_ID
+    },
+    'bidId': STATIC_IMP_ID,
+    'mediaTypes': {
+      'video': {
+        'playerSize': [
+          [
+            1280,
+            720
+          ]
+        ],
+        'context': 'instream'
+      }
+    },
+    'sizes': [[1280, 720]]
+  }
+];
+
+const VIDEO_BIDDER_REQUEST = {'bidderCode': BIDDER_CODE, 'bids': VIDEO_BID_REQUEST};
+
+const VIDEO_BID_RESPONSE = {
+  'cur': 'USD',
+  'seatbid': [
+    {
+      'seat': '5',
+      'bid': [
+        {
+          'ext': {
+            'usersync_urls': [
+              'https://match.adsby.bidtheatre.com/usersync?gdpr=0&gdpr_consent='
+            ]
+          },
+          'crid': '1922926',
+          'h': 720,
+          'mtype': 2,
+          'nurl': 'https://adsby.bidtheatre.com/video?z=27025;a=1922926;ex=36;es=http%3A%2F%2F127.0.0.1%3A8080;eb=3672319;xs=940400838;so=1;tag=unspec_1280_720;kuid=05914b22-88cb-4c5d-9f7c-f133fdf9669a;wp=${AUCTION_PRICE};su=127.0.0.1%3A8080;iab=vast2;dealId=;ma=eyJjZCI6ZmFsc2UsInN0IjozLCJtbGF0Ijo1OS4yNywibW9yZyI6InRlbGlhIG5ldHdvcmsgc2VydmljZXMiLCJtbHNjb3JlIjowLjg2MDcwMDU0NzY5NTE1OTksIm16aXAiOiIxMjggMzUiLCJiaXAiOiI4MS4yMjcuODIuMjgiLCJhZ2lkIjozNTYyNzAyLCJtbG1vZGVsIjoibWFzdGVyX21sX2Nsa181MzYiLCJ1YSI6Ik1vemlsbGFcLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNV83KSBBcHBsZVdlYktpdFwvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lXC8xMzAuMC4wLjAgU2FmYXJpXC81MzcuMzYiLCJtbG9uIjoxOC4xMywibXJlZ2lvbiI6ImFiIiwiZHQiOjEsIm1jaXR5Ijoic2thcnBuYWNrIiwicGFnZXVybCI6Imh0dHA6XC9cLzEyNy4wLjAuMTo4MDgwXC92aWRlby5odG1sP3BianNfZGVidWc9dHJ1ZSIsImltcGlkIjoieDM2X2FzeC1iLXMyXzQxNDMzMTA0MTIyMzUyNTU3NDgiLCJtY291bnRyeSI6InN3ZSIsInRzIjoxNzMxNTA3NTY5Njg3fQ%3D%3D;cd=0;cb0=;impId=x36_asx-b-s2_4143310412235255748;gdpr=1;gdpr_consent=CP-S4UAP-S4UACGABBENAzEsAP_gAEPgAAAAKKtV_H__bW1r8X73aft0eY1P9_j77sQxBhfJE-4FzLvW_JwXx2ExNA36tqIKmRIEu3bBIQNlHJDUTVCgaogVryDMakWcoTNKJ6BkiFMRO2dYCF5vmwtj-QKY5vr993dx2D-t_dv83dzyz4VHn3a5_2e0WJCdA58tDfv9bROb-9IPd_58v4v0_F_rE2_eT1l_tevp7D9-ct87_XW-9_fff79Ll9-goqAWYaFRAHWBISEGgYRQIAVBWEBFAgAAABIGiAgBMGBTsDAJdYSIAQAoABggBAACjIAEAAAEACEQAQAFAgAAgECgABAAgEAgAIGAAEAFgIBAACA6BCmBBAoFgAkZkRCmBCFAkEBLZUIJAECCuEIRZ4AEAiJgoAAAAACsAAQFgsDiSQEqEggS4g2gAAIAEAghAqEEnJgACBI2WoPBE2jK0gDQ04SAAAAA.YAAAAAAAAAAA',
+          'adid': '1922926',
+          'adomain': [
+            'bidtheatre.com'
+          ],
+          'price': BID_PRICE,
+          'cat': [
+            'IAB3-1'
+          ],
+          'w': 1280,
+          'id': STATIC_IMP_ID,
+          'impid': STATIC_IMP_ID,
+          'cid': 'c154375'
+        }
+      ]
+    }
+  ]
+}
+
+describe('BidtheatreAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': BIDDER_CODE,
+      'params': {
+        'publisherId': VALID_PUBLISHER_ID
+      },
+      'sizes': [[980, 240]]
+    };
+
+    it('should return true when required param found and of correct type', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required param is not passed', function () {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
+
+      };
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+
+    it('should return false when required param of incorrect data type', function () {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
+        'publisherId': 12345
+      };
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+
+    it('should return false when required param of incorrect length', function () {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
+        'publisherId': '73b20b3a-12a0-4869-b54e-8d42b55786e'
+      };
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('should include correct http method, correct url and existing data', function () {
+      const request = spec.buildRequests(BANNER_BID_REQUEST, BANNER_BIDDER_REQUEST);
+      expect(request[0].method).to.equal('POST');
+      expect(request[0].url).to.equal(ENDPOINT_URL);
+      expect(request[0].data).to.exist;
+    });
+
+    it('should include required bid param in request', function () {
+      const request = spec.buildRequests(BANNER_BID_REQUEST, BANNER_BIDDER_REQUEST);
+      const data = request[0].data;
+      expect(data.imp[0].ext.bidder.publisherId).to.equal(VALID_PUBLISHER_ID);
+    });
+
+    it('should include imp array in request', function () {
+      const request = spec.buildRequests(BANNER_BID_REQUEST, BANNER_BIDDER_REQUEST);
+      const data = request[0].data;
+      expect(data).to.have.property('imp').that.is.an('array').with.lengthOf.at.least(1);
+      expect(data.imp[0]).to.be.an('object');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should have exactly one bid in banner response', function () {
+      const request = spec.buildRequests(BANNER_BID_REQUEST, BANNER_BIDDER_REQUEST);
+      const bids = spec.interpretResponse({body: BANNER_BID_RESPONSE}, request[0]);
+      expect(bids).to.be.an('array').with.lengthOf(1);
+      expect(bids[0]).to.be.an('object');
+    });
+
+    it('should have currency set to USD in banner response', function () {
+      const request = spec.buildRequests(BANNER_BID_REQUEST, BANNER_BIDDER_REQUEST);
+      const bids = spec.interpretResponse({body: BANNER_BID_RESPONSE}, request[0]);
+      expect(bids[0].currency).to.be.a('string').and.to.equal(DEFAULT_CURRENCY);
+    });
+
+    it('should have ad in response and auction price macros replaced in banner response', function () {
+      const request = spec.buildRequests(BANNER_BID_REQUEST, BANNER_BIDDER_REQUEST);
+      const bids = spec.interpretResponse({body: BANNER_BID_RESPONSE}, request[0]);
+      const ad = bids[0].ad;
+      expect(ad).to.exist;
+      expect(ad).to.be.a('string');
+      expect(ad).to.include('&wp=' + BID_PRICE + '&');
+      expect(ad).to.not.include(AUCTION_PRICE_MACRO);
+    });
+
+    if (FEATURES.VIDEO) {
+      it('should have exactly one bid in video response', function () {
+        const request = spec.buildRequests(VIDEO_BID_REQUEST, VIDEO_BIDDER_REQUEST);
+        const bids = spec.interpretResponse({body: VIDEO_BID_RESPONSE}, request[0]);
+        expect(bids).to.be.an('array').with.lengthOf(1);
+        expect(bids[0]).to.be.an('object');
+      });
+
+      it('should have currency set to USD in video response', function () {
+        const request = spec.buildRequests(VIDEO_BID_REQUEST, VIDEO_BIDDER_REQUEST);
+        const bids = spec.interpretResponse({body: VIDEO_BID_RESPONSE}, request[0]);
+        expect(bids[0].currency).to.be.a('string').and.to.equal(DEFAULT_CURRENCY);
+      });
+
+      it('should have vastUrl in response and auction price macros replaced in video response', function () {
+        const request = spec.buildRequests(VIDEO_BID_REQUEST, VIDEO_BIDDER_REQUEST);
+        const bids = spec.interpretResponse({body: VIDEO_BID_RESPONSE}, request[0]);
+        const vastUrl = bids[0].vastUrl;
+        expect(vastUrl).to.exist;
+        expect(vastUrl).to.be.a('string');
+        expect(vastUrl).to.include(';wp=' + BID_PRICE + ';');
+        expect(vastUrl).to.not.include(AUCTION_PRICE_MACRO);
+      });
+    }
+  });
+
+  describe('getUserSyncs', function () {
+    const bidResponse = deepClone(BANNER_BID_RESPONSE);
+    const bidResponseSyncURL = bidResponse.seatbid[0].bid[0].ext.usersync_urls[0];
+
+    const gdprConsent = {
+      gdprApplies: true,
+      consentString: 'CONSENT_STRING'
+    };
+
+    it('should return empty when pixel is disallowed', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: false }, bidResponse, gdprConsent)).to.be.empty;
+    });
+
+    it('should return empty when no server response is present', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, [], gdprConsent)).to.be.empty;
+    });
+
+    it('should return usersync url when pixel is allowed and present in bid response', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, [{body: bidResponse}], gdprConsent)).to.deep.equal([{ type: 'image', url: bidResponseSyncURL }]);
+    });
+  });
+});
diff --git a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
index be1ffb06c76..d934a6c611b 100644
--- a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
+++ b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
@@ -2,9 +2,10 @@ import bidwatchAnalytics from 'modules/bidwatchAnalyticsAdapter.js';
 import {dereferenceWithoutRenderer} from 'modules/bidwatchAnalyticsAdapter.js';
 import { expect } from 'chai';
 import { server } from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
+
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('BidWatch Analytics', function () {
   let timestamp = new Date() - 256;
@@ -301,10 +302,10 @@ describe('BidWatch Analytics', function () {
         }
       });
 
-      events.emit(constants.EVENTS.BID_REQUESTED, auctionEnd['bidderRequests'][0]);
-      events.emit(constants.EVENTS.BID_RESPONSE, auctionEnd['bidsReceived'][0]);
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
-      events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
+      events.emit(EVENTS.BID_REQUESTED, auctionEnd['bidderRequests'][0]);
+      events.emit(EVENTS.BID_RESPONSE, auctionEnd['bidsReceived'][0]);
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeout);
+      events.emit(EVENTS.AUCTION_END, auctionEnd);
       expect(server.requests.length).to.equal(1);
       let message = JSON.parse(server.requests[0].requestBody);
       expect(message).to.have.property('auctionEnd').exist;
@@ -331,7 +332,7 @@ describe('BidWatch Analytics', function () {
           domain: 'test'
         }
       });
-      events.emit(constants.EVENTS.BID_WON, bidWon);
+      events.emit(EVENTS.BID_WON, bidWon);
       expect(server.requests.length).to.equal(1);
       let message = JSON.parse(server.requests[0].requestBody);
       expect(message).not.to.have.property('ad');
diff --git a/test/spec/modules/big-richmediaBidAdapter_spec.js b/test/spec/modules/big-richmediaBidAdapter_spec.js
index c3a9a8ef6c1..f37975c3bc1 100644
--- a/test/spec/modules/big-richmediaBidAdapter_spec.js
+++ b/test/spec/modules/big-richmediaBidAdapter_spec.js
@@ -271,31 +271,6 @@ describe('bigRichMediaAdapterTests', function () {
     });
   });
 
-  describe('transformBidParams', function() {
-    it('cast placementId to number', function() {
-      const adUnit = {
-        code: 'adunit-code',
-        params: {
-          placementId: '456'
-        }
-      };
-      const bid = {
-        params: {
-          placementId: '456'
-        },
-        sizes: [[300, 250]],
-        mediaTypes: {
-          banner: { sizes: [[300, 250]] }
-        }
-      };
-
-      const params = spec.transformBidParams({ placementId: '456' }, true, adUnit, [{ bidderCode: 'bigRichmedia', auctionId: bid.auctionId, bids: [bid] }]);
-
-      expect(params.placement_id).to.exist;
-      expect(params.placement_id).to.be.a('number');
-    });
-  });
-
   describe('onBidWon', function() {
     it('Should not have any error', function() {
       const result = spec.onBidWon({});
diff --git a/test/spec/modules/bizzclickBidAdapter_spec.js b/test/spec/modules/bizzclickBidAdapter_spec.js
deleted file mode 100644
index f80051b0a50..00000000000
--- a/test/spec/modules/bizzclickBidAdapter_spec.js
+++ /dev/null
@@ -1,419 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/bizzclickBidAdapter.js';
-import {config} from 'src/config.js';
-
-const NATIVE_BID_REQUEST = {
-  code: 'native_example',
-  mediaTypes: {
-    native: {
-      title: {
-        required: true,
-        len: 800
-      },
-      image: {
-        required: true,
-        len: 80
-      },
-      sponsoredBy: {
-        required: true
-      },
-      clickUrl: {
-        required: true
-      },
-      privacyLink: {
-        required: false
-      },
-      body: {
-        required: true
-      },
-      icon: {
-        required: true,
-        sizes: [50, 50]
-      }
-    }
-  },
-  bidder: 'bizzclick',
-  params: {
-    placementId: 'hash',
-    accountId: 'accountId'
-  },
-  timeout: 1000
-
-};
-
-const BANNER_BID_REQUEST = {
-  code: 'banner_example',
-  mediaTypes: {
-    banner: {
-      sizes: [[300, 250], [300, 600]]
-    }
-  },
-  schain: {
-    ver: '1.0',
-    complete: 1,
-    nodes: [
-      {
-        asi: 'example.com',
-        sid: '164',
-        hp: 1
-      }
-    ]
-  },
-  bidder: 'bizzclick',
-  params: {
-    placementId: 'hash',
-    accountId: 'accountId'
-  },
-  timeout: 1000,
-  gdprConsent: {
-    consentString: 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
-    gdprApplies: 1,
-  },
-  uspConsent: 'uspConsent'
-}
-
-const bidRequest = {
-  refererInfo: {
-    referer: 'test.com'
-  }
-}
-
-const VIDEO_BID_REQUEST = {
-  code: 'video1',
-  sizes: [640, 480],
-  mediaTypes: { video: {
-    minduration: 0,
-    maxduration: 999,
-    boxingallowed: 1,
-    skip: 0,
-    mimes: [
-      'application/javascript',
-      'video/mp4'
-    ],
-    w: 1920,
-    h: 1080,
-    protocols: [
-      2
-    ],
-    linearity: 1,
-    api: [
-      1,
-      2
-    ]
-  }
-  },
-
-  bidder: 'bizzclick',
-  params: {
-    placementId: 'hash',
-    accountId: 'accountId'
-  },
-  timeout: 1000
-
-}
-
-const BANNER_BID_RESPONSE = {
-  id: 'request_id',
-  bidid: 'request_imp_id',
-  seatbid: [{
-    bid: [{
-      id: 'bid_id',
-      impid: 'request_imp_id',
-      price: 5,
-      adomain: ['example.com'],
-      adm: 'admcode',
-      crid: 'crid',
-      ext: {
-        mediaType: 'banner'
-      }
-    }],
-  }],
-};
-
-const VIDEO_BID_RESPONSE = {
-  id: 'request_id',
-  bidid: 'request_imp_id',
-  seatbid: [{
-    bid: [{
-      id: 'bid_id',
-      impid: 'request_imp_id',
-      price: 5,
-      adomain: ['example.com'],
-      adm: 'admcode',
-      crid: 'crid',
-      ext: {
-        mediaType: 'video',
-        vastUrl: 'http://example.vast',
-      }
-    }],
-  }],
-};
-
-let imgData = {
-  url: `https://example.com/image`,
-  w: 1200,
-  h: 627
-};
-
-const NATIVE_BID_RESPONSE = {
-  id: 'request_id',
-  bidid: 'request_imp_id',
-  seatbid: [{
-    bid: [{
-      id: 'bid_id',
-      impid: 'request_imp_id',
-      price: 5,
-      adomain: ['example.com'],
-      adm: { native:
-          {
-            assets: [
-              {id: 0, title: 'dummyText'},
-              {id: 3, image: imgData},
-              {
-                id: 5,
-                data: {value: 'organization.name'}
-              }
-            ],
-            link: {url: 'example.com'},
-            imptrackers: ['tracker1.com', 'tracker2.com', 'tracker3.com'],
-            jstracker: 'tracker1.com'
-          }
-      },
-      crid: 'crid',
-      ext: {
-        mediaType: 'native'
-      }
-    }],
-  }],
-};
-
-describe('BizzclickAdapter', function() {
-  describe('with COPPA', function() {
-    beforeEach(function() {
-      sinon.stub(config, 'getConfig')
-        .withArgs('coppa')
-        .returns(true);
-    });
-    afterEach(function() {
-      config.getConfig.restore();
-    });
-
-    it('should send the Coppa "required" flag set to "1" in the request', function () {
-      let serverRequest = spec.buildRequests([BANNER_BID_REQUEST]);
-      expect(serverRequest.data[0].regs.coppa).to.equal(1);
-    });
-  });
-
-  describe('isBidRequestValid', function() {
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(NATIVE_BID_REQUEST)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, NATIVE_BID_REQUEST);
-      delete bid.params;
-      bid.params = {
-        'IncorrectParam': 0
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('build Native Request', function () {
-    const request = spec.buildRequests([NATIVE_BID_REQUEST], bidRequest);
-
-    it('Creates a ServerRequest object with method, URL and data', function () {
-      expect(request).to.exist;
-      expect(request.method).to.exist;
-      expect(request.url).to.exist;
-      expect(request.data).to.exist;
-    });
-
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('Returns valid URL', function () {
-      expect(request.url).to.equal('https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=accountId');
-    });
-
-    it('Returns empty data if no valid requests are passed', function () {
-      let serverRequest = spec.buildRequests([]);
-      expect(serverRequest).to.be.an('array').that.is.empty;
-    });
-  });
-
-  describe('build Banner Request', function () {
-    const request = spec.buildRequests([BANNER_BID_REQUEST]);
-
-    it('Creates a ServerRequest object with method, URL and data', function () {
-      expect(request).to.exist;
-      expect(request.method).to.exist;
-      expect(request.url).to.exist;
-      expect(request.data).to.exist;
-    });
-
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('check consent and ccpa string is set properly', function() {
-      expect(request.data[0].regs.ext.gdpr).to.equal(1);
-      expect(request.data[0].user.ext.consent).to.equal(BANNER_BID_REQUEST.gdprConsent.consentString);
-      expect(request.data[0].regs.ext.us_privacy).to.equal(BANNER_BID_REQUEST.uspConsent);
-    })
-
-    it('check schain is set properly', function() {
-      expect(request.data[0].source.ext.schain.complete).to.equal(1);
-      expect(request.data[0].source.ext.schain.ver).to.equal('1.0');
-    })
-
-    it('Returns valid URL', function () {
-      expect(request.url).to.equal('https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=accountId');
-    });
-  });
-
-  describe('build Video Request', function () {
-    const request = spec.buildRequests([VIDEO_BID_REQUEST]);
-
-    it('Creates a ServerRequest object with method, URL and data', function () {
-      expect(request).to.exist;
-      expect(request.method).to.exist;
-      expect(request.url).to.exist;
-      expect(request.data).to.exist;
-    });
-
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('Returns valid URL', function () {
-      expect(request.url).to.equal('https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=accountId');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('Empty response must return empty array', function() {
-      const emptyResponse = null;
-      let response = spec.interpretResponse(emptyResponse);
-
-      expect(response).to.be.an('array').that.is.empty;
-    })
-
-    it('Should interpret banner response', function () {
-      const bannerResponse = {
-        body: [BANNER_BID_RESPONSE]
-      }
-
-      const expectedBidResponse = {
-        requestId: BANNER_BID_RESPONSE.id,
-        cpm: BANNER_BID_RESPONSE.seatbid[0].bid[0].price,
-        width: BANNER_BID_RESPONSE.seatbid[0].bid[0].w,
-        height: BANNER_BID_RESPONSE.seatbid[0].bid[0].h,
-        ttl: BANNER_BID_RESPONSE.ttl || 1200,
-        currency: BANNER_BID_RESPONSE.cur || 'USD',
-        netRevenue: true,
-        creativeId: BANNER_BID_RESPONSE.seatbid[0].bid[0].crid,
-        dealId: BANNER_BID_RESPONSE.seatbid[0].bid[0].dealid,
-
-        meta: {advertiserDomains: BANNER_BID_RESPONSE.seatbid[0].bid[0].adomain},
-        mediaType: 'banner',
-        ad: BANNER_BID_RESPONSE.seatbid[0].bid[0].adm
-      }
-
-      let bannerResponses = spec.interpretResponse(bannerResponse);
-
-      expect(bannerResponses).to.be.an('array').that.is.not.empty;
-      let dataItem = bannerResponses[0];
-      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-        'netRevenue', 'currency', 'dealId', 'meta', 'mediaType');
-      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
-      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
-      expect(dataItem.ad).to.equal(expectedBidResponse.ad);
-      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
-      expect(dataItem.meta.advertiserDomains).to.equal(expectedBidResponse.meta.advertiserDomains);
-      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
-      expect(dataItem.netRevenue).to.be.true;
-      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
-      expect(dataItem.width).to.equal(expectedBidResponse.width);
-      expect(dataItem.height).to.equal(expectedBidResponse.height);
-    });
-
-    it('Should interpret video response', function () {
-      const videoResponse = {
-        body: [VIDEO_BID_RESPONSE]
-      }
-
-      const expectedBidResponse = {
-        requestId: VIDEO_BID_RESPONSE.id,
-        cpm: VIDEO_BID_RESPONSE.seatbid[0].bid[0].price,
-        width: VIDEO_BID_RESPONSE.seatbid[0].bid[0].w,
-        height: VIDEO_BID_RESPONSE.seatbid[0].bid[0].h,
-        ttl: VIDEO_BID_RESPONSE.ttl || 1200,
-        currency: VIDEO_BID_RESPONSE.cur || 'USD',
-        netRevenue: true,
-        creativeId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].crid,
-        dealId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].dealid,
-        mediaType: 'video',
-        vastXml: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adm,
-        meta: {advertiserDomains: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adomain},
-        vastUrl: VIDEO_BID_RESPONSE.seatbid[0].bid[0].ext.vastUrl
-      }
-
-      let videoResponses = spec.interpretResponse(videoResponse);
-
-      expect(videoResponses).to.be.an('array').that.is.not.empty;
-      let dataItem = videoResponses[0];
-      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastXml', 'vastUrl', 'ttl', 'creativeId',
-        'netRevenue', 'currency', 'dealId', 'meta', 'mediaType');
-      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
-      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
-      expect(dataItem.vastXml).to.equal(expectedBidResponse.vastXml)
-      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
-      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
-      expect(dataItem.meta.advertiserDomains).to.equal(expectedBidResponse.meta.advertiserDomains);
-      expect(dataItem.netRevenue).to.be.true;
-      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
-      expect(dataItem.width).to.equal(expectedBidResponse.width);
-      expect(dataItem.height).to.equal(expectedBidResponse.height);
-    });
-
-    it('Should interpret native response', function () {
-      const nativeResponse = {
-        body: [NATIVE_BID_RESPONSE]
-      }
-
-      const expectedBidResponse = {
-        requestId: NATIVE_BID_RESPONSE.id,
-        cpm: NATIVE_BID_RESPONSE.seatbid[0].bid[0].price,
-        width: NATIVE_BID_RESPONSE.seatbid[0].bid[0].w,
-        height: NATIVE_BID_RESPONSE.seatbid[0].bid[0].h,
-        ttl: NATIVE_BID_RESPONSE.ttl || 1200,
-        currency: NATIVE_BID_RESPONSE.cur || 'USD',
-        netRevenue: true,
-        creativeId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].crid,
-        dealId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].dealid,
-        mediaType: 'native',
-        meta: {advertiserDomains: NATIVE_BID_RESPONSE.seatbid[0].bid[0].adomain},
-        native: {clickUrl: NATIVE_BID_RESPONSE.seatbid[0].bid[0].adm.native.link.url}
-      }
-
-      let nativeResponses = spec.interpretResponse(nativeResponse);
-
-      expect(nativeResponses).to.be.an('array').that.is.not.empty;
-      let dataItem = nativeResponses[0];
-      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'native', 'ttl', 'creativeId',
-        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
-      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
-      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
-      expect(dataItem.meta.advertiserDomains).to.equal(expectedBidResponse.meta.advertiserDomains);
-      expect(dataItem.native.clickUrl).to.equal(expectedBidResponse.native.clickUrl)
-      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
-      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
-      expect(dataItem.netRevenue).to.be.true;
-      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
-      expect(dataItem.width).to.equal(expectedBidResponse.width);
-      expect(dataItem.height).to.equal(expectedBidResponse.height);
-    });
-  });
-})
diff --git a/test/spec/modules/blastoBidAdapter_spec.js b/test/spec/modules/blastoBidAdapter_spec.js
new file mode 100644
index 00000000000..671f99fa938
--- /dev/null
+++ b/test/spec/modules/blastoBidAdapter_spec.js
@@ -0,0 +1,308 @@
+import { expect } from 'chai';
+import { spec } from 'modules/blastoBidAdapter';
+import 'modules/priceFloors.js';
+import { newBidder } from 'src/adapters/bidderFactory';
+import { config } from '../../../src/config.js';
+import { syncAddFPDToBidderRequest } from '../../helpers/fpd.js';
+
+// load modules that register ORTB processors
+import 'src/prebid.js';
+import 'modules/currency.js';
+import 'modules/userId/index.js';
+import 'modules/multibid/index.js';
+import 'modules/priceFloors.js';
+import 'modules/consentManagementTcf.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js';
+
+const SIMPLE_BID_REQUEST = {
+  bidder: 'blasto',
+  params: {
+    accountId: 'testAccountId',
+    sourceId: 'testSourceId',
+    host: 'USE',
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [320, 250],
+        [300, 600],
+      ],
+    },
+  },
+  adUnitCode: 'div-gpt-ad-1499748733608-0',
+  transactionId: 'f183e871-fbed-45f0-a427-c8a63c4c01eb',
+  bidId: '33e9500b21129f',
+  bidderRequestId: '2772c1e566670b',
+  auctionId: '192721e36a0239',
+  sizes: [[300, 250], [160, 600]],
+  gdprConsent: {
+    apiVersion: 2,
+    consentString: 'CONSENT',
+    vendorData: { purpose: { consents: { 1: true } } },
+    gdprApplies: true,
+    addtlConsent: '1~1.35.41.101',
+  },
+}
+
+const BANNER_BID_REQUEST = {
+  bidder: 'blasto',
+  params: {
+    accountId: 'testAccountId',
+    sourceId: 'testSourceId',
+    host: 'USE',
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 600],
+      ],
+    },
+  },
+  adUnitCode: '/adunit-code/test-path',
+  bidId: 'test-bid-id-1',
+  bidderRequestId: 'test-bid-request-1',
+  auctionId: 'test-auction-1',
+  transactionId: 'test-transactionId-1',
+  code: 'banner_example',
+  timeout: 1000,
+}
+
+const VIDEO_BID_REQUEST = {
+  placementCode: '/DfpAccount1/slotVideo',
+  bidId: 'test-bid-id-2',
+  mediaTypes: {
+    video: {
+      playerSize: [400, 300],
+      w: 400,
+      h: 300,
+      minduration: 5,
+      maxduration: 10,
+      startdelay: 0,
+      skip: 1,
+      minbitrate: 200,
+      protocols: [1, 2, 4]
+    }
+  },
+  bidder: 'blasto',
+  params: {
+    accountId: '123',
+    sourceId: '123',
+    host: 'USE',
+  },
+  adUnitCode: '/adunit-code/test-path',
+  bidderRequestId: 'test-bid-request-1',
+  auctionId: 'test-auction-1',
+  transactionId: 'test-transactionId-1',
+  timeout: 1000,
+}
+
+const NATIVE_BID_REQUEST = {
+  code: 'native_example',
+  mediaTypes: {
+    native: {
+      title: {
+        required: true,
+        len: 800
+      },
+      image: {
+        required: true,
+        len: 80
+      },
+      sponsoredBy: {
+        required: true
+      },
+      clickUrl: {
+        required: true
+      },
+      privacyLink: {
+        required: false
+      },
+      body: {
+        required: true
+      },
+      icon: {
+        required: true,
+        sizes: [50, 50]
+      }
+    }
+  },
+  bidder: 'blasto',
+  params: {
+    accountId: 'testAccountId',
+    sourceId: 'testSourceId',
+    host: 'USE',
+  },
+  adUnitCode: '/adunit-code/test-path',
+  bidId: 'test-bid-id-1',
+  bidderRequestId: 'test-bid-request-1',
+  auctionId: 'test-auction-1',
+  transactionId: 'test-transactionId-1',
+  timeout: 1000,
+  uspConsent: 'uspConsent'
+};
+
+const bidderRequest = {
+  refererInfo: {
+    page: 'https://publisher.com/home',
+    ref: 'https://referrer'
+  }
+};
+
+const gdprConsent = {
+  apiVersion: 2,
+  consentString: 'CONSENT',
+  vendorData: { purpose: { consents: { 1: true } } },
+  gdprApplies: true,
+  addtlConsent: '1~1.35.41.101',
+}
+
+describe('blastoAdapter', function () {
+  const adapter = newBidder(spec);
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('with user privacy regulations', function () {
+    it('should send the Coppa "required" flag set to "1" in the request', function () {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+      const serverRequest = spec.buildRequests([SIMPLE_BID_REQUEST], syncAddFPDToBidderRequest(bidderRequest));
+      expect(serverRequest.data.regs.coppa).to.equal(1);
+      config.getConfig.restore();
+    });
+
+    it('should send the GDPR Consent data in the request', function () {
+      const serverRequest = spec.buildRequests([SIMPLE_BID_REQUEST], syncAddFPDToBidderRequest({ ...bidderRequest, gdprConsent }));
+      expect(serverRequest.data.regs.ext.gdpr).to.exist.and.to.equal(1);
+      expect(serverRequest.data.user.ext.consent).to.equal('CONSENT');
+    });
+
+    it('should send the CCPA data in the request', function () {
+      const serverRequest = spec.buildRequests([SIMPLE_BID_REQUEST], syncAddFPDToBidderRequest({...bidderRequest, ...{ uspConsent: '1YYY' }}));
+      expect(serverRequest.data.regs.ext.us_privacy).to.equal('1YYY');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(BANNER_BID_REQUEST)).to.equal(true);
+    });
+
+    it('should return false when accountID/sourceId is missing', function () {
+      let localbid = Object.assign({}, BANNER_BID_REQUEST);
+      delete localbid.params.accountId;
+      delete localbid.params.sourceId;
+      expect(spec.isBidRequestValid(BANNER_BID_REQUEST)).to.equal(false);
+    });
+  });
+
+  describe('build request', function () {
+    it('should return an empty array when no bid requests', function () {
+      const bidRequest = spec.buildRequests([], syncAddFPDToBidderRequest(bidderRequest));
+      expect(bidRequest).to.be.an('array');
+      expect(bidRequest.length).to.equal(0);
+    });
+
+    it('should return a valid bid request object', function () {
+      const request = spec.buildRequests([SIMPLE_BID_REQUEST], syncAddFPDToBidderRequest(bidderRequest));
+      expect(request).to.not.equal('array');
+      expect(request.data).to.be.an('object');
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.not.equal('');
+      expect(request.url).to.not.equal(undefined);
+      expect(request.url).to.not.equal(null);
+
+      expect(request.data.site).to.have.property('page');
+      expect(request.data.site).to.have.property('domain');
+      expect(request.data).to.have.property('id');
+      expect(request.data).to.have.property('imp');
+      expect(request.data).to.have.property('device');
+    });
+
+    it('should return a valid bid BANNER request object', function () {
+      const request = spec.buildRequests([BANNER_BID_REQUEST], syncAddFPDToBidderRequest(bidderRequest));
+      expect(request.data.imp[0].banner).to.exist;
+      expect(request.data.imp[0].banner.format[0].w).to.be.an('number');
+      expect(request.data.imp[0].banner.format[0].h).to.be.an('number');
+    });
+
+    if (FEATURES.VIDEO) {
+      it('should return a valid bid VIDEO request object', function () {
+        const request = spec.buildRequests([VIDEO_BID_REQUEST], syncAddFPDToBidderRequest(bidderRequest));
+        expect(request.data.imp[0].video).to.exist;
+        expect(request.data.imp[0].video.w).to.be.an('number');
+        expect(request.data.imp[0].video.h).to.be.an('number');
+      });
+    }
+
+    it('should return a valid bid NATIVE request object', function () {
+      const request = spec.buildRequests([NATIVE_BID_REQUEST], syncAddFPDToBidderRequest(bidderRequest));
+      expect(request.data.imp[0]).to.be.an('object');
+    });
+  })
+
+  describe('interpretResponse', function () {
+    let bidRequests, bidderRequest;
+    beforeEach(function () {
+      bidRequests = [{
+        'bidId': '28ffdk2B952532',
+        'bidder': 'blasto',
+        'userId': {
+          'freepassId': {
+            'userIp': '172.21.0.1',
+            'userId': '123',
+            'commonId': 'commonIdValue'
+          }
+        },
+        'adUnitCode': 'adunit-code',
+        'params': {
+          'publisherId': 'publisherIdValue'
+        }
+      }];
+      bidderRequest = {};
+    });
+
+    it('Empty response must return empty array', function () {
+      const emptyResponse = null;
+      let response = spec.interpretResponse(emptyResponse, BANNER_BID_REQUEST);
+
+      expect(response).to.be.an('array').that.is.empty;
+    })
+
+    it('Should interpret banner response', function () {
+      const serverResponse = {
+        body: {
+          'cur': 'USD',
+          'seatbid': [{
+            'bid': [{
+              'impid': '28ffdk2B952532',
+              'price': 97,
+              'adm': '',
+              'w': 300,
+              'h': 250,
+              'crid': 'creative0'
+            }]
+          }]
+        }
+      };
+      it('should interpret server response', function () {
+        const bidRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse(serverResponse, bidRequest);
+        expect(bids).to.be.an('array');
+        const bid = bids[0];
+        expect(bid).to.be.an('object');
+        expect(bid.currency).to.equal('USD');
+        expect(bid.cpm).to.equal(97);
+        expect(bid.ad).to.equal(ad)
+        expect(bid.width).to.equal(300);
+        expect(bid.height).to.equal(250);
+        expect(bid.creativeId).to.equal('creative0');
+      });
+    })
+  });
+});
diff --git a/test/spec/modules/bliinkBidAdapter_spec.js b/test/spec/modules/bliinkBidAdapter_spec.js
index d0320ab6ec1..ff48d8579a7 100644
--- a/test/spec/modules/bliinkBidAdapter_spec.js
+++ b/test/spec/modules/bliinkBidAdapter_spec.js
@@ -7,7 +7,14 @@ import {
   BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME,
   getEffectiveConnectionType,
   getUserIds,
+  GVL_ID,
 } from 'modules/bliinkBidAdapter.js';
+import {
+  canAccessWindowTop,
+  getDomLoadingDuration,
+  getWindowSelf,
+  getWindowTop
+} from 'src/utils.js';
 import { config } from 'src/config.js';
 
 /**
@@ -30,7 +37,9 @@ import { config } from 'src/config.js';
  * ortb2Imp: {ext: {data: {pbadslot: string}}}}}
  */
 
+const w = (canAccessWindowTop()) ? getWindowTop() : getWindowSelf();
 const connectionType = getEffectiveConnectionType();
+const domLoadingDuration = getDomLoadingDuration(w).toString();
 const getConfigBid = (placement) => {
   return {
     adUnitCode: '/19968336/test',
@@ -57,6 +66,7 @@ const getConfigBid = (placement) => {
         },
       },
     },
+    domLoadingDuration,
     ect: connectionType,
     params: {
       placement: placement,
@@ -348,11 +358,31 @@ const GetUserIds = [
     want: undefined,
   },
   {
-    title: 'Should return userIds if exists',
+    title: 'Should return eids if exists',
     args: {
-      fn: getUserIds([{ userIds: { criteoId: 'testId' } }]),
+      fn: getUserIds([{ userIdAsEids: [
+        {
+          'source': 'criteo.com',
+          'uids': [
+            {
+              'id': 'testId',
+              'atype': 1
+            }
+          ]
+        }
+      ] }]),
     },
-    want: { criteoId: 'testId' },
+    want: [
+      {
+        'source': 'criteo.com',
+        'uids': [
+          {
+            'id': 'testId',
+            'atype': 1
+          }
+        ]
+      }
+    ],
   },
 ];
 
@@ -655,12 +685,13 @@ const testsBuildRequests = [
       method: 'POST',
       url: BLIINK_ENDPOINT_ENGINE,
       data: {
+        domLoadingDuration,
         ect: connectionType,
         keywords: '',
         pageDescription: '',
         pageTitle: '',
         pageUrl:
-          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html',
         tags: [
           {
             transactionId: '2def0c5b2a7f6e',
@@ -697,6 +728,7 @@ const testsBuildRequests = [
       method: 'POST',
       url: BLIINK_ENDPOINT_ENGINE,
       data: {
+        domLoadingDuration,
         ect: connectionType,
         gdpr: true,
         gdprConsent: 'XXXX',
@@ -704,7 +736,7 @@ const testsBuildRequests = [
         pageTitle: '',
         keywords: '',
         pageUrl:
-          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html',
         tags: [
           {
             transactionId: '2def0c5b2a7f6e',
@@ -742,6 +774,7 @@ const testsBuildRequests = [
       method: 'POST',
       url: BLIINK_ENDPOINT_ENGINE,
       data: {
+        domLoadingDuration,
         ect: connectionType,
         gdpr: true,
         uspConsent: 'uspConsent',
@@ -750,7 +783,7 @@ const testsBuildRequests = [
         pageTitle: '',
         keywords: '',
         pageUrl:
-          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html',
         tags: [
           {
             transactionId: '2def0c5b2a7f6e',
@@ -801,6 +834,7 @@ const testsBuildRequests = [
       method: 'POST',
       url: BLIINK_ENDPOINT_ENGINE,
       data: {
+        domLoadingDuration,
         ect: connectionType,
         gdpr: true,
         gdprConsent: 'XXXX',
@@ -808,7 +842,7 @@ const testsBuildRequests = [
         pageTitle: '',
         keywords: '',
         pageUrl:
-          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html',
         schain: {
           ver: '1.0',
           complete: 1,
@@ -840,16 +874,31 @@ const testsBuildRequests = [
     },
   },
   {
-    title: 'Should build request with userIds if exists',
+    title: 'Should build request with eids if exists',
     args: {
       fn: spec.buildRequests(
         [
           {
-            userIds: {
-              criteoId:
-                'vG4RRF93V05LRlJUTVVOQTJJJTJGbG1rZWxEeDVvc0NXWE42TzJqU2hG',
-              netId: 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
-            },
+            userIdAsEids: [
+              {
+                'source': 'criteo.com',
+                'uids': [
+                  {
+                    'id': 'vG4RRF93V05LRlJUTVVOQTJJJTJGbG1rZWxEeDVvc0NXWE42TzJqU2hG',
+                    'atype': 1
+                  }
+                ]
+              },
+              {
+                'source': 'netid.de',
+                'uids': [
+                  {
+                    'id': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
+                    'atype': 1
+                  }
+                ]
+              }
+            ],
           },
         ],
         Object.assign(getConfigBuildRequest('banner'), {
@@ -864,6 +913,7 @@ const testsBuildRequests = [
       method: 'POST',
       url: BLIINK_ENDPOINT_ENGINE,
       data: {
+        domLoadingDuration,
         ect: connectionType,
         gdpr: true,
         gdprConsent: 'XXXX',
@@ -871,11 +921,27 @@ const testsBuildRequests = [
         pageTitle: '',
         keywords: '',
         pageUrl:
-          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
-        userIds: {
-          criteoId: 'vG4RRF93V05LRlJUTVVOQTJJJTJGbG1rZWxEeDVvc0NXWE42TzJqU2hG',
-          netId: 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
-        },
+          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html',
+        eids: [
+          {
+            'source': 'criteo.com',
+            'uids': [
+              {
+                'id': 'vG4RRF93V05LRlJUTVVOQTJJJTJGbG1rZWxEeDVvc0NXWE42TzJqU2hG',
+                'atype': 1
+              }
+            ]
+          },
+          {
+            'source': 'netid.de',
+            'uids': [
+              {
+                'id': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
+                'atype': 1
+              }
+            ]
+          }
+        ],
         tags: [
           {
             transactionId: '2def0c5b2a7f6e',
@@ -1053,6 +1119,7 @@ describe('BLIINK Adapter keywords & coppa true', function () {
       method: 'POST',
       url: BLIINK_ENDPOINT_ENGINE,
       data: {
+        domLoadingDuration,
         ect: connectionType,
         gdpr: true,
         coppa: 1,
@@ -1061,7 +1128,7 @@ describe('BLIINK Adapter keywords & coppa true', function () {
         pageTitle: '',
         keywords: 'Bliink,Saber,Prebid',
         pageUrl:
-          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+          'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html',
         tags: [
           {
             transactionId: '2def0c5b2a7f6e',
@@ -1108,3 +1175,7 @@ describe('getEffectiveConnectionType', () => {
     });
   }
 });
+
+it('should expose gvlid', function () {
+  expect(spec.gvlid).to.equal(GVL_ID);
+});
diff --git a/test/spec/modules/bluebillywigBidAdapter_spec.js b/test/spec/modules/bluebillywigBidAdapter_spec.js
deleted file mode 100644
index 4b58e3507db..00000000000
--- a/test/spec/modules/bluebillywigBidAdapter_spec.js
+++ /dev/null
@@ -1,1094 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/bluebillywigBidAdapter.js';
-import {deepAccess, deepClone} from 'src/utils.js';
-import {config} from 'src/config.js';
-import {VIDEO} from 'src/mediaTypes.js';
-
-const BB_CONSTANTS = {
-  BIDDER_CODE: 'bluebillywig',
-  AUCTION_URL: '$$URL_STARTpbs.bluebillywig.com/openrtb2/auction?pub=$$PUBLICATION',
-  SYNC_URL: '$$URL_STARTpbs.bluebillywig.com/static/cookie-sync.html?pub=$$PUBLICATION',
-  RENDERER_URL: 'https://$$PUBLICATION.bbvms.com/r/$$RENDERER.js',
-  DEFAULT_TIMEOUT: 5000,
-  DEFAULT_TTL: 300,
-  DEFAULT_WIDTH: 768,
-  DEFAULT_HEIGHT: 432,
-  DEFAULT_NET_REVENUE: true
-};
-
-describe('BlueBillywigAdapter', () => {
-  describe('isBidRequestValid', () => {
-    const baseValidBid = {
-      bidder: BB_CONSTANTS.BIDDER_CODE,
-      params: {
-        accountId: 123,
-        publicationName: 'bbprebid.dev',
-        rendererCode: 'glorious_renderer',
-        connections: [ BB_CONSTANTS.BIDDER_CODE ],
-        bluebillywig: {}
-      },
-      mediaTypes: {
-        video: {
-          context: 'outstream'
-        }
-      }
-    };
-
-    it('should return true when required params found', () => {
-      expect(spec.isBidRequestValid(baseValidBid)).to.equal(true);
-    });
-
-    it('should return false when params missing', () => {
-      const bid = deepClone(baseValidBid);
-      delete bid.params;
-
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when publicationName is missing', () => {
-      const bid = deepClone(baseValidBid);
-      delete bid.params.publicationName;
-
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when publicationName is not a string', () => {
-      const bid = deepClone(baseValidBid);
-
-      bid.params.publicationName = 123;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.publicationName = false;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.publicationName = void (0);
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.publicationName = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when publicationName is formatted poorly', () => {
-      const bid = deepClone(baseValidBid);
-
-      bid.params.publicationName = 'bb.';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.publicationName = 'bb-test';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.publicationName = '?';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when renderer is not specified', () => {
-      const bid = deepClone(baseValidBid);
-
-      delete bid.params.rendererCode;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when renderer is not a string', () => {
-      const bid = deepClone(baseValidBid);
-
-      bid.params.rendererCode = 123;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.rendererCode = false;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.rendererCode = void (0);
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.rendererCode = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when renderer is formatted poorly', () => {
-      const bid = deepClone(baseValidBid);
-
-      bid.params.rendererCode = 'bb.';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.rendererCode = 'bb-test';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.rendererCode = '?';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when accountId is not specified', () => {
-      const bid = deepClone(baseValidBid);
-
-      delete bid.params.accountId;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when connections is not specified', () => {
-      const bid = deepClone(baseValidBid);
-
-      delete bid.params.connections;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when connections is not an array', () => {
-      const bid = deepClone(baseValidBid);
-
-      bid.params.connections = 123;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.connections = false;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.connections = void (0);
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.connections = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.connections = 'string';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when a connection is missing', () => {
-      const bid = deepClone(baseValidBid);
-
-      bid.params.connections.push('potatoes');
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.connections.pop();
-
-      delete bid.params[BB_CONSTANTS.BIDDER_CODE];
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail if bid has no mediaTypes', () => {
-      const bid = deepClone(baseValidBid);
-
-      delete bid.mediaTypes;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail if bid has no mediaTypes.video', () => {
-      const bid = deepClone(baseValidBid);
-
-      delete bid.mediaTypes[VIDEO];
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail if bid has no mediaTypes.video.context', () => {
-      const bid = deepClone(baseValidBid);
-
-      delete bid.mediaTypes[VIDEO].context;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail if mediaTypes.video.context is not "outstream"', () => {
-      const bid = deepClone(baseValidBid);
-
-      bid.mediaTypes[VIDEO].context = 'instream';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail if video is specified but is not an object', () => {
-      const bid = deepClone(baseValidBid);
-
-      bid.params.video = null;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.video = 'string';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.video = 123;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.video = false;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.video = void (0);
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail if rendererSettings is specified but is not an object', () => {
-      const bid = deepClone(baseValidBid);
-
-      bid.params.rendererSettings = null;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.rendererSettings = 'string';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.rendererSettings = 123;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.rendererSettings = false;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-
-      bid.params.rendererSettings = void (0);
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', () => {
-    const publicationName = 'bbprebid.dev';
-    const rendererCode = 'glorious_renderer';
-
-    const baseValidBid = {
-      bidder: BB_CONSTANTS.BIDDER_CODE,
-      params: {
-        accountId: 123,
-        publicationName: publicationName,
-        rendererCode: rendererCode,
-        connections: [ BB_CONSTANTS.BIDDER_CODE ],
-        bluebillywig: {}
-      },
-      mediaTypes: {
-        video: {
-          context: 'outstream'
-        }
-      }
-    };
-
-    const baseValidBidRequests = [baseValidBid];
-
-    const validBidderRequest = {
-      ortb2: {
-        source: {
-          tid: '12abc345-67d8-9012-e345-6f78901a2b34',
-        }
-      },
-      auctionStart: 1585918458868,
-      bidderCode: BB_CONSTANTS.BIDDER_CODE,
-      bidderRequestId: '1a2345b67c8d9e0',
-      bids: [{
-        adUnitCode: 'ad-unit-test',
-        auctionId: '12abc345-67d8-9012-e345-6f78901a2b34',
-        bidId: '1234ab567c89de0',
-        bidRequestsCount: 1,
-        bidder: BB_CONSTANTS.BIDDER_CODE,
-        bidderRequestId: '1a2345b67c8d9e0',
-        params: baseValidBid.params,
-        sizes: [[768, 432], [640, 480], [630, 360]],
-        transactionId: '2b34c5de-f67a-8901-bcd2-34567efabc89'
-      }],
-      start: 11585918458869,
-      timeout: 3000
-    };
-
-    it('sends bid request to AUCTION_URL via POST', () => {
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      expect(request.url).to.equal(`https://pbs.bluebillywig.com/openrtb2/auction?pub=${publicationName}`);
-      expect(request.method).to.equal('POST');
-    });
-
-    it('sends data as a string', () => {
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      expect(request.data).to.be.a('string');
-    });
-
-    it('sends all bid parameters', () => {
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
-    });
-
-    it('builds the base request properly', () => {
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.id).to.exist;
-      expect(payload.source).to.be.an('object');
-      expect(payload.source.tid).to.equal(validBidderRequest.ortb2.source.tid);
-      expect(payload.tmax).to.equal(BB_CONSTANTS.DEFAULT_TIMEOUT);
-      expect(payload.imp).to.be.an('array');
-      expect(payload.test).to.be.a('number');
-      expect(payload).to.have.nested.property('ext.prebid.targeting');
-      expect(payload.ext.prebid.targeting).to.be.an('object');
-      expect(payload.ext.prebid.targeting.includewinners).to.equal(true);
-      expect(payload.ext.prebid.targeting.includebidderkeys).to.equal(false);
-    });
-
-    it('adds an impression to the payload', () => {
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.imp.length).to.equal(1);
-    });
-
-    it('adds connections to ext', () => {
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.imp[0].ext).to.have.all.keys(['bluebillywig']);
-    });
-
-    it('adds gdpr when present', () => {
-      const newValidBidderRequest = deepClone(validBidderRequest);
-      newValidBidderRequest.gdprConsent = {
-        consentString: 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
-        gdprApplies: true
-      };
-
-      const request = spec.buildRequests(baseValidBidRequests, newValidBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.nested.property('regs.ext.gdpr');
-      expect(payload.regs.ext.gdpr).to.be.a('number');
-      expect(payload.regs.ext.gdpr).to.equal(1);
-      expect(payload).to.have.nested.property('user.ext.consent');
-      expect(payload.user.ext.consent).to.equal(newValidBidderRequest.gdprConsent.consentString);
-    });
-
-    it('sets gdpr to 0 when explicitly gdprApplies: false', () => {
-      const newValidBidderRequest = deepClone(validBidderRequest);
-      newValidBidderRequest.gdprConsent = {
-        gdprApplies: false
-      };
-
-      const request = spec.buildRequests(baseValidBidRequests, newValidBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.nested.property('regs.ext.gdpr');
-      expect(payload.regs.ext.gdpr).to.be.a('number');
-      expect(payload.regs.ext.gdpr).to.equal(0);
-    });
-
-    it('adds usp_consent when present', () => {
-      const newValidBidderRequest = deepClone(validBidderRequest);
-      newValidBidderRequest.uspConsent = '1YYY';
-
-      const request = spec.buildRequests(baseValidBidRequests, newValidBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.nested.property('regs.ext.us_privacy');
-      expect(payload.regs.ext.us_privacy).to.equal(newValidBidderRequest.uspConsent);
-    });
-
-    it('sets coppa to 1 when specified in config', () => {
-      config.setConfig({'coppa': true});
-
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.nested.property('regs.coppa');
-      expect(payload.regs.coppa).to.equal(1);
-
-      config.resetConfig();
-    });
-
-    it('does not set coppa when disabled in the config', () => {
-      config.setConfig({'coppa': false});
-
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(deepAccess(payload, 'regs.coppa')).to.be.undefined;
-
-      config.resetConfig();
-    });
-
-    it('does not set coppa when not specified in config', () => {
-      config.resetConfig();
-
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(deepAccess(payload, 'regs.coppa')).to.be.undefined;
-    });
-
-    it('should add window size to request by default', () => {
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.nested.property('device.w');
-      expect(payload).to.have.nested.property('device.h');
-      expect(payload.device.w).to.be.a('number');
-      expect(payload.device.h).to.be.a('number');
-    });
-
-    it('should add site when specified in config', () => {
-      config.setConfig({ site: { name: 'Blue Billywig', domain: 'bluebillywig.com', page: 'https://bluebillywig.com/', publisher: { id: 'abc', name: 'Blue Billywig', domain: 'bluebillywig.com' } } });
-
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.property('site');
-      expect(payload).to.have.nested.property('site.name');
-      expect(payload).to.have.nested.property('site.domain');
-      expect(payload).to.have.nested.property('site.page');
-      expect(payload).to.have.nested.property('site.publisher');
-      expect(payload).to.have.nested.property('site.publisher.id');
-      expect(payload).to.have.nested.property('site.publisher.name');
-      expect(payload).to.have.nested.property('site.publisher.domain');
-
-      config.resetConfig();
-    });
-
-    it('should add app when specified in config', () => {
-      config.setConfig({ app: { bundle: 'org.prebid.mobile.demoapp', domain: 'prebid.org' } });
-
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.property('app');
-      expect(payload).to.have.nested.property('app.bundle');
-      expect(payload).to.have.nested.property('app.domain');
-      expect(payload.app.bundle).to.equal('org.prebid.mobile.demoapp');
-      expect(payload.app.domain).to.equal('prebid.org');
-
-      config.resetConfig();
-    });
-
-    it('should add referrerInfo as site when no app is set', () => {
-      const newValidBidderRequest = deepClone(validBidderRequest);
-
-      newValidBidderRequest.refererInfo = { page: 'https://www.bluebillywig.com' };
-
-      const request = spec.buildRequests(baseValidBidRequests, newValidBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.nested.property('site.page');
-      expect(payload.site.page).to.equal('https://www.bluebillywig.com');
-    });
-
-    it('should not add referrerInfo as site when app is set', () => {
-      config.setConfig({ app: { bundle: 'org.prebid.mobile.demoapp', domain: 'prebid.org' } });
-
-      const newValidBidderRequest = deepClone(validBidderRequest);
-      newValidBidderRequest.refererInfo = { referer: 'https://www.bluebillywig.com' };
-
-      const request = spec.buildRequests(baseValidBidRequests, newValidBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.site).to.be.undefined;
-      config.resetConfig();
-    });
-
-    it('should add device size to request when specified in config', () => {
-      config.setConfig({ device: { w: 1, h: 1 } });
-
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.nested.property('device.w');
-      expect(payload).to.have.nested.property('device.h');
-      expect(payload.device.w).to.be.a('number');
-      expect(payload.device.h).to.be.a('number');
-      expect(payload.device.w).to.equal(1);
-      expect(payload.device.h).to.equal(1);
-
-      config.resetConfig();
-    });
-
-    it('should set schain on the request when set on config', () => {
-      const schain = {
-        validation: 'lax',
-        config: {
-          ver: '1.0',
-          complete: 1,
-	  nodes: [
-            {
-              asi: 'indirectseller.com',
-	      sid: '00001',
-              hp: 1
-            }
-          ]
-        }
-      };
-
-      const newBaseValidBidRequests = deepClone(baseValidBidRequests);
-      newBaseValidBidRequests[0].schain = schain;
-
-      const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.nested.property('source.ext.schain');
-      expect(payload.source.ext.schain).to.deep.equal(schain);
-    });
-
-    it('should add currency when specified on the config', () => {
-      config.setConfig({ currency: { adServerCurrency: 'USD' } });
-
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.property('cur');
-      expect(payload.cur).to.eql(['USD']); // NB not equal, eql to check for same array because [1] === [1] fails normally
-
-      config.resetConfig();
-    });
-
-    it('should also take in array for currency on the config', () => {
-      config.setConfig({ currency: { adServerCurrency: ['USD', 'PHP'] } });
-
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.property('cur');
-      expect(payload.cur).to.eql(['USD']); // NB not equal, eql to check for same array because [1] === [1] fails normally
-
-      config.resetConfig();
-    });
-
-    it('should not set cur when currency is not specified on the config', () => {
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.cur).to.be.undefined;
-    });
-
-    it('should set user ids when present', () => {
-      const newBaseValidBidRequests = deepClone(baseValidBidRequests);
-      newBaseValidBidRequests[0].userIdAsEids = [ {} ];
-
-      const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload).to.have.nested.property('user.ext.eids');
-      expect(payload.user.ext.eids).to.be.an('array');
-      expect(payload.user.ext.eids.length).to.equal(1);
-    });
-
-    it('should not set user ids when none present', () => {
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(deepAccess(payload, 'user.ext.eids')).to.be.undefined;
-    });
-
-    it('should set imp.0.video.[w|h|placement] by default', () => {
-      const newBaseValidBidRequests = deepClone(baseValidBidRequests);
-
-      const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(deepAccess(payload, 'imp.0.video.w')).to.equal(768);
-      expect(deepAccess(payload, 'imp.0.video.h')).to.equal(432);
-      expect(deepAccess(payload, 'imp.0.video.placement')).to.equal(3);
-    });
-
-    it('should update imp0.video.[w|h] when present in config', () => {
-      const newBaseValidBidRequests = deepClone(baseValidBidRequests);
-      newBaseValidBidRequests[0].mediaTypes.video.playerSize = [1, 1];
-
-      const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(deepAccess(payload, 'imp.0.video.w')).to.equal(1);
-      expect(deepAccess(payload, 'imp.0.video.h')).to.equal(1);
-    });
-
-    it('should allow overriding any imp0.video key through params.video', () => {
-      const newBaseValidBidRequests = deepClone(baseValidBidRequests);
-      newBaseValidBidRequests[0].params.video = {
-        w: 2,
-        h: 2,
-        placement: 1,
-        minduration: 15,
-        maxduration: 30
-      };
-
-      const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(deepAccess(payload, 'imp.0.video.w')).to.equal(2);
-      expect(deepAccess(payload, 'imp.0.video.h')).to.equal(2);
-      expect(deepAccess(payload, 'imp.0.video.placement')).to.equal(1);
-      expect(deepAccess(payload, 'imp.0.video.minduration')).to.equal(15);
-      expect(deepAccess(payload, 'imp.0.video.maxduration')).to.equal(30);
-    });
-
-    it('should not allow placing any non-OpenRTB 2.5 keys on imp.0.video through params.video', () => {
-      const newBaseValidBidRequests = deepClone(baseValidBidRequests);
-      newBaseValidBidRequests[0].params.video = {
-        'true': true,
-        'testing': 'some',
-        123: {},
-        '': 'values'
-      };
-
-      const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(deepAccess(request, 'imp.0.video.true')).to.be.undefined;
-      expect(deepAccess(payload, 'imp.0.video.testing')).to.be.undefined;
-      expect(deepAccess(payload, 'imp.0.video.123')).to.be.undefined;
-      expect(deepAccess(payload, 'imp.0.video.')).to.be.undefined;
-    });
-  });
-  describe('interpretResponse', () => {
-    const publicationName = 'bbprebid.dev';
-    const rendererCode = 'glorious_renderer';
-
-    const baseValidBid = {
-      bidder: BB_CONSTANTS.BIDDER_CODE,
-      params: {
-        accountId: 123,
-        publicationName: publicationName,
-        rendererCode: rendererCode,
-        connections: [ BB_CONSTANTS.BIDDER_CODE ],
-        bluebillywig: {}
-      },
-      mediaTypes: {
-        video: {
-          context: 'outstream'
-        }
-      }
-    };
-
-    const baseValidBidRequests = [baseValidBid];
-
-    const validBidderRequest = {
-      auctionId: '12abc345-67d8-9012-e345-6f78901a2b34',
-      auctionStart: 1585918458868,
-      bidderCode: BB_CONSTANTS.BIDDER_CODE,
-      bidderRequestId: '1a2345b67c8d9e0',
-      bids: [{
-        adUnitCode: 'ad-unit-test',
-        auctionId: '12abc345-67d8-9012-e345-6f78901a2b34',
-        bidId: '1234ab567c89de0',
-        bidRequestsCount: 1,
-        bidder: BB_CONSTANTS.BIDDER_CODE,
-        bidderRequestId: '1a2345b67c8d9e0',
-        params: baseValidBid.params,
-        sizes: [[640, 480], [630, 360]],
-        transactionId: '2b34c5de-f67a-8901-bcd2-34567efabc89'
-      }],
-      start: 11585918458869,
-      timeout: 3000
-    };
-
-    const validResponse = {
-      id: 'a12abc345-67d8-9012-e345-6f78901a2b34',
-      seatbid: [
-        {
-          bid: [
-            {
-              id: '1',
-              impid: '1234ab567c89de0',
-              price: 1,
-              adm: '\r\nBB Adserver00:00:51',
-              adid: '67069817',
-              adomain: [
-                'bluebillywig.com'
-              ],
-              cid: '3535',
-              crid: '67069817',
-              w: 1,
-              h: 1,
-	      publicationName: 'bbprebid',
-	      accountId: 123,
-              ext: {
-                prebid: {
-                  targeting: {
-                    hb_bidder: 'bluebillywig',
-                    hb_pb: '1.00',
-                    hb_size: '1x1'
-                  },
-                  type: 'video'
-                },
-                bidder: {
-                  prebid: {
-                    targeting: {
-                      hb_bidder: 'bluebillywig',
-                      hb_pb: '10.00',
-                      hb_size: '1x1'
-                    },
-                    type: 'video',
-                    video: {
-                      duration: 51,
-                      primary_category: ''
-                    }
-                  },
-                  bidder: {
-                    bluebillywig: {
-                      brand_id: 1,
-                      auction_id: 1,
-                      bid_ad_type: 1,
-                      creative_info: {
-                        video: {
-                          duration: 51,
-                          mimes: [
-                            'video/x-flv',
-                            'video/mp4',
-                            'video/webm'
-                          ]
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          seat: 'bluebillywig'
-        }
-      ],
-      cur: 'USD',
-      ext: {
-        responsetimemillis: {
-          bluebillywig: 0
-        },
-        tmaxrequest: 5000
-      }
-    };
-
-    const serverResponse = { body: validResponse };
-
-    it('should build bid array', () => {
-      const response = deepClone(serverResponse);
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(result.length).to.equal(1);
-    });
-
-    it('should have all relevant fields', () => {
-      const response = deepClone(serverResponse);
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-      const bid = result[0];
-
-      // BB_HELPERS.transformRTBToPrebidProps
-      expect(bid.cpm).to.equal(serverResponse.body.seatbid[0].bid[0].price);
-      expect(bid.bidId).to.equal(serverResponse.body.seatbid[0].bid[0].impid);
-      expect(bid.requestId).to.equal(serverResponse.body.seatbid[0].bid[0].impid);
-      expect(bid.width).to.equal(serverResponse.body.seatbid[0].bid[0].w || BB_CONSTANTS.DEFAULT_WIDTH);
-      expect(bid.height).to.equal(serverResponse.body.seatbid[0].bid[0].h || BB_CONSTANTS.DEFAULT_HEIGHT);
-      expect(bid.ad).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-      expect(bid.netRevenue).to.equal(BB_CONSTANTS.DEFAULT_NET_REVENUE);
-      expect(bid.creativeId).to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-      expect(bid.currency).to.equal(serverResponse.body.cur);
-      expect(bid.ttl).to.equal(BB_CONSTANTS.DEFAULT_TTL);
-
-      expect(bid).to.have.property('meta');
-      expect(bid.meta).to.have.property('advertiserDomains');
-      expect(bid.meta.advertiserDomains[0]).to.equal('bluebillywig.com');
-
-      expect(bid.publicationName).to.equal(validBidderRequest.bids[0].params.publicationName);
-      expect(bid.rendererCode).to.equal(validBidderRequest.bids[0].params.rendererCode);
-      expect(bid.accountId).to.equal(validBidderRequest.bids[0].params.accountId);
-    });
-
-    it('should not give anything when seatbid is an empty array', () => {
-      const seatbidEmptyArray = deepClone(serverResponse);
-      seatbidEmptyArray.body.seatbid = [];
-
-      const response = seatbidEmptyArray;
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(result.length).to.equal(0);
-    });
-
-    it('should not give anything when seatbid is missing', () => {
-      const seatbidMissing = deepClone(serverResponse);
-      delete seatbidMissing.body.seatbid;
-
-      const response = seatbidMissing;
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(result.length).to.equal(0);
-    });
-
-    const seatbidNotArrayResponse = deepClone(serverResponse);
-    it('should not give anything when seatbid is not an array', () => {
-      const invalidValues = [ false, null, {}, void (0), 123, 'string' ];
-
-      for (const invalidValue of invalidValues) {
-        seatbidNotArrayResponse.body.seatbid = invalidValue
-        const response = deepClone(seatbidNotArrayResponse); // interpretResponse is destructive
-        const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-        const result = spec.interpretResponse(response, request);
-
-        expect(result.length).to.equal(0);
-      }
-    });
-
-    it('should not give anything when seatbid.bid is an empty array', () => {
-      const seatbidBidEmpty = deepClone(serverResponse);
-      seatbidBidEmpty.body.seatbid[0].bid = [];
-
-      const response = seatbidBidEmpty;
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(result.length).to.equal(0);
-    });
-
-    it('should not give anything when seatbid.bid is missing', () => {
-      const seatbidBidMissing = deepClone(serverResponse);
-      delete seatbidBidMissing.body.seatbid[0].bid;
-
-      const response = seatbidBidMissing;
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(result.length).to.equal(0);
-    });
-
-    it('should not give anything when seatbid.bid is not an array', () => {
-      const seatbidBidNotArray = deepClone(serverResponse);
-
-      const invalidValues = [ false, null, {}, void (0), 123, 'string' ];
-
-      for (const invalidValue of invalidValues) {
-        seatbidBidNotArray.body.seatbid[0].bid = invalidValue;
-
-        const response = deepClone(seatbidBidNotArray); // interpretResponse is destructive
-        const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-        const result = spec.interpretResponse(response, request);
-
-        expect(result.length).to.equal(0);
-      }
-    });
-
-    it('should take default width and height when w/h not present', () => {
-      const bidSizesMissing = deepClone(serverResponse);
-
-      delete bidSizesMissing.body.seatbid[0].bid[0].w;
-      delete bidSizesMissing.body.seatbid[0].bid[0].h;
-
-      const response = bidSizesMissing;
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(deepAccess(result, '0.width')).to.equal(768);
-      expect(deepAccess(result, '0.height')).to.equal(432);
-    });
-
-    it('should take nurl value when adm not present', () => {
-      const bidAdmMissing = deepClone(serverResponse);
-
-      delete bidAdmMissing.body.seatbid[0].bid[0].adm;
-      bidAdmMissing.body.seatbid[0].bid[0].nurl = 'https://bluebillywig.com';
-
-      const response = bidAdmMissing;
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(deepAccess(result, '0.vastXml')).to.be.undefined;
-      expect(deepAccess(result, '0.vastUrl')).to.equal('https://bluebillywig.com');
-    });
-
-    it('should not take nurl value when adm present', () => {
-      const bidAdmNurlPresent = deepClone(serverResponse);
-
-      bidAdmNurlPresent.body.seatbid[0].bid[0].nurl = 'https://bluebillywig.com';
-
-      const response = bidAdmNurlPresent;
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(deepAccess(result, '0.vastXml')).to.equal(bidAdmNurlPresent.body.seatbid[0].bid[0].adm);
-      expect(deepAccess(result, '0.vastUrl')).to.be.undefined;
-    });
-
-    it('should take ext.prebid.cache data when present, ignore ext.prebid.targeting and nurl', () => {
-      const bidExtPrebidCache = deepClone(serverResponse);
-
-      delete bidExtPrebidCache.body.seatbid[0].bid[0].adm;
-      bidExtPrebidCache.body.seatbid[0].bid[0].nurl = 'https://notnurl.com';
-
-      bidExtPrebidCache.body.seatbid[0].bid[0].ext = {
-        prebid: {
-          cache: {
-            vastXml: {
-              url: 'https://bluebillywig.com',
-              cacheId: '12345'
-            }
-          },
-          targeting: {
-            hb_uuid: '23456',
-            hb_cache_host: 'bluebillywig.com',
-            hb_cache_path: '/cache'
-          }
-        }
-      };
-
-      const response = bidExtPrebidCache;
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(deepAccess(result, '0.vastUrl')).to.equal('https://bluebillywig.com');
-      expect(deepAccess(result, '0.videoCacheKey')).to.equal('12345');
-    });
-
-    it('should take ext.prebid.targeting data when ext.prebid.cache not present, and ignore nurl', () => {
-      const bidExtPrebidTargeting = deepClone(serverResponse);
-
-      delete bidExtPrebidTargeting.body.seatbid[0].bid[0].adm;
-      bidExtPrebidTargeting.body.seatbid[0].bid[0].nurl = 'https://notnurl.com';
-
-      bidExtPrebidTargeting.body.seatbid[0].bid[0].ext = {
-        prebid: {
-          targeting: {
-            hb_uuid: '34567',
-            hb_cache_host: 'bluebillywig.com',
-            hb_cache_path: '/cache'
-          }
-        }
-      };
-
-      const response = bidExtPrebidTargeting;
-      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
-      const result = spec.interpretResponse(response, request);
-
-      expect(deepAccess(result, '0.vastUrl')).to.equal('https://bluebillywig.com/cache?uuid=34567');
-      expect(deepAccess(result, '0.videoCacheKey')).to.equal('34567');
-    });
-  });
-  describe('getUserSyncs', () => {
-    const publicationName = 'bbprebid.dev';
-    const rendererCode = 'glorious_renderer';
-
-    const baseValidBid = {
-      bidder: BB_CONSTANTS.BIDDER_CODE,
-      params: {
-        accountId: 123,
-        publicationName: publicationName,
-        rendererCode: rendererCode,
-        connections: [ BB_CONSTANTS.BIDDER_CODE ],
-        bluebillywig: {}
-      },
-      mediaTypes: {
-        video: {
-          context: 'outstream'
-        }
-      }
-    };
-
-    const validBidRequests = [baseValidBid];
-
-    const validBidderRequest = {
-      auctionId: '12abc345-67d8-9012-e345-6f78901a2b34',
-      auctionStart: 1585918458868,
-      bidderCode: BB_CONSTANTS.BIDDER_CODE,
-      bidderRequestId: '1a2345b67c8d9e0',
-      bids: [{
-        adUnitCode: 'ad-unit-test',
-        auctionId: '12abc345-67d8-9012-e345-6f78901a2b34',
-        bidId: '1234ab567c89de0',
-        bidRequestsCount: 1,
-        bidder: BB_CONSTANTS.BIDDER_CODE,
-        bidderRequestId: '1a2345b67c8d9e0',
-        params: baseValidBid.params,
-        sizes: [[768, 432], [640, 480], [630, 360]],
-        transactionId: '2b34c5de-f67a-8901-bcd2-34567efabc89'
-      }],
-      start: 11585918458869,
-      timeout: 3000
-    };
-    const validResponse = {
-      id: 'a12abc345-67d8-9012-e345-6f78901a2b34',
-      seatbid: [
-        {
-          bid: [
-            {
-              id: '1',
-              impid: '1234ab567c89de0',
-              price: 1,
-              adm: '\r\nBB Adserver00:00:51',
-              adid: '67069817',
-              adomain: [
-                'bluebillywig.com'
-              ],
-              cid: '3535',
-              crid: '67069817',
-              w: 1,
-              h: 1,
-	      publicationName: 'bbprebid',
-	      accountId: 123,
-              ext: {
-                prebid: {
-                  targeting: {
-                    hb_bidder: 'bluebillywig',
-                    hb_pb: '1.00',
-                    hb_size: '1x1'
-                  },
-                  type: 'video'
-                },
-                bidder: {
-                  prebid: {
-                    targeting: {
-                      hb_bidder: 'bluebillywig',
-                      hb_pb: '10.00',
-                      hb_size: '1x1'
-                    },
-                    type: 'video',
-                    video: {
-                      duration: 51,
-                      primary_category: ''
-                    }
-                  },
-                  bidder: {
-                    bluebillywig: {
-                      brand_id: 1,
-                      auction_id: 1,
-                      bid_ad_type: 1,
-                      creative_info: {
-                        video: {
-                          duration: 51,
-                          mimes: [
-                            'video/x-flv',
-                            'video/mp4',
-                            'video/webm'
-                          ]
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          seat: 'bluebillywig'
-        }
-      ],
-      cur: 'USD',
-      ext: {
-        responsetimemillis: {
-          bluebillywig: 0
-        },
-        tmaxrequest: 5000
-      }
-    };
-
-    const serverResponse = { body: validResponse };
-
-    const gdpr = {
-      consentString: 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAA  AAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
-      gdprApplies: true
-    };
-
-    it('should return empty if no server response', function () {
-      const result = spec.getUserSyncs({}, false, gdpr);
-      expect(result).to.be.empty;
-    });
-
-    it('should return empty if server response is empty', function () {
-      const result = spec.getUserSyncs({}, [], gdpr);
-      expect(result).to.be.empty;
-    });
-
-    it('should return empty if iframeEnabled is not true', () => {
-      const result = spec.getUserSyncs({iframeEnabled: false}, [serverResponse], gdpr);
-      expect(result).to.be.empty;
-    });
-
-    it('should append the various values if they exist', function() {
-      // push data to syncStore
-      spec.buildRequests(validBidRequests, validBidderRequest);
-
-      const result = spec.getUserSyncs({iframeEnabled: true}, [serverResponse], gdpr);
-
-      expect(result).to.not.be.empty;
-
-      expect(result[0].url).to.include('gdpr=1');
-      expect(result[0].url).to.include(gdpr.consentString);
-      expect(result[0].url).to.include('accountId=123');
-      expect(result[0].url).to.include(`bidders=${btoa(JSON.stringify(validBidRequests[0].params.connections))}`);
-      expect(result[0].url).to.include('cb=');
-    });
-  });
-});
diff --git a/test/spec/modules/boldwinBidAdapter_spec.js b/test/spec/modules/boldwinBidAdapter_spec.js
index 52a6ec03757..820938dcec2 100644
--- a/test/spec/modules/boldwinBidAdapter_spec.js
+++ b/test/spec/modules/boldwinBidAdapter_spec.js
@@ -1,115 +1,221 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/boldwinBidAdapter.js';
-import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import { expect } from 'chai';
+import { spec } from '../../../modules/boldwinBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'boldwin';
 
 describe('BoldwinBidAdapter', function () {
-  const bid = {
-    bidId: '23fhj33i987f',
-    bidder: 'boldwin',
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
     mediaTypes: {
-      banner: {
-        sizes: [ [300, 250], [320, 50] ],
+      [BANNER]: {
+        sizes: [[300, 250]]
       }
     },
     params: {
-      placementId: 'testBanner',
+
     }
-  };
+  }
 
   const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
     },
-    ortb2: {}
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
-    it('Should return true if there are bidId, params and placementId parameters present', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
     });
     it('Should return false if at least one of parameters is not present', function () {
-      delete bid.params.placementId;
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
     });
   });
 
   describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
       expect(serverRequest.url).to.exist;
       expect(serverRequest.data).to.exist;
     });
+
     it('Returns POST method', function () {
       expect(serverRequest.method).to.equal('POST');
     });
+
     it('Returns valid URL', function () {
       expect(serverRequest.url).to.equal('https://ssp.videowalldirect.com/pbjs');
     });
-    it('Returns valid data if array of bids is valid', function () {
+
+    it('Returns general data valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
       expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
-      expect(data.gdpr).to.not.exist;
-      expect(data.ccpa).to.not.exist;
-      let placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'adFormat', 'sizes', 'hPlayer', 'wPlayer', 'schain', 'bidFloor', 'type');
-      expect(placement.placementId).to.equal('testBanner');
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.adFormat).to.equal(BANNER);
-      expect(placement.schain).to.be.an('object');
-      expect(placement.type).to.exist.and.to.equal('publisher');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
     });
 
-    it('Returns valid data for mediatype video', function () {
-      const playerSize = [300, 300];
-      bid.mediaTypes = {};
-      bid.mediaTypes[VIDEO] = {
-        playerSize
-      };
-      serverRequest = spec.buildRequests([bid], bidderRequest);
-      let data = serverRequest.data;
-      expect(data).to.be.an('object');
-      let placement = data['placements'][0];
-      expect(placement).to.be.an('object');
-      expect(placement.adFormat).to.equal(VIDEO);
-      expect(placement.wPlayer).to.equal(playerSize[0]);
-      expect(placement.hPlayer).to.equal(playerSize[1]);
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.wPlayer).to.be.an('number');
+            expect(placement.hPlayer).to.be.an('number');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
     });
 
     it('Returns data with gdprConsent and without uspConsent', function () {
-      bidderRequest.gdprConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
 
     it('Returns data with uspConsent and without gdprConsent', function () {
-      bidderRequest.uspConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.ccpa).to.exist;
       expect(data.ccpa).to.be.a('string');
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
-
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
-      let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
   });
 
   describe('gpp consent', function () {
@@ -119,7 +225,7 @@ describe('BoldwinBidAdapter', function () {
         applicableSections: [8]
       };
 
-      let serverRequest = spec.buildRequests([bid], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data).to.be.an('object');
       expect(data).to.have.property('gpp');
@@ -129,15 +235,18 @@ describe('BoldwinBidAdapter', function () {
     })
 
     it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
       bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
       bidderRequest.ortb2.regs.gpp = 'abc123';
       bidderRequest.ortb2.regs.gpp_sid = [8];
 
-      let serverRequest = spec.buildRequests([bid], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data).to.be.an('object');
       expect(data).to.have.property('gpp');
       expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
     })
   });
 
@@ -155,7 +264,11 @@ describe('BoldwinBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let bannerResponses = spec.interpretResponse(banner);
@@ -163,18 +276,17 @@ describe('BoldwinBidAdapter', function () {
       let dataItem = bannerResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
         'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
-      expect(dataItem.requestId).to.equal('23fhj33i987f');
-      expect(dataItem.cpm).to.equal(0.4);
-      expect(dataItem.width).to.equal(300);
-      expect(dataItem.height).to.equal(250);
-      expect(dataItem.ad).to.equal('Test');
-      expect(dataItem.ttl).to.equal(120);
-      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
       expect(dataItem.netRevenue).to.be.true;
-      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
       expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
-
     it('Should interpret video response', function () {
       const video = {
         body: [{
@@ -186,7 +298,11 @@ describe('BoldwinBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let videoResponses = spec.interpretResponse(video);
@@ -220,6 +336,10 @@ describe('BoldwinBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let nativeResponses = spec.interpretResponse(native);
@@ -307,14 +427,41 @@ describe('BoldwinBidAdapter', function () {
     });
   });
 
-  describe('getUserSyncs', function () {
-    let userSync = spec.getUserSyncs();
-    it('Returns valid URL and type', function () {
-      expect(userSync).to.be.an('array').with.lengthOf(1);
-      expect(userSync[0].type).to.exist;
-      expect(userSync[0].url).to.exist;
-      expect(userSync[0].type).to.be.equal('image');
-      expect(userSync[0].url).to.be.equal('https://cs.videowalldirect.com');
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.videowalldirect.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.videowalldirect.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.videowalldirect.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
     });
   });
 });
diff --git a/test/spec/modules/bridBidAdapter_spec.js b/test/spec/modules/bridBidAdapter_spec.js
index 7503c748999..fdda6d840e8 100644
--- a/test/spec/modules/bridBidAdapter_spec.js
+++ b/test/spec/modules/bridBidAdapter_spec.js
@@ -1,4 +1,5 @@
 import { spec } from '../../../modules/bridBidAdapter.js'
+import { SYNC_URL } from '../../../libraries/targetVideoUtils/constants.js';
 
 describe('Brid Bid Adapter', function() {
   const videoRequest = [{
@@ -126,4 +127,23 @@ describe('Brid Bid Adapter', function() {
     expect(payload.regs.ext.gdpr).to.be.undefined;
     expect(payload.regs.ext.us_privacy).to.equal(uspConsentString);
   });
+
+  it('Test userSync have only one object and it should have a property type=iframe', function () {
+    let userSync = spec.getUserSyncs({ iframeEnabled: true });
+    expect(userSync).to.be.an('array');
+    expect(userSync.length).to.be.equal(1);
+    expect(userSync[0]).to.have.property('type');
+    expect(userSync[0].type).to.be.equal('iframe');
+  });
+
+  it('Test userSync valid sync url for iframe', function () {
+    let [userSync] = spec.getUserSyncs({ iframeEnabled: true }, {}, {consentString: 'anyString'});
+    expect(userSync.url).to.contain(SYNC_URL + 'load-cookie.html?endpoint=brid&gdpr=0&gdpr_consent=anyString');
+    expect(userSync.type).to.be.equal('iframe');
+  });
+
+  it('Test userSyncs iframeEnabled=false', function () {
+    let userSyncs = spec.getUserSyncs({iframeEnabled: false});
+    expect(userSyncs).to.have.lengthOf(0);
+  });
 });
diff --git a/test/spec/modules/brightcomBidAdapter_spec.js b/test/spec/modules/brightcomBidAdapter_spec.js
deleted file mode 100644
index 1ae73708d00..00000000000
--- a/test/spec/modules/brightcomBidAdapter_spec.js
+++ /dev/null
@@ -1,411 +0,0 @@
-import { expect } from 'chai';
-import * as utils from 'src/utils.js';
-import { spec } from 'modules/brightcomBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-import {config} from '../../../src/config';
-
-const URL = 'https://brightcombid.marphezis.com/hb';
-
-describe('brightcomBidAdapter', function() {
-  const adapter = newBidder(spec);
-  let element, win;
-  let bidRequests;
-  let sandbox;
-
-  beforeEach(function() {
-    element = {
-      x: 0,
-      y: 0,
-
-      width: 0,
-      height: 0,
-
-      getBoundingClientRect: () => {
-        return {
-          width: element.width,
-          height: element.height,
-
-          left: element.x,
-          top: element.y,
-          right: element.x + element.width,
-          bottom: element.y + element.height
-        };
-      }
-    };
-    win = {
-      document: {
-        visibilityState: 'visible'
-      },
-
-      innerWidth: 800,
-      innerHeight: 600
-    };
-    bidRequests = [{
-      'bidder': 'brightcom',
-      'params': {
-        'publisherId': 1234567
-      },
-      'adUnitCode': 'adunit-code',
-      'mediaTypes': {
-        'banner': {
-          'sizes': [[300, 250], [300, 600]]
-        }
-      },
-      'bidId': '5fb26ac22bde4',
-      'bidderRequestId': '4bf93aeb730cb9',
-      'auctionId': 'ffe9a1f7-7b67-4bda-a8e0-9ee5dc9f442e',
-      'schain': {
-        'ver': '1.0',
-        'complete': 1,
-        'nodes': [
-          {
-            'asi': 'exchange1.com',
-            'sid': '1234',
-            'hp': 1,
-            'rid': 'bid-request-1',
-            'name': 'publisher',
-            'domain': 'publisher.com'
-          }
-        ]
-      },
-    }];
-
-    sandbox = sinon.sandbox.create();
-    sandbox.stub(document, 'getElementById').withArgs('adunit-code').returns(element);
-    sandbox.stub(utils, 'getWindowTop').returns(win);
-    sandbox.stub(utils, 'getWindowSelf').returns(win);
-  });
-
-  afterEach(function() {
-    sandbox.restore();
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'brightcom',
-      'params': {
-        'publisherId': 1234567
-      },
-      'adUnitCode': 'adunit-code',
-      'mediaTypes': {
-        'banner': {
-          'sizes': [[300, 250], [300, 600]]
-        }
-      },
-      'bidId': '5fb26ac22bde4',
-      'bidderRequestId': '4bf93aeb730cb9',
-      'auctionId': 'ffe9a1f7-7b67-4bda-a8e0-9ee5dc9f442e',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when publisherId not passed correctly', function () {
-      bid.params.publisherId = undefined;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when require params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    it('sends bid request to our endpoint via POST', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.method).to.equal('POST');
-    });
-
-    it('request url should match our endpoint url', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.equal(URL);
-    });
-
-    it('sets the proper banner object', function() {
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
-    });
-
-    it('accepts a single array as a size', function() {
-      bidRequests[0].mediaTypes.banner.sizes = [300, 250];
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}]);
-    });
-
-    it('sends bidfloor param if present', function () {
-      bidRequests[0].params.bidFloor = 0.05;
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0].bidfloor).to.equal(0.05);
-    });
-
-    it('sends tagid', function () {
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0].tagid).to.equal('adunit-code');
-    });
-
-    it('sends publisher id', function () {
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.site.publisher.id).to.equal(1234567);
-    });
-
-    it('sends gdpr info if exists', function () {
-      const consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
-      const bidderRequest = {
-        'bidderCode': 'brightcom',
-        'auctionId': '1d1a030790a437',
-        'bidderRequestId': '22edbae2744bf5',
-        'timeout': 3000,
-        gdprConsent: {
-          consentString: consentString,
-          gdprApplies: true
-        },
-        refererInfo: {
-          page: 'http://example.com/page.html',
-          domain: 'example.com',
-        }
-      };
-      bidderRequest.bids = bidRequests;
-
-      const data = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data);
-
-      expect(data.regs.ext.gdpr).to.exist.and.to.be.a('number');
-      expect(data.regs.ext.gdpr).to.equal(1);
-      expect(data.user.ext.consent).to.exist.and.to.be.a('string');
-      expect(data.user.ext.consent).to.equal(consentString);
-    });
-
-    it('sends us_privacy', function () {
-      const bidderRequest = {
-        uspConsent: '1YYY'
-      };
-      const data = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data)
-
-      expect(data.regs).to.not.equal(null);
-      expect(data.regs.ext).to.not.equal(null);
-      expect(data.regs.ext.us_privacy).to.equal('1YYY');
-    });
-
-    it('sends coppa', function () {
-      sandbox.stub(config, 'getConfig').withArgs('coppa').returns(true);
-
-      const data = JSON.parse(spec.buildRequests(bidRequests).data)
-      expect(data.regs).to.not.be.undefined;
-      expect(data.regs.coppa).to.equal(1);
-    });
-
-    it('sends schain', function () {
-      const data = JSON.parse(spec.buildRequests(bidRequests).data);
-      expect(data).to.not.be.undefined;
-      expect(data.source).to.not.be.undefined;
-      expect(data.source.ext).to.not.be.undefined;
-      expect(data.source.ext.schain).to.not.be.undefined;
-      expect(data.source.ext.schain.complete).to.equal(1);
-      expect(data.source.ext.schain.ver).to.equal('1.0');
-      expect(data.source.ext.schain.nodes).to.not.be.undefined;
-      expect(data.source.ext.schain.nodes).to.lengthOf(1);
-      expect(data.source.ext.schain.nodes[0].asi).to.equal('exchange1.com');
-      expect(data.source.ext.schain.nodes[0].sid).to.equal('1234');
-      expect(data.source.ext.schain.nodes[0].hp).to.equal(1);
-      expect(data.source.ext.schain.nodes[0].rid).to.equal('bid-request-1');
-      expect(data.source.ext.schain.nodes[0].name).to.equal('publisher');
-      expect(data.source.ext.schain.nodes[0].domain).to.equal('publisher.com');
-    });
-
-    it('sends user eid parameters', function () {
-      bidRequests[0].userIdAsEids = [{
-        source: 'pubcid.org',
-        uids: [{
-          id: 'userid_pubcid'
-        }]
-      }, {
-        source: 'adserver.org',
-        uids: [{
-          id: 'userid_ttd',
-          ext: {
-            rtiPartner: 'TDID'
-          }
-        }]
-      }
-      ];
-
-      const data = JSON.parse(spec.buildRequests(bidRequests).data);
-
-      expect(data.user).to.not.be.undefined;
-      expect(data.user.ext).to.not.be.undefined;
-      expect(data.user.ext.eids).to.not.be.undefined;
-      expect(data.user.ext.eids).to.deep.equal(bidRequests[0].userIdAsEids);
-    });
-
-    it('sends user id parameters', function () {
-      const userId = {
-        sharedid: {
-          id: '01*******',
-          third: '01E*******'
-        }
-      };
-
-      bidRequests[0].userId = userId;
-
-      const data = JSON.parse(spec.buildRequests(bidRequests).data);
-      expect(data.user).to.not.be.undefined;
-      expect(data.user.ext).to.not.be.undefined;
-      expect(data.user.ext.ids).is.deep.equal(userId);
-    });
-
-    context('when element is fully in view', function() {
-      it('returns 100', function() {
-        Object.assign(element, { width: 600, height: 400 });
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(100);
-      });
-    });
-
-    context('when element is out of view', function() {
-      it('returns 0', function() {
-        Object.assign(element, { x: -300, y: 0, width: 207, height: 320 });
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(0);
-      });
-    });
-
-    context('when element is partially in view', function() {
-      it('returns percentage', function() {
-        Object.assign(element, { width: 800, height: 800 });
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(75);
-      });
-    });
-
-    context('when width or height of the element is zero', function() {
-      it('try to use alternative values', function() {
-        Object.assign(element, { width: 0, height: 0 });
-        bidRequests[0].mediaTypes.banner.sizes = [[800, 2400]];
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(25);
-      });
-    });
-
-    context('when nested iframes', function() {
-      it('returns \'na\'', function() {
-        Object.assign(element, { width: 600, height: 400 });
-
-        utils.getWindowTop.restore();
-        utils.getWindowSelf.restore();
-        sandbox.stub(utils, 'getWindowTop').returns(win);
-        sandbox.stub(utils, 'getWindowSelf').returns({});
-
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal('na');
-      });
-    });
-
-    context('when tab is inactive', function() {
-      it('returns 0', function() {
-        Object.assign(element, { width: 600, height: 400 });
-
-        utils.getWindowTop.restore();
-        win.document.visibilityState = 'hidden';
-        sandbox.stub(utils, 'getWindowTop').returns(win);
-
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(0);
-      });
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let response;
-    beforeEach(function () {
-      response = {
-        body: {
-          'id': '37386aade21a71',
-          'seatbid': [{
-            'bid': [{
-              'id': '376874781',
-              'impid': '283a9f4cd2415d',
-              'price': 0.35743275,
-              'nurl': '',
-              'adm': '',
-              'w': 300,
-              'h': 250,
-              'adomain': ['example.com']
-            }]
-          }]
-        }
-      };
-    });
-
-    it('should get the correct bid response', function () {
-      let expectedResponse = [{
-        'requestId': '283a9f4cd2415d',
-        'cpm': 0.35743275,
-        'width': 300,
-        'height': 250,
-        'creativeId': '376874781',
-        'currency': 'USD',
-        'netRevenue': true,
-        'mediaType': 'banner',
-        'ad': `
`,
-        'ttl': 60,
-        'meta': {
-          'advertiserDomains': ['example.com']
-        }
-      }];
-
-      let result = spec.interpretResponse(response);
-      expect(result[0]).to.deep.equal(expectedResponse[0]);
-    });
-
-    it('crid should default to the bid id if not on the response', function () {
-      let expectedResponse = [{
-        'requestId': '283a9f4cd2415d',
-        'cpm': 0.35743275,
-        'width': 300,
-        'height': 250,
-        'creativeId': response.body.seatbid[0].bid[0].id,
-        'currency': 'USD',
-        'netRevenue': true,
-        'mediaType': 'banner',
-        'ad': `
`,
-        'ttl': 60,
-        'meta': {
-          'advertiserDomains': ['example.com']
-        }
-      }];
-
-      let result = spec.interpretResponse(response);
-      expect(result[0]).to.deep.equal(expectedResponse[0]);
-    });
-
-    it('handles empty bid response', function () {
-      let response = {
-        body: ''
-      };
-      let result = spec.interpretResponse(response);
-      expect(result.length).to.equal(0);
-    });
-  });
-
-  describe('getUserSyncs ', () => {
-    let syncOptions = {iframeEnabled: true, pixelEnabled: true};
-
-    it('should not return', () => {
-      let returnStatement = spec.getUserSyncs(syncOptions, []);
-      expect(returnStatement).to.be.empty;
-    });
-  });
-});
diff --git a/test/spec/modules/britepoolIdSystem_spec.js b/test/spec/modules/britepoolIdSystem_spec.js
deleted file mode 100644
index ddb61806006..00000000000
--- a/test/spec/modules/britepoolIdSystem_spec.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import {britepoolIdSubmodule} from 'modules/britepoolIdSystem.js';
-import * as utils from '../../../src/utils.js';
-
-describe('BritePool Submodule', () => {
-  const api_key = '1111';
-  const aaid = '4421ea96-34a9-45df-a4ea-3c41a48a18b1';
-  const idfa = '2d1c4fac-5507-4e28-991c-ca544e992dba';
-  const bpid = '279c0161-5152-487f-809e-05d7f7e653fd';
-  const url_override = 'https://override';
-  const getter_override = function(params) {
-    return JSON.stringify({ 'primaryBPID': bpid });
-  };
-  const getter_callback_override = function(params) {
-    return callback => {
-      callback(JSON.stringify({ 'primaryBPID': bpid }));
-    };
-  };
-
-  let triggerPixelStub;
-
-  beforeEach(function (done) {
-    triggerPixelStub = sinon.stub(utils, 'triggerPixel');
-    done();
-  });
-
-  afterEach(function () {
-    triggerPixelStub.restore();
-  });
-
-  it('trigger id resolution pixel when no identifiers set', () => {
-    britepoolIdSubmodule.getId({ params: {} });
-    expect(triggerPixelStub.called).to.be.true;
-  });
-
-  it('trigger id resolution pixel when no identifiers set with api_key param', () => {
-    britepoolIdSubmodule.getId({ params: { api_key } });
-    expect(triggerPixelStub.called).to.be.true;
-  });
-
-  it('does not trigger id resolution pixel when identifiers set', () => {
-    britepoolIdSubmodule.getId({ params: { api_key, aaid } });
-    expect(triggerPixelStub.called).to.be.false;
-  });
-
-  it('sends x-api-key in header and one identifier', () => {
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid });
-    assert(errors.length === 0, errors);
-    expect(headers['x-api-key']).to.equal(api_key);
-    expect(params).to.eql({ aaid });
-  });
-
-  it('sends x-api-key in header and two identifiers', () => {
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid, idfa });
-    assert(errors.length === 0, errors);
-    expect(headers['x-api-key']).to.equal(api_key);
-    expect(params).to.eql({ aaid, idfa });
-  });
-
-  it('allows call without api_key', () => {
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ aaid, idfa });
-    expect(params).to.eql({ aaid, idfa });
-    expect(errors.length).to.equal(0);
-  });
-
-  it('test url override', () => {
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid, url: url_override });
-    expect(url).to.equal(url_override);
-    // Making sure it did not become part of params
-    expect(params.url).to.be.undefined;
-  });
-
-  it('test gdpr consent string in url', () => {
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid }, { gdprApplies: true, consentString: 'expectedConsentString' });
-    expect(url).to.equal('https://api.britepool.com/v1/britepool/id?gdprString=expectedConsentString');
-  });
-
-  it('test gdpr consent string not in url if gdprApplies false', () => {
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid }, { gdprApplies: false, consentString: 'expectedConsentString' });
-    expect(url).to.equal('https://api.britepool.com/v1/britepool/id');
-  });
-
-  it('test gdpr consent string not in url if consent string undefined', () => {
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid }, { gdprApplies: true, consentString: undefined });
-    expect(url).to.equal('https://api.britepool.com/v1/britepool/id');
-  });
-
-  it('dynamic pub params should be added to params', () => {
-    window.britepool_pubparams = { ppid: '12345' };
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid });
-    expect(params).to.eql({ aaid, ppid: '12345' });
-    window.britepool_pubparams = undefined;
-  });
-
-  it('dynamic pub params should override submodule params', () => {
-    window.britepool_pubparams = { ppid: '67890' };
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, ppid: '12345' });
-    expect(params).to.eql({ ppid: '67890' });
-    window.britepool_pubparams = undefined;
-  });
-
-  it('if dynamic pub params undefined do nothing', () => {
-    window.britepool_pubparams = undefined;
-    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid });
-    expect(params).to.eql({ aaid });
-    window.britepool_pubparams = undefined;
-  });
-
-  it('test getter override with value', () => {
-    const { params, headers, url, getter, errors } = britepoolIdSubmodule.createParams({ api_key, aaid, url: url_override, getter: getter_override });
-    expect(getter).to.equal(getter_override);
-    // Making sure it did not become part of params
-    expect(params.getter).to.be.undefined;
-    const response = britepoolIdSubmodule.getId({ params: { api_key, aaid, url: url_override, getter: getter_override } });
-    assert.deepEqual(response, { id: { 'primaryBPID': bpid } });
-  });
-
-  it('test getter override with callback', done => {
-    const { params, headers, url, getter, errors } = britepoolIdSubmodule.createParams({ api_key, aaid, url: url_override, getter: getter_callback_override });
-    expect(getter).to.equal(getter_callback_override);
-    // Making sure it did not become part of params
-    expect(params.getter).to.be.undefined;
-    const response = britepoolIdSubmodule.getId({ params: { api_key, aaid, url: url_override, getter: getter_callback_override } });
-    expect(response.callback).to.not.be.undefined;
-    response.callback(result => {
-      assert.deepEqual(result, { 'primaryBPID': bpid });
-      done();
-    });
-  });
-});
diff --git a/test/spec/modules/browsiRtdProvider_spec.js b/test/spec/modules/browsiRtdProvider_spec.js
index 75120aa7505..92a08c8fbef 100644
--- a/test/spec/modules/browsiRtdProvider_spec.js
+++ b/test/spec/modules/browsiRtdProvider_spec.js
@@ -1,9 +1,9 @@
 import * as browsiRTD from '../../../modules/browsiRtdProvider.js';
-import {makeSlot} from '../integration/faker/googletag.js';
 import * as utils from '../../../src/utils'
 import * as events from '../../../src/events';
 import * as sinon from 'sinon';
 import {sendPageviewEvent} from '../../../modules/browsiRtdProvider.js';
+import * as mockGpt from 'test/spec/integration/faker/googletag.js';
 
 describe('browsi Real time  data sub module', function () {
   const conf = {
@@ -55,7 +55,7 @@ describe('browsi Real time  data sub module', function () {
   });
 
   it('should match placement with ad unit', function () {
-    const slot = makeSlot({code: '/123/abc', divId: 'browsiAd_1'});
+    const slot = mockGpt.makeSlot({code: '/123/abc', divId: 'browsiAd_1'});
 
     const test1 = browsiRTD.isIdMatchingAdUnit(slot, ['/123/abc']); // true
     const test2 = browsiRTD.isIdMatchingAdUnit(slot, ['/123/abc', '/456/def']); // true
@@ -69,7 +69,7 @@ describe('browsi Real time  data sub module', function () {
   });
 
   it('should return correct macro values', function () {
-    const slot = makeSlot({code: '/123/abc', divId: 'browsiAd_1'});
+    const slot = mockGpt.makeSlot({code: '/123/abc', divId: 'browsiAd_1'});
 
     slot.setTargeting('test', ['test', 'value']);
     // slot getTargeting doesn't act like GPT so we can't expect real value
@@ -89,14 +89,8 @@ describe('browsi Real time  data sub module', function () {
       expect(browsiRTD.browsiSubmodule.getTargetingData([], null, null, auction)).to.eql({});
     });
 
-    it('should return NA if no prediction for ad unit', function () {
-      makeSlot({code: 'adMock', divId: 'browsiAd_2'});
-      browsiRTD.setData({});
-      expect(browsiRTD.browsiSubmodule.getTargetingData(['adMock'], null, null, auction)).to.eql({adMock: {bv: 'NA'}});
-    });
-
     it('should return prediction from server', function () {
-      makeSlot({code: 'hasPrediction', divId: 'hasPrediction'});
+      mockGpt.makeSlot({code: 'hasPrediction', divId: 'hasPrediction'});
       const data = {
         p: {'hasPrediction': {ps: {0: 0.234}}},
         kn: 'bv',
@@ -272,4 +266,29 @@ describe('browsi Real time  data sub module', function () {
       expect(eventsEmitSpy.callCount).to.equal(0);
     })
   })
+
+  describe('set targeting - invalid params', function () {
+    it('should return false if key is undefined', function () {
+      expect(browsiRTD.setKeyValue()).to.equal(false);
+    })
+    it('should return false if key is not string', function () {
+      expect(browsiRTD.setKeyValue(1)).to.equal(false);
+    })
+  })
+  describe('set targeting - valid params', function () {
+    let slot;
+    const splitKey = 'splitTest';
+    before(() => {
+      mockGpt.reset();
+      window.googletag.pubads().clearTargeting();
+      slot = mockGpt.makeSlot({code: '/123/split', divId: 'split'});
+      browsiRTD.setKeyValue(splitKey);
+      window.googletag.cmd.forEach(cmd => cmd());
+    })
+    it('should place numeric key value on all slots', function () {
+      const targetingValue = window.googletag.pubads().getTargeting(splitKey);
+      expect(targetingValue).to.be.an('array').that.is.not.empty;
+      expect(targetingValue[0]).to.be.a('string');
+    })
+  })
 });
diff --git a/test/spec/modules/byDataAnalyticsAdapter_spec.js b/test/spec/modules/byDataAnalyticsAdapter_spec.js
index c680c687a71..b98b5cb7039 100644
--- a/test/spec/modules/byDataAnalyticsAdapter_spec.js
+++ b/test/spec/modules/byDataAnalyticsAdapter_spec.js
@@ -1,8 +1,9 @@
 import ascAdapter from 'modules/byDataAnalyticsAdapter';
 import { expect } from 'chai';
+import {EVENTS} from 'src/constants.js';
+
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
-let constants = require('src/constants.json');
 let auctionId = 'b70ef967-5c5b-4602-831e-f2cf16e59af2';
 const initOptions = {
   clientId: 'asc00000',
@@ -176,9 +177,9 @@ describe('byData Analytics Adapter ', () => {
       });
     });
     it('sends and formatted auction data ', function () {
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeoutArgs);
-      events.emit(constants.EVENTS.NO_BID, noBidArgs);
-      events.emit(constants.EVENTS.BID_WON, bidWonArgs)
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeoutArgs);
+      events.emit(EVENTS.NO_BID, noBidArgs);
+      events.emit(EVENTS.BID_WON, bidWonArgs)
       var userToken = ascAdapter.getVisitorData(userData);
       var newAuData = ascAdapter.dataProcess(auctionEndArgs);
       var newBwData = ascAdapter.getBidWonData(bidWonArgs);
diff --git a/test/spec/modules/c1xBidAdapter_spec.js b/test/spec/modules/c1xBidAdapter_spec.js
index 315680cba26..c93b43d571b 100644
--- a/test/spec/modules/c1xBidAdapter_spec.js
+++ b/test/spec/modules/c1xBidAdapter_spec.js
@@ -31,9 +31,9 @@ describe('C1XAdapter', () => {
     });
 
     it('should return false when require params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(c1xAdapter.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {};
+      expect(c1xAdapter.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
   describe('buildRequests', () => {
diff --git a/test/spec/modules/cadentApertureMXBidAdapter_spec.js b/test/spec/modules/cadentApertureMXBidAdapter_spec.js
index 3ccb5405552..d8686e3c667 100644
--- a/test/spec/modules/cadentApertureMXBidAdapter_spec.js
+++ b/test/spec/modules/cadentApertureMXBidAdapter_spec.js
@@ -48,49 +48,11 @@ describe('cadent_aperture_mx Adapter', function () {
         'auctionId': '1d1a01234a475'
       };
       let noBid = {};
-      let otherBid = {
-        'bidder': 'emxdigital',
-        'params': {
-          'tagid': '25251'
-        },
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[300, 250]]
-          }
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [
-          [300, 250],
-          [300, 600]
-        ],
-        'bidId': '30b31c2501de1e',
-        'bidderRequestId': '22edbae3120bf6',
-        'auctionId': '1d1a01234a475'
-      };
-      let noMediaSizeBid = {
-        'bidder': 'emxdigital',
-        'params': {
-          'tagid': '25251'
-        },
-        'mediaTypes': {
-          'banner': {}
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [
-          [300, 250],
-          [300, 600]
-        ],
-        'bidId': '30b31c2501de1e',
-        'bidderRequestId': '22edbae3120bf6',
-        'auctionId': '1d1a01234a475'
-      };
 
       it('should return true when required params found', function () {
         expect(spec.isBidRequestValid(bid)).to.equal(true);
         expect(spec.isBidRequestValid(badBid)).to.equal(false);
         expect(spec.isBidRequestValid(noBid)).to.equal(false);
-        expect(spec.isBidRequestValid(otherBid)).to.equal(false);
-        expect(spec.isBidRequestValid(noMediaSizeBid)).to.equal(false);
       });
     });
 
@@ -451,10 +413,27 @@ describe('cadent_aperture_mx Adapter', function () {
         });
       });
 
-      it('should add gpid to request if present', () => {
+      it('should add gpid to request if present in ext.gpid', () => {
+        const gpid = '/12345/my-gpt-tag-0';
+        let bid = utils.deepClone(bidderRequest.bids[0]);
+        bid.ortb2Imp = { ext: { gpid, data: { adserver: { adslot: gpid + '1' }, pbadslot: gpid + '2' } } };
+        let requestWithGPID = spec.buildRequests([bid], bidderRequest);
+        requestWithGPID = JSON.parse(requestWithGPID.data);
+        expect(requestWithGPID.imp[0].ext.gpid).to.exist.and.equal(gpid);
+      });
+
+      it('should add gpid to request if present in ext.data.adserver.adslot', () => {
+        const gpid = '/12345/my-gpt-tag-0';
+        let bid = utils.deepClone(bidderRequest.bids[0]);
+        bid.ortb2Imp = { ext: { data: { adserver: { adslot: gpid }, pbadslot: gpid + '1' } } };
+        let requestWithGPID = spec.buildRequests([bid], bidderRequest);
+        requestWithGPID = JSON.parse(requestWithGPID.data);
+        expect(requestWithGPID.imp[0].ext.gpid).to.exist.and.equal(gpid);
+      });
+
+      it('should add gpid to request if present in ext.data.pbadslot', () => {
         const gpid = '/12345/my-gpt-tag-0';
         let bid = utils.deepClone(bidderRequest.bids[0]);
-        bid.ortb2Imp = { ext: { data: { adserver: { adslot: gpid } } } };
         bid.ortb2Imp = { ext: { data: { pbadslot: gpid } } };
         let requestWithGPID = spec.buildRequests([bid], bidderRequest);
         requestWithGPID = JSON.parse(requestWithGPID.data);
diff --git a/test/spec/modules/carodaBidAdapter_spec.js b/test/spec/modules/carodaBidAdapter_spec.js
index f575e31e85d..780c81ebe9f 100644
--- a/test/spec/modules/carodaBidAdapter_spec.js
+++ b/test/spec/modules/carodaBidAdapter_spec.js
@@ -3,6 +3,8 @@ import { assert } from 'chai';
 import { spec } from 'modules/carodaBidAdapter.js';
 import { config } from 'src/config.js';
 import { createEidsArray } from 'modules/userId/eids.js';
+import { setConfig as setCurrencyConfig } from '../../../modules/currency';
+import { addFPDToBidderRequest } from '../../helpers/fpd';
 
 describe('Caroda adapter', function () {
   let bids = [];
@@ -185,29 +187,28 @@ describe('Caroda adapter', function () {
     });
 
     it('should send currency if defined', function () {
-      config.setConfig({ currency: { adServerCurrency: 'EUR' } });
+      setCurrencyConfig({ adServerCurrency: 'EUR' });
       let validBidRequests = [{ params: {} }];
-      let refererInfo = { page: 'page' };
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo })[0].data);
-
-      assert.deepEqual(request.currency, 'EUR');
+      const bidderRequest = { refererInfo: { page: 'page' } };
+      return addFPDToBidderRequest(bidderRequest).then(res => {
+        let request = JSON.parse(spec.buildRequests(validBidRequests, res)[0].data);
+        assert.deepEqual(request.currency, 'EUR');
+        setCurrencyConfig({});
+      });
     });
 
     it('should pass extended ids', function () {
       let validBidRequests = [{
         bid_id: 'bidId',
         params: {},
-        userIdAsEids: createEidsArray({
-          tdid: 'TTD_ID_FROM_USER_ID_MODULE',
-          pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
-        })
+        userIdAsEids: [
+          { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
+          { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
+        ]
       }];
 
       let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
-      assert.deepEqual(request.user.eids, [
-        { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
-        { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
-      ]);
+      assert.deepEqual(request.user.eids, validBidRequests[0].userIdAsEids);
     });
 
     describe('user privacy', function () {
@@ -304,11 +305,15 @@ describe('Caroda adapter', function () {
         });
 
         it('should request floor price in adserver currency', function () {
-          config.setConfig({ currency: { adServerCurrency: 'DKK' } });
           const validBidRequests = [ getBidWithFloor() ];
-          const imp = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
-          assert.equal(imp.bidfloor, undefined);
-          assert.equal(imp.bidfloorcur, 'DKK');
+          setCurrencyConfig({ adServerCurrency: 'DKK' });
+          const bidderRequest = { refererInfo: { page: 'page' } };
+          return addFPDToBidderRequest(bidderRequest).then(res => {
+            const imp = JSON.parse(spec.buildRequests(validBidRequests, res)[0].data);
+            assert.equal(imp.bidfloor, undefined);
+            assert.equal(imp.bidfloorcur, 'DKK');
+            setCurrencyConfig({});
+          });
         });
 
         it('should add correct floor values', function () {
diff --git a/test/spec/modules/ccxBidAdapter_spec.js b/test/spec/modules/ccxBidAdapter_spec.js
index cbae441e7e7..1e345691bcf 100644
--- a/test/spec/modules/ccxBidAdapter_spec.js
+++ b/test/spec/modules/ccxBidAdapter_spec.js
@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+import {syncAddFPDToBidderRequest} from '../../helpers/fpd';
 import { spec } from 'modules/ccxBidAdapter.js';
 import * as utils from 'src/utils.js';
 
@@ -39,6 +40,7 @@ describe('ccxAdapter', function () {
       transactionId: 'aefddd38-cfa0-48ab-8bdd-325de4bab5f9'
     }
   ];
+
   describe('isBidRequestValid', function () {
     it('Valid bid requests', function () {
       expect(spec.isBidRequestValid(bids[0])).to.be.true;
@@ -75,6 +77,7 @@ describe('ccxAdapter', function () {
       expect(spec.isBidRequestValid(bidsClone[0])).to.be.true;
     });
   });
+
   describe('buildRequests', function () {
     it('No valid bids', function () {
       expect(spec.buildRequests([])).to.be.undefined;
@@ -173,6 +176,7 @@ describe('ccxAdapter', function () {
 
       expect(data.imp).to.deep.have.same.members(imps);
     });
+
     it('Valid bid request - sizes old style', function () {
       let bidsClone = utils.deepClone(bids);
       delete (bidsClone[0].mediaTypes);
@@ -218,6 +222,7 @@ describe('ccxAdapter', function () {
 
       expect(data.imp).to.deep.have.same.members(imps);
     });
+
     it('Valid bid request - sizes old style - no media type', function () {
       let bidsClone = utils.deepClone(bids);
       delete (bidsClone[0].mediaTypes);
@@ -385,6 +390,7 @@ describe('ccxAdapter', function () {
       expect(spec.interpretResponse({})).to.be.empty;
     });
   });
+
   describe('getUserSyncs', function () {
     it('Valid syncs - all', function () {
       let syncOptions = {
@@ -434,6 +440,7 @@ describe('ccxAdapter', function () {
       expect(spec.getUserSyncs(syncOptions, [{body: response}])).to.be.empty;
     });
   });
+
   describe('mediaTypesVideoParams', function () {
     it('Valid video mediaTypes', function () {
       let bids = [
@@ -488,4 +495,78 @@ describe('ccxAdapter', function () {
       expect(data.imp).to.deep.have.same.members(imps);
     });
   });
+
+  describe('FLEDGE', function () {
+    it('should properly build a request when FLEDGE is enabled', function () {
+      let bidderRequest = {
+        paapi: {
+          enabled: true
+        }
+      };
+      let bids = [
+        {
+          adUnitCode: 'banner',
+          auctionId: '0b9de793-8eda-481e-a548-aaaaaaaaaaa1',
+          bidId: '2e56e1af51ccc1',
+          bidder: 'ccx',
+          bidderRequestId: '17e7b9f58accc1',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            placementId: 609
+          },
+          sizes: [[300, 250]],
+          transactionId: 'befddd38-cfa0-48ab-8bdd-bbbbbbbbbbb1',
+          ortb2Imp: {
+            ext: {
+              ae: 1
+            }
+          }
+        }
+      ];
+
+      let ortbRequest = spec.buildRequests(bids, syncAddFPDToBidderRequest(bidderRequest));
+      let data = JSON.parse(ortbRequest.data);
+      expect(data.imp[0].ext.ae).to.equal(1);
+    });
+
+    it('should properly build a request when FLEDGE is disabled', function () {
+      let bidderRequest = {
+        paapi: {
+          enabled: false
+        }
+      };
+      let bids = [
+        {
+          adUnitCode: 'banner',
+          auctionId: '0b9de793-8eda-481e-a548-aaaaaaaaaaa2',
+          bidId: '2e56e1af51ccc2',
+          bidder: 'ccx',
+          bidderRequestId: '17e7b9f58accc2',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            placementId: 610
+          },
+          sizes: [[300, 250]],
+          transactionId: 'befddd38-cfa0-48ab-8bdd-bbbbbbbbbbb2',
+          ortb2Imp: {
+            ext: {
+              ae: 1
+            }
+          }
+        }
+      ];
+
+      let ortbRequest = spec.buildRequests(bids, syncAddFPDToBidderRequest(bidderRequest));
+      let data = JSON.parse(ortbRequest.data);
+      expect(data.imp[0].ext.ae).to.be.undefined;
+    });
+  });
 });
diff --git a/test/spec/modules/ceeIdSystem_spec.js b/test/spec/modules/ceeIdSystem_spec.js
new file mode 100644
index 00000000000..62ae2898ede
--- /dev/null
+++ b/test/spec/modules/ceeIdSystem_spec.js
@@ -0,0 +1,131 @@
+import { ceeIdSubmodule, storage, readId } from 'modules/ceeIdSystem.js';
+import sinon from 'sinon';
+
+describe('ceeIdSystem', () => {
+  let sandbox;
+  let getCookieStub;
+  let getDataFromLocalStorageStub;
+
+  beforeEach(() => {
+    sandbox = sinon.createSandbox();
+    getCookieStub = sandbox.stub(storage, 'getCookie');
+    getDataFromLocalStorageStub = sandbox.stub(storage, 'getDataFromLocalStorage');
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  describe('getId', () => {
+    it('should return an object with id when ceeIdToken is found in LS', () => {
+      const config = {
+        name: 'ceeId',
+        storage: {
+          type: 'cookie',
+          name: 'ceeIdToken',
+          expires: 7,
+          refreshInSeconds: 360,
+        },
+        params: {
+          tokenName: 'WPxid',
+        },
+      };
+
+      getDataFromLocalStorageStub.returns('testToken');
+      getCookieStub.returns('testToken');
+
+      const result = ceeIdSubmodule.getId(config);
+
+      expect(result).to.deep.equal({ id: 'testToken' });
+    });
+
+    it('should return an object with id when ceeIdToken is passed in setConfig', () => {
+      const config = {
+        name: 'ceeId',
+        storage: {
+          type: 'cookie',
+          name: 'ceeIdToken',
+          expires: 7,
+          refreshInSeconds: 360,
+        },
+        params: {
+          tokenName: 'WPxid',
+          value: 'testTokenFromSetConfig'
+        },
+      };
+
+      getDataFromLocalStorageStub.returns('testToken');
+      getCookieStub.returns('testToken');
+
+      const result = ceeIdSubmodule.getId(config);
+
+      expect(result).to.deep.equal({ id: 'testTokenFromSetConfig' });
+    });
+
+    it('should return undefined when ceeIdToken is not found', () => {
+      const config = {
+        name: 'ceeId',
+        storage: {
+          type: 'cookie',
+          name: 'ceeIdToken',
+          expires: 7,
+          refreshInSeconds: 360,
+        },
+        params: {
+          tokenName: 'WPxid',
+        },
+      };
+      const result = ceeIdSubmodule.getId(config);
+
+      expect(result).to.be.undefined;
+    });
+  });
+
+  describe('decode', () => {
+    it('should return an object with ceeId when value is a string', () => {
+      const result = ceeIdSubmodule.decode('testId');
+
+      expect(result).to.deep.equal({ ceeId: 'testId' });
+    });
+
+    it('should return undefined when value is not a string', () => {
+      const result = ceeIdSubmodule.decode({});
+
+      expect(result).to.be.undefined;
+    });
+  });
+
+  describe('readId', () => {
+    it('should return data from local storage when it exists', () => {
+      const tokenName = 'testToken';
+
+      getDataFromLocalStorageStub.returns('local_storage_data');
+
+      const result = readId(tokenName);
+
+      expect(result).to.equal('local_storage_data');
+    });
+
+    it('should return data from cookie when local storage data does not exist', () => {
+      const tokenName = 'testToken';
+
+      getDataFromLocalStorageStub.returns(null);
+      getCookieStub.returns('cookie_data');
+
+      const result = readId(tokenName);
+
+      expect(result).to.equal('cookie_data');
+    });
+
+    it('should return null when neither local storage data nor cookie data exists', () => {
+      const tokenName = 'testToken';
+
+      getDataFromLocalStorageStub.returns(null);
+      getCookieStub.returns(null);
+
+      const result = readId(tokenName);
+
+      expect(result).to.be.null;
+    });
+  });
+});
diff --git a/test/spec/modules/cleanioRtdProvider_spec.js b/test/spec/modules/cleanioRtdProvider_spec.js
index 1d21fbd8457..0211a9ae588 100644
--- a/test/spec/modules/cleanioRtdProvider_spec.js
+++ b/test/spec/modules/cleanioRtdProvider_spec.js
@@ -2,9 +2,10 @@ import { loadExternalScriptStub } from 'test/mocks/adloaderStub.js';
 import * as utils from '../../../src/utils.js';
 import * as hook from '../../../src/hook.js'
 import * as events from '../../../src/events.js';
-import CONSTANTS from '../../../src/constants.json';
+import { EVENTS } from '../../../src/constants.js';
 
 import { __TEST__ } from '../../../modules/cleanioRtdProvider.js';
+import {MODULE_TYPE_RTD} from '../../../src/activities/modules.js';
 
 const {
   readConfig,
@@ -70,7 +71,7 @@ describe('clean.io RTD module', function () {
       pageInitStepProtectPage(fakeScriptURL);
 
       sinon.assert.calledOnce(loadExternalScriptStub);
-      sinon.assert.calledWith(loadExternalScriptStub, fakeScriptURL, 'clean.io');
+      sinon.assert.calledWith(loadExternalScriptStub, fakeScriptURL, MODULE_TYPE_RTD, 'clean.io');
     });
   });
 
@@ -139,7 +140,7 @@ describe('clean.io RTD module', function () {
       const { init, onBidResponseEvent } = getModule();
       expect(init({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: 'full' } }, {})).to.equal(true);
       sinon.assert.calledOnce(loadExternalScriptStub);
-      sinon.assert.calledWith(loadExternalScriptStub, 'https://abc1234567890.cloudfront.net/script.js', 'clean.io');
+      sinon.assert.calledWith(loadExternalScriptStub, 'https://abc1234567890.cloudfront.net/script.js', MODULE_TYPE_RTD, 'clean.io');
 
       const fakeBidResponse = makeFakeBidResponse();
       onBidResponseEvent(fakeBidResponse, {}, {});
@@ -193,16 +194,16 @@ describe('clean.io RTD module', function () {
       const eventCounter = { registerCleanioBillingEvent: function() {} };
       sinon.spy(eventCounter, 'registerCleanioBillingEvent');
 
-      events.on(CONSTANTS.EVENTS.BILLABLE_EVENT, (evt) => {
+      events.on(EVENTS.BILLABLE_EVENT, (evt) => {
         if (evt.vendor === 'clean.io') {
           eventCounter.registerCleanioBillingEvent()
         }
       });
 
-      events.emit(CONSTANTS.EVENTS.BID_WON, {});
-      events.emit(CONSTANTS.EVENTS.BID_WON, {});
-      events.emit(CONSTANTS.EVENTS.BID_WON, {});
-      events.emit(CONSTANTS.EVENTS.BID_WON, {});
+      events.emit(EVENTS.BID_WON, {});
+      events.emit(EVENTS.BID_WON, {});
+      events.emit(EVENTS.BID_WON, {});
+      events.emit(EVENTS.BID_WON, {});
 
       sinon.assert.callCount(eventCounter.registerCleanioBillingEvent, 4);
     });
diff --git a/test/spec/modules/cleanmedianetBidAdapter_spec.js b/test/spec/modules/cleanmedianetBidAdapter_spec.js
index 3c73dac07de..58270438772 100644
--- a/test/spec/modules/cleanmedianetBidAdapter_spec.js
+++ b/test/spec/modules/cleanmedianetBidAdapter_spec.js
@@ -376,7 +376,7 @@ describe('CleanmedianetAdapter', () => {
       const bidRequestWithVideo = utils.deepClone(bidRequest);
 
       bidRequestWithVideo.params.video = {
-        placement: 1,
+        plcmt: 1,
         minduration: 1,
       }
 
@@ -395,7 +395,7 @@ describe('CleanmedianetAdapter', () => {
 
       expect(response.data.imp[0].video.mimes).to.equal(bidRequestWithVideo.mediaTypes.video.mimes);
       expect(response.data.imp[0].video.skip).to.not.exist;
-      expect(response.data.imp[0].video.placement).to.equal(1);
+      expect(response.data.imp[0].video.plcmt).to.equal(1);
       expect(response.data.imp[0].video.minduration).to.equal(1);
       expect(response.data.imp[0].video.playbackmethod).to.equal(1);
       expect(response.data.imp[0].video.startdelay).to.equal(1);
@@ -405,7 +405,7 @@ describe('CleanmedianetAdapter', () => {
           playerSize: [302, 252],
           mimes: ['video/mpeg'],
           skip: 1,
-          placement: 1,
+          plcmt: 1,
           minduration: 1,
           playbackmethod: 1,
           startdelay: 1,
@@ -428,7 +428,7 @@ describe('CleanmedianetAdapter', () => {
           context: 'instream',
           mimes: ['video/mpeg'],
           skip: 1,
-          placement: 1,
+          plcmt: 1,
           minduration: 1,
           playbackmethod: 1,
           startdelay: 1,
@@ -457,7 +457,7 @@ describe('CleanmedianetAdapter', () => {
         context: 'instream',
         mimes: ['video/mpeg'],
         skip: 1,
-        placement: 1,
+        plcmt: 1,
         minduration: 1,
         playbackmethod: 1,
         startdelay: 1,
diff --git a/test/spec/modules/clickforceBidAdapter_spec.js b/test/spec/modules/clickforceBidAdapter_spec.js
index c4c4d77e954..99aef433890 100644
--- a/test/spec/modules/clickforceBidAdapter_spec.js
+++ b/test/spec/modules/clickforceBidAdapter_spec.js
@@ -31,12 +31,12 @@ describe('ClickforceAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'someIncorrectParam': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/cointrafficBidAdapter_spec.js b/test/spec/modules/cointrafficBidAdapter_spec.js
index 79775f7b135..21f02b4f8ef 100644
--- a/test/spec/modules/cointrafficBidAdapter_spec.js
+++ b/test/spec/modules/cointrafficBidAdapter_spec.js
@@ -4,6 +4,11 @@ import { spec } from 'modules/cointrafficBidAdapter.js';
 import { config } from 'src/config.js'
 import * as utils from 'src/utils.js'
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory.js').BidderRequest} BidderRequest
+ */
+
 const ENDPOINT_URL = 'https://apps-pbd.ctraffic.io/pb/tmp';
 
 describe('cointrafficBidAdapter', function () {
diff --git a/test/spec/modules/colombiaBidAdapter_spec.js b/test/spec/modules/colombiaBidAdapter_spec.js
new file mode 100644
index 00000000000..1b61e1a92b4
--- /dev/null
+++ b/test/spec/modules/colombiaBidAdapter_spec.js
@@ -0,0 +1,155 @@
+import { expect } from 'chai';
+import { spec } from 'modules/colombiaBidAdapter';
+import { newBidder } from 'src/adapters/bidderFactory';
+
+const HOST_NAME = document.location.protocol + '//' + window.location.host;
+const ENDPOINT = 'https://ade.clmbtech.com/cde/prebid.htm';
+
+describe('colombiaBidAdapter', function() {
+  const adapter = newBidder(spec);
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'colombia',
+      'params': {
+        placementId: '307466'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [
+        [300, 250]
+      ],
+      'bidId': '23beaa6af6cdde',
+      'bidderRequestId': '19c0c1efdf37e7',
+      'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when placementId not passed correctly', function () {
+      bid.params.placementId = '';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when require params are not passed', function () {
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests = [
+      {
+        'bidder': 'colombia',
+        'params': {
+          placementId: '307466'
+        },
+        'adUnitCode': 'adunit-code1',
+        'sizes': [
+          [300, 250]
+        ],
+        'bidId': '23beaa6af6cdde',
+        'bidderRequestId': '19c0c1efdf37e7',
+        'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
+      },
+      {
+        'bidder': 'colombia',
+        'params': {
+          placementId: '307466'
+        },
+        'adUnitCode': 'adunit-code2',
+        'sizes': [
+          [300, 250]
+        ],
+        'bidId': '382091349b149f"',
+        'bidderRequestId': '"1f9c98192de2511"',
+        'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
+      }
+    ];
+    let bidderRequest = {
+      refererInfo: {
+        numIframes: 0,
+        reachedTop: true,
+        referer: 'http://example.com',
+        stack: ['http://example.com']
+      }
+    };
+
+    const request = spec.buildRequests(bidRequests);
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request[0].method).to.equal('POST');
+    });
+
+    it('attaches source and version to endpoint URL as query params', function () {
+      expect(request[0].url).to.equal(ENDPOINT);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let bidRequest = [
+      {
+        'method': 'POST',
+        'url': 'https://ade.clmbtech.com/cde/prebid.htm',
+        'data': {
+          'v': 'hb1',
+          'p': '307466',
+          'w': '300',
+          'h': '250',
+          'cb': 12892917383,
+          'r': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836',
+          'uid': '23beaa6af6cdde',
+          't': 'i',
+        }
+      }
+    ];
+
+    let serverResponse = [{
+      'ad': '
This is test case for colombia adapter
 ',
+      'cpm': 3.14,
+      'creativeId': '6b958110-612c-4b03-b6a9-7436c9f746dc-1sk24',
+      'currency': 'USD',
+      'requestId': '23beaa6af6cdde',
+      'width': 728,
+      'height': 90,
+      'netRevenue': true,
+      'ttl': 600,
+      'dealid': '',
+      'referrer': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836'
+    }];
+
+    it('should get the correct bid response', function () {
+      let expectedResponse = [{
+        'requestId': '23beaa6af6cdde',
+        'cpm': 3.14,
+        'width': 728,
+        'height': 90,
+        'creativeId': '6b958110-612c-4b03-b6a9-7436c9f746dc-1sk24',
+        'dealId': '',
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'referrer': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836',
+        'ad': '
This is test case for colombia adapter
'
+      }];
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+    });
+
+    it('handles empty bid response', function () {
+      let response = {
+        body: {
+          'uid': '23beaa6af6cdde',
+          'height': 0,
+          'creativeId': '',
+          'statusMessage': 'Bid returned empty or error response',
+          'width': 0,
+          'cpm': 0
+        }
+      };
+      let result = spec.interpretResponse(response, bidRequest[0]);
+      expect(result.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
index b8c872d879d..22a98df633f 100644
--- a/test/spec/modules/colossussspBidAdapter_spec.js
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -255,13 +255,45 @@ describe('ColossussspAdapter', function () {
   });
 
   describe('buildRequests with user ids', function () {
-    bid.userId = {}
-    bid.userId.britepoolid = 'britepoolid123';
-    bid.userId.idl_env = 'idl_env123';
-    bid.userId.tdid = 'tdid123';
-    bid.userId.id5id = { uid: 'id5id123' };
-    bid.userId.uid2 = { id: 'uid2id123' };
-    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    var clonedBid = JSON.parse(JSON.stringify(bid));
+    clonedBid.userId = {}
+    clonedBid.userId.idl_env = 'idl_env123';
+    clonedBid.userId.tdid = 'tdid123';
+    clonedBid.userId.id5id = { uid: 'id5id123' };
+    clonedBid.userId.uid2 = { id: 'uid2id123' };
+    clonedBid.userIdAsEids = [
+      {
+        'source': 'pubcid.org',
+        'uids': [
+          {
+            'id': '4679e98e-1d83-4718-8aba-aa88hhhaaa',
+            'atype': 1
+          }
+        ]
+      },
+      {
+        'source': 'adserver.org',
+        'uids': [
+          {
+            'id': 'e804908e-57b4-4f46-a097-08be44321e79',
+            'atype': 1,
+            'ext': {
+              'rtiPartner': 'TDID'
+            }
+          }
+        ]
+      },
+      {
+        'source': 'neustar.biz',
+        'uids': [
+          {
+            'id': 'E1:Bvss1x8hXM2zHeqiqj2umJUziavSvLT6E_ORri5fDCsZb-5sfD18oNWycTmdx6QBNdbURBVv466hLJiKSwHCaTxvROo8smjqj6GfvlKfzQI',
+            'atype': 1
+          }
+        ]
+      }
+    ];
+    let serverRequest = spec.buildRequests([clonedBid], bidderRequest);
     it('Returns valid data if array of bids is valid', function () {
       let data = serverRequest.data;
       let placements = data['placements'];
@@ -270,11 +302,11 @@ describe('ColossussspAdapter', function () {
         let placement = placements[i];
         expect(placement).to.have.property('eids')
         expect(placement.eids).to.be.an('array')
-        expect(placement.eids.length).to.be.equal(5)
+        expect(placement.eids.length).to.be.equal(7)
         for (let index in placement.eids) {
           let v = placement.eids[index];
           expect(v).to.have.all.keys('source', 'uids')
-          expect(v.source).to.be.oneOf(['britepool.com', 'identityLink', 'adserver.org', 'id5-sync.com', 'uidapi.com'])
+          expect(v.source).to.be.oneOf(['pubcid.org', 'adserver.org', 'neustar.biz', 'identityLink', 'id5-sync.com', 'adserver.org', 'uidapi.com'])
           expect(v.uids).to.be.an('array');
           expect(v.uids.length).to.be.equal(1)
           expect(v.uids[0]).to.have.property('id')
diff --git a/test/spec/modules/compassBidAdapter_spec.js b/test/spec/modules/compassBidAdapter_spec.js
index 6a761e63ea1..d0cecc2272f 100644
--- a/test/spec/modules/compassBidAdapter_spec.js
+++ b/test/spec/modules/compassBidAdapter_spec.js
@@ -3,9 +3,19 @@ import { spec } from '../../../modules/compassBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'compass'
+const bidder = 'compass';
 
 describe('CompassBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -16,8 +26,9 @@ describe('CompassBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -30,8 +41,9 @@ describe('CompassBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -53,8 +65,9 @@ describe('CompassBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -73,9 +86,20 @@ describe('CompassBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
     timeout: 500
   };
@@ -112,6 +136,7 @@ describe('CompassBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -129,7 +154,7 @@ describe('CompassBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -145,6 +170,56 @@ describe('CompassBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -170,8 +245,10 @@ describe('CompassBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -186,12 +263,38 @@ describe('CompassBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -395,5 +498,17 @@ describe('CompassBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://sa-cs.deliverimp.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sa-cs.deliverimp.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/concertAnalyticsAdapter_spec.js b/test/spec/modules/concertAnalyticsAdapter_spec.js
index 1df73ae04fe..7cb6db1b1a0 100644
--- a/test/spec/modules/concertAnalyticsAdapter_spec.js
+++ b/test/spec/modules/concertAnalyticsAdapter_spec.js
@@ -1,10 +1,11 @@
 import concertAnalytics from 'modules/concertAnalyticsAdapter.js';
 import { expect } from 'chai';
 import {expectEvents} from '../../helpers/analytics.js';
+import { EVENTS } from 'src/constants.js';
+
 const sinon = require('sinon');
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('ConcertAnalyticsAdapter', function() {
   let sandbox;
@@ -147,10 +148,10 @@ describe('ConcertAnalyticsAdapter', function() {
   }
 
   function fireBidEvents(events) {
-    events.emit(constants.EVENTS.AUCTION_INIT, {timestamp, auctionId, timeout, adUnits});
-    events.emit(constants.EVENTS.BID_REQUESTED, {bidder: 'concert'});
-    events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
-    events.emit(constants.EVENTS.AUCTION_END, {});
-    events.emit(constants.EVENTS.BID_WON, bidWon);
+    events.emit(EVENTS.AUCTION_INIT, { timestamp, auctionId, timeout, adUnits });
+    events.emit(EVENTS.BID_REQUESTED, { bidder: 'concert' });
+    events.emit(EVENTS.BID_RESPONSE, bidResponse);
+    events.emit(EVENTS.AUCTION_END, {});
+    events.emit(EVENTS.BID_WON, bidWon);
   }
 });
diff --git a/test/spec/modules/concertBidAdapter_spec.js b/test/spec/modules/concertBidAdapter_spec.js
index 4a6a4f2ba60..2fb43236081 100644
--- a/test/spec/modules/concertBidAdapter_spec.js
+++ b/test/spec/modules/concertBidAdapter_spec.js
@@ -94,7 +94,7 @@ describe('ConcertAdapter', function () {
   });
 
   describe('spec.isBidRequestValid', function() {
-    it('should return when it recieved all the required params', function() {
+    it('should return when it received all the required params', function() {
       const bid = bidRequests[0];
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
@@ -116,7 +116,20 @@ describe('ConcertAdapter', function () {
       expect(payload).to.have.property('meta');
       expect(payload).to.have.property('slots');
 
-      const metaRequiredFields = ['prebidVersion', 'pageUrl', 'screen', 'debug', 'uid', 'optedOut', 'adapterVersion', 'uspConsent', 'gdprConsent', 'gppConsent', 'browserLanguage'];
+      const metaRequiredFields = [
+        'prebidVersion',
+        'pageUrl',
+        'screen',
+        'debug',
+        'uid',
+        'optedOut',
+        'adapterVersion',
+        'uspConsent',
+        'gdprConsent',
+        'gppConsent',
+        'browserLanguage',
+        'tdid'
+      ];
       const slotsRequiredFields = ['name', 'bidId', 'transactionId', 'sizes', 'partnerId', 'slotType'];
 
       metaRequiredFields.forEach(function(field) {
@@ -199,6 +212,31 @@ describe('ConcertAdapter', function () {
       expect(slot.offsetCoordinates.x).to.equal(100)
       expect(slot.offsetCoordinates.y).to.equal(0)
     })
+
+    it('should not pass along tdid if the user has opted out', function() {
+      storage.setDataInLocalStorage('c_nap', 'true');
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.meta.tdid).to.be.null;
+    });
+
+    it('should not pass along tdid if USP consent disallows', function() {
+      storage.removeDataFromLocalStorage('c_nap');
+      const request = spec.buildRequests(bidRequests, { ...bidRequest, uspConsent: '1YY' });
+      const payload = JSON.parse(request.data);
+
+      expect(payload.meta.tdid).to.be.null;
+    });
+
+    it('should pass along tdid if the user has not opted out', function() {
+      storage.removeDataFromLocalStorage('c_nap', 'true');
+      const tdid = '123abc';
+      const bidRequestsWithTdid = [{ ...bidRequests[0], userId: { tdid } }]
+      const request = spec.buildRequests(bidRequestsWithTdid, bidRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.meta.tdid).to.equal(tdid);
+    });
   });
 
   describe('spec.interpretResponse', function() {
@@ -211,6 +249,22 @@ describe('ConcertAdapter', function () {
       });
     });
 
+    it('should include dealId when present in bidResponse', function() {
+      const bids = spec.interpretResponse({
+        body: {
+          bids: [
+            { ...bidResponse.body.bids[0], dealid: 'CON-123' }
+          ]
+        }
+      }, bidRequest);
+      expect(bids[0]).to.have.property('dealId');
+    });
+
+    it('should exclude dealId when absent in bidResponse', function() {
+      const bids = spec.interpretResponse(bidResponse, bidRequest);
+      expect(bids[0]).to.not.have.property('dealId');
+    });
+
     it('should return empty bids if there is no response from server', function() {
       const bids = spec.interpretResponse({ body: null }, bidRequest);
       expect(bids).to.have.lengthOf(0);
diff --git a/test/spec/modules/confiantRtdProvider_spec.js b/test/spec/modules/confiantRtdProvider_spec.js
index 8f9fcd0ba98..f9b86046f3a 100644
--- a/test/spec/modules/confiantRtdProvider_spec.js
+++ b/test/spec/modules/confiantRtdProvider_spec.js
@@ -1,7 +1,7 @@
 import * as utils from '../../../src/utils.js';
 import * as hook from '../../../src/hook.js'
 import * as events from '../../../src/events.js';
-import CONSTANTS from '../../../src/constants.json';
+import { EVENTS } from '../../../src/constants.js';
 
 import confiantModule from '../../../modules/confiantRtdProvider.js';
 
@@ -48,7 +48,7 @@ describe('Confiant RTD module', function () {
       let billableEventsCounter = 0;
       const propertyId = 'fff';
 
-      events.on(CONSTANTS.EVENTS.BILLABLE_EVENT, (e) => {
+      events.on(EVENTS.BILLABLE_EVENT, (e) => {
         if (e.vendor === 'confiant') {
           billableEventsCounter++;
           expect(e.type).to.equal('impression');
diff --git a/test/spec/modules/connatixBidAdapter_spec.js b/test/spec/modules/connatixBidAdapter_spec.js
index 16ead9f9458..af56b937f58 100644
--- a/test/spec/modules/connatixBidAdapter_spec.js
+++ b/test/spec/modules/connatixBidAdapter_spec.js
@@ -1,9 +1,23 @@
 import { expect } from 'chai';
+import sinon from 'sinon';
 import {
-  spec,
-  getBidFloor as connatixGetBidFloor
+  _getBidRequests,
+  _canSelectViewabilityContainer as connatixCanSelectViewabilityContainer,
+  detectViewability as connatixDetectViewability,
+  getBidFloor as connatixGetBidFloor,
+  _getMinSize as connatixGetMinSize,
+  _getViewability as connatixGetViewability,
+  _isViewabilityMeasurable as connatixIsViewabilityMeasurable,
+  saveOnAllStorages as connatixSaveOnAllStorages,
+  readFromAllStorages as connatixReadFromAllStorages,
+  storage,
+  spec
 } from '../../../modules/connatixBidAdapter.js';
-import { BANNER } from '../../../src/mediaTypes.js';
+import adapterManager from '../../../src/adapterManager.js';
+import * as ajax from '../../../src/ajax.js';
+import { ADPOD, BANNER, VIDEO } from '../../../src/mediaTypes.js';
+
+const BIDDER_CODE = 'connatix';
 
 describe('connatixBidAdapter', function () {
   let bid;
@@ -24,6 +38,478 @@ describe('connatixBidAdapter', function () {
     };
   };
 
+  function addVideoToBidMock(bid) {
+    const mediaTypes = {
+      video: {
+        context: 'instream',
+        w: 1280,
+        h: 720,
+        playerSize: [1280, 720],
+        placement: 1,
+        plcmt: 1,
+        api: [1, 2],
+        mimes: ['video/mp4', 'application/javascript'],
+        minduration: 30,
+        maxduration: 60,
+        startdelay: 0,
+      }
+    }
+
+    bid.mediaTypes = mediaTypes;
+  }
+
+  describe('connatixGetMinSize', () => {
+    it('should return the smallest size based on area', () => {
+      const sizes = [
+        { w: 300, h: 250 },
+        { w: 728, h: 90 },
+        { w: 160, h: 600 }
+      ];
+      const result = connatixGetMinSize(sizes);
+      expect(result).to.deep.equal({ w: 728, h: 90 });
+    });
+
+    it('should handle an array with one size', () => {
+      const sizes = [{ w: 300, h: 250 }];
+      const result = connatixGetMinSize(sizes);
+      expect(result).to.deep.equal({ w: 300, h: 250 });
+    });
+
+    it('should handle empty array', () => {
+      const sizes = [];
+      const result = connatixGetMinSize(sizes);
+      expect(result).to.be.undefined;
+    });
+  });
+
+  describe('_isIframe', () => {
+    let querySelectorStub;
+
+    beforeEach(() => {
+      querySelectorStub = sinon.stub(window.top.document, 'querySelector');
+    });
+
+    afterEach(() => {
+      querySelectorStub.restore();
+    });
+
+    it('should return true when window.top.document.querySelector does not throw an error', () => {
+      querySelectorStub.returns({});
+      expect(connatixCanSelectViewabilityContainer()).to.be.true;
+    });
+
+    it('should return false when window.top.document.querySelector throws an error', () => {
+      querySelectorStub.throws(new Error('test error'));
+      expect(connatixCanSelectViewabilityContainer()).to.be.false;
+    });
+  });
+
+  describe('_isViewabilityMeasurable', () => {
+    let querySelectorStub;
+
+    beforeEach(() => {
+      querySelectorStub = sinon.stub(window.top.document, 'querySelector');
+    });
+
+    afterEach(() => {
+      querySelectorStub.restore();
+    });
+
+    it('should return false if the element is null or undefined', () => {
+      expect(connatixIsViewabilityMeasurable(null)).to.be.false;
+      expect(connatixIsViewabilityMeasurable(undefined)).to.be.false;
+    });
+
+    it('should return false if _isIframe returns true', () => {
+      querySelectorStub.throws(new Error('test error'));
+
+      const element = document.createElement('div');
+      expect(connatixIsViewabilityMeasurable(element)).to.be.false;
+    });
+
+    it('should return true if _isIframe returns false', () => {
+      querySelectorStub.returns(document.createElement('div'))
+
+      const element = document.createElement('div');
+      expect(connatixIsViewabilityMeasurable(element)).to.be.true;
+    });
+  });
+
+  describe('_getViewability', () => {
+    let element;
+    let getBoundingClientRectStub;
+    let topWinMock;
+
+    beforeEach(() => {
+      element = document.createElement('div');
+      getBoundingClientRectStub = sinon.stub(element, 'getBoundingClientRect');
+
+      topWinMock = {
+        document: {
+          visibilityState: 'visible'
+        },
+        innerWidth: 800,
+        innerHeight: 600
+      };
+    });
+
+    afterEach(() => {
+      getBoundingClientRectStub.restore();
+    });
+
+    it('should return 0 if the document is not visible', () => {
+      topWinMock.document.visibilityState = 'hidden';
+
+      const viewability = connatixGetViewability(element, topWinMock);
+
+      expect(viewability).to.equal(0);
+    });
+
+    it('should return 100% if the element is fully in view', () => {
+      const boundingBox = { left: 100, top: 100, right: 300, bottom: 300, width: 200, height: 200 };
+      getBoundingClientRectStub.returns(boundingBox);
+
+      const viewability = connatixGetViewability(element, topWinMock);
+
+      expect(viewability).to.equal(100);
+    });
+
+    it('should return the correct percentage if the element is partially in view', () => {
+      const boundingBox = { left: 700, top: 500, right: 900, bottom: 700, width: 200, height: 200 };
+      getBoundingClientRectStub.returns(boundingBox);
+
+      const viewability = connatixGetViewability(element, topWinMock);
+
+      expect(viewability).to.equal(25); // 100x100 / 200x200 = 0.25 -> 25%
+    });
+
+    it('should return 0% if the element is not in view', () => {
+      const boundingBox = { left: 900, top: 700, right: 1100, bottom: 900, width: 200, height: 200 };
+      getBoundingClientRectStub.returns(boundingBox);
+
+      const viewability = connatixGetViewability(element, topWinMock);
+
+      expect(viewability).to.equal(0);
+    });
+
+    it('should use provided width and height if element dimensions are zero', () => {
+      const boundingBox = { left: 100, top: 100, right: 100, bottom: 100, width: 0, height: 0 };
+      getBoundingClientRectStub.returns(boundingBox);
+
+      const dimensions = { w: 200, h: 200 };
+      const viewability = connatixGetViewability(element, topWinMock, dimensions);
+
+      expect(viewability).to.equal(100); // Element fully in view with provided dimensions
+    });
+  });
+
+  describe('detectViewability', () => {
+    let element;
+    let getBoundingClientRectStub;
+    let topWinMock;
+    let querySelectorStub;
+    let getElementByIdStub;
+
+    beforeEach(() => {
+      element = document.createElement('div');
+      getBoundingClientRectStub = sinon.stub(element, 'getBoundingClientRect');
+
+      topWinMock = {
+        document: {
+          visibilityState: 'visible'
+        },
+        innerWidth: 800,
+        innerHeight: 600
+      };
+
+      querySelectorStub = sinon.stub(window.top.document, 'querySelector');
+      getElementByIdStub = sinon.stub(document, 'getElementById');
+    });
+
+    afterEach(() => {
+      getBoundingClientRectStub.restore();
+      querySelectorStub.restore();
+      getElementByIdStub.restore();
+    });
+
+    it('should return 100% viewability when the element is fully within view and has a valid viewabilityContainerIdentifier', () => {
+      const bid = {
+        params: { viewabilityContainerIdentifier: '#validElement' },
+        adUnitCode: 'adUnitCode123',
+        mediaTypes: { banner: { sizes: [[300, 250]] } },
+        sizes: [[300, 250]]
+      };
+
+      getBoundingClientRectStub.returns({
+        left: 100,
+        top: 100,
+        right: 400,
+        bottom: 350,
+        width: 300,
+        height: 250
+      });
+
+      querySelectorStub.withArgs('#validElement').returns(element);
+      getElementByIdStub.returns(null);
+
+      const result = connatixDetectViewability(bid);
+
+      // Expected calculation: the element is fully in view, so 100% viewability
+      expect(result).to.equal(100);
+    });
+
+    it('should fall back to using bid sizes and adUnitCode when the viewabilityContainerIdentifier is invalid or was not provided', () => {
+      const bid = {
+        params: { viewabilityContainerIdentifier: '#invalidElement' },
+        adUnitCode: 'adUnitCode123',
+        mediaTypes: { banner: { sizes: [[300, 250]] } },
+        sizes: [[300, 250]]
+      };
+
+      getBoundingClientRectStub.returns({
+        left: 200,
+        top: 100,
+        right: 500,
+        bottom: 350,
+        width: 300,
+        height: 250
+      });
+
+      querySelectorStub.withArgs('#invalidElement').returns(null);
+      getElementByIdStub.withArgs('adUnitCode123').returns(element);
+
+      const result = connatixDetectViewability(bid);
+
+      expect(result).to.equal(100); // Full viewability
+    });
+
+    it('should use the adUnitCode as a fallback when querying an element fails due to a browser error, and return 100% viewability because adUnitCode container is fully in view', () => {
+      const bid = {
+        params: { viewabilityContainerIdentifier: '#invalidElement' },
+        adUnitCode: 'adUnitCode123',
+        sizes: [[300, 250]]
+      };
+
+      // Simulate an error when querying the element
+      querySelectorStub.withArgs('#invalidElement').throws(new Error('Query failed'));
+
+      getBoundingClientRectStub.returns({
+        left: 100,
+        top: 100,
+        right: 400,
+        bottom: 350,
+        width: 300,
+        height: 250
+      });
+
+      // The fallback should use the adUnitCode to find the element
+      getElementByIdStub.withArgs('adUnitCode123').returns(element);
+
+      const result = connatixDetectViewability(bid);
+
+      expect(result).to.equal(100); // Expect the fallback to work and return 100% viewability
+    });
+
+    it('should return null when querying the element by the provided identifier fails and the adUnitCode viewability container is unavailable', () => {
+      const bid = {
+        params: { viewabilityContainerIdentifier: '#invalidElement' },
+        adUnitCode: 'adUnitCode123',
+        sizes: [[300, 250]]
+      };
+
+      // Simulate an error when querying the element
+      querySelectorStub.withArgs('#invalidElement').throws(new Error('Query failed'));
+
+      getBoundingClientRectStub.returns({
+        left: 100,
+        top: 100,
+        right: 400,
+        bottom: 350,
+        width: 300,
+        height: 250
+      });
+
+      const result = connatixDetectViewability(bid);
+
+      expect(result).to.equal(null);
+    });
+  });
+
+  describe('_getBidRequests', function () {
+    let bid;
+
+    // Mock a bid request similar to the one already used in connatixBidAdapter tests
+    function mockBidRequest() {
+      const mediaTypes = {
+        banner: {
+          sizes: [16, 9],
+        }
+      };
+      return {
+        bidId: 'testing',
+        bidder: 'connatix',
+        params: {
+          placementId: '30e91414-545c-4f45-a950-0bec9308ff22',
+          viewabilityContainerIdentifier: 'viewabilityId',
+        },
+        mediaTypes,
+        sizes: [300, 250]
+      };
+    }
+
+    it('should map valid bid requests and include the expected fields', function () {
+      bid = mockBidRequest();
+
+      const result = _getBidRequests([bid]);
+
+      expect(result).to.have.lengthOf(1);
+      expect(result[0]).to.have.property('bidId', bid.bidId);
+      expect(result[0]).to.have.property('mediaTypes', bid.mediaTypes);
+      expect(result[0]).to.have.property('sizes', bid.sizes);
+      expect(result[0]).to.have.property('placementId', bid.params.placementId);
+      expect(result[0]).to.have.property('hasViewabilityContainerId', true);
+    });
+
+    it('should set hasViewabilityContainerId to false when viewabilityContainerIdentifier is absent', function () {
+      bid = mockBidRequest();
+      delete bid.params.viewabilityContainerIdentifier;
+
+      const result = _getBidRequests([bid]);
+
+      expect(result[0]).to.have.property('hasViewabilityContainerId', false);
+    });
+
+    it('should call getBidFloor for each bid and return the correct floor value', function () {
+      bid = mockBidRequest();
+      const floorValue = 5;
+
+      // Mock getFloor method on bid
+      bid.getFloor = function() {
+        return { floor: floorValue };
+      };
+
+      const result = _getBidRequests([bid]);
+
+      expect(result[0]).to.have.property('floor', floorValue);
+    });
+
+    it('should return floor as 0 if getBidFloor throws an error', function () {
+      bid = mockBidRequest();
+
+      // Mock getFloor method to throw an error
+      bid.getFloor = function() {
+        throw new Error('error');
+      };
+
+      const result = _getBidRequests([bid]);
+
+      expect(result[0]).to.have.property('floor', 0);
+    });
+  });
+
+  describe('onTimeout', function () {
+    let ajaxStub;
+
+    beforeEach(() => {
+      ajaxStub = sinon.stub(spec, 'triggerEvent')
+    })
+
+    afterEach(() => {
+      ajaxStub.restore()
+    });
+
+    it('call event if bidder is connatix', () => {
+      const result = spec.onTimeout([{
+        bidder: 'connatix',
+        timeout: 500,
+      }]);
+      expect(ajaxStub.calledOnce).to.equal(true);
+
+      const data = ajaxStub.firstCall.args[0];
+      expect(data.type).to.equal('Timeout');
+      expect(data.timeout).to.equal(500);
+    });
+
+    it('timeout event is not triggered if bidder is not connatix', () => {
+      const result = spec.onTimeout([{
+        bidder: 'otherBidder',
+        timeout: 500,
+      }]);
+      expect(ajaxStub.notCalled).to.equal(true);
+    });
+  });
+
+  describe('onBidWon', function () {
+    let ajaxStub;
+
+    beforeEach(() => {
+      ajaxStub = sinon.stub(spec, 'triggerEvent');
+    });
+
+    afterEach(() => {
+      ajaxStub.restore();
+    });
+
+    it('calls triggerEvent with correct data when bidWinData is provided', () => {
+      const bidWinData = {
+        bidder: 'connatix',
+        cpm: 2.5,
+        requestId: 'abc123',
+        bidId: 'dasdas-dsawda-dwaddw-dwdwd',
+        adUnitCode: 'adunit_1',
+        timeToRespond: 300,
+        auctionId: 'auction_456',
+      };
+
+      spec.onBidWon(bidWinData);
+      expect(ajaxStub.calledOnce).to.equal(true);
+
+      const eventData = ajaxStub.firstCall.args[0];
+      expect(eventData.type).to.equal('BidWon');
+      expect(eventData.bestBidBidder).to.equal('connatix');
+      expect(eventData.bestBidPrice).to.equal(2.5);
+      expect(eventData.requestId).to.equal('abc123');
+      expect(eventData.bidId).to.equal('dasdas-dsawda-dwaddw-dwdwd');
+      expect(eventData.adUnitCode).to.equal('adunit_1');
+      expect(eventData.timeToRespond).to.equal(300);
+      expect(eventData.auctionId).to.equal('auction_456');
+    });
+
+    it('does not call triggerEvent if bidWinData is null', () => {
+      spec.onBidWon(null);
+      expect(ajaxStub.notCalled).to.equal(true);
+    });
+
+    it('does not call triggerEvent if bidWinData is undefined', () => {
+      spec.onBidWon(undefined);
+      expect(ajaxStub.notCalled).to.equal(true);
+    });
+  });
+
+  describe('triggerEvent', function () {
+    let ajaxStub;
+
+    beforeEach(() => {
+      ajaxStub = sinon.stub(ajax, 'ajax');
+    });
+
+    afterEach(() => {
+      ajaxStub.restore();
+    });
+
+    it('should call ajax with the correct parameters', () => {
+      const data = { type: 'BidWon', bestBidBidder: 'bidder1', bestBidPrice: 1.5, requestId: 'req123', adUnitCode: 'ad123', timeToRespond: 250, auctionId: 'auc123', context: {} };
+      spec.triggerEvent(data);
+
+      expect(ajaxStub.calledOnce).to.equal(true);
+      const [url, _, payload, options] = ajaxStub.firstCall.args;
+      expect(url).to.equal('https://capi.connatix.com/tr/am');
+      expect(payload).to.equal(JSON.stringify(data));
+      expect(options.method).to.equal('POST');
+      expect(options.withCredentials).to.equal(false);
+    });
+  });
+
   describe('isBidRequestValid', function () {
     this.beforeEach(function () {
       bid = mockBidRequest();
@@ -32,10 +518,6 @@ describe('connatixBidAdapter', function () {
     it('Should return true if all required fileds are present', function () {
       expect(spec.isBidRequestValid(bid)).to.be.true;
     });
-    it('Should return false if bidder does not correspond', function () {
-      bid.bidder = 'abc';
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-    });
     it('Should return false if bidId is missing', function () {
       delete bid.bidId;
       expect(spec.isBidRequestValid(bid)).to.be.false;
@@ -52,7 +534,7 @@ describe('connatixBidAdapter', function () {
       delete bid.mediaTypes;
       expect(spec.isBidRequestValid(bid)).to.be.false;
     });
-    it('Should return false if banner is missing from mediaTypes ', function () {
+    it('Should return false if both banner and video are missing from mediaTypes', function () {
       delete bid.mediaTypes.banner;
       expect(spec.isBidRequestValid(bid)).to.be.false;
     });
@@ -68,6 +550,15 @@ describe('connatixBidAdapter', function () {
       bid.mediaTypes.banner.sizes = [];
       expect(spec.isBidRequestValid(bid)).to.be.false;
     });
+    it('Should return true if video is set correctly', function () {
+      addVideoToBidMock(bid);
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if context is set to adpod on video media type', function() {
+      addVideoToBidMock(bid);
+      bid.mediaTypes.video.context = ADPOD;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
     it('Should return true if add an extra field was added to the bidRequest', function () {
       bid.params.test = 1;
       expect(spec.isBidRequestValid(bid)).to.be.true;
@@ -76,6 +567,7 @@ describe('connatixBidAdapter', function () {
 
   describe('buildRequests', function () {
     let serverRequest;
+    let setCookieStub, setDataInLocalStorageStub;
     let bidderRequest = {
       refererInfo: {
         canonicalUrl: '',
@@ -90,6 +582,10 @@ describe('connatixBidAdapter', function () {
         gdprApplies: true
       },
       uspConsent: '1YYY',
+      gppConsent: {
+        gppString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+        applicableSections: [7]
+      },
       ortb2: {
         site: {
           data: {
@@ -100,10 +596,21 @@ describe('connatixBidAdapter', function () {
     };
 
     this.beforeEach(function () {
+      const mockIdentityProviderData = { mockKey: 'mockValue' };
+      const CNX_IDS_EXPIRY = 24 * 30 * 60 * 60 * 1000;
+      setCookieStub = sinon.stub(storage, 'setCookie');
+      setDataInLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
+      connatixSaveOnAllStorages('test_ids_cnx', mockIdentityProviderData, CNX_IDS_EXPIRY);
+
       bid = mockBidRequest();
       serverRequest = spec.buildRequests([bid], bidderRequest);
     })
 
+    this.afterEach(function() {
+      setCookieStub.restore();
+      setDataInLocalStorageStub.restore();
+    });
+
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
@@ -128,21 +635,21 @@ describe('connatixBidAdapter', function () {
       expect(serverRequest.data.refererInfo).to.equal(bidderRequest.refererInfo);
       expect(serverRequest.data.gdprConsent).to.equal(bidderRequest.gdprConsent);
       expect(serverRequest.data.uspConsent).to.equal(bidderRequest.uspConsent);
+      expect(serverRequest.data.gppConsent).to.equal(bidderRequest.gppConsent);
       expect(serverRequest.data.ortb2).to.equal(bidderRequest.ortb2);
+      expect(serverRequest.data.identityProviderData).to.deep.equal({ mockKey: 'mockValue' });
     });
   });
 
   describe('interpretResponse', function () {
     const CustomerId = '99f20d18-c4b4-4a28-3d8e-d43e2c8cb4ac';
     const PlayerId = 'e4984e88-9ff4-45a3-8b9d-33aabcad634f';
-    const Bid = {Cpm: 0.1, LineItems: [], RequestId: '2f897340c4eaa3', Ttl: 86400};
+    const Bid = {Cpm: 0.1, RequestId: '2f897340c4eaa3', Ttl: 86400, CustomerId, PlayerId};
 
     let serverResponse;
     this.beforeEach(function () {
       serverResponse = {
         body: {
-          CustomerId,
-          PlayerId,
           Bids: [ Bid ]
         },
         headers: function() { }
@@ -162,18 +669,6 @@ describe('connatixBidAdapter', function () {
       expect(response).to.be.an('array').that.is.empty;
     });
 
-    it('Should return an empty array if CustomerId is null', function () {
-      serverResponse.body.CustomerId = null;
-      const response = spec.interpretResponse(serverResponse);
-      expect(response).to.be.an('array').that.is.empty;
-    });
-
-    it('Should return an empty array if PlayerId is null', function () {
-      serverResponse.body.PlayerId = null;
-      const response = spec.interpretResponse(serverResponse);
-      expect(response).to.be.an('array').that.is.empty;
-    });
-
     it('Should return one bid response for one bid', function() {
       const bidResponses = spec.interpretResponse(serverResponse);
       expect(bidResponses.length).to.equal(1);
@@ -206,18 +701,40 @@ describe('connatixBidAdapter', function () {
       expect(bidResponses[0].cpm).to.equal(firstBidCpm);
       expect(bidResponses[1].cpm).to.equal(secondBidCpm);
     });
+
+    it('Should contain specific values for banner bids', function () {
+      const adHtml = 'ad html'
+      serverResponse.body.Bids = [ { ...Bid, Ad: adHtml } ];
+
+      const bidResponses = spec.interpretResponse(serverResponse);
+      const [ bidResponse ] = bidResponses;
+
+      expect(bidResponse.vastXml).to.be.undefined;
+      expect(bidResponse.ad).to.equal(adHtml);
+      expect(bidResponse.mediaType).to.equal(BANNER);
+    });
+
+    it('Should contain specific values for video bids', function () {
+      const adVastXml = 'ad vast xml'
+      serverResponse.body.Bids = [ { ...Bid, VastXml: adVastXml } ];
+
+      const bidResponses = spec.interpretResponse(serverResponse);
+      const [ bidResponse ] = bidResponses;
+
+      expect(bidResponse.ad).to.be.undefined;
+      expect(bidResponse.vastXml).to.equal(adVastXml);
+      expect(bidResponse.mediaType).to.equal(VIDEO);
+    });
   });
 
   describe('getUserSyncs', function() {
     const CustomerId = '99f20d18-c4b4-4a28-3d8e-d43e2c8cb4ac';
     const PlayerId = 'e4984e88-9ff4-45a3-8b9d-33aabcad634f';
     const UserSyncEndpoint = 'https://connatix.com/sync'
-    const Bid = {Cpm: 0.1, LineItems: [], RequestId: '2f897340c4eaa3', Ttl: 86400};
+    const Bid = {Cpm: 0.1, RequestId: '2f897340c4eaa3', Ttl: 86400, CustomerId, PlayerId};
 
     const serverResponse = {
       body: {
-        CustomerId,
-        PlayerId,
         UserSyncEndpoint,
         Bids: [ Bid ]
       },
@@ -314,6 +831,77 @@ describe('connatixBidAdapter', function () {
     });
   });
 
+  describe('userIdAsEids', function() {
+    let validBidRequests;
+
+    this.beforeEach(function () {
+      bid = mockBidRequest();
+      validBidRequests = [bid];
+    })
+
+    it('Connatix adapter reads EIDs from Prebid user models and adds it to Request', function() {
+      validBidRequests[0].userIdAsEids = [{
+        'source': 'adserver.org',
+        'uids': [{
+          'id': 'TTD_ID_FROM_USER_ID_MODULE',
+          'atype': 1,
+          'ext': {
+            'stype': 'ppuid',
+            'rtiPartner': 'TDID'
+          }
+        }]
+      },
+      {
+        'source': 'pubserver.org',
+        'uids': [{
+          'id': 'TDID_FROM_USER_ID_MODULE',
+          'atype': 1
+        }]
+      }];
+      let serverRequest = spec.buildRequests(validBidRequests, {});
+      expect(serverRequest.data.userIdList).to.deep.equal(validBidRequests[0].userIdAsEids);
+    });
+  });
+
+  describe('isConnatix', function () {
+    let aliasRegistryStub;
+
+    beforeEach(() => {
+      aliasRegistryStub = sinon.stub(adapterManager, 'aliasRegistry').value({});
+    });
+
+    afterEach(() => {
+      aliasRegistryStub.restore();
+    });
+
+    it('should return false if aliasName is undefined or null', () => {
+      expect(spec.isConnatix(undefined)).to.be.false;
+      expect(spec.isConnatix(null)).to.be.false;
+    });
+
+    it('should return true if aliasName matches BIDDER_CODE', () => {
+      const aliasName = BIDDER_CODE;
+      expect(spec.isConnatix(aliasName)).to.be.true;
+    });
+
+    it('should return true if aliasName is mapped to BIDDER_CODE in aliasRegistry', () => {
+      const aliasName = 'connatixAlias';
+      aliasRegistryStub.value({ 'connatixAlias': BIDDER_CODE });
+      expect(spec.isConnatix(aliasName)).to.be.true;
+    });
+
+    it('should return false if aliasName does not match BIDDER_CODE', () => {
+      const aliasName = 'otherBidder';
+      expect(spec.isConnatix(aliasName)).to.be.false;
+    });
+
+    it('should return false if aliasName is mapped to a different bidder in aliasRegistry', () => {
+      const aliasName = 'someOtherAlias';
+      aliasRegistryStub.value({ 'someOtherAlias': 'otherBidder' });
+      expect(spec.isConnatix(aliasName)).to.be.false;
+    });
+  });
+
   describe('getBidFloor', function () {
     this.beforeEach(function () {
       bid = mockBidRequest();
@@ -363,4 +951,102 @@ describe('connatixBidAdapter', function () {
       expect(floor).to.equal(0);
     });
   });
+  describe('getUserSyncs with message event listener', function() {
+    const CNX_IDS_EXPIRY = 24 * 30 * 60 * 60 * 1000;
+    const CNX_IDS_LOCAL_STORAGE_COOKIES_KEY = 'cnx_user_ids';
+    const ALL_PROVIDERS_RESOLVED_EVENT = 'cnx_all_identity_providers_resolved';
+
+    const mockData = {
+      providerName: 'nonId',
+      data: {
+        supplementalEids: [{ provider: 2, group: 1, eidsList: ['123', '456'] }]
+      }
+    };
+
+    function messageHandler(event) {
+      if (!event.data || event.origin !== 'https://cds.connatix.com') {
+        return;
+      }
+
+      if (event.data.type === ALL_PROVIDERS_RESOLVED_EVENT) {
+        window.removeEventListener('message', messageHandler);
+        event.stopImmediatePropagation();
+      }
+
+      if (event.data.type === ALL_PROVIDERS_RESOLVED_EVENT || event.data.type === IDENTITY_PROVIDER_RESOLVED_EVENT) {
+        const response = event.data;
+        if (response.data) {
+          connatixSaveOnAllStorages(CNX_IDS_LOCAL_STORAGE_COOKIES_KEY, response.data, CNX_IDS_EXPIRY);
+        }
+      }
+    }
+
+    let sandbox;
+
+    beforeEach(() => {
+      sandbox = sinon.createSandbox();
+      sandbox.stub(storage, 'setCookie');
+      sandbox.stub(storage, 'setDataInLocalStorage');
+      sandbox.stub(window, 'removeEventListener');
+      sandbox.stub(storage, 'cookiesAreEnabled').returns(true);
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      sandbox.stub(storage, 'getCookie');
+      sandbox.stub(storage, 'getDataFromLocalStorage');
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('Should set a cookie and save to local storage when a valid message is received', () => {
+      const fakeEvent = {
+        data: { type: 'cnx_all_identity_providers_resolved', data: mockData },
+        origin: 'https://cds.connatix.com',
+        stopImmediatePropagation: sinon.spy()
+      };
+
+      messageHandler(fakeEvent);
+
+      expect(fakeEvent.stopImmediatePropagation.calledOnce).to.be.true;
+      expect(window.removeEventListener.calledWith('message', messageHandler)).to.be.true;
+      expect(storage.setCookie.calledWith(CNX_IDS_LOCAL_STORAGE_COOKIES_KEY, JSON.stringify(mockData), sinon.match.string)).to.be.true;
+      expect(storage.setDataInLocalStorage.calledWith(CNX_IDS_LOCAL_STORAGE_COOKIES_KEY, JSON.stringify(mockData))).to.be.true;
+
+      storage.getCookie.returns(JSON.stringify(mockData));
+      storage.getDataFromLocalStorage.returns(JSON.stringify(mockData));
+
+      const retrievedData = connatixReadFromAllStorages(CNX_IDS_LOCAL_STORAGE_COOKIES_KEY);
+      expect(retrievedData).to.deep.equal(mockData);
+    });
+
+    it('Should should not do anything when there is no data in the payload', () => {
+      const fakeEvent = {
+        data: null,
+        origin: 'https://cds.connatix.com',
+        stopImmediatePropagation: sinon.spy()
+      };
+
+      messageHandler(fakeEvent);
+
+      expect(fakeEvent.stopImmediatePropagation.notCalled).to.be.true;
+      expect(window.removeEventListener.notCalled).to.be.true;
+      expect(storage.setCookie.notCalled).to.be.true;
+      expect(storage.setDataInLocalStorage.notCalled).to.be.true;
+    });
+
+    it('Should should not do anything when the origin is invalid', () => {
+      const fakeEvent = {
+        data: { type: 'cnx_all_identity_providers_resolved', data: mockData },
+        origin: 'https://notConnatix.com',
+        stopImmediatePropagation: sinon.spy()
+      };
+
+      messageHandler(fakeEvent);
+
+      expect(fakeEvent.stopImmediatePropagation.notCalled).to.be.true;
+      expect(window.removeEventListener.notCalled).to.be.true;
+      expect(storage.setCookie.notCalled).to.be.true;
+      expect(storage.setDataInLocalStorage.notCalled).to.be.true;
+    });
+  });
 });
diff --git a/test/spec/modules/connectIdSystem_spec.js b/test/spec/modules/connectIdSystem_spec.js
index 5376ba60886..3009ecef769 100644
--- a/test/spec/modules/connectIdSystem_spec.js
+++ b/test/spec/modules/connectIdSystem_spec.js
@@ -3,6 +3,7 @@ import {connectIdSubmodule, storage} from 'modules/connectIdSystem.js';
 import {server} from '../../mocks/xhr';
 import {parseQS, parseUrl} from 'src/utils.js';
 import {uspDataHandler, gppDataHandler} from 'src/adapterManager.js';
+import * as refererDetection from '../../../src/refererDetection';
 
 const TEST_SERVER_URL = 'http://localhost:9876/';
 
@@ -288,6 +289,79 @@ describe('Yahoo ConnectID Submodule', () => {
           expect(setCookieStub.firstCall.args[2]).to.equal(expiryDelta.toUTCString());
         });
 
+        it('returns an object with the stored ID from cookies and syncs because of expired TTL', () => {
+          const last2Days = Date.now() - (60 * 60 * 24 * 1000 * 2);
+          const last21Days = Date.now() - (60 * 60 * 24 * 1000 * 21);
+          const ttl = 10000;
+          const cookieData = {connectId: 'foo', he: 'email', lastSynced: last2Days, puid: '9', lastUsed: last21Days, ttl};
+          getCookieStub.withArgs(STORAGE_KEY).returns(JSON.stringify(cookieData));
+
+          let result = invokeGetIdAPI({
+            he: HASHED_EMAIL,
+            pixelId: PIXEL_ID
+          }, consentData);
+
+          expect(result).to.be.an('object').that.has.all.keys('id', 'callback');
+          expect(result.id).to.deep.equal(cookieData);
+          expect(typeof result.callback).to.equal('function');
+        });
+
+        it('returns an object with the stored ID from cookies and not syncs because of valid TTL', () => {
+          const last2Days = Date.now() - (60 * 60 * 24 * 1000 * 2);
+          const last21Days = Date.now() - (60 * 60 * 24 * 1000 * 21);
+          const ttl = 60 * 60 * 24 * 1000 * 3;
+          const cookieData = {connectId: 'foo', he: HASHED_EMAIL, lastSynced: last2Days, puid: '9', lastUsed: last21Days, ttl};
+          getCookieStub.withArgs(STORAGE_KEY).returns(JSON.stringify(cookieData));
+
+          let result = invokeGetIdAPI({
+            he: HASHED_EMAIL,
+            pixelId: PIXEL_ID
+          }, consentData);
+
+          expect(result).to.be.an('object').that.has.all.keys('id');
+          cookieData.lastUsed = result.id.lastUsed;
+          expect(result.id).to.deep.equal(cookieData);
+        });
+
+        it('returns an object with the stored ID from cookies and not syncs because of valid TTL with provided puid', () => {
+          const last2Days = Date.now() - (60 * 60 * 24 * 1000 * 2);
+          const last21Days = Date.now() - (60 * 60 * 24 * 1000 * 21);
+          const ttl = 60 * 60 * 24 * 1000 * 3;
+          const cookieData = {connectId: 'foo', he: HASHED_EMAIL, lastSynced: last2Days, puid: '9', lastUsed: last21Days, ttl};
+          getCookieStub.withArgs(STORAGE_KEY).returns(JSON.stringify(cookieData));
+
+          let result = invokeGetIdAPI({
+            he: HASHED_EMAIL,
+            pixelId: PIXEL_ID,
+            puid: '9'
+          }, consentData);
+
+          expect(result).to.be.an('object').that.has.all.keys('id');
+          cookieData.lastUsed = result.id.lastUsed;
+          expect(result.id).to.deep.equal(cookieData);
+        });
+
+        it('returns an object with the stored ID from cookies and syncs because is O&O traffic', () => {
+          const last2Days = Date.now() - (60 * 60 * 24 * 1000 * 2);
+          const last21Days = Date.now() - (60 * 60 * 24 * 1000 * 21);
+          const ttl = 60 * 60 * 24 * 1000 * 3;
+          const cookieData = {connectId: 'foo', he: HASHED_EMAIL, lastSynced: last2Days, puid: '9', lastUsed: last21Days, ttl};
+          getCookieStub.withArgs(STORAGE_KEY).returns(JSON.stringify(cookieData));
+          const getRefererInfoStub = sinon.stub(refererDetection, 'getRefererInfo');
+          getRefererInfoStub.returns({
+            ref: 'https://dev.fc.yahoo.com?test'
+          });
+          let result = invokeGetIdAPI({
+            he: HASHED_EMAIL,
+            pixelId: PIXEL_ID
+          }, consentData);
+          getRefererInfoStub.restore();
+
+          expect(result).to.be.an('object').that.has.all.keys('id', 'callback');
+          expect(result.id).to.deep.equal(cookieData);
+          expect(typeof result.callback).to.equal('function');
+        });
+
         it('Makes an ajax GET request to the production API endpoint with stored puid when id is stale', () => {
           const last15Days = Date.now() - (60 * 60 * 24 * 1000 * 15);
           const last29Days = Date.now() - (60 * 60 * 24 * 1000 * 29);
@@ -475,24 +549,28 @@ describe('Yahoo ConnectID Submodule', () => {
           expect(result.callback).to.be.a('function');
         });
 
+        function mockOptout(value) {
+          getLocalStorageStub.callsFake((key) => {
+            if (key === 'connectIdOptOut') return value;
+          })
+        }
+
         it('returns an undefined if the Yahoo specific opt-out key is present in local storage', () => {
-          localStorage.setItem('connectIdOptOut', '1');
+          mockOptout('1');
           expect(invokeGetIdAPI({
             he: HASHED_EMAIL,
             pixelId: PIXEL_ID
           }, consentData)).to.be.undefined;
-          localStorage.removeItem('connectIdOptOut');
         });
 
         it('returns an object with the callback function if the correct params are passed and Yahoo opt-out value is not "1"', () => {
-          localStorage.setItem('connectIdOptOut', 'true');
+          mockOptout('true');
           let result = invokeGetIdAPI({
             he: HASHED_EMAIL,
             pixelId: PIXEL_ID
           }, consentData);
           expect(result).to.be.an('object').that.has.all.keys('callback');
           expect(result.callback).to.be.a('function');
-          localStorage.removeItem('connectIdOptOut');
         });
 
         it('Makes an ajax GET request to the production API endpoint with pixelId and he query params', () => {
@@ -730,6 +808,25 @@ describe('Yahoo ConnectID Submodule', () => {
         });
       });
     });
+    describe('userHasOptedOut()', () => {
+      it('should return a function', () => {
+        expect(connectIdSubmodule.userHasOptedOut).to.be.a('function');
+      });
+
+      it('should return false when local storage key has not been set function', () => {
+        expect(connectIdSubmodule.userHasOptedOut()).to.be.false;
+      });
+
+      it('should return true when local storage key has been set to "1"', () => {
+        getLocalStorageStub.returns('1');
+        expect(connectIdSubmodule.userHasOptedOut()).to.be.true;
+      });
+
+      it('should return false when local storage key has not been set to "1"', () => {
+        getLocalStorageStub.returns('hello');
+        expect(connectIdSubmodule.userHasOptedOut()).to.be.false;
+      });
+    });
   });
 
   describe('decode()', () => {
@@ -810,28 +907,4 @@ describe('Yahoo ConnectID Submodule', () => {
       })).to.be.true;
     });
   });
-
-  describe('userHasOptedOut()', () => {
-    afterEach(() => {
-      localStorage.removeItem('connectIdOptOut');
-    });
-
-    it('should return a function', () => {
-      expect(connectIdSubmodule.userHasOptedOut).to.be.a('function');
-    });
-
-    it('should return false when local storage key has not been set function', () => {
-      expect(connectIdSubmodule.userHasOptedOut()).to.be.false;
-    });
-
-    it('should return true when local storage key has been set to "1"', () => {
-      localStorage.setItem('connectIdOptOut', '1');
-      expect(connectIdSubmodule.userHasOptedOut()).to.be.true;
-    });
-
-    it('should return false when local storage key has not been set to "1"', () => {
-      localStorage.setItem('connectIdOptOut', 'hello');
-      expect(connectIdSubmodule.userHasOptedOut()).to.be.false;
-    });
-  });
 });
diff --git a/test/spec/modules/connectadBidAdapter_spec.js b/test/spec/modules/connectadBidAdapter_spec.js
index d8dfcb0ce98..f067d801c5e 100644
--- a/test/spec/modules/connectadBidAdapter_spec.js
+++ b/test/spec/modules/connectadBidAdapter_spec.js
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import {spec} from 'modules/connectadBidAdapter.js';
 import { config } from 'src/config.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import assert from 'assert';
 
 describe('ConnectAd Adapter', function () {
   let bidRequests;
@@ -26,7 +27,13 @@ describe('ConnectAd Adapter', function () {
         bidId: '2f95c00074b931',
         auctionId: 'e76cbb58-f3e1-4ad9-9f4c-718c1919d0df',
         bidderRequestId: '1c56ad30b9b8ca8',
-        transactionId: 'e76cbb58-f3e1-4ad9-9f4c-718c1919d0df'
+        transactionId: 'e76cbb58-f3e1-4ad9-9f4c-718c1919d0df',
+        ortb2Imp: {
+          ext: {
+            tid: '601bda1a-01a9-4de9-b8f3-649d3bdd0d8f',
+            gpid: '/12345/homepage-leftnav'
+          }
+        },
       }
     ];
 
@@ -69,6 +76,10 @@ describe('ConnectAd Adapter', function () {
     }
   });
 
+  afterEach(function () {
+    config.resetConfig();
+  });
+
   describe('inherited functions', function () {
     it('should exists and is a function', function () {
       const adapter = newBidder(spec);
@@ -193,30 +204,28 @@ describe('ConnectAd Adapter', function () {
       });
 
       it('should build a request if Consent but no gdprApplies', function () {
-        let bidderRequest = {
+        let localbidderRequest = {
           timeout: 3000,
           gdprConsent: {
             gdprApplies: false,
             consentString: 'consentDataString',
           },
         }
-        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const request = spec.buildRequests(bidRequests, localbidderRequest);
         const requestparse = JSON.parse(request.data);
 
-        expect(requestparse.placements[0].adTypes).to.be.an('array');
         expect(requestparse.placements[0].siteId).to.equal(123456);
         expect(requestparse.user.ext.consent).to.equal('consentDataString');
       });
 
       it('should build a request if gdprConsent empty', function () {
-        let bidderRequest = {
+        let localbidderRequest = {
           timeout: 3000,
           gdprConsent: {}
         }
-        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const request = spec.buildRequests(bidRequests, localbidderRequest);
         const requestparse = JSON.parse(request.data);
 
-        expect(requestparse.placements[0].adTypes).to.be.an('array');
         expect(requestparse.placements[0].siteId).to.equal(123456);
       });
 
@@ -239,7 +248,7 @@ describe('ConnectAd Adapter', function () {
       it('should not include schain when not provided', function () {
         const request = spec.buildRequests(bidRequests, bidderRequest);
         const requestparse = JSON.parse(request.data);
-        expect(requestparse.source).to.not.exist;
+        expect(requestparse).to.not.have.property('source.ext.schain');
       });
 
       it('should submit coppa if set in config', function () {
@@ -248,7 +257,17 @@ describe('ConnectAd Adapter', function () {
           .returns(true);
         const request = spec.buildRequests(bidRequests, bidderRequest);
         const requestparse = JSON.parse(request.data);
-        expect(requestparse.user.coppa).to.equal(1);
+        expect(requestparse.regs.coppa).to.equal(1);
+        config.getConfig.restore();
+      });
+
+      it('should not set coppa when coppa is not provided or is set to false', function () {
+        sinon.stub(config, 'getConfig')
+          .withArgs('coppa')
+          .returns(false);
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const requestparse = JSON.parse(request.data);
+        assert.equal(requestparse.regs.coppa, undefined);
         config.getConfig.restore();
       });
 
@@ -259,27 +278,96 @@ describe('ConnectAd Adapter', function () {
         expect(requestparse.user.ext.eids[0].uids[0].id).to.equal('123456');
       });
 
-      it('should add referer info', function () {
-        const bidRequest = Object.assign({}, bidRequests[0])
-        const bidderRequ = {
-          refererInfo: {
-            page: 'https://connectad.io/page.html',
-            legacy: {
-              referer: 'https://connectad.io/page.html',
-              reachedTop: true,
-              numIframes: 2,
-              stack: [
-                'https://connectad.io/page.html',
-                'https://connectad.io/iframe1.html',
-                'https://connectad.io/iframe2.html'
-              ]
+      it('should include DSA signals', function () {
+        const dsa = {
+          dsarequired: 3,
+          pubrender: 0,
+          datatopub: 2,
+          transparency: [
+            {
+              domain: 'domain1.com',
+              dsaparams: [1]
+            },
+            {
+              domain: 'domain2.com',
+              dsaparams: [1, 2]
+            }
+          ]
+        };
+
+        let bidRequest = {
+		      ortb2: {
+            regs: {
+              ext: {
+                dsa
+              }
+            }
+          }
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        assert.deepEqual(data.regs.ext.dsa, dsa);
+      });
+
+      it('should pass auction level tid', function() {
+        const bidRequest = Object.assign([], bidRequests);
+
+        const localBidderRequest = {
+          ...bidderRequest,
+          ortb2: {
+            source: {
+              tid: '9XSL9B79XM'
             }
           }
         }
-        const request = spec.buildRequests([bidRequest], bidderRequ);
+
+        const request = spec.buildRequests(bidRequest, localBidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.source?.tid).to.equal('9XSL9B79XM')
+      });
+
+      it('should pass gpid', function() {
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const requestparse = JSON.parse(request.data);
+        expect(requestparse.placements[0].gpid).to.equal('/12345/homepage-leftnav');
+      });
+
+      it('should pass impression level tid', function() {
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const requestparse = JSON.parse(request.data);
+        expect(requestparse.placements[0].tid).to.equal('601bda1a-01a9-4de9-b8f3-649d3bdd0d8f');
+      });
+
+      it('should pass first party data', function() {
+        const bidRequest = Object.assign([], bidRequests);
+
+        const localBidderRequest = {
+          ...bidderRequest,
+          ortb2: {
+            bcat: ['IAB1', 'IAB2-1'],
+            badv: ['xyz.com', 'zyx.com'],
+            site: { ext: { data: 'some site data' } },
+            device: { ext: { data: 'some device data' } },
+            user: { ext: { data: 'some user data' } },
+            regs: { ext: { data: 'some regs data' } }
+          }
+        };
+
+        const request = spec.buildRequests(bidRequest, localBidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.bcat).to.deep.equal(localBidderRequest.ortb2.bcat);
+        expect(data.badv).to.deep.equal(localBidderRequest.ortb2.badv);
+        expect(data.site).to.nested.include({'ext.data': 'some site data'});
+        expect(data.device).to.nested.include({'ext.data': 'some device data'});
+        expect(data.user).to.nested.include({'ext.data': 'some user data'});
+        expect(data.regs).to.nested.include({'ext.data': 'some regs data'});
+      });
+
+      it('should accept tmax from global config if not set by requestBids method', function() {
+        const request = spec.buildRequests(bidRequests, bidderRequest);
         const requestparse = JSON.parse(request.data);
 
-        expect(requestparse.referrer_info).to.exist;
+        expect(requestparse.tmax).to.deep.equal(3000);
       });
 
       it('should populate schain', function () {
@@ -313,6 +401,76 @@ describe('ConnectAd Adapter', function () {
       });
     });
 
+    describe('GPP Implementation', function() {
+      it('should check with GPP Consent', function () {
+        let bidRequest = {
+          gppConsent: {
+            'gppString': 'DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN',
+            'fullGppData': {
+              'sectionId': 3,
+              'gppVersion': 1,
+              'sectionList': [
+                5,
+                7
+              ],
+              'applicableSections': [
+                5
+              ],
+              'gppString': 'DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN',
+              'pingData': {
+                'cmpStatus': 'loaded',
+                'gppVersion': '1.0',
+                'cmpDisplayStatus': 'visible',
+                'supportedAPIs': [
+                  'tcfca',
+                  'usnat',
+                  'usca',
+                  'usva',
+                  'usco',
+                  'usut',
+                  'usct'
+                ],
+                'cmpId': 31
+              },
+              'eventName': 'sectionChange'
+            },
+            'applicableSections': [
+              5
+            ],
+            'apiVersion': 1
+          }
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.regs.gpp).to.equal('DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN');
+        expect(data.regs.gpp_sid[0]).to.equal(5);
+      });
+
+      it('should check without GPP Consent', function () {
+        let bidRequest = {};
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.regs.gpp).to.equal(undefined);
+      });
+
+      it('should check with GPP Consent read from OpenRTB2', function () {
+        let bidRequest = {
+          ortb2: {
+            regs: {
+              'gpp': 'DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN',
+              'gpp_sid': [
+                5
+              ]
+            }
+          }
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.regs.gpp).to.equal('DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN');
+        expect(data.regs.gpp_sid[0]).to.equal(5);
+      });
+    });
+
     describe('bid responses', function () {
       it('should return complete bid response with adomain', function () {
         const ADOMAINS = ['connectad.io'];
@@ -348,6 +506,53 @@ describe('ConnectAd Adapter', function () {
         expect(bids[0].meta.advertiserDomains).to.deep.equal(ADOMAINS);
       });
 
+      it('should process meta response object', function () {
+        const ADOMAINS = ['connectad.io'];
+        const dsa = {
+          behalf: 'Advertiser',
+          paid: 'Advertiser',
+          transparency: [{
+            domain: 'dsp1domain.com',
+            dsaparams: [1, 2]
+          }],
+          adrender: 1
+        };
+
+        let serverResponse = {
+          body: {
+            decisions: {
+              '2f95c00074b931': {
+                adId: '0',
+                adomain: ['connectad.io'],
+                contents: [
+                  {
+                    body: '<<<---- Creative --->>>'
+                  }
+                ],
+                height: '250',
+                width: '300',
+                dsa: dsa,
+                category: 'IAB123',
+                pricing: {
+                  clearPrice: 11.899999999999999
+                }
+              }
+            }
+          }
+        };
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const bids = spec.interpretResponse(serverResponse, request);
+
+        expect(bids).to.be.lengthOf(1);
+        expect(bids[0].cpm).to.equal(11.899999999999999);
+        expect(bids[0].width).to.equal('300');
+        expect(bids[0].height).to.equal('250');
+        expect(bids[0].ad).to.have.length.above(1);
+        expect(bids[0].meta.advertiserDomains).to.deep.equal(ADOMAINS);
+        expect(bids[0].meta.dsa).to.equal(dsa);
+        expect(bids[0].meta.primaryCatId).to.equal('IAB123');
+      });
+
       it('should return complete bid response with empty adomain', function () {
         const ADOMAINS = [];
 
@@ -471,22 +676,59 @@ describe('ConnectAd Adapter', function () {
     });
   });
 
+  describe('GPP Sync', function() {
+    it('should concatenate gppString and applicableSections values in the returned image url', () => {
+      const gppConsent = { gppString: 'DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN', applicableSections: [5] };
+      const result = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, undefined, undefined, undefined, gppConsent);
+      expect(result).to.deep.equal([{
+        type: 'image',
+        url: `https://sync.connectad.io/ImageSyncer?gpp=DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN&gpp_sid=5&`
+      }]);
+    });
+
+    it('should concatenate gppString and applicableSections values in the returned iFrame url', () => {
+      const gppConsent = { gppString: 'DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN', applicableSections: [5, 6] };
+      const result = spec.getUserSyncs({iframeEnabled: true}, undefined, undefined, undefined, gppConsent);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: `https://sync.connectad.io/iFrameSyncer?gpp=DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN&gpp_sid=5%2C6&`
+      }]);
+    });
+
+    it('should return url without Gpp consent if gppConsent is undefined', () => {
+      const result = spec.getUserSyncs({iframeEnabled: true}, undefined, undefined, undefined, undefined);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: `https://sync.connectad.io/iFrameSyncer?`
+      }]);
+    });
+
+    it('should return iFrame url without Gpp consent if gppConsent.gppString is undefined', () => {
+      const gppConsent = { applicableSections: ['5'] };
+      const result = spec.getUserSyncs({iframeEnabled: true}, undefined, undefined, undefined, gppConsent);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: `https://sync.connectad.io/iFrameSyncer?`
+      }]);
+    });
+  });
+
   describe('getUserSyncs', () => {
     let testParams = [
       {
         name: 'iframe/no gdpr or ccpa',
-        arguments: [{ iframeEnabled: true, pixelEnabled: true }, {}, null],
+        arguments: [{ iframeEnabled: true, pixelEnabled: false }, {}, null],
         expect: {
           type: 'iframe',
-          pixels: ['https://cdn.connectad.io/connectmyusers.php?']
+          pixels: ['https://sync.connectad.io/iFrameSyncer?']
         }
       },
       {
         name: 'iframe/gdpr',
-        arguments: [{ iframeEnabled: true, pixelEnabled: true }, {}, {gdprApplies: true, consentString: '234234'}],
+        arguments: [{ iframeEnabled: true, pixelEnabled: false }, {}, {gdprApplies: true, consentString: '234234'}],
         expect: {
           type: 'iframe',
-          pixels: ['https://cdn.connectad.io/connectmyusers.php?gdpr=1&gdpr_consent=234234&']
+          pixels: ['https://sync.connectad.io/iFrameSyncer?gdpr=1&gdpr_consent=234234&']
         }
       },
       {
@@ -494,15 +736,39 @@ describe('ConnectAd Adapter', function () {
         arguments: [{ iframeEnabled: true, pixelEnabled: true }, {}, null, 'YN12'],
         expect: {
           type: 'iframe',
-          pixels: ['https://cdn.connectad.io/connectmyusers.php?us_privacy=YN12&']
+          pixels: ['https://sync.connectad.io/iFrameSyncer?us_privacy=YN12&']
         }
       },
       {
         name: 'iframe/ccpa & gdpr',
-        arguments: [{ iframeEnabled: true, pixelEnabled: true }, {}, {gdprApplies: true, consentString: '234234'}, 'YN12'],
+        arguments: [{ iframeEnabled: true, pixelEnabled: false }, {}, {gdprApplies: true, consentString: '234234'}, 'YN12'],
+        expect: {
+          type: 'iframe',
+          pixels: ['https://sync.connectad.io/iFrameSyncer?gdpr=1&gdpr_consent=234234&us_privacy=YN12&']
+        }
+      },
+      {
+        name: 'image/ccpa & gdpr',
+        arguments: [{ iframeEnabled: false, pixelEnabled: true }, {}, {gdprApplies: true, consentString: '234234'}, 'YN12'],
+        expect: {
+          type: 'image',
+          pixels: ['https://sync.connectad.io/ImageSyncer?gdpr=1&gdpr_consent=234234&us_privacy=YN12&']
+        }
+      },
+      {
+        name: 'image/gdpr',
+        arguments: [{ iframeEnabled: false, pixelEnabled: true }, {}, {gdprApplies: true, consentString: '234234'}],
+        expect: {
+          type: 'image',
+          pixels: ['https://sync.connectad.io/ImageSyncer?gdpr=1&gdpr_consent=234234&']
+        }
+      },
+      {
+        name: 'should prioritize iframe over image for user sync',
+        arguments: [{ iframeEnabled: true, pixelEnabled: true }, {}, null],
         expect: {
           type: 'iframe',
-          pixels: ['https://cdn.connectad.io/connectmyusers.php?gdpr=1&gdpr_consent=234234&us_privacy=YN12&']
+          pixels: ['https://sync.connectad.io/iFrameSyncer?']
         }
       }
     ];
diff --git a/test/spec/modules/consentManagementGpp_spec.js b/test/spec/modules/consentManagementGpp_spec.js
index 99d4f94f502..25114ac6602 100644
--- a/test/spec/modules/consentManagementGpp_spec.js
+++ b/test/spec/modules/consentManagementGpp_spec.js
@@ -10,8 +10,6 @@ import {gppDataHandler} from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
 import {config} from 'src/config.js';
 import 'src/prebid.js';
-import {MODE_CALLBACK, MODE_MIXED} from '../../../libraries/cmp/cmpClient.js';
-import {GreedyPromise} from '../../../src/utils/promise.js';
 
 let expect = require('chai').expect;
 
@@ -141,170 +139,33 @@ describe('consentManagementGpp', function () {
       });
     });
   });
-  describe('GPPClient.ping', () => {
-    function mkPingData(gppVersion) {
-      return {
-        gppVersion
-      }
-    }
-    Object.entries({
-      'unknown': {
-        expectedMode: MODE_CALLBACK,
-        pingData: mkPingData(),
-        apiVersion: '1.1',
-        client({callback}) {
-          callback(this.pingData);
-        }
-      },
-      '1.0': {
-        expectedMode: MODE_MIXED,
-        pingData: mkPingData('1.0'),
-        apiVersion: '1.0',
-        client() {
-          return this.pingData;
-        }
-      },
-      '1.1 that runs callback immediately': {
-        expectedMode: MODE_CALLBACK,
-        pingData: mkPingData('1.1'),
-        apiVersion: '1.1',
-        client({callback}) {
-          callback(this.pingData);
-        }
-      },
-      '1.1 that defers callback': {
-        expectedMode: MODE_CALLBACK,
-        pingData: mkPingData('1.1'),
-        apiVersion: '1.1',
-        client({callback}) {
-          setTimeout(() => callback(this.pingData), 10);
-        }
-      },
-      '> 1.1': {
-        expectedMode: MODE_CALLBACK,
-        pingData: mkPingData('1.2'),
-        apiVersion: '1.1',
-        client({callback}) {
-          setTimeout(() => callback(this.pingData), 10);
-        }
-      }
-    }).forEach(([t, scenario]) => {
-      describe(`using CMP version ${t}`, () => {
-        let clients, mkClient;
-        beforeEach(() => {
-          clients = [];
-          mkClient = ({mode}) => {
-            const mockClient = function (args) {
-              if (args.command === 'ping') {
-                return Promise.resolve(scenario.client(args));
-              }
-            }
-            mockClient.mode = mode;
-            mockClient.close = sinon.stub();
-            clients.push(mockClient);
-            return mockClient;
-          }
-        });
-
-        it('should resolve to client with the correct mode', () => {
-          return GPPClient.ping(mkClient).then(([client]) => {
-            expect(client.cmp.mode).to.eql(scenario.expectedMode);
-          });
-        });
-
-        it('should resolve to pingData', () => {
-          return GPPClient.ping(mkClient).then(([_, pingData]) => {
-            expect(pingData).to.eql(scenario.pingData);
-          });
-        });
 
-        it('should .close the probing client', () => {
-          return GPPClient.ping(mkClient).then(([client]) => {
-            sinon.assert.called(clients[0].close);
-            sinon.assert.notCalled(client.cmp.close);
-          })
-        });
-
-        it('should .tag the client with version', () => {
-          return GPPClient.ping(mkClient).then(([client]) => {
-            expect(client.apiVersion).to.eql(scenario.apiVersion);
-          })
-        })
-      })
-    });
-
-    it('should reject when mkClient returns null (CMP not found)', () => {
-      return GPPClient.ping(() => null).catch((err) => {
-        expect(err.message).to.match(/not found/);
-      });
-    });
-
-    it('should reject when client rejects', () => {
-      const err = {some: 'prop'};
-      const mockClient = () => Promise.reject(err);
-      mockClient.close = sinon.stub();
-      return GPPClient.ping(() => mockClient).catch((result) => {
-        expect(result).to.eql(err);
-        sinon.assert.called(mockClient.close);
-      });
-    });
-
-    it('should reject when callback is invoked with success = false', () => {
-      const err = 'error';
-      const mockClient = ({callback}) => callback(err, false);
-      mockClient.close = sinon.stub();
-      return GPPClient.ping(() => mockClient).catch((result) => {
-        expect(result).to.eql(err);
-        sinon.assert.called(mockClient.close);
-      })
-    })
-  });
-
-  describe('GPPClient.init', () => {
-    let makeCmp, cmpCalls, cmpResult;
+  describe('GPPClient.get', () => {
+    let makeCmp;
 
     beforeEach(() => {
-      cmpResult = {signalStatus: 'ready', gppString: 'mock-str'};
-      cmpCalls = [];
       makeCmp = sinon.stub().callsFake(() => {
-        function mockCmp(args) {
-          cmpCalls.push(args);
-          return GreedyPromise.resolve(cmpResult);
-        }
-        mockCmp.close = sinon.stub();
-        return mockCmp;
+        return sinon.stub()
       });
     });
 
-    it('should re-use same client', (done) => {
-      GPPClient.init(makeCmp).then(([client]) => {
-        GPPClient.init(makeCmp).then(([client2, consentPm]) => {
-          expect(client2).to.equal(client);
-          expect(cmpCalls.filter((el) => el.command === 'ping').length).to.equal(2) // recycled client should be refreshed
-          consentPm.then((consent) => {
-            expect(consent.gppString).to.eql('mock-str');
-            done()
-          })
-        });
-      });
+    it('should re-use same client', () => {
+      expect(GPPClient.get(makeCmp)).to.equal(GPPClient.get(makeCmp));
+      sinon.assert.calledOnce(makeCmp);
     });
 
-    it('should not re-use errors', (done) => {
-      cmpResult = Promise.reject(new Error());
-      GPPClient.init(makeCmp).catch(() => {
-        cmpResult = {signalStatus: 'ready'};
-        return GPPClient.init(makeCmp).then(([client]) => {
-          expect(client).to.exist;
-          done()
-        })
-      })
+    it('should not re-use errors', () => {
+      try {
+        GPPClient.get(sinon.stub().throws(new Error()));
+      } catch (e) {}
+      expect(GPPClient.get(makeCmp)).to.exist;
     })
   })
 
   describe('GPP client', () => {
     const CHANGE_EVENTS = ['sectionChange', 'signalStatus'];
 
-    let gppClient, gppData, cmpReady, eventListener;
+    let gppClient, gppData, eventListener;
 
     function mockClient(apiVersion = '1.1', cmpVersion = '1.1') {
       const mockCmp = sinon.stub().callsFake(function ({command, callback}) {
@@ -314,10 +175,8 @@ describe('consentManagementGpp', function () {
           throw new Error('unexpected command: ' + command);
         }
       })
-      const client = new GPPClient(cmpVersion, mockCmp);
+      const client = new GPPClient(mockCmp);
       client.apiVersion = apiVersion;
-      client.getGPPData = sinon.stub().callsFake(() => Promise.resolve(gppData));
-      client.isCMPReady = sinon.stub().callsFake(() => cmpReady);
       client.events = CHANGE_EVENTS;
       return client;
     }
@@ -325,7 +184,6 @@ describe('consentManagementGpp', function () {
     beforeEach(() => {
       gppDataHandler.reset();
       eventListener = null;
-      cmpReady = true;
       gppData = {
         applicableSections: [7],
         gppString: 'mock-string',
@@ -346,7 +204,7 @@ describe('consentManagementGpp', function () {
 
     describe('updateConsent', () => {
       it('should update data handler with consent data', () => {
-        return gppClient.updateConsent().then(data => {
+        return gppClient.updateConsent(gppData).then(data => {
           sinon.assert.match(data, gppData);
           sinon.assert.match(gppDataHandler.getConsentData(), gppData);
           expect(gppDataHandler.ready).to.be.true;
@@ -358,8 +216,7 @@ describe('consentManagementGpp', function () {
         'missing': null
       }).forEach(([t, data]) => {
         it(`should not update, and reject promise, when gpp data is ${t}`, (done) => {
-          gppData = data;
-          gppClient.updateConsent().catch(err => {
+          gppClient.updateConsent(data).catch(err => {
             expect(err.message).to.match(/empty/);
             expect(err.args).to.eql(data == null ? [] : [data]);
             expect(gppDataHandler.ready).to.be.false;
@@ -368,15 +225,6 @@ describe('consentManagementGpp', function () {
         });
       })
 
-      it('should not update when gpp data rejects', (done) => {
-        gppData = Promise.reject(new Error('err'));
-        gppClient.updateConsent().catch(err => {
-          expect(gppDataHandler.ready).to.be.false;
-          expect(err.message).to.eql('err');
-          done();
-        })
-      });
-
       describe('consent data validation', () => {
         Object.entries({
           applicableSections: {
@@ -394,7 +242,7 @@ describe('consentManagementGpp', function () {
               describe(t, () => {
                 it('should not update', (done) => {
                   Object.assign(gppData, {[prop]: value});
-                  gppClient.updateConsent().catch(err => {
+                  gppClient.updateConsent(gppData).catch(err => {
                     expect(err.message).to.match(/unexpected/);
                     expect(err.args).to.eql([gppData]);
                     expect(gppDataHandler.ready).to.be.false;
@@ -409,23 +257,14 @@ describe('consentManagementGpp', function () {
     });
 
     describe('init', () => {
-      beforeEach(() => {
-        gppClient.isCMPReady = function (pingData) {
-          return pingData.ready;
-        }
-        gppClient.getGPPData = function (pingData) {
-          return Promise.resolve(pingData);
-        }
-      })
-
       it('does not use initial pingData if CMP is not ready', () => {
-        gppClient.init({...gppData, ready: false});
+        gppClient.init({...gppData, signalStatus: 'not ready'});
         expect(eventListener).to.exist;
         expect(gppDataHandler.ready).to.be.false;
       });
 
       it('uses initial pingData (and resolves promise) if CMP is ready', () => {
-        return gppClient.init({...gppData, ready: true}).then(data => {
+        return gppClient.init({...gppData, signalStatus: 'ready'}).then(data => {
           expect(eventListener).to.exist;
           sinon.assert.match(data, gppData);
           sinon.assert.match(gppDataHandler.getConsentData(), gppData);
@@ -433,7 +272,7 @@ describe('consentManagementGpp', function () {
       });
 
       it('rejects promise when CMP errors out', (done) => {
-        gppClient.init({ready: false}).catch((err) => {
+        gppClient.init({signalStatus: 'not ready'}).catch((err) => {
           expect(err.message).to.match(/error/);
           expect(err.args).to.eql(['error'])
           done();
@@ -447,7 +286,7 @@ describe('consentManagementGpp', function () {
         'irrelevant': {eventName: 'irrelevant'}
       }).forEach(([t, evt]) => {
         it(`ignores ${t} events`, () => {
-          let pm = gppClient.init({ready: false}).catch((err) => err.args[0] !== 'done' && Promise.reject(err));
+          let pm = gppClient.init({signalStatus: 'not ready'}).catch((err) => err.args[0] !== 'done' && Promise.reject(err));
           eventListener(evt);
           eventListener('done', false);
           return pm;
@@ -456,7 +295,7 @@ describe('consentManagementGpp', function () {
 
       it('rejects the promise when cmpStatus is "error"', (done) => {
         const evt = {eventName: 'other', pingData: {cmpStatus: 'error'}};
-        gppClient.init({ready: false}).catch(err => {
+        gppClient.init({signalStatus: 'not ready'}).catch(err => {
           expect(err.message).to.match(/error/);
           expect(err.args).to.eql([evt]);
           done();
@@ -479,163 +318,36 @@ describe('consentManagementGpp', function () {
           });
 
           it('does not fire consent data updates if the CMP is not ready', (done) => {
-            gppClient.init({ready: false}).catch(() => {
+            gppClient.init({signalStatus: 'not ready'}).catch(() => {
               expect(gppDataHandler.ready).to.be.false;
               done();
             });
-            eventListener({...gppData2, ready: false});
+            eventListener({...gppData2, signalStatus: 'not ready'});
             eventListener('done', false);
           })
 
           it('fires consent data updates (and resolves promise) if CMP is ready', (done) => {
-            gppClient.init({ready: false}).then(data => {
+            gppClient.init({signalStatus: 'not ready'}).then(data => {
               sinon.assert.match(data, gppData2);
               done()
             });
-            cmpReady = true;
-            eventListener(makeEvent({...gppData2, ready: true}));
+            eventListener(makeEvent({...gppData2, signalStatus: 'ready'}));
           });
 
           it('keeps updating consent data on new events', () => {
-            let pm = gppClient.init({ready: false}).then(data => {
+            let pm = gppClient.init({signalStatus: 'not ready'}).then(data => {
               sinon.assert.match(data, gppData);
               sinon.assert.match(gppDataHandler.getConsentData(), gppData);
             });
-            eventListener(makeEvent({...gppData, ready: true}));
+            eventListener(makeEvent({...gppData, signalStatus: 'ready'}));
             return pm.then(() => {
-              eventListener(makeEvent({...gppData2, ready: true}))
+              eventListener(makeEvent({...gppData2, signalStatus: 'ready'}))
             }).then(() => {
               sinon.assert.match(gppDataHandler.getConsentData(), gppData2);
             });
           });
-        })
-      })
-    });
-  });
-
-  describe('GPP 1.0 protocol', () => {
-    let mockCmp, gppClient;
-    beforeEach(() => {
-      mockCmp = sinon.stub();
-      gppClient = new (GPPClient.getClient('1.0'))('1.0', mockCmp);
-    });
-
-    describe('isCMPReady', () => {
-      Object.entries({
-        'loaded': [true, 'loaded'],
-        'other': [false, 'other'],
-        'undefined': [false, undefined]
-      }).forEach(([t, [expected, cmpStatus]]) => {
-        it(`should be ${expected} when cmpStatus is ${t}`, () => {
-          expect(gppClient.isCMPReady(Object.assign({}, {cmpStatus}))).to.equal(expected);
-        });
-      });
-    });
-
-    describe('getGPPData', () => {
-      let gppData, pingData;
-      beforeEach(() => {
-        gppData = {
-          gppString: 'mock-string',
-          supportedAPIs: ['usnat'],
-          applicableSections: [7, 8]
-        }
-        pingData = {
-          supportedAPIs: gppData.supportedAPIs
-        };
-      });
-
-      function mockCmpCommands(commands) {
-        mockCmp.callsFake(({command, parameter}) => {
-          if (commands.hasOwnProperty((command))) {
-            return Promise.resolve(commands[command](parameter));
-          } else {
-            return Promise.reject(new Error(`unrecognized command ${command}`))
-          }
-        })
-      }
-
-      it('should retrieve consent string and applicableSections', () => {
-        mockCmpCommands({
-          getGPPData: () => gppData
-        })
-        return gppClient.getGPPData(pingData).then(data => {
-          sinon.assert.match(data, gppData);
-        })
-      });
-
-      it('should reject when getGPPData rejects', (done) => {
-        mockCmpCommands({
-          getGPPData: () => Promise.reject(new Error('err'))
-        });
-        gppClient.getGPPData(pingData).catch(err => {
-          expect(err.message).to.eql('err');
-          done();
         });
       });
-
-      it('should not choke if supportedAPIs is missing', () => {
-        [gppData, pingData].forEach(ob => { delete ob.supportedAPIs; })
-        mockCmpCommands({
-          getGPPData: () => gppData
-        });
-        return gppClient.getGPPData(pingData).then(res => {
-          expect(res.gppString).to.eql(gppData.gppString);
-          expect(res.parsedSections).to.eql({});
-        })
-      })
-
-      describe('section data', () => {
-        let usnat, parsedUsnat;
-
-        function mockSections(sections) {
-          mockCmpCommands({
-            getGPPData: () => gppData,
-            getSection: (api) => (sections[api])
-          });
-        };
-
-        beforeEach(() => {
-          usnat = {
-            MockField: 'val',
-            OtherField: 'o',
-            Gpc: true
-          };
-          parsedUsnat = [
-            {
-              MockField: 'val',
-              OtherField: 'o'
-            },
-            {
-              SubsectionType: 1,
-              Gpc: true
-            }
-          ]
-        });
-
-        it('retrieves section data', () => {
-          mockSections({usnat});
-          return gppClient.getGPPData(pingData).then(data => {
-            expect(data.parsedSections).to.eql({usnat: parsedUsnat})
-          });
-        });
-
-        it('does not choke if a section is missing', () => {
-          mockSections({usnat});
-          gppData.supportedAPIs = ['usnat', 'missing'];
-          return gppClient.getGPPData(pingData).then(data => {
-            expect(data.parsedSections).to.eql({usnat: parsedUsnat});
-          })
-        });
-
-        it('does not choke if a section fails', () => {
-          mockSections({usnat, err: Promise.reject(new Error('err'))});
-          gppData.supportedAPIs = ['usnat', 'err'];
-          return gppClient.getGPPData(pingData).then(data => {
-            expect(data.parsedSections).to.eql({usnat: parsedUsnat});
-          })
-        });
-      })
     });
   });
 
@@ -643,7 +355,7 @@ describe('consentManagementGpp', function () {
     let mockCmp, gppClient;
     beforeEach(() => {
       mockCmp = sinon.stub();
-      gppClient = new (GPPClient.getClient('1.1'))('1.1', mockCmp);
+      gppClient = new GPPClient(mockCmp);
     });
 
     describe('isCMPReady', () => {
@@ -657,82 +369,6 @@ describe('consentManagementGpp', function () {
         });
       });
     });
-
-    it('gets GPPData from pingData', () => {
-      mockCmp.throws(new Error());
-      const pingData = {
-        'gppVersion': '1.1',
-        'cmpStatus': 'loaded',
-        'cmpDisplayStatus': 'disabled',
-        'supportedAPIs': [
-          '5:tcfcav1',
-          '7:usnat',
-          '8:usca',
-          '9:usva',
-          '10:usco',
-          '11:usut',
-          '12:usct'
-        ],
-        'signalStatus': 'ready',
-        'cmpId': 31,
-        'sectionList': [
-          7
-        ],
-        'applicableSections': [
-          7
-        ],
-        'gppString': 'DBABL~BAAAAAAAAgA.QA',
-        'parsedSections': {
-          'usnat': [
-            {
-              'Version': 1,
-              'SharingNotice': 0,
-              'SaleOptOutNotice': 0,
-              'SharingOptOutNotice': 0,
-              'TargetedAdvertisingOptOutNotice': 0,
-              'SensitiveDataProcessingOptOutNotice': 0,
-              'SensitiveDataLimitUseNotice': 0,
-              'SaleOptOut': 0,
-              'SharingOptOut': 0,
-              'TargetedAdvertisingOptOut': 0,
-              'SensitiveDataProcessing': [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0
-              ],
-              'KnownChildSensitiveDataConsents': [
-                0,
-                0
-              ],
-              'PersonalDataConsents': 0,
-              'MspaCoveredTransaction': 2,
-              'MspaOptOutOptionMode': 0,
-              'MspaServiceProviderMode': 0
-            },
-            {
-              'SubsectionType': 1,
-              'Gpc': false
-            }
-          ]
-        }
-      };
-      return gppClient.getGPPData(pingData).then((gppData) => {
-        sinon.assert.match(gppData, {
-          gppString: pingData.gppString,
-          applicableSections: pingData.applicableSections,
-          parsedSections: pingData.parsedSections
-        })
-      })
-    })
   })
 
   describe('requestBidsHook tests:', function () {
@@ -858,56 +494,76 @@ describe('consentManagementGpp', function () {
       });
     });
 
-    describe('already known consentData:', function () {
-      let cmpStub = sinon.stub();
-
-      function mockCMP(pingData) {
-        return function (command, callback) {
+    describe('on CMP sectionChange events', () => {
+      let pingData, triggerCMPEvent;
+      beforeEach(() => {
+        pingData = {
+          applicableSections: [7],
+          gppString: 'xyz',
+        };
+        triggerCMPEvent = null;
+        window.__gpp = sinon.stub().callsFake(function (command, callback) {
           switch (command) {
             case 'addEventListener':
               // eslint-disable-next-line standard/no-callback-literal
-              callback({eventName: 'sectionChange', pingData})
+              triggerCMPEvent = (event, payload = {}) => callback({eventName: event, pingData: {...pingData, ...payload}})
               break;
             case 'ping':
               callback(pingData)
               break;
+            default:
+              throw new Error('unexpected __gpp invocation')
           }
-        }
-      }
-
-      beforeEach(function () {
-        didHookReturn = false;
-        window.__gpp = function () {};
+        });
+        setConsentConfig(goodConfig);
       });
 
-      afterEach(function () {
-        config.resetConfig();
-        cmpStub.restore();
+      afterEach(() => {
         delete window.__gpp;
         resetConsentData();
       });
 
-      it('should bypass CMP and simply use previously stored consentData', function () {
-        let testConsentData = {
-          applicableSections: [7],
-          gppString: 'xyz',
-        };
-
-        cmpStub = sinon.stub(window, '__gpp').callsFake(mockCMP({...testConsentData, signalStatus: 'ready'}));
-        setConsentConfig(goodConfig);
-        requestBidsHook(() => {}, {});
-        cmpStub.reset();
-
+      function startHook() {
+        let hookRan = false;
         requestBidsHook(() => {
-          didHookReturn = true;
+          hookRan = true;
         }, {});
-        let consent = gppDataHandler.getConsentData();
+        return () => new Promise((resolve) => setTimeout(resolve(hookRan), 5));
+      }
 
-        expect(didHookReturn).to.be.true;
-        expect(consent.gppString).to.equal(testConsentData.gppString);
-        expect(consent.applicableSections).to.deep.equal(testConsentData.applicableSections);
-        sinon.assert.notCalled(cmpStub);
+      it('should wait for signalStatus: ready', async () => {
+        const didHookRun = startHook();
+        expect(await didHookRun()).to.be.false;
+        triggerCMPEvent('sectionChange', {signalStatus: 'not ready'});
+        expect(await didHookRun()).to.be.false;
+        triggerCMPEvent('sectionChange', {signalStatus: 'ready'});
+        expect(await didHookRun()).to.be.true;
+        expect(gppDataHandler.getConsentData().gppString).to.eql('xyz');
+      });
+
+      it('should re-use GPP data once ready', async () => {
+        let didHookRun = startHook();
+        triggerCMPEvent('sectionChange', {signalStatus: 'ready'});
+        await didHookRun();
+        window.__gpp.reset();
+        didHookRun = startHook();
+        expect(await didHookRun()).to.be.true;
+        sinon.assert.notCalled(window.__gpp);
+      });
+
+      it('after signalStatus: ready, should wait again for signalStatus: ready', async () => {
+        let didHookRun = startHook();
+        triggerCMPEvent('sectionChange', {signalStatus: 'ready'});
+        await didHookRun();
+        for (let run of ['first', 'second']) {
+          triggerCMPEvent('cmpDisplayStatus', {signalStatus: 'not ready'});
+          didHookRun = startHook();
+          expect(await didHookRun()).to.be.false;
+          triggerCMPEvent('sectionChange', {signalStatus: 'ready', gppString: run});
+          expect(await didHookRun()).to.be.true;
+          expect(gppDataHandler.getConsentData().gppString).to.eql(run);
+        }
       });
-    });
+    })
   });
 });
diff --git a/test/spec/modules/consentManagementUsp_spec.js b/test/spec/modules/consentManagementUsp_spec.js
index e98486754ab..5f589ee5fe7 100644
--- a/test/spec/modules/consentManagementUsp_spec.js
+++ b/test/spec/modules/consentManagementUsp_spec.js
@@ -493,7 +493,6 @@ describe('consentManagement', function () {
         sinon.assert.notCalled(utils.logWarn);
         sinon.assert.notCalled(utils.logError);
 
-        expect(consentMeta.usp).to.equal(testConsentData.uspString);
         expect(consentMeta.generatedAt).to.be.above(1644367751709);
       });
 
@@ -522,6 +521,19 @@ describe('consentManagement', function () {
         setConsentConfig(goodConfig);
         expect(uspDataHandler.getConsentData()).to.eql('string');
       });
+
+      it('does not invoke registerDeletion if the CMP calls back with an error', () => {
+        sandbox.stub(window, '__uspapi').callsFake((cmd, _, cb) => {
+          if (cmd === 'registerDeletion') {
+            cb(null, false);
+          } else {
+            // eslint-disable-next-line standard/no-callback-literal
+            cb({uspString: 'string'}, true);
+          }
+        });
+        setConsentConfig(goodConfig);
+        sinon.assert.notCalled(adapterManager.callDataDeletionRequest);
+      })
     });
   });
 });
diff --git a/test/spec/modules/consentManagement_spec.js b/test/spec/modules/consentManagement_spec.js
index c1ed042a2c8..9131e6748e8 100644
--- a/test/spec/modules/consentManagement_spec.js
+++ b/test/spec/modules/consentManagement_spec.js
@@ -8,7 +8,7 @@ import {
   setConsentConfig,
   staticConsentData,
   userCMP
-} from 'modules/consentManagement.js';
+} from 'modules/consentManagementTcf.js';
 import {gdprDataHandler} from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
 import {config} from 'src/config.js';
@@ -284,7 +284,7 @@ describe('consentManagement', function () {
         expect(consent).to.be.null;
       });
 
-      it('should call gpdrDataHandler.setConsentData() when unknown CMP api is used', () => {
+      it('should call gdprDataHandler.setConsentData() when unknown CMP api is used', () => {
         setConsentConfig({gdpr: {cmpApi: 'invalid'}});
         let hookRan = false;
         requestBidsHook(() => { hookRan = true; }, {});
diff --git a/test/spec/modules/consumableBidAdapter_spec.js b/test/spec/modules/consumableBidAdapter_spec.js
index deeb8f7100d..073e889d172 100644
--- a/test/spec/modules/consumableBidAdapter_spec.js
+++ b/test/spec/modules/consumableBidAdapter_spec.js
@@ -66,6 +66,11 @@ const BIDDER_REQUEST_1 = {
       'http://example.com/iframe1.html',
       'http://example.com/iframe2.html'
     ]
+  },
+  ortb2: {
+    device: {
+      language: 'en'
+    }
   }
 };
 
@@ -130,6 +135,11 @@ const BIDDER_REQUEST_2 = {
       'http://example.com/iframe1.html',
       'http://example.com/iframe2.html'
     ]
+  },
+  ortb2: {
+    device: {
+      language: 'en'
+    }
   }
 };
 
@@ -177,6 +187,11 @@ const BIDDER_REQUEST_VIDEO = {
       'http://example.com/iframe1.html',
       'http://example.com/iframe2.html'
     ]
+  },
+  ortb2: {
+    device: {
+      language: 'en'
+    }
   }
 };
 
@@ -188,6 +203,11 @@ const BIDDER_REQUEST_EMPTY = {
   gdprConsent: {
     consentString: 'consent-test',
     gdprApplies: false
+  },
+  ortb2: {
+    device: {
+      language: 'en'
+    }
   }
 };
 
@@ -519,6 +539,12 @@ describe('Consumable BidAdapter', function () {
       expect(data1.placements[0].bidfloor).to.equal(0.05);
       expect(data2.placements[0].bidfloor).to.equal(0.15);
     });
+    it('should contain the language param', function () {
+      let request = spec.buildRequests(BIDDER_REQUEST_1.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+
+      expect(data.lang).to.equal('en');
+    });
   });
   describe('interpretResponse validation', function () {
     it('response should have valid bidderCode', function () {
@@ -651,21 +677,30 @@ describe('Consumable BidAdapter', function () {
       expect(opts[0].url).to.equal('https://sync.serverbid.com/ss/730181.html?gdpr=0&gdpr_consent=GDPR_CONSENT_STRING');
     })
 
-    it('should return a sync url if iframe syncs are enabled and GPP applies', function () {
+    it('should return a sync url if iframe syncs are enabled and has GPP consent with applicable sections', function () {
       let gppConsent = {
         applicableSections: [1, 2],
         gppString: 'GPP_CONSENT_STRING'
       }
-      let opts = spec.getUserSyncs(syncOptions, [AD_SERVER_RESPONSE], {}, {}, gppConsent);
+      let opts = spec.getUserSyncs(syncOptions, [AD_SERVER_RESPONSE], {}, '', gppConsent);
 
       expect(opts.length).to.equal(1);
-      expect(opts[0].url).to.equal('https://sync.serverbid.com/ss/730181.html?gpp=GPP_CONSENT_STRING&gpp_sid=1,2');
+      expect(opts[0].url).to.equal('https://sync.serverbid.com/ss/730181.html?gpp=GPP_CONSENT_STRING&gpp_sid=1%2C2');
     })
 
-    it('should return a sync url if iframe syncs are enabled and USP applies', function () {
-      let uspConsent = {
-        consentString: 'USP_CONSENT_STRING',
+    it('should return a sync url if iframe syncs are enabled and has GPP consent without applicable sections', function () {
+      let gppConsent = {
+        applicableSections: [],
+        gppString: 'GPP_CONSENT_STRING'
       }
+      let opts = spec.getUserSyncs(syncOptions, [AD_SERVER_RESPONSE], {}, '', gppConsent);
+
+      expect(opts.length).to.equal(1);
+      expect(opts[0].url).to.equal('https://sync.serverbid.com/ss/730181.html?gpp=GPP_CONSENT_STRING');
+    })
+
+    it('should return a sync url if iframe syncs are enabled and USP applies', function () {
+      let uspConsent = 'USP_CONSENT_STRING';
       let opts = spec.getUserSyncs(syncOptions, [AD_SERVER_RESPONSE], {}, uspConsent);
 
       expect(opts.length).to.equal(1);
@@ -677,9 +712,7 @@ describe('Consumable BidAdapter', function () {
         consentString: 'GDPR_CONSENT_STRING',
         gdprApplies: true,
       }
-      let uspConsent = {
-        consentString: 'USP_CONSENT_STRING',
-      }
+      let uspConsent = 'USP_CONSENT_STRING';
       let opts = spec.getUserSyncs(syncOptions, [AD_SERVER_RESPONSE], gdprConsent, uspConsent);
 
       expect(opts.length).to.equal(1);
@@ -704,50 +737,22 @@ describe('Consumable BidAdapter', function () {
       sandbox.restore();
     });
 
-    it('Request should have unifiedId config params', function() {
+    it('Request should have EIDs', function() {
       bidderRequest.bidRequest[0].userId = {};
       bidderRequest.bidRequest[0].userId.tdid = 'TTD_ID';
-      bidderRequest.bidRequest[0].userIdAsEids = createEidsArray(bidderRequest.bidRequest[0].userId);
-      let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
-      let data = JSON.parse(request.data);
-      expect(data.user.eids).to.deep.equal([{
+      bidderRequest.bidRequest[0].userIdAsEids = [{
         'source': 'adserver.org',
         'uids': [{
-          'id': 'TTD_ID',
+          'id': 'TTD_ID_FROM_USER_ID_MODULE',
           'atype': 1,
           'ext': {
             'rtiPartner': 'TDID'
           }
         }]
-      }]);
-    });
-
-    it('Request should have adsrvrOrgId from UserId Module if config and userId module both have TTD ID', function() {
-      sandbox.stub(config, 'getConfig').callsFake((key) => {
-        var config = {
-          adsrvrOrgId: {
-            'TDID': 'TTD_ID_FROM_CONFIG',
-            'TDID_LOOKUP': 'TRUE',
-            'TDID_CREATED_AT': '2022-06-21T09:47:00'
-          }
-        };
-        return config[key];
-      });
-      bidderRequest.bidRequest[0].userId = {};
-      bidderRequest.bidRequest[0].userId.tdid = 'TTD_ID';
-      bidderRequest.bidRequest[0].userIdAsEids = createEidsArray(bidderRequest.bidRequest[0].userId);
+      }];
       let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
       let data = JSON.parse(request.data);
-      expect(data.user.eids).to.deep.equal([{
-        'source': 'adserver.org',
-        'uids': [{
-          'id': 'TTD_ID',
-          'atype': 1,
-          'ext': {
-            'rtiPartner': 'TDID'
-          }
-        }]
-      }]);
+      expect(data.user.eids).to.deep.equal(bidderRequest.bidRequest[0].userIdAsEids);
     });
 
     it('Request should NOT have adsrvrOrgId params if userId is NOT object', function() {
diff --git a/test/spec/modules/contentexchangeBidAdapter_spec.js b/test/spec/modules/contentexchangeBidAdapter_spec.js
index 1b3dc4f19c9..913c9072dd5 100644
--- a/test/spec/modules/contentexchangeBidAdapter_spec.js
+++ b/test/spec/modules/contentexchangeBidAdapter_spec.js
@@ -3,9 +3,19 @@ import { spec } from '../../../modules/contentexchangeBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'contentexchange'
+const bidder = 'contentexchange';
 
 describe('ContentexchangeBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -16,9 +26,9 @@ describe('ContentexchangeBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'test',
-        adFormat: BANNER
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -31,9 +41,9 @@ describe('ContentexchangeBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'test',
-        adFormat: VIDEO
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -55,9 +65,9 @@ describe('ContentexchangeBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'test',
-        adFormat: NATIVE
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -70,15 +80,26 @@ describe('ContentexchangeBidAdapter', function () {
       }
     },
     params: {
-      adFormat: BANNER
+
     }
   }
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
     timeout: 500
   };
@@ -115,6 +136,7 @@ describe('ContentexchangeBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -132,7 +154,7 @@ describe('ContentexchangeBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -142,11 +164,62 @@ describe('ContentexchangeBidAdapter', function () {
       const { placements } = serverRequest.data;
       for (let i = 0, len = placements.length; i < len; i++) {
         const placement = placements[i];
-        expect(placement.placementId).to.be.equal('test');
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
         expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
         expect(placement.bidId).to.be.a('string');
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -172,8 +245,10 @@ describe('ContentexchangeBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -188,12 +263,38 @@ describe('ContentexchangeBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -372,6 +473,7 @@ describe('ContentexchangeBidAdapter', function () {
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
+
   describe('getUserSyncs', function() {
     it('Should return array of objects with proper sync config , include GDPR', function() {
       const syncData = spec.getUserSyncs({}, {}, {
@@ -396,5 +498,17 @@ describe('ContentexchangeBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://sync2.adnetwork.agency/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync2.adnetwork.agency/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/contxtfulBidAdapter_spec.js b/test/spec/modules/contxtfulBidAdapter_spec.js
new file mode 100644
index 00000000000..14b4b94f062
--- /dev/null
+++ b/test/spec/modules/contxtfulBidAdapter_spec.js
@@ -0,0 +1,484 @@
+import { spec } from 'modules/contxtfulBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import * as ajax from 'src/ajax.js';
+const VERSION = 'v1';
+const CUSTOMER = 'CUSTOMER';
+const BIDDER_ENDPOINT = 'prebid.receptivity.io';
+const RX_FROM_API = { ReceptivityState: 'Receptive', test_info: 'rx_from_engine' };
+
+describe('contxtful bid adapter', function () {
+  const adapter = newBidder(spec);
+  let sandbox;
+
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
+
+  describe('is a functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('valid code', function () {
+    it('should return the bidder code of contxtful', function () {
+      expect(spec.code).to.eql('contxtful');
+    });
+  });
+
+  let bidRequests =
+  [
+    {
+      bidder: 'contxtful',
+      bidId: 'bId1',
+      custom_param_1: 'value_1',
+      transactionId: 'tId1',
+      params: {
+        bcat: ['cat1', 'cat2'],
+        badv: ['adv1', 'adv2'],
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [300, 600]
+          ]
+        },
+      },
+      ortb2Imp: {
+        ext: {
+          tid: 't-id-test-1',
+          gpid: 'gpid-id-unitest-1'
+        },
+      },
+      schain: {
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'schain-seller-1.com',
+            sid: '00001',
+            hp: 1,
+          },
+        ],
+      },
+      getFloor: () => ({ currency: 'CAD', floor: 10 }),
+    }
+  ];
+
+  let expectedReceptivityData = {
+    rx: RX_FROM_API,
+    params: {
+      ev: VERSION,
+      ci: CUSTOMER,
+    },
+  };
+
+  let bidderRequest = {
+    refererInfo: {
+      ref: 'https://my-referer-custom.com',
+    },
+    ortb2: {
+      source: {
+        tid: 'auction-id',
+      },
+      property_1: 'string_val_1',
+      regs: {
+        coppa: 1,
+        ext: {
+          us_privacy: '12345'
+        }
+      },
+      user: {
+        data: [
+          {
+            name: 'contxtful',
+            ext: expectedReceptivityData
+          }
+        ],
+        ext: {
+          eids: [
+            {
+              source: 'id5-sync.com',
+              uids: [
+                {
+                  atype: 1,
+                  id: 'fake-id5id',
+                },
+              ]
+            }
+          ]
+        }
+      }
+
+    },
+    timeout: 1234,
+    uspConsent: '12345'
+  };
+
+  describe('valid configuration', function() {
+    const theories = [
+      [
+        null,
+        'contxfulBidAdapter: contxtful.version should be a non-empty string',
+        'null object for config',
+      ],
+      [
+        {},
+        'contxfulBidAdapter: contxtful.version should be a non-empty string',
+        'empty object for config',
+      ],
+      [
+        { customer: CUSTOMER },
+        'contxfulBidAdapter: contxtful.version should be a non-empty string',
+        'customer only in config',
+      ],
+      [
+        { version: VERSION },
+        'contxfulBidAdapter: contxtful.customer should be a non-empty string',
+        'version only in config',
+      ],
+      [
+        { customer: CUSTOMER, version: '' },
+        'contxfulBidAdapter: contxtful.version should be a non-empty string',
+        'empty string for version',
+      ],
+      [
+        { customer: '', version: VERSION },
+        'contxfulBidAdapter: contxtful.customer should be a non-empty string',
+        'empty string for customer',
+      ],
+      [
+        { customer: '', version: '' },
+        'contxfulBidAdapter: contxtful.version should be a non-empty string',
+        'empty string for version & customer',
+      ],
+    ];
+
+    theories.forEach(([params, expectedErrorMessage, description]) => {
+      it('detects invalid configuration and throws the expected error (' + description + ')', () => {
+        config.setConfig({
+          contxtful: params
+        });
+        expect(() => spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        })).to.throw(
+          expectedErrorMessage
+        );
+      });
+    });
+
+    it('uses a valid configuration and returns the right url', () => {
+      config.setConfig({
+        contxtful: {customer: CUSTOMER, version: VERSION}
+      });
+      const bidRequest = spec.buildRequests(bidRequests);
+      expect(bidRequest.url).to.eq('https://' + BIDDER_ENDPOINT + `/${VERSION}/prebid/${CUSTOMER}/bid`)
+    });
+
+    it('will take specific ortb2 configuration parameters and returns it in ortb2 object', () => {
+      config.setConfig({
+        contxtful: {customer: CUSTOMER, version: VERSION},
+      });
+      const bidRequest = spec.buildRequests(bidRequests, bidderRequest);
+      expect(bidRequest.data.ortb2.property_1).to.equal('string_val_1');
+    });
+  });
+
+  describe('valid bid request', function () {
+    config.setConfig({
+      contxtful: {customer: CUSTOMER, version: VERSION},
+    });
+    const bidRequest = spec.buildRequests(bidRequests, bidderRequest);
+
+    it('will return a data property containing properties ortb2, bidRequests, bidderRequest and config', () => {
+      expect(bidRequest.data).not.to.be.undefined;
+      expect(bidRequest.data.ortb2).not.to.be.undefined;
+      expect(bidRequest.data.bidRequests).not.to.be.undefined;
+      expect(bidRequest.data.bidderRequest).not.to.be.undefined;
+      expect(bidRequest.data.config).not.to.be.undefined;
+    });
+
+    it('will take custom parameters in the bid request and within the bidRequests array', () => {
+      expect(bidRequest.data.bidRequests[0].custom_param_1).to.equal('value_1')
+    });
+
+    it('will return any supply chain parameters within the bidRequests array', () => {
+      expect(bidRequest.data.bidRequests[0].schain.ver).to.equal('1.0');
+    });
+
+    it('will return floor request within the bidFloor parameter in the bidRequests array', () => {
+      expect(bidRequest.data.bidRequests[0].bidFloor.currency).to.equal('CAD');
+      expect(bidRequest.data.bidRequests[0].bidFloor.floor).to.equal(10);
+    });
+
+    it('will return the usp string in the uspConsent parameter within the bidderRequest property', () => {
+      expect(bidRequest.data.bidderRequest.uspConsent).to.equal('12345');
+    });
+
+    it('will contains impressions array on ortb2.imp object for all ad units', () => {
+      expect(bidRequest.data.ortb2.imp.length).to.equal(1);
+      expect(bidRequest.data.ortb2.imp[0].id).to.equal('bId1');
+    });
+
+    it('will contains the registration on ortb2.regs object', () => {
+      expect(bidRequest.data.ortb2.regs).not.to.be.undefined;
+      expect(bidRequest.data.ortb2.regs.coppa).to.equal(1);
+      expect(bidRequest.data.ortb2.regs.ext.us_privacy).to.equal('12345')
+    })
+
+    it('will contains the eids modules within the ortb2.user.ext.eids', () => {
+      expect(bidRequest.data.ortb2.user.ext.eids).not.to.be.undefined;
+      expect(bidRequest.data.ortb2.user.ext.eids[0].source).to.equal('id5-sync.com');
+      expect(bidRequest.data.ortb2.user.ext.eids[0].uids[0].id).to.equal('fake-id5id');
+    });
+
+    it('will contains the receptivity value within the ortb2.user.data with contxtful name', () => {
+      let obtained_receptivity_data = bidRequest.data.ortb2.user.data.filter(function(userData) {
+        return userData.name == 'contxtful';
+      });
+      expect(obtained_receptivity_data.length).to.equal(1);
+      expect(obtained_receptivity_data[0].ext).to.deep.equal(expectedReceptivityData);
+    });
+
+    it('will contains ortb2Imp of the bid request within the ortb2.imp.ext', () => {
+      let first_imp = bidRequest.data.ortb2.imp[0];
+      expect(first_imp.ext).not.to.be.undefined;
+      expect(first_imp.ext.tid).to.equal('t-id-test-1');
+      expect(first_imp.ext.gpid).to.equal('gpid-id-unitest-1');
+    });
+  });
+
+  describe('valid bid request with no floor module', () => {
+    let noFloorsBidRequests =
+    [
+      {
+        bidder: 'contxtful',
+        bidId: 'bId1',
+        transactionId: 'tId1',
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [300, 250],
+              [300, 600]
+            ]
+          },
+        },
+      },
+      {
+        bidder: 'contxtful',
+        bidId: 'bId2',
+        transactionId: 'tId2',
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [300, 250],
+              [300, 600]
+            ]
+          },
+        },
+        params: {
+          bidfloor: 54
+        }
+      },
+    ];
+
+    config.setConfig({
+      contxtful: {customer: CUSTOMER, version: VERSION},
+    });
+
+    const bidRequest = spec.buildRequests(noFloorsBidRequests, bidderRequest);
+    it('will contains default value of floor if the bid request do not contains floor function', () => {
+      expect(bidRequest.data.bidRequests[0].bidFloor.currency).to.equal('USD');
+      expect(bidRequest.data.bidRequests[0].bidFloor.floor).to.equal(0);
+    });
+
+    it('will take the param.bidfloor as floor value if possible', () => {
+      expect(bidRequest.data.bidRequests[1].bidFloor.currency).to.equal('USD');
+      expect(bidRequest.data.bidRequests[1].bidFloor.floor).to.equal(54);
+    });
+  });
+
+  describe('valid bid response', () => {
+    const bidResponse = [
+      {
+        'requestId': 'arequestId',
+        'originalCpm': 1.5,
+        'cpm': 1.35,
+        'currency': 'CAD',
+        'width': 300,
+        'height': 600,
+        'creativeId': 'creativeid',
+        'netRevenue': true,
+        'ttl': 300,
+        'ad': '',
+        'mediaType': 'banner',
+        'syncs': [
+          {
+            'url': 'mysyncurl.com?qparam1=qparamv1&qparam2=qparamv2'
+          }
+        ]
+      }
+    ];
+    config.setConfig({
+      contxtful: {customer: CUSTOMER, version: VERSION},
+    });
+
+    const bidRequest = spec.buildRequests(bidRequests, bidderRequest);
+
+    it('will interpret response correcly', () => {
+      const bids = spec.interpretResponse({ body: bidResponse }, bidRequest);
+      expect(bids).not.to.be.undefined;
+      expect(bids).to.have.lengthOf(1);
+      expect(bids).to.deep.equal(bidResponse);
+    });
+
+    it('will return empty response if bid response is empty', () => {
+      const bids = spec.interpretResponse({ body: [] }, bidRequest);
+      expect(bids).to.have.lengthOf(0);
+    })
+
+    it('will trigger user sync if enable pixel mode', () => {
+      const syncOptions = {
+        pixelEnabled: true
+      };
+
+      const userSyncs = spec.getUserSyncs(syncOptions, [{ body: bidResponse }]);
+      expect(userSyncs).to.deep.equal([
+        {
+          'url': 'mysyncurl.com/image?pbjs=1&coppa=0&qparam1=qparamv1&qparam2=qparamv2',
+          'type': 'image'
+        }
+      ]);
+    });
+
+    it('will trigger user sync if enable iframe mode', () => {
+      const syncOptions = {
+        iframeEnabled: true
+      };
+
+      const userSyncs = spec.getUserSyncs(syncOptions, [{ body: bidResponse }]);
+      expect(userSyncs).to.deep.equal([
+        {
+          'url': 'mysyncurl.com/iframe?pbjs=1&coppa=0&qparam1=qparamv1&qparam2=qparamv2',
+          'type': 'iframe'
+        }
+      ]);
+    });
+
+    describe('no sync option', () => {
+      it('will return image sync if no sync options', () => {
+        const userSyncs = spec.getUserSyncs({}, [{ body: bidResponse }]);
+        expect(userSyncs).to.deep.equal([
+          {
+            'url': 'mysyncurl.com/image?pbjs=1&coppa=0&qparam1=qparamv1&qparam2=qparamv2',
+            'type': 'image'
+          }
+        ]);
+      });
+      it('will return empty value if no server response', () => {
+        const userSyncs = spec.getUserSyncs({}, []);
+        expect(userSyncs).to.have.lengthOf(0);
+        const userSyncs2 = spec.getUserSyncs({}, null);
+        expect(userSyncs2).to.have.lengthOf(0);
+      });
+    });
+
+    it('will return empty value if no server response', () => {
+      const syncOptions = {
+        iframeEnabled: true
+      };
+
+      const userSyncs = spec.getUserSyncs(syncOptions, []);
+      expect(userSyncs).to.have.lengthOf(0);
+      const userSyncs2 = spec.getUserSyncs(syncOptions, null);
+      expect(userSyncs2).to.have.lengthOf(0);
+    });
+
+    describe('onTimeout callback', () => {
+      it('will always call server with sendBeacon available', () => {
+        config.setConfig({
+          contxtful: {customer: CUSTOMER, version: VERSION},
+        });
+
+        const beaconStub = sandbox.stub(ajax, 'sendBeacon').returns(true);
+        const ajaxStub = sandbox.stub(ajax, 'ajax');
+        expect(spec.onTimeout({'customData': 'customvalue'})).to.not.throw;
+        expect(beaconStub.called).to.be.true;
+        expect(ajaxStub.called).to.be.false;
+      });
+
+      it('will always call server with sendBeacon not available', () => {
+        config.setConfig({
+          contxtful: {customer: CUSTOMER, version: VERSION},
+        });
+
+        const ajaxStub = sandbox.stub(ajax, 'ajax');
+        const beaconStub = sandbox.stub(ajax, 'sendBeacon').returns(false);
+        expect(spec.onTimeout({'customData': 'customvalue'})).to.not.throw;
+        expect(beaconStub.called).to.be.true;
+        expect(beaconStub.returned(false)).to.be.true;
+        expect(ajaxStub.calledOnce).to.be.true;
+      });
+    });
+
+    describe('on onBidderError callback', () => {
+      it('will always call server', () => {
+        config.setConfig({
+          contxtful: {customer: CUSTOMER, version: VERSION},
+        });
+
+        const ajaxStub = sandbox.stub(ajax, 'ajax');
+        const beaconStub = sandbox.stub(ajax, 'sendBeacon').returns(false);
+        spec.onBidderError({'customData': 'customvalue'});
+        expect(ajaxStub.calledOnce).to.be.true;
+        expect(beaconStub.returned(false)).to.be.true;
+      });
+    });
+
+    describe('on onBidWon callback', () => {
+      it('will always call server', () => {
+        config.setConfig({
+          contxtful: {customer: CUSTOMER, version: VERSION},
+        });
+
+        const ajaxStub = sandbox.stub(ajax, 'ajax');
+        const beaconStub = sandbox.stub(ajax, 'sendBeacon').returns(false);
+        spec.onBidWon({'customData': 'customvalue'});
+        expect(ajaxStub.calledOnce).to.be.true;
+        expect(beaconStub.returned(false)).to.be.true;
+      });
+    });
+
+    describe('on onBidBillable callback', () => {
+      it('will always call server when sampling rate is configured to be 1.0', () => {
+        config.setConfig({
+          contxtful: {customer: CUSTOMER, version: VERSION, sampling: {onBidBillable: 1.0}},
+        });
+        const ajaxStub = sandbox.stub(ajax, 'ajax');
+        const beaconStub = sandbox.stub(ajax, 'sendBeacon').returns(false);
+        spec.onBidBillable({'customData': 'customvalue'});
+        expect(ajaxStub.calledOnce).to.be.true;
+        expect(beaconStub.returned(false)).to.be.true;
+      });
+    });
+
+    describe('on onAdRenderSucceeded callback', () => {
+      it('will always call server when sampling rate is configured to be 1.0', () => {
+        config.setConfig({
+          contxtful: {customer: CUSTOMER, version: VERSION, sampling: {onAdRenderSucceeded: 1.0}},
+        });
+        const ajaxStub = sandbox.stub(ajax, 'ajax');
+        const beaconStub = sandbox.stub(ajax, 'sendBeacon').returns(false);
+        spec.onAdRenderSucceeded({'customData': 'customvalue'});
+        expect(ajaxStub.calledOnce).to.be.true;
+        expect(beaconStub.returned(false)).to.be.true;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/contxtfulRtdProvider_spec.js b/test/spec/modules/contxtfulRtdProvider_spec.js
new file mode 100644
index 00000000000..e31ef554da0
--- /dev/null
+++ b/test/spec/modules/contxtfulRtdProvider_spec.js
@@ -0,0 +1,656 @@
+import { contxtfulSubmodule, extractParameters } from '../../../modules/contxtfulRtdProvider.js';
+import { expect } from 'chai';
+import { loadExternalScriptStub } from 'test/mocks/adloaderStub.js';
+import { getStorageManager } from '../../../src/storageManager.js';
+import { MODULE_TYPE_UID } from '../../../src/activities/modules.js';
+import * as events from '../../../src/events';
+import Sinon from 'sinon';
+
+const MODULE_NAME = 'contxtful';
+
+const VERSION = 'v1';
+const CUSTOMER = 'CUSTOMER';
+const CONTXTFUL_CONNECTOR_ENDPOINT = `https://api.receptivity.io/${VERSION}/prebid/${CUSTOMER}/connector/rxConnector.js`;
+
+const RX_FROM_SESSION_STORAGE = { ReceptivityState: 'Receptive', test_info: 'rx_from_session_storage' };
+const RX_FROM_API = { ReceptivityState: 'Receptive', test_info: 'rx_from_engine' };
+
+const RX_API_MOCK = { receptivity: sinon.stub(), receptivityBatched: sinon.stub() };
+const RX_CONNECTOR_MOCK = {
+  fetchConfig: sinon.stub(),
+  rxApiBuilder: sinon.stub(),
+};
+
+const TIMEOUT = 10;
+const RX_CONNECTOR_IS_READY_EVENT = new CustomEvent('rxConnectorIsReady', { detail: {[CUSTOMER]: RX_CONNECTOR_MOCK}, bubbles: true });
+
+function buildInitConfig(version, customer) {
+  return {
+    name: 'contxtful',
+    params: {
+      version: version,
+      customer: customer,
+      hostname: 'api.receptivity.io',
+      bidders: ['mock-bidder-code'],
+      adServerTargeting: true,
+    },
+  };
+}
+
+describe('contxtfulRtdProvider', function () {
+  let sandbox = sinon.sandbox.create();
+  let loadExternalScriptTag;
+  let eventsEmitSpy;
+
+  const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME });
+
+  beforeEach(() => {
+    loadExternalScriptTag = document.createElement('script');
+    loadExternalScriptStub.callsFake((_url, _moduleName) => loadExternalScriptTag);
+
+    RX_API_MOCK.receptivity.reset();
+    RX_API_MOCK.receptivity.callsFake(() => RX_FROM_API);
+
+    RX_API_MOCK.receptivityBatched.reset();
+    RX_API_MOCK.receptivityBatched.callsFake((bidders) => bidders.reduce((accumulator, bidder) => { accumulator[bidder] = RX_FROM_API; return accumulator; }, {}));
+
+    RX_CONNECTOR_MOCK.fetchConfig.reset();
+    RX_CONNECTOR_MOCK.fetchConfig.callsFake((tagId) => new Promise((resolve, reject) => resolve({ tag_id: tagId })));
+
+    RX_CONNECTOR_MOCK.rxApiBuilder.reset();
+    RX_CONNECTOR_MOCK.rxApiBuilder.callsFake((_config) => new Promise((resolve, reject) => resolve(RX_API_MOCK)));
+
+    eventsEmitSpy = sandbox.spy(events, ['emit']);
+
+    let tagId = CUSTOMER;
+    sessionStorage.clear();
+  });
+
+  afterEach(function () {
+    delete window.Contxtful;
+    sandbox.restore();
+  });
+
+  describe('extractParameters', () => {
+    const {
+      params: { customer, version },
+    } = buildInitConfig(VERSION, CUSTOMER);
+    const theories = [
+      [
+        null,
+        'params.version should be a non-empty string',
+        'null object for config',
+      ],
+      [
+        {},
+        'params.version should be a non-empty string',
+        'empty object for config',
+      ],
+      [
+        { customer },
+        'params.version should be a non-empty string',
+        'customer only in config',
+      ],
+      [
+        { version },
+        'params.customer should be a non-empty string',
+        'version only in config',
+      ],
+      [
+        { customer, version: '' },
+        'params.version should be a non-empty string',
+        'empty string for version',
+      ],
+      [
+        { customer: '', version },
+        'params.customer should be a non-empty string',
+        'empty string for customer',
+      ],
+      [
+        { customer: '', version: '' },
+        'params.version should be a non-empty string',
+        'empty string for version & customer',
+      ],
+    ];
+
+    theories.forEach(([params, expectedErrorMessage, _description]) => {
+      const config = { name: 'contxtful', params };
+      it('detects invalid configuration and throws the expected error', () => {
+        expect(() => extractParameters(config)).to.throw(
+          expectedErrorMessage
+        );
+      });
+    });
+  });
+
+  describe('extractParameters', function () {
+    it('detects invalid configuration and returns false', () => {
+      expect(contxtfulSubmodule.init({})).to.be.false;
+    });
+  });
+
+  describe('init', function () {
+    it('uses a valid configuration and returns true when initializing', () => {
+      const config = buildInitConfig(VERSION, CUSTOMER);
+      expect(contxtfulSubmodule.init(config)).to.be.true;
+    });
+
+    it('loads a RX connector script asynchronously', (done) => {
+      contxtfulSubmodule.init(buildInitConfig(VERSION, CUSTOMER));
+
+      setTimeout(() => {
+        expect(loadExternalScriptStub.calledOnce).to.be.true;
+        expect(loadExternalScriptStub.args[0][0]).to.equal(
+          CONTXTFUL_CONNECTOR_ENDPOINT
+        );
+
+        done();
+      }, TIMEOUT);
+    });
+  });
+
+  describe('init', function () {
+    it('returns true when initializing', () => {
+      loadExternalScriptStub.callsFake((url, moduleCode, callback, doc, attributes) => {
+        return { addEventListener: (type, listener) => { } };
+      });
+      const config = buildInitConfig(VERSION, CUSTOMER);
+      expect(contxtfulSubmodule.init(config)).to.be.true;
+    });
+  });
+
+  describe('init', function () {
+    it('uses the RX API to get receptivity', (done) => {
+      let config = buildInitConfig(VERSION, CUSTOMER);
+      contxtfulSubmodule.init(config);
+      window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+      setTimeout(() => {
+        contxtfulSubmodule.getTargetingData(['ad-slot'], config);
+        expect(RX_API_MOCK.receptivity.callCount, 'receptivity 42').to.be.equal(1);
+        expect(RX_API_MOCK.receptivity.firstCall.returnValue, 'receptivity').to.be.equal(RX_FROM_API);
+        done();
+      }, TIMEOUT);
+    });
+  });
+
+  describe('init', function () {
+    it('gets the RX API returned by an external script', (done) => {
+      let config = buildInitConfig(VERSION, CUSTOMER);
+      contxtfulSubmodule.init(config);
+      window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+      setTimeout(() => {
+        contxtfulSubmodule.getTargetingData(['ad-slot'], config);
+        expect(RX_CONNECTOR_MOCK.fetchConfig.callCount, 'fetchConfig').at.least(1);
+        expect(RX_CONNECTOR_MOCK.rxApiBuilder.callCount, 'rxApiBuilder').at.least(1);
+        done();
+      }, TIMEOUT);
+    });
+  });
+
+  describe('init', function () {
+    it('detect that initial receptivity is not dispatched and it does not initialize receptivity value', (done) => {
+      let config = buildInitConfig(VERSION, CUSTOMER);
+      contxtfulSubmodule.init(config);
+
+      setTimeout(() => {
+        let targetingData = contxtfulSubmodule.getTargetingData(['ad-slot'], config);
+        expect(targetingData).to.deep.equal({});
+        done();
+      }, TIMEOUT);
+    });
+  });
+
+  describe('init', function () {
+    const theories = [
+      [new Event('initialReceptivity'), 'event without details'],
+      [new CustomEvent('initialReceptivity', {}), 'custom event without details'],
+      [new CustomEvent('initialReceptivity', { detail: {} }), 'custom event with invalid details'],
+      [new CustomEvent('initialReceptivity', { detail: { ReceptivityState: '' } }), 'custom event with details without ReceptivityState'],
+    ];
+
+    theories.forEach(([initialReceptivityEvent, _description]) => {
+      it('figures out that initial receptivity is invalid and it does not initialize receptivity value', (done) => {
+        let config = buildInitConfig(VERSION, CUSTOMER);
+        contxtfulSubmodule.init(config);
+        loadExternalScriptTag.dispatchEvent(initialReceptivityEvent);
+
+        setTimeout(() => {
+          let targetingData = contxtfulSubmodule.getTargetingData(['ad-slot'], config);
+          expect(targetingData).to.deep.equal({});
+          done();
+        }, TIMEOUT);
+      });
+    })
+  });
+
+  describe('getTargetingData', function () {
+    const theories = [
+      [undefined, {}, 'undefined ad-slots'],
+      [[], {}, 'empty ad-slots'],
+      [
+        ['ad-slot'],
+        { 'ad-slot': RX_FROM_API },
+        'single ad-slot',
+      ],
+      [
+        ['ad-slot-1', 'ad-slot-2'],
+        {
+          'ad-slot-1': RX_FROM_API,
+          'ad-slot-2': RX_FROM_API,
+        },
+        'many ad-slots',
+      ],
+    ];
+
+    theories.forEach(([adUnits, expected, description]) => {
+      it('adds receptivity to the ad units using the RX API', function (done) {
+        let config = buildInitConfig(VERSION, CUSTOMER);
+        contxtfulSubmodule.init(config);
+        window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+        setTimeout(() => {
+          let targetingData = contxtfulSubmodule.getTargetingData(adUnits, config);
+          expect(targetingData, description).to.deep.equal(expected, description);
+          done();
+        }, TIMEOUT);
+      });
+    });
+  });
+
+  describe('getTargetingData', function () {
+    const theories = [
+      [undefined, {}, 'undefined ad-slots'],
+      [[], {}, 'empty ad-slots'],
+      [
+        ['ad-slot'],
+        {},
+        'single ad-slot',
+      ],
+      [
+        ['ad-slot-1', 'ad-slot-2'],
+        {
+        },
+        'many ad-slots',
+      ],
+    ];
+
+    theories.forEach(([adUnits, expected, description]) => {
+      it('honours "adServerTargeting" and the RX API is not called', function (done) {
+        let config = buildInitConfig(VERSION, CUSTOMER);
+        config.params.adServerTargeting = false;
+        contxtfulSubmodule.init(config);
+        window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+        setTimeout(() => {
+          let _ = contxtfulSubmodule.getTargetingData(adUnits, config);
+          expect(RX_API_MOCK.receptivity.callCount).to.be.equal(0);
+          done();
+        }, TIMEOUT);
+      });
+
+      it('honours adServerTargeting and it does not add receptivity to the ad units', function (done) {
+        let config = buildInitConfig(VERSION, CUSTOMER);
+        config.params.adServerTargeting = false;
+        contxtfulSubmodule.init(config);
+        window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+        setTimeout(() => {
+          let targetingData = contxtfulSubmodule.getTargetingData(adUnits, config);
+          expect(targetingData, description).to.deep.equal(expected);
+          done();
+        }, TIMEOUT);
+      });
+    });
+  });
+
+  describe('getTargetingData', function () {
+    const theories = [
+      [undefined, {}, 'undefined ad-slots'],
+      [[], {}, 'empty ad-slots'],
+      [
+        ['ad-slot'],
+        { 'ad-slot': RX_FROM_SESSION_STORAGE },
+        'single ad-slot',
+      ],
+      [
+        ['ad-slot-1', 'ad-slot-2'],
+        {
+          'ad-slot-1': RX_FROM_SESSION_STORAGE,
+          'ad-slot-2': RX_FROM_SESSION_STORAGE,
+        },
+        'many ad-slots',
+      ],
+    ];
+
+    theories.forEach(([adUnits, expected, _description]) => {
+      it('uses non-expired info from session storage and adds receptivity to the ad units using session storage', function (done) {
+        // Simulate that there was a write to sessionStorage in the past.
+        storage.setDataInSessionStorage(CUSTOMER, JSON.stringify({exp: new Date().getTime() + 1000, rx: RX_FROM_SESSION_STORAGE}))
+
+        let config = buildInitConfig(VERSION, CUSTOMER);
+        contxtfulSubmodule.init(config);
+
+        let targetingData = contxtfulSubmodule.getTargetingData(adUnits, config);
+        expect(targetingData).to.deep.equal(expected);
+
+        done();
+      });
+    });
+  });
+
+  describe('getTargetingData', function () {
+    const theories = [
+      [undefined, {}, 'undefined ad-slots'],
+      [[], {}, 'empty ad-slots'],
+      [
+        ['ad-slot'],
+        {},
+        'single ad-slot',
+      ],
+      [
+        ['ad-slot-1', 'ad-slot-2'],
+        {
+        },
+        'many ad-slots',
+      ],
+    ];
+
+    theories.forEach(([adUnits, expected, _description]) => {
+      it('ignores expired info from session storage and does not forward the info to ad units', function (done) {
+        // Simulate that there was a write to sessionStorage in the past.
+        storage.setDataInSessionStorage(CUSTOMER, JSON.stringify({exp: new Date().getTime() - 100, rx: RX_FROM_SESSION_STORAGE}));
+
+        let config = buildInitConfig(VERSION, CUSTOMER);
+        contxtfulSubmodule.init(config);
+
+        let targetingData = contxtfulSubmodule.getTargetingData(adUnits, config);
+        expect(targetingData).to.deep.equal(expected);
+
+        done();
+      });
+    });
+  });
+
+  describe('getBidRequestData', function () {
+    it('calls once the onDone callback', function (done) {
+      contxtfulSubmodule.init(buildInitConfig(VERSION, CUSTOMER));
+      window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+      let reqBidsConfigObj = {
+        ortb2Fragments: {
+          global: {},
+          bidder: {},
+        },
+      };
+
+      setTimeout(() => {
+        const onDoneSpy = sinon.spy();
+        contxtfulSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, buildInitConfig(VERSION, CUSTOMER));
+        expect(onDoneSpy.calledOnce).to.be.true;
+        done();
+      }, TIMEOUT);
+    });
+  });
+
+  describe('getBidRequestData', function () {
+    it('does not write receptivity to the global OpenRTB 2 fragment', function (done) {
+      let config = buildInitConfig(VERSION, CUSTOMER);
+      contxtfulSubmodule.init(config);
+      window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+      let reqBidsConfigObj = {
+        ortb2Fragments: {
+          global: {},
+          bidder: {},
+        },
+      };
+
+      setTimeout(() => {
+        const onDone = () => 42;
+        contxtfulSubmodule.getBidRequestData(reqBidsConfigObj, onDone, config);
+        expect(reqBidsConfigObj.ortb2Fragments.global).to.deep.equal({});
+        done();
+      }, TIMEOUT);
+    });
+  });
+
+  describe('getBidRequestData', function () {
+    it('writes receptivity to the configured bidder OpenRTB 2 fragments', function (done) {
+      let config = buildInitConfig(VERSION, CUSTOMER);
+      contxtfulSubmodule.init(config);
+      window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+      let reqBidsConfigObj = {
+        ortb2Fragments: {
+          global: {},
+          bidder: {},
+        },
+      };
+
+      let expectedData = {
+        name: 'contxtful',
+        ext: {
+          rx: RX_FROM_API,
+          params: {
+            ev: config.params?.version,
+            ci: config.params?.customer,
+          },
+        },
+      };
+
+      setTimeout(() => {
+        const onDoneSpy = sinon.spy();
+        contxtfulSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, config);
+
+        let data = reqBidsConfigObj.ortb2Fragments.bidder[config.params.bidders[0]].user.data[0];
+
+        expect(data.name).to.deep.equal(expectedData.name);
+        expect(data.ext.rx).to.deep.equal(expectedData.ext.rx);
+        expect(data.ext.params).to.deep.equal(expectedData.ext.params);
+        done();
+      }, TIMEOUT);
+    });
+  });
+
+  describe('getBidRequestData', function () {
+    it('uses non-expired info from session storage and adds receptivity to the reqBidsConfigObj', function (done) {
+      let config = buildInitConfig(VERSION, CUSTOMER);
+
+      // Simulate that there was a write to sessionStorage in the past.
+      let bidder = config.params.bidders[0];
+
+      storage.setDataInSessionStorage(`${config.params.customer}_${bidder}`, JSON.stringify({exp: new Date().getTime() + 1000, rx: RX_FROM_SESSION_STORAGE}));
+
+      let reqBidsConfigObj = {
+        ortb2Fragments: {
+          global: {},
+          bidder: {},
+        },
+      };
+
+      contxtfulSubmodule.init(config);
+
+      // Since the RX_CONNECTOR_IS_READY_EVENT event was not dispatched, the RX engine is not loaded.
+      contxtfulSubmodule.getBidRequestData(reqBidsConfigObj, () => {}, config);
+
+      setTimeout(() => {
+        let ortb2BidderFragment = reqBidsConfigObj.ortb2Fragments.bidder[bidder];
+        let userData = ortb2BidderFragment.user.data;
+        let contxtfulData = userData[0];
+
+        expect(contxtfulData.name).to.be.equal('contxtful');
+        expect(contxtfulData.ext.rx).to.deep.equal(RX_FROM_SESSION_STORAGE);
+        expect(contxtfulData.ext.params).to.deep.equal({
+          ev: config.params.version,
+          ci: config.params.customer,
+        });
+
+        done();
+      }, TIMEOUT);
+    });
+  });
+
+  describe('getBidRequestData', function () {
+    it('uses the RX API', function (done) {
+      let config = buildInitConfig(VERSION, CUSTOMER);
+      contxtfulSubmodule.init(config);
+      window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+      let reqBidsConfigObj = {
+        ortb2Fragments: {
+          global: {},
+          bidder: {},
+        },
+      };
+
+      setTimeout(() => {
+        expect(RX_CONNECTOR_MOCK.fetchConfig.callCount).at.least(1);
+        expect(RX_CONNECTOR_MOCK.rxApiBuilder.callCount).at.least(1);
+        const onDoneSpy = sinon.spy();
+        contxtfulSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, config);
+        expect(onDoneSpy.callCount).to.equal(1);
+        expect(RX_API_MOCK.receptivityBatched.callCount).to.equal(1);
+        done();
+      }, TIMEOUT);
+    });
+  });
+
+  describe('getBidRequestData', function () {
+    it('adds receptivity to the reqBidsConfigObj', function (done) {
+      let config = buildInitConfig(VERSION, CUSTOMER);
+      contxtfulSubmodule.init(config);
+      window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+      let reqBidsConfigObj = {
+        ortb2Fragments: {
+          global: {},
+          bidder: {},
+        },
+      };
+
+      let expectedData = {
+        name: 'contxtful',
+        ext: {
+          rx: RX_FROM_API,
+          params: {
+            ev: config.params?.version,
+            ci: config.params?.customer,
+          },
+        },
+      };
+
+      setTimeout(() => {
+        const onDoneSpy = sinon.spy();
+        contxtfulSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, config);
+
+        let data = reqBidsConfigObj.ortb2Fragments.bidder[config.params.bidders[0]].user.data[0];
+
+        expect(data.name).to.deep.equal(expectedData.name);
+        expect(data.ext.rx).to.deep.equal(expectedData.ext.rx);
+        expect(data.ext.params).to.deep.equal(expectedData.ext.params);
+        done();
+      }, TIMEOUT);
+    });
+
+    describe('before rxApi is loaded', function () {
+      const moveEventTheories = [
+        [
+          new PointerEvent('pointermove', { clientX: 1, clientY: 2 }),
+          { x: 1, y: 2 },
+          'pointer move',
+        ]
+      ];
+
+      moveEventTheories.forEach(([event, expected, _description]) => {
+        it('adds move event', function (done) {
+          let config = buildInitConfig(VERSION, CUSTOMER);
+          contxtfulSubmodule.init(config);
+
+          window.dispatchEvent(event);
+
+          let reqBidsConfigObj = {
+            ortb2Fragments: {
+              global: {},
+              bidder: {},
+            },
+          };
+
+          setTimeout(() => {
+            const onDoneSpy = sinon.spy();
+            contxtfulSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, config);
+
+            let ext = reqBidsConfigObj.ortb2Fragments.bidder[config.params.bidders[0]].user.data[0].ext;
+
+            let events = JSON.parse(atob(ext.events));
+
+            expect(events.ui.position.x).to.be.deep.equal(expected.x);
+            expect(events.ui.position.y).to.be.deep.equal(expected.y);
+            expect(Sinon.match.number.test(events.ui.position.timestampMs)).to.be.true;
+            done();
+          }, TIMEOUT);
+        });
+      });
+
+      it('adds screen event', function (done) {
+        let config = buildInitConfig(VERSION, CUSTOMER);
+        contxtfulSubmodule.init(config);
+
+        // Cannot change the window size from JS
+        // So we take the current size as expectation
+        const width = window.innerWidth;
+        const height = window.innerHeight;
+
+        let reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+        };
+
+        setTimeout(() => {
+          const onDoneSpy = sinon.spy();
+          contxtfulSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, config);
+
+          let ext = reqBidsConfigObj.ortb2Fragments.bidder[config.params.bidders[0]].user.data[0].ext;
+
+          let events = JSON.parse(atob(ext.events));
+
+          expect(events.ui.screen.topLeft).to.be.deep.equal({ x: 0, y: 0 }, 'screen top left');
+          expect(events.ui.screen.width).to.be.deep.equal(width, 'screen width');
+          expect(events.ui.screen.height).to.be.deep.equal(height, 'screen height');
+          expect(Sinon.match.number.test(events.ui.screen.timestampMs), 'screen timestamp').to.be.true;
+          done();
+        }, TIMEOUT);
+      });
+    })
+  });
+
+  describe('after rxApi is loaded', function () {
+    it('does not add event', function (done) {
+      let config = buildInitConfig(VERSION, CUSTOMER);
+      contxtfulSubmodule.init(config);
+      window.dispatchEvent(RX_CONNECTOR_IS_READY_EVENT);
+
+      let reqBidsConfigObj = {
+        ortb2Fragments: {
+          global: {},
+          bidder: {},
+        },
+      };
+
+      setTimeout(() => {
+        const onDoneSpy = sinon.spy();
+        contxtfulSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, config);
+
+        let ext = reqBidsConfigObj.ortb2Fragments.bidder[config.params.bidders[0]].user.data[0].ext;
+
+        let events = ext.events;
+
+        expect(events).to.be.undefined;
+        done();
+      }, TIMEOUT);
+    });
+  })
+});
diff --git a/test/spec/modules/conversantAnalyticsAdapter_spec.js b/test/spec/modules/conversantAnalyticsAdapter_spec.js
index f425535ce73..f46de31b19c 100644
--- a/test/spec/modules/conversantAnalyticsAdapter_spec.js
+++ b/test/spec/modules/conversantAnalyticsAdapter_spec.js
@@ -1,20 +1,20 @@
 import sinon from 'sinon';
-import {expect} from 'chai';
-import {default as conversantAnalytics, CNVR_CONSTANTS, cnvrHelper} from 'modules/conversantAnalyticsAdapter';
+import { expect } from 'chai';
+import { default as conversantAnalytics, CNVR_CONSTANTS, cnvrHelper } from 'modules/conversantAnalyticsAdapter';
 import * as utils from 'src/utils.js';
 import * as prebidGlobal from 'src/prebidGlobal';
-import {server} from '../../mocks/xhr.js';
+import { server } from '../../mocks/xhr.js';
 
-import constants from 'src/constants.json'
+import {EVENTS} from 'src/constants.js'
 
-let events = require('src/events');
+const events = require('src/events');
 
 describe('Conversant analytics adapter tests', function() {
   let sandbox; // sinon sandbox to make restoring all stubbed objects easier
   let clock; // clock stub from sinon to mock our cache cleanup interval
   let logInfoStub;
 
-  const PREBID_VERSION = '1.2';
+  const PREBID_VERSION = '$prebid.version$';
   const SITE_ID = 108060;
 
   let requests;
@@ -39,7 +39,7 @@ describe('Conversant analytics adapter tests', function() {
     requests = server.requests;
     sandbox = sinon.sandbox.create();
     sandbox.stub(events, 'getEvents').returns([]); // need to stub this otherwise unwanted events seem to get fired during testing
-    let getGlobalStub = {
+    const getGlobalStub = {
       version: PREBID_VERSION,
       getUserIds: function() { // userIdTargeting.js init() gets called on AUCTION_END so we need to mock this function.
         return {};
@@ -98,7 +98,7 @@ describe('Conversant analytics adapter tests', function() {
     it('should NOT sample when sampling set to 0', function() {
       sandbox.stub(utils, 'logError');
       const NEVER_SAMPLE_CONFIG = utils.deepClone(VALID_ALWAYS_SAMPLE_CONFIG);
-      NEVER_SAMPLE_CONFIG['options'].cnvr_sampling = 0;
+      NEVER_SAMPLE_CONFIG.options.cnvr_sampling = 0;
       conversantAnalytics.disableAnalytics();
       conversantAnalytics.enableAnalytics(NEVER_SAMPLE_CONFIG);
       expect(utils.logError.called).to.equal(false);
@@ -110,17 +110,17 @@ describe('Conversant analytics adapter tests', function() {
     it('should cleanup up cache objects', function() {
       conversantAnalytics.enableAnalytics(VALID_CONFIGURATION);
 
-      cnvrHelper.adIdLookup['keep'] = {timeReceived: DATESTAMP + 1};
-      cnvrHelper.adIdLookup['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE};
+      cnvrHelper.adIdLookup.keep = { timeReceived: DATESTAMP + 1 };
+      cnvrHelper.adIdLookup.delete = { timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE };
 
-      cnvrHelper.timeoutCache['keep'] = {timeReceived: DATESTAMP + 1};
-      cnvrHelper.timeoutCache['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE};
+      cnvrHelper.timeoutCache.keep = { timeReceived: DATESTAMP + 1 };
+      cnvrHelper.timeoutCache.delete = { timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE };
 
-      cnvrHelper.auctionIdTimestampCache['keep'] = {timeReceived: DATESTAMP + 1};
-      cnvrHelper.auctionIdTimestampCache['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE};
+      cnvrHelper.auctionIdTimestampCache.keep = { timeReceived: DATESTAMP + 1 };
+      cnvrHelper.auctionIdTimestampCache.delete = { timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE };
 
-      cnvrHelper.bidderErrorCache['keep'] = {timeReceived: DATESTAMP + 1, errors: []};
-      cnvrHelper.bidderErrorCache['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE, errors: []};
+      cnvrHelper.bidderErrorCache.keep = { timeReceived: DATESTAMP + 1, errors: [] };
+      cnvrHelper.bidderErrorCache.delete = { timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE, errors: [] };
 
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(2);
       expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(2);
@@ -145,12 +145,12 @@ describe('Conversant analytics adapter tests', function() {
     it('createBid() should return correct object', function() {
       const EVENT_CODE = 1;
       const TIME = 2;
-      let bid = cnvrHelper.createBid(EVENT_CODE, 2);
-      expect(bid).to.deep.equal({'eventCodes': [EVENT_CODE], 'timeToRespond': TIME});
+      const bid = cnvrHelper.createBid(EVENT_CODE, 2);
+      expect(bid).to.deep.equal({ eventCodes: [EVENT_CODE], timeToRespond: TIME });
     });
 
     it('createAdUnit() should return correct object', function() {
-      let adUnit = cnvrHelper.createAdUnit();
+      const adUnit = cnvrHelper.createAdUnit();
       expect(adUnit).to.deep.equal({
         sizes: [],
         mediaTypes: [],
@@ -160,13 +160,13 @@ describe('Conversant analytics adapter tests', function() {
 
     it('createAdSize() should return correct object', function() {
       let adSize = cnvrHelper.createAdSize(1, 2);
-      expect(adSize).to.deep.equal({w: 1, h: 2});
+      expect(adSize).to.deep.equal({ w: 1, h: 2 });
 
       adSize = cnvrHelper.createAdSize();
-      expect(adSize).to.deep.equal({w: -1, h: -1});
+      expect(adSize).to.deep.equal({ w: -1, h: -1 });
 
       adSize = cnvrHelper.createAdSize('foo', 'bar');
-      expect(adSize).to.deep.equal({w: -1, h: -1});
+      expect(adSize).to.deep.equal({ w: -1, h: -1 });
     });
 
     it('getLookupKey() should return correct object', function() {
@@ -183,7 +183,7 @@ describe('Conversant analytics adapter tests', function() {
       const myDate = Date.now();
       conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
 
-      let payload = cnvrHelper.createPayload(REQUEST_TYPE, AUCTION_ID, myDate);
+      const payload = cnvrHelper.createPayload(REQUEST_TYPE, AUCTION_ID, myDate);
       expect(payload).to.deep.equal({
         bidderErrors: [],
         cnvrSampleRate: 1,
@@ -200,7 +200,7 @@ describe('Conversant analytics adapter tests', function() {
     });
 
     it('keyExistsAndIsObject() should return correct data', function() {
-      let data = {
+      const data = {
         a: [],
         b: 1,
         c: 'foo',
@@ -216,21 +216,21 @@ describe('Conversant analytics adapter tests', function() {
     });
 
     it('deduplicateArray() should return correct data', function () {
-      let arrayOfObjects = [{w: 1, h: 2}, {w: 2, h: 3}, {w: 1, h: 2}];
-      let array = [3, 2, 1, 1, 2, 3];
+      const arrayOfObjects = [{ w: 1, h: 2 }, { w: 2, h: 3 }, { w: 1, h: 2 }];
+      const array = [3, 2, 1, 1, 2, 3];
       let empty;
-      let notArray = 3;
-      let emptyArray = [];
+      const notArray = 3;
+      const emptyArray = [];
 
       expect(JSON.stringify(cnvrHelper.deduplicateArray(array))).to.equal(JSON.stringify([3, 2, 1]));
-      expect(JSON.stringify(cnvrHelper.deduplicateArray(arrayOfObjects))).to.equal(JSON.stringify([{w: 1, h: 2}, {w: 2, h: 3}]));
+      expect(JSON.stringify(cnvrHelper.deduplicateArray(arrayOfObjects))).to.equal(JSON.stringify([{ w: 1, h: 2 }, { w: 2, h: 3 }]));
       expect(JSON.stringify(cnvrHelper.deduplicateArray(emptyArray))).to.equal(JSON.stringify([]));
       expect(cnvrHelper.deduplicateArray(empty)).to.be.undefined;
       expect(cnvrHelper.deduplicateArray(notArray)).to.equal(notArray);
     });
 
     it('getSampleRate() should return correct data', function () {
-      let obj = {
+      const obj = {
         sampling: 1,
         cnvr_sampling: 0.5,
         too_big: 1.2,
@@ -249,7 +249,7 @@ describe('Conversant analytics adapter tests', function() {
     });
 
     it('getPageUrl() should return correct data', function() {
-      let url = cnvrHelper.getPageUrl();
+      const url = cnvrHelper.getPageUrl();
       expect(url.length).to.be.above(1);
     });
 
@@ -313,20 +313,20 @@ describe('Conversant analytics adapter tests', function() {
 
   describe('Bid Timeout Event Tests', function() {
     const BID_TIMEOUT_PAYLOAD = [{
-      'bidId': '80882409358b8a8',
-      'bidder': 'conversant',
-      'adUnitCode': 'MedRect',
-      'auctionId': 'afbd6e0b-e45b-46ab-87bf-c0bac0cb8881'
+      bidId: '80882409358b8a8',
+      bidder: 'conversant',
+      adUnitCode: 'MedRect',
+      auctionId: 'afbd6e0b-e45b-46ab-87bf-c0bac0cb8881'
     }, {
-      'bidId': '9da4c107a6f24c8',
-      'bidder': 'conversant',
-      'adUnitCode': 'Leaderboard',
-      'auctionId': 'afbd6e0b-e45b-46ab-87bf-c0bac0cb8881'
+      bidId: '9da4c107a6f24c8',
+      bidder: 'conversant',
+      adUnitCode: 'Leaderboard',
+      auctionId: 'afbd6e0b-e45b-46ab-87bf-c0bac0cb8881'
     }];
 
     it('should put both items in timeout cache', function() {
       expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(0);
-      events.emit(constants.EVENTS.BID_TIMEOUT, BID_TIMEOUT_PAYLOAD);
+      events.emit(EVENTS.BID_TIMEOUT, BID_TIMEOUT_PAYLOAD);
       expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(2);
 
       BID_TIMEOUT_PAYLOAD.forEach(timeoutBid => {
@@ -358,7 +358,7 @@ describe('Conversant analytics adapter tests', function() {
       };
 
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
-      events.emit(constants.EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD);
+      events.emit(EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD);
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0); // object should be removed
       expect(requests).to.have.lengthOf(1);
       const data = JSON.parse(requests[0].requestBody);
@@ -366,8 +366,8 @@ describe('Conversant analytics adapter tests', function() {
       expect(data.auction.auctionId).to.equal('auctionId');
       expect(data.auction.preBidVersion).to.equal(PREBID_VERSION);
       expect(data.auction.sid).to.equal(SITE_ID);
-      expect(data.adUnits['adUnitCode'].bids['bidderCode'][0].eventCodes.includes(CNVR_CONSTANTS.RENDER_FAILED)).to.be.true;
-      expect(data.adUnits['adUnitCode'].bids['bidderCode'][0].message).to.have.lengthOf.above(0);
+      expect(data.adUnits.adUnitCode.bids.bidderCode[0].eventCodes.includes(CNVR_CONSTANTS.RENDER_FAILED)).to.be.true;
+      expect(data.adUnits.adUnitCode.bids.bidderCode[0].message).to.have.lengthOf.above(0);
     });
 
     it('should not send data if no adId', function() {
@@ -379,14 +379,14 @@ describe('Conversant analytics adapter tests', function() {
       };
 
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
-      events.emit(constants.EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD_NO_ADID);
+      events.emit(EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD_NO_ADID);
       expect(requests).to.have.lengthOf(1);
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1); // same object in cache as before... no change
       expect(cnvrHelper.adIdLookup[RENDER_FAILED_PAYLOAD.adId]).to.not.be.undefined;
 
       expect(requests[0].url).to.contain('cvx/event/prebidanalyticerrors');
       const data = JSON.parse(requests[0].requestBody);
-      expect(data.event).to.be.equal(constants.EVENTS.AD_RENDER_FAILED);
+      expect(data.event).to.be.equal(EVENTS.AD_RENDER_FAILED);
       expect(data.siteId).to.be.equal(SITE_ID);
       expect(data.message).to.not.be.undefined;
       expect(data.prebidVersion).to.not.be.undefined;
@@ -402,13 +402,13 @@ describe('Conversant analytics adapter tests', function() {
       };
       expect(requests).to.have.lengthOf(0);
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
-      events.emit(constants.EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD);
+      events.emit(EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD);
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0); // object should be removed but no call made to send data
       expect(requests).to.have.lengthOf(1);
 
       expect(requests[0].url).to.contain('cvx/event/prebidanalyticerrors');
       const data = JSON.parse(requests[0].requestBody);
-      expect(data.event).to.be.equal(constants.EVENTS.AD_RENDER_FAILED);
+      expect(data.event).to.be.equal(EVENTS.AD_RENDER_FAILED);
       expect(data.siteId).to.be.equal(SITE_ID);
       expect(data.message).to.not.be.undefined;
       expect(data.prebidVersion).to.not.be.undefined;
@@ -492,14 +492,14 @@ describe('Conversant analytics adapter tests', function() {
     it('should not send data or put a record in adIdLookup when bad data provided', function() {
       expect(requests).to.have.lengthOf(0);
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
-      events.emit(constants.EVENTS.BID_WON, BAD_BID_WON_ARGS);
+      events.emit(EVENTS.BID_WON, BAD_BID_WON_ARGS);
       expect(requests).to.have.lengthOf(1);
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
 
       // check for error event
       expect(requests[0].url).to.contain('cvx/event/prebidanalyticerrors');
       const data = JSON.parse(requests[0].requestBody);
-      expect(data.event).to.be.equal(constants.EVENTS.BID_WON);
+      expect(data.event).to.be.equal(EVENTS.BID_WON);
       expect(data.siteId).to.be.equal(SITE_ID);
       expect(data.message).to.not.be.undefined;
       expect(data.prebidVersion).to.not.be.undefined;
@@ -509,11 +509,11 @@ describe('Conversant analytics adapter tests', function() {
 
     it('should send data and put a record in adIdLookup', function() {
       const myAuctionStart = Date.now();
-      cnvrHelper.auctionIdTimestampCache[GOOD_BID_WON_ARGS.auctionId] = {timeReceived: myAuctionStart};
+      cnvrHelper.auctionIdTimestampCache[GOOD_BID_WON_ARGS.auctionId] = { timeReceived: myAuctionStart };
 
       expect(requests).to.have.lengthOf(0);
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
-      events.emit(constants.EVENTS.BID_WON, GOOD_BID_WON_ARGS);
+      events.emit(EVENTS.BID_WON, GOOD_BID_WON_ARGS);
 
       // Check that adIdLookup was set correctly
       expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
@@ -914,16 +914,16 @@ describe('Conversant analytics adapter tests', function() {
     it('should not do anything when auction id doesnt exist', function() {
       sandbox.stub(utils, 'logError');
 
-      let BAD_ARGS = JSON.parse(JSON.stringify(AUCTION_END_PAYLOAD));
+      const BAD_ARGS = JSON.parse(JSON.stringify(AUCTION_END_PAYLOAD));
       delete BAD_ARGS.auctionId;
       expect(requests).to.have.lengthOf(0);
-      events.emit(constants.EVENTS.AUCTION_END, BAD_ARGS);
+      events.emit(EVENTS.AUCTION_END, BAD_ARGS);
       expect(requests).to.have.lengthOf(1);
 
       // check for error event
       expect(requests[0].url).to.contain('cvx/event/prebidanalyticerrors');
       const data = JSON.parse(requests[0].requestBody);
-      expect(data.event).to.be.equal(constants.EVENTS.AUCTION_END);
+      expect(data.event).to.be.equal(EVENTS.AUCTION_END);
       expect(data.siteId).to.be.equal(SITE_ID);
       expect(data.message).to.not.be.undefined;
       expect(data.prebidVersion).to.not.be.undefined;
@@ -961,7 +961,7 @@ describe('Conversant analytics adapter tests', function() {
       expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(0);
       expect(Object.keys(cnvrHelper.bidderErrorCache)).to.have.lengthOf(1);
 
-      events.emit(constants.EVENTS.AUCTION_END, AUCTION_END_PAYLOAD);
+      events.emit(EVENTS.AUCTION_END, AUCTION_END_PAYLOAD);
       expect(utils.logError.called).to.equal(false);
       expect(requests).to.have.lengthOf(1);
       expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(0);
@@ -993,7 +993,7 @@ describe('Conversant analytics adapter tests', function() {
       expect(data.adUnits[AD_UNIT_CODE_NATIVE].sizes).to.have.lengthOf(0);
 
       expect(Object.keys(data.adUnits[AD_UNIT_CODE].bids)).to.have.lengthOf(2);
-      const cnvrBidsArray = data.adUnits[AD_UNIT_CODE].bids['conversant'];
+      const cnvrBidsArray = data.adUnits[AD_UNIT_CODE].bids.conversant;
       // testing multiple bids from same bidder
       expect(cnvrBidsArray).to.have.lengthOf(2);
       expect(cnvrBidsArray[0].eventCodes.includes(CNVR_CONSTANTS.BID)).to.be.true;
@@ -1014,7 +1014,7 @@ describe('Conversant analytics adapter tests', function() {
       expect(cnvrBidsArray[1].adSize.h).to.equal(100);
       expect(cnvrBidsArray[1].mediaType).to.equal('banner');
 
-      const apnBidsArray = data.adUnits[AD_UNIT_CODE].bids['appnexus'];
+      const apnBidsArray = data.adUnits[AD_UNIT_CODE].bids.appnexus;
       expect(apnBidsArray).to.have.lengthOf(2);
       let apnBid = apnBidsArray[0];
       expect(apnBid.originalCpm).to.be.undefined;
@@ -1034,7 +1034,7 @@ describe('Conversant analytics adapter tests', function() {
       expect(apnBid.mediaType).to.be.undefined;
 
       expect(Object.keys(data.adUnits[AD_UNIT_CODE_NATIVE].bids)).to.have.lengthOf(1);
-      const apnNativeBidsArray = data.adUnits[AD_UNIT_CODE_NATIVE].bids['appnexus'];
+      const apnNativeBidsArray = data.adUnits[AD_UNIT_CODE_NATIVE].bids.appnexus;
       expect(apnNativeBidsArray).to.have.lengthOf(1);
       const apnNativeBid = apnNativeBidsArray[0];
       expect(apnNativeBid.eventCodes.includes(CNVR_CONSTANTS.BID)).to.be.true;
@@ -1075,7 +1075,7 @@ describe('Conversant analytics adapter tests', function() {
       bidderCode: 'myBidderCode',
       bidderRequestId: '15246a574e859f',
       bids: [{}],
-      gdprConsent: {consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA', vendorData: {}, gdprApplies: true},
+      gdprConsent: { consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA', vendorData: {}, gdprApplies: true },
       refererInfo: {
         canonicalUrl: null,
         page: 'http://mypage.org?pbjs_debug=true',
@@ -1089,12 +1089,12 @@ describe('Conversant analytics adapter tests', function() {
     };
 
     it('should record error when bidder_error called', function() {
-      let warnStub = sandbox.stub(utils, 'logWarn');
+      const warnStub = sandbox.stub(utils, 'logWarn');
       expect(requests).to.have.lengthOf(0);
       expect(Object.keys(cnvrHelper.bidderErrorCache)).to.have.lengthOf(0);
       expect(warnStub.calledOnce).to.be.false;
 
-      events.emit(constants.EVENTS.BIDDER_ERROR, {'error': XHR_ERROR_MOCK, 'bidderRequest': MOCK_BID_REQUEST});
+      events.emit(EVENTS.BIDDER_ERROR, { error: XHR_ERROR_MOCK, bidderRequest: MOCK_BID_REQUEST });
       expect(Object.keys(cnvrHelper.bidderErrorCache)).to.have.lengthOf(1);
       expect(warnStub.calledOnce).to.be.true;
 
@@ -1105,7 +1105,7 @@ describe('Conversant analytics adapter tests', function() {
       expect(errorObj.errors[0].bidderCode).to.equal(MOCK_BID_REQUEST.bidderCode);
       expect(errorObj.errors[0].url).to.not.be.undefined;
 
-      events.emit(constants.EVENTS.BIDDER_ERROR, {'error': XHR_ERROR_MOCK, 'bidderRequest': MOCK_BID_REQUEST});
+      events.emit(EVENTS.BIDDER_ERROR, { error: XHR_ERROR_MOCK, bidderRequest: MOCK_BID_REQUEST });
       errorObj = cnvrHelper.bidderErrorCache[MOCK_BID_REQUEST.auctionId];
       expect(errorObj.errors).to.have.lengthOf(2);
     });
diff --git a/test/spec/modules/conversantBidAdapter_spec.js b/test/spec/modules/conversantBidAdapter_spec.js
index 59ebefa2d60..2b2d44b3b06 100644
--- a/test/spec/modules/conversantBidAdapter_spec.js
+++ b/test/spec/modules/conversantBidAdapter_spec.js
@@ -1,14 +1,22 @@
 import {expect} from 'chai';
 import {spec, storage} from 'modules/conversantBidAdapter.js';
 import * as utils from 'src/utils.js';
+import {deepSetValue} from 'src/utils.js';
 import {createEidsArray} from 'modules/userId/eids.js';
-import { config } from '../../../src/config.js';
 import {deepAccess} from 'src/utils';
+// load modules that register ORTB processors
+import 'src/prebid.js'
+import 'modules/currency.js';
+import 'modules/userId/index.js'; // handles eids
+import 'modules/priceFloors.js';
+import 'modules/consentManagementTcf.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js'; // handles schain
+import {hook} from '../../../src/hook.js'
 
 describe('Conversant adapter tests', function() {
   const siteId = '108060';
   const versionPattern = /^\d+\.\d+\.\d+(.)*$/;
-
   const bidRequests = [
     // banner with single size
     {
@@ -19,13 +27,18 @@ describe('Conversant adapter tests', function() {
         tag_id: 'tagid-1',
         bidfloor: 0.5
       },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        }
+      },
       placementCode: 'pcode000',
       transactionId: 'tx000',
-      sizes: [[300, 250]],
       bidId: 'bid000',
       bidderRequestId: '117d765b87bed38',
       auctionId: 'req000'
     },
+
     // banner with sizes in mediaTypes.banner.sizes
     {
       bidder: 'conversant',
@@ -51,9 +64,13 @@ describe('Conversant adapter tests', function() {
         position: 2,
         tag_id: ''
       },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 600], [160, 600]],
+        }
+      },
       placementCode: 'pcode002',
       transactionId: 'tx002',
-      sizes: [[300, 600], [160, 600]],
       bidId: 'bid002',
       bidderRequestId: '117d765b87bed38',
       auctionId: 'req000'
@@ -77,7 +94,6 @@ describe('Conversant adapter tests', function() {
       },
       placementCode: 'pcode003',
       transactionId: 'tx003',
-      sizes: [640, 480],
       bidId: 'bid003',
       bidderRequestId: '117d765b87bed38',
       auctionId: 'req000'
@@ -125,16 +141,15 @@ describe('Conversant adapter tests', function() {
       bidderRequestId: '117d765b87bed38',
       auctionId: 'req000'
     },
-    // video with first party data
+    // banner with first party data
     {
       bidder: 'conversant',
       params: {
         site_id: siteId
       },
       mediaTypes: {
-        video: {
-          context: 'instream',
-          mimes: ['video/mp4', 'video/x-flv']
+        banner: {
+          sizes: [[300, 600], [160, 600]],
         }
       },
       ortb2Imp: {
@@ -150,23 +165,6 @@ describe('Conversant adapter tests', function() {
       bidId: 'bid006',
       bidderRequestId: '117d765b87bed38',
       auctionId: 'req000'
-    },
-    {
-      bidder: 'conversant',
-      params: {
-        site_id: siteId
-      },
-      mediaTypes: {
-        banner: {
-          sizes: [[728, 90], [468, 60]],
-          pos: 5
-        }
-      },
-      placementCode: 'pcode001',
-      transactionId: 'tx001',
-      bidId: 'bid007',
-      bidderRequestId: '117d765b87bed38',
-      auctionId: 'req000'
     }
   ];
 
@@ -217,7 +215,14 @@ describe('Conversant adapter tests', function() {
         }]
       }]
     },
-    headers: {}};
+    headers: {}
+  };
+
+  before(() => {
+    // ortbConverter depends on other modules to be setup to work as expected so run hook.ready to register some
+    // submodules so functions like setOrtbSourceExtSchain and setOrtbUserExtEids are available
+    hook.ready();
+  });
 
   it('Verify basic properties', function() {
     expect(spec.code).to.equal('conversant');
@@ -232,12 +237,9 @@ describe('Conversant adapter tests', function() {
     expect(spec.isBidRequestValid({})).to.be.false;
     expect(spec.isBidRequestValid({params: {}})).to.be.false;
     expect(spec.isBidRequestValid({params: {site_id: '123'}})).to.be.true;
-    expect(spec.isBidRequestValid(bidRequests[0])).to.be.true;
-    expect(spec.isBidRequestValid(bidRequests[1])).to.be.true;
-    expect(spec.isBidRequestValid(bidRequests[2])).to.be.true;
-    expect(spec.isBidRequestValid(bidRequests[3])).to.be.true;
-    expect(spec.isBidRequestValid(bidRequests[4])).to.be.true;
-    expect(spec.isBidRequestValid(bidRequests[5])).to.be.true;
+    bidRequests.forEach((bid) => {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
 
     const simpleVideo = JSON.parse(JSON.stringify(bidRequests[3]));
     simpleVideo.params.site_id = 123;
@@ -251,152 +253,171 @@ describe('Conversant adapter tests', function() {
     expect(spec.isBidRequestValid(simpleVideo)).to.be.true;
   });
 
-  it('Verify buildRequest', function() {
-    const page = 'http://test.com?a=b&c=123';
-    const bidderRequest = {
-      refererInfo: {
-        page: page
-      },
-      ortb2: {
-        source: {
-          tid: 'tid000'
+  describe('Verify buildRequest', function() {
+    let page, bidderRequest, request, payload;
+    before(() => {
+      page = 'http://test.com?a=b&c=123';
+      // ortbConverter uses the site/device information from the ortb2 object passed in the bidderRequest object
+      bidderRequest = {
+        refererInfo: {
+          page: page
+        },
+        ortb2: {
+          source: {
+            tid: 'tid000'
+          },
+          site: {
+            mobile: 0,
+            page: page,
+          },
+          device: {
+            w: screen.width,
+            h: screen.height,
+            dnt: 0,
+            ua: navigator.userAgent
+          }
         }
-      }
-    };
-    const request = spec.buildRequests(bidRequests, bidderRequest);
-    expect(request.method).to.equal('POST');
-    expect(request.url).to.equal('https://web.hb.ad.cpe.dotomi.com/cvx/client/hb/ortb/25');
-    const payload = request.data;
+      };
+      request = spec.buildRequests(bidRequests, bidderRequest);
+      payload = request.data;
+    });
+
+    it('Verify common elements', function() {
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal('https://web.hb.ad.cpe.dotomi.com/cvx/client/hb/ortb/25');
+
+      expect(payload).to.have.property('id');
+      expect(payload.source).to.have.property('tid', 'tid000');
+      expect(payload).to.have.property('at', 1);
+      expect(payload).to.have.property('imp');
+      expect(payload.imp).to.be.an('array').with.lengthOf(bidRequests.length);
+
+      expect(payload).to.have.property('site');
+      expect(payload.site).to.have.property('id', siteId);
+      expect(payload.site).to.have.property('mobile').that.is.oneOf([0, 1]);
+
+      expect(payload.site).to.have.property('page', page);
 
-    expect(payload).to.have.property('id');
-    expect(payload.source).to.have.property('tid', 'tid000');
-    expect(payload).to.have.property('at', 1);
-    expect(payload).to.have.property('imp');
-    expect(payload.imp).to.be.an('array').with.lengthOf(8);
-
-    expect(payload.imp[0]).to.have.property('id', 'bid000');
-    expect(payload.imp[0]).to.have.property('secure', 1);
-    expect(payload.imp[0]).to.have.property('bidfloor', 0.5);
-    expect(payload.imp[0]).to.have.property('displaymanager', 'Prebid.js');
-    expect(payload.imp[0]).to.have.property('displaymanagerver').that.matches(versionPattern);
-    expect(payload.imp[0]).to.have.property('tagid', 'tagid-1');
-    expect(payload.imp[0]).to.have.property('banner');
-    expect(payload.imp[0].banner).to.have.property('pos', 1);
-    expect(payload.imp[0].banner).to.have.property('format');
-    expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}]);
-    expect(payload.imp[0]).to.not.have.property('video');
-
-    expect(payload.imp[1]).to.have.property('id', 'bid001');
-    expect(payload.imp[1]).to.have.property('secure', 1);
-    expect(payload.imp[1]).to.have.property('bidfloor', 0);
-    expect(payload.imp[1]).to.have.property('displaymanager', 'Prebid.js');
-    expect(payload.imp[1]).to.have.property('displaymanagerver').that.matches(versionPattern);
-    expect(payload.imp[1]).to.not.have.property('tagid');
-    expect(payload.imp[1]).to.have.property('banner');
-    expect(payload.imp[1].banner).to.not.have.property('pos');
-    expect(payload.imp[1].banner).to.have.property('format');
-    expect(payload.imp[1].banner.format).to.deep.equal([{w: 728, h: 90}, {w: 468, h: 60}]);
-
-    expect(payload.imp[2]).to.have.property('id', 'bid002');
-    expect(payload.imp[2]).to.have.property('secure', 1);
-    expect(payload.imp[2]).to.have.property('bidfloor', 0);
-    expect(payload.imp[2]).to.have.property('displaymanager', 'Prebid.js');
-    expect(payload.imp[2]).to.have.property('displaymanagerver').that.matches(versionPattern);
-    expect(payload.imp[2]).to.have.property('banner');
-    expect(payload.imp[2].banner).to.have.property('pos', 2);
-    expect(payload.imp[2].banner).to.have.property('format');
-    expect(payload.imp[2].banner.format).to.deep.equal([{w: 300, h: 600}, {w: 160, h: 600}]);
-
-    expect(payload.imp[3]).to.have.property('id', 'bid003');
-    expect(payload.imp[3]).to.have.property('secure', 1);
-    expect(payload.imp[3]).to.have.property('bidfloor', 0);
-    expect(payload.imp[3]).to.have.property('displaymanager', 'Prebid.js');
-    expect(payload.imp[3]).to.have.property('displaymanagerver').that.matches(versionPattern);
-    expect(payload.imp[3]).to.not.have.property('tagid');
-    expect(payload.imp[3]).to.have.property('video');
-    expect(payload.imp[3].video).to.have.property('pos', 3);
-    expect(payload.imp[3].video).to.have.property('w', 632);
-    expect(payload.imp[3].video).to.have.property('h', 499);
-    expect(payload.imp[3].video).to.have.property('mimes');
-    expect(payload.imp[3].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
-    expect(payload.imp[3].video).to.have.property('protocols');
-    expect(payload.imp[3].video.protocols).to.deep.equal([1, 2]);
-    expect(payload.imp[3].video).to.have.property('api');
-    expect(payload.imp[3].video.api).to.deep.equal([2]);
-    expect(payload.imp[3].video).to.have.property('maxduration', 30);
-    expect(payload.imp[3]).to.not.have.property('banner');
-
-    expect(payload.imp[4]).to.have.property('id', 'bid004');
-    expect(payload.imp[4]).to.have.property('secure', 1);
-    expect(payload.imp[4]).to.have.property('bidfloor', 0);
-    expect(payload.imp[4]).to.have.property('displaymanager', 'Prebid.js');
-    expect(payload.imp[4]).to.have.property('displaymanagerver').that.matches(versionPattern);
-    expect(payload.imp[4]).to.not.have.property('tagid');
-    expect(payload.imp[4]).to.have.property('video');
-    expect(payload.imp[4].video).to.not.have.property('pos');
-    expect(payload.imp[4].video).to.have.property('w', 1024);
-    expect(payload.imp[4].video).to.have.property('h', 768);
-    expect(payload.imp[4].video).to.have.property('mimes');
-    expect(payload.imp[4].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
-    expect(payload.imp[4].video).to.have.property('protocols');
-    expect(payload.imp[4].video.protocols).to.deep.equal([1, 2, 3]);
-    expect(payload.imp[4].video).to.have.property('api');
-    expect(payload.imp[4].video.api).to.deep.equal([2, 3]);
-    expect(payload.imp[4].video).to.have.property('maxduration', 30);
-    expect(payload.imp[4]).to.not.have.property('banner');
-
-    expect(payload.imp[5]).to.have.property('id', 'bid005');
-    expect(payload.imp[5]).to.have.property('secure', 1);
-    expect(payload.imp[5]).to.have.property('bidfloor', 0);
-    expect(payload.imp[5]).to.have.property('displaymanager', 'Prebid.js');
-    expect(payload.imp[5]).to.have.property('displaymanagerver').that.matches(versionPattern);
-    expect(payload.imp[5]).to.not.have.property('tagid');
-    expect(payload.imp[5]).to.have.property('video');
-    expect(payload.imp[5].video).to.have.property('pos', 2);
-    expect(payload.imp[5].video).to.not.have.property('w');
-    expect(payload.imp[5].video).to.not.have.property('h');
-    expect(payload.imp[5].video).to.have.property('mimes');
-    expect(payload.imp[5].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
-    expect(payload.imp[5].video).to.not.have.property('protocols');
-    expect(payload.imp[5].video).to.not.have.property('api');
-    expect(payload.imp[5].video).to.not.have.property('maxduration');
-    expect(payload.imp[5]).to.not.have.property('banner');
-
-    expect(payload.imp[6]).to.have.property('id', 'bid006');
-    expect(payload.imp[6]).to.have.property('video');
-    expect(payload.imp[6].video).to.have.property('mimes');
-    expect(payload.imp[6].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
-    expect(payload.imp[6]).to.not.have.property('banner');
-    expect(payload.imp[6]).to.have.property('instl');
-    expect(payload.imp[6]).to.have.property('ext');
-    expect(payload.imp[6].ext).to.have.property('data');
-    expect(payload.imp[6].ext.data).to.have.property('pbadslot');
-
-    expect(payload.imp[7]).to.have.property('id', 'bid007');
-    expect(payload.imp[7]).to.have.property('secure', 1);
-    expect(payload.imp[7]).to.have.property('bidfloor', 0);
-    expect(payload.imp[7]).to.have.property('displaymanager', 'Prebid.js');
-    expect(payload.imp[7]).to.have.property('displaymanagerver').that.matches(versionPattern);
-    expect(payload.imp[7]).to.not.have.property('tagid');
-    expect(payload.imp[7]).to.have.property('banner');
-    expect(payload.imp[7].banner).to.have.property('pos', 5);
-    expect(payload.imp[7].banner).to.have.property('format');
-    expect(payload.imp[7].banner.format).to.deep.equal([{w: 728, h: 90}, {w: 468, h: 60}]);
-
-    expect(payload).to.have.property('site');
-    expect(payload.site).to.have.property('id', siteId);
-    expect(payload.site).to.have.property('mobile').that.is.oneOf([0, 1]);
-
-    expect(payload.site).to.have.property('page', page);
-
-    expect(payload).to.have.property('device');
-    expect(payload.device).to.have.property('w', screen.width);
-    expect(payload.device).to.have.property('h', screen.height);
-    expect(payload.device).to.have.property('dnt').that.is.oneOf([0, 1]);
-    expect(payload.device).to.have.property('ua', navigator.userAgent);
-
-    expect(payload).to.not.have.property('user'); // there should be no user by default
-    expect(payload).to.not.have.property('tmax'); // there should be no user by default
+      expect(payload).to.have.property('device');
+      expect(payload.device).to.have.property('w', screen.width);
+      expect(payload.device).to.have.property('h', screen.height);
+      expect(payload.device).to.have.property('dnt').that.is.oneOf([0, 1]);
+      expect(payload.device).to.have.property('ua', navigator.userAgent);
+
+      expect(payload).to.not.have.property('user'); // there should be no user by default
+      expect(payload).to.not.have.property('tmax'); // there should be no user by default
+    });
+
+    it('Simple banner', () => {
+      expect(payload.imp[0]).to.have.property('id', 'bid000');
+      expect(payload.imp[0]).to.have.property('secure', 1);
+      expect(payload.imp[0]).to.have.property('bidfloor', 0.5);
+      expect(payload.imp[0]).to.have.property('displaymanager', 'Prebid.js');
+      expect(payload.imp[0]).to.have.property('displaymanagerver').that.matches(versionPattern);
+      expect(payload.imp[0]).to.have.property('tagid', 'tagid-1');
+      expect(payload.imp[0]).to.have.property('banner');
+      expect(payload.imp[0].banner).to.have.property('pos', 1);
+      expect(payload.imp[0].banner).to.have.property('format');
+      expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}]);
+      expect(payload.imp[0]).to.not.have.property('video');
+    });
+
+    it('Banner multiple sizes', () => {
+      expect(payload.imp[1]).to.have.property('id', 'bid001');
+      expect(payload.imp[1]).to.have.property('secure', 1);
+      expect(payload.imp[1]).to.have.property('bidfloor', 0);
+      expect(payload.imp[1]).to.have.property('displaymanager', 'Prebid.js');
+      expect(payload.imp[1]).to.have.property('displaymanagerver').that.matches(versionPattern);
+      expect(payload.imp[1]).to.not.have.property('tagid');
+      expect(payload.imp[1]).to.have.property('banner');
+      expect(payload.imp[1].banner).to.not.have.property('pos');
+      expect(payload.imp[1].banner).to.have.property('format');
+      expect(payload.imp[1].banner.format).to.deep.equal([{w: 728, h: 90}, {w: 468, h: 60}]);
+    });
+
+    it('Banner with tagid and position', () => {
+      expect(payload.imp[2]).to.have.property('id', 'bid002');
+      expect(payload.imp[2]).to.have.property('secure', 1);
+      expect(payload.imp[2]).to.have.property('bidfloor', 0);
+      expect(payload.imp[2]).to.have.property('displaymanager', 'Prebid.js');
+      expect(payload.imp[2]).to.have.property('displaymanagerver').that.matches(versionPattern);
+      expect(payload.imp[2]).to.have.property('banner');
+      expect(payload.imp[2].banner).to.have.property('pos', 2);
+      expect(payload.imp[2].banner).to.have.property('format');
+      expect(payload.imp[2].banner.format).to.deep.equal([{w: 300, h: 600}, {w: 160, h: 600}]);
+    });
+
+    if (FEATURES.VIDEO) {
+      it('Simple video', () => {
+        expect(payload.imp[3]).to.have.property('id', 'bid003');
+        expect(payload.imp[3]).to.have.property('secure', 1);
+        expect(payload.imp[3]).to.have.property('bidfloor', 0);
+        expect(payload.imp[3]).to.have.property('displaymanager', 'Prebid.js');
+        expect(payload.imp[3]).to.have.property('displaymanagerver').that.matches(versionPattern);
+        expect(payload.imp[3]).to.not.have.property('tagid');
+        expect(payload.imp[3]).to.have.property('video');
+        expect(payload.imp[3].video).to.have.property('pos', 3);
+        expect(payload.imp[3].video).to.have.property('w', 632);
+        expect(payload.imp[3].video).to.have.property('h', 499);
+        expect(payload.imp[3].video).to.have.property('mimes');
+        expect(payload.imp[3].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
+        expect(payload.imp[3].video).to.have.property('protocols');
+        expect(payload.imp[3].video.protocols).to.deep.equal([1, 2]);
+        expect(payload.imp[3].video).to.have.property('api');
+        expect(payload.imp[3].video.api).to.deep.equal([2]);
+        expect(payload.imp[3].video).to.have.property('maxduration', 30);
+        expect(payload.imp[3]).to.not.have.property('banner');
+      });
+
+      it('Video with playerSize', () => {
+        expect(payload.imp[4]).to.have.property('id', 'bid004');
+        expect(payload.imp[4]).to.have.property('secure', 1);
+        expect(payload.imp[4]).to.have.property('bidfloor', 0);
+        expect(payload.imp[4]).to.have.property('displaymanager', 'Prebid.js');
+        expect(payload.imp[4]).to.have.property('displaymanagerver').that.matches(versionPattern);
+        expect(payload.imp[4]).to.not.have.property('tagid');
+        expect(payload.imp[4]).to.have.property('video');
+        expect(payload.imp[4].video).to.not.have.property('pos');
+        expect(payload.imp[4].video).to.have.property('w', 1024);
+        expect(payload.imp[4].video).to.have.property('h', 768);
+        expect(payload.imp[4].video).to.have.property('mimes');
+        expect(payload.imp[4].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
+        expect(payload.imp[4].video).to.have.property('protocols');
+        expect(payload.imp[4].video.protocols).to.deep.equal([1, 2, 3]);
+        expect(payload.imp[4].video).to.have.property('api');
+        expect(payload.imp[4].video.api).to.deep.equal([1, 2, 3]);
+        expect(payload.imp[4].video).to.have.property('maxduration', 30);
+      });
+
+      it('Video without sizes', () => {
+        expect(payload.imp[5]).to.have.property('id', 'bid005');
+        expect(payload.imp[5]).to.have.property('secure', 1);
+        expect(payload.imp[5]).to.have.property('bidfloor', 0);
+        expect(payload.imp[5]).to.have.property('displaymanager', 'Prebid.js');
+        expect(payload.imp[5]).to.have.property('displaymanagerver').that.matches(versionPattern);
+        expect(payload.imp[5]).to.not.have.property('tagid');
+        expect(payload.imp[5]).to.have.property('video');
+        expect(payload.imp[5].video).to.have.property('pos', 2);
+        expect(payload.imp[5].video).to.not.have.property('w');
+        expect(payload.imp[5].video).to.not.have.property('h');
+        expect(payload.imp[5].video).to.have.property('mimes');
+        expect(payload.imp[5].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
+        expect(payload.imp[5].video).to.not.have.property('protocols');
+        expect(payload.imp[5].video).to.not.have.property('api');
+        expect(payload.imp[5].video).to.not.have.property('maxduration');
+        expect(payload.imp[5]).to.not.have.property('banner');
+      });
+    }
+
+    it('With FPD', () => {
+      expect(payload.imp[6]).to.have.property('id', 'bid006');
+      expect(payload.imp[6]).to.have.property('banner');
+      expect(payload.imp[6]).to.not.have.property('video');
+      expect(payload.imp[6]).to.have.property('instl');
+      expect(payload.imp[6]).to.have.property('ext');
+      expect(payload.imp[6].ext).to.have.property('data');
+      expect(payload.imp[6].ext.data).to.have.property('pbadslot');
+    });
   });
 
   it('Verify timeout', () => {
@@ -420,6 +441,13 @@ describe('Conversant adapter tests', function() {
     expect(payload.site.content).to.have.property('title');
   });
 
+  it('Verify currency', () => {
+    const bidderRequest = { timeout: 9999, ortb2: {cur: ['EUR']} };
+    const request = spec.buildRequests(bidRequests, bidderRequest);
+    const payload = request.data;
+    expect(payload.cur).deep.equal(['USD']);
+  })
+
   it('Verify supply chain data', () => {
     const bidderRequest = {refererInfo: {page: 'http://test.com?a=b&c=123'}};
     const schain = {complete: 1, ver: '1.0', nodes: [{asi: 'bidderA.com', sid: '00001', hp: 1}]};
@@ -440,59 +468,62 @@ describe('Conversant adapter tests', function() {
     expect(request.url).to.equal(testUrl);
   });
 
-  it('Verify interpretResponse', function() {
-    const request = spec.buildRequests(bidRequests, {});
-    const response = spec.interpretResponse(bidResponses, request);
-    expect(response).to.be.an('array').with.lengthOf(4);
-
-    let bid = response[0];
-    expect(bid).to.have.property('requestId', 'bid000');
-    expect(bid).to.have.property('currency', 'USD');
-    expect(bid).to.have.property('cpm', 0.99);
-    expect(bid).to.have.property('creativeId', '1000');
-    expect(bid).to.have.property('width', 300);
-    expect(bid).to.have.property('height', 250);
-    expect(bid.meta.advertiserDomains).to.deep.equal(['https://example.com']);
-    expect(bid).to.have.property('ad', 'markup000');
-    expect(bid).to.have.property('ttl', 300);
-    expect(bid).to.have.property('netRevenue', true);
+  describe('Verify interpretResponse', function() {
+    let bid, request, response;
+
+    before(() => {
+      request = spec.buildRequests(bidRequests, {});
+      response = spec.interpretResponse(bidResponses, request).bids;
+    });
+
+    it('Banner', function() {
+      expect(response).to.be.an('array').with.lengthOf(4);
+      bid = response[0];
+      expect(bid).to.have.property('requestId', 'bid000');
+      expect(bid).to.have.property('cpm', 0.99);
+      expect(bid).to.have.property('creativeId', '1000');
+      expect(bid).to.have.property('width', 300);
+      expect(bid).to.have.property('height', 250);
+      expect(bid.meta.advertiserDomains).to.deep.equal(['https://example.com']);
+      expect(bid).to.have.property('ad', 'markup000
');
+      expect(bid).to.have.property('ttl', 300);
+      expect(bid).to.have.property('netRevenue', true);
+    });
 
     // There is no bid001 because cpm is $0
 
-    bid = response[1];
-    expect(bid).to.have.property('requestId', 'bid002');
-    expect(bid).to.have.property('currency', 'USD');
-    expect(bid).to.have.property('cpm', 2.99);
-    expect(bid).to.have.property('creativeId', '1002');
-    expect(bid).to.have.property('width', 300);
-    expect(bid).to.have.property('height', 600);
-    expect(bid).to.have.property('ad', 'markup002');
-    expect(bid).to.have.property('ttl', 300);
-    expect(bid).to.have.property('netRevenue', true);
-
-    bid = response[2];
-    expect(bid).to.have.property('requestId', 'bid003');
-    expect(bid).to.have.property('currency', 'USD');
-    expect(bid).to.have.property('cpm', 3.99);
-    expect(bid).to.have.property('creativeId', '1003');
-    expect(bid).to.have.property('width', 632);
-    expect(bid).to.have.property('height', 499);
-    expect(bid).to.have.property('vastUrl', 'markup003');
-    expect(bid).to.have.property('mediaType', 'video');
-    expect(bid).to.have.property('ttl', 300);
-    expect(bid).to.have.property('netRevenue', true);
-
-    bid = response[3];
-    expect(bid).to.have.property('vastXml', '');
-  });
+    it('Banner multiple sizes', function() {
+      bid = response[1];
+      expect(bid).to.have.property('requestId', 'bid002');
+      expect(bid).to.have.property('cpm', 2.99);
+      expect(bid).to.have.property('creativeId', '1002');
+      expect(bid).to.have.property('width', 300);
+      expect(bid).to.have.property('height', 600);
+      expect(bid).to.have.property('ad', 'markup002
');
+      expect(bid).to.have.property('ttl', 300);
+      expect(bid).to.have.property('netRevenue', true);
+    });
+
+    if (FEATURES.VIDEO) {
+      it('Video', function () {
+        bid = response[2];
+        expect(bid).to.have.property('requestId', 'bid003');
+        expect(bid).to.have.property('cpm', 3.99);
+        expect(bid).to.have.property('creativeId', '1003');
+        expect(bid).to.have.property('playerWidth', 632);
+        expect(bid).to.have.property('playerHeight', 499);
+        expect(bid).to.have.property('vastUrl', 'notify003');
+        expect(bid).to.have.property('vastXml', 'markup003');
+        expect(bid).to.have.property('mediaType', 'video');
+        expect(bid).to.have.property('ttl', 300);
+        expect(bid).to.have.property('netRevenue', true);
+      });
 
-  it('Verify handling of bad responses', function() {
-    let response = spec.interpretResponse({}, {});
-    expect(response).to.be.an('array').with.lengthOf(0);
-    response = spec.interpretResponse({id: '123'}, {});
-    expect(response).to.be.an('array').with.lengthOf(0);
-    response = spec.interpretResponse({id: '123', seatbid: []}, {});
-    expect(response).to.be.an('array').with.lengthOf(0);
+      it('Empty Video', function() {
+        bid = response[3];
+        expect(bid).to.have.property('vastXml', '');
+      });
+    }
   });
 
   it('Verify publisher commond id support', function() {
@@ -524,79 +555,17 @@ describe('Conversant adapter tests', function() {
     expect(payload).to.not.have.nested.property('user.ext.eids');
   });
 
-  it('Verify GDPR bid request', function() {
-    // add gdpr info
-    const bidderRequest = {
-      gdprConsent: {
-        consentString: 'BOJObISOJObISAABAAENAA4AAAAAoAAA',
-        gdprApplies: true
-      }
-    };
-
-    const payload = spec.buildRequests(bidRequests, bidderRequest).data;
-    expect(payload).to.have.deep.nested.property('user.ext.consent', 'BOJObISOJObISAABAAENAA4AAAAAoAAA');
-    expect(payload).to.have.deep.nested.property('regs.ext.gdpr', 1);
-  });
-
-  it('Verify GDPR bid request without gdprApplies', function() {
-    // add gdpr info
-    const bidderRequest = {
-      gdprConsent: {
-        consentString: ''
-      }
-    };
-
-    const payload = spec.buildRequests(bidRequests, bidderRequest).data;
-    expect(payload).to.have.deep.nested.property('user.ext.consent', '');
-    expect(payload).to.not.have.deep.nested.property('regs.ext.gdpr');
-  });
-
-  describe('CCPA', function() {
-    it('should have us_privacy', function() {
-      const bidderRequest = {
-        uspConsent: '1NYN'
-      };
-
-      const payload = spec.buildRequests(bidRequests, bidderRequest).data;
-      expect(payload).to.have.deep.nested.property('regs.ext.us_privacy', '1NYN');
-      expect(payload).to.not.have.deep.nested.property('regs.ext.gdpr');
-    });
-
-    it('should have no us_privacy', function() {
-      const payload = spec.buildRequests(bidRequests, {}).data;
-      expect(payload).to.not.have.deep.nested.property('regs.ext.us_privacy');
-    });
-
-    it('should have both gdpr and us_privacy', function() {
-      const bidderRequest = {
-        gdprConsent: {
-          consentString: 'BOJObISOJObISAABAAENAA4AAAAAoAAA',
-          gdprApplies: true
-        },
-        uspConsent: '1NYN'
-      };
-
-      const payload = spec.buildRequests(bidRequests, bidderRequest).data;
-      expect(payload).to.have.deep.nested.property('user.ext.consent', 'BOJObISOJObISAABAAENAA4AAAAAoAAA');
-      expect(payload).to.have.deep.nested.property('regs.ext.gdpr', 1);
-      expect(payload).to.have.deep.nested.property('regs.ext.us_privacy', '1NYN');
-    });
-  });
-
   describe('Extended ID', function() {
     it('Verify unifiedid and liveramp', function() {
       // clone bidRequests
       let requests = utils.deepClone(bidRequests);
 
-      // add pubcid to every entry
-      requests.forEach((unit) => {
-        Object.assign(unit, {userId: {pubcid: '112233', tdid: '223344', idl_env: '334455'}});
-        Object.assign(unit, {userIdAsEids: createEidsArray(unit.userId)});
-      });
+      const eidArray = [{'source': 'pubcid.org', 'uids': [{'id': '112233', 'atype': 1}]}, {'source': 'liveramp.com', 'uids': [{'id': '334455', 'atype': 3}]}];
+
       //  construct http post payload
-      const payload = spec.buildRequests(requests, {}).data;
+      const payload = spec.buildRequests(requests, {ortb2: {user: {ext: {eids: eidArray}}}}).data;
       expect(payload).to.have.deep.nested.property('user.ext.eids', [
-        {source: 'adserver.org', uids: [{id: '223344', atype: 1, ext: {rtiPartner: 'TDID'}}]},
+        {source: 'pubcid.org', uids: [{id: '112233', atype: 1}]},
         {source: 'liveramp.com', uids: [{id: '334455', atype: 3}]}
       ]);
     });
diff --git a/test/spec/modules/copper6sspBidAdapter_spec.js b/test/spec/modules/copper6sspBidAdapter_spec.js
new file mode 100644
index 00000000000..a97ef3ecbe5
--- /dev/null
+++ b/test/spec/modules/copper6sspBidAdapter_spec.js
@@ -0,0 +1,515 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/copper6sspBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'copper6ssp';
+
+describe('Copper6SSPBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://endpoint.copper6.com/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys(
+        'deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://сsync.copper6.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://сsync.copper6.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://сsync.copper6.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/cpmstarBidAdapter_spec.js b/test/spec/modules/cpmstarBidAdapter_spec.js
index 285fca9690a..f9b1ba59cde 100755
--- a/test/spec/modules/cpmstarBidAdapter_spec.js
+++ b/test/spec/modules/cpmstarBidAdapter_spec.js
@@ -149,7 +149,7 @@ describe('Cpmstar Bid Adapter', function () {
     };
     var requests = spec.buildRequests(reqs, bidderRequest);
     expect(requests[0]).to.have.property('url');
-    expect(requests[0].url).to.include('&schain=1.0,1!exchange1.com,1234,1,,,!exchange2.com,abcd,1,,,');
+    expect(requests[0].url).to.include('&schain=1.0%2C1%21exchange1.com%2C1234%2C1%2C%2C%2C%21exchange2.com%2Cabcd%2C1%2C%2C%2C');
   });
 
   describe('interpretResponse', function () {
diff --git a/test/spec/modules/craftBidAdapter_spec.js b/test/spec/modules/craftBidAdapter_spec.js
index dfdbebde738..d74477c5b8b 100644
--- a/test/spec/modules/craftBidAdapter_spec.js
+++ b/test/spec/modules/craftBidAdapter_spec.js
@@ -40,21 +40,21 @@ describe('craftAdapter', function () {
     });
 
     it('should return false when params.sitekey not found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         placementId: '1234abcd'
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when params.placementId not found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         sitekey: 'craft-prebid-example'
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when AMP cotext found', function () {
@@ -158,7 +158,7 @@ describe('craftAdapter', function () {
         height: 250,
         mediaType: 'banner',
         meta: null,
-        netRevenue: false,
+        netRevenue: true,
         requestId: '0396fae4eb5f47',
         ttl: 360,
         width: 300,
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index 7cba0e2fbdf..30de96e33d0 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -1,17 +1,20 @@
 import { expect } from 'chai';
 import {
-  tryGetCriteoFastBid,
   spec,
   storage,
-  PROFILE_ID_PUBLISHERTAG,
-  ADAPTER_VERSION,
-  canFastBid, getFastBidUrl, FAST_BID_VERSION_CURRENT
 } from 'modules/criteoBidAdapter.js';
 import * as utils from 'src/utils.js';
 import * as refererDetection from 'src/refererDetection.js';
 import * as ajax from 'src/ajax.js';
 import { config } from '../../../src/config.js';
 import { BANNER, NATIVE, VIDEO } from '../../../src/mediaTypes.js';
+import {syncAddFPDToBidderRequest} from '../../helpers/fpd';
+import 'modules/userId/index.js';
+import 'modules/consentManagementTcf.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/consentManagementGpp.js';
+import 'modules/schain.js';
+import {hook} from '../../../src/hook';
 
 describe('The Criteo bidding adapter', function () {
   let utilsMock, sandbox, ajaxStub;
@@ -38,7 +41,66 @@ describe('The Criteo bidding adapter', function () {
     ajaxStub.restore();
   });
 
-  describe('getUserSyncs', function () {
+  describe('getUserSyncs in pixel mode', function () {
+    const syncOptions = {
+      pixelEnabled: true
+    };
+
+    it('should not trigger sync if publisher did not enable pixel based syncs', function () {
+      const userSyncs = spec.getUserSyncs({
+        iframeEnabled: false
+      }, undefined, undefined, undefined);
+
+      expect(userSyncs).to.eql([]);
+    });
+
+    it('should not trigger sync if purpose one is not granted', function () {
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: 'ABC',
+        vendorData: {
+          purpose: {
+            consents: {
+              1: false
+            }
+          }
+        }
+      };
+      const userSyncs = spec.getUserSyncs(syncOptions, undefined, gdprConsent, undefined);
+
+      expect(userSyncs).to.eql([]);
+    });
+
+    it('should trigger sync with consent data', function () {
+      const usPrivacy = 'usp_string';
+
+      const gppConsent = {
+        gppString: 'gpp_string',
+        applicableSections: [ 1, 2 ]
+      };
+
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: 'ABC',
+        vendorData: {
+          purpose: {
+            consents: {
+              1: true
+            }
+          }
+        }
+      };
+
+      const userSyncs = spec.getUserSyncs(syncOptions, undefined, gdprConsent, usPrivacy, gppConsent);
+
+      expect(userSyncs).to.eql([{
+        type: 'image',
+        url: 'https://ssp-sync.criteo.com/user-sync/redirect?profile=207&gdprapplies=true&gdpr=ABC&ccpa=usp_string&gpp=gpp_string&gpp_sid=1&gpp_sid=2'
+      }]);
+    });
+  });
+
+  describe('getUserSyncs in iframe mode', function () {
     const syncOptionsIframeEnabled = {
       iframeEnabled: true
     };
@@ -61,7 +123,9 @@ describe('The Criteo bidding adapter', function () {
       getCookieStub,
       setCookieStub,
       getDataFromLocalStorageStub,
-      removeDataFromLocalStorageStub;
+      setDataInLocalStorageStub,
+      removeDataFromLocalStorageStub,
+      triggerPixelStub;
 
     beforeEach(function () {
       getConfigStub = sinon.stub(config, 'getConfig');
@@ -83,7 +147,10 @@ describe('The Criteo bidding adapter', function () {
       getCookieStub = sinon.stub(storage, 'getCookie');
       setCookieStub = sinon.stub(storage, 'setCookie');
       getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+      setDataInLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
       removeDataFromLocalStorageStub = sinon.stub(storage, 'removeDataFromLocalStorage');
+
+      triggerPixelStub = sinon.stub(utils, 'triggerPixel');
     });
 
     afterEach(function () {
@@ -95,15 +162,9 @@ describe('The Criteo bidding adapter', function () {
       getCookieStub.restore();
       setCookieStub.restore();
       getDataFromLocalStorageStub.restore();
+      setDataInLocalStorageStub.restore();
       removeDataFromLocalStorageStub.restore();
-    });
-
-    it('should not trigger sync if publisher is using fast bid', function () {
-      getConfigStub.withArgs('criteo.fastBidVersion').returns('latest');
-
-      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, undefined);
-
-      expect(userSyncs).to.eql([]);
+      triggerPixelStub.restore();
     });
 
     it('should not trigger sync if publisher did not enable iframe based syncs', function () {
@@ -151,7 +212,7 @@ describe('The Criteo bidding adapter', function () {
 
       expect(userSyncs).to.eql([{
         type: 'iframe',
-        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com#${JSON.stringify(expectedHashWithCookieData, Object.keys(expectedHashWithCookieData).sort()).replace(/"/g, '%22')}`
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&gpp=#${JSON.stringify(expectedHashWithCookieData, Object.keys(expectedHashWithCookieData).sort()).replace(/"/g, '%22')}`
       }]);
     });
 
@@ -175,7 +236,7 @@ describe('The Criteo bidding adapter', function () {
 
       expect(userSyncs).to.eql([{
         type: 'iframe',
-        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com#${JSON.stringify(expectedHashWithLocalStorageData, Object.keys(expectedHashWithLocalStorageData).sort()).replace(/"/g, '%22')}`
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&gpp=#${JSON.stringify(expectedHashWithLocalStorageData, Object.keys(expectedHashWithLocalStorageData).sort()).replace(/"/g, '%22')}`
       }]);
     });
 
@@ -195,7 +256,7 @@ describe('The Criteo bidding adapter', function () {
 
       expect(userSyncs).to.eql([{
         type: 'iframe',
-        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&gdpr=1&gdpr_consent=ABC#${JSON.stringify(expectedHash).replace(/"/g, '%22')}`
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&gdpr=1&gdpr_consent=ABC&gpp=#${JSON.stringify(expectedHash).replace(/"/g, '%22')}`
       }]);
     });
 
@@ -204,7 +265,7 @@ describe('The Criteo bidding adapter', function () {
 
       expect(userSyncs).to.eql([{
         type: 'iframe',
-        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&us_privacy=ABC#${JSON.stringify(expectedHash).replace(/"/g, '%22')}`
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&us_privacy=ABC&gpp=#${JSON.stringify(expectedHash).replace(/"/g, '%22')}`
       }]);
     });
 
@@ -247,6 +308,62 @@ describe('The Criteo bidding adapter', function () {
       expect(removeDataFromLocalStorageStub.called).to.be.false;
       expect(ajaxStub.called).to.be.false;
     });
+
+    it('should trigger sync pixel from iframe response', function (done) {
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, undefined);
+
+      const event = new MessageEvent('message', {
+        data: {
+          requestId: '123456',
+          callbacks: [
+            'https://example.com/pixel1',
+            'https://example.com/pixel2'
+          ]
+        },
+        origin: 'https://gum.criteo.com'
+      });
+
+      window.dispatchEvent(event);
+      setTimeout(() => {
+        expect(triggerPixelStub.calledTwice).to.be.true;
+        expect(triggerPixelStub.firstCall.calledWith('https://example.com/pixel1')).to.be.true;
+        expect(triggerPixelStub.secondCall.calledWith('https://example.com/pixel2')).to.be.true;
+
+        done();
+      }, 0);
+    });
+
+    it('should write cookie only on TLD+1 level', function(done) {
+      const cookies = {};
+
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, undefined);
+
+      setCookieStub.callsFake((name, value, expires, _, domain) => {
+        if (domain != '.com') {
+          cookies[name] = value;
+        }
+      });
+
+      getCookieStub.callsFake((name) => cookies[name]);
+
+      const event = new MessageEvent('message', {
+        data: {
+          requestId: '123456',
+          bundle: 'bundle'
+        },
+        origin: 'https://gum.criteo.com'
+      });
+
+      window.dispatchEvent(event);
+      setTimeout(() => {
+        expect(setCookieStub.calledWith('cto_bundle', 'bundle', sinon.match.string, null, '.com')).to.be.true;
+        expect(setCookieStub.calledWith('cto_bundle', 'bundle', sinon.match.string, null, '.abc.com')).to.be.true;
+        expect(setCookieStub.calledWith('cto_bundle', 'bundle', sinon.match.string, null, '.www.abc.com')).to.be.false;
+        expect(cookies).to.deep.equal({ 'cto_bundle': 'bundle' });
+
+        done();
+      }, 0);
+    });
   });
 
   describe('isBidRequestValid', function () {
@@ -364,93 +481,6 @@ describe('The Criteo bidding adapter', function () {
     });
 
     it('should return false when given an invalid video bid request', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'criteo',
-        mediaTypes: {
-          video: {
-            mimes: ['video/mpeg'],
-            playerSize: [640, 480],
-            protocols: [5, 6],
-            maxduration: 30,
-            api: [1, 2]
-          }
-        },
-        params: {
-          networkId: 456,
-          video: {
-            skip: 1,
-            placement: 1,
-            playbackmethod: 1
-          }
-        },
-      })).to.equal(false);
-
-      expect(spec.isBidRequestValid({
-        bidder: 'criteo',
-        mediaTypes: {
-          video: {
-            context: 'instream',
-            mimes: ['video/mpeg'],
-            playerSize: [640, 480],
-            protocols: [5, 6],
-            maxduration: 30,
-            api: [1, 2]
-          }
-        },
-        params: {
-          networkId: 456,
-          video: {
-            skip: 1,
-            placement: 2,
-            playbackmethod: 1
-          }
-        },
-      })).to.equal(false);
-
-      expect(spec.isBidRequestValid({
-        bidder: 'criteo',
-        mediaTypes: {
-          video: {
-            context: 'outstream',
-            mimes: ['video/mpeg'],
-            playerSize: [640, 480],
-            protocols: [5, 6],
-            maxduration: 30,
-            api: [1, 2]
-          }
-        },
-        params: {
-          networkId: 456,
-          video: {
-            skip: 1,
-            placement: 1,
-            playbackmethod: 1
-          }
-        },
-      })).to.equal(false);
-
-      expect(spec.isBidRequestValid({
-        bidder: 'criteo',
-        mediaTypes: {
-          video: {
-            context: 'adpod',
-            mimes: ['video/mpeg'],
-            playerSize: [640, 480],
-            protocols: [5, 6],
-            maxduration: 30,
-            api: [1, 2]
-          }
-        },
-        params: {
-          networkId: 456,
-          video: {
-            skip: 1,
-            placement: 1,
-            playbackmethod: 1
-          }
-        },
-      })).to.equal(false);
-
       expect(spec.isBidRequestValid({
         bidder: 'criteo',
         mediaTypes: {
@@ -630,8 +660,8 @@ describe('The Criteo bidding adapter', function () {
       },
       timeout: 3000,
       gdprConsent: {
-        gdprApplies: 1,
-        consentString: 'concentDataString',
+        gdprApplies: true,
+        consentString: 'consentDataString',
         vendorData: {
           vendorConsents: {
             '91': 1
@@ -643,6 +673,10 @@ describe('The Criteo bidding adapter', function () {
 
     let localStorageIsEnabledStub;
 
+    before(() => {
+      hook.ready();
+    });
+
     this.beforeEach(function () {
       localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
       localStorageIsEnabledStub.returns(true);
@@ -656,13 +690,11 @@ describe('The Criteo bidding adapter', function () {
     it('should properly build a request using random uuid as auction id', function () {
       const generateUUIDStub = sinon.stub(utils, 'generateUUID');
       generateUUIDStub.returns('def');
-      const bidderRequest = {
-      };
+      const bidderRequest = {};
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -671,7 +703,7 @@ describe('The Criteo bidding adapter', function () {
           params: {}
         },
       ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
       const ortbRequest = request.data;
       expect(ortbRequest.id).to.equal('def');
       generateUUIDStub.restore();
@@ -689,7 +721,6 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -698,22 +729,14 @@ describe('The Criteo bidding adapter', function () {
           params: {}
         },
       ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
       const ortbRequest = request.data;
       expect(ortbRequest.source.tid).to.equal('abc');
     });
 
-    it('should properly transmit bidId if available', function () {
-      const bidderRequest = {
-        ortb2: {
-          source: {
-            tid: 'abc'
-          }
-        }
-      };
+    it('should properly transmit tmax if available', function () {
       const bidRequests = [
         {
-          bidId: 'bidId',
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
@@ -725,22 +748,18 @@ describe('The Criteo bidding adapter', function () {
           params: {}
         },
       ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
       const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].slotid).to.equal('bidId');
+      expect(ortbRequest.tmax).to.equal(bidderRequest.timeout);
     });
 
-    it('should properly build a request if refererInfo is not provided', function () {
+    it('should properly transmit bidId if available', function () {
       const bidderRequest = {};
       const bidRequests = [
         {
+          bidId: 'bidId',
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          ortb2Imp: {
-            ext: {
-              tid: 'transaction-123',
-            },
-          },
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -749,9 +768,9 @@ describe('The Criteo bidding adapter', function () {
           params: {}
         },
       ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
       const ortbRequest = request.data;
-      expect(ortbRequest.publisher.url).to.equal('');
+      expect(ortbRequest.imp[0].id).to.equal('bidId');
     });
 
     it('should properly build a zoneId request', function () {
@@ -772,77 +791,24 @@ describe('The Criteo bidding adapter', function () {
           params: {
             zoneId: 123,
             publisherSubId: '123',
-            nativeCallback: function () { },
             integrationMode: 'amp'
           },
         },
       ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&lsavail=1&im=1&debug=1&nolog=1/);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      expect(request.url).to.match(/^https:\/\/grid-bidder\.criteo\.com\/openrtb_2_5\/pbjs\/auction\/request\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&lsavail=[01]&im=1&debug=[01]&nolog=[01]$/);
       expect(request.method).to.equal('POST');
       const ortbRequest = request.data;
-      expect(ortbRequest.publisher.url).to.equal(refererUrl);
-      expect(ortbRequest.slots).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].impid).to.equal('bid-123');
-      expect(ortbRequest.slots[0].transactionid).to.equal('transaction-123');
-      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].sizes[0]).to.equal('728x90');
-      expect(ortbRequest.slots[0].zoneid).to.equal(123);
-      expect(ortbRequest.gdprConsent.consentData).to.equal('concentDataString');
-      expect(ortbRequest.gdprConsent.gdprApplies).to.equal(true);
-      expect(ortbRequest.gdprConsent.version).to.equal(1);
-    });
-
-    it('should keep undefined sizes for non native banner', function () {
-      const bidRequests = [
-        {
-          mediaTypes: {
-            banner: {
-              sizes: [[undefined, undefined]]
-            }
-          },
-          params: {},
-        },
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].sizes[0]).to.equal('undefinedxundefined');
-    });
-
-    it('should keep undefined size for non native banner', function () {
-      const bidRequests = [
-        {
-          mediaTypes: {
-            banner: {
-              sizes: [undefined, undefined]
-            }
-          },
-          params: {},
-        },
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].sizes[0]).to.equal('undefinedxundefined');
-    });
-
-    it('should properly detect and forward native flag', function () {
-      const bidRequests = [
-        {
-          mediaTypes: {
-            banner: {
-              sizes: [[undefined, undefined]]
-            }
-          },
-          params: {
-            nativeCallback: function () { }
-          },
-        },
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].native).to.equal(true);
+      expect(ortbRequest.site.page).to.equal(refererUrl);
+      expect(ortbRequest.imp).to.have.lengthOf(1);
+      expect(ortbRequest.imp[0].tagid).to.equal('bid-123');
+      expect(ortbRequest.imp[0].banner.format).to.have.lengthOf(1);
+      expect(ortbRequest.imp[0].banner.format[0].w).to.equal(728);
+      expect(ortbRequest.imp[0].banner.format[0].h).to.equal(90);
+      expect(ortbRequest.imp[0].ext.bidder.zoneid).to.equal(123);
+      expect(ortbRequest.user.ext.consent).to.equal('consentDataString');
+      expect(ortbRequest.regs.ext.gdpr).to.equal(1);
+      expect(ortbRequest.regs.ext.gdprversion).to.equal(1);
     });
 
     it('should properly forward eids', function () {
@@ -850,25 +816,33 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
             }
           },
-          userIdAsEids: [
-            {
-              source: 'criteo.com',
-              uids: [{
-                id: 'abc',
-                atype: 1
-              }]
-            }
-          ],
           params: {}
         },
       ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const br = {
+        ...bidderRequest,
+        ortb2: {
+          user: {
+            ext: {
+              eids: [
+                {
+                  source: 'criteo.com',
+                  uids: [{
+                    id: 'abc',
+                    atype: 1
+                  }]
+                }
+              ]
+            }
+          }
+        }
+      }
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(br));
       const ortbRequest = request.data;
       expect(ortbRequest.user.ext.eids).to.deep.equal([
         {
@@ -881,79 +855,81 @@ describe('The Criteo bidding adapter', function () {
       ]);
     });
 
-    it('should properly detect and forward native flag', function () {
-      const bidRequests = [
-        {
-          mediaTypes: {
-            banner: {
-              sizes: [undefined, undefined]
-            }
-          },
-          params: {
-            nativeCallback: function () { }
+    if (FEATURES.NATIVE) {
+      it('should properly build a native request without assets', function () {
+        const bidRequests = [
+          {
+            mediaTypes: {
+              native: {}
+            },
+            params: {}
           },
-        },
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].native).to.equal(true);
-    });
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const ortbRequest = request.data;
+        expect(ortbRequest.imp[0].native.request_native).to.not.be.null;
+        expect(ortbRequest.imp[0].native.request_native.assets).to.be.undefined;
+      });
+    }
 
-    it('should map ortb native assets to slot ext assets', function () {
-      const assets = [{
-        required: 1,
-        id: 1,
-        img: {
-          type: 3,
-          wmin: 100,
-          hmin: 100,
-        }
-      },
-      {
-        required: 1,
-        id: 2,
-        title: {
-          len: 140,
-        }
-      },
-      {
-        required: 1,
-        id: 3,
-        data: {
-          type: 1,
-        }
-      },
-      {
-        required: 0,
-        id: 4,
-        data: {
-          type: 2,
-        }
-      },
-      {
-        required: 0,
-        id: 5,
-        img: {
-          type: 1,
-          wmin: 20,
-          hmin: 20,
-        }
-      }];
-      const bidRequests = [
+    if (FEATURES.NATIVE) {
+      it('should properly build a native request with assets', function () {
+        const assets = [{
+          required: 1,
+          id: 1,
+          img: {
+            type: 3,
+            wmin: 100,
+            hmin: 100,
+          }
+        },
         {
-          nativeOrtbRequest: {
-            assets: assets
-          },
-          params: {
-            nativeCallback: function () { }
-          },
+          required: 1,
+          id: 2,
+          title: {
+            len: 140,
+          }
         },
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].native).to.equal(true);
-      expect(ortbRequest.slots[0].ext.assets).to.deep.equal(assets);
-    });
+        {
+          required: 1,
+          id: 3,
+          data: {
+            type: 1,
+          }
+        },
+        {
+          required: 0,
+          id: 4,
+          data: {
+            type: 2,
+          }
+        },
+        {
+          required: 0,
+          id: 5,
+          img: {
+            type: 1,
+            wmin: 20,
+            hmin: 20,
+          }
+        }];
+        const bidRequests = [
+          {
+            mediaTypes: {
+              native: {}
+            },
+            nativeOrtbRequest: {
+              assets: assets
+            },
+            params: {}
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const ortbRequest = request.data;
+        expect(ortbRequest.imp[0].native.request_native).to.not.be.null;
+        expect(ortbRequest.imp[0].native.request_native.assets).to.deep.equal(assets);
+      });
+    }
 
     it('should properly build a networkId request', function () {
       const bidderRequest = {
@@ -963,7 +939,7 @@ describe('The Criteo bidding adapter', function () {
         },
         timeout: 3000,
         gdprConsent: {
-          gdprApplies: 0,
+          gdprApplies: false,
           consentString: undefined,
           vendorData: {
             vendorConsents: {
@@ -991,23 +967,23 @@ describe('The Criteo bidding adapter', function () {
           },
         },
       ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d/);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      expect(request.url).to.match(/^https:\/\/grid-bidder\.criteo\.com\/openrtb_2_5\/pbjs\/auction\/request\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&lsavail=[01]&debug=[01]&nolog=[01]&networkId=456$/);
       expect(request.method).to.equal('POST');
       const ortbRequest = request.data;
-      expect(ortbRequest.publisher.url).to.equal(refererUrl);
-      expect(ortbRequest.publisher.networkid).to.equal(456);
-      expect(ortbRequest.slots).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].impid).to.equal('bid-123');
-      expect(ortbRequest.slots[0].transactionid).to.equal('transaction-123');
-      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(2);
-      expect(ortbRequest.slots[0].sizes[0]).to.equal('300x250');
-      expect(ortbRequest.slots[0].sizes[1]).to.equal('728x90');
-      expect(ortbRequest.gdprConsent.consentData).to.equal(undefined);
-      expect(ortbRequest.gdprConsent.gdprApplies).to.equal(false);
-    });
-
-    it('should properly build a mixed request', function () {
+      expect(ortbRequest.site.page).to.equal(refererUrl);
+      expect(ortbRequest.imp).to.have.lengthOf(1);
+      expect(ortbRequest.imp[0].tagid).to.equal('bid-123');
+      expect(ortbRequest.imp[0].banner.format).to.have.lengthOf(2);
+      expect(ortbRequest.imp[0].banner.format[0].w).to.equal(300);
+      expect(ortbRequest.imp[0].banner.format[0].h).to.equal(250);
+      expect(ortbRequest.imp[0].banner.format[1].w).to.equal(728);
+      expect(ortbRequest.imp[0].banner.format[1].h).to.equal(90);
+      expect(ortbRequest.user?.ext?.consent).to.equal(undefined);
+      expect(ortbRequest.regs.ext.gdpr).to.equal(0);
+    });
+
+    it('should properly build a mixed request with both a zoneId and a networkId', function () {
       const bidderRequest = {
         refererInfo: {
           page: refererUrl,
@@ -1051,23 +1027,26 @@ describe('The Criteo bidding adapter', function () {
           },
         },
       ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d/);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      expect(request.url).to.match(/^https:\/\/grid-bidder\.criteo\.com\/openrtb_2_5\/pbjs\/auction\/request\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&lsavail=[01]&debug=[01]&nolog=[01]&networkId=456$/);
       expect(request.method).to.equal('POST');
       const ortbRequest = request.data;
-      expect(ortbRequest.publisher.url).to.equal(refererUrl);
-      expect(ortbRequest.publisher.networkid).to.equal(456);
-      expect(ortbRequest.slots).to.have.lengthOf(2);
-      expect(ortbRequest.slots[0].impid).to.equal('bid-123');
-      expect(ortbRequest.slots[0].transactionid).to.equal('transaction-123');
-      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].sizes[0]).to.equal('728x90');
-      expect(ortbRequest.slots[1].impid).to.equal('bid-234');
-      expect(ortbRequest.slots[1].transactionid).to.equal('transaction-234');
-      expect(ortbRequest.slots[1].sizes).to.have.lengthOf(2);
-      expect(ortbRequest.slots[1].sizes[0]).to.equal('300x250');
-      expect(ortbRequest.slots[1].sizes[1]).to.equal('728x90');
-      expect(ortbRequest.gdprConsent).to.equal(undefined);
+      expect(ortbRequest.site.page).to.equal(refererUrl);
+      expect(ortbRequest.imp).to.have.lengthOf(2);
+      expect(ortbRequest.imp[0].tagid).to.equal('bid-123');
+      expect(ortbRequest.imp[0].banner.format).to.have.lengthOf(1);
+      expect(ortbRequest.imp[0].banner.format[0].w).to.equal(728);
+      expect(ortbRequest.imp[0].banner.format[0].h).to.equal(90);
+      expect(ortbRequest.imp[0].ext.tid).to.equal('transaction-123');
+      expect(ortbRequest.imp[0].ext.bidder.zoneid).to.equal(123);
+      expect(ortbRequest.imp[1].tagid).to.equal('bid-234');
+      expect(ortbRequest.imp[1].banner.format).to.have.lengthOf(2);
+      expect(ortbRequest.imp[1].banner.format[0].w).to.equal(300);
+      expect(ortbRequest.imp[1].banner.format[0].h).to.equal(250);
+      expect(ortbRequest.imp[1].banner.format[1].w).to.equal(728);
+      expect(ortbRequest.imp[1].banner.format[1].h).to.equal(90);
+      expect(ortbRequest.imp[1].ext.tid).to.equal('transaction-234');
+      expect(ortbRequest.user?.ext?.consent).to.equal(undefined);
     });
 
     it('should properly build a request with undefined gdpr consent fields when they are not provided', function () {
@@ -1075,7 +1054,6 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1091,9 +1069,9 @@ describe('The Criteo bidding adapter', function () {
         gdprConsent: {},
       };
 
-      const ortbRequest = spec.buildRequests(bidRequests, bidderRequest).data;
-      expect(ortbRequest.gdprConsent.consentData).to.equal(undefined);
-      expect(ortbRequest.gdprConsent.gdprApplies).to.equal(undefined);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.user?.ext?.consent).to.equal(undefined);
+      expect(ortbRequest.regs?.ext?.gdpr).to.equal(undefined);
     });
 
     it('should properly build a request with ccpa consent field', function () {
@@ -1101,7 +1079,6 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1117,18 +1094,15 @@ describe('The Criteo bidding adapter', function () {
         uspConsent: '1YNY',
       };
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.user).to.not.be.null;
-      expect(request.data.user.uspIab).to.equal('1YNY');
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.regs.ext.us_privacy).to.equal('1YNY');
     });
 
-    it('should properly build a request with device sua field', function () {
-      const sua = {}
+    it('should properly build a request with overridden tmax', function () {
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1140,26 +1114,23 @@ describe('The Criteo bidding adapter', function () {
         },
       ];
       const bidderRequest = {
-        timeout: 3000,
-        uspConsent: '1YNY',
-        ortb2: {
-          device: {
-            sua: sua
-          }
-        }
+        timeout: 1234
       };
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.user.ext.sua).to.not.be.null;
-      expect(request.data.user.ext.sua).to.equal(sua);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.tmax).to.equal(1234);
     });
 
-    it('should properly build a request with gpp consent field', function () {
+    it('should properly build a request with device sua field', function () {
+      const sua = {
+        platform: {
+          brand: 'abc'
+        }
+      }
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1170,29 +1141,26 @@ describe('The Criteo bidding adapter', function () {
           },
         },
       ];
-      const ortb2 = {
-        regs: {
-          gpp: 'gpp_consent_string',
-          gpp_sid: [0, 1, 2]
+      const bidderRequest = {
+        timeout: 3000,
+        uspConsent: '1YNY',
+        ortb2: {
+          device: {
+            sua: sua
+          }
         }
       };
 
-      const request = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2 });
-      expect(request.data.regs).to.not.be.null;
-      expect(request.data.regs.gpp).to.equal('gpp_consent_string');
-      expect(request.data.regs.gpp_sid).to.deep.equal([0, 1, 2]);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.device.ext.sua).not.to.be.null;
+      expect(ortbRequest.device.ext.sua.platform.brand).to.equal('abc');
     });
 
-    it('should properly build a request with schain object', function () {
-      const expectedSchain = {
-        someProperty: 'someValue'
-      };
+    it('should properly build a request with gpp consent field', function () {
       const bidRequests = [
         {
           bidder: 'criteo',
-          schain: expectedSchain,
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1203,18 +1171,23 @@ describe('The Criteo bidding adapter', function () {
           },
         },
       ];
+      const ortb2 = {
+        regs: {
+          gpp: 'gpp_consent_string',
+          gpp_sid: [0, 1, 2],
+        }
+      };
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.source.ext.schain).to.equal(expectedSchain);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest({ ...bidderRequest, ortb2 })).data;
+      expect(ortbRequest.regs.ext.gpp).to.equal('gpp_consent_string');
+      expect(ortbRequest.regs.ext.gpp_sid).to.deep.equal([0, 1, 2]);
     });
 
-    it('should properly build a request with bcat field', function () {
-      const bcat = ['IAB1', 'IAB2'];
+    it('should properly build a request with dsa object', function () {
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1225,24 +1198,39 @@ describe('The Criteo bidding adapter', function () {
           },
         },
       ];
-      const bidderRequest = {
-        ortb2: {
-          bcat
+      let dsa = {
+        required: 3,
+        pubrender: 0,
+        datatopub: 2,
+        transparency: [{
+          domain: 'platform1domain.com',
+          params: [1]
+        }, {
+          domain: 'SSP2domain.com',
+          params: [1, 2]
+        }]
+      };
+      const ortb2 = {
+        regs: {
+          ext: {
+            dsa: dsa
+          }
         }
       };
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.bcat).to.not.be.null;
-      expect(request.data.bcat).to.equal(bcat);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest({ ...bidderRequest, ortb2 })).data;
+      expect(ortbRequest.regs.ext.dsa).to.deep.equal(dsa);
     });
 
-    it('should properly build a request with badv field', function () {
-      const badv = ['ford.com'];
+    it('should properly build a request with schain object', function () {
+      const expectedSchain = {
+        someProperty: 'someValue'
+      };
       const bidRequests = [
         {
           bidder: 'criteo',
+          schain: expectedSchain,
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1253,24 +1241,17 @@ describe('The Criteo bidding adapter', function () {
           },
         },
       ];
-      const bidderRequest = {
-        ortb2: {
-          badv
-        }
-      };
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.badv).to.not.be.null;
-      expect(request.data.badv).to.equal(badv);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.source.ext.schain).to.equal(expectedSchain);
     });
 
-    it('should properly build a request with bapp field', function () {
-      const bapp = ['com.foo.mygame'];
+    it('should properly build a request with bcat field', function () {
+      const bcat = ['IAB1', 'IAB2'];
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1283,21 +1264,20 @@ describe('The Criteo bidding adapter', function () {
       ];
       const bidderRequest = {
         ortb2: {
-          bapp
+          bcat
         }
       };
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.bapp).to.not.be.null;
-      expect(request.data.bapp).to.equal(bapp);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.bcat).to.deep.equal(bcat);
     });
 
-    it('should properly build a request with if ccpa consent field is not provided', function () {
+    it('should properly build a request with badv field', function () {
+      const badv = ['ford.com'];
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1309,151 +1289,21 @@ describe('The Criteo bidding adapter', function () {
         },
       ];
       const bidderRequest = {
-        timeout: 3000
+        ortb2: {
+          badv
+        }
       };
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.user).to.not.be.null;
-      expect(request.data.user.uspIab).to.equal(undefined);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.badv).to.deep.equal(badv);
     });
 
-    it('should properly build a video request', function () {
-      const bidRequests = [
-        {
-          bidder: 'criteo',
-          adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
-          sizes: [[640, 480]],
-          mediaTypes: {
-            video: {
-              playerSize: [640, 480],
-              mimes: ['video/mp4', 'video/x-flv'],
-              maxduration: 30,
-              api: [1, 2],
-              protocols: [2, 3],
-              plcmt: 3
-            }
-          },
-          params: {
-            zoneId: 123,
-            video: {
-              skip: 1,
-              minduration: 5,
-              startdelay: 5,
-              playbackmethod: [1, 3],
-              placement: 2
-            }
-          },
-        },
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d/);
-      expect(request.method).to.equal('POST');
-      const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
-      expect(ortbRequest.slots[0].sizes).to.deep.equal([]);
-      expect(ortbRequest.slots[0].video.playersizes).to.deep.equal(['640x480']);
-      expect(ortbRequest.slots[0].video.maxduration).to.equal(30);
-      expect(ortbRequest.slots[0].video.api).to.deep.equal([1, 2]);
-      expect(ortbRequest.slots[0].video.protocols).to.deep.equal([2, 3]);
-      expect(ortbRequest.slots[0].video.skip).to.equal(1);
-      expect(ortbRequest.slots[0].video.minduration).to.equal(5);
-      expect(ortbRequest.slots[0].video.startdelay).to.equal(5);
-      expect(ortbRequest.slots[0].video.playbackmethod).to.deep.equal([1, 3]);
-      expect(ortbRequest.slots[0].video.placement).to.equal(2);
-      expect(ortbRequest.slots[0].video.plcmt).to.equal(3);
-    });
-
-    it('should properly build a video request with more than one player size', function () {
-      const bidRequests = [
-        {
-          bidder: 'criteo',
-          adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
-          sizes: [[640, 480], [800, 600]],
-          mediaTypes: {
-            video: {
-              playerSize: [[640, 480], [800, 600]],
-              mimes: ['video/mp4', 'video/x-flv'],
-              maxduration: 30,
-              api: [1, 2],
-              protocols: [2, 3]
-            }
-          },
-          params: {
-            zoneId: 123,
-            video: {
-              skip: 1,
-              minduration: 5,
-              startdelay: 5,
-              playbackmethod: [1, 3],
-              placement: 2
-            }
-          },
-        },
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d/);
-      expect(request.method).to.equal('POST');
-      const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].sizes).to.deep.equal([]);
-      expect(ortbRequest.slots[0].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
-      expect(ortbRequest.slots[0].video.playersizes).to.deep.equal(['640x480', '800x600']);
-      expect(ortbRequest.slots[0].video.maxduration).to.equal(30);
-      expect(ortbRequest.slots[0].video.api).to.deep.equal([1, 2]);
-      expect(ortbRequest.slots[0].video.protocols).to.deep.equal([2, 3]);
-      expect(ortbRequest.slots[0].video.skip).to.equal(1);
-      expect(ortbRequest.slots[0].video.minduration).to.equal(5);
-      expect(ortbRequest.slots[0].video.startdelay).to.equal(5);
-      expect(ortbRequest.slots[0].video.playbackmethod).to.deep.equal([1, 3]);
-      expect(ortbRequest.slots[0].video.placement).to.equal(2);
-    });
-
-    it('should properly build a video request when mediaTypes.video.skip=0', function () {
-      const bidRequests = [
-        {
-          bidder: 'criteo',
-          adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
-          sizes: [[300, 250]],
-          mediaTypes: {
-            video: {
-              playerSize: [[300, 250]],
-              mimes: ['video/mp4', 'video/MPV', 'video/H264', 'video/webm', 'video/ogg'],
-              minduration: 1,
-              maxduration: 30,
-              playbackmethod: [2, 3, 4, 5, 6],
-              api: [1, 2, 3, 4, 5, 6],
-              protocols: [1, 2, 3, 4, 5, 6, 7, 8],
-              skip: 0
-            }
-          },
-          params: {
-            networkId: 123
-          }
-        }
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d/);
-      expect(request.method).to.equal('POST');
-      const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].sizes).to.deep.equal([]);
-      expect(ortbRequest.slots[0].video.playersizes).to.deep.equal(['300x250']);
-      expect(ortbRequest.slots[0].video.mimes).to.deep.equal(['video/mp4', 'video/MPV', 'video/H264', 'video/webm', 'video/ogg']);
-      expect(ortbRequest.slots[0].video.minduration).to.equal(1);
-      expect(ortbRequest.slots[0].video.maxduration).to.equal(30);
-      expect(ortbRequest.slots[0].video.playbackmethod).to.deep.equal([2, 3, 4, 5, 6]);
-      expect(ortbRequest.slots[0].video.api).to.deep.equal([1, 2, 3, 4, 5, 6]);
-      expect(ortbRequest.slots[0].video.protocols).to.deep.equal([1, 2, 3, 4, 5, 6, 7, 8]);
-      expect(ortbRequest.slots[0].video.skip).to.equal(0);
-    });
-
-    it('should properly build a request with ceh', function () {
+    it('should properly build a request with bapp field', function () {
+      const bapp = ['com.foo.mygame'];
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1464,64 +1314,206 @@ describe('The Criteo bidding adapter', function () {
           },
         },
       ];
-      config.setConfig({
-        criteo: {
-          ceh: 'hashedemail'
+      const bidderRequest = {
+        ortb2: {
+          bapp
         }
-      });
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.user).to.not.be.null;
-      expect(request.data.user.ceh).to.equal('hashedemail');
+      };
+
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.bapp).to.deep.equal(bapp);
     });
 
-    it('should properly build a request without first party data', function () {
-      const bidRequests = [
-        {
-          bidder: 'criteo',
-          adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
-          mediaTypes: {
-            banner: {
-              sizes: [[728, 90]]
-            }
+    if (FEATURES.VIDEO) {
+      it('should properly build a video request', function () {
+        const bidRequests = [
+          {
+            bidder: 'criteo',
+            adUnitCode: 'bid-123',
+            sizes: [[640, 480]],
+            mediaTypes: {
+              video: {
+                context: 'inbanner',
+                playerSize: [640, 480],
+                mimes: ['video/mp4', 'video/x-flv'],
+                maxduration: 30,
+                api: [1, 2],
+                protocols: [2, 3],
+                plcmt: 3,
+                w: 640,
+                h: 480,
+                linearity: 1,
+                skipmin: 30,
+                skipafter: 30,
+                minbitrate: 10000,
+                maxbitrate: 48000,
+                delivery: [1, 2, 3],
+                pos: 1,
+                playbackend: 1,
+                adPodDurationSec: 30,
+                durationRangeSec: [1, 30],
+              }
+            },
+            params: {
+              zoneId: 123,
+              video: {
+                skip: 1,
+                minduration: 5,
+                startdelay: 5,
+                playbackmethod: [1, 3],
+                placement: 2
+              }
+            },
           },
-          params: {
-            zoneId: 123
-          }
-        },
-      ];
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        expect(request.url).to.match(/^https:\/\/grid-bidder\.criteo\.com\/openrtb_2_5\/pbjs\/auction\/request\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&lsavail=[01]&debug=[01]&nolog=[01]$/);
+        expect(request.method).to.equal('POST');
+        const ortbRequest = request.data;
+        expect(ortbRequest.imp).to.have.lengthOf(1);
+        expect(ortbRequest.imp[0].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
+        expect(ortbRequest.imp[0].video.maxduration).to.equal(30);
+        expect(ortbRequest.imp[0].video.api).to.deep.equal([1, 2]);
+        expect(ortbRequest.imp[0].video.protocols).to.deep.equal([2, 3]);
+        expect(ortbRequest.imp[0].video.skip).to.equal(1);
+        expect(ortbRequest.imp[0].video.minduration).to.equal(5);
+        expect(ortbRequest.imp[0].video.startdelay).to.equal(5);
+        expect(ortbRequest.imp[0].video.playbackmethod).to.deep.equal([1, 3]);
+        expect(ortbRequest.imp[0].video.placement).to.equal(2);
+        expect(ortbRequest.imp[0].video.w).to.equal(640);
+        expect(ortbRequest.imp[0].video.h).to.equal(480);
+        expect(ortbRequest.imp[0].video.linearity).to.equal(1);
+        expect(ortbRequest.imp[0].video.skipmin).to.equal(30);
+        expect(ortbRequest.imp[0].video.skipafter).to.equal(30);
+        expect(ortbRequest.imp[0].video.minbitrate).to.equal(10000);
+        expect(ortbRequest.imp[0].video.maxbitrate).to.equal(48000);
+        expect(ortbRequest.imp[0].video.delivery).to.deep.equal([1, 2, 3]);
+        expect(ortbRequest.imp[0].video.pos).to.equal(1);
+        expect(ortbRequest.imp[0].video.playbackend).to.equal(1);
+        expect(ortbRequest.imp[0].video.ext.context).to.equal('inbanner');
+        expect(ortbRequest.imp[0].video.ext.playersizes).to.deep.equal(['640x480']);
+        expect(ortbRequest.imp[0].video.ext.plcmt).to.equal(3);
+        expect(ortbRequest.imp[0].video.ext.poddur).to.equal(30);
+        expect(ortbRequest.imp[0].video.ext.rqddurs).to.deep.equal([1, 30]);
+      });
+    }
 
-      const request = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2: {} });
-      expect(request.data.publisher.ext).to.equal(undefined);
-      expect(request.data.user.ext).to.equal(undefined);
-      expect(request.data.slots[0].ext).to.equal(undefined);
-    });
+    if (FEATURES.VIDEO) {
+      it('should properly build a video request with more than one player size', function () {
+        const bidRequests = [
+          {
+            bidder: 'criteo',
+            adUnitCode: 'bid-123',
+            sizes: [[640, 480], [800, 600]],
+            mediaTypes: {
+              video: {
+                playerSize: [[640, 480], [800, 600]],
+                mimes: ['video/mp4', 'video/x-flv'],
+                maxduration: 30,
+                api: [1, 2],
+                protocols: [2, 3]
+              }
+            },
+            params: {
+              zoneId: 123,
+              video: {
+                skip: 1,
+                minduration: 5,
+                startdelay: 5,
+                playbackmethod: [1, 3],
+                placement: 2
+              }
+            },
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        expect(request.url).to.match(/^https:\/\/grid-bidder\.criteo\.com\/openrtb_2_5\/pbjs\/auction\/request\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&lsavail=[01]&debug=[01]&nolog=[01]$/);
+        expect(request.method).to.equal('POST');
+        const ortbRequest = request.data;
+        expect(ortbRequest.imp[0].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
+        expect(ortbRequest.imp[0].video.maxduration).to.equal(30);
+        expect(ortbRequest.imp[0].video.api).to.deep.equal([1, 2]);
+        expect(ortbRequest.imp[0].video.protocols).to.deep.equal([2, 3]);
+        expect(ortbRequest.imp[0].video.skip).to.equal(1);
+        expect(ortbRequest.imp[0].video.minduration).to.equal(5);
+        expect(ortbRequest.imp[0].video.startdelay).to.equal(5);
+        expect(ortbRequest.imp[0].video.playbackmethod).to.deep.equal([1, 3]);
+        expect(ortbRequest.imp[0].video.placement).to.equal(2);
+        expect(ortbRequest.imp[0].video.w).to.equal(640);
+        expect(ortbRequest.imp[0].video.h).to.equal(480);
+        expect(ortbRequest.imp[0].video.ext.playersizes).to.deep.equal(['640x480', '800x600']);
+        expect(ortbRequest.imp[0].ext.bidder.zoneid).to.equal(123);
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('should properly build a video request when mediaTypes.video.skip=0', function () {
+        const bidRequests = [
+          {
+            bidder: 'criteo',
+            adUnitCode: 'bid-123',
+            sizes: [[300, 250]],
+            mediaTypes: {
+              video: {
+                playerSize: [[300, 250]],
+                mimes: ['video/mp4', 'video/MPV', 'video/H264', 'video/webm', 'video/ogg'],
+                minduration: 1,
+                maxduration: 30,
+                playbackmethod: [2, 3, 4, 5, 6],
+                api: [1, 2, 3, 4, 5, 6],
+                protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+                skip: 0
+              }
+            },
+            params: {
+              networkId: 456
+            }
+          }
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        expect(request.url).to.match(/^https:\/\/grid-bidder\.criteo\.com\/openrtb_2_5\/pbjs\/auction\/request\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&lsavail=[01]&debug=[01]&nolog=[01]&networkId=456$/);
+        expect(request.method).to.equal('POST');
+        const ortbRequest = request.data;
+        expect(ortbRequest.imp[0].video.mimes).to.deep.equal(['video/mp4', 'video/MPV', 'video/H264', 'video/webm', 'video/ogg']);
+        expect(ortbRequest.imp[0].video.minduration).to.equal(1);
+        expect(ortbRequest.imp[0].video.maxduration).to.equal(30);
+        expect(ortbRequest.imp[0].video.playbackmethod).to.deep.equal([2, 3, 4, 5, 6]);
+        expect(ortbRequest.imp[0].video.api).to.deep.equal([1, 2, 3, 4, 5, 6]);
+        expect(ortbRequest.imp[0].video.protocols).to.deep.equal([1, 2, 3, 4, 5, 6, 7, 8]);
+        expect(ortbRequest.imp[0].video.skip).to.equal(0);
+        expect(ortbRequest.imp[0].video.w).to.equal(300);
+        expect(ortbRequest.imp[0].video.h).to.equal(250);
+        expect(ortbRequest.imp[0].video.ext.playersizes).to.deep.equal(['300x250']);
+      });
+    }
 
-    it('should properly build a request with criteo specific ad unit first party data', function () {
-      // TODO: this test does not do what it says
+    it('should properly build a request without first party data', function () {
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
             }
           },
           params: {
-            zoneId: 123,
-            ext: {
-              bidfloor: 0.75
-            }
+            zoneId: 123
           }
         },
       ];
 
-      const request = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2: {} });
-      expect(request.data.slots[0].ext).to.deep.equal({
-        bidfloor: 0.75,
-      });
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest({ ...bidderRequest, ortb2: {} })).data;
+      expect(ortbRequest.site.page).to.equal(refererUrl);
+      expect(ortbRequest.imp).to.have.lengthOf(1);
+      expect(ortbRequest.imp[0].tagid).to.equal('bid-123');
+      expect(ortbRequest.imp[0].banner.format).to.have.lengthOf(1);
+      expect(ortbRequest.imp[0].banner.format[0].w).to.equal(728);
+      expect(ortbRequest.imp[0].banner.format[0].h).to.equal(90);
+      expect(ortbRequest.imp[0].ext.bidder.zoneid).to.equal(123);
+      expect(ortbRequest.user.ext.consent).to.equal('consentDataString');
+      expect(ortbRequest.regs.ext.gdpr).to.equal(1);
+      expect(ortbRequest.regs.ext.gdprversion).to.equal(1);
     });
 
     it('should properly build a request with first party data', function () {
@@ -1567,7 +1559,6 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
@@ -1594,41 +1585,34 @@ describe('The Criteo bidding adapter', function () {
         user: userData
       };
 
-      const request = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2 });
-      expect(request.data.publisher.ext).to.deep.equal({ data: { pageType: 'article' } });
-      expect(request.data.user).to.deep.equal(userData);
-      expect(request.data.site).to.deep.equal(siteData);
-      expect(request.data.slots[0].ext).to.deep.equal({
-        bidfloor: 0.75,
-        data: {
-          someContextAttribute: 'abc'
-        }
-      });
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest({ ...bidderRequest, ortb2 })).data;
+      expect(ortbRequest.user).to.deep.equal({ ...userData, ext: { ...userData.ext, consent: 'consentDataString' } });
+      expect(ortbRequest.site).to.deep.equal({ ...siteData, page: refererUrl, domain: 'criteo.com', publisher: { ...ortbRequest.site.publisher, domain: 'criteo.com' } });
+      expect(ortbRequest.imp[0].ext.bidfloor).to.equal(0.75);
+      expect(ortbRequest.imp[0].ext.data.someContextAttribute).to.equal('abc')
     });
 
     it('should properly build a request when coppa flag is true', function () {
       const bidRequests = [];
       const bidderRequest = {};
       config.setConfig({ coppa: true });
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.regs.coppa).to.not.be.undefined;
-      expect(request.data.regs.coppa).to.equal(1);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.regs.coppa).to.equal(1);
     });
 
     it('should properly build a request when coppa flag is false', function () {
       const bidRequests = [];
       const bidderRequest = {};
       config.setConfig({ coppa: false });
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.regs.coppa).to.not.be.undefined;
-      expect(request.data.regs.coppa).to.equal(0);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.regs.coppa).to.equal(0);
     });
 
     it('should properly build a request when coppa flag is not defined', function () {
       const bidRequests = [];
       const bidderRequest = {};
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.regs.coppa).to.be.undefined;
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.regs?.coppa).to.be.undefined;
     });
 
     it('should properly build a banner request with floors', function () {
@@ -1636,7 +1620,6 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[300, 250], [728, 90]]
@@ -1664,8 +1647,8 @@ describe('The Criteo bidding adapter', function () {
         },
       ];
       const bidderRequest = {};
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.slots[0].ext.floors).to.deep.equal({
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp[0].ext.floors).to.deep.equal({
         'banner': {
           '300x250': { 'currency': 'USD', 'floor': 1 },
           '728x90': { 'currency': 'USD', 'floor': 2 }
@@ -1678,7 +1661,6 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[300, 250], [728, 90]]
@@ -1692,8 +1674,8 @@ describe('The Criteo bidding adapter', function () {
         },
       ];
       const bidderRequest = {};
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.slots[0].ext.floors).to.deep.equal({
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp[0].ext.floors).to.deep.equal({
         'banner': {
           '300x250': { 'currency': 'EUR', 'floor': 1 },
           '728x90': { 'currency': 'EUR', 'floor': 1 }
@@ -1706,7 +1688,6 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             video: {
               playerSize: [[300, 250], [728, 90]]
@@ -1734,8 +1715,8 @@ describe('The Criteo bidding adapter', function () {
         },
       ];
       const bidderRequest = {};
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.slots[0].ext.floors).to.deep.equal({
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp[0].ext.floors).to.deep.equal({
         'video': {
           '300x250': { 'currency': 'USD', 'floor': 1 },
           '728x90': { 'currency': 'USD', 'floor': 2 }
@@ -1743,221 +1724,454 @@ describe('The Criteo bidding adapter', function () {
       });
     });
 
-    it('should properly build a multi format request with floors', function () {
+    if (FEATURES.VIDEO && FEATURES.NATIVE) {
+      it('should properly build a multi format request with floors', function () {
+        const bidRequests = [
+          {
+            bidder: 'criteo',
+            adUnitCode: 'bid-123',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250], [728, 90]]
+              },
+              video: {
+                playerSize: [640, 480],
+              },
+              native: {}
+            },
+            params: {
+              networkId: 456,
+            },
+            ortb2Imp: {
+              ext: {
+                data: {
+                  someContextAttribute: 'abc'
+                }
+              }
+            },
+
+            getFloor: inputParams => {
+              if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+                return {
+                  currency: 'USD',
+                  floor: 1.0
+                };
+              } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+                return {
+                  currency: 'USD',
+                  floor: 2.0
+                };
+              } else if (inputParams.mediaType === VIDEO && inputParams.size[0] === 640 && inputParams.size[1] === 480) {
+                return {
+                  currency: 'EUR',
+                  floor: 3.2
+                };
+              } else if (inputParams.mediaType === NATIVE && inputParams.size === '*') {
+                return {
+                  currency: 'YEN',
+                  floor: 4.99
+                };
+              } else {
+                return {}
+              }
+            }
+          },
+        ];
+        const bidderRequest = {};
+        const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+        expect(ortbRequest.imp[0].banner).not.to.be.null;
+        expect(ortbRequest.imp[0].video).not.to.be.null;
+        expect(ortbRequest.imp[0].native.request_native).not.to.be.null;
+        expect(ortbRequest.imp[0].ext.data.someContextAttribute).to.deep.equal('abc');
+        expect(ortbRequest.imp[0].ext.floors).to.deep.equal({
+          'banner': {
+            '300x250': { 'currency': 'USD', 'floor': 1 },
+            '728x90': { 'currency': 'USD', 'floor': 2 }
+          },
+          'video': {
+            '640x480': { 'currency': 'EUR', 'floor': 3.2 }
+          },
+          'native': {
+            '*': { 'currency': 'YEN', 'floor': 4.99 }
+          }
+        });
+      });
+    }
+
+    it('should properly build a request when imp.rwdd is present', function () {
+      const bidderRequest = {};
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
-              sizes: [[300, 250], [728, 90]]
-            },
-            video: {
-              playerSize: [640, 480],
-            },
-            native: {}
+              sizes: [[728, 90]]
+            }
           },
           params: {
-            networkId: 456,
+            zoneId: 123
           },
           ortb2Imp: {
-            ext: {
-              data: {
-                someContextAttribute: 'abc'
-              }
-            }
-          },
+            rwdd: 1
+          }
+        },
+      ];
 
-          getFloor: inputParams => {
-            if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
-              return {
-                currency: 'USD',
-                floor: 1.0
-              };
-            } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
-              return {
-                currency: 'USD',
-                floor: 2.0
-              };
-            } else if (inputParams.mediaType === VIDEO && inputParams.size[0] === 640 && inputParams.size[1] === 480) {
-              return {
-                currency: 'EUR',
-                floor: 3.2
-              };
-            } else if (inputParams.mediaType === NATIVE && inputParams.size === '*') {
-              return {
-                currency: 'YEN',
-                floor: 4.99
-              };
-            } else {
-              return {}
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp[0].ext.rwdd).to.equal(1);
+    });
+
+    it('should properly build a request when imp.rwdd is false', function () {
+      const bidderRequest = {};
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
             }
+          },
+          params: {
+            zoneId: 123
+          },
+          ortb2Imp: {
+            rwdd: 0
           }
         },
       ];
-      const bidderRequest = {};
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.slots[0].ext.data.someContextAttribute).to.deep.equal('abc');
-      expect(request.data.slots[0].ext.floors).to.deep.equal({
-        'banner': {
-          '300x250': { 'currency': 'USD', 'floor': 1 },
-          '728x90': { 'currency': 'USD', 'floor': 2 }
-        },
-        'video': {
-          '640x480': { 'currency': 'EUR', 'floor': 3.2 }
-        },
-        'native': {
-          '*': { 'currency': 'YEN', 'floor': 4.99 }
-        }
-      });
+
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp[0].ext?.rwdd).to.equal(0);
     });
 
-    it('should properly build a request when imp.rwdd is present', function () {
-      const bidderRequest = {};
+    it('should properly build a request when FLEDGE is enabled', function () {
+      const bidderRequest = {
+        paapi: {
+          enabled: true
+        }
+      };
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
             }
           },
           params: {
-            zoneId: 123,
-            ext: {
-              bidfloor: 0.75
-            }
+            zoneId: 123
           },
           ortb2Imp: {
-            rwdd: 1,
             ext: {
-              data: {
-                someContextAttribute: 'abc'
+              igs: {
+                ae: 1
               }
             }
           }
         },
       ];
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.slots[0].rwdd).to.be.not.null;
-      expect(request.data.slots[0].rwdd).to.equal(1);
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp[0].ext.igs.ae).to.equal(1);
     });
 
-    it('should properly build a request when imp.rwdd is false', function () {
-      const bidderRequest = {};
+    it('should properly build a request when FLEDGE is disabled', function () {
+      const bidderRequest = {
+        paapi: {
+          enabled: false
+        },
+      };
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
             }
           },
           params: {
-            zoneId: 123,
-            ext: {
-              bidfloor: 0.75
-            }
+            zoneId: 123
           },
           ortb2Imp: {
-            rwdd: 0,
             ext: {
-              data: {
-                someContextAttribute: 'abc'
+              igs: {
+                ae: 1
               }
             }
           }
         },
       ];
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.slots[0].rwdd).to.be.undefined;
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp[0].ext.igs?.ae).to.be.undefined;
     });
-  });
 
-  describe('interpretResponse', function () {
-    it('should return an empty array when parsing a no bid response', function () {
-      const response = {};
-      const request = { bidRequests: [] };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
-    });
-
-    it('should properly parse a bid response with a networkId', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            cpm: 1.23,
-            creative: 'test-ad',
-            creativecode: 'test-crId',
-            width: 728,
-            height: 90,
-            deal: 'myDealCode',
-            adomain: ['criteo.com'],
-            ext: {
-              meta: {
-                networkName: 'Criteo'
-              }
+    it('should properly transmit the pubid and slot uid if available', function () {
+      const bidderRequest = {
+        ortb2: {
+          site: {
+            publisher: {
+              id: 'pub-777'
             }
-          }],
-        },
+          }
+        }
       };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          ortb2Imp: {
+            ext: {
+              tid: 'transaction-123',
+            },
+          },
           mediaTypes: {
             banner: {
               sizes: [[728, 90]]
             }
           },
+          params: {
+            zoneId: 123,
+          },
+        },
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-234',
+          ortb2Imp: {
+            ext: {
+              tid: 'transaction-234',
+            },
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [728, 90]]
+            }
+          },
           params: {
             networkId: 456,
+            pubid: 'pub-888',
+            uid: 888
+          },
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const ortbRequest = request.data;
+      expect(ortbRequest.site.publisher.id).to.equal('pub-888');
+      expect(ortbRequest.imp[0].ext.bidder.uid).to.be.undefined;
+      expect(ortbRequest.imp[1].ext.bidder.uid).to.equal(888);
+    });
+
+    it('should properly transmit device.ext.cdep if available', function () {
+      const bidderRequest = {
+        ortb2: {
+          device: {
+            ext: {
+              cdep: 'cookieDeprecationLabel'
+            }
           }
-        }]
+        }
+      };
+      const bidRequests = [];
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const ortbRequest = request.data;
+      expect(ortbRequest.device.ext.cdep).to.equal('cookieDeprecationLabel');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const refererUrl = 'https://criteo.com?pbt_debug=1&pbt_nolog=1';
+    const bidderRequest = {
+      refererInfo: {
+        page: refererUrl,
+        topmostLocation: refererUrl
+      },
+      timeout: 3000,
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'consentDataString',
+        vendorData: {
+          vendorConsents: {
+            '91': 1
+          },
+        },
+        apiVersion: 1,
+      },
+    };
+
+    function mockResponse(winningBidId, mediaType) {
+      return {
+        id: 'test-requestId',
+        seatbid: [
+          {
+            seat: 'criteo',
+            bid: [
+              {
+                id: 'test-bidderId',
+                impid: winningBidId,
+                price: 1.23,
+                adomain: ['criteo.com'],
+                bundle: '',
+                iurl: 'http://some_image/',
+                cid: '123456',
+                crid: 'test-crId',
+                dealid: 'deal-code',
+                w: 728,
+                h: 90,
+                adm: 'test-ad',
+                adm_native: mediaType === NATIVE ? {
+                  ver: '1.2',
+                  assets: [
+                    {
+                      id: 10,
+                      title: {
+                        text: 'Some product'
+                      }
+                    },
+                    {
+                      id: 11,
+                      img: {
+                        type: 3,
+                        url: 'https://main_image_url.com',
+                        w: 400,
+                        h: 400
+                      }
+                    },
+                    {
+                      id: 12,
+                      data: {
+                        value: 'Some product'
+                      }
+                    },
+                    {
+                      id: 13,
+                      data: {
+                        value: '1,499 TL'
+                      }
+                    },
+                    {
+                      id: 15,
+                      data: {
+                        value: 'CTA'
+                      },
+                      link: {
+                        url: 'https://cta_url.com'
+                      }
+                    },
+                    {
+                      id: 17,
+                      img: {
+                        type: 1,
+                        url: 'https://main_image_url.com',
+                        w: 200,
+                        h: 200
+                      },
+                      link: {
+                        url: 'https://icon_image_url.com'
+                      }
+                    },
+                    {
+                      id: 16,
+                      data: {
+                        value: 'Some brand'
+                      }
+                    }
+                  ],
+                  eventtrackers: [
+                    {
+                      event: 1,
+                      method: 1,
+                      url: 'https://eventtrackers.com'
+                    },
+                    {
+                      event: 1,
+                      method: 1,
+                      url: 'https://test_in_isolation.criteo.com/tpd?dd=HTlW9l9xTEZqRHVlSHFiSWx5Q2VQMlEwSTJhNCUyQkxNazQ1Y29LR3ZmS2VTSDFsUGdkRHNoWjQ2UWp0SGtVZ1RTbHI0TFRpTlVqNWxiUkZOeGVFNjVraW53R0loRVJQNDJOY2R1eWxVdjBBQ1BEdVFvTyUyRlg3aWJaeUFha3UyemNNVGpmJTJCS1prc0FwRjZRJTJCQ2dpaFBJeVhZRmQlMkZURVZocUFRdm03OTdFZHZSbURNZWt4Uzh2M1NSUUxmTmhaTnNnRXd4VkZlOTdJOXdnNGZjaVolMkZWYmdYVjJJMkQ0eGxQaFIwQmVtWk1sQ09tNXlGY0Nwc09GTDladzExJTJGVExGNXJsdGpneERDeTMlMkJuNUlUcEU4NDFLMTZPc2ZoWFUwMmpGbDFpVjBPZUVtTlEwaWNOeHRyRFYyenRKd0lpJTJGTTElMkY1WGZ3Smo3aTh0bUJzdzZRdlZUSXppanNkamo3ekZNZjhKdjl2VDJ5eHV1YnVzdmdRdk5iWnprNXVFMVdmbGs0QU1QY0ozZQ'
+                    }
+                  ],
+                  privacy: 'https://cta_url.com',
+                  ext: {
+                    privacy: {
+                      imageurl: 'https://icon_image_url.com',
+                      clickurl: 'https://cta_url.com',
+                      longlegaltext: ''
+                    }
+                  }
+                } : undefined,
+                ext: {
+                  mediatype: mediaType,
+                  displayurl: mediaType === VIDEO ? 'http://test-ad' : undefined,
+                  dsa: {
+                    adrender: 1
+                  },
+                  meta: {
+                    networkName: 'Criteo'
+                  },
+                  videoPlayerType: mediaType === VIDEO ? 'RadiantMediaPlayer' : undefined,
+                  videoPlayerConfig: mediaType === VIDEO ? {} : undefined,
+                  cur: 'CUR'
+                }
+              }
+            ]
+          }
+        ]
       };
+    }
+
+    it('should return an empty array when parsing an empty bid response', function () {
+      const bidRequests = [];
+      const response = {};
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
       const bids = spec.interpretResponse(response, request);
+      expect(bids).to.have.lengthOf(0);
+    });
+
+    it('should return an empty array when parsing a well-formed no bid response', function () {
+      const bidRequests = [];
+      const response = { seatbid: [] };
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const bids = spec.interpretResponse({ body: response }, request);
+      expect(bids).to.have.lengthOf(0);
+    });
+
+    it('should properly parse a banner bid response', function () {
+      const bidRequests = [{
+        adUnitCode: 'test-requestId',
+        bidId: 'test-bidId',
+        mediaTypes: {
+          banner: {
+            sizes: [[728, 90]]
+          }
+        },
+        params: {
+          networkId: 456,
+        }
+      }];
+      const response = mockResponse('test-bidId', BANNER);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const bids = spec.interpretResponse({ body: response }, request);
       expect(bids).to.have.lengthOf(1);
+      expect(bids[0].mediaType).to.equal(BANNER);
       expect(bids[0].requestId).to.equal('test-bidId');
+      expect(bids[0].seatBidId).to.equal('test-bidderId')
       expect(bids[0].cpm).to.equal(1.23);
-      expect(bids[0].ad).to.equal('test-ad');
-      expect(bids[0].creativeId).to.equal('test-crId');
+      expect(bids[0].currency).to.equal('CUR');
       expect(bids[0].width).to.equal(728);
       expect(bids[0].height).to.equal(90);
-      expect(bids[0].dealId).to.equal('myDealCode');
+      expect(bids[0].ad).to.equal('test-ad');
+      expect(bids[0].creativeId).to.equal('test-crId');
+      expect(bids[0].dealId).to.equal('deal-code');
       expect(bids[0].meta.advertiserDomains[0]).to.equal('criteo.com');
       expect(bids[0].meta.networkName).to.equal('Criteo');
+      expect(bids[0].meta.dsa.adrender).to.equal(1);
     });
 
-    it('should properly parse a bid response with a networkId with twin ad unit banner win', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            cpm: 1.23,
-            creative: 'test-ad',
-            creativecode: 'test-crId',
-            width: 728,
-            height: 90,
-            deal: 'myDealCode',
-            adomain: ['criteo.com'],
-            ext: {
-              meta: {
-                networkName: 'Criteo'
-              }
-            }
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
+    if (FEATURES.VIDEO) {
+      it('should properly parse a bid response with a video', function () {
+        const bidRequests = [{
           adUnitCode: 'test-requestId',
           bidId: 'test-bidId',
           mediaTypes: {
@@ -1971,70 +2185,161 @@ describe('The Criteo bidding adapter', function () {
             }
           },
           params: {
-            networkId: 456,
+            zoneId: 123,
           },
-        }, {
+        }];
+        const response = mockResponse('test-bidId', VIDEO);
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(VIDEO);
+        expect(bids[0].requestId).to.equal('test-bidId');
+        expect(bids[0].seatBidId).to.equal('test-bidderId')
+        expect(bids[0].cpm).to.equal(1.23);
+        expect(bids[0].currency).to.equal('CUR');
+        expect(bids[0].vastUrl).to.equal('http://test-ad');
+        expect(bids[0].vastXml).to.equal('test-ad');
+        expect(bids[0].playerWidth).to.equal(640);
+        expect(bids[0].playerHeight).to.equal(480);
+        expect(bids[0].renderer).to.equal(undefined);
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('should properly parse a bid response with an outstream video', function () {
+        const bidRequests = [{
           adUnitCode: 'test-requestId',
-          bidId: 'test-bidId2',
+          bidId: 'test-bidId',
           mediaTypes: {
-            banner: {
-              sizes: [[728, 90]]
+            video: {
+              context: 'outstream',
+              mimes: ['video/mpeg'],
+              playerSize: [640, 480],
+              protocols: [5, 6],
+              maxduration: 30,
+              api: [1, 2]
             }
           },
           params: {
             networkId: 456,
+          },
+        }];
+        const response = mockResponse('test-bidId', VIDEO);
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(VIDEO);
+        expect(bids[0].requestId).to.equal('test-bidId');
+        expect(bids[0].seatBidId).to.equal('test-bidderId')
+        expect(bids[0].cpm).to.equal(1.23);
+        expect(bids[0].currency).to.equal('CUR');
+        expect(bids[0].vastUrl).to.equal('http://test-ad');
+        expect(bids[0].vastXml).to.equal('test-ad');
+        expect(bids[0].playerWidth).to.equal(640);
+        expect(bids[0].playerHeight).to.equal(480);
+        expect(bids[0].renderer.url).to.equal('https://static.criteo.net/js/ld/publishertag.renderer.js');
+        expect(typeof bids[0].renderer.config.documentResolver).to.equal('function');
+        expect(typeof bids[0].renderer._render).to.equal('function');
+      });
+    }
+
+    if (FEATURES.NATIVE) {
+      it('should properly parse a native bid response', function () {
+        const bidRequests = [{
+          adUnitCode: 'test-requestId',
+          bidId: 'test-bidId',
+          params: {
+            zoneId: '123',
+          },
+          native: true,
+        }];
+        const response = mockResponse('test-bidId', NATIVE);
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(NATIVE);
+        expect(bids[0].requestId).to.equal('test-bidId');
+        expect(bids[0].seatBidId).to.equal('test-bidderId')
+        expect(bids[0].cpm).to.equal(1.23);
+        expect(bids[0].currency).to.equal('CUR');
+        expect(bids[0].width).to.equal(728);
+        expect(bids[0].height).to.equal(90);
+        expect(bids[0].ad).to.equal(undefined);
+        expect(bids[0].native.ortb).not.to.be.null;
+        expect(bids[0].native.ortb).to.equal(response.seatbid[0].bid[0].adm); // adm_native field was moved to adm
+        expect(bids[0].creativeId).to.equal('test-crId');
+        expect(bids[0].dealId).to.equal('deal-code');
+        expect(bids[0].meta.advertiserDomains[0]).to.equal('criteo.com');
+        expect(bids[0].meta.networkName).to.equal('Criteo');
+        expect(bids[0].meta.dsa.adrender).to.equal(1);
+      });
+    }
+
+    it('should properly parse a bid response when banner win with twin ad units', function () {
+      const bidRequests = [{
+        adUnitCode: 'test-requestId',
+        bidId: 'test-bidId',
+        mediaTypes: {
+          video: {
+            context: 'instream',
+            mimes: ['video/mpeg'],
+            playerSize: [640, 480],
+            protocols: [5, 6],
+            maxduration: 30,
+            api: [1, 2]
           }
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
+        },
+        params: {
+          networkId: 456,
+        },
+      }, {
+        adUnitCode: 'test-requestId',
+        bidId: 'test-bidId2',
+        mediaTypes: {
+          banner: {
+            sizes: [[728, 90]]
+          }
+        },
+        params: {
+          networkId: 456,
+        }
+      }];
+      const response = mockResponse('test-bidId2', BANNER);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const bids = spec.interpretResponse({ body: response }, request);
       expect(bids).to.have.lengthOf(1);
+      expect(bids[0].mediaType).to.equal(BANNER);
       expect(bids[0].requestId).to.equal('test-bidId2');
+      expect(bids[0].seatBidId).to.equal('test-bidderId')
       expect(bids[0].cpm).to.equal(1.23);
-      expect(bids[0].ad).to.equal('test-ad');
-      expect(bids[0].creativeId).to.equal('test-crId');
+      expect(bids[0].currency).to.equal('CUR');
       expect(bids[0].width).to.equal(728);
       expect(bids[0].height).to.equal(90);
-      expect(bids[0].dealId).to.equal('myDealCode');
+      expect(bids[0].ad).to.equal('test-ad');
+      expect(bids[0].creativeId).to.equal('test-crId');
+      expect(bids[0].dealId).to.equal('deal-code');
       expect(bids[0].meta.advertiserDomains[0]).to.equal('criteo.com');
       expect(bids[0].meta.networkName).to.equal('Criteo');
+      expect(bids[0].meta.dsa.adrender).to.equal(1);
     });
 
-    it('should properly parse a bid response with a networkId with twin ad unit video win', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            displayurl: 'http://test-ad',
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            video: true,
-            ext: {
-              meta: {
-                networkName: 'Criteo'
-              }
-            }
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
+    if (FEATURES.VIDEO) {
+      it('should properly parse a bid response when video win with twin ad units', function () {
+        const bidRequests = [{
           adUnitCode: 'test-requestId',
           bidId: 'test-bidId',
           mediaTypes: {
             video: {
               context: 'instream',
               mimes: ['video/mpeg'],
-              playerSize: [728, 90],
+              playerSize: [640, 480],
               protocols: [5, 6],
               maxduration: 30,
               api: [1, 2]
             }
           },
           params: {
-            networkId: 456,
+            zoneId: '123'
           },
         }, {
           adUnitCode: 'test-requestId',
@@ -2047,63 +2352,27 @@ describe('The Criteo bidding adapter', function () {
           params: {
             networkId: 456,
           }
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(1);
-      expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].cpm).to.equal(1.23);
-      expect(bids[0].vastUrl).to.equal('http://test-ad');
-      expect(bids[0].mediaType).to.equal(VIDEO);
-    });
+        }];
+        const response = mockResponse('test-bidId', VIDEO);
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(VIDEO);
+        expect(bids[0].requestId).to.equal('test-bidId');
+        expect(bids[0].seatBidId).to.equal('test-bidderId')
+        expect(bids[0].cpm).to.equal(1.23);
+        expect(bids[0].currency).to.equal('CUR');
+        expect(bids[0].vastUrl).to.equal('http://test-ad');
+        expect(bids[0].vastXml).to.equal('test-ad');
+        expect(bids[0].playerWidth).to.equal(640);
+        expect(bids[0].playerHeight).to.equal(480);
+        expect(bids[0].renderer).to.equal(undefined);
+      });
+    }
 
-    it('should properly parse a bid response with a networkId with twin ad unit native win', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            cpm: 1.23,
-            creative: 'test-ad',
-            creativecode: 'test-crId',
-            width: 728,
-            height: 90,
-            deal: 'myDealCode',
-            adomain: ['criteo.com'],
-            native: {
-              'products': [{
-                'sendTargetingKeys': false,
-                'title': 'Product title',
-                'description': 'Product desc',
-                'price': '100',
-                'click_url': 'https://product.click',
-                'image': {
-                  'url': 'https://publisherdirect.criteo.com/publishertag/preprodtest/creative.png',
-                  'height': 300,
-                  'width': 300
-                },
-                'call_to_action': 'Try it now!'
-              }],
-              'advertiser': {
-                'description': 'sponsor',
-                'domain': 'criteo.com',
-                'logo': { 'url': 'https://www.criteo.com/images/criteo-logo.svg', 'height': 300, 'width': 300 }
-              },
-              'privacy': {
-                'optout_click_url': 'https://info.criteo.com/privacy/informations',
-                'optout_image_url': 'https://static.criteo.net/flash/icon/nai_small.png',
-              },
-              'impression_pixels': [{ 'url': 'https://my-impression-pixel/test/impression' }, { 'url': 'https://cas.com/lg.com' }]
-            },
-            ext: {
-              meta: {
-                networkName: 'Criteo'
-              }
-            }
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
+    if (FEATURES.NATIVE) {
+      it('should properly parse a bid response when native win with twin ad units', function () {
+        const bidRequests = [{
           adUnitCode: 'test-requestId',
           bidId: 'test-bidId',
           mediaTypes: {
@@ -2123,291 +2392,285 @@ describe('The Criteo bidding adapter', function () {
           params: {
             networkId: 456,
           }
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(1);
-      expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].cpm).to.equal(1.23);
-      expect(bids[0].mediaType).to.equal(NATIVE);
-    });
+        }];
+        const response = mockResponse('test-bidId', NATIVE);
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(NATIVE);
+        expect(bids[0].requestId).to.equal('test-bidId');
+        expect(bids[0].seatBidId).to.equal('test-bidderId')
+        expect(bids[0].cpm).to.equal(1.23);
+        expect(bids[0].currency).to.equal('CUR');
+        expect(bids[0].width).to.equal(728);
+        expect(bids[0].height).to.equal(90);
+        expect(bids[0].ad).to.equal(undefined);
+        expect(bids[0].native.ortb).not.to.be.null;
+        expect(bids[0].native.ortb).to.equal(response.seatbid[0].bid[0].adm); // adm_native field was moved to adm
+        expect(bids[0].creativeId).to.equal('test-crId');
+        expect(bids[0].dealId).to.equal('deal-code');
+        expect(bids[0].meta.advertiserDomains[0]).to.equal('criteo.com');
+        expect(bids[0].meta.networkName).to.equal('Criteo');
+        expect(bids[0].meta.dsa.adrender).to.equal(1);
+      });
+    }
 
-    it('should properly parse a bid response with a zoneId', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            creative: 'test-ad',
-            width: 728,
-            height: 90,
-            zoneid: 123,
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
-          params: {
-            zoneId: 123,
+    if (FEATURES.NATIVE) {
+      it('should warn only once if sendTargetingKeys set to true on required fields for native bidRequest', () => {
+        const bidRequests = [
+          {
+            bidder: 'criteo',
+            adUnitCode: 'bid-123',
+            mediaTypes: {
+              native: {}
+            },
+            nativeOrtbRequest: {
+              assets: [{
+                required: 1,
+                id: 1,
+                img: {
+                  type: 3,
+                  wmin: 100,
+                  hmin: 100,
+                }
+              }]
+            },
+            transactionId: 'transaction-123',
+            sizes: [[728, 90]],
+            params: {
+              zoneId: 123,
+              publisherSubId: '123'
+            },
           },
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(1);
-      expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].cpm).to.equal(1.23);
-      expect(bids[0].ad).to.equal('test-ad');
-      expect(bids[0].width).to.equal(728);
-      expect(bids[0].height).to.equal(90);
-    });
-
-    it('should properly parse a bid response with a video', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            displayurl: 'http://test-ad',
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            video: true
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
-          params: {
-            zoneId: 123,
+          {
+            bidder: 'criteo',
+            adUnitCode: 'bid-456',
+            mediaTypes: {
+              native: {}
+            },
+            nativeOrtbRequest: {
+              assets: [{
+                required: 1,
+                id: 1,
+                img: {
+                  type: 3,
+                  wmin: 100,
+                  hmin: 100,
+                }
+              }]
+            },
+            transactionId: 'transaction-456',
+            sizes: [[728, 90]],
+            params: {
+              zoneId: 456,
+              publisherSubId: '456'
+            },
           },
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(1);
-      expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].cpm).to.equal(1.23);
-      expect(bids[0].vastUrl).to.equal('http://test-ad');
-      expect(bids[0].mediaType).to.equal(VIDEO);
-    });
+        ];
 
-    it('should properly parse a bid response with a outstream video', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            displayurl: 'http://test-ad',
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            video: true,
-            ext: {
-              videoPlayerType: 'RadiantMediaPlayer',
-              videoPlayerConfig: {
-
-              }
+        const nativeParamsWithSendTargetingKeys = [
+          {
+            nativeParams: {
+              image: {
+                sendTargetingKeys: true
+              },
             }
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
-          params: {
-            zoneId: 123,
           },
-          mediaTypes: {
-            video: {
-              context: 'outstream'
+          {
+            nativeParams: {
+              icon: {
+                sendTargetingKeys: true
+              },
+            }
+          },
+          {
+            nativeParams: {
+              clickUrl: {
+                sendTargetingKeys: true
+              },
+            }
+          },
+          {
+            nativeParams: {
+              displayUrl: {
+                sendTargetingKeys: true
+              },
             }
-          }
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(1);
-      expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].cpm).to.equal(1.23);
-      expect(bids[0].vastUrl).to.equal('http://test-ad');
-      expect(bids[0].renderer.url).to.equal('https://static.criteo.net/js/ld/publishertag.renderer.js');
-      expect(typeof bids[0].renderer.config.documentResolver).to.equal('function');
-      expect(typeof bids[0].renderer._render).to.equal('function');
-    });
-
-    it('should properly parse a bid response with native', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            native: {
-              'products': [{
-                'sendTargetingKeys': false,
-                'title': 'Product title',
-                'description': 'Product desc',
-                'price': '100',
-                'click_url': 'https://product.click',
-                'image': {
-                  'url': 'https://publisherdirect.criteo.com/publishertag/preprodtest/creative.png',
-                  'height': 300,
-                  'width': 300
-                },
-                'call_to_action': 'Try it now!'
-              }],
-              'advertiser': {
-                'description': 'sponsor',
-                'domain': 'criteo.com',
-                'logo': { 'url': 'https://www.criteo.com/images/criteo-logo.svg', 'height': 300, 'width': 300 }
+          },
+          {
+            nativeParams: {
+              privacyLink: {
+                sendTargetingKeys: true
               },
-              'privacy': {
-                'optout_click_url': 'https://info.criteo.com/privacy/informations',
-                'optout_image_url': 'https://static.criteo.net/flash/icon/nai_small.png',
+            }
+          },
+          {
+            nativeParams: {
+              privacyIcon: {
+                sendTargetingKeys: true
               },
-              'impression_pixels': [{ 'url': 'https://my-impression-pixel/test/impression' }, { 'url': 'https://cas.com/lg.com' }]
             }
-          }],
-        },
+          }
+        ];
+
+        utilsMock.expects('logWarn')
+          .withArgs('Criteo: all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)')
+          .exactly(nativeParamsWithSendTargetingKeys.length * bidRequests.length);
+        nativeParamsWithSendTargetingKeys.forEach(nativeParams => {
+          let transformedBidRequests = { ...bidRequests };
+          transformedBidRequests = [Object.assign(transformedBidRequests[0], nativeParams), Object.assign(transformedBidRequests[1], nativeParams)];
+          spec.buildRequests(transformedBidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        });
+        utilsMock.verify();
+      });
+    }
+
+    it('should properly parse a bid response with FLEDGE auction configs', function () {
+      let auctionConfig1 = {
+        auctionSignals: {},
+        decisionLogicUrl: 'https://grid-mercury.criteo.com/fledge/decision',
+        interestGroupBuyers: ['https://first-buyer-domain.com', 'https://second-buyer-domain.com'],
+        perBuyerSignals: {
+          'https://first-buyer-domain.com': {
+            foo: 'bar',
+          },
+          'https://second-buyer-domain.com': {
+            foo: 'baz'
+          },
+        },
+        perBuyerTimeout: {
+          '*': 500,
+          'buyer1': 100,
+          'buyer2': 200
+        },
+        perBuyerGroupLimits: {
+          '*': 60,
+          'buyer1': 300,
+          'buyer2': 400
+        },
+        seller: 'https://seller-domain.com',
+        sellerTimeout: 500,
+        sellerSignals: {
+          foo: 'bar',
+          foo2: 'bar2',
+          floor: 1,
+          currency: 'USD',
+          perBuyerTimeout: {
+            'buyer1': 100,
+            'buyer2': 200
+          },
+          perBuyerGroupLimits: {
+            'buyer1': 300,
+            'buyer2': 400
+          },
+        },
+        sellerCurrency: 'USD',
       };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
-          params: {
-            zoneId: 123,
-          },
-          native: true,
-        }]
+      let auctionConfig2 = {
+        auctionSignals: {},
+        decisionLogicUrl: 'https://grid-mercury.criteo.com/fledge/decision',
+        interestGroupBuyers: ['https://first-buyer-domain.com', 'https://second-buyer-domain.com'],
+        perBuyerSignals: {
+          'https://first-buyer-domain.com': {
+            foo: 'bar',
+          },
+          'https://second-buyer-domain.com': {
+            foo: 'baz'
+          },
+        },
+        perBuyerTimeout: {
+          '*': 500,
+          'buyer1': 100,
+          'buyer2': 200
+        },
+        perBuyerGroupLimits: {
+          '*': 60,
+          'buyer1': 300,
+          'buyer2': 400
+        },
+        seller: 'https://seller-domain.com',
+        sellerTimeout: 500,
+        sellerSignals: {
+          foo: 'bar',
+          floor: 1,
+          perBuyerTimeout: {
+            'buyer1': 100,
+            'buyer2': 200
+          },
+          perBuyerGroupLimits: {
+            'buyer1': 300,
+            'buyer2': 400
+          },
+        },
+        sellerCurrency: '???'
       };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(1);
-      expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].cpm).to.equal(1.23);
-      expect(bids[0].mediaType).to.equal(NATIVE);
-    });
-
-    it('should warn only once if sendTargetingKeys set to true on required fields for native bidRequest', () => {
-      const bidderRequest = {};
       const bidRequests = [
         {
+          bidId: 'test-bidId',
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
-          params: {
-            zoneId: 123,
-            publisherSubId: '123',
-            nativeCallback: function () { }
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
           },
-        },
-        {
-          bidder: 'criteo',
-          adUnitCode: 'bid-456',
-          transactionId: 'transaction-456',
-          sizes: [[728, 90]],
           params: {
-            zoneId: 456,
-            publisherSubId: '456',
-            nativeCallback: function () { }
-          },
-        },
-      ];
-
-      const nativeParamsWithSendTargetingKeys = [
-        {
-          nativeParams: {
-            image: {
-              sendTargetingKeys: true
-            },
-          }
-        },
-        {
-          nativeParams: {
-            icon: {
-              sendTargetingKeys: true
-            },
-          }
-        },
-        {
-          nativeParams: {
-            clickUrl: {
-              sendTargetingKeys: true
-            },
-          }
-        },
-        {
-          nativeParams: {
-            displayUrl: {
-              sendTargetingKeys: true
-            },
+            bidFloor: 1,
+            bidFloorCur: 'EUR'
           }
         },
         {
-          nativeParams: {
-            privacyLink: {
-              sendTargetingKeys: true
-            },
+          bidId: 'test-bidId-2',
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
+          params: {
+            bidFloor: 1,
+            bidFloorCur: 'EUR'
           }
         },
-        {
-          nativeParams: {
-            privacyIcon: {
-              sendTargetingKeys: true
-            },
-          }
-        }
       ];
-
-      utilsMock.expects('logWarn')
-        .withArgs('Criteo: all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)')
-        .exactly(nativeParamsWithSendTargetingKeys.length * bidRequests.length);
-      nativeParamsWithSendTargetingKeys.forEach(nativeParams => {
-        let transformedBidRequests = { ...bidRequests };
-        transformedBidRequests = [Object.assign(transformedBidRequests[0], nativeParams), Object.assign(transformedBidRequests[1], nativeParams)];
-        spec.buildRequests(transformedBidRequests, bidderRequest);
-      });
-      utilsMock.verify();
-    });
-
-    it('should properly parse a bid response with a zoneId passed as a string', function () {
       const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            cpm: 1.23,
-            creative: 'test-ad',
-            width: 728,
-            height: 90,
-            zoneid: 123,
-          }],
+        ext: {
+          igi: [{
+            impid: 'test-bidId',
+            igs: [{
+              impid: 'test-bidId',
+              bidId: 'test-bidId',
+              config: auctionConfig1
+            }]
+          }, {
+            impid: 'test-bidId-2',
+            igs: [{
+              impid: 'test-bidId-2',
+              bidId: 'test-bidId-2',
+              config: auctionConfig2
+            }]
+          }]
         },
       };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
-          params: {
-            zoneId: '123',
-          },
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(1);
-      expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].cpm).to.equal(1.23);
-      expect(bids[0].ad).to.equal('test-ad');
-      expect(bids[0].width).to.equal(728);
-      expect(bids[0].height).to.equal(90);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const interpretedResponse = spec.interpretResponse({ body: response }, request);
+      expect(interpretedResponse).to.have.property('bids');
+      expect(interpretedResponse).to.have.property('paapi');
+      expect(interpretedResponse.bids).to.have.lengthOf(0);
+      expect(interpretedResponse.paapi).to.have.lengthOf(2);
+      expect(interpretedResponse.paapi[0]).to.deep.equal({
+        bidId: 'test-bidId',
+        impid: 'test-bidId',
+        config: auctionConfig1,
+      });
+      expect(interpretedResponse.paapi[1]).to.deep.equal({
+        bidId: 'test-bidId-2',
+        impid: 'test-bidId-2',
+        config: auctionConfig2,
+      });
     });
 
     [{
@@ -2429,148 +2692,65 @@ describe('The Criteo bidding adapter', function () {
       hasBidResponseLevelPafData: false,
       hasBidResponseBidLevelPafData: false,
       shouldContainsBidMetaPafData: false
-    }].forEach(testCase => {
-      const bidPafContentId = 'abcdef';
-      const pafTransmission = {
-        version: '12'
-      };
-      const response = {
-        slots: [
-          {
-            width: 300,
-            height: 250,
-            cpm: 10,
-            impid: 'adUnitId',
-            ext: (testCase.hasBidResponseBidLevelPafData ? {
-              paf: {
-                content_id: bidPafContentId
-              }
-            } : undefined)
-          }
-        ],
-        ext: (testCase.hasBidResponseLevelPafData ? {
-          paf: {
-            transmission: pafTransmission
-          }
-        } : undefined)
-      };
-
-      const request = {
-        bidRequests: [{
+    }].forEach(testCase =>
+      it('should properly forward or not meta paf data', () => {
+        const bidPafContentId = 'abcdef';
+        const pafTransmission = {
+          version: '12'
+        };
+        const bidRequests = [{
+          bidId: 'test-bidId',
           adUnitCode: 'adUnitId',
           sizes: [[300, 250]],
           params: {
             networkId: 456,
           }
-        }]
-      };
-
-      const bids = spec.interpretResponse(response, request);
-
-      expect(bids).to.have.lengthOf(1);
+        }];
+        const response = {
+          id: 'test-requestId',
+          seatbid: [{
+            seat: 'criteo',
+            bid: [
+              {
+                id: 'test-bidderId',
+                impid: 'test-bidId',
+                w: 728,
+                h: 90,
+                ext: {
+                  mediatype: BANNER,
+                  paf: testCase.hasBidResponseBidLevelPafData ? {
+                    content_id: bidPafContentId
+                  } : undefined
+                }
+              }
+            ]
+          }],
+          ext: (testCase.hasBidResponseLevelPafData ? {
+            paf: {
+              transmission: pafTransmission
+            }
+          } : undefined)
+        };
 
-      const theoreticalBidMetaPafData = {
-        paf: {
-          content_id: bidPafContentId,
-          transmission: pafTransmission
-        }
-      };
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
 
-      if (testCase.shouldContainsBidMetaPafData) {
-        expect(bids[0].meta).to.deep.equal(theoreticalBidMetaPafData);
-      } else {
-        expect(bids[0].meta).not.to.deep.equal(theoreticalBidMetaPafData);
-      }
-    });
-  });
+        expect(bids).to.have.lengthOf(1);
 
-  describe('canFastBid', function () {
-    it('should properly detect if can do fastbid', function () {
-      const testCasesAndExpectedResult = [['none', false], ['', true], [undefined, true], [123, true]];
-      testCasesAndExpectedResult.forEach(testCase => {
-        const result = canFastBid(testCase[0]);
-        expect(result).to.equal(testCase[1]);
-      })
-    });
-  });
+        const expectedBidMetaPafData = {
+          paf: {
+            content_id: bidPafContentId,
+            transmission: pafTransmission
+          }
+        };
 
-  describe('getFastBidUrl', function () {
-    it('should properly detect the version of fastbid', function () {
-      const testCasesAndExpectedResult = [
-        ['', 'https://static.criteo.net/js/ld/publishertag.prebid.' + FAST_BID_VERSION_CURRENT + '.js'],
-        [undefined, 'https://static.criteo.net/js/ld/publishertag.prebid.' + FAST_BID_VERSION_CURRENT + '.js'],
-        [null, 'https://static.criteo.net/js/ld/publishertag.prebid.' + FAST_BID_VERSION_CURRENT + '.js'],
-        [NaN, 'https://static.criteo.net/js/ld/publishertag.prebid.' + FAST_BID_VERSION_CURRENT + '.js'],
-        [123, 'https://static.criteo.net/js/ld/publishertag.prebid.123.js'],
-        ['123', 'https://static.criteo.net/js/ld/publishertag.prebid.123.js'],
-        ['latest', 'https://static.criteo.net/js/ld/publishertag.prebid.js']
-      ];
-      testCasesAndExpectedResult.forEach(testCase => {
-        const result = getFastBidUrl(testCase[0]);
-        expect(result).to.equal(testCase[1]);
+        if (testCase.shouldContainsBidMetaPafData) {
+          expect(bids[0].meta).to.deep.equal(expectedBidMetaPafData);
+        } else {
+          expect(bids[0].meta).not.to.deep.equal(expectedBidMetaPafData);
+        }
       })
-    });
-  });
-
-  describe('tryGetCriteoFastBid', function () {
-    const VALID_HASH = 'vBeD8Q7GU6lypFbzB07W8hLGj7NL+p7dI9ro2tCxkrmyv0F6stNuoNd75Us33iNKfEoW+cFWypelr6OJPXxki2MXWatRhJuUJZMcK4VBFnxi3Ro+3a0xEfxE4jJm4eGe98iC898M+/YFHfp+fEPEnS6pEyw124ONIFZFrcejpHU=';
-    const INVALID_HASH = 'invalid';
-    const VALID_PUBLISHER_TAG = 'test';
-    const INVALID_PUBLISHER_TAG = 'test invalid';
-
-    const FASTBID_LOCAL_STORAGE_KEY = 'criteo_fast_bid';
-
-    it('should verify valid hash with valid publisher tag', function () {
-      localStorage.setItem(FASTBID_LOCAL_STORAGE_KEY, '// Hash: ' + VALID_HASH + '\n' + VALID_PUBLISHER_TAG);
-
-      utilsMock.expects('logInfo').withExactArgs('Using Criteo FastBid').once();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in FastBid').never();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Criteo FastBid found').never();
-
-      tryGetCriteoFastBid();
-
-      expect(localStorage.getItem(FASTBID_LOCAL_STORAGE_KEY)).to.equals('// Hash: ' + VALID_HASH + '\n' + VALID_PUBLISHER_TAG);
-      utilsMock.verify();
-    });
-
-    it('should verify valid hash with invalid publisher tag', function () {
-      localStorage.setItem(FASTBID_LOCAL_STORAGE_KEY, '// Hash: ' + VALID_HASH + '\n' + INVALID_PUBLISHER_TAG);
-
-      utilsMock.expects('logInfo').withExactArgs('Using Criteo FastBid').never();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in FastBid').never();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Criteo FastBid found').once();
-
-      tryGetCriteoFastBid();
-
-      expect(localStorage.getItem(FASTBID_LOCAL_STORAGE_KEY)).to.be.null;
-      utilsMock.verify();
-    });
-
-    it('should verify invalid hash with valid publisher tag', function () {
-      localStorage.setItem(FASTBID_LOCAL_STORAGE_KEY, '// Hash: ' + INVALID_HASH + '\n' + VALID_PUBLISHER_TAG);
-
-      utilsMock.expects('logInfo').withExactArgs('Using Criteo FastBid').never();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in FastBid').never();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Criteo FastBid found').once();
-
-      tryGetCriteoFastBid();
-
-      expect(localStorage.getItem(FASTBID_LOCAL_STORAGE_KEY)).to.be.null;
-      utilsMock.verify();
-    });
-
-    it('should verify missing hash', function () {
-      localStorage.setItem(FASTBID_LOCAL_STORAGE_KEY, VALID_PUBLISHER_TAG);
-
-      utilsMock.expects('logInfo').withExactArgs('Using Criteo FastBid').never();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in FastBid').once();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Criteo FastBid found').never();
-
-      tryGetCriteoFastBid();
-
-      expect(localStorage.getItem(FASTBID_LOCAL_STORAGE_KEY)).to.be.null;
-      utilsMock.verify();
-    });
+    )
   });
 
   describe('when pubtag prebid adapter is not available', function () {
@@ -2580,12 +2760,24 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
           sizes: [[728, 90]],
+          mediaTypes: {
+            native: {}
+          },
+          nativeOrtbRequest: {
+            assets: [{
+              required: 1,
+              id: 1,
+              img: {
+                type: 3,
+                wmin: 100,
+                hmin: 100,
+              }
+            }]
+          },
           params: {
             zoneId: 123,
-            publisherSubId: '123',
-            nativeCallback: function () { }
+            publisherSubId: '123'
           },
           nativeParams: {
             image: {
@@ -2611,7 +2803,7 @@ describe('The Criteo bidding adapter', function () {
       ];
 
       utilsMock.expects('logWarn').withArgs('Criteo: all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)').never();
-      const request = spec.buildRequests(bidRequestsWithSendId, bidderRequest);
+      const request = spec.buildRequests(bidRequestsWithSendId, syncAddFPDToBidderRequest(bidderRequest));
       utilsMock.verify();
     });
 
@@ -2621,23 +2813,46 @@ describe('The Criteo bidding adapter', function () {
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
-          transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            native: {}
+          },
+          nativeOrtbRequest: {
+            assets: [{
+              required: 1,
+              id: 1,
+              img: {
+                type: 3,
+                wmin: 100,
+                hmin: 100,
+              }
+            }]
+          },
           params: {
             zoneId: 123,
-            publisherSubId: '123',
-            nativeCallback: function () { }
+            publisherSubId: '123'
           },
         },
         {
           bidder: 'criteo',
           adUnitCode: 'bid-456',
           transactionId: 'transaction-456',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            native: {}
+          },
+          nativeOrtbRequest: {
+            assets: [{
+              required: 1,
+              id: 1,
+              img: {
+                type: 3,
+                wmin: 100,
+                hmin: 100,
+              }
+            }]
+          },
           params: {
             zoneId: 456,
-            publisherSubId: '456',
-            nativeCallback: function () { }
+            publisherSubId: '456'
           },
         },
       ];
@@ -2693,132 +2908,9 @@ describe('The Criteo bidding adapter', function () {
       nativeParamsWithoutSendId.forEach(nativeParams => {
         let transformedBidRequests = { ...bidRequests };
         transformedBidRequests = [Object.assign(transformedBidRequests[0], nativeParams), Object.assign(transformedBidRequests[1], nativeParams)];
-        spec.buildRequests(transformedBidRequests, bidderRequest);
+        spec.buildRequests(transformedBidRequests, syncAddFPDToBidderRequest(bidderRequest));
       });
       utilsMock.verify();
     });
   });
-
-  describe('when pubtag prebid adapter is available', function () {
-    it('should forward response to pubtag when calling interpretResponse', () => {
-      const response = {};
-      const request = {};
-
-      const adapter = { interpretResponse: function () { } };
-      const adapterMock = sinon.mock(adapter);
-      adapterMock.expects('interpretResponse').withExactArgs(response, request).once().returns('ok');
-      const prebidAdapter = { GetAdapter: function () { } };
-      const prebidAdapterMock = sinon.mock(prebidAdapter);
-      prebidAdapterMock.expects('GetAdapter').withExactArgs(request).once().returns(adapter);
-
-      global.Criteo = {
-        PubTag: {
-          Adapters: {
-            Prebid: prebidAdapter
-          }
-        }
-      };
-
-      expect(spec.interpretResponse(response, request)).equal('ok');
-      adapterMock.verify();
-      prebidAdapterMock.verify();
-    });
-
-    it('should forward bid to pubtag when calling onBidWon', () => {
-      const bid = { auctionId: 123 };
-
-      const adapter = { handleBidWon: function () { } };
-      const adapterMock = sinon.mock(adapter);
-      adapterMock.expects('handleBidWon').withExactArgs(bid).once();
-      const prebidAdapter = { GetAdapter: function () { } };
-      const prebidAdapterMock = sinon.mock(prebidAdapter);
-      prebidAdapterMock.expects('GetAdapter').withExactArgs(bid.auctionId).once().returns(adapter);
-
-      global.Criteo = {
-        PubTag: {
-          Adapters: {
-            Prebid: prebidAdapter
-          }
-        }
-      };
-
-      spec.onBidWon(bid);
-      adapterMock.verify();
-      prebidAdapterMock.verify();
-    });
-
-    it('should forward bid to pubtag when calling onSetTargeting', () => {
-      const bid = { auctionId: 123 };
-
-      const adapter = { handleSetTargeting: function () { } };
-      const adapterMock = sinon.mock(adapter);
-      adapterMock.expects('handleSetTargeting').withExactArgs(bid).once();
-      const prebidAdapter = { GetAdapter: function () { } };
-      const prebidAdapterMock = sinon.mock(prebidAdapter);
-      prebidAdapterMock.expects('GetAdapter').withExactArgs(bid.auctionId).once().returns(adapter);
-
-      global.Criteo = {
-        PubTag: {
-          Adapters: {
-            Prebid: prebidAdapter
-          }
-        }
-      };
-
-      spec.onSetTargeting(bid);
-      adapterMock.verify();
-      prebidAdapterMock.verify();
-    });
-
-    it('should forward bid to pubtag when calling onTimeout', () => {
-      const timeoutData = [{ auctionId: 123 }];
-
-      const adapter = { handleBidTimeout: function () { } };
-      const adapterMock = sinon.mock(adapter);
-      adapterMock.expects('handleBidTimeout').once();
-      const prebidAdapter = { GetAdapter: function () { } };
-      const prebidAdapterMock = sinon.mock(prebidAdapter);
-      prebidAdapterMock.expects('GetAdapter').withExactArgs(timeoutData[0].auctionId).once().returns(adapter);
-
-      global.Criteo = {
-        PubTag: {
-          Adapters: {
-            Prebid: prebidAdapter
-          }
-        }
-      };
-
-      spec.onTimeout(timeoutData);
-      adapterMock.verify();
-      prebidAdapterMock.verify();
-    });
-
-    it('should return a POST method with url & data from pubtag', () => {
-      const bidRequests = {};
-      const bidderRequest = {};
-
-      const prebidAdapter = { buildCdbUrl: function () { }, buildCdbRequest: function () { } };
-      const prebidAdapterMock = sinon.mock(prebidAdapter);
-      prebidAdapterMock.expects('buildCdbUrl').once().returns('cdbUrl');
-      prebidAdapterMock.expects('buildCdbRequest').once().returns('cdbRequest');
-
-      const adapters = { Prebid: function () { } };
-      const adaptersMock = sinon.mock(adapters);
-      adaptersMock.expects('Prebid').withExactArgs(PROFILE_ID_PUBLISHERTAG, ADAPTER_VERSION, bidRequests, bidderRequest, '$prebid.version$', sinon.match.any).once().returns(prebidAdapter);
-
-      global.Criteo = {
-        PubTag: {
-          Adapters: adapters
-        }
-      };
-
-      const buildRequestsResult = spec.buildRequests(bidRequests, bidderRequest);
-      expect(buildRequestsResult.method).equal('POST');
-      expect(buildRequestsResult.url).equal('cdbUrl');
-      expect(buildRequestsResult.data).equal('cdbRequest');
-
-      adaptersMock.verify();
-      prebidAdapterMock.verify();
-    });
-  });
 });
diff --git a/test/spec/modules/criteoIdSystem_spec.js b/test/spec/modules/criteoIdSystem_spec.js
index aaf63873d93..eb1f54d7cd2 100644
--- a/test/spec/modules/criteoIdSystem_spec.js
+++ b/test/spec/modules/criteoIdSystem_spec.js
@@ -2,6 +2,9 @@ import { criteoIdSubmodule, storage } from 'modules/criteoIdSystem.js';
 import * as utils from 'src/utils.js';
 import { gdprDataHandler, uspDataHandler, gppDataHandler } from '../../../src/adapterManager.js';
 import { server } from '../../mocks/xhr';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
 
 const pastDateString = new Date(0).toString()
 
@@ -52,17 +55,21 @@ describe('CriteoId module', function () {
   });
 
   const storageTestCases = [
-    { cookie: 'bidId', localStorage: 'bidId2', expected: 'bidId' },
-    { cookie: 'bidId', localStorage: undefined, expected: 'bidId' },
-    { cookie: undefined, localStorage: 'bidId', expected: 'bidId' },
-    { cookie: undefined, localStorage: undefined, expected: undefined },
+    { submoduleConfig: undefined, cookie: 'bidId', localStorage: 'bidId2', expected: 'bidId' },
+    { submoduleConfig: undefined, cookie: 'bidId', localStorage: undefined, expected: 'bidId' },
+    { submoduleConfig: undefined, cookie: undefined, localStorage: 'bidId', expected: 'bidId' },
+    { submoduleConfig: undefined, cookie: undefined, localStorage: undefined, expected: undefined },
+    { submoduleConfig: { storage: { type: 'cookie' } }, cookie: 'bidId', localStorage: 'bidId2', expected: 'bidId' },
+    { submoduleConfig: { storage: { type: 'cookie' } }, cookie: undefined, localStorage: 'bidId2', expected: undefined },
+    { submoduleConfig: { storage: { type: 'html5' } }, cookie: 'bidId', localStorage: 'bidId2', expected: 'bidId2' },
+    { submoduleConfig: { storage: { type: 'html5' } }, cookie: 'bidId', localStorage: undefined, expected: undefined },
   ]
 
-  storageTestCases.forEach(testCase => it('getId() should return the bidId when it exists in local storages', function () {
+  storageTestCases.forEach(testCase => it('getId() should return the user id depending on the storage type enabled and the data available', function () {
     getCookieStub.withArgs('cto_bidid').returns(testCase.cookie);
     getLocalStorageStub.withArgs('cto_bidid').returns(testCase.localStorage);
 
-    const result = criteoIdSubmodule.getId();
+    const result = criteoIdSubmodule.getId(testCase.submoduleConfig);
     expect(result.id).to.be.deep.equal(testCase.expected ? { criteoId: testCase.expected } : undefined);
     expect(result.callback).to.be.a('function');
   }))
@@ -95,22 +102,24 @@ describe('CriteoId module', function () {
   });
 
   const responses = [
-    { bundle: 'bundle', bidId: 'bidId', acwsUrl: 'acwsUrl' },
-    { bundle: 'bundle', bidId: undefined, acwsUrl: 'acwsUrl' },
-    { bundle: 'bundle', bidId: 'bidId', acwsUrl: undefined },
-    { bundle: undefined, bidId: 'bidId', acwsUrl: 'acwsUrl' },
-    { bundle: 'bundle', bidId: undefined, acwsUrl: undefined },
-    { bundle: undefined, bidId: 'bidId', acwsUrl: undefined },
-    { bundle: undefined, bidId: undefined, acwsUrl: 'acwsUrl' },
-    { bundle: undefined, bidId: undefined, acwsUrl: ['acwsUrl', 'acwsUrl2'] },
-    { bundle: undefined, bidId: undefined, acwsUrl: undefined },
+    { submoduleConfig: undefined, shouldWriteCookie: true, shouldWriteLocalStorage: true, bundle: 'bundle', bidId: 'bidId', acwsUrl: 'acwsUrl' },
+    { submoduleConfig: undefined, shouldWriteCookie: true, shouldWriteLocalStorage: true, bundle: 'bundle', bidId: undefined, acwsUrl: 'acwsUrl' },
+    { submoduleConfig: undefined, shouldWriteCookie: true, shouldWriteLocalStorage: true, bundle: 'bundle', bidId: 'bidId', acwsUrl: undefined },
+    { submoduleConfig: undefined, shouldWriteCookie: true, shouldWriteLocalStorage: true, bundle: undefined, bidId: 'bidId', acwsUrl: 'acwsUrl' },
+    { submoduleConfig: undefined, shouldWriteCookie: true, shouldWriteLocalStorage: true, bundle: 'bundle', bidId: undefined, acwsUrl: undefined },
+    { submoduleConfig: undefined, shouldWriteCookie: true, shouldWriteLocalStorage: true, bundle: undefined, bidId: 'bidId', acwsUrl: undefined },
+    { submoduleConfig: undefined, shouldWriteCookie: true, shouldWriteLocalStorage: true, bundle: undefined, bidId: undefined, acwsUrl: 'acwsUrl' },
+    { submoduleConfig: undefined, shouldWriteCookie: true, shouldWriteLocalStorage: true, bundle: undefined, bidId: undefined, acwsUrl: ['acwsUrl', 'acwsUrl2'] },
+    { submoduleConfig: undefined, shouldWriteCookie: true, shouldWriteLocalStorage: true, bundle: undefined, bidId: undefined, acwsUrl: undefined },
+    { submoduleConfig: { storage: { type: 'cookie' } }, shouldWriteCookie: true, shouldWriteLocalStorage: false, bundle: 'bundle', bidId: 'bidId', acwsUrl: undefined },
+    { submoduleConfig: { storage: { type: 'html5' } }, shouldWriteCookie: false, shouldWriteLocalStorage: true, bundle: 'bundle', bidId: 'bidId', acwsUrl: undefined },
   ]
 
   responses.forEach(response => describe('test user sync response behavior', function () {
     const expirationTs = new Date(nowTimestamp + cookiesMaxAge).toString();
 
     it('should save bidId if it exists', function () {
-      const result = criteoIdSubmodule.getId();
+      const result = criteoIdSubmodule.getId(response.submoduleConfig);
       result.callback((id) => {
         expect(id).to.be.deep.equal(response.bidId ? { criteoId: response.bidId } : undefined);
       });
@@ -127,16 +136,35 @@ describe('CriteoId module', function () {
         expect(setCookieStub.calledWith('cto_bundle')).to.be.false;
         expect(setLocalStorageStub.calledWith('cto_bundle')).to.be.false;
       } else if (response.bundle) {
-        expect(setCookieStub.calledWith('cto_bundle', response.bundle, expirationTs, null, '.com')).to.be.true;
-        expect(setCookieStub.calledWith('cto_bundle', response.bundle, expirationTs, null, '.testdev.com')).to.be.true;
-        expect(setLocalStorageStub.calledWith('cto_bundle', response.bundle)).to.be.true;
+        if (response.shouldWriteCookie) {
+          expect(setCookieStub.calledWith('cto_bundle', response.bundle, expirationTs, null, '.com')).to.be.true;
+          expect(setCookieStub.calledWith('cto_bundle', response.bundle, expirationTs, null, '.testdev.com')).to.be.true;
+        } else {
+          expect(setCookieStub.calledWith('cto_bundle', response.bundle, expirationTs, null, '.com')).to.be.false;
+          expect(setCookieStub.calledWith('cto_bundle', response.bundle, expirationTs, null, '.testdev.com')).to.be.false;
+        }
+
+        if (response.shouldWriteLocalStorage) {
+          expect(setLocalStorageStub.calledWith('cto_bundle', response.bundle)).to.be.true;
+        } else {
+          expect(setLocalStorageStub.calledWith('cto_bundle', response.bundle)).to.be.false;
+        }
         expect(triggerPixelStub.called).to.be.false;
       }
 
       if (response.bidId) {
-        expect(setCookieStub.calledWith('cto_bidid', response.bidId, expirationTs, null, '.com')).to.be.true;
-        expect(setCookieStub.calledWith('cto_bidid', response.bidId, expirationTs, null, '.testdev.com')).to.be.true;
-        expect(setLocalStorageStub.calledWith('cto_bidid', response.bidId)).to.be.true;
+        if (response.shouldWriteCookie) {
+          expect(setCookieStub.calledWith('cto_bidid', response.bidId, expirationTs, null, '.com')).to.be.true;
+          expect(setCookieStub.calledWith('cto_bidid', response.bidId, expirationTs, null, '.testdev.com')).to.be.true;
+        } else {
+          expect(setCookieStub.calledWith('cto_bidid', response.bidId, expirationTs, null, '.com')).to.be.false;
+          expect(setCookieStub.calledWith('cto_bidid', response.bidId, expirationTs, null, '.testdev.com')).to.be.false;
+        }
+        if (response.shouldWriteLocalStorage) {
+          expect(setLocalStorageStub.calledWith('cto_bidid', response.bidId)).to.be.true;
+        } else {
+          expect(setLocalStorageStub.calledWith('cto_bidid', response.bidId)).to.be.false;
+        }
       } else {
         expect(setCookieStub.calledWith('cto_bidid', '', pastDateString, null, '.com')).to.be.true;
         expect(setCookieStub.calledWith('cto_bidid', '', pastDateString, null, '.testdev.com')).to.be.true;
@@ -333,4 +361,20 @@ describe('CriteoId module', function () {
 
     expect(callBackSpy.calledOnce).to.be.true;
   }));
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(criteoIdSubmodule);
+    });
+    it('criteo', function() {
+      const userId = {
+        criteoId: 'some-random-id-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'criteo.com',
+        uids: [{id: 'some-random-id-value', atype: 1}]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/currency_spec.js b/test/spec/modules/currency_spec.js
index f7c2580f3f3..8685bc1266f 100644
--- a/test/spec/modules/currency_spec.js
+++ b/test/spec/modules/currency_spec.js
@@ -3,18 +3,22 @@ import {
   getCurrencyRates
 } from 'test/fixtures/fixtures.js';
 
-import { getGlobal } from 'src/prebidGlobal.js';
+import {getGlobal} from 'src/prebidGlobal.js';
 
 import {
   setConfig,
   addBidResponseHook,
   currencySupportEnabled,
   currencyRates,
-  ready
+  responseReady
 } from 'modules/currency.js';
 import {createBid} from '../../../src/bidfactory.js';
-import CONSTANTS from '../../../src/constants.json';
+import * as utils from 'src/utils.js';
+import {EVENTS, STATUS, REJECTION_REASON} from '../../../src/constants.js';
 import {server} from '../../mocks/xhr.js';
+import * as events from 'src/events.js';
+import { enrichFPD } from '../../../src/fpd/enrichment.js';
+import {requestBidsHook} from '../../../modules/currency.js';
 
 var assert = require('chai').assert;
 var expect = require('chai').expect;
@@ -27,12 +31,11 @@ describe('currency', function () {
   let fn = sinon.spy();
 
   function makeBid(bidProps) {
-    return Object.assign(createBid(CONSTANTS.STATUS.GOOD), bidProps);
+    return Object.assign(createBid(STATUS.GOOD), bidProps);
   }
 
   beforeEach(function () {
     fakeCurrencyFileServer = server;
-    ready.reset();
   });
 
   afterEach(function () {
@@ -259,6 +262,19 @@ describe('currency', function () {
       expect(innerBid.getCpmInNewCurrency('JPY')).to.equal('100.000');
     });
 
+    it('does not block auctions if rates do not need to be fetched', () => {
+      sandbox.stub(responseReady, 'resolve');
+      setConfig({
+        adServerCurrency: 'USD',
+        rates: {
+          USD: {
+            JPY: 100
+          }
+        }
+      });
+      sinon.assert.called(responseReady.resolve);
+    })
+
     it('uses rates specified in json when provided and consider boosted bid', function () {
       setConfig({
         adServerCurrency: 'USD',
@@ -287,32 +303,56 @@ describe('currency', function () {
       expect(innerBid.getCpmInNewCurrency('JPY')).to.equal('1000.000');
     });
 
-    it('uses default rates when currency file fails to load', function () {
-      setConfig({});
-
-      setConfig({
-        adServerCurrency: 'USD',
-        defaultRates: {
-          USD: {
-            JPY: 100
+    describe('when rates fail to load', () => {
+      let bid, addBidResponse, reject;
+      beforeEach(() => {
+        bid = makeBid({cpm: 100, currency: 'JPY', bidder: 'rubicoin'});
+        addBidResponse = sinon.spy();
+        reject = sinon.spy();
+      })
+      it('uses default rates if specified', function () {
+        setConfig({
+          adServerCurrency: 'USD',
+          defaultRates: {
+            USD: {
+              JPY: 100
+            }
           }
-        }
-      });
-
-      // default response is 404
-      fakeCurrencyFileServer.respond();
+        });
 
-      var bid = { cpm: 100, currency: 'JPY', bidder: 'rubicon' };
-      var innerBid;
+        // default response is 404
+        addBidResponseHook(addBidResponse, 'au', bid);
+        fakeCurrencyFileServer.respond();
+        sinon.assert.calledWith(addBidResponse, 'au', sinon.match(innerBid => {
+          expect(innerBid.cpm).to.equal('1.0000');
+          expect(typeof innerBid.getCpmInNewCurrency).to.equal('function');
+          expect(innerBid.getCpmInNewCurrency('JPY')).to.equal('100.000');
+          return true;
+        }));
+      });
 
-      addBidResponseHook(function(adCodeId, bid) {
-        innerBid = bid;
-      }, 'elementId', bid);
+      it('rejects bids if no default rates are specified', () => {
+        setConfig({
+          adServerCurrency: 'USD',
+        });
+        addBidResponseHook(addBidResponse, 'au', bid, reject);
+        fakeCurrencyFileServer.respond();
+        sinon.assert.notCalled(addBidResponse);
+        sinon.assert.calledWith(reject, REJECTION_REASON.CANNOT_CONVERT_CURRENCY);
+      });
 
-      expect(innerBid.cpm).to.equal('1.0000');
-      expect(typeof innerBid.getCpmInNewCurrency).to.equal('function');
-      expect(innerBid.getCpmInNewCurrency('JPY')).to.equal('100.000');
-    });
+      it('attempts to load rates again on the next auction', () => {
+        setConfig({
+          adServerCurrency: 'USD',
+        });
+        fakeCurrencyFileServer.respond();
+        fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
+        events.emit(EVENTS.AUCTION_INIT, {});
+        addBidResponseHook(addBidResponse, 'au', bid, reject);
+        fakeCurrencyFileServer.respond();
+        sinon.assert.calledWith(addBidResponse, 'au', bid, reject);
+      })
+    })
   });
 
   describe('currency.addBidResponseDecorator bidResponseQueue', function () {
@@ -321,29 +361,26 @@ describe('currency', function () {
 
       fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
 
-      var bid = { 'cpm': 1, 'currency': 'USD' };
+      const bid = { 'cpm': 1, 'currency': 'USD' };
 
       setConfig({ 'adServerCurrency': 'JPY' });
 
-      var marker = false;
-      let promiseResolved = false;
+      let responseAdded = false;
+      let isReady = false;
+      responseReady.promise.then(() => { isReady = true });
+
       addBidResponseHook(Object.assign(function() {
-        marker = true;
-      }, {
-        bail: function (promise) {
-          promise.then(() => promiseResolved = true);
-        }
+        responseAdded = true;
       }), 'elementId', bid);
 
-      expect(marker).to.equal(false);
-
       setTimeout(() => {
-        expect(promiseResolved).to.be.false;
+        expect(responseAdded).to.equal(false);
+        expect(isReady).to.equal(false);
         fakeCurrencyFileServer.respond();
 
         setTimeout(() => {
-          expect(marker).to.equal(true);
-          expect(promiseResolved).to.be.true;
+          expect(responseAdded).to.equal(true);
+          expect(isReady).to.equal(true);
           done();
         });
       });
@@ -419,6 +456,23 @@ describe('currency', function () {
       expect(reject.calledOnce).to.be.true;
     });
 
+    it('should reject bid when rates have not loaded when the auction times out', () => {
+      fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
+      setConfig({'adServerCurrency': 'JPY'});
+      const bid = makeBid({cpm: 1, currency: 'USD', auctionId: 'aid'});
+      const noConversionBid = makeBid({cpm: 1, currency: 'JPY', auctionId: 'aid'});
+      const reject = sinon.spy();
+      const addBidResponse = sinon.spy();
+      addBidResponseHook(addBidResponse, 'au', bid, reject);
+      addBidResponseHook(addBidResponse, 'au', noConversionBid, reject);
+      events.emit(EVENTS.AUCTION_TIMEOUT, { auctionId: 'aid' });
+      fakeCurrencyFileServer.respond();
+      sinon.assert.calledOnce(addBidResponse);
+      sinon.assert.calledWith(addBidResponse, 'au', noConversionBid, reject);
+      sinon.assert.calledOnce(reject);
+      sinon.assert.calledWith(reject, REJECTION_REASON.CANNOT_CONVERT_CURRENCY);
+    })
+
     it('should return 1 when currency support is enabled and same currency code is requested as is set to adServerCurrency', function () {
       fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
       setConfig({ 'adServerCurrency': 'JPY' });
@@ -471,4 +525,67 @@ describe('currency', function () {
       expect(innerBid.currency).to.equal('CNY');
     });
   });
+
+  describe('enrichFpd', function() {
+    function fpd(ortb2 = {}) {
+      return enrichFPD(Promise.resolve(ortb2));
+    }
+    it('should set adServerCurrency on ortb', function () {
+      fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
+      setConfig({ adServerCurrency: 'EUR' });
+      return fpd({}).then((ortb) => {
+        expect(ortb.ext.prebid.adServerCurrency).to.eql('EUR')
+      })
+    })
+  });
+
+  describe('auctionDelay param', () => {
+    const continueAuction = sinon.stub();
+    let logWarnSpy;
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      clock = sinon.useFakeTimers(1046952000000); // 2003-03-06T12:00:00Z
+      logWarnSpy = sinon.spy(utils, 'logWarn');
+    });
+
+    afterEach(function () {
+      clock.runAll();
+      sandbox.restore();
+      clock.restore();
+      utils.logWarn.restore();
+      continueAuction.resetHistory();
+    });
+
+    it('should delay auction start when auctionDelay set in module config', () => {
+      setConfig({auctionDelay: 2000, adServerCurrency: 'USD'});
+      const reqBidsConfigObj = {
+        auctionId: '128937'
+      };
+      requestBidsHook(continueAuction, reqBidsConfigObj);
+      clock.tick(1000);
+      expect(continueAuction.notCalled).to.be.true;
+    });
+
+    it('should start auction when auctionDelay time passed', () => {
+      setConfig({auctionDelay: 2000, adServerCurrency: 'USD'});
+      const reqBidsConfigObj = {
+        auctionId: '128937'
+      };
+      requestBidsHook(continueAuction, reqBidsConfigObj);
+      clock.tick(3000);
+      expect(logWarnSpy.calledOnce).to.equal(true);
+      expect(continueAuction.calledOnce).to.be.true;
+    });
+
+    it('should run auction if rates were fetched before auctionDelay time', () => {
+      setConfig({auctionDelay: 3000, adServerCurrency: 'USD'});
+      const reqBidsConfigObj = {
+        auctionId: '128937'
+      };
+      fakeCurrencyFileServer.respond();
+      requestBidsHook(continueAuction, reqBidsConfigObj);
+      expect(continueAuction.calledOnce).to.be.true;
+    });
+  });
 });
diff --git a/test/spec/modules/cpexIdSystem_spec.js b/test/spec/modules/czechAdIdSystem_spec.js
similarity index 54%
rename from test/spec/modules/cpexIdSystem_spec.js
rename to test/spec/modules/czechAdIdSystem_spec.js
index 6e004c9f8ca..19b606b9237 100644
--- a/test/spec/modules/cpexIdSystem_spec.js
+++ b/test/spec/modules/czechAdIdSystem_spec.js
@@ -1,4 +1,7 @@
-import { czechAdIdSubmodule, storage } from 'modules/czechAdIdSystem.js';
+import {czechAdIdSubmodule, storage} from 'modules/czechAdIdSystem.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
 
 describe('czechAdId module', function () {
   let getCookieStub;
@@ -12,13 +15,13 @@ describe('czechAdId module', function () {
     getCookieStub.restore();
   });
 
-  const cookieTestCasesForEmpty = [undefined, null, '']
+  const cookieTestCasesForEmpty = [undefined, null, ''];
 
   describe('getId()', function () {
     it('should return the uid when it exists in cookie', function () {
       getCookieStub.withArgs('czaid').returns('czechAdIdTest');
       const id = czechAdIdSubmodule.getId();
-      expect(id).to.be.deep.equal({ id: 'czechAdIdTest' });
+      expect(id).to.be.deep.equal({id: 'czechAdIdTest'});
     });
 
     cookieTestCasesForEmpty.forEach(testCase => it('should not return the uid when it doesnt exist in cookie', function () {
@@ -32,7 +35,22 @@ describe('czechAdId module', function () {
     it('should return the uid when it exists in cookie', function () {
       getCookieStub.withArgs('czaid').returns('czechAdIdTest');
       const decoded = czechAdIdSubmodule.decode();
-      expect(decoded).to.be.deep.equal({ czechAdId: 'czechAdIdTest' });
+      expect(decoded).to.be.deep.equal({czechAdId: 'czechAdIdTest'});
+    });
+  });
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(czechAdIdSubmodule);
+    });
+
+    it('czechAdId', () => {
+      const id = 'some-random-id-value';
+      const userId = {czechAdId: id};
+      const [eid] = createEidsArray(userId);
+      expect(eid).to.deep.equal({
+        source: 'czechadid.cz',
+        uids: [{id: 'some-random-id-value', atype: 1}]
+      });
     });
   });
 });
diff --git a/test/spec/modules/dailyhuntBidAdapter_spec.js b/test/spec/modules/dailyhuntBidAdapter_spec.js
index f347d6cec5b..ab75264d951 100644
--- a/test/spec/modules/dailyhuntBidAdapter_spec.js
+++ b/test/spec/modules/dailyhuntBidAdapter_spec.js
@@ -27,10 +27,10 @@ describe('DailyhuntAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
   describe('buildRequests', function() {
diff --git a/test/spec/modules/dailymotionBidAdapter_spec.js b/test/spec/modules/dailymotionBidAdapter_spec.js
new file mode 100644
index 00000000000..2a276a06b15
--- /dev/null
+++ b/test/spec/modules/dailymotionBidAdapter_spec.js
@@ -0,0 +1,1953 @@
+import { config } from 'src/config.js';
+import { expect } from 'chai';
+import { spec } from 'modules/dailymotionBidAdapter.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes';
+
+describe('dailymotionBidAdapterTests', () => {
+  // Validate that isBidRequestValid only validates requests with apiKey
+  it('validates isBidRequestValid', () => {
+    expect(config.runWithBidder('dailymotion', () => spec.isBidRequestValid())).to.be.false;
+
+    const bidWithEmptyApi = {
+      params: {
+        apiKey: '',
+      },
+      mediaTypes: {
+        [VIDEO]: {
+          context: 'instream',
+        },
+      },
+    };
+
+    expect(config.runWithBidder('dailymotion', () => spec.isBidRequestValid(bidWithEmptyApi))).to.be.false;
+
+    const bidWithApi = {
+      params: {
+        apiKey: 'test_api_key',
+      },
+      mediaTypes: {
+        [VIDEO]: {
+          context: 'instream',
+        },
+      },
+    };
+
+    expect(config.runWithBidder('dailymotion', () => spec.isBidRequestValid(bidWithApi))).to.be.true;
+
+    const bidWithEmptyMediaTypes = {
+      params: {
+        apiKey: '',
+      },
+    };
+
+    expect(config.runWithBidder('dailymotion', () => spec.isBidRequestValid(bidWithEmptyMediaTypes))).to.be.false;
+
+    const bidWithEmptyVideoAdUnit = {
+      params: {
+        apiKey: '',
+      },
+      mediaTypes: {
+        [VIDEO]: {},
+      },
+    };
+
+    expect(config.runWithBidder('dailymotion', () => spec.isBidRequestValid(bidWithEmptyVideoAdUnit))).to.be.false;
+
+    const bidWithBannerMediaType = {
+      params: {
+        apiKey: 'test_api_key',
+      },
+      mediaTypes: {
+        [BANNER]: {},
+      },
+    };
+
+    expect(config.runWithBidder('dailymotion', () => spec.isBidRequestValid(bidWithBannerMediaType))).to.be.false;
+
+    const bidWithOutstreamContext = {
+      params: {
+        apiKey: 'test_api_key',
+      },
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+        },
+      },
+    };
+
+    expect(config.runWithBidder('dailymotion', () => spec.isBidRequestValid(bidWithOutstreamContext))).to.be.false;
+  });
+
+  // Validate request generation
+  it('validates buildRequests', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        dmTs: '123456',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerName: 'dailymotion',
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    config.setConfig({
+      userSync: {
+        syncEnabled: true,
+        filterSettings: {
+          all: {
+            bidders: '*',
+            filter: 'include'
+          }
+        }
+      }
+    });
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    const { data: reqData } = request;
+
+    expect(request.options.withCredentials).to.eql(false);
+    expect(request.url).to.equal('https://pb.dmxleo.com');
+
+    expect(reqData.pbv).to.eql('$prebid.version$');
+    expect(reqData.userSyncEnabled).to.be.true;
+    expect(reqData.bidder_request).to.eql({
+      refererInfo: bidderRequestData.refererInfo,
+      uspConsent: bidderRequestData.uspConsent,
+      gdprConsent: bidderRequestData.gdprConsent,
+      gppConsent: bidderRequestData.gppConsent,
+    });
+    expect(reqData.config.api_key).to.eql(bidRequestData[0].params.apiKey);
+    expect(reqData.config.ts).to.eql(bidRequestData[0].params.dmTs);
+    expect(reqData.coppa).to.be.true;
+    expect(reqData.request.auctionId).to.eql(bidRequestData[0].auctionId);
+    expect(reqData.request.bidId).to.eql(bidRequestData[0].bidId);
+    expect(reqData.request.mediaTypes.video).to.eql(bidRequestData[0].mediaTypes.video);
+    expect(reqData.video_metadata).to.eql({
+      description: bidRequestData[0].params.video.description,
+      iabcat1: ['IAB-1'],
+      iabcat2: bidRequestData[0].params.video.iabcat2,
+      id: bidRequestData[0].params.video.id,
+      lang: bidRequestData[0].params.video.lang,
+      private: bidRequestData[0].params.video.private,
+      tags: bidRequestData[0].params.video.tags,
+      title: bidRequestData[0].params.video.title,
+      url: bidRequestData[0].params.video.url,
+      topics: bidRequestData[0].params.video.topics,
+      duration: bidRequestData[0].params.video.duration,
+      livestream: !!bidRequestData[0].params.video.livestream,
+      isCreatedForKids: bidRequestData[0].params.video.isCreatedForKids,
+      context: {
+        siteOrAppCat: [],
+        siteOrAppContentCat: [],
+        videoViewsInSession: bidRequestData[0].params.video.videoViewsInSession,
+        autoplay: bidRequestData[0].params.video.autoplay,
+        playerName: bidRequestData[0].params.video.playerName,
+        playerVolume: bidRequestData[0].params.video.playerVolume,
+      },
+    });
+  });
+
+  it('validates buildRequests with global consent', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerName: 'dailymotion',
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: true
+        }
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(true);
+  });
+
+  it('validates buildRequests without gdpr applying', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerName: 'dailymotion',
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: false,
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(true);
+  });
+
+  it('validates buildRequests with detailed consent without legitimate interest', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerName: 'dailymotion',
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: false,
+          purpose: {
+            consents: {
+              1: true,
+              2: true,
+              3: true,
+              4: true,
+              7: true,
+              9: true,
+              10: true,
+            },
+          },
+          vendor: {
+            consents: {
+              573: true
+            }
+          },
+        },
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(false);
+  });
+
+  it('validates buildRequests with detailed consent, with legitimate interest', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerName: 'dailymotion',
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: false,
+          purpose: {
+            consents: {
+              1: true,
+              3: true,
+              4: true,
+            },
+            legitimateInterests: {
+              2: true,
+              7: true,
+              9: true,
+              10: true,
+            },
+          },
+          vendor: {
+            consents: {
+              573: true
+            }
+          },
+        },
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(true);
+  });
+
+  it('validates buildRequests with detailed consent and legitimate interest but publisher forces consent', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerName: 'dailymotion',
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: false,
+          publisher: {
+            restrictions: {
+              2: { 573: 1 },
+              7: { 573: 1 },
+              9: { 573: 1 },
+              10: { 573: 1 },
+            },
+          },
+          purpose: {
+            consents: {
+              1: true,
+              3: true,
+              4: true,
+            },
+            legitimateInterests: {
+              2: true,
+              7: true,
+              9: true,
+              10: true,
+            },
+          },
+          vendor: {
+            consents: {
+              573: true
+            }
+          },
+        },
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(false);
+  });
+
+  it('validates buildRequests with detailed consent, no legitimate interest and publisher forces consent', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerName: 'dailymotion',
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: false,
+          publisher: {
+            restrictions: {
+              2: { 573: 1 },
+              7: { 573: 1 },
+              9: { 573: 1 },
+              10: { 573: 1 },
+            },
+          },
+          purpose: {
+            consents: {
+              1: true,
+              2: true,
+              3: true,
+              4: true,
+              7: true,
+              9: true,
+              10: true,
+            },
+          },
+          vendor: {
+            consents: {
+              573: true
+            }
+          },
+        },
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(true);
+  });
+
+  it('validates buildRequests with detailed consent but publisher full restriction on purpose 1', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          xid: 'x123456',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: false,
+          publisher: {
+            restrictions: {
+              1: {
+                573: 0,
+              },
+            },
+          },
+          purpose: {
+            consents: {
+              1: true,
+              2: true,
+              3: true,
+              4: true,
+              7: true,
+              9: true,
+              10: true,
+            },
+          },
+          vendor: {
+            consents: {
+              573: true
+            }
+          },
+        },
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(false);
+  });
+
+  it('validates buildRequests with detailed consent but publisher restriction 2 on consent purpose 1', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          xid: 'x123456',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: false,
+          publisher: {
+            restrictions: {
+              1: {
+                573: 2,
+              },
+            },
+          },
+          purpose: {
+            consents: {
+              1: true,
+              3: true,
+              4: true,
+            },
+            legitimateInterests: {
+              2: true,
+              7: true,
+              9: true,
+              10: true,
+            },
+          },
+          vendor: {
+            consents: {
+              573: true
+            }
+          },
+        },
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(false);
+  });
+
+  it('validates buildRequests with detailed consent, legitimate interest and publisher restriction on purpose 1', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          xid: 'x123456',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: false,
+          publisher: {
+            restrictions: {
+              1: {
+                573: 1,
+              },
+            },
+          },
+          purpose: {
+            consents: {
+              1: true,
+              3: true,
+              4: true,
+            },
+            legitimateInterests: {
+              2: true,
+              7: true,
+              9: true,
+              10: true,
+            },
+          },
+          vendor: {
+            consents: {
+              573: true
+            }
+          },
+        },
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(true);
+  });
+
+  it('validates buildRequests with detailed consent and legitimate interest but publisher restriction on legitimate interest 2', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          xid: 'x123456',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: false,
+          publisher: {
+            restrictions: {
+              2: {
+                573: 2,
+              },
+            },
+          },
+          purpose: {
+            consents: {
+              1: true,
+              3: true,
+              4: true,
+            },
+            legitimateInterests: {
+              2: true,
+              7: true,
+              9: true,
+              10: true,
+            },
+          },
+          vendor: {
+            consents: {
+              573: true
+            }
+          },
+        },
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(true);
+  });
+
+  it('validates buildRequests with insufficient consent', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          iabcat1: ['IAB-1'],
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          livestream: 1,
+          isCreatedForKids: true,
+          videoViewsInSession: 2,
+          autoplay: true,
+          playerName: 'dailymotion',
+          playerVolume: 8,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+        vendorData: {
+          hasGlobalConsent: false,
+          purpose: {
+            consents: {
+              1: true,
+              3: true,
+              4: true,
+            },
+          },
+          vendor: {
+            consents: {
+              573: true
+            }
+          },
+        },
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        site: {
+          content: {
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    expect(request.options.withCredentials).to.eql(false);
+  });
+
+  it('validates buildRequests with content values from App', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          mimes: ['video/mp4'],
+          minduration: 5,
+          maxduration: 30,
+          playbackmethod: [3],
+          plcmt: 1,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1,
+          skipafter: 5,
+          skipmin: 10,
+          startdelay: 0,
+          w: 1280,
+          h: 720,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          iabcat2: ['6', '17'],
+          id: '54321',
+          lang: 'FR',
+          private: false,
+          tags: 'tag_1,tag_2,tag_3',
+          title: 'test video',
+          url: 'https://test.com/test',
+          topics: 'topic_1, topic_2',
+          livestream: 1,
+          // Test invalid values
+          isCreatedForKids: 'false',
+          videoViewsInSession: -1,
+          autoplay: 'true',
+          playerName: 'dailymotion',
+          playerVolume: 12,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+      },
+      gppConsent: {
+        gppString: 'xxx',
+        applicableSections: [5],
+      },
+      ortb2: {
+        regs: {
+          coppa: 1,
+        },
+        device: {
+          lmt: 1,
+          ifa: 'xxx',
+          ext: {
+            atts: 2,
+          },
+        },
+        app: {
+          bundle: 'app-bundle',
+          storeurl: 'https://play.google.com/store/apps/details?id=app-bundle',
+          content: {
+            len: 556,
+            data: [
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 4 },
+                segment: [{ id: 'IAB-1' }],
+              },
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '200' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    config.setConfig({
+      userSync: {
+        syncEnabled: true,
+        filterSettings: {
+          iframe: {
+            bidders: ['dailymotion'],
+            filter: 'include'
+          }
+        }
+      }
+    });
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    const { data: reqData } = request;
+
+    expect(request.url).to.equal('https://pb.dmxleo.com');
+
+    expect(reqData.pbv).to.eql('$prebid.version$');
+    expect(reqData.userSyncEnabled).to.be.true;
+    expect(reqData.bidder_request).to.eql({
+      refererInfo: bidderRequestData.refererInfo,
+      uspConsent: bidderRequestData.uspConsent,
+      gdprConsent: bidderRequestData.gdprConsent,
+      gppConsent: bidderRequestData.gppConsent,
+    });
+    expect(reqData.config.api_key).to.eql(bidRequestData[0].params.apiKey);
+    expect(reqData.coppa).to.be.true;
+    expect(reqData.appBundle).to.eql(bidderRequestData.ortb2.app.bundle);
+    expect(reqData.appStoreUrl).to.eql(bidderRequestData.ortb2.app.storeurl);
+    expect(reqData.device.lmt).to.eql(bidderRequestData.ortb2.device.lmt);
+    expect(reqData.device.ifa).to.eql(bidderRequestData.ortb2.device.ifa);
+    expect(reqData.device.atts).to.eql(bidderRequestData.ortb2.device.ext.atts);
+    expect(reqData.request.auctionId).to.eql(bidRequestData[0].auctionId);
+    expect(reqData.request.bidId).to.eql(bidRequestData[0].bidId);
+
+    expect(reqData.request.mediaTypes.video).to.eql(bidRequestData[0].mediaTypes.video);
+
+    expect(reqData.video_metadata).to.eql({
+      description: bidRequestData[0].params.video.description,
+      iabcat1: ['IAB-1'],
+      iabcat2: bidRequestData[0].params.video.iabcat2,
+      id: bidRequestData[0].params.video.id,
+      lang: bidRequestData[0].params.video.lang,
+      private: bidRequestData[0].params.video.private,
+      tags: bidRequestData[0].params.video.tags,
+      title: bidRequestData[0].params.video.title,
+      url: bidRequestData[0].params.video.url,
+      topics: bidRequestData[0].params.video.topics,
+      // Overriden through bidder params
+      duration: bidderRequestData.ortb2.app.content.len,
+      livestream: !!bidRequestData[0].params.video.livestream,
+      isCreatedForKids: null,
+      context: {
+        siteOrAppCat: [],
+        siteOrAppContentCat: [],
+        videoViewsInSession: null,
+        autoplay: null,
+        playerName: 'dailymotion',
+        playerVolume: null,
+      },
+    });
+  });
+
+  it('validates buildRequests with fallback values on ortb2 (gpp, iabcat2, id...)', () => {
+    const bidRequestData = [{
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: 123456,
+      adUnitCode: 'preroll',
+      mediaTypes: {
+        video: {
+          api: [2, 7],
+          startdelay: 0,
+        },
+      },
+      sizes: [[1920, 1080]],
+      params: {
+        apiKey: 'test_api_key',
+        video: {
+          description: 'this is a test video',
+          duration: 556,
+          private: false,
+          title: 'test video',
+          topics: 'topic_1, topic_2',
+          isCreatedForKids: false,
+          videoViewsInSession: 10,
+          autoplay: false,
+          playerName: 'dailymotion',
+          playerVolume: 0,
+        },
+      },
+    }];
+
+    const bidderRequestData = {
+      refererInfo: {
+        page: 'https://publisher.com',
+      },
+      uspConsent: '1YN-',
+      gdprConsent: {
+        apiVersion: 2,
+        consentString: 'xxx',
+        gdprApplies: true,
+      },
+      ortb2: {
+        regs: {
+          gpp: 'xxx',
+          gpp_sid: [5],
+          coppa: 0,
+        },
+        site: {
+          cat: ['IAB-1'],
+          content: {
+            id: '54321',
+            language: 'FR',
+            keywords: 'tag_1,tag_2,tag_3',
+            title: 'test video',
+            url: 'https://test.com/test',
+            livestream: 1,
+            cat: ['IAB-2'],
+            data: [
+              undefined, // Undefined to check proper handling of edge cases
+              {}, // Empty object to check proper handling of edge cases
+              { ext: {} }, // Empty ext to check proper handling of edge cases
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 22 }, // Invalid segtax to check proper handling of edge cases
+                segment: [{ id: '400' }],
+              },
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: undefined, // Invalid segment to check proper handling of edge cases
+              },
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 4 },
+                segment: undefined, // Invalid segment to check proper handling of edge cases
+              },
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: 2222 }], // Invalid segment id to check proper handling of edge cases
+              },
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '6' }],
+              },
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '6' }], // Check that same cat won't be duplicated
+              },
+              {
+                name: 'dataprovider.com',
+                ext: { segtax: 5 },
+                segment: [{ id: '17' }, { id: '20' }],
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    config.setConfig({
+      userSync: {
+        syncEnabled: true,
+        filterSettings: {
+          image: {
+            bidders: ['dailymotion'],
+            filter: 'include'
+          },
+          iframe: {
+            bidders: ['dailymotion'],
+            filter: 'exclude',
+          },
+        }
+      }
+    });
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestData, bidderRequestData),
+    );
+
+    const { data: reqData } = request;
+
+    expect(request.url).to.equal('https://pb.dmxleo.com');
+
+    expect(reqData.pbv).to.eql('$prebid.version$');
+    expect(reqData.userSyncEnabled).to.be.true;
+    expect(reqData.bidder_request).to.eql({
+      refererInfo: bidderRequestData.refererInfo,
+      uspConsent: bidderRequestData.uspConsent,
+      gdprConsent: bidderRequestData.gdprConsent,
+      gppConsent: {
+        gppString: bidderRequestData.ortb2.regs.gpp,
+        applicableSections: bidderRequestData.ortb2.regs.gpp_sid,
+      },
+    });
+    expect(reqData.config.api_key).to.eql(bidRequestData[0].params.apiKey);
+    expect(reqData.coppa).to.be.false;
+    expect(reqData.request.auctionId).to.eql(bidRequestData[0].auctionId);
+    expect(reqData.request.bidId).to.eql(bidRequestData[0].bidId);
+
+    expect(reqData.request.mediaTypes.video).to.eql({
+      ...bidRequestData[0].mediaTypes.video,
+      mimes: [],
+      minduration: 0,
+      maxduration: 0,
+      playbackmethod: [],
+      plcmt: undefined,
+      protocols: [],
+      skip: 0,
+      skipafter: 0,
+      skipmin: 0,
+      w: 0,
+      h: 0,
+    });
+
+    expect(reqData.video_metadata).to.eql({
+      description: bidRequestData[0].params.video.description,
+      iabcat1: ['IAB-2'],
+      iabcat2: ['6', '17', '20'],
+      id: bidderRequestData.ortb2.site.content.id,
+      lang: bidderRequestData.ortb2.site.content.language,
+      private: bidRequestData[0].params.video.private,
+      tags: bidderRequestData.ortb2.site.content.keywords,
+      title: bidderRequestData.ortb2.site.content.title,
+      url: bidderRequestData.ortb2.site.content.url,
+      topics: bidRequestData[0].params.video.topics,
+      duration: bidRequestData[0].params.video.duration,
+      livestream: !!bidderRequestData.ortb2.site.content.livestream,
+      isCreatedForKids: bidRequestData[0].params.video.isCreatedForKids,
+      context: {
+        siteOrAppCat: bidderRequestData.ortb2.site.cat,
+        siteOrAppContentCat: bidderRequestData.ortb2.site.content.cat,
+        videoViewsInSession: bidRequestData[0].params.video.videoViewsInSession,
+        autoplay: bidRequestData[0].params.video.autoplay,
+        playerName: bidRequestData[0].params.video.playerName,
+        playerVolume: bidRequestData[0].params.video.playerVolume,
+      },
+    });
+  });
+
+  it('validates buildRequests - with default values on empty bid & bidder request', () => {
+    const bidRequestDataWithApi = [{
+      params: {
+        apiKey: 'test_api_key',
+      },
+    }];
+
+    config.setConfig({
+      userSync: {
+        syncEnabled: false,
+      }
+    });
+
+    const [request] = config.runWithBidder(
+      'dailymotion',
+      () => spec.buildRequests(bidRequestDataWithApi, {}),
+    );
+
+    const { data: reqData } = request;
+
+    expect(request.url).to.equal('https://pb.dmxleo.com');
+
+    expect(reqData.config.api_key).to.eql(bidRequestDataWithApi[0].params.apiKey);
+    expect(reqData.coppa).to.be.false;
+
+    expect(reqData.pbv).to.eql('$prebid.version$');
+    expect(reqData.userSyncEnabled).to.be.false;
+    expect(reqData.bidder_request).to.eql({
+      gdprConsent: {
+        apiVersion: 1,
+        consentString: '',
+        gdprApplies: false,
+      },
+      refererInfo: {
+        page: '',
+      },
+      uspConsent: '',
+      gppConsent: {
+        gppString: '',
+        applicableSections: [],
+      },
+    });
+
+    expect(reqData.request).to.eql({
+      auctionId: '',
+      bidId: '',
+      adUnitCode: '',
+      mediaTypes: {
+        video: {
+          api: [],
+          mimes: [],
+          minduration: 0,
+          maxduration: 0,
+          playbackmethod: [],
+          plcmt: undefined,
+          protocols: [],
+          skip: 0,
+          skipafter: 0,
+          skipmin: 0,
+          startdelay: undefined,
+          w: 0,
+          h: 0,
+        },
+      },
+      sizes: [],
+    });
+
+    expect(reqData.video_metadata).to.eql({
+      description: '',
+      duration: 0,
+      iabcat1: [],
+      iabcat2: [],
+      id: '',
+      lang: '',
+      private: false,
+      tags: '',
+      title: '',
+      url: '',
+      topics: '',
+      livestream: false,
+      isCreatedForKids: null,
+      context: {
+        siteOrAppCat: [],
+        siteOrAppContentCat: [],
+        videoViewsInSession: null,
+        autoplay: null,
+        playerName: '',
+        playerVolume: null,
+      },
+    });
+  });
+
+  it('validates buildRequests - with empty/undefined validBidRequests', () => {
+    expect(spec.buildRequests([], {})).to.have.lengthOf(0);
+
+    expect(spec.buildRequests(undefined, {})).to.have.lengthOf(0);
+  });
+
+  it('validates interpretResponse', () => {
+    const serverResponse = {
+      body: {
+        ad: 'https://fakecacheserver/cache?uuid=1234',
+        cacheId: '1234',
+        cpm: 20.0,
+        creativeId: '5678',
+        currency: 'USD',
+        dealId: 'deal123',
+        nurl: 'https://bid/nurl',
+        requestId: 'test_requestid',
+        vastUrl: 'https://fakecacheserver/cache?uuid=1234',
+      },
+    };
+
+    const bids = spec.interpretResponse(serverResponse);
+    expect(bids).to.have.lengthOf(1);
+
+    const [bid] = bids;
+    expect(bid).to.eql(serverResponse.body);
+  });
+
+  it('validates interpretResponse - with empty/undefined serverResponse', () => {
+    expect(spec.interpretResponse({})).to.have.lengthOf(0);
+
+    expect(spec.interpretResponse(undefined)).to.have.lengthOf(0);
+  });
+
+  it('validates getUserSyncs', () => {
+    // Nothing sent in getUserSyncs
+    expect(config.runWithBidder('dailymotion', () => spec.getUserSyncs())).to.eql([]);
+
+    // No server response
+    {
+      const responses = [];
+      const syncOptions = { iframeEnabled: true, pixelEnabled: true };
+
+      expect(config.runWithBidder(
+        'dailymotion',
+        () => spec.getUserSyncs(syncOptions, responses),
+      )).to.eql([]);
+    }
+
+    // No permissions
+    {
+      const responses = [{ body: { userSyncs: [{ url: 'https://usersyncurl.com', type: 'image' }] } }];
+      const syncOptions = { iframeEnabled: false, pixelEnabled: false };
+
+      expect(config.runWithBidder(
+        'dailymotion',
+        () => spec.getUserSyncs(syncOptions, responses),
+      )).to.eql([]);
+    }
+
+    // Has permissions but no userSyncs urls
+    {
+      const responses = [{}];
+      const syncOptions = { iframeEnabled: false, pixelEnabled: true };
+
+      expect(config.runWithBidder(
+        'dailymotion',
+        () => spec.getUserSyncs(syncOptions, responses),
+      )).to.eql([]);
+    }
+
+    // Return userSyncs urls for pixels
+    {
+      const responses = [{
+        body: {
+          userSyncs: [
+            { url: 'https://usersyncurl.com', type: 'image' },
+            { url: 'https://usersyncurl2.com', type: 'image' },
+            { url: 'https://usersyncurl3.com', type: 'iframe' }
+          ],
+        }
+      }];
+
+      const syncOptions = { iframeEnabled: false, pixelEnabled: true };
+
+      expect(config.runWithBidder(
+        'dailymotion',
+        () => spec.getUserSyncs(syncOptions, responses),
+      )).to.eql([
+        { type: 'image', url: 'https://usersyncurl.com' },
+        { type: 'image', url: 'https://usersyncurl2.com' },
+      ]);
+    }
+
+    // Return userSyncs urls for iframes
+    {
+      const responses = [{
+        body: {
+          userSyncs: [
+            { url: 'https://usersyncurl.com', type: 'image' },
+            { url: 'https://usersyncurl2.com', type: 'image' },
+            { url: 'https://usersyncurl3.com', type: 'iframe' }
+          ],
+        }
+      }];
+
+      const syncOptions = { iframeEnabled: true, pixelEnabled: true };
+
+      expect(config.runWithBidder(
+        'dailymotion',
+        () => spec.getUserSyncs(syncOptions, responses),
+      )).to.eql([
+        { type: 'iframe', url: 'https://usersyncurl3.com' },
+      ]);
+    }
+  });
+});
diff --git a/test/spec/modules/datawrkzBidAdapter_spec.js b/test/spec/modules/datawrkzBidAdapter_spec.js
index 5524e318600..e78d2f68d91 100644
--- a/test/spec/modules/datawrkzBidAdapter_spec.js
+++ b/test/spec/modules/datawrkzBidAdapter_spec.js
@@ -36,26 +36,26 @@ describe('datawrkzAdapterTests', function () {
     });
 
     it('should return false when params not found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when required site_id param not found', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {'bidfloor': '1.0'}
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {'bidfloor': '1.0'}
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when adunit is adpod video', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {'bidfloor': '1.0', 'site_id': SITE_ID};
-      bid.mediaTypes = {
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {'bidfloor': '1.0', 'site_id': SITE_ID};
+      invalidBid.mediaTypes = {
         'video': {
           'context': 'adpod'
         }
       }
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/debugging_mod_spec.js b/test/spec/modules/debugging_mod_spec.js
index 8c7f0e84bce..438c70fae64 100644
--- a/test/spec/modules/debugging_mod_spec.js
+++ b/test/spec/modules/debugging_mod_spec.js
@@ -37,7 +37,12 @@ describe('bid interceptor', () => {
   describe('serializeConfig', () => {
     Object.entries({
       regexes: /pat/,
-      functions: () => ({})
+      functions: () => ({}),
+      'undefined': undefined,
+      date: new Date(),
+      symbol: Symbol('test'),
+      map: new Map(),
+      set: new Set(),
     }).forEach(([test, arg]) => {
       it(`should filter out ${test}`, () => {
         const valid = [{key1: 'value'}, {key2: 'value'}];
@@ -103,8 +108,8 @@ describe('bid interceptor', () => {
   });
 
   describe('rule', () => {
-    function matchingRule({replace, options}) {
-      setRules({when: {}, then: replace, options: options});
+    function matchingRule({replace, options, paapi}) {
+      setRules({when: {}, then: replace, options: options, paapi});
       return interceptor.match({});
     }
 
@@ -164,6 +169,48 @@ describe('bid interceptor', () => {
       });
     });
 
+    describe('paapi', () => {
+      it('should accept literals', () => {
+        const mockConfig = [
+          {config: {paapi: 1}},
+          {config: {paapi: 2}}
+        ]
+        const paapi = matchingRule({paapi: mockConfig}).paapi({});
+        expect(paapi).to.eql(mockConfig);
+      });
+
+      it('should accept a function and pass extra args to it', () => {
+        const paapiDef = sinon.stub();
+        const args = [{}, {}, {}];
+        matchingRule({paapi: paapiDef}).paapi(...args);
+        expect(paapiDef.calledOnceWith(...args.map(sinon.match.same))).to.be.true;
+      });
+
+      Object.entries({
+        'literal': (cfg) => [cfg],
+        'function': (cfg) => () => [cfg]
+      }).forEach(([t, makeConfigs]) => {
+        describe(`when paapi is defined as a ${t}`, () => {
+          it('should wrap top-level configs in "config"', () => {
+            const cfg = {decisionLogicURL: 'example'};
+            expect(matchingRule({paapi: makeConfigs(cfg)}).paapi({})).to.eql([{
+              config: cfg
+            }])
+          });
+
+          Object.entries({
+            'config': {config: 1},
+            'igb': {igb: 1},
+            'config and igb': {config: 1, igb: 2}
+          }).forEach(([t, cfg]) => {
+            it(`should not wrap configs that define top-level ${t}`, () => {
+              expect(matchingRule({paapi: makeConfigs(cfg)}).paapi({})).to.eql([cfg]);
+            })
+          })
+        })
+      })
+    })
+
     describe('.options', () => {
       it('should include default rule options', () => {
         const optDef = {someOption: 'value'};
@@ -181,16 +228,17 @@ describe('bid interceptor', () => {
   });
 
   describe('intercept()', () => {
-    let done, addBid;
+    let done, addBid, addPaapiConfig;
 
     function intercept(args = {}) {
       const bidRequest = {bids: args.bids || []};
-      return interceptor.intercept(Object.assign({bidRequest, done, addBid}, args));
+      return interceptor.intercept(Object.assign({bidRequest, done, addBid, addPaapiConfig}, args));
     }
 
     beforeEach(() => {
       done = sinon.spy();
       addBid = sinon.spy();
+      addPaapiConfig = sinon.spy();
     });
 
     describe('on no match', () => {
@@ -253,6 +301,29 @@ describe('bid interceptor', () => {
         });
       });
 
+      it('should call addPaapiConfigs when provided', () => {
+        const mockPaapiConfigs = [
+          {config: {paapi: 1}},
+          {config: {paapi: 2}}
+        ]
+        setRules({
+          when: {id: 2},
+          paapi: mockPaapiConfigs,
+        });
+        intercept({bidRequest: REQUEST});
+        expect(addPaapiConfig.callCount).to.eql(2);
+        mockPaapiConfigs.forEach(cfg => sinon.assert.calledWith(addPaapiConfig, cfg))
+      })
+
+      it('should not call onBid when then is null', () => {
+        setRules({
+          when: {id: 2},
+          then: null
+        });
+        intercept({bidRequest: REQUEST});
+        sinon.assert.notCalled(addBid);
+      })
+
       it('should call done()', () => {
         intercept({bidRequest: REQUEST});
         expect(done.calledOnce).to.be.true;
@@ -283,17 +354,30 @@ describe('Debugging config', () => {
 });
 
 describe('bidderBidInterceptor', () => {
-  let next, interceptBids, onCompletion, interceptResult, done, addBid;
+  let next, interceptBids, onCompletion, interceptResult, done, addBid, wrapCallback, addPaapiConfig, wrapped;
 
-  function interceptorArgs({spec = {}, bids = [], bidRequest = {}, ajax = {}, wrapCallback = {}, cbs = {}} = {}) {
+  function interceptorArgs({spec = {}, bids = [], bidRequest = {}, ajax = {}, cbs = {}} = {}) {
     return [next, interceptBids, spec, bids, bidRequest, ajax, wrapCallback, Object.assign({onCompletion}, cbs)];
   }
 
   beforeEach(() => {
     next = sinon.spy();
+    wrapped = false;
+    wrapCallback = sinon.stub().callsFake(cb => {
+      if (cb == null) return cb;
+      return function () {
+        wrapped = true;
+        try {
+          return cb.apply(this, arguments)
+        } finally {
+          wrapped = false;
+        }
+      }
+    });
     interceptBids = sinon.stub().callsFake((opts) => {
       done = opts.done;
       addBid = opts.addBid;
+      addPaapiConfig = opts.addPaapiConfig;
       return interceptResult;
     });
     onCompletion = sinon.spy();
@@ -301,13 +385,26 @@ describe('bidderBidInterceptor', () => {
   });
 
   it('should pass to interceptBid an addBid that triggers onBid', () => {
-    const onBid = sinon.spy();
+    const onBid = sinon.stub().callsFake(() => {
+      expect(wrapped).to.be.true;
+    });
     bidderBidInterceptor(...interceptorArgs({cbs: {onBid}}));
-    const bid = {};
+    const bid = {
+      bidder: 'bidder'
+    };
     addBid(bid);
     expect(onBid.calledWith(sinon.match.same(bid))).to.be.true;
   });
 
+  it('should pass addPaapiConfig that triggers onPaapi', () => {
+    const onPaapi = sinon.stub().callsFake(() => {
+      expect(wrapped).to.be.true;
+    });
+    bidderBidInterceptor(...interceptorArgs({cbs: {onPaapi}}));
+    addPaapiConfig({paapi: 'config'}, {bidId: 'bidId'});
+    sinon.assert.calledWith(onPaapi, {paapi: 'config', bidId: 'bidId'})
+  })
+
   describe('with no remaining bids', () => {
     it('should pass a done callback that triggers onCompletion', () => {
       bidderBidInterceptor(...interceptorArgs());
@@ -316,6 +413,12 @@ describe('bidderBidInterceptor', () => {
       expect(onCompletion.calledOnce).to.be.true;
     });
 
+    it('should call onResponse', () => {
+      const onResponse = sinon.stub();
+      bidderBidInterceptor(...interceptorArgs({cbs: {onResponse}}));
+      sinon.assert.called(onResponse);
+    })
+
     it('should not call next()', () => {
       bidderBidInterceptor(...interceptorArgs());
       expect(next.called).to.be.false;
diff --git a/test/spec/modules/deepintentBidAdapter_spec.js b/test/spec/modules/deepintentBidAdapter_spec.js
index d2a351b4089..b64c29d6800 100644
--- a/test/spec/modules/deepintentBidAdapter_spec.js
+++ b/test/spec/modules/deepintentBidAdapter_spec.js
@@ -252,6 +252,22 @@ describe('Deepintent adapter', function () {
       expect(data.imp[0].displaymanager).to.equal('di_prebid');
       expect(data.imp[0].displaymanagerver).to.equal('1.0.0');
     });
+    it('bid request check: bidfloor check', function() {
+      const requestClone = utils.deepClone(request);
+      let bRequest = spec.buildRequests(requestClone);
+      let data = JSON.parse(bRequest.data);
+      expect(data.imp[0].bidfloor).to.not.exist;
+
+      requestClone[0].params.bidfloor = 0;
+      bRequest = spec.buildRequests(requestClone);
+      data = JSON.parse(bRequest.data);
+      expect(data.imp[0].bidfloor).to.equal(0);
+
+      requestClone[0].params.bidfloor = 1.2;
+      bRequest = spec.buildRequests(requestClone);
+      data = JSON.parse(bRequest.data);
+      expect(data.imp[0].bidfloor).to.equal(1.2);
+    });
     it('bid request check: user object check', function () {
       let bRequest = spec.buildRequests(request);
       let data = JSON.parse(bRequest.data);
@@ -357,5 +373,34 @@ describe('Deepintent adapter', function () {
       let response = spec.interpretResponse(invalidResponse, bRequest);
       expect(response[0].mediaType).to.equal(undefined);
     });
-  })
+  });
+  describe('GPP and coppa', function() {
+    it('Request params check with GPP Consent', function () {
+      let bidderReq = {gppConsent: {gppString: 'gpp-string-test', applicableSections: [5]}};
+      let bRequest = spec.buildRequests(request, bidderReq);
+      let data = JSON.parse(bRequest.data);
+      expect(data.regs.gpp).to.equal('gpp-string-test');
+      expect(data.regs.gpp_sid[0]).to.equal(5);
+    });
+    it('Request params check with GPP Consent read from ortb2', function () {
+      let bidderReq = {
+        ortb2: {
+          regs: {
+            gpp: 'gpp-test-string',
+            gpp_sid: [5]
+          }
+        }
+      };
+      let bRequest = spec.buildRequests(request, bidderReq);
+      let data = JSON.parse(bRequest.data);
+      expect(data.regs.gpp).to.equal('gpp-test-string');
+      expect(data.regs.gpp_sid[0]).to.equal(5);
+    });
+    it('should include coppa flag in bid request if coppa is set to true', () => {
+      let bidderReq = {ortb2: {regs: {coppa: 1}}};
+      let bRequest = spec.buildRequests(request, bidderReq);
+      let data = JSON.parse(bRequest.data);
+      expect(data.regs.coppa).to.equal(1);
+    });
+  });
 });
diff --git a/test/spec/modules/deepintentDpesIdsystem_spec.js b/test/spec/modules/deepintentDpesIdsystem_spec.js
index 4c26b118a98..252cb2f414c 100644
--- a/test/spec/modules/deepintentDpesIdsystem_spec.js
+++ b/test/spec/modules/deepintentDpesIdsystem_spec.js
@@ -1,12 +1,10 @@
 import { expect } from 'chai';
-import {find} from 'src/polyfill.js';
-import { storage, deepintentDpesSubmodule } from 'modules/deepintentDpesIdSystem.js';
-import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
-import { config } from 'src/config.js';
+import { deepintentDpesSubmodule } from 'modules/deepintentDpesIdSystem.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
 
-const DI_COOKIE_NAME = '_dpes_id';
-const DI_COOKIE_STORED = '{"id":"2cf40748c4f7f60d343336e08f80dc99"}';
 const DI_COOKIE_OBJECT = {id: '2cf40748c4f7f60d343336e08f80dc99'};
+const DI_UPDATED_STORAGE = '2cf40748c4f7f60d343336e08f80dc99';
 
 const cookieConfig = {
   name: 'deepintentId',
@@ -27,50 +25,56 @@ const html5Config = {
 }
 
 describe('Deepintent DPES System', () => {
-  let getDataFromLocalStorageStub, localStorageIsEnabledStub;
-  let getCookieStub, cookiesAreEnabledStub;
-
-  beforeEach(() => {
-    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
-    localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
-    getCookieStub = sinon.stub(storage, 'getCookie');
-    cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
-  });
-
-  afterEach(() => {
-    getDataFromLocalStorageStub.restore();
-    localStorageIsEnabledStub.restore();
-    getCookieStub.restore();
-    cookiesAreEnabledStub.restore();
-  });
-
   describe('Deepintent Dpes Sytsem: test "getId" method', () => {
-    it('Wrong config should fail the tests', () => {
-      // no config
-      expect(deepintentDpesSubmodule.getId()).to.be.eq(undefined);
-      expect(deepintentDpesSubmodule.getId({ })).to.be.eq(undefined);
-
-      expect(deepintentDpesSubmodule.getId({params: {}, storage: {}})).to.be.eq(undefined);
-      expect(deepintentDpesSubmodule.getId({params: {}, storage: {type: 'cookie'}})).to.be.eq(undefined);
-      expect(deepintentDpesSubmodule.getId({params: {}, storage: {name: '_dpes_id'}})).to.be.eq(undefined);
+    it('If nothing is found in cache, return undefined', () => {
+      let diId = deepintentDpesSubmodule.getId({}, undefined, undefined);
+      expect(diId).to.be.eq(undefined);
     });
 
     it('Get value stored in cookie for getId', () => {
-      getCookieStub.withArgs(DI_COOKIE_NAME).returns(DI_COOKIE_STORED);
       let diId = deepintentDpesSubmodule.getId(cookieConfig, undefined, DI_COOKIE_OBJECT);
       expect(diId).to.deep.equal(DI_COOKIE_OBJECT);
     });
 
     it('provides the stored deepintentId if cookie is absent but present in local storage', () => {
-      getDataFromLocalStorageStub.withArgs(DI_COOKIE_NAME).returns(DI_COOKIE_STORED);
-      let idx = deepintentDpesSubmodule.getId(html5Config, undefined, DI_COOKIE_OBJECT);
-      expect(idx).to.deep.equal(DI_COOKIE_OBJECT);
+      let idx = deepintentDpesSubmodule.getId(html5Config, undefined, DI_UPDATED_STORAGE);
+      expect(idx).to.be.eq(DI_UPDATED_STORAGE);
     });
   });
 
   describe('Deepintent Dpes System : test "decode" method', () => {
-    it('Get the correct decoded value for dpes id', () => {
-      expect(deepintentDpesSubmodule.decode(DI_COOKIE_OBJECT, cookieConfig)).to.deep.equal({'deepintentId': {'id': '2cf40748c4f7f60d343336e08f80dc99'}});
+    it('Get the correct decoded value for dpes id, if an object is set return object', () => {
+      expect(deepintentDpesSubmodule.decode(DI_COOKIE_OBJECT, cookieConfig)).to.deep.equal({'deepintentId': DI_COOKIE_OBJECT});
+    });
+
+    it('Get the correct decoded value for dpes id, if a string is set return string', () => {
+      expect(deepintentDpesSubmodule.decode(DI_UPDATED_STORAGE, {})).to.deep.equal({'deepintentId': DI_UPDATED_STORAGE});
     });
   });
+
+  describe('Deepintent Dpes System : test "getValue" method in eids', () => {
+    it('Get the correct string value for dpes id, if an object is set in local storage', () => {
+      expect(deepintentDpesSubmodule.eids.deepintentId.getValue(DI_COOKIE_OBJECT)).to.be.equal(DI_UPDATED_STORAGE);
+    });
+
+    it('Get the correct string value for dpes id, if a string is set in local storage', () => {
+      expect(deepintentDpesSubmodule.eids.deepintentId.getValue(DI_UPDATED_STORAGE)).to.be.eq(DI_UPDATED_STORAGE);
+    });
+  });
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(deepintentDpesSubmodule);
+    })
+    it('deepintentId', function() {
+      const userId = {
+        deepintentId: 'some-random-id-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'deepintent.com',
+        uids: [{id: 'some-random-id-value', atype: 3}]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/dexertoBidAdapter_spec.js b/test/spec/modules/dexertoBidAdapter_spec.js
new file mode 100644
index 00000000000..419fcbc9dbe
--- /dev/null
+++ b/test/spec/modules/dexertoBidAdapter_spec.js
@@ -0,0 +1,199 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/dexertoBidAdapter';
+import * as utils from '../../../src/utils.js';
+
+describe('dexerto adapter', function () {
+  let request;
+  let bannerResponse, invalidResponse;
+
+  beforeEach(function () {
+    request = [
+      {
+        bidder: 'dexerto',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          placement_id: 110003,
+          width: 300,
+          height: 250,
+          domain: '',
+          bid_floor: 0.5
+        }
+      }
+    ];
+    bannerResponse = {
+      'body': {
+        'id': 'a48b79e7-7104-4213-99f3-55f3234f2e54',
+        'seatbid': [{
+          'bid': [{
+            'id': '3d7dd6dc-7665-4cdc-96a4-5ea192df32b8',
+            'impid': '285b9c53b2c662',
+            'price': 0.5,
+            'adid': '3424',
+            'adm': " 
 
",
+            'adomain': ['google.com'],
+            'iurl': 'https://cdn.audiencelogy.com/1_3424_1.jpg',
+            'cid': '410011',
+            'crid': '410011',
+            'w': 300,
+            'h': 250,
+            'cat': ['IAB1-15']
+          }],
+          'seat': 'audiencelogy',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_1256'
+      }
+    };
+    invalidResponse = {
+      'body': {
+        'id': 'a48b79e7-7104-4213-99f3-55f3234f2e54',
+        'seatbid': [{
+          'bid': [{
+            'id': '3d7dd6dc-7665-4cdc-96a4-5ea192df32b8',
+            'impid': '285b9c53b2c662',
+            'price': 0.5,
+            'adid': '3424',
+            'adm': 'invalid response',
+            'adomain': ['google.com'],
+            'iurl': 'https://cdn.audiencelogy.com/1_3424_1.jpg',
+            'cid': '410011',
+            'crid': '410011',
+            'w': 300,
+            'h': 250,
+            'cat': ['IAB1-15']
+          }],
+          'seat': 'audiencelogy',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_1256'
+      }
+    };
+  });
+
+  describe('validations', function () {
+    it('isBidValid : placement_id is passed', function () {
+      let bid = {
+          bidder: 'dexerto',
+          params: {
+            placement_id: 110003
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(true);
+    });
+    it('isBidValid : placement_id is not passed', function () {
+      let bid = {
+          bidder: 'dexerto',
+          params: {
+            width: 300,
+            height: 250,
+            domain: '',
+            bid_floor: 0.5
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(false);
+    });
+  });
+  describe('Validate Request', function () {
+    it('Immutable bid request validate', function () {
+      let _Request = utils.deepClone(request),
+        bidRequest = spec.buildRequests(request);
+      expect(request).to.deep.equal(_Request);
+    });
+    it('Validate bidder connection', function () {
+      let _Request = spec.buildRequests(request);
+      expect(_Request.url).to.equal('https://rtb.dexerto.media/hb/dexerto');
+      expect(_Request.method).to.equal('POST');
+      expect(_Request.options.contentType).to.equal('application/json');
+    });
+    it('Validate bid request : Impression', function () {
+      let _Request = spec.buildRequests(request);
+      let data = JSON.parse(_Request.data);
+      // expect(data.at).to.equal(1); // auction type
+      expect(data[0].imp[0].id).to.equal(request[0].bidId);
+      expect(data[0].placementId).to.equal(110003);
+    });
+    it('Validate bid request : ad size', function () {
+      let _Request = spec.buildRequests(request);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].imp[0].banner).to.be.a('object');
+      expect(data[0].imp[0].banner.w).to.equal(300);
+      expect(data[0].imp[0].banner.h).to.equal(250);
+    });
+    it('Validate bid request : user object', function () {
+      let _Request = spec.buildRequests(request);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].user).to.be.a('object');
+      expect(data[0].user.id).to.be.a('string');
+    });
+    it('Validate bid request : CCPA Check', function () {
+      let bidRequest = {
+        uspConsent: '1NYN'
+      };
+      let _Request = spec.buildRequests(request, bidRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.ext.us_privacy).to.equal('1NYN');
+      //   let _bidRequest = {};
+      //   let _Request1 = spec.buildRequests(request, _bidRequest);
+      //   let data1 = JSON.parse(_Request1.data);
+      //   expect(data1.regs).to.equal(undefined);
+    });
+  });
+  describe('Validate response ', function () {
+    it('Validate bid response : valid bid response', function () {
+      let bResponse = spec.interpretResponse(bannerResponse, request);
+      expect(bResponse).to.be.an('array').with.length.above(0);
+      expect(bResponse[0].requestId).to.equal(bannerResponse.body.seatbid[0].bid[0].impid);
+      expect(bResponse[0].width).to.equal(bannerResponse.body.seatbid[0].bid[0].w);
+      expect(bResponse[0].height).to.equal(bannerResponse.body.seatbid[0].bid[0].h);
+      expect(bResponse[0].currency).to.equal('USD');
+      expect(bResponse[0].netRevenue).to.equal(false);
+      expect(bResponse[0].mediaType).to.equal('banner');
+      expect(bResponse[0].meta.advertiserDomains).to.deep.equal(['google.com']);
+      expect(bResponse[0].ttl).to.equal(300);
+      expect(bResponse[0].creativeId).to.equal(bannerResponse.body.seatbid[0].bid[0].crid);
+      expect(bResponse[0].dealId).to.equal(bannerResponse.body.seatbid[0].bid[0].dealId);
+    });
+    it('Invalid bid response check ', function () {
+      let bRequest = spec.buildRequests(request);
+      let response = spec.interpretResponse(invalidResponse, bRequest);
+      expect(response[0].ad).to.equal('invalid response');
+    });
+  });
+  describe('GPP and coppa', function () {
+    it('Request params check with GPP Consent', function () {
+      let bidderReq = { gppConsent: { gppString: 'gpp-string-test', applicableSections: [5] } };
+      let _Request = spec.buildRequests(request, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.gpp).to.equal('gpp-string-test');
+      expect(data[0].regs.gpp_sid[0]).to.equal(5);
+    });
+    it('Request params check with GPP Consent read from ortb2', function () {
+      let bidderReq = {
+        ortb2: {
+          regs: {
+            gpp: 'gpp-test-string',
+            gpp_sid: [5]
+          }
+        }
+      };
+      let _Request = spec.buildRequests(request, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.gpp).to.equal('gpp-test-string');
+      expect(data[0].regs.gpp_sid[0]).to.equal(5);
+    });
+    it(' Bid request should have coppa flag if its true', () => {
+      let bidderReq = { ortb2: { regs: { coppa: 1 } } };
+      let _Request = spec.buildRequests(request, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.coppa).to.equal(1);
+    });
+  });
+});
diff --git a/test/spec/modules/dfpAdServerVideo_spec.js b/test/spec/modules/dfpAdServerVideo_spec.js
index 89485adf28b..092cd1ff0f3 100644
--- a/test/spec/modules/dfpAdServerVideo_spec.js
+++ b/test/spec/modules/dfpAdServerVideo_spec.js
@@ -1,43 +1,60 @@
-import { expect } from 'chai';
+import {expect} from 'chai';
 
 import parse from 'url-parse';
-import {buildDfpVideoUrl, buildAdpodVideoUrl, dep} from 'modules/dfpAdServerVideo.js';
-import adUnit from 'test/fixtures/video/adUnit.json';
+import {buildDfpVideoUrl, dep} from 'modules/dfpAdServerVideo.js';
+import AD_UNIT from 'test/fixtures/video/adUnit.json';
 import * as utils from 'src/utils.js';
-import { config } from 'src/config.js';
-import { targeting } from 'src/targeting.js';
-import { auctionManager } from 'src/auctionManager.js';
-import { gdprDataHandler, uspDataHandler } from 'src/adapterManager.js';
-import * as adpod from 'modules/adpod.js';
-import { server } from 'test/mocks/xhr.js';
-import * as adServer from 'src/adserver.js';
 import {deepClone} from 'src/utils.js';
-import {hook} from '../../../src/hook.js';
-import {getRefererInfo} from '../../../src/refererDetection.js';
+import {config} from 'src/config.js';
+import {targeting} from 'src/targeting.js';
+import {auctionManager} from 'src/auctionManager.js';
+import {gdprDataHandler} from 'src/adapterManager.js';
 
-const bid = {
-  videoCacheKey: 'abc',
-  adserverTargeting: {
-    hb_uuid: 'abc',
-    hb_cache_id: 'abc',
-  },
-};
+import * as adServer from 'src/adserver.js';
+import {hook} from '../../../src/hook.js';
+import {stubAuctionIndex} from '../../helpers/indexStub.js';
+import {AuctionIndex} from '../../../src/auctionIndex.js';
 
 describe('The DFP video support module', function () {
   before(() => {
     hook.ready();
   });
 
-  let sandbox;
+  let sandbox, bid, adUnit;
 
   beforeEach(() => {
     sandbox = sinon.sandbox.create();
+    bid = {
+      videoCacheKey: 'abc',
+      adserverTargeting: {
+        hb_uuid: 'abc',
+        hb_cache_id: 'abc',
+      },
+    };
+    adUnit = deepClone(AD_UNIT);
   });
 
   afterEach(() => {
     sandbox.restore();
   });
 
+  function getURL(options) {
+    return parse(buildDfpVideoUrl(Object.assign({
+      adUnit: adUnit,
+      bid: bid,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }, options)))
+  }
+  function getQueryParams(options) {
+    return utils.parseQS(getURL(options).query);
+  }
+
+  function getCustomParams(options) {
+    return utils.parseQS('?' + decodeURIComponent(getQueryParams(options).cust_params));
+  }
+
   Object.entries({
     params: {
       params: {
@@ -51,27 +68,25 @@ describe('The DFP video support module', function () {
     describe(`when using ${t}`, () => {
       it('should use page location as default for description_url', () => {
         sandbox.stub(dep, 'ri').callsFake(() => ({page: 'example.com'}));
-
-        const url = parse(buildDfpVideoUrl(Object.assign({
-          adUnit: adUnit,
-          bid: bid,
-        }, options)));
-        const prm = utils.parseQS(url.query);
+        const prm = getQueryParams(options);
         expect(prm.description_url).to.eql('example.com');
-      })
-    })
+      });
+
+      it('should use a URI encoded page location as default for description_url', () => {
+        sandbox.stub(dep, 'ri').callsFake(() => ({page: 'https://example.com?iu=/99999999/news&cust_params=current_hour%3D12%26newscat%3Dtravel&pbjs_debug=true'}));
+        const prm = getQueryParams(options);
+        expect(prm.description_url).to.eql('https%3A%2F%2Fexample.com%3Fiu%3D%2F99999999%2Fnews%26cust_params%3Dcurrent_hour%253D12%2526newscat%253Dtravel%26pbjs_debug%3Dtrue');
+      });
+    });
   })
 
   it('should make a legal request URL when given the required params', function () {
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bid,
+    const url = getURL({
       params: {
         'iu': 'my/adUnit',
         'description_url': 'someUrl.com',
       }
-    }));
-
+    })
     expect(url.protocol).to.equal('https:');
     expect(url.host).to.equal('securepubads.g.doubleclick.net');
 
@@ -88,15 +103,10 @@ describe('The DFP video support module', function () {
   });
 
   it('can take an adserver url as a parameter', function () {
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.vastUrl = 'vastUrl.example';
-
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bidCopy,
+    bid.vastUrl = 'vastUrl.example';
+    const url = getURL({
       url: 'https://video.adserver.example/',
-    }));
-
+    })
     expect(url.host).to.equal('video.adserver.example');
   });
 
@@ -110,161 +120,64 @@ describe('The DFP video support module', function () {
   });
 
   it('overwrites url params when both url and params object are given', function () {
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bid,
+    const params = getQueryParams({
       url: 'https://video.adserver.example/ads?sz=640x480&iu=/123/aduniturl&impl=s',
       params: { iu: 'my/adUnit' }
-    }));
+    });
 
-    const queryObject = utils.parseQS(url.query);
-    expect(queryObject.iu).to.equal('my/adUnit');
+    expect(params.iu).to.equal('my/adUnit');
   });
 
   it('should override param defaults with user-provided ones', function () {
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bid,
+    const params = getQueryParams({
       params: {
-        'iu': 'my/adUnit',
         'output': 'vast',
       }
-    }));
-
-    expect(utils.parseQS(url.query)).to.have.property('output', 'vast');
+    });
+    expect(params.output).to.equal('vast');
   });
 
   it('should include the cache key and adserver targeting in cust_params', function () {
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+    bid.adserverTargeting = Object.assign(bid.adserverTargeting, {
       hb_adid: 'ad_id',
     });
 
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bidCopy,
-      params: {
-        'iu': 'my/adUnit'
-      }
-    }));
-    const queryObject = utils.parseQS(url.query);
-    const customParams = utils.parseQS('?' + decodeURIComponent(queryObject.cust_params));
+    const customParams = getCustomParams()
 
     expect(customParams).to.have.property('hb_adid', 'ad_id');
     expect(customParams).to.have.property('hb_uuid', bid.videoCacheKey);
     expect(customParams).to.have.property('hb_cache_id', bid.videoCacheKey);
   });
 
-  it('should include the us_privacy key when USP Consent is available', function () {
-    let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
-    uspDataHandlerStub.returns('1YYY');
-
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
-      hb_adid: 'ad_id',
-    });
-
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bidCopy,
-      params: {
-        'iu': 'my/adUnit'
-      }
-    }));
-    const queryObject = utils.parseQS(url.query);
-    expect(queryObject.us_privacy).to.equal('1YYY');
-    uspDataHandlerStub.restore();
-  });
-
-  it('should not include the us_privacy key when USP Consent is not available', function () {
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
-      hb_adid: 'ad_id',
-    });
-
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bidCopy,
-      params: {
-        'iu': 'my/adUnit'
-      }
-    }));
-    const queryObject = utils.parseQS(url.query);
-    expect(queryObject.us_privacy).to.equal(undefined);
-  });
-
   it('should include the GDPR keys when GDPR Consent is available', function () {
-    let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
-    gdprDataHandlerStub.returns({
+    sandbox.stub(gdprDataHandler, 'getConsentData').returns({
       gdprApplies: true,
       consentString: 'consent',
       addtlConsent: 'moreConsent'
     });
-
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
-      hb_adid: 'ad_id',
-    });
-
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bidCopy,
-      params: {
-        'iu': 'my/adUnit'
-      }
-    }));
-    const queryObject = utils.parseQS(url.query);
+    const queryObject = getQueryParams();
     expect(queryObject.gdpr).to.equal('1');
     expect(queryObject.gdpr_consent).to.equal('consent');
     expect(queryObject.addtl_consent).to.equal('moreConsent');
-    gdprDataHandlerStub.restore();
   });
 
   it('should not include the GDPR keys when GDPR Consent is not available', function () {
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
-      hb_adid: 'ad_id',
-    });
-
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bidCopy,
-      params: {
-        'iu': 'my/adUnit'
-      }
-    }));
-    const queryObject = utils.parseQS(url.query);
+    const queryObject = getQueryParams()
     expect(queryObject.gdpr).to.equal(undefined);
     expect(queryObject.gdpr_consent).to.equal(undefined);
     expect(queryObject.addtl_consent).to.equal(undefined);
   });
 
   it('should only include the GDPR keys for GDPR Consent fields with values', function () {
-    let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
-    gdprDataHandlerStub.returns({
+    sandbox.stub(gdprDataHandler, 'getConsentData').returns({
       gdprApplies: true,
       consentString: 'consent',
     });
-
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
-      hb_adid: 'ad_id',
-    });
-
-    const url = parse(buildDfpVideoUrl({
-      adUnit: adUnit,
-      bid: bidCopy,
-      params: {
-        'iu': 'my/adUnit'
-      }
-    }));
-    const queryObject = utils.parseQS(url.query);
+    const queryObject = getQueryParams()
     expect(queryObject.gdpr).to.equal('1');
     expect(queryObject.gdpr_consent).to.equal('consent');
     expect(queryObject.addtl_consent).to.equal(undefined);
-    gdprDataHandlerStub.restore();
   });
-
   describe('GAM PPID', () => {
     let ppid;
     let getPPIDStub;
@@ -280,29 +193,283 @@ describe('The DFP video support module', function () {
       'url': {url: 'https://video.adserver.mock/', params: {'iu': 'mock/unit'}}
     }).forEach(([t, opts]) => {
       describe(`when using ${t}`, () => {
-        function buildUrlAndGetParams() {
-          const url = parse(buildDfpVideoUrl(Object.assign({
-            adUnit: adUnit,
-            bid: deepClone(bid),
-          }, opts)));
-          return utils.parseQS(url.query);
-        }
-
         it('should be included if available', () => {
           ppid = 'mockPPID';
-          const q = buildUrlAndGetParams();
+          const q = getQueryParams(opts);
           expect(q.ppid).to.equal('mockPPID');
         });
 
         it('should not be included if not available', () => {
           ppid = undefined;
-          const q = buildUrlAndGetParams();
+          const q = getQueryParams(opts);
           expect(q.hasOwnProperty('ppid')).to.be.false;
         })
       })
     })
   })
 
+  describe('ORTB video parameters', () => {
+    Object.entries({
+      plcmt: [
+        {
+          video: {
+            plcmt: 1
+          },
+          expected: '1'
+        }
+      ],
+      min_ad_duration: [
+        {
+          video: {
+            minduration: 123
+          },
+          expected: '123000'
+        }
+      ],
+      max_ad_duration: [
+        {
+          video: {
+            maxduration: 321
+          },
+          expected: '321000'
+        }
+      ],
+      vpos: [
+        {
+          video: {
+            startdelay: 0
+          },
+          expected: 'preroll'
+        },
+        {
+          video: {
+            startdelay: -1
+          },
+          expected: 'midroll'
+        },
+        {
+          video: {
+            startdelay: -2
+          },
+          expected: 'postroll'
+        },
+        {
+          video: {
+            startdelay: 10
+          },
+          expected: 'midroll'
+        }
+      ],
+      vconp: [
+        {
+          video: {
+            playbackmethod: [7]
+          },
+          expected: '2'
+        },
+        {
+          video: {
+            playbackmethod: [7, 1]
+          },
+          expected: undefined
+        }
+      ],
+      vpa: [
+        {
+          video: {
+            playbackmethod: [1, 2, 4, 5, 6, 7]
+          },
+          expected: 'auto'
+        },
+        {
+          video: {
+            playbackmethod: [3, 7],
+          },
+          expected: 'click'
+        },
+        {
+          video: {
+            playbackmethod: [1, 3],
+          },
+          expected: undefined
+        }
+      ],
+      vpmute: [
+        {
+          video: {
+            playbackmethod: [1, 3, 4, 5, 7]
+          },
+          expected: '0'
+        },
+        {
+          video: {
+            playbackmethod: [2, 6, 7],
+          },
+          expected: '1'
+        },
+        {
+          video: {
+            playbackmethod: [1, 2]
+          },
+          expected: undefined
+        }
+      ]
+    }).forEach(([param, cases]) => {
+      describe(param, () => {
+        cases.forEach(({video, expected}) => {
+          describe(`when mediaTypes.video has ${JSON.stringify(video)}`, () => {
+            it(`fills in ${param} = ${expected}`, () => {
+              Object.assign(adUnit.mediaTypes.video, video);
+              expect(getQueryParams()[param]).to.eql(expected);
+            });
+            it(`does not override pub-provided params.${param}`, () => {
+              Object.assign(adUnit.mediaTypes.video, video);
+              expect(getQueryParams({
+                params: {
+                  [param]: 'OG'
+                }
+              })[param]).to.eql('OG');
+            });
+            it('does not fill if param has no value', () => {
+              expect(getQueryParams().hasOwnProperty(param)).to.be.false;
+            })
+          })
+        })
+      })
+    })
+  });
+
+  describe('ppsj', () => {
+    let ortb2;
+    beforeEach(() => {
+      ortb2 = null;
+    })
+
+    function getSignals() {
+      const ppsj = JSON.parse(atob(getQueryParams().ppsj));
+      return Object.fromEntries(ppsj.PublisherProvidedTaxonomySignals.map(sig => [sig.taxonomy, sig.values]));
+    }
+
+    Object.entries({
+      'FPD from bid request'() {
+        bid.requestId = 'req-id';
+        sandbox.stub(auctionManager, 'index').get(() => stubAuctionIndex({
+          bidRequests: [
+            {
+              bidId: 'req-id',
+              ortb2
+            }
+          ]
+        }));
+      },
+      'global FPD from auction'() {
+        bid.auctionId = 'auid';
+        sandbox.stub(auctionManager, 'index').get(() => new AuctionIndex(() => [{
+          getAuctionId: () => 'auid',
+          getFPD: () => ({
+            global: ortb2
+          })
+        }]));
+      }
+    }).forEach(([t, setup]) => {
+      describe(`using ${t}`, () => {
+        beforeEach(setup);
+        it('does not fill if there\'s no segments in segtax 4 or 6', () => {
+          ortb2 = {
+            site: {
+              content: {
+                data: [
+                  {
+                    segment: [
+                      {id: '1'},
+                      {id: '2'}
+                    ]
+                  },
+                ]
+              }
+            },
+            user: {
+              data: [
+                {
+                  ext: {
+                    segtax: 1,
+                  },
+                  segment: [
+                    {id: '3'}
+                  ]
+                }
+              ]
+            }
+          }
+          expect(getQueryParams().ppsj).to.not.exist;
+        });
+
+        const SEGMENTS = [
+          {
+            ext: {
+              segtax: 4,
+            },
+            segment: [
+              {id: '4-1'},
+              {id: '4-2'}
+            ]
+          },
+          {
+            ext: {
+              segtax: 4,
+            },
+            segment: [
+              {id: '4-2'},
+              {id: '4-3'}
+            ]
+          },
+          {
+            ext: {
+              segtax: 6,
+            },
+            segment: [
+              {id: '6-1'},
+              {id: '6-2'}
+            ]
+          },
+          {
+            ext: {
+              segtax: 6,
+            },
+            segment: [
+              {id: '6-2'},
+              {id: '6-3'}
+            ]
+          },
+        ]
+
+        it('collects user.data segments with segtax = 4 into IAB_AUDIENCE_1_1', () => {
+          ortb2 = {
+            user: {
+              data: SEGMENTS
+            }
+          }
+          expect(getSignals()).to.eql({
+            IAB_AUDIENCE_1_1: ['4-1', '4-2', '4-3']
+          })
+        })
+
+        it('collects site.content.data segments with segtax = 6 into IAB_CONTENT_2_2', () => {
+          ortb2 = {
+            site: {
+              content: {
+                data: SEGMENTS
+              }
+            }
+          }
+          expect(getSignals()).to.eql({
+            IAB_CONTENT_2_2: ['6-1', '6-2', '6-3']
+          })
+        })
+      })
+    })
+  })
+
   describe('special targeting unit test', function () {
     const allTargetingData = {
       'hb_format': 'video',
@@ -539,253 +706,4 @@ describe('The DFP video support module', function () {
     expect(customParams).to.have.property('other_key', 'other_value');
     expect(customParams).to.have.property('hb_rand', 'random');
   });
-
-  describe('adpod unit tests', function () {
-    let amStub;
-    let amGetAdUnitsStub;
-
-    before(function () {
-      let adUnits = [{
-        code: 'adUnitCode-1',
-        mediaTypes: {
-          video: {
-            context: 'adpod',
-            playerSize: [640, 480],
-            adPodDurationSec: 60,
-            durationRangeSec: [15, 30],
-            requireExactDuration: true
-          }
-        },
-        bids: [
-          {
-            bidder: 'appnexus',
-            params: {
-              placementId: 14542875,
-            }
-          }
-        ]
-      }];
-
-      amGetAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits');
-      amGetAdUnitsStub.returns(adUnits);
-      amStub = sinon.stub(auctionManager, 'getBidsReceived');
-    });
-
-    beforeEach(function () {
-      config.setConfig({
-        adpod: {
-          brandCategoryExclusion: true,
-          deferCaching: false
-        }
-      });
-    })
-
-    afterEach(function() {
-      config.resetConfig();
-    });
-
-    after(function () {
-      amGetAdUnitsStub.restore();
-      amStub.restore();
-    });
-
-    it('should return masterTag url', function() {
-      amStub.returns(getBidsReceived());
-      let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
-      uspDataHandlerStub.returns('1YYY');
-      let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
-      gdprDataHandlerStub.returns({
-        gdprApplies: true,
-        consentString: 'consent',
-        addtlConsent: 'moreConsent'
-      });
-      let url;
-      parse(buildAdpodVideoUrl({
-        code: 'adUnitCode-1',
-        callback: handleResponse,
-        params: {
-          'iu': 'my/adUnit',
-          'description_url': 'someUrl.com',
-        }
-      }));
-
-      function handleResponse(err, masterTag) {
-        if (err) {
-          return;
-        }
-        url = parse(masterTag);
-
-        expect(url.protocol).to.equal('https:');
-        expect(url.host).to.equal('securepubads.g.doubleclick.net');
-
-        const queryParams = utils.parseQS(url.query);
-        expect(queryParams).to.have.property('correlator');
-        expect(queryParams).to.have.property('description_url', 'someUrl.com');
-        expect(queryParams).to.have.property('env', 'vp');
-        expect(queryParams).to.have.property('gdfp_req', '1');
-        expect(queryParams).to.have.property('iu', 'my/adUnit');
-        expect(queryParams).to.have.property('output', 'vast');
-        expect(queryParams).to.have.property('sz', '640x480');
-        expect(queryParams).to.have.property('unviewed_position_start', '1');
-        expect(queryParams).to.have.property('url');
-        expect(queryParams).to.have.property('cust_params');
-        expect(queryParams).to.have.property('us_privacy', '1YYY');
-        expect(queryParams).to.have.property('gdpr', '1');
-        expect(queryParams).to.have.property('gdpr_consent', 'consent');
-        expect(queryParams).to.have.property('addtl_consent', 'moreConsent');
-
-        const custParams = utils.parseQS(decodeURIComponent(queryParams.cust_params));
-        expect(custParams).to.have.property('hb_cache_id', '123');
-        expect(custParams).to.have.property('hb_pb_cat_dur', '15.00_395_15s,15.00_406_30s,10.00_395_15s');
-        uspDataHandlerStub.restore();
-        gdprDataHandlerStub.restore();
-      }
-    });
-
-    it('should return masterTag url with correct custom params when brandCategoryExclusion is false', function() {
-      config.setConfig({
-        adpod: {
-          brandCategoryExclusion: false,
-        }
-      });
-      function getBids() {
-        let bids = [
-          createBid(10, 'adUnitCode-1', 15, '10.00_15s', '123', '395', '10.00'),
-          createBid(15, 'adUnitCode-1', 15, '15.00_15s', '123', '395', '15.00'),
-          createBid(25, 'adUnitCode-1', 30, '15.00_30s', '123', '406', '25.00'),
-        ];
-        bids.forEach((bid) => {
-          delete bid.meta;
-        });
-        return bids;
-      }
-      amStub.returns(getBids());
-      let url;
-      parse(buildAdpodVideoUrl({
-        code: 'adUnitCode-1',
-        callback: handleResponse,
-        params: {
-          'iu': 'my/adUnit',
-          'description_url': 'someUrl.com',
-        }
-      }));
-
-      function handleResponse(err, masterTag) {
-        if (err) {
-          return;
-        }
-        url = parse(masterTag);
-        expect(url.protocol).to.equal('https:');
-        expect(url.host).to.equal('securepubads.g.doubleclick.net');
-
-        const queryParams = utils.parseQS(url.query);
-        expect(queryParams).to.have.property('correlator');
-        expect(queryParams).to.have.property('description_url', 'someUrl.com');
-        expect(queryParams).to.have.property('env', 'vp');
-        expect(queryParams).to.have.property('gdfp_req', '1');
-        expect(queryParams).to.have.property('iu', 'my/adUnit');
-        expect(queryParams).to.have.property('output', 'xml_vast3');
-        expect(queryParams).to.have.property('sz', '640x480');
-        expect(queryParams).to.have.property('unviewed_position_start', '1');
-        expect(queryParams).to.have.property('url');
-        expect(queryParams).to.have.property('cust_params');
-
-        const custParams = utils.parseQS(decodeURIComponent(queryParams.cust_params));
-        expect(custParams).to.have.property('hb_cache_id', '123');
-        expect(custParams).to.have.property('hb_pb_cat_dur', '10.00_15s,15.00_15s,15.00_30s');
-      }
-    });
-
-    it('should handle error when cache fails', function() {
-      config.setConfig({
-        adpod: {
-          brandCategoryExclusion: true,
-          deferCaching: true
-        }
-      });
-      amStub.returns(getBidsReceived());
-
-      parse(buildAdpodVideoUrl({
-        code: 'adUnitCode-1',
-        callback: handleResponse,
-        params: {
-          'iu': 'my/adUnit',
-          'description_url': 'someUrl.com',
-        }
-      }));
-
-      server.requests[0].respond(503, {
-        'Content-Type': 'plain/text',
-      }, 'The server could not save anything at the moment.');
-
-      function handleResponse(err, masterTag) {
-        expect(masterTag).to.be.null;
-        expect(err).to.be.an('error');
-      }
-    });
-  })
 });
-
-function getBidsReceived() {
-  return [
-    createBid(10, 'adUnitCode-1', 15, '10.00_395_15s', '123', '395', '10.00'),
-    createBid(15, 'adUnitCode-1', 15, '15.00_395_15s', '123', '395', '15.00'),
-    createBid(25, 'adUnitCode-1', 30, '15.00_406_30s', '123', '406', '25.00'),
-  ]
-}
-
-function createBid(cpm, adUnitCode, durationBucket, priceIndustryDuration, uuid, label, hbpb) {
-  return {
-    'bidderCode': 'appnexus',
-    'width': 640,
-    'height': 360,
-    'statusMessage': 'Bid available',
-    'adId': '28f24ced14586c',
-    'mediaType': 'video',
-    'source': 'client',
-    'requestId': '28f24ced14586c',
-    'cpm': cpm,
-    'creativeId': 97517771,
-    'currency': 'USD',
-    'netRevenue': true,
-    'ttl': 3600,
-    'adUnitCode': adUnitCode,
-    'video': {
-      'context': 'adpod',
-      'durationBucket': durationBucket
-    },
-    'appnexus': {
-      'buyerMemberId': 9325
-    },
-    'vastUrl': 'http://some-vast-url.com',
-    'vastImpUrl': 'http://some-vast-imp-url.com',
-    'auctionId': 'ec266b31-d652-49c5-8295-e83fafe5532b',
-    'responseTimestamp': 1548442460888,
-    'requestTimestamp': 1548442460827,
-    'bidder': 'appnexus',
-    'timeToRespond': 61,
-    'pbLg': '5.00',
-    'pbMg': '5.00',
-    'pbHg': '5.00',
-    'pbAg': '5.00',
-    'pbDg': '5.00',
-    'pbCg': '',
-    'size': '640x360',
-    'adserverTargeting': {
-      'hb_bidder': 'appnexus',
-      'hb_adid': '28f24ced14586c',
-      'hb_pb': hbpb,
-      'hb_size': '640x360',
-      'hb_source': 'client',
-      'hb_format': 'video',
-      'hb_pb_cat_dur': priceIndustryDuration,
-      'hb_cache_id': uuid
-    },
-    'customCacheKey': `${priceIndustryDuration}_${uuid}`,
-    'meta': {
-      'primaryCatId': 'iab-1',
-      'adServerCatId': label
-    },
-    'videoCacheKey': '4cf395af-8fee-4960-af0e-88d44e399f14'
-  }
-}
diff --git a/test/spec/modules/dfpAdpod_spec.js b/test/spec/modules/dfpAdpod_spec.js
new file mode 100644
index 00000000000..33d724dac26
--- /dev/null
+++ b/test/spec/modules/dfpAdpod_spec.js
@@ -0,0 +1,257 @@
+import {auctionManager} from '../../../src/auctionManager.js';
+import {config} from '../../../src/config.js';
+import {gdprDataHandler, uspDataHandler} from '../../../src/consentHandler.js';
+import parse from 'url-parse';
+import {buildAdpodVideoUrl} from '../../../modules/dfpAdpod.js';
+import {expect} from 'chai/index.js';
+import * as utils from '../../../src/utils.js';
+import {server} from '../../mocks/xhr.js';
+import * as adpod from 'modules/adpod.js';
+
+describe('dfpAdpod', function () {
+  let amStub;
+  let amGetAdUnitsStub;
+
+  before(function () {
+    let adUnits = [{
+      code: 'adUnitCode-1',
+      mediaTypes: {
+        video: {
+          context: 'adpod',
+          playerSize: [640, 480],
+          adPodDurationSec: 60,
+          durationRangeSec: [15, 30],
+          requireExactDuration: true
+        }
+      },
+      bids: [
+        {
+          bidder: 'appnexus',
+          params: {
+            placementId: 14542875,
+          }
+        }
+      ]
+    }];
+
+    amGetAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits');
+    amGetAdUnitsStub.returns(adUnits);
+    amStub = sinon.stub(auctionManager, 'getBidsReceived');
+  });
+
+  beforeEach(function () {
+    config.setConfig({
+      adpod: {
+        brandCategoryExclusion: true,
+        deferCaching: false
+      }
+    });
+  })
+
+  afterEach(function() {
+    config.resetConfig();
+  });
+
+  after(function () {
+    amGetAdUnitsStub.restore();
+    amStub.restore();
+  });
+
+  function getBidsReceived() {
+    return [
+      createBid(10, 'adUnitCode-1', 15, '10.00_395_15s', '123', '395', '10.00'),
+      createBid(15, 'adUnitCode-1', 15, '15.00_395_15s', '123', '395', '15.00'),
+      createBid(25, 'adUnitCode-1', 30, '15.00_406_30s', '123', '406', '25.00'),
+    ]
+  }
+
+  function createBid(cpm, adUnitCode, durationBucket, priceIndustryDuration, uuid, label, hbpb) {
+    return {
+      'bidderCode': 'appnexus',
+      'width': 640,
+      'height': 360,
+      'statusMessage': 'Bid available',
+      'adId': '28f24ced14586c',
+      'mediaType': 'video',
+      'source': 'client',
+      'requestId': '28f24ced14586c',
+      'cpm': cpm,
+      'creativeId': 97517771,
+      'currency': 'USD',
+      'netRevenue': true,
+      'ttl': 3600,
+      'adUnitCode': adUnitCode,
+      'video': {
+        'context': 'adpod',
+        'durationBucket': durationBucket
+      },
+      'appnexus': {
+        'buyerMemberId': 9325
+      },
+      'vastUrl': 'http://some-vast-url.com',
+      'vastImpUrl': 'http://some-vast-imp-url.com',
+      'auctionId': 'ec266b31-d652-49c5-8295-e83fafe5532b',
+      'responseTimestamp': 1548442460888,
+      'requestTimestamp': 1548442460827,
+      'bidder': 'appnexus',
+      'timeToRespond': 61,
+      'pbLg': '5.00',
+      'pbMg': '5.00',
+      'pbHg': '5.00',
+      'pbAg': '5.00',
+      'pbDg': '5.00',
+      'pbCg': '',
+      'size': '640x360',
+      'adserverTargeting': {
+        'hb_bidder': 'appnexus',
+        'hb_adid': '28f24ced14586c',
+        'hb_pb': hbpb,
+        'hb_size': '640x360',
+        'hb_source': 'client',
+        'hb_format': 'video',
+        'hb_pb_cat_dur': priceIndustryDuration,
+        'hb_cache_id': uuid
+      },
+      'customCacheKey': `${priceIndustryDuration}_${uuid}`,
+      'meta': {
+        'primaryCatId': 'iab-1',
+        'adServerCatId': label
+      },
+      'videoCacheKey': '4cf395af-8fee-4960-af0e-88d44e399f14'
+    }
+  }
+
+  it('should return masterTag url', function() {
+    amStub.returns(getBidsReceived());
+    let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+    uspDataHandlerStub.returns('1YYY');
+    let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+    gdprDataHandlerStub.returns({
+      gdprApplies: true,
+      consentString: 'consent',
+      addtlConsent: 'moreConsent'
+    });
+    let url;
+    parse(buildAdpodVideoUrl({
+      code: 'adUnitCode-1',
+      callback: handleResponse,
+      params: {
+        'iu': 'my/adUnit',
+        'description_url': 'someUrl.com',
+      }
+    }));
+
+    function handleResponse(err, masterTag) {
+      if (err) {
+        return;
+      }
+      url = parse(masterTag);
+
+      expect(url.protocol).to.equal('https:');
+      expect(url.host).to.equal('securepubads.g.doubleclick.net');
+
+      const queryParams = utils.parseQS(url.query);
+      expect(queryParams).to.have.property('correlator');
+      expect(queryParams).to.have.property('description_url', 'someUrl.com');
+      expect(queryParams).to.have.property('env', 'vp');
+      expect(queryParams).to.have.property('gdfp_req', '1');
+      expect(queryParams).to.have.property('iu', 'my/adUnit');
+      expect(queryParams).to.have.property('output', 'vast');
+      expect(queryParams).to.have.property('sz', '640x480');
+      expect(queryParams).to.have.property('unviewed_position_start', '1');
+      expect(queryParams).to.have.property('url');
+      expect(queryParams).to.have.property('cust_params');
+      expect(queryParams).to.have.property('gdpr', '1');
+      expect(queryParams).to.have.property('gdpr_consent', 'consent');
+      expect(queryParams).to.have.property('addtl_consent', 'moreConsent');
+
+      const custParams = utils.parseQS(decodeURIComponent(queryParams.cust_params));
+      expect(custParams).to.have.property('hb_cache_id', '123');
+      expect(custParams).to.have.property('hb_pb_cat_dur', '15.00_395_15s,15.00_406_30s,10.00_395_15s');
+      uspDataHandlerStub.restore();
+      gdprDataHandlerStub.restore();
+    }
+  });
+
+  it('should return masterTag url with correct custom params when brandCategoryExclusion is false', function() {
+    config.setConfig({
+      adpod: {
+        brandCategoryExclusion: false,
+      }
+    });
+    function getBids() {
+      let bids = [
+        createBid(10, 'adUnitCode-1', 15, '10.00_15s', '123', '395', '10.00'),
+        createBid(15, 'adUnitCode-1', 15, '15.00_15s', '123', '395', '15.00'),
+        createBid(25, 'adUnitCode-1', 30, '15.00_30s', '123', '406', '25.00'),
+      ];
+      bids.forEach((bid) => {
+        delete bid.meta;
+      });
+      return bids;
+    }
+    amStub.returns(getBids());
+    let url;
+    parse(buildAdpodVideoUrl({
+      code: 'adUnitCode-1',
+      callback: handleResponse,
+      params: {
+        'iu': 'my/adUnit',
+        'description_url': 'someUrl.com',
+      }
+    }));
+
+    function handleResponse(err, masterTag) {
+      if (err) {
+        return;
+      }
+      url = parse(masterTag);
+      expect(url.protocol).to.equal('https:');
+      expect(url.host).to.equal('securepubads.g.doubleclick.net');
+
+      const queryParams = utils.parseQS(url.query);
+      expect(queryParams).to.have.property('correlator');
+      expect(queryParams).to.have.property('description_url', 'someUrl.com');
+      expect(queryParams).to.have.property('env', 'vp');
+      expect(queryParams).to.have.property('gdfp_req', '1');
+      expect(queryParams).to.have.property('iu', 'my/adUnit');
+      expect(queryParams).to.have.property('output', 'xml_vast3');
+      expect(queryParams).to.have.property('sz', '640x480');
+      expect(queryParams).to.have.property('unviewed_position_start', '1');
+      expect(queryParams).to.have.property('url');
+      expect(queryParams).to.have.property('cust_params');
+
+      const custParams = utils.parseQS(decodeURIComponent(queryParams.cust_params));
+      expect(custParams).to.have.property('hb_cache_id', '123');
+      expect(custParams).to.have.property('hb_pb_cat_dur', '10.00_15s,15.00_15s,15.00_30s');
+    }
+  });
+
+  it('should handle error when cache fails', function() {
+    config.setConfig({
+      adpod: {
+        brandCategoryExclusion: true,
+        deferCaching: true
+      }
+    });
+    amStub.returns(getBidsReceived());
+
+    parse(buildAdpodVideoUrl({
+      code: 'adUnitCode-1',
+      callback: handleResponse,
+      params: {
+        'iu': 'my/adUnit',
+        'description_url': 'someUrl.com',
+      }
+    }));
+
+    server.requests[0].respond(503, {
+      'Content-Type': 'plain/text',
+    }, 'The server could not save anything at the moment.');
+
+    function handleResponse(err, masterTag) {
+      expect(masterTag).to.be.null;
+      expect(err).to.be.an('error');
+    }
+  });
+})
diff --git a/test/spec/modules/dgkeywordRtdProvider_spec.js b/test/spec/modules/dgkeywordRtdProvider_spec.js
index 754740b7a64..ff88ea0512f 100644
--- a/test/spec/modules/dgkeywordRtdProvider_spec.js
+++ b/test/spec/modules/dgkeywordRtdProvider_spec.js
@@ -91,6 +91,22 @@ describe('Digital Garage Keyword Module', function () {
       expect(dgRtd.getTargetBidderOfDgKeywords(adUnits_no_target)).an('array')
         .that.is.empty;
     });
+    it('convertKeywordsToString method unit test', function () {
+      const keywordsTest = [
+        { keywords: { param1: 'keywords1' }, result: 'param1=keywords1' },
+        { keywords: { param1: 'keywords1', param2: 'keywords2' }, result: 'param1=keywords1,param2=keywords2' },
+        { keywords: { p1: 'k1', p2: 'k2', p: 'k' }, result: 'p1=k1,p2=k2,p=k' },
+        { keywords: { p1: 'k1', p2: 'k2', p: ['k'] }, result: 'p1=k1,p2=k2,p=k' },
+        { keywords: { p1: 'k1', p2: ['k21', 'k22'], p: ['k'] }, result: 'p1=k1,p2=k21,p2=k22,p=k' },
+        { keywords: { p1: ['k11', 'k12', 'k13'], p2: ['k21', 'k22'], p: ['k'] }, result: 'p1=k11,p1=k12,p1=k13,p2=k21,p2=k22,p=k' },
+        { keywords: { p1: [], p2: ['', ''], p: [''] }, result: 'p1,p2,p' },
+        { keywords: { p1: 1, p2: [1, 'k2'], p: '' }, result: 'p1,p2=k2,p' },
+        { keywords: { p1: ['k1', 2, 'k3'], p2: [1, 2], p: 3 }, result: 'p1=k1,p1=k3,p2,p' },
+      ];
+      for (const test of keywordsTest) {
+        expect(dgRtd.convertKeywordsToString(test.keywords)).equal(test.result);
+      }
+    })
     it('should have targets', function () {
       const adUnits_targets = [
         {
@@ -242,16 +258,16 @@ describe('Digital Garage Keyword Module', function () {
           expect(targets[1].bidder).to.be.equal('dg2');
           expect(targets[1].params.placementId).to.be.equal(99999998);
           expect(targets[1].params.dgkeyword).to.be.an('undefined');
-          expect(targets[1].params.keywords).to.be.an('undefined');
+          expect(targets[1].params.ortb2Imp).to.be.an('undefined');
           targets = pbjs.adUnits[1].bids;
           expect(targets[0].bidder).to.be.equal('dg');
           expect(targets[0].params.placementId).to.be.equal(99999996);
           expect(targets[0].params.dgkeyword).to.be.an('undefined');
-          expect(targets[0].params.keywords).to.be.an('undefined');
+          expect(targets[0].params.ortb2Imp).to.be.an('undefined');
           expect(targets[2].bidder).to.be.equal('dg3');
           expect(targets[2].params.placementId).to.be.equal(99999994);
           expect(targets[2].params.dgkeyword).to.be.an('undefined');
-          expect(targets[2].params.keywords).to.be.an('undefined');
+          expect(targets[2].params.ortb2Imp).to.be.an('undefined');
 
           expect(pbjs.getBidderConfig()).to.be.deep.equal({});
 
@@ -275,16 +291,16 @@ describe('Digital Garage Keyword Module', function () {
           expect(targets[1].bidder).to.be.equal('dg2');
           expect(targets[1].params.placementId).to.be.equal(99999998);
           expect(targets[1].params.dgkeyword).to.be.an('undefined');
-          expect(targets[1].params.keywords).to.be.an('undefined');
+          expect(targets[1].params.ortb2Imp).to.be.an('undefined');
           targets = pbjs.adUnits[1].bids;
           expect(targets[0].bidder).to.be.equal('dg');
           expect(targets[0].params.placementId).to.be.equal(99999996);
           expect(targets[0].params.dgkeyword).to.be.an('undefined');
-          expect(targets[0].params.keywords).to.be.an('undefined');
+          expect(targets[0].params.ortb2Imp).to.be.an('undefined');
           expect(targets[2].bidder).to.be.equal('dg3');
           expect(targets[2].params.placementId).to.be.equal(99999994);
           expect(targets[2].params.dgkeyword).to.be.an('undefined');
-          expect(targets[2].params.keywords).to.be.an('undefined');
+          expect(targets[2].params.ortb2Imp).to.be.an('undefined');
 
           expect(pbjs.getBidderConfig()).to.be.deep.equal({});
 
@@ -318,16 +334,16 @@ describe('Digital Garage Keyword Module', function () {
           expect(targets[1].bidder).to.be.equal('dg2');
           expect(targets[1].params.placementId).to.be.equal(99999998);
           expect(targets[1].params.dgkeyword).to.be.an('undefined');
-          expect(targets[1].params.keywords).to.be.deep.equal(SUCCESS_RESULT);
+          expect(targets[1].ortb2Imp.ext.data.keywords).to.be.deep.equal(dgRtd.convertKeywordsToString(SUCCESS_RESULT));
           targets = pbjs.adUnits[1].bids;
           expect(targets[0].bidder).to.be.equal('dg');
           expect(targets[0].params.placementId).to.be.equal(99999996);
           expect(targets[0].params.dgkeyword).to.be.an('undefined');
-          expect(targets[0].params.keywords).to.be.deep.equal(SUCCESS_RESULT);
+          expect(targets[0].ortb2Imp.ext.data.keywords).to.be.deep.equal(dgRtd.convertKeywordsToString(SUCCESS_RESULT));
           expect(targets[2].bidder).to.be.equal('dg3');
           expect(targets[2].params.placementId).to.be.equal(99999994);
           expect(targets[2].params.dgkeyword).to.be.an('undefined');
-          expect(targets[2].params.keywords).to.be.an('undefined');
+          expect(targets[2].ortb2Imp).to.be.an('undefined');
 
           if (!IGNORE_SET_ORTB2) {
             expect(pbjs.getBidderConfig()).to.be.deep.equal({
diff --git a/test/spec/modules/dianomiBidAdapter_spec.js b/test/spec/modules/dianomiBidAdapter_spec.js
index 0838762d750..ef9283d3dad 100644
--- a/test/spec/modules/dianomiBidAdapter_spec.js
+++ b/test/spec/modules/dianomiBidAdapter_spec.js
@@ -3,6 +3,8 @@ import { assert } from 'chai';
 import { spec } from 'modules/dianomiBidAdapter.js';
 import { config } from 'src/config.js';
 import { createEidsArray } from 'modules/userId/eids.js';
+import { setConfig as setCurrencyConfig } from '../../../modules/currency';
+import { addFPDToBidderRequest } from '../../helpers/fpd';
 
 describe('Dianomi adapter', () => {
   let bids = [];
@@ -250,32 +252,31 @@ describe('Dianomi adapter', () => {
         {
           bidId: 'bidId',
           params: { smartadId: 1234 },
-          userIdAsEids: createEidsArray({
-            tdid: 'TTD_ID_FROM_USER_ID_MODULE',
-            pubcid: 'pubCommonId_FROM_USER_ID_MODULE',
-          }),
+          userIdAsEids: [
+            {
+              source: 'adserver.org',
+              uids: [{ id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } }],
+            },
+            { source: 'pubcid.org', uids: [{ id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 }] },
+          ],
         },
       ];
 
       let request = JSON.parse(
         spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
       );
-      assert.deepEqual(request.user.ext.eids, [
-        {
-          source: 'adserver.org',
-          uids: [{ id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } }],
-        },
-        { source: 'pubcid.org', uids: [{ id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 }] },
-      ]);
+      assert.deepEqual(request.user.ext.eids, validBidRequests[0].userIdAsEids);
     });
 
     it('should send currency if defined', () => {
-      config.setConfig({ currency: { adServerCurrency: 'EUR' } });
+      setCurrencyConfig({ adServerCurrency: 'EUR' })
       let validBidRequests = [{ params: { smartadId: 1234 } }];
       let refererInfo = { page: 'page' };
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo }).data);
-
-      assert.deepEqual(request.cur, ['EUR']);
+      return addFPDToBidderRequest({ refererInfo }).then(res => {
+        let request = JSON.parse(spec.buildRequests(validBidRequests, res).data);
+        assert.deepEqual(request.cur, ['EUR']);
+        setCurrencyConfig({});
+      });
     });
 
     it('should pass supply chain object', () => {
@@ -397,12 +398,18 @@ describe('Dianomi adapter', () => {
         });
 
         it('should request floor price in adserver currency', () => {
-          config.setConfig({ currency: { adServerCurrency: 'GBP' } });
-          const validBidRequests = [getBidWithFloor()];
-          let imp = getRequestImps(validBidRequests)[0];
-
-          assert.equal(imp.bidfloor, undefined);
-          assert.equal(imp.bidfloorcur, 'GBP');
+          setCurrencyConfig({ adServerCurrency: 'GBP' })
+          let validBidRequests = [getBidWithFloor()];
+          let refererInfo = { page: 'page' };
+          return addFPDToBidderRequest({ refererInfo }).then(res => {
+            let imp = JSON.parse(
+              spec.buildRequests(validBidRequests, res).data
+            ).imp[0];
+
+            assert.equal(imp.bidfloor, undefined);
+            assert.equal(imp.bidfloorcur, 'GBP');
+            setCurrencyConfig({});
+          });
         });
 
         it('should add correct floor values', () => {
diff --git a/test/spec/modules/digitalMatterBidAdapter_spec.js b/test/spec/modules/digitalMatterBidAdapter_spec.js
new file mode 100644
index 00000000000..87056588cd9
--- /dev/null
+++ b/test/spec/modules/digitalMatterBidAdapter_spec.js
@@ -0,0 +1,265 @@
+import {assert, expect} from 'chai';
+import {spec} from 'modules/digitalMatterBidAdapter';
+import {config} from '../../../src/config';
+import {deepClone} from '../../../src/utils';
+
+const bid = {
+  'adUnitCode': 'adUnitCode',
+  'bidId': 'bidId',
+  'bidder': 'digitalMatter',
+  'mediaTypes': {
+    'banner': {
+      'sizes': [[300, 250], [300, 600]]
+    }
+  },
+  'params': {
+    'accountId': '1_demo_1',
+    'siteId': '1-demo-1'
+  }
+};
+const bidderRequest = {
+  ortb2: {
+    source: {
+      tid: 'tid-string'
+    },
+    regs: {
+      ext: {
+        gdpr: 1
+      }
+    },
+    site: {
+      domain: 'publisher.domain.com',
+      publisher: {
+        domain: 'publisher.domain.com'
+      },
+      page: 'https://publisher.domain.com/test.html'
+    },
+    device: {
+      w: 100,
+      h: 100,
+      dnt: 0,
+      ua: navigator.userAgent,
+      language: 'en'
+    }
+  }
+};
+
+describe('Digital Matter BidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    it('should return true when all required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+
+    it('should return false when media type banner is missing', function () {
+      let invalidBid = deepClone(bid);
+      delete invalidBid.mediaTypes.banner;
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('should send request with correct structure', function () {
+      let request = spec.buildRequests([bid], bidderRequest);
+
+      assert.equal(request.method, 'POST');
+      assert.equal(request.url, 'https://adx.digitalmatter.services/openrtb2/auction');
+      assert.equal(request.options, undefined);
+      assert.ok(request.data);
+    });
+
+    it('should have default request structure', function () {
+      let keys = 'tid,site,device,imp,test,ext'.split(',');
+      let request = JSON.parse(spec.buildRequests([bid], bidderRequest).data);
+      let data = Object.keys(request);
+
+      assert.deepEqual(keys, data);
+    });
+
+    it('should send info about device', function () {
+      config.setConfig({
+        device: {w: 1920, h: 1080}
+      });
+      let request = JSON.parse(spec.buildRequests([bid], bidderRequest).data);
+
+      assert.equal(request.device.ua, navigator.userAgent);
+      assert.equal(request.device.w, 100);
+      assert.equal(request.device.h, 100);
+    });
+
+    it('should send info about the site', function () {
+      let request = JSON.parse(spec.buildRequests([bid], bidderRequest).data);
+
+      assert.deepEqual(request.site, {
+        domain: 'publisher.domain.com',
+        publisher: {
+          domain: 'publisher.domain.com'
+        },
+        page: 'https://publisher.domain.com/test.html'
+      });
+    });
+
+    it('should send currency if defined', function () {
+      config.setConfig({currency: {adServerCurrency: 'EUR'}});
+      let request = JSON.parse(spec.buildRequests([bid], bidderRequest).data);
+
+      assert.deepEqual(request.cur, [{adServerCurrency: 'EUR'}]);
+    });
+
+    it('should pass supply chain object', function () {
+      let validBidRequests = {
+        ...bid,
+        schain: {
+          validation: 'strict',
+          config: {
+            ver: '1.0'
+          }
+        }
+      };
+
+      let request = JSON.parse(spec.buildRequests([validBidRequests], bidderRequest).data);
+      assert.deepEqual(request.source.ext.schain, {
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      });
+    });
+
+    it('should pass extended ids if exists', function () {
+      let validBidRequests = {
+        ...bid,
+        userIdAsEids: [
+          {
+            source: 'adserver.org',
+            uids: [
+              {
+                id: 'TTD_ID_FROM_USER_ID_MODULE',
+                atype: 1,
+                ext: {
+                  rtiPartner: 'TDID'
+                }
+              }
+            ]
+          }
+        ]
+      };
+
+      let request = JSON.parse(spec.buildRequests([validBidRequests], bidderRequest).data);
+
+      assert.deepEqual(request.user.ext.eids, validBidRequests.userIdAsEids);
+    });
+
+    it('should pass gdpr consent data if gdprApplies', function () {
+      let consentedBidderRequest = {
+        ...bidderRequest,
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'consentDataString'
+        }
+      };
+
+      let request = JSON.parse(spec.buildRequests([bid], consentedBidderRequest).data);
+      assert.equal(request.user.ext.consent, consentedBidderRequest.gdprConsent.consentString);
+      assert.equal(request.regs.ext.gdpr, consentedBidderRequest.gdprConsent.gdprApplies);
+      assert.equal(typeof request.regs.ext.gdpr, 'number');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return empty array if no body in response', function () {
+      assert.ok(spec.interpretResponse([]));
+    });
+
+    it('should return array with bids if response not empty', function () {
+      const firstResponse = {
+        id: 'id_1',
+        impid: 'impId_1',
+        bidid: 'bidId_1',
+        adunitcode: 'adUnitCode_1',
+        cpm: 0.10,
+        ad: '
ad',
+        adomain: [
+          'advertiser.org'
+        ],
+        width: 970,
+        height: 250,
+        creativeid: 'creativeId_1',
+        meta: {
+          advertiserDomains: [
+            'advertiser.org'
+          ]
+        }
+      };
+      const secondResponse = {
+        'id': 'id_2',
+        'impid': 'impId_2',
+        'bidid': 'bidId_2',
+        'adunitcode': 'adUnitCode_2',
+        'cpm': 0.11,
+        'ad': '
ad',
+        'adomain': [
+          'advertiser.org'
+        ],
+        'width': 970,
+        'height': 250,
+        'creativeid': 'creativeId_2',
+        'meta': {
+          'advertiserDomains': [
+            'advertiser.org'
+          ]
+        }
+      };
+      const currency = 'EUR';
+
+      const bids = spec.interpretResponse({
+        body: {
+          id: 'randomId',
+          cur: currency,
+          bids: [
+            firstResponse,
+            secondResponse
+          ]
+        }
+      });
+
+      assert.ok(bids);
+      assert.deepEqual(bids[0].requestId, firstResponse.bidid);
+      assert.deepEqual(bids[0].cpm, firstResponse.cpm);
+      assert.deepEqual(bids[0].creativeId, firstResponse.creativeid);
+      assert.deepEqual(bids[0].ttl, 300);
+      assert.deepEqual(bids[0].netRevenue, true);
+      assert.deepEqual(bids[0].currency, currency);
+      assert.deepEqual(bids[0].width, firstResponse.width);
+      assert.deepEqual(bids[0].height, firstResponse.height);
+      assert.deepEqual(bids[0].dealId, undefined);
+      assert.deepEqual(bids[0].meta.advertiserDomains, [ 'advertiser.org' ]);
+
+      assert.deepEqual(bids[1].requestId, secondResponse.bidid);
+      assert.deepEqual(bids[1].cpm, secondResponse.cpm);
+      assert.deepEqual(bids[1].creativeId, secondResponse.creativeid);
+      assert.deepEqual(bids[1].ttl, 300);
+      assert.deepEqual(bids[1].netRevenue, true);
+      assert.deepEqual(bids[1].currency, currency);
+      assert.deepEqual(bids[1].width, secondResponse.width);
+      assert.deepEqual(bids[1].height, secondResponse.height);
+      assert.deepEqual(bids[1].dealId, undefined);
+      assert.deepEqual(bids[1].meta.advertiserDomains, [ 'advertiser.org' ]);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('handle empty array (e.g. timeout)', function () {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, []);
+      expect(syncs).to.deep.equal([]);
+    });
+  });
+});
diff --git a/test/spec/modules/discoveryBidAdapter_spec.js b/test/spec/modules/discoveryBidAdapter_spec.js
index 078add73046..e65243fd15a 100644
--- a/test/spec/modules/discoveryBidAdapter_spec.js
+++ b/test/spec/modules/discoveryBidAdapter_spec.js
@@ -1,7 +1,38 @@
 import { expect } from 'chai';
-import { spec } from 'modules/discoveryBidAdapter.js';
+import {
+  spec,
+  getPmgUID,
+  storage,
+  THIRD_PARTY_COOKIE_ORIGIN,
+  COOKIE_KEY_MGUID,
+  getCookieTimeToUTCString,
+  buildUTMTagData,
+} from 'modules/discoveryBidAdapter.js';
+import { getPageTitle, getPageDescription, getPageKeywords, getConnectionDownLink } from '../../../libraries/fpdUtils/pageInfo.js';
+import * as utils from 'src/utils.js';
+import {getHLen} from '../../../libraries/navigatorData/navigatorData.js';
 
 describe('discovery:BidAdapterTests', function () {
+  let sandbox;
+
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(storage, 'getCookie');
+    sandbox.stub(storage, 'setCookie');
+    sandbox.stub(storage, 'getDataFromLocalStorage');
+    sandbox.stub(utils, 'generateUUID').returns('new-uuid');
+    sandbox.stub(utils, 'parseUrl').returns({
+      search: {
+        utm_source: 'example.com'
+      }
+    });
+    sandbox.stub(storage, 'cookiesAreEnabled');
+  })
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
   let bidRequestData = {
     bidderCode: 'discovery',
     auctionId: 'ff66e39e-4075-4d18-9854-56fde9b879ac',
@@ -11,12 +42,59 @@ describe('discovery:BidAdapterTests', function () {
         bidder: 'discovery',
         params: {
           token: 'd0f4902b616cc5c38cbe0a08676d0ed9',
+          siteId: 'siteId_01',
+          zoneId: 'zoneId_01',
+          publisher: '52',
+          position: 'left',
+          referrer: 'https://discovery.popin.cc',
+        },
+        refererInfo: {
+          page: 'https://discovery.popin.cc',
+          stack: [
+            'a.com',
+            'b.com'
+          ]
         },
         mediaTypes: {
           banner: {
             sizes: [[300, 250]],
+            pos: 'left',
+          },
+        },
+        ortb2: {
+          user: {
+            ext: {
+              data: {
+                CxSegments: []
+              }
+            }
+          },
+          site: {
+            domain: 'discovery.popin.cc',
+            publisher: {
+              domain: 'discovery.popin.cc'
+            },
+            page: 'https://discovery.popin.cc',
+            cat: ['IAB-19', 'IAB-20'],
           },
         },
+        ortb2Imp: {
+          ext: {
+            gpid: 'adslot_gpid',
+            tid: 'tid_01',
+            data: {
+              browsi: {
+                browsiViewability: 'NA',
+              },
+              adserver: {
+                name: 'adserver_name',
+                adslot: 'adslot_name',
+              },
+              keywords: ['travel', 'sport'],
+              pbadslot: '202309999'
+            }
+          }
+        },
         adUnitCode: 'regular_iframe',
         transactionId: 'd163f9e2-7ecd-4c2c-a3bd-28ceb52a60ee',
         sizes: [[300, 250]],
@@ -29,9 +107,96 @@ describe('discovery:BidAdapterTests', function () {
         bidderWinsCount: 0,
       },
     ],
+    ortb2: {
+      user: {
+        data: {
+          segment: [
+            {
+              id: '412'
+            }
+          ],
+          name: 'test.popin.cc',
+          ext: {
+            segclass: '1',
+            segtax: 503
+          }
+        }
+      }
+    }
   };
   let request = [];
 
+  let bidRequestDataNoParams = {
+    bidderCode: 'discovery',
+    auctionId: 'ff66e39e-4075-4d18-9854-56fde9b879ac',
+    bidderRequestId: '4fec04e87ad785',
+    bids: [
+      {
+        bidder: 'discovery',
+        params: {
+          referrer: 'https://discovery.popin.cc',
+        },
+        refererInfo: {
+          page: 'https://discovery.popin.cc',
+          stack: [
+            'a.com',
+            'b.com'
+          ]
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+            pos: 'left',
+          },
+        },
+        ortb2: {
+          user: {
+            ext: {
+              data: {
+                CxSegments: []
+              }
+            }
+          },
+          site: {
+            domain: 'discovery.popin.cc',
+            publisher: {
+              domain: 'discovery.popin.cc'
+            },
+            page: 'https://discovery.popin.cc',
+            cat: ['IAB-19', 'IAB-20'],
+          },
+        },
+        ortb2Imp: {
+          ext: {
+            gpid: 'adslot_gpid',
+            tid: 'tid_01',
+            data: {
+              browsi: {
+                browsiViewability: 'NA',
+              },
+              adserver: {
+                name: 'adserver_name',
+                adslot: 'adslot_name',
+              },
+              keywords: ['travel', 'sport'],
+              pbadslot: '202309999'
+            }
+          }
+        },
+        adUnitCode: 'regular_iframe',
+        transactionId: 'd163f9e2-7ecd-4c2c-a3bd-28ceb52a60ee',
+        sizes: [[300, 250]],
+        bidId: '276092a19e05eb',
+        bidderRequestId: '1fadae168708b',
+        auctionId: 'ff66e39e-4075-4d18-9854-56fde9b879ac',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0,
+      },
+    ],
+  };
+
   it('discovery:validate_pub_params', function () {
     expect(
       spec.isBidRequestValid({
@@ -45,11 +210,74 @@ describe('discovery:BidAdapterTests', function () {
     ).to.equal(true);
   });
 
+  it('isBidRequestValid:no_params', function () {
+    expect(
+      spec.isBidRequestValid({
+        bidder: 'discovery',
+        params: {},
+      })
+    ).to.equal(true);
+  });
   it('discovery:validate_generated_params', function () {
+    storage.getCookie.withArgs('_ss_pp_utm').callsFake(() => '{"utm_source":"example.com","utm_medium":"123","utm_campaign":"456"}');
     request = spec.buildRequests(bidRequestData.bids, bidRequestData);
     let req_data = JSON.parse(request.data);
     expect(req_data.imp).to.have.lengthOf(1);
   });
+  describe('first party data', function () {
+    it('should pass additional parameter in request for topics', function () {
+      const request = spec.buildRequests(bidRequestData.bids, bidRequestData);
+      let res = JSON.parse(request.data);
+      expect(res.ext.tpData).to.deep.equal(bidRequestData.ortb2.user.data);
+    });
+  });
+
+  describe('discovery: buildRequests', function() {
+    describe('getPmgUID function', function() {
+      it('should generate new UUID and set cookie if not exists', () => {
+        storage.cookiesAreEnabled.callsFake(() => true);
+        storage.getCookie.callsFake(() => null);
+        const uid = getPmgUID();
+        expect(uid).to.equal('new-uuid');
+        expect(storage.setCookie.calledOnce).to.be.true;
+      });
+
+      it('should return existing UUID from cookie', () => {
+        storage.cookiesAreEnabled.callsFake(() => true);
+        storage.getCookie.callsFake(() => 'existing-uuid');
+        const uid = getPmgUID();
+        expect(uid).to.equal('existing-uuid');
+        expect(storage.setCookie.called).to.be.true;
+      });
+
+      it('should not set new UUID when cookies are not enabled', () => {
+        storage.cookiesAreEnabled.callsFake(() => false);
+        storage.getCookie.callsFake(() => null);
+        getPmgUID();
+        expect(storage.setCookie.calledOnce).to.be.false;
+      });
+      it('should return other ID from storage and cookie', () => {
+        spec.buildRequests(bidRequestData.bids, bidRequestData);
+        expect(storage.getCookie.called).to.be.true;
+        expect(storage.getDataFromLocalStorage.called).to.be.true;
+      });
+    })
+    describe('buildUTMTagData function', function() {
+      it('should set UTM cookie', () => {
+        storage.cookiesAreEnabled.callsFake(() => true);
+        storage.getCookie.callsFake(() => null);
+        buildUTMTagData();
+        expect(storage.setCookie.calledOnce).to.be.true;
+      });
+
+      it('should not set UTM when cookies are not enabled', () => {
+        storage.cookiesAreEnabled.callsFake(() => false);
+        storage.getCookie.callsFake(() => null);
+        buildUTMTagData();
+        expect(storage.setCookie.calledOnce).to.be.false;
+      });
+    })
+  });
 
   it('discovery:validate_response_params', function () {
     let tempAdm = '
'
@@ -90,4 +318,347 @@ describe('discovery:BidAdapterTests', function () {
     expect(bid.height).to.equal(250);
     expect(bid.currency).to.equal('USD');
   });
+
+  describe('discovery: getUserSyncs', function() {
+    const COOKY_SYNC_IFRAME_URL = 'https://asset.popin.cc/js/cookieSync.html';
+    const IFRAME_ENABLED = {
+      iframeEnabled: true,
+      pixelEnabled: false,
+    };
+    const IFRAME_DISABLED = {
+      iframeEnabled: false,
+      pixelEnabled: false,
+    };
+    const GDPR_CONSENT = {
+      consentString: 'gdprConsentString',
+      gdprApplies: true
+    };
+    const USP_CONSENT = {
+      consentString: 'uspConsentString'
+    }
+
+    let syncParamUrl = `dm=${encodeURIComponent(location.origin || `https://${location.host}`)}`;
+    syncParamUrl += '&gdpr=1&gdpr_consent=gdprConsentString&ccpa_consent=uspConsentString';
+    const expectedIframeSyncs = [
+      {
+        type: 'iframe',
+        url: `${COOKY_SYNC_IFRAME_URL}?${syncParamUrl}`
+      }
+    ];
+
+    it('should return nothing if iframe is disabled', () => {
+      const userSyncs = spec.getUserSyncs(IFRAME_DISABLED, undefined, GDPR_CONSENT, USP_CONSENT, undefined);
+      expect(userSyncs).to.be.undefined;
+    });
+
+    it('should do userSyncs if iframe is enabled', () => {
+      const userSyncs = spec.getUserSyncs(IFRAME_ENABLED, undefined, GDPR_CONSENT, USP_CONSENT, undefined);
+      expect(userSyncs).to.deep.equal(expectedIframeSyncs);
+    });
+  });
+});
+
+describe('discovery Bid Adapter Tests', function () {
+  describe('buildRequests', () => {
+    describe('getPageTitle function', function() {
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should return the top document title if available', function() {
+        const fakeTopDocument = {
+          title: 'Top Document Title',
+          querySelector: () => ({ content: 'Top Document Title test' })
+        };
+        const fakeTopWindow = {
+          document: fakeTopDocument
+        };
+        const result = getPageTitle({ top: fakeTopWindow });
+        expect(result).to.equal('Top Document Title');
+      });
+
+      it('should return the content of top og:title meta tag if title is empty', function() {
+        const ogTitleContent = 'Top OG Title Content';
+        const fakeTopWindow = {
+          document: {
+            title: '',
+            querySelector: sandbox.stub().withArgs('meta[property="og:title"]').returns({ content: ogTitleContent })
+          }
+        };
+
+        const result = getPageTitle({ top: fakeTopWindow });
+        expect(result).to.equal(ogTitleContent);
+      });
+
+      it('should return the document title if no og:title meta tag is present', function() {
+        document.title = 'Test Page Title';
+        sandbox.stub(document, 'querySelector').withArgs('meta[property="og:title"]').returns(null);
+
+        const result = getPageTitle({ top: undefined });
+        expect(result).to.equal('Test Page Title');
+      });
+
+      it('should return the content of og:title meta tag if present', function() {
+        document.title = '';
+        const ogTitleContent = 'Top OG Title Content';
+        sandbox.stub(document, 'querySelector').withArgs('meta[property="og:title"]').returns({ content: ogTitleContent });
+        const result = getPageTitle({ top: undefined });
+        expect(result).to.equal(ogTitleContent);
+      });
+
+      it('should return an empty string if no title or og:title meta tag is found', function() {
+        document.title = '';
+        sandbox.stub(document, 'querySelector').withArgs('meta[property="og:title"]').returns(null);
+        const result = getPageTitle({ top: undefined });
+        expect(result).to.equal('');
+      });
+
+      it('should handle exceptions when accessing top.document and fallback to current document', function() {
+        const fakeWindow = {
+          get top() {
+            throw new Error('Access denied');
+          }
+        };
+        const ogTitleContent = 'Current OG Title Content';
+        document.title = 'Current Document Title';
+        sandbox.stub(document, 'querySelector').withArgs('meta[property="og:title"]').returns({ content: ogTitleContent });
+        const result = getPageTitle(fakeWindow);
+        expect(result).to.equal('Current Document Title');
+      });
+    });
+
+    describe('getPageDescription function', function() {
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should return the top document description if available', function() {
+        const descriptionContent = 'Top Document Description';
+        const fakeTopDocument = {
+          querySelector: sandbox.stub().withArgs('meta[name="description"]').returns({ content: descriptionContent })
+        };
+        const fakeTopWindow = { document: fakeTopDocument };
+        const result = getPageDescription({ top: fakeTopWindow });
+        expect(result).to.equal(descriptionContent);
+      });
+
+      it('should return the top document og:description if description is not present', function() {
+        const ogDescriptionContent = 'Top OG Description';
+        const fakeTopDocument = {
+          querySelector: sandbox.stub().withArgs('meta[property="og:description"]').returns({ content: ogDescriptionContent })
+        };
+        const fakeTopWindow = { document: fakeTopDocument };
+        const result = getPageDescription({ top: fakeTopWindow });
+        expect(result).to.equal(ogDescriptionContent);
+      });
+
+      it('should return the current document description if top document is not accessible', function() {
+        const descriptionContent = 'Current Document Description';
+        sandbox.stub(document, 'querySelector')
+          .withArgs('meta[name="description"]').returns({ content: descriptionContent })
+        const fakeWindow = {
+          get top() {
+            throw new Error('Access denied');
+          }
+        };
+        const result = getPageDescription(fakeWindow);
+        expect(result).to.equal(descriptionContent);
+      });
+
+      it('should return the current document og:description if description is not present and top document is not accessible', function() {
+        const ogDescriptionContent = 'Current OG Description';
+        sandbox.stub(document, 'querySelector')
+          .withArgs('meta[property="og:description"]').returns({ content: ogDescriptionContent });
+
+        const fakeWindow = {
+          get top() {
+            throw new Error('Access denied');
+          }
+        };
+        const result = getPageDescription(fakeWindow);
+        expect(result).to.equal(ogDescriptionContent);
+      });
+    });
+
+    describe('getPageKeywords function', function() {
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should return the top document keywords if available', function() {
+        const keywordsContent = 'keyword1, keyword2, keyword3';
+        const fakeTopDocument = {
+          querySelector: sandbox.stub()
+            .withArgs('meta[name="keywords"]').returns({ content: keywordsContent })
+        };
+        const fakeTopWindow = { document: fakeTopDocument };
+
+        const result = getPageKeywords({ top: fakeTopWindow });
+        expect(result).to.equal(keywordsContent);
+      });
+
+      it('should return the current document keywords if top document is not accessible', function() {
+        const keywordsContent = 'keyword1, keyword2, keyword3';
+        sandbox.stub(document, 'querySelector')
+          .withArgs('meta[name="keywords"]').returns({ content: keywordsContent });
+
+        // 模拟顶层窗口访问异常
+        const fakeWindow = {
+          get top() {
+            throw new Error('Access denied');
+          }
+        };
+
+        const result = getPageKeywords(fakeWindow);
+        expect(result).to.equal(keywordsContent);
+      });
+
+      it('should return an empty string if no keywords meta tag is found', function() {
+        sandbox.stub(document, 'querySelector').withArgs('meta[name="keywords"]').returns(null);
+
+        const result = getPageKeywords();
+        expect(result).to.equal('');
+      });
+    });
+    describe('getConnectionDownLink function', function() {
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should return the downlink value as a string if available', function() {
+        const downlinkValue = 2.5;
+        const fakeNavigator = {
+          connection: {
+            downlink: downlinkValue
+          }
+        };
+
+        const result = getConnectionDownLink({ navigator: fakeNavigator });
+        expect(result).to.equal(downlinkValue.toString());
+      });
+
+      it('should return undefined if downlink is not available', function() {
+        const fakeNavigator = {
+          connection: {}
+        };
+
+        const result = getConnectionDownLink({ navigator: fakeNavigator });
+        expect(result).to.be.undefined;
+      });
+
+      it('should return undefined if connection is not available', function() {
+        const fakeNavigator = {};
+
+        const result = getConnectionDownLink({ navigator: fakeNavigator });
+        expect(result).to.be.undefined;
+      });
+
+      it('should handle cases where navigator is not defined', function() {
+        const result = getConnectionDownLink({});
+        expect(result).to.be.undefined;
+      });
+    });
+
+    describe('getUserSyncs with message event listener', function() {
+      function messageHandler(event) {
+        if (!event.data || event.origin !== THIRD_PARTY_COOKIE_ORIGIN) {
+          return;
+        }
+
+        window.removeEventListener('message', messageHandler, true);
+        event.stopImmediatePropagation();
+
+        const response = event.data;
+        if (!response.optout && response.mguid) {
+          storage.setCookie(COOKIE_KEY_MGUID, response.mguid, getCookieTimeToUTCString());
+        }
+      }
+
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+        sandbox.stub(storage, 'setCookie');
+        sandbox.stub(window, 'removeEventListener');
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should set a cookie when a valid message is received', () => {
+        const fakeEvent = {
+          data: { optout: '', mguid: '12345' },
+          origin: THIRD_PARTY_COOKIE_ORIGIN,
+          stopImmediatePropagation: sinon.spy()
+        };
+
+        messageHandler(fakeEvent);
+
+        expect(fakeEvent.stopImmediatePropagation.calledOnce).to.be.true;
+        expect(window.removeEventListener.calledWith('message', messageHandler, true)).to.be.true;
+        expect(storage.setCookie.calledWith(COOKIE_KEY_MGUID, '12345', sinon.match.string)).to.be.true;
+      });
+      it('should not do anything when an invalid message is received', () => {
+        const fakeEvent = {
+          data: null,
+          origin: 'http://invalid-origin.com',
+          stopImmediatePropagation: sinon.spy()
+        };
+
+        messageHandler(fakeEvent);
+
+        expect(fakeEvent.stopImmediatePropagation.notCalled).to.be.true;
+        expect(window.removeEventListener.notCalled).to.be.true;
+        expect(storage.setCookie.notCalled).to.be.true;
+      });
+    });
+    describe('getHLen', () => {
+      it('should return the correct length of history when accessible', () => {
+        const mockWindow = {
+          top: {
+            history: {
+              length: 3
+            }
+          }
+        };
+        const result = getHLen(mockWindow);
+        expect(result).to.equal(3);
+      });
+
+      it('should return undefined when accessing win.top.history.length throws an error', () => {
+        const mockWindow = {
+          get top() {
+            throw new Error('Access denied');
+          }
+        };
+        const result = getHLen(mockWindow);
+        expect(result).be.undefined;
+      });
+    });
+  });
 });
diff --git a/test/spec/modules/djaxBidAdapter_spec.js b/test/spec/modules/djaxBidAdapter_spec.js
new file mode 100644
index 00000000000..afa9a36eab7
--- /dev/null
+++ b/test/spec/modules/djaxBidAdapter_spec.js
@@ -0,0 +1,100 @@
+import { expect } from 'chai';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { spec } from '../../../modules/djaxBidAdapter.js';
+
+const DOMAIN = 'https://revphpe.djaxbidder.com/header_bidding_vast/';
+const ENDPOINT = DOMAIN + 'www/admin/plugins/Prebid/getAd.php';
+
+describe('Djax Adapter', function() {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('should exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValidForBanner', () => {
+    let bid = {
+      'bidder': 'djax',
+      'params': {
+    	  'publisherId': 2
+      },
+      'adUnitCode': 'adunit-code',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [
+            [300, 250]
+          ]
+        }
+      },
+      'sizes': [[300, 250]],
+      'bidId': '26e88c3c703e66',
+      'bidderRequestId': '1a8ff729f6c1a3',
+      'auctionId': 'cb65d954-ffe1-4f4a-8603-02b521c00333',
+    };
+
+    it('should return true when required params found', () => {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+
+  describe('buildRequestsForBanner', () => {
+    let bidRequests = [
+      {
+        'bidder': 'djax',
+        'params': {
+        	'publisherId': 2
+        },
+        'adUnitCode': 'adunit-code',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [300, 250]
+            ]
+          }
+        },
+        'sizes': [[300, 250]],
+        'bidId': '26e88c3c703e66',
+        'bidderRequestId': '1a8ff729f6c1a3',
+        'auctionId': 'cb65d954-ffe1-4f4a-8603-02b521c00333'
+      }
+    ];
+
+    it('sends bid request to ENDPOINT via POST', () => {
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.contain(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+  });
+
+  describe('interpretResponseForBanner', () => {
+    let bidRequests = [
+      {
+        'bidder': 'djax',
+        'params': {
+        	'publisherId': 2
+        },
+        'adUnitCode': 'adunit-code',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [300, 250]
+            ]
+          }
+        },
+        'sizes': [[300, 250]],
+        'bidId': '26e88c3c703e66',
+        'bidderRequestId': '1a8ff729f6c1a3',
+        'auctionId': 'cb65d954-ffe1-4f4a-8603-02b521c00333'
+      }
+    ];
+
+    it('handles nobid responses', () => {
+      var request = spec.buildRequests(bidRequests);
+      let response = '';
+      let result = spec.interpretResponse(response, request[0]);
+      expect(result.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/docereeAdManagerBidAdapter_spec.js b/test/spec/modules/docereeAdManagerBidAdapter_spec.js
new file mode 100644
index 00000000000..704b9c48d3a
--- /dev/null
+++ b/test/spec/modules/docereeAdManagerBidAdapter_spec.js
@@ -0,0 +1,222 @@
+import { expect } from 'chai';
+import { spec, getPayload, getPageUrl } from '../../../modules/docereeAdManagerBidAdapter.js';
+import { config } from '../../../src/config.js';
+import * as utils from '../../../src/utils.js';
+
+describe('docereeadmanager', function () {
+  config.setConfig({
+    docereeadmanager: {
+      user: {
+        data: {
+          userId: '',
+          email: '',
+          firstname: '',
+          lastname: '',
+          specialization: '',
+          hcpid: '',
+          gender: '',
+          city: '',
+          state: '',
+          zipcode: '',
+          hashedNPI: '',
+          hashedhcpid: '',
+          hashedemail: '',
+          hashedmobile: '',
+          country: '',
+          organization: '',
+          dob: '',
+          platformUid: '',
+          mobile: '',
+        },
+      },
+    },
+  });
+  let bid = {
+    bidId: 'testing',
+    bidder: 'docereeadmanager',
+    params: {
+      placementId: 'DOC-19-1',
+      publisherUrl: 'xxxxxx.com/xxxx',
+      gdpr: '1',
+      gdprconsent:
+        'CPQfU1jPQfU1jG0AAAENAwCAAAAAAAAAAAAAAAAAAAAA.IGLtV_T9fb2vj-_Z99_tkeYwf95y3p-wzhheMs-8NyZeH_B4Wv2MyvBX4JiQKGRgksjLBAQdtHGlcTQgBwIlViTLMYk2MjzNKJrJEilsbO2dYGD9Pn8HT3ZCY70-vv__7v3ff_3g',
+    },
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if placementId is present', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if placementId is not present', function () {
+      delete bid.params.placementId;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('isGdprConsentPresent', function () {
+    it('Should return true if gdpr consent is present', function () {
+      expect(spec.isGdprConsentPresent(bid)).to.be.true;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid]);
+    serverRequest = serverRequest[0];
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://dai.doceree.com/drs/quest');
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: {
+          cpm: 3.576,
+          currency: 'USD',
+          width: 250,
+          height: 300,
+          ad: '
I am an ad
',
+          ttl: 30,
+          creativeId: 'div-1',
+          netRevenue: false,
+          bidderCode: '123',
+          dealId: 232,
+          requestId: '123',
+          meta: {
+            brandId: null,
+            advertiserDomains: ['https://dai.doceree.com/drs/quest'],
+          },
+        },
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys(
+        'requestId',
+        'cpm',
+        'width',
+        'height',
+        'ad',
+        'ttl',
+        'netRevenue',
+        'currency',
+        'mediaType',
+        'creativeId',
+        'meta'
+      );
+      expect(dataItem.requestId).to.equal('123');
+      expect(dataItem.cpm).to.equal(3.576);
+      expect(dataItem.width).to.equal(250);
+      expect(dataItem.height).to.equal(300);
+      expect(dataItem.ad).to.equal('
I am an ad
');
+      expect(dataItem.ttl).to.equal(30);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.creativeId).to.equal('div-1');
+      expect(dataItem.meta.advertiserDomains).to.be.an('array').that.is.not
+        .empty;
+    });
+  });
+
+  describe('getPageUrl', function () {
+    it('should return an url string', function () {
+      const result = getPageUrl();
+      expect(result).to.equal(utils.getWindowSelf().location.href);
+    });
+  });
+
+  describe('payload', function () {
+    it('should return payload with the correct data', function () {
+      const data = {
+        userId: 'xxxxx',
+        email: 'xxxx@mail.com',
+        firstname: 'Xxxxx',
+        lastname: 'Xxxxxx',
+        specialization: 'Xxxxxxxxx',
+        hcpid: 'xxxxxxx',
+        gender: 'Xxxx',
+        city: 'Xxxxx',
+        state: 'Xxxxxx',
+        zipcode: 'XXXXXX',
+        hashedNPI: 'xxxxxx',
+        hashedhcpid: 'xxxxxxx',
+        hashedemail: 'xxxxxxx',
+        hashedmobile: 'xxxxxxx',
+        country: 'Xxxxxx',
+        organization: 'Xxxxxx',
+        dob: 'xx-xx-xxxx',
+        platformUid: 'Xx.xxx.xxxxxx',
+        mobile: 'XXXXXXXXXX',
+      }
+      bid = { ...bid, params: { ...bid.params, placementId: 'DOC-19-1' } }
+      const buildRequests = {
+        gdprConsent: {
+          consentString: 'COwK6gaOwK6gaFmAAAENAPCAAAAAAAAAAAAAAAAAAAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+          gdprApplies: false
+        }
+      }
+      const payload = getPayload(bid, data, buildRequests);
+
+      const payloadData = payload.data;
+      expect(payloadData).to.have.all.keys(
+        'userid',
+        'email',
+        'firstname',
+        'lastname',
+        'specialization',
+        'hcpid',
+        'gender',
+        'city',
+        'state',
+        'zipcode',
+        'hashedNPI',
+        'pb',
+        'adunit',
+        'requestId',
+        'hashedhcpid',
+        'hashedemail',
+        'hashedmobile',
+        'country',
+        'organization',
+        'dob',
+        'userconsent',
+        'mobile',
+        'pageurl',
+        'consent'
+      );
+      expect(payloadData.userid).to.equal('Xx.xxx.xxxxxx');
+      expect(payloadData.email).to.equal('xxxx@mail.com');
+      expect(payloadData.firstname).to.equal('Xxxxx');
+      expect(payloadData.lastname).to.equal('Xxxxxx');
+      expect(payloadData.specialization).to.equal('Xxxxxxxxx');
+      expect(payloadData.hcpid).to.equal('xxxxxxx');
+      expect(payloadData.gender).to.equal('Xxxx');
+      expect(payloadData.city).to.equal('Xxxxx');
+      expect(payloadData.state).to.equal('Xxxxxx');
+      expect(payloadData.zipcode).to.equal('XXXXXX');
+      expect(payloadData.hashedNPI).to.equal('xxxxxx');
+      expect(payloadData.pb).to.equal(1);
+      expect(payloadData.userconsent).to.equal(1);
+      expect(payloadData.dob).to.equal('xx-xx-xxxx');
+      expect(payloadData.organization).to.equal('Xxxxxx');
+      expect(payloadData.country).to.equal('Xxxxxx');
+      expect(payloadData.hashedmobile).to.equal('xxxxxxx');
+      expect(payloadData.hashedemail).to.equal('xxxxxxx');
+      expect(payloadData.hashedhcpid).to.equal('xxxxxxx');
+      expect(payloadData.requestId).to.equal('testing');
+      expect(payloadData.mobile).to.equal('XXXXXXXXXX');
+      expect(payloadData.adunit).to.equal('DOC-19-1');
+      expect(payloadData.pageurl).to.equal('xxxxxx.com/xxxx');
+      expect(payloadData.consent.gdprstr).to.equal('COwK6gaOwK6gaFmAAAENAPCAAAAAAAAAAAAAAAAAAAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw');
+      expect(payloadData.consent.gdpr).to.equal(0);
+    })
+  })
+});
diff --git a/test/spec/modules/docereeBidAdapter_spec.js b/test/spec/modules/docereeBidAdapter_spec.js
index dadbb56b0c0..25da8b256fc 100644
--- a/test/spec/modules/docereeBidAdapter_spec.js
+++ b/test/spec/modules/docereeBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {spec} from '../../../modules/docereeBidAdapter.js';
 import { config } from '../../../src/config.js';
+import * as utils from 'src/utils.js';
 
 describe('BidlabBidAdapter', function () {
   config.setConfig({
@@ -102,4 +103,36 @@ describe('BidlabBidAdapter', function () {
       expect(dataItem.meta.advertiserDomains[0]).to.equal('doceree.com')
     });
   })
+  describe('onBidWon', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('exists and is a function', () => {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function');
+    });
+    it('should return nothing', function () {
+      var response = spec.onBidWon({});
+      expect(response).to.be.an('undefined')
+      expect(utils.triggerPixel.called).to.equal(true);
+    });
+  });
+  describe('onTimeout', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('exists and is a function', () => {
+      expect(spec.onTimeout).to.exist.and.to.be.a('function');
+    });
+    it('should return nothing', function () {
+      var response = spec.onBidWon([]);
+      expect(response).to.be.an('undefined')
+      expect(utils.triggerPixel.called).to.equal(true);
+    });
+  });
 });
diff --git a/test/spec/modules/driftpixelBidAdapter_spec.js b/test/spec/modules/driftpixelBidAdapter_spec.js
new file mode 100644
index 00000000000..da84235b404
--- /dev/null
+++ b/test/spec/modules/driftpixelBidAdapter_spec.js
@@ -0,0 +1,458 @@
+import {expect} from 'chai';
+import {config} from 'src/config.js';
+import {spec} from 'modules/driftpixelBidAdapter.js';
+import {deepClone} from 'src/utils';
+import {getBidFloor} from '../../../libraries/xeUtils/bidderUtils.js';
+
+const ENDPOINT = 'https://pbjs.driftpixel.live';
+
+const defaultRequest = {
+  adUnitCode: 'test',
+  bidId: '1',
+  requestId: 'qwerty',
+  ortb2: {
+    source: {
+      tid: 'auctionId'
+    }
+  },
+  ortb2Imp: {
+    ext: {
+      tid: 'tr1',
+    }
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 200]
+      ]
+    }
+  },
+  bidder: 'driftpixel',
+  params: {
+    env: 'driftpixel',
+    pid: '40',
+    ext: {}
+  },
+  bidRequestsCount: 1
+};
+
+const defaultRequestVideo = deepClone(defaultRequest);
+defaultRequestVideo.mediaTypes = {
+  video: {
+    playerSize: [640, 480],
+    context: 'instream',
+    skipppable: true
+  }
+};
+
+const videoBidderRequest = {
+  bidderCode: 'driftpixel',
+  bids: [{mediaTypes: {video: {}}, bidId: 'qwerty'}]
+};
+
+const displayBidderRequest = {
+  bidderCode: 'driftpixel',
+  bids: [{bidId: 'qwerty'}]
+};
+
+describe('driftpixelBidAdapter', () => {
+  describe('isBidRequestValid', function () {
+    it('should return false when request params is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when required env param is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params.env;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when required pid param is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params.pid;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when video.playerSize is missing', function () {
+      const invalidRequest = deepClone(defaultRequestVideo);
+      delete invalidRequest.mediaTypes.video.playerSize;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(defaultRequest)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+
+    it('should send request with correct structure', function () {
+      const request = spec.buildRequests([defaultRequest], {});
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal(ENDPOINT + '/bid');
+      expect(request.options).to.have.property('contentType').and.to.equal('application/json');
+      expect(request).to.have.property('data');
+    });
+
+    it('should build basic request structure', function () {
+      const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
+      expect(request).to.have.property('bidId').and.to.equal(defaultRequest.bidId);
+      expect(request).to.have.property('auctionId').and.to.equal(defaultRequest.ortb2.source.tid);
+      expect(request).to.have.property('transactionId').and.to.equal(defaultRequest.ortb2Imp.ext.tid);
+      expect(request).to.have.property('tz').and.to.equal(new Date().getTimezoneOffset());
+      expect(request).to.have.property('bc').and.to.equal(1);
+      expect(request).to.have.property('floor').and.to.equal(null);
+      expect(request).to.have.property('banner').and.to.deep.equal({sizes: [[300, 250], [300, 200]]});
+      expect(request).to.have.property('gdprApplies').and.to.equal(0);
+      expect(request).to.have.property('consentString').and.to.equal('');
+      expect(request).to.have.property('userEids').and.to.deep.equal([]);
+      expect(request).to.have.property('usPrivacy').and.to.equal('');
+      expect(request).to.have.property('sizes').and.to.deep.equal(['300x250', '300x200']);
+      expect(request).to.have.property('ext').and.to.deep.equal({});
+      expect(request).to.have.property('env').and.to.deep.equal({
+        env: 'driftpixel',
+        pid: '40'
+      });
+      expect(request).to.have.property('device').and.to.deep.equal({
+        ua: navigator.userAgent,
+        lang: navigator.language
+      });
+    });
+
+    it('should build request with schain', function () {
+      const schainRequest = deepClone(defaultRequest);
+      schainRequest.schain = {
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([schainRequest], {}).data)[0];
+      expect(request).to.have.property('schain').and.to.deep.equal({
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      });
+    });
+
+    it('should build request with location', function () {
+      const bidderRequest = {
+        refererInfo: {
+          page: 'page',
+          location: 'location',
+          domain: 'domain',
+          ref: 'ref',
+          isAmp: false
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('location');
+      const location = request.location;
+      expect(location).to.have.property('page').and.to.equal('page');
+      expect(location).to.have.property('location').and.to.equal('location');
+      expect(location).to.have.property('domain').and.to.equal('domain');
+      expect(location).to.have.property('ref').and.to.equal('ref');
+      expect(location).to.have.property('isAmp').and.to.equal(false);
+    });
+
+    it('should build request with ortb2 info', function () {
+      const ortb2Request = deepClone(defaultRequest);
+      ortb2Request.ortb2 = {
+        site: {
+          name: 'name'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([ortb2Request], {}).data)[0];
+      expect(request).to.have.property('ortb2').and.to.deep.equal({
+        site: {
+          name: 'name'
+        }
+      });
+    });
+
+    it('should build request with ortb2Imp info', function () {
+      const ortb2ImpRequest = deepClone(defaultRequest);
+      ortb2ImpRequest.ortb2Imp = {
+        ext: {
+          data: {
+            pbadslot: 'home1',
+            adUnitSpecificAttribute: '1'
+          }
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([ortb2ImpRequest], {}).data)[0];
+      expect(request).to.have.property('ortb2Imp').and.to.deep.equal({
+        ext: {
+          data: {
+            pbadslot: 'home1',
+            adUnitSpecificAttribute: '1'
+          }
+        }
+      });
+    });
+
+    it('should build request with valid bidfloor', function () {
+      const bfRequest = deepClone(defaultRequest);
+      bfRequest.getFloor = () => ({floor: 5, currency: 'USD'});
+      const request = JSON.parse(spec.buildRequests([bfRequest], {}).data)[0];
+      expect(request).to.have.property('floor').and.to.equal(5);
+    });
+
+    it('should build request with gdpr consent data if applies', function () {
+      const bidderRequest = {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'qwerty'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('gdprApplies').and.equals(1);
+      expect(request).to.have.property('consentString').and.equals('qwerty');
+    });
+
+    it('should build request with usp consent data if applies', function () {
+      const bidderRequest = {
+        uspConsent: '1YA-'
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('usPrivacy').and.equals('1YA-');
+    });
+
+    it('should build request with extended ids', function () {
+      const idRequest = deepClone(defaultRequest);
+      idRequest.userIdAsEids = [
+        {source: 'adserver.org', uids: [{id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: {rtiPartner: 'TDID'}}]},
+        {source: 'pubcid.org', uids: [{id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1}]}
+      ];
+      const request = JSON.parse(spec.buildRequests([idRequest], {}).data)[0];
+      expect(request).to.have.property('userEids').and.deep.equal(idRequest.userIdAsEids);
+    });
+
+    it('should build request with video', function () {
+      const request = JSON.parse(spec.buildRequests([defaultRequestVideo], {}).data)[0];
+      expect(request).to.have.property('video').and.to.deep.equal({
+        playerSize: [640, 480],
+        context: 'instream',
+        skipppable: true
+      });
+      expect(request).to.have.property('sizes').and.to.deep.equal(['640x480']);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return empty bids', function () {
+      const serverResponse = {
+        body: {
+          data: null
+        }
+      };
+
+      const invalidResponse = spec.interpretResponse(serverResponse, {});
+      expect(invalidResponse).to.be.an('array').that.is.empty;
+    });
+
+    it('should interpret valid response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 300,
+            height: 250,
+            ttl: 600,
+            meta: {
+              advertiserDomains: ['driftpixel']
+            },
+            ext: {
+              pixels: [
+                ['iframe', 'surl1'],
+                ['image', 'surl2'],
+              ]
+            }
+          }]
+        }
+      };
+
+      const validResponse = spec.interpretResponse(serverResponse, {bidderRequest: displayBidderRequest});
+      const bid = validResponse[0];
+      expect(validResponse).to.be.an('array').that.is.not.empty;
+      expect(bid.requestId).to.equal('qwerty');
+      expect(bid.cpm).to.equal(1);
+      expect(bid.currency).to.equal('USD');
+      expect(bid.width).to.equal(300);
+      expect(bid.height).to.equal(250);
+      expect(bid.ttl).to.equal(600);
+      expect(bid.meta).to.deep.equal({advertiserDomains: ['driftpixel']});
+    });
+
+    it('should interpret valid banner response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 300,
+            height: 250,
+            ttl: 600,
+            mediaType: 'banner',
+            creativeId: 'xe-demo-banner',
+            ad: 'ad',
+            meta: {}
+          }]
+        }
+      };
+
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: displayBidderRequest});
+      const bid = validResponseBanner[0];
+      expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+      expect(bid.mediaType).to.equal('banner');
+      expect(bid.creativeId).to.equal('xe-demo-banner');
+      expect(bid.ad).to.equal('ad');
+    });
+
+    it('should interpret valid video response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 600,
+            height: 480,
+            ttl: 600,
+            mediaType: 'video',
+            creativeId: 'xe-demo-video',
+            ad: 'vast-xml',
+            meta: {}
+          }]
+        }
+      };
+
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: videoBidderRequest});
+      const bid = validResponseBanner[0];
+      expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+      expect(bid.mediaType).to.equal('video');
+      expect(bid.creativeId).to.equal('xe-demo-video');
+      expect(bid.ad).to.equal('vast-xml');
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('shoukd handle no params', function () {
+      const opts = spec.getUserSyncs({}, []);
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty if sync is not allowed', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false});
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should allow iframe sync', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('iframe');
+      expect(opts[0].url).to.equal('surl1?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+    });
+
+    it('should allow pixel sync', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+    });
+
+    it('should allow pixel sync and parse consent params', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }], {
+        gdprApplies: 1,
+        consentString: '1YA-'
+      });
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=1&gdpr_consent=1YA-');
+    });
+  });
+
+  describe('getBidFloor', function () {
+    it('should return null when getFloor is not a function', () => {
+      const bid = {getFloor: 2};
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when getFloor doesnt return an object', () => {
+      const bid = {getFloor: () => 2};
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when floor is not a number', () => {
+      const bid = {
+        getFloor: () => ({floor: 'string', currency: 'USD'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when currency is not USD', () => {
+      const bid = {
+        getFloor: () => ({floor: 5, currency: 'EUR'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return floor value when everything is correct', () => {
+      const bid = {
+        getFloor: () => ({floor: 5, currency: 'USD'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.equal(5);
+    });
+  });
+})
diff --git a/test/spec/modules/dsaControl_spec.js b/test/spec/modules/dsaControl_spec.js
new file mode 100644
index 00000000000..1744d1d5bab
--- /dev/null
+++ b/test/spec/modules/dsaControl_spec.js
@@ -0,0 +1,112 @@
+import {addBidResponseHook, setMetaDsa, reset} from '../../../modules/dsaControl.js';
+import { REJECTION_REASON } from 'src/constants.js';
+import {auctionManager} from '../../../src/auctionManager.js';
+import {AuctionIndex} from '../../../src/auctionIndex.js';
+
+describe('DSA transparency', () => {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+  afterEach(() => {
+    sandbox.restore();
+    reset();
+  });
+
+  describe('addBidResponseHook', () => {
+    const auctionId = 'auction-id';
+    let bid, auction, fpd, next, reject;
+    beforeEach(() => {
+      next = sinon.stub();
+      reject = sinon.stub();
+      fpd = {};
+      bid = {
+        auctionId
+      }
+      auction = {
+        getAuctionId: () => auctionId,
+        getFPD: () => ({global: fpd})
+      }
+      sandbox.stub(auctionManager, 'index').get(() => new AuctionIndex(() => [auction]));
+    });
+
+    function expectRejection(reason) {
+      addBidResponseHook(next, 'adUnit', bid, reject);
+      sinon.assert.calledWith(reject, reason);
+      sinon.assert.notCalled(next);
+    }
+
+    function expectAcceptance() {
+      addBidResponseHook(next, 'adUnit', bid, reject);
+      sinon.assert.notCalled(reject);
+      sinon.assert.calledWith(next, 'adUnit', bid, reject);
+    }
+
+    [2, 3].forEach(required => {
+      describe(`when regs.ext.dsa.dsarequired is ${required} (required)`, () => {
+        beforeEach(() => {
+          fpd = {
+            regs: {ext: {dsa: {dsarequired: required}}}
+          };
+        });
+
+        it('should reject bids that have no meta.dsa', () => {
+          expectRejection(REJECTION_REASON.DSA_REQUIRED);
+        });
+
+        it('should accept bids that do', () => {
+          bid.meta = {dsa: {}};
+          expectAcceptance();
+        });
+
+        describe('and pubrender = 0 (rendering by publisher not supported)', () => {
+          beforeEach(() => {
+            fpd.regs.ext.dsa.pubrender = 0;
+          });
+
+          it('should reject bids with adrender = 0 (advertiser will not render)', () => {
+            bid.meta = {dsa: {adrender: 0}};
+            expectRejection(REJECTION_REASON.DSA_MISMATCH);
+          });
+
+          it('should accept bids with adrender = 1 (advertiser will render)', () => {
+            bid.meta = {dsa: {adrender: 1}};
+            expectAcceptance();
+          });
+        });
+        describe('and pubrender = 2 (publisher will render)', () => {
+          beforeEach(() => {
+            fpd.regs.ext.dsa.pubrender = 2;
+          });
+
+          it('should reject bids with adrender = 1 (advertiser will render)', () => {
+            bid.meta = {dsa: {adrender: 1}};
+            expectRejection(REJECTION_REASON.DSA_MISMATCH);
+          });
+
+          it('should accept bids with adrender = 0 (advertiser will not render)', () => {
+            bid.meta = {dsa: {adrender: 0}};
+            expectAcceptance();
+          })
+        })
+      });
+    });
+    [undefined, 'garbage', 0, 1].forEach(required => {
+      describe(`when regs.ext.dsa.dsarequired is ${required}`, () => {
+        beforeEach(() => {
+          if (required != null) {
+            fpd = {
+              regs: {ext: {dsa: {dsarequired: required}}}
+            }
+          }
+        });
+
+        it('should accept bids regardless of their meta.dsa', () => {
+          addBidResponseHook(next, 'adUnit', bid, reject);
+          sinon.assert.notCalled(reject);
+          sinon.assert.calledWith(next, 'adUnit', bid, reject);
+        })
+      })
+    })
+  });
+});
diff --git a/test/spec/modules/dsp_genieeBidAdapter_spec.js b/test/spec/modules/dsp_genieeBidAdapter_spec.js
new file mode 100644
index 00000000000..b708acffc0b
--- /dev/null
+++ b/test/spec/modules/dsp_genieeBidAdapter_spec.js
@@ -0,0 +1,181 @@
+import { expect } from 'chai';
+import { spec } from 'modules/dsp_genieeBidAdapter.js';
+import { config } from 'src/config';
+import { setConfig as setCurrencyConfig } from '../../../modules/currency';
+import { addFPDToBidderRequest } from '../../helpers/fpd';
+
+describe('Geniee adapter tests', () => {
+  const validBidderRequest = {
+    code: 'sample_request',
+    bids: [{
+      bidId: 'bid-id',
+      bidder: 'dsp_geniee',
+      params: {
+        test: 1
+      }
+    }],
+    gdprConsent: {
+      gdprApplies: false
+    },
+    uspConsent: '1YNY'
+  };
+
+  describe('isBidRequestValid function test', () => {
+    it('valid', () => {
+      expect(spec.isBidRequestValid(validBidderRequest.bids[0])).equal(true);
+    });
+  });
+  describe('buildRequests function test', () => {
+    it('auction', () => {
+      const request = spec.buildRequests(validBidderRequest.bids, validBidderRequest);
+      const auction_id = request.data.id;
+      expect(request).deep.equal({
+        method: 'POST',
+        url: 'https://rt.gsspat.jp/prebid_auction',
+        data: {
+          at: 1,
+          id: auction_id,
+          imp: [
+            {
+              ext: {
+                test: 1
+              },
+              id: 'bid-id',
+              secure: 1
+            }
+          ],
+          test: 1
+        },
+      });
+    });
+    it('uncomfortable (gdpr)', () => {
+      validBidderRequest.gdprConsent.gdprApplies = true;
+      const request = spec.buildRequests(validBidderRequest.bids, validBidderRequest);
+      expect(request).deep.equal({
+        method: 'GET',
+        url: 'https://rt.gsspat.jp/prebid_uncomfortable',
+      });
+      validBidderRequest.gdprConsent.gdprApplies = false;
+    });
+    it('uncomfortable (usp)', () => {
+      validBidderRequest.uspConsent = '1YYY';
+      const request = spec.buildRequests(validBidderRequest.bids, validBidderRequest);
+      expect(request).deep.equal({
+        method: 'GET',
+        url: 'https://rt.gsspat.jp/prebid_uncomfortable',
+      });
+      validBidderRequest.uspConsent = '1YNY';
+    });
+    it('uncomfortable (coppa)', () => {
+      config.setConfig({ coppa: true });
+      const request = spec.buildRequests(validBidderRequest.bids, validBidderRequest);
+      expect(request).deep.equal({
+        method: 'GET',
+        url: 'https://rt.gsspat.jp/prebid_uncomfortable',
+      });
+      config.resetConfig();
+    });
+    it('uncomfortable (currency)', () => {
+      setCurrencyConfig({ adServerCurrency: 'TWD' });
+      return addFPDToBidderRequest(validBidderRequest).then(res => {
+        const request = spec.buildRequests(validBidderRequest.bids, res);
+        expect(request).deep.equal({
+          method: 'GET',
+          url: 'https://rt.gsspat.jp/prebid_uncomfortable',
+        });
+        setCurrencyConfig({});
+        config.resetConfig();
+      });
+    });
+  });
+  describe('interpretResponse function test', () => {
+    it('sample bid', () => {
+      const request = spec.buildRequests(validBidderRequest.bids, validBidderRequest);
+      const auction_id = request.data.id;
+      const adm = "\n";
+      const serverResponse = {
+        body: {
+          id: auction_id,
+          cur: 'JPY',
+          seatbid: [{
+            bid: [{
+              id: '7b77235d599e06d289e58ddfa9390443e22d7071',
+              impid: 'bid-id',
+              price: 0.6666000000000001,
+              adid: '8405715',
+              adm: adm,
+              adomain: ['geniee.co.jp'],
+              iurl: 'http://img.gsspat.jp/e/068c8e1eafbf0cb6ac1ee95c36152bd2/04f4bd4e6b71f978d343d84ecede3877.png',
+              cid: '8405715',
+              crid: '1383823',
+              cat: ['IAB1'],
+              w: 300,
+              h: 250,
+              mtype: 1
+            }]
+          }]
+        }
+      };
+      const bids = spec.interpretResponse(serverResponse, request);
+      expect(bids).deep.equal([{
+        ad: adm,
+        cpm: 0.6666000000000001,
+        creativeId: '1383823',
+        creative_id: '1383823',
+        height: 250,
+        width: 300,
+        currency: 'JPY',
+        mediaType: 'banner',
+        meta: {
+          advertiserDomains: ['geniee.co.jp'],
+          primaryCatId: 'IAB1',
+          secondaryCatIds: []
+        },
+        netRevenue: true,
+        requestId: 'bid-id',
+        seatBidId: '7b77235d599e06d289e58ddfa9390443e22d7071',
+        ttl: 300
+      }]);
+    });
+    it('no bid', () => {
+      const serverResponse = {};
+      const bids = spec.interpretResponse(serverResponse, validBidderRequest);
+      expect(bids).deep.equal([]);
+    });
+  });
+  describe('getUserSyncs function test', () => {
+    it('sync enabled', () => {
+      const syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: true
+      };
+      const serverResponses = [];
+      const syncs = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(syncs).deep.equal([{
+        type: 'image',
+        url: 'https://rt.gsspat.jp/prebid_cs'
+      }]);
+    });
+    it('sync disabled (option false)', () => {
+      const syncOptions = {
+        iframeEnabled: false,
+        pixelEnabled: false
+      };
+      const serverResponses = [];
+      const syncs = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(syncs).deep.equal([]);
+    });
+    it('sync disabled (gdpr)', () => {
+      const syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: true
+      };
+      const serverResponses = [];
+      const gdprConsent = {
+        gdprApplies: true
+      };
+      const syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent);
+      expect(syncs).deep.equal([]);
+    });
+  });
+});
diff --git a/test/spec/modules/dspxBidAdapter_spec.js b/test/spec/modules/dspxBidAdapter_spec.js
index 841fc087613..ad7bc827837 100644
--- a/test/spec/modules/dspxBidAdapter_spec.js
+++ b/test/spec/modules/dspxBidAdapter_spec.js
@@ -1,7 +1,9 @@
 import { expect } from 'chai';
+import { config } from 'src/config.js';
 import { spec } from 'modules/dspxBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { deepClone } from '../../../src/utils';
+import {BANNER} from '../../../src/mediaTypes';
 
 const ENDPOINT_URL = 'https://buyer.dspx.tv/request/';
 const ENDPOINT_URL_DEV = 'https://dcbuyer.dspx.tv/request/';
@@ -33,12 +35,19 @@ describe('dspxAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'someIncorrectParam': 0
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      const invalidBid = {
+        bidId: '30b31c1838de1e',
+        bidder: 'dspx',
+        mediaTypes: {
+          [BANNER]: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          someIncorrectParam: 0
+        }
+      }
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -77,7 +86,26 @@ describe('dspxAdapter', function () {
         'sharedid': {
           'id': '01EXPPGZ9C8NKG1MTXVHV98505',
           'third': '01EXPPGZ9C8NKG1MTXVHV98505'
-        }
+        },
+        'pubProvidedId': [{
+          'source': 'puburl2.com',
+          'uids': [{
+            'id': 'pubid2'
+          }, {
+            'id': 'pubid2-123'
+          }]
+        }, {
+          'source': 'puburl.com',
+          'uids': [{
+            'id': 'pubid1',
+            'atype': 1,
+            'ext': {
+              'stype': 'ppuid'
+            }
+          }]
+        }],
+        'euid': {},
+        'tdid': 'tdid_ID',
       },
       'crumbs': {
         'pubcid': 'e09ab6a3-ae74-4f01-b2e8-81b141d6dc61'
@@ -228,12 +256,54 @@ describe('dspxAdapter', function () {
       }
     };
 
+    // With ortb2
+    var bidderRequestWithORTB = {
+      refererInfo: {
+        referer: 'some_referrer.net'
+      },
+      gdprConsent: {
+        consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+        vendorData: {someData: 'value'},
+        gdprApplies: true
+      },
+      ortb2: {
+        source: {},
+        site: {
+          domain: 'buyer',
+          publisher: {
+            domain: 'buyer'
+          },
+          page: 'http://buyer/schain.php?ver=8.5.0-pre:latest-dev-build&pbjs_debug=true',
+          ref: 'http://buyer/pbjsv/',
+          content: {
+            id: 'contentID',
+            episode: 1,
+            title: 'contentTitle',
+            series: 'contentSeries',
+            season: 'contentSeason 3',
+            artist: 'contentArtist',
+            genre: 'rock',
+            isrc: 'contentIsrc',
+            url: 'https://content-url.com/',
+            context: 1,
+            keywords: 'kw1,kw2,keqword 3',
+            livestream: 0,
+            cat: [
+              'IAB1-1',
+              'IAB1-2',
+              'IAB2-10'
+            ]
+          }
+        },
+      }
+    };
+
     var request1 = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
     it('sends bid request to our endpoint via GET', function () {
       expect(request1.method).to.equal('GET');
       expect(request1.url).to.equal(ENDPOINT_URL);
       let data = request1.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid').replace(/pbver=.*?&/g, 'pbver=test&');
-      expect(data).to.equal('_f=auto&alternative=prebid_js&inventory_item_id=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e1&pbver=test&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bprivate_auction%5D=0&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&bcat=IAB2%2CIAB4&dvt=desktop&did_netid=123&did_id5=ID5-ZHMOcvSShIBZiIth_yYh9odjNFxVEmMQ_i5TArPfWw!ID5*dtrjfV5mPLasyya5TW2IE9oVzQZwx7xRPGyAYS4hcWkAAOoxoFef4bIoREpQys8x&did_id5_linktype=2&did_uid2=456&did_sharedid=01EXPPGZ9C8NKG1MTXVHV98505&did_pubcid=e09ab6a3-ae74-4f01-b2e8-81b141d6dc61&did_cpubcid=e09ab6a3-ae74-4f01-b2e8-81b141d6dc61&schain%5Bver%5D=1.0&schain%5Bcomplete%5D=1&schain%5Bnodes%5D%5B0%5D%5Basi%5D=example.com&schain%5Bnodes%5D%5B0%5D%5Bsid%5D=0&schain%5Bnodes%5D%5B0%5D%5Bhp%5D=1&schain%5Bnodes%5D%5B0%5D%5Brid%5D=bidrequestid&schain%5Bnodes%5D%5B0%5D%5Bdomain%5D=example.com&auctionId=1d1a030790a475&pbcode=testDiv1&media_types%5Bbanner%5D=300x250');
+      expect(data).to.equal('_f=auto&alternative=prebid_js&inventory_item_id=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e1&pbver=test&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bprivate_auction%5D=0&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&bcat=IAB2%2CIAB4&dvt=desktop&auctionId=1d1a030790a475&pbcode=testDiv1&media_types%5Bbanner%5D=300x250&schain%5Bver%5D=1.0&schain%5Bcomplete%5D=1&schain%5Bnodes%5D%5B0%5D%5Basi%5D=example.com&schain%5Bnodes%5D%5B0%5D%5Bsid%5D=0&schain%5Bnodes%5D%5B0%5D%5Bhp%5D=1&schain%5Bnodes%5D%5B0%5D%5Brid%5D=bidrequestid&schain%5Bnodes%5D%5B0%5D%5Bdomain%5D=example.com&did_netid=123&did_id5=ID5-ZHMOcvSShIBZiIth_yYh9odjNFxVEmMQ_i5TArPfWw!ID5*dtrjfV5mPLasyya5TW2IE9oVzQZwx7xRPGyAYS4hcWkAAOoxoFef4bIoREpQys8x&did_id5_linktype=2&did_uid2=456&did_sharedid=01EXPPGZ9C8NKG1MTXVHV98505&did_pubcid=e09ab6a3-ae74-4f01-b2e8-81b141d6dc61&did_tdid=tdid_ID&did_ppuid=1%3Apuburl.com%3Apubid1&did_cpubcid=e09ab6a3-ae74-4f01-b2e8-81b141d6dc61');
     });
 
     var request2 = spec.buildRequests([bidRequests[1]], bidderRequest)[0];
@@ -281,6 +351,14 @@ describe('dspxAdapter', function () {
       expect(data).to.equal('_f=auto&alternative=prebid_js&inventory_item_id=107&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e4&pbver=test&pfilter%5Btest%5D=1&prebidDevMode=1&auctionId=1d1a030790a478&pbcode=testDiv3&media_types%5Bvideo%5D=640x480&media_types%5Bbanner%5D=300x250&vctx=instream&vpl%5Bmimes%5D%5B0%5D=video%2Fmp4&vpl%5Bprotocols%5D%5B0%5D=1&vpl%5Bprotocols%5D%5B1%5D=2&vpl%5Bplaybackmethod%5D%5B0%5D=2&vpl%5Bskip%5D=1');
     });
 
+    var request7 = spec.buildRequests([bidRequests[5]], bidderRequestWithORTB)[0];
+    it('ortb2 iab_content test', function () {
+      expect(request7.method).to.equal('GET');
+      expect(request7.url).to.equal('http://localhost');
+      let data = request7.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid').replace(/pbver=.*?&/g, 'pbver=test&');
+      expect(data).to.equal('_f=auto&alternative=prebid_js&inventory_item_id=107&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e4&pbver=test&pfilter%5Btest%5D=1&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&pfilter%5Biab_content%5D=cat%3AIAB1-1%7CIAB1-2%7CIAB2-10%2Cepisode%3A1%2Ccontext%3A1%2Cid%3AcontentID%2Ctitle%3AcontentTitle%2Cseries%3AcontentSeries%2Cseason%3AcontentSeason%25203%2Cartist%3AcontentArtist%2Cgenre%3Arock%2Cisrc%3AcontentIsrc%2Curl%3Ahttps%253A%252F%252Fcontent-url.com%252F%2Ckeywords%3Akw1%252Ckw2%252Ckeqword%25203&prebidDevMode=1&auctionId=1d1a030790a478&pbcode=testDiv3&media_types%5Bvideo%5D=640x480&media_types%5Bbanner%5D=300x250&vctx=instream&vpl%5Bmimes%5D%5B0%5D=video%2Fmp4&vpl%5Bprotocols%5D%5B0%5D=1&vpl%5Bprotocols%5D%5B1%5D=2&vpl%5Bplaybackmethod%5D%5B0%5D=2&vpl%5Bskip%5D=1');
+    });
+
     // bidfloor tests
     const getFloorResponse = {currency: 'EUR', floor: 5};
     let testBidRequest = deepClone(bidRequests[1]);
@@ -321,6 +399,109 @@ describe('dspxAdapter', function () {
     });
   });
 
+  describe('google topics handling', () => {
+    afterEach(() => {
+      config.resetConfig();
+    });
+
+    const REQPARAMS = {
+      refererInfo: {
+        referer: 'some_referrer.net'
+      },
+      gdprConsent: {
+        consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+        vendorData: {someData: 'value'},
+        gdprApplies: true
+      }
+    };
+
+    const defaultRequest = {
+      'bidder': 'dspx',
+      'params': {
+        'placement': '6682',
+        'pfilter': {
+          'floorprice': 1000000,
+          'private_auction': 0,
+          'geo': {
+            'country': 'DE'
+          }
+        },
+        'bcat': 'IAB2,IAB4',
+        'dvt': 'desktop'
+      },
+      'sizes': [
+        [300, 250]
+      ],
+      'bidId': '30b31c1838de1e1',
+      'bidderRequestId': '22edbae2733bf61',
+      'auctionId': '1d1a030790a475',
+      'adUnitCode': 'testDiv1',
+    };
+
+    it('does pass segtax, segclass, segments for google topics data', () => {
+      const GOOGLE_TOPICS_DATA = {
+        ortb2: {
+          user: {
+            data: [
+              {
+                ext: {
+                  segtax: 600,
+                  segclass: 'v1',
+                },
+                segment: [
+                  {id: '717'}, {id: '808'},
+                ]
+              }
+            ]
+          },
+        },
+      }
+      config.setConfig(GOOGLE_TOPICS_DATA);
+      const request = spec.buildRequests([defaultRequest], { ...REQPARAMS, ...GOOGLE_TOPICS_DATA })[0];
+      expect(request.data).to.contain('segtx=600&segcl=v1&segs=717%2C808');
+    });
+
+    it('does not pass topics params for invalid topics data', () => {
+      const INVALID_TOPICS_DATA = {
+        ortb2: {
+          user: {
+            data: [
+              {
+                segment: []
+              },
+              {
+                segment: [{id: ''}]
+              },
+              {
+                segment: [{id: null}]
+              },
+              {
+                segment: [{id: 'dummy'}, {id: '123'}]
+              },
+              {
+                ext: {
+                  segtax: 600,
+                  segclass: 'v1',
+                },
+                segment: [
+                  {
+                    name: 'dummy'
+                  }
+                ]
+              },
+            ]
+          }
+        }
+      };
+
+      config.setConfig(INVALID_TOPICS_DATA);
+      let request = spec.buildRequests([defaultRequest], { ...REQPARAMS, ...INVALID_TOPICS_DATA })[0];
+      expect(request.data).to.not.contain('segtax');
+      expect(request.data).to.not.contain('segclass');
+      expect(request.data).to.not.contain('segments');
+    });
+  });
+
   describe('interpretResponse', function () {
     let serverResponse = {
       'body': {
@@ -427,7 +608,7 @@ describe('dspxAdapter', function () {
         }
       }];
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(Object.keys(result[0])).to.include.members(Object.keys(expectedResponse[0]));
       expect(result[0].meta.advertiserDomains.length).to.equal(1);
       expect(result[0].meta.advertiserDomains[0]).to.equal(expectedResponse[0].meta.advertiserDomains[0]);
     });
@@ -447,7 +628,7 @@ describe('dspxAdapter', function () {
         }
       }];
       let result = spec.interpretResponse(serverVideoResponse, bidRequest[0]);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[1]));
+      expect(Object.keys(result[0])).to.include.members(Object.keys(expectedResponse[1]));
       expect(result[0].meta.advertiserDomains.length).to.equal(0);
     });
 
@@ -466,7 +647,7 @@ describe('dspxAdapter', function () {
         }
       }];
       let result = spec.interpretResponse(serverVideoResponseVastUrl, bidRequest[0]);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[2]));
+      expect(Object.keys(result[0])).to.include.members(Object.keys(expectedResponse[2]));
       expect(result[0].meta.advertiserDomains.length).to.equal(0);
     });
 
diff --git a/test/spec/modules/dxkultureBidAdapter_spec.js b/test/spec/modules/dxkultureBidAdapter_spec.js
index bf76ddd0c8a..a752c81cb6e 100644
--- a/test/spec/modules/dxkultureBidAdapter_spec.js
+++ b/test/spec/modules/dxkultureBidAdapter_spec.js
@@ -1,137 +1,198 @@
 import {expect} from 'chai';
-import {spec} from 'modules/dxkultureBidAdapter.js';
-
-const BANNER_REQUEST = {
-  'bidderCode': 'dxkulture',
-  'auctionId': 'auctionId-56a2-4f71-9098-720a68f2f708',
-  'bidderRequestId': 'requestId',
-  'bidRequest': [{
-    'bidder': 'dxkulture',
-    'params': {
-      'placementId': 123456,
-    },
-    'placementCode': 'div-gpt-dummy-placement-code',
-    'mediaTypes': {'banner': {'sizes': [[300, 250]]}},
-    'bidId': 'bidId1',
-    'bidderRequestId': 'bidderRequestId',
-    'auctionId': 'auctionId-56a2-4f71-9098-720a68f2f708'
-  },
-  {
-    'bidder': 'dxkulture',
-    'params': {
-      'placementId': 123456,
-    },
-    'placementCode': 'div-gpt-dummy-placement-code',
-    'mediaTypes': {'banner': {'sizes': [[300, 250]]}},
-    'bidId': 'bidId2',
-    'bidderRequestId': 'bidderRequestId',
-    'auctionId': 'auctionId-56a2-4f71-9098-720a68f2f708'
-  }],
-  'start': 1487883186070,
-  'auctionStart': 1487883186069,
-  'timeout': 3000
+import {spec, SYNC_URL} from 'modules/dxkultureBidAdapter.js';
+import {BANNER, VIDEO} from 'src/mediaTypes.js';
+
+const getBannerRequest = () => {
+  return {
+    bidderCode: 'dxkulture',
+    auctionId: 'ba87bfdf-493e-4a88-8e26-17b4cbc9adbd',
+    bidderRequestId: 'bidderRequestId',
+    bids: [
+      {
+        bidder: 'dxkulture',
+        params: {
+          placementId: 123456,
+          publisherId: 'publisherId',
+          bidfloor: 10,
+        },
+        auctionId: 'auctionId-56a2-4f71-9098-720a68f2f708',
+        placementCode: 'div-gpt-dummy-placement-code',
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [ 300, 250 ],
+            ]
+          }
+        },
+        bidId: '2e9f38ea93bb9e',
+        bidderRequestId: 'bidderRequestId',
+      }
+    ],
+    start: 1487883186070,
+    auctionStart: 1487883186069,
+    timeout: 3000
+  }
 };
 
-const RESPONSE = {
-  'headers': null,
-  'body': {
-    'id': 'responseId',
-    'seatbid': [
-      {
-        'bid': [
-          {
-            'id': 'bidId1',
-            'impid': 'bidId1',
-            'price': 0.18,
-            'adm': '',
-            'adid': '144762342',
-            'adomain': [
-              'https://dummydomain.com'
-            ],
-            'iurl': 'iurl',
-            'cid': '109',
-            'crid': 'creativeId',
-            'cat': [],
-            'w': 300,
-            'h': 250,
-            'ext': {
-              'prebid': {
-                'type': 'banner'
-              },
-              'bidder': {
-                'appnexus': {
-                  'brand_id': 334553,
-                  'auction_id': 514667951122925701,
-                  'bidder_id': 2,
-                  'bid_ad_type': 0
+const getVideoRequest = () => {
+  return {
+    bidderCode: 'dxkulture',
+    auctionId: 'e158486f-8c7f-472f-94ce-b0cbfbb50ab4',
+    bidderRequestId: '34feaad34lkj2',
+    bids: [{
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[640, 480]],
+        }
+      },
+      bidder: 'dxkulture',
+      sizes: [640, 480],
+      bidId: '30b3efwfwe1e',
+      adUnitCode: 'video1',
+      params: {
+        video: {
+          playerWidth: 640,
+          playerHeight: 480,
+          mimes: ['video/mp4', 'application/javascript'],
+          protocols: [2, 5],
+          api: [2],
+          position: 1,
+          delivery: [2],
+          sid: 134,
+          rewarded: 1,
+          placement: 1,
+          plcmt: 1,
+          hp: 1,
+          inventoryid: 123
+        },
+        site: {
+          id: 1,
+          page: 'https://test.com',
+          referrer: 'http://test.com'
+        },
+        publisherId: 'km123',
+        bidfloor: 10,
+      }
+    }, {
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[640, 480]],
+        }
+      },
+      bidder: 'dxkulture',
+      sizes: [640, 480],
+      bidId: '30b3efwfwe2e',
+      adUnitCode: 'video1',
+      params: {
+        video: {
+          playerWidth: 640,
+          playerHeight: 480,
+          mimes: ['video/mp4', 'application/javascript'],
+          protocols: [2, 5],
+          api: [2],
+          position: 1,
+          delivery: [2],
+          sid: 134,
+          rewarded: 1,
+          placement: 1,
+          plcmt: 1,
+          hp: 1,
+          inventoryid: 123
+        },
+        site: {
+          id: 1,
+          page: 'https://test.com',
+          referrer: 'http://test.com'
+        },
+        publisherId: 'km123',
+        bidfloor: 10,
+      }
+    }],
+    auctionStart: 1520001292880,
+    timeout: 5000,
+    start: 1520001292884,
+    doneCbCallCount: 0,
+    refererInfo: {
+      numIframes: 1,
+      reachedTop: true,
+      referer: 'test.com'
+    }
+  };
+};
+
+const getBidderResponse = () => {
+  return {
+    headers: null,
+    body: {
+      id: 'bid-response',
+      seatbid: [
+        {
+          bid: [
+            {
+              id: '2e9f38ea93bb9e',
+              impid: '2e9f38ea93bb9e',
+              price: 0.18,
+              adm: '',
+              adid: '144762342',
+              adomain: [
+                'https://dummydomain.com'
+              ],
+              iurl: 'iurl',
+              cid: '109',
+              crid: 'creativeId',
+              cat: [],
+              w: 300,
+              h: 250,
+              ext: {
+                prebid: {
+                  type: 'banner'
+                },
+                bidder: {
+                  appnexus: {
+                    brand_id: 334553,
+                    auction_id: 514667951122925701,
+                    bidder_id: 2,
+                    bid_ad_type: 0
+                  }
                 }
               }
             }
+          ],
+          seat: 'dxkulture'
+        }
+      ],
+      ext: {
+        usersync: {
+          sovrn: {
+            status: 'none',
+            syncs: [
+              {
+                url: 'urlsovrn',
+                type: 'iframe'
+              }
+            ]
           },
-          {
-            'id': 'bidId2',
-            'impid': 'bidId2',
-            'price': 0.1,
-            'adm': '',
-            'adid': '144762342',
-            'adomain': [
-              'https://dummydomain.com'
-            ],
-            'iurl': 'iurl',
-            'cid': '109',
-            'crid': 'creativeId',
-            'cat': [],
-            'w': 300,
-            'h': 250,
-            'ext': {
-              'prebid': {
-                'type': 'banner'
-              },
-              'bidder': {
-                'appnexus': {
-                  'brand_id': 386046,
-                  'auction_id': 517067951122925501,
-                  'bidder_id': 2,
-                  'bid_ad_type': 0
-                }
+          appnexus: {
+            status: 'none',
+            syncs: [
+              {
+                url: 'urlappnexus',
+                type: 'pixel'
               }
-            }
+            ]
           }
-        ],
-        'seat': 'dxkulture'
-      }
-    ],
-    'ext': {
-      'usersync': {
-        'sovrn': {
-          'status': 'none',
-          'syncs': [
-            {
-              'url': 'urlsovrn',
-              'type': 'iframe'
-            }
-          ]
         },
-        'appnexus': {
-          'status': 'none',
-          'syncs': [
-            {
-              'url': 'urlappnexus',
-              'type': 'pixel'
-            }
-          ]
+        responsetimemillis: {
+          appnexus: 127
         }
-      },
-      'responsetimemillis': {
-        'appnexus': 127
       }
     }
-  }
-};
-
-const DEFAULT_NETWORK_ID = 1;
+  };
+}
 
-describe('dxkultureBidAdapter:', function () {
+describe('dxkultureBidAdapter', function() {
   let videoBidRequest;
 
   const VIDEO_REQUEST = {
@@ -174,6 +235,7 @@ describe('dxkultureBidAdapter:', function () {
           sid: 134,
           rewarded: 1,
           placement: 1,
+          plcmt: 1,
           hp: 1,
           inventoryid: 123
         },
@@ -182,51 +244,86 @@ describe('dxkultureBidAdapter:', function () {
           page: 'https://test.com',
           referrer: 'http://test.com'
         },
-        publisherId: 'km123'
+        publisherId: 'km123',
+        bidfloor: 0
       }
     };
   });
 
-  describe('isBidRequestValid', function () {
-    context('basic validation', function () {
-      beforeEach(function () {
-        // Basic Valid BidRequest
-        this.bid = {
-          bidder: 'dxkulture',
-          mediaTypes: {
-            banner: {
-              sizes: [[250, 300]]
-            }
-          },
-          params: {
-            placementId: 'placementId',
-            publisherId: 'publisherId',
-          }
-        };
-      });
+  describe('isValidRequest', function() {
+    let bidderRequest;
 
-      it('should accept request if placementId and publisherId are passed', function () {
-        expect(spec.isBidRequestValid(this.bid)).to.be.true;
-      });
+    beforeEach(function() {
+      bidderRequest = getBannerRequest();
+    });
 
-      it('reject requests without params', function () {
-        this.bid.params = {};
-        expect(spec.isBidRequestValid(this.bid)).to.be.false;
-      });
+    it('should accept request if placementId and publisherId are passed', function () {
+      expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.be.true;
+    });
 
-      it('returns false when banner mediaType does not exist', function () {
-        this.bid.mediaTypes = {}
-        expect(spec.isBidRequestValid(this.bid)).to.be.false;
-      });
+    it('reject requests without params', function () {
+      bidderRequest.bids[0].params = {};
+      expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.be.false;
     });
 
-    context('banner validation', function () {
-      it('returns true when banner sizes are defined', function () {
+    it('returns false when banner mediaType does not exist', function () {
+      bidderRequest.bids[0].mediaTypes = {}
+      expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function() {
+    let bidderRequest;
+
+    beforeEach(function() {
+      bidderRequest = getBannerRequest();
+    });
+
+    it('should return expected request object', function() {
+      const bidRequest = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      expect(bidRequest.url).equal('https://ads.dxkulture.com/pbjs?pid=publisherId&placementId=123456');
+      expect(bidRequest.method).equal('POST');
+    });
+  });
+
+  context('banner validation', function () {
+    let bidderRequest;
+
+    beforeEach(function() {
+      bidderRequest = getBannerRequest();
+    });
+
+    it('returns true when banner sizes are defined', function () {
+      const bid = {
+        bidder: 'dxkulture',
+        mediaTypes: {
+          banner: {
+            sizes: [[250, 300]]
+          }
+        },
+        params: {
+          placementId: 'placementId',
+          publisherId: 'publisherId',
+        }
+      };
+
+      expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.be.true;
+    });
+
+    it('returns false when banner sizes are invalid', function () {
+      const invalidSizes = [
+        undefined,
+        '2:1',
+        123,
+        'test'
+      ];
+
+      invalidSizes.forEach((sizes) => {
         const bid = {
           bidder: 'dxkulture',
           mediaTypes: {
             banner: {
-              sizes: [[250, 300]]
+              sizes
             }
           },
           params: {
@@ -235,348 +332,288 @@ describe('dxkultureBidAdapter:', function () {
           }
         };
 
-        expect(spec.isBidRequestValid(bid)).to.be.true;
+        expect(spec.isBidRequestValid(bid)).to.be.false;
       });
+    });
+  });
 
-      it('returns false when banner sizes are invalid', function () {
-        const invalidSizes = [
-          undefined,
-          '2:1',
-          123,
-          'test'
-        ];
-
-        invalidSizes.forEach((sizes) => {
-          const bid = {
-            bidder: 'dxkulture',
-            mediaTypes: {
-              banner: {
-                sizes
-              }
-            },
-            params: {
-              placementId: 'placementId',
-              publisherId: 'publisherId',
-            }
-          };
+  context('video validation', function () {
+    beforeEach(function () {
+      // Basic Valid BidRequest
+      this.bid = {
+        bidder: 'dxkulture',
+        mediaTypes: {
+          video: {
+            playerSize: [[300, 50]],
+            context: 'instream',
+            mimes: ['foo', 'bar'],
+            protocols: [1, 2]
+          }
+        },
+        params: {
+          placementId: 'placementId',
+          publisherId: 'publisherId',
+        }
+      };
+    });
 
-          expect(spec.isBidRequestValid(bid)).to.be.false;
-        });
-      });
+    it('should return true (skip validations) when e2etest = true', function () {
+      this.bid.params = {
+        e2etest: true
+      };
+      expect(spec.isBidRequestValid(this.bid)).to.equal(true);
     });
 
-    context('video validation', function () {
-      beforeEach(function () {
-        // Basic Valid BidRequest
-        this.bid = {
-          bidder: 'dxkulture',
-          mediaTypes: {
-            video: {
-              playerSize: [[300, 50]],
-              context: 'instream',
-              mimes: ['foo', 'bar'],
-              protocols: [1, 2]
-            }
-          },
-          params: {
-            placementId: 'placementId',
-            publisherId: 'publisherId',
-          }
-        };
-      });
+    it('returns false when video context is not defined', function () {
+      delete this.bid.mediaTypes.video.context;
 
-      it('should return true (skip validations) when e2etest = true', function () {
-        this.bid.params = {
-          e2etest: true
-        };
-        expect(spec.isBidRequestValid(this.bid)).to.equal(true);
-      });
+      expect(spec.isBidRequestValid(this.bid)).to.be.false;
+    });
 
-      it('returns false when video context is not defined', function () {
-        delete this.bid.mediaTypes.video.context;
+    it('returns false when video playserSize is invalid', function () {
+      const invalidSizes = [
+        undefined,
+        '2:1',
+        123,
+        'test'
+      ];
 
+      invalidSizes.forEach((playerSize) => {
+        this.bid.mediaTypes.video.playerSize = playerSize;
         expect(spec.isBidRequestValid(this.bid)).to.be.false;
       });
+    });
 
-      it('returns false when video playserSize is invalid', function () {
-        const invalidSizes = [
-          undefined,
-          '2:1',
-          123,
-          'test'
-        ];
-
-        invalidSizes.forEach((playerSize) => {
-          this.bid.mediaTypes.video.playerSize = playerSize;
-          expect(spec.isBidRequestValid(this.bid)).to.be.false;
-        });
-      });
+    it('returns false when video mimes is invalid', function () {
+      const invalidMimes = [
+        undefined,
+        'test',
+        1,
+        []
+      ]
 
-      it('returns false when video mimes is invalid', function () {
-        const invalidMimes = [
-          undefined,
-          'test',
-          1,
-          []
-        ]
-
-        invalidMimes.forEach((mimes) => {
-          this.bid.mediaTypes.video.mimes = mimes;
-          expect(spec.isBidRequestValid(this.bid)).to.be.false;
-        })
-      });
+      invalidMimes.forEach((mimes) => {
+        this.bid.mediaTypes.video.mimes = mimes;
+        expect(spec.isBidRequestValid(this.bid)).to.be.false;
+      })
+    });
 
-      it('returns false when video protocols is invalid', function () {
-        const invalidMimes = [
-          undefined,
-          'test',
-          1,
-          []
-        ]
-
-        invalidMimes.forEach((protocols) => {
-          this.bid.mediaTypes.video.protocols = protocols;
-          expect(spec.isBidRequestValid(this.bid)).to.be.false;
-        })
-      });
+    it('returns false when video protocols is invalid', function () {
+      const invalidMimes = [
+        undefined,
+        'test',
+        1,
+        []
+      ]
+
+      invalidMimes.forEach((protocols) => {
+        this.bid.mediaTypes.video.protocols = protocols;
+        expect(spec.isBidRequestValid(this.bid)).to.be.false;
+      })
     });
   });
 
   describe('buildRequests', function () {
+    let bidderBannerRequest;
+    let bidRequestsWithMediaTypes;
+    let mockBidderRequest;
+
+    beforeEach(function() {
+      bidderBannerRequest = getBannerRequest();
+
+      mockBidderRequest = {refererInfo: {}};
+
+      bidRequestsWithMediaTypes = [{
+        bidder: 'dxkulture',
+        params: {
+          publisherId: 'km123',
+        },
+        adUnitCode: '/adunit-code/test-path',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        bidId: 'test-bid-id-1',
+        bidderRequestId: 'test-bid-request-1',
+        auctionId: 'test-auction-1',
+        transactionId: 'test-transactionId-1',
+        ortb2Imp: {
+          ext: {
+            ae: 2
+          }
+        }
+      }, {
+        bidder: 'dxkulture',
+        params: {
+          publisherId: 'km123',
+        },
+        adUnitCode: 'adunit-code',
+        mediaTypes: {
+          video: {
+            playerSize: [640, 480],
+            placement: 1,
+            plcmt: 1,
+          }
+        },
+        bidId: 'test-bid-id-2',
+        bidderRequestId: 'test-bid-request-2',
+        auctionId: 'test-auction-2',
+        transactionId: 'test-transactionId-2'
+      }];
+    });
+
     context('when mediaType is banner', function () {
       it('creates request data', function () {
-        let request = spec.buildRequests(BANNER_REQUEST.bidRequest, BANNER_REQUEST);
+        let request = spec.buildRequests(bidderBannerRequest.bids, bidderBannerRequest)
 
         expect(request).to.exist.and.to.be.a('object');
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0]).to.have.property('id', BANNER_REQUEST.bidRequest[0].bidId);
-        expect(payload.imp[1]).to.have.property('id', BANNER_REQUEST.bidRequest[1].bidId);
+        const payload = request.data;
+        expect(payload.imp[0]).to.have.property('id', bidderBannerRequest.bids[0].bidId);
       });
 
       it('has gdpr data if applicable', function () {
-        const req = Object.assign({}, BANNER_REQUEST, {
+        const req = Object.assign({}, getBannerRequest(), {
           gdprConsent: {
             consentString: 'consentString',
             gdprApplies: true,
           }
         });
-        let request = spec.buildRequests(BANNER_REQUEST.bidRequest, req);
+        let request = spec.buildRequests(bidderBannerRequest.bids, req);
 
-        const payload = JSON.parse(request.data);
+        const payload = request.data;
         expect(payload.user.ext).to.have.property('consent', req.gdprConsent.consentString);
         expect(payload.regs.ext).to.have.property('gdpr', 1);
       });
+    });
 
-      it('should properly forward eids parameters', function () {
-        const req = Object.assign({}, BANNER_REQUEST);
-        req.bidRequest[0].userIdAsEids = [
-          {
-            source: 'dummy.com',
-            uids: [
-              {
-                id: 'd6d0a86c-20c6-4410-a47b-5cba383a698a',
-                atype: 1
-              }
-            ]
-          }];
-        let request = spec.buildRequests(req.bidRequest, req);
+    if (FEATURES.VIDEO) {
+      context('video', function () {
+        it('should create a POST request for every bid', function () {
+          const requests = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          expect(requests.method).to.equal('POST');
+          expect(requests.url.trim()).to.equal(spec.ENDPOINT + '?pid=' + videoBidRequest.params.publisherId);
+        });
 
-        const payload = JSON.parse(request.data);
-        expect(payload.user.ext.eids[0].source).to.equal('dummy.com');
-        expect(payload.user.ext.eids[0].uids[0].id).to.equal('d6d0a86c-20c6-4410-a47b-5cba383a698a');
-        expect(payload.user.ext.eids[0].uids[0].atype).to.equal(1);
-      });
-    });
+        it('should attach request data', function () {
+          const requests = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          const data = requests.data;
+          const [width, height] = videoBidRequest.sizes;
+          const VERSION = '1.0.0';
+
+          expect(data.imp[1].video.w).to.equal(width);
+          expect(data.imp[1].video.h).to.equal(height);
+          expect(data.imp[1].bidfloor).to.equal(videoBidRequest.params.bidfloor);
+          expect(data.imp[1]['video']['placement']).to.equal(videoBidRequest.params.video['placement']);
+          expect(data.imp[1]['video']['plcmt']).to.equal(videoBidRequest.params.video['plcmt']);
+          expect(data.ext.prebidver).to.equal('$prebid.version$');
+          expect(data.ext.adapterver).to.equal(spec.VERSION);
+        });
 
-    context('when mediaType is video', function () {
-      it('should create a POST request for every bid', function () {
-        const requests = spec.buildRequests([videoBidRequest], VIDEO_REQUEST);
-        expect(requests.method).to.equal('POST');
-        expect(requests.url.trim()).to.equal(spec.ENDPOINT + '?pid=' + videoBidRequest.params.publisherId + '&nId=' + DEFAULT_NETWORK_ID);
-      });
+        it('should set pubId to e2etest when bid.params.e2etest = true', function () {
+          bidRequestsWithMediaTypes[0].params.e2etest = true;
+          const requests = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          expect(requests.method).to.equal('POST');
+          expect(requests.url).to.equal(spec.ENDPOINT + '?pid=e2etest');
+        });
 
-      it('should attach request data', function () {
-        const requests = spec.buildRequests([videoBidRequest], VIDEO_REQUEST);
-        const data = JSON.parse(requests.data);
-        const [width, height] = videoBidRequest.sizes;
-        const VERSION = '1.0.0';
-        expect(data.imp[0].video.w).to.equal(width);
-        expect(data.imp[0].video.h).to.equal(height);
-        expect(data.imp[0].bidfloor).to.equal(videoBidRequest.params.bidfloor);
-        expect(data.ext.prebidver).to.equal('$prebid.version$');
-        expect(data.ext.adapterver).to.equal(spec.VERSION);
+        it('should attach End 2 End test data', function () {
+          bidRequestsWithMediaTypes[1].params.e2etest = true;
+          const requests = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          const data = requests.data;
+          expect(data.imp[1].bidfloor).to.equal(0);
+          expect(data.imp[1].video.w).to.equal(640);
+          expect(data.imp[1].video.h).to.equal(480);
+        });
       });
+    }
+  });
 
-      it('should set pubId to e2etest when bid.params.e2etest = true', function () {
-        videoBidRequest.params.e2etest = true;
-        const requests = spec.buildRequests([videoBidRequest], VIDEO_REQUEST);
-        expect(requests.method).to.equal('POST');
-        expect(requests.url).to.equal(spec.ENDPOINT + '?pid=e2etest&nId=' + DEFAULT_NETWORK_ID);
+  describe('interpretResponse', function() {
+    context('when mediaType is banner', function() {
+      let bidRequest, bidderResponse;
+      beforeEach(function() {
+        const bidderRequest = getBannerRequest();
+        bidRequest = spec.buildRequests(bidderRequest.bids, bidderRequest);
+        bidderResponse = getBidderResponse();
       });
 
-      it('should attach End 2 End test data', function () {
-        videoBidRequest.params.e2etest = true;
-        const requests = spec.buildRequests([videoBidRequest], VIDEO_REQUEST);
-        const data = JSON.parse(requests.data);
-        expect(data.imp[0].bidfloor).to.not.exist;
-        expect(data.imp[0].video.w).to.equal(640);
-        expect(data.imp[0].video.h).to.equal(480);
+      it('handles empty response', function () {
+        const EMPTY_RESP = Object.assign({}, bidderResponse, {'body': {}});
+        const bids = spec.interpretResponse(EMPTY_RESP, bidRequest);
+
+        expect(bids).to.be.empty;
       });
-    });
-  });
 
-  describe('interpretResponse', function () {
-    context('when mediaType is banner', function () {
       it('have bids', function () {
-        let bids = spec.interpretResponse(RESPONSE, BANNER_REQUEST);
+        let bids = spec.interpretResponse(bidderResponse, bidRequest);
         expect(bids).to.be.an('array').that.is.not.empty;
         validateBidOnIndex(0);
-        validateBidOnIndex(1);
 
         function validateBidOnIndex(index) {
           expect(bids[index]).to.have.property('currency', 'USD');
-          expect(bids[index]).to.have.property('requestId', RESPONSE.body.seatbid[0].bid[index].impid);
-          expect(bids[index]).to.have.property('cpm', RESPONSE.body.seatbid[0].bid[index].price);
-          expect(bids[index]).to.have.property('width', RESPONSE.body.seatbid[0].bid[index].w);
-          expect(bids[index]).to.have.property('height', RESPONSE.body.seatbid[0].bid[index].h);
-          expect(bids[index]).to.have.property('ad', RESPONSE.body.seatbid[0].bid[index].adm);
-          expect(bids[index]).to.have.property('creativeId', RESPONSE.body.seatbid[0].bid[index].crid);
-          expect(bids[index].meta).to.have.property('advertiserDomains', RESPONSE.body.seatbid[0].bid[index].adomain);
+          expect(bids[index]).to.have.property('requestId', getBidderResponse().body.seatbid[0].bid[index].impid);
+          expect(bids[index]).to.have.property('cpm', getBidderResponse().body.seatbid[0].bid[index].price);
+          expect(bids[index]).to.have.property('width', getBidderResponse().body.seatbid[0].bid[index].w);
+          expect(bids[index]).to.have.property('height', getBidderResponse().body.seatbid[0].bid[index].h);
+          expect(bids[index]).to.have.property('ad', getBidderResponse().body.seatbid[0].bid[index].adm);
+          expect(bids[index]).to.have.property('creativeId', getBidderResponse().body.seatbid[0].bid[index].crid);
+          expect(bids[index].meta).to.have.property('advertiserDomains');
           expect(bids[index]).to.have.property('ttl', 300);
           expect(bids[index]).to.have.property('netRevenue', true);
         }
       });
+    });
+
+    context('when mediaType is video', function () {
+      let bidRequest, bidderResponse;
+      beforeEach(function() {
+        const bidderRequest = getVideoRequest();
+        bidRequest = spec.buildRequests(bidderRequest.bids, bidderRequest);
+        bidderResponse = getBidderResponse();
+      });
 
       it('handles empty response', function () {
-        const EMPTY_RESP = Object.assign({}, RESPONSE, {'body': {}});
-        const bids = spec.interpretResponse(EMPTY_RESP, BANNER_REQUEST);
+        const EMPTY_RESP = Object.assign({}, bidderResponse, {'body': {}});
+        const bids = spec.interpretResponse(EMPTY_RESP, bidRequest);
 
         expect(bids).to.be.empty;
       });
-    });
-
-    context('when mediaType is video', function () {
-      it('should return no bids if the response is not valid', function () {
-        const bidResponse = spec.interpretResponse({
-          body: null
-        }, {
-          videoBidRequest
-        });
-        expect(bidResponse.length).to.equal(0);
-      });
 
       it('should return no bids if the response "nurl" and "adm" are missing', function () {
-        const serverResponse = {
+        const SERVER_RESP = Object.assign({}, bidderResponse, {'body': {
           seatbid: [{
             bid: [{
               price: 6.01
             }]
           }]
-        };
-        const bidResponse = spec.interpretResponse({
-          body: serverResponse
-        }, {
-          videoBidRequest
-        });
-        expect(bidResponse.length).to.equal(0);
+        }});
+        const bids = spec.interpretResponse(SERVER_RESP, bidRequest);
+        expect(bids.length).to.equal(0);
       });
 
       it('should return no bids if the response "price" is missing', function () {
-        const serverResponse = {
+        const SERVER_RESP = Object.assign({}, bidderResponse, {'body': {
           seatbid: [{
             bid: [{
               adm: ''
             }]
           }]
-        };
-        const bidResponse = spec.interpretResponse({
-          body: serverResponse
-        }, {
-          videoBidRequest
-        });
-        expect(bidResponse.length).to.equal(0);
-      });
-
-      it('should return a valid video bid response with just "adm"', function () {
-        const serverResponse = {
-          id: '123',
-          seatbid: [{
-            bid: [{
-              id: 1,
-              adid: 123,
-              impid: 456,
-              crid: 2,
-              price: 6.01,
-              adm: '',
-              adomain: [
-                'dxkulture.com'
-              ],
-              w: 640,
-              h: 480,
-              ext: {
-                prebid: {
-                  type: 'video'
-                },
-              }
-            }]
-          }],
-          cur: 'USD'
-        };
-        const bidResponse = spec.interpretResponse({
-          body: serverResponse
-        }, {
-          videoBidRequest
-        });
-        let o = {
-          requestId: serverResponse.seatbid[0].bid[0].impid,
-          ad: '',
-          bidderCode: spec.code,
-          cpm: serverResponse.seatbid[0].bid[0].price,
-          creativeId: serverResponse.seatbid[0].bid[0].crid,
-          vastXml: serverResponse.seatbid[0].bid[0].adm,
-          width: 640,
-          height: 480,
-          mediaType: 'video',
-          currency: 'USD',
-          ttl: 300,
-          netRevenue: true,
-          meta: {
-            advertiserDomains: ['dxkulture.com']
-          }
-        };
-        expect(bidResponse[0]).to.deep.equal(o);
-      });
-
-      it('should default ttl to 300', function () {
-        const serverResponse = {
-          seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: ''}]}],
-          cur: 'USD'
-        };
-        const bidResponse = spec.interpretResponse({body: serverResponse}, {videoBidRequest});
-        expect(bidResponse[0].ttl).to.equal(300);
-      });
-      it('should not allow ttl above 3601, default to 300', function () {
-        videoBidRequest.params.video.ttl = 3601;
-        const serverResponse = {
-          seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: ''}]}],
-          cur: 'USD'
-        };
-        const bidResponse = spec.interpretResponse({body: serverResponse}, {videoBidRequest});
-        expect(bidResponse[0].ttl).to.equal(300);
-      });
-      it('should not allow ttl below 1, default to 300', function () {
-        videoBidRequest.params.video.ttl = 0;
-        const serverResponse = {
-          seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: ''}]}],
-          cur: 'USD'
-        };
-        const bidResponse = spec.interpretResponse({body: serverResponse}, {videoBidRequest});
-        expect(bidResponse[0].ttl).to.equal(300);
+        }});
+        const bids = spec.interpretResponse(SERVER_RESP, bidRequest);
+        expect(bids.length).to.equal(0);
       });
     });
   });
 
   describe('getUserSyncs', function () {
+    let bidRequest, bidderResponse;
+    beforeEach(function() {
+      const bidderRequest = getVideoRequest();
+      bidRequest = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      bidderResponse = getBidderResponse();
+    });
+
     it('handles no parameters', function () {
       let opts = spec.getUserSyncs({});
       expect(opts).to.be.an('array').that.is.empty;
@@ -588,26 +625,25 @@ describe('dxkultureBidAdapter:', function () {
     });
 
     it('iframe sync enabled should return results', function () {
-      let opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [RESPONSE]);
+      let opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [bidderResponse]);
 
       expect(opts.length).to.equal(1);
       expect(opts[0].type).to.equal('iframe');
-      expect(opts[0].url).to.equal(RESPONSE.body.ext.usersync['sovrn'].syncs[0].url);
+      expect(opts[0].url).to.equal(bidderResponse.body.ext.usersync['sovrn'].syncs[0].url);
     });
 
     it('pixel sync enabled should return results', function () {
-      let opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [RESPONSE]);
+      let opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [bidderResponse]);
 
       expect(opts.length).to.equal(1);
       expect(opts[0].type).to.equal('image');
-      expect(opts[0].url).to.equal(RESPONSE.body.ext.usersync['appnexus'].syncs[0].url);
+      expect(opts[0].url).to.equal(bidderResponse.body.ext.usersync['appnexus'].syncs[0].url);
     });
 
-    it('all sync enabled should return all results', function () {
-      let opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, [RESPONSE]);
+    it('all sync enabled should prioritize iframe', function () {
+      let opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, [bidderResponse]);
 
-      expect(opts.length).to.equal(2);
+      expect(opts.length).to.equal(1);
     });
   });
-})
-;
+});
diff --git a/test/spec/modules/dynamicAdBoostRtdProvider_spec.js b/test/spec/modules/dynamicAdBoostRtdProvider_spec.js
new file mode 100644
index 00000000000..66c24435589
--- /dev/null
+++ b/test/spec/modules/dynamicAdBoostRtdProvider_spec.js
@@ -0,0 +1,77 @@
+import { subModuleObj as rtdProvider } from 'modules/dynamicAdBoostRtdProvider.js';
+import { loadExternalScript } from '../../../src/adloader.js';
+import { expect } from 'chai';
+
+const configWithParams = {
+  params: {
+    keyId: 'dynamic',
+    adUnits: ['gpt-123'],
+    threshold: 1
+  }
+};
+
+const configWithoutRequiredParams = {
+  params: {
+    keyId: ''
+  }
+};
+
+describe('dynamicAdBoost', function() {
+  let clock;
+  let sandbox;
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    clock = sandbox.useFakeTimers(Date.now());
+  });
+  afterEach(function () {
+    sandbox.restore();
+  });
+  describe('init', function() {
+    describe('initialize without expected params', function() {
+      it('fails initalize when keyId is not present', function() {
+        expect(rtdProvider.init(configWithoutRequiredParams)).to.be.false;
+      })
+    })
+
+    describe('initialize with expected params', function() {
+      it('successfully initialize with load script', function() {
+        expect(rtdProvider.init(configWithParams)).to.be.true;
+        clock.tick(1000);
+        expect(loadExternalScript.called).to.be.true;
+      })
+    });
+  });
+})
+
+describe('markViewed tests', function() {
+  let sandbox;
+  const mockObserver = {
+    unobserve: sinon.spy()
+  };
+  const makeElement = (id) => {
+    const el = document.createElement('div');
+    el.setAttribute('id', id);
+    return el;
+  }
+  const mockEntry = {
+    target: makeElement('target_id')
+  };
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+  })
+
+  afterEach(function() {
+    sandbox.restore()
+  })
+
+  it('markViewed returns a function', function() {
+    expect(rtdProvider.markViewed(mockEntry, mockObserver)).to.be.a('function')
+  });
+
+  it('markViewed unobserves', function() {
+    const func = rtdProvider.markViewed(mockEntry, mockObserver);
+    func();
+    expect(mockObserver.unobserve.calledOnce).to.be.true;
+  });
+})
diff --git a/test/spec/modules/e_volutionBidAdapter_spec.js b/test/spec/modules/e_volutionBidAdapter_spec.js
index d488048060a..4777b73aa3c 100644
--- a/test/spec/modules/e_volutionBidAdapter_spec.js
+++ b/test/spec/modules/e_volutionBidAdapter_spec.js
@@ -1,117 +1,302 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/e_volutionBidAdapter.js';
+import { expect } from 'chai';
+import { spec } from '../../../modules/e_volutionBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'e_volution';
 
 describe('EvolutionTechBidAdapter', function () {
-  let bids = [{
-    bidId: '23fhj33i987f',
-    bidder: 'e_volution',
-    params: {
-      placementId: 0
-    },
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250]],
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
       }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
-    userId: {
-      id5id: 'id5id'
-    }
-  }, {
-    bidId: '23fhj33i987f',
-    bidder: 'e_volution',
-    params: {
-      placementId: 0
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
     mediaTypes: {
-      video: {
-        playerSize: [300, 250]
+      [BANNER]: {
+        sizes: [[300, 250]]
       }
     },
-    userId: {
-      id5id: 'id5id'
-    }
-  }, {
-    bidId: '23fhj33i987f',
-    bidder: 'e_volution',
     params: {
-      placementId: 0
-    },
-    mediaTypes: {
-      native: {}
-    },
-    userId: {
-      id5id: 'id5id'
+
     }
-  }];
+  }
 
   const bidderRequest = {
-    uspConsent: 'uspConsent',
-    gdprConsent: 'gdprConsent'
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
-    it('Should return true if there are bidId, params and placementId parameters present', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
       expect(spec.isBidRequestValid(bids[0])).to.be.true;
     });
     it('Should return false if at least one of parameters is not present', function () {
-      delete bids[0].params.placementId;
-      expect(spec.isBidRequestValid(bids[0])).to.be.false;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
     });
   });
 
   describe('buildRequests', function () {
     let serverRequest = spec.buildRequests(bids, bidderRequest);
+
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
       expect(serverRequest.url).to.exist;
       expect(serverRequest.data).to.exist;
     });
+
     it('Returns POST method', function () {
       expect(serverRequest.method).to.equal('POST');
     });
+
     it('Returns valid URL', function () {
       expect(serverRequest.url).to.equal('https://service.e-volution.ai/?c=o&m=multi');
     });
-    it('Returns valid data if array of bids is valid', function () {
+
+    it('Returns general data valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
       expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
-      expect(data.ccpa).to.be.equal('uspConsent');
-      expect(data.gdpr).to.be.equal('gdprConsent');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
 
-      let placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'bidfloor', 'eids');
-      expect(placement.placementId).to.equal(0);
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal('banner');
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
-      placement = data['placements'][1];
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'bidfloor', 'eids', 'wPlayer', 'hPlayer',
-        'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate',
-        'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity');
-      expect(placement.placementId).to.equal(0);
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal('video');
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
 
-      placement = data['placements'][2];
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'bidfloor', 'eids', 'native');
-      expect(placement.placementId).to.equal(0);
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal('native');
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
     });
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
     });
   });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
   describe('interpretResponse', function () {
     it('Should interpret banner response', function () {
       const banner = {
@@ -128,7 +313,8 @@ describe('EvolutionTechBidAdapter', function () {
           currency: 'USD',
           dealId: '1',
           meta: {
-            adomain: [ 'example.com' ]
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
           }
         }]
       };
@@ -137,15 +323,16 @@ describe('EvolutionTechBidAdapter', function () {
       let dataItem = bannerResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
         'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
-      expect(dataItem.requestId).to.equal('23fhj33i987f');
-      expect(dataItem.cpm).to.equal(0.4);
-      expect(dataItem.width).to.equal(300);
-      expect(dataItem.height).to.equal(250);
-      expect(dataItem.ad).to.equal('Test');
-      expect(dataItem.ttl).to.equal(120);
-      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
       expect(dataItem.netRevenue).to.be.true;
-      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret video response', function () {
       const video = {
@@ -160,7 +347,8 @@ describe('EvolutionTechBidAdapter', function () {
           currency: 'USD',
           dealId: '1',
           meta: {
-            adomain: [ 'example.com' ]
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
           }
         }]
       };
@@ -177,6 +365,7 @@ describe('EvolutionTechBidAdapter', function () {
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
       expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret native response', function () {
       const native = {
@@ -195,7 +384,8 @@ describe('EvolutionTechBidAdapter', function () {
           netRevenue: true,
           currency: 'USD',
           meta: {
-            adomain: [ 'example.com' ]
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
           }
         }]
       };
@@ -216,6 +406,7 @@ describe('EvolutionTechBidAdapter', function () {
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
       expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should return an empty array if invalid banner response is passed', function () {
       const invBanner = {
@@ -282,18 +473,4 @@ describe('EvolutionTechBidAdapter', function () {
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
-  describe('getUserSyncs', function () {
-    let userSync = spec.getUserSyncs();
-    it('Returns valid URL and type', function () {
-      if (spec.noSync) {
-        expect(userSync).to.be.equal(false);
-      } else {
-        expect(userSync).to.be.an('array').with.lengthOf(1);
-        expect(userSync[0].type).to.exist;
-        expect(userSync[0].url).to.exist;
-        expect(userSync[0].type).to.be.equal('image');
-        expect(userSync[0].url).to.be.equal('https://service.e-volution.ai/?c=o&m=sync');
-      }
-    });
-  });
 });
diff --git a/test/spec/modules/ebdrBidAdapter_spec.js b/test/spec/modules/ebdrBidAdapter_spec.js
deleted file mode 100644
index 1c46381500f..00000000000
--- a/test/spec/modules/ebdrBidAdapter_spec.js
+++ /dev/null
@@ -1,245 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/ebdrBidAdapter.js';
-import { VIDEO, BANNER } from 'src/mediaTypes.js';
-import * as utils from 'src/utils.js';
-
-describe('ebdrBidAdapter', function () {
-  let bidRequests;
-
-  beforeEach(function () {
-    bidRequests = [
-      {
-        code: 'div-gpt-ad-1460505748561-0',
-        mediaTypes: {
-          banner: {
-            sizes: [[300, 250], [300, 600]],
-          }
-        },
-        bidder: 'ebdr',
-        params: {
-          zoneid: '99999',
-          bidfloor: '1.00',
-          IDFA: 'xxx-xxx',
-          ADID: 'xxx-xxx',
-          latitude: '34.089811',
-          longitude: '-118.392805'
-        },
-        bidId: '2c5e8a1a84522d',
-        bidderRequestId: '1d0c4017f02458',
-        auctionId: '9adc85ed-43ee-4a78-816b-52b7e578f314'
-      }, {
-        adUnitCode: 'div-gpt-ad-1460505748561-1',
-        mediaTypes: {
-          video: {
-            context: 'instream',
-            playerSize: [300, 250]
-          }
-        },
-        bidder: 'ebdr',
-        params: {
-          zoneid: '99998',
-          bidfloor: '1.00',
-          IDFA: 'xxx-xxx',
-          ADID: 'xxx-xxx',
-          latitude: '34.089811',
-          longitude: '-118.392805'
-        },
-        bidId: '23a01e95856577',
-        bidderRequestId: '1d0c4017f02458',
-        auctionId: '9adc85ed-43ee-4a78-816b-52b7e578f314'
-      }
-    ];
-  });
-
-  describe('spec.isBidRequestValid', function () {
-    it('should return true when the required params are passed', function () {
-      const bidRequest = bidRequests[0];
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    });
-
-    it('should return true when the only required param is missing', function () {
-      const bidRequest = bidRequests[0];
-      bidRequest.params = {
-        zoneid: '99998',
-        bidfloor: '1.00',
-      };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    });
-
-    it('should return true when the "bidfloor" param is missing', function () {
-      const bidRequest = bidRequests[0];
-      bidRequest.params = {
-        zoneid: '99998',
-      };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    });
-
-    it('should return false when no bid params are passed', function () {
-      const bidRequest = bidRequests[0];
-      bidRequest.params = {};
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    });
-
-    it('should return false when a bid request is not passed', function () {
-      expect(spec.isBidRequestValid()).to.equal(false);
-      expect(spec.isBidRequestValid({})).to.equal(false);
-    });
-  });
-
-  describe('spec.buildRequests', function () {
-    describe('for banner bids', function () {
-      it('must handle an empty bid size', function () {
-        bidRequests[0].mediaTypes = { banner: {} };
-        const requests = spec.buildRequests(bidRequests);
-        const bidRequest = {};
-        bidRequest['2c5e8a1a84522d'] = { mediaTypes: BANNER, w: null, h: null };
-        expect(requests.bids['2c5e8a1a84522d']).to.deep.equals(bidRequest['2c5e8a1a84522d']);
-      });
-      it('should create a single GET', function () {
-        bidRequests[0].mediaTypes = { banner: {} };
-        bidRequests[1].mediaTypes = { banner: {} };
-        const requests = spec.buildRequests(bidRequests);
-        expect(requests.method).to.equal('GET');
-      });
-      it('must parse bid size from a nested array', function () {
-        const width = 640;
-        const height = 480;
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = { banner: {sizes: [[ width, height ]]} };
-        const requests = spec.buildRequests([ bidRequest ]);
-        const data = {};
-        data['2c5e8a1a84522d'] = { mediaTypes: BANNER, w: width, h: height };
-        expect(requests.bids['2c5e8a1a84522d']).to.deep.equal(data['2c5e8a1a84522d']);
-      });
-    });
-    describe('for video bids', function () {
-      it('must handle an empty bid size', function () {
-        bidRequests[1].mediaTypes = { video: {} };
-        const requests = spec.buildRequests(bidRequests);
-        const bidRequest = {};
-        bidRequest['23a01e95856577'] = { mediaTypes: VIDEO, w: null, h: null };
-        expect(requests.bids['23a01e95856577']).to.deep.equals(bidRequest['23a01e95856577']);
-      });
-
-      it('should create a GET request for each bid', function () {
-        const bidRequest = bidRequests[1];
-        const requests = spec.buildRequests([ bidRequest ]);
-        expect(requests.method).to.equal('GET');
-      });
-    });
-  });
-
-  describe('spec.interpretResponse', function () {
-    describe('for video bids', function () {
-      it('should return no bids if the response is not valid', function () {
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = { video: {} };
-        const bidResponse = spec.interpretResponse({ body: null }, { bidRequest });
-        expect(bidResponse.length).to.equal(0);
-      });
-
-      it('should return a valid video bid response', function () {
-        const ebdrReq = {bids: {}};
-        bidRequests.forEach(bid => {
-          let _mediaTypes = (bid.mediaTypes && bid.mediaTypes.video ? VIDEO : BANNER);
-          ebdrReq.bids[bid.bidId] = {mediaTypes: _mediaTypes,
-            w: _mediaTypes == BANNER ? bid.mediaTypes[_mediaTypes].sizes[0][0] : bid.mediaTypes[_mediaTypes].playerSize[0],
-            h: _mediaTypes == BANNER ? bid.mediaTypes[_mediaTypes].sizes[0][1] : bid.mediaTypes[_mediaTypes].playerSize[1]
-          };
-        });
-        const serverResponse = {id: '1d0c4017f02458', seatbid: [{bid: [{id: '23a01e95856577', impid: '23a01e95856577', price: 0.81, adid: 'abcde-12345', nurl: 'https://cdn0.bnmla.com/vtest.xml', adm: '\nStatic VASTStatic VAST Tag00:00:15https//www.engagebdr.com/c', adomain: ['advertiserdomain.com'], iurl: '', cid: 'campaign1', crid: 'abcde-12345', w: 300, h: 250}], seat: '19513bcfca8006'}], bidid: '19513bcfca8006', cur: 'USD'};
-        const bidResponse = spec.interpretResponse({ body: serverResponse }, ebdrReq);
-        expect(bidResponse[0]).to.deep.equal({
-          requestId: bidRequests[1].bidId,
-          vastXml: serverResponse.seatbid[0].bid[0].adm,
-          mediaType: 'video',
-          creativeId: serverResponse.seatbid[0].bid[0].crid,
-          cpm: serverResponse.seatbid[0].bid[0].price,
-          width: serverResponse.seatbid[0].bid[0].w,
-          height: serverResponse.seatbid[0].bid[0].h,
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 3600,
-          vastUrl: serverResponse.seatbid[0].bid[0].nurl,
-          meta: {
-            advertiserDomains: [
-              'advertiserdomain.com'
-            ]
-          }
-        });
-      });
-    });
-
-    describe('for banner bids', function () {
-      it('should return no bids if the response is not valid', function () {
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = { banner: {} };
-        const bidResponse = spec.interpretResponse({ body: null }, { bidRequest });
-        expect(bidResponse.length).to.equal(0);
-      });
-
-      it('should return no bids if the response is empty', function () {
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = { banner: {} };
-        const bidResponse = spec.interpretResponse({ body: [] }, { bidRequest });
-        expect(bidResponse.length).to.equal(0);
-      });
-
-      it('should return valid banner bid responses', function () {
-        const ebdrReq = {bids: {}};
-        bidRequests.forEach(bid => {
-          let _mediaTypes = (bid.mediaTypes && bid.mediaTypes.video ? VIDEO : BANNER);
-          ebdrReq.bids[bid.bidId] = {mediaTypes: _mediaTypes,
-            w: _mediaTypes == BANNER ? bid.mediaTypes[_mediaTypes].sizes[0][0] : bid.mediaTypes[_mediaTypes].playerSize[0],
-            h: _mediaTypes == BANNER ? bid.mediaTypes[_mediaTypes].sizes[0][1] : bid.mediaTypes[_mediaTypes].playerSize[1]
-          };
-        });
-        const serverResponse = {id: '1d0c4017f02458', seatbid: [{bid: [{id: '2c5e8a1a84522d', impid: '2c5e8a1a84522d', price: 0.81, adid: 'abcde-12345', nurl: '', adm: '
', adomain: ['advertiserdomain.com'], iurl: '', cid: 'campaign1', crid: 'abcde-12345', w: 300, h: 250}], seat: '19513bcfca8006'}], bidid: '19513bcfca8006', cur: 'USD', w: 300, h: 250};
-        const bidResponse = spec.interpretResponse({ body: serverResponse }, ebdrReq);
-        expect(bidResponse[0]).to.deep.equal({
-          requestId: bidRequests[ 0 ].bidId,
-          ad: serverResponse.seatbid[0].bid[0].adm,
-          mediaType: 'banner',
-          creativeId: serverResponse.seatbid[0].bid[0].crid,
-          cpm: serverResponse.seatbid[0].bid[0].price,
-          width: serverResponse.seatbid[0].bid[0].w,
-          height: serverResponse.seatbid[0].bid[0].h,
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 3600,
-          meta: {
-            advertiserDomains: [
-              'advertiserdomain.com'
-            ]
-          },
-        });
-      });
-    });
-  });
-  describe('spec.getUserSyncs', function () {
-    let syncOptions
-    beforeEach(function () {
-      syncOptions = {
-        enabledBidders: ['ebdr'], // only these bidders are allowed to sync
-        pixelEnabled: true
-      }
-    });
-    it('sucess with usersync url', function () {
-      const serverResponse = {id: '1d0c4017f02458', seatbid: [{bid: [{id: '2c5e8a1a84522d', impid: '2c5e8a1a84522d', price: 0.81, adid: 'abcde-12345', nurl: '', adm: '
', adomain: ['advertiserdomain.com'], iurl: 'https://match.bnmla.com/usersync?sspid=59&redir=', cid: 'campaign1', crid: 'abcde-12345', w: 300, h: 250}], seat: '19513bcfca8006'}], bidid: '19513bcfca8006', cur: 'USD', w: 300, h: 250};
-      const result = [];
-      result.push({type: 'image', url: 'https://match.bnmla.com/usersync?sspid=59&redir='});
-      expect(spec.getUserSyncs(syncOptions, { body: serverResponse })).to.deep.equal(result);
-    });
-
-    it('sucess without usersync url', function () {
-      const serverResponse = {id: '1d0c4017f02458', seatbid: [{bid: [{id: '2c5e8a1a84522d', impid: '2c5e8a1a84522d', price: 0.81, adid: 'abcde-12345', nurl: '', adm: '
', adomain: ['advertiserdomain.com'], iurl: '', cid: 'campaign1', crid: 'abcde-12345', w: 300, h: 250}], seat: '19513bcfca8006'}], bidid: '19513bcfca8006', cur: 'USD', w: 300, h: 250};
-      const result = [];
-      expect(spec.getUserSyncs(syncOptions, { body: serverResponse })).to.deep.equal(result);
-    });
-    it('empty response', function () {
-      const serverResponse = {};
-      const result = [];
-      expect(spec.getUserSyncs(syncOptions, { body: serverResponse })).to.deep.equal(result);
-    });
-  });
-});
diff --git a/test/spec/modules/eclickadsBidAdapter_spec.js b/test/spec/modules/eclickadsBidAdapter_spec.js
new file mode 100644
index 00000000000..aadb8f41a64
--- /dev/null
+++ b/test/spec/modules/eclickadsBidAdapter_spec.js
@@ -0,0 +1,214 @@
+import { expect } from 'chai';
+import {
+  spec,
+  ENDPOINT,
+  BIDDER_CODE,
+} from '../../../modules/eclickadsBidAdapter.js';
+import { NATIVE, BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import { deepClone } from '../../../src/utils.js';
+import { config } from '../../../src/config.js';
+
+describe('eclickadsBidAdapter', () => {
+  const bidItem = {
+    bidder: BIDDER_CODE,
+    params: {
+      zid: '7096',
+    },
+  };
+  const eclickadsBidderConfigData = {
+    orig_aid: 'xqf7zdmg7the65ac.1718271138.des',
+    fosp_aid: '1013000403',
+    fosp_uid: '7aab24a4663258a2c1d76a08b20f7e6e',
+    id: '84b2a41c4299bb9b8924423e',
+    myvne_id: '1013000403',
+  };
+  const bidRequest = {
+    code: 'test-div',
+    size: [[320, 85]],
+    mediaTypes: {
+      [NATIVE]: {
+        title: {
+          required: true,
+        },
+        body: {
+          required: true,
+        },
+        image: {
+          required: true,
+        },
+        sponsoredBy: {
+          required: true,
+        },
+        icon: {
+          required: false,
+        },
+      },
+    },
+    ortb2: {
+      device: {
+        w: 980,
+        h: 1720,
+        dnt: 0,
+        ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+        language: 'en',
+        devicetype: 1,
+        make: 'Apple',
+        model: 'iPhone 12 Pro Max',
+        os: 'iOS',
+        osv: '17.4',
+      },
+      site: {
+        name: 'example',
+        domain: 'page.example.com',
+        page: 'https://page.example.com/here.html',
+        ref: 'https://ref.example.com',
+        ext: {
+          data: eclickadsBidderConfigData,
+        },
+      },
+    },
+  };
+
+  describe('isBidRequestValid', () => {
+    it('should return false when atleast one of required params is missing', () => {
+      const bid = deepClone(bidItem);
+      delete bid.params.zid;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+    it('should return true if there is correct required params and mediatype', () => {
+      bidItem.params.mediaTypes == NATIVE;
+      expect(spec.isBidRequestValid(bidItem)).to.be.true;
+    });
+    it('should return true if there is no size', () => {
+      const bid = deepClone(bidItem);
+      delete bid.params.size;
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+  });
+
+  describe('buildRequests', () => {
+    const bidList = [bidItem];
+    const request = config.runWithBidder(BIDDER_CODE, () =>
+      spec.buildRequests(bidList, bidRequest)
+    );
+    const _data = request.data;
+
+    it('should be create a request to server with POST method, data, valid url', () => {
+      expect(request).to.be.exist;
+      expect(_data).to.be.exist;
+      expect(request.method).to.be.exist;
+      expect(request.method).equal('POST');
+      expect(request.url).to.be.exist;
+      expect(request.url).equal(ENDPOINT + eclickadsBidderConfigData.fosp_uid);
+    });
+    it('should return valid data format if bid array is valid', () => {
+      expect(_data).to.be.an('object');
+      expect(_data).to.has.all.keys(
+        'deviceWidth',
+        'deviceHeight',
+        'language',
+        'host',
+        'ua',
+        'page',
+        'imp',
+        'device',
+        'myvne_id',
+        'orig_aid',
+        'fosp_aid',
+        'fosp_uid',
+        'id'
+      );
+      expect(_data.deviceWidth).to.be.an('number');
+      expect(_data.deviceHeight).to.be.an('number');
+      expect(_data.device).to.be.an('string');
+      expect(_data.language).to.be.an('string');
+      expect(_data.host).to.be.an('string').that.is.equal('page.example.com');
+      expect(_data.page)
+        .to.be.an('string')
+        .that.is.equal('https://page.example.com/here.html');
+      expect(_data.imp).to.be.an('array');
+      expect(_data.myvne_id).to.be.an('string');
+      expect(_data.orig_aid).to.be.an('string');
+      expect(_data.fosp_aid).to.be.an('string');
+      expect(_data.myvne_id).to.be.an('string');
+      expect(_data.fosp_uid).to.be.an('string');
+      expect(_data.id).to.be.an('string');
+    });
+
+    it('should return empty array if there is no bidItem passed', () => {
+      const request = config.runWithBidder(BIDDER_CODE, () =>
+        spec.buildRequests([], bidRequest)
+      );
+      const _data = request.data;
+      expect(_data.imp).to.be.an('array').that.is.empty;
+    });
+
+    it('should return the number of imp equal to the number of bidItem', () => {
+      expect(_data.imp).to.have.lengthOf(bidList.length);
+    });
+
+    it('have to contain required params and correct format for sending to EClickAds', () => {
+      const item = _data.imp[0];
+      expect(item.zid).to.be.an('string');
+    });
+  });
+
+  describe('interpretResponse', () => {
+    const expectedResponse = {
+      id: '84b2a41c4299bb9b8924423e',
+      seat: '35809',
+      seatbid: [
+        {
+          id: 'DBCCDFD5-AACC-424E-8225-4160D35CBE5D',
+          impid: '35ea1073c745d6c',
+          adUnitCode: '8871826dc92e',
+          requestId: '1122839202z3v',
+          creativeId: '112233ss921v',
+          netRevenue: true,
+          currency: ['VND'],
+          cpm: 0.1844,
+          ad: 'eclickads_ad_p',
+        },
+      ],
+    };
+
+    const response = spec.interpretResponse({ body: expectedResponse });
+
+    it('should return an array of offers', () => {
+      expect(response).to.be.an('array');
+    });
+
+    it('should return empty array if there is no offer from server response', () => {
+      const emptyOfferResponse = deepClone(expectedResponse);
+      emptyOfferResponse.seatbid = [];
+      const response = spec.interpretResponse({ body: emptyOfferResponse });
+      expect(response).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty array if seatbid from server response is null or missing', () => {
+      const nullOfferResponse = deepClone(expectedResponse);
+      nullOfferResponse.seatbid = null;
+      const response = spec.interpretResponse({ body: nullOfferResponse });
+      expect(response).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty array if server response is get error - empty', () => {
+      const response = spec.interpretResponse({ body: undefined });
+      expect(response).to.be.an('array').that.is.empty;
+    });
+
+    it('should return correct format, params for each of offers from server response', () => {
+      const offer = response[0];
+      expect(offer.id).to.be.an('string').that.is.not.empty;
+      expect(offer.impid).to.be.an('string').that.is.not.empty;
+      expect(offer.requestId).to.be.an('string').that.is.not.empty;
+      expect(offer.creativeId).to.be.an('string').that.is.not.empty;
+      expect(offer.netRevenue).to.be.an('boolean');
+      expect(offer.ttl).to.be.an('number');
+      expect(offer.cpm).to.be.an('number').greaterThan(0);
+      expect(offer.adserverTargeting).to.be.an('object');
+      expect(offer.adserverTargeting['hb_ad_eclickads']).to.be.an('string').that
+        .is.not.empty;
+    });
+  });
+});
diff --git a/test/spec/modules/edge226BidAdapter_spec.js b/test/spec/modules/edge226BidAdapter_spec.js
new file mode 100644
index 00000000000..e9e1c34b9cd
--- /dev/null
+++ b/test/spec/modules/edge226BidAdapter_spec.js
@@ -0,0 +1,477 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/edge226BidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'edge226';
+
+describe('Edge226BidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://ssp.dauup.com/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys(
+        'device',
+        'deviceWidth',
+        'deviceHeight',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+});
diff --git a/test/spec/modules/ehealthcaresolutionsBidAdapter_spec.js b/test/spec/modules/ehealthcaresolutionsBidAdapter_spec.js
new file mode 100644
index 00000000000..c420c387598
--- /dev/null
+++ b/test/spec/modules/ehealthcaresolutionsBidAdapter_spec.js
@@ -0,0 +1,322 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/ehealthcaresolutionsBidAdapter.js';
+import * as utils from '../../../src/utils.js';
+
+describe('ehealthcaresolutions adapter', function () {
+  let bannerRequest, nativeRequest;
+  let bannerResponse, nativeResponse, invalidBannerResponse, invalidNativeResponse;
+
+  beforeEach(function () {
+    bannerRequest = [
+      {
+        bidder: 'ehealthcaresolutions',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          placement_id: 111520,
+          bid_floor: 0.5
+        }
+      }
+    ];
+    nativeRequest = [
+      {
+        bidder: 'ehealthcaresolutions',
+        mediaTypes: {
+          native: {
+            title: { required: true, len: 100 },
+            image: { required: true, sizes: [300, 250] },
+            sponsored: { required: false },
+            clickUrl: { required: true },
+            desc: { required: true },
+            icon: { required: false, sizes: [50, 50] },
+            cta: { required: false }
+          }
+        },
+        params: {
+          placement_id: 111519,
+          bid_floor: 1
+        }
+      }
+    ];
+    bannerResponse = {
+      'body': {
+        'id': '006ac3b3-67f0-43bf-a33a-388b2f869fef',
+        'seatbid': [{
+          'bid': [{
+            'id': '049d07ed-c07e-4890-9f19-5cf41406a42d',
+            'impid': '286e606ac84a09',
+            'price': 0.11,
+            'adid': '368853',
+            'adm': "",
+            'adomain': ['google.com'],
+            'iurl': 'https://cdn.ehealthcaresolutions.com/1_368853_1.png',
+            'cid': '468133/368853',
+            'crid': '368853',
+            'w': 300,
+            'h': 250,
+            'cat': ['IAB7-19']
+          }],
+          'seat': 'ehealthcaresolutions',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_-1'
+      }
+    };
+    nativeResponse = {
+      'body': {
+        'id': '453ade66-9113-4944-a674-5bbdcb9808ac',
+        'seatbid': [{
+          'bid': [{
+            'id': '652c9a4c-66ea-4579-998b-cefe7b4cfecd',
+            'impid': '2c3875bdbb1893',
+            'price': 1.1,
+            'adid': '368852',
+            'adm': '{\"native\":{\"ver\":\"1.1\",\"assets\": [{\"id\":1,\"required\":1,\"title\":{\"text\":\"Integrative Approaches: Merging Traditional and Alternative \"}},{\"id\":2,\"required\":1,\"img\":{\"url\":\"https://cdn.ehealthcaresolutions.com/1_368852_0.png\",\"w\":500,\"h\":300,\"type\":\"3\"}},{\"id\":3,\"required\":0,\"data\":{\"value\":\"Diabetes In Control. A free weekly diabetes newsletter for Medical Professionals.\"}},{\"id\":4,\"required\":1,\"data\":{\"value\":\"Integrative Approaches: Merging Traditional and Alternative \"}},{\"id\":6,\"required\":1,\"data\":{\"value\":\"URL\"}}],\"link\":{\"url\":\"https://r.ehealthcaresolutions.com/adx-rtb-d/servlet/WebF_AdManager.AdLinkManager?qs=H4sIAAAAAAAAAx2U2QHDIAxDVwKDr3F84P1HqNLPtMSRpSeG9RiPXH+5a474KzO/47YX7UoP50m61fLujlNjb76/8ZiblkimHq5nL/ZRedp3031x1tnk55LjSNN6h9/Zq+qmaLLuWTl74m1ZJKnb+m2OtQm/3L4sb933pM92qMOgjJ41MYmPXKnndRVKs+9bfSEumoZIFpTXuXbCP+WXuzl725E3O+9odi5OJrnBzhwjx9+UnFN3nTNt1/HY5aeljKtvZYpoJHNXr8BWa8ysKQY7ZmNA3DHK2qRwY7+zLu+xm9z5eheJ4Pv2usSptvO3p7JHrnXn0T5yVWdccp9Yz7hhoz2iu2zqsXsGFZ9hh14J6yU4TkJ0BgnOY8tY3tS+n2qsw7xZfKuanSNbAo+9nkJ83i20+FwhfbJeDVOllXsdxmDWauYcSRgS9+yG5qHwUDjAxxA0iZnOjlsnI+y09+ATeTEwbAVGgp0Qu/ceP0kjUvpu1Ty7O9MoegfrmLPxdjUh3mJL+XhARby+Ax8iBckf6BQdn9W+DMlvmlzYLuLlIy7YociFOIvXvEiYYCMboVk8BLHbnw3Zmr5us3xbjtXL67L96F15acJXkM5BOmTaUbBkYGdCI+Et8XmlpbuE3xVQwmxryc2y4wP3ByuuP8GogPZz8OpPaBv8diWWUTrC2nnLhdNUrJRTKc9FepDvwHTDwfbbMCTSb4LhUIFkyFrw/i7GtkPi6NCCai6N47TgNsTnzZWRoVtOSLq7FsLiF29y0Gj0GHVPVYG3QOPS7Swc3UuiFAQZJx3YvpHA2geUgVBASMEL4vcDi2Dw3NPtBSC4EQEvH/uMILu6WyUwraywTeVpoqoHTqOoD84FzReKoWemJy6jyuiBieGlQIe6wY2elTaMOwEUFF5NagzPj6nauc0+aXzQN3Q72hxFAgtfORK60RRAHYZLYymIzSJcXLgRFsqrb1UoD+5Atq7TWojaLTfOyUvH9EeJvZEOilQAXrf/ALoI8ZhABQAA\"},\"imptrackers\":[\"https://i.ehealthcaresolutions.com/adx-rtb-d/servlet/WebF_AdManager.ImpCounter?price=${AUCTION_PRICE}&ids=111519,16703,468132,368852,211356,233,13,16704,1&cb=1728409547&ap=5.00000&vd=223.233.85.189,14,8&nm=0.00&GUIDs=[adx_guid],652c9a4c-66ea-4579-998b-cefe7b4cfecd,652c9a4c-66ea-4579-998b-cefe7b4cfecd,999999,-1_&info=2,-1,IN&adx_custom=&adx_custom_ex=~~~-1~~~0&cat=-1&ref=https%3A%2F%2Fqa-jboss.audiencelogy.com%2Ftn_native_prod.html\",\"https://i.ehealthcaresolutions.com/adx-rtb-d/servlet/WebF_AdManager.ImpTracker?price=${AUCTION_PRICE}&ids=111519,16703,468132,368852,211356,233,13,16704,1&cb=1728409547&ap=5.00000&vd=223.233.85.189,14,8&nm=0.00&GUIDs=[adx_guid],652c9a4c-66ea-4579-998b-cefe7b4cfecd,652c9a4c-66ea-4579-998b-cefe7b4cfecd,999999,-1_&info=2,-1,IN&adx_custom=&adx_custom_ex=~~~-1~~~0&cat=-1&ref=\",\"https://rtb-east.ehealthcaresolutions.com:9001/beacon?uid=44636f6605b06ec6d4389d6efb7e5054&cc=468132&fccap=5&nid=1\"]}}',
+            'adomain': ['www.diabetesincontrol.com'],
+            'iurl': 'https://cdn.ehealthcaresolutions.com/1_368852_0.png',
+            'cid': '468132/368852',
+            'crid': '368852',
+            'cat': ['IAB7']
+          }],
+          'seat': 'ehealthcaresolutions',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_-1'
+      }
+    };
+    invalidBannerResponse = {
+      'body': {
+        'id': '006ac3b3-67f0-43bf-a33a-388b2f869fef',
+        'seatbid': [{
+          'bid': [{
+            'id': '049d07ed-c07e-4890-9f19-5cf41406a42d',
+            'impid': '286e606ac84a09',
+            'price': 0.11,
+            'adid': '368853',
+            'adm': 'invalid response',
+            'adomain': ['google.com'],
+            'iurl': 'https://cdn.ehealthcaresolutions.com/1_368853_1.png',
+            'cid': '468133/368853',
+            'crid': '368853',
+            'w': 300,
+            'h': 250,
+            'cat': ['IAB7-19']
+          }],
+          'seat': 'ehealthcaresolutions',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_-1'
+      }
+    };
+    invalidNativeResponse = {
+      'body': {
+        'id': '453ade66-9113-4944-a674-5bbdcb9808ac',
+        'seatbid': [{
+          'bid': [{
+            'id': '652c9a4c-66ea-4579-998b-cefe7b4cfecd',
+            'impid': '2c3875bdbb1893',
+            'price': 1.1,
+            'adid': '368852',
+            'adm': 'invalid response',
+            'adomain': ['www.diabetesincontrol.com'],
+            'iurl': 'https://cdn.ehealthcaresolutions.com/1_368852_0.png',
+            'cid': '468132/368852',
+            'crid': '368852',
+            'cat': ['IAB7']
+          }],
+          'seat': 'ehealthcaresolutions',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_-1'
+      }
+    };
+  });
+
+  describe('validations', function () {
+    it('isBidValid : placement_id is passed', function () {
+      let bid = {
+          bidder: 'ehealthcaresolutions',
+          params: {
+            placement_id: 111520
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(true);
+    });
+    it('isBidValid : placement_id is not passed', function () {
+      let bid = {
+          bidder: 'ehealthcaresolutions',
+          params: {
+            width: 300,
+            height: 250,
+            domain: '',
+            bid_floor: 0.5
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(false);
+    });
+  });
+  describe('Validate Banner Request', function () {
+    it('Immutable bid request validate', function () {
+      let _Request = utils.deepClone(bannerRequest),
+        bidRequest = spec.buildRequests(bannerRequest);
+      expect(bannerRequest).to.deep.equal(_Request);
+    });
+    it('Validate bidder connection', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      expect(_Request.url).to.equal('https://rtb.ehealthcaresolutions.com/hb');
+      expect(_Request.method).to.equal('POST');
+      expect(_Request.options.contentType).to.equal('application/json');
+    });
+    it('Validate bid request : Impression', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      let data = JSON.parse(_Request.data);
+      // expect(data.at).to.equal(1); // auction type
+      expect(data[0].imp[0].id).to.equal(bannerRequest[0].bidId);
+      expect(data[0].placementId).to.equal(111520);
+    });
+    it('Validate bid request : ad size', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].imp[0].banner).to.be.a('object');
+      expect(data[0].imp[0].banner.w).to.equal(300);
+      expect(data[0].imp[0].banner.h).to.equal(250);
+    });
+    it('Validate bid request : user object', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].user).to.be.a('object');
+      expect(data[0].user.id).to.be.a('string');
+    });
+    it('Validate bid request : CCPA Check', function () {
+      let bidRequest = {
+        uspConsent: '1NYN'
+      };
+      let _Request = spec.buildRequests(bannerRequest, bidRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.ext.us_privacy).to.equal('1NYN');
+      //   let _bidRequest = {};
+      //   let _Request1 = spec.buildRequests(request, _bidRequest);
+      //   let data1 = JSON.parse(_Request1.data);
+      //   expect(data1.regs).to.equal(undefined);
+    });
+  });
+  describe('Validate banner response ', function () {
+    it('Validate bid response : valid bid response', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      let bResponse = spec.interpretResponse(bannerResponse, _Request);
+      expect(bResponse).to.be.an('array').with.length.above(0);
+      expect(bResponse[0].requestId).to.equal(bannerResponse.body.seatbid[0].bid[0].impid);
+      expect(bResponse[0].width).to.equal(bannerResponse.body.seatbid[0].bid[0].w);
+      expect(bResponse[0].height).to.equal(bannerResponse.body.seatbid[0].bid[0].h);
+      expect(bResponse[0].currency).to.equal('USD');
+      expect(bResponse[0].netRevenue).to.equal(false);
+      expect(bResponse[0].mediaType).to.equal('banner');
+      expect(bResponse[0].meta.advertiserDomains).to.deep.equal(['google.com']);
+      expect(bResponse[0].ttl).to.equal(300);
+      expect(bResponse[0].creativeId).to.equal(bannerResponse.body.seatbid[0].bid[0].crid);
+      expect(bResponse[0].dealId).to.equal(bannerResponse.body.seatbid[0].bid[0].dealId);
+    });
+    it('Invalid bid response check ', function () {
+      let bRequest = spec.buildRequests(bannerRequest);
+      let response = spec.interpretResponse(invalidBannerResponse, bRequest);
+      expect(response[0].ad).to.equal('invalid response');
+    });
+  });
+  describe('Validate Native Request', function () {
+    it('Immutable bid request validate', function () {
+      let _Request = utils.deepClone(nativeRequest),
+        bidRequest = spec.buildRequests(nativeRequest);
+      expect(nativeRequest).to.deep.equal(_Request);
+    });
+    it('Validate bidder connection', function () {
+      let _Request = spec.buildRequests(nativeRequest);
+      expect(_Request.url).to.equal('https://rtb.ehealthcaresolutions.com/hb');
+      expect(_Request.method).to.equal('POST');
+      expect(_Request.options.contentType).to.equal('application/json');
+    });
+    it('Validate bid request : Impression', function () {
+      let _Request = spec.buildRequests(nativeRequest);
+      let data = JSON.parse(_Request.data);
+      // expect(data.at).to.equal(1); // auction type
+      expect(data[0].imp[0].id).to.equal(nativeRequest[0].bidId);
+      expect(data[0].placementId).to.equal(111519);
+    });
+    it('Validate bid request : user object', function () {
+      let _Request = spec.buildRequests(nativeRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].user).to.be.a('object');
+      expect(data[0].user.id).to.be.a('string');
+    });
+    it('Validate bid request : CCPA Check', function () {
+      let bidRequest = {
+        uspConsent: '1NYN'
+      };
+      let _Request = spec.buildRequests(nativeRequest, bidRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.ext.us_privacy).to.equal('1NYN');
+      //   let _bidRequest = {};
+      //   let _Request1 = spec.buildRequests(request, _bidRequest);
+      //   let data1 = JSON.parse(_Request1.data);
+      //   expect(data1.regs).to.equal(undefined);
+    });
+  });
+  describe('Validate native response ', function () {
+    it('Validate bid response : valid bid response', function () {
+      let _Request = spec.buildRequests(nativeRequest);
+      let bResponse = spec.interpretResponse(nativeResponse, _Request);
+      expect(bResponse).to.be.an('array').with.length.above(0);
+      expect(bResponse[0].requestId).to.equal(nativeResponse.body.seatbid[0].bid[0].impid);
+      // expect(bResponse[0].width).to.equal(bannerResponse.body.seatbid[0].bid[0].w);
+      // expect(bResponse[0].height).to.equal(bannerResponse.body.seatbid[0].bid[0].h);
+      expect(bResponse[0].currency).to.equal('USD');
+      expect(bResponse[0].netRevenue).to.equal(false);
+      expect(bResponse[0].mediaType).to.equal('native');
+      expect(bResponse[0].native.clickUrl).to.be.a('string').and.not.be.empty;
+      expect(bResponse[0].native.impressionTrackers).to.be.an('array').with.length.above(0);
+      expect(bResponse[0].native.title).to.be.a('string').and.not.be.empty;
+      expect(bResponse[0].native.image.url).to.be.a('string').and.not.be.empty;
+      expect(bResponse[0].meta.advertiserDomains).to.deep.equal(['www.diabetesincontrol.com']);
+      expect(bResponse[0].ttl).to.equal(300);
+      expect(bResponse[0].creativeId).to.equal(nativeResponse.body.seatbid[0].bid[0].crid);
+      expect(bResponse[0].dealId).to.equal(nativeResponse.body.seatbid[0].bid[0].dealId);
+    });
+  });
+  describe('GPP and coppa', function () {
+    it('Request params check with GPP Consent', function () {
+      let bidderReq = { gppConsent: { gppString: 'gpp-string-test', applicableSections: [5] } };
+      let _Request = spec.buildRequests(bannerRequest, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.gpp).to.equal('gpp-string-test');
+      expect(data[0].regs.gpp_sid[0]).to.equal(5);
+    });
+    it('Request params check with GPP Consent read from ortb2', function () {
+      let bidderReq = {
+        ortb2: {
+          regs: {
+            gpp: 'gpp-test-string',
+            gpp_sid: [5]
+          }
+        }
+      };
+      let _Request = spec.buildRequests(bannerRequest, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.gpp).to.equal('gpp-test-string');
+      expect(data[0].regs.gpp_sid[0]).to.equal(5);
+    });
+    it(' Bid request should have coppa flag if its true', () => {
+      let bidderReq = { ortb2: { regs: { coppa: 1 } } };
+      let _Request = spec.buildRequests(bannerRequest, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.coppa).to.equal(1);
+    });
+  });
+});
diff --git a/test/spec/modules/eids_spec.js b/test/spec/modules/eids_spec.js
index 1597790e652..30bfabb6f50 100644
--- a/test/spec/modules/eids_spec.js
+++ b/test/spec/modules/eids_spec.js
@@ -1,519 +1,7 @@
 import {createEidsArray} from 'modules/userId/eids.js';
-import {expect} from 'chai';
 
-//  Note: In unit tets cases for bidders, call the createEidsArray function over userId object that is used for calling fetchBids
-//      this way the request will stay consistent and unit test cases will not need lots of changes.
-
-describe('eids array generation for known sub-modules', function() {
-  it('pubCommonId', function() {
-    const userId = {
-      pubcid: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'pubcid.org',
-      uids: [{id: 'some-random-id-value', atype: 1}]
-    });
-  });
-
-  it('unifiedId: ext generation', function() {
-    const userId = {
-      tdid: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'adserver.org',
-      uids: [{id: 'some-random-id-value', atype: 1, ext: { rtiPartner: 'TDID' }}]
-    });
-  });
-
-  describe('id5Id', function() {
-    it('does not include an ext if not provided', function() {
-      const userId = {
-        id5id: {
-          uid: 'some-random-id-value'
-        }
-      };
-      const newEids = createEidsArray(userId);
-      expect(newEids.length).to.equal(1);
-      expect(newEids[0]).to.deep.equal({
-        source: 'id5-sync.com',
-        uids: [{ id: 'some-random-id-value', atype: 1 }]
-      });
-    });
-
-    it('includes ext if provided', function() {
-      const userId = {
-        id5id: {
-          uid: 'some-random-id-value',
-          ext: {
-            linkType: 0
-          }
-        }
-      };
-      const newEids = createEidsArray(userId);
-      expect(newEids.length).to.equal(1);
-      expect(newEids[0]).to.deep.equal({
-        source: 'id5-sync.com',
-        uids: [{
-          id: 'some-random-id-value',
-          atype: 1,
-          ext: {
-            linkType: 0
-          }
-        }]
-      });
-    });
-  });
-
-  it('parrableId', function() {
-    const userId = {
-      parrableId: {
-        eid: 'some-random-id-value'
-      }
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'parrable.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
-    });
-  });
-
-  it('merkleId (legacy) - supports single id', function() {
-    const userId = {
-      merkleId: {
-        id: 'some-random-id-value', keyID: 1
-      }
-    };
-    const newEids = createEidsArray(userId);
-
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'merkleinc.com',
-      uids: [{
-        id: 'some-random-id-value',
-        atype: 3,
-        ext: { keyID: 1 }
-      }]
-    });
-  });
-
-  it('merkleId supports multiple source providers', function() {
-    const userId = {
-      merkleId: [{
-        id: 'some-random-id-value', ext: { enc: 1, keyID: 16, idName: 'pamId', ssp: 'ssp1' }
-      }, {
-        id: 'another-random-id-value',
-        ext: {
-          enc: 1,
-          idName: 'pamId',
-          third: 4,
-          ssp: 'ssp2'
-        }
-      }]
-    }
-
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(2);
-    expect(newEids[0]).to.deep.equal({
-      source: 'ssp1.merkleinc.com',
-      uids: [{id: 'some-random-id-value',
-        atype: 3,
-        ext: {
-          enc: 1,
-          keyID: 16,
-          idName: 'pamId',
-          ssp: 'ssp1'
-        }
-      }]
-    });
-    expect(newEids[1]).to.deep.equal({
-      source: 'ssp2.merkleinc.com',
-      uids: [{id: 'another-random-id-value',
-        atype: 3,
-        ext: {
-          third: 4,
-          enc: 1,
-          idName: 'pamId',
-          ssp: 'ssp2'
-        }
-      }]
-    });
-  });
-
-  it('identityLink', function() {
-    const userId = {
-      idl_env: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'liveramp.com',
-      uids: [{id: 'some-random-id-value', atype: 3}]
-    });
-  });
-
-  it('liveIntentId; getValue call and ext', function() {
-    const userId = {
-      lipb: {
-        lipbid: 'some-random-id-value',
-        segments: ['s1', 's2']
-      }
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'liveintent.com',
-      uids: [{id: 'some-random-id-value', atype: 3}],
-      ext: {segments: ['s1', 's2']}
-    });
-  });
-
-  it('bidswitch', function() {
-    const userId = {
-      bidswitch: {'id': 'sample_id'}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'bidswitch.net',
-      uids: [{
-        id: 'sample_id',
-        atype: 3
-      }]
-    });
-  });
-
-  it('bidswitch with ext', function() {
-    const userId = {
-      bidswitch: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'bidswitch.net',
-      uids: [{
-        id: 'sample_id',
-        atype: 3,
-        ext: {
-          provider: 'some.provider.com'
-        }
-      }]
-    });
-  });
-
-  it('medianet', function() {
-    const userId = {
-      medianet: {'id': 'sample_id'}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'media.net',
-      uids: [{
-        id: 'sample_id',
-        atype: 3
-      }]
-    });
-  });
-
-  it('medianet with ext', function() {
-    const userId = {
-      medianet: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'media.net',
-      uids: [{
-        id: 'sample_id',
-        atype: 3,
-        ext: {
-          provider: 'some.provider.com'
-        }
-      }]
-    });
-  });
-
-  it('magnite', function() {
-    const userId = {
-      magnite: {'id': 'sample_id'}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'rubiconproject.com',
-      uids: [{
-        id: 'sample_id',
-        atype: 3
-      }]
-    });
-  });
-
-  it('magnite with ext', function() {
-    const userId = {
-      magnite: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'rubiconproject.com',
-      uids: [{
-        id: 'sample_id',
-        atype: 3,
-        ext: {
-          provider: 'some.provider.com'
-        }
-      }]
-    });
-  });
-
-  it('index', function() {
-    const userId = {
-      index: {'id': 'sample_id'}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'liveintent.indexexchange.com',
-      uids: [{
-        id: 'sample_id',
-        atype: 3
-      }]
-    });
-  });
-
-  it('index with ext', function() {
-    const userId = {
-      index: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'liveintent.indexexchange.com',
-      uids: [{
-        id: 'sample_id',
-        atype: 3,
-        ext: {
-          provider: 'some.provider.com'
-        }
-      }]
-    });
-  });
-
-  it('liveIntentId; getValue call and NO ext', function() {
-    const userId = {
-      lipb: {
-        lipbid: 'some-random-id-value'
-      }
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'liveintent.com',
-      uids: [{id: 'some-random-id-value', atype: 3}]
-    });
-  });
-
-  it('britepoolId', function() {
-    const userId = {
-      britepoolid: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'britepool.com',
-      uids: [{id: 'some-random-id-value', atype: 3}]
-    });
-  });
-
-  it('lotamePanoramaId', function () {
-    const userId = {
-      lotamePanoramaId: 'some-random-id-value',
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'crwdcntrl.net',
-      uids: [{ id: 'some-random-id-value', atype: 1 }],
-    });
-  });
-
-  it('criteo', function() {
-    const userId = {
-      criteoId: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'criteo.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
-    });
-  });
-
-  it('tapadId', function() {
-    const userId = {
-      tapadId: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'tapad.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
-    });
-  });
-
-  it('deepintentId', function() {
-    const userId = {
-      deepintentId: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'deepintent.com',
-      uids: [{id: 'some-random-id-value', atype: 3}]
-    });
-  });
-
-  it('NetId', function() {
-    const userId = {
-      netId: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'netid.de',
-      uids: [{id: 'some-random-id-value', atype: 1}]
-    });
-  });
-
-  it('zeotapIdPlus', function() {
-    const userId = {
-      IDP: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'zeotap.com',
-      uids: [{
-        id: 'some-random-id-value',
-        atype: 1
-      }]
-    });
-  });
-
-  it('hadronId', function() {
-    const userId = {
-      hadronId: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'audigent.com',
-      uids: [{
-        id: 'some-random-id-value',
-        atype: 1
-      }]
-    });
-  });
-
-  it('quantcastId', function() {
-    const userId = {
-      quantcastId: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'quantcast.com',
-      uids: [{
-        id: 'some-random-id-value',
-        atype: 1
-      }]
-    });
-  });
-
-  it('uid2', function() {
-    const userId = {
-      uid2: {'id': 'Sample_AD_Token'}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'uidapi.com',
-      uids: [{
-        id: 'Sample_AD_Token',
-        atype: 3
-      }]
-    });
-  });
-
-  it('uid2 with ext', function() {
-    const userId = {
-      uid2: {'id': 'Sample_AD_Token', 'ext': {'provider': 'some.provider.com'}}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'uidapi.com',
-      uids: [{
-        id: 'Sample_AD_Token',
-        atype: 3,
-        ext: {
-          provider: 'some.provider.com'
-        }
-      }]
-    });
-  });
-
-  it('euid', function() {
-    const userId = {
-      euid: {'id': 'Sample_AD_Token'}
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'euid.eu',
-      uids: [{
-        id: 'Sample_AD_Token',
-        atype: 3
-      }]
-    });
-  });
-
-  it('kpuid', function() {
-    const userId = {
-      kpuid: 'Sample_Token'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'kpuid.com',
-      uids: [{
-        id: 'Sample_Token',
-        atype: 3
-      }]
-    });
-  });
-
-  it('tncid', function() {
-    const userId = {
-      tncid: 'TEST_TNCID'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'thenewco.it',
-      uids: [{
-        id: 'TEST_TNCID',
-        atype: 3
-      }]
-    });
-  });
-
-  it('pubProvidedId', function() {
+describe('eids array generation for known sub-modules', function () {
+  it('pubProvidedId', function () {
     const userId = {
       pubProvidedId: [{
         source: 'example.com',
@@ -548,148 +36,10 @@ describe('eids array generation for known sub-modules', function() {
       }]
     });
   });
-
-  it('amxId', () => {
-    const id = 'c4bcadb0-124f-4468-a91a-d3d44cf311c5'
-    const userId = {
-      amxId: id
-    };
-
-    const [eid] = createEidsArray(userId);
-    expect(eid).to.deep.equal({
-      source: 'amxdt.net',
-      uids: [{
-        atype: 1,
-        id,
-      }]
-    });
-  });
-
-  it('qid', function() {
-    const userId = {
-      qid: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 'adquery.io',
-      uids: [{
-        id: 'some-random-id-value',
-        atype: 1
-      }]
-    });
-  });
-
-  it('operaId', function() {
-    const userId = {
-      operaId: 'some-random-id-value'
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: 't.adx.opera.com',
-      uids: [{
-        id: 'some-random-id-value',
-        atype: 1
-      }]
-    });
-  });
-
-  it('33acrossId', function() {
-    const userId = {
-      '33acrossId': {
-        envelope: 'some-random-id-value'
-      }
-    };
-    const newEids = createEidsArray(userId);
-    expect(newEids.length).to.equal(1);
-    expect(newEids[0]).to.deep.equal({
-      source: '33across.com',
-      uids: [{
-        id: 'some-random-id-value',
-        atype: 1
-      }]
-    });
-  });
-
-  it('czechAdId', () => {
-    const id = 'some-random-id-value'
-    const userId = { czechAdId: id };
-    const [eid] = createEidsArray(userId);
-    expect(eid).to.deep.equal({
-      source: 'czechadid.cz',
-      uids: [{ id: 'some-random-id-value', atype: 1 }]
-    });
-  });
-
-  describe('ftrackId', () => {
-    it('should return the correct EID schema', () => {
-      // This is the schema returned from the ftrack decode() method
-      expect(createEidsArray({
-        ftrackId: {
-          uid: 'test-device-id',
-          ext: {
-            DeviceID: 'test-device-id',
-            SingleDeviceID: 'test-single-device-id',
-            HHID: 'test-household-id'
-          }
-        },
-        foo: {
-          bar: 'baz'
-        },
-        lorem: {
-          ipsum: ''
-        }
-      })).to.deep.equal([{
-        source: 'flashtalking.com',
-        uids: [{
-          atype: 1,
-          id: 'test-device-id',
-          ext: {
-            DeviceID: 'test-device-id',
-            SingleDeviceID: 'test-single-device-id',
-            HHID: 'test-household-id'
-          }
-        }]
-      }]);
-    });
-  });
-
-  describe('imuid', function() {
-    it('should return the correct EID schema with imuid', function() {
-      const userId = {
-        imuid: 'testimuid'
-      };
-      const newEids = createEidsArray(userId);
-      expect(newEids.length).to.equal(1);
-      expect(newEids[0]).to.deep.equal({
-        source: 'intimatemerger.com',
-        uids: [{
-          id: 'testimuid',
-          atype: 1
-        }]
-      });
-    });
-
-    it('should return the correct EID schema with imppid', function() {
-      const userId = {
-        imppid: 'imppid-value-imppid-value-imppid-value'
-      };
-      const newEids = createEidsArray(userId);
-      expect(newEids.length).to.equal(1);
-      expect(newEids[0]).to.deep.equal({
-        source: 'ppid.intimatemerger.com',
-        uids: [{
-          id: 'imppid-value-imppid-value-imppid-value',
-          atype: 1
-        }]
-      });
-    });
-  });
 });
 
 describe('Negative case', function () {
-  it('eids array generation for UN-known sub-module', function() {
+  it('eids array generation for UN-known sub-module', function () {
     // UnknownCommonId
     const userId = {
       unknowncid: 'some-random-id-value'
@@ -698,7 +48,7 @@ describe('Negative case', function () {
     expect(newEids.length).to.equal(0);
   });
 
-  it('eids array generation for known sub-module with non-string value', function() {
+  it('eids array generation for known sub-module with non-string value', function () {
     // pubCommonId
     let userId = {
       pubcid: undefined
diff --git a/test/spec/modules/eightPodAnalyticsAdapter_spec.js b/test/spec/modules/eightPodAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..55a09db03b4
--- /dev/null
+++ b/test/spec/modules/eightPodAnalyticsAdapter_spec.js
@@ -0,0 +1,187 @@
+import analyticsAdapter, { storage, queue, trackEvent } from 'modules/eightPodAnalyticsAdapter.js';
+import { expect } from 'chai';
+import adapterManager from 'src/adapterManager.js';
+import eightPodAnalytics from 'modules/eightPodAnalyticsAdapter.js';
+import { EVENTS } from '../../../src/constants.js';
+
+const {
+  BID_WON
+} = EVENTS;
+
+describe('eightPodAnalyticAdapter', function() {
+  let sandbox;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    adapterManager.enableAnalytics({
+      provider: 'eightPod'
+    });
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+    analyticsAdapter.disableAnalytics();
+  });
+
+  describe('setup page', function() {
+    let getDataFromLocalStorageStub, localStorageIsEnabledStub;
+    let addEventListenerSpy;
+
+    beforeEach(function() {
+      localStorageIsEnabledStub = sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      getDataFromLocalStorageStub = sandbox.stub(
+        storage,
+        'getDataFromLocalStorage'
+      );
+      addEventListenerSpy = sandbox.spy(window, 'addEventListener');
+    });
+
+    afterEach(function() {
+      getDataFromLocalStorageStub.restore();
+      localStorageIsEnabledStub.restore();
+      addEventListenerSpy.restore();
+    });
+
+    it('should subscribe on messageEvents', function() {
+      getDataFromLocalStorageStub.returns(JSON.stringify([]));
+      sandbox.spy(eightPodAnalytics, 'eventSubscribe');
+      sandbox.spy(eightPodAnalytics, 'getEventFromLocalStorage');
+
+      analyticsAdapter.setupPage();
+
+      sandbox.assert.callCount(analyticsAdapter.eventSubscribe, 0);
+      sandbox.assert.callCount(analyticsAdapter.getEventFromLocalStorage, 1);
+    });
+
+    it('should receive saved events list', function() {
+      const eventList = [1, 2, 3];
+      getDataFromLocalStorageStub.returns(JSON.stringify(eventList));
+      sandbox.spy(eightPodAnalytics, 'eventSubscribe');
+
+      analyticsAdapter.setupPage();
+      expect(queue).to.deep.equal(eventList)
+    });
+  });
+
+  describe('track event', function() {
+    let setupPageStub;
+
+    beforeEach(function() {
+      setupPageStub = sandbox.stub(eightPodAnalytics, 'setupPage');
+      eightPodAnalytics.resetContext();
+    });
+
+    afterEach(function() {
+      setupPageStub.restore();
+    });
+
+    it('should NOT call setup page and get context', function() {
+      eightPodAnalytics.track({
+        eventType: 'wrong_event_type',
+      })
+
+      sandbox.assert.callCount(setupPageStub, 0);
+      expect(analyticsAdapter.getContext()).to.deep.equal({})
+    });
+
+    it('should call setup page and get context', function() {
+      eightPodAnalytics.track({
+        eventType: BID_WON,
+        args: {
+          adUnitCode: 'adUnitCode',
+          bidder: 'eightPod',
+          creativeId: 'creativeId',
+          seatBidId: 'seatBidId',
+          cid: 'campaignId',
+          params: [
+            {
+              publisherId: 'publisherId',
+              placementId: 'placementId',
+            }
+          ]
+        }
+      })
+
+      sandbox.assert.callCount(setupPageStub, 1);
+      expect(analyticsAdapter.getContext()).to.deep.equal({
+        adUnitCode: {
+          bidId: 'seatBidId',
+          campaignId: 'campaignId',
+          placementId: 'placementId',
+          publisherId: 'publisherId',
+          variantId: 'creativeId'
+        }
+      })
+    });
+  });
+
+  describe('trackEvent', function() {
+    let getContextStub, getTimeStub;
+    const adUnitCode = 'adUnitCode';
+
+    beforeEach(function() {
+      getContextStub = sandbox.stub(eightPodAnalytics, 'getContext');
+      getTimeStub = sandbox.stub(Date.prototype, 'getTime').returns(1234);
+      eightPodAnalytics.resetQueue();
+      eightPodAnalytics.resetContext();
+    });
+
+    afterEach(function() {
+      getContextStub.restore();
+      getTimeStub.restore();
+    });
+
+    it('should add event to the queue', function() {
+      getContextStub.returns({adUnitCode: {}});
+
+      const event1 = {
+        detail: {
+          type: 'Counter',
+          name: 'next_slide',
+          payload: {
+            from: '1.1',
+            to: '2.2',
+            value: 3
+          }
+        }
+      }
+      const result1 = {
+        context: {},
+        eventType: 'Counter',
+        eventClass: 'adunit',
+        timestamp: 1234,
+        eventName: 'next_slide',
+        payload: {
+          from: '1.1',
+          to: '2.2',
+          value: 3
+        }
+      }
+
+      const event2 = {
+        detail: {
+          type: 'Counter',
+          name: 'pod_impression',
+          payload: {
+            value: 2
+          }
+        }
+      }
+      const result2 = {
+        context: {},
+        eventType: 'Counter',
+        eventClass: 'adunit',
+        timestamp: 1234,
+        eventName: 'pod_impression',
+        payload: {
+          value: 2
+        }
+      }
+
+      trackEvent(event1, adUnitCode)
+      expect(queue).to.deep.equal([result1]);
+      trackEvent(event2, adUnitCode);
+      expect(queue).to.deep.equal([result1, result2]);
+    });
+  });
+});
diff --git a/test/spec/modules/eightPodBidAdapter_spec.js b/test/spec/modules/eightPodBidAdapter_spec.js
new file mode 100644
index 00000000000..7d55997d8cd
--- /dev/null
+++ b/test/spec/modules/eightPodBidAdapter_spec.js
@@ -0,0 +1,203 @@
+import { expect } from 'chai'
+import { spec, getPageKeywords, parseUserAgent } from 'modules/eightPodBidAdapter'
+import 'modules/priceFloors.js'
+import { config } from 'src/config.js'
+import { newBidder } from 'src/adapters/bidderFactory'
+import * as utils from '../../../src/utils';
+import sinon from 'sinon';
+
+describe('eightPodBidAdapter', function () {
+  const adapter = newBidder(spec)
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    const validBid = {
+      bidder: 'eightPod',
+      adUnitCode: '/adunit-code/test-path',
+      bidId: 'test-bid-id-1',
+      bidderRequestId: 'test-bid-request-1',
+      auctionId: 'test-auction-1',
+      transactionId: 'test-transactionId-1',
+      params: {
+        placementId: 'placementId1',
+      },
+    }
+    const invalidBid = {
+      bidder: 'eightPod',
+      adUnitCode: '/adunit-code/test-path',
+      bidId: 'test-bid-id-1',
+      bidderRequestId: 'test-bid-request-1',
+      auctionId: 'test-auction-1',
+      transactionId: 'test-transactionId-1',
+    }
+
+    beforeEach(() => {
+      config.resetConfig()
+    })
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(validBid)).to.equal(true)
+    })
+
+    it('should return false when required params found and invalid bid', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    let bidRequests, bidderRequest
+    beforeEach(function () {
+      bidRequests = [
+        {
+          bidder: 'eightPod',
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250],
+                [300, 600],
+              ],
+            },
+          },
+          adUnitCode: '/adunit-code/test-path',
+          bidId: 'test-bid-id-1',
+          bidderRequestId: 'test-bid-request-1',
+          auctionId: 'test-auction-1',
+          transactionId: 'test-transactionId-1',
+          params: {
+            placementId: 'placementId1',
+          }
+        }
+      ]
+      bidderRequest = {
+        refererInfo: {},
+        ortb2: {
+          device: {
+            ua: 'ua',
+            language: 'en',
+            dnt: 1,
+            js: 1,
+          }
+        } }
+    })
+
+    it('should return an empty array when no bid requests', function () {
+      const bidRequest = spec.buildRequests([], bidderRequest)
+      expect(bidRequest).to.be.an('array')
+      expect(bidRequest.length).to.equal(0)
+    })
+
+    it('should return a valid bid request object', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)
+
+      expect(request).to.be.an('array')
+      expect(request[0].data).to.be.an('object')
+      expect(request[0].method).to.equal('POST')
+      expect(request[0].url).to.not.equal('')
+      expect(request[0].url).to.not.equal(undefined)
+      expect(request[0].url).to.not.equal(null)
+    })
+  })
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should not trigger pixel if bid does not contain nurl', function() {
+      spec.onBidWon({});
+      expect(utils.triggerPixel.callCount).to.equal(0)
+    })
+
+    it('Should trigger pixel if bid nurl', function() {
+      spec.onBidWon({
+        burl: 'https://example.com/some-tracker'
+      });
+      expect(utils.triggerPixel.callCount).to.equal(1)
+    })
+  })
+
+  describe('getPageKeywords function', function() {
+    let sandbox;
+
+    beforeEach(() => {
+      sandbox = sinon.createSandbox();
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('should return the top document keywords if available', function() {
+      const keywordsContent = 'keyword1,keyword2,keyword3';
+      const fakeTopDocument = {
+        querySelector: sandbox.stub()
+          .withArgs('meta[name="keywords"]').returns({ content: keywordsContent })
+      };
+      const fakeTopWindow = { document: fakeTopDocument };
+
+      const result = getPageKeywords({ top: fakeTopWindow });
+      expect(result).to.equal(keywordsContent);
+    });
+
+    it('should return the current document keywords if top document is not accessible', function() {
+      const keywordsContent = 'keyword1,keyword2,keyword3';
+      sandbox.stub(document, 'querySelector')
+        .withArgs('meta[name="keywords"]').returns({ content: keywordsContent });
+
+      const fakeWindow = {
+        get top() {
+          throw new Error('Access denied');
+        }
+      };
+
+      const result = getPageKeywords(fakeWindow);
+      expect(result).to.equal(keywordsContent);
+    });
+
+    it('should return an empty string if no keywords meta tag is found', function() {
+      sandbox.stub(document, 'querySelector').withArgs('meta[name="keywords"]').returns(null);
+
+      const result = getPageKeywords();
+      expect(result).to.equal('');
+    });
+  });
+
+  describe('parseUserAgent function', function() {
+    let sandbox;
+
+    beforeEach(() => {
+      sandbox = sinon.createSandbox();
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('should return the platform and version IOS', function() {
+      const uaStub = sandbox.stub(window.navigator, 'userAgent');
+      uaStub.value('Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1');
+
+      const result = parseUserAgent();
+      expect(result.platform).to.equal('ios');
+      expect(result.version).to.equal('iphone');
+      expect(result.device).to.equal('16.6');
+    });
+
+    it('should return the platform and version android', function() {
+      const uaStub = sandbox.stub(window.navigator, 'userAgent');
+      uaStub.value('Mozilla/5.0 (Linux; Android 5.0.1; SM-G920V Build/LRX22C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36');
+
+      const result = parseUserAgent();
+      expect(result.platform).to.equal('android');
+      expect(result.version).to.equal('5.0');
+      expect(result.device).to.equal('');
+    })
+  })
+})
diff --git a/test/spec/modules/emtvBidAdapter_spec.js b/test/spec/modules/emtvBidAdapter_spec.js
index 4f95a0cc094..ce81dc15ad4 100644
--- a/test/spec/modules/emtvBidAdapter_spec.js
+++ b/test/spec/modules/emtvBidAdapter_spec.js
@@ -8,6 +8,16 @@ const adUrl = 'https://us-east-ep.engagemedia.tv/pbjs';
 const syncUrl = 'https://cs.engagemedia.tv';
 
 describe('EMTVBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -18,8 +28,9 @@ describe('EMTVBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -32,8 +43,9 @@ describe('EMTVBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -55,8 +67,9 @@ describe('EMTVBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -75,10 +88,22 @@ describe('EMTVBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
-    }
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
@@ -113,6 +138,7 @@ describe('EMTVBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -130,7 +156,7 @@ describe('EMTVBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -146,6 +172,56 @@ describe('EMTVBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -171,8 +247,10 @@ describe('EMTVBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -187,12 +265,38 @@ describe('EMTVBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -396,5 +500,17 @@ describe('EMTVBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal(`${syncUrl}/image?pbjs=1&ccpa_consent=1---&coppa=0`)
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal(`${syncUrl}/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0`)
+    });
   });
 });
diff --git a/test/spec/modules/enrichmentFpdModule_spec.js b/test/spec/modules/enrichmentFpdModule_spec.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/spec/modules/eplanningAnalyticsAdapter_spec.js b/test/spec/modules/eplanningAnalyticsAdapter_spec.js
deleted file mode 100644
index 419181de983..00000000000
--- a/test/spec/modules/eplanningAnalyticsAdapter_spec.js
+++ /dev/null
@@ -1,157 +0,0 @@
-import eplAnalyticsAdapter from 'modules/eplanningAnalyticsAdapter.js';
-import {includes} from 'src/polyfill.js';
-import { expect } from 'chai';
-import { parseUrl } from 'src/utils.js';
-import { server } from 'test/mocks/xhr.js';
-let adapterManager = require('src/adapterManager').default;
-let events = require('src/events');
-let constants = require('src/constants.json');
-
-describe('eplanning analytics adapter', function () {
-  beforeEach(function () {
-    sinon.stub(events, 'getEvents').returns([]);
-  });
-
-  afterEach(function () {
-    events.getEvents.restore();
-    eplAnalyticsAdapter.disableAnalytics();
-  });
-
-  describe('track', function () {
-    it('builds and sends auction data', function () {
-      sinon.spy(eplAnalyticsAdapter, 'track');
-
-      let auctionTimestamp = 1496510254313;
-      let pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
-      let initOptions = {
-        host: 'https://ads.ar.e-planning.net/hba/1/',
-        ci: '12345'
-      };
-      let pbidderCode = 'adapter';
-
-      const bidRequest = {
-        bidderCode: pbidderCode,
-        auctionId: pauctionId,
-        bidderRequestId: '1a6fc81528d0f6',
-        bids: [{
-          bidder: pbidderCode,
-          placementCode: 'container-1',
-          bidId: '208750227436c1',
-          bidderRequestId: '1a6fc81528d0f6',
-          auctionId: pauctionId,
-          startTime: 1509369418389,
-          sizes: [[300, 250]],
-        }],
-        auctionStart: 1509369418387,
-        timeout: 3000,
-        start: 1509369418389
-      };
-
-      const bidResponse = {
-        bidderCode: pbidderCode,
-        adId: '208750227436c1',
-        cpm: 0.015,
-        auctionId: pauctionId,
-        responseTimestamp: 1509369418832,
-        requestTimestamp: 1509369418389,
-        bidder: pbidderCode,
-        timeToRespond: 443,
-        size: '300x250',
-        width: 300,
-        height: 250,
-      };
-
-      let bidTimeout = [
-        {
-          bidId: '208750227436c1',
-          bidder: pbidderCode,
-          auctionId: pauctionId
-        }
-      ];
-
-      adapterManager.registerAnalyticsAdapter({
-        code: 'eplanning',
-        adapter: eplAnalyticsAdapter
-      });
-
-      adapterManager.enableAnalytics({
-        provider: 'eplanning',
-        options: initOptions
-      });
-
-      // Emit the events with the "real" arguments
-
-      // Step 1: Send auction init event
-      events.emit(constants.EVENTS.AUCTION_INIT, {
-        auctionId: pauctionId,
-        timestamp: auctionTimestamp
-      });
-
-      // Step 2: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
-
-      // Step 3: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
-
-      // Step 4: Send bid time out event
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
-
-      // Step 5: Send auction bid won event
-      events.emit(constants.EVENTS.BID_WON, {
-        adId: 'adIdData',
-        ad: 'adContent',
-        auctionId: pauctionId,
-        width: 300,
-        height: 250
-      });
-
-      // Step 6: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {auctionId: pauctionId});
-
-      // Step 7: Find the request data sent (filtering other hosts)
-      let requests = server.requests.filter(req => {
-        return req.url.indexOf(initOptions.host) > -1;
-      });
-      expect(requests.length).to.equal(1);
-
-      expect(includes([initOptions.host + initOptions.ci], requests[0].url));
-      expect(includes(['https://ads.ar.e-planning.net/hba/1/12345?d='], requests[0].url));
-
-      let info = requests[0].url;
-      let purl = parseUrl(info);
-      let eplData = JSON.parse(decodeURIComponent(purl.search.d));
-
-      // Step 8 check that 6 events were sent
-      expect(eplData.length).to.equal(6);
-
-      // Step 9 verify that we only receive the parameters we need
-      let expectedEventValues = [
-        // AUCTION INIT
-        {ec: constants.EVENTS.AUCTION_INIT,
-          p: {auctionId: pauctionId, time: auctionTimestamp}},
-        // BID REQ
-        {ec: constants.EVENTS.BID_REQUESTED,
-          p: {auctionId: pauctionId, time: 1509369418389, bidder: pbidderCode, bids: [{time: 1509369418389, sizes: [[300, 250]], bidder: pbidderCode, placementCode: 'container-1', auctionId: pauctionId}]}},
-        // BID RESP
-        {ec: constants.EVENTS.BID_RESPONSE,
-          p: {auctionId: pauctionId, bidder: pbidderCode, cpm: 0.015, size: '300x250', time: 1509369418832}},
-        // BID T.O.
-        {ec: constants.EVENTS.BID_TIMEOUT,
-          p: [{auctionId: pauctionId, bidder: pbidderCode}]},
-        // BID WON
-        {ec: constants.EVENTS.BID_WON,
-          p: {auctionId: pauctionId, size: '300x250'}},
-        // AUCTION END
-        {ec: constants.EVENTS.AUCTION_END,
-          p: {auctionId: pauctionId}}
-      ];
-
-      for (let evid = 0; evid < eplData.length; evid++) {
-        expect(eplData[evid]).to.deep.equal(expectedEventValues[evid]);
-      }
-
-      // Step 10 check that the host to send the ajax request is configurable via options
-      expect(eplAnalyticsAdapter.context.host).to.equal(initOptions.host);
-    });
-  });
-});
diff --git a/test/spec/modules/equativBidAdapter_spec.js b/test/spec/modules/equativBidAdapter_spec.js
new file mode 100644
index 00000000000..c66e97e6dbc
--- /dev/null
+++ b/test/spec/modules/equativBidAdapter_spec.js
@@ -0,0 +1,878 @@
+import { getBidFloor } from 'libraries/equativUtils/equativUtils.js';
+import { converter, spec, storage } from 'modules/equativBidAdapter.js';
+import { BANNER } from 'src/mediaTypes.js';
+import * as utils from '../../../src/utils.js';
+
+describe('Equativ bid adapter tests', () => {
+  let sandBox;
+
+  beforeEach(() => {
+    sandBox = sinon.createSandbox();
+    sandBox.stub(utils, 'logError');
+    sandBox.stub(utils, 'logWarn');
+  });
+
+  afterEach(() => sandBox.restore());
+
+  const DEFAULT_BANNER_BID_REQUESTS = [
+    {
+      adUnitCode: 'eqtv_42',
+      bidId: 'abcd1234',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [300, 600],
+          ],
+        },
+      },
+      bidder: 'equativ',
+      params: {
+        networkId: 111,
+      },
+      requestId: 'efgh5678',
+      ortb2Imp: {
+        ext: {
+          tid: 'zsfgzzg',
+        },
+      },
+    }
+  ];
+
+  const DEFAULT_VIDEO_BID_REQUESTS = [
+    {
+      adUnitCode: 'eqtv_43',
+      bidId: 'efgh5678',
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[640, 480]],
+          pos: 3,
+          skip: 1,
+          linearity: 1,
+          minduration: 10,
+          maxduration: 30,
+          minbitrate: 300,
+          maxbitrate: 600,
+          w: 640,
+          h: 480,
+          playbackmethod: [1],
+          api: [3],
+          mimes: ['video/x-flv', 'video/mp4'],
+          // protocols: [2, 3], // used in older adapter ... including as comment for reference
+          startdelay: 42,
+          battr: [13, 14],
+          placement: 1,
+        },
+      },
+      bidder: 'equativ',
+      params: {
+        networkId: 111,
+      },
+      requestId: 'abcd1234',
+      ortb2Imp: {
+        ext: {
+          tid: 'zsgzgzz',
+        },
+      },
+    }
+  ];
+
+  const nativeOrtbRequest = {
+    assets: [{
+      id: 0,
+      required: 1,
+      title: {
+        len: 140
+      }
+    },
+    {
+      id: 1,
+      required: 1,
+      img: {
+        type: 3,
+        w: 300,
+        h: 600
+      }
+    },
+    {
+      id: 2,
+      required: 1,
+      data: {
+        type: 1
+      }
+    }],
+    context: 1,
+    eventtrackers: [{
+      event: 1,
+      methods: [1, 2]
+    }],
+    plcmttype: 1,
+    privacy: 1,
+    ver: '1.2',
+  };
+  const DEFAULT_NATIVE_BID_REQUESTS = [
+    {
+      adUnitCode: 'equativ_native_42',
+      bidId: 'equativ_native_bidid_42',
+      mediaTypes: {
+        native: {
+          ortb: {
+            ...nativeOrtbRequest
+          }
+        },
+      },
+      nativeOrtbRequest,
+      bidder: 'equativ',
+      params: {
+        networkId: 777,
+      },
+      requestId: 'equativ_native_reqid_42',
+      ortb2Imp: {
+        ext: {
+          tid: 'equativ_native_tid_42',
+        },
+      },
+    }
+  ];
+
+  const DEFAULT_BANNER_BIDDER_REQUEST = {
+    bidderCode: 'equativ',
+    bids: DEFAULT_BANNER_BID_REQUESTS,
+  };
+
+  const DEFAULT_VIDEO_BIDDER_REQUEST = {
+    bidderCode: 'equativ',
+    bids: DEFAULT_VIDEO_BID_REQUESTS,
+  };
+
+  const DEFAULT_NATIVE_BIDDER_REQUEST = {
+    bidderCode: 'equativ',
+    bids: DEFAULT_NATIVE_BID_REQUESTS,
+  };
+
+  const SAMPLE_RESPONSE = {
+    body: {
+      id: '12h712u7-k22g-8124-ab7a-h268s22dy271',
+      seatbid: [
+        {
+          bid: [
+            {
+              id: '1bh7jku7-ko2g-8654-ab72-h268shvwy271',
+              impid: 'r12gwgf231',
+              price: 0.6565,
+              adm: '
AD
',
+              adomain: ['abc.com'],
+              cid: '1242512',
+              crid: '535231',
+              w: 300,
+              h: 600,
+              mtype: 1,
+              cat: ['IAB19', 'IAB19-1'],
+              cattax: 1,
+            },
+          ],
+          seat: '4212',
+        },
+      ],
+      cur: 'USD',
+      statuscode: 0,
+    },
+  };
+
+  describe('buildRequests', () => {
+    it('should build correct requests using ORTB converter', () => {
+      const request = spec.buildRequests(
+        DEFAULT_BANNER_BID_REQUESTS,
+        DEFAULT_BANNER_BIDDER_REQUEST
+      );
+      const dataFromConverter = converter.toORTB({
+        bidderRequest: DEFAULT_BANNER_BIDDER_REQUEST,
+        bidRequests: DEFAULT_BANNER_BID_REQUESTS,
+      });
+      expect(request[0]).to.deep.equal({
+        data: { ...dataFromConverter, id: request[0].data.id },
+        method: 'POST',
+        url: 'https://ssb-global.smartadserver.com/api/bid?callerId=169',
+      });
+    });
+
+    it('should add ext.bidder to imp object when siteId is defined', () => {
+      const bidRequests = [
+        { ...DEFAULT_BANNER_BID_REQUESTS[0], params: { siteId: 123 } },
+      ];
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.imp[0].ext.bidder).to.deep.equal({
+        siteId: 123,
+      });
+    });
+
+    it('should add ext.bidder to imp object when pageId is defined', () => {
+      const bidRequests = [
+        { ...DEFAULT_BANNER_BID_REQUESTS[0], params: { pageId: 123 } },
+      ];
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.imp[0].ext.bidder).to.deep.equal({
+        pageId: 123,
+      });
+    });
+
+    it('should add ext.bidder to imp object when formatId is defined', () => {
+      const bidRequests = [
+        { ...DEFAULT_BANNER_BID_REQUESTS[0], params: { formatId: 123 } },
+      ];
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.imp[0].ext.bidder).to.deep.equal({
+        formatId: 123,
+      });
+    });
+
+    it('should not add ext.bidder to imp object when siteId, pageId, formatId are not defined', () => {
+      const bidRequests = [{ ...DEFAULT_BANNER_BID_REQUESTS[0], params: {} }];
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.imp[0].ext.bidder).to.be.undefined;
+    });
+
+    it('should add site.publisher.id param', () => {
+      const request = spec.buildRequests(
+        DEFAULT_BANNER_BID_REQUESTS,
+        DEFAULT_BANNER_BIDDER_REQUEST
+      )[0];
+      expect(request.data.site.publisher.id).to.equal(111);
+    });
+
+    it('should pass ortb2.site.publisher.id', () => {
+      const bidRequests = [{
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        ortb2: {
+          site: {
+            publisher: {
+              id: 98,
+            }
+          }
+        }
+      }];
+      delete bidRequests[0].params;
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.site.publisher.id).to.equal(98);
+    });
+
+    it('should pass networkId as site.publisher.id', () => {
+      const bidRequests = [{
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        ortb2: {
+          site: {
+            publisher: {}
+          }
+        }
+      }];
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.site.publisher.id).to.equal(111);
+    });
+
+    it('should pass ortb2.app.publisher.id', () => {
+      const bidRequests = [{
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        ortb2: {
+          app: {
+            publisher: {
+              id: 27,
+            }
+          }
+        }
+      }];
+      delete bidRequests[0].params;
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.app.publisher.id).to.equal(27);
+    });
+
+    it('should pass networkId as app.publisher.id', () => {
+      const bidRequests = [{
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        ortb2: {
+          app: {
+            publisher: {}
+          }
+        }
+      }];
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.app.publisher.id).to.equal(111);
+    });
+
+    it('should pass ortb2.dooh.publisher.id', () => {
+      const bidRequests = [{
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        ortb2: {
+          dooh: {
+            publisher: {
+              id: 35,
+            }
+          }
+        }
+      }];
+      delete bidRequests[0].params;
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.dooh.publisher.id).to.equal(35);
+    });
+
+    it('should pass networkId as dooh.publisher.id', () => {
+      const bidRequests = [{
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        ortb2: {
+          dooh: {
+            publisher: {}
+          }
+        }
+      }];
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.dooh.publisher.id).to.equal(111);
+    });
+
+    it('should send default floor of 0.0', () => {
+      const request = spec.buildRequests(
+        DEFAULT_BANNER_BID_REQUESTS,
+        DEFAULT_BANNER_BIDDER_REQUEST
+      )[0];
+      expect(request.data.imp[0]).to.have.property('bidfloor').that.eq(0.0);
+    });
+
+    it('should send secure connection', () => {
+      const request = spec.buildRequests(
+        DEFAULT_BANNER_BID_REQUESTS,
+        DEFAULT_BANNER_BIDDER_REQUEST
+      )[0];
+      expect(request.data.imp[0]).to.have.property('secure').that.eq(1);
+    });
+
+    it('should have tagid', () => {
+      const request = spec.buildRequests(
+        DEFAULT_BANNER_BID_REQUESTS,
+        DEFAULT_BANNER_BIDDER_REQUEST
+      )[0];
+      expect(request.data.imp[0]).to.have.property('tagid').that.eq(DEFAULT_BANNER_BID_REQUESTS[0].adUnitCode);
+    });
+
+    it('should remove dt', () => {
+      const bidRequests = [
+        { ...DEFAULT_BANNER_BID_REQUESTS[0], ortb2Imp: { dt: 1728377558235 } }
+      ];
+      const bidderRequest = { ...DEFAULT_BANNER_BIDDER_REQUEST, bids: bidRequests };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.imp[0]).to.not.have.property('dt');
+    });
+
+    it('should read and send pid as buyeruid', () => {
+      const cookieData = {
+        'eqt_pid': '7789746781'
+      };
+      const getCookieStub = sinon.stub(storage, 'getCookie');
+      getCookieStub.callsFake(cookieName => cookieData[cookieName]);
+
+      const request = spec.buildRequests(
+        DEFAULT_BANNER_BID_REQUESTS,
+        DEFAULT_BANNER_BIDDER_REQUEST
+      )[0];
+
+      expect(request.data.user).to.have.property('buyeruid').that.eq(cookieData['eqt_pid']);
+
+      getCookieStub.restore();
+    });
+
+    it('should not send buyeruid', () => {
+      const getCookieStub = sinon.stub(storage, 'getCookie');
+      getCookieStub.callsFake(() => null);
+
+      const request = spec.buildRequests(
+        DEFAULT_BANNER_BID_REQUESTS,
+        DEFAULT_BANNER_BIDDER_REQUEST
+      )[0];
+
+      expect(request.data).to.not.have.property('user');
+
+      getCookieStub.restore();
+    });
+
+    it('should pass buyeruid defined in config', () => {
+      const getCookieStub = sinon.stub(storage, 'getCookie');
+      getCookieStub.callsFake(() => undefined);
+
+      const bidRequest = {
+        ...DEFAULT_BANNER_BIDDER_REQUEST,
+        ortb2: {
+          user: {
+            buyeruid: 'buyeruid-provided-by-publisher'
+          }
+        }
+      };
+      const request = spec.buildRequests([ DEFAULT_BANNER_BID_REQUESTS[0] ], bidRequest)[0];
+
+      expect(request.data.user.buyeruid).to.deep.eq(bidRequest.ortb2.user.buyeruid);
+
+      getCookieStub.restore();
+    });
+
+    it('should build a video request properly under normal circumstances', () => {
+      // ASSEMBLE
+      if (FEATURES.VIDEO) {
+        // ACT
+        const request = spec.buildRequests(DEFAULT_VIDEO_BID_REQUESTS, {})[0].data;
+
+        // ASSERT
+        expect(request.imp[0]).to.have.property('video');
+
+        const videoObj = request.imp[0].video;
+
+        expect(videoObj).to.have.property('api').and.to.deep.equal([3]);
+        expect(videoObj).to.have.property('battr').and.to.deep.equal([13, 14]);
+        expect(videoObj).to.have.property('linearity').and.to.equal(1);
+        expect(videoObj).to.have.property('mimes').and.to.deep.equal(['video/x-flv', 'video/mp4']);
+        expect(videoObj).to.have.property('minbitrate').and.to.equal(300);
+        expect(videoObj).to.have.property('maxbitrate').and.to.equal(600);
+        expect(videoObj).to.have.property('minduration').and.to.equal(10);
+        expect(videoObj).to.have.property('maxduration').and.to.equal(30);
+        expect(videoObj).to.have.property('placement').and.to.equal(1);
+        expect(videoObj).to.have.property('playbackmethod').and.to.deep.equal([1]);
+        expect(videoObj).to.have.property('pos').and.to.equal(3);
+        expect(videoObj).to.have.property('skip').and.to.equal(1);
+        expect(videoObj).to.have.property('startdelay').and.to.equal(42);
+        expect(videoObj).to.have.property('w').and.to.equal(640);
+        expect(videoObj).to.have.property('h').and.to.equal(480);
+        expect(videoObj).not.to.have.property('ext');
+      }
+    });
+
+    it('should read and pass ortb2Imp.rwdd', () => {
+      // ASSEMBLE
+      if (FEATURES.VIDEO) {
+        const bidRequestsWithOrtb2ImpRwdd = [
+          {
+            ...DEFAULT_VIDEO_BID_REQUESTS[0],
+            ortb2Imp: {
+              rwdd: 1
+            }
+          }
+        ];
+        // ACT
+        const request = spec.buildRequests(bidRequestsWithOrtb2ImpRwdd, {})[0].data;
+
+        // ASSERT
+        expect(request.imp[0]).to.have.property('rwdd').and.to.equal(1);
+      }
+    });
+
+    it('should read mediaTypes.video.ext.rewarded and pass as rwdd', () => {
+      // ASSEMBLE
+      if (FEATURES.VIDEO) {
+        const bidRequestsWithExtReworded = [
+          {
+            ...DEFAULT_VIDEO_BID_REQUESTS[0],
+            mediaTypes: {
+              video: {
+                ext: {
+                  rewarded: 1
+                }
+              }
+            }
+          }
+        ];
+        // ACT
+        const request = spec.buildRequests(bidRequestsWithExtReworded, {})[0].data;
+
+        // ASSERT
+        expect(request.imp[0]).to.have.property('rwdd').and.to.equal(1);
+      }
+    });
+
+    it('should prioritize ortb2Imp.rwdd over mediaTypes.video.ext.rewarded', () => {
+      // ASSEMBLE
+      if (FEATURES.VIDEO) {
+        const bidRequestsWithBothRewordedParams = [
+          {
+            ...DEFAULT_VIDEO_BID_REQUESTS[0],
+            mediaTypes: {
+              video: {
+                ext: {
+                  rewarded: 1
+                }
+              }
+            },
+            ortb2Imp: {
+              rwdd: 2
+            }
+          }
+        ];
+        // ACT
+        const request = spec.buildRequests(bidRequestsWithBothRewordedParams, {})[0].data;
+
+        // ASSERT
+        expect(request.imp[0]).to.have.property('rwdd').and.to.equal(2);
+      }
+    });
+
+    it('should warn about missing required properties for video requests', () => {
+      // ASSEMBLE
+      const missingRequiredVideoRequest = DEFAULT_VIDEO_BID_REQUESTS[0];
+
+      // removing required properties
+      delete missingRequiredVideoRequest.mediaTypes.video.mimes;
+      delete missingRequiredVideoRequest.mediaTypes.video.placement;
+
+      const bidRequests = [ missingRequiredVideoRequest ];
+      const bidderRequest = { ...DEFAULT_VIDEO_BIDDER_REQUEST, bids: bidRequests };
+
+      // ACT
+      spec.buildRequests(bidRequests, bidderRequest);
+
+      // ASSERT
+      expect(utils.logWarn.callCount).to.equal(2);
+      expect(utils.logWarn.getCall(0).args[0]).to.satisfy(arg => arg.includes('"mimes" is missing'));
+      expect(utils.logWarn.getCall(1).args[0]).to.satisfy(arg => arg.includes('"placement" is missing'));
+    });
+
+    it('should not send a video request when it has an empty body and no other impressions with any media types are defined', () => {
+      // ASSEMBLE
+      const emptyVideoRequest = {
+        ...DEFAULT_VIDEO_BID_REQUESTS[0],
+        mediaTypes: {
+          video: {}
+        }
+      };
+      const bidRequests = [ emptyVideoRequest ];
+      const bidderRequest = { ...DEFAULT_VIDEO_BIDDER_REQUEST, bids: bidRequests };
+
+      // ACT
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      // ASSERT
+      expect(utils.logError.calledOnce).to.equal(true);
+      expect(utils.logError.args[0][0]).to.satisfy(arg => arg.includes('No request'));
+      expect(request).to.be.undefined;
+    });
+
+    it('should build a native request properly under normal circumstances', () => {
+      if (FEATURES.NATIVE) {
+        // ASSEMBLE
+        const expectedResult = true;
+
+        // ACT
+        const request = spec.buildRequests(DEFAULT_NATIVE_BID_REQUESTS, {})[0].data;
+
+        // ASSERT
+        expect(request.imp[0]).to.have.property('native');
+
+        const nativeObj = request.imp[0].native;
+        expect(nativeObj).to.have.property('ver').and.to.equal('1.2');
+        expect(nativeObj).to.have.property('request').and.to.be.a('string');
+
+        const requestObj = JSON.parse(nativeObj.request);
+        expect(requestObj).to.have.property('assets').and.to.be.an('array');
+        expect(requestObj).to.have.property('eventtrackers').and.to.be.an('array');
+        expect(requestObj).to.have.property('plcmttype').and.to.equal(1);
+        expect(requestObj).to.have.property('privacy').and.to.equal(1);
+        expect(requestObj).to.have.property('ver').and.to.equal('1.2');
+      }
+    });
+
+    it('should not send a native request when it has an empty body and no other impressions with any media types are defined', () => {
+      if (FEATURES.NATIVE) {
+        // ASSEMBLE
+        const emptyNativeRequest = {
+          ...DEFAULT_NATIVE_BID_REQUESTS[0],
+          mediaTypes: {
+            native: {}
+          }
+        };
+        const bidRequests = [ emptyNativeRequest ];
+        const bidderRequest = { ...DEFAULT_NATIVE_BIDDER_REQUEST, bids: bidRequests };
+
+        // ACT
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+
+        // ASSERT
+        expect(utils.logError.calledOnce).to.equal(true);
+        expect(utils.logError.args[0][0]).to.satisfy(arg => arg.includes('No request'));
+        expect(request).to.be.undefined;
+      }
+    });
+
+    it('should warn about missing "assets" property for native requests', () => {
+      if (FEATURES.NATIVE) {
+        // ASSEMBLE
+        const missingRequiredNativeRequest = DEFAULT_NATIVE_BID_REQUESTS[0];
+
+        // removing just "assets" for this test
+        delete missingRequiredNativeRequest.nativeOrtbRequest.assets;
+        const bidRequests = [ missingRequiredNativeRequest ];
+        const bidderRequest = { ...DEFAULT_NATIVE_BIDDER_REQUEST, bids: bidRequests };
+
+        // this value comes from native.js, part of the ortbConverter library
+        const warningMsgFromLibrary = 'mediaTypes.native is set, but no assets were specified. Native request skipped.'
+
+        // ACT
+        spec.buildRequests(bidRequests, bidderRequest);
+
+        // ASSERT
+        expect(utils.logWarn.callCount).to.equal(1)
+        expect(utils.logWarn.getCall(0).args[0]).to.satisfy(arg => arg.includes(warningMsgFromLibrary));
+      }
+    });
+
+    it('should warn about other missing required properties for native requests', () => {
+      if (FEATURES.NATIVE) {
+        // ASSEMBLE
+        const missingRequiredNativeRequest = DEFAULT_NATIVE_BID_REQUESTS[0];
+
+        // ortbConverter library will warn about missing assets; we supply warnings for these properties here
+        delete missingRequiredNativeRequest.mediaTypes.native.ortb.eventtrackers;
+        delete missingRequiredNativeRequest.mediaTypes.native.ortb.plcmttype;
+        delete missingRequiredNativeRequest.mediaTypes.native.ortb.privacy;
+
+        const bidRequests = [ missingRequiredNativeRequest ];
+        const bidderRequest = { ...DEFAULT_NATIVE_BIDDER_REQUEST, bids: bidRequests };
+
+        // ACT
+        spec.buildRequests(bidRequests, bidderRequest);
+
+        // ASSERT
+        expect(utils.logWarn.callCount).to.equal(4); // the first message, regarding missing assets, is supplied by the ortbConverter library
+        expect(utils.logWarn.getCall(0).args[0]).to.satisfy(arg => arg.includes('no assets were specified'));
+        expect(utils.logWarn.getCall(1).args[0]).to.satisfy(arg => arg.includes('"privacy" is missing'));
+        expect(utils.logWarn.getCall(2).args[0]).to.satisfy(arg => arg.includes('"plcmttype" is missing'));
+        expect(utils.logWarn.getCall(3).args[0]).to.satisfy(arg => arg.includes('"eventtrackers" is missing'));
+      }
+    });
+  });
+
+  describe('getBidFloor', () => {
+    it('should return floor of 0.0 if floor module not available', () => {
+      const bid = {
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        getFloor: false,
+      };
+      expect(getBidFloor(bid)).to.deep.eq(0.0);
+    });
+
+    it('should return floor of 0.0 if mediaTypes not defined', () => {
+      const bid = {
+        getFloor: () => ({})
+      };
+      expect(bid.mediaTypes).to.be.undefined;
+      expect(getBidFloor(bid)).to.deep.eq(0.0);
+    });
+
+    it('should return proper min floor', () => {
+      const bid = {
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        getFloor: data => {
+          if (data.size[0] === 300 && data.size[1] === 250) {
+            return { floor: 1.13 };
+          } else if (data.size[0] === 300 && data.size[1] === 600) {
+            return { floor: 1.39 };
+          } else {
+            return { floor: 0.52 };
+          }
+        }
+      };
+      expect(getBidFloor(bid, 'USD', BANNER)).to.deep.eq(1.13);
+    });
+
+    it('should return global media type floor if no rule for size', () => {
+      const bid = {
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        getFloor: data => {
+          if (data.size[0] === 728 && data.size[1] === 90) {
+            return { floor: 1.13 };
+          } else if (data.size[0] === 300 && data.size[1] === 600) {
+            return { floor: 1.36 };
+          } else {
+            return { floor: 0.34 };
+          }
+        }
+      };
+      expect(getBidFloor(bid, 'USD', BANNER)).to.deep.eq(0.34);
+    });
+
+    it('should return floor of 0 if no rule for size', () => {
+      const bid = {
+        ...DEFAULT_BANNER_BID_REQUESTS[0],
+        getFloor: data => {
+          if (data.size[0] === 728 && data.size[1] === 90) {
+            return { floor: 1.13 };
+          } else if (data.size[0] === 300 && data.size[1] === 600) {
+            return { floor: 1.36 };
+          } else {
+            return {};
+          }
+        }
+      };
+      expect(getBidFloor(bid, 'USD', BANNER)).to.deep.eq(0.0);
+    });
+  });
+
+  describe('getUserSyncs', () => {
+    let setCookieStub;
+
+    beforeEach(() => setCookieStub = sinon.stub(storage, 'setCookie'));
+
+    afterEach(() => setCookieStub.restore());
+
+    it('should return empty array if iframe sync not enabled', () => {
+      const syncs = spec.getUserSyncs({}, SAMPLE_RESPONSE);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should retrieve and save user pid', (done) => {
+      const userSyncs = spec.getUserSyncs(
+        { iframeEnabled: true },
+        SAMPLE_RESPONSE
+      );
+
+      window.dispatchEvent(new MessageEvent('message', {
+        data: {
+          pid: '7767825890726'
+        },
+        origin: 'https://apps.smartadserver.com'
+      }));
+
+      const exp = new Date();
+      exp.setTime(Date.now() + 31536000000);
+
+      setTimeout(() => {
+        expect(setCookieStub.calledOnce).to.be.true;
+        expect(setCookieStub.calledWith('eqt_pid', '7767825890726', exp.toUTCString())).to.be.true;
+        done();
+      });
+    });
+
+    it('should not save user pid coming from not origin', (done) => {
+      const userSyncs = spec.getUserSyncs(
+        { iframeEnabled: true },
+        SAMPLE_RESPONSE
+      );
+
+      window.dispatchEvent(new MessageEvent('message', {
+        data: {
+          pid: '7767825890726'
+        },
+        origin: 'https://another-origin.com'
+      }));
+
+      setTimeout(() => {
+        expect(setCookieStub.notCalled).to.be.true;
+        done();
+      });
+    });
+
+    it('should not save empty pid', (done) => {
+      const userSyncs = spec.getUserSyncs(
+        { iframeEnabled: true },
+        SAMPLE_RESPONSE
+      );
+
+      window.dispatchEvent(new MessageEvent('message', {
+        data: {
+          pid: ''
+        },
+        origin: 'https://apps.smartadserver.com'
+      }));
+
+      setTimeout(() => {
+        expect(setCookieStub.notCalled).to.be.true;
+        done();
+      });
+    });
+
+    it('should return array including iframe cookie sync object', () => {
+      const syncs = spec.getUserSyncs(
+        { iframeEnabled: true },
+        SAMPLE_RESPONSE
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0]).to.deep.equal({
+        type: 'iframe',
+        url: 'https://apps.smartadserver.com/diff/templates/asset/csync.html'
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    it('should return data returned by ORTB converter', () => {
+      const request = spec.buildRequests(
+        DEFAULT_BANNER_BID_REQUESTS,
+        DEFAULT_BANNER_BIDDER_REQUEST
+      )[0];
+      const bids = spec.interpretResponse(SAMPLE_RESPONSE, request);
+      expect(bids).to.deep.equal(
+        converter.fromORTB({
+          request: request.data,
+          response: SAMPLE_RESPONSE.body,
+        })
+      );
+    });
+  });
+
+  describe('isBidRequestValid', () => {
+    it('should return true if params.networkId is set', () => {
+      const bidRequest = {
+        params: {
+          networkId: 123,
+        },
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true if ortb2.site.publisher.id is set', () => {
+      const bidRequest = {
+        ortb2: {
+          site: {
+            publisher: {
+              id: 123,
+            },
+          },
+        },
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true if ortb2.app.publisher.id is set', () => {
+      const bidRequest = {
+        ortb2: {
+          app: {
+            publisher: {
+              id: 123,
+            },
+          },
+        },
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true if ortb2.dooh.publisher.id is set', () => {
+      const bidRequest = {
+        ortb2: {
+          dooh: {
+            publisher: {
+              id: 123,
+            },
+          },
+        },
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return false if networkId is not set', () => {
+      const bidRequest = {};
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+  });
+});
diff --git a/test/spec/modules/eskimiBidAdapter_spec.js b/test/spec/modules/eskimiBidAdapter_spec.js
index d01240c86ab..a452f115767 100644
--- a/test/spec/modules/eskimiBidAdapter_spec.js
+++ b/test/spec/modules/eskimiBidAdapter_spec.js
@@ -1,5 +1,5 @@
-import { expect } from 'chai';
-import { spec } from 'modules/eskimiBidAdapter.js';
+import {expect} from 'chai';
+import {spec} from 'modules/eskimiBidAdapter.js';
 import * as utils from 'src/utils';
 
 const BANNER_BID = {
@@ -33,7 +33,7 @@ const VIDEO_BID = {
       playbackmethod: [2, 4, 6],
       playerSize: [[1024, 768]],
       protocols: [3, 4, 7, 8, 10],
-      placement: 1,
+      plcmt: 1,
       minduration: 0,
       maxduration: 60,
       startdelay: 0
@@ -165,8 +165,8 @@ describe('Eskimi bid adapter', function () {
     it('should properly forward ORTB blocking params', function () {
       let bid = utils.deepClone(BANNER_BID);
       bid = utils.mergeDeep(bid, {
-        params: { bcat: ['IAB1-1'], badv: ['example.com'], bapp: ['com.example'] },
-        mediaTypes: { banner: { battr: [1] } }
+        params: {bcat: ['IAB1-1'], badv: ['example.com'], bapp: ['com.example']},
+        mediaTypes: {banner: {battr: [1]}}
       });
 
       let [request] = spec.buildRequests([bid], BIDDER_REQUEST);
@@ -222,7 +222,7 @@ describe('Eskimi bid adapter', function () {
           mimes: ['video/mp4', 'video/x-flv'],
           playbackmethod: [3, 4],
           protocols: [5, 6],
-          placement: 1,
+          plcmt: 1,
           minduration: 0,
           maxduration: 60,
           w: 1024,
@@ -253,7 +253,7 @@ describe('Eskimi bid adapter', function () {
         const [request] = spec.buildRequests([bid], BIDDER_REQUEST);
         const response = utils.deepClone(BANNER_BID_RESPONSE);
 
-        const bids = spec.interpretResponse({ body: response }, request);
+        const bids = spec.interpretResponse({body: response}, request);
         expect(bids).to.be.an('array').that.is.not.empty;
 
         expect(bids[0].mediaType).to.equal('banner');
@@ -274,7 +274,7 @@ describe('Eskimi bid adapter', function () {
         const bid = utils.deepClone(BANNER_BID);
 
         let request = spec.buildRequests([bid], BIDDER_REQUEST)[0];
-        const EMPTY_RESP = Object.assign({}, BANNER_BID_RESPONSE, { 'body': {} });
+        const EMPTY_RESP = Object.assign({}, BANNER_BID_RESPONSE, {'body': {}});
         const bids = spec.interpretResponse(EMPTY_RESP, request);
         expect(bids).to.be.empty;
       });
@@ -285,7 +285,7 @@ describe('Eskimi bid adapter', function () {
           const bid = utils.deepClone(VIDEO_BID);
 
           const [request] = spec.buildRequests([bid], BIDDER_REQUEST);
-          const bids = spec.interpretResponse({ body: VIDEO_BID_RESPONSE }, request);
+          const bids = spec.interpretResponse({body: VIDEO_BID_RESPONSE}, request);
           expect(bids).to.be.an('array').that.is.not.empty;
 
           expect(bids[0].mediaType).to.equal('video');
diff --git a/test/spec/modules/euidIdSystem_spec.js b/test/spec/modules/euidIdSystem_spec.js
index 4f6bacebe6a..aff1e0535ae 100644
--- a/test/spec/modules/euidIdSystem_spec.js
+++ b/test/spec/modules/euidIdSystem_spec.js
@@ -1,11 +1,14 @@
-import {coreStorage, init, setSubmoduleRegistry} from 'modules/userId/index.js';
+import {attachIdSystem, coreStorage, init, setSubmoduleRegistry} from 'modules/userId/index.js';
 import {config} from 'src/config.js';
 import {euidIdSubmodule} from 'modules/euidIdSystem.js';
-import 'modules/consentManagement.js';
+import 'modules/consentManagementTcf.js';
 import 'src/prebid.js';
+import * as utils from 'src/utils.js';
 import {apiHelpers, cookieHelpers, runAuction, setGdprApplies} from './uid2IdSystem_helpers.js';
 import {hook} from 'src/hook.js';
-import {uninstall as uninstallGdprEnforcement} from 'modules/gdprEnforcement.js';
+import {uninstall as uninstallTcfControl} from 'modules/tcfControl.js';
+import {server} from 'test/mocks/xhr';
+import {createEidsArray} from '../../../modules/userId/eids.js';
 
 let expect = require('chai').expect;
 
@@ -20,45 +23,60 @@ const refreshedToken = 'refreshed-advertising-token';
 const auctionDelayMs = 10;
 
 const makeEuidIdentityContainer = (token) => ({euid: {id: token}});
+const makeEuidOptoutContainer = (token) => ({euid: {optout: true}});
 const useLocalStorage = true;
+
 const makePrebidConfig = (params = null, extraSettings = {}, debug = false) => ({
   userSync: { auctionDelay: auctionDelayMs, userIds: [{name: 'euid', params: {storage: useLocalStorage ? 'localStorage' : 'cookie', ...params}, ...extraSettings}] }, debug
 });
 
+const cstgConfigParams = { serverPublicKey: 'UID2-X-L-24B8a/eLYBmRkXA9yPgRZt+ouKbXewG2OPs23+ov3JC8mtYJBCx6AxGwJ4MlwUcguebhdDp2CvzsCgS9ogwwGA==', subscriptionId: 'subscription-id' }
+const clientSideGeneratedToken = 'client-side-generated-advertising-token';
+const optoutToken = 'optout-token';
+
 const apiUrl = 'https://prod.euid.eu/v2/token/refresh';
+const cstgApiUrl = 'https://prod.euid.eu/v2/token/client-generate';
 const headers = { 'Content-Type': 'application/json' };
-const makeSuccessResponseBody = () => btoa(JSON.stringify({ status: 'success', body: { ...apiHelpers.makeTokenResponse(initialToken), advertising_token: refreshedToken } }));
+const makeSuccessResponseBody = (token) => btoa(JSON.stringify({ status: 'success', body: { ...apiHelpers.makeTokenResponse(initialToken), advertising_token: token } }));
+const makeOptoutResponseBody = (token) => btoa(JSON.stringify({ status: 'optout', body: { ...apiHelpers.makeTokenResponse(initialToken), advertising_token: token } }));
 const expectToken = (bid, token) => expect(bid?.userId ?? {}).to.deep.include(makeEuidIdentityContainer(token));
+const expectOptout = (bid, token) => expect(bid?.userId ?? {}).to.deep.include(makeEuidOptoutContainer(token));
 const expectNoIdentity = (bid) => expect(bid).to.not.haveOwnProperty('userId');
 
 describe('EUID module', function() {
-  let suiteSandbox, testSandbox, timerSpy, fullTestTitle, restoreSubtleToUndefined = false;
-  let server;
+  let suiteSandbox, restoreSubtleToUndefined = false;
 
   const configureEuidResponse = (httpStatus, response) => server.respondWith('POST', apiUrl, (xhr) => xhr.respond(httpStatus, headers, response));
+  const configureEuidCstgResponse = (httpStatus, response) => server.respondWith('POST', cstgApiUrl, (xhr) => xhr.respond(httpStatus, headers, response));
 
   before(function() {
-    uninstallGdprEnforcement();
+    uninstallTcfControl();
     hook.ready();
     suiteSandbox = sinon.sandbox.create();
     if (typeof window.crypto.subtle === 'undefined') {
       restoreSubtleToUndefined = true;
-      window.crypto.subtle = { importKey: () => {}, decrypt: () => {} };
+      window.crypto.subtle = { importKey: () => {}, digest: () => {}, decrypt: () => {}, deriveKey: () => {}, encrypt: () => {}, generateKey: () => {}, exportKey: () => {} };
     }
     suiteSandbox.stub(window.crypto.subtle, 'importKey').callsFake(() => Promise.resolve());
+    suiteSandbox.stub(window.crypto.subtle, 'digest').callsFake(() => Promise.resolve('hashed_value'));
     suiteSandbox.stub(window.crypto.subtle, 'decrypt').callsFake((settings, key, data) => Promise.resolve(new Uint8Array([...settings.iv, ...data])));
+    suiteSandbox.stub(window.crypto.subtle, 'deriveKey').callsFake(() => Promise.resolve());
+    suiteSandbox.stub(window.crypto.subtle, 'exportKey').callsFake(() => Promise.resolve());
+    suiteSandbox.stub(window.crypto.subtle, 'encrypt').callsFake(() => Promise.resolve(new ArrayBuffer()));
+    suiteSandbox.stub(window.crypto.subtle, 'generateKey').callsFake(() => Promise.resolve({
+      privateKey: {},
+      publicKey: {}
+    }));
   });
   after(function() {
     suiteSandbox.restore();
     if (restoreSubtleToUndefined) window.crypto.subtle = undefined;
   });
   beforeEach(function() {
-    server = sinon.createFakeServer();
     init(config);
     setSubmoduleRegistry([euidIdSubmodule]);
   });
   afterEach(function() {
-    server.restore();
     $$PREBID_GLOBAL$$.requestBids.removeAll();
     config.resetConfig();
     cookieHelpers.clearCookies(moduleCookieName, publisherCookieName);
@@ -115,10 +133,53 @@ describe('EUID module', function() {
   it('When an expired token is provided and the API responds in time, the refreshed token is provided to the auction.', async function() {
     setGdprApplies(true);
     const euidToken = apiHelpers.makeTokenResponse(initialToken, true, true);
-    configureEuidResponse(200, makeSuccessResponseBody());
+    configureEuidResponse(200, makeSuccessResponseBody(refreshedToken));
     config.setConfig(makePrebidConfig({euidToken}));
     apiHelpers.respondAfterDelay(1, server);
     const bid = await runAuction();
     expectToken(bid, refreshedToken);
   });
+
+  if (FEATURES.UID2_CSTG) {
+    it('Should use client side generated EUID token in the auction.', async function() {
+      setGdprApplies(true);
+      const euidToken = apiHelpers.makeTokenResponse(initialToken, true, true);
+      configureEuidCstgResponse(200, makeSuccessResponseBody(clientSideGeneratedToken));
+      config.setConfig(makePrebidConfig({ euidToken, ...cstgConfigParams, email: 'test@test.com' }));
+      apiHelpers.respondAfterDelay(1, server);
+
+      const bid = await runAuction();
+      expectToken(bid, clientSideGeneratedToken);
+    });
+    it('Should receive an optout response when the user has opted out.', async function() {
+      setGdprApplies(true);
+      const euidToken = apiHelpers.makeTokenResponse(initialToken, true, true);
+      configureEuidCstgResponse(200, makeOptoutResponseBody(optoutToken));
+      config.setConfig(makePrebidConfig({ euidToken, ...cstgConfigParams, email: 'optout@test.com' }));
+      apiHelpers.respondAfterDelay(1, server);
+
+      const bid = await runAuction();
+      expectOptout(bid, optoutToken);
+    });
+  }
+
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(euidIdSubmodule);
+    });
+    it('euid', function() {
+      const userId = {
+        euid: {'id': 'Sample_AD_Token'}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'euid.eu',
+        uids: [{
+          id: 'Sample_AD_Token',
+          atype: 3
+        }]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/exadsBidAdapter_spec.js b/test/spec/modules/exadsBidAdapter_spec.js
new file mode 100644
index 00000000000..ca24dad3959
--- /dev/null
+++ b/test/spec/modules/exadsBidAdapter_spec.js
@@ -0,0 +1,632 @@
+import { expect } from 'chai';
+import { spec, imps } from 'modules/exadsBidAdapter.js';
+import { BANNER, NATIVE, VIDEO } from '../../../src/mediaTypes.js';
+
+describe('exadsBidAdapterTest', function () {
+  const bidder = 'exads';
+
+  const partners = {
+    ORTB_2_4: 'ortb_2_4'
+  };
+
+  const imageBanner = {
+    mediaTypes: {
+      banner: {
+        sizes: [300, 250]
+      }
+    },
+    bidder: bidder,
+    params: {
+      zoneId: 5147485,
+      fid: '829a896f011475d505a0d89cfdd1af8d9cdb07ff',
+      partner: partners.ORTB_2_4,
+      siteId: '12345',
+      siteName: 'your-site.com',
+      catIab: ['IAB25-3'],
+      userIp: '0.0.0.0',
+      userId: '',
+      country: 'IRL',
+      impressionId: '123456',
+      keywords: 'lifestyle, humour',
+      bidfloor: 0.00000011,
+      bidfloorcur: 'EUR',
+      bcat: ['IAB25', 'IAB7-39', 'IAB8-18', 'IAB8-5', 'IAB9-9'],
+      badv: ['first.com', 'second.com'],
+      mimes: ['image/jpg'],
+      endpoint: 'test.com',
+      dsa: {
+        dsarequired: 3,
+        pubrender: 0,
+        datatopub: 2
+      },
+    }
+  };
+
+  const native = {
+    mediaTypes: {
+      native: {
+        ortb: {
+          assets: [{
+            id: 3,
+            required: 1,
+            title: {
+              len: 124
+            }
+          },
+          {
+            id: 2,
+            data: {
+              type: 1,
+              len: 50
+            }
+          },
+          {
+            id: 1,
+            required: 1,
+            img: {
+              type: 3,
+              w: 300,
+              h: 300,
+            }
+          }]
+        }
+      },
+    },
+    bidder: bidder,
+    params: {
+      zoneId: 5147485,
+      fid: '829a896f011475d505a0d89cfdd1af8d9cdb07ff',
+      partner: partners.ORTB_2_4,
+      siteId: '12345',
+      siteName: 'your-site.com',
+      catIab: ['IAB25-3'],
+      userIp: '0.0.0.0',
+      userId: '',
+      country: 'IRL',
+      impressionId: '123456',
+      keywords: 'lifestyle, humour',
+      bidfloor: 0.00000011,
+      bidfloorcur: 'EUR',
+      native: {
+        plcmtcnt: 4,
+      },
+      dsa: {
+        pubrender: 0,
+        datatopub: 2
+      },
+      endpoint: 'test.com'
+    }
+  };
+
+  const instream = {
+    mediaTypes: {
+      video: {
+        mimes: ['video/mp4'],
+        protocols: [3, 6],
+      }
+    },
+    bidder: bidder,
+    params: {
+      zoneId: 5147485,
+      fid: '829a896f011475d505a0d89cfdd1af8d9cdb07ff',
+      partner: partners.ORTB_2_4,
+      siteId: '12345',
+      siteName: 'your-site.com',
+      catIab: ['IAB25-3'],
+      userIp: '0.0.0.0',
+      userId: '',
+      country: 'IRL',
+      impressionId: '123456',
+      keywords: 'lifestyle, humour',
+      bidfloor: 0.00000011,
+      bidfloorcur: 'EUR',
+      imp: {
+        ext: {
+          video_cta: 0
+        }
+      },
+      dsa: {
+        datatopub: 2
+      },
+      endpoint: 'test.com',
+    }
+  };
+
+  describe('while validating bid request', function () {
+    it('should check the validity of bidRequest with all mandatory params for banner ad-format', function () {
+      expect(spec.isBidRequestValid(imageBanner)).to.equal(true);
+    });
+
+    it('should check the validity of a bidRequest with all mandatory params for native ad-format', function () {
+      expect(spec.isBidRequestValid(native));
+    });
+
+    it('should check the validity of a bidRequest with all mandatory params for instream ad-format', function () {
+      expect(spec.isBidRequestValid(instream)).to.equal(true);
+    });
+
+    it('should check the validity of a bidRequest with wrong partner', function () {
+      expect(spec.isBidRequestValid({
+        ...imageBanner,
+        params: {
+          ...imageBanner.params,
+          partner: 'not_ortb_2_4'
+        }
+      })).to.eql(false);
+    });
+
+    it('should check the validity of a bidRequest without params', function () {
+      expect(spec.isBidRequestValid({
+        bidder: bidder,
+        params: { }
+      })).to.equal(false);
+    });
+  });
+
+  describe('while building bid request for banner ad-format', function () {
+    const bidRequests = [imageBanner];
+
+    it('should make a bidRequest by HTTP method', function () {
+      const requests = spec.buildRequests(bidRequests, {});
+      requests.forEach(function(requestItem) {
+        expect(requestItem.method).to.equal('POST');
+      });
+    });
+  });
+
+  describe('while building bid request for native ad-format', function () {
+    const bidRequests = [native];
+
+    it('should make a bidRequest by HTTP method', function () {
+      const requests = spec.buildRequests(bidRequests, {});
+      requests.forEach(function(requestItem) {
+        expect(requestItem.method).to.equal('POST');
+      });
+    });
+  });
+
+  describe('while building bid request for instream ad-format', function () {
+    const bidRequests = [instream];
+
+    it('should make a bidRequest by HTTP method', function () {
+      const requests = spec.buildRequests(bidRequests, {});
+      requests.forEach(function(requestItem) {
+        expect(requestItem.method).to.equal('POST');
+      });
+    });
+  });
+
+  describe('while interpreting bid response', function () {
+    beforeEach(() => {
+      imps.set('270544423272657', { adPartner: 'ortb_2_4', mediaType: null });
+    });
+
+    it('should test the banner interpretResponse', function () {
+      const serverResponse = {
+        body: {
+          'id': '2d2a496527398e',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '8f7fa506af97bc193e7bf099d8ed6930bd50aaf1',
+                  'impid': '270544423272657',
+                  'price': 0.0045000000000000005,
+                  'adm': '\n\n',
+                  'ext': {
+                    'btype': 1,
+                    'asset_mime_type': [
+                      'image/jpeg',
+                      'image/jpg'
+                    ]
+                  },
+                  'nurl': 'http://your-ad-network.com/',
+                  'cid': '6260389',
+                  'crid': '89453173',
+                  'adomain': [
+                    'test.com'
+                  ],
+                  'w': 300,
+                  'h': 250,
+                  'attr': [
+                    12
+                  ]
+                }
+              ]
+            }
+          ],
+          'cur': 'USD'
+        }
+      };
+
+      const bidResponses = spec.interpretResponse(serverResponse, {
+        data: JSON.stringify({
+          'id': '2d2a496527398e',
+          'at': 1,
+          'imp': [
+            {
+              'id': '270544423272657',
+              'bidfloor': 1.1e-7,
+              'bidfloorcur': 'EUR',
+              'banner': {
+                'w': 300,
+                'h': 250
+              }
+            }
+          ],
+          'site': {
+            'id': '12345',
+            'domain': 'your-ad-network.com',
+            'cat': [
+              'IAB25-3'
+            ],
+            'page': 'https://your-ad-network.com/prebidJS-client-RTB-banner.html',
+            'keywords': 'lifestyle, humour'
+          },
+          'device': {
+            'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+            'ip': '95.233.216.174',
+            'geo': {
+              'country': 'ITA'
+            },
+            'language': 'en',
+            'os': 'MacOS',
+            'js': 0,
+            'ext': {
+              'remote_addr': '',
+              'x_forwarded_for': '',
+              'accept_language': 'en-GB'
+            }
+          },
+          'user': {
+            'id': ''
+          },
+          'ext': {
+            'sub': 0
+          }
+        })
+      });
+
+      expect(bidResponses).to.be.an('array').that.is.not.empty;
+
+      const bid = serverResponse.body.seatbid[0].bid[0];
+      const bidResponse = bidResponses[0];
+
+      expect(bidResponse.mediaType).to.equal(BANNER);
+      expect(bidResponse.width).to.equal(bid.w);
+      expect(bidResponse.height).to.equal(bid.h);
+    });
+
+    it('should test the native interpretResponse', function () {
+      const serverResponse = {
+        body: {
+          'id': '21dea1fc6c3e1b',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': 'cedc93987cd4a1e08fdfe97de97482d1ecc503ee',
+                  'impid': '270544423272657',
+                  'price': 0.0045000000000000005,
+                  'adm': '{"native":{"link":{"url":"https:\\/\\/your-ad-network.com"},"eventtrackers":[{"event":1,"method":1,"url":"https:\\/\\/your-ad-network.com"}],"assets":[{"id":1,"title":{"text":"Title"}},{"id":2,"data":{"value":"Description"}},{"id":3,"img":{"url":"https:\\/\\/your-ad-network.com\\/32167\\/f85ee87ea23.jpg"}}]}}',
+                  'ext': {
+                    'btype': 1,
+                    'asset_mime_type': [
+                      'image/jpeg',
+                      'image/jpg'
+                    ]
+                  },
+                  'nurl': 'http://your-ad-network.com',
+                  'cid': '6260393',
+                  'crid': '89453189',
+                  'adomain': [
+                    'test.com'
+                  ],
+                  'w': 300,
+                  'h': 300,
+                  'attr': []
+                }
+              ]
+            }
+          ],
+          'cur': 'USD'
+        }
+      };
+
+      const bidResponses = spec.interpretResponse(serverResponse, {
+        data: JSON.stringify({
+          'id': '21dea1fc6c3e1b',
+          'at': 1,
+          'imp': [
+            {
+              'id': '270544423272657',
+              'bidfloor': 1.1e-7,
+              'bidfloorcur': 'EUR',
+              'native': {
+                'request': '{"native":{"ver":"1.2","context":1,"contextsubtype":10,"plcmttype":4,"plcmtcnt":4,"assets":[{"id":1,"required":1,"title":{"len":124}},{"id":2,"data":{"type":1,"len":50}},{"id":3,"required":1,"img":{"type":3,"w":300,"h":300,"wmin":300,"hmin":300}}]}}',
+                'ver': '1.2'
+              }
+            }
+          ],
+          'site': {
+            'id': '12345',
+            'domain': 'your-ad-network.com',
+            'cat': [
+              'IAB25-3'
+            ],
+            'page': 'https://your-ad-network.com/prebidJS-client-RTB-native.html'
+          },
+          'device': {
+            'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+            'ip': '95.233.216.174',
+            'geo': {
+              'country': 'ITA'
+            },
+            'language': 'en',
+            'os': 'MacOS',
+            'js': 0,
+            'ext': {
+              'remote_addr': '',
+              'x_forwarded_for': '',
+              'accept_language': 'en-GB'
+            }
+          },
+          'user': {
+            'id': ''
+          },
+          'ext': {
+            'sub': 0
+          }
+        })
+      });
+
+      expect(bidResponses).to.be.an('array').that.is.not.empty;
+
+      const bidResponse = bidResponses[0];
+
+      expect(bidResponse.mediaType).to.equal(NATIVE);
+    });
+
+    it('should test the InStream Video interpretResponse', function () {
+      const serverResponse = {
+        body: {
+          'id': '2218abc7ebca97',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': 'd2d2063517b126252f56e22767c53f936ff40411',
+                  'impid': '270544423272657',
+                  'price': 0.12474000000000002,
+                  'adm': '\n\n  \n    \n      your-ad-network.com\n      \n      \n      \n      \n        \n          \n            00:00:20.32\n            \n              \n            \n            \n              \n            \n            \n              \n            \n            \n              \n                \n                  test.com\n                \n              \n            \n          \n        \n      \n    \n  \n\n',
+                  'ext': {
+                    'btype': 1,
+                    'asset_mime_type': [
+                      'video/mp4'
+                    ]
+                  },
+                  'nurl': 'http://your-ad-network.com',
+                  'cid': '6260395',
+                  'crid': '89453191',
+                  'adomain': [
+                    'test.com'
+                  ],
+                  'w': 0,
+                  'h': 0,
+                  'attr': []
+                }
+              ]
+            }
+          ],
+          'cur': 'USD'
+        }
+      };
+
+      const bidResponses = spec.interpretResponse(serverResponse, {
+        data: JSON.stringify({
+          'id': '2218abc7ebca97',
+          'at': 1,
+          'imp': [
+            {
+              'id': '270544423272657',
+              'video': {
+                'mimes': [
+                  'video/mp4'
+                ]
+              },
+              'protocols': [
+                3,
+                6
+              ],
+              'ext': {
+                'video_cta': 0
+              }
+            }
+          ],
+          'site': {
+            'id': '12345',
+            'domain': 'your-ad-network.com',
+            'cat': [
+              'IAB25-3'
+            ],
+            'page': 'https://your-ad-network.com/prebidJS-client-RTB-InStreamVideo.html',
+            'keywords': 'lifestyle, humour'
+          },
+          'device': {
+            'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+            'ip': '95.233.216.174',
+            'geo': {
+              'country': 'ITA'
+            },
+            'language': 'en',
+            'os': 'MacOS',
+            'js': 0,
+            'ext': {
+              'remote_addr': '',
+              'x_forwarded_for': '',
+              'accept_language': 'en-GB'
+            }
+          },
+          'user': {
+            'id': ''
+          },
+          'ext': {
+            'sub': 0
+          }
+        })
+      });
+
+      expect(bidResponses).to.be.an('array').that.is.not.empty;
+
+      const bidResponse = bidResponses[0];
+
+      expect(bidResponse.mediaType).to.equal(VIDEO);
+    });
+  });
+
+  describe('checking dsa information', function() {
+    it('should add dsa information to the request via bidderRequest.params.dsa', function () {
+      const bidRequests = [imageBanner];
+
+      const requests = spec.buildRequests(bidRequests, {});
+
+      requests.forEach(function(requestItem) {
+        const payload = JSON.parse(requestItem.data);
+
+        expect(payload.regs.ext.dsa).to.exist;
+        expect(payload.regs.ext.dsa.dsarequired).to.equal(3);
+        expect(payload.regs.ext.dsa.pubrender).to.equal(0);
+        expect(payload.regs.ext.dsa.datatopub).to.equal(2);
+      });
+    });
+
+    it('should test the dsa interpretResponse', function () {
+      const dsaResponse = {
+        'behalf': '...',
+        'paid': '...',
+        'transparency': [
+          {
+            'params': [
+              2
+            ]
+          }
+        ],
+        'adrender': 0
+      };
+
+      const serverResponse = {
+        body: {
+          'id': '2d2a496527398e',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '8f7fa506af97bc193e7bf099d8ed6930bd50aaf1',
+                  'impid': '270544423272657',
+                  'price': 0.0045000000000000005,
+                  'adm': '\n\n',
+                  'ext': {
+                    'btype': 1,
+                    'asset_mime_type': [
+                      'image/jpeg',
+                      'image/jpg'
+                    ],
+                    'dsa': dsaResponse
+                  },
+                  'nurl': 'http://your-ad-network.com/',
+                  'cid': '6260389',
+                  'crid': '89453173',
+                  'adomain': [
+                    'test.com'
+                  ],
+                  'w': 300,
+                  'h': 250,
+                  'attr': [
+                    12
+                  ]
+                }
+              ]
+            }
+          ],
+          'cur': 'USD'
+        }
+      };
+
+      const bidResponses = spec.interpretResponse(serverResponse, {
+        data: JSON.stringify({
+          'id': '2d2a496527398e',
+          'at': 1,
+          'imp': [
+            {
+              'id': '270544423272657',
+              'bidfloor': 1.1e-7,
+              'bidfloorcur': 'EUR',
+              'banner': {
+                'w': 300,
+                'h': 250
+              }
+            }
+          ],
+          'site': {
+            'id': '12345',
+            'domain': 'your-ad-network.com',
+            'cat': [
+              'IAB25-3'
+            ],
+            'page': 'https://your-ad-network.com/prebidJS-client-RTB-banner.html',
+            'keywords': 'lifestyle, humour'
+          },
+          'device': {
+            'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+            'ip': '95.233.216.174',
+            'geo': {
+              'country': 'ITA'
+            },
+            'language': 'en',
+            'os': 'MacOS',
+            'js': 0,
+            'ext': {
+              'remote_addr': '',
+              'x_forwarded_for': '',
+              'accept_language': 'en-GB'
+            }
+          },
+          'user': {
+            'id': ''
+          },
+          'ext': {
+            'sub': 0
+          },
+          'regs': {
+            'ext': {
+              'dsa': {
+                'dsarequired': 3,
+                'pubrender': 0,
+                'datatopub': 2
+              }
+            }
+          }
+        })
+      });
+
+      expect(bidResponses).to.be.an('array').that.is.not.empty;
+      const bidResponse = bidResponses[0];
+      expect(bidResponse.meta).to.exist;
+      expect(bidResponse.meta.dsa).to.exist;
+      expect(bidResponse.meta.dsa).equal(dsaResponse);
+    });
+  });
+
+  describe('on getting the win event', function() {
+    it('should not create nurl request if bid is undefined', function() {
+      const result = spec.onBidWon({});
+      expect(result).to.be.undefined;
+    });
+  });
+
+  describe('checking timeut', function () {
+    it('should exists and be a function', () => {
+      expect(spec.onTimeout).to.exist.and.to.be.a('function');
+    });
+  });
+});
diff --git a/test/spec/modules/excoBidAdapter_spec.js b/test/spec/modules/excoBidAdapter_spec.js
new file mode 100644
index 00000000000..39844f0bc6a
--- /dev/null
+++ b/test/spec/modules/excoBidAdapter_spec.js
@@ -0,0 +1,655 @@
+import {expect} from 'chai';
+import {
+  spec as adapter,
+  createDomain,
+  storage
+} from 'modules/excoBidAdapter';
+import * as utils from 'src/utils.js';
+import {version} from 'package.json';
+import {useFakeTimers} from 'sinon';
+import {BANNER, VIDEO} from '../../../src/mediaTypes';
+import {config} from '../../../src/config';
+import {
+  hashCode,
+  extractPID,
+  extractCID,
+  extractSubDomain,
+  getStorageItem,
+  setStorageItem,
+  tryParseJSON,
+  getUniqueDealId,
+} from '../../../libraries/vidazooUtils/bidderUtils.js';
+
+export const TEST_ID_SYSTEMS = ['criteoId', 'id5id', 'idl_env', 'lipb', 'netId', 'pubcid', 'tdid', 'pubProvidedId'];
+
+const SUB_DOMAIN = 'rtb';
+
+const BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': 'div-gpt-ad-12345-0',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '59db6b3b4ffaa70004f45cdc',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1,
+    'ext': {
+      'param1': 'loremipsum',
+      'param2': 'dolorsitamet'
+    }
+  },
+  'placementCode': 'div-gpt-ad-1460505748561-0',
+  'sizes': [[300, 250], [300, 600]],
+  'bidderRequestId': '1fdb5ff1b6eaa7',
+  'bidRequestsCount': 4,
+  'bidderRequestsCount': 3,
+  'bidderWinsCount': 1,
+  'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'mediaTypes': [BANNER],
+  'ortb2Imp': {
+    'ext': {
+      'gpid': '0123456789',
+      'tid': '56e184c6-bde9-497b-b9b9-cf47a61381ee'
+    }
+  }
+};
+
+const VIDEO_BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': '63550ad1ff6642d368cba59dh5884270560',
+  'bidderRequestId': '12a8ae9ada9c13',
+  'bidRequestsCount': 4,
+  'bidderRequestsCount': 3,
+  'bidderWinsCount': 1,
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '635509f7ff6642d368cb9837',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1
+  },
+  'sizes': [[545, 307]],
+  'mediaTypes': {
+    'video': {
+      'playerSize': [[545, 307]],
+      'context': 'instream',
+      'mimes': [
+        'video/mp4',
+        'application/javascript'
+      ],
+      'protocols': [2, 3, 5, 6],
+      'maxduration': 60,
+      'minduration': 0,
+      'startdelay': 0,
+      'linearity': 1,
+      'api': [2],
+      'placement': 1
+    }
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': '0123456789',
+      'tid': '56e184c6-bde9-497b-b9b9-cf47a61381ee'
+    }
+  }
+}
+
+const BIDDER_REQUEST = {
+  'gdprConsent': {
+    'consentString': 'consent_string',
+    'gdprApplies': true
+  },
+  'gppString': 'gpp_string',
+  'gppSid': [7],
+  'uspConsent': 'consent_string',
+  'refererInfo': {
+    'page': 'https://www.greatsite.com',
+    'ref': 'https://www.somereferrer.com'
+  },
+  'ortb2': {
+    'site': {
+      'content': {
+        'language': 'en'
+      }
+    },
+    'regs': {
+      'gpp': 'gpp_string',
+      'gpp_sid': [7],
+      'coppa': 0
+    },
+    'device': {
+      'sua': {
+        'source': 2,
+        'platform': {
+          'brand': 'Android',
+          'version': ['8', '0', '0']
+        },
+        'browsers': [
+          {'brand': 'Not_A Brand', 'version': ['99', '0', '0', '0']},
+          {'brand': 'Google Chrome', 'version': ['109', '0', '5414', '119']},
+          {'brand': 'Chromium', 'version': ['109', '0', '5414', '119']}
+        ],
+        'mobile': 1,
+        'model': 'SM-G955U',
+        'bitness': '64',
+        'architecture': ''
+      }
+    }
+  }
+};
+
+const SERVER_RESPONSE = {
+  body: {
+    cid: 'testcid123',
+    results: [{
+      'ad': '',
+      'price': 0.8,
+      'creativeId': '12610997325162499419',
+      'exp': 30,
+      'width': 300,
+      'height': 250,
+      'advertiserDomains': ['securepubads.g.doubleclick.net'],
+      'cookies': [{
+        'src': 'https://sync.com',
+        'type': 'iframe'
+      }, {
+        'src': 'https://sync.com',
+        'type': 'img'
+      }]
+    }]
+  }
+};
+
+const VIDEO_SERVER_RESPONSE = {
+  body: {
+    'cid': '635509f7ff6642d368cb9837',
+    'results': [{
+      'ad': '',
+      'advertiserDomains': ['exco.com'],
+      'exp': 60,
+      'width': 545,
+      'height': 307,
+      'mediaType': 'video',
+      'creativeId': '12610997325162499419',
+      'price': 2,
+      'cookies': []
+    }]
+  }
+};
+
+const REQUEST = {
+  data: {
+    width: 300,
+    height: 250,
+    bidId: '2d52001cabd527'
+  }
+};
+
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = utils.parseUrl(window.top.document.URL, {decodeSearchAsString: true});
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
+
+describe('ExcoBidAdapter', function () {
+  describe('validtae spec', function () {
+    it('exists and is a function', function () {
+      expect(adapter.isBidRequestValid).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.buildRequests).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.interpretResponse).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.getUserSyncs).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a string', function () {
+      expect(adapter.code).to.exist.and.to.be.a('string');
+    });
+
+    it('exists and contains media types', function () {
+      expect(adapter.supportedMediaTypes).to.exist.and.to.be.an('array').with.length(2);
+      expect(adapter.supportedMediaTypes).to.contain.members([BANNER, VIDEO]);
+    });
+  });
+
+  describe('validate bid requests', function () {
+    it('should require cId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should require pId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should validate correctly', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid',
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.true;
+    });
+  });
+
+  describe('build requests', function () {
+    let sandbox;
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        exco: {
+          storageAllowed: true
+        }
+      };
+      sandbox = sinon.sandbox.create();
+      sandbox.stub(Date, 'now').returns(1000);
+    });
+
+    it('should build video request', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      config.setConfig({
+        bidderTimeout: 3000,
+        enableTIDs: true
+      });
+      const requests = adapter.buildRequests([VIDEO_BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/635509f7ff6642d368cb9837`,
+        data: {
+          adUnitCode: '63550ad1ff6642d368cba59dh5884270560',
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          bidderVersion: adapter.version,
+          bidderRequestId: '12a8ae9ada9c13',
+          cb: 1000,
+          gdpr: 1,
+          gdprConsent: 'consent_string',
+          usPrivacy: 'consent_string',
+          gppString: 'gpp_string',
+          gppSid: [7],
+          transactionId: '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+          prebidVersion: version,
+          bidRequestsCount: 4,
+          bidderRequestsCount: 3,
+          bidderWinsCount: 1,
+          bidderTimeout: 3000,
+          publisherId: '59ac17c192832d0011283fe3',
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          schain: VIDEO_BID.schain,
+          sizes: ['545x307'],
+          sua: {
+            'source': 2,
+            'platform': {
+              'brand': 'Android',
+              'version': ['8', '0', '0']
+            },
+            'browsers': [
+              {'brand': 'Not_A Brand', 'version': ['99', '0', '0', '0']},
+              {'brand': 'Google Chrome', 'version': ['109', '0', '5414', '119']},
+              {'brand': 'Chromium', 'version': ['109', '0', '5414', '119']}
+            ],
+            'mobile': 1,
+            'model': 'SM-G955U',
+            'bitness': '64',
+            'architecture': ''
+          },
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          uqs: getTopWindowQueryParams(),
+          mediaTypes: {
+            video: {
+              api: [2],
+              context: 'instream',
+              linearity: 1,
+              maxduration: 60,
+              mimes: [
+                'video/mp4',
+                'application/javascript'
+              ],
+              minduration: 0,
+              placement: 1,
+              playerSize: [[545, 307]],
+              protocols: [2, 3, 5, 6],
+              startdelay: 0
+            }
+          },
+          gpid: '0123456789',
+          cat: [],
+          contentData: [],
+          contentLang: 'en',
+          isStorageAllowed: true,
+          pagecat: [],
+          userData: [],
+          coppa: 0
+        }
+      });
+    });
+
+    it('should build banner request for each size', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      config.setConfig({
+        bidderTimeout: 3000,
+        enableTIDs: true
+      });
+      const requests = adapter.buildRequests([BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/59db6b3b4ffaa70004f45cdc`,
+        data: {
+          gdprConsent: 'consent_string',
+          gdpr: 1,
+          gppString: 'gpp_string',
+          gppSid: [7],
+          usPrivacy: 'consent_string',
+          bidRequestsCount: 4,
+          bidderRequestsCount: 3,
+          bidderWinsCount: 1,
+          bidderTimeout: 3000,
+          bidderRequestId: '1fdb5ff1b6eaa7',
+          transactionId: '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+          sizes: ['300x250', '300x600'],
+          sua: {
+            'source': 2,
+            'platform': {
+              'brand': 'Android',
+              'version': ['8', '0', '0']
+            },
+            'browsers': [
+              {'brand': 'Not_A Brand', 'version': ['99', '0', '0', '0']},
+              {'brand': 'Google Chrome', 'version': ['109', '0', '5414', '119']},
+              {'brand': 'Chromium', 'version': ['109', '0', '5414', '119']}
+            ],
+            'mobile': 1,
+            'model': 'SM-G955U',
+            'bitness': '64',
+            'architecture': ''
+          },
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          cb: 1000,
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          adUnitCode: 'div-gpt-ad-12345-0',
+          publisherId: '59ac17c192832d0011283fe3',
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          bidderVersion: adapter.version,
+          prebidVersion: version,
+          schain: BID.schain,
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          mediaTypes: [BANNER],
+          gpid: '0123456789',
+          uqs: getTopWindowQueryParams(),
+          'ext.param1': 'loremipsum',
+          'ext.param2': 'dolorsitamet',
+          cat: [],
+          contentData: [],
+          contentLang: 'en',
+          isStorageAllowed: true,
+          pagecat: [],
+          userData: [],
+          coppa: 0
+        }
+      });
+    });
+
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+      sandbox.restore();
+    });
+  });
+  describe('getUserSyncs', function () {
+    it('should have valid user sync with iframeEnabled', function () {
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://cs.exco-pb.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with cid on response', function () {
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://cs.exco-pb.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with pixelEnabled', function () {
+      const result = adapter.getUserSyncs({pixelEnabled: true}, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        'url': 'https://cs.exco-pb.com/api/sync/image/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy=',
+        'type': 'image'
+      }]);
+    })
+  });
+
+  describe('interpret response', function () {
+    it('should return empty array when there is no response', function () {
+      const responses = adapter.interpretResponse(null);
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no ad', function () {
+      const responses = adapter.interpretResponse({price: 1, ad: ''});
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no price', function () {
+      const responses = adapter.interpretResponse({price: null, ad: 'great ad'});
+      expect(responses).to.be.empty;
+    });
+
+    it('should return an array of interpreted banner responses', function () {
+      const responses = adapter.interpretResponse(SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 0.8,
+        width: 300,
+        height: 250,
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 30,
+        ad: '',
+        meta: {
+          advertiserDomains: ['securepubads.g.doubleclick.net']
+        }
+      });
+    });
+
+    it('should get meta from response metaData', function () {
+      const serverResponse = utils.deepClone(SERVER_RESPONSE);
+      serverResponse.body.results[0].metaData = {
+        advertiserDomains: ['exco.com'],
+        agencyName: 'Agency Name',
+      };
+      const responses = adapter.interpretResponse(serverResponse, REQUEST);
+      expect(responses[0].meta).to.deep.equal({
+        advertiserDomains: ['exco.com'],
+        agencyName: 'Agency Name'
+      });
+    });
+
+    it('should return an array of interpreted video responses', function () {
+      const responses = adapter.interpretResponse(VIDEO_SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 2,
+        width: 545,
+        height: 307,
+        mediaType: 'video',
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 60,
+        vastXml: '',
+        meta: {
+          advertiserDomains: ['exco.com']
+        }
+      });
+    });
+
+    it('should take default TTL', function () {
+      const serverResponse = utils.deepClone(SERVER_RESPONSE);
+      delete serverResponse.body.results[0].exp;
+      const responses = adapter.interpretResponse(serverResponse, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0].ttl).to.equal(300);
+    });
+  });
+
+  describe('user id system', function () {
+    TEST_ID_SYSTEMS.forEach((idSystemProvider) => {
+      const id = Date.now().toString();
+      const bid = utils.deepClone(BID);
+
+      const userId = (function () {
+        switch (idSystemProvider) {
+          case 'lipb':
+            return {lipbid: id};
+          case 'id5id':
+            return {uid: id};
+          default:
+            return id;
+        }
+      })();
+
+      bid.userId = {
+        [idSystemProvider]: userId
+      };
+
+      it(`should include 'uid.${idSystemProvider}' in request params`, function () {
+        const requests = adapter.buildRequests([bid], BIDDER_REQUEST);
+        expect(requests[0].data[`uid.${idSystemProvider}`]).to.equal(id);
+      });
+    });
+  });
+
+  describe('alternate param names extractors', function () {
+    it('should return undefined when param not supported', function () {
+      const cid = extractCID({'c_id': '1'});
+      const pid = extractPID({'p_id': '1'});
+      const subDomain = extractSubDomain({'sub_domain': 'prebid'});
+      expect(cid).to.be.undefined;
+      expect(pid).to.be.undefined;
+      expect(subDomain).to.be.undefined;
+    });
+
+    it('should return value when param supported', function () {
+      const cid = extractCID({'cId': '1'});
+      const pid = extractPID({'pId': '2'});
+      const subDomain = extractSubDomain({'subDomain': 'prebid'});
+      expect(cid).to.be.equal('1');
+      expect(pid).to.be.equal('2');
+      expect(subDomain).to.be.equal('prebid');
+    });
+  });
+
+  describe('unique deal id', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        exco: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    const key = 'myKey';
+    let uniqueDealId;
+    beforeEach(() => {
+      uniqueDealId = getUniqueDealId(storage, key, 0);
+    })
+
+    it('should get current unique deal id', function (done) {
+      // waiting some time so `now` will become past
+      setTimeout(() => {
+        const current = getUniqueDealId(storage, key);
+        expect(current).to.be.equal(uniqueDealId);
+        done();
+      }, 200);
+    });
+
+    it('should get new unique deal id on expiration', function (done) {
+      setTimeout(() => {
+        const current = getUniqueDealId(storage, key, 100);
+        expect(current).to.not.be.equal(uniqueDealId);
+        done();
+      }, 200)
+    });
+  });
+
+  describe('storage utils', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        exco: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    it('should get value from storage with create param', function () {
+      const now = Date.now();
+      const clock = useFakeTimers({
+        shouldAdvanceTime: true,
+        now
+      });
+      setStorageItem(storage, 'myKey', 2020);
+      const {value, created} = getStorageItem(storage, 'myKey');
+      expect(created).to.be.equal(now);
+      expect(value).to.be.equal(2020);
+      expect(typeof value).to.be.equal('number');
+      expect(typeof created).to.be.equal('number');
+      clock.restore();
+    });
+
+    it('should get external stored value', function () {
+      const value = 'superman'
+      window.localStorage.setItem('myExternalKey', value);
+      const item = getStorageItem(storage, 'myExternalKey');
+      expect(item).to.be.equal(value);
+    });
+
+    it('should parse JSON value', function () {
+      const data = JSON.stringify({event: 'send'});
+      const {event} = tryParseJSON(data);
+      expect(event).to.be.equal('send');
+    });
+
+    it('should get original value on parse fail', function () {
+      const value = 21;
+      const parsed = tryParseJSON(value);
+      expect(typeof parsed).to.be.equal('number');
+      expect(parsed).to.be.equal(value);
+    });
+  });
+});
diff --git a/test/spec/modules/fanAdapter_spec.js b/test/spec/modules/fanAdapter_spec.js
new file mode 100644
index 00000000000..010ba91339d
--- /dev/null
+++ b/test/spec/modules/fanAdapter_spec.js
@@ -0,0 +1,315 @@
+import * as ajax from 'src/ajax.js';
+import { expect } from 'chai';
+import { spec } from 'modules/fanAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from 'src/mediaTypes.js';
+
+describe('Freedom Ad Network Bid Adapter', function () {
+  describe('Test isBidRequestValid', function () {
+    it('undefined bid should return false', function () {
+      expect(spec.isBidRequestValid()).to.be.false;
+    });
+
+    it('null bid should return false', function () {
+      expect(spec.isBidRequestValid(null)).to.be.false;
+    });
+
+    it('bid.params should be set', function () {
+      expect(spec.isBidRequestValid({})).to.be.false;
+    });
+
+    it('bid.params.placementId should be set', function () {
+      expect(spec.isBidRequestValid({
+        params: { foo: 'bar' }
+      })).to.be.false;
+    });
+
+    it('valid bid should return true', function () {
+      expect(spec.isBidRequestValid({
+        mediaTypes: {
+          [BANNER]: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          placementId: 'e6203f1e-bd6d-4f42-9895-d1a19cdb83c8'
+        }
+      })).to.be.true;
+    });
+  });
+
+  describe('Test buildRequests', function () {
+    const bidderRequest = {
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      auctionStart: Date.now(),
+      bidderCode: 'myBidderCode',
+      bidderRequestId: '15246a574e859f',
+      refererInfo: {
+        page: 'http://example.com',
+        stack: ['http://example.com']
+      },
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'IwuyYwpjmnsauyYasIUWwe'
+      },
+      uspConsent: 'Oush3@jmUw82has',
+      timeout: 3000
+    };
+
+    it('build request object', function () {
+      const bidRequests = [
+        {
+          adUnitCode: 'test-div',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '8064026a1776',
+          bidder: 'freedomadnetwork',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            banner: { sizes: [[300, 250]] }
+          },
+          params: {
+            placementId: 'e6203f1e-bd6d-4f42-9895-d1a19cdb83c8'
+          }
+        },
+        {
+          adUnitCode: 'test-native',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '8064026a1777',
+          bidder: 'freedomadnetwork',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            native: {
+              title: {
+                required: true,
+                len: 20,
+              },
+              image: {
+                required: true,
+                sizes: [300, 250],
+                aspect_ratios: [{
+                  ratio_width: 1,
+                  ratio_height: 1
+                }]
+              },
+              icon: {
+                required: true,
+                sizes: [60, 60],
+                aspect_ratios: [{
+                  ratio_width: 1,
+                  ratio_height: 1
+                }]
+              },
+              sponsoredBy: {
+                required: true,
+                len: 20
+              },
+              body: {
+                required: true,
+                len: 140
+              },
+              cta: {
+                required: true,
+                len: 20,
+              }
+            }
+          },
+          params: {
+            placementId: '3f50a79e-5582-4e5c-b1f4-9dcc1c82cece'
+          }
+        },
+        {
+          adUnitCode: 'test-native2',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '8064026a1778',
+          bidder: 'freedomadnetwork',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            native: {
+              title: {},
+              image: {},
+              icon: {},
+              sponsoredBy: {},
+              body: {},
+              cta: {}
+            }
+          },
+          params: {
+            placementId: '2015defc-19db-4cf6-926d-d2d0d32122fa',
+          }
+        },
+        {
+          adUnitCode: 'test-native3',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '8064026a1779',
+          bidder: 'freedomadnetwork',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            native: {},
+          },
+          params: {
+            placementId: '8064026a-9932-45ae-b804-03491302ad88'
+          }
+        }
+      ];
+
+      let reqs;
+
+      expect(function () {
+        reqs = spec.buildRequests(bidRequests, bidderRequest);
+      }).to.not.throw();
+
+      expect(reqs).to.be.an('array').that.have.lengthOf(bidRequests.length);
+
+      for (let i = 0, len = reqs.length; i < len; i++) {
+        const req = reqs[i];
+        const bidRequest = bidRequests[i];
+
+        expect(req.method).to.equal('POST');
+        expect(req.url).to.equal('https://srv.freedomadnetwork.com/pb/req');
+
+        expect(req.options).to.be.an('object');
+        expect(req.options.contentType).to.contain('application/json');
+        expect(req.options.customHeaders).to.be.an('object');
+
+        expect(req.originalBidRequest).to.equal(bidRequest);
+
+        var data = JSON.parse(req.data);
+        expect(data.id).to.equal(bidRequest.bidId);
+        expect(data.placements[0]).to.equal(bidRequest.params.placementId);
+      }
+    });
+  });
+
+  describe('Test adapter request', function () {
+    const adapter = newBidder(spec);
+
+    it('adapter.callBids exists and is a function', function () {
+      expect(adapter.callBids).to.be.a('function');
+    });
+  });
+
+  describe('Test response interpretResponse', function () {
+    it('Test main interpretResponse', function () {
+      const serverResponse = {
+        body: [{
+          id: '8064026a1776',
+          bidid: '78e10bd4-aa67-40a6-b282-0f2697251eb3',
+          impid: '88faf7e7-bef8-43a5-9ef3-73db10c2af6b',
+          userId: '944c9c880be09af1e90da1f883538607',
+          cpm: 17.76,
+          currency: 'USD',
+          width: 300,
+          height: 250,
+          ttl: 60,
+          netRevenue: false,
+          crid: '03f3ed6f-1a9e-4276-8ad7-0dc5efae289e',
+          payload: '',
+          trackers: [],
+          mediaType: 'native',
+          domains: ['foo.com'],
+        }]
+      };
+
+      const bidResponses = spec.interpretResponse(serverResponse, {
+        originalBidRequest: {
+          adUnitCode: 'test-div',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '8064026a1776',
+          bidder: 'freedomadnetwork',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            banner: { sizes: [[300, 250]] }
+          },
+          params: {
+            placementId: 'e6203f1e-bd6d-4f42-9895-d1a19cdb83c8'
+          }
+        }
+      });
+
+      expect(bidResponses).to.be.an('array').that.is.not.empty;
+
+      const bid = serverResponse.body[0];
+      const bidResponse = bidResponses[0];
+
+      expect(bidResponse.requestId).to.equal(bid.id);
+      expect(bidResponse.bidid).to.equal(bid.bidid);
+      expect(bidResponse.impid).to.equal(bid.impid);
+      expect(bidResponse.userId).to.equal(bid.userId);
+      expect(bidResponse.cpm).to.equal(bid.cpm);
+      expect(bidResponse.currency).to.equal(bid.currency);
+      expect(bidResponse.width).to.equal(bid.width);
+      expect(bidResponse.height).to.equal(bid.height);
+      expect(bidResponse.ad).to.equal(bid.payload);
+      expect(bidResponse.ttl).to.equal(bid.ttl);
+      expect(bidResponse.creativeId).to.equal(bid.crid);
+      expect(bidResponse.netRevenue).to.equal(bid.netRevenue);
+      expect(bidResponse.trackers).to.equal(bid.trackers);
+      expect(bidResponse.meta.mediaType).to.equal(bid.mediaType);
+      expect(bidResponse.meta.advertiserDomains).to.equal(bid.domains);
+    });
+
+    it('Test empty server response', function () {
+      const bidResponses = spec.interpretResponse({}, {});
+
+      expect(bidResponses).to.be.an('array').that.is.empty;
+    });
+
+    it('Test empty bid response', function () {
+      const bidResponses = spec.interpretResponse({ body: [] }, {});
+
+      expect(bidResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('Test getUserSyncs', function () {
+    it('getUserSyncs should return empty', function () {
+      const serverResponse = {};
+      const syncOptions = {}
+      const userSyncPixels = spec.getUserSyncs(syncOptions, [serverResponse])
+      expect(userSyncPixels).to.have.lengthOf(0);
+    });
+  });
+
+  describe('Test onTimeout', function () {
+    it('onTimeout should not throw', function () {
+      expect(spec.onTimeout()).to.not.throw;
+    });
+  });
+
+  describe('Test onBidWon', function () {
+    let sandbox, ajaxStub;
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+      ajaxStub = sandbox.stub(ajax, 'ajax');
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+      ajaxStub.restore();
+    });
+
+    const bid = {
+      bidid: '78e10bd4-aa67-40a6-b282-0f2697251eb3',
+      impid: '88faf7e7-bef8-43a5-9ef3-73db10c2af6b',
+      cpm: 17.76,
+      trackers: ['foo.com'],
+    }
+
+    it('onBidWon empty bid should not throw', function () {
+      expect(spec.onBidWon({})).to.not.throw;
+      expect(ajaxStub.calledOnce).to.equal(true);
+    });
+
+    it('onBidWon valid bid should not throw', function () {
+      expect(spec.onBidWon(bid)).to.not.throw;
+      expect(ajaxStub.calledOnce).to.equal(true);
+    });
+  });
+
+  describe('Test onSetTargeting', function () {
+    it('onSetTargeting should not throw', function () {
+      expect(spec.onSetTargeting()).to.not.throw;
+    });
+  });
+});
diff --git a/test/spec/modules/fintezaAnalyticsAdapter_spec.js b/test/spec/modules/fintezaAnalyticsAdapter_spec.js
index cddffc63554..1e4c5cbcdd3 100644
--- a/test/spec/modules/fintezaAnalyticsAdapter_spec.js
+++ b/test/spec/modules/fintezaAnalyticsAdapter_spec.js
@@ -3,10 +3,10 @@ import {includes} from 'src/polyfill.js';
 import { expect } from 'chai';
 import { parseUrl } from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
 
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 function setCookie(name, value, expires) {
   document.cookie = name + '=' + value +
@@ -74,7 +74,7 @@ describe('finteza analytics adapter', function () {
         };
 
         // Emit the events with the "real" arguments
-        events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
+        events.emit(EVENTS.BID_REQUESTED, bidRequest);
 
         expect(server.requests.length).to.equal(1);
 
@@ -117,7 +117,7 @@ describe('finteza analytics adapter', function () {
         };
 
         // Emit the events with the "real" arguments
-        events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+        events.emit(EVENTS.BID_RESPONSE, bidResponse);
 
         expect(server.requests[0].method).to.equal('GET');
         expect(server.requests[0].withCredentials).to.equal(true);
@@ -171,7 +171,7 @@ describe('finteza analytics adapter', function () {
         }
 
         // Emit the events with the "real" arguments
-        events.emit(constants.EVENTS.BID_WON, bidWon);
+        events.emit(EVENTS.BID_WON, bidWon);
 
         expect(server.requests[0].method).to.equal('GET');
         expect(server.requests[0].withCredentials).to.equal(true);
@@ -211,7 +211,7 @@ describe('finteza analytics adapter', function () {
         ];
 
         // Emit the events with the "real" arguments
-        events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
+        events.emit(EVENTS.BID_TIMEOUT, bidTimeout);
 
         expect(server.requests[0].method).to.equal('GET');
         expect(server.requests[0].withCredentials).to.equal(true);
diff --git a/test/spec/modules/fledgeForGpt_spec.js b/test/spec/modules/fledgeForGpt_spec.js
deleted file mode 100644
index b4bff8e82f0..00000000000
--- a/test/spec/modules/fledgeForGpt_spec.js
+++ /dev/null
@@ -1,430 +0,0 @@
-import {
-  expect
-} from 'chai';
-import * as fledge from 'modules/fledgeForGpt.js';
-import {config} from '../../../src/config.js';
-import adapterManager from '../../../src/adapterManager.js';
-import * as utils from '../../../src/utils.js';
-import * as gptUtils from '../../../libraries/gptUtils/gptUtils.js';
-import {hook} from '../../../src/hook.js';
-import 'modules/appnexusBidAdapter.js';
-import 'modules/rubiconBidAdapter.js';
-import {parseExtPrebidFledge, setImpExtAe, setResponseFledgeConfigs} from 'modules/fledgeForGpt.js';
-import * as events from 'src/events.js';
-import CONSTANTS from 'src/constants.json';
-import {getGlobal} from '../../../src/prebidGlobal.js';
-
-describe('fledgeForGpt module', () => {
-  let sandbox;
-
-  beforeEach(() => {
-    sandbox = sinon.sandbox.create();
-  });
-  afterEach(() => {
-    sandbox.restore();
-  });
-  describe('addComponentAuction', function () {
-    before(() => {
-      fledge.init({enabled: true});
-    });
-
-    const fledgeAuctionConfig = {
-      seller: 'bidder',
-      mock: 'config'
-    };
-
-    describe('addComponentAuctionHook', function () {
-      let nextFnSpy, mockGptSlot;
-      beforeEach(function () {
-        nextFnSpy = sinon.spy();
-        mockGptSlot = {
-          setConfig: sinon.stub(),
-          getAdUnitPath: () => 'mock/gpt/au'
-        };
-        sandbox.stub(gptUtils, 'getGptSlotForAdUnitCode').callsFake(() => mockGptSlot);
-      });
-
-      it('should call next()', function () {
-        fledge.addComponentAuctionHook(nextFnSpy, 'aid', 'auc', fledgeAuctionConfig);
-        sinon.assert.calledWith(nextFnSpy, 'aid', 'auc', fledgeAuctionConfig);
-      });
-
-      it('should collect auction configs and route them to GPT at end of auction', () => {
-        events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {auctionId: 'aid'});
-        const cf1 = {...fledgeAuctionConfig, id: 1, seller: 'b1'};
-        const cf2 = {...fledgeAuctionConfig, id: 2, seller: 'b2'};
-        fledge.addComponentAuctionHook(nextFnSpy, 'aid', 'au1', cf1);
-        fledge.addComponentAuctionHook(nextFnSpy, 'aid', 'au2', cf2);
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, {auctionId: 'aid'});
-        sinon.assert.calledWith(gptUtils.getGptSlotForAdUnitCode, 'au1');
-        sinon.assert.calledWith(gptUtils.getGptSlotForAdUnitCode, 'au2');
-        sinon.assert.calledWith(mockGptSlot.setConfig, {
-          componentAuction: [{
-            configKey: 'b1',
-            auctionConfig: cf1,
-          }]
-        });
-        sinon.assert.calledWith(mockGptSlot.setConfig, {
-          componentAuction: [{
-            configKey: 'b2',
-            auctionConfig: cf2,
-          }]
-        });
-      });
-
-      it('should drop auction configs after end of auction', () => {
-        events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {auctionId: 'aid'});
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, {auctionId: 'aid'});
-        fledge.addComponentAuctionHook(nextFnSpy, 'aid', 'au', fledgeAuctionConfig);
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, {auctionId: 'aid'});
-        sinon.assert.notCalled(mockGptSlot.setConfig);
-      });
-
-      describe('floor signal', () => {
-        before(() => {
-          if (!getGlobal().convertCurrency) {
-            getGlobal().convertCurrency = () => null;
-            getGlobal().convertCurrency.mock = true;
-          }
-        });
-        after(() => {
-          if (getGlobal().convertCurrency.mock) {
-            delete getGlobal().convertCurrency;
-          }
-        });
-
-        beforeEach(() => {
-          sandbox.stub(getGlobal(), 'convertCurrency').callsFake((amount, from, to) => {
-            if (from === to) return amount;
-            if (from === 'USD' && to === 'JPY') return amount * 100;
-            if (from === 'JPY' && to === 'USD') return amount / 100;
-            throw new Error('unexpected currency conversion');
-          });
-        });
-
-        Object.entries({
-          'bids': (payload, values) => {
-            payload.bidsReceived = values
-              .map((val) => ({adUnitCode: 'au', cpm: val.amount, currency: val.cur}))
-              .concat([{adUnitCode: 'other', cpm: 10000, currency: 'EUR'}])
-          },
-          'no bids': (payload, values) => {
-            payload.bidderRequests = values
-              .map((val) => ({bids: [{adUnitCode: 'au', getFloor: () => ({floor: val.amount, currency: val.cur})}]}))
-              .concat([{bids: {adUnitCode: 'other', getFloor: () => ({floor: -10000, currency: 'EUR'})}}])
-          }
-        }).forEach(([tcase, setup]) => {
-          describe(`when auction has ${tcase}`, () => {
-            Object.entries({
-              'no currencies': {
-                values: [{amount: 1}, {amount: 100}, {amount: 10}, {amount: 100}],
-                'bids': {
-                  bidfloor: 100,
-                  bidfloorcur: undefined
-                },
-                'no bids': {
-                  bidfloor: 1,
-                  bidfloorcur: undefined,
-                }
-              },
-              'only zero values': {
-                values: [{amount: 0, cur: 'USD'}, {amount: 0, cur: 'JPY'}],
-                'bids': {
-                  bidfloor: undefined,
-                  bidfloorcur: undefined,
-                },
-                'no bids': {
-                  bidfloor: undefined,
-                  bidfloorcur: undefined,
-                }
-              },
-              'matching currencies': {
-                values: [{amount: 10, cur: 'JPY'}, {amount: 100, cur: 'JPY'}],
-                'bids': {
-                  bidfloor: 100,
-                  bidfloorcur: 'JPY',
-                },
-                'no bids': {
-                  bidfloor: 10,
-                  bidfloorcur: 'JPY',
-                }
-              },
-              'mixed currencies': {
-                values: [{amount: 10, cur: 'USD'}, {amount: 10, cur: 'JPY'}],
-                'bids': {
-                  bidfloor: 10,
-                  bidfloorcur: 'USD'
-                },
-                'no bids': {
-                  bidfloor: 10,
-                  bidfloorcur: 'JPY',
-                }
-              }
-            }).forEach(([t, testConfig]) => {
-              const values = testConfig.values;
-              const {bidfloor, bidfloorcur} = testConfig[tcase];
-
-              describe(`with ${t}`, () => {
-                let payload;
-                beforeEach(() => {
-                  payload = {auctionId: 'aid'};
-                  setup(payload, values);
-                });
-
-                it('should populate bidfloor/bidfloorcur', () => {
-                  events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {auctionId: 'aid'});
-                  fledge.addComponentAuctionHook(nextFnSpy, 'aid', 'au', fledgeAuctionConfig);
-                  events.emit(CONSTANTS.EVENTS.AUCTION_END, payload);
-                  sinon.assert.calledWith(mockGptSlot.setConfig, sinon.match(arg => {
-                    return arg.componentAuction.some(au => au.auctionConfig.auctionSignals?.prebid?.bidfloor === bidfloor && au.auctionConfig.auctionSignals?.prebid?.bidfloorcur === bidfloorcur)
-                  }))
-                })
-              });
-            });
-          })
-        })
-      });
-    });
-  });
-
-  describe('fledgeEnabled', function () {
-    const navProps = Object.fromEntries(['runAdAuction', 'joinAdInterestGroup'].map(p => [p, navigator[p]]));
-
-    before(function () {
-      // navigator.runAdAuction & co may not exist, so we can't stub it normally with
-      // sinon.stub(navigator, 'runAdAuction') or something
-      Object.keys(navProps).forEach(p => {
-        navigator[p] = sinon.stub();
-      });
-      hook.ready();
-    });
-
-    after(function () {
-      Object.entries(navProps).forEach(([p, orig]) => navigator[p] = orig);
-    });
-
-    afterEach(function () {
-      config.resetConfig();
-    });
-
-    const adUnits = [{
-      'code': '/19968336/header-bid-tag1',
-      'mediaTypes': {
-        'banner': {
-          'sizes': [[728, 90]]
-        },
-      },
-      'bids': [
-        {
-          'bidder': 'appnexus',
-        },
-        {
-          'bidder': 'rubicon',
-        },
-      ]
-    }];
-
-    describe('with setBidderConfig()', () => {
-      it('should set fledgeEnabled correctly per bidder', function () {
-        config.setConfig({bidderSequence: 'fixed'});
-        config.setBidderConfig({
-          bidders: ['appnexus'],
-          config: {
-            fledgeEnabled: true,
-            defaultForSlots: 1,
-          }
-        });
-
-        const bidRequests = adapterManager.makeBidRequests(
-          adUnits,
-          Date.now(),
-          utils.getUniqueIdentifierStr(),
-          function callback() {
-          },
-          []
-        );
-
-        expect(bidRequests[0].bids[0].bidder).equals('appnexus');
-        expect(bidRequests[0].fledgeEnabled).to.be.true;
-        expect(bidRequests[0].defaultForSlots).to.equal(1);
-
-        expect(bidRequests[1].bids[0].bidder).equals('rubicon');
-        expect(bidRequests[1].fledgeEnabled).to.be.undefined;
-        expect(bidRequests[1].defaultForSlots).to.be.undefined;
-      });
-    });
-
-    describe('with setConfig()', () => {
-      it('should set fledgeEnabled correctly per bidder', function () {
-        config.setConfig({
-          bidderSequence: 'fixed',
-          fledgeForGpt: {
-            enabled: true,
-            bidders: ['appnexus'],
-            defaultForSlots: 1,
-          }
-        });
-
-        const bidRequests = adapterManager.makeBidRequests(
-          adUnits,
-          Date.now(),
-          utils.getUniqueIdentifierStr(),
-          function callback() {
-          },
-          []
-        );
-
-        expect(bidRequests[0].bids[0].bidder).equals('appnexus');
-        expect(bidRequests[0].fledgeEnabled).to.be.true;
-        expect(bidRequests[0].defaultForSlots).to.equal(1);
-
-        expect(bidRequests[1].bids[0].bidder).equals('rubicon');
-        expect(bidRequests[1].fledgeEnabled).to.be.undefined;
-        expect(bidRequests[1].defaultForSlots).to.be.undefined;
-      });
-
-      it('should set fledgeEnabled correctly for all bidders', function () {
-        config.setConfig({
-          bidderSequence: 'fixed',
-          fledgeForGpt: {
-            enabled: true,
-            defaultForSlots: 1,
-          }
-        });
-
-        const bidRequests = adapterManager.makeBidRequests(
-          adUnits,
-          Date.now(),
-          utils.getUniqueIdentifierStr(),
-          function callback() {
-          },
-          []
-        );
-
-        expect(bidRequests[0].bids[0].bidder).equals('appnexus');
-        expect(bidRequests[0].fledgeEnabled).to.be.true;
-        expect(bidRequests[0].defaultForSlots).to.equal(1);
-
-        expect(bidRequests[1].bids[0].bidder).equals('rubicon');
-        expect(bidRequests[0].fledgeEnabled).to.be.true;
-        expect(bidRequests[0].defaultForSlots).to.equal(1);
-      });
-    });
-  });
-
-  describe('ortb processors for fledge', () => {
-    describe('when defaultForSlots is set', () => {
-      it('imp.ext.ae should be set if fledge is enabled', () => {
-        const imp = {};
-        setImpExtAe(imp, {}, {bidderRequest: {fledgeEnabled: true, defaultForSlots: 1}});
-        expect(imp.ext.ae).to.equal(1);
-      });
-      it('imp.ext.ae should be left intact if set on adunit and fledge is enabled', () => {
-        const imp = {ext: {ae: 2}};
-        setImpExtAe(imp, {}, {bidderRequest: {fledgeEnabled: true, defaultForSlots: 1}});
-        expect(imp.ext.ae).to.equal(2);
-      });
-    });
-    describe('when defaultForSlots is not defined', () => {
-      it('imp.ext.ae should be removed if fledge is not enabled', () => {
-        const imp = {ext: {ae: 1}};
-        setImpExtAe(imp, {}, {bidderRequest: {}});
-        expect(imp.ext.ae).to.not.exist;
-      });
-      it('imp.ext.ae should be left intact if fledge is enabled', () => {
-        const imp = {ext: {ae: 2}};
-        setImpExtAe(imp, {}, {bidderRequest: {fledgeEnabled: true}});
-        expect(imp.ext.ae).to.equal(2);
-      });
-    });
-    describe('parseExtPrebidFledge', () => {
-      function packageConfigs(configs) {
-        return {
-          ext: {
-            prebid: {
-              fledge: {
-                auctionconfigs: configs
-              }
-            }
-          }
-        };
-      }
-
-      function generateImpCtx(fledgeFlags) {
-        return Object.fromEntries(Object.entries(fledgeFlags).map(([impid, fledgeEnabled]) => [impid, {imp: {ext: {ae: fledgeEnabled}}}]));
-      }
-
-      function generateCfg(impid, ...ids) {
-        return ids.map((id) => ({impid, config: {id}}));
-      }
-
-      function extractResult(ctx) {
-        return Object.fromEntries(
-          Object.entries(ctx)
-            .map(([impid, ctx]) => [impid, ctx.fledgeConfigs?.map(cfg => cfg.config.id)])
-            .filter(([_, val]) => val != null)
-        );
-      }
-
-      it('should collect fledge configs by imp', () => {
-        const ctx = {
-          impContext: generateImpCtx({e1: 1, e2: 1, d1: 0})
-        };
-        const resp = packageConfigs(
-          generateCfg('e1', 1, 2, 3)
-            .concat(generateCfg('e2', 4)
-              .concat(generateCfg('d1', 5, 6)))
-        );
-        parseExtPrebidFledge({}, resp, ctx);
-        expect(extractResult(ctx.impContext)).to.eql({
-          e1: [1, 2, 3],
-          e2: [4],
-        });
-      });
-      it('should not choke if fledge config references unknown imp', () => {
-        const ctx = {impContext: generateImpCtx({i: 1})};
-        const resp = packageConfigs(generateCfg('unknown', 1));
-        parseExtPrebidFledge({}, resp, ctx);
-        expect(extractResult(ctx.impContext)).to.eql({});
-      });
-    });
-    describe('setResponseFledgeConfigs', () => {
-      it('should set fledgeAuctionConfigs paired with their corresponding bid id', () => {
-        const ctx = {
-          impContext: {
-            1: {
-              bidRequest: {bidId: 'bid1'},
-              fledgeConfigs: [{config: {id: 1}}, {config: {id: 2}}]
-            },
-            2: {
-              bidRequest: {bidId: 'bid2'},
-              fledgeConfigs: [{config: {id: 3}}]
-            },
-            3: {
-              bidRequest: {bidId: 'bid3'}
-            }
-          }
-        };
-        const resp = {};
-        setResponseFledgeConfigs(resp, {}, ctx);
-        expect(resp.fledgeAuctionConfigs).to.eql([
-          {bidId: 'bid1', config: {id: 1}},
-          {bidId: 'bid1', config: {id: 2}},
-          {bidId: 'bid2', config: {id: 3}},
-        ]);
-      });
-      it('should not set fledgeAuctionConfigs if none exist', () => {
-        const resp = {};
-        setResponseFledgeConfigs(resp, {}, {
-          impContext: {
-            1: {
-              fledgeConfigs: []
-            },
-            2: {}
-          }
-        });
-        expect(resp).to.eql({});
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/flippBidAdapter_spec.js b/test/spec/modules/flippBidAdapter_spec.js
index 518052ad91e..9602a156bed 100644
--- a/test/spec/modules/flippBidAdapter_spec.js
+++ b/test/spec/modules/flippBidAdapter_spec.js
@@ -99,6 +99,14 @@ describe('flippAdapter', function () {
                 'requestId': '237f4d1a293f99',
                 'cpm': 1.11,
                 'creative': 'Returned from server',
+              },
+              'contents': {
+                'data': {
+                  'customData': {
+                    'compactHeight': 600,
+                    'standardHeight': 1800
+                  }
+                }
               }
             }]
           },
@@ -114,7 +122,7 @@ describe('flippAdapter', function () {
           cpm: 1.11,
           netRevenue: true,
           width: 300,
-          height: 600,
+          height: 1800,
           creativeId: 262838368,
           ttl: 30,
           ad: 'Returned from server',
diff --git a/test/spec/modules/fluctBidAdapter_spec.js b/test/spec/modules/fluctBidAdapter_spec.js
index ff6f8562a4e..32ca99ecd76 100644
--- a/test/spec/modules/fluctBidAdapter_spec.js
+++ b/test/spec/modules/fluctBidAdapter_spec.js
@@ -26,30 +26,30 @@ describe('fluctAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return true when dfpUnitCode is not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         tagId: '10000:100000001',
         groupId: '1000000002',
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(true);
     });
 
     it('should return false when groupId is not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         dfpUnitCode: '/1000/dfp_unit_code',
         tagId: '10000:100000001',
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/freewheel-sspBidAdapter_spec.js b/test/spec/modules/freewheel-sspBidAdapter_spec.js
index c42c5e2528d..94b7f04b637 100644
--- a/test/spec/modules/freewheel-sspBidAdapter_spec.js
+++ b/test/spec/modules/freewheel-sspBidAdapter_spec.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import { spec } from 'modules/freewheel-sspBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { createEidsArray } from 'modules/userId/eids.js';
+import { config } from 'src/config.js';
 
 const ENDPOINT = '//ads.stickyadstv.com/www/delivery/swfIndex.php';
 const PREBID_VERSION = '$prebid.version$';
@@ -40,12 +41,12 @@ describe('freewheelSSP BidAdapter Test', () => {
     });
 
     it('should return false when required params are not passed', () => {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         wrong: 'missing zone id'
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -72,12 +73,12 @@ describe('freewheelSSP BidAdapter Test', () => {
     });
 
     it('should return false when required params are not passed', () => {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         wrong: 'missing zone id'
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -203,6 +204,14 @@ describe('freewheelSSP BidAdapter Test', () => {
       let bidderRequest = {
         'gdprConsent': {
           'consentString': gdprConsentString
+        },
+        'ortb2': {
+          'site': {
+            'content': {
+              'test': 'news',
+              'test2': 'param'
+            }
+          }
         }
       };
 
@@ -216,6 +225,7 @@ describe('freewheelSSP BidAdapter Test', () => {
       expect(payload.playerSize).to.equal('300x600');
       expect(payload._fw_gdpr_consent).to.exist.and.to.be.a('string');
       expect(payload._fw_gdpr_consent).to.equal(gdprConsentString);
+      expect(payload._fw_prebid_content).to.deep.equal('{\"test\":\"news\",\"test2\":\"param\"}');
 
       let gdprConsent = {
         'gdprApplies': true,
diff --git a/test/spec/modules/ftrackIdSystem_spec.js b/test/spec/modules/ftrackIdSystem_spec.js
index ecd610a12fb..12e18ed5354 100644
--- a/test/spec/modules/ftrackIdSystem_spec.js
+++ b/test/spec/modules/ftrackIdSystem_spec.js
@@ -3,10 +3,10 @@ import * as utils from 'src/utils.js';
 import { uspDataHandler } from 'src/adapterManager.js';
 import { loadExternalScript } from 'src/adloader.js';
 import { getGlobal } from 'src/prebidGlobal.js';
-import { init, setSubmoduleRegistry } from 'modules/userId/index.js';
+import {attachIdSystem, init, setSubmoduleRegistry} from 'modules/userId/index.js';
 import {createEidsArray} from 'modules/userId/eids.js';
 import {config} from 'src/config.js';
-let expect = require('chai').expect;
+import 'src/prebid.js';
 
 let server;
 
@@ -380,10 +380,10 @@ describe('FTRACK ID System', () => {
           }
         });
 
-        getGlobal().getUserIdsAsync().then(ids => {
-          expect(ids).to.deep.equal({
+        return getGlobal().getUserIdsAsync().then(ids => {
+          expect(ids.ftrackId).to.deep.equal({
             uid: 'device_test_id',
-            ftrackId: {
+            ext: {
               HHID: 'household_test_id',
               DeviceID: 'device_test_id',
               SingleDeviceID: 'single_device_test_id'
@@ -558,5 +558,40 @@ describe('FTRACK ID System', () => {
         });
       });
     });
+  });
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(ftrackIdSubmodule);
+    });
+    it('should return the correct EID schema', () => {
+      // This is the schema returned from the ftrack decode() method
+      expect(createEidsArray({
+        ftrackId: {
+          uid: 'test-device-id',
+          ext: {
+            DeviceID: 'test-device-id',
+            SingleDeviceID: 'test-single-device-id',
+            HHID: 'test-household-id'
+          }
+        },
+        foo: {
+          bar: 'baz'
+        },
+        lorem: {
+          ipsum: ''
+        }
+      })).to.deep.equal([{
+        source: 'flashtalking.com',
+        uids: [{
+          atype: 1,
+          id: 'test-device-id',
+          ext: {
+            DeviceID: 'test-device-id',
+            SingleDeviceID: 'test-single-device-id',
+            HHID: 'test-household-id'
+          }
+        }]
+      }]);
+    });
   })
 });
diff --git a/test/spec/modules/gameraRtdProvider_spec.js b/test/spec/modules/gameraRtdProvider_spec.js
new file mode 100644
index 00000000000..63029d85545
--- /dev/null
+++ b/test/spec/modules/gameraRtdProvider_spec.js
@@ -0,0 +1,223 @@
+import { submodule } from 'src/hook.js';
+import { getGlobal } from 'src/prebidGlobal.js';
+import * as utils from 'src/utils.js';
+import { subModuleObj } from 'modules/gameraRtdProvider.js';
+
+describe('gameraRtdProvider', function () {
+  let logErrorSpy;
+
+  beforeEach(function () {
+    logErrorSpy = sinon.spy(utils, 'logError');
+  });
+
+  afterEach(function () {
+    logErrorSpy.restore();
+  });
+
+  describe('subModuleObj', function () {
+    it('should have the correct module name', function () {
+      expect(subModuleObj.name).to.equal('gamera');
+    });
+
+    it('successfully instantiates and returns true', function () {
+      expect(subModuleObj.init()).to.equal(true);
+    });
+  });
+
+  describe('getBidRequestData', function () {
+    const reqBidsConfigObj = {
+      adUnits: [{
+        code: 'test-div',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        ortb2Imp: {
+          ext: {
+            data: {
+              pbadslot: 'homepage-top-rect',
+              adUnitSpecificAttribute: '123',
+            }
+          }
+        },
+        bids: [{ bidder: 'test' }]
+      }],
+      ortb2Fragments: {
+        global: {
+          site: {
+            name: 'example',
+            domain: 'page.example.com',
+            // OpenRTB 2.5 spec / Content Taxonomy
+            cat: ['IAB2'],
+            sectioncat: ['IAB2-2'],
+            pagecat: ['IAB2-2'],
+
+            page: 'https://page.example.com/here.html',
+            ref: 'https://ref.example.com',
+            keywords: 'power tools, drills',
+            search: 'drill',
+            content: {
+              userrating: '4',
+              data: [{
+                name: 'www.dataprovider1.com', // who resolved the segments
+                ext: {
+                  segtax: 7, // taxonomy used to encode the segments
+                  cids: ['iris_c73g5jq96mwso4d8']
+                },
+                // the bare minimum are the IDs. These IDs are the ones from the new IAB Content Taxonomy v3
+                segment: [{ id: '687' }, { id: '123' }]
+              }]
+            },
+            ext: {
+              data: { // fields that aren't part of openrtb 2.6
+                pageType: 'article',
+                category: 'repair'
+              }
+            }
+          },
+          // this is where the user data is placed
+          user: {
+            keywords: 'a,b',
+            data: [{
+              name: 'dataprovider.com',
+              ext: {
+                segtax: 4
+              },
+              segment: [{
+                id: '1'
+              }]
+            }],
+            ext: {
+              data: {
+                registered: true,
+                interests: ['cars']
+              }
+            }
+          }
+        }
+      }
+    };
+
+    let callback;
+
+    beforeEach(function () {
+      callback = sinon.spy();
+      window.gamera = undefined;
+    });
+
+    it('should queue command when gamera.getPrebidSegments is not available', function () {
+      subModuleObj.getBidRequestData(reqBidsConfigObj, callback);
+
+      expect(window.gamera).to.exist;
+      expect(window.gamera.cmd).to.be.an('array');
+      expect(window.gamera.cmd.length).to.equal(1);
+      expect(callback.called).to.be.false;
+
+      // our callback should be executed if command queue is flushed
+      window.gamera.cmd.forEach(command => command());
+      expect(callback.calledOnce).to.be.true;
+    });
+
+    it('should call enrichAuction directly when gamera.getPrebidSegments is available', function () {
+      window.gamera = {
+        getPrebidSegments: () => ({})
+      };
+
+      subModuleObj.getBidRequestData(reqBidsConfigObj, callback);
+
+      expect(callback.calledOnce).to.be.true;
+    });
+
+    it('should handle errors gracefully', function () {
+      window.gamera = {
+        getPrebidSegments: () => {
+          throw new Error('Test error');
+        }
+      };
+
+      subModuleObj.getBidRequestData(reqBidsConfigObj, callback);
+
+      expect(logErrorSpy.calledWith('gameraRtdProvider', 'Error getting segments:')).to.be.true;
+      expect(callback.calledOnce).to.be.true;
+    });
+
+    describe('segment enrichment', function () {
+      const mockSegments = {
+        user: {
+          data: [{
+            name: 'gamera.ai',
+            ext: {
+              segtax: 4,
+            },
+            segment: [{ id: 'user-1' }]
+          }]
+        },
+        site: {
+          keywords: 'gamera,article,keywords',
+          content: {
+            data: [{
+              name: 'gamera.ai',
+              ext: {
+                segtax: 7,
+              },
+              segment: [{ id: 'site-1' }]
+            }]
+          }
+        },
+        adUnits: {
+          'test-div': {
+            key: 'value',
+            ext: {
+              data: {
+                gameraSegment: 'ad-1',
+              }
+            }
+          }
+        }
+      };
+
+      beforeEach(function () {
+        window.gamera = {
+          getPrebidSegments: () => mockSegments
+        };
+      });
+
+      it('should enrich ortb2Fragments with user data', function () {
+        subModuleObj.getBidRequestData(reqBidsConfigObj, callback);
+
+        expect(reqBidsConfigObj.ortb2Fragments.global.user.data).to.deep.include(mockSegments.user.data[0]);
+
+        // check if existing attributes are not overwritten
+        expect(reqBidsConfigObj.ortb2Fragments.global.user.data[0].ext.segtax).to.equal(4);
+        expect(reqBidsConfigObj.ortb2Fragments.global.user.data[0].segment[0].id).to.equal('1');
+        expect(reqBidsConfigObj.ortb2Fragments.global.user.keywords).to.equal('a,b');
+        expect(reqBidsConfigObj.ortb2Fragments.global.user.ext.data.registered).to.equal(true);
+      });
+
+      it('should enrich ortb2Fragments with site data', function () {
+        subModuleObj.getBidRequestData(reqBidsConfigObj, callback);
+
+        expect(reqBidsConfigObj.ortb2Fragments.global.site.content.data).to.deep.include(mockSegments.site.content.data[0]);
+        expect(reqBidsConfigObj.ortb2Fragments.global.site.keywords).to.equal('gamera,article,keywords');
+
+        // check if existing attributes are not overwritten
+        expect(reqBidsConfigObj.ortb2Fragments.global.site.content.data[0].ext.segtax).to.equal(7);
+        expect(reqBidsConfigObj.ortb2Fragments.global.site.content.data[0].segment[0].id).to.equal('687');
+        expect(reqBidsConfigObj.ortb2Fragments.global.site.ext.data.category).to.equal('repair');
+        expect(reqBidsConfigObj.ortb2Fragments.global.site.content.userrating).to.equal('4');
+      });
+
+      it('should enrich adUnits with segment data', function () {
+        subModuleObj.getBidRequestData(reqBidsConfigObj, callback);
+
+        expect(reqBidsConfigObj.adUnits[0].ortb2Imp.key).to.equal('value');
+        expect(reqBidsConfigObj.adUnits[0].ortb2Imp.ext.data.gameraSegment).to.equal('ad-1');
+
+        // check if existing attributes are not overwritten
+        expect(reqBidsConfigObj.adUnits[0].ortb2Imp.ext.data.adUnitSpecificAttribute).to.equal('123');
+        expect(reqBidsConfigObj.adUnits[0].ortb2Imp.ext.data.pbadslot).to.equal('homepage-top-rect');
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/gammaBidAdapter_spec.js b/test/spec/modules/gammaBidAdapter_spec.js
index 35394df7d11..2c83c3912e3 100644
--- a/test/spec/modules/gammaBidAdapter_spec.js
+++ b/test/spec/modules/gammaBidAdapter_spec.js
@@ -8,8 +8,9 @@ describe('gammaBidAdapter', function() {
   let bid = {
     'bidder': 'gamma',
     'params': {
-      siteId: '1465446377',
-      zoneId: '1515999290'
+      siteId: '1398219351',
+      zoneId: '1398219417',
+      region: 'SGP'
     },
     'adUnitCode': 'adunit-code',
     'sizes': [
@@ -27,9 +28,9 @@ describe('gammaBidAdapter', function() {
     });
 
     it('should return false when require params are not passed', () => {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when params not passed correctly', () => {
@@ -84,7 +85,7 @@ describe('gammaBidAdapter', function() {
         'width': 300,
         'height': 250,
         'creativeId': '1515999070',
-        'dealId': 'gax-paj2qarjf2g',
+        'dealId': 'gax-lvpjgs5b9k4n',
         'currency': 'USD',
         'netRevenue': true,
         'ttl': 300,
diff --git a/test/spec/modules/gamoshiBidAdapter_spec.js b/test/spec/modules/gamoshiBidAdapter_spec.js
index 984830f67d4..8f9818ed901 100644
--- a/test/spec/modules/gamoshiBidAdapter_spec.js
+++ b/test/spec/modules/gamoshiBidAdapter_spec.js
@@ -379,7 +379,7 @@ describe('GamoshiAdapter', () => {
       const bidRequestWithVideo = utils.deepClone(bidRequest);
 
       bidRequestWithVideo.params.video = {
-        placement: 1,
+        plcmt: 1,
         minduration: 1,
       }
 
@@ -398,7 +398,7 @@ describe('GamoshiAdapter', () => {
 
       expect(response.data.imp[0].video.mimes).to.equal(bidRequestWithVideo.mediaTypes.video.mimes);
       expect(response.data.imp[0].video.skip).to.not.exist;
-      expect(response.data.imp[0].video.placement).to.equal(1);
+      expect(response.data.imp[0].video.plcmt).to.equal(1);
       expect(response.data.imp[0].video.minduration).to.equal(1);
       expect(response.data.imp[0].video.playbackmethod).to.equal(1);
       expect(response.data.imp[0].video.startdelay).to.equal(1);
@@ -408,7 +408,7 @@ describe('GamoshiAdapter', () => {
           playerSize: [302, 252],
           mimes: ['video/mpeg'],
           skip: 1,
-          placement: 1,
+          plcmt: 1,
           minduration: 1,
           playbackmethod: 1,
           startdelay: 1,
@@ -431,7 +431,7 @@ describe('GamoshiAdapter', () => {
           context: 'instream',
           mimes: ['video/mpeg'],
           skip: 1,
-          placement: 1,
+          plcmt: 1,
           minduration: 1,
           playbackmethod: 1,
           startdelay: 1,
@@ -440,6 +440,7 @@ describe('GamoshiAdapter', () => {
       let response = spec.buildRequests([bidRequestWithVideo], bidRequest)[0];
       expect(response.data.imp[0].video.ext.context).to.equal('instream');
       bidRequestWithVideo.mediaTypes.video.context = 'outstream';
+      bidRequestWithVideo.mediaTypes.video.context = 'outstream';
 
       const bidRequestWithPosEquals1 = utils.deepClone(bidRequestWithVideo);
       bidRequestWithPosEquals1.mediaTypes.video.context = 'outstream';
@@ -460,7 +461,7 @@ describe('GamoshiAdapter', () => {
         context: 'instream',
         mimes: ['video/mpeg'],
         skip: 1,
-        placement: 1,
+        plcmt: 1,
         minduration: 1,
         playbackmethod: 1,
         startdelay: 1,
diff --git a/test/spec/modules/genericAnalyticsAdapter_spec.js b/test/spec/modules/genericAnalyticsAdapter_spec.js
index a5a6074c425..f574a33bf86 100644
--- a/test/spec/modules/genericAnalyticsAdapter_spec.js
+++ b/test/spec/modules/genericAnalyticsAdapter_spec.js
@@ -1,8 +1,8 @@
 import {defaultHandler, GenericAnalytics} from '../../../modules/genericAnalyticsAdapter.js';
 import * as events from 'src/events.js';
-import * as CONSTANTS from 'src/constants.json';
+import {EVENTS} from 'src/constants.js';
 
-const {AUCTION_INIT, BID_RESPONSE} = CONSTANTS.EVENTS;
+const {AUCTION_INIT, BID_RESPONSE} = EVENTS;
 
 describe('Generic analytics', () => {
   describe('adapter', () => {
@@ -75,7 +75,7 @@ describe('Generic analytics', () => {
             options: {
               url: 'mock',
               events: {
-                bidResponse: null
+                mockEvent: null
               }
             }
           });
@@ -265,7 +265,7 @@ describe('Generic analytics', () => {
           handler([payload, {}]);
           sinon.assert.calledWith(ajax, url, sinon.match.any,
             sinon.match(data => sinon.match(payload).test(parse(data))),
-            {method}
+            {method, keepalive: true}
           );
         });
 
@@ -275,7 +275,7 @@ describe('Generic analytics', () => {
           handler(payload);
           sinon.assert.calledWith(ajax, url, sinon.match.any,
             sinon.match(data => sinon.match(payload).test(parse(data))),
-            {method}
+            {method, keepalive: true}
           );
         });
       });
diff --git a/test/spec/modules/geoedgeRtdProvider_spec.js b/test/spec/modules/geoedgeRtdProvider_spec.js
index 96da2e3dbd7..5f3f2a5b1b8 100644
--- a/test/spec/modules/geoedgeRtdProvider_spec.js
+++ b/test/spec/modules/geoedgeRtdProvider_spec.js
@@ -1,47 +1,51 @@
 import * as utils from '../../../src/utils.js';
-import {loadExternalScript} from '../../../src/adloader.js';
-import {
+import { loadExternalScript } from '../../../src/adloader.js';
+import * as geoedgeRtdModule from '../../../modules/geoedgeRtdProvider.js';
+import { server } from '../../../test/mocks/xhr.js';
+import * as events from '../../../src/events.js';
+import { EVENTS } from '../../../src/constants.js';
+
+const {
   geoedgeSubmodule,
   getClientUrl,
   getInPageUrl,
   htmlPlaceholder,
   setWrapper,
-  wrapper,
-  WRAPPER_URL
-} from '../../../modules/geoedgeRtdProvider.js';
-import {server} from '../../../test/mocks/xhr.js';
-import * as events from '../../../src/events.js';
-import CONSTANTS from '../../../src/constants.json';
+  getMacros,
+  WRAPPER_URL,
+  preloadClient,
+  markAsLoaded
+} = geoedgeRtdModule;
 
-let key = '123123123';
+const key = '123123123';
 function makeConfig(gpt) {
   return {
     name: 'geoedge',
     params: {
       wap: false,
-      key: key,
+      key,
       bidders: {
         bidderA: true,
         bidderB: false
       },
-      gpt: gpt
+      gpt
     }
   };
 }
 
 function mockBid(bidderCode) {
   return {
-    'ad': '',
-    'adId': '1234',
-    'cpm': '1.00',
-    'width': 300,
-    'height': 250,
-    'bidderCode': bidderCode,
-    'requestId': utils.getUniqueIdentifierStr(),
-    'creativeId': 'id',
-    'currency': 'USD',
-    'netRevenue': true,
-    'ttl': 360
+    ad: '',
+    adId: '1234',
+    cpm: '1.00',
+    width: 300,
+    height: 250,
+    bidderCode,
+    requestId: utils.getUniqueIdentifierStr(),
+    creativeId: 'id',
+    currency: 'USD',
+    netRevenue: true,
+    ttl: 360
   };
 }
 
@@ -54,7 +58,7 @@ function mockMessageFromClient(key) {
   };
 }
 
-let mockWrapper = `${htmlPlaceholder}`;
+const mockWrapper = `${htmlPlaceholder}`;
 
 describe('Geoedge RTD module', function () {
   describe('submodule', function () {
@@ -64,17 +68,15 @@ describe('Geoedge RTD module', function () {
       });
     });
     describe('init', function () {
-      let insertElementStub;
-
       before(function () {
-        insertElementStub = sinon.stub(utils, 'insertElement');
+        sinon.spy(geoedgeRtdModule, 'preloadClient');
       });
       after(function () {
-        utils.insertElement.restore();
+        geoedgeRtdModule.preloadClient.restore();
       });
       it('should return false when missing params or key', function () {
-        let missingParams = geoedgeSubmodule.init({});
-        let missingKey = geoedgeSubmodule.init({ params: {} });
+        const missingParams = geoedgeSubmodule.init({});
+        const missingKey = geoedgeSubmodule.init({ params: {} });
         expect(missingParams || missingKey).to.equal(false);
       });
       it('should return true when params are ok', function () {
@@ -82,18 +84,17 @@ describe('Geoedge RTD module', function () {
       });
       it('should fetch the wrapper', function () {
         geoedgeSubmodule.init(makeConfig(false));
-        let request = server.requests[0];
-        let isWrapperRequest = request && request.url && request.url && request.url === WRAPPER_URL;
+        const request = server.requests[0];
+        const isWrapperRequest = request && request.url && request.url && request.url === WRAPPER_URL;
         expect(isWrapperRequest).to.equal(true);
       });
-      it('should preload the client', function () {
-        let isLinkPreloadAsScript = arg => arg.tagName === 'LINK' && arg.rel === 'preload' && arg.as === 'script' && arg.href === getClientUrl(key);
-        expect(insertElementStub.calledWith(sinon.match(isLinkPreloadAsScript))).to.equal(true);
+      it('should call preloadClient', function () {
+        expect(preloadClient.called);
       });
       it('should emit billable events with applicable winning bids', function (done) {
         let counter = 0;
-        events.on(CONSTANTS.EVENTS.BILLABLE_EVENT, function (event) {
-          if (event.vendor === 'geoedge' && event.type === 'impression') {
+        events.on(EVENTS.BILLABLE_EVENT, function (event) {
+          if (event.vendor === geoedgeSubmodule.name && event.type === 'impression') {
             counter += 1;
           }
           expect(counter).to.equal(1);
@@ -103,35 +104,69 @@ describe('Geoedge RTD module', function () {
       });
       it('should load the in page code when gpt params is true', function () {
         geoedgeSubmodule.init(makeConfig(true));
-        let isInPageUrl = arg => arg == getInPageUrl(key);
+        const isInPageUrl = arg => arg === getInPageUrl(key);
         expect(loadExternalScript.calledWith(sinon.match(isInPageUrl))).to.equal(true);
       });
       it('should set the window.grumi config object when gpt params is true', function () {
-        let hasGrumiObj = typeof window.grumi === 'object';
+        const hasGrumiObj = typeof window.grumi === 'object';
         expect(hasGrumiObj && window.grumi.key === key && window.grumi.fromPrebid).to.equal(true);
       });
     });
+    describe('preloadClient', function () {
+      let iframe;
+      preloadClient(key);
+      const loadExternalScriptCall = loadExternalScript.getCall(0);
+      it('should create an invisible iframe and insert it to the DOM', function () {
+        iframe = document.getElementById('grumiFrame');
+        expect(iframe && iframe.style.display === 'none');
+      });
+      it('should assign params object to the iframe\'s window', function () {
+        const grumi = iframe.contentWindow.grumi;
+        expect(grumi.key).to.equal(key);
+      });
+      it('should preload the client into the iframe', function () {
+        const isClientUrl = arg => arg === getClientUrl(key);
+        expect(loadExternalScriptCall.calledWithMatch(isClientUrl)).to.equal(true);
+      });
+    });
     describe('setWrapper', function () {
       it('should set the wrapper', function () {
         setWrapper(mockWrapper);
-        expect(wrapper).to.equal(mockWrapper);
+        expect(geoedgeRtdModule.wrapper).to.equal(mockWrapper);
+      });
+    });
+    describe('getMacros', function () {
+      it('return a dictionary of macros replaced with values from bid object', function () {
+        const bid = mockBid('testBidder');
+        const dict = getMacros(bid, key);
+        const hasCpm = dict['%_hbCpm!'] === bid.cpm;
+        const hasCurrency = dict['%_hbCurrency!'] === bid.currency;
+        expect(hasCpm && hasCurrency);
+      });
+      it('return a dictionary of macros replaced with values from overrides object if provided', function () {
+        const bid = mockBid('testBidder');
+        window.grumi.overrides = { site: 'test-overrides' };
+        const overrides = window.grumi.overrides;
+        const dict = getMacros(bid, key);
+        const siteOveridden = dict['%%SITE%%'] === overrides.site;
+        expect(siteOveridden);
       });
     });
     describe('onBidResponseEvent', function () {
-      let bidFromA = mockBid('bidderA');
+      const bidFromA = mockBid('bidderA');
       it('should wrap bid html when bidder is configured', function () {
         geoedgeSubmodule.onBidResponseEvent(bidFromA, makeConfig(false));
         expect(bidFromA.ad.indexOf('')).to.equal(0);
       });
       it('should not wrap bid html when bidder is not configured', function () {
-        let bidFromB = mockBid('bidderB');
+        const bidFromB = mockBid('bidderB');
         geoedgeSubmodule.onBidResponseEvent(bidFromB, makeConfig(false));
         expect(bidFromB.ad.indexOf('')).to.equal(-1);
       });
       it('should only muatate the bid ad porperty', function () {
-        let copy = Object.assign({}, bidFromA);
+        const copy = Object.assign({}, bidFromA);
         delete copy.ad;
-        let equalsOriginal = Object.keys(copy).every(key => copy[key] === bidFromA[key]);
+        const equalsOriginal = Object.keys(copy).every(key => copy[key] === bidFromA[key]);
         expect(equalsOriginal).to.equal(true);
       });
     });
diff --git a/test/spec/modules/globalsunBidAdapter_spec.js b/test/spec/modules/globalsunBidAdapter_spec.js
index 0d17c25363d..0651b05894f 100644
--- a/test/spec/modules/globalsunBidAdapter_spec.js
+++ b/test/spec/modules/globalsunBidAdapter_spec.js
@@ -3,9 +3,19 @@ import { spec } from '../../../modules/globalsunBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'globalsun'
+const bidder = 'globalsun';
 
 describe('GlobalsunBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -16,8 +26,9 @@ describe('GlobalsunBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -30,8 +41,9 @@ describe('GlobalsunBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -53,8 +65,9 @@ describe('GlobalsunBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -73,9 +86,20 @@ describe('GlobalsunBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
     timeout: 500
   };
@@ -112,6 +136,7 @@ describe('GlobalsunBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -129,7 +154,7 @@ describe('GlobalsunBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -145,6 +170,56 @@ describe('GlobalsunBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -170,8 +245,10 @@ describe('GlobalsunBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -186,12 +263,38 @@ describe('GlobalsunBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -395,5 +498,17 @@ describe('GlobalsunBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://cs.globalsun.io/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.globalsun.io/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/gmosspBidAdapter_spec.js b/test/spec/modules/gmosspBidAdapter_spec.js
index 8c3aa6c94cb..77644b136db 100644
--- a/test/spec/modules/gmosspBidAdapter_spec.js
+++ b/test/spec/modules/gmosspBidAdapter_spec.js
@@ -27,10 +27,10 @@ describe('GmosspAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/gnetBidAdapter_spec.js b/test/spec/modules/gnetBidAdapter_spec.js
index f1af3b71103..8e2cfadc96b 100644
--- a/test/spec/modules/gnetBidAdapter_spec.js
+++ b/test/spec/modules/gnetBidAdapter_spec.js
@@ -32,10 +32,10 @@ describe('gnetAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/goldbachBidAdapter_spec.js b/test/spec/modules/goldbachBidAdapter_spec.js
index 93956d2caf9..6ea84ed6931 100644
--- a/test/spec/modules/goldbachBidAdapter_spec.js
+++ b/test/spec/modules/goldbachBidAdapter_spec.js
@@ -36,23 +36,23 @@ describe('GoldbachXandrAdapter', function () {
     });
 
     it('should return true when required params found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'member': '1234',
         'invCode': 'ABCD'
       };
 
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(true);
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placementId': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/goldfishAdsRtdProvider_spec.js b/test/spec/modules/goldfishAdsRtdProvider_spec.js
new file mode 100755
index 00000000000..39a1e0c9b33
--- /dev/null
+++ b/test/spec/modules/goldfishAdsRtdProvider_spec.js
@@ -0,0 +1,163 @@
+import {
+  goldfishAdsSubModule,
+  manageCallbackResponse,
+} from 'modules/goldfishAdsRtdProvider.js';
+import { getStorageManager } from '../../../src/storageManager.js';
+import { expect } from 'chai';
+import { server } from 'test/mocks/xhr.js';
+import { config as _config } from 'src/config.js';
+import { DATA_STORAGE_KEY, MODULE_NAME, MODULE_TYPE, getStorageData, updateUserData } from '../../../modules/goldfishAdsRtdProvider';
+
+const responseHeader = { 'Content-Type': 'application/json' };
+
+const sampleConfig = {
+  name: 'golfishAds',
+  waitForIt: true,
+  params: {
+    key: 'testkey'
+  }
+};
+
+const sampleAdUnits = [
+  {
+    code: 'one-div-id',
+    mediaTypes: {
+      banner: {
+        sizes: [970, 250]
+      }
+    },
+    bids: [
+      {
+        bidder: 'appnexus',
+        params: {
+          placementId: 12345370,
+        }
+      }]
+  },
+  {
+    code: 'two-div-id',
+    mediaTypes: {
+      banner: { sizes: [300, 250] }
+    },
+    bids: [
+      {
+        bidder: 'appnexus',
+        params: {
+          placementId: 12345370,
+        }
+      }]
+  }];
+
+const sampleOutputData = [1, 2, 3]
+
+describe('goldfishAdsRtdProvider is a RTD provider that', function () {
+  describe('has a method `init` that', function () {
+    it('exists', function () {
+      expect(goldfishAdsSubModule.init).to.be.a('function');
+    });
+    it('returns false missing config params', function () {
+      const config = {
+        name: 'goldfishAds',
+        waitForIt: true,
+      };
+      const value = goldfishAdsSubModule.init(config);
+      expect(value).to.equal(false);
+    });
+    it('returns false if missing providers param', function () {
+      const config = {
+        name: 'goldfishAds',
+        waitForIt: true,
+        params: {}
+      };
+      const value = goldfishAdsSubModule.init(config);
+      expect(value).to.equal(false);
+    });
+    it('returns false if wrong providers param included', function () {
+      const config = {
+        name: 'goldfishAds',
+        waitForIt: true,
+        params: {
+          account: 'test'
+        }
+      };
+      const value = goldfishAdsSubModule.init(config);
+      expect(value).to.equal(false);
+    });
+    it('returns true if good providers param included', function () {
+      const config = {
+        name: 'goldfishAds',
+        waitForIt: true,
+        params: {
+          key: 'testkey'
+        }
+      };
+      const value = goldfishAdsSubModule.init(config);
+      expect(value).to.equal(true);
+    });
+  });
+
+  describe('has a method `getBidRequestData` that', function () {
+    it('exists', function () {
+      expect(goldfishAdsSubModule.getBidRequestData).to.be.a('function');
+    });
+
+    it('send correct request', function () {
+      const callback = sinon.spy();
+      let request;
+      const reqBidsConfigObj = { adUnits: sampleAdUnits };
+      goldfishAdsSubModule.getBidRequestData(reqBidsConfigObj, callback, sampleConfig);
+      request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify(sampleOutputData));
+      expect(request.url).to.be.include(`?key=testkey`);
+    });
+  });
+
+  describe('has a manageCallbackResponse that', function () {
+    it('properly transforms the response', function () {
+      const response = { response: '[\"1\", \"2\", \"3\"]' };
+      const output = manageCallbackResponse(response);
+      expect(output.name).to.be.equal('goldfishads.com');
+    });
+  });
+
+  describe('has an updateUserData that', function () {
+    it('properly transforms the response', function () {
+      const userData = {
+        segment: [{id: '1'}, {id: '2'}],
+        ext: {
+          segtax: 4,
+        }
+      };
+      const reqBidsConfigObj = { ortb2Fragments: { bidder: { appnexus: { user: { data: [] } } } } };
+      const output = updateUserData(userData, reqBidsConfigObj);
+      expect(output.ortb2Fragments.bidder.appnexus.user.data[0].segment).to.be.length(2);
+      expect(output.ortb2Fragments.bidder.appnexus.user.data[0].segment[0].id).to.be.eql('1');
+    });
+  });
+
+  describe('uses Local Storage to ', function () {
+    const sandbox = sinon.createSandbox();
+    const storage = getStorageManager({ moduleType: MODULE_TYPE, moduleName: MODULE_NAME })
+    beforeEach(() => {
+      storage.setDataInLocalStorage(DATA_STORAGE_KEY, JSON.stringify({
+        targeting: {
+          name: 'goldfishads.com',
+          segment: [{id: '1'}, {id: '2'}],
+          ext: {
+            segtax: 4,
+          }
+        },
+        expiry: new Date().getTime() + 1000 * 60 * 60 * 24 * 30,
+      }));
+    });
+    afterEach(() => {
+      sandbox.restore();
+    });
+    it('get data from local storage', function () {
+      const output = getStorageData();
+      expect(output.name).to.be.equal('goldfishads.com');
+      expect(output.segment).to.be.length(2);
+      expect(output.ext.segtax).to.be.equal(4);
+    });
+  });
+});
diff --git a/test/spec/modules/gptPreAuction_spec.js b/test/spec/modules/gptPreAuction_spec.js
index fa2236f77c6..989a5f376bb 100644
--- a/test/spec/modules/gptPreAuction_spec.js
+++ b/test/spec/modules/gptPreAuction_spec.js
@@ -2,10 +2,16 @@ import {
   appendGptSlots,
   appendPbAdSlot,
   _currentConfig,
-  makeBidRequestsHook
+  makeBidRequestsHook,
+  getAuctionsIdsFromTargeting,
+  getSegments,
+  getSignals,
+  getSignalsArrayByAuctionsIds,
+  getSignalsIntersection
 } from 'modules/gptPreAuction.js';
 import { config } from 'src/config.js';
 import { makeSlot } from '../integration/faker/googletag.js';
+import { taxonomies } from '../../../libraries/gptUtils/gptUtils.js';
 
 describe('GPT pre-auction module', () => {
   let sandbox;
@@ -25,6 +31,87 @@ describe('GPT pre-auction module', () => {
     makeSlot({ code: 'slotCode4', divId: 'div5' })
   ];
 
+  const mockTargeting = {'/123456/header-bid-tag-0': {'hb_deal_rubicon': '1234', 'hb_deal': '1234', 'hb_pb': '0.53', 'hb_adid': '148018fe5e', 'hb_bidder': 'rubicon', 'foobar': '300x250', 'hb_pb_rubicon': '0.53', 'hb_adid_rubicon': '148018fe5e', 'hb_bidder_rubicon': 'rubicon', 'hb_deal_appnexus': '4321', 'hb_pb_appnexus': '0.1', 'hb_adid_appnexus': '567891011', 'hb_bidder_appnexus': 'appnexus'}}
+
+  const mockAuctionManager = {
+    findBidByAdId(adId) {
+      const bidsMap = {
+        '148018fe5e': {
+          auctionId: mocksAuctions[0].auctionId
+        },
+        '567891011': {
+          auctionId: mocksAuctions[1].auctionId
+        },
+      };
+      return bidsMap[adId];
+    },
+    index: {
+      getAuction({ auctionId }) {
+        return mocksAuctions.find(auction => auction.auctionId === auctionId);
+      }
+    }
+  }
+
+  const mocksAuctions = [
+    {
+      auctionId: '1111',
+      getFPD: () => ({
+        global: {
+          user: {
+            data: [{
+              name: 'dataprovider.com',
+              ext: {
+                segtax: 4
+              },
+              segment: [{
+                id: '1'
+              }, {
+                id: '2'
+              }]
+            }],
+          }
+        }
+      })
+    },
+    {
+      auctionId: '234234',
+      getFPD: () => ({
+        global: {
+          user: {
+            data: [{
+              name: 'dataprovider.com',
+              ext: {
+                segtax: 4
+              },
+              segment: [{
+                id: '2'
+              }]
+            }]
+          }
+        }
+      }),
+    }, {
+      auctionId: '234324234',
+      getFPD: () => ({
+        global: {
+          user: {
+            data: [{
+              name: 'dataprovider.com',
+              ext: {
+                segtax: 4
+              },
+              segment: [{
+                id: '2'
+              }, {
+                id: '3'
+              }]
+            }]
+          }
+        }
+      })
+    },
+  ]
+
   describe('appendPbAdSlot', () => {
     // sets up our document body to test the pbAdSlot dom actions against
     document.body.innerHTML = '
test1
' +
@@ -122,6 +209,17 @@ describe('GPT pre-auction module', () => {
       expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: '/12345/slotCode2' });
     });
 
+    it('returns full ad unit path even if mcmEnabled is true', () => {
+      config.setConfig({ gptPreAuction: { enabled: true, mcmEnabled: true } });
+      window.googletag.pubads().setSlots([
+        makeSlot({ code: '/12345,21212/slot', divId: 'div1' }),
+      ]);
+      const adUnit = {code: '/12345,21212/slot'};
+      expect(appendGptSlots([adUnit])).to.eql({
+        '/12345,21212/slot': '/12345,21212/slot'
+      })
+    })
+
     it('will not trim child id if mcmEnabled is not set to true', () => {
       window.googletag.pubads().setSlots([
         makeSlot({ code: '/12345,21212/slotCode1', divId: 'div1' }),
@@ -188,7 +286,7 @@ describe('GPT pre-auction module', () => {
         customGptSlotMatching: false,
         customPbAdSlot: false,
         customPreAuction: false,
-        useDefaultPreAuction: false
+        useDefaultPreAuction: true
       });
     });
   });
@@ -372,6 +470,33 @@ describe('GPT pre-auction module', () => {
       expect(returnedAdUnits).to.deep.equal(expectedAdUnits);
     });
 
+    it('should pass full slot path to customPreAuction when mcmEnabled is true', () => {
+      const customPreAuction = sinon.stub();
+      config.setConfig({
+        gptPreAuction: {
+          enabled: true,
+          mcmEnabled: true,
+          customPreAuction
+        }
+      });
+      window.googletag.pubads().setSlots([
+        makeSlot({ code: '/12345,21212/slot', divId: 'div1' }),
+      ]);
+      const adUnit = {code: '/12345,21212/slot'};
+      makeBidRequestsHook(sinon.stub(), [adUnit]);
+      sinon.assert.calledWith(customPreAuction, adUnit, '/12345/slot', adUnit.code);
+    });
+
+    it('should not choke if gpt is not available', () => {
+      config.setConfig({
+        gptPreAuction: {
+          enabled: true
+        }
+      });
+      sandbox.stub(window, 'googletag').value(null);
+      makeBidRequestsHook(sinon.stub(), [{}]);
+    })
+
     it('should use useDefaultPreAuction logic', () => {
       config.setConfig({
         gptPreAuction: {
@@ -453,5 +578,70 @@ describe('GPT pre-auction module', () => {
       runMakeBidRequests(testAdUnits);
       expect(returnedAdUnits).to.deep.equal(expectedAdUnits);
     });
+
+    it('sets gpid when mcmEnabled: true', () => {
+      config.setConfig({ gptPreAuction: { enabled: true, mcmEnabled: true } });
+      window.googletag.pubads().setSlots([
+        makeSlot({ code: '/12345,21212/slot', divId: 'div1' }),
+      ]);
+      const adUnit = {code: '/12345,21212/slot'};
+      makeBidRequestsHook(sinon.stub(), [adUnit]);
+      expect(adUnit.ortb2Imp.ext.gpid).to.eql('/12345/slot');
+    });
+  });
+
+  describe('pps gpt config', () => {
+    it('should parse segments from fpd', () => {
+      const twoSegments = getSegments(mocksAuctions[0].getFPD().global, ['user.data'], 4);
+      expect(JSON.stringify(twoSegments)).to.equal(JSON.stringify(['1', '2']));
+      const zeroSegments = getSegments(mocksAuctions[0].getFPD().global, ['user.data'], 6);
+      expect(zeroSegments).to.length(0);
+    });
+
+    it('should return signals from fpd', () => {
+      const signals = getSignals(mocksAuctions[0].getFPD().global);
+      const expectedSignals = [{ taxonomy: taxonomies[0], values: ['1', '2'] }];
+      expect(signals).to.eql(expectedSignals);
+    });
+
+    it('should properly get auctions ids from targeting', () => {
+      const auctionsIds = getAuctionsIdsFromTargeting(mockTargeting, mockAuctionManager);
+      expect(auctionsIds).to.eql([mocksAuctions[0].auctionId, mocksAuctions[1].auctionId])
+    });
+
+    it('should filter out adIds that do not map to any auction', () => {
+      const auctionsIds = getAuctionsIdsFromTargeting({
+        ...mockTargeting,
+        'au': {'hb_adid': 'missing'},
+      }, mockAuctionManager);
+      expect(auctionsIds).to.eql([mocksAuctions[0].auctionId, mocksAuctions[1].auctionId]);
+    })
+
+    it('should properly return empty array of auction ids for invalid targeting', () => {
+      let auctionsIds = getAuctionsIdsFromTargeting({}, mockAuctionManager);
+      expect(Array.isArray(auctionsIds)).to.equal(true);
+      expect(auctionsIds).to.length(0);
+      auctionsIds = getAuctionsIdsFromTargeting({'/123456/header-bid-tag-0/bg': {'invalidContent': '123'}}, mockAuctionManager);
+      expect(Array.isArray(auctionsIds)).to.equal(true);
+      expect(auctionsIds).to.length(0);
+    });
+
+    it('should properly get signals from auctions', () => {
+      const signals = getSignalsArrayByAuctionsIds(['1111', '234234', '234324234'], mockAuctionManager.index);
+      const intersection = getSignalsIntersection(signals);
+      const expectedResult = { IAB_AUDIENCE_1_1: { values: ['2'] }, IAB_CONTENT_2_2: { values: [] } };
+      expect(JSON.stringify(intersection)).to.be.equal(JSON.stringify(expectedResult));
+    });
+
+    it('should return empty signals array for empty auctions ids array', () => {
+      const signals = getSignalsArrayByAuctionsIds([], mockAuctionManager.index);
+      expect(Array.isArray(signals)).to.equal(true);
+      expect(signals).to.length(0);
+    });
+
+    it('should return properly formatted object for getSignalsIntersection invoked with empty array', () => {
+      const signals = getSignalsIntersection([]);
+      expect(Object.keys(signals)).to.contain.members(taxonomies);
+    });
   });
 });
diff --git a/test/spec/modules/greenbidsAnalyticsAdapter_spec.js b/test/spec/modules/greenbidsAnalyticsAdapter_spec.js
index 870fbd23870..7eeaa7a6c67 100644
--- a/test/spec/modules/greenbidsAnalyticsAdapter_spec.js
+++ b/test/spec/modules/greenbidsAnalyticsAdapter_spec.js
@@ -1,23 +1,58 @@
 import {
-  greenbidsAnalyticsAdapter, parseBidderCode,
+  greenbidsAnalyticsAdapter,
+  isSampled,
   ANALYTICS_VERSION, BIDDER_STATUS
 } from 'modules/greenbidsAnalyticsAdapter.js';
-
-import {expect} from 'chai';
+import {
+  generateUUID
+} from '../../../src/utils.js';
+import * as utils from 'src/utils.js';
+import { expect } from 'chai';
 import sinon from 'sinon';
 
 const events = require('src/events');
-const constants = require('src/constants.json');
+const constants = require('src/constants.js');
 
 const pbuid = 'pbuid-AA778D8A796AEA7A0843E2BBEB677766';
 const auctionId = 'b0b39610-b941-4659-a87c-de9f62d3e13e';
 
 describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
+  describe('enableAnalytics and config parser', function () {
+    const configOptions = {
+      pbuid: pbuid,
+      greenbidsSampling: 1,
+    };
+    beforeEach(function () {
+      greenbidsAnalyticsAdapter.enableAnalytics({
+        provider: 'greenbidsAnalytics',
+        options: configOptions
+      });
+    });
+
+    afterEach(function () {
+      greenbidsAnalyticsAdapter.disableAnalytics();
+    });
+
+    it('should parse config correctly with optional values', function () {
+      expect(greenbidsAnalyticsAdapter.getAnalyticsOptions().options).to.deep.equal(configOptions);
+      expect(greenbidsAnalyticsAdapter.getAnalyticsOptions().pbuid).to.equal(configOptions.pbuid);
+    });
+
+    it('should not enable Analytics when pbuid is missing', function () {
+      const configOptions = {
+        options: {
+        }
+      };
+      const validConfig = greenbidsAnalyticsAdapter.initConfig(configOptions);
+      expect(validConfig).to.equal(false);
+    });
+  });
+
   describe('event tracking and message cache manager', function () {
     beforeEach(function () {
       const configOptions = {
         pbuid: pbuid,
-        sampling: 0,
+        greenbidsSampling: 1,
       };
 
       greenbidsAnalyticsAdapter.enableAnalytics({
@@ -30,54 +65,17 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
       greenbidsAnalyticsAdapter.disableAnalytics();
     });
 
-    describe('#parseBidderCode()', function() {
-      it('should get lower case bidder code from bidderCode field value', function() {
-        const receivedBids = [
-          {
-            auctionId: auctionId,
-            adUnitCode: 'adunit_1',
-            bidder: 'greenbids',
-            bidderCode: 'GREENBIDS',
-            requestId: 'a1b2c3d4',
-            timeToRespond: 72,
-            cpm: 0.1,
-            currency: 'USD',
-            ad: 'fake ad1'
-          },
-        ];
-        const result = parseBidderCode(receivedBids[0]);
-        expect(result).to.equal('greenbids');
-      });
-      it('should get lower case bidder code from bidder field value as bidderCode field is missing', function() {
-        const receivedBids = [
-          {
-            auctionId: auctionId,
-            adUnitCode: 'adunit_1',
-            bidder: 'greenbids',
-            bidderCode: '',
-            requestId: 'a1b2c3d4',
-            timeToRespond: 72,
-            cpm: 0.1,
-            currency: 'USD',
-            ad: 'fake ad1'
-          },
-        ];
-        const result = parseBidderCode(receivedBids[0]);
-        expect(result).to.equal('greenbids');
-      });
-    });
-
-    describe('#getCachedAuction()', function() {
-      const existing = {timeoutBids: [{}]};
+    describe('#getCachedAuction()', function () {
+      const existing = { timeoutBids: [{}] };
       greenbidsAnalyticsAdapter.cachedAuctions['test_auction_id'] = existing;
 
-      it('should get the existing cached object if it exists', function() {
+      it('should get the existing cached object if it exists', function () {
         const result = greenbidsAnalyticsAdapter.getCachedAuction('test_auction_id');
 
         expect(result).to.equal(existing);
       });
 
-      it('should create a new object and store it in the cache on cache miss', function() {
+      it('should create a new object and store it in the cache on cache miss', function () {
         const result = greenbidsAnalyticsAdapter.getCachedAuction('no_such_id');
 
         expect(result).to.deep.include({
@@ -86,7 +84,7 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
       });
     });
 
-    describe('when formatting JSON payload sent to backend', function() {
+    describe('when formatting JSON payload sent to backend', function () {
       const receivedBids = [
         {
           auctionId: auctionId,
@@ -108,7 +106,8 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
           timeToRespond: 100,
           cpm: 0.08,
           currency: 'USD',
-          ad: 'fake ad2'
+          ad: 'fake ad2',
+          params: {'placement ID': 12784}
         },
         {
           auctionId: auctionId,
@@ -146,21 +145,21 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
           auctionId: auctionId,
           pbuid: pbuid,
           referrer: window.location.href,
-          sampling: 0,
+          sampling: 1,
           prebid: '$prebid.version$',
         });
       }
 
-      describe('#createCommonMessage', function() {
-        it('should correctly serialize some common fields', function() {
+      describe('#createCommonMessage', function () {
+        it('should correctly serialize some common fields', function () {
           const message = greenbidsAnalyticsAdapter.createCommonMessage(auctionId);
 
           assertHavingRequiredMessageFields(message);
         });
       });
 
-      describe('#serializeBidResponse', function() {
-        it('should handle BID properly with timeout false and hasBid true', function() {
+      describe('#serializeBidResponse', function () {
+        it('should handle BID properly with timeout false and hasBid true', function () {
           const result = greenbidsAnalyticsAdapter.serializeBidResponse(receivedBids[0], BIDDER_STATUS.BID);
 
           expect(result).to.include({
@@ -170,7 +169,7 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
           });
         });
 
-        it('should handle NO_BID properly and set hasBid to false', function() {
+        it('should handle NO_BID properly and set hasBid to false', function () {
           const result = greenbidsAnalyticsAdapter.serializeBidResponse(noBids[0], BIDDER_STATUS.NO_BID);
 
           expect(result).to.include({
@@ -180,7 +179,7 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
           });
         });
 
-        it('should handle TIMEOUT properly and set isTimeout to true', function() {
+        it('should handle TIMEOUT properly and set isTimeout to true', function () {
           const result = greenbidsAnalyticsAdapter.serializeBidResponse(noBids[0], BIDDER_STATUS.TIMEOUT);
 
           expect(result).to.include({
@@ -191,8 +190,8 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
         });
       });
 
-      describe('#addBidResponseToMessage()', function() {
-        it('should add a bid response in the output message, grouped by adunit_id and bidder', function() {
+      describe('#addBidResponseToMessage()', function () {
+        it('should add a bid response in the output message, grouped by adunit_id and bidder', function () {
           const message = {
             adUnits: [
               {
@@ -210,14 +209,15 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
                 bidder: 'greenbids',
                 isTimeout: false,
                 hasBid: false,
+                params: {}
               }
             ]
           });
         });
       });
 
-      describe('#createBidMessage()', function() {
-        it('should format auction message sent to the backend', function() {
+      describe('#createBidMessage()', function () {
+        it('should format auction message sent to the backend', function () {
           const args = {
             auctionId: auctionId,
             timestamp: 1234567890,
@@ -246,6 +246,13 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
                     skip: 1,
                     protocols: [1, 2, 3, 4]
                   },
+                },
+                ortb2Imp: {
+                  ext: {
+                    data: {
+                      adunitDFP: 'adunitcustomPathExtension'
+                    }
+                  }
                 }
               },
             ],
@@ -253,8 +260,9 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
             noBids: noBids
           };
 
+          sinon.stub(greenbidsAnalyticsAdapter, 'getCachedAuction').returns({ timeoutBids: timeoutBids });
           const result = greenbidsAnalyticsAdapter.createBidMessage(args, timeoutBids);
-
+          greenbidsAnalyticsAdapter.getCachedAuction.restore();
           assertHavingRequiredMessageFields(result);
           expect(result).to.deep.include({
             auctionElapsed: 100,
@@ -266,21 +274,35 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
                     sizes: [[300, 250], [300, 600]]
                   }
                 },
+                ortb2Imp: {},
                 bidders: [
                   {
                     bidder: 'greenbids',
                     isTimeout: false,
-                    hasBid: true
+                    hasBid: true,
+                    params: {},
+                    cpm: 0.1,
+                    currency: 'USD',
                   },
                   {
                     bidder: 'greenbidsx',
                     isTimeout: false,
-                    hasBid: true
+                    hasBid: true,
+                    params: { 'placement ID': 12784 },
+                    cpm: 0.08,
+                    currency: 'USD',
                   }
                 ]
               },
               {
                 code: 'adunit-2',
+                ortb2Imp: {
+                  ext: {
+                    data: {
+                      adunitDFP: 'adunitcustomPathExtension'
+                    }
+                  }
+                },
                 mediaTypes: {
                   banner: {
                     sizes: [[300, 250], [300, 600]]
@@ -297,7 +319,10 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
                   {
                     bidder: 'greenbids',
                     isTimeout: true,
-                    hasBid: true
+                    hasBid: true,
+                    cpm: 0.09,
+                    currency: 'USD',
+                    params: {}
                   }
                 ]
               }
@@ -306,8 +331,8 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
         });
       });
 
-      describe('#handleBidTimeout()', function() {
-        it('should cached the timeout bid as BID_TIMEOUT event was triggered', function() {
+      describe('#handleBidTimeout()', function () {
+        it('should cached the timeout bid as BID_TIMEOUT event was triggered', function () {
           greenbidsAnalyticsAdapter.cachedAuctions['test_timeout_auction_id'] = { 'timeoutBids': [] };
           const args = [{
             auctionId: 'test_timeout_auction_id',
@@ -315,7 +340,7 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
             timeout: 3000,
             auctionEnd: 1234567990,
             bidsReceived: receivedBids,
-            noBids: noBids
+            noBids: noBids,
           }];
 
           greenbidsAnalyticsAdapter.handleBidTimeout(args);
@@ -338,7 +363,7 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
   describe('greenbids Analytics Adapter track handler ', function () {
     const configOptions = {
       pbuid: pbuid,
-      sampling: 1,
+      greenbidsSampling: 1,
     };
 
     beforeEach(function () {
@@ -354,50 +379,72 @@ describe('Greenbids Prebid AnalyticsAdapter Testing', function () {
       events.getEvents.restore();
     });
 
-    it('should call handleBidTimeout as BID_TIMEOUT trigger event', function() {
+    it('should call handleAuctionInit as AUCTION_INIT trigger event', function () {
+      sinon.spy(greenbidsAnalyticsAdapter, 'handleAuctionInit');
+      events.emit(constants.EVENTS.AUCTION_INIT, { auctionId: 'auctionId' });
+      sinon.assert.callCount(greenbidsAnalyticsAdapter.handleAuctionInit, 1);
+      greenbidsAnalyticsAdapter.handleAuctionInit.restore();
+    });
+
+    it('should call handleBidTimeout as BID_TIMEOUT trigger event', function () {
       sinon.spy(greenbidsAnalyticsAdapter, 'handleBidTimeout');
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
+      events.emit(constants.EVENTS.BID_TIMEOUT, { auctionId: 'auctionId' });
       sinon.assert.callCount(greenbidsAnalyticsAdapter.handleBidTimeout, 1);
       greenbidsAnalyticsAdapter.handleBidTimeout.restore();
     });
 
-    it('should call handleAuctionEnd as AUCTION_END trigger event', function() {
+    it('should call handleAuctionEnd as AUCTION_END trigger event', function () {
       sinon.spy(greenbidsAnalyticsAdapter, 'handleAuctionEnd');
-      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(constants.EVENTS.AUCTION_END, { auctionId: 'auctionId' });
       sinon.assert.callCount(greenbidsAnalyticsAdapter.handleAuctionEnd, 1);
       greenbidsAnalyticsAdapter.handleAuctionEnd.restore();
     });
+
+    it('should call handleBillable as BILLABLE_EVENT trigger event', function () {
+      sinon.spy(greenbidsAnalyticsAdapter, 'handleBillable');
+      events.emit(constants.EVENTS.BILLABLE_EVENT, {
+        type: 'auction',
+        billingId: generateUUID(),
+        auctionId: 'auctionId',
+        vendor: 'greenbidsRtdProvider'
+      });
+      sinon.assert.callCount(greenbidsAnalyticsAdapter.handleBillable, 1);
+      greenbidsAnalyticsAdapter.handleBillable.restore();
+    });
   });
 
-  describe('enableAnalytics and config parser', function () {
-    const configOptions = {
-      pbuid: pbuid,
-      sampling: 0,
-    };
+  describe('isSampled', function () {
+    it('should return true for invalid sampling rates', function () {
+      expect(isSampled('ce1f3692-632c-4cfd-9e40-0c2ad625ec56', -1, 0.0)).to.be.true;
+      expect(isSampled('ce1f3692-632c-4cfd-9e40-0c2ad625ec56', 1.2, 0.0)).to.be.true;
+    });
 
-    beforeEach(function () {
-      greenbidsAnalyticsAdapter.enableAnalytics({
-        provider: 'greenbidsAnalytics',
-        options: configOptions
-      });
+    it('should return determinist falsevalue for valid sampling rate given the predifined id and rate', function () {
+      expect(isSampled('ce1f3692-632c-4cfd-9e40-0c2ad625ec56', 0.0001, 0.0)).to.be.false;
     });
 
-    afterEach(function () {
-      greenbidsAnalyticsAdapter.disableAnalytics();
+    it('should return determinist true value for valid sampling rate given the predifined id and rate', function () {
+      expect(isSampled('ce1f3692-632c-4cfd-9e40-0c2ad625ec56', 0.9999, 0.0)).to.be.true;
     });
 
-    it('should parse config correctly with optional values', function () {
-      expect(greenbidsAnalyticsAdapter.getAnalyticsOptions().options).to.deep.equal(configOptions);
-      expect(greenbidsAnalyticsAdapter.getAnalyticsOptions().pbuid).to.equal(configOptions.pbuid);
+    it('should return determinist true value for valid sampling rate given the predifined id and rate when we split to non exploration first', function () {
+      expect(isSampled('ce1f3692-632c-4cfd-9e40-0c2ad625ec56', 0.9999, 0.0, 1.0)).to.be.true;
     });
 
-    it('should not enable Analytics when pbuid is missing', function () {
-      const configOptions = {
-        options: {
-        }
-      };
-      const validConfig = greenbidsAnalyticsAdapter.initConfig(configOptions);
-      expect(validConfig).to.equal(false);
+    it('should return determinist false value for valid sampling rate given the predifined id and rate when we split to non exploration first', function () {
+      expect(isSampled('ce1f3692-632c-4cfd-9e40-0c2ad625ec56', 0.0001, 0.0, 1.0)).to.be.false;
+    });
+  });
+
+  describe('isSampled when analytic isforced', function () {
+    before(() => {
+      sinon.stub(utils, 'getParameterByName').callsFake(par => par === 'greenbids_force_sampling' ? true : undefined);
+    });
+    it('should return determinist true when sampling flag activated', function () {
+      expect(isSampled('ce1f3692-632c-4cfd-9e40-0c2ad625ec56', 0.0001, 0.0)).to.be.true;
+    });
+    after(() => {
+      utils.getParameterByName.restore();
     });
   });
 });
diff --git a/test/spec/modules/greenbidsRtdProvider_spec.js b/test/spec/modules/greenbidsRtdProvider_spec.js
index cd93e9013c0..ae63a0b00a0 100644
--- a/test/spec/modules/greenbidsRtdProvider_spec.js
+++ b/test/spec/modules/greenbidsRtdProvider_spec.js
@@ -6,7 +6,9 @@ import {
 import {
   greenbidsSubmodule
 } from 'modules/greenbidsRtdProvider.js';
-import {server} from '../../mocks/xhr.js';
+import { server } from '../../mocks/xhr.js';
+import * as events from '../../../src/events.js';
+import { EVENTS } from '../../../src/constants.js';
 
 describe('greenbidsRtdProvider', () => {
   const endPoint = 't.greenbids.ai';
@@ -39,14 +41,36 @@ describe('greenbidsRtdProvider', () => {
       }]
   };
 
-  const SAMPLE_RESPONSE_ADUNITS = [
+  const SAMPLE_RESPONSE_ADUNITS_NOT_EXPLORED = [
     {
       code: 'adUnit1',
       bidders: {
         'appnexus': true,
         'rubicon': false,
         'ix': true
-      }
+      },
+      isExploration: false
+    },
+    {
+      code: 'adUnit2',
+      bidders: {
+        'appnexus': false,
+        'rubicon': true,
+        'openx': true
+      },
+      isExploration: false
+
+    }];
+
+  const SAMPLE_RESPONSE_ADUNITS_EXPLORED = [
+    {
+      code: 'adUnit1',
+      bidders: {
+        'appnexus': true,
+        'rubicon': false,
+        'ix': true
+      },
+      isExploration: true
     },
     {
       code: 'adUnit2',
@@ -54,7 +78,9 @@ describe('greenbidsRtdProvider', () => {
         'appnexus': false,
         'rubicon': true,
         'openx': true
-      }
+      },
+      isExploration: true
+
     }];
 
   describe('init', () => {
@@ -70,22 +96,37 @@ describe('greenbidsRtdProvider', () => {
   });
 
   describe('updateAdUnitsBasedOnResponse', () => {
-    it('should update ad units based on response', () => {
+    it('should update ad units based on response if not exploring', () => {
       const adUnits = JSON.parse(JSON.stringify(SAMPLE_REQUEST_BIDS_CONFIG_OBJ.adUnits));
-      greenbidsSubmodule.updateAdUnitsBasedOnResponse(adUnits, SAMPLE_RESPONSE_ADUNITS);
+      greenbidsSubmodule.updateAdUnitsBasedOnResponse(adUnits, SAMPLE_RESPONSE_ADUNITS_NOT_EXPLORED);
 
       expect(adUnits[0].bids).to.have.length(2);
       expect(adUnits[1].bids).to.have.length(2);
     });
+
+    it('should not update ad units based on response if exploring', () => {
+      const adUnits = JSON.parse(JSON.stringify(SAMPLE_REQUEST_BIDS_CONFIG_OBJ.adUnits));
+      greenbidsSubmodule.updateAdUnitsBasedOnResponse(adUnits, SAMPLE_RESPONSE_ADUNITS_EXPLORED);
+
+      expect(adUnits[0].bids).to.have.length(3);
+      expect(adUnits[1].bids).to.have.length(3);
+      expect(adUnits[0].ortb2Imp.ext.greenbids.greenbidsId).to.be.a.string;
+      expect(adUnits[1].ortb2Imp.ext.greenbids.greenbidsId).to.be.a.string;
+      expect(adUnits[0].ortb2Imp.ext.greenbids.greenbidsId).to.equal(adUnits[0].ortb2Imp.ext.greenbids.greenbidsId);
+      expect(adUnits[0].ortb2Imp.ext.greenbids.keptInAuction).to.deep.equal(SAMPLE_RESPONSE_ADUNITS_EXPLORED[0].bidders);
+      expect(adUnits[1].ortb2Imp.ext.greenbids.keptInAuction).to.deep.equal(SAMPLE_RESPONSE_ADUNITS_EXPLORED[1].bidders);
+      expect(adUnits[0].ortb2Imp.ext.greenbids.isExploration).to.equal(SAMPLE_RESPONSE_ADUNITS_EXPLORED[0].isExploration);
+      expect(adUnits[1].ortb2Imp.ext.greenbids.isExploration).to.equal(SAMPLE_RESPONSE_ADUNITS_EXPLORED[1].isExploration);
+    });
   });
 
   describe('findMatchingAdUnit', () => {
     it('should find matching ad unit by code', () => {
-      const matchingAdUnit = greenbidsSubmodule.findMatchingAdUnit(SAMPLE_RESPONSE_ADUNITS, 'adUnit1');
-      expect(matchingAdUnit).to.deep.equal(SAMPLE_RESPONSE_ADUNITS[0]);
+      const matchingAdUnit = greenbidsSubmodule.findMatchingAdUnit(SAMPLE_RESPONSE_ADUNITS_NOT_EXPLORED, 'adUnit1');
+      expect(matchingAdUnit).to.deep.equal(SAMPLE_RESPONSE_ADUNITS_NOT_EXPLORED[0]);
     });
     it('should return undefined if no matching ad unit is found', () => {
-      const matchingAdUnit = greenbidsSubmodule.findMatchingAdUnit(SAMPLE_RESPONSE_ADUNITS, 'nonexistent');
+      const matchingAdUnit = greenbidsSubmodule.findMatchingAdUnit(SAMPLE_RESPONSE_ADUNITS_NOT_EXPLORED, 'nonexistent');
       expect(matchingAdUnit).to.be.undefined;
     });
   });
@@ -93,7 +134,7 @@ describe('greenbidsRtdProvider', () => {
   describe('removeFalseBidders', () => {
     it('should remove bidders with false value', () => {
       const adUnit = JSON.parse(JSON.stringify(SAMPLE_REQUEST_BIDS_CONFIG_OBJ.adUnits[0]));
-      const matchingAdUnit = SAMPLE_RESPONSE_ADUNITS[0];
+      const matchingAdUnit = SAMPLE_RESPONSE_ADUNITS_NOT_EXPLORED[0];
       greenbidsSubmodule.removeFalseBidders(adUnit, matchingAdUnit);
       expect(adUnit.bids).to.have.length(2);
       expect(adUnit.bids.map((bid) => bid.bidder)).to.not.include('rubicon');
@@ -125,14 +166,15 @@ describe('greenbidsRtdProvider', () => {
       setTimeout(() => {
         server.requests[0].respond(
           200,
-          {'Content-Type': 'application/json'},
-          JSON.stringify(SAMPLE_RESPONSE_ADUNITS)
+          { 'Content-Type': 'application/json' },
+          JSON.stringify(SAMPLE_RESPONSE_ADUNITS_NOT_EXPLORED)
         );
       }, 50);
 
       setTimeout(() => {
         const requestUrl = new URL(server.requests[0].url);
         expect(requestUrl.host).to.be.eq(endPoint);
+        expect(requestBids.greenbidsId).to.be.a.string;
         expect(requestBids.adUnits[0].bids).to.have.length(2);
         expect(requestBids.adUnits[0].bids.map((bid) => bid.bidder)).to.not.include('rubicon');
         expect(requestBids.adUnits[0].bids.map((bid) => bid.bidder)).to.include('ix');
@@ -157,8 +199,8 @@ describe('greenbidsRtdProvider', () => {
       setTimeout(() => {
         server.requests[0].respond(
           200,
-          {'Content-Type': 'application/json'},
-          JSON.stringify(SAMPLE_RESPONSE_ADUNITS)
+          { 'Content-Type': 'application/json' },
+          JSON.stringify(SAMPLE_RESPONSE_ADUNITS_NOT_EXPLORED)
         );
         done();
       }, 300);
@@ -166,6 +208,7 @@ describe('greenbidsRtdProvider', () => {
       setTimeout(() => {
         const requestUrl = new URL(server.requests[0].url);
         expect(requestUrl.host).to.be.eq(endPoint);
+        expect(requestBids.greenbidsId).to.be.a.string;
         expect(requestBids.adUnits[0].bids).to.have.length(3);
         expect(requestBids.adUnits[1].bids).to.have.length(3);
         expect(callback.calledOnce).to.be.true;
@@ -183,14 +226,15 @@ describe('greenbidsRtdProvider', () => {
       setTimeout(() => {
         server.requests[0].respond(
           500,
-          {'Content-Type': 'application/json'},
-          JSON.stringify({'failure': 'fail'})
+          { 'Content-Type': 'application/json' },
+          JSON.stringify({ 'failure': 'fail' })
         );
       }, 50);
 
       setTimeout(() => {
         const requestUrl = new URL(server.requests[0].url);
         expect(requestUrl.host).to.be.eq(endPoint);
+        expect(requestBids.greenbidsId).to.be.a.string;
         expect(requestBids.adUnits[0].bids).to.have.length(3);
         expect(requestBids.adUnits[1].bids).to.have.length(3);
         expect(callback.calledOnce).to.be.true;
@@ -198,4 +242,116 @@ describe('greenbidsRtdProvider', () => {
       }, 60);
     });
   });
+
+  describe('stripAdUnits', function () {
+    it('should strip all properties except bidder from each bid in adUnits', function () {
+      const adUnits =
+        [
+          {
+            bids: [
+              { bidder: 'bidder1', otherProp: 'value1' },
+              { bidder: 'bidder2', otherProp: 'value2' }
+            ],
+            mediaTypes: { 'banner': { prop: 'value3' } }
+          }
+        ];
+      const expectedOutput = [
+        {
+          bids: [
+            { bidder: 'bidder1' },
+            { bidder: 'bidder2' }
+          ],
+          mediaTypes: { 'banner': { prop: 'value3' } }
+        }
+      ];
+
+      // Perform the test
+      const output = greenbidsSubmodule.stripAdUnits(adUnits);
+      expect(output).to.deep.equal(expectedOutput);
+    });
+
+    it('should strip all properties except bidder from each bid in adUnits but keep ortb2Imp', function () {
+      const adUnits =
+        [
+          {
+            bids: [
+              { bidder: 'bidder1', otherProp: 'value1' },
+              { bidder: 'bidder2', otherProp: 'value2' }
+            ],
+            mediaTypes: { 'banner': { prop: 'value3' } },
+            ortb2Imp: {
+              ext: {
+                greenbids: {
+                  greenbidsId: 'test'
+                }
+              }
+            }
+          }
+        ];
+      const expectedOutput = [
+        {
+          bids: [
+            { bidder: 'bidder1' },
+            { bidder: 'bidder2' }
+          ],
+          mediaTypes: { 'banner': { prop: 'value3' } },
+          ortb2Imp: {
+            ext: {
+              greenbids: {
+                greenbidsId: 'test'
+              }
+            }
+          }
+        }
+      ];
+
+      // Perform the test
+      const output = greenbidsSubmodule.stripAdUnits(adUnits);
+      expect(output).to.deep.equal(expectedOutput);
+    });
+  });
+
+  describe('onAuctionInitEvent', function () {
+    it('should not emit billable event if greenbids hasn\'t set the adunit.ext value', function () {
+      sinon.spy(events, 'emit');
+      greenbidsSubmodule.onAuctionInitEvent({
+        auctionId: 'test',
+        adUnits: [
+          {
+            bids: [
+              { bidder: 'bidder1', otherProp: 'value1' },
+              { bidder: 'bidder2', otherProp: 'value2' }
+            ],
+            mediaTypes: { 'banner': { prop: 'value3' } },
+          }
+        ]
+      });
+      sinon.assert.callCount(events.emit, 0);
+      events.emit.restore();
+    });
+
+    it('should  emit billable event if greenbids has set the adunit.ext value', function (done) {
+      let counter = 0;
+      events.on(EVENTS.BILLABLE_EVENT, function (event) {
+        if (event.vendor === 'greenbidsRtdProvider' && event.type === 'auction') {
+          counter += 1;
+        }
+        expect(counter).to.equal(1);
+        done();
+      });
+      greenbidsSubmodule.onAuctionInitEvent({
+        auctionId: 'test',
+        adUnits: [
+          {
+            bids: [
+              { bidder: 'bidder1', otherProp: 'value1' },
+              { bidder: 'bidder2', otherProp: 'value2' }
+            ],
+            mediaTypes: { 'banner': { prop: 'value3' } },
+            ortb2Imp: { ext: { greenbids: { greenbidsId: 'b0b39610-b941-4659-a87c-de9f62d3e13e' } } }
+          }
+        ]
+      });
+    });
+  });
 });
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index b12083236a2..18f1f7aa7c8 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -30,12 +30,12 @@ describe('TheMediaGrid Adapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'uid': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -950,6 +950,33 @@ describe('TheMediaGrid Adapter', function () {
       expect(payload.tmax).to.equal(null);
     })
 
+    it('should add ORTB2 device data to the request', function () {
+      const bidderRequestWithDevice = {
+        ...bidderRequest,
+        ...{
+          ortb2: {
+            device: {
+              w: 980,
+              h: 1720,
+              dnt: 0,
+              ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+              language: 'en',
+              devicetype: 1,
+              make: 'Apple',
+              model: 'iPhone 12 Pro Max',
+              os: 'iOS',
+              osv: '17.4',
+            },
+          },
+        },
+      };
+
+      const [request] = spec.buildRequests([bidRequests[0]], bidderRequestWithDevice);
+      const payload = parseRequest(request.data);
+
+      expect(payload.device).to.deep.equal(bidderRequestWithDevice.ortb2.device);
+    });
+
     describe('floorModule', function () {
       const floorTestData = {
         'currency': 'USD',
@@ -1352,7 +1379,7 @@ describe('TheMediaGrid Adapter', function () {
 
     it('complicated case', function () {
       const fullResponse = [
-        {'bid': [{'impid': '2164be6358b9', 'adid': '32_52_7543', 'price': 1.15, 'adm': '
test content 1
', 'auid': 1, 'h': 250, 'w': 300, dealid: 11}], 'seat': '1'},
+        {'bid': [{'impid': '2164be6358b9', 'adid': '32_52_7543', 'price': 1.15, 'adm': '
test content 1
', 'auid': 1, 'h': 250, 'w': 300, dealid: 11, 'ext': {'dsa': {'adrender': 1}}}], 'seat': '1'},
         {'bid': [{'impid': '4e111f1b66e4', 'adid': '32_54_4535', 'price': 0.5, 'adm': '
test content 2
', 'auid': 2, 'h': 600, 'w': 300, dealid: 12}], 'seat': '1'},
         {'bid': [{'impid': '26d6f897b516', 'adid': '32_53_75467', 'price': 0.15, 'adm': '
test content 3
', 'auid': 1, 'h': 90, 'w': 728}], 'seat': '1'},
         {'bid': [{'impid': '326bde7fbf69', 'adid': '32_54_12342', 'price': 0.15, 'adm': '
test content 4
', 'auid': 1, 'h': 600, 'w': 300}], 'seat': '1'},
@@ -1430,6 +1457,9 @@ describe('TheMediaGrid Adapter', function () {
           'netRevenue': true,
           'ttl': 360,
           'meta': {
+            dsa: {
+              adrender: 1
+            },
             advertiserDomains: []
           },
         },
@@ -1559,37 +1589,9 @@ describe('TheMediaGrid Adapter', function () {
     });
 
     it('should send right request on onDataDeletionRequest call', function() {
-      spec.onDataDeletionRequest([{
-        bids: [
-          {
-            bidder: 'grid',
-            params: {
-              uid: 1
-            }
-          },
-          {
-            bidder: 'grid',
-            params: {
-              uid: 2
-            }
-          },
-          {
-            bidder: 'another',
-            params: {
-              uid: 3
-            }
-          },
-          {
-            bidder: 'gridNM',
-            params: {
-              uid: 4
-            }
-          }
-        ],
-      }]);
+      spec.onDataDeletionRequest([{}]);
       expect(ajaxStub.calledOnce).to.equal(true);
-      expect(ajaxStub.firstCall.args[0]).to.equal('https://media.grid.bidswitch.net/uspapi_delete');
-      expect(ajaxStub.firstCall.args[2]).to.equal('{"uids":[1,2,4]}');
+      expect(ajaxStub.firstCall.args[0]).to.equal('https://media.grid.bidswitch.net/uspapi_delete_c2s');
     });
   });
 
diff --git a/test/spec/modules/growthCodeAnalyticsAdapter_spec.js b/test/spec/modules/growthCodeAnalyticsAdapter_spec.js
index cd9c12a729c..266bc104fd8 100644
--- a/test/spec/modules/growthCodeAnalyticsAdapter_spec.js
+++ b/test/spec/modules/growthCodeAnalyticsAdapter_spec.js
@@ -2,7 +2,7 @@ import adapterManager from '../../../src/adapterManager.js';
 import growthCodeAnalyticsAdapter from '../../../modules/growthCodeAnalyticsAdapter.js';
 import { expect } from 'chai';
 import * as events from '../../../src/events.js';
-import constants from '../../../src/constants.json';
+import { EVENTS } from '../../../src/constants.js';
 import { generateUUID } from '../../../src/utils.js';
 import { server } from 'test/mocks/xhr.js';
 
@@ -58,7 +58,7 @@ describe('growthCode analytics adapter', () => {
         adUnitCodes: ['usr1234']
       }],
     };
-    events.emit(constants.EVENTS.AUCTION_END, auction);
+    events.emit(EVENTS.AUCTION_END, auction);
     assert(server.requests.length > 0)
     const body = JSON.parse(server.requests[0].requestBody);
     var eventTypes = [];
diff --git a/test/spec/modules/growthCodeIdSystem_spec.js b/test/spec/modules/growthCodeIdSystem_spec.js
index 97083047d4e..e3848dc4844 100644
--- a/test/spec/modules/growthCodeIdSystem_spec.js
+++ b/test/spec/modules/growthCodeIdSystem_spec.js
@@ -6,9 +6,12 @@ import {expect} from 'chai';
 import {getStorageManager} from '../../../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../../../src/activities/modules.js';
 
-const GCID_EXPIRY = 45;
 const MODULE_NAME = 'growthCodeId';
-const SHAREDID = 'fe9c5c89-7d56-4666-976d-e07e73b3b664';
+const EIDS = '[{"source":"domain.com","uids":[{"id":"8212212191539393121","ext":{"stype":"ppuid"}}]}]';
+const GCID = 'e06e9e5a-273c-46f8-aace-6f62cf13ea71'
+
+const GCID_EID = '{"id": [{"source": "growthcode.io", "uids": [{"atype": 3,"id": "e06e9e5a-273c-46f8-aace-6f62cf13ea71"}]}]}'
+const GCID_EID_EID = '{"id": [{"source": "growthcode.io", "uids": [{"atype": 3,"id": "e06e9e5a-273c-46f8-aace-6f62cf13ea71"}]},{"source": "domain.com", "uids": [{"id": "8212212191539393121", "ext": {"stype":"ppuid"}}]}]}'
 
 const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME });
 
@@ -23,11 +26,8 @@ describe('growthCodeIdSystem', () => {
 
   beforeEach(function () {
     logErrorStub = sinon.stub(utils, 'logError');
-    storage.setDataInLocalStorage('_sharedid', SHAREDID);
-    const expiresStr = (new Date(Date.now() + (GCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
-    if (storage.cookiesAreEnabled()) {
-      storage.setCookie('_sharedid', SHAREDID, expiresStr, 'LAX');
-    }
+    storage.setDataInLocalStorage('gcid', GCID, null);
+    storage.setDataInLocalStorage('customerEids', EIDS, null);
   });
 
   afterEach(function () {
@@ -40,45 +40,33 @@ describe('growthCodeIdSystem', () => {
     });
   });
 
-  it('should NOT call the growthcode id endpoint if gdpr applies but consent string is missing', function () {
-    let submoduleCallback = growthCodeIdSubmodule.getId(getIdParams, { gdprApplies: true }, undefined);
-    expect(submoduleCallback).to.be.undefined;
-  });
-
-  it('should log an error if pid configParam was not passed when getId', function () {
-    growthCodeIdSubmodule.getId();
-    expect(logErrorStub.callCount).to.be.equal(1);
+  it('test return of GCID', function () {
+    let ids;
+    ids = growthCodeIdSubmodule.getId();
+    expect(ids).to.deep.equal(JSON.parse(GCID_EID));
   });
 
-  it('should log an error if sharedId (LocalStore) is not setup correctly', function () {
-    growthCodeIdSubmodule.getId({params: {
-      pid: 'TEST01',
-      publisher_id: '_sharedid_bad',
-      publisher_id_storage: 'html5',
+  it('test return of the GCID and an additional EID', function () {
+    let ids;
+    ids = growthCodeIdSubmodule.getId({params: {
+      customerEids: 'customerEids',
     }});
-    expect(logErrorStub.callCount).to.be.equal(1);
+    expect(ids).to.deep.equal(JSON.parse(GCID_EID_EID));
   });
 
-  it('should log an error if sharedId (LocalStore) is not setup correctly', function () {
-    growthCodeIdSubmodule.getId({params: {
-      pid: 'TEST01',
-      publisher_id: '_sharedid_bad',
-      publisher_id_storage: 'cookie',
+  it('test return of the GCID and an additional EID (bad Local Store name)', function () {
+    let ids;
+    ids = growthCodeIdSubmodule.getId({params: {
+      customerEids: 'customerEidsBad',
     }});
-    expect(logErrorStub.callCount).to.be.equal(1);
+    expect(ids).to.deep.equal(JSON.parse(GCID_EID));
   });
 
-  it('should call the growthcode id endpoint', function () {
-    let callBackSpy = sinon.spy();
-    let submoduleCallback = growthCodeIdSubmodule.getId(getIdParams).callback;
-    submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url.substr(0, 85)).to.be.eq('https://p2.gcprivacy.com/v1/pb?pid=TEST01&uid=' + SHAREDID + '&u=');
-    request.respond(
-      200,
-      {},
-      JSON.stringify({})
-    );
-    expect(callBackSpy.calledOnce).to.be.true;
+  it('test decode function)', function () {
+    let ids;
+    ids = growthCodeIdSubmodule.decode(GCID, {params: {
+      customerEids: 'customerEids',
+    }});
+    expect(ids).to.deep.equal(JSON.parse('{"growthCodeId":"' + GCID + '"}'));
   });
 })
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
index 0e64ec67b27..8e7a80281ab 100644
--- a/test/spec/modules/gumgumBidAdapter_spec.js
+++ b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -44,9 +44,9 @@ describe('gumgumAdapter', function () {
     });
 
     it('should return true when required params found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'inSlot': '789'
       };
 
@@ -54,33 +54,33 @@ describe('gumgumAdapter', function () {
     });
 
     it('should return true when inslot sends sizes and trackingid', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'inSlot': '789',
         'sizes': [[0, 1], [2, 3], [4, 5], [6, 7]]
       };
 
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(true);
     });
 
     it('should return false when no unit type is specified', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placementId': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when bidfloor is not a number', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'inSlot': '789',
         'bidfloor': '0.50'
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false if invalid request id is found', function () {
@@ -100,8 +100,32 @@ describe('gumgumAdapter', function () {
 
   describe('buildRequests', function () {
     let sizesArray = [[300, 250], [300, 600]];
+    const bidderRequest = {
+      ortb2: {
+        site: {
+          content: {
+            data: [{
+              name: 'www.iris.com',
+              ext: {
+                segtax: 500,
+                cids: ['iris_c73g5jq96mwso4d8']
+              }
+            }]
+          },
+          page: 'http://pub.com/news',
+          ref: 'http://google.com',
+          publisher: {
+            id: 'p10000',
+            domain: 'pub.com'
+          }
+        }
+      }
+    };
+
     let bidRequests = [
       {
+        gppString: 'DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN',
+        gppSid: [7],
         bidder: 'gumgum',
         params: {
           inSlot: 9
@@ -119,6 +143,30 @@ describe('gumgumAdapter', function () {
             }
           }
         },
+        pubProvidedId: [
+          {
+            uids: [
+              {
+                ext: {
+                  stype: 'ppuid',
+                },
+                id: 'aac4504f-ef89-401b-a891-ada59db44336',
+              },
+            ],
+            source: 'sonobi.com',
+          },
+          {
+            uids: [
+              {
+                ext: {
+                  stype: 'ppuid',
+                },
+                id: 'y-zqTHmW9E2uG3jEETC6i6BjGcMhPXld2F~A',
+              },
+            ],
+            source: 'aol.com',
+          },
+        ],
         adUnitCode: 'adunit-code',
         sizes: sizesArray,
         bidId: '30b31c1838de1e',
@@ -155,6 +203,7 @@ describe('gumgumAdapter', function () {
         linearity: 1,
         startdelay: 1,
         placement: 123456,
+        plcmt: 3,
         protocols: [1, 2]
       }
     };
@@ -165,6 +214,13 @@ describe('gumgumAdapter', function () {
       const request = { ...bidRequests[0] };
       const bidRequest = spec.buildRequests([request])[0];
       expect(bidRequest.data.aun).to.equal(bidRequests[0].adUnitCode);
+      expect(bidRequest.data.displaymanager).to.equal('Prebid.js - gumgum');
+      expect(bidRequest.data.displaymanagerver).to.equal(JCSI.pbv);
+    });
+    it('should set pubProvidedId if the uid and  pubProvidedId are available', function () {
+      const request = { ...bidRequests[0] };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.pubProvidedId).to.equal(JSON.stringify(bidRequests[0].userId.pubProvidedId));
     });
     it('should set id5Id and id5IdLinkType if the uid and  linkType are available', function () {
       const request = { ...bidRequests[0] };
@@ -225,19 +281,17 @@ describe('gumgumAdapter', function () {
       const bidRequest = spec.buildRequests([request])[0];
       expect(bidRequest.data).to.have.property('iriscat');
     });
+    it('should set the irisid param when found iris_c73g5jq96mwso4d8', function() {
+      const request = { ...bidRequests[0], params: { irisid: 'abc123' } };
+      const bidRequest = spec.buildRequests([request], bidderRequest)[0];
+      expect(bidRequest.data).to.have.property('irisid', 'iris_c73g5jq96mwso4d8');
+    });
 
     it('should not set the iriscat param when not found', function () {
       const request = { ...bidRequests[0] }
       const bidRequest = spec.buildRequests([request])[0];
       expect(bidRequest.data).to.not.have.property('iriscat');
     });
-
-    it('should set the irisid param when found', function () {
-      const request = { ...bidRequests[0], params: { irisid: 'abc123' } }
-      const bidRequest = spec.buildRequests([request])[0];
-      expect(bidRequest.data).to.have.property('irisid');
-    });
-
     it('should not set the irisid param when not found', function () {
       const request = { ...bidRequests[0] }
       const bidRequest = spec.buildRequests([request])[0];
@@ -251,10 +305,38 @@ describe('gumgumAdapter', function () {
     });
 
     it('should set the global placement id (gpid) if in adserver property', function () {
-      const req = { ...bidRequests[0], ortb2Imp: { ext: { data: { adserver: { name: 'test', adslot: 123456 } } } } }
+      const req = { ...bidRequests[0],
+        ortb2Imp: {
+          ext: {
+            gpid: '/17037559/jeusol/jeusol_D_1',
+            data: {
+              adserver: {
+                name: 'test',
+                adslot: 123456
+              }
+            }
+          }
+        } }
       const bidRequest = spec.buildRequests([req])[0];
       expect(bidRequest.data).to.have.property('gpid');
-      expect(bidRequest.data.gpid).to.equal(123456);
+      expect(bidRequest.data.gpid).to.equal('/17037559/jeusol/jeusol_D_1');
+    });
+    it('should set ae value to 1 for PAAPI', function () {
+      const req = { ...bidRequests[0],
+        ortb2Imp: {
+          ext: {
+            ae: 1,
+            data: {
+              adserver: {
+                name: 'test',
+                adslot: 123456
+              }
+            }
+          }
+        } }
+      const bidRequest = spec.buildRequests([req])[0];
+      expect(bidRequest.data).to.have.property('ae');
+      expect(bidRequest.data.ae).to.equal(true);
     });
 
     it('should set the global placement id (gpid) if in pbadslot property', function () {
@@ -265,6 +347,14 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data.gpid).to.equal(pbadslot);
     });
 
+    it('should set the global placement id (gpid) if media type is video', function () {
+      const pbadslot = 'cde456'
+      const req = { ...bidRequests[0], ortb2Imp: { ext: { data: { pbadslot } } }, params: zoneParam, mediaTypes: vidMediaTypes }
+      const bidRequest = spec.buildRequests([req])[0];
+      expect(bidRequest.data).to.have.property('gpid');
+      expect(bidRequest.data.gpid).to.equal(pbadslot);
+    });
+
     it('should set the bid floor if getFloor module is not present but static bid floor is defined', function () {
       const req = { ...bidRequests[0], params: { bidfloor: 42 } }
       const bidRequest = spec.buildRequests([req])[0];
@@ -426,6 +516,7 @@ describe('gumgumAdapter', function () {
         linearity: 1,
         startdelay: 1,
         placement: 123456,
+        plcmt: 3,
         protocols: [1, 2]
       };
       const request = Object.assign({}, bidRequests[0]);
@@ -444,6 +535,7 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data.li).to.eq(videoVals.linearity);
       expect(bidRequest.data.sd).to.eq(videoVals.startdelay);
       expect(bidRequest.data.pt).to.eq(videoVals.placement);
+      expect(bidRequest.data.vplcmt).to.eq(videoVals.plcmt);
       expect(bidRequest.data.pr).to.eq(videoVals.protocols.join(','));
       expect(bidRequest.data.viw).to.eq(videoVals.playerSize[0].toString());
       expect(bidRequest.data.vih).to.eq(videoVals.playerSize[1].toString());
@@ -457,6 +549,7 @@ describe('gumgumAdapter', function () {
         linearity: 1,
         startdelay: 1,
         placement: 123456,
+        plcmt: 3,
         protocols: [1, 2]
       };
       const request = Object.assign({}, bidRequests[0]);
@@ -475,6 +568,7 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data.li).to.eq(inVideoVals.linearity);
       expect(bidRequest.data.sd).to.eq(inVideoVals.startdelay);
       expect(bidRequest.data.pt).to.eq(inVideoVals.placement);
+      expect(bidRequest.data.vplcmt).to.eq(inVideoVals.plcmt);
       expect(bidRequest.data.pr).to.eq(inVideoVals.protocols.join(','));
       expect(bidRequest.data.viw).to.eq(inVideoVals.playerSize[0].toString());
       expect(bidRequest.data.vih).to.eq(inVideoVals.playerSize[1].toString());
@@ -486,6 +580,12 @@ describe('gumgumAdapter', function () {
       expect(request.data).to.not.include.any.keys('eAdBuyId');
       expect(request.data).to.not.include.any.keys('adBuyId');
     });
+    it('should set pubProvidedId if the uid and  pubProvidedId are available', function () {
+      const request = { ...bidRequests[0] };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.pubProvidedId).to.equal(JSON.stringify(bidRequests[0].userId.pubProvidedId));
+    });
+
     it('should add gdpr consent parameters if gdprConsent is present', function () {
       const gdprConsent = { consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==', gdprApplies: true };
       const fakeBidRequest = { gdprConsent: gdprConsent };
@@ -503,10 +603,9 @@ describe('gumgumAdapter', function () {
       const gppConsent = { gppString: 'DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN', applicableSections: [7] }
       const fakeBidRequest = { gppConsent: gppConsent };
       const bidRequest = spec.buildRequests(bidRequests, fakeBidRequest)[0];
-      expect(bidRequest.data.gppConsent).to.exist;
-      expect(bidRequest.data.gppConsent.gppString).to.equal(gppConsent.gppString);
-      expect(bidRequest.data.gppConsent.gpp_sid).to.equal(gppConsent.applicableSections);
-      expect(bidRequest.data.gppConsent.gppString).to.eq('DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN');
+      expect(bidRequest.data.gppString).to.equal(gppConsent.gppString);
+      expect(bidRequest.data.gppSid).to.equal(gppConsent.applicableSections.join(','));
+      expect(bidRequest.data.gppString).to.eq('DBACNYA~CPXxRfAPXxRfAAfKABENB-CgAAAAAAAAAAYgAAAAAAAA~1YNN');
     });
     it('should handle ortb2 parameters', function () {
       const ortb2 = {
@@ -517,15 +616,14 @@ describe('gumgumAdapter', function () {
       }
       const fakeBidRequest = { gppConsent: ortb2 };
       const bidRequest = spec.buildRequests(bidRequests, fakeBidRequest)[0];
-      expect(bidRequest.data.gppConsent.gppString).to.eq(fakeBidRequest[0])
+      expect(bidRequest.data.gpp).to.eq(fakeBidRequest[0])
     });
     it('should handle gppConsent is present but values are undefined case', function () {
       const gppConsent = { gppString: undefined, applicableSections: undefined }
       const fakeBidRequest = { gppConsent: gppConsent };
       const bidRequest = spec.buildRequests(bidRequests, fakeBidRequest)[0];
-      expect(bidRequest.data.gppConsent).to.exist;
-      expect(bidRequest.data.gppConsent.gppString).to.equal(undefined);
-      expect(bidRequest.data.gppConsent.gpp_sid).to.equal(undefined);
+      expect(bidRequest.data.gppString).to.equal('');
+      expect(bidRequest.data.gppSid).to.equal('');
     });
     it('should handle ortb2  undefined parameters', function () {
       const ortb2 = {
@@ -536,8 +634,31 @@ describe('gumgumAdapter', function () {
       }
       const fakeBidRequest = { gppConsent: ortb2 };
       const bidRequest = spec.buildRequests(bidRequests, fakeBidRequest)[0];
-      expect(bidRequest.data.gppConsent.gppString).to.eq(undefined)
-      expect(bidRequest.data.gppConsent.gpp_sid).to.eq(undefined)
+      expect(bidRequest.data.gppString).to.eq('')
+      expect(bidRequest.data.gppSid).to.eq('')
+    });
+    it('should add DSA information to payload if available', function () {
+      // Define the sample ORTB2 object with DSA information
+      const ortb2 = {
+        regs: {
+          ext: {
+            dsa: {
+              dsarequired: '1',
+              pubrender: '2',
+              datatopub: '3',
+              transparency: [{
+                domain: 'test.com',
+                dsaparams: [1, 2, 3]
+              }]
+            }
+          }
+        }
+      };
+      const fakeBidRequest = { ortb2 };
+      // Call the buildRequests function to generate the bid request
+      const [bidRequest] = spec.buildRequests(bidRequests, fakeBidRequest);
+      // Assert that the DSA information in the bid request matches the provided ORTB2 data
+      expect(bidRequest.data.dsa).to.deep.equal(JSON.stringify(fakeBidRequest.ortb2.regs.ext.dsa));
     });
     it('should not set coppa parameter if coppa config is set to false', function () {
       config.setConfig({
@@ -664,6 +785,40 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data.pu.includes('ggad')).to.be.false;
       expect(bidRequest.data.pu.includes('ggdeal')).to.be.false;
     });
+
+    it('should handle ORTB2 device data', function () {
+      const ortb2 = {
+        device: {
+          w: 980,
+          h: 1720,
+          dnt: 0,
+          ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+          language: 'en',
+          devicetype: 1,
+          make: 'Apple',
+          model: 'iPhone 12 Pro Max',
+          os: 'iOS',
+          osv: '17.4',
+          ext: {fiftyonedegrees_deviceId: '17595-133085-133468-18092'},
+          ip: '127.0.0.1',
+          ipv6: '51dc:5e20:fd6a:c955:66be:03b4:dfa3:35b2',
+        },
+      };
+
+      const bidRequest = spec.buildRequests(bidRequests, { ortb2 })[0];
+
+      expect(bidRequest.data.dnt).to.equal(ortb2.device.dnt);
+      expect(bidRequest.data.ua).to.equal(ortb2.device.ua);
+      expect(bidRequest.data.lang).to.equal(ortb2.device.language);
+      expect(bidRequest.data.dt).to.equal(ortb2.device.devicetype);
+      expect(bidRequest.data.make).to.equal(ortb2.device.make);
+      expect(bidRequest.data.model).to.equal(ortb2.device.model);
+      expect(bidRequest.data.os).to.equal(ortb2.device.os);
+      expect(bidRequest.data.osv).to.equal(ortb2.device.osv);
+      expect(bidRequest.data.foddid).to.equal(ortb2.device.ext.fiftyonedegrees_deviceId);
+      expect(bidRequest.data.ip).to.equal(ortb2.device.ip);
+      expect(bidRequest.data.ipv6).to.equal(ortb2.device.ipv6);
+    });
   })
 
   describe('interpretResponse', function () {
@@ -832,6 +987,19 @@ describe('gumgumAdapter', function () {
         expect(result.height = expectedSize[1]);
       })
 
+      it('request size that  matches response size for in-slot', function () {
+        const request = { ...bidRequest };
+        const body = { ...serverResponse };
+        const expectedSize = [[ 320, 50 ], [300, 600], [300, 250]];
+        let result;
+        request.pi = 3;
+        body.ad.width = 300;
+        body.ad.height = 600;
+        result = spec.interpretResponse({ body }, request)[0];
+        expect(result.width = expectedSize[1][0]);
+        expect(result.height = expectedSize[1][1]);
+      })
+
       it('defaults to use bidRequest sizes', function () {
         const { ad, jcsi, pag, thms, meta } = serverResponse
         const noAdSizes = { ...ad }
diff --git a/test/spec/modules/hadronAnalyticsAdapter_spec.js b/test/spec/modules/hadronAnalyticsAdapter_spec.js
index bea131fb78f..68e5bc3aecb 100644
--- a/test/spec/modules/hadronAnalyticsAdapter_spec.js
+++ b/test/spec/modules/hadronAnalyticsAdapter_spec.js
@@ -2,7 +2,7 @@ import adapterManager from '../../../src/adapterManager.js';
 import hadronAnalyticsAdapter from '../../../modules/hadronAnalyticsAdapter.js';
 import { expect } from 'chai';
 import * as events from '../../../src/events.js';
-import constants from '../../../src/constants.json';
+import { EVENTS } from '../../../src/constants.js';
 import { generateUUID } from '../../../src/utils.js';
 import { server } from 'test/mocks/xhr.js';
 
@@ -48,13 +48,13 @@ describe('Hadron analytics adapter', () => {
         adUnitCodes: ['usr1234']
       }],
     };
-    events.emit(constants.EVENTS.AUCTION_END, auction);
+    events.emit(EVENTS.AUCTION_END, auction);
     assert(server.requests.length > 0)
     const body = JSON.parse(server.requests[0].requestBody);
     var eventTypes = [];
     body.events.forEach(e => eventTypes.push(e.eventType));
     assert(eventTypes.length > 0)
-    assert(eventTypes.indexOf(constants.EVENTS.AUCTION_END) > -1);
+    assert(eventTypes.indexOf(EVENTS.AUCTION_END) > -1);
     hadronAnalyticsAdapter.disableAnalytics();
   });
 });
diff --git a/test/spec/modules/hadronIdSystem_spec.js b/test/spec/modules/hadronIdSystem_spec.js
index cc0118d4659..70aaf06bcc8 100644
--- a/test/spec/modules/hadronIdSystem_spec.js
+++ b/test/spec/modules/hadronIdSystem_spec.js
@@ -1,12 +1,15 @@
-import { hadronIdSubmodule, storage } from 'modules/hadronIdSystem.js';
-import { server } from 'test/mocks/xhr.js';
-import * as utils from 'src/utils.js';
+import {hadronIdSubmodule, storage, LS_TAM_KEY} from 'modules/hadronIdSystem.js';
+import {server} from 'test/mocks/xhr.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
 
 describe('HadronIdSystem', function () {
-  describe('getId', function() {
+  const HADRON_TEST = 'tstCachedHadronId1';
+  describe('getId', function () {
     let getDataFromLocalStorageStub;
 
-    beforeEach(function() {
+    beforeEach(function () {
       getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
     });
 
@@ -14,42 +17,47 @@ describe('HadronIdSystem', function () {
       getDataFromLocalStorageStub.restore();
     });
 
-    it('gets a hadronId', function() {
+    it('gets a cached hadronid', function () {
       const config = {
         params: {}
       };
-      const callbackSpy = sinon.spy();
-      const callback = hadronIdSubmodule.getId(config).callback;
-      callback(callbackSpy);
-      const request = server.requests[0];
-      expect(request.url).to.eq(`https://id.hadron.ad.gt/api/v1/pbhid?partner_id=0&_it=prebid`);
-      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ hadronId: 'testHadronId1' }));
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal({ id: { hadronId: 'testHadronId1' } });
-    });
-
-    it('gets a cached hadronid', function() {
-      const config = {
-        params: {}
-      };
-      getDataFromLocalStorageStub.withArgs('auHadronId').returns('tstCachedHadronId1');
-
+      getDataFromLocalStorageStub.withArgs(LS_TAM_KEY).returns(HADRON_TEST);
       const result = hadronIdSubmodule.getId(config);
-      expect(result).to.deep.equal({ id: { hadronId: 'tstCachedHadronId1' } });
+      expect(result).to.deep.equal({id: HADRON_TEST});
     });
 
-    it('allows configurable id url', function() {
+    it('allows configurable id url', function () {
       const config = {
         params: {
           url: 'https://hadronid.publync.com'
         }
       };
+      getDataFromLocalStorageStub.withArgs(LS_TAM_KEY).returns(null);
       const callbackSpy = sinon.spy();
       const callback = hadronIdSubmodule.getId(config).callback;
       callback(callbackSpy);
       const request = server.requests[0];
-      expect(request.url).to.eq('https://hadronid.publync.com/?partner_id=0&_it=prebid');
-      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ hadronId: 'testHadronId1' }));
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal({ id: { hadronId: 'testHadronId1' } });
+      expect(request.url).to.match(/^https:\/\/hadronid\.publync\.com\//);
     });
   });
+
+  describe('eids', () => {
+    before(() => {
+      attachIdSystem(hadronIdSubmodule);
+    });
+    it('hadronId', function () {
+      const userId = {
+        hadronId: 'some-random-id-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'audigent.com',
+        uids: [{
+          id: 'some-random-id-value',
+          atype: 1
+        }]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/hadronRtdProvider_spec.js b/test/spec/modules/hadronRtdProvider_spec.js
index b9e07c97f84..46877f246b5 100644
--- a/test/spec/modules/hadronRtdProvider_spec.js
+++ b/test/spec/modules/hadronRtdProvider_spec.js
@@ -1,15 +1,20 @@
-// TODO: this and hadronRtdProvider_spec are a copy-paste of each other
-
 import {config} from 'src/config.js';
-import {HALOID_LOCAL_NAME, RTD_LOCAL_NAME, addRealTimeData, getRealTimeData, hadronSubmodule, storage} from 'modules/hadronRtdProvider.js';
+import {
+  HADRONID_LOCAL_NAME,
+  RTD_LOCAL_NAME,
+  addRealTimeData,
+  getRealTimeData,
+  hadronSubmodule,
+  storage
+} from 'modules/hadronRtdProvider.js';
 import {server} from 'test/mocks/xhr.js';
 
 const responseHeader = {'Content-Type': 'application/json'};
 
-describe('hadronRtdProvider', function() {
+describe('hadronRtdProvider', function () {
   let getDataFromLocalStorageStub;
 
-  beforeEach(function() {
+  beforeEach(function () {
     config.resetConfig();
     getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
   });
@@ -18,19 +23,19 @@ describe('hadronRtdProvider', function() {
     getDataFromLocalStorageStub.restore();
   });
 
-  describe('hadronSubmodule', function() {
+  describe('hadronSubmodule', function () {
     it('successfully instantiates', function () {
-		  expect(hadronSubmodule.init()).to.equal(true);
+      expect(hadronSubmodule.init()).to.equal(true);
     });
   });
 
-  describe('Add Real-Time Data', function() {
-    it('merges ortb2 data', function() {
+  describe('Add Real-Time Data', function () {
+    it('merges ortb2 data', function () {
       let rtdConfig = {};
 
       const setConfigUserObj1 = {
         name: 'www.dataprovider1.com',
-        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        ext: {taxonomyname: 'iab_audience_taxonomy'},
         segment: [{
           id: '1776'
         }]
@@ -38,7 +43,7 @@ describe('hadronRtdProvider', function() {
 
       const setConfigUserObj2 = {
         name: 'www.dataprovider2.com',
-        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        ext: {taxonomyname: 'iab_audience_taxonomy'},
         segment: [{
           id: '1914'
         }]
@@ -125,12 +130,12 @@ describe('hadronRtdProvider', function() {
       expect(ortb2Config.site.content.data).to.deep.include.members([setConfigSiteObj1, rtdSiteObj1]);
     });
 
-    it('merges ortb2 data without duplication', function() {
+    it('merges ortb2 data without duplication', function () {
       let rtdConfig = {};
 
       const userObj1 = {
         name: 'www.dataprovider1.com',
-        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        ext: {taxonomyname: 'iab_audience_taxonomy'},
         segment: [{
           id: '1776'
         }]
@@ -138,7 +143,7 @@ describe('hadronRtdProvider', function() {
 
       const userObj2 = {
         name: 'www.dataprovider2.com',
-        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        ext: {taxonomyname: 'iab_audience_taxonomy'},
         segment: [{
           id: '1914'
         }]
@@ -197,12 +202,12 @@ describe('hadronRtdProvider', function() {
       expect(ortb2Config.site.content.data).to.have.lengthOf(1);
     });
 
-    it('merges bidder-specific ortb2 data', function() {
+    it('merges bidder-specific ortb2 data', function () {
       let rtdConfig = {};
 
       const configUserObj1 = {
         name: 'www.dataprovider1.com',
-        ext: { segtax: 3 },
+        ext: {segtax: 3},
         segment: [{
           id: '1776'
         }]
@@ -210,7 +215,7 @@ describe('hadronRtdProvider', function() {
 
       const configUserObj2 = {
         name: 'www.dataprovider2.com',
-        ext: { segtax: 3 },
+        ext: {segtax: 3},
         segment: [{
           id: '1914'
         }]
@@ -218,7 +223,7 @@ describe('hadronRtdProvider', function() {
 
       const configUserObj3 = {
         name: 'www.dataprovider1.com',
-        ext: { segtax: 3 },
+        ext: {segtax: 3},
         segment: [{
           id: '2003'
         }]
@@ -374,12 +379,12 @@ describe('hadronRtdProvider', function() {
       expect(ortb2Config.site.content.data).to.deep.include.members([configSiteObj2, rtdSiteObj2]);
     });
 
-    it('merges bidder-specific ortb2 data without duplication', function() {
+    it('merges bidder-specific ortb2 data without duplication', function () {
       let rtdConfig = {};
 
       const userObj1 = {
         name: 'www.dataprovider1.com',
-        ext: { segtax: 3 },
+        ext: {segtax: 3},
         segment: [{
           id: '1776'
         }]
@@ -387,7 +392,7 @@ describe('hadronRtdProvider', function() {
 
       const userObj2 = {
         name: 'www.dataprovider2.com',
-        ext: { segtax: 3 },
+        ext: {segtax: 3},
         segment: [{
           id: '1914'
         }]
@@ -395,7 +400,7 @@ describe('hadronRtdProvider', function() {
 
       const userObj3 = {
         name: 'www.dataprovider1.com',
-        ext: { segtax: 3 },
+        ext: {segtax: 3},
         segment: [{
           id: '2003'
         }]
@@ -503,10 +508,10 @@ describe('hadronRtdProvider', function() {
       expect(ortb2Config.site.content.data).to.have.lengthOf(2);
     });
 
-    it('allows publisher defined rtd ortb2 logic', function() {
+    it('allows publisher defined rtd ortb2 logic', function () {
       const rtdConfig = {
         params: {
-          handleRtd: function(bidConfig, rtd, rtdConfig, pbConfig) {
+          handleRtd: function (bidConfig, rtd, rtdConfig, pbConfig) {
             if (rtd.ortb2.user.data[0].segment[0].id == '1776') {
               pbConfig.setConfig({ortb2: rtd.ortb2});
             } else {
@@ -520,7 +525,7 @@ describe('hadronRtdProvider', function() {
 
       const rtdUserObj1 = {
         name: 'www.dataprovider.com',
-        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        ext: {taxonomyname: 'iab_audience_taxonomy'},
         segment: [{
           id: '1776'
         }]
@@ -566,10 +571,10 @@ describe('hadronRtdProvider', function() {
       expect(config.getConfig().ortb2).to.deep.equal({});
     });
 
-    it('allows publisher defined adunit logic', function() {
+    it('allows publisher defined adunit logic', function () {
       const rtdConfig = {
         params: {
-          handleRtd: function(bidConfig, rtd, rtdConfig, pbConfig) {
+          handleRtd: function (bidConfig, rtd, rtdConfig, pbConfig) {
             var adUnits = bidConfig.adUnits;
             for (var i = 0; i < adUnits.length; i++) {
               var adUnit = adUnits[i];
@@ -631,8 +636,8 @@ describe('hadronRtdProvider', function() {
     });
   });
 
-  describe('Get Real-Time Data', function() {
-    it('gets rtd from local storage cache', function() {
+  describe('Get Real-Time Data', function () {
+    it('gets rtd from local storage cache', function () {
       const rtdConfig = {
         params: {
           segmentCache: true
@@ -667,12 +672,12 @@ describe('hadronRtdProvider', function() {
       };
 
       getDataFromLocalStorageStub.withArgs(RTD_LOCAL_NAME).returns(JSON.stringify(cachedRtd));
-
-      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
-      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+      getRealTimeData(bidConfig, () => {
+        expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+      }, rtdConfig, {});
     });
 
-    it('gets real-time data via async request', function() {
+    it('gets real-time data via async request', function () {
       const setConfigSiteObj1 = {
         name: 'www.audigent.com',
         ext: {
@@ -737,17 +742,15 @@ describe('hadronRtdProvider', function() {
         }
       };
 
-      getDataFromLocalStorageStub.withArgs(HALOID_LOCAL_NAME).returns('testHadronId1');
-      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
-
-      let request = server.requests[0];
-      let postData = JSON.parse(request.requestBody);
-      expect(postData.config).to.have.deep.property('publisherId', 'testPub1');
-      expect(postData.userIds).to.have.deep.property('hadronId', 'testHadronId1');
-
-      request.respond(200, responseHeader, JSON.stringify(data));
-
-      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+      getDataFromLocalStorageStub.withArgs(HADRONID_LOCAL_NAME).returns('testHadronId1');
+      getRealTimeData(bidConfig, () => {
+        let request = server.requests[0];
+        let postData = JSON.parse(request.requestBody);
+        expect(postData.config).to.have.deep.property('publisherId', 'testPub1');
+        expect(postData.userIds).to.have.deep.property('hadronId', 'testHadronId1');
+        request.respond(200, responseHeader, JSON.stringify(data));
+        expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+      }, rtdConfig, {});
     });
   });
 });
diff --git a/test/spec/modules/humansecurityRtdProvider_spec.js b/test/spec/modules/humansecurityRtdProvider_spec.js
new file mode 100644
index 00000000000..627c3a6c1e4
--- /dev/null
+++ b/test/spec/modules/humansecurityRtdProvider_spec.js
@@ -0,0 +1,210 @@
+import { loadExternalScriptStub } from 'test/mocks/adloaderStub.js';
+
+import * as utils from '../../../src/utils.js';
+import * as hook from '../../../src/hook.js';
+import * as refererDetection from '../../../src/refererDetection.js';
+
+import { __TEST__ } from '../../../modules/humansecurityRtdProvider.js';
+
+const {
+  SUBMODULE_NAME,
+  SCRIPT_URL,
+  main,
+  load,
+  onImplLoaded,
+  onImplMessage,
+  onGetBidRequestData
+} = __TEST__;
+
+describe('humansecurity RTD module', function () {
+  let sandbox;
+
+  const stubUuid = 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee';
+  const sonarStubId = `sonar_${stubUuid}`;
+  const stubWindow = { [sonarStubId]: undefined };
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(utils, 'getWindowSelf').returns(stubWindow);
+    sandbox.stub(utils, 'generateUUID').returns(stubUuid);
+    sandbox.stub(refererDetection, 'getRefererInfo').returns({ domain: 'example.com' });
+  });
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe('Initialization step', function () {
+    let sandbox2;
+    let connectSpy;
+    beforeEach(function() {
+      sandbox2 = sinon.sandbox.create();
+      connectSpy = sandbox.spy();
+      // Once the impl script is loaded, it registers the API using session ID
+      sandbox2.stub(stubWindow, sonarStubId).value({ connect: connectSpy });
+    });
+    afterEach(function () {
+      sandbox2.restore();
+    });
+
+    it('should accept valid configurations', function () {
+      // Default configuration - empty
+      expect(() => load({})).to.not.throw();
+      expect(() => load({ params: {} })).to.not.throw();
+      // Configuration with clientId
+      expect(() => load({ params: { clientId: 'customer123' } })).to.not.throw();
+    });
+
+    it('should throw an Error on invalid configuration', function () {
+      expect(() => load({ params: { clientId: 123 } })).to.throw();
+      expect(() => load({ params: { clientId: 'abc.def' } })).to.throw();
+      expect(() => load({ params: { clientId: '1' } })).to.throw();
+      expect(() => load({ params: { clientId: '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' } })).to.throw();
+    });
+
+    it('should insert implementation script', () => {
+      load({ });
+
+      expect(loadExternalScriptStub.calledOnce).to.be.true;
+
+      const args = loadExternalScriptStub.getCall(0).args;
+      expect(args[0]).to.be.equal(`${SCRIPT_URL}?r=example.com`);
+      expect(args[2]).to.be.equal(SUBMODULE_NAME);
+      expect(args[3]).to.be.equal(onImplLoaded);
+      expect(args[4]).to.be.equal(null);
+      expect(args[5]).to.be.deep.equal({ 'data-sid': 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee' });
+    });
+
+    it('should insert external script element with "customerId" info from config', () => {
+      load({ params: { clientId: 'customer123' } });
+
+      expect(loadExternalScriptStub.calledOnce).to.be.true;
+
+      const args = loadExternalScriptStub.getCall(0).args;
+      expect(args[0]).to.be.equal(`${SCRIPT_URL}?r=example.com&c=customer123`);
+    });
+
+    it('should connect to the implementation script once it loads', function () {
+      load({ });
+
+      expect(loadExternalScriptStub.calledOnce).to.be.true;
+      expect(connectSpy.calledOnce).to.be.true;
+
+      const args = connectSpy.getCall(0).args;
+      expect(args[0]).to.haveOwnProperty('cmd'); // pbjs global
+      expect(args[0]).to.haveOwnProperty('que');
+      expect(args[1]).to.be.equal(onImplMessage);
+    });
+  });
+
+  describe('Bid enrichment step', function () {
+    const hmnsData = { 'v1': 'sometoken' };
+
+    let sandbox2;
+    let callbackSpy;
+    let reqBidsConfig;
+    beforeEach(function() {
+      sandbox2 = sinon.sandbox.create();
+      callbackSpy = sandbox2.spy();
+      reqBidsConfig = { ortb2Fragments: { bidder: {}, global: {} } };
+    });
+    afterEach(function () {
+      sandbox2.restore();
+    });
+
+    it('should add empty device.ext.hmns to global ortb2 when data is yet to be received from the impl script', () => {
+      load({ });
+
+      onGetBidRequestData(reqBidsConfig, callbackSpy, { params: {} }, {});
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(reqBidsConfig.ortb2Fragments.global).to.have.own.property('device');
+      expect(reqBidsConfig.ortb2Fragments.global.device).to.have.own.property('ext');
+      expect(reqBidsConfig.ortb2Fragments.global.device.ext).to.have.own.property('hmns').which.is.an('object').that.deep.equals({});
+    });
+
+    it('should add the default device.ext.hmns to global ortb2 when no "hmns" data was yet received', () => {
+      load({ });
+
+      onImplMessage({ type: 'info', data: 'not a hmns message' });
+      onGetBidRequestData(reqBidsConfig, callbackSpy, { params: {} }, {});
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(reqBidsConfig.ortb2Fragments.global).to.have.own.property('device');
+      expect(reqBidsConfig.ortb2Fragments.global.device).to.have.own.property('ext');
+      expect(reqBidsConfig.ortb2Fragments.global.device.ext).to.have.own.property('hmns').which.is.an('object').that.deep.equals({});
+    });
+
+    it('should add device.ext.hmns with received tokens to global ortb2 when the data was received', () => {
+      load({ });
+
+      onImplMessage({ type: 'hmns', data: hmnsData });
+      onGetBidRequestData(reqBidsConfig, callbackSpy, { params: {} }, {});
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(reqBidsConfig.ortb2Fragments.global).to.have.own.property('device');
+      expect(reqBidsConfig.ortb2Fragments.global.device).to.have.own.property('ext');
+      expect(reqBidsConfig.ortb2Fragments.global.device.ext).to.have.own.property('hmns').which.is.an('object').that.deep.equals(hmnsData);
+    });
+
+    it('should update device.ext.hmns with new data', () => {
+      load({ });
+
+      onImplMessage({ type: 'hmns', data: { 'v1': 'should be overwritten' } });
+      onImplMessage({ type: 'hmns', data: hmnsData });
+      onGetBidRequestData(reqBidsConfig, callbackSpy, { params: {} }, {});
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(reqBidsConfig.ortb2Fragments.global).to.have.own.property('device');
+      expect(reqBidsConfig.ortb2Fragments.global.device).to.have.own.property('ext');
+      expect(reqBidsConfig.ortb2Fragments.global.device.ext).to.have.own.property('hmns').which.is.an('object').that.deep.equals(hmnsData);
+    });
+  });
+
+  describe('Sumbodule execution', function() {
+    let sandbox2;
+    let submoduleStub;
+    beforeEach(function() {
+      sandbox2 = sinon.sandbox.create();
+      submoduleStub = sandbox2.stub(hook, 'submodule');
+    });
+    afterEach(function () {
+      sandbox2.restore();
+    });
+
+    function getModule() {
+      main();
+
+      expect(submoduleStub.calledOnceWith('realTimeData')).to.equal(true);
+
+      const submoduleDef = submoduleStub.getCall(0).args[1];
+      expect(submoduleDef).to.be.an('object');
+      expect(submoduleDef).to.have.own.property('name', SUBMODULE_NAME);
+      expect(submoduleDef).to.have.own.property('init').that.is.a('function');
+      expect(submoduleDef).to.have.own.property('getBidRequestData').that.is.a('function');
+
+      return submoduleDef;
+    }
+
+    it('should register humansecurity RTD submodule provider', function () {
+      getModule();
+    });
+
+    it('should refuse initialization on invalid customer id configuration', function () {
+      const { init } = getModule();
+      expect(init({ params: { clientId: 123 } })).to.equal(false);
+      expect(loadExternalScriptStub.notCalled).to.be.true;
+    });
+
+    it('should commence initialization on valid initialization', function () {
+      const { init } = getModule();
+      expect(init({ params: { clientId: 'customer123' } })).to.equal(true);
+      expect(loadExternalScriptStub.calledOnce).to.be.true;
+    });
+
+    it('should commence initialization on default initialization', function () {
+      const { init } = getModule();
+      expect(init({ })).to.equal(true);
+      expect(loadExternalScriptStub.calledOnce).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/hypelabBidAdapter_spec.js b/test/spec/modules/hypelabBidAdapter_spec.js
index 4522073a2db..28d0739de79 100644
--- a/test/spec/modules/hypelabBidAdapter_spec.js
+++ b/test/spec/modules/hypelabBidAdapter_spec.js
@@ -92,7 +92,7 @@ const mockBidRequest = {
     placement_slug: 'test_placement',
     provider_version: '0.0.1',
     provider_name: 'prebid',
-    referrer: 'https://example.com',
+    location: 'https://example.com',
     sdk_version: '7.51.0-pre',
     sizes: [[728, 90]],
     wids: [],
@@ -160,6 +160,9 @@ describe('hypelabBidAdapter', function () {
       expect(data.bidRequestsCount).to.be.a('number');
       expect(data.bidderRequestsCount).to.be.a('number');
       expect(data.bidderWinsCount).to.be.a('number');
+      expect(data.dpr).to.be.a('number');
+      expect(data.location).to.be.a('string');
+      expect(data.floor).to.equal(null);
     });
 
     describe('should set uuid to the first id in userIdAsEids', () => {
@@ -211,6 +214,7 @@ describe('hypelabBidAdapter', function () {
       expect(data.ad).to.be.a('string');
       expect(data.mediaType).to.be.a('string');
       expect(data.meta.advertiserDomains).to.be.an('array');
+      expect(data.meta.advertiserDomains[0]).to.be.a('string');
     });
 
     describe('should return a blank array if cpm is not set', () => {
diff --git a/test/spec/modules/id5AnalyticsAdapter_spec.js b/test/spec/modules/id5AnalyticsAdapter_spec.js
index 9cb7233ce7c..7616052dbe7 100644
--- a/test/spec/modules/id5AnalyticsAdapter_spec.js
+++ b/test/spec/modules/id5AnalyticsAdapter_spec.js
@@ -2,7 +2,7 @@ import adapterManager from '../../../src/adapterManager.js';
 import id5AnalyticsAdapter from '../../../modules/id5AnalyticsAdapter.js';
 import { expect } from 'chai';
 import * as events from '../../../src/events.js';
-import constants from '../../../src/constants.json';
+import { EVENTS } from '../../../src/constants.js';
 import { generateUUID } from '../../../src/utils.js';
 import {server} from '../../mocks/xhr.js';
 
@@ -98,11 +98,11 @@ describe('ID5 analytics adapter', () => {
     it('sends auction end events to the backend', () => {
       id5AnalyticsAdapter.enableAnalytics(config);
       server.respond();
-      events.emit(constants.EVENTS.AUCTION_END, auction);
+      events.emit(EVENTS.AUCTION_END, auction);
       server.respond();
 
       // Why 3? 1: config, 2: tcfEnforcement, 3: auctionEnd
-      // tcfEnforcement? yes, gdprEnforcement module emits in reaction to auctionEnd
+      // tcfEnforcement? yes, tcfControl module emits in reaction to auctionEnd
       expect(server.requests).to.have.length(3);
 
       const body1 = JSON.parse(server.requests[1].requestBody);
@@ -307,7 +307,7 @@ describe('ID5 analytics adapter', () => {
 
       id5AnalyticsAdapter.enableAnalytics(config);
       server.respond();
-      events.emit(constants.EVENTS.AUCTION_END, auction);
+      events.emit(EVENTS.AUCTION_END, auction);
       server.respond();
 
       expect(server.requests).to.have.length(3);
@@ -360,7 +360,7 @@ describe('ID5 analytics adapter', () => {
       ]);
       id5AnalyticsAdapter.enableAnalytics(config);
       server.respond();
-      events.emit(constants.EVENTS.AUCTION_END, auction);
+      events.emit(EVENTS.AUCTION_END, auction);
       server.respond();
 
       expect(server.requests).to.have.length(2);
@@ -441,7 +441,7 @@ describe('ID5 analytics adapter', () => {
       ]);
       id5AnalyticsAdapter.enableAnalytics(config);
       server.respond();
-      events.emit(constants.EVENTS.AUCTION_END, auction);
+      events.emit(EVENTS.AUCTION_END, auction);
       server.respond();
 
       expect(server.requests).to.have.length(3);
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index 56b23ba9634..456bd92cb02 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -1,31 +1,32 @@
+import * as id5System from '../../../modules/id5IdSystem.js';
 import {
-  expDaysStr,
-  getFromLocalStorage,
-  getNbFromCache,
-  ID5_PRIVACY_STORAGE_NAME,
-  ID5_STORAGE_NAME,
-  id5IdSubmodule,
-  nbCacheName,
-  storage,
-  storeInLocalStorage,
-  storeNbInCache,
-} from 'modules/id5IdSystem.js';
-import {coreStorage, getConsentHash, init, requestBidsHook, setSubmoduleRegistry} from 'modules/userId/index.js';
-import {config} from 'src/config.js';
-import * as events from 'src/events.js';
-import CONSTANTS from 'src/constants.json';
-import * as utils from 'src/utils.js';
-import {uspDataHandler} from 'src/adapterManager.js';
-import 'src/prebid.js';
+  attachIdSystem,
+  coreStorage,
+  getConsentHash,
+  init,
+  startAuctionHook,
+  setSubmoduleRegistry
+} from '../../../modules/userId/index.js';
+import {config} from '../../../src/config.js';
+import * as events from '../../../src/events.js';
+import {EVENTS} from '../../../src/constants.js';
+import * as utils from '../../../src/utils.js';
+import {uspDataHandler, gppDataHandler} from '../../../src/adapterManager.js';
+import '../../../src/prebid.js';
 import {hook} from '../../../src/hook.js';
 import {mockGdprConsent} from '../../helpers/consentData.js';
 import {server} from '../../mocks/xhr.js';
 import {expect} from 'chai';
+import {GreedyPromise} from '../../../src/utils/promise.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+
+const IdFetchFlow = id5System.IdFetchFlow;
 
 describe('ID5 ID System', function () {
   const ID5_MODULE_NAME = 'id5Id';
   const ID5_EIDS_NAME = ID5_MODULE_NAME.toLowerCase();
   const ID5_SOURCE = 'id5-sync.com';
+  const TRUE_LINK_SOURCE = 'true-link-id5-sync.com';
   const ID5_TEST_PARTNER_ID = 173;
   const ID5_ENDPOINT = `https://id5-sync.com/g/v2/${ID5_TEST_PARTNER_ID}.json`;
   const ID5_API_CONFIG_URL = `https://id5-sync.com/api/config/prebid`;
@@ -35,7 +36,6 @@ describe('ID5 ID System', function () {
       url: ID5_ENDPOINT
     }
   };
-  const ID5_NB_STORAGE_NAME = nbCacheName(ID5_TEST_PARTNER_ID);
   const ID5_STORED_ID = 'storedid5id';
   const ID5_STORED_SIGNATURE = '123456';
   const ID5_STORED_LINK_TYPE = 1;
@@ -46,6 +46,25 @@ describe('ID5 ID System', function () {
       'linkType': ID5_STORED_LINK_TYPE
     }
   };
+  const EUID_STORED_ID = 'EUID_1';
+  const EUID_SOURCE = 'uidapi.com';
+  const ID5_STORED_OBJ_WITH_EUID = {
+    ...ID5_STORED_OBJ,
+    'ext': {
+      'euid': {
+        'source': EUID_SOURCE,
+        'uids': [{
+          'id': EUID_STORED_ID,
+          'aType': 3
+        }]
+      }
+    }
+  };
+  const TRUE_LINK_STORED_ID = 'TRUE_LINK_1';
+  const ID5_STORED_OBJ_WITH_TRUE_LINK = {
+    ...ID5_STORED_OBJ,
+    publisherTrueLinkId: TRUE_LINK_STORED_ID
+  };
   const ID5_RESPONSE_ID = 'newid5id';
   const ID5_RESPONSE_SIGNATURE = 'abcdef';
   const ID5_RESPONSE_LINK_TYPE = 2;
@@ -68,24 +87,33 @@ describe('ID5 ID System', function () {
         131: true
       }
     }
-  }
+  };
 
   const HEADERS_CONTENT_TYPE_JSON = {
     'Content-Type': 'application/json'
+  };
+
+  function expDaysStr(expDays) {
+    return (new Date(Date.now() + (1000 * 60 * 60 * 24 * expDays))).toUTCString();
   }
 
-  function getId5FetchConfig(storageName = ID5_STORAGE_NAME, storageType = 'html5') {
+  function storeInStorage(key, value, expDays) {
+    id5System.storage.setDataInLocalStorage(`${key}_exp`, expDaysStr(expDays));
+    id5System.storage.setDataInLocalStorage(`${key}`, value);
+  }
+
+  function getId5FetchConfig(partner = ID5_TEST_PARTNER_ID, storageName = id5System.ID5_STORAGE_NAME, storageType = 'html5') {
     return {
       name: ID5_MODULE_NAME,
       params: {
-        partner: ID5_TEST_PARTNER_ID
+        partner
       },
       storage: {
         name: storageName,
         type: storageType,
         expires: 90
       }
-    }
+    };
   }
 
   function getId5ValueConfig(value) {
@@ -96,7 +124,7 @@ describe('ID5 ID System', function () {
           uid: value
         }
       }
-    }
+    };
   }
 
   function getUserSyncConfig(userIds) {
@@ -105,11 +133,11 @@ describe('ID5 ID System', function () {
         userIds: userIds,
         syncDelay: 0
       }
-    }
+    };
   }
 
   function getFetchLocalStorageConfig() {
-    return getUserSyncConfig([getId5FetchConfig(ID5_STORAGE_NAME, 'html5')]);
+    return getUserSyncConfig([getId5FetchConfig()]);
   }
 
   function getValueConfig(value) {
@@ -126,67 +154,77 @@ describe('ID5 ID System', function () {
   }
 
   function callSubmoduleGetId(config, consentData, cacheIdObj) {
-    return new Promise((resolve) => {
-      id5IdSubmodule.getId(config, consentData, cacheIdObj).callback((response) => {
-        resolve(response)
-      })
+    return new GreedyPromise((resolve) => {
+      id5System.id5IdSubmodule.getId(config, consentData, cacheIdObj).callback((response) => {
+        resolve(response);
+      });
     });
   }
 
+  function wrapAsyncExpects(done, expectsFn) {
+    return function () {
+      try {
+        expectsFn();
+      } catch (err) {
+        done(err);
+      }
+    }
+  }
+
   class XhrServerMock {
+    currentRequestIdx = 0;
+    server;
+
     constructor(server) {
-      this.currentRequestIdx = 0
-      this.server = server
+      this.currentRequestIdx = 0;
+      this.server = server;
     }
 
-    expectFirstRequest() {
-      return this.#expectRequest(0);
+    async expectFirstRequest() {
+      return this.#waitOnRequest(0);
     }
 
-    expectNextRequest() {
-      return this.#expectRequest(++this.currentRequestIdx)
+    async expectNextRequest() {
+      return this.#waitOnRequest(++this.currentRequestIdx);
     }
 
-    expectConfigRequest() {
-      return this.expectFirstRequest()
-        .then(configRequest => {
-          expect(configRequest.url).is.eq(ID5_API_CONFIG_URL);
-          expect(configRequest.method).is.eq('POST');
-          return configRequest;
-        })
+    async expectConfigRequest() {
+      const configRequest = await this.expectFirstRequest();
+      expect(configRequest.url).is.eq(ID5_API_CONFIG_URL);
+      expect(configRequest.method).is.eq('POST');
+      expect(configRequest.withCredentials).is.eq(true);
+      return configRequest;
     }
 
-    respondWithConfigAndExpectNext(configRequest, config = ID5_API_CONFIG) {
+    async respondWithConfigAndExpectNext(configRequest, config = ID5_API_CONFIG) {
       configRequest.respond(200, HEADERS_CONTENT_TYPE_JSON, JSON.stringify(config));
-      return this.expectNextRequest()
+      return this.expectNextRequest();
     }
 
-    expectFetchRequest() {
-      return this.expectConfigRequest()
-        .then(configRequest => {
-          return this.respondWithConfigAndExpectNext(configRequest, ID5_API_CONFIG);
-        }).then(request => {
-          expect(request.url).is.eq(ID5_API_CONFIG.fetchCall.url);
-          expect(request.method).is.eq('POST');
-          return request;
-        })
+    async expectFetchRequest() {
+      const configRequest = await this.expectFirstRequest();
+      const fetchRequest = await this.respondWithConfigAndExpectNext(configRequest);
+      expect(fetchRequest.method).is.eq('POST');
+      expect(fetchRequest.url).is.eq(ID5_API_CONFIG.fetchCall.url);
+      return fetchRequest;
     }
 
-    #expectRequest(index) {
-      let server = this.server
-      return new Promise(function (resolve) {
-        (function waitForCondition() {
-          if (server.requests && server.requests.length > index) return resolve(server.requests[index]);
-          setTimeout(waitForCondition, 30);
-        })();
-      })
-        .then(request => {
-          return request
-        });
+    async #waitOnRequest(index) {
+      const server = this.server;
+      return new GreedyPromise((resolve) => {
+        const waitForCondition = () => {
+          if (server.requests && server.requests.length > index) {
+            resolve(server.requests[index]);
+          } else {
+            setTimeout(waitForCondition, 30);
+          }
+        };
+        waitForCondition();
+      });
     }
 
     hasReceivedAnyRequest() {
-      let requests = this.server.requests;
+      const requests = this.server.requests;
       return requests && requests.length > 0;
     }
   }
@@ -198,35 +236,41 @@ describe('ID5 ID System', function () {
   describe('Check for valid publisher config', function () {
     it('should fail with invalid config', function () {
       // no config
-      expect(id5IdSubmodule.getId()).is.eq(undefined);
-      expect(id5IdSubmodule.getId({})).is.eq(undefined);
-
-      // valid params, invalid storage
-      expect(id5IdSubmodule.getId({ params: { partner: 123 } })).to.be.eq(undefined);
-      expect(id5IdSubmodule.getId({ params: { partner: 123 }, storage: {} })).to.be.eq(undefined);
-      expect(id5IdSubmodule.getId({ params: { partner: 123 }, storage: { name: '' } })).to.be.eq(undefined);
-      expect(id5IdSubmodule.getId({ params: { partner: 123 }, storage: { type: '' } })).to.be.eq(undefined);
-
-      // valid storage, invalid params
-      expect(id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, })).to.be.eq(undefined);
-      expect(id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, params: { } })).to.be.eq(undefined);
-      expect(id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, params: { partner: 'abc' } })).to.be.eq(undefined);
+      expect(id5System.id5IdSubmodule.getId()).is.eq(undefined);
+      expect(id5System.id5IdSubmodule.getId({})).is.eq(undefined);
+
+      // valid params, invalid id5System.storage
+      expect(id5System.id5IdSubmodule.getId({params: {partner: 123}})).to.be.eq(undefined);
+      expect(id5System.id5IdSubmodule.getId({params: {partner: 123}, storage: {}})).to.be.eq(undefined);
+      expect(id5System.id5IdSubmodule.getId({params: {partner: 123}, storage: {name: ''}})).to.be.eq(undefined);
+      expect(id5System.id5IdSubmodule.getId({params: {partner: 123}, storage: {type: ''}})).to.be.eq(undefined);
+
+      // valid id5System.storage, invalid params
+      expect(id5System.id5IdSubmodule.getId({storage: {name: 'name', type: 'html5'}})).to.be.eq(undefined);
+      expect(id5System.id5IdSubmodule.getId({storage: {name: 'name', type: 'html5'}, params: {}})).to.be.eq(undefined);
+      expect(id5System.id5IdSubmodule.getId({
+        storage: {name: 'name', type: 'html5'},
+        params: {partner: 'abc'}
+      })).to.be.eq(undefined);
     });
 
-    it('should warn with non-recommended storage params', function () {
-      let logWarnStub = sinon.stub(utils, 'logWarn');
+    it('should warn with non-recommended id5System.storage params', function () {
+      const logWarnStub = sinon.stub(utils, 'logWarn');
 
-      id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, params: { partner: 123 } });
+      id5System.id5IdSubmodule.getId({storage: {name: 'name', type: 'html5'}, params: {partner: 123}});
       expect(logWarnStub.calledOnce).to.be.true;
       logWarnStub.restore();
 
-      id5IdSubmodule.getId({ storage: { name: ID5_STORAGE_NAME, type: 'cookie', }, params: { partner: 123 } });
+      id5System.id5IdSubmodule.getId({
+        storage: {name: id5System.ID5_STORAGE_NAME, type: 'cookie'},
+        params: {partner: 123}
+      });
       expect(logWarnStub.calledOnce).to.be.true;
       logWarnStub.restore();
     });
   });
 
-  describe('Check for valid consent', function() {
+  describe('Check for valid consent', function () {
     const dataConsentVals = [
       [{purpose: {consents: {1: false}}}, {vendor: {consents: {131: true}}}, ' no purpose consent'],
       [{purpose: {consents: {1: true}}}, {vendor: {consents: {131: false}}}, ' no vendor consent'],
@@ -238,495 +282,526 @@ describe('ID5 ID System', function () {
       [{purpose: {consents: {1: true}}}, {vendor: {consents: {31: true}}}, ' incorrect vendor consent']
     ];
 
-    dataConsentVals.forEach(function([purposeConsent, vendorConsent, caseName]) {
-      it('should fail with invalid consent because of ' + caseName, function() {
-        let dataConsent = {
+    dataConsentVals.forEach(function ([purposeConsent, vendorConsent, caseName]) {
+      it('should fail with invalid consent because of ' + caseName, function () {
+        const dataConsent = {
           gdprApplies: true,
           consentString: 'consentString',
           vendorData: {
             purposeConsent, vendorConsent
           }
-        }
-        expect(id5IdSubmodule.getId(config)).is.eq(undefined);
-        expect(id5IdSubmodule.getId(config, dataConsent)).is.eq(undefined);
+        };
+        expect(id5System.id5IdSubmodule.getId(config)).is.eq(undefined);
+        expect(id5System.id5IdSubmodule.getId(config, dataConsent)).is.eq(undefined);
 
-        let cacheIdObject = 'cacheIdObject';
-        expect(id5IdSubmodule.extendId(config)).is.eq(undefined);
-        expect(id5IdSubmodule.extendId(config, dataConsent, cacheIdObject)).is.eq(cacheIdObject);
+        const cacheIdObject = 'cacheIdObject';
+        expect(id5System.id5IdSubmodule.extendId(config)).is.eq(undefined);
+        expect(id5System.id5IdSubmodule.extendId(config, dataConsent, cacheIdObject)).is.eq(cacheIdObject);
       });
     });
   });
 
   describe('Xhr Requests from getId()', function () {
-    const responseHeader = HEADERS_CONTENT_TYPE_JSON
+    const responseHeader = HEADERS_CONTENT_TYPE_JSON;
+    let gppStub;
 
     beforeEach(function () {
     });
 
     afterEach(function () {
-      uspDataHandler.reset()
+      uspDataHandler.reset();
+      gppStub?.restore();
     });
 
-    it('should call the ID5 server and handle a valid response', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let config = getId5FetchConfig();
-      let submoduleResponse = callSubmoduleGetId(config, undefined, undefined);
+    it('should call the ID5 server and handle a valid response', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const config = getId5FetchConfig();
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(fetchRequest.url).to.contain(ID5_ENDPOINT);
-          expect(fetchRequest.withCredentials).is.true;
-          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
-          expect(requestBody.o).is.eq('pbjs');
-          expect(requestBody.pd).is.undefined;
-          expect(requestBody.s).is.undefined;
-          expect(requestBody.provider).is.undefined
-          expect(requestBody.v).is.eq('$prebid.version$');
-          expect(requestBody.gdpr).is.eq(0);
-          expect(requestBody.gdpr_consent).is.undefined;
-          expect(requestBody.us_privacy).is.undefined;
-          expect(requestBody.storage).is.deep.eq(config.storage)
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(config, undefined, undefined);
 
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
-        .then(submoduleResponse => {
-          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
-        });
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+
+      expect(fetchRequest.url).to.contain(ID5_ENDPOINT);
+      expect(fetchRequest.withCredentials).is.true;
+
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+      expect(requestBody.o).is.eq('pbjs');
+      expect(requestBody.pd).is.undefined;
+      expect(requestBody.s).is.undefined;
+      expect(requestBody.provider).is.undefined;
+      expect(requestBody.v).is.eq('$prebid.version$');
+      expect(requestBody.gdpr).is.eq(0);
+      expect(requestBody.gdpr_consent).is.undefined;
+      expect(requestBody.us_privacy).is.undefined;
+      expect(requestBody.storage).is.deep.eq(config.storage);
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+
+      const submoduleResponse = await submoduleResponsePromise;
+      expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
     });
 
-    it('should call the ID5 server with gdpr data ', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let consentData = {
+    it('should call the ID5 server with gdpr data ', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const consentData = {
         gdprApplies: true,
         consentString: 'consentString',
         vendorData: ALLOWED_ID5_VENDOR_DATA
-      }
+      };
 
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
-          expect(requestBody.gdpr).to.eq(1);
-          expect(requestBody.gdpr_consent).is.eq(consentData.consentString);
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+      expect(requestBody.gdpr).to.eq(1);
+      expect(requestBody.gdpr_consent).is.eq(consentData.consentString);
 
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
-        .then(submoduleResponse => {
-          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
-        });
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+
+      const submoduleResponse = await submoduleResponsePromise;
+      expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
     });
 
-    it('should call the ID5 server without gdpr data when gdpr not applies ', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let consentData = {
+    it('should call the ID5 server without gdpr data when gdpr not applies ', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const consentData = {
         gdprApplies: false,
         consentString: 'consentString'
-      }
+      };
 
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.gdpr).to.eq(0);
-          expect(requestBody.gdpr_consent).is.undefined
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.gdpr).to.eq(0);
+      expect(requestBody.gdpr_consent).is.undefined;
 
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
-        .then(submoduleResponse => {
-          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
-        });
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+
+      const submoduleResponse = await submoduleResponsePromise;
+      expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
     });
 
-    it('should call the ID5 server with us privacy consent', function () {
-      let usPrivacyString = '1YN-';
-      uspDataHandler.setConsentData(usPrivacyString)
-      let xhrServerMock = new XhrServerMock(server)
-      let consentData = {
+    it('should call the ID5 server with us privacy consent', async function () {
+      const usPrivacyString = '1YN-';
+      uspDataHandler.setConsentData(usPrivacyString);
+      const xhrServerMock = new XhrServerMock(server);
+      const consentData = {
         gdprApplies: true,
         consentString: 'consentString',
         vendorData: ALLOWED_ID5_VENDOR_DATA
-      }
+      };
 
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
-          expect(requestBody.us_privacy).to.eq(usPrivacyString);
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+      expect(requestBody.us_privacy).to.eq(usPrivacyString);
 
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
-        .then(submoduleResponse => {
-          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
-        });
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+
+      const submoduleResponse = await submoduleResponsePromise;
+      expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
     });
 
-    it('should call the ID5 server with no signature field when no stored object', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+    it('should call the ID5 server with no signature field when no stored object', async function () {
+      const xhrServerMock = new XhrServerMock(server);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.s).is.undefined;
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.s).is.undefined;
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
     });
 
-    it('should call the ID5 server for config with submodule config object', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let id5FetchConfig = getId5FetchConfig();
+    it('should call the ID5 server for config with submodule config object', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const id5FetchConfig = getId5FetchConfig();
       id5FetchConfig.params.extraParam = {
         x: 'X',
         y: {
           a: 1,
           b: '3'
         }
-      }
-      let submoduleResponse = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
-
-      return xhrServerMock.expectConfigRequest()
-        .then(configRequest => {
-          let requestBody = JSON.parse(configRequest.requestBody)
-          expect(requestBody).is.deep.eq(id5FetchConfig)
-          return xhrServerMock.respondWithConfigAndExpectNext(configRequest)
-        })
-        .then(fetchRequest => {
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
+      };
+
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
+
+      const configRequest = await xhrServerMock.expectConfigRequest();
+      const requestBody = JSON.parse(configRequest.requestBody);
+      expect(requestBody).is.deep.eq({
+        ...id5FetchConfig,
+        bounce: true
+      });
+
+      const fetchRequest = await xhrServerMock.respondWithConfigAndExpectNext(configRequest);
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
     });
 
-    it('should call the ID5 server for config with partner id being a string', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let id5FetchConfig = getId5FetchConfig();
+    it('should call the ID5 server for config with partner id being a string', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const id5FetchConfig = getId5FetchConfig();
       id5FetchConfig.params.partner = '173';
-      let submoduleResponse = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
-
-      return xhrServerMock.expectConfigRequest()
-        .then(configRequest => {
-          let requestBody = JSON.parse(configRequest.requestBody)
-          expect(requestBody.params.partner).is.eq(173)
-          return xhrServerMock.respondWithConfigAndExpectNext(configRequest)
-        })
-        .then(fetchRequest => {
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
+
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
+
+      const configRequest = await xhrServerMock.expectConfigRequest();
+      const requestBody = JSON.parse(configRequest.requestBody);
+      expect(requestBody.params.partner).is.eq(173);
+
+      const fetchRequest = await xhrServerMock.respondWithConfigAndExpectNext(configRequest);
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
     });
 
-    it('should call the ID5 server for config with overridden url', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let id5FetchConfig = getId5FetchConfig();
-      id5FetchConfig.params.configUrl = 'http://localhost/x/y/z'
+    it('should call the ID5 server for config with overridden url', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const id5FetchConfig = getId5FetchConfig();
+      id5FetchConfig.params.configUrl = 'http://localhost/x/y/z';
 
-      let submoduleResponse = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
 
-      return xhrServerMock.expectFirstRequest()
-        .then(configRequest => {
-          expect(configRequest.url).is.eq('http://localhost/x/y/z')
-          return xhrServerMock.respondWithConfigAndExpectNext(configRequest)
-        })
-        .then(fetchRequest => {
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
-    });
-
-    it('should call the ID5 server with additional data when provided', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
-
-      return xhrServerMock.expectConfigRequest()
-        .then(configRequest => {
-          return xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
-            fetchCall: {
-              url: ID5_ENDPOINT,
-              overrides: {
-                arg1: '123',
-                arg2: {
-                  x: '1',
-                  y: 2
-                }
-              }
-            }
-          });
-        })
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
-          expect(requestBody.o).is.eq('pbjs');
-          expect(requestBody.v).is.eq('$prebid.version$');
-          expect(requestBody.arg1).is.eq('123')
-          expect(requestBody.arg2).is.deep.eq({
-            x: '1',
-            y: 2
-          })
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
-    });
-
-    it('should call the ID5 server with extensions', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
-
-      return xhrServerMock.expectConfigRequest()
-        .then(configRequest => {
-          return xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
-            fetchCall: {
-              url: ID5_ENDPOINT
-            },
-            extensionsCall: {
-              url: ID5_EXTENSIONS_ENDPOINT,
-              method: 'GET'
-            }
-          });
-        })
-        .then(extensionsRequest => {
-          expect(extensionsRequest.url).is.eq(ID5_EXTENSIONS_ENDPOINT)
-          expect(extensionsRequest.method).is.eq('GET')
-          extensionsRequest.respond(200, responseHeader, JSON.stringify({
-            lb: 'ex'
-          }))
-          return xhrServerMock.expectNextRequest();
-        })
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
-          expect(requestBody.o).is.eq('pbjs');
-          expect(requestBody.v).is.eq('$prebid.version$');
-          expect(requestBody.extensions).is.deep.eq({
-            lb: 'ex'
-          })
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
-    });
-
-    it('should call the ID5 server with extensions fetched with POST', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
-
-      return xhrServerMock.expectConfigRequest()
-        .then(configRequest => {
-          return xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
-            fetchCall: {
-              url: ID5_ENDPOINT
-            },
-            extensionsCall: {
-              url: ID5_EXTENSIONS_ENDPOINT,
-              method: 'POST',
-              body: {
-                x: '1',
-                y: 2
-              }
+      const configRequest = await xhrServerMock.expectFirstRequest();
+      expect(configRequest.url).is.eq('http://localhost/x/y/z');
+
+      const fetchRequest = await xhrServerMock.respondWithConfigAndExpectNext(configRequest);
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
+    });
+
+    it('should call the ID5 server with additional data when provided', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      const configRequest = await xhrServerMock.expectConfigRequest();
+      const fetchRequest = await xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
+        fetchCall: {
+          url: ID5_ENDPOINT,
+          overrides: {
+            arg1: '123',
+            arg2: {
+              x: '1',
+              y: 2
             }
-          });
-        })
-        .then(extensionsRequest => {
-          expect(extensionsRequest.url).is.eq(ID5_EXTENSIONS_ENDPOINT)
-          expect(extensionsRequest.method).is.eq('POST')
-          let requestBody = JSON.parse(extensionsRequest.requestBody)
-          expect(requestBody).is.deep.eq({
+          }
+        }
+      });
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+      expect(requestBody.o).is.eq('pbjs');
+      expect(requestBody.v).is.eq('$prebid.version$');
+      expect(requestBody.arg1).is.eq('123');
+      expect(requestBody.arg2).is.deep.eq({
+        x: '1',
+        y: 2
+      });
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
+    });
+
+    it('should call the ID5 server with extensions', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      const configRequest = await xhrServerMock.expectConfigRequest();
+      const extensionsRequest = await xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
+        fetchCall: {
+          url: ID5_ENDPOINT
+        },
+        extensionsCall: {
+          url: ID5_EXTENSIONS_ENDPOINT,
+          method: 'GET'
+        }
+      });
+      expect(extensionsRequest.url).is.eq(ID5_EXTENSIONS_ENDPOINT);
+      expect(extensionsRequest.method).is.eq('GET');
+
+      extensionsRequest.respond(200, responseHeader, JSON.stringify({
+        lb: 'ex'
+      }));
+      const fetchRequest = await xhrServerMock.expectNextRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+      expect(requestBody.o).is.eq('pbjs');
+      expect(requestBody.v).is.eq('$prebid.version$');
+      expect(requestBody.extensions).is.deep.eq({
+        lb: 'ex'
+      });
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
+    });
+
+    it('should call the ID5 server with extensions fetched using method POST', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      const configRequest = await xhrServerMock.expectConfigRequest();
+      const extensionsRequest = await xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
+        fetchCall: {
+          url: ID5_ENDPOINT
+        },
+        extensionsCall: {
+          url: ID5_EXTENSIONS_ENDPOINT,
+          method: 'POST',
+          body: {
             x: '1',
             y: 2
-          })
-          extensionsRequest.respond(200, responseHeader, JSON.stringify({
-            lb: 'post',
-          }))
-          return xhrServerMock.expectNextRequest();
-        })
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
-          expect(requestBody.o).is.eq('pbjs');
-          expect(requestBody.v).is.eq('$prebid.version$');
-          expect(requestBody.extensions).is.deep.eq({
-            lb: 'post'
-          })
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
+          }
+        }
+      });
+      expect(extensionsRequest.url).is.eq(ID5_EXTENSIONS_ENDPOINT);
+      expect(extensionsRequest.method).is.eq('POST');
+      const extRequestBody = JSON.parse(extensionsRequest.requestBody);
+      expect(extRequestBody).is.deep.eq({
+        x: '1',
+        y: 2
+      });
+      extensionsRequest.respond(200, responseHeader, JSON.stringify({
+        lb: 'post'
+      }));
+
+      const fetchRequest = await xhrServerMock.expectNextRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+      expect(requestBody.o).is.eq('pbjs');
+      expect(requestBody.v).is.eq('$prebid.version$');
+      expect(requestBody.extensions).is.deep.eq({
+        lb: 'post'
+      });
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
     });
 
-    it('should call the ID5 server with signature field from stored object', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+    it('should call the ID5 server with signature field from stored object', async function () {
+      const xhrServerMock = new XhrServerMock(server);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.s).is.eq(ID5_STORED_SIGNATURE);
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.s).is.eq(ID5_STORED_SIGNATURE);
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
     });
 
-    it('should call the ID5 server with pd field when pd config is set', function () {
-      let xhrServerMock = new XhrServerMock(server)
+    it('should call the ID5 server with pd field when pd config is set', async function () {
+      const xhrServerMock = new XhrServerMock(server);
       const pubData = 'b50ca08271795a8e7e4012813f23d505193d75c0f2e2bb99baa63aa822f66ed3';
 
-      let id5Config = getId5FetchConfig();
+      const id5Config = getId5FetchConfig();
       id5Config.params.pd = pubData;
 
-      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(id5Config, undefined, undefined);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.pd).is.eq(pubData);
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse;
-        })
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.pd).is.eq(pubData);
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
     });
 
-    it('should call the ID5 server with no pd field when pd config is not set', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let id5Config = getId5FetchConfig();
+    it('should call the ID5 server with no pd field when pd config is not set', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const id5Config = getId5FetchConfig();
       id5Config.params.pd = undefined;
 
-      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.pd).is.undefined;
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse;
-        })
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.pd).is.undefined;
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
     });
 
-    it('should call the ID5 server with nb=1 when no stored value exists and reset after', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
+    it('should call the ID5 server with nb=1 when no stored value exists and reset after', async function () {
+      const xhrServerMock = new XhrServerMock(server);
 
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.nbPage).is.eq(1);
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
-        .then(() => {
-          expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(0);
-        })
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.nbPage).is.eq(1);
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      const response = await submoduleResponsePromise;
+
+      expect(response.nbPage).is.undefined;
     });
 
-    it('should call the ID5 server with incremented nb when stored value exists and reset after', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
+    it('should call the ID5 server with incremented nb when stored value exists and reset after', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const TEST_PARTNER_ID = 189;
+      const config = getId5FetchConfig(TEST_PARTNER_ID);
+      const storedObj = {...ID5_STORED_OBJ, nbPage: 1};
 
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(config, undefined, storedObj);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.nbPage).is.eq(2);
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        })
-        .then(() => {
-          expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(0);
-        })
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.nbPage).is.eq(2);
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      const response = await submoduleResponsePromise;
+
+      expect(response.nbPage).is.undefined;
     });
 
-    it('should call the ID5 server with ab_testing object when abTesting is turned on', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let id5Config = getId5FetchConfig();
-      id5Config.params.abTesting = {enabled: true, controlGroupPct: 0.234}
+    it('should call the ID5 server with ab_testing object when abTesting is turned on', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const id5Config = getId5FetchConfig();
+      id5Config.params.abTesting = {enabled: true, controlGroupPct: 0.234};
 
-      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.ab_testing.enabled).is.eq(true);
-          expect(requestBody.ab_testing.control_group_pct).is.eq(0.234);
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse;
-        });
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.ab_testing.enabled).is.eq(true);
+      expect(requestBody.ab_testing.control_group_pct).is.eq(0.234);
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
     });
 
-    it('should call the ID5 server without ab_testing object when abTesting is turned off', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let id5Config = getId5FetchConfig();
-      id5Config.params.abTesting = {enabled: false, controlGroupPct: 0.55}
+    it('should call the ID5 server without ab_testing object when abTesting is turned off', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const id5Config = getId5FetchConfig();
+      id5Config.params.abTesting = {enabled: false, controlGroupPct: 0.55};
 
-      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.ab_testing).is.undefined;
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        });
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.ab_testing).is.undefined;
+
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
     });
 
-    it('should call the ID5 server without ab_testing when when abTesting is not set', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let id5Config = getId5FetchConfig();
+    it('should call the ID5 server without ab_testing when when abTesting is not set', async function () {
+      const xhrServerMock = new XhrServerMock(server);
+      const id5Config = getId5FetchConfig();
 
-      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
+      // Trigger the fetch but we await on it later
+      const submoduleResponsePromise = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      return xhrServerMock.expectFetchRequest()
-        .then(fetchRequest => {
-          let requestBody = JSON.parse(fetchRequest.requestBody);
-          expect(requestBody.ab_testing).is.undefined;
-          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-          return submoduleResponse
-        });
-    });
+      const fetchRequest = await xhrServerMock.expectFetchRequest();
+      const requestBody = JSON.parse(fetchRequest.requestBody);
+      expect(requestBody.ab_testing).is.undefined;
 
-    it('should store the privacy object from the ID5 server response', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+      fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      await submoduleResponsePromise;
+    });
 
-      const privacy = {
-        jurisdiction: 'gdpr',
-        id5_consent: true
+    describe('with successful external module call', function () {
+      const MOCK_RESPONSE = {
+        ...ID5_JSON_RESPONSE,
+        universal_uid: 'my_mock_reponse'
       };
+      let mockId5ExternalModule;
 
-      return xhrServerMock.expectFetchRequest()
-        .then(request => {
-          let responseObject = utils.deepClone(ID5_JSON_RESPONSE);
-          responseObject.privacy = privacy;
-          request.respond(200, responseHeader, JSON.stringify(responseObject));
-          return submoduleResponse
-        })
-        .then(() => {
-          expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).is.eq(JSON.stringify(privacy));
-          coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
-        })
-    });
-
-    it('should not store a privacy object if not part of ID5 server response', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
+      beforeEach(() => {
+        window.id5Prebid = {
+          integration: {
+            fetchId5Id: function () {
+            }
+          }
+        };
+        mockId5ExternalModule = sinon.stub(window.id5Prebid.integration, 'fetchId5Id')
+          .resolves(MOCK_RESPONSE);
+      });
+
+      this.afterEach(() => {
+        mockId5ExternalModule.restore();
+        delete window.id5Prebid;
+      });
+
+      it('should retrieve the response from the external module interface', async function () {
+        const xhrServerMock = new XhrServerMock(server);
+        const config = getId5FetchConfig();
+        config.params.externalModuleUrl = 'https://test-me.test';
+
+        // Trigger the fetch but we await on it later
+        const submoduleResponsePromise = callSubmoduleGetId(config, undefined, undefined);
+
+        const configRequest = await xhrServerMock.expectConfigRequest();
+        configRequest.respond(200, HEADERS_CONTENT_TYPE_JSON, JSON.stringify(ID5_API_CONFIG));
+
+        const submoduleResponse = await submoduleResponsePromise;
+        expect(submoduleResponse).to.deep.equal(MOCK_RESPONSE);
+        expect(mockId5ExternalModule.calledOnce);
+      });
+    });
+
+    describe('with failing external module loading', function () {
+      it('should fallback to regular logic if external module fails to load', async function () {
+        const xhrServerMock = new XhrServerMock(server);
+        const config = getId5FetchConfig();
+        config.params.externalModuleUrl = 'https://test-me.test'; // Fails by loading this fake URL
+
+        // Trigger the fetch but we await on it later
+        const submoduleResponsePromise = callSubmoduleGetId(config, undefined, undefined);
+
+        // Still we have a server-side request triggered as fallback
+        const fetchRequest = await xhrServerMock.expectFetchRequest();
+        fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+
+        const submoduleResponse = await submoduleResponsePromise;
+        expect(submoduleResponse).to.deep.equal(ID5_JSON_RESPONSE);
+      });
+    });
+
+    it('should pass gpp_string and gpp_sid to ID5 server', function () {
+      let xhrServerMock = new XhrServerMock(server);
+      gppStub = sinon.stub(gppDataHandler, 'getConsentData');
+      gppStub.returns({
+        ready: true,
+        gppString: 'GPP_STRING',
+        applicableSections: [2]
+      });
       let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
 
       return xhrServerMock.expectFetchRequest()
-        .then(request => {
-          let responseObject = utils.deepClone(ID5_JSON_RESPONSE);
-          responseObject.privacy = undefined;
-          request.respond(200, responseHeader, JSON.stringify(responseObject));
-          return submoduleResponse
-        })
-        .then(() => {
-          expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).is.null;
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.gpp_string).is.equal('GPP_STRING');
+          expect(requestBody.gpp_sid).contains(2);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse;
         });
     });
 
@@ -734,23 +809,55 @@ describe('ID5 ID System', function () {
       let sandbox;
       beforeEach(() => {
         sandbox = sinon.sandbox.create();
-        sandbox.stub(storage, 'getCookie');
+        sandbox.stub(id5System.storage, 'getCookie');
       });
       afterEach(() => {
         sandbox.restore();
       });
       it('should not throw if malformed JSON is forced into cookies', () => {
-        storage.getCookie.callsFake(() => ' Not JSON ');
-        id5IdSubmodule.getId(getId5FetchConfig());
+        id5System.storage.getCookie.callsFake(() => ' Not JSON ');
+        id5System.id5IdSubmodule.getId(getId5FetchConfig());
       });
-    })
+    });
+
+    it('should pass true link info to ID5 server even when true link is not booted', function () {
+      let xhrServerMock = new XhrServerMock(server);
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.true_link).is.deep.equal({booted: false});
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse;
+        });
+    });
+
+    it('should pass full true link info to ID5 server when true link is booted', function () {
+      let xhrServerMock = new XhrServerMock(server);
+      let trueLinkResponse = {booted: true, redirected: true, id: 'TRUE_LINK_ID'};
+      window.id5Bootstrap = {
+        getTrueLinkInfo: function () {
+          return trueLinkResponse;
+        }
+      };
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.true_link).is.deep.equal(trueLinkResponse);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse;
+        });
+    });
   });
 
   describe('Local storage', () => {
     let sandbox;
     beforeEach(() => {
       sandbox = sinon.sandbox.create();
-      sandbox.stub(storage, 'localStorageIsEnabled');
+      sandbox.stub(id5System.storage, 'localStorageIsEnabled');
     });
     afterEach(() => {
       sandbox.restore();
@@ -758,26 +865,23 @@ describe('ID5 ID System', function () {
     [
       [true, 1],
       [false, 0]
-    ].forEach(function ([isEnabled, expectedValue]) {
-      it(`should check localStorage availability and log in request. Available=${isEnabled}`, () => {
-        let xhrServerMock = new XhrServerMock(server)
-        let config = getId5FetchConfig();
-        let submoduleResponse = callSubmoduleGetId(config, undefined, undefined);
-        storage.localStorageIsEnabled.callsFake(() => isEnabled)
-
-        return xhrServerMock.expectFetchRequest()
-          .then(fetchRequest => {
-            let requestBody = JSON.parse(fetchRequest.requestBody);
-            expect(requestBody.localStorage).is.eq(expectedValue);
-
-            fetchRequest.respond(200, HEADERS_CONTENT_TYPE_JSON, JSON.stringify(ID5_JSON_RESPONSE));
-            return submoduleResponse
-          })
-          .then(submoduleResponse => {
-            expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
-          });
-      })
-    })
+    ].forEach(([isEnabled, expectedValue]) => {
+      it(`should check localStorage availability and log in request. Available=${isEnabled}`, async function () {
+        const xhrServerMock = new XhrServerMock(server);
+        id5System.storage.localStorageIsEnabled.callsFake(() => isEnabled);
+
+        // Trigger the fetch but we await on it later
+        const submoduleResponsePromise = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+        const fetchRequest = await xhrServerMock.expectFetchRequest();
+        const requestBody = JSON.parse(fetchRequest.requestBody);
+        expect(requestBody.localStorage).is.eq(expectedValue);
+
+        fetchRequest.respond(200, HEADERS_CONTENT_TYPE_JSON, JSON.stringify(ID5_JSON_RESPONSE));
+        const submoduleResponse = await submoduleResponsePromise;
+        expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
+      });
+    });
   });
 
   describe('Request Bids Hook', function () {
@@ -788,29 +892,27 @@ describe('ID5 ID System', function () {
       sandbox = sinon.sandbox.create();
       mockGdprConsent(sandbox);
       sinon.stub(events, 'getEvents').returns([]);
-      coreStorage.removeDataFromLocalStorage(ID5_STORAGE_NAME);
-      coreStorage.removeDataFromLocalStorage(`${ID5_STORAGE_NAME}_last`);
-      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
-      coreStorage.setDataInLocalStorage(ID5_STORAGE_NAME + '_cst', getConsentHash())
+      coreStorage.removeDataFromLocalStorage(id5System.ID5_STORAGE_NAME);
+      coreStorage.removeDataFromLocalStorage(`${id5System.ID5_STORAGE_NAME}_last`);
+      coreStorage.setDataInLocalStorage(id5System.ID5_STORAGE_NAME + '_cst', getConsentHash());
       adUnits = [getAdUnitMock()];
     });
     afterEach(function () {
       events.getEvents.restore();
-      coreStorage.removeDataFromLocalStorage(ID5_STORAGE_NAME);
-      coreStorage.removeDataFromLocalStorage(`${ID5_STORAGE_NAME}_last`);
-      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
-      coreStorage.removeDataFromLocalStorage(ID5_STORAGE_NAME + '_cst')
+      coreStorage.removeDataFromLocalStorage(id5System.ID5_STORAGE_NAME);
+      coreStorage.removeDataFromLocalStorage(`${id5System.ID5_STORAGE_NAME}_last`);
+      coreStorage.removeDataFromLocalStorage(id5System.ID5_STORAGE_NAME + '_cst');
       sandbox.restore();
     });
 
     it('should add stored ID from cache to bids', function (done) {
-      storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
+      storeInStorage(id5System.ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
 
       init(config);
-      setSubmoduleRegistry([id5IdSubmodule]);
+      setSubmoduleRegistry([id5System.id5IdSubmodule]);
       config.setConfig(getFetchLocalStorageConfig());
 
-      requestBidsHook(function () {
+      startAuctionHook(wrapAsyncExpects(done, () => {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property(`userId.${ID5_EIDS_NAME}`);
@@ -828,22 +930,31 @@ describe('ID5 ID System', function () {
           });
         });
         done();
-      }, {adUnits});
+      }), {adUnits});
     });
 
-    it('should add config value ID to bids', function (done) {
+    it('should add stored EUID from cache to bids', function (done) {
+      storeInStorage(id5System.ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ_WITH_EUID), 1);
+
       init(config);
-      setSubmoduleRegistry([id5IdSubmodule]);
-      config.setConfig(getValueConfig(ID5_STORED_ID));
+      setSubmoduleRegistry([id5System.id5IdSubmodule]);
+      config.setConfig(getFetchLocalStorageConfig());
 
-      requestBidsHook(function () {
+      startAuctionHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property(`userId.${ID5_EIDS_NAME}`);
-            expect(bid.userId.id5id.uid).is.equal(ID5_STORED_ID);
-            expect(bid.userIdAsEids[0]).is.deep.equal({
-              source: ID5_SOURCE,
-              uids: [{id: ID5_STORED_ID, atype: 1}]
+            expect(bid).to.have.deep.nested.property(`userId.euid`);
+            expect(bid.userId.euid.uid).is.equal(EUID_STORED_ID);
+            expect(bid.userIdAsEids[0].uids[0].id).is.equal(ID5_STORED_ID);
+            expect(bid.userIdAsEids[1]).is.deep.equal({
+              source: EUID_SOURCE,
+              uids: [{
+                id: EUID_STORED_ID,
+                atype: 3,
+                ext: {
+                  provider: ID5_SOURCE
+                }
+              }]
             });
           });
         });
@@ -851,72 +962,79 @@ describe('ID5 ID System', function () {
       }, {adUnits});
     });
 
-    it('should set nb=1 in cache when no stored nb value exists and cached ID', function (done) {
-      storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
-      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
+    it('should add stored TRUE_LINK_ID from cache to bids', function (done) {
+      storeInStorage(id5System.ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ_WITH_TRUE_LINK), 1);
 
       init(config);
-      setSubmoduleRegistry([id5IdSubmodule]);
+      setSubmoduleRegistry([id5System.id5IdSubmodule]);
       config.setConfig(getFetchLocalStorageConfig());
 
-      requestBidsHook((adUnitConfig) => {
-        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(1);
-        done()
-      }, {adUnits});
+      startAuctionHook(wrapAsyncExpects(done, function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property(`userId.trueLinkId`);
+            expect(bid.userId.trueLinkId.uid).is.equal(TRUE_LINK_STORED_ID);
+            expect(bid.userIdAsEids[1]).is.deep.equal({
+              source: TRUE_LINK_SOURCE,
+              uids: [{
+                id: TRUE_LINK_STORED_ID,
+                atype: 1,
+              }]
+            });
+          });
+        });
+        done();
+      }), {adUnits});
     });
 
-    it('should increment nb in cache when stored nb value exists and cached ID', function (done) {
-      storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
-      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
-
+    it('should add config value ID to bids', function (done) {
       init(config);
-      setSubmoduleRegistry([id5IdSubmodule]);
-      config.setConfig(getFetchLocalStorageConfig());
+      setSubmoduleRegistry([id5System.id5IdSubmodule]);
+      config.setConfig(getValueConfig(ID5_STORED_ID));
 
-      requestBidsHook(() => {
-        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(2);
-        done()
+      startAuctionHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property(`userId.${ID5_EIDS_NAME}`);
+            expect(bid.userId.id5id.uid).is.equal(ID5_STORED_ID);
+            expect(bid.userIdAsEids[0]).is.deep.equal({
+              source: ID5_SOURCE,
+              uids: [{id: ID5_STORED_ID, atype: 1}]
+            });
+          });
+        });
+        done();
       }, {adUnits});
     });
 
     it('should call ID5 servers with signature and incremented nb post auction if refresh needed', function () {
-      let xhrServerMock = new XhrServerMock(server)
-      let initialLocalStorageValue = JSON.stringify(ID5_STORED_OBJ);
-      storeInLocalStorage(ID5_STORAGE_NAME, initialLocalStorageValue, 1);
-      storeInLocalStorage(`${ID5_STORAGE_NAME}_last`, expDaysStr(-1), 1);
+      const xhrServerMock = new XhrServerMock(server);
+      let storedObject = ID5_STORED_OBJ;
+      storedObject.nbPage = 1;
+      const initialLocalStorageValue = JSON.stringify(storedObject);
+      storeInStorage(id5System.ID5_STORAGE_NAME, initialLocalStorageValue, 1);
+      storeInStorage(`${id5System.ID5_STORAGE_NAME}_last`, expDaysStr(-1), 1);
 
-      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
       let id5Config = getFetchLocalStorageConfig();
       id5Config.userSync.userIds[0].storage.refreshInSeconds = 2;
+      id5Config.userSync.auctionDelay = 0; // do not trigger callback before auction
       init(config);
-      setSubmoduleRegistry([id5IdSubmodule]);
+      setSubmoduleRegistry([id5System.id5IdSubmodule]);
       config.setConfig(id5Config);
-
       return new Promise((resolve) => {
-        requestBidsHook(() => {
-          resolve()
+        startAuctionHook(() => {
+          resolve();
         }, {adUnits});
       }).then(() => {
         expect(xhrServerMock.hasReceivedAnyRequest()).is.false;
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
-        return xhrServerMock.expectFetchRequest()
+        events.emit(EVENTS.AUCTION_END, {});
+        return xhrServerMock.expectFetchRequest();
       }).then(request => {
-        let requestBody = JSON.parse(request.requestBody);
+        const requestBody = JSON.parse(request.requestBody);
         expect(requestBody.s).is.eq(ID5_STORED_SIGNATURE);
         expect(requestBody.nbPage).is.eq(2);
-        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(2);
         request.respond(200, HEADERS_CONTENT_TYPE_JSON, JSON.stringify(ID5_JSON_RESPONSE));
-
-        return new Promise(function (resolve) {
-          (function waitForCondition() {
-            if (getFromLocalStorage(ID5_STORAGE_NAME) !== initialLocalStorageValue) return resolve();
-            setTimeout(waitForCondition, 30);
-          })();
-        })
-      }).then(() => {
-        expect(decodeURIComponent(getFromLocalStorage(ID5_STORAGE_NAME))).is.eq(JSON.stringify(ID5_JSON_RESPONSE));
-        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(0);
-      })
+      });
     });
   });
 
@@ -924,10 +1042,22 @@ describe('ID5 ID System', function () {
     const expectedDecodedObject = {id5id: {uid: ID5_STORED_ID, ext: {linkType: ID5_STORED_LINK_TYPE}}};
 
     it('should properly decode from a stored object', function () {
-      expect(id5IdSubmodule.decode(ID5_STORED_OBJ, getId5FetchConfig())).is.deep.equal(expectedDecodedObject);
+      expect(id5System.id5IdSubmodule.decode(ID5_STORED_OBJ, getId5FetchConfig())).is.deep.equal(expectedDecodedObject);
     });
     it('should return undefined if passed a string', function () {
-      expect(id5IdSubmodule.decode('somestring', getId5FetchConfig())).is.eq(undefined);
+      expect(id5System.id5IdSubmodule.decode('somestring', getId5FetchConfig())).is.eq(undefined);
+    });
+    it('should decode euid from a stored object with EUID', function () {
+      expect(id5System.id5IdSubmodule.decode(ID5_STORED_OBJ_WITH_EUID, getId5FetchConfig()).euid).is.deep.equal({
+        'source': EUID_SOURCE,
+        'uid': EUID_STORED_ID,
+        'ext': {'provider': ID5_SOURCE}
+      });
+    });
+    it('should decode trueLinkId from a stored object with trueLinkId', function () {
+      expect(id5System.id5IdSubmodule.decode(ID5_STORED_OBJ_WITH_TRUE_LINK, getId5FetchConfig()).trueLinkId).is.deep.equal({
+        'uid': TRUE_LINK_STORED_ID
+      });
     });
   });
 
@@ -970,13 +1100,13 @@ describe('ID5 ID System', function () {
         });
 
         it('should not set abTestingControlGroup extension when A/B testing is off', function () {
-          let decoded = id5IdSubmodule.decode(storedObject, testConfig);
+          const decoded = id5System.id5IdSubmodule.decode(storedObject, testConfig);
           expect(decoded).is.deep.equal(expectedDecodedObjectWithIdAbOff);
         });
 
         it('should set abTestingControlGroup to false when A/B testing is on but in normal group', function () {
           storedObject.ab_testing = {result: 'normal'};
-          let decoded = id5IdSubmodule.decode(storedObject, testConfig);
+          const decoded = id5System.id5IdSubmodule.decode(storedObject, testConfig);
           expect(decoded).is.deep.equal(expectedDecodedObjectWithIdAbOn);
         });
 
@@ -986,17 +1116,58 @@ describe('ID5 ID System', function () {
           storedObject.ext = {
             'linkType': 0
           };
-          let decoded = id5IdSubmodule.decode(storedObject, testConfig);
+          const decoded = id5System.id5IdSubmodule.decode(storedObject, testConfig);
           expect(decoded).is.deep.equal(expectedDecodedObjectWithoutIdAbOn);
         });
 
         it('should log A/B testing errors', function () {
           storedObject.ab_testing = {result: 'error'};
-          let decoded = id5IdSubmodule.decode(storedObject, testConfig);
+          const decoded = id5System.id5IdSubmodule.decode(storedObject, testConfig);
           expect(decoded).is.deep.equal(expectedDecodedObjectWithIdAbOff);
           sinon.assert.calledOnce(logErrorSpy);
         });
       });
     });
   });
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(id5System);
+    });
+    it('does not include an ext if not provided', function() {
+      const userId = {
+        id5id: {
+          uid: 'some-random-id-value'
+        }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'id5-sync.com',
+        uids: [{ id: 'some-random-id-value', atype: 1 }]
+      });
+    });
+
+    it('includes ext if provided', function() {
+      const userId = {
+        id5id: {
+          uid: 'some-random-id-value',
+          ext: {
+            linkType: 0
+          }
+        }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'id5-sync.com',
+        uids: [{
+          id: 'some-random-id-value',
+          atype: 1,
+          ext: {
+            linkType: 0
+          }
+        }]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/idImportLibrary_spec.js b/test/spec/modules/idImportLibrary_spec.js
index d5b3e32546d..6045eb0bda0 100644
--- a/test/spec/modules/idImportLibrary_spec.js
+++ b/test/spec/modules/idImportLibrary_spec.js
@@ -4,6 +4,10 @@ import * as idImportlibrary from 'modules/idImportLibrary.js';
 import {getGlobal} from '../../../src/prebidGlobal.js';
 import {config} from 'src/config.js';
 import {hook} from '../../../src/hook.js';
+import * as activities from '../../../src/activities/rules.js';
+import { ACTIVITY_ENRICH_UFPD } from '../../../src/activities/activities.js';
+import { CONF_DEFAULT_FULL_BODY_SCAN, CONF_DEFAULT_INPUT_SCAN } from '../../../modules/idImportLibrary.js';
+
 var expect = require('chai').expect;
 
 const mockMutationObserver = {
@@ -86,6 +90,16 @@ describe('IdImportLibrary Tests', function () {
       idImportlibrary.setConfig(config);
       expect(config.inputscan).to.be.equal(true);
     });
+    it('results when activity is not allowed', function () {
+      sandbox.stub(activities, 'isActivityAllowed').callsFake((activity) => {
+        return !(activity === ACTIVITY_ENRICH_UFPD);
+      });
+      let config = { 'url': 'URL', 'debounce': 0 };
+      idImportlibrary.setConfig(config);
+      sinon.assert.called(utils.logError);
+      expect(config.inputscan).to.be.not.equal(CONF_DEFAULT_INPUT_SCAN);
+      expect(config.fullscan).to.be.not.equal(CONF_DEFAULT_FULL_BODY_SCAN);
+    });
   });
   describe('Test with email is found', function () {
     let mutationObserverStub;
diff --git a/test/spec/modules/idWardRtdProvider_spec.js b/test/spec/modules/idWardRtdProvider_spec.js
deleted file mode 100644
index 924a3794c7b..00000000000
--- a/test/spec/modules/idWardRtdProvider_spec.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import {config} from 'src/config.js';
-import {getRealTimeData, idWardRtdSubmodule, storage} from 'modules/idWardRtdProvider.js';
-
-describe('idWardRtdProvider', function() {
-  let getDataFromLocalStorageStub;
-
-  const testReqBidsConfigObj = {
-    adUnits: [
-      {
-        bids: ['bid1', 'bid2']
-      }
-    ]
-  };
-
-  const onDone = function() { return true };
-
-  const cmoduleConfig = {
-    'name': 'idWard',
-    'params': {
-      'cohortStorageKey': 'cohort_ids'
-    }
-  }
-
-  beforeEach(function() {
-    config.resetConfig();
-    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage')
-  });
-
-  afterEach(function () {
-    getDataFromLocalStorageStub.restore();
-  });
-
-  describe('idWardRtdSubmodule', function() {
-    it('successfully instantiates', function () {
-		  expect(idWardRtdSubmodule.init()).to.equal(true);
-    });
-  });
-
-  describe('Get Real-Time Data', function() {
-    it('gets rtd from local storage', function() {
-      const rtdConfig = {
-        params: {
-          cohortStorageKey: 'cohort_ids',
-          segtax: 503
-        }
-      };
-
-      const bidConfig = {
-        ortb2Fragments: {
-          global: {}
-        }
-      };
-
-      const rtdUserObj1 = {
-        name: 'id-ward.com',
-        ext: {
-          segtax: 503
-        },
-        segment: [
-          {
-            id: 'TCZPQOWPEJG3MJOTUQUF793A'
-          },
-          {
-            id: '93SUG3H540WBJMYNT03KX8N3'
-          }
-        ]
-      };
-
-      getDataFromLocalStorageStub.withArgs('cohort_ids')
-        .returns(JSON.stringify(['TCZPQOWPEJG3MJOTUQUF793A', '93SUG3H540WBJMYNT03KX8N3']));
-
-      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
-      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
-    });
-
-    it('do not set rtd if local storage empty', function() {
-      const rtdConfig = {
-        params: {
-          cohortStorageKey: 'cohort_ids',
-          segtax: 503
-        }
-      };
-
-      const bidConfig = {};
-
-      getDataFromLocalStorageStub.withArgs('cohort_ids')
-        .returns(null);
-
-      expect(config.getConfig().ortb2).to.be.undefined;
-      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
-      expect(config.getConfig().ortb2).to.be.undefined;
-    });
-
-    it('do not set rtd if local storage has incorrect value', function() {
-      const rtdConfig = {
-        params: {
-          cohortStorageKey: 'cohort_ids',
-          segtax: 503
-        }
-      };
-
-      const bidConfig = {};
-
-      getDataFromLocalStorageStub.withArgs('cohort_ids')
-        .returns('wrong cohort ids value');
-
-      expect(config.getConfig().ortb2).to.be.undefined;
-      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
-      expect(config.getConfig().ortb2).to.be.undefined;
-    });
-
-    it('should initalise and return with config', function () {
-      expect(getRealTimeData(testReqBidsConfigObj, onDone, cmoduleConfig)).to.equal(undefined)
-    });
-  });
-});
diff --git a/test/spec/modules/identityLinkIdSystem_spec.js b/test/spec/modules/identityLinkIdSystem_spec.js
index a273f26b28b..5efe9794f92 100644
--- a/test/spec/modules/identityLinkIdSystem_spec.js
+++ b/test/spec/modules/identityLinkIdSystem_spec.js
@@ -3,6 +3,10 @@ import * as utils from 'src/utils.js';
 import {server} from 'test/mocks/xhr.js';
 import {getCoreStorageManager} from '../../../src/storageManager.js';
 import {stub} from 'sinon';
+import { gppDataHandler } from '../../../src/adapterManager.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
 
 const storage = getCoreStorageManager();
 
@@ -20,6 +24,7 @@ function setTestEnvelopeCookie () {
 
 describe('IdentityLinkId tests', function () {
   let logErrorStub;
+  let gppConsentDataStub;
 
   beforeEach(function () {
     defaultConfigParams = { params: {pid: pid} };
@@ -73,16 +78,19 @@ describe('IdentityLinkId tests', function () {
     expect(submoduleCallback).to.be.undefined;
   });
 
-  it('should call the LiveRamp envelope endpoint with IAB consent string v1', function () {
+  it('should call the LiveRamp envelope endpoint with IAB consent string v2', function () {
     let callBackSpy = sinon.spy();
     let consentData = {
       gdprApplies: true,
-      consentString: 'BOkIpDSOkIpDSADABAENCc-AAAApOAFAAMAAsAMIAcAA_g'
+      consentString: 'CO4VThZO4VTiuADABBENAzCgAP_AAEOAAAAAAwwAgAEABhAAgAgAAA.YAAAAAAAAAA',
+      vendorData: {
+        tcfPolicyVersion: 2
+      }
     };
     let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams, consentData).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
-    expect(request.url).to.be.eq('https://api.rlcdn.com/api/identity/envelope?pid=14&ct=1&cv=BOkIpDSOkIpDSADABAENCc-AAAApOAFAAMAAsAMIAcAA_g');
+    expect(request.url).to.be.eq('https://api.rlcdn.com/api/identity/envelope?pid=14&ct=4&cv=CO4VThZO4VTiuADABBENAzCgAP_AAEOAAAAAAwwAgAEABhAAgAgAAA.YAAAAAAAAAA');
     request.respond(
       200,
       responseHeader,
@@ -91,25 +99,46 @@ describe('IdentityLinkId tests', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should call the LiveRamp envelope endpoint with IAB consent string v2', function () {
+  it('should call the LiveRamp envelope endpoint with GPP consent string', function() {
+    gppConsentDataStub = sinon.stub(gppDataHandler, 'getConsentData');
+    gppConsentDataStub.returns({
+      ready: true,
+      gppString: 'DBABLA~BVVqAAAACqA.QA',
+      applicableSections: [7]
+    });
     let callBackSpy = sinon.spy();
-    let consentData = {
-      gdprApplies: true,
-      consentString: 'CO4VThZO4VTiuADABBENAzCgAP_AAEOAAAAAAwwAgAEABhAAgAgAAA.YAAAAAAAAAA',
-      vendorData: {
-        tcfPolicyVersion: 2
-      }
-    };
-    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams, consentData).callback;
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
-    expect(request.url).to.be.eq('https://api.rlcdn.com/api/identity/envelope?pid=14&ct=4&cv=CO4VThZO4VTiuADABBENAzCgAP_AAEOAAAAAAwwAgAEABhAAgAgAAA.YAAAAAAAAAA');
+    expect(request.url).to.be.eq('https://api.rlcdn.com/api/identity/envelope?pid=14&gpp=DBABLA~BVVqAAAACqA.QA&gpp_sid=7');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    gppConsentDataStub.restore();
+  });
+
+  it('should call the LiveRamp envelope endpoint without GPP consent string if consent string is not provided', function () {
+    gppConsentDataStub = sinon.stub(gppDataHandler, 'getConsentData');
+    gppConsentDataStub.returns({
+      ready: true,
+      gppString: '',
+      applicableSections: [7]
+    });
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://api.rlcdn.com/api/identity/envelope?pid=14');
     request.respond(
       200,
       responseHeader,
       JSON.stringify({})
     );
     expect(callBackSpy.calledOnce).to.be.true;
+    gppConsentDataStub.restore();
   });
 
   it('should not throw Uncaught TypeError when envelope endpoint returns empty response', function () {
@@ -212,4 +241,21 @@ describe('IdentityLinkId tests', function () {
     expect(envelopeValueFromStorage).to.be.a('string');
     expect(envelopeValueFromStorage).to.be.eq(testEnvelopeValue);
   })
+
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(identityLinkSubmodule);
+    });
+    it('identityLink', function() {
+      const userId = {
+        idl_env: 'some-random-id-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveramp.com',
+        uids: [{id: 'some-random-id-value', atype: 3}]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/idxIdSystem_spec.js b/test/spec/modules/idxIdSystem_spec.js
index 56e1c709c8b..bfe9d1b1e68 100644
--- a/test/spec/modules/idxIdSystem_spec.js
+++ b/test/spec/modules/idxIdSystem_spec.js
@@ -1,9 +1,10 @@
 import { expect } from 'chai';
 import {find} from 'src/polyfill.js';
 import { config } from 'src/config.js';
-import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
+import { init, startAuctionHook, setSubmoduleRegistry } from 'modules/userId/index.js';
 import { storage, idxIdSubmodule } from 'modules/idxIdSystem.js';
 import {mockGdprConsent} from '../../helpers/consentData.js';
+import 'src/prebid.js';
 
 const IDX_COOKIE_NAME = '_idx';
 const IDX_DUMMY_VALUE = 'idx value for testing';
@@ -100,10 +101,15 @@ describe('IDx ID System', () => {
 
     afterEach(() => {
       sandbox.restore();
+      config.resetConfig();
+    })
+
+    after(() => {
+      init(config);
     })
 
     it('when a stored IDx exists it is added to bids', (done) => {
-      requestBidsHook(() => {
+      startAuctionHook(() => {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.idx');
diff --git a/test/spec/modules/illuminBidAdapter_spec.js b/test/spec/modules/illuminBidAdapter_spec.js
new file mode 100644
index 00000000000..3cd79c7468d
--- /dev/null
+++ b/test/spec/modules/illuminBidAdapter_spec.js
@@ -0,0 +1,655 @@
+import {expect} from 'chai';
+import {
+  spec as adapter,
+  createDomain,
+  storage
+} from 'modules/illuminBidAdapter.js';
+import * as utils from 'src/utils.js';
+import {version} from 'package.json';
+import {useFakeTimers} from 'sinon';
+import {BANNER, VIDEO} from '../../../src/mediaTypes';
+import {config} from '../../../src/config';
+import {
+  hashCode,
+  extractPID,
+  extractCID,
+  extractSubDomain,
+  getStorageItem,
+  setStorageItem,
+  tryParseJSON,
+  getUniqueDealId,
+} from '../../../libraries/vidazooUtils/bidderUtils.js';
+
+export const TEST_ID_SYSTEMS = ['criteoId', 'id5id', 'idl_env', 'lipb', 'netId', 'pubcid', 'tdid', 'pubProvidedId'];
+
+const SUB_DOMAIN = 'exchange';
+
+const BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': 'div-gpt-ad-12345-0',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '59db6b3b4ffaa70004f45cdc',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1,
+    'ext': {
+      'param1': 'loremipsum',
+      'param2': 'dolorsitamet'
+    }
+  },
+  'placementCode': 'div-gpt-ad-1460505748561-0',
+  'sizes': [[300, 250], [300, 600]],
+  'bidderRequestId': '1fdb5ff1b6eaa7',
+  'bidRequestsCount': 4,
+  'bidderRequestsCount': 3,
+  'bidderWinsCount': 1,
+  'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'mediaTypes': [BANNER],
+  'ortb2Imp': {
+    'ext': {
+      'gpid': '0123456789',
+      'tid': '56e184c6-bde9-497b-b9b9-cf47a61381ee'
+    }
+  }
+};
+
+const VIDEO_BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': '63550ad1ff6642d368cba59dh5884270560',
+  'bidderRequestId': '12a8ae9ada9c13',
+  'bidRequestsCount': 4,
+  'bidderRequestsCount': 3,
+  'bidderWinsCount': 1,
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '635509f7ff6642d368cb9837',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1
+  },
+  'sizes': [[545, 307]],
+  'mediaTypes': {
+    'video': {
+      'playerSize': [[545, 307]],
+      'context': 'instream',
+      'mimes': [
+        'video/mp4',
+        'application/javascript'
+      ],
+      'protocols': [2, 3, 5, 6],
+      'maxduration': 60,
+      'minduration': 0,
+      'startdelay': 0,
+      'linearity': 1,
+      'api': [2],
+      'placement': 1
+    }
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': '0123456789',
+      'tid': '56e184c6-bde9-497b-b9b9-cf47a61381ee'
+    }
+  }
+}
+
+const BIDDER_REQUEST = {
+  'gdprConsent': {
+    'consentString': 'consent_string',
+    'gdprApplies': true
+  },
+  'gppString': 'gpp_string',
+  'gppSid': [7],
+  'uspConsent': 'consent_string',
+  'refererInfo': {
+    'page': 'https://www.greatsite.com',
+    'ref': 'https://www.somereferrer.com'
+  },
+  'ortb2': {
+    'site': {
+      'content': {
+        'language': 'en'
+      }
+    },
+    'regs': {
+      'gpp': 'gpp_string',
+      'gpp_sid': [7],
+      'coppa': 0
+    },
+    'device': {
+      'sua': {
+        'source': 2,
+        'platform': {
+          'brand': 'Android',
+          'version': ['8', '0', '0']
+        },
+        'browsers': [
+          {'brand': 'Not_A Brand', 'version': ['99', '0', '0', '0']},
+          {'brand': 'Google Chrome', 'version': ['109', '0', '5414', '119']},
+          {'brand': 'Chromium', 'version': ['109', '0', '5414', '119']}
+        ],
+        'mobile': 1,
+        'model': 'SM-G955U',
+        'bitness': '64',
+        'architecture': ''
+      }
+    }
+  }
+};
+
+const SERVER_RESPONSE = {
+  body: {
+    cid: 'testcid123',
+    results: [{
+      'ad': '',
+      'price': 0.8,
+      'creativeId': '12610997325162499419',
+      'exp': 30,
+      'width': 300,
+      'height': 250,
+      'advertiserDomains': ['securepubads.g.doubleclick.net'],
+      'cookies': [{
+        'src': 'https://sync.com',
+        'type': 'iframe'
+      }, {
+        'src': 'https://sync.com',
+        'type': 'img'
+      }]
+    }]
+  }
+};
+
+const VIDEO_SERVER_RESPONSE = {
+  body: {
+    'cid': '635509f7ff6642d368cb9837',
+    'results': [{
+      'ad': '',
+      'advertiserDomains': ['illumin.com'],
+      'exp': 60,
+      'width': 545,
+      'height': 307,
+      'mediaType': 'video',
+      'creativeId': '12610997325162499419',
+      'price': 2,
+      'cookies': []
+    }]
+  }
+};
+
+const REQUEST = {
+  data: {
+    width: 300,
+    height: 250,
+    bidId: '2d52001cabd527'
+  }
+};
+
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = utils.parseUrl(window.top.document.URL, {decodeSearchAsString: true});
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
+
+describe('IlluminBidAdapter', function () {
+  describe('validtae spec', function () {
+    it('exists and is a function', function () {
+      expect(adapter.isBidRequestValid).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.buildRequests).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.interpretResponse).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.getUserSyncs).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a string', function () {
+      expect(adapter.code).to.exist.and.to.be.a('string');
+    });
+
+    it('exists and contains media types', function () {
+      expect(adapter.supportedMediaTypes).to.exist.and.to.be.an('array').with.length(2);
+      expect(adapter.supportedMediaTypes).to.contain.members([BANNER, VIDEO]);
+    });
+  });
+
+  describe('validate bid requests', function () {
+    it('should require cId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should require pId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should validate correctly', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid',
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.true;
+    });
+  });
+
+  describe('build requests', function () {
+    let sandbox;
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        illumin: {
+          storageAllowed: true
+        }
+      };
+      sandbox = sinon.sandbox.create();
+      sandbox.stub(Date, 'now').returns(1000);
+    });
+
+    it('should build video request', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      config.setConfig({
+        bidderTimeout: 3000,
+        enableTIDs: true
+      });
+      const requests = adapter.buildRequests([VIDEO_BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/635509f7ff6642d368cb9837`,
+        data: {
+          adUnitCode: '63550ad1ff6642d368cba59dh5884270560',
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          bidderVersion: adapter.version,
+          bidderRequestId: '12a8ae9ada9c13',
+          cb: 1000,
+          gdpr: 1,
+          gdprConsent: 'consent_string',
+          usPrivacy: 'consent_string',
+          gppString: 'gpp_string',
+          gppSid: [7],
+          transactionId: '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+          prebidVersion: version,
+          bidRequestsCount: 4,
+          bidderRequestsCount: 3,
+          bidderWinsCount: 1,
+          bidderTimeout: 3000,
+          publisherId: '59ac17c192832d0011283fe3',
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          schain: VIDEO_BID.schain,
+          sizes: ['545x307'],
+          sua: {
+            'source': 2,
+            'platform': {
+              'brand': 'Android',
+              'version': ['8', '0', '0']
+            },
+            'browsers': [
+              {'brand': 'Not_A Brand', 'version': ['99', '0', '0', '0']},
+              {'brand': 'Google Chrome', 'version': ['109', '0', '5414', '119']},
+              {'brand': 'Chromium', 'version': ['109', '0', '5414', '119']}
+            ],
+            'mobile': 1,
+            'model': 'SM-G955U',
+            'bitness': '64',
+            'architecture': ''
+          },
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          uqs: getTopWindowQueryParams(),
+          mediaTypes: {
+            video: {
+              api: [2],
+              context: 'instream',
+              linearity: 1,
+              maxduration: 60,
+              mimes: [
+                'video/mp4',
+                'application/javascript'
+              ],
+              minduration: 0,
+              placement: 1,
+              playerSize: [[545, 307]],
+              protocols: [2, 3, 5, 6],
+              startdelay: 0
+            }
+          },
+          gpid: '0123456789',
+          cat: [],
+          contentData: [],
+          contentLang: 'en',
+          isStorageAllowed: true,
+          pagecat: [],
+          userData: [],
+          coppa: 0
+        }
+      });
+    });
+
+    it('should build banner request for each size', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      config.setConfig({
+        bidderTimeout: 3000,
+        enableTIDs: true
+      });
+      const requests = adapter.buildRequests([BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/59db6b3b4ffaa70004f45cdc`,
+        data: {
+          gdprConsent: 'consent_string',
+          gdpr: 1,
+          gppString: 'gpp_string',
+          gppSid: [7],
+          usPrivacy: 'consent_string',
+          bidRequestsCount: 4,
+          bidderRequestsCount: 3,
+          bidderWinsCount: 1,
+          bidderTimeout: 3000,
+          bidderRequestId: '1fdb5ff1b6eaa7',
+          transactionId: '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+          sizes: ['300x250', '300x600'],
+          sua: {
+            'source': 2,
+            'platform': {
+              'brand': 'Android',
+              'version': ['8', '0', '0']
+            },
+            'browsers': [
+              {'brand': 'Not_A Brand', 'version': ['99', '0', '0', '0']},
+              {'brand': 'Google Chrome', 'version': ['109', '0', '5414', '119']},
+              {'brand': 'Chromium', 'version': ['109', '0', '5414', '119']}
+            ],
+            'mobile': 1,
+            'model': 'SM-G955U',
+            'bitness': '64',
+            'architecture': ''
+          },
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          cb: 1000,
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          adUnitCode: 'div-gpt-ad-12345-0',
+          publisherId: '59ac17c192832d0011283fe3',
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          bidderVersion: adapter.version,
+          prebidVersion: version,
+          schain: BID.schain,
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          mediaTypes: [BANNER],
+          gpid: '0123456789',
+          uqs: getTopWindowQueryParams(),
+          'ext.param1': 'loremipsum',
+          'ext.param2': 'dolorsitamet',
+          cat: [],
+          contentData: [],
+          contentLang: 'en',
+          isStorageAllowed: true,
+          pagecat: [],
+          userData: [],
+          coppa: 0
+        }
+      });
+    });
+
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+      sandbox.restore();
+    });
+  });
+  describe('getUserSyncs', function () {
+    it('should have valid user sync with iframeEnabled', function () {
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.illumin.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with cid on response', function () {
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.illumin.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with pixelEnabled', function () {
+      const result = adapter.getUserSyncs({pixelEnabled: true}, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        'url': 'https://sync.illumin.com/api/sync/image/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy=',
+        'type': 'image'
+      }]);
+    })
+  });
+
+  describe('interpret response', function () {
+    it('should return empty array when there is no response', function () {
+      const responses = adapter.interpretResponse(null);
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no ad', function () {
+      const responses = adapter.interpretResponse({price: 1, ad: ''});
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no price', function () {
+      const responses = adapter.interpretResponse({price: null, ad: 'great ad'});
+      expect(responses).to.be.empty;
+    });
+
+    it('should return an array of interpreted banner responses', function () {
+      const responses = adapter.interpretResponse(SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 0.8,
+        width: 300,
+        height: 250,
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 30,
+        ad: '',
+        meta: {
+          advertiserDomains: ['securepubads.g.doubleclick.net']
+        }
+      });
+    });
+
+    it('should get meta from response metaData', function () {
+      const serverResponse = utils.deepClone(SERVER_RESPONSE);
+      serverResponse.body.results[0].metaData = {
+        advertiserDomains: ['illumin.com'],
+        agencyName: 'Agency Name',
+      };
+      const responses = adapter.interpretResponse(serverResponse, REQUEST);
+      expect(responses[0].meta).to.deep.equal({
+        advertiserDomains: ['illumin.com'],
+        agencyName: 'Agency Name'
+      });
+    });
+
+    it('should return an array of interpreted video responses', function () {
+      const responses = adapter.interpretResponse(VIDEO_SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 2,
+        width: 545,
+        height: 307,
+        mediaType: 'video',
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 60,
+        vastXml: '',
+        meta: {
+          advertiserDomains: ['illumin.com']
+        }
+      });
+    });
+
+    it('should take default TTL', function () {
+      const serverResponse = utils.deepClone(SERVER_RESPONSE);
+      delete serverResponse.body.results[0].exp;
+      const responses = adapter.interpretResponse(serverResponse, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0].ttl).to.equal(300);
+    });
+  });
+
+  describe('user id system', function () {
+    TEST_ID_SYSTEMS.forEach((idSystemProvider) => {
+      const id = Date.now().toString();
+      const bid = utils.deepClone(BID);
+
+      const userId = (function () {
+        switch (idSystemProvider) {
+          case 'lipb':
+            return {lipbid: id};
+          case 'id5id':
+            return {uid: id};
+          default:
+            return id;
+        }
+      })();
+
+      bid.userId = {
+        [idSystemProvider]: userId
+      };
+
+      it(`should include 'uid.${idSystemProvider}' in request params`, function () {
+        const requests = adapter.buildRequests([bid], BIDDER_REQUEST);
+        expect(requests[0].data[`uid.${idSystemProvider}`]).to.equal(id);
+      });
+    });
+  });
+
+  describe('alternate param names extractors', function () {
+    it('should return undefined when param not supported', function () {
+      const cid = extractCID({'c_id': '1'});
+      const pid = extractPID({'p_id': '1'});
+      const subDomain = extractSubDomain({'sub_domain': 'prebid'});
+      expect(cid).to.be.undefined;
+      expect(pid).to.be.undefined;
+      expect(subDomain).to.be.undefined;
+    });
+
+    it('should return value when param supported', function () {
+      const cid = extractCID({'cId': '1'});
+      const pid = extractPID({'pId': '2'});
+      const subDomain = extractSubDomain({'subDomain': 'prebid'});
+      expect(cid).to.be.equal('1');
+      expect(pid).to.be.equal('2');
+      expect(subDomain).to.be.equal('prebid');
+    });
+  });
+
+  describe('unique deal id', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        illumin: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    const key = 'myKey';
+    let uniqueDealId;
+    beforeEach(() => {
+      uniqueDealId = getUniqueDealId(storage, key, 0);
+    })
+
+    it('should get current unique deal id', function (done) {
+      // waiting some time so `now` will become past
+      setTimeout(() => {
+        const current = getUniqueDealId(storage, key);
+        expect(current).to.be.equal(uniqueDealId);
+        done();
+      }, 200);
+    });
+
+    it('should get new unique deal id on expiration', function (done) {
+      setTimeout(() => {
+        const current = getUniqueDealId(storage, key, 100);
+        expect(current).to.not.be.equal(uniqueDealId);
+        done();
+      }, 200)
+    });
+  });
+
+  describe('storage utils', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        illumin: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    it('should get value from storage with create param', function () {
+      const now = Date.now();
+      const clock = useFakeTimers({
+        shouldAdvanceTime: true,
+        now
+      });
+      setStorageItem(storage, 'myKey', 2020);
+      const {value, created} = getStorageItem(storage, 'myKey');
+      expect(created).to.be.equal(now);
+      expect(value).to.be.equal(2020);
+      expect(typeof value).to.be.equal('number');
+      expect(typeof created).to.be.equal('number');
+      clock.restore();
+    });
+
+    it('should get external stored value', function () {
+      const value = 'superman'
+      window.localStorage.setItem('myExternalKey', value);
+      const item = getStorageItem(storage, 'myExternalKey');
+      expect(item).to.be.equal(value);
+    });
+
+    it('should parse JSON value', function () {
+      const data = JSON.stringify({event: 'send'});
+      const {event} = tryParseJSON(data);
+      expect(event).to.be.equal('send');
+    });
+
+    it('should get original value on parse fail', function () {
+      const value = 21;
+      const parsed = tryParseJSON(value);
+      expect(typeof parsed).to.be.equal('number');
+      expect(parsed).to.be.equal(value);
+    });
+  });
+});
diff --git a/test/spec/modules/imdsBidAdapter_spec.js b/test/spec/modules/imdsBidAdapter_spec.js
index 7d808a2528f..2911ee588c0 100644
--- a/test/spec/modules/imdsBidAdapter_spec.js
+++ b/test/spec/modules/imdsBidAdapter_spec.js
@@ -585,7 +585,7 @@ describe('imdsBidAdapter ', function () {
             maxduration: 45,
             startdelay: 1,
             linearity: 1,
-            placement: 1,
+            plcmt: 1,
             mimes: ['video/mp4'],
             protocols: [1],
             api: 1
@@ -622,7 +622,7 @@ describe('imdsBidAdapter ', function () {
             maxduration: 45,
             startdelay: 1,
             linearity: 1,
-            placement: 1,
+            plcmt: 1,
             mimes: ['video/mp4'],
             protocols: [1],
             api: 1
@@ -651,7 +651,7 @@ describe('imdsBidAdapter ', function () {
             playerSize: [[640, 480]],
             startdelay: 1,
             linearity: 1,
-            placement: 1,
+            plcmt: 1,
             mimes: ['video/mp4']
           }
         },
@@ -680,7 +680,7 @@ describe('imdsBidAdapter ', function () {
             maxduration: 45,
             startdelay: 1,
             linearity: 1,
-            placement: 1,
+            plcmt: 1,
             mimes: ['video/mp4'],
             protocols: [1],
             api: 1
@@ -703,7 +703,7 @@ describe('imdsBidAdapter ', function () {
             playerSize: [[ 640, 480 ]],
             startdelay: 1,
             linearity: 1,
-            placement: 1,
+            plcmt: 1,
             mimes: ['video/mp4']
           }
         },
@@ -726,7 +726,7 @@ describe('imdsBidAdapter ', function () {
             w: 640,
             startdelay: 1,
             linearity: 1,
-            placement: 1,
+            plcmt: 1,
             mimes: ['video/mp4']
           },
           id: 'v2624fabbb078e8-640x480',
@@ -1362,17 +1362,17 @@ describe('imdsBidAdapter ', function () {
       expect(usersyncs[0].url).to.contain('https://ad-cdn.technoratimedia.com/html/usersync.html');
     });
 
-    it('should return a pixel usersync when pixels is enabled', function () {
+    it('should return an image usersync when pixels are enabled', function () {
       let usersyncs = spec.getUserSyncs({
         pixelEnabled: true
       }, null);
       expect(usersyncs).to.be.an('array').with.lengthOf(1);
-      expect(usersyncs[0]).to.have.property('type', 'pixel');
+      expect(usersyncs[0]).to.have.property('type', 'image');
       expect(usersyncs[0]).to.have.property('url');
       expect(usersyncs[0].url).to.contain('https://sync.technoratimedia.com/services');
     });
 
-    it('should return an iframe usersync when both iframe and pixels is enabled', function () {
+    it('should return an iframe usersync when both iframe and pixel are enabled', function () {
       let usersyncs = spec.getUserSyncs({
         iframeEnabled: true,
         pixelEnabled: true
diff --git a/test/spec/modules/impactifyBidAdapter_spec.js b/test/spec/modules/impactifyBidAdapter_spec.js
index 215972ff450..d9bf4becb22 100644
--- a/test/spec/modules/impactifyBidAdapter_spec.js
+++ b/test/spec/modules/impactifyBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
-import { spec } from 'modules/impactifyBidAdapter.js';
+import { spec, STORAGE, STORAGE_KEY } from 'modules/impactifyBidAdapter.js';
 import * as utils from 'src/utils.js';
+import sinon from 'sinon';
 
 const BIDDER_CODE = 'impactify';
 const BIDDER_ALIAS = ['imp'];
@@ -19,89 +20,202 @@ var gdprData = {
 };
 
 describe('ImpactifyAdapter', function () {
+  let getLocalStorageStub;
+  let localStorageIsEnabledStub;
+  let sandbox;
+
+  beforeEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      impactify: {
+        storageAllowed: true
+      }
+    };
+    sinon.stub(document.body, 'appendChild');
+    sandbox = sinon.sandbox.create();
+    getLocalStorageStub = sandbox.stub(STORAGE, 'getDataFromLocalStorage');
+    localStorageIsEnabledStub = sandbox.stub(STORAGE, 'localStorageIsEnabled');
+  });
+
+  afterEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {};
+    document.body.appendChild.restore();
+    sandbox.restore();
+  });
+
   describe('isBidRequestValid', function () {
-    let validBid = {
-      bidder: 'impactify',
-      params: {
-        appId: '1',
-        format: 'screen',
-        style: 'inline'
+    let validBids = [
+      {
+        bidder: 'impactify',
+        params: {
+          appId: 'example.com',
+          format: 'screen',
+          style: 'inline'
+        }
+      },
+      {
+        bidder: 'impactify',
+        params: {
+          appId: 'example.com',
+          format: 'display',
+          style: 'static'
+        }
+      }
+    ];
+
+    let videoBidRequests = [
+      {
+        bidder: 'impactify',
+        params: {
+          appId: '1',
+          format: 'screen',
+          style: 'inline'
+        },
+        mediaTypes: {
+          video: {
+            context: 'instream'
+          }
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[DEFAULT_VIDEO_WIDTH, DEFAULT_VIDEO_HEIGHT]],
+        bidId: '123456789',
+        bidderRequestId: '987654321',
+        auctionId: '19ab94a9-b0d7-4ed7-9f80-ad0c033cf1b1',
+        transactionId: 'f7b2c372-7a7b-11eb-9439-0242ac130002',
+        userId: {
+          pubcid: '87a0327b-851c-4bb3-a925-0c7be94548f5'
+        },
+        userIdAsEids: [
+          {
+            source: 'pubcid.org',
+            uids: [
+              {
+                id: '87a0327b-851c-4bb3-a925-0c7be94548f5',
+                atype: 1
+              }
+            ]
+          }
+        ]
+      }
+    ];
+    let videoBidderRequest = {
+      bidderRequestId: '98845765110',
+      auctionId: '165410516454',
+      bidderCode: 'impactify',
+      bids: [
+        {
+          ...videoBidRequests[0]
+        }
+      ],
+      refererInfo: {
+        referer: 'https://impactify.io'
       }
     };
 
     it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+      expect(spec.isBidRequestValid(validBids[0])).to.equal(true);
+      expect(spec.isBidRequestValid(validBids[1])).to.equal(true);
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, validBid);
+      let bid = Object.assign({}, validBids[0]);
       delete bid.params;
       bid.params = {};
       expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      let bid2 = Object.assign({}, validBids[1]);
+      delete bid2.params;
+      bid2.params = {};
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
     });
 
     it('should return false when appId is missing', () => {
-      const bid = utils.deepClone(validBid);
+      const bid = utils.deepClone(validBids[0]);
       delete bid.params.appId;
-
       expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      const bid2 = utils.deepClone(validBids[1]);
+      delete bid2.params.appId;
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
     });
 
     it('should return false when appId is not a string', () => {
-      const bid = utils.deepClone(validBid);
+      const bid = utils.deepClone(validBids[0]);
+      const bid2 = utils.deepClone(validBids[1]);
 
       bid.params.appId = 123;
+      bid2.params.appId = 123;
       expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
 
       bid.params.appId = false;
+      bid2.params.appId = false;
       expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
 
       bid.params.appId = void (0);
+      bid2.params.appId = void (0);
       expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
 
       bid.params.appId = {};
+      bid2.params.appId = {};
       expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
     });
 
     it('should return false when format is missing', () => {
-      const bid = utils.deepClone(validBid);
+      const bid = utils.deepClone(validBids[0]);
       delete bid.params.format;
 
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
     it('should return false when format is not a string', () => {
-      const bid = utils.deepClone(validBid);
+      const bid = utils.deepClone(validBids[0]);
+      const bid2 = utils.deepClone(validBids[1]);
 
       bid.params.format = 123;
+      bid2.params.format = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
       expect(spec.isBidRequestValid(bid)).to.equal(false);
 
       bid.params.format = false;
+      bid2.params.format = false;
       expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
 
       bid.params.format = void (0);
+      bid2.params.format = void (0);
       expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
 
       bid.params.format = {};
+      bid2.params.format = {};
       expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
     });
 
     it('should return false when format is not equals to screen or display', () => {
-      const bid = utils.deepClone(validBid);
+      const bid = utils.deepClone(validBids[0]);
       if (bid.params.format != 'screen' && bid.params.format != 'display') {
         expect(spec.isBidRequestValid(bid)).to.equal(false);
       }
+
+      const bid2 = utils.deepClone(validBids[1]);
+      if (bid2.params.format != 'screen' && bid2.params.format != 'display') {
+        expect(spec.isBidRequestValid(bid2)).to.equal(false);
+      }
     });
 
     it('should return false when style is missing', () => {
-      const bid = utils.deepClone(validBid);
+      const bid = utils.deepClone(validBids[0]);
       delete bid.params.style;
 
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
     it('should return false when style is not a string', () => {
-      const bid = utils.deepClone(validBid);
+      const bid = utils.deepClone(validBids[0]);
 
       bid.params.style = 123;
       expect(spec.isBidRequestValid(bid)).to.equal(false);
@@ -167,22 +281,44 @@ describe('ImpactifyAdapter', function () {
     };
 
     it('should pass bidfloor', function () {
-      videoBidRequests[0].getFloor = function() {
+      videoBidRequests[0].getFloor = function () {
         return {
           currency: 'USD',
           floor: 1.23,
         }
       }
 
-      const res = spec.buildRequests(videoBidRequests, videoBidderRequest)
+      const res = spec.buildRequests(videoBidRequests, videoBidderRequest);
       const resData = JSON.parse(res.data)
       expect(resData.imp[0].bidfloor).to.equal(1.23)
     });
 
     it('sends video bid request to ENDPOINT via POST', function () {
+      localStorageIsEnabledStub.returns(true);
+
+      getLocalStorageStub.returns('testValue');
+
       const request = spec.buildRequests(videoBidRequests, videoBidderRequest);
+
       expect(request.url).to.equal(ORIGIN + AUCTIONURI);
       expect(request.method).to.equal('POST');
+      expect(request.options.customHeaders['x-impact']).to.equal('testValue');
+    });
+
+    it('should set header value from localstorage correctly', function () {
+      localStorageIsEnabledStub.returns(true);
+      getLocalStorageStub.returns('testValue');
+
+      const request = spec.buildRequests(videoBidRequests, videoBidderRequest);
+      expect(request.options.customHeaders).to.be.an('object');
+      expect(request.options.customHeaders['x-impact']).to.equal('testValue');
+    });
+
+    it('should set header value to empty if localstorage is not enabled', function () {
+      localStorageIsEnabledStub.returns(false);
+
+      const request = spec.buildRequests(videoBidRequests, videoBidderRequest);
+      expect(request.options.customHeaders).to.be.undefined;
     });
   });
   describe('interpretResponse', function () {
@@ -205,7 +341,7 @@ describe('ImpactifyAdapter', function () {
                 h: 1,
                 hash: 'test',
                 expiry: 166192938,
-                meta: {'advertiserDomains': ['testdomain.com']},
+                meta: { 'advertiserDomains': ['testdomain.com'] },
                 ext: {
                   prebid: {
                     'type': 'video'
@@ -281,7 +417,7 @@ describe('ImpactifyAdapter', function () {
           height: 1,
           hash: 'test',
           expiry: 166192938,
-          meta: {'advertiserDomains': ['testdomain.com']},
+          meta: { 'advertiserDomains': ['testdomain.com'] },
           ttl: 300,
           creativeId: '97517771'
         }
@@ -343,7 +479,7 @@ describe('ImpactifyAdapter', function () {
               h: 1,
               hash: 'test',
               expiry: 166192938,
-              meta: {'advertiserDomains': ['testdomain.com']},
+              meta: { 'advertiserDomains': ['testdomain.com'] },
               ext: {
                 prebid: {
                   'type': 'video'
@@ -399,8 +535,8 @@ describe('ImpactifyAdapter', function () {
       const result = spec.getUserSyncs('bad', [], gdprData);
       expect(result).to.be.empty;
     });
-    it('should append the various values if they exist', function() {
-      const result = spec.getUserSyncs({iframeEnabled: true}, validResponse, gdprData);
+    it('should append the various values if they exist', function () {
+      const result = spec.getUserSyncs({ iframeEnabled: true }, validResponse, gdprData);
       expect(result[0].url).to.include('gdpr=1');
       expect(result[0].url).to.include('gdpr_consent=BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA');
     });
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index f427f9e7624..46e07bacbe4 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -10,12 +10,13 @@ import 'modules/currency.js';
 import 'modules/userId/index.js';
 import 'modules/multibid/index.js';
 import 'modules/priceFloors.js';
-import 'modules/consentManagement.js';
+import 'modules/consentManagementTcf.js';
 import 'modules/consentManagementUsp.js';
 import 'modules/schain.js';
 import {decorateAdUnitsWithNativeParams} from '../../../src/native.js';
 import {syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
 import {hook} from '../../../src/hook.js';
+import * as prebidGlobal from 'src/prebidGlobal.js';
 
 describe('Improve Digital Adapter Tests', function () {
   const METHOD = 'POST';
@@ -32,6 +33,7 @@ describe('Improve Digital Adapter Tests', function () {
   const simpleBidRequest = {
     bidder: 'improvedigital',
     params: {
+      publisherId: 1234,
       placementId: 1053688
     },
     adUnitCode: 'div-gpt-ad-1499748733608-0',
@@ -59,6 +61,7 @@ describe('Improve Digital Adapter Tests', function () {
   const instreamBidRequest = {
     bidder: 'improvedigital',
     params: {
+      publisherId: 1234,
       placementId: 123456
     },
     adUnitCode: 'video1',
@@ -107,17 +110,6 @@ describe('Improve Digital Adapter Tests', function () {
     }
   };
 
-  const simpleSmartTagBidRequest = {
-    mediaTypes: {},
-    bidder: 'improvedigital',
-    bidId: '1a2b3c',
-    placementCode: 'placement1',
-    params: {
-      publisherId: 1032,
-      placementKey: 'data_team_test_hb_smoke_test'
-    }
-  };
-
   const bidderRequest = {
     ortb2: {
       source: {
@@ -174,6 +166,10 @@ describe('Improve Digital Adapter Tests', function () {
     return bidRequests;
   }
 
+  function formatPublisherUrl(baseUrl, publisherId) {
+    return `${baseUrl}/${publisherId}/${PB_ENDPOINT}`;
+  }
+
   before(() => {
     hook.ready();
   });
@@ -188,12 +184,7 @@ describe('Improve Digital Adapter Tests', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
-    it('should return false when both placementId and placementKey + publisherId are missing', function () {
-      const bid = { 'params': {} };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when only one of placementKey and publisherId is present', function () {
+    it('should return false when only one of placementId or publisherId is present', function () {
       let bid = {
         params: {
           publisherId: 1234
@@ -202,38 +193,38 @@ describe('Improve Digital Adapter Tests', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(false);
       bid = {
         params: {
-          placementKey: 'xyz'
+          placementId: 1234
         }
       };
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
-    it('should return true when placementId is passed', function () {
+    it('should return true when both placementId and publisherId are passed', function () {
       expect(spec.isBidRequestValid(simpleBidRequest)).to.equal(true);
     });
-
-    it('should return true when both placementKey and publisherId are passed', function () {
-      expect(spec.isBidRequestValid(simpleSmartTagBidRequest)).to.equal(true);
-    });
   });
 
   describe('buildRequests', function () {
     let getConfigStub = null;
+    let getGlobalStub = null;
 
     afterEach(function () {
       if (getConfigStub) {
         getConfigStub.restore();
         getConfigStub = null;
       }
+
+      if (getGlobalStub) {
+        getGlobalStub.restore();
+        getGlobalStub = null;
+      }
     });
 
     it('should make a well-formed request objects', function () {
-      getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
       const request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequest))[0];
       expect(request).to.be.an('object');
       expect(request.method).to.equal(METHOD);
-      expect(request.url).to.equal(AD_SERVER_URL);
+      expect(request.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1234));
 
       const payload = JSON.parse(request.data);
       expect(payload).to.be.an('object');
@@ -247,7 +238,7 @@ describe('Improve Digital Adapter Tests', function () {
       sinon.assert.match(payload.imp, [
         sinon.match({
           id: '33e9500b21129f',
-          secure: 0,
+          secure: 1,
           ext: {
             bidder: {
               placementId: 1053688,
@@ -264,19 +255,17 @@ describe('Improve Digital Adapter Tests', function () {
     });
 
     it('should make a well-formed request object for multi-format ad unit', function () {
-      getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
       const request = spec.buildRequests(updateNativeParams([multiFormatBidRequest]), multiFormatBidderRequest)[0];
       expect(request).to.be.an('object');
       expect(request.method).to.equal(METHOD);
-      expect(request.url).to.equal(AD_SERVER_URL);
+      expect(request.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1234));
 
       const payload = JSON.parse(request.data);
       expect(payload).to.be.an('object');
       sinon.assert.match(payload.imp, [
         sinon.match({
           id: '33e9500b21129f',
-          secure: 0,
+          secure: 1,
           ext: {
             bidder: {
               placementId: 1053688,
@@ -284,7 +273,6 @@ describe('Improve Digital Adapter Tests', function () {
           },
           ...(FEATURES.VIDEO && {
             video: {
-              placement: OUTSTREAM_TYPE,
               w: 640,
               h: 480,
               mimes: ['video/mp4'],
@@ -345,12 +333,6 @@ describe('Improve Digital Adapter Tests', function () {
       });
     }
 
-    it('should set placementKey and publisherId for smart tags', function () {
-      const payload = JSON.parse(spec.buildRequests([simpleSmartTagBidRequest], bidderRequest)[0].data);
-      expect(payload.imp[0].ext.bidder.publisherId).to.equal(1032);
-      expect(payload.imp[0].ext.bidder.placementKey).to.equal('data_team_test_hb_smoke_test');
-    });
-
     it('should add keyValues', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
       const keyValues = {
@@ -374,10 +356,21 @@ describe('Improve Digital Adapter Tests', function () {
       }
     });
 
-    it('should add bid floor', function () {
-      const bidRequest = Object.assign({}, simpleBidRequest);
-      let payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+    it('should add bid floor correctly', function () {
+      getGlobalStub = sinon.stub(prebidGlobal, 'getGlobal').returns({
+        convertCurrency: (cpm, from, to) => {
+          const conversionKeys = { 'EUR-USD': 1.75 };
+          const conversionRate = conversionKeys[`${from}-${to}`];
+          if (!conversionRate) {
+            throw new Error(`No conversion rate found for ${from}-${to}`);
+          }
+          return cpm * conversionRate;
+        }
+      });
+      const bidRequest = deepClone(simpleBidRequest);
+
       // Floor price currency shouldn't be populated without a floor price
+      let payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
       expect(payload.imp[0].bidfloorcur).to.not.exist;
 
       // Default floor price currency
@@ -386,18 +379,25 @@ describe('Improve Digital Adapter Tests', function () {
       expect(payload.imp[0].bidfloor).to.equal(0.05);
       expect(payload.imp[0].bidfloorcur).to.equal('USD');
 
-      // Floor price currency
-      bidRequest.params.bidFloorCur = 'eUR';
+      // Floor price sent as is when currency cannot be converted to default bid adapter currency
+      bidRequest.params.bidFloorCur = 'UAH';
+      bidRequest.params.bidFloor = 0.05;
       payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
       expect(payload.imp[0].bidfloor).to.equal(0.05);
-      expect(payload.imp[0].bidfloorcur).to.equal('EUR');
+      expect(payload.imp[0].bidfloorcur).to.equal('UAH');
+
+      // Floor price currency converted to default bid adapter currency
+      bidRequest.params.bidFloorCur = 'eUR';
+      payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+      expect(payload.imp[0].bidfloor).to.equal(0.08750000000000001);
+      expect(payload.imp[0].bidfloorcur).to.equal('USD');
 
       // getFloor defined -> use it over bidFloor
       let getFloorResponse = { currency: 'USD', floor: 3 };
       bidRequest.getFloor = () => getFloorResponse;
       payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
       expect(payload.imp[0].bidfloor).to.equal(3);
-      // expect(payload.imp[0].bidfloorcur).to.equal('USD');
+      expect(payload.imp[0].bidfloorcur).to.equal('USD');
     });
 
     it('should add GDPR consent string', function () {
@@ -405,8 +405,7 @@ describe('Improve Digital Adapter Tests', function () {
       const payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdpr))[0].data);
       expect(payload.regs.ext.gdpr).to.exist.and.to.equal(1);
       expect(payload.user.ext.consent).to.equal('CONSENT');
-      expect(payload.user.ext.ConsentedProvidersSettings).to.not.exist;
-      expect(payload.user.ext.consented_providers_settings.consented_providers).to.exist.and.to.deep.equal([1, 35, 41, 101]);
+      expect(payload.user.ext.ConsentedProvidersSettings.consented_providers).to.exist.and.to.deep.equal('1~1.35.41.101');
     });
 
     it('should not add consented providers when empty', function () {
@@ -475,25 +474,6 @@ describe('Improve Digital Adapter Tests', function () {
     });
 
     if (FEATURES.VIDEO) {
-      it('should add correct placement value for instream and outstream video', function () {
-        let bidRequest = deepClone(simpleBidRequest);
-        let payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
-        expect(payload.imp[0].video).to.not.exist;
-
-        bidRequest = deepClone(simpleBidRequest);
-        bidRequest.mediaTypes = {
-          video: {
-            context: 'instream',
-            playerSize: [640, 480]
-          }
-        };
-        payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
-        expect(payload.imp[0].video.placement).to.exist.and.equal(1);
-        bidRequest.mediaTypes.video.context = 'outstream';
-        payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
-        expect(payload.imp[0].video.placement).to.exist.and.equal(3);
-      });
-
       it('should set video params for instream', function() {
         const bidRequest = deepClone(instreamBidRequest);
         delete bidRequest.mediaTypes.video.playerSize;
@@ -508,13 +488,12 @@ describe('Improve Digital Adapter Tests', function () {
           minbitrate: 500,
           maxbitrate: 2000,
           w: 1024,
-          h: 640,
-          placement: INSTREAM_TYPE,
+          h: 640
         };
         bidRequest.params.video = videoParams;
         const request = spec.buildRequests([bidRequest], bidderRequest)[0];
         const payload = JSON.parse(request.data);
-        expect(payload.imp[0].video).to.deep.equal(videoParams);
+        expect(payload.imp[0].video).to.deep.include(videoParams);
       });
 
       it('should set video playerSize over video params', () => {
@@ -551,7 +530,6 @@ describe('Improve Digital Adapter Tests', function () {
         const payload = JSON.parse(request.data);
         expect(payload.imp[0].video).to.deep.equal({...{
           mimes: ['video/mp4'],
-          placement: OUTSTREAM_TYPE,
           w: bidRequest.mediaTypes.video.playerSize[0],
           h: bidRequest.mediaTypes.video.playerSize[1],
         },
@@ -564,7 +542,6 @@ describe('Improve Digital Adapter Tests', function () {
         const request = spec.buildRequests([bidRequest], {})[0];
         const payload = JSON.parse(request.data);
         const testVideoParams = Object.assign({
-          placement: OUTSTREAM_TYPE,
           w: 640,
           h: 480,
           mimes: ['video/mp4'],
@@ -583,7 +560,7 @@ describe('Improve Digital Adapter Tests', function () {
     });
 
     it('should add eids', function () {
-      const userIdAsEids = [
+      const eids = [
         {
           source: 'id5-sync.com',
           uids: [{
@@ -599,9 +576,10 @@ describe('Improve Digital Adapter Tests', function () {
           id: '1111'
         }]
       }]}};
-      const bidRequest = Object.assign({}, simpleBidRequest);
-      bidRequest.userIdAsEids = userIdAsEids;
-      const request = spec.buildRequests([bidRequest], bidderRequestReferrer)[0];
+      const request = spec.buildRequests([simpleBidRequest], {
+        ...bidderRequestReferrer,
+        ortb2: {user: {ext: {eids: eids}}}
+      })[0];
       const payload = JSON.parse(request.data);
       expect(payload.user).to.deep.equal(expectedUserObject);
     });
@@ -609,7 +587,7 @@ describe('Improve Digital Adapter Tests', function () {
     it('should return 2 requests', function () {
       const requests = spec.buildRequests([
         simpleBidRequest,
-        simpleSmartTagBidRequest
+        instreamBidRequest
       ], bidderRequest);
       expect(requests).to.be.an('array');
       expect(requests.length).to.equal(2);
@@ -621,7 +599,7 @@ describe('Improve Digital Adapter Tests', function () {
       const requests = spec.buildRequests([ simpleBidRequest, instreamBidRequest ], bidderRequest);
       expect(requests).to.be.an('array');
       expect(requests.length).to.equal(1);
-      expect(requests[0].url).to.equal(AD_SERVER_URL);
+      expect(requests[0].url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1234));
       const request = JSON.parse(requests[0].data);
       expect(request.imp.length).to.equal(2);
       expect(request.imp[0].banner).to.exist;
@@ -635,7 +613,7 @@ describe('Improve Digital Adapter Tests', function () {
       expect(requests).to.be.an('array');
       expect(requests.length).to.equal(2);
       expect(requests[0].url).to.equal(EXTEND_URL);
-      expect(requests[1].url).to.equal(AD_SERVER_URL);
+      expect(requests[1].url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1234));
       const adServerRequest = JSON.parse(requests[1].data);
       expect(adServerRequest.imp.length).to.equal(2);
       expect(adServerRequest.imp[0].banner).to.exist;
@@ -643,8 +621,6 @@ describe('Improve Digital Adapter Tests', function () {
     });
 
     it('should set Prebid sizes in bid request', function () {
-      getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
       const request = spec.buildRequests([simpleBidRequest], bidderRequest)[0];
       const payload = JSON.parse(request.data);
       sinon.assert.match(payload.imp[0].banner, {
@@ -656,8 +632,6 @@ describe('Improve Digital Adapter Tests', function () {
     });
 
     it('should not add single size filter when using Prebid sizes', function () {
-      getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
       const bidRequest = Object.assign({}, simpleBidRequest);
       const size = {
         w: 800,
@@ -683,32 +657,9 @@ describe('Improve Digital Adapter Tests', function () {
       expect(payload.app.content).does.exist.and.equal('XYZ');
     });
 
-    it('should not set site when app is defined in CONFIG', function () {
-      getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('app').returns({ content: 'XYZ' });
-      let request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequest))[0];
-      let payload = JSON.parse(request.data);
-      expect(payload.site).does.not.exist;
-      expect(payload.app).does.exist;
-      expect(payload.app.content).does.exist.and.equal('XYZ');
-    });
-
     it('should set correct site params', function () {
-      getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('site').returns({
-        content: 'XYZ',
-        page: 'https://improveditigal.com/',
-        domain: 'improveditigal.com'
-      });
       let request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequestReferrer))[0];
       let payload = JSON.parse(request.data);
-      expect(payload.site.content).does.exist.and.equal('XYZ');
-      expect(payload.site.page).does.exist.and.equal('https://improveditigal.com/');
-      expect(payload.site.domain).does.exist.and.equal('improveditigal.com');
-      getConfigStub.reset();
-
-      request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequestReferrer))[0];
-      payload = JSON.parse(request.data);
       expect(payload.site.content).does.not.exist;
       expect(payload.site.page).does.exist.and.equal('https://blah.com/test.html');
       expect(payload.site.domain).does.exist.and.equal('blah.com');
@@ -721,23 +672,13 @@ describe('Improve Digital Adapter Tests', function () {
       expect(payload.site.domain).does.exist.and.equal('blah.com');
     });
 
-    it('should set site when app not available', function () {
-      getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('app').returns(undefined);
-      getConfigStub.withArgs('site').returns({});
-      let request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequest))[0];
-      let payload = JSON.parse(request.data);
-      expect(payload.site).does.exist;
-      expect(payload.app).does.not.exist;
-    });
-
     it('should call basic ads endpoint when no consent for purpose 1', function () {
       const consent = deepClone(gdprConsent);
       deepSetValue(consent, 'vendorData.purpose.consents.1', false);
       const bidderRequestWithConsent = deepClone(bidderRequest);
       bidderRequestWithConsent.gdprConsent = consent;
       const request = spec.buildRequests([simpleBidRequest], bidderRequestWithConsent)[0];
-      expect(request.url).to.equal(BASIC_ADS_URL);
+      expect(request.url).to.equal(formatPublisherUrl(BASIC_ADS_BASE_URL, 1234));
     });
 
     it('should set extend params when extend mode enabled from global configuration', function () {
@@ -756,6 +697,7 @@ describe('Improve Digital Adapter Tests', function () {
       expect(payload.imp[0].ext.bidder).to.not.exist;
       expect(payload.imp[0].ext.prebid.bidder.improvedigital).to.deep.equal({
         placementId: 1053688,
+        publisherId: 1234,
         keyValues
       });
       expect(payload.imp[0].ext.prebid.storedrequest.id).to.equal('1053688');
@@ -781,18 +723,15 @@ describe('Improve Digital Adapter Tests', function () {
       bidRequest.params.extend = false;
       getConfigStub.withArgs('improvedigital.extend').returns(true);
       request = spec.buildRequests([bidRequest], { bids: [bidRequest] })[0];
-      expect(request.url).to.equal(AD_SERVER_URL);
+      expect(request.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1234));
 
       const requests = spec.buildRequests([bidRequest, instreamBidRequest], { bids: [bidRequest, instreamBidRequest] });
       expect(requests.length).to.equal(2);
-      expect(requests[0].url).to.equal(AD_SERVER_URL);
+      expect(requests[0].url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1234));
       expect(requests[1].url).to.equal(EXTEND_URL);
     });
 
     it('should add publisherId to request URL when available in request params', function() {
-      function formatPublisherUrl(baseUrl, publisherId) {
-        return `${baseUrl}/${publisherId}/${PB_ENDPOINT}`;
-      }
       const bidRequest = deepClone(simpleBidRequest);
       bidRequest.params.publisherId = 1000;
       let request = spec.buildRequests([bidRequest], bidderRequest)[0];
@@ -841,10 +780,6 @@ describe('Improve Digital Adapter Tests', function () {
       bidderRequestWithConsent.gdprConsent = consent;
       request = spec.buildRequests([bidRequest], bidderRequestWithConsent)[0];
       expect(request.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1000));
-
-      delete bidRequest.params.publisherId;
-      request = spec.buildRequests([bidRequest], bidderRequestWithConsent)[0];
-      expect(request.url).to.equal(AD_SERVER_URL);
     });
   });
 
@@ -1071,7 +1006,7 @@ describe('Improve Digital Adapter Tests', function () {
         width: 728,
         height: 90,
         ttl: 300,
-        ad: '\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"mediaType":"banner","ad":"\\"\\"","requestId":"33e9500b21129f","seatBidId":"35adfe19-d6e9-46b9-9f7d-20da7026b965","cpm":1.9200543539802946,"currency":"EUR","width":728,"height":90,"creative_id":"510265","creativeId":"510265","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script>  ',
+        ad: '\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"publisherId":1234,"placementId":1053688,"keyValues":{"testKey":["testValue"]},"size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"mediaType":"banner","ad":"\\"\\"","requestId":"33e9500b21129f","seatBidId":"35adfe19-d6e9-46b9-9f7d-20da7026b965","cpm":1.9200543539802946,"currency":"EUR","width":728,"height":90,"creative_id":"510265","creativeId":"510265","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script>  ',
         creativeId: '510265',
         dealId: 320896,
         netRevenue: false,
@@ -1081,7 +1016,7 @@ describe('Improve Digital Adapter Tests', function () {
 
     const multiFormatExpectedBid = [
       Object.assign({}, expectedBid[0], {
-        ad: '\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]},"native":{},"video":{"context":"outstream","playerSize":[640,480]}},"sizes":[[300,250],[160,600]],"nativeParams":{"body":{"required":true}}},"bid":{"mediaType":"banner","ad":"\\"\\"","requestId":"33e9500b21129f","seatBidId":"35adfe19-d6e9-46b9-9f7d-20da7026b965","cpm":1.9200543539802946,"currency":"EUR","width":728,"height":90,"creative_id":"510265","creativeId":"510265","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script>  ',
+        ad: '\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"publisherId":1234,"placementId":1053688},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]},"native":{},"video":{"context":"outstream","playerSize":[640,480]}},"sizes":[[300,250],[160,600]],"nativeParams":{"body":{"required":true}}},"bid":{"mediaType":"banner","ad":"\\"\\"","requestId":"33e9500b21129f","seatBidId":"35adfe19-d6e9-46b9-9f7d-20da7026b965","cpm":1.9200543539802946,"currency":"EUR","width":728,"height":90,"creative_id":"510265","creativeId":"510265","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script>  ',
       })
     ];
 
@@ -1094,7 +1029,7 @@ describe('Improve Digital Adapter Tests', function () {
         width: 300,
         height: 250,
         ttl: 300,
-        ad: '\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"mediaType":"banner","ad":"\\"\\"","requestId":"33e9500b21129f","seatBidId":"83c8d524-0955-4d0c-b558-4c9f3600e09b","cpm":1.9200543539802946,"currency":"EUR","width":300,"height":250,"creative_id":"479163","creativeId":"479163","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script>  ',
+        ad: '\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"publisherId":1234,"placementId":1053688,"keyValues":{"testKey":["testValue"]},"size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"mediaType":"banner","ad":"\\"\\"","requestId":"33e9500b21129f","seatBidId":"83c8d524-0955-4d0c-b558-4c9f3600e09b","cpm":1.9200543539802946,"currency":"EUR","width":300,"height":250,"creative_id":"479163","creativeId":"479163","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script>  ',
         creativeId: '479163',
         dealId: 320896,
         netRevenue: false,
@@ -1181,6 +1116,16 @@ describe('Improve Digital Adapter Tests', function () {
       expect(bids[0].dealId).to.equal(268515);
     });
 
+    it('should set deal type targeting KV for PG', function () {
+      const request = makeRequest(bidderRequest);
+      const response = deepClone(serverResponse);
+      let bids;
+
+      response.body.seatbid[0].bid[0].ext.improvedigital.pg = 1;
+      bids = spec.interpretResponse(response, request);
+      expect(bids[0].adserverTargeting.hb_deal_type_improve).to.equal('pg');
+    });
+
     it('should set currency', function () {
       const response = deepClone(serverResponse);
       response.body.cur = 'EUR';
diff --git a/test/spec/modules/imuIdSystem_spec.js b/test/spec/modules/imuIdSystem_spec.js
index 3650302a2ed..1d6f79786a0 100644
--- a/test/spec/modules/imuIdSystem_spec.js
+++ b/test/spec/modules/imuIdSystem_spec.js
@@ -13,6 +13,9 @@ import {
 } from 'modules/imuIdSystem.js';
 
 import * as utils from 'src/utils.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
 
 describe('imuId module', function () {
   // let setLocalStorageStub;
@@ -181,4 +184,38 @@ describe('imuId module', function () {
       expect(res.success('error response')).to.equal(undefined);
     });
   });
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(imuIdSubmodule);
+    });
+    it('should return the correct EID schema with imuid', function() {
+      const userId = {
+        imuid: 'testimuid'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'intimatemerger.com',
+        uids: [{
+          id: 'testimuid',
+          atype: 1
+        }]
+      });
+    });
+
+    it('should return the correct EID schema with imppid', function() {
+      const userId = {
+        imppid: 'imppid-value-imppid-value-imppid-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'ppid.intimatemerger.com',
+        uids: [{
+          id: 'imppid-value-imppid-value-imppid-value',
+          atype: 1
+        }]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/incrxBidAdapter_spec.js b/test/spec/modules/incrxBidAdapter_spec.js
index 3fb4ffe2cd3..72234c17845 100644
--- a/test/spec/modules/incrxBidAdapter_spec.js
+++ b/test/spec/modules/incrxBidAdapter_spec.js
@@ -1,14 +1,12 @@
 import { expect } from 'chai';
 import { spec } from 'modules/incrxBidAdapter.js';
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
 
-describe('IncrementX', function () {
-  const METHOD = 'POST';
-  const URL = 'https://hb.incrementxserv.com/vzhbidder/bid';
-
-  const bidRequest = {
-    bidder: 'IncrementX',
+describe('incrementx', function () {
+  const bannerBidRequest = {
+    bidder: 'incrementx',
     params: {
-      placementId: 'PNX-HB-F796830VCF3C4B'
+      placementId: 'IX-HB-12345'
     },
     mediaTypes: {
       banner: {
@@ -19,86 +17,125 @@ describe('IncrementX', function () {
       [300, 250],
       [300, 600]
     ],
-    bidId: 'bid-id-123456',
-    adUnitCode: 'ad-unit-code-1',
-    bidderRequestId: 'bidder-request-id-123456',
-    auctionId: 'auction-id-123456',
-    transactionId: 'transaction-id-123456'
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    bidId: '2faedf3e89d123',
+    bidderRequestId: '1c78fb49cc71c6',
+    auctionId: 'b4f81e8e36232',
+    transactionId: '0d95b2c1-a834-4e50-a962-9b6aa0e1c8fb'
+  };
+  const videoBidRequest = {
+    bidder: 'incrementx',
+    params: {
+      placementId: 'IX-HB-12346'
+    },
+    mediaTypes: {
+      video: {
+        context: 'outstream',
+        playerSize: ['640x480']
+      }
+    },
+    adUnitCode: 'div-gpt-ad-1460505748561-1',
+    bidId: '2faedf3e89d124',
+    bidderRequestId: '1c78fb49cc71c7',
+    auctionId: 'b4f81e8e36233',
+    transactionId: '0d95b2c1-a834-4e50-a962-9b6aa0e1c8fc'
   };
-
   describe('isBidRequestValid', function () {
-    it('should return true where required params found', function () {
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    it('should return true when required params are found', function () {
+      expect(spec.isBidRequestValid(bannerBidRequest)).to.equal(true);
+      expect(spec.isBidRequestValid(videoBidRequest)).to.equal(true);
     });
   });
 
   describe('buildRequests', function () {
-    let bidderRequest = {
+    const bidderRequest = {
       refererInfo: {
-        page: 'https://www.test.com',
-        reachedTop: true,
-        isAmp: false,
-        numIframes: 0,
-        stack: [
-          'https://www.test.com'
-        ],
-        canonicalUrl: null
+        page: 'https://someurl.com'
       }
     };
-
-    it('should build correct POST request for banner bid', function () {
-      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      expect(request).to.be.an('object');
-      expect(request.method).to.equal(METHOD);
-      expect(request.url).to.equal(URL);
-
-      const payload = JSON.parse(decodeURI(request.data.q));
-      expect(payload).to.be.an('object');
-      expect(payload._vzPlacementId).to.be.a('string');
-      expect(payload.sizes).to.be.an('array');
-      expect(payload._slotBidId).to.be.a('string');
-      expect(payload._rqsrc).to.be.a('string');
+    it('should build banner request', function () {
+      const requests = spec.buildRequests([bannerBidRequest], bidderRequest);
+      expect(requests).to.have.lengthOf(1);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal('https://hb.incrementxserv.com/vzhbidder/bid');
+      const data = JSON.parse(decodeURI(requests[0].data.q));
+      expect(data._vzPlacementId).to.equal('IX-HB-12345');
+      expect(data.sizes).to.to.a('array');
+      expect(data.mChannel).to.equal(1);
+    });
+    it('should build video request', function () {
+      const requests = spec.buildRequests([videoBidRequest], bidderRequest);
+      expect(requests).to.have.lengthOf(1);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal('https://hb.incrementxserv.com/vzhbidder/bid');
+      const data = JSON.parse(decodeURI(requests[0].data.q));
+      expect(data._vzPlacementId).to.equal('IX-HB-12346');
+      expect(data.sizes).to.be.a('array');
+      expect(data.mChannel).to.equal(2);
     });
   });
-
   describe('interpretResponse', function () {
-    let serverResponse = {
+    const bannerServerResponse = {
       body: {
-        vzhPlacementId: 'PNX-HB-F796830VCF3C4B',
-        bid: 'BID-XXXX-XXXX',
-        adWidth: '300',
-        adHeight: '250',
-        cpm: '0.7',
-        ad: '
Ad from IncrementX
',
-        slotBidId: 'bid-id-123456',
-        adType: '1',
-        settings: '1,2',
-        nurl: 'htt://nurl.com',
-        statusText: 'Success'
+        slotBidId: '2faedf3e89d123',
+        cpm: 0.5,
+        adWidth: 300,
+        adHeight: 250,
+        ad: '
Banner Ad
',
+        mediaType: BANNER,
+        netRevenue: true,
+        currency: 'USD',
+        advertiserDomains: ['example.com']
       }
     };
-
-    let expectedResponse = [{
-      requestId: 'bid-id-123456',
-      cpm: '0.7',
-      currency: 'USD',
-      adType: '1',
-      settings: '1,2',
-      netRevenue: false,
-      width: '300',
-      height: '250',
-      creativeId: 0,
-      ttl: 300,
-      ad: '
Ad from IncrementX
',
-      meta: {
-        mediaType: 'banner',
-        advertiserDomains: []
+    const videoServerResponse = {
+      body: {
+        slotBidId: '2faedf3e89d124',
+        cpm: 1.0,
+        adWidth: 640,
+        adHeight: 480,
+        ad: 'Test VAST',
+        mediaType: VIDEO,
+        netRevenue: true,
+        currency: 'USD',
+        rUrl: 'https://example.com/vast.xml',
+        advertiserDomains: ['example.com']
       }
-    }];
-
-    it('should correctly interpret valid banner response', function () {
-      let result = spec.interpretResponse(serverResponse);
-      expect(result).to.deep.equal(expectedResponse);
+    };
+    const bidderRequest = {
+      refererInfo: {
+        page: 'https://someurl.com'
+      },
+      data: {
+        bidderRequestData: {
+          bids: [videoBidRequest]
+        }
+      }
+    };
+    it('should handle banner response', function () {
+      const bidResponses = spec.interpretResponse(bannerServerResponse, bidderRequest);
+      expect(bidResponses).to.have.lengthOf(1);
+      const bid = bidResponses[0];
+      expect(bid.requestId).to.equal('2faedf3e89d123');
+      expect(bid.cpm).to.equal(0.5);
+      expect(bid.width).to.equal(300);
+      expect(bid.height).to.equal(250);
+      expect(bid.ad).to.equal('
Banner Ad
');
+      expect(bid.mediaType).to.equal(BANNER);
+      expect(bid.meta.advertiserDomains).to.deep.equal(['example.com']);
+    });
+    it('should handle video response', function () {
+      const bidResponses = spec.interpretResponse(videoServerResponse, bidderRequest);
+      expect(bidResponses).to.have.lengthOf(1);
+      const bid = bidResponses[0];
+      expect(bid.requestId).to.equal('2faedf3e89d124');
+      expect(bid.cpm).to.equal(1.0);
+      expect(bid.width).to.equal(640);
+      expect(bid.height).to.equal(480);
+      expect(bid.vastXml).to.equal('Test VAST');
+      expect(bid.renderer).to.exist;
+      expect(bid.mediaType).to.equal(VIDEO);
+      expect(bid.meta.advertiserDomains).to.deep.equal(['example.com']);
     });
   });
 });
diff --git a/test/spec/modules/inmobiBidAdapter_spec.js b/test/spec/modules/inmobiBidAdapter_spec.js
new file mode 100644
index 00000000000..a7074a2eed8
--- /dev/null
+++ b/test/spec/modules/inmobiBidAdapter_spec.js
@@ -0,0 +1,1965 @@
+import { expect } from 'chai';
+import {
+  spec,
+} from 'modules/inmobiBidAdapter.js';
+import * as utils from 'src/utils.js';
+import * as ajax from 'src/ajax.js';
+import { BANNER, NATIVE, VIDEO } from '../../../src/mediaTypes.js';
+import { hook } from '../../../src/hook';
+import { config } from '../../../src/config.js';
+import { syncAddFPDToBidderRequest } from '../../helpers/fpd';
+import 'modules/consentManagementTcf.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/consentManagementGpp.js';
+import 'modules/priceFloors.js';
+import sinon from 'sinon';
+
+// constants
+const GVLID = 333;
+export const ADAPTER_VERSION = 1.0;
+const BIDDER_CODE = 'inmobi';
+export const EVENT_ENDPOINT = 'https://sync.inmobi.com';
+
+describe('The inmobi bidding adapter', function () {
+  let utilsMock, sandbox, ajaxStub, fetchStub; ;
+
+  beforeEach(function () {
+    // mock objects
+    utilsMock = sinon.mock(utils);
+    sandbox = sinon.sandbox.create();
+    ajaxStub = sandbox.stub(ajax, 'ajax');
+    fetchStub = sinon.stub(global, 'fetch').resolves(new Response('OK'));
+  });
+
+  afterEach(function () {
+    utilsMock.restore();
+    sandbox.restore();
+    ajaxStub.restore();
+    fetchStub.restore();
+  });
+
+  describe('onBidWon', function () {
+    // existence test
+    it('onBidWon function should be defined', function () {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function');
+    });
+
+    it('It should invoke onBidWon, resolving the eventType and domain', function () {
+      const bid = {
+        bidder: 'inmobi',
+        width: 300,
+        height: 250,
+        adId: '330a22bdea4cac1',
+        mediaType: 'banner',
+        cpm: 0.28,
+        ad: 'inmobiAd',
+        requestId: '418b37f85e772c1',
+        adUnitCode: 'div-gpt-ad-1460505748561-01',
+        size: '350x250',
+        adserverTargeting: {
+          hb_bidder: 'prebid',
+          hb_adid: '330a22bdea4cac1',
+          hb_pb: '0.20',
+          hb_size: '350x250'
+        },
+        meta: {
+          loggingPercentage: 100
+        }
+      };
+      spec.onBidWon(bid);
+      // expected url and payload
+      const expectedUrl = `${EVENT_ENDPOINT}/report/onBidWon`;
+      const expectedPayload = JSON.stringify({
+        domain: location.hostname,
+        eventPayload: bid.meta
+      });
+      // assert statements
+      expect(fetchStub.callCount).to.be.equal(1);
+      const fetchArgs = fetchStub.getCall(0).args;
+      /*
+                     index  fetch parameter
+                     0 ->   URL
+                     1 ->   options (method, headers, body, etc.)
+                  */
+      expect(fetchArgs[0]).to.equal(expectedUrl);
+      const actualPayload = fetchArgs[1]?.body;
+      expect(actualPayload).to.equal(expectedPayload);
+      expect(fetchArgs[1]).to.deep.include({
+        method: 'POST',
+        credentials: 'include',
+        keepalive: true,
+      });
+      expect(fetchArgs[1]?.headers).to.deep.equal({
+        'Content-Type': 'text/plain',
+      });
+    });
+
+    it('onBidWon should not be called when loggingPercentage is set to 0', function () {
+      const bid = {
+        bidder: 'inmobi',
+        width: 300,
+        height: 250,
+        adId: '330a22bdea4cac1',
+        mediaType: 'banner',
+        cpm: 0.28,
+        ad: 'inmobiAd',
+        requestId: '418b37f85e772c1',
+        adUnitCode: 'div-gpt-ad-1460505748561-01',
+        size: '350x250',
+        adserverTargeting: {
+          hb_bidder: 'prebid',
+          hb_adid: '330a22bdea4cac1',
+          hb_pb: '0.20',
+          hb_size: '350x250'
+        },
+        meta: {
+          loggingPercentage: 0
+        }
+      };
+      spec.onBidWon(bid);
+      // expected url and payload
+      const expectedUrl = `${EVENT_ENDPOINT}/report/onBidWon`;
+      const expectedPayload = JSON.stringify({
+        domain: location.hostname,
+        eventPayload: bid.meta
+      });
+      // assert statements
+      expect(fetchStub.callCount).to.be.equal(0);
+    });
+
+    it('onBidWon should not be called if the bid data is null', function () {
+      // Call onBidWon with null data
+      spec.onBidWon(null);
+      // Assert that ajax was not called since bid data is null
+      expect(fetchStub.callCount).to.be.equal(0);
+    });
+  });
+
+  describe('onBidderError', function () {
+    it('onBidderError function should be defined', function () {
+      expect(spec.onBidderError).to.exist.and.to.be.a('function');
+    });
+
+    it('onBidderError should not be called if the bid data is null', function () {
+      // Call onBidError with null data
+      spec.onBidderError(null);
+      // Assert that ajax was not called since bid data is null
+      expect(fetchStub.callCount).to.be.equal(0);
+    });
+
+    it('onBidderError should be called with the eventType', function () {
+      const bid = {
+        error: 'error', // Assuming this will be a mock or reference to an actual XMLHttpRequest object
+        bidderRequest: {
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          auctionStart: 1579746300522,
+          bidder: 'inmobi',
+          bidderRequestId: '15246a574e859f'
+        }
+      };
+      spec.onBidderError(bid);
+      // expected url and payload
+      const expectedUrl = `${EVENT_ENDPOINT}/report/onBidderError`;
+      const expectedPayload = JSON.stringify({
+        domain: location.hostname,
+        eventPayload: bid
+      });
+      // assert statements
+      expect(fetchStub.callCount).to.be.equal(1);
+      const fetchArgs = fetchStub.getCall(0).args;
+      /*
+                     index  fetch parameter
+                     0 ->   URL
+                     1 ->   options (method, headers, body, etc.)
+                  */
+      expect(fetchArgs[0]).to.equal(expectedUrl);
+      const actualPayload = fetchArgs[1]?.body;
+      expect(actualPayload).to.equal(expectedPayload);
+      expect(fetchArgs[1]).to.deep.include({
+        method: 'POST',
+        credentials: 'include',
+        keepalive: true,
+      });
+      expect(fetchArgs[1]?.headers).to.deep.equal({
+        'Content-Type': 'text/plain',
+      });
+    });
+  });
+
+  describe('onAdRenderSucceeded', function () {
+    // existence test
+    it('onAdRenderSucceeded function should be defined', function () {
+      expect(spec.onAdRenderSucceeded).to.exist.and.to.be.a('function');
+    });
+
+    it('should invoke onAdRenderSucceeded, resolving the eventType and domain', function () {
+      const bid = {
+        bidder: 'inmobi',
+        width: 300,
+        height: 250,
+        adId: '330a22bdea4cac1',
+        mediaType: 'banner',
+        cpm: 0.28,
+        ad: 'inmobiAd',
+        requestId: '418b37f85e772c1',
+        adUnitCode: 'div-gpt-ad-1460505748561-01',
+        size: '350x250',
+        adserverTargeting: {
+          hb_bidder: 'prebid',
+          hb_adid: '330a22bdea4cac1',
+          hb_pb: '0.20',
+          hb_size: '350x250'
+        },
+        meta: {
+          loggingPercentage: 100
+        }
+      };
+      spec.onAdRenderSucceeded(bid);
+      // expected url and payload
+      const expectedUrl = `${EVENT_ENDPOINT}/report/onAdRenderSucceeded`;
+      const expectedPayload = JSON.stringify({
+        domain: location.hostname,
+        eventPayload: bid.meta
+      });
+      // assert statements
+      expect(fetchStub.callCount).to.be.equal(1);
+      const fetchArgs = fetchStub.getCall(0).args;
+      /*
+                     index  fetch parameter
+                     0 ->   URL
+                     1 ->   options (method, headers, body, etc.)
+                  */
+      expect(fetchArgs[0]).to.equal(expectedUrl);
+      const actualPayload = fetchArgs[1]?.body;
+      expect(actualPayload).to.equal(expectedPayload);
+      expect(fetchArgs[1]).to.deep.include({
+        method: 'POST',
+        credentials: 'include',
+        keepalive: true,
+      });
+      expect(fetchArgs[1]?.headers).to.deep.equal({
+        'Content-Type': 'text/plain',
+      });
+    });
+
+    it('onAdRenderSucceeded should not be called when loggingPercentage is 0', function () {
+      const bid = {
+        bidder: 'inmobi',
+        width: 300,
+        height: 250,
+        adId: '330a22bdea4cac1',
+        mediaType: 'banner',
+        cpm: 0.28,
+        ad: 'inmobiAd',
+        requestId: '418b37f85e772c1',
+        adUnitCode: 'div-gpt-ad-1460505748561-01',
+        size: '350x250',
+        adserverTargeting: {
+          hb_bidder: 'prebid',
+          hb_adid: '330a22bdea4cac1',
+          hb_pb: '0.20',
+          hb_size: '350x250'
+        },
+        meta: {
+          loggingPercentage: 0
+        }
+      };
+      spec.onAdRenderSucceeded(bid);
+      // expected url and payload
+      const expectedUrl = `${EVENT_ENDPOINT}/report/onAdRenderSucceeded`;
+      const expectedPayload = JSON.stringify({
+        domain: location.hostname,
+        eventPayload: bid.meta
+      });
+      // assert statements
+      expect(fetchStub.callCount).to.be.equal(0);
+    });
+
+    it('onAdRenderSucceeded should not be called if the bid data is null', function () {
+      // Call onAdRenderSucceeded with null data
+      spec.onAdRenderSucceeded(null);
+      // Assert that ajax was not called since bid data is null
+      expect(fetchStub.callCount).to.be.equal(0);
+    });
+  });
+
+  describe('onTimeout', function () {
+    // existence test
+    it('onTimeout function should be defined', function () {
+      expect(spec.onTimeout).to.exist.and.to.be.a('function');
+    });
+
+    it('should invoke onTimeout, resolving the eventType and domain', function () {
+      const bid = [
+        {
+          bidder: 'inmobi',
+          bidId: '51ef8751f9aead1',
+          adUnitCode: 'div-gpt-ad-14605057481561-0',
+          timeout: 3000,
+          auctionId: '18fd8b8b0bd7517'
+        }
+      ];
+      spec.onTimeout(bid);
+      // expected url and payload
+      const expectedUrl = `${EVENT_ENDPOINT}/report/onTimeout`;
+      const expectedPayload = JSON.stringify({
+        domain: location.hostname,
+        eventPayload: bid
+      });
+      // assert statements
+      expect(fetchStub.callCount).to.be.equal(1);
+      const fetchArgs = fetchStub.getCall(0).args;
+      /*
+                     index  fetch parameter
+                     0 ->   URL
+                     1 ->   options (method, headers, body, etc.)
+                  */
+      expect(fetchArgs[0]).to.equal(expectedUrl);
+      const actualPayload = fetchArgs[1]?.body;
+      expect(actualPayload).to.equal(expectedPayload);
+      expect(fetchArgs[1]).to.deep.include({
+        method: 'POST',
+        credentials: 'include',
+        keepalive: true,
+      });
+      expect(fetchArgs[1]?.headers).to.deep.equal({
+        'Content-Type': 'text/plain',
+      });
+    });
+
+    it('onTimeout should not be called if the bid data is null', function () {
+      // Call onTimeout with null data
+      spec.onTimeout(null);
+      // Assert that ajax was not called since bid data is null
+      expect(fetchStub.callCount).to.be.equal(0);
+    });
+  });
+
+  describe('onSetTargeting', function () {
+    // existence test
+    it('The onSetTargeting function should be defined', function () {
+      expect(spec.onSetTargeting).to.exist.and.to.be.a('function');
+    });
+
+    it('should invoke onSetTargeting, resolving the eventType and domain', function () {
+      const bid = {
+        bidder: 'inmobi',
+        width: 300,
+        height: 250,
+        adId: '330a22bdea4cac1',
+        mediaType: 'banner',
+        cpm: 0.28,
+        ad: 'inmobiAd',
+        requestId: '418b37f85e7721c',
+        adUnitCode: 'div-gpt-ad-1460505748561-01',
+        size: '350x250',
+        adserverTargeting: {
+          hb_bidder: 'prebid',
+          hb_adid: '330a22bdea4cac1',
+          hb_pb: '0.20',
+          hb_size: '350x250'
+        },
+        meta: {
+          loggingPercentage: 100
+        }
+      };
+      spec.onSetTargeting(bid);
+      // expected url and payload
+      const expectedUrl = `${EVENT_ENDPOINT}/report/onSetTargeting`;
+      const expectedPayload = JSON.stringify({
+        domain: location.hostname,
+        eventPayload: bid.meta
+      });
+      // assert statements
+      expect(fetchStub.callCount).to.be.equal(1);
+      const fetchArgs = fetchStub.getCall(0).args;
+      /*
+                     index  fetch parameter
+                     0 ->   URL
+                     1 ->   options (method, headers, body, etc.)
+                  */
+      expect(fetchArgs[0]).to.equal(expectedUrl);
+      const actualPayload = fetchArgs[1]?.body;
+      expect(actualPayload).to.equal(expectedPayload);
+      expect(fetchArgs[1]).to.deep.include({
+        method: 'POST',
+        credentials: 'include',
+        keepalive: true,
+      });
+      expect(fetchArgs[1]?.headers).to.deep.equal({
+        'Content-Type': 'text/plain',
+      });
+    });
+
+    it('onSetTargeting should not be called when loggingPercentage is 0', function () {
+      const bid = {
+        bidder: 'inmobi',
+        width: 300,
+        height: 250,
+        adId: '330a22bdea4cac1',
+        mediaType: 'banner',
+        cpm: 0.28,
+        ad: 'inmobiAd',
+        requestId: '418b37f85e7721c',
+        adUnitCode: 'div-gpt-ad-1460505748561-01',
+        size: '350x250',
+        adserverTargeting: {
+          hb_bidder: 'prebid',
+          hb_adid: '330a22bdea4cac1',
+          hb_pb: '0.20',
+          hb_size: '350x250'
+        },
+        meta: {
+          loggingPercentage: 0
+        }
+      };
+      spec.onSetTargeting(bid);
+      // expected url and payload
+      const expectedUrl = `${EVENT_ENDPOINT}/report/onSetTargeting`;
+      const expectedPayload = JSON.stringify({
+        domain: location.hostname,
+        eventPayload: bid.meta
+      });
+      // assert statements
+      expect(fetchStub.callCount).to.be.equal(0);
+    });
+
+    it('onSetTargeting should not be called if the bid data is null', function () {
+      // Call onSetTargeting with null data
+      spec.onSetTargeting(null);
+      // Assert that ajax was not called since bid data is null
+      expect(fetchStub.callCount).to.be.equal(0);
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return false when an invalid bid is provided', function () {
+      const bid = {
+        bidder: 'inmobi',
+      };
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should return true when the bid contains a PLC', function () {
+      const bid = {
+        bidder: 'inmobi',
+        params: {
+          plc: '123a',
+        },
+      };
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    before(() => {
+      hook.ready();
+    })
+    afterEach(function () {
+      config.resetConfig();
+    });
+    const bidderRequest = {
+      refererInfo: {
+        page: 'inmobi',
+        topmostLocation: 'inmobi'
+      },
+      timeout: 3000,
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'consentDataString',
+        vendorData: {
+          vendorConsents: {
+            '333': 1
+          },
+        },
+        apiVersion: 1,
+      },
+    };
+
+    it('request should build with correct plc', function () {
+      const bidRequests = [
+        {
+          bidId: 'bidId',
+          bidder: 'inmobi',
+          adUnitCode: 'bid-12',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123'
+          }
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const ortbRequest = request.data;
+      expect(ortbRequest.imp[0].ext.bidder.plc).to.deep.equal('123');
+    });
+
+    it('request should build with correct imp', function () {
+      const expectedMetric = {
+        url: 'https://inmobi.com'
+      }
+      const bidRequests = [{
+        bidId: 'bidId',
+        bidder: 'inmobi',
+        adUnitCode: 'impId',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 50]]
+          }
+        },
+        ortb2Imp: {
+          instl: 1,
+          metric: expectedMetric,
+          ext: {
+            gpid: 'gpid_inmobi'
+          },
+          rwdd: 1
+        },
+        params: {
+          plc: '123ai',
+          bidfloor: 4.66,
+          bidfloorcur: 'USD'
+        }
+      }];
+
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp).to.have.lengthOf(1);
+      expect(ortbRequest.imp[0].id).to.deep.equal('bidId');
+      expect(ortbRequest.imp[0].tagid).to.deep.equal('impId');
+      expect(ortbRequest.imp[0].instl).to.equal(1);
+      expect(ortbRequest.imp[0].bidfloor).to.equal(4.66);
+      expect(ortbRequest.imp[0].bidfloorcur).to.equal('USD');
+      expect(ortbRequest.imp[0].metric).to.deep.equal(expectedMetric);
+      expect(ortbRequest.imp[0].secure).to.equal(0);
+      expect(ortbRequest.imp[0].ext.gpid).to.equal('gpid_inmobi');
+      expect(ortbRequest.imp[0].rwdd).to.equal(1);
+    });
+
+    it('request should build with proper site data', function () {
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '1234a',
+          },
+        },
+      ];
+      const ortb2 = {
+        site: {
+          name: 'raapchikgames.com',
+          domain: 'raapchikgames.com',
+          keywords: 'test1, test2',
+          cat: ['IAB2'],
+          pagecat: ['IAB3'],
+          sectioncat: ['IAB4'],
+          page: 'https://raapchikgames.com',
+          ref: 'inmobi.com',
+          privacypolicy: 1,
+          content: {
+            url: 'https://raapchikgames.com/games1'
+          }
+        }
+      };
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest({ ...bidderRequest, ortb2 })).data;
+      expect(ortbRequest.site.domain).to.equal('raapchikgames.com');
+      expect(ortbRequest.site.publisher.domain).to.equal('inmobi');
+      expect(ortbRequest.site.page).to.equal('https://raapchikgames.com');
+      expect(ortbRequest.site.name).to.equal('raapchikgames.com');
+      expect(ortbRequest.site.keywords).to.equal('test1, test2');
+      expect(ortbRequest.site.cat).to.deep.equal(['IAB2']);
+      expect(ortbRequest.site.pagecat).to.deep.equal(['IAB3']);
+      expect(ortbRequest.site.sectioncat).to.deep.equal(['IAB4']);
+      expect(ortbRequest.site.ref).to.equal('inmobi.com');
+      expect(ortbRequest.site.privacypolicy).to.equal(1);
+      expect(ortbRequest.site.content.url).to.equal('https://raapchikgames.com/games1')
+    });
+
+    it('request should build with proper device data', function () {
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '1234a',
+          },
+        },
+      ];
+      const ortb2 = {
+        device: {
+          dnt: 0,
+          ua: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36',
+          ip: '195.199.250.144',
+          h: 919,
+          w: 1920,
+          language: 'hu',
+          lmt: 1,
+          js: 1,
+          connectiontype: 0,
+          hwv: '5S',
+          model: 'iphone',
+          mccmnc: '310-005',
+          geo: {
+            lat: 40.0964439,
+            lon: -75.3009142
+          }
+        }
+      };
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest({ ...bidderRequest, ortb2 })).data;
+      expect(ortbRequest.device.dnt).to.equal(0);
+      expect(ortbRequest.device.lmt).to.equal(1);
+      expect(ortbRequest.device.js).to.equal(1);
+      expect(ortbRequest.device.connectiontype).to.equal(0);
+      expect(ortbRequest.device.ua).to.equal('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36');
+      expect(ortbRequest.device.ip).to.equal('195.199.250.144');
+      expect(ortbRequest.device.h).to.equal(919);
+      expect(ortbRequest.device.w).to.equal(1920);
+      expect(ortbRequest.device.language).to.deep.equal('hu');
+      expect(ortbRequest.device.hwv).to.deep.equal('5S');
+      expect(ortbRequest.device.model).to.deep.equal('iphone');
+      expect(ortbRequest.device.mccmnc).to.deep.equal('310-005');
+      expect(ortbRequest.device.geo.lat).to.deep.equal(40.0964439);
+      expect(ortbRequest.device.geo.lon).to.deep.equal(-75.3009142);
+    });
+
+    it('should properly build a request with source object', function () {
+      const expectedSchain = { id: 'prebid' };
+      const ortb2 = {
+        source: {
+          pchain: 'inmobi',
+          schain: expectedSchain
+        }
+      };
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          bidId: 'bidId',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '124',
+          },
+        },
+      ];
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest({ ...bidderRequest, ortb2 })).data;
+      expect(ortbRequest.source.ext.schain).to.deep.equal(expectedSchain);
+      expect(ortbRequest.source.pchain).to.equal('inmobi');
+    });
+
+    it('should properly user object', function () {
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123'
+          }
+        },
+      ];
+      const br = {
+        ...bidderRequest,
+        ortb2: {
+          user: {
+            yob: 2002,
+            keyowrds: 'test test',
+            gender: 'M',
+            customdata: 'test no',
+            geo: {
+              lat: 40.0964439,
+              lon: -75.3009142
+            },
+            ext: {
+              eids: [
+                {
+                  source: 'inmobi.com',
+                  uids: [{
+                    id: 'iid',
+                    atype: 1
+                  }]
+                }
+              ]
+            }
+          }
+        }
+      }
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(br));
+      const ortbRequest = request.data;
+      expect(ortbRequest.user.yob).to.deep.equal(2002);
+      expect(ortbRequest.user.keyowrds).to.deep.equal('test test');
+      expect(ortbRequest.user.gender).to.deep.equal('M');
+      expect(ortbRequest.user.customdata).to.deep.equal('test no');
+      expect(ortbRequest.user.geo.lat).to.deep.equal(40.0964439);
+      expect(ortbRequest.user.geo.lon).to.deep.equal(-75.3009142);
+      expect(ortbRequest.user.ext.eids).to.deep.equal([
+        {
+          source: 'inmobi.com',
+          uids: [{
+            id: 'iid',
+            atype: 1
+          }]
+        }
+      ]);
+    });
+
+    it('should properly build a request regs object', function () {
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '1234a',
+          },
+        },
+      ];
+      const ortb2 = {
+        regs: {
+          coppa: 1,
+          gpp: 'gpp_consent_string',
+          gpp_sid: [0, 1, 2],
+          us_privacy: 'yes us privacy applied'
+        }
+      };
+
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest({ ...bidderRequest, ortb2 })).data;
+      expect(ortbRequest.regs.coppa).to.equal(1);
+      expect(ortbRequest.regs.ext.gpp).to.equal('gpp_consent_string');
+      expect(ortbRequest.regs.ext.gpp_sid).to.deep.equal([0, 1, 2]);
+      expect(ortbRequest.regs.ext.us_privacy).to.deep.equal('yes us privacy applied');
+    });
+
+    it('gdpr test', function () {
+      // using privacy params from global bidder Request
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '1234a',
+          },
+        },
+      ];
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.regs.ext.gdpr).to.deep.equal(1);
+      expect(ortbRequest.user.ext.consent).to.equal('consentDataString');
+    });
+
+    it('should properly set tmax if available', function () {
+      // using tmax from global bidder Request
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'bid-1',
+          transactionId: 'trans-1',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123'
+          }
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const ortbRequest = request.data;
+      expect(ortbRequest.tmax).to.equal(bidderRequest.timeout);
+    });
+
+    it('should properly build a request with bcat field', function () {
+      const bcat = ['IAB1', 'IAB2'];
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123a',
+          },
+        },
+      ];
+      const bidderRequest = {
+        ortb2: {
+          bcat
+        }
+      };
+
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.bcat).to.deep.equal(bcat);
+    });
+
+    it('should properly build a request with badv field', function () {
+      const badv = ['ford.com'];
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '12ea',
+          },
+        },
+      ];
+      const bidderRequest = {
+        ortb2: {
+          badv
+        }
+      };
+
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.badv).to.deep.equal(badv);
+    });
+
+    it('should properly build a request with bapp field', function () {
+      const bapp = ['raapchik.com'];
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123a',
+          },
+        },
+      ];
+      const bidderRequest = {
+        ortb2: {
+          bapp
+        }
+      };
+
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.bapp).to.deep.equal(bapp);
+    });
+
+    it('banner request test', function () {
+      const bidderRequest = {};
+      const bidRequests = [
+        {
+          bidId: 'bidId',
+          bidder: 'inmobi',
+          adUnitCode: 'bid-12',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]],
+              pos: 1,
+              topframe: 0,
+            }
+          },
+          params: {
+            plc: '123'
+          },
+          ortb2Imp: {
+            banner: {
+              api: [1, 2],
+              mimes: ['image/jpg', 'image/gif']
+            }
+          }
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const ortbRequest = request.data;
+      expect(ortbRequest.imp[0].banner).not.to.be.null;
+      expect(ortbRequest.imp[0].banner.format[0].w).to.equal(320);
+      expect(ortbRequest.imp[0].banner.format[0].h).to.equal(50);
+      expect(ortbRequest.imp[0].banner.pos).to.equal(1);
+      expect(ortbRequest.imp[0].banner.topframe).to.equal(0);
+      expect(ortbRequest.imp[0].banner.api).to.deep.equal([1, 2]);
+      expect(ortbRequest.imp[0].banner.mimes).to.deep.equal(['image/jpg', 'image/gif']);
+    });
+
+    it('banner request test with sizes > 1', function () {
+      const bidderRequest = {};
+      const bidRequests = [
+        {
+          bidId: 'bidId',
+          bidder: 'inmobi',
+          adUnitCode: 'bid-12',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50], [720, 50]]
+            }
+          },
+          params: {
+            plc: '123'
+          }
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const ortbRequest = request.data;
+      expect(ortbRequest.imp[0].banner).not.to.be.null;
+      expect(ortbRequest.imp[0].banner.format[0].w).to.equal(320);
+      expect(ortbRequest.imp[0].banner.format[0].h).to.equal(50);
+      expect(ortbRequest.imp[0].banner.format[1].w).to.equal(720);
+      expect(ortbRequest.imp[0].banner.format[1].h).to.equal(50);
+    });
+
+    if (FEATURES.VIDEO) {
+      it('video request test', function () {
+        const bidRequests = [
+          {
+            bidder: 'inmobi',
+            adUnitCode: 'bid-123',
+            sizes: [[640, 360]],
+            mediaTypes: {
+              video: {
+                context: 'inbanner',
+                playerSize: [640, 360],
+                mimes: ['video/mp4', 'video/x-flv'],
+                maxduration: 30,
+                api: [1, 2],
+                protocols: [2, 3],
+                plcmt: 3,
+                w: 640,
+                h: 360,
+                linearity: 1,
+                skipmin: 30,
+                skipafter: 30,
+                minbitrate: 10000,
+                maxbitrate: 48000,
+                delivery: [1, 2, 3],
+                pos: 1,
+                playbackend: 1,
+                adPodDurationSec: 30,
+                durationRangeSec: [1, 30],
+                skip: 1,
+                minduration: 5,
+                startdelay: 5,
+                playbackmethod: [1, 3],
+                placement: 2
+              }
+            },
+            params: {
+              plc: '123'
+            },
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const ortbRequest = request.data;
+        expect(ortbRequest.imp).to.have.lengthOf(1);
+        expect(ortbRequest.imp[0].video.skip).to.equal(1);
+        expect(ortbRequest.imp[0].video.minduration).to.equal(5);
+        expect(ortbRequest.imp[0].video.startdelay).to.equal(5);
+        expect(ortbRequest.imp[0].video.playbackmethod).to.deep.equal([1, 3]);
+        expect(ortbRequest.imp[0].video.placement).to.equal(2);
+        expect(ortbRequest.imp[0].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
+        expect(ortbRequest.imp[0].video.maxduration).to.equal(30);
+        expect(ortbRequest.imp[0].video.api).to.deep.equal([1, 2]);
+        expect(ortbRequest.imp[0].video.protocols).to.deep.equal([2, 3]);
+        expect(ortbRequest.imp[0].video.plcmt).to.equal(3);
+        expect(ortbRequest.imp[0].video.w).to.equal(640);
+        expect(ortbRequest.imp[0].video.h).to.equal(360);
+        expect(ortbRequest.imp[0].video.linearity).to.equal(1);
+        expect(ortbRequest.imp[0].video.skipmin).to.equal(30);
+        expect(ortbRequest.imp[0].video.skipafter).to.equal(30);
+        expect(ortbRequest.imp[0].video.minbitrate).to.equal(10000);
+        expect(ortbRequest.imp[0].video.maxbitrate).to.equal(48000);
+        expect(ortbRequest.imp[0].video.delivery).to.deep.equal([1, 2, 3]);
+        expect(ortbRequest.imp[0].video.pos).to.equal(1);
+        expect(ortbRequest.imp[0].video.playbackend).to.equal(1);
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('video request with player size > 1 ', function () {
+        const bidRequests = [
+          {
+            bidder: 'inmobi',
+            adUnitCode: 'bid-123',
+            sizes: [[640, 360], [480, 320]],
+            mediaTypes: {
+              video: {
+                context: 'inbanner',
+                playerSize: [[640, 360], [480, 320]],
+                mimes: ['video/mp4', 'video/x-flv'],
+                maxduration: 30,
+                api: [1, 2],
+                protocols: [2, 3],
+                plcmt: 3,
+                w: 640,
+                h: 360,
+                linearity: 1,
+                skipmin: 30,
+                skipafter: 30,
+                minbitrate: 10000,
+                maxbitrate: 48000,
+                delivery: [1, 2, 3],
+                pos: 1,
+                playbackend: 1,
+                adPodDurationSec: 30,
+                durationRangeSec: [1, 30],
+                skip: 1,
+                minduration: 5,
+                startdelay: 5,
+                playbackmethod: [1, 3],
+                placement: 2
+              }
+            },
+            params: {
+              plc: '123'
+            },
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const ortbRequest = request.data;
+        expect(ortbRequest.imp).to.have.lengthOf(1);
+        expect(ortbRequest.imp[0].video.w).to.be.equal(640);
+        expect(ortbRequest.imp[0].video.h).to.be.equal(360);
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('video request test when skip is 0', function () {
+        const bidRequests = [
+          {
+            bidder: 'inmobi',
+            adUnitCode: 'bid-123',
+            sizes: [[640, 360]],
+            mediaTypes: {
+              video: {
+                context: 'inbanner',
+                playerSize: [640, 360],
+                mimes: ['video/mp4', 'video/x-flv'],
+                maxduration: 30,
+                api: [1, 2],
+                protocols: [2, 3],
+                plcmt: 3,
+                w: 640,
+                h: 360,
+                linearity: 1,
+                skipmin: 30,
+                skipafter: 30,
+                minbitrate: 10000,
+                maxbitrate: 48000,
+                delivery: [1, 2, 3],
+                pos: 1,
+                playbackend: 1,
+                adPodDurationSec: 30,
+                durationRangeSec: [1, 30],
+                skip: 0,
+                minduration: 5,
+                startdelay: 5,
+                playbackmethod: [1, 3],
+                placement: 2
+              }
+            },
+            params: {
+              plc: '123'
+            },
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const ortbRequest = request.data;
+        expect(ortbRequest.imp).to.have.lengthOf(1);
+        expect(ortbRequest.imp[0].video.skip).to.equal(0);
+      });
+    }
+
+    if (FEATURES.NATIVE) {
+      it('native request test without assests', function () {
+        const bidRequests = [
+          {
+            mediaTypes: {
+              native: {}
+            },
+            params: {
+              'plc': '123a'
+            }
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const ortbRequest = request.data;
+        expect(ortbRequest.imp[0].native).to.be.undefined;
+      });
+    }
+
+    if (FEATURES.NATIVE) {
+      it('native request with assets', function () {
+        const assets = [{
+          required: 1,
+          id: 1,
+          img: {
+            type: 3,
+            wmin: 100,
+            hmin: 100,
+          }
+        },
+        {
+          required: 1,
+          id: 2,
+          title: {
+            len: 140,
+          }
+        },
+        {
+          required: 1,
+          id: 3,
+          data: {
+            type: 1,
+          }
+        }];
+        const bidRequests = [
+          {
+            mediaTypes: {
+              native: {}
+            },
+            nativeOrtbRequest: {
+              assets: assets
+            },
+            params: {}
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const ortbRequest = request.data;
+
+        expect(ortbRequest.imp[0].native.request).to.not.be.null;
+        const nativeRequest = JSON.parse(ortbRequest.imp[0].native.request);
+        expect(nativeRequest).to.have.property('assets');
+        expect(nativeRequest.assets).to.deep.equal(assets);
+      });
+    }
+
+    it('should properly build a request when coppa flag is true', function () {
+      const bidRequests = [];
+      const bidderRequest = {};
+      config.setConfig({ coppa: true });
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.regs.coppa).to.equal(1);
+    });
+
+    it('should properly build a request when coppa flag is false', function () {
+      const bidRequests = [];
+      const bidderRequest = {};
+      config.setConfig({ coppa: false });
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.regs.coppa).to.equal(0);
+    });
+
+    it('should properly build a request when coppa flag is not defined', function () {
+      const bidRequests = [];
+      const bidderRequest = {};
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.regs?.coppa).to.be.undefined;
+    });
+
+    it('build a banner request with bidFloor', function () {
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50], [720, 90]]
+            }
+          },
+          params: {
+            plc: '123a',
+            bidfloor: 1,
+            bidfloorcur: 'USD'
+          }
+        }
+      ];
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp[0].bidfloor).to.deep.equal(1);
+      expect(ortbRequest.imp[0].bidfloorcur).to.deep.equal('USD');
+    });
+
+    it('build a banner request with getFloor', function () {
+      const bidRequests = [
+        {
+          bidder: 'inmobi',
+          adUnitCode: 'impId',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123a'
+          },
+          getFloor: inputParams => {
+            return { currency: 'USD', floor: 1.23, size: '*', mediaType: '*' };
+          }
+        }
+      ];
+      const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+      expect(ortbRequest.imp[0].bidfloor).equal(1.23);
+      expect(ortbRequest.imp[0].bidfloorcur).equal('USD');
+    });
+
+    if (FEATURES.VIDEO) {
+      it('build a video request with bidFloor', function () {
+        const bidRequests = [
+          {
+            bidder: 'inmobi',
+            adUnitCode: 'impId',
+            mediaTypes: {
+              video: {
+                playerSize: [[480, 320], [720, 480]]
+              }
+            },
+            params: {
+              plc: '123a',
+              bidfloor: 1,
+              bidfloorcur: 'USD'
+            }
+          }
+        ];
+        const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+        expect(ortbRequest.imp[0].bidfloor).to.equal(1);
+        expect(ortbRequest.imp[0].bidfloorcur).to.equal('USD');
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('build a video request with getFloor', function () {
+        const bidRequests = [
+          {
+            bidder: 'inmobi',
+            adUnitCode: 'impId',
+            mediaTypes: {
+              video: {
+                playerSize: [[480, 320], [720, 480]]
+              }
+            },
+            params: {
+              plc: '123a'
+            },
+            getFloor: inputParams => {
+              return { currency: 'USD', floor: 1.23, size: '*', mediaType: '*' };
+            }
+          }
+        ];
+        const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+        expect(ortbRequest.imp[0].bidfloor).to.equal(1.23);
+        expect(ortbRequest.imp[0].bidfloorcur).to.equal('USD');
+      });
+    }
+
+    if (FEATURES.NATIVE && FEATURES.VIDEO) {
+      it('build a mutli format request with getFloor', function () {
+        const assets = [{
+          required: 1,
+          id: 1,
+          img: {
+            type: 3,
+            wmin: 100,
+            hmin: 100,
+          }
+        },
+        {
+          required: 1,
+          id: 2,
+          title: {
+            len: 140,
+          }
+        },
+        {
+          required: 1,
+          id: 3,
+          data: {
+            type: 1,
+          }
+        }];
+        const bidRequests = [
+          {
+            bidder: 'inmobi',
+            adUnitCode: 'impId',
+            mediaTypes: {
+              banner: {
+                sizes: [[320, 50], [720, 90]]
+              },
+              video: {
+                playerSize: [640, 480],
+              },
+              native: {
+
+              }
+            },
+            nativeOrtbRequest: {
+              assets: assets
+            },
+            params: {
+              plc: '12456'
+            },
+            getFloor: inputParams => {
+              return { currency: 'USD', floor: 1.23, size: '*', mediaType: '*' };
+            }
+          },
+        ];
+        const bidderRequest = {};
+        const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+        expect(ortbRequest.imp[0].banner).not.to.be.undefined;
+        expect(ortbRequest.imp[0].video).not.to.be.undefined;
+        expect(ortbRequest.imp[0].native.request).not.to.be.undefined;
+        expect(ortbRequest.imp[0].bidfloor).to.deep.equal(1.23);
+        expect(ortbRequest.imp[0].bidfloorcur).to.deep.equal('USD');
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('build a multi imp request', function () {
+        const bidRequests = [{
+          adUnitCode: 'impId',
+          bidId: 'bidId',
+          mediaTypes: {
+            video: {
+              context: 'inbanner',
+              playerSize: [640, 360],
+              mimes: ['video/mp4', 'video/x-flv'],
+              maxduration: 30,
+              api: [1, 2],
+              protocols: [2, 3],
+              plcmt: 3,
+              w: 640,
+              h: 360,
+              linearity: 1,
+              skipmin: 30,
+              skipafter: 30,
+              minbitrate: 10000,
+              maxbitrate: 48000,
+              delivery: [1, 2, 3],
+              pos: 1,
+              playbackend: 1,
+              adPodDurationSec: 30,
+              durationRangeSec: [1, 30],
+              skip: 1,
+              minduration: 5,
+              startdelay: 5,
+              playbackmethod: [1, 3],
+              placement: 2
+            }
+          },
+          params: {
+            plc: '123'
+          },
+        }, {
+          adUnitCode: 'impId',
+          bidId: 'bidId2',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123',
+          }
+        }];
+        const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+        expect(ortbRequest.imp).to.have.lengthOf(2);
+        expect(ortbRequest.imp[0].video.skip).to.equal(1);
+        expect(ortbRequest.imp[0].video.minduration).to.equal(5);
+        expect(ortbRequest.imp[0].video.startdelay).to.equal(5);
+        expect(ortbRequest.imp[0].video.playbackmethod).to.deep.equal([1, 3]);
+        expect(ortbRequest.imp[0].video.placement).to.equal(2);
+        // banner test
+        expect(ortbRequest.imp[1].banner).not.to.be.undefined;
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('build a multi format request', function () {
+        const bidRequests = [{
+          adUnitCode: 'impId',
+          bidId: 'bidId',
+          mediaTypes: {
+            video: {
+              context: 'inbanner',
+              playerSize: [640, 360],
+              mimes: ['video/mp4', 'video/x-flv'],
+              maxduration: 30,
+              api: [1, 2],
+              protocols: [2, 3],
+              plcmt: 3,
+              w: 640,
+              h: 360,
+              linearity: 1,
+              skipmin: 30,
+              skipafter: 30,
+              minbitrate: 10000,
+              maxbitrate: 48000,
+              delivery: [1, 2, 3],
+              pos: 1,
+              playbackend: 1,
+              adPodDurationSec: 30,
+              durationRangeSec: [1, 30],
+              skip: 1,
+              minduration: 5,
+              startdelay: 5,
+              playbackmethod: [1, 3],
+              placement: 2
+            },
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123'
+          },
+        }];
+        const ortbRequest = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest)).data;
+        expect(ortbRequest.imp).to.have.lengthOf(1);
+        expect(ortbRequest.imp[0].video.skip).to.equal(1);
+        expect(ortbRequest.imp[0].video.minduration).to.equal(5);
+        expect(ortbRequest.imp[0].video.startdelay).to.equal(5);
+        expect(ortbRequest.imp[0].video.playbackmethod).to.deep.equal([1, 3]);
+        expect(ortbRequest.imp[0].video.placement).to.equal(2);
+        // banner test
+        expect(ortbRequest.imp[0].banner).not.to.be.undefined;
+      });
+    }
+  });
+
+  describe('getUserSyncs', function () {
+    const syncEndPoint = 'https://sync.inmobi.com/prebidjs?';
+
+    it('should return empty if iframe disabled and pixelEnabled is false', function () {
+      const res = spec.getUserSyncs({});
+      expect(res).to.deep.equal([]);
+    });
+
+    it('should return user sync if iframe enabled is true', function () {
+      const res = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true });
+      expect(res).to.deep.equal([{ type: 'iframe', url: syncEndPoint }]);
+    });
+
+    it('should return user sync if iframe enabled is true and gdpr not present', function () {
+      const res = spec.getUserSyncs({ iframeEnabled: true }, {}, { gdprApplies: false });
+      expect(res).to.deep.equal([{ type: 'iframe', url: `${syncEndPoint}` }]);
+    });
+
+    it('should return user sync if iframe enabled is true and gdpr = 1 and gdpr consent present', function () {
+      const res = spec.getUserSyncs({ iframeEnabled: true }, {}, { gdprApplies: true, consentString: 'GDPR_CONSENT' });
+      expect(res).to.deep.equal([{ type: 'iframe', url: `${syncEndPoint}gdpr=1&gdpr_consent=GDPR_CONSENT` }]);
+    });
+
+    it('should return user sync if iframe enabled is true and gdpr = 1 , gdpr consent present and usp_consent present', function () {
+      const res = spec.getUserSyncs({ iframeEnabled: true }, {}, { gdprApplies: true, consentString: 'GDPR_CONSENT' }, 'USP_CONSENT');
+      expect(res).to.deep.equal([{ type: 'iframe', url: `${syncEndPoint}gdpr=1&gdpr_consent=GDPR_CONSENT&us_privacy=USP_CONSENT` }]);
+    });
+
+    it('should return user sync if iframe enabled is true  usp_consent present and gppConsent present', function () {
+      const res = spec.getUserSyncs({ iframeEnabled: true }, {}, { gdprApplies: false, consentString: undefined }, 'USP_CONSENT', { gppString: 'GPP_STRING', applicableSections: [32, 51] });
+      expect(res).to.deep.equal([{ type: 'iframe', url: `${syncEndPoint}us_privacy=USP_CONSENT&gpp=GPP_STRING&gpp_sid=32%2C51` }]);
+    });
+
+    const responses = [{
+      body: {
+        ext: {
+          prebidjs: {
+            urls: [
+              {
+                url: 'https://sync.inmobi.com/prebidjs'
+              },
+              {
+                url: 'https://eus.rubiconproject.com/usync.html?p=test'
+              }
+            ]
+          }
+        }
+      }
+    }];
+
+    it('should return urls from response when iframe enabled is false and pixel enabled', function () {
+      const res = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: true }, responses);
+      expect(res).to.deep.equal([
+        { type: 'image', url: 'https://sync.inmobi.com/prebidjs' },
+        { type: 'image', url: 'https://eus.rubiconproject.com/usync.html?p=test' }
+      ])
+    });
+
+    it('should return urls from response when iframe enabled is false and pixel enabled and empty responses', function () {
+      const responses = [];
+      const res = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: true }, responses);
+      expect(res).to.deep.equal([
+        { type: 'image', url: `${syncEndPoint}` }
+      ])
+    });
+
+    it('should return urls from response when iframe enabled is false and pixel enabled and no response', function () {
+      const responses = undefined;
+      const res = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: true }, responses);
+      expect(res).to.deep.equal([
+        { type: 'image', url: `${syncEndPoint}` }
+      ])
+    });
+
+    it('should return urls from response when iframe enabled is false and all consent parameters present', function () {
+      const res = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: true }, responses, { gdprApplies: true, consentString: 'GDPR_CONSENT' }, 'USP_CONSENT', { gppString: 'GPP_STRING', applicableSections: [32, 51] });
+      expect(res).to.deep.equal([
+        { type: 'image', url: 'https://sync.inmobi.com/prebidjs?gdpr=1&gdpr_consent=GDPR_CONSENT&us_privacy=USP_CONSENT&gpp=GPP_STRING&gpp_sid=32%2C51' },
+        { type: 'image', url: 'https://eus.rubiconproject.com/usync.html?p=test&gdpr=1&gdpr_consent=GDPR_CONSENT&us_privacy=USP_CONSENT&gpp=GPP_STRING&gpp_sid=32%2C51' }
+      ])
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidderRequest = {
+      refererInfo: {
+        page: 'https://raapchikgames.com',
+        topmostLocation: 'https://raapchikgames.com'
+      },
+      timeout: 3000,
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'consentDataString',
+        vendorData: {
+          vendorConsents: {
+            '333': 1
+          },
+        },
+        apiVersion: 1,
+      },
+    };
+    function mockResponse(winningBidId, mediaType) {
+      return {
+        id: '95d08af8-2d50-4d75-a411-8ecd9224970e',
+        cur: 'USD',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '20dd72ed-930f-1000-e56f-07c37a793f30',
+                impid: winningBidId,
+                price: 1.1645,
+                adomain: ['advertiserDomain.sandbox.inmobi.com'],
+                crid: '88b37efcd5f34d368e60317c706942a4ef6f6976eb394046958fd0e8a7b75301',
+                w: 320,
+                h: 50,
+                adm: 'test-ad',
+                mtype: mediaType,
+                nurl: 'https://et-l.w.inmobi.com/c.asm/',
+                api: 3,
+                cat: [],
+                ext: {
+                  loggingPercentage: 100,
+                  prebid: {
+                    meta: {
+                      advertiserDomains: ['advertiserDomain.sandbox.inmobi.com'],
+                      networkName: 'inmobi'
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        ],
+        ext: {
+          prebidjs: {
+            urls: [
+              { url: 'https://sync.inmobi.com/prebidjs' },
+              { url: 'https://eus.rubiconproject.com/usync.html?p=test' }
+            ]
+          }
+        }
+      };
+    };
+
+    function mockResponseNative(winningBidId, mediaType) {
+      return {
+        id: '95d08af8-2d50-4d75-a411-8ecd9224970e',
+        cur: 'USD',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '20dd72ed-930f-1000-e56f-07c37a793f30',
+                impid: winningBidId,
+                price: 1.1645,
+                adomain: ['advertiserDomain.sandbox.inmobi.com'],
+                crid: '88b37efcd5f34d368e60317c706942a4ef6f6976eb394046958fd0e8a7b75301',
+                w: 320,
+                h: 50,
+                adm: '{"native":{"ver":"1.2","assets":[{"img":{"w":100,"h":100,"type":3,"url":"https://supply.inmobicdn.net/sandbox-prod-assets/Native_testAd.png"},"id":1,"required":1},{"id":2,"title":{"len":140,"text":"Native-Title-InMobi-Sandbox"},"required":1},{"data":{"type":1,"value":""},"id":3,"required":1},{"data":{"type":2,"value":"InMobi native test - Subtitle"},"id":4,"required":0},{"img":{"w":20,"h":20,"type":1,"url":"https://supply.inmobicdn.net/sandbox-prod-assets/inmobi-Logo-150x150.png"},"id":5,"required":0}],"link":{"clicktrackers":["https://c-eus.w.inmobi.com/"],"url":"https://www.inmobi.com"},"eventtrackers":[{"method":1,"event":1,"url":"https://et-eus.w.inmobi.com/"}]}}',
+                mtype: mediaType,
+                nurl: 'https://et-l.w.inmobi.com/c.asm/',
+                api: 3,
+                cat: [],
+                ext: {
+                  loggingPercentage: 100,
+                  prebid: {
+                    meta: {
+                      advertiserDomains: ['advertiserDomain.sandbox.inmobi.com'],
+                      networkName: 'inmobi'
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        ],
+        ext: {
+          prebidjs: {
+            urls: [
+              { url: 'https://sync.inmobi.com/prebidjs' },
+              { url: 'https://eus.rubiconproject.com/usync.html?p=test' }
+            ]
+          }
+        }
+      };
+    };
+
+    it('returns an empty array when bid response is empty', function () {
+      const bidRequests = [];
+      const response = {};
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const bids = spec.interpretResponse(response, request);
+      expect(bids).to.have.lengthOf(0);
+    });
+
+    it('should return an empty array when there is no bid response', function () {
+      const bidRequests = [];
+      const response = { seatbid: [] };
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const bids = spec.interpretResponse({ body: response }, request);
+      expect(bids).to.have.lengthOf(0);
+    });
+
+    it('return banner response', function () {
+      const bidRequests = [{
+        adUnitCode: 'impId',
+        bidId: 'bidId',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 50]]
+          }
+        },
+        params: {
+          plc: '124a',
+        }
+      }];
+      const response = mockResponse('bidId', 1);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const bids = spec.interpretResponse({ body: response }, request);
+      expect(bids).to.have.length(1);
+      expect(bids[0].currency).to.deep.equal('USD');
+      expect(bids[0].mediaType).to.deep.equal('banner');
+      expect(bids[0].requestId).to.deep.equal('bidId');
+      expect(bids[0].seatBidId).to.deep.equal('20dd72ed-930f-1000-e56f-07c37a793f30');
+      expect(bids[0].cpm).to.equal(1.1645);
+      expect(bids[0].width).to.equal(320);
+      expect(bids[0].height).to.equal(50);
+      expect(bids[0].creativeId).to.deep.equal('88b37efcd5f34d368e60317c706942a4ef6f6976eb394046958fd0e8a7b75301');
+      expect(bids[0].meta.loggingPercentage).to.equal(100);
+      expect(bids[0].meta.advertiserDomains[0]).to.deep.equal('advertiserDomain.sandbox.inmobi.com');
+      expect(bids[0].meta.prebid.meta.networkName).to.deep.equal('inmobi');
+    });
+
+    it('bid response when banner wins among two ad units', function () {
+      const bidRequests = [{
+        adUnitCode: 'impId',
+        bidId: 'bidId',
+        mediaTypes: {
+          video: {
+            context: 'instream',
+            mimes: ['video/mpeg'],
+            playerSize: [640, 320],
+            protocols: [5, 6],
+            maxduration: 30,
+            api: [1, 2]
+          }
+        },
+        params: {
+          plc: '123',
+        },
+      }, {
+        adUnitCode: 'impId',
+        bidId: 'bidId2',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 50]]
+          }
+        },
+        params: {
+          plc: '123',
+        }
+      }];
+      const response = mockResponse('bidId2', 1);
+      const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+      const bids = spec.interpretResponse({ body: response }, request);
+      expect(bids[0].currency).to.deep.equal('USD');
+      expect(bids[0].mediaType).to.deep.equal('banner');
+      expect(bids[0].requestId).to.deep.equal('bidId2');
+      expect(bids[0].seatBidId).to.deep.equal('20dd72ed-930f-1000-e56f-07c37a793f30');
+      expect(bids[0].cpm).to.equal(1.1645);
+      expect(bids[0].width).to.equal(320);
+      expect(bids[0].height).to.equal(50);
+      expect(bids[0].creativeId).to.deep.equal('88b37efcd5f34d368e60317c706942a4ef6f6976eb394046958fd0e8a7b75301');
+      expect(bids[0].meta.loggingPercentage).to.equal(100);
+      expect(bids[0].meta.advertiserDomains[0]).to.deep.equal('advertiserDomain.sandbox.inmobi.com');
+      expect(bids[0].meta.prebid.meta.networkName).to.deep.equal('inmobi');
+    });
+
+    if (FEATURES.VIDEO) {
+      it('return instream video response', function () {
+        const bidRequests = [{
+          adUnitCode: 'impId',
+          bidId: 'bidId',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              mimes: ['video/mpeg'],
+              playerSize: [640, 320],
+              protocols: [5, 6],
+              maxduration: 30,
+              api: [1, 2]
+            }
+          },
+          params: {
+            plc: '123a1',
+          },
+        }];
+        const response = mockResponse('bidId', 2);
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(VIDEO);
+        expect(bids[0].currency).to.deep.equal('USD');
+        expect(bids[0].requestId).to.deep.equal('bidId');
+        expect(bids[0].seatBidId).to.deep.equal('20dd72ed-930f-1000-e56f-07c37a793f30');
+        expect(bids[0].cpm).to.equal(1.1645);
+        expect(bids[0].playerWidth).to.equal(640);
+        expect(bids[0].playerHeight).to.equal(320);
+        expect(bids[0].creativeId).to.deep.equal('88b37efcd5f34d368e60317c706942a4ef6f6976eb394046958fd0e8a7b75301');
+        expect(bids[0].meta.loggingPercentage).to.equal(100);
+        expect(bids[0].meta.advertiserDomains[0]).to.deep.equal('advertiserDomain.sandbox.inmobi.com');
+        expect(bids[0].meta.prebid.meta.networkName).to.deep.equal('inmobi');
+        expect(bids[0].vastUrl).to.equal('https://et-l.w.inmobi.com/c.asm/');
+        expect(bids[0].vastXml).to.equal('test-ad');
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('return video outstream response', function () {
+        const bidRequests = [{
+          adUnitCode: 'impId',
+          bidId: 'bidId',
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              mimes: ['video/mpeg'],
+              playerSize: [640, 320],
+              protocols: [5, 6],
+              maxduration: 30,
+              api: [1, 2]
+            }
+          },
+          params: {
+            plc: '123a1',
+          },
+        }];
+        const response = mockResponse('bidId', 2);
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(VIDEO);
+        expect(bids[0].currency).to.deep.equal('USD');
+        expect(bids[0].requestId).to.deep.equal('bidId');
+        expect(bids[0].seatBidId).to.deep.equal('20dd72ed-930f-1000-e56f-07c37a793f30');
+        expect(bids[0].cpm).to.equal(1.1645);
+        expect(bids[0].playerWidth).to.equal(640);
+        expect(bids[0].playerHeight).to.equal(320);
+        expect(bids[0].creativeId).to.deep.equal('88b37efcd5f34d368e60317c706942a4ef6f6976eb394046958fd0e8a7b75301');
+        expect(bids[0].meta.loggingPercentage).to.equal(100);
+        expect(bids[0].meta.advertiserDomains[0]).to.deep.equal('advertiserDomain.sandbox.inmobi.com');
+        expect(bids[0].meta.prebid.meta.networkName).to.deep.equal('inmobi');
+        expect(bids[0].vastUrl).to.equal('https://et-l.w.inmobi.com/c.asm/');
+        expect(bids[0].vastXml).to.equal('test-ad');
+      });
+    }
+
+    if (FEATURES.VIDEO) {
+      it('bid response when video wins among two ad units', function () {
+        const bidRequests = [{
+          adUnitCode: 'impId',
+          bidId: 'bidId',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              mimes: ['video/mpeg'],
+              playerSize: [640, 320],
+              protocols: [5, 6],
+              maxduration: 30,
+              api: [1, 2]
+            }
+          },
+          params: {
+            plc: '123',
+          },
+        }, {
+          adUnitCode: 'impId',
+          bidId: 'bidId2',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123',
+          }
+        }];
+        const response = mockResponse('bidId', 2);
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(VIDEO);
+        expect(bids[0].currency).to.deep.equal('USD');
+        expect(bids[0].requestId).to.deep.equal('bidId');
+        expect(bids[0].seatBidId).to.deep.equal('20dd72ed-930f-1000-e56f-07c37a793f30');
+        expect(bids[0].cpm).to.equal(1.1645);
+        expect(bids[0].playerWidth).to.equal(640);
+        expect(bids[0].playerHeight).to.equal(320);
+        expect(bids[0].creativeId).to.deep.equal('88b37efcd5f34d368e60317c706942a4ef6f6976eb394046958fd0e8a7b75301');
+        expect(bids[0].meta.loggingPercentage).to.equal(100);
+        expect(bids[0].meta.advertiserDomains[0]).to.deep.equal('advertiserDomain.sandbox.inmobi.com');
+        expect(bids[0].meta.prebid.meta.networkName).to.deep.equal('inmobi');
+        expect(bids[0].vastUrl).to.equal('https://et-l.w.inmobi.com/c.asm/');
+        expect(bids[0].vastXml).to.equal('test-ad');
+      });
+    }
+
+    if (FEATURES.NATIVE) {
+      it('should correctly parse a native bid response', function () {
+        const bidRequests = [{
+          adUnitCode: 'impId',
+          bidId: 'bidId',
+          params: {
+            plc: '123',
+          },
+          native: true,
+          bidder: 'inmobi',
+          mediaTypes: {
+            native: {
+              image: {
+                required: true,
+                sizes: [120, 60],
+                sendId: true,
+                sendTargetingKeys: false
+              }
+            }
+          }
+        }];
+        const response = mockResponseNative('bidId', 4);
+        const expectedAdmNativeOrtb = JSON.parse(response.seatbid[0].bid[0].adm).native;
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(NATIVE);
+        // testing
+        expect(bids[0].requestId).to.deep.equal('bidId');
+        expect(bids[0].seatBidId).to.deep.equal('20dd72ed-930f-1000-e56f-07c37a793f30')
+        expect(bids[0].cpm).to.deep.equal(1.1645);
+        expect(bids[0].currency).to.deep.equal('USD');
+        expect(bids[0].width).to.deep.equal(320);
+        expect(bids[0].height).to.deep.equal(50);
+        expect(bids[0].ad).to.equal(undefined);
+        expect(bids[0].native.ortb).not.to.be.null;
+        expect(bids[0].native.ortb).to.deep.equal(expectedAdmNativeOrtb);
+        expect(bids[0].creativeId).to.deep.equal('88b37efcd5f34d368e60317c706942a4ef6f6976eb394046958fd0e8a7b75301');
+        expect(bids[0].meta.advertiserDomains[0]).to.deep.equal('advertiserDomain.sandbox.inmobi.com');
+        expect(bids[0].meta.prebid.meta.networkName).to.deep.equal('inmobi');
+      });
+    }
+
+    if (FEATURES.NATIVE) {
+      it('should correctly parse a native bid response when there are two ad units', function () {
+        const bidRequests = [{
+          adUnitCode: 'impId',
+          bidId: 'bidId',
+          params: {
+            plc: '123',
+          },
+          native: true,
+          bidder: 'inmobi',
+          mediaTypes: {
+            native: {
+              image: {
+                required: true,
+                sizes: [120, 60],
+                sendId: true,
+                sendTargetingKeys: false
+              }
+            }
+          }
+        },
+        {
+          adUnitCode: 'impId',
+          bidId: 'bidId2',
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50]]
+            }
+          },
+          params: {
+            plc: '123',
+          }
+        }];
+        const response = mockResponseNative('bidId', 4);
+        const expectedAdmNativeOrtb = JSON.parse(response.seatbid[0].bid[0].adm).native;
+        const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+        const bids = spec.interpretResponse({ body: response }, request);
+        expect(bids).to.have.lengthOf(1);
+        expect(bids[0].mediaType).to.equal(NATIVE);
+        // testing
+        expect(bids[0].requestId).to.deep.equal('bidId');
+        expect(bids[0].seatBidId).to.deep.equal('20dd72ed-930f-1000-e56f-07c37a793f30')
+        expect(bids[0].cpm).to.deep.equal(1.1645);
+        expect(bids[0].currency).to.deep.equal('USD');
+        expect(bids[0].width).to.deep.equal(320);
+        expect(bids[0].height).to.deep.equal(50);
+        expect(bids[0].ad).to.equal(undefined);
+        expect(bids[0].native.ortb).not.to.be.null;
+        expect(bids[0].native.ortb).to.deep.equal(expectedAdmNativeOrtb);
+        expect(bids[0].creativeId).to.deep.equal('88b37efcd5f34d368e60317c706942a4ef6f6976eb394046958fd0e8a7b75301');
+        expect(bids[0].meta.advertiserDomains[0]).to.deep.equal('advertiserDomain.sandbox.inmobi.com');
+        expect(bids[0].meta.prebid.meta.networkName).to.deep.equal('inmobi');
+      });
+    }
+  });
+});
diff --git a/test/spec/modules/innityBidAdapter_spec.js b/test/spec/modules/innityBidAdapter_spec.js
index 192ab4911ee..820f535ba72 100644
--- a/test/spec/modules/innityBidAdapter_spec.js
+++ b/test/spec/modules/innityBidAdapter_spec.js
@@ -120,5 +120,11 @@ describe('innityAdapterTest', () => {
       expect(result[0].meta.advertiserDomains.length).to.equal(0);
       expect(result[0].meta.advertiserDomains).to.deep.equal([]);
     });
+
+    it('result with no bids', () => {
+      bidResponse.body = {};
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+      expect(result).to.deep.equal([]);
+    });
   });
 });
diff --git a/test/spec/modules/insticatorBidAdapter_spec.js b/test/spec/modules/insticatorBidAdapter_spec.js
index e24bcb3b455..158fdebeb76 100644
--- a/test/spec/modules/insticatorBidAdapter_spec.js
+++ b/test/spec/modules/insticatorBidAdapter_spec.js
@@ -75,9 +75,10 @@ describe('InsticatorBidAdapter', function () {
     ortb2: {
       source: {
         tid: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
-      }
+      },
     },
     timeout: 300,
+    gdprApplies: 1,
     gdprConsent: {
       consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
       vendorData: {},
@@ -161,7 +162,20 @@ describe('InsticatorBidAdapter', function () {
       })).to.be.false;
     });
 
-    it('should return false if video placement is not a number', () => {
+    it('should return true if video object is absent/undefined', () => {
+      expect(spec.isBidRequestValid({
+        ...bidRequest,
+        ...{
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            },
+          }
+        }
+      })).to.be.true;
+    })
+
+    it('should return false if video plcmt is not a number', () => {
       expect(spec.isBidRequestValid({
         ...bidRequest,
         ...{
@@ -173,12 +187,111 @@ describe('InsticatorBidAdapter', function () {
               ],
               w: 250,
               h: 300,
-              placement: 'NaN',
+              plcmt: 'NaN',
             },
           }
         }
       })).to.be.false;
     });
+
+    it('should return true if playerSize is present instead of w and h', () => {
+      expect(spec.isBidRequestValid({
+        ...bidRequest,
+        ...{
+          mediaTypes: {
+            video: {
+              mimes: [
+                'video/mp4',
+                'video/mpeg',
+              ],
+              playerSize: [250, 300],
+              plcmt: 1,
+            },
+          }
+        }
+      })).to.be.true;
+    });
+
+    it('should return true if optional video fields are valid', () => {
+      expect(spec.isBidRequestValid({
+        ...bidRequest,
+        ...{
+          mediaTypes: {
+            video: {
+              mimes: [
+                'video/mp4',
+                'video/mpeg',
+              ],
+              playerSize: [250, 300],
+              placement: 1,
+              startdelay: 1,
+              skip: 1,
+              skipmin: 1,
+              skipafter: 1,
+              minduration: 1,
+              maxduration: 1,
+              api: [1, 2],
+              protocols: [2],
+              battr: [1, 2],
+              playbackmethod: [1, 2],
+              playbackend: 1,
+              delivery: [1, 2],
+              pos: 1,
+            },
+          }
+        }
+      })).to.be.true;
+    });
+
+    it('should return false if video min duration > max duration', () => {
+      expect(spec.isBidRequestValid({
+        ...bidRequest,
+        ...{
+          mediaTypes: {
+            video: {
+              mimes: [
+                'video/mp4',
+                'video/mpeg',
+              ],
+              playerSize: [250, 300],
+              placement: 1,
+              minduration: 5,
+              maxduration: 4,
+            },
+          }
+        }
+      })).to.be.false;
+    });
+
+    it('should return true when video bidder params override bidRequest video params', () => {
+      expect(spec.isBidRequestValid({
+        ...bidRequest,
+        ...{
+          mediaTypes: {
+            video: {
+              mimes: [
+                'video/mp4',
+                'video/mpeg',
+              ],
+              playerSize: [250, 300],
+              plcmt: 1,
+            },
+          }
+        },
+        params: {
+          ...bidRequest.params,
+          video: {
+            mimes: [
+              'video/mp4',
+              'video/mpeg',
+              'video/x-flv',
+              'video/webm',
+            ],
+            plcmt: 2,
+          },
+        }
+      })).to.be.true;
+    });
   });
 
   describe('buildRequests', function () {
@@ -276,7 +389,7 @@ describe('InsticatorBidAdapter', function () {
       expect(data.device).to.be.an('object');
       expect(data.device.w).to.equal(window.innerWidth);
       expect(data.device.h).to.equal(window.innerHeight);
-      expect(data.device.js).to.equal(true);
+      expect(data.device.js).to.equal(1);
       expect(data.device.ext).to.be.an('object');
       expect(data.device.ext.localStorage).to.equal(true);
       expect(data.device.ext.cookies).to.equal(false);
@@ -326,6 +439,13 @@ describe('InsticatorBidAdapter', function () {
           insticator: {
             adUnitId: bidRequest.params.adUnitId,
           },
+          prebid: {
+            bidder: {
+              insticator: {
+                adUnitId: bidRequest.params.adUnitId,
+              }
+            }
+          }
         }
       }]);
       expect(data.ext).to.be.an('object');
@@ -347,14 +467,343 @@ describe('InsticatorBidAdapter', function () {
 
       expect(data.user.id).to.equal(USER_ID_STUBBED);
     });
-    it('should return empty regs object if no gdprConsent is passed', function () {
+
+    it('should return with coppa regs object if no gdprConsent is passed', function () {
       const requests = spec.buildRequests([bidRequest], { ...bidderRequest, ...{ gdprConsent: false } });
       const data = JSON.parse(requests[0].data);
-      expect(data.regs).to.be.an('object').that.is.empty;
+      expect(data.regs).to.be.an('object');
+      expect(data.regs.coppa).to.be.oneOf([0, 1]);
+    });
+
+    it('should return with us_privacy string if uspConsent is passed', function () {
+      const requests = spec.buildRequests([bidRequest], { ...bidderRequest, ...{ uspConsent: '1YNN' } });
+      const data = JSON.parse(requests[0].data);
+      expect(data.regs).to.be.an('object');
+      expect(data.regs.ext).to.be.an('object');
+      expect(data.regs.ext.us_privacy).to.equal('1YNN');
+      expect(data.regs.ext.ccpa).to.equal('1YNN');
+    });
+
+    it('should return with gpp if gppConsent is passed', function () {
+      const requests = spec.buildRequests([bidRequest], { ...bidderRequest, ...{ gppConsent: { gppString: '1YNN', applicableSections: ['1', '2'] } } });
+      const data = JSON.parse(requests[0].data);
+      expect(data.regs).to.be.an('object');
+      expect(data.regs.ext).to.be.an('object');
+      expect(data.regs.ext.gppSid).to.deep.equal(['1', '2']);
+    });
+
+    it('should create the request with dsa data and return with dsa object', function() {
+      const dsa = {
+        dsarequired: 2,
+        pubrender: 1,
+        datatopub: 2,
+        transparency: [{
+          domain: 'google.com',
+          dsaparams: [1, 2]
+        }]
+      }
+      const bidRequestWithDsa = {
+        ...bidderRequest,
+        ortb2: {
+          regs: {
+            ext: {
+              dsa: dsa
+            }
+          }
+        }
+      }
+      const requests = spec.buildRequests([bidRequest], {...bidRequestWithDsa});
+      const data = JSON.parse(requests[0].data);
+      expect(data.regs).to.be.an('object');
+      expect(data.regs.ext).to.be.an('object');
+      expect(data.regs.ext.dsa).to.deep.equal(dsa);
     });
+
     it('should return empty array if no valid requests are passed', function () {
       expect(spec.buildRequests([], bidderRequest)).to.be.an('array').that.have.lengthOf(0);
     });
+
+    it('should have bidder params override bidRequest mediatypes', function () {
+      const tempBiddRequest = {
+        ...bidRequest,
+        params: {
+          ...bidRequest.params,
+          video: {
+            mimes: [
+              'video/mp4',
+              'video/mpeg',
+              'video/x-flv',
+              'video/webm',
+              'video/ogg',
+            ],
+            plcmt: 4,
+            w: 640,
+            h: 480,
+          }
+        }
+      }
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].video.mimes).to.deep.equal([
+        'video/mp4',
+        'video/mpeg',
+        'video/x-flv',
+        'video/webm',
+        'video/ogg',
+      ])
+      expect(data.imp[0].video.placement).to.equal(2);
+      expect(data.imp[0].video.plcmt).to.equal(4);
+      expect(data.imp[0].video.w).to.equal(640);
+      expect(data.imp[0].video.h).to.equal(480);
+    });
+
+    it('should have bidder bidfloor from the request', function () {
+      const tempBiddRequest = {
+        ...bidRequest,
+        params: {
+          ...bidRequest.params,
+          floor: 0.5,
+        },
+      }
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].bidfloor).to.equal(0.5);
+      expect(data.imp[0].bidfloorcur).to.equal('USD');
+    });
+
+    it('should have bidder bidfloorcur from the request', function () {
+      const expectedFloor = 1.5;
+      const currency = 'USD';
+      const tempBiddRequest = {
+        ...bidRequest,
+        params: {
+          ...bidRequest.params,
+          floor: 0.5,
+          currency: 'USD',
+        },
+      }
+      tempBiddRequest.getFloor = () => ({ floor: expectedFloor, currency })
+
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].bidfloor).to.equal(1.5);
+      expect(data.imp[0].bidfloorcur).to.equal('USD');
+    });
+
+    it('should have 1 floor for banner 300x250 and 1.5 for 300x600', function () {
+      const tempBiddRequest = {
+        ...bidRequest,
+        params: {
+          ...bidRequest.params,
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+            format: [{ w: 300, h: 250 }]
+          },
+        },
+      }
+      tempBiddRequest.getFloor = (params) => {
+        return { floor: params.size[1] === 250 ? 1 : 1.5, currency: 'USD' }
+      }
+
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].bidfloor).to.equal(1);
+
+      tempBiddRequest.mediaTypes.banner.format = [ { w: 300, h: 600 },
+      ];
+      const request2 = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data2 = JSON.parse(request2[0].data);
+      expect(data2.imp[0].bidfloor).to.equal(1.5);
+    });
+
+    it('should have 4 floor for video 300x250 and 4.5 for 300x600', function () {
+      const tempBiddRequest = {
+        ...bidRequest,
+        params: {
+          ...bidRequest.params,
+        },
+        mediaTypes: {
+          video: {
+            mimes: [
+              'video/mp4',
+              'video/mpeg',
+            ],
+            w: 300,
+            h: 250,
+            placement: 2,
+          },
+        },
+      }
+      tempBiddRequest.getFloor = (params) => {
+        return { floor: params.size[1] === 250 ? 4 : 4.5, currency: 'USD' }
+      }
+
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].bidfloor).to.equal(4);
+
+      tempBiddRequest.mediaTypes.video.w = 300;
+      tempBiddRequest.mediaTypes.video.h = 600;
+      const request2 = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data2 = JSON.parse(request2[0].data);
+      expect(data2.imp[0].bidfloor).to.equal(4.5);
+    });
+
+    it('should have sites first party data if present in bidderRequest ortb2', function () {
+      bidderRequest = {
+        ...bidderRequest,
+        ortb2: {
+          ...bidderRequest.ortb2,
+          site: {
+            keywords: 'keyword1,keyword2',
+            search: 'search',
+            content: {
+              title: 'title',
+              keywords: 'keyword3,keyword4',
+              genre: 'rock'
+            },
+            cat: ['IAB1', 'IAB2']
+          }
+        }
+      }
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data).to.have.property('site');
+      expect(data.site).to.have.property('keywords');
+      expect(data.site.keywords).to.equal('keyword1,keyword2');
+      expect(data.site).to.have.property('search');
+      expect(data.site.search).to.equal('search');
+      expect(data.site).to.have.property('content');
+      expect(data.site.content).to.have.property('title');
+      expect(data.site.content.title).to.equal('title');
+      expect(data.site.content).to.have.property('keywords');
+      expect(data.site.content.keywords).to.equal('keyword3,keyword4');
+      expect(data.site.content).to.have.property('genre');
+      expect(data.site.content.genre).to.equal('rock');
+      expect(data.site).to.have.property('cat');
+      expect(data.site.cat).to.deep.equal(['IAB1', 'IAB2']);
+    });
+
+    it('should have device.sua if present in bidderRequest ortb2', function () {
+      bidderRequest = {
+        ...bidderRequest,
+        ortb2: {
+          ...bidderRequest.ortb2,
+          device: {
+            ...bidderRequest.ortb2.device,
+            sua: {}
+          }
+        }
+      }
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data).to.have.property('device');
+      expect(data.device).to.have.property('sua');
+    })
+
+    it('should use param bid_endpoint_request_url for request endpoint if present', function () {
+      const tempBiddRequest = {
+        ...bidRequest,
+        params: {
+          ...bidRequest.params,
+          bid_endpoint_request_url: 'https://example.com'
+        }
+      }
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      expect(requests[0].url).to.equal('https://example.com');
+    });
+
+    it('should have user keywords if present in bidrequest', function () {
+      const tempBiddRequest = {
+        ...bidRequest,
+        params: {
+          ...bidRequest.params,
+          user: {
+            keywords: 'keyword1,keyword2'
+          }
+        }
+      }
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.user).to.have.property('keywords');
+      expect(data.user.keywords).to.equal('keyword1,keyword2');
+    });
+
+    it('should remove video params if they are invalid', function () {
+      const tempBiddRequest = {
+        ...bidRequest,
+        mediaTypes: {
+          ...bidRequest.mediaTypes,
+          video: {
+            mimes: [
+              'video/mp4',
+              'video/mpeg',
+              'video/x-flv',
+              'video/webm',
+              'video/ogg',
+            ],
+            protocols: 'NaN',
+            w: '300',
+            h: '250',
+          }
+        }
+      }
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].video).to.not.have.property('plcmt');
+    });
+
+    it('should have user consent and gdpr string if gdprConsent is passed', function () {
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.regs).to.be.an('object');
+      expect(data.regs.ext).to.be.an('object');
+      expect(data.regs.ext.gdpr).to.equal(1);
+      expect(data.regs.ext.gdprConsentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.user.ext).to.have.property('consent');
+      expect(data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
+    });
+
+    it('should have one or more privacy policies if present in bidrequest, like gpp, gdpr and us_privacy', function () {
+      const requests = spec.buildRequests([bidRequest], { ...bidderRequest, ...{ uspConsent: '1YNN' } });
+      const data = JSON.parse(requests[0].data);
+      expect(data.regs.ext).to.have.property('gdpr');
+      expect(data.regs.ext).to.have.property('us_privacy');
+      expect(data.regs.ext).to.have.property('gppSid');
+    });
+
+    it('should return true if publisherId is absent', () => {
+      expect(spec.isBidRequestValid(bidRequest)).to.be.true;
+    })
+
+    it('should have publisher object with id in site object, if publisherId present in params', function () {
+      const tempBiddRequest = {
+        ...bidRequest,
+      }
+      tempBiddRequest.params = {
+        ...tempBiddRequest.params,
+        publisherId: '86dd03a1-053f-4e3e-90e7-389070a0c62c'
+      }
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.site.publisher).to.be.an('object');
+      expect(data.site.publisher.id).to.equal(tempBiddRequest.params.publisherId)
+    });
+
+    it('should have publisher object should be empty, if publisherId is empty string', function () {
+      const tempBiddRequest = {
+        ...bidRequest,
+      }
+      tempBiddRequest.params = {
+        ...tempBiddRequest.params,
+        publisherId: ''
+      }
+      const requests = spec.buildRequests([tempBiddRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.site.publisher).to.not.an('object');
+    });
   });
 
   describe('interpretResponse', function () {
@@ -570,4 +1019,188 @@ describe('InsticatorBidAdapter', function () {
       expect(spec.getUserSyncs({}, [response])).to.have.length(0);
     })
   });
+
+  describe('Response with video Instream', function () {
+    const bidRequestVid = {
+      method: 'POST',
+      url: 'https://ex.ingage.tech/v1/openrtb',
+      options: {
+        contentType: 'application/json',
+        withCredentials: true,
+      },
+      data: '',
+      bidderRequest: {
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+        timeout: 300,
+        bids: [
+          {
+            bidder: 'insticator',
+            params: {
+              adUnitId: '1a2b3c4d5e6f1a2b3c4d'
+            },
+            adUnitCode: 'adunit-code-1',
+            mediaTypes: {
+              video: {
+                mimes: [
+                  'video/mp4',
+                  'video/mpeg',
+                ],
+                playerSize: [[250, 300]],
+                placement: 2,
+                plcmt: 2,
+              }
+            },
+            bidId: 'bid1',
+          }
+        ]
+      }
+    };
+
+    const bidResponseVid = {
+      body: {
+        id: '22edbae2733bf6',
+        bidid: 'foo9876',
+        cur: 'USD',
+        seatbid: [
+          {
+            seat: 'some-dsp',
+            bid: [
+              {
+                ad: '',
+                impid: 'bid1',
+                crid: 'crid1',
+                price: 0.5,
+                w: 300,
+                h: 250,
+                adm: '',
+                exp: 60,
+                adomain: ['test1.com'],
+                ext: {
+                  meta: {
+                    test: 1
+                  }
+                },
+              }
+            ],
+          },
+        ]
+      }
+    };
+    const bidRequestWithVideo = utils.deepClone(bidRequestVid);
+
+    it('should have related properties for video Instream', function() {
+      const serverResponseWithInstream = utils.deepClone(bidResponseVid);
+      serverResponseWithInstream.body.seatbid[0].bid[0].vastXml = '';
+      serverResponseWithInstream.body.seatbid[0].bid[0].mediaType = 'video';
+      const bidResponse = spec.interpretResponse(serverResponseWithInstream, bidRequestWithVideo)[0];
+      expect(bidResponse).to.have.any.keys('mediaType', 'vastXml', 'vastUrl');
+      expect(bidResponse).to.have.property('mediaType', 'video');
+      expect(bidResponse.width).to.equal(300);
+      expect(bidResponse.height).to.equal(250);
+      expect(bidResponse).to.have.property('vastXml', '');
+      expect(bidResponse.vastUrl).to.match(/^data:text\/xml;charset=utf-8;base64,[\w+/=]+$/)
+    });
+  })
+
+  describe(`Response with DSA data`, function() {
+    const bidRequestDsa = {
+      method: 'POST',
+      url: 'https://ex.ingage.tech/v1/openrtb',
+      options: {
+        contentType: 'application/json',
+        withCredentials: true,
+      },
+      data: '',
+      bidderRequest: {
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+        timeout: 300,
+        bids: [
+          {
+            bidder: 'insticator',
+            params: {
+              adUnitId: '1a2b3c4d5e6f1a2b3c4d'
+            },
+            adUnitCode: 'adunit-code-1',
+            mediaTypes: {
+              video: {
+                mimes: [
+                  'video/mp4',
+                  'video/mpeg',
+                ],
+                playerSize: [[250, 300]],
+                placement: 2,
+                plcmt: 2,
+              }
+            },
+            bidId: 'bid1',
+          }
+        ],
+        ortb2: {
+          regs: {
+            ext: {
+              dsa: {
+                dsarequired: 2,
+                pubrender: 1,
+                datatopub: 2,
+                transparency: [{
+                  domain: 'google.com',
+                  dsaparams: [1, 2]
+                }]
+              }
+            }}
+        },
+      }
+    };
+
+    const bidResponseDsa = {
+      body: {
+        id: '22edbae2733bf6',
+        bidid: 'foo9876',
+        cur: 'USD',
+        seatbid: [
+          {
+            seat: 'some-dsp',
+            bid: [
+              {
+                ad: '',
+                impid: 'bid1',
+                crid: 'crid1',
+                price: 0.5,
+                w: 300,
+                h: 250,
+                adm: '',
+                exp: 60,
+                adomain: ['test1.com'],
+                ext: {
+                  meta: {
+                    test: 1,
+                  },
+                  dsa: {
+                    behalf: 'Advertiser',
+                    paid: 'Advertiser',
+                    transparency: [{
+                      domain: 'google.com',
+                      dsaparams: [1, 2]
+                    }],
+                    adrender: 1
+                  }
+                },
+              }
+            ],
+          },
+        ]
+      }
+    };
+    const bidRequestWithDsa = utils.deepClone(bidRequestDsa);
+    it('should have related properties for DSA data', function() {
+      const serverResponseWithDsa = utils.deepClone(bidResponseDsa);
+      const bidResponse = spec.interpretResponse(serverResponseWithDsa, bidRequestWithDsa)[0];
+      expect(bidResponse).to.have.any.keys('ext');
+      expect(bidResponse.ext.dsa).to.have.property('behalf', 'Advertiser');
+      expect(bidResponse.ext.dsa).to.have.property('paid', 'Advertiser');
+      expect(bidResponse.ext.dsa).to.have.property('adrender', 1);
+    });
+  });
 });
diff --git a/test/spec/modules/integr8BidAdapter_spec.js b/test/spec/modules/integr8BidAdapter_spec.js
index 8c5a4b47903..01bb706df25 100644
--- a/test/spec/modules/integr8BidAdapter_spec.js
+++ b/test/spec/modules/integr8BidAdapter_spec.js
@@ -72,7 +72,7 @@ describe('integr8AdapterTest', () => {
     });
 
     it('bidRequest url', () => {
-      const endpointUrl = 'https://integr8.central.gjirafa.tech/bid';
+      const endpointUrl = 'https://central.sea.integr8.digital/bid';
       const requests = spec.buildRequests(bidRequests);
       requests.forEach(function (requestItem) {
         expect(requestItem.url).to.match(new RegExp(`${endpointUrl}`));
@@ -113,7 +113,7 @@ describe('integr8AdapterTest', () => {
   describe('interpretResponse', () => {
     const bidRequest = {
       'method': 'POST',
-      'url': 'https://integr8.central.gjirafa.tech/bid',
+      'url': 'https://central.sea.integr8.digital/bid',
       'data': {
         'sizes': '728x90',
         'adUnitId': 'hb-leaderboard',
diff --git a/test/spec/modules/intentIqAnalyticsAdapter_spec.js b/test/spec/modules/intentIqAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..5ba0686af0b
--- /dev/null
+++ b/test/spec/modules/intentIqAnalyticsAdapter_spec.js
@@ -0,0 +1,327 @@
+import { expect } from 'chai';
+import iiqAnalyticsAnalyticsAdapter from 'modules/intentIqAnalyticsAdapter.js';
+import * as utils from 'src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+import { config } from 'src/config.js';
+import { EVENTS } from 'src/constants.js';
+import * as events from 'src/events.js';
+import { getStorageManager } from 'src/storageManager.js';
+import sinon from 'sinon';
+import { REPORTER_ID, preparePayload } from '../../../modules/intentIqAnalyticsAdapter';
+import {FIRST_PARTY_KEY, VERSION} from '../../../libraries/intentIqConstants/intentIqConstants.js';
+import * as detectBrowserUtils from '../../../libraries/intentIqUtils/detectBrowserUtils.js';
+import {getReferrer, appendVrrefAndFui} from '../../../libraries/intentIqUtils/getRefferer.js';
+
+const partner = 10;
+const defaultData = '{"pcid":"f961ffb1-a0e1-4696-a9d2-a21d815bd344", "group": "A"}';
+const version = VERSION;
+
+const storage = getStorageManager({ moduleType: 'analytics', moduleName: 'iiqAnalytics' });
+
+const USERID_CONFIG = [
+  {
+    'name': 'intentIqId',
+    'params': {
+      'partner': partner,
+      'unpack': null,
+    },
+    'storage': {
+      'type': 'html5',
+      'name': 'intentIqId',
+      'expires': 60,
+      'refreshInSeconds': 14400
+    }
+  }
+];
+
+let wonRequest = {
+  'bidderCode': 'pubmatic',
+  'width': 728,
+  'height': 90,
+  'statusMessage': 'Bid available',
+  'adId': '23caeb34c55da51',
+  'requestId': '87615b45ca4973',
+  'transactionId': '5e69fd76-8c86-496a-85ce-41ae55787a50',
+  'auctionId': '0cbd3a43-ff45-47b8-b002-16d3946b23bf',
+  'mediaType': 'banner',
+  'source': 'client',
+  'cpm': 5,
+  'currency': 'USD',
+  'ttl': 300,
+  'referrer': '',
+  'adapterCode': 'pubmatic',
+  'originalCpm': 5,
+  'originalCurrency': 'USD',
+  'responseTimestamp': 1669644710345,
+  'requestTimestamp': 1669644710109,
+  'bidder': 'testbidder',
+  'adUnitCode': 'addUnitCode',
+  'timeToRespond': 236,
+  'pbLg': '5.00',
+  'pbMg': '5.00',
+  'pbHg': '5.00',
+  'pbAg': '5.00',
+  'pbDg': '5.00',
+  'pbCg': '',
+  'size': '728x90',
+  'status': 'rendered'
+};
+
+describe('IntentIQ tests all', function () {
+  let logErrorStub;
+  let getWindowSelfStub;
+  let getWindowTopStub;
+  let getWindowLocationStub;
+  let detectBrowserStub;
+
+  beforeEach(function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+    sinon.stub(config, 'getConfig').withArgs('userSync.userIds').returns(USERID_CONFIG);
+    sinon.stub(events, 'getEvents').returns([]);
+    iiqAnalyticsAnalyticsAdapter.enableAnalytics({
+      provider: 'iiqAnalytics',
+    });
+    iiqAnalyticsAnalyticsAdapter.initOptions = {
+      lsValueInitialized: false,
+      partner: null,
+      fpid: null,
+      userGroup: null,
+      currentGroup: null,
+      dataInLs: null,
+      eidl: null,
+      lsIdsInitialized: false,
+      manualWinReportEnabled: false,
+      domainName: null
+    };
+    if (iiqAnalyticsAnalyticsAdapter.track.restore) {
+      iiqAnalyticsAnalyticsAdapter.track.restore();
+    }
+    sinon.spy(iiqAnalyticsAnalyticsAdapter, 'track');
+  });
+
+  afterEach(function () {
+    logErrorStub.restore();
+    if (getWindowSelfStub) getWindowSelfStub.restore();
+    if (getWindowTopStub) getWindowTopStub.restore();
+    if (getWindowLocationStub) getWindowLocationStub.restore();
+    if (detectBrowserStub) detectBrowserStub.restore();
+    config.getConfig.restore();
+    events.getEvents.restore();
+    iiqAnalyticsAnalyticsAdapter.disableAnalytics();
+    if (iiqAnalyticsAnalyticsAdapter.track.restore) {
+      iiqAnalyticsAnalyticsAdapter.track.restore();
+    }
+    localStorage.clear();
+    server.reset();
+  });
+
+  it('IIQ Analytical Adapter bid win report', function () {
+    localStorage.setItem(FIRST_PARTY_KEY, defaultData);
+    getWindowLocationStub = sinon.stub(utils, 'getWindowLocation').returns({href: 'http://localhost:9876/'});
+    const expectedVrref = encodeURIComponent(getWindowLocationStub().href);
+
+    events.emit(EVENTS.BID_WON, wonRequest);
+
+    expect(server.requests.length).to.be.above(0);
+    const request = server.requests[0];
+    expect(request.url).to.contain('https://reports.intentiq.com/report?pid=' + partner + '&mct=1');
+    expect(request.url).to.contain(`&jsver=${version}`);
+    expect(request.url).to.contain(`&vrref=${expectedVrref}`);
+    expect(request.url).to.contain('&payload=');
+    expect(request.url).to.contain('iiqid=f961ffb1-a0e1-4696-a9d2-a21d815bd344');
+  });
+
+  it('should initialize with default configurations', function () {
+    expect(iiqAnalyticsAnalyticsAdapter.initOptions.lsValueInitialized).to.be.false;
+  });
+
+  it('should handle BID_WON event with group configuration from local storage', function () {
+    localStorage.setItem(FIRST_PARTY_KEY, '{"pcid":"testpcid", "group": "B"}');
+    const expectedVrref = encodeURIComponent('http://localhost:9876/');
+
+    events.emit(EVENTS.BID_WON, wonRequest);
+
+    expect(server.requests.length).to.be.above(0);
+    const request = server.requests[0];
+    expect(request.url).to.contain('https://reports.intentiq.com/report?pid=' + partner + '&mct=1');
+    expect(request.url).to.contain(`&jsver=${version}`);
+    expect(request.url).to.contain(`&vrref=${expectedVrref}`);
+    expect(request.url).to.contain('iiqid=testpcid');
+  });
+
+  it('should handle BID_WON event with default group configuration', function () {
+    localStorage.setItem(FIRST_PARTY_KEY, defaultData);
+    const defaultDataObj = JSON.parse(defaultData)
+
+    events.emit(EVENTS.BID_WON, wonRequest);
+
+    expect(server.requests.length).to.be.above(0);
+    const request = server.requests[0];
+    const dataToSend = preparePayload(wonRequest);
+    const base64String = btoa(JSON.stringify(dataToSend));
+    const payload = `[%22${base64String}%22]`;
+    const expectedUrl = appendVrrefAndFui(
+      `https://reports.intentiq.com/report?pid=${partner}&mct=1&iiqid=${defaultDataObj.pcid}&agid=${REPORTER_ID}&jsver=${version}&source=pbjs&payload=${payload}&uh=`,
+      iiqAnalyticsAnalyticsAdapter.initOptions.domainName
+    );
+    expect(request.url).to.equal(expectedUrl);
+    expect(dataToSend.pcid).to.equal(defaultDataObj.pcid)
+  });
+
+  it('should not send request if manualWinReportEnabled is true', function () {
+    iiqAnalyticsAnalyticsAdapter.initOptions.manualWinReportEnabled = true;
+    events.emit(EVENTS.BID_WON, wonRequest);
+    expect(server.requests.length).to.equal(1);
+  });
+
+  it('should read data from local storage', function () {
+    localStorage.setItem(FIRST_PARTY_KEY, '{"group": "A"}');
+    localStorage.setItem(FIRST_PARTY_KEY + '_' + partner, '{"data":"testpcid", "eidl": 10}');
+    events.emit(EVENTS.BID_WON, wonRequest);
+    expect(iiqAnalyticsAnalyticsAdapter.initOptions.dataInLs).to.equal('testpcid');
+    expect(iiqAnalyticsAnalyticsAdapter.initOptions.eidl).to.equal(10);
+    expect(iiqAnalyticsAnalyticsAdapter.initOptions.currentGroup).to.equal('A');
+  });
+
+  it('should handle initialization values from local storage', function () {
+    localStorage.setItem(FIRST_PARTY_KEY, '{"pcid":"testpcid", "group": "B"}');
+    localStorage.setItem(FIRST_PARTY_KEY + '_' + partner, '{"data":"testpcid"}');
+    events.emit(EVENTS.BID_WON, wonRequest);
+    expect(iiqAnalyticsAnalyticsAdapter.initOptions.currentGroup).to.equal('B');
+    expect(iiqAnalyticsAnalyticsAdapter.initOptions.fpid).to.be.not.null;
+  });
+
+  it('should handle reportExternalWin', function () {
+    events.emit(EVENTS.BID_REQUESTED);
+    iiqAnalyticsAnalyticsAdapter.initOptions.manualWinReportEnabled = true;
+    localStorage.setItem(FIRST_PARTY_KEY, '{"pcid":"testpcid", "group": "B"}');
+    localStorage.setItem(FIRST_PARTY_KEY + '_' + partner, '{"data":"testpcid"}');
+    expect(window[`intentIqAnalyticsAdapter_${partner}`].reportExternalWin).to.be.a('function');
+    expect(window[`intentIqAnalyticsAdapter_${partner}`].reportExternalWin({cpm: 1, currency: 'USD'})).to.equal(false);
+  });
+
+  it('should return window.location.href when window.self === window.top', function () {
+    // Stub helper functions
+    getWindowSelfStub = sinon.stub(utils, 'getWindowSelf').returns(window);
+    getWindowTopStub = sinon.stub(utils, 'getWindowTop').returns(window);
+    getWindowLocationStub = sinon.stub(utils, 'getWindowLocation').returns({ href: 'http://localhost:9876/' });
+
+    const referrer = getReferrer();
+    expect(referrer).to.equal(encodeURIComponent('http://localhost:9876/'));
+  });
+
+  it('should return window.top.location.href when window.self !== window.top and access is successful', function () {
+    // Stub helper functions to simulate iframe
+    getWindowSelfStub = sinon.stub(utils, 'getWindowSelf').returns({});
+    getWindowTopStub = sinon.stub(utils, 'getWindowTop').returns({ location: { href: 'http://example.com/' } });
+
+    const referrer = getReferrer();
+
+    expect(referrer).to.equal(encodeURIComponent('http://example.com/'));
+  });
+
+  it('should return an empty string and log an error when accessing window.top.location.href throws an error', function () {
+    // Stub helper functions to simulate error
+    getWindowSelfStub = sinon.stub(utils, 'getWindowSelf').returns({});
+    getWindowTopStub = sinon.stub(utils, 'getWindowTop').throws(new Error('Access denied'));
+
+    const referrer = getReferrer();
+    expect(referrer).to.equal('');
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(logErrorStub.firstCall.args[0]).to.contain('Error accessing location: Error: Access denied');
+  });
+
+  it('should not send request if the browser is in blacklist (chrome)', function () {
+    const USERID_CONFIG_BROWSER = [...USERID_CONFIG];
+    USERID_CONFIG_BROWSER[0].params.browserBlackList = 'ChrOmE';
+
+    config.getConfig.restore();
+    sinon.stub(config, 'getConfig').withArgs('userSync.userIds').returns(USERID_CONFIG_BROWSER);
+    detectBrowserStub = sinon.stub(detectBrowserUtils, 'detectBrowser').returns('chrome');
+
+    localStorage.setItem(FIRST_PARTY_KEY, defaultData);
+    events.emit(EVENTS.BID_WON, wonRequest);
+
+    expect(server.requests.length).to.equal(0);
+  });
+
+  it('should send request if the browser is not in blacklist (safari)', function () {
+    const USERID_CONFIG_BROWSER = [...USERID_CONFIG];
+    USERID_CONFIG_BROWSER[0].params.browserBlackList = 'chrome,firefox';
+
+    config.getConfig.restore();
+    sinon.stub(config, 'getConfig').withArgs('userSync.userIds').returns(USERID_CONFIG_BROWSER);
+    detectBrowserStub = sinon.stub(detectBrowserUtils, 'detectBrowser').returns('safari');
+
+    localStorage.setItem(FIRST_PARTY_KEY, defaultData);
+    events.emit(EVENTS.BID_WON, wonRequest);
+
+    expect(server.requests.length).to.be.above(0);
+    const request = server.requests[0];
+    expect(request.url).to.contain(`https://reports.intentiq.com/report?pid=${partner}&mct=1`);
+    expect(request.url).to.contain(`&jsver=${version}`);
+    expect(request.url).to.contain(`&vrref=${encodeURIComponent('http://localhost:9876/')}`);
+    expect(request.url).to.contain('&payload=');
+    expect(request.url).to.contain('iiqid=f961ffb1-a0e1-4696-a9d2-a21d815bd344');
+  });
+
+  const testCasesVrref = [
+    {
+      description: 'domainName matches window.top.location.href',
+      getWindowSelf: {},
+      getWindowTop: { location: { href: 'http://example.com/page' } },
+      getWindowLocation: { href: 'http://example.com/page' },
+      domainName: 'example.com',
+      expectedVrref: encodeURIComponent('http://example.com/page'),
+      shouldContainFui: false
+    },
+    {
+      description: 'domainName does not match window.top.location.href',
+      getWindowSelf: {},
+      getWindowTop: { location: { href: 'http://anotherdomain.com/page' } },
+      getWindowLocation: { href: 'http://anotherdomain.com/page' },
+      domainName: 'example.com',
+      expectedVrref: encodeURIComponent('example.com'),
+      shouldContainFui: false
+    },
+    {
+      description: 'domainName is missing, only fui=1 is returned',
+      getWindowSelf: {},
+      getWindowTop: { location: { href: '' } },
+      getWindowLocation: { href: '' },
+      domainName: null,
+      expectedVrref: '',
+      shouldContainFui: true
+    },
+    {
+      description: 'domainName is missing',
+      getWindowSelf: {},
+      getWindowTop: { location: { href: 'http://example.com/page' } },
+      getWindowLocation: { href: 'http://example.com/page' },
+      domainName: null,
+      expectedVrref: encodeURIComponent('http://example.com/page'),
+      shouldContainFui: false
+    },
+  ];
+
+  testCasesVrref.forEach(({ description, getWindowSelf, getWindowTop, getWindowLocation, domainName, expectedVrref, shouldContainFui }) => {
+    it(`should append correct vrref when ${description}`, function () {
+      getWindowSelfStub = sinon.stub(utils, 'getWindowSelf').returns(getWindowSelf);
+      getWindowTopStub = sinon.stub(utils, 'getWindowTop').returns(getWindowTop);
+      getWindowLocationStub = sinon.stub(utils, 'getWindowLocation').returns(getWindowLocation);
+
+      const url = 'https://reports.intentiq.com/report?pid=10';
+      const modifiedUrl = appendVrrefAndFui(url, domainName);
+      const urlObj = new URL(modifiedUrl);
+
+      const vrref = encodeURIComponent(urlObj.searchParams.get('vrref') || '');
+      const fui = urlObj.searchParams.get('fui');
+
+      expect(vrref).to.equal(expectedVrref);
+      expect(urlObj.searchParams.has('fui')).to.equal(shouldContainFui);
+      if (shouldContainFui) {
+        expect(fui).to.equal('1');
+      }
+    });
+  });
+});
diff --git a/test/spec/modules/intentIqIdSystem_spec.js b/test/spec/modules/intentIqIdSystem_spec.js
index ef174af416b..b95c3603e3a 100644
--- a/test/spec/modules/intentIqIdSystem_spec.js
+++ b/test/spec/modules/intentIqIdSystem_spec.js
@@ -2,30 +2,64 @@ import { expect } from 'chai';
 import { intentIqIdSubmodule, storage } from 'modules/intentIqIdSystem.js';
 import * as utils from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
+import { decryptData, handleClientHints, readData } from '../../../modules/intentIqIdSystem';
+import {getGppValue} from '../../../libraries/intentIqUtils/getGppValue.js';
+import { gppDataHandler, uspDataHandler } from '../../../src/consentHandler';
+import { clearAllCookies } from '../../helpers/cookies';
+import { detectBrowserFromUserAgent, detectBrowserFromUserAgentData } from '../../../libraries/intentIqUtils/detectBrowserUtils';
+import {CLIENT_HINTS_KEY, FIRST_PARTY_KEY} from '../../../libraries/intentIqConstants/intentIqConstants.js';
 
 const partner = 10;
 const pai = '11';
 const pcid = '12';
-const enableCookieStorage = true;
 const defaultConfigParams = { params: { partner: partner } };
 const paiConfigParams = { params: { partner: partner, pai: pai } };
 const pcidConfigParams = { params: { partner: partner, pcid: pcid } };
-const enableCookieConfigParams = { params: { partner: partner, enableCookieStorage: enableCookieStorage } };
-const allConfigParams = { params: { partner: partner, pai: pai, pcid: pcid, enableCookieStorage: enableCookieStorage } };
+const allConfigParams = { params: { partner: partner, pai: pai, pcid: pcid } };
 const responseHeader = { 'Content-Type': 'application/json' }
 
+export const testClientHints = {
+  architecture: 'x86',
+  bitness: '64',
+  brands: [
+    {
+      brand: 'Not(A:Brand',
+      version: '24'
+    },
+    {
+      brand: 'Chromium',
+      version: '122'
+    }
+  ],
+  fullVersionList: [
+    {
+      brand: 'Not(A:Brand',
+      version: '24.0.0.0'
+    },
+    {
+      brand: 'Chromium',
+      version: '122.0.6261.128'
+    }
+  ],
+  mobile: false,
+  model: '',
+  platform: 'Linux',
+  platformVersion: '6.5.0',
+  wow64: false
+};
+
 describe('IntentIQ tests', function () {
   let logErrorStub;
   let testLSValue = {
-    'date': 1651945280759,
+    'date': Date.now(),
     'cttl': 2000,
     'rrtt': 123
   }
   let testLSValueWithData = {
-    'date': 1651945280759,
+    'date': Date.now(),
     'cttl': 9999999999999,
     'rrtt': 123,
-    'data': 'previousTestData'
+    'data': 'U2FsdGVkX185JJuQ2Zk0JLGjpgEbqxNy0Yl2qMtj9PqA5Q3IkNQYyTyFyTOkJi9Nf7E43PZQvIUgiUY/A9QxKYmy1LHX9LmZMKlLOcY1Je13Kr1EN7HRF8nIIWXo2jRgS5n0Nmty5995x3YMjLw+aRweoEtcrMC6p4wOdJnxfrOhdg0d/R7b8C+IN85rDLfNXANL1ezX8zwh4rj9XpMmWw=='
   }
   let testResponseWithValues = {
     'abPercentage': 90,
@@ -39,11 +73,17 @@ describe('IntentIQ tests', function () {
   }
 
   beforeEach(function () {
+    localStorage.clear();
+    const expiredDate = new Date(0).toUTCString();
+    storage.setCookie(FIRST_PARTY_KEY, '', expiredDate, 'Lax');
+    storage.setCookie(FIRST_PARTY_KEY + '_' + partner, '', expiredDate, 'Lax');
     logErrorStub = sinon.stub(utils, 'logError');
   });
 
   afterEach(function () {
     logErrorStub.restore();
+    clearAllCookies();
+    localStorage.clear();
   });
 
   it('should log an error if no configParams were passed when getId', function () {
@@ -64,7 +104,7 @@ describe('IntentIQ tests', function () {
     expect(submodule).to.be.undefined;
   });
 
-  it('should not save data in cookie if enableCookieStorage configParam not set', function () {
+  it('should not save data in cookie if relevant type not set', function () {
     let callBackSpy = sinon.spy();
     let submoduleCallback = intentIqIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
@@ -79,9 +119,9 @@ describe('IntentIQ tests', function () {
     expect(storage.getCookie('_iiq_fdata_' + partner)).to.equal(null);
   });
 
-  it('should save data in cookie if enableCookieStorage configParam set to true', function () {
+  it('should save data in cookie if storage type is "cookie"', function () {
     let callBackSpy = sinon.spy();
-    let submoduleCallback = intentIqIdSubmodule.getId(allConfigParams).callback;
+    let submoduleCallback = intentIqIdSubmodule.getId({ ...allConfigParams, enabledStorageTypes: ['cookie'] }).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
     expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&pcid=12&pai=11&iiqidtype=2&iiqpcid=');
@@ -91,9 +131,10 @@ describe('IntentIQ tests', function () {
       JSON.stringify({ pid: 'test_pid', data: 'test_personid', ls: true })
     );
     expect(callBackSpy.calledOnce).to.be.true;
-    const cookieValue = storage.getCookie('_iiq_fdata_' + partner)
-    expect(cookieValue).to.not.equal(null)
-    expect(JSON.parse(cookieValue).data).to.be.equal('test_personid');
+    const cookieValue = storage.getCookie('_iiq_fdata_' + partner);
+    expect(cookieValue).to.not.equal(null);
+    const decryptedData = JSON.parse(decryptData(JSON.parse(cookieValue).data));
+    expect(decryptedData).to.deep.equal({eids: ['test_personid']});
   });
 
   it('should call the IntentIQ endpoint with only partner', function () {
@@ -111,8 +152,6 @@ describe('IntentIQ tests', function () {
   });
 
   it('should ignore INVALID_ID and invalid responses in decode', function () {
-    // let resp = JSON.stringify({'RESULT': 'NA'});
-    // expect(intentIqIdSubmodule.decode(resp)).to.equal(undefined);
     expect(intentIqIdSubmodule.decode('INVALID_ID')).to.equal(undefined);
     expect(intentIqIdSubmodule.decode('')).to.equal(undefined);
     expect(intentIqIdSubmodule.decode(undefined)).to.equal(undefined);
@@ -199,7 +238,7 @@ describe('IntentIQ tests', function () {
       JSON.stringify({ pid: 'test_pid', data: 'test_personid', ls: true })
     );
     expect(callBackSpy.calledOnce).to.be.true;
-    expect(callBackSpy.args[0][0]).to.be.eq('test_personid');
+    expect(callBackSpy.args[0][0]).to.deep.equal(['test_personid']);
   });
 
   it('dont save result if ls=false', function () {
@@ -214,22 +253,7 @@ describe('IntentIQ tests', function () {
       JSON.stringify({ pid: 'test_pid', data: 'test_personid', ls: false })
     );
     expect(callBackSpy.calledOnce).to.be.true;
-    expect(callBackSpy.args[0][0]).to.be.undefined;
-  });
-
-  it('save result as INVALID_ID on empty data and ls=true ', function () {
-    let callBackSpy = sinon.spy();
-    let submoduleCallback = intentIqIdSubmodule.getId(allConfigParams).callback;
-    submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&pcid=12&pai=11&iiqidtype=2&iiqpcid=');
-    request.respond(
-      200,
-      responseHeader,
-      JSON.stringify({ pid: 'test_pid', data: '', ls: true })
-    );
-    expect(callBackSpy.calledOnce).to.be.true;
-    expect(callBackSpy.args[0][0]).to.be.eq('INVALID_ID');
+    expect(callBackSpy.args[0][0]).to.deep.equal({eids: []});
   });
 
   it('send addition parameters if were found in localstorage', function () {
@@ -248,16 +272,225 @@ describe('IntentIQ tests', function () {
       JSON.stringify(testResponseWithValues)
     );
     expect(callBackSpy.calledOnce).to.be.true;
-    expect(callBackSpy.args[0][0]).to.be.eq(testResponseWithValues.data);
+    expect(callBackSpy.args[0][0]).to.deep.equal([testResponseWithValues.data]);
   });
 
   it('return data stored in local storage ', function () {
-    localStorage.setItem('_iiq_fdata_' + partner, JSON.stringify(testLSValueWithData))
+    localStorage.setItem('_iiq_fdata_' + partner, JSON.stringify(testLSValueWithData));
+    let returnedValue = intentIqIdSubmodule.getId(allConfigParams);
+    expect(returnedValue.id).to.deep.equal(JSON.parse(decryptData(testLSValueWithData.data)).eids);
+  });
+
+  it('should handle browser blacklisting', function () {
+    let configParamsWithBlacklist = {
+      params: { partner: partner, browserBlackList: 'chrome' }
+    };
+    sinon.stub(navigator, 'userAgent').value('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36');
+    let submoduleCallback = intentIqIdSubmodule.getId(configParamsWithBlacklist);
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(submoduleCallback).to.be.undefined;
+  });
+
+  it('should handle invalid JSON in readData', function () {
+    localStorage.setItem('_iiq_fdata_' + partner, 'invalid_json');
     let callBackSpy = sinon.spy();
-    let submoduleCallback = intentIqIdSubmodule.getId(allConfigParams).callback;
+    let submoduleCallback = intentIqIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
-    expect(server.requests.length).to.be.equal(0);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
     expect(callBackSpy.calledOnce).to.be.true;
-    expect(callBackSpy.args[0][0]).to.be.equal(testLSValueWithData.data);
+    expect(logErrorStub.called).to.be.true;
+  });
+
+  describe('getGppValue', function () {
+    const testCases = [
+      {
+        description: 'should return gppString and gpi=0 when GPP data exists',
+        input: { gppString: '{"key1":"value1","key2":"value2"}' },
+        expectedOutput: { gppString: '{"key1":"value1","key2":"value2"}', gpi: 0 }
+      },
+      {
+        description: 'should return empty gppString and gpi=1 when GPP data does not exist',
+        input: null,
+        expectedOutput: { gppString: '', gpi: 1 }
+      },
+      {
+        description: 'should return empty gppString and gpi=1 when gppString is not set',
+        input: {},
+        expectedOutput: { gppString: '', gpi: 1 }
+      },
+      {
+        description: 'should handle GPP data with empty string',
+        input: { gppString: '' },
+        expectedOutput: { gppString: '', gpi: 1 }
+      }
+    ];
+
+    testCases.forEach(({ description, input, expectedOutput }) => {
+      it(description, function () {
+        sinon.stub(gppDataHandler, 'getConsentData').returns(input);
+
+        const result = getGppValue();
+        expect(result).to.deep.equal(expectedOutput);
+
+        gppDataHandler.getConsentData.restore();
+      });
+    });
+  });
+
+  describe('detectBrowserFromUserAgent', function () {
+    it('should detect Chrome browser', function () {
+      const userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36';
+      const result = detectBrowserFromUserAgent(userAgent);
+      expect(result).to.equal('chrome');
+    });
+
+    it('should detect Safari browser', function () {
+      const userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.3 Safari/605.1.15';
+      const result = detectBrowserFromUserAgent(userAgent);
+      expect(result).to.equal('safari');
+    });
+
+    it('should detect Firefox browser', function () {
+      const userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:89.0) Gecko/20100101 Firefox/89.0';
+      const result = detectBrowserFromUserAgent(userAgent);
+      expect(result).to.equal('firefox');
+    });
+  });
+
+  describe('detectBrowserFromUserAgentData', function () {
+    it('should detect Microsoft Edge browser', function () {
+      const userAgentData = {
+        brands: [
+          { brand: 'Microsoft Edge', version: '91' },
+          { brand: 'Chromium', version: '91' }
+        ]
+      };
+      const result = detectBrowserFromUserAgentData(userAgentData);
+      expect(result).to.equal('edge');
+    });
+
+    it('should detect Chrome browser', function () {
+      const userAgentData = {
+        brands: [
+          { brand: 'Google Chrome', version: '91' },
+          { brand: 'Chromium', version: '91' }
+        ]
+      };
+      const result = detectBrowserFromUserAgentData(userAgentData);
+      expect(result).to.equal('chrome');
+    });
+
+    it('should return unknown for unrecognized user agent data', function () {
+      const userAgentData = {
+        brands: [
+          { brand: 'Unknown Browser', version: '1.0' }
+        ]
+      };
+      const result = detectBrowserFromUserAgentData(userAgentData);
+      expect(result).to.equal('unknown');
+    });
+  });
+
+  describe('IntentIQ consent management within getId', function () {
+    let uspDataHandlerStub;
+    let gppDataHandlerStub;
+
+    beforeEach(function () {
+      localStorage.clear();
+      const expiredDate = new Date(0).toUTCString();
+      storage.setCookie(FIRST_PARTY_KEY, '', expiredDate, 'Lax');
+      storage.setCookie(FIRST_PARTY_KEY + '_' + partner, '', expiredDate, 'Lax');
+      uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+      gppDataHandlerStub = sinon.stub(gppDataHandler, 'getConsentData');
+    });
+
+    afterEach(function () {
+      uspDataHandlerStub.restore();
+      gppDataHandlerStub.restore();
+    });
+
+    it('should set cmpData.us_privacy if uspData exists', function () {
+      const uspData = '1NYN';
+      uspDataHandlerStub.returns(uspData);
+      let callBackSpy = sinon.spy();
+      let submoduleCallback = intentIqIdSubmodule.getId(defaultConfigParams).callback;
+      submoduleCallback(callBackSpy);
+      let request = server.requests[0];
+      expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&iiqidtype=2&iiqpcid=');
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({ pid: 'test_pid', data: 'test_personid', ls: false, isOptedOut: false })
+      );
+      expect(callBackSpy.calledOnce).to.be.true;
+
+      // Check the local storage directly to see if cmpData.us_privacy was set correctly
+      const firstPartyData = JSON.parse(localStorage.getItem(FIRST_PARTY_KEY));
+      expect(firstPartyData.uspapi_value).to.equal(uspData);
+    });
+
+    it('should create a request with gpp data if gppData exists and has gppString', function () {
+      const mockGppValue = {
+        gppString: '{"key1":"value1","key2":"value2"}',
+        gpi: 0
+      };
+
+      const mockConfig = {
+        params: { partner: partner },
+        enabledStorageTypes: ['localStorage']
+      };
+
+      gppDataHandlerStub.returns(mockGppValue);
+
+      let callBackSpy = sinon.spy();
+      let submoduleCallback = intentIqIdSubmodule.getId(mockConfig).callback;
+      submoduleCallback(callBackSpy);
+
+      let request = server.requests[0];
+
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({ pid: 'test_pid', data: 'test_personid', ls: true })
+      );
+
+      expect(request.url).to.contain(`&gpp=${encodeURIComponent(mockGppValue.gppString)}`);
+      expect(callBackSpy.calledOnce).to.be.true;
+
+      const firstPartyData = JSON.parse(localStorage.getItem(FIRST_PARTY_KEY));
+      expect(firstPartyData.gpp_string_value).to.equal(mockGppValue.gppString);
+    });
+  });
+
+  it('should get and save client hints to storge', async () => {
+    // Client hints are async function, thats why async/await is using
+    localStorage.clear();
+    Object.defineProperty(navigator, 'userAgentData', {
+      value: { getHighEntropyValues: async () => testClientHints },
+      configurable: true
+    });
+    await intentIqIdSubmodule.getId(defaultConfigParams);
+    const savedClientHints = readData(CLIENT_HINTS_KEY, ['html5']);
+    expect(savedClientHints).to.equal(handleClientHints(testClientHints));
+  });
+
+  it('should run callback from params', async () => {
+    let wasCallbackCalled = false
+    const callbackConfigParams = { params: { partner: partner,
+      pai: pai,
+      pcid: pcid,
+      browserBlackList: 'Chrome',
+      callback: () => {
+        wasCallbackCalled = true
+      } } };
+
+    await intentIqIdSubmodule.getId(callbackConfigParams);
+    expect(wasCallbackCalled).to.equal(true);
   });
 });
diff --git a/test/spec/modules/invibesBidAdapter_spec.js b/test/spec/modules/invibesBidAdapter_spec.js
index 7ee6b464996..e12376b2a37 100644
--- a/test/spec/modules/invibesBidAdapter_spec.js
+++ b/test/spec/modules/invibesBidAdapter_spec.js
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import { config } from 'src/config.js';
-import {spec, resetInvibes, stubDomainOptions, readGdprConsent} from 'modules/invibesBidAdapter.js';
+import {spec, resetInvibes, stubDomainOptions, readGdprConsent, storage} from 'modules/invibesBidAdapter.js';
 
 describe('invibesBidAdapter:', function () {
   const BIDDER_CODE = 'invibes';
@@ -44,6 +44,78 @@ describe('invibesBidAdapter:', function () {
     }
   ];
 
+  let bidRequestsWithDuplicatedplacementId = [
+    {
+      bidId: 'b1',
+      bidder: BIDDER_CODE,
+      bidderRequestId: 'r1',
+      params: {
+        placementId: PLACEMENT_ID,
+        disableUserSyncs: false
+
+      },
+      adUnitCode: 'test-div1',
+      auctionId: 'a1',
+      sizes: [
+        [300, 250],
+        [400, 300],
+        [125, 125]
+      ],
+      transactionId: 't1'
+    }, {
+      bidId: 'b2',
+      bidder: BIDDER_CODE,
+      bidderRequestId: 'r2',
+      params: {
+        placementId: PLACEMENT_ID,
+        disableUserSyncs: false
+      },
+      adUnitCode: 'test-div2',
+      auctionId: 'a2',
+      sizes: [
+        [300, 250],
+        [400, 300]
+      ],
+      transactionId: 't2'
+    }
+  ];
+
+  let bidRequestsWithUniquePlacementId = [
+    {
+      bidId: 'b1',
+      bidder: BIDDER_CODE,
+      bidderRequestId: 'r1',
+      params: {
+        placementId: 'PLACEMENT_ID_1',
+        disableUserSyncs: false
+
+      },
+      adUnitCode: 'test-div1',
+      auctionId: 'a1',
+      sizes: [
+        [300, 250],
+        [400, 300],
+        [125, 125]
+      ],
+      transactionId: 't1'
+    }, {
+      bidId: 'b2',
+      bidder: BIDDER_CODE,
+      bidderRequestId: 'r2',
+      params: {
+        placementId: 'PLACEMENT_ID_2',
+        disableUserSyncs: false
+      },
+      adUnitCode: 'test-div2',
+      auctionId: 'a2',
+      sizes: [
+        [300, 250],
+        [400, 300]
+      ],
+      transactionId: 't2'
+    }
+  ];
+
   let bidRequestsWithUserId = [
     {
       bidId: 'b1',
@@ -115,6 +187,8 @@ describe('invibesBidAdapter:', function () {
     };
   }
 
+  let sandbox;
+
   beforeEach(function () {
     resetInvibes();
     $$PREBID_GLOBAL$$.bidderSettings = {
@@ -124,11 +198,13 @@ describe('invibesBidAdapter:', function () {
     };
     document.cookie = '';
     this.cStub1 = sinon.stub(console, 'info');
+    sandbox = sinon.sandbox.create();
   });
 
   afterEach(function () {
     $$PREBID_GLOBAL$$.bidderSettings = {};
     this.cStub1.restore();
+    sandbox.restore();
   });
 
   describe('isBidRequestValid:', function () {
@@ -185,17 +261,44 @@ describe('invibesBidAdapter:', function () {
       expect(request.data.preventPageViewEvent).to.be.false;
     });
 
+    it('sends isPlacementRefresh as false when the placement ids are used for the first time', function () {
+      let request = spec.buildRequests(bidRequestsWithUniquePlacementId, bidderRequestWithPageInfo);
+      expect(request.data.isPlacementRefresh).to.be.false;
+    });
+
     it('sends preventPageViewEvent as true on 2nd call', function () {
       let request = spec.buildRequests(bidRequests, bidderRequestWithPageInfo);
       expect(request.data.preventPageViewEvent).to.be.true;
     });
 
+    it('sends isPlacementRefresh as true on multi requests on the same placement id', function () {
+      let request = spec.buildRequests(bidRequestsWithDuplicatedplacementId, bidderRequestWithPageInfo);
+      expect(request.data.isPlacementRefresh).to.be.true;
+    });
+
+    it('sends isInfiniteScrollPage as false initially', function () {
+      let request = spec.buildRequests(bidRequests, bidderRequestWithPageInfo);
+      expect(request.data.isInfiniteScrollPage).to.be.false;
+    });
+
+    it('sends isPlacementRefresh as true on multi requests multiple calls with the same placement id from second call', function () {
+      let request = spec.buildRequests(bidRequests, bidderRequestWithPageInfo);
+      expect(request.data.isInfiniteScrollPage).to.be.false;
+      let duplicatedRequest = spec.buildRequests(bidRequests, bidderRequestWithPageInfo);
+      expect(duplicatedRequest.data.isPlacementRefresh).to.be.true;
+    });
+
     it('sends bid request to ENDPOINT via GET', function () {
       const request = spec.buildRequests(bidRequests, bidderRequestWithPageInfo);
       expect(request.url).to.equal(ENDPOINT);
       expect(request.method).to.equal('GET');
     });
 
+    it('generates a visitId of length 32', function () {
+      spec.buildRequests(bidRequests, bidderRequestWithPageInfo);
+      expect(top.window.invibes.visitId.length).to.equal(32);
+    });
+
     it('sends bid request to custom endpoint via GET', function () {
       const request = spec.buildRequests([{
         bidId: 'b1',
@@ -429,6 +532,8 @@ describe('invibesBidAdapter:', function () {
     });
 
     it('sends undefined lid when no cookie', function () {
+      sandbox.stub(storage, 'getDataFromLocalStorage').returns(null);
+      sandbox.stub(storage, 'getCookie').returns(null);
       let request = spec.buildRequests(bidRequests, bidderRequestWithPageInfo);
       expect(request.data.lId).to.be.undefined;
     });
@@ -461,6 +566,50 @@ describe('invibesBidAdapter:', function () {
       expect(request.data.lId).to.exist;
     });
 
+    it('does not send handIid when it doesnt exist in cookie', function () {
+      top.window.invibes.optIn = 1;
+      top.window.invibes.purposes = [true, false, false, false, false, false, false, false, false, false];
+      sandbox.stub(storage, 'getCookie').returns(null)
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            vendorConsents: {
+              436: true
+            }
+          }
+        },
+        refererInfo: {
+          page: 'https://randomWeb.com?someFakePara=fakeValue&secondParam=secondValue'
+        }
+      };
+      SetBidderAccess();
+
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.handIid).to.not.exist;
+    });
+
+    it('sends handIid when comes on cookie', function () {
+      top.window.invibes.optIn = 1;
+      top.window.invibes.purposes = [true, false, false, false, false, false, false, false, false, false];
+      global.document.cookie = 'handIid=abcdefghijkk';
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            vendorConsents: {
+              436: true
+            }
+          }
+        },
+        refererInfo: {
+          page: 'https://randomWeb.com?someFakePara=fakeValue&secondParam=secondValue'
+        }
+      };
+      SetBidderAccess();
+
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.handIid).to.equal('abcdefghijkk');
+    });
+
     it('should send purpose 1', function () {
       let bidderRequest = {
         gdprConsent: {
@@ -1362,5 +1511,28 @@ describe('invibesBidAdapter:', function () {
       let response = spec.getUserSyncs({iframeEnabled: false});
       expect(response).to.equal(undefined);
     });
+
+    it('uses uspConsent when no gdprConsent', function () {
+      let bidderRequest = {
+        uspConsent: '1YNY',
+        refererInfo: {
+          page: 'https://randomWeb.com?someFakePara=fakeValue&secondParam=secondValue'
+        }
+      };
+
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(top.window.invibes.optIn).to.equal(2);
+      expect(top.window.invibes.GdprModuleInstalled).to.be.false;
+      expect(top.window.invibes.UspModuleInstalled).to.be.true;
+      var index;
+      for (index = 0; index < top.window.invibes.purposes.length; ++index) {
+        expect(top.window.invibes.purposes[index]).to.be.true;
+      }
+      for (index = 0; index < top.window.invibes.legitimateInterests.length; ++index) {
+        expect(top.window.invibes.legitimateInterests[index]).to.be.true;
+      }
+      expect(request.data.tc).to.not.exist;
+      expect(request.data.uspc).to.equal(bidderRequest.uspConsent);
+    });
   });
 });
diff --git a/test/spec/modules/invisiblyAnalyticsAdapter_spec.js b/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
index a8828515ffd..e866d2404f3 100644
--- a/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
+++ b/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
@@ -2,8 +2,8 @@ import invisiblyAdapter from 'modules/invisiblyAnalyticsAdapter.js';
 import { expect } from 'chai';
 import {expectEvents} from '../../helpers/analytics.js';
 import {server} from '../../mocks/xhr.js';
+import { EVENTS, STATUS } from 'src/constants.js';
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('Invisibly Analytics Adapter test suite', function () {
   let xhr;
@@ -26,7 +26,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       hb_source: 'client',
     },
     getStatusCode() {
-      return CONSTANTS.STATUS.GOOD;
+      return STATUS.GOOD;
     },
   };
 
@@ -54,7 +54,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       hb_source: 'server',
     },
     getStatusCode() {
-      return CONSTANTS.STATUS.GOOD;
+      return STATUS.GOOD;
     },
   };
 
@@ -204,11 +204,11 @@ describe('Invisibly Analytics Adapter test suite', function () {
             options: {},
           });
 
-          events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
-          events.emit(constants.EVENTS.AUCTION_END, MOCK.AUCTION_END);
-          events.emit(constants.EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
-          events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
-          events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON);
+          events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
+          events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END);
+          events.emit(EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
+          events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
+          events.emit(EVENTS.BID_WON, MOCK.BID_WON);
           invisiblyAdapter.flush();
           sinon.assert.callCount(invisiblyAdapter.track, 0);
         });
@@ -230,7 +230,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for auction init event
       it('auction init event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -252,7 +252,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for bid adjustment event
       it('bid adjustment event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.BID_ADJUSTMENT, MOCK.BID_ADJUSTMENT);
+        events.emit(EVENTS.BID_ADJUSTMENT, MOCK.BID_ADJUSTMENT);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -274,7 +274,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for bid timeout event
       it('bid timeout event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.BID_TIMEOUT, MOCK.BID_TIMEOUT);
+        events.emit(EVENTS.BID_TIMEOUT, MOCK.BID_TIMEOUT);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -296,7 +296,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for bid requested event
       it('bid requested event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -318,7 +318,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for bid response event
       it('bid response event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
+        events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -338,7 +338,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for no bid event
       it('no bid event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.NO_BID, MOCK.NO_BID);
+        events.emit(EVENTS.NO_BID, MOCK.NO_BID);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -360,7 +360,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for bid won event
       it('bid won event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON);
+        events.emit(EVENTS.BID_WON, MOCK.BID_WON);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -378,7 +378,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for bidder done event
       it('bidder done event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(EVENTS.BIDDER_DONE, MOCK.BIDDER_DONE);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -403,7 +403,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for set targeting event
       it('set targeting event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.SET_TARGETING, MOCK.SET_TARGETING);
+        events.emit(EVENTS.SET_TARGETING, MOCK.SET_TARGETING);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -428,7 +428,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for request bids event
       it('request bids event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.REQUEST_BIDS, MOCK.REQUEST_BIDS);
+        events.emit(EVENTS.REQUEST_BIDS, MOCK.REQUEST_BIDS);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -450,7 +450,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for add ad units event
       it('add ad units event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.ADD_AD_UNITS, MOCK.ADD_AD_UNITS);
+        events.emit(EVENTS.ADD_AD_UNITS, MOCK.ADD_AD_UNITS);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -472,7 +472,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for ad render failed event
       it('ad render failed event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED);
+        events.emit(EVENTS.AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -494,7 +494,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       // spec for auction end event
       it('auction end event', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.AUCTION_END, MOCK.AUCTION_END);
+        events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END);
         invisiblyAdapter.flush();
 
         const invisiblyEvents = JSON.parse(
@@ -516,7 +516,7 @@ describe('Invisibly Analytics Adapter test suite', function () {
       it('it should not call sendEvent for this event emit', function () {
         sinon.spy(invisiblyAdapter, 'sendEvent');
         invisiblyAdapter.enableAnalytics(MOCK.config);
-        events.emit(constants.EVENTS.INVALID_EVENT, MOCK.INVALID_EVENT);
+        events.emit(EVENTS.INVALID_EVENT, MOCK.INVALID_EVENT);
         invisiblyAdapter.flush();
 
         expect(requests.length).to.equal(0);
@@ -529,19 +529,19 @@ describe('Invisibly Analytics Adapter test suite', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
 
         expectEvents([
-          constants.EVENTS.AUCTION_INIT,
-          constants.EVENTS.AUCTION_END,
-          constants.EVENTS.BID_ADJUSTMENT,
-          constants.EVENTS.BID_TIMEOUT,
-          constants.EVENTS.BID_REQUESTED,
-          constants.EVENTS.BID_RESPONSE,
-          constants.EVENTS.NO_BID,
-          constants.EVENTS.BID_WON,
-          constants.EVENTS.BIDDER_DONE,
-          constants.EVENTS.SET_TARGETING,
-          constants.EVENTS.REQUEST_BIDS,
-          constants.EVENTS.ADD_AD_UNITS,
-          constants.EVENTS.AD_RENDER_FAILED
+          EVENTS.AUCTION_INIT,
+          EVENTS.AUCTION_END,
+          EVENTS.BID_ADJUSTMENT,
+          EVENTS.BID_TIMEOUT,
+          EVENTS.BID_REQUESTED,
+          EVENTS.BID_RESPONSE,
+          EVENTS.NO_BID,
+          EVENTS.BID_WON,
+          EVENTS.BIDDER_DONE,
+          EVENTS.SET_TARGETING,
+          EVENTS.REQUEST_BIDS,
+          EVENTS.ADD_AD_UNITS,
+          EVENTS.AD_RENDER_FAILED
         ]).to.beTrackedBy(invisiblyAdapter.track);
       });
     });
@@ -558,11 +558,11 @@ describe('Invisibly Analytics Adapter test suite', function () {
           },
         });
 
-        events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
-        events.emit(constants.EVENTS.AUCTION_END, MOCK.AUCTION_END);
-        events.emit(constants.EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
-        events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
-        events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON);
+        events.emit(EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(EVENTS.AUCTION_END, MOCK.AUCTION_END);
+        events.emit(EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
+        events.emit(EVENTS.BID_WON, MOCK.BID_WON);
         invisiblyAdapter.flush();
 
         sinon.assert.callCount(invisiblyAdapter.sendEvent, 0);
diff --git a/test/spec/modules/iqmBidAdapter_spec.js b/test/spec/modules/iqmBidAdapter_spec.js
deleted file mode 100644
index 2f8b5811b2f..00000000000
--- a/test/spec/modules/iqmBidAdapter_spec.js
+++ /dev/null
@@ -1,414 +0,0 @@
-import { expect } from 'chai';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-import * as bidderFactory from 'src/adapters/bidderFactory.js';
-import {spec} from 'modules/iqmBidAdapter';
-
-const ENDPOINT = 'https://pbd.bids.iqm.com';
-
-describe('iqmAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid =
-      {
-        bidder: 'iqm',
-        params: {
-          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
-          placementId: 23451,
-          bidfloor: 0.50
-        },
-
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      };
-
-    it('should return false when no bid', function () {
-      expect(spec.isBidRequestValid()).to.equal(false);
-    });
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-    it('should return false when it is video and mimes and protcol are not present', function () {
-      const bid = {
-        adUnitCode: 'div-gpt-ad-1460505748561-0',
-        auctionId: 'a0aca162-e3d0-44db-a465-5c96a64fa5fb',
-        bidId: '2cbdc9b506be33',
-        bidRequestsCount: 1,
-        bidder: 'iqm',
-        bidderRequestId: '185c3a4c7f88ec',
-        bidderRequestsCount: 1,
-        bidderWinsCount: 0,
-        crumbs: {pubcid: 'f56a553d-370d-4cea-b31a-7214a3d8f8e1'},
-        mediaTypes: {
-          video: {
-            context: 'instream',
-            playerSize: [
-              [
-                640,
-                480
-              ]
-            ]
-          }
-        },
-        params: {
-          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
-          placementId: 23451,
-          geo: {
-            country: 'USA'
-          },
-
-          bidfloor: 0.50,
-          video: {
-            placement: 2,
-            mimes: null,
-            protocols: null,
-            skipppable: true,
-            playback_method: ['auto_play_sound_off']
-          }
-        },
-        src: 'client',
-        transactionId: 'a57d06fd-cc6d-4a90-87af-c10727998f0b' };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-    it('should return false when required params are not found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        placementId: 0,
-        publisherId: null
-
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let validBidRequests = [
-      {bidder: 'iqm',
-        params: {
-          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
-          placementId: 23451,
-          bidfloor: 0.5},
-        crumbs: {
-          pubcid: 'a0f51f64-6d86-41d0-abaf-7ece71404d94'},
-        ortb2Imp: {ext: {data: {'pbadslot': '/19968336/header-bid-tag-0'}}},
-        mediaTypes: {
-          banner: {
-            sizes: [[300, 250]]}},
-        adUnitCode: '/19968336/header-bid-tag-0',
-        transactionId: '56fe8d92-ff6e-4c34-90ad-2f743cd0eae8',
-        sizes: [[300, 250]],
-        bidId: '266d810da21904',
-        bidderRequestId: '13c05d264c7ffe',
-        auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
-        src: 'client',
-        bidRequestsCount: 1,
-        bidderRequestsCount: 1,
-        bidderWinsCount: 0}];
-
-    let bidderRequest = {
-      bidderCode: 'iqm',
-      auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
-      bidderRequestId: '13c05d264c7ffe',
-      bids: [{
-        bidder: 'iqm',
-        params: {publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a', placementId: 23451, bidfloor: 0.5},
-        crumbs: {pubcid: 'a0f51f64-6d86-41d0-abaf-7ece71404d94'},
-        ortb2Imp: {ext: {data: {'pbadslot': '/19968336/header-bid-tag-0'}}},
-        mediaTypes: {banner: {sizes: [[300, 250]]}},
-        adUnitCode: '/19968336/header-bid-tag-0',
-        transactionId: '56fe8d92-ff6e-4c34-90ad-2f743cd0eae8',
-        sizes: [[300, 250]],
-        bidId: '266d810da21904',
-        bidderRequestId: '13c05d264c7ffe',
-        auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
-        src: 'client',
-        bidRequestsCount: 1,
-        bidderRequestsCount: 1,
-        bidderWinsCount: 0
-      }],
-      auctionStart: 1615205942159,
-      timeout: 7000,
-      refererInfo: {
-        page: 'http://test.localhost:9999/integrationExamples/gpt/hello_world.html',
-        domain: 'test.localhost.com:9999',
-        ref: null,
-        reachedTop: true,
-        isAmp: false,
-        numIframes: 0,
-        stack: ['http://test.localhost:9999/integrationExamples/gpt/hello_world.html'],
-        canonicalUrl: null
-      },
-      start: 1615205942162
-    };
-
-    it('should parse out  sizes', function () {
-      let temp = [];
-      const request = spec.buildRequests(validBidRequests, bidderRequest);
-      const payload = request[0].data;
-
-      expect(payload.sizes).to.exist;
-      expect(payload.sizes[0]).to.deep.equal([300, 250]);
-    });
-
-    it('should populate the ad_types array on all requests', function () {
-      // const bidRequest = Object.assign({}, bidRequests[0]);
-
-      const request = spec.buildRequests(validBidRequests, bidderRequest);
-      const payload = request[0].data;
-
-      expect(payload.imp.mediatype).to.deep.equal('banner');
-    });
-    it('sends bid request to ENDPOINT via POST', function () {
-      const request = spec.buildRequests(validBidRequests, bidderRequest);
-      expect(request[0].url).to.equal(ENDPOINT);
-      expect(request[0].method).to.equal('POST');
-    });
-    it('should attach valid video params to the tag', function () {
-      let validBidRequests_video = [{
-        bidder: 'iqm',
-        params: {
-          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
-          placementId: 23451,
-          bidfloor: 0.5,
-          video: {
-            placement: 2,
-            mimes: ['video/mp4'],
-            protocols: [2, 5],
-            skipppable: true,
-            playback_method: ['auto_play_sound_off']
-          }
-        },
-        crumbs: {pubcid: '09b8f065-9d1b-4a36-bd0c-ea22e2dad807'},
-        ortb2Imp: {ext: {data: {'pbadslot': 'video1'}}},
-        mediaTypes: {video: {playerSize: [[640, 480]], context: 'instream'}},
-        adUnitCode: 'video1',
-        transactionId: '86795c66-acf9-4dd5-998f-6d5362aaa541',
-        sizes: [[640, 480]],
-        bidId: '28bfb7e2d12897',
-        bidderRequestId: '16e1ce8481bc6d',
-        auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
-        src: 'client',
-        bidRequestsCount: 1,
-        bidderRequestsCount: 1,
-        bidderWinsCount: 0
-      }];
-      let bidderRequest_video = {
-        bidderCode: 'iqm',
-        auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
-        bidderRequestId: '16e1ce8481bc6d',
-        bids: [{
-          bidder: 'iqm',
-          params: {
-            publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
-            placementId: 23451,
-            bidfloor: 0.5,
-            video: {
-              placement: 2,
-              mimes: ['video/mp4'],
-              protocols: [2, 5],
-              skipppable: true,
-              playback_method: ['auto_play_sound_off']
-            }
-          },
-          crumbs: {pubcid: '09b8f065-9d1b-4a36-bd0c-ea22e2dad807'},
-          fpd: {context: {pbAdSlot: 'video1'}},
-          mediaTypes: {video: {playerSize: [[640, 480]], context: 'instream'}},
-          adUnitCode: 'video1',
-          transactionId: '86795c66-acf9-4dd5-998f-6d5362aaa541',
-          sizes: [[640, 480]],
-          bidId: '28bfb7e2d12897',
-          bidderRequestId: '16e1ce8481bc6d',
-          auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
-          src: 'client',
-          bidRequestsCount: 1,
-          bidderRequestsCount: 1,
-          bidderWinsCount: 0
-        }],
-        auctionStart: 1615271191985,
-        timeout: 3000,
-        refererInfo: {
-          page: 'http://test.localhost:9999/integrationExamples/gpt/pbjs_video_adUnit.html',
-          domain: 'test.localhost.com:9999',
-          ref: null,
-          reachedTop: true,
-          isAmp: false,
-          numIframes: 0,
-          stack: ['http://test.localhost:9999/integrationExamples/gpt/pbjs_video_adUnit.html'],
-          canonicalUrl: null
-        },
-        start: 1615271191988
-      };
-      const request = spec.buildRequests(validBidRequests_video, bidderRequest_video);
-      const payload = request[0].data;
-      expect(payload.imp.id).to.exist;
-      expect(payload.imp.displaymanager).to.exist;
-      expect(payload.imp.displaymanagerver).to.exist;
-
-      expect(payload.imp.video).to.deep.equal({
-        context: 'instream',
-        w: 640,
-        h: 480,
-        mimes: ['video/mp4'],
-        placement: 1,
-        protocols: [2, 5],
-        startdelay: 0
-      });
-    });
-
-    it('should add referer info to payload', function () {
-      // TODO: this is wrong on multiple levels
-      // The payload contains everything in `bidderRequest`; that is sometimes not even serializable
-      // this should not be testing the validity of internal Prebid structures
-      const request = spec.buildRequests(validBidRequests, bidderRequest);
-      const payload = request[0].data;
-
-      expect(payload.bidderRequest.refererInfo).to.exist;
-    });
-  })
-
-  describe('interpretResponse', function () {
-    let tempResult = {requestId: '2d9601dd8328f8', currency: 'USD', cpm: 4.5, netRevenue: true, creativeId: 'cr-121004', adUnitCode: 'div-gpt-ad-1460505748561-0', 'auctionId': '22a4f3d8-511f-46ba-91be-53b9949e4b48', mediaType: 'banner', ttl: 3000, ad: "            ", width: 844, height: 617};
-    let validBidRequests_temp = [
-      {bidder: 'iqm',
-        params: {
-          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
-          placementId: 23451,
-          bidfloor: 0.5},
-        crumbs: {
-          pubcid: 'a0f51f64-6d86-41d0-abaf-7ece71404d94'},
-        ortb2Imp: {ext: {data: {'pbadslot': '/19968336/header-bid-tag-0'}}},
-        mediaTypes: {
-          banner: {
-            sizes: [[300, 250]]}},
-        adUnitCode: '/19968336/header-bid-tag-0',
-        transactionId: '56fe8d92-ff6e-4c34-90ad-2f743cd0eae8',
-        sizes: [[300, 250]],
-        bidId: '266d810da21904',
-        bidderRequestId: '13c05d264c7ffe',
-        auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
-        src: 'client',
-        bidRequestsCount: 1,
-        bidderRequestsCount: 1,
-        bidderWinsCount: 0}];
-    let bidderRequest = {
-      bidderCode: 'iqm',
-      auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
-      bidderRequestId: '13c05d264c7ffe',
-      bids: [{
-        bidder: 'iqm',
-        params: {publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a', placementId: 23451, bidfloor: 0.5},
-        crumbs: {pubcid: 'a0f51f64-6d86-41d0-abaf-7ece71404d94'},
-        ortb2Imp: {ext: {data: {'pbadslot': '/19968336/header-bid-tag-0'}}},
-        mediaTypes: {banner: {sizes: [[300, 250]]}},
-        adUnitCode: '/19968336/header-bid-tag-0',
-        transactionId: '56fe8d92-ff6e-4c34-90ad-2f743cd0eae8',
-        sizes: [[300, 250]],
-        bidId: '266d810da21904',
-        bidderRequestId: '13c05d264c7ffe',
-        auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
-        src: 'client',
-        bidRequestsCount: 1,
-        bidderRequestsCount: 1,
-        bidderWinsCount: 0
-      }],
-      auctionStart: 1615205942159,
-      timeout: 7000,
-      refererInfo: {
-        page: 'http://test.localhost:9999/integrationExamples/gpt/hello_world.html',
-        domain: 'test.localhost.com:9999',
-        ref: null,
-        reachedTop: true,
-        isAmp: false,
-        numIframes: 0,
-        stack: ['http://test.localhost:9999/integrationExamples/gpt/hello_world.html'],
-        canonicalUrl: null
-      },
-      start: 1615205942162
-    };
-    let response = {
-
-      id: '5bdbab92aae961cfbdf7465d',
-      seatbid: [{bid: [{id: 'bid-5bdbab92aae961cfbdf7465d-5bdbab92aae961cfbdf74653', impid: '5bdbab92aae961cfbdf74653', price: 9.9, nurl: 'https://winn.stage.iqm.com/smaato?raw=w9XViV4dovBHrxujHhBj-l-uWB08CUOMW_oR-EUxZbaWLL0ENzcMlP3CJFEURN6FgRp_HdjAjxTYHR7uG4S6h6dl_vjU_YNABiPd607-iTqxOCl-2cKLo-hhQus4sMw01VIqyqrPmzOTHTwJm4vTjUIoWMPZbARgQvUnBzjRH9xeYS-Bv3kgAW9NSBfgBZeLyT3WJJ_3VKIE_Iurt8OjpA%3D%3D&req_id=5bdbab92aae961cfbdf7465d&ap=${AUCTION_PRICE}', adm: "             ", adomain: ['click.iqm.com'], iurl: 'https://d3jme5si7t6llb.cloudfront.net/image/1/404/owVo6mc_1588902031079.png', cid: '169218', crid: 'cr-301435', attr: [], h: 250, w: 250}]}],
-      bidid: '5bdbab92aae961cfbdf7465d'
-    };
-
-    it('should get correct bid response', function () {
-      let expectedResponse = [
-        {requestId: '49ad5f21156efd', currency: 'USD', cpm: 9.9, netRevenue: true, creativeId: 'cr-301435', adUnitCode: '/19968336/header-bid-tag-0', auctionId: '853cddf1-8d13-4482-bd88-f5ef927d5ab3', mediaType: 'banner', ttl: 3000, ad: "             ", width: 250, height: 250}
-      ];
-      let temprequest = spec.buildRequests(validBidRequests_temp, bidderRequest);
-
-      let result = spec.interpretResponse({ body: response }, temprequest[0]);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
-    });
-
-    let validBidRequests_temp_video =
-      [{bidder: 'iqm', params: {publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a', placementId: 23451, bidfloor: 0.5, video: {placement: 2, mimes: ['video/mp4'], protocols: [2, 5], skipppable: true, playback_method: ['auto_play_sound_off']}}, crumbs: {pubcid: 'cd86c3ff-d630-40e6-83ab-420e9e800594'}, fpd: {context: {pbAdSlot: 'video1'}}, mediaTypes: {video: {playerSize: [[640, 480]], context: 'instream'}}, adUnitCode: 'video1', transactionId: '8335b266-7a41-45f9-86a2-92fdc7cf0cd9', sizes: [[640, 480]], bidId: '26274beff25455', bidderRequestId: '17c5d8c3168761', auctionId: '2c592dcf-7dfc-4823-8203-dd1ebab77fe0', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0}];
-    let bidderRequest_video = {
-      bidderCode: 'iqm',
-      auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
-      bidderRequestId: '16e1ce8481bc6d',
-      bids: [{
-        bidder: 'iqm',
-        params: {
-          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
-          placementId: 23451,
-          bidfloor: 0.5,
-          video: {
-            placement: 2,
-            mimes: ['video/mp4'],
-            protocols: [2, 5],
-            skipppable: true,
-            playback_method: ['auto_play_sound_off']
-          }
-        },
-        crumbs: {pubcid: '09b8f065-9d1b-4a36-bd0c-ea22e2dad807'},
-        ortb2Imp: {ext: {data: {'pbadslot': 'video1'}}},
-        mediaTypes: {video: {playerSize: [[640, 480]], context: 'instream'}},
-        adUnitCode: 'video1',
-        transactionId: '86795c66-acf9-4dd5-998f-6d5362aaa541',
-        sizes: [[640, 480]],
-        bidId: '28bfb7e2d12897',
-        bidderRequestId: '16e1ce8481bc6d',
-        auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
-        src: 'client',
-        bidRequestsCount: 1,
-        bidderRequestsCount: 1,
-        bidderWinsCount: 0
-      }],
-      auctionStart: 1615271191985,
-      timeout: 3000,
-      refererInfo: {
-        page: 'http://test.localhost:9999/integrationExamples/gpt/pbjs_video_adUnit.html',
-        domain: 'test.localhost.com:9999',
-        ref: '',
-        reachedTop: true,
-        isAmp: false,
-        numIframes: 0,
-        stack: ['http://test.localhost:9999/integrationExamples/gpt/pbjs_video_adUnit.html'],
-        canonicalUrl: null
-      },
-      start: 1615271191988
-    };
-
-    it('handles non-banner media responses', function () {
-      let response = {id: '2341234', seatbid: [{bid: [{id: 'bid-2341234-1', impid: '1', price: 9, nurl: 'https://frontend.stage.iqm.com/static/vast-01.xml', adm: 'http://cdn.iqm.com/pbd?raw=312730_203cf73dc83fb_2824348636878_pbd', adomain: ['app1.stage.iqm.com'], cid: '168900', crid: 'cr-304503', attr: []}]}], bidid: '2341234'};
-
-      let temprequest_video = spec.buildRequests(validBidRequests_temp_video, bidderRequest_video);
-
-      let result = spec.interpretResponse({ body: response }, temprequest_video[0]);
-      expect(result[0]).to.have.property('vastUrl');
-    });
-  });
-});
diff --git a/test/spec/modules/iqxBidAdapter_spec.js b/test/spec/modules/iqxBidAdapter_spec.js
new file mode 100644
index 00000000000..29b03a4ed3a
--- /dev/null
+++ b/test/spec/modules/iqxBidAdapter_spec.js
@@ -0,0 +1,447 @@
+import {expect} from 'chai';
+import {config} from 'src/config.js';
+import {spec} from 'modules/iqxBidAdapter.js';
+import {deepClone} from 'src/utils';
+import {getBidFloor} from '../../../libraries/xeUtils/bidderUtils.js';
+
+const ENDPOINT = 'https://pbjs.iqzonertb.live';
+
+const defaultRequest = {
+  adUnitCode: 'test',
+  bidId: '1',
+  requestId: 'qwerty',
+  ortb2: {
+    source: {
+      tid: 'auctionId'
+    }
+  },
+  ortb2Imp: {
+    ext: {
+      tid: 'tr1',
+    }
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 200]
+      ]
+    }
+  },
+  bidder: 'iqx',
+  params: {
+    env: 'iqx',
+    pid: '40',
+    ext: {}
+  },
+  bidRequestsCount: 1
+};
+
+const defaultRequestVideo = deepClone(defaultRequest);
+defaultRequestVideo.mediaTypes = {
+  video: {
+    playerSize: [640, 480],
+    context: 'instream',
+    skipppable: true
+  }
+};
+describe('iqxBidAdapter', () => {
+  describe('isBidRequestValid', function () {
+    it('should return false when request params is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when required env param is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params.env;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when required pid param is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params.pid;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when video.playerSize is missing', function () {
+      const invalidRequest = deepClone(defaultRequestVideo);
+      delete invalidRequest.mediaTypes.video.playerSize;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(defaultRequest)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+
+    it('should send request with correct structure', function () {
+      const request = spec.buildRequests([defaultRequest], {});
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal(ENDPOINT + '/bid');
+      expect(request.options).to.have.property('contentType').and.to.equal('application/json');
+      expect(request).to.have.property('data');
+    });
+
+    it('should build basic request structure', function () {
+      const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
+      expect(request).to.have.property('bidId').and.to.equal(defaultRequest.bidId);
+      expect(request).to.have.property('auctionId').and.to.equal(defaultRequest.ortb2.source.tid);
+      expect(request).to.have.property('transactionId').and.to.equal(defaultRequest.ortb2Imp.ext.tid);
+      expect(request).to.have.property('tz').and.to.equal(new Date().getTimezoneOffset());
+      expect(request).to.have.property('bc').and.to.equal(1);
+      expect(request).to.have.property('floor').and.to.equal(null);
+      expect(request).to.have.property('banner').and.to.deep.equal({sizes: [[300, 250], [300, 200]]});
+      expect(request).to.have.property('gdprApplies').and.to.equal(0);
+      expect(request).to.have.property('consentString').and.to.equal('');
+      expect(request).to.have.property('userEids').and.to.deep.equal([]);
+      expect(request).to.have.property('usPrivacy').and.to.equal('');
+      expect(request).to.have.property('sizes').and.to.deep.equal(['300x250', '300x200']);
+      expect(request).to.have.property('ext').and.to.deep.equal({});
+      expect(request).to.have.property('env').and.to.deep.equal({
+        env: 'iqx',
+        pid: '40'
+      });
+      expect(request).to.have.property('device').and.to.deep.equal({
+        ua: navigator.userAgent,
+        lang: navigator.language
+      });
+    });
+
+    it('should build request with schain', function () {
+      const schainRequest = deepClone(defaultRequest);
+      schainRequest.schain = {
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([schainRequest], {}).data)[0];
+      expect(request).to.have.property('schain').and.to.deep.equal({
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      });
+    });
+
+    it('should build request with location', function () {
+      const bidderRequest = {
+        refererInfo: {
+          page: 'page',
+          location: 'location',
+          domain: 'domain',
+          ref: 'ref',
+          isAmp: false
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('location');
+      const location = request.location;
+      expect(location).to.have.property('page').and.to.equal('page');
+      expect(location).to.have.property('location').and.to.equal('location');
+      expect(location).to.have.property('domain').and.to.equal('domain');
+      expect(location).to.have.property('ref').and.to.equal('ref');
+      expect(location).to.have.property('isAmp').and.to.equal(false);
+    });
+
+    it('should build request with ortb2 info', function () {
+      const ortb2Request = deepClone(defaultRequest);
+      ortb2Request.ortb2 = {
+        site: {
+          name: 'name'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([ortb2Request], {}).data)[0];
+      expect(request).to.have.property('ortb2').and.to.deep.equal({
+        site: {
+          name: 'name'
+        }
+      });
+    });
+
+    it('should build request with ortb2Imp info', function () {
+      const ortb2ImpRequest = deepClone(defaultRequest);
+      ortb2ImpRequest.ortb2Imp = {
+        ext: {
+          data: {
+            pbadslot: 'home1',
+            adUnitSpecificAttribute: '1'
+          }
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([ortb2ImpRequest], {}).data)[0];
+      expect(request).to.have.property('ortb2Imp').and.to.deep.equal({
+        ext: {
+          data: {
+            pbadslot: 'home1',
+            adUnitSpecificAttribute: '1'
+          }
+        }
+      });
+    });
+
+    it('should build request with valid bidfloor', function () {
+      const bfRequest = deepClone(defaultRequest);
+      bfRequest.getFloor = () => ({floor: 5, currency: 'USD'});
+      const request = JSON.parse(spec.buildRequests([bfRequest], {}).data)[0];
+      expect(request).to.have.property('floor').and.to.equal(5);
+    });
+
+    it('should build request with gdpr consent data if applies', function () {
+      const bidderRequest = {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'qwerty'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('gdprApplies').and.equals(1);
+      expect(request).to.have.property('consentString').and.equals('qwerty');
+    });
+
+    it('should build request with usp consent data if applies', function () {
+      const bidderRequest = {
+        uspConsent: '1YA-'
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('usPrivacy').and.equals('1YA-');
+    });
+
+    it('should build request with extended ids', function () {
+      const idRequest = deepClone(defaultRequest);
+      idRequest.userIdAsEids = [
+        {source: 'adserver.org', uids: [{id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: {rtiPartner: 'TDID'}}]},
+        {source: 'pubcid.org', uids: [{id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1}]}
+      ];
+      const request = JSON.parse(spec.buildRequests([idRequest], {}).data)[0];
+      expect(request).to.have.property('userEids').and.deep.equal(idRequest.userIdAsEids);
+    });
+
+    it('should build request with video', function () {
+      const request = JSON.parse(spec.buildRequests([defaultRequestVideo], {}).data)[0];
+      expect(request).to.have.property('video').and.to.deep.equal({
+        playerSize: [640, 480],
+        context: 'instream',
+        skipppable: true
+      });
+      expect(request).to.have.property('sizes').and.to.deep.equal(['640x480']);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return empty bids', function () {
+      const serverResponse = {
+        body: {
+          data: null
+        }
+      };
+
+      const invalidResponse = spec.interpretResponse(serverResponse, {});
+      expect(invalidResponse).to.be.an('array').that.is.empty;
+    });
+
+    it('should interpret valid response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 300,
+            height: 250,
+            ttl: 600,
+            meta: {
+              advertiserDomains: ['iqx']
+            },
+            ext: {
+              pixels: [
+                ['iframe', 'surl1'],
+                ['image', 'surl2'],
+              ]
+            }
+          }]
+        }
+      };
+
+      const validResponse = spec.interpretResponse(serverResponse, {bidderRequest: defaultRequest});
+      const bid = validResponse[0];
+      expect(validResponse).to.be.an('array').that.is.not.empty;
+      expect(bid.requestId).to.equal('qwerty');
+      expect(bid.cpm).to.equal(1);
+      expect(bid.currency).to.equal('USD');
+      expect(bid.width).to.equal(300);
+      expect(bid.height).to.equal(250);
+      expect(bid.ttl).to.equal(600);
+      expect(bid.meta).to.deep.equal({advertiserDomains: ['iqx']});
+    });
+
+    it('should interpret valid banner response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 300,
+            height: 250,
+            ttl: 600,
+            mediaType: 'banner',
+            creativeId: 'xe-demo-banner',
+            ad: 'ad',
+            meta: {}
+          }]
+        }
+      };
+
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: defaultRequest});
+      const bid = validResponseBanner[0];
+      expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+      expect(bid.mediaType).to.equal('banner');
+      expect(bid.creativeId).to.equal('xe-demo-banner');
+      expect(bid.ad).to.equal('ad');
+    });
+
+    it('should interpret valid video response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 600,
+            height: 480,
+            ttl: 600,
+            mediaType: 'video',
+            creativeId: 'xe-demo-video',
+            ad: 'vast-xml',
+            meta: {}
+          }]
+        }
+      };
+
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: defaultRequestVideo});
+      const bid = validResponseBanner[0];
+      expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+      expect(bid.mediaType).to.equal('video');
+      expect(bid.creativeId).to.equal('xe-demo-video');
+      expect(bid.ad).to.equal('vast-xml');
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('shoukd handle no params', function () {
+      const opts = spec.getUserSyncs({}, []);
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty if sync is not allowed', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false});
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should allow iframe sync', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('iframe');
+      expect(opts[0].url).to.equal('surl1?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+    });
+
+    it('should allow pixel sync', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+    });
+
+    it('should allow pixel sync and parse consent params', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }], {
+        gdprApplies: 1,
+        consentString: '1YA-'
+      });
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=1&gdpr_consent=1YA-');
+    });
+  });
+
+  describe('getBidFloor', function () {
+    it('should return null when getFloor is not a function', () => {
+      const bid = {getFloor: 2};
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when getFloor doesnt return an object', () => {
+      const bid = {getFloor: () => 2};
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when floor is not a number', () => {
+      const bid = {
+        getFloor: () => ({floor: 'string', currency: 'USD'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when currency is not USD', () => {
+      const bid = {
+        getFloor: () => ({floor: 5, currency: 'EUR'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return floor value when everything is correct', () => {
+      const bid = {
+        getFloor: () => ({floor: 5, currency: 'USD'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.equal(5);
+    });
+  });
+})
diff --git a/test/spec/modules/iqzoneBidAdapter_spec.js b/test/spec/modules/iqzoneBidAdapter_spec.js
index 2e920d3b769..f642a935f69 100644
--- a/test/spec/modules/iqzoneBidAdapter_spec.js
+++ b/test/spec/modules/iqzoneBidAdapter_spec.js
@@ -3,9 +3,19 @@ import { spec } from '../../../modules/iqzoneBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'iqzone'
+const bidder = 'iqzone';
 
 describe('IQZoneBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -16,8 +26,9 @@ describe('IQZoneBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -30,8 +41,9 @@ describe('IQZoneBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -53,8 +65,9 @@ describe('IQZoneBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -73,9 +86,20 @@ describe('IQZoneBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
     timeout: 500
   };
@@ -112,6 +136,7 @@ describe('IQZoneBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -129,7 +154,7 @@ describe('IQZoneBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -145,6 +170,56 @@ describe('IQZoneBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -170,8 +245,10 @@ describe('IQZoneBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -186,12 +263,38 @@ describe('IQZoneBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -381,7 +484,7 @@ describe('IQZoneBidAdapter', function () {
       expect(syncData[0].type).to.be.a('string')
       expect(syncData[0].type).to.equal('image')
       expect(syncData[0].url).to.be.a('string')
-      expect(syncData[0].url).to.equal('https://cs.smartssp.iqzone.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+      expect(syncData[0].url).to.equal('https://cs.iqzone.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
     });
     it('Should return array of objects with proper sync config , include CCPA', function() {
       const syncData = spec.getUserSyncs({}, {}, {}, {
@@ -392,7 +495,19 @@ describe('IQZoneBidAdapter', function () {
       expect(syncData[0].type).to.be.a('string')
       expect(syncData[0].type).to.equal('image')
       expect(syncData[0].url).to.be.a('string')
-      expect(syncData[0].url).to.equal('https://cs.smartssp.iqzone.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+      expect(syncData[0].url).to.equal('https://cs.iqzone.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.iqzone.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
     });
   });
 });
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 853215d95ad..e0162617be3 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -2,7 +2,7 @@ import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
-import { spec, storage, ERROR_CODES, FEATURE_TOGGLES, LOCAL_STORAGE_FEATURE_TOGGLES_KEY, REQUESTED_FEATURE_TOGGLES, combineImps, bidToVideoImp, bidToNativeImp, deduplicateImpExtFields, removeSiteIDs, addDeviceInfo } from '../../../modules/ixBidAdapter.js';
+import { spec, storage, FEATURE_TOGGLES, LOCAL_STORAGE_FEATURE_TOGGLES_KEY, REQUESTED_FEATURE_TOGGLES, combineImps, bidToVideoImp, bidToNativeImp, deduplicateImpExtFields, removeSiteIDs, addDeviceInfo } from '../../../modules/ixBidAdapter.js';
 import { deepAccess, deepClone } from '../../../src/utils.js';
 
 describe('IndexexchangeAdapter', function () {
@@ -188,6 +188,35 @@ describe('IndexexchangeAdapter', function () {
     }
   ];
 
+  const DEFAULT_BANNER_VALID_BID_WITH_FLEDGE_ENABLED = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '123',
+        size: [300, 250]
+      },
+      sizes: [[300, 250], [300, 600]],
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]],
+          pos: 0
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47229',
+          ae: 1 // Fledge enabled
+        },
+      },
+      adUnitCode: 'div-fledge-ad-1460505748561-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47229',
+      bidId: '1a2b3c4d',
+      bidderRequestId: '11a22b33c44d',
+      auctionId: '1aa2bb3cc4dd',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
   const DEFAULT_BANNER_VALID_BID_PARAM_NO_SIZE = [
     {
       bidder: 'ix',
@@ -596,6 +625,45 @@ describe('IndexexchangeAdapter', function () {
     ]
   };
 
+  const DEFAULT_BANNER_BID_RESPONSE_WITH_DSA = {
+    cur: 'USD',
+    id: '11a22b33c44d',
+    seatbid: [
+      {
+        bid: [
+          {
+            crid: '12345',
+            adomain: ['www.abc.com'],
+            adid: '14851455',
+            impid: '1a2b3c4d',
+            cid: '3051266',
+            price: 100,
+            w: 300,
+            h: 250,
+            id: '1',
+            ext: {
+              dspid: 50,
+              pricelevel: '_100',
+              advbrandid: 303325,
+              advbrand: 'OECTA',
+              dsa: {
+                behalf: 'Advertiser',
+                paid: 'Advertiser',
+                transparency: [{
+                  domain: 'dsp1domain.com',
+                  dsaparams: [1, 2]
+                }],
+                'adrender': 1
+              }
+            },
+            adm: ''
+          }
+        ],
+        seat: '3970'
+      }
+    ]
+  };
+
   const DEFAULT_BANNER_BID_RESPONSE_WITHOUT_ADOMAIN = {
     cur: 'USD',
     id: '11a22b33c44d',
@@ -735,6 +803,52 @@ describe('IndexexchangeAdapter', function () {
     }
   };
 
+  const DEFAULT_OPTION_FLEDGE_ENABLED_GLOBALLY = {
+    gdprConsent: {
+      gdprApplies: true,
+      consentString: '3huaa11=qu3198ae',
+      vendorData: {}
+    },
+    refererInfo: {
+      page: 'https://www.prebid.org',
+      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    },
+    ortb2: {
+      site: {
+        page: 'https://www.prebid.org'
+      },
+      source: {
+        tid: 'mock-tid'
+      }
+    },
+    paapi: {
+      enabled: true
+    },
+  };
+
+  const DEFAULT_OPTION_FLEDGE_ENABLED = {
+    gdprConsent: {
+      gdprApplies: true,
+      consentString: '3huaa11=qu3198ae',
+      vendorData: {}
+    },
+    refererInfo: {
+      page: 'https://www.prebid.org',
+      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    },
+    ortb2: {
+      site: {
+        page: 'https://www.prebid.org'
+      },
+      source: {
+        tid: 'mock-tid'
+      }
+    },
+    paapi: {
+      enabled: true
+    }
+  };
+
   const DEFAULT_IDENTITY_RESPONSE = {
     IdentityIp: {
       responsePending: false,
@@ -742,7 +856,8 @@ describe('IndexexchangeAdapter', function () {
         source: 'identityinc.com',
         uids: [
           {
-            id: 'identityid'
+            id: 'identityid',
+            atype: 1
           }
         ]
       }
@@ -760,6 +875,8 @@ describe('IndexexchangeAdapter', function () {
     id5id: { uid: 'testid5id' }, // ID5
     imuid: 'testimuid',
     '33acrossId': { envelope: 'v1.5fs.1000.fjdiosmclds' },
+    'criteoID': { envelope: 'testcriteoID' },
+    'euidID': { envelope: 'testeuid' },
     pairId: {envelope: 'testpairId'}
   };
 
@@ -819,6 +936,16 @@ describe('IndexexchangeAdapter', function () {
       uids: [{
         id: DEFAULT_USERID_DATA['33acrossId'].envelope
       }]
+    }, {
+      source: 'criteo.com',
+      uids: [{
+        id: DEFAULT_USERID_DATA['criteoID'].envelope
+      }]
+    }, {
+      source: 'euid.eu',
+      uids: [{
+        id: DEFAULT_USERID_DATA['euidID'].envelope
+      }]
     }, {
       source: 'google.com',
       uids: [{
@@ -835,6 +962,23 @@ describe('IndexexchangeAdapter', function () {
 
   const extractPayload = function (bidRequest) { return bidRequest.data }
 
+  const generateEid = function (numEid) {
+    const eids = [];
+
+    for (let i = 1; i <= numEid; i++) {
+      const newEid = {
+        source: `eid_source_${i}.com`,
+        uids: [{
+          id: `uid_id_${i}`,
+        }]
+      };
+
+      eids.push(newEid);
+    }
+
+    return eids;
+  }
+
   describe('inherited functions', function () {
     it('should exists and is a function', function () {
       const adapter = newBidder(spec);
@@ -1208,34 +1352,6 @@ describe('IndexexchangeAdapter', function () {
     });
   });
 
-  describe('Roundel alias adapter', function () {
-    const vaildBids = [DEFAULT_BANNER_VALID_BID, DEFAULT_VIDEO_VALID_BID, DEFAULT_MULTIFORMAT_BANNER_VALID_BID, DEFAULT_MULTIFORMAT_VIDEO_VALID_BID];
-    const ALIAS_OPTIONS = Object.assign({
-      bidderCode: 'roundel'
-    }, DEFAULT_OPTION);
-
-    it('should not build requests for mediaTypes if liveramp data is unavaliable', function () {
-      vaildBids.forEach((validBid) => {
-        const request = spec.buildRequests(validBid, ALIAS_OPTIONS);
-        expect(request).to.be.an('array');
-        expect(request).to.have.lengthOf(0);
-      });
-    });
-
-    it('should build requests for mediaTypes if liveramp data is avaliable', function () {
-      vaildBids.forEach((validBid) => {
-        const cloneValidBid = utils.deepClone(validBid);
-        cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
-        const request = spec.buildRequests(cloneValidBid, ALIAS_OPTIONS);
-        const payload = extractPayload(request[0]);
-        expect(request).to.be.an('array');
-        expect(request).to.have.lengthOf.above(0); // should be 1 or more
-        expect(payload.user.eids).to.have.lengthOf(9);
-        expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
-      });
-    });
-  });
-
   describe('buildRequestsIdentity', function () {
     let request;
     let payload;
@@ -1268,8 +1384,14 @@ describe('IndexexchangeAdapter', function () {
 
       it('identity data in impression should have correct format and value (single identity partner)', function () {
         const impression = payload.user.eids;
+        expect(impression).to.be.an('array');
+        expect(impression).to.have.lengthOf(1);
         expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
+        expect(impression[0].uids).to.be.an('array');
+        expect(impression[0].uids).to.have.lengthOf(1);
         expect(impression[0].uids[0].id).to.equal(testCopy.IdentityIp.data.uids[0].id);
+        expect(impression[0].uids[0].atype).to.exist;
+        expect(impression[0].uids[0].atype).to.equal(testCopy.IdentityIp.data.uids[0].atype);
       });
     });
 
@@ -1401,6 +1523,15 @@ describe('IndexexchangeAdapter', function () {
   describe('buildRequestsUserId', function () {
     let validIdentityResponse;
     let validUserIdPayload;
+    const serverResponse = {
+      body: {
+        ext: {
+          pbjs_allow_all_eids: {
+            activated: true
+          }
+        }
+      }
+    };
 
     beforeEach(function () {
       window.headertag = {};
@@ -1411,6 +1542,7 @@ describe('IndexexchangeAdapter', function () {
 
     afterEach(function () {
       delete window.headertag;
+      validIdentityResponse = {}
     });
 
     it('IX adapter reads supported user modules from Prebid and adds it to Video', function () {
@@ -1418,10 +1550,89 @@ describe('IndexexchangeAdapter', function () {
       cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
       const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
       const payload = extractPayload(request);
-      expect(payload.user.eids).to.have.lengthOf(9);
+      expect(payload.user.eids).to.have.lengthOf(11);
       expect(payload.user.eids).to.have.deep.members(DEFAULT_USERID_PAYLOAD);
     });
 
+    it('IX adapter filters eids from prebid past the maximum eid limit', function () {
+      const cloneValidBid = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
+      let eid_sent_from_prebid = generateEid(55);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(eid_sent_from_prebid);
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = extractPayload(request);
+      expect(payload.user.eids).to.have.lengthOf(50);
+      let eid_accepted = eid_sent_from_prebid.slice(0, 50);
+      expect(payload.user.eids).to.have.deep.members(eid_accepted);
+      expect(payload.ext.ixdiag.eidLength).to.equal(55);
+    });
+
+    it('IX adapter filters eids from IXL past the maximum eid limit', function () {
+      validIdentityResponse = {
+        MerkleIp: {
+          responsePending: false,
+          data: {
+            source: 'merkle.com',
+            uids: [{
+              id: '1234-5678-9012-3456',
+              ext: {
+                keyID: '1234-5678',
+                enc: 1
+              }
+            }]
+          }
+        },
+        LiveIntentIp: {
+          responsePending: false,
+          data: {
+            source: 'liveintent.com',
+            uids: [{
+              id: '1234-5678-9012-3456',
+              ext: {
+                keyID: '1234-5678',
+                rtiPartner: 'LDID',
+                enc: 1
+              }
+            }]
+          }
+        }
+      };
+      const cloneValidBid = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
+      let eid_sent_from_prebid = generateEid(49);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(eid_sent_from_prebid);
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = extractPayload(request);
+      expect(payload.user.eids).to.have.lengthOf(50);
+      eid_sent_from_prebid.push({
+        source: 'merkle.com',
+        uids: [{
+          id: '1234-5678-9012-3456',
+          ext: {
+            keyID: '1234-5678',
+            enc: 1
+          }
+        }]
+      })
+      expect(payload.user.eids).to.have.deep.members(eid_sent_from_prebid);
+      expect(payload.ext.ixdiag.eidLength).to.equal(49);
+    });
+
+    it('Has incoming eids with no uid', function () {
+      const cloneValidBid = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
+      let eid_sent_from_prebid = [
+        {
+          source: 'catijah.org'
+        },
+        {
+          source: 'bagel.com'
+        }
+      ];
+      cloneValidBid[0].userIdAsEids = utils.deepClone(eid_sent_from_prebid);
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = extractPayload(request);
+      expect(payload.user.eids).to.be.undefined
+      expect(payload.ext.ixdiag.eidLength).to.equal(2);
+    });
+
     it('We continue to send in IXL identity info and Prebid takes precedence over IXL', function () {
       validIdentityResponse = {
         AdserverOrgIp: {
@@ -1551,7 +1762,7 @@ describe('IndexexchangeAdapter', function () {
       })
 
       expect(payload.user).to.exist;
-      expect(payload.user.eids).to.have.lengthOf(11);
+      expect(payload.user.eids).to.have.lengthOf(13);
 
       expect(payload.user.eids).to.have.deep.members(validUserIdPayload);
     });
@@ -1593,7 +1804,7 @@ describe('IndexexchangeAdapter', function () {
       });
 
       const payload = extractPayload(request);
-      expect(payload.user.eids).to.have.lengthOf(10);
+      expect(payload.user.eids).to.have.lengthOf(12);
       expect(payload.user.eids).to.have.deep.members(validUserIdPayload);
     });
   });
@@ -1700,6 +1911,72 @@ describe('IndexexchangeAdapter', function () {
       expect(r.user.testProperty).to.be.undefined;
     });
 
+    it('should set dsa field when defined', function () {
+      const dsa = {
+        dsarequired: 3,
+        pubrender: 0,
+        datatopub: 2,
+        transparency: [{
+          domain: 'domain.com',
+          dsaparams: [1]
+        }]
+      }
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2: {regs: {
+        ext: {
+          dsa: deepClone(dsa)
+        }
+      }
+      }})[0];
+      const r = extractPayload(request);
+
+      expect(r.regs.ext.dsa.dsarequired).to.equal(dsa.dsarequired);
+      expect(r.regs.ext.dsa.pubrender).to.equal(dsa.pubrender);
+      expect(r.regs.ext.dsa.datatopub).to.equal(dsa.datatopub);
+      expect(r.regs.ext.dsa.transparency).to.be.an('array');
+      expect(r.regs.ext.dsa.transparency).to.have.deep.members(dsa.transparency);
+    });
+    it('should not set dsa fields when fields arent appropriately defined', function () {
+      const dsa = {
+        dsarequired: '3',
+        pubrender: '0',
+        datatopub: '2',
+        transparency: 20
+      }
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2: {regs: {
+        ext: {
+          dsa: deepClone(dsa)
+        }
+      }
+      }})[0];
+      const r = extractPayload(request);
+
+      expect(r.regs).to.be.undefined;
+    });
+    it('should not set dsa transparency when fields arent appropriately defined', function () {
+      const dsa = {
+        transparency: [{
+          domain: 3,
+          dsaparams: [1]
+        },
+        {
+          domain: 'domain.com',
+          dsaparams: 'params'
+        },
+        {
+          domain: 'domain.com',
+          dsaparams: ['1']
+        }]
+      }
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2: {regs: {
+        ext: {
+          dsa: deepClone(dsa)
+        }
+      }
+      }})[0];
+      const r = extractPayload(request);
+
+      expect(r.regs).to.be.undefined;
+    });
     it('should set gpp and gpp_sid field when defined', function () {
       const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2: {regs: {gpp: 'gpp', gpp_sid: [1]}} })[0];
       const r = extractPayload(request);
@@ -1708,7 +1985,7 @@ describe('IndexexchangeAdapter', function () {
       expect(r.regs.gpp_sid).to.be.an('array');
       expect(r.regs.gpp_sid).to.include(1);
     });
-    it('should not set gpp and gpp_sid field when not defined', function () {
+    it('should not set gpp, gpp_sid and dsa field when not defined', function () {
       const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2: {regs: {}} })[0];
       const r = extractPayload(request);
 
@@ -3146,6 +3423,156 @@ describe('IndexexchangeAdapter', function () {
     });
   });
 
+  describe('buildRequestFledge', function () {
+    it('impression should have ae=1 in ext when fledge module is enabled and ae is set in ad unit', function () {
+      const bidderRequest = deepClone(DEFAULT_OPTION_FLEDGE_ENABLED);
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID_WITH_FLEDGE_ENABLED[0]);
+      const requestBidFloor = spec.buildRequests([bid], bidderRequest)[0];
+      const impression = extractPayload(requestBidFloor).imp[0];
+
+      expect(impression.ext.ae).to.equal(1);
+    });
+
+    it('impression should have ae=1 in ext when request has paapi.enabled = true and ext.ae = 1', function () {
+      const bidderRequest = deepClone(DEFAULT_OPTION_FLEDGE_ENABLED);
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID_WITH_FLEDGE_ENABLED[0]);
+      const requestBidFloor = spec.buildRequests([bid], bidderRequest)[0];
+      const impression = extractPayload(requestBidFloor).imp[0];
+
+      expect(impression.ext.ae).to.equal(1);
+    });
+
+    it('impression should not have ae=1 in ext when fledge module is enabled globally through setConfig but overidden at ad unit level', function () {
+      const bidderRequest = deepClone(DEFAULT_OPTION_FLEDGE_ENABLED);
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      const requestBidFloor = spec.buildRequests([bid], bidderRequest)[0];
+      const impression = extractPayload(requestBidFloor).imp[0];
+
+      expect(impression.ext.ae).to.be.undefined;
+    });
+
+    it('impression should not have ae=1 in ext when fledge module is disabled', function () {
+      const bidderRequest = deepClone(DEFAULT_OPTION);
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      const requestBidFloor = spec.buildRequests([bid], bidderRequest)[0];
+      const impression = extractPayload(requestBidFloor).imp[0];
+
+      expect(impression.ext.ae).to.be.undefined;
+    });
+
+    it('should contain correct IXdiag ae property for Fledge', function () {
+      const bid = DEFAULT_BANNER_VALID_BID_WITH_FLEDGE_ENABLED[0];
+      const bidderRequestWithFledgeEnabled = deepClone(DEFAULT_OPTION_FLEDGE_ENABLED);
+      const request = spec.buildRequests([bid], bidderRequestWithFledgeEnabled);
+      const diagObj = extractPayload(request[0]).ext.ixdiag;
+      expect(diagObj.ae).to.equal(true);
+    });
+
+    it('should log warning for non integer auction environment in ad unit for fledge', () => {
+      const logWarnSpy = sinon.spy(utils, 'logWarn');
+      const bid = DEFAULT_BANNER_VALID_BID_WITH_FLEDGE_ENABLED[0];
+      bid.ortb2Imp.ext.ae = 'malformed'
+      const bidderRequestWithFledgeEnabled = deepClone(DEFAULT_OPTION_FLEDGE_ENABLED);
+      spec.buildRequests([bid], bidderRequestWithFledgeEnabled);
+      expect(logWarnSpy.calledWith('error setting auction environment flag - must be an integer')).to.be.true;
+      logWarnSpy.restore();
+    });
+
+    it('impression should have paapi extension when passed', function () {
+      const bidderRequest = deepClone(DEFAULT_OPTION_FLEDGE_ENABLED);
+      let bid = utils.deepClone(DEFAULT_BANNER_VALID_BID_WITH_FLEDGE_ENABLED[0]);
+      bid.ortb2Imp.ext.ae = 1
+      bid.ortb2Imp.ext.paapi = {
+        requestedSize: {
+          width: 300,
+          height: 250
+        }
+      }
+      const requestBidFloor = spec.buildRequests([bid], bidderRequest)[0];
+      const impression = extractPayload(requestBidFloor).imp[0];
+      expect(impression.ext.paapi.requestedSize.width).to.equal(300);
+      expect(impression.ext.paapi.requestedSize.height).to.equal(250);
+    });
+  });
+
+  describe('integration through exchangeId and externalId', function () {
+    const expectedExchangeId = 123456;
+    // create banner bids with externalId but no siteId as bidder param
+    const bannerBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+    delete bannerBids[0].params.siteId;
+    bannerBids[0].params.externalId = 'exteranl_id_1';
+
+    beforeEach(() => {
+      config.setConfig({ exchangeId: expectedExchangeId });
+      spec.resetSiteID();
+    });
+
+    afterEach(() => {
+      config.resetConfig();
+    });
+
+    it('when exchangeId and externalId set but no siteId, isBidRequestValid should return true', function () {
+      const bid = utils.deepClone(bannerBids[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('when neither exchangeId nor siteId set, isBidRequestValid should return false', function () {
+      config.resetConfig();
+      const bid = utils.deepClone(bannerBids[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('when exchangeId and externalId set with banner impression but no siteId, bidrequest sent to endpoint with p param and externalID inside imp.ext', function () {
+      const requests = spec.buildRequests(bannerBids, DEFAULT_OPTION);
+      const payload = extractPayload(requests[0]);
+
+      const expectedURL = IX_SECURE_ENDPOINT + '?p=' + expectedExchangeId;
+      expect(requests[0].url).to.equal(expectedURL);
+      expect(payload.imp[0].ext.externalID).to.equal(bannerBids[0].params.externalId);
+      expect(payload.imp[0].banner.format[0].ext).to.be.undefined;
+      expect(payload.imp[0].ext.siteID).to.be.undefined;
+    });
+
+    it('when exchangeId and externalId set with video impression, bidrequest sent to endpoint with p param and externalID inside imp.ext', function () {
+      const validBids = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
+      delete validBids[0].params.siteId;
+      validBids[0].params.externalId = 'exteranl_id_1';
+
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const payload = extractPayload(requests[0]);
+
+      const expectedURL = IX_SECURE_ENDPOINT + '?p=' + expectedExchangeId;
+      expect(requests[0].url).to.equal(expectedURL);
+      expect(payload.imp[0].ext.externalID).to.equal(validBids[0].params.externalId);
+      expect(payload.imp[0].ext.siteID).to.be.undefined;
+    });
+
+    it('when exchangeId and externalId set beside siteId, bidrequest sent to endpoint with both p param and s param and externalID inside imp.ext and siteID inside imp.banner.format.ext', function () {
+      bannerBids[0].params.siteId = '1234';
+      const requests = spec.buildRequests(bannerBids, DEFAULT_OPTION);
+      const payload = extractPayload(requests[0]);
+
+      const expectedURL = IX_SECURE_ENDPOINT + '?s=' + bannerBids[0].params.siteId + '&p=' + expectedExchangeId;
+      expect(requests[0].url).to.equal(expectedURL);
+      expect(payload.imp[0].ext.externalID).to.equal(bannerBids[0].params.externalId);
+      expect(payload.imp[0].banner.format[0].ext.externalID).to.be.undefined;
+      expect(payload.imp[0].ext.siteID).to.be.undefined;
+      expect(payload.imp[0].banner.format[0].ext.siteID).to.equal(bannerBids[0].params.siteId);
+    });
+
+    it('when exchangeId and siteId set, but no externalId, bidrequest sent to exchange', function () {
+      bannerBids[0].params.siteId = '1234';
+      delete bannerBids[0].params.externalId;
+      const requests = spec.buildRequests(bannerBids, DEFAULT_OPTION);
+      const payload = extractPayload(requests[0]);
+
+      const expectedURL = IX_SECURE_ENDPOINT + '?s=' + bannerBids[0].params.siteId + '&p=' + expectedExchangeId;
+      expect(requests[0].url).to.equal(expectedURL);
+      expect(payload.imp[0].ext.externalID).to.be.undefined;
+      expect(payload.imp[0].banner.format[0].ext.siteID).to.equal(bannerBids[0].params.siteId);
+    });
+  });
+
   describe('interpretResponse', function () {
     // generate bidderRequest with real buildRequest logic for intepretResponse testing
     let bannerBidderRequest
@@ -3183,6 +3610,40 @@ describe('IndexexchangeAdapter', function () {
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
+    it('should get correct bid response for banner ad with dsa signals', function () {
+      const expectedParse = [
+        {
+          requestId: '1a2b3c4d',
+          cpm: 1,
+          creativeId: '12345',
+          width: 300,
+          height: 250,
+          mediaType: 'banner',
+          ad: '',
+          currency: 'USD',
+          ttl: 300,
+          netRevenue: true,
+          meta: {
+            networkId: 50,
+            brandId: 303325,
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com'],
+            dsa: {
+              behalf: 'Advertiser',
+              paid: 'Advertiser',
+              transparency: [{
+                domain: 'dsp1domain.com',
+                dsaparams: [1, 2]
+              }],
+              'adrender': 1
+            }
+          }
+        }
+      ];
+      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE_WITH_DSA }, bannerBidderRequest);
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    });
+
     it('should get correct bid response for banner ad with missing adomain', function () {
       const expectedParse = [
         {
@@ -3669,6 +4130,140 @@ describe('IndexexchangeAdapter', function () {
       const result = spec.interpretResponse({ body: DEFAULT_NATIVE_BID_RESPONSE }, nativeBidderRequest);
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
+
+    describe('Auction config response', function () {
+      let bidderRequestWithFledgeEnabled;
+      let serverResponseWithoutFledgeConfigs;
+      let serverResponseWithFledgeConfigs;
+      let serverResponseWithMalformedAuctionConfig;
+      let serverResponseWithMalformedAuctionConfigs;
+
+      beforeEach(() => {
+        bidderRequestWithFledgeEnabled = spec.buildRequests(DEFAULT_BANNER_VALID_BID_WITH_FLEDGE_ENABLED, {})[0];
+        bidderRequestWithFledgeEnabled.paapi = {enabled: true};
+
+        serverResponseWithoutFledgeConfigs = {
+          body: {
+            ...DEFAULT_BANNER_BID_RESPONSE
+          }
+        };
+
+        serverResponseWithFledgeConfigs = {
+          body: {
+            ...DEFAULT_BANNER_BID_RESPONSE,
+            ext: {
+              protectedAudienceAuctionConfigs: [
+                {
+                  bidId: '59f219e54dc2fc',
+                  config: {
+                    seller: 'https://seller.test.indexexchange.com',
+                    decisionLogicUrl: 'https://seller.test.indexexchange.com/decision-logic.js',
+                    interestGroupBuyers: ['https://buyer.test.indexexchange.com'],
+                    sellerSignals: {
+                      callbackURL: 'https://test.com/ig/v1/ck74j8bcvc9c73a8eg6g'
+                    },
+                    perBuyerSignals: {
+                      'https://buyer.test.indexexchange.com': {}
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        };
+
+        serverResponseWithMalformedAuctionConfig = {
+          body: {
+            ...DEFAULT_BANNER_BID_RESPONSE,
+            ext: {
+              protectedAudienceAuctionConfigs: ['malformed']
+            }
+          }
+        };
+
+        serverResponseWithMalformedAuctionConfigs = {
+          body: {
+            ...DEFAULT_BANNER_BID_RESPONSE,
+            ext: {
+              protectedAudienceAuctionConfigs: 'malformed'
+            }
+          }
+        };
+      });
+
+      it('should correctly interpret response with auction configs', () => {
+        const result = spec.interpretResponse(serverResponseWithFledgeConfigs, bidderRequestWithFledgeEnabled);
+        const expectedOutput = [
+          {
+            bidId: '59f219e54dc2fc',
+            config: {
+              ...serverResponseWithFledgeConfigs.body.ext.protectedAudienceAuctionConfigs[0].config,
+              perBuyerSignals: {
+                'https://buyer.test.indexexchange.com': {}
+              }
+            }
+          }
+        ];
+        expect(result.paapi).to.deep.equal(expectedOutput);
+      });
+
+      it('should correctly interpret response without auction configs', () => {
+        const result = spec.interpretResponse(serverResponseWithoutFledgeConfigs, bidderRequestWithFledgeEnabled);
+        expect(result.paapi).to.be.undefined;
+      });
+
+      it('should handle malformed auction configs gracefully', () => {
+        const result = spec.interpretResponse(serverResponseWithMalformedAuctionConfig, bidderRequestWithFledgeEnabled);
+        expect(result.paapi).to.be.empty;
+      });
+
+      it('should log warning for malformed auction configs', () => {
+        const logWarnSpy = sinon.spy(utils, 'logWarn');
+        spec.interpretResponse(serverResponseWithMalformedAuctionConfig, bidderRequestWithFledgeEnabled);
+        expect(logWarnSpy.calledWith('Malformed auction config detected:', 'malformed')).to.be.true;
+        logWarnSpy.restore();
+      });
+
+      it('should return bids when protected audience auction conigs is malformed', () => {
+        const result = spec.interpretResponse(serverResponseWithMalformedAuctionConfigs, bidderRequestWithFledgeEnabled);
+        expect(result.paapi).to.be.undefined;
+        expect(result.length).to.be.greaterThan(0);
+      });
+    });
+
+    describe('interpretResponse when server response is empty', function() {
+      let serverResponseWithoutBody;
+      let serverResponseWithoutSeatbid;
+      let bidderRequestWithFledgeEnabled;
+      let bidderRequestWithoutFledgeEnabled;
+
+      beforeEach(() => {
+        serverResponseWithoutBody = {};
+
+        serverResponseWithoutSeatbid = {
+          body: {}
+        };
+
+        bidderRequestWithFledgeEnabled = spec.buildRequests(DEFAULT_BANNER_VALID_BID_WITH_FLEDGE_ENABLED, {})[0];
+        bidderRequestWithFledgeEnabled.paapi = {enabled: true};
+
+        bidderRequestWithoutFledgeEnabled = spec.buildRequests(DEFAULT_BANNER_VALID_BID, {})[0];
+      });
+
+      it('should return empty bids when response does not have body', function () {
+        let result = spec.interpretResponse(serverResponseWithoutBody, bidderRequestWithFledgeEnabled);
+        expect(result).to.deep.equal([]);
+        result = spec.interpretResponse(serverResponseWithoutBody, bidderRequestWithoutFledgeEnabled);
+        expect(result).to.deep.equal([]);
+      });
+
+      it('should return empty bids when response body does not have seatbid', function () {
+        let result = spec.interpretResponse(serverResponseWithoutSeatbid, bidderRequestWithFledgeEnabled);
+        expect(result).to.deep.equal([]);
+        result = spec.interpretResponse(serverResponseWithoutSeatbid, bidderRequestWithoutFledgeEnabled);
+        expect(result).to.deep.equal([]);
+      });
+    });
   });
 
   describe('bidrequest consent', function () {
@@ -4248,178 +4843,6 @@ describe('IndexexchangeAdapter', function () {
     });
   });
 
-  describe('LocalStorage error codes', () => {
-    let TODAY = new Date().toISOString().slice(0, 10);
-    const key = 'ixdiag';
-
-    let sandbox;
-    let setDataInLocalStorageStub;
-    let getDataFromLocalStorageStub;
-    let removeDataFromLocalStorageStub;
-    let localStorageValues = {};
-
-    beforeEach(() => {
-      sandbox = sinon.sandbox.create();
-      setDataInLocalStorageStub = sandbox.stub(storage, 'setDataInLocalStorage').callsFake((key, value) => localStorageValues[key] = value)
-      getDataFromLocalStorageStub = sandbox.stub(storage, 'getDataFromLocalStorage').callsFake((key) => localStorageValues[key])
-      removeDataFromLocalStorageStub = sandbox.stub(storage, 'removeDataFromLocalStorage').callsFake((key) => delete localStorageValues[key])
-      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
-    });
-
-    afterEach(() => {
-      setDataInLocalStorageStub.restore();
-      getDataFromLocalStorageStub.restore();
-      removeDataFromLocalStorageStub.restore();
-      localStorageValues = {};
-      sandbox.restore();
-
-      config.setConfig({
-        ortb2: {},
-        ix: {},
-      })
-    });
-
-    it('should not log error in LocalStorage when there is no logError called.', () => {
-      const bid = DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0];
-      expect(spec.isBidRequestValid(bid)).to.be.true;
-      expect(localStorageValues[key]).to.be.undefined;
-    });
-
-    it('should log ERROR_CODES.BID_SIZE_INVALID_FORMAT in LocalStorage when there is logError called.', () => {
-      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.size = ['400', 100];
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.BID_SIZE_INVALID_FORMAT]: 1 } });
-    });
-
-    it('should log ERROR_CODES.BID_SIZE_NOT_INCLUDED in LocalStorage when there is logError called.', () => {
-      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.size = [407, 100];
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.BID_SIZE_NOT_INCLUDED]: 1 } });
-    });
-
-    it('should log ERROR_CODES.PROPERTY_NOT_INCLUDED in LocalStorage when there is logError called.', () => {
-      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.video = {};
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.PROPERTY_NOT_INCLUDED]: 4 } });
-    });
-
-    it('should log ERROR_CODES.SITE_ID_INVALID_VALUE in LocalStorage when there is logError called.', () => {
-      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.siteId = false;
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.SITE_ID_INVALID_VALUE]: 1 } });
-    });
-
-    it('should log ERROR_CODES.BID_FLOOR_INVALID_FORMAT in LocalStorage when there is logError called.', () => {
-      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.bidFloor = true;
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.BID_FLOOR_INVALID_FORMAT]: 1 } });
-    });
-
-    it('should log ERROR_CODES.VIDEO_DURATION_INVALID in LocalStorage when there is logError called.', () => {
-      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.video.minduration = 1;
-      bid.params.video.maxduration = 0;
-
-      expect(spec.isBidRequestValid(bid)).to.be.true;
-      spec.buildRequests([bid]);
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.VIDEO_DURATION_INVALID]: 2 } });
-    });
-
-    it('should increment errors for errorCode', () => {
-      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.video = {};
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.PROPERTY_NOT_INCLUDED]: 4 } });
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.PROPERTY_NOT_INCLUDED]: 8 } });
-    });
-
-    it('should add new errorCode to ixdiag.', () => {
-      let bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.size = ['400', 100];
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.BID_SIZE_INVALID_FORMAT]: 1 } });
-
-      bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.siteId = false;
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({
-        [TODAY]: {
-          [ERROR_CODES.BID_SIZE_INVALID_FORMAT]: 1,
-          [ERROR_CODES.SITE_ID_INVALID_VALUE]: 1
-        }
-      });
-    });
-
-    it('should clear errors with successful response', () => {
-      const ixdiag = { [TODAY]: { '1': 1, '3': 8, '4': 1 } };
-      setDataInLocalStorageStub(key, JSON.stringify(ixdiag));
-
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal(ixdiag);
-
-      const request = DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0];
-      expect(spec.isBidRequestValid(request)).to.be.true;
-
-      const data = {
-        id: '345',
-        imp: [
-          {
-            id: '1a2b3c4e',
-          }
-        ],
-        ext: {
-          ixdiag: {
-            err: {
-              '4': 8
-            }
-          }
-        }
-      };
-
-      const validBidRequest = DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0];
-
-      spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data, validBidRequest });
-
-      expect(localStorageValues[key]).to.be.undefined;
-    });
-
-    it('should clear errors after 7 day expiry errorCode', () => {
-      const EXPIRED_DATE = '2019-12-12';
-
-      const ixdiag = { [EXPIRED_DATE]: { '1': 1, '3': 8, '4': 1 }, [TODAY]: { '3': 8, '4': 1 } };
-      setDataInLocalStorageStub(key, JSON.stringify(ixdiag));
-
-      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.size = ['400', 100];
-
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(JSON.parse(localStorageValues[key])[EXPIRED_DATE]).to.be.undefined;
-      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { '1': 1, '3': 8, '4': 1 } })
-    });
-
-    it('should not save error data into localstorage if consent is not given', () => {
-      config.setConfig({ deviceAccess: false });
-      storage.localStorageIsEnabled.restore(); // let core manage device access
-      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-      bid.params.size = ['400', 100];
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-      expect(localStorageValues[key]).to.be.undefined;
-    });
-  });
   describe('combine imps test', function () {
     it('base test', function () {
       const imps = [
diff --git a/test/spec/modules/jixieBidAdapter_spec.js b/test/spec/modules/jixieBidAdapter_spec.js
index fd0d7e8a033..5428fd0db0f 100644
--- a/test/spec/modules/jixieBidAdapter_spec.js
+++ b/test/spec/modules/jixieBidAdapter_spec.js
@@ -76,8 +76,11 @@ describe('jixie Adapter', function () {
     const jxifoTest1_ = 'fffffbbbbbcccccaaaaae890606aaaaa';
     const jxtdidTest1_ = '222223d1-1111-2222-3333-b9f129299999';
     const jxcompTest1_ = 'AAAAABBBBBCCCCCDDDDDEEEEEUkkZPQfifpkPnnlJhtsa4o+gf4nfqgN5qHiTVX73ymTSbLT9jz1nf+Q7QdxNh9nTad9UaN5pzfHMt/rs1woQw72c1ip+8heZXPfKGZtZP7ldJesYhlo3/0FVcL/wl9ZlAo1jYOEfHo7Y9zFzNXABbbbbb==';
-
+    const ckname1Val_ = 'ckckname1';
+    const ckname2Val_ = 'ckckname2';
     const refJxEids_ = {
+      'pubid1': ckname1Val_,
+      'pubid2': ckname2Val_,
       '_jxtoko': jxtokoTest1_,
       '_jxifo': jxifoTest1_,
       '_jxtdid': jxtdidTest1_,
@@ -206,6 +209,17 @@ describe('jixie Adapter', function () {
       }
     ];
 
+    const testJixieCfg_ = {
+      genids: [
+        { id: 'pubid1', ck: 'ckname1' },
+        { id: 'pubid2', ck: 'ckname2' },
+        { id: '_jxtoko' },
+        { id: '_jxifo' },
+        { id: '_jxtdid' },
+        { id: '_jxcomp' }
+      ]
+    };
+
     it('should attach valid params to the adserver endpoint (1)', function () {
       // this one we do not intercept the cookie stuff so really don't know
       // what will be in there. so we do not check here (using expect)
@@ -216,7 +230,6 @@ describe('jixie Adapter', function () {
       })
       expect(request.data).to.be.an('string');
       const payload = JSON.parse(request.data);
-      expect(payload).to.have.property('auctionid', auctionId_);
       expect(payload).to.have.property('timeout', timeout_);
       expect(payload).to.have.property('currency', currency_);
       expect(payload).to.have.property('bids').that.deep.equals(refBids_);
@@ -226,8 +239,25 @@ describe('jixie Adapter', function () {
       // similar to above test case but here we force some clientid sessionid values
       // and domain, pageurl
       // get the interceptors ready:
+      let getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.callsFake(function fakeFn(prop) {
+        if (prop == 'jixie') {
+          return testJixieCfg_;
+        }
+        return null;
+      });
+
       let getCookieStub = sinon.stub(storage, 'getCookie');
       let getLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+      getCookieStub
+        .withArgs('ckname1')
+        .returns(ckname1Val_);
+      getCookieStub
+        .withArgs('ckname2')
+        .returns(ckname2Val_);
+      getCookieStub
+        .withArgs('_jxtoko')
+        .returns(jxtokoTest1_);
       getCookieStub
         .withArgs('_jxtoko')
         .returns(jxtokoTest1_);
@@ -265,7 +295,6 @@ describe('jixie Adapter', function () {
 
       expect(request.data).to.be.an('string');
       const payload = JSON.parse(request.data);
-      expect(payload).to.have.property('auctionid', auctionId_);
       expect(payload).to.have.property('client_id_c', clientIdTest1_);
       expect(payload).to.have.property('client_id_ls', clientIdTest1_);
       expect(payload).to.have.property('session_id_c', sessionIdTest1_);
@@ -282,6 +311,7 @@ describe('jixie Adapter', function () {
       // unwire interceptors
       getCookieStub.restore();
       getLocalStorageStub.restore();
+      getConfigStub.restore();
       miscDimsStub.restore();
     });// it
 
@@ -362,6 +392,27 @@ describe('jixie Adapter', function () {
       expect(payload.bids[0].bidFloor).to.exist.and.to.equal(2.1);
     });
 
+    it('it should populate the aid field when available', function () {
+      let oneSpecialBidReq = deepClone(bidRequests_[0]);
+      // 1 aid is not set in the jixie config
+      let request = spec.buildRequests([oneSpecialBidReq], bidderRequest_);
+      let payload = JSON.parse(request.data);
+      expect(payload.aid).to.eql('');
+
+      // 2 aid is set in the jixie config
+      let getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.callsFake(function fakeFn(prop) {
+        if (prop == 'jixie') {
+          return { aid: '11223344556677889900' };
+        }
+        return null;
+      });
+      request = spec.buildRequests([oneSpecialBidReq], bidderRequest_);
+      payload = JSON.parse(request.data);
+      expect(payload.aid).to.exist.and.to.equal('11223344556677889900');
+      getConfigStub.restore();
+    });
+
     it('should populate eids when supported userIds are available', function () {
       const oneSpecialBidReq = Object.assign({}, bidRequests_[0], {
         userIdAsEids: [
@@ -425,7 +476,6 @@ describe('jixie Adapter', function () {
     'bids': [
       // video (vast tag url) returned here
       {
-        'trackingUrlBase': 'https://traid.jixie.io/sync/ad?',
         'jxBidId': '62847e4c696edcb-028d5dee-2c83-44e3-bed1-b75002475cdf',
         'requestId': '62847e4c696edcb',
         'cpm': 2.19,
@@ -458,7 +508,6 @@ describe('jixie Adapter', function () {
       // display ad returned here: This one there is advertiserDomains
       // in the response . Will be checked in the unit tests below
       {
-        'trackingUrlBase': 'https://traid.jixie.io/sync/ad?',
         'jxBidId': '600c9ae6fda1acb-028d5dee-2c83-44e3-bed1-b75002475cdf',
         'requestId': '600c9ae6fda1acb',
         'cpm': 1.999,
@@ -495,7 +544,6 @@ describe('jixie Adapter', function () {
       },
       // outstream, jx non-default renderer specified:
       {
-        'trackingUrlBase': 'https://traid.jixie.io/sync/ad?',
         'jxBidId': '99bc539c81b00ce-028d5dee-2c83-44e3-bed1-b75002475cdf',
         'requestId': '99bc539c81b00ce',
         'cpm': 2.99,
@@ -514,7 +562,6 @@ describe('jixie Adapter', function () {
       },
       // outstream, jx default renderer:
       {
-        'trackingUrlBase': 'https://traid.jixie.io/sync/ad?',
         'jxBidId': '61bc539c81b00ce-028d5dee-2c83-44e3-bed1-b75002475cdf',
         'requestId': '61bc539c81b00ce',
         'cpm': 1.99,
@@ -585,7 +632,6 @@ describe('jixie Adapter', function () {
       expect(result[0].netRevenue).to.equal(true)
       expect(result[0].ttl).to.equal(300)
       expect(result[0].vastUrl).to.include('https://ad.jixie.io/v1/video?creativeid=')
-      expect(result[0].trackingUrlBase).to.include('sync')
       // We will always make sure the meta->advertiserDomains property is there
       // If no info it is an empty array.
       expect(result[0].meta.advertiserDomains.length).to.equal(0)
@@ -601,7 +647,6 @@ describe('jixie Adapter', function () {
       expect(result[1].ttl).to.equal(300)
       expect(result[1].ad).to.include('jxoutstream')
       expect(result[1].meta.advertiserDomains.length).to.equal(3)
-      expect(result[1].trackingUrlBase).to.include('sync')
 
       // should pick up about using alternative outstream renderer
       expect(result[2].requestId).to.equal('99bc539c81b00ce')
@@ -613,7 +658,6 @@ describe('jixie Adapter', function () {
       expect(result[2].netRevenue).to.equal(true)
       expect(result[2].ttl).to.equal(300)
       expect(result[2].vastXml).to.include('')
-      expect(result[2].trackingUrlBase).to.include('sync');
       expect(result[2].renderer.id).to.equal('demoslot4-div')
       expect(result[2].meta.advertiserDomains.length).to.equal(0)
       expect(result[2].renderer.url).to.equal(JX_OTHER_OUTSTREAM_RENDERER_URL);
@@ -628,7 +672,6 @@ describe('jixie Adapter', function () {
       expect(result[3].netRevenue).to.equal(true)
       expect(result[3].ttl).to.equal(300)
       expect(result[3].vastXml).to.include('')
-      expect(result[3].trackingUrlBase).to.include('sync');
       expect(result[3].renderer.id).to.equal('demoslot2-div')
       expect(result[3].meta.advertiserDomains.length).to.equal(0)
       expect(result[3].renderer.url).to.equal(JX_OUTSTREAM_RENDERER_URL)
@@ -663,116 +706,68 @@ describe('jixie Adapter', function () {
       spec.onBidWon({ trackingUrl: TRACKINGURL_ })
       expect(jixieaux.ajax.calledWith(TRACKINGURL_)).to.equal(true);
     })
-
-    it('Should not fire if the adserver response indicates no firing', function() {
-      let called = false;
-      ajaxStub.callsFake(function fakeFn() {
-        called = true;
-      });
-      spec.onBidWon({ notrack: 1 })
-      expect(called).to.equal(false);
-    });
-
-    // A reference to check again:
-    const QPARAMS_ = {
-      action: 'hbbidwon',
-      device: device_,
-      pageurl: encodeURIComponent(pageurl_),
-      domain: encodeURIComponent(domain_),
-      cid: 121,
-      cpid: 99,
-      jxbidid: '62847e4c696edcb-028d5dee-2c83-44e3-bed1-b75002475cdf',
-      auctionid: '028d5dee-2c83-44e3-bed1-b75002475cdf',
-      cpm: 1.11,
-      requestid: '62847e4c696edcb'
-    };
-
-    it('check it is sending the correct ajax url and qparameters', function() {
-      spec.onBidWon({
-        trackingUrlBase: 'https://mytracker.com/sync?',
-        cid: 121,
-        cpid: 99,
-        jxBidId: '62847e4c696edcb-028d5dee-2c83-44e3-bed1-b75002475cdf',
-        auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf',
-        cpm: 1.11,
-        requestId: '62847e4c696edcb'
-      })
-      expect(jixieaux.ajax.calledWith('https://mytracker.com/sync?', null, QPARAMS_)).to.equal(true);
-    });
   }); // describe
 
-  /**
-   * onTimeout
-   */
-  describe('onTimeout', function() {
-    let ajaxStub;
-    let miscDimsStub;
-    beforeEach(function() {
-      ajaxStub = sinon.stub(jixieaux, 'ajax');
-      miscDimsStub = sinon.stub(jixieaux, 'getMiscDims');
-      miscDimsStub
-        .returns({ device: device_, pageurl: pageurl_, domain: domain_, mkeywords: keywords_ });
-    })
-
-    afterEach(function() {
-      miscDimsStub.restore();
-      ajaxStub.restore();
-    })
-
-    // reference to check against:
-    const QPARAMS_ = {
-      action: 'hbtimeout',
-      device: device_,
-      pageurl: encodeURIComponent(pageurl_),
-      domain: encodeURIComponent(domain_),
-      auctionid: '028d5dee-2c83-44e3-bed1-b75002475cdf',
-      timeout: 1000,
-      count: 2
-    };
-
-    it('check it is sending the correct ajax url and qparameters', function() {
-      spec.onTimeout([
-        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000},
-        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000}
-      ])
-      expect(jixieaux.ajax.calledWith(spec.EVENTS_URL, null, QPARAMS_)).to.equal(true);
+  describe('getUserSyncs', function () {
+    it('it should favour iframe over pixel if publisher allows iframe usersync', function () {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true,
+      }
+      const response = {
+        'userSyncs': [
+          {
+            'uf': 'https://syncstuff.jixie.io/',
+            'up': 'https://syncstuff.jixie.io/image.gif'
+          },
+          {
+            'up': 'https://syncstuff.jixie.io/image1.gif'
+          }
+        ]
+      }
+      let result = spec.getUserSyncs(syncOptions, [{ body: response }]);
+      expect(result[0].type).to.equal('iframe')
+      expect(result[1].type).to.equal('image')
     })
 
-    it('if turned off via config then dont do onTimeout sending of event', function() {
-      let getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.callsFake(function fakeFn(prop) {
-        if (prop == 'jixie') {
-          return { onTimeout: 'off' };
-        }
-        return null;
-      });
-      let called = false;
-      ajaxStub.callsFake(function fakeFn() {
-        called = true;
-      });
-      spec.onTimeout([
-        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000},
-        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000}
-      ])
-      expect(called).to.equal(false);
-      getConfigStub.restore();
+    it('it should pick pixel if publisher not allow iframe', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': true,
+      }
+      const response = {
+        'userSyncs': [
+          {
+            'uf': 'https://syncstuff.jixie.io/',
+            'up': 'https://syncstuff.jixie.io/image.gif'
+          },
+          {
+            'up': 'https://syncstuff.jixie.io/image1.gif'
+          }
+        ]
+      }
+      let result = spec.getUserSyncs(syncOptions, [{ body: response }]);
+      expect(result[0].type).to.equal('image')
+      expect(result[1].type).to.equal('image')
     })
 
-    const otherUrl_ = 'https://other.azurewebsites.net/sync/evt?';
-    it('if config specifies a different endpoint then should send there instead', function() {
-      let getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.callsFake(function fakeFn(prop) {
-        if (prop == 'jixie') {
-          return { onTimeoutUrl: otherUrl_ };
-        }
-        return null;
-      });
-      spec.onTimeout([
-        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000},
-        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000}
-      ])
-      expect(jixieaux.ajax.calledWith(otherUrl_, null, QPARAMS_)).to.equal(true);
-      getConfigStub.restore();
+    it('it should return nothing if pub only allow pixel but all usersyncs are iframe only', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': true,
+      }
+      const response = {
+        'userSyncs': [
+          {
+            'uf': 'https://syncstuff.jixie.io/',
+          },
+          {
+            'uf': 'https://syncstuff2.jixie.io/',
+          }
+        ]
+      }
+      let result = spec.getUserSyncs(syncOptions, [{ body: response }]);
+      expect(result.length).to.equal(0)
     })
-  });// describe
+  })
 });
diff --git a/test/spec/modules/justIdSystem_spec.js b/test/spec/modules/justIdSystem_spec.js
index b6a8cd2d310..95d964d807c 100644
--- a/test/spec/modules/justIdSystem_spec.js
+++ b/test/spec/modules/justIdSystem_spec.js
@@ -143,7 +143,7 @@ describe('JustIdSystem', function () {
     var scriptTagCallback;
 
     beforeEach(() => {
-      loadExternalScriptStub.callsFake((url, moduleCode, callback) => {
+      loadExternalScriptStub.callsFake((url, moduleCode, moduleType, callback) => {
         scriptTagCallback = callback;
         return scriptTag;
       });
diff --git a/test/spec/modules/jwplayerBidAdapter_spec.js b/test/spec/modules/jwplayerBidAdapter_spec.js
new file mode 100644
index 00000000000..e19790a9670
--- /dev/null
+++ b/test/spec/modules/jwplayerBidAdapter_spec.js
@@ -0,0 +1,412 @@
+import { expect, assert } from 'chai';
+import { spec } from 'modules/jwplayerBidAdapter.js';
+
+describe('jwplayerBidAdapter', function() {
+  beforeEach(function() {
+    this.defaultBidderRequest = {
+      gdprConsent: {
+        consentString: 'testConsentString',
+        gdprApplies: true
+      },
+      uspConsent: 'testCCPA',
+      refererInfo: {
+        referer: 'https://example.com'
+      },
+      ortb2: {
+        site: {
+          domain: 'page.example.com',
+          page: 'https://examplepage.com',
+          content: {
+            url: 'media.mp4',
+            id: 'testMediaId',
+            title: 'testTile',
+            data: [{
+              name: 'jwplayer.com',
+              segment: [{
+                id: '00000000'
+              }, {
+                id: '88888888'
+              }, {
+                id: '80808080'
+              }],
+              ext: {
+                segtax: 502,
+                cids: ['testMediaId', 'externalTestId'],
+              }
+            }],
+            ext: {
+              description: 'testDescription'
+            }
+          }
+        }
+      },
+      timeout: 1000
+    }
+  });
+
+  it('should use jwplayer bidder code', function () {
+    expect(spec.code).to.equal('jwplayer');
+  });
+
+  it('should use jwplayer GVLID code', function () {
+    expect(spec.gvlid).to.equal(1046);
+  });
+
+  it('should support VIDEO media type only', function () {
+    expect(spec.supportedMediaTypes).to.have.length(1);
+    expect(spec.supportedMediaTypes[0]).to.equal('video');
+  });
+
+  describe('isBidRequestValid', function() {
+    it('should be invalid when bidRequest is undefined', function() {
+      assert(spec.isBidRequestValid() === false);
+    });
+
+    it('should be invalid when bidRequest is null', function() {
+      assert(spec.isBidRequestValid(null) === false);
+    });
+
+    it('should be invalid when the bidRequest has no params', function() {
+      assert(spec.isBidRequestValid({}) === false);
+    });
+
+    it('should be invalid when the bid request only includes a publisher ID', function() {
+      assert(spec.isBidRequestValid({params: {publisherId: 'foo'}}) === false);
+    });
+
+    it('should be invalid when the bid request only includes a placement ID', function() {
+      assert(spec.isBidRequestValid({params: {placementId: 'foo'}}) === false);
+    });
+
+    it('should be invalid when the bid request only includes a site ID', function() {
+      assert(spec.isBidRequestValid({params: {siteId: 'foo'}}) === false);
+    });
+
+    it('should be valid when the bid includes a placement ID, a publisher ID and a site ID', function() {
+      assert(spec.isBidRequestValid({params: {placementId: 'foo', publisherId: 'bar', siteId: 'siteId '}}) === true);
+    });
+  });
+
+  describe('buildRequests', function() {
+    it('should return undefined when bidRequests is undefined', function () {
+      expect(spec.buildRequests()).to.be.undefined;
+    });
+
+    it('should return undefined when bidRequests is null', function () {
+      expect(spec.buildRequests(null)).to.be.undefined;
+    });
+
+    it('should return undefined when ortb site.content.url is absent', function () {
+      const request = spec.buildRequests({}, {
+        ortb2: {
+          site: {
+            content: {
+              url: null,
+            }
+          }
+        }
+      });
+
+      expect(request).to.be.undefined;
+    });
+
+    it('should build a valid request when bid request is complete', function() {
+      const incomingBidRequests = [
+        {
+          bidder: 'jwplayer',
+          params: {
+            placementId: 'testPlacementId',
+            publisherId: 'testPublisherId',
+            siteId: 'testSiteId',
+            bidFloor: 10,
+            currency: 'EUR',
+          },
+          mediaTypes: {
+            video: {
+              pos: 3,
+              w: 640,
+              h: 480,
+              context: 'instream',
+              mimes: [
+                'video/mp4',
+                'application/javascript'
+              ],
+              protocols: [2, 3, 5, 6],
+              maxduration: 60,
+              minduration: 3,
+              startdelay: 0,
+              linearity: 1,
+              placement: 1,
+              plcmt: 1,
+              skip: 1,
+              skipafter: 4,
+              minbitrate: 500,
+              maxbitrate: 1000,
+              api: [2],
+              delivery: [2],
+              playbackmethod: [1],
+              playbackend: 2
+            }
+          },
+          schain: {
+            ver: '1.0',
+            complete: 1,
+            nodes: [
+              {
+                asi: 'publisher.com',
+                sid: '00001',
+                hp: 1
+              }
+            ]
+          },
+          bidRequestsCount: 1,
+          adUnitCode: 'testAdUnitCode',
+          bidId: 'testBidId'
+        }
+      ];
+
+      const outgoingBidRequests = spec.buildRequests(incomingBidRequests, this.defaultBidderRequest);
+
+      outgoingBidRequests.forEach(serverRequest => {
+        expect(serverRequest.url).to.equal('https://vpb-server.jwplayer.com/openrtb2/auction');
+        expect(serverRequest.method).to.equal('POST');
+
+        const openrtbRequest = JSON.parse(serverRequest.data);
+
+        expect(openrtbRequest.id).to.equal('testBidId');
+
+        expect(openrtbRequest.imp[0].id).to.equal('testAdUnitCode');
+        expect(openrtbRequest.imp[0].video.w).to.equal(640);
+        expect(openrtbRequest.imp[0].video.h).to.equal(480);
+        expect(openrtbRequest.imp[0].video.mimes).to.deep.equal(['video/mp4', 'application/javascript']);
+        expect(openrtbRequest.imp[0].video.protocols).to.deep.equal([2, 3, 5, 6]);
+        expect(openrtbRequest.imp[0].video.api).to.deep.equal([2]);
+        expect(openrtbRequest.imp[0].video.startdelay).to.equal(0);
+        expect(openrtbRequest.imp[0].video.placement).to.equal(1);
+        expect(openrtbRequest.imp[0].video.plcmt).to.equal(1);
+        expect(openrtbRequest.imp[0].video.pos).to.equal(3);
+        expect(openrtbRequest.imp[0].video.minduration).to.equal(3);
+        expect(openrtbRequest.imp[0].video.maxduration).to.equal(60);
+        expect(openrtbRequest.imp[0].video.skip).to.equal(1);
+        expect(openrtbRequest.imp[0].video.skipafter).to.equal(4);
+        expect(openrtbRequest.imp[0].video.minbitrate).to.equal(500);
+        expect(openrtbRequest.imp[0].video.maxbitrate).to.equal(1000);
+        expect(openrtbRequest.imp[0].video.delivery).to.deep.equal([2]);
+        expect(openrtbRequest.imp[0].video.playbackmethod).to.deep.equal([1]);
+        expect(openrtbRequest.imp[0].video.playbackend).to.equal(2);
+        expect(openrtbRequest.imp[0].video.linearity).to.equal(1);
+
+        expect(openrtbRequest.imp[0].bidfloor).to.equal(10);
+        expect(openrtbRequest.imp[0].bidfloorcur).to.equal('EUR');
+
+        expect(openrtbRequest.imp[0].ext.prebid.bidder.jwplayer.placementId).to.equal('testPlacementId');
+
+        expect(openrtbRequest.site.domain).to.equal('page.example.com');
+        expect(openrtbRequest.site.page).to.equal('https://examplepage.com');
+        expect(openrtbRequest.site.ref).to.equal('https://example.com');
+
+        expect(openrtbRequest.site.publisher.ext.jwplayer.publisherId).to.equal('testPublisherId');
+        expect(openrtbRequest.site.publisher.ext.jwplayer.siteId).to.equal('testSiteId');
+
+        expect(openrtbRequest.site.content.url).to.equal('media.mp4');
+        expect(openrtbRequest.site.content.id).to.equal('testMediaId');
+        expect(openrtbRequest.site.content.title).to.equal('testTile');
+        expect(openrtbRequest.site.content.ext.description).to.equal('testDescription');
+        expect(openrtbRequest.site.content.data.length).to.equal(1);
+        const datum = openrtbRequest.site.content.data[0];
+        expect(datum.name).to.equal('jwplayer.com');
+        expect(datum.segment).to.deep.equal([{
+          id: '00000000'
+        }, {
+          id: '88888888'
+        }, {
+          id: '80808080'
+        }]);
+        expect(datum.ext.segtax).to.equal(502);
+        expect(datum.ext.cids).to.deep.equal(['testMediaId', 'externalTestId']);
+
+        expect(openrtbRequest.device.ua).to.equal(navigator.userAgent);
+        expect(openrtbRequest.device.w).to.not.be.undefined;
+        expect(openrtbRequest.device.h).to.not.be.undefined;
+        expect(openrtbRequest.device.dnt).to.not.be.undefined;
+        expect(openrtbRequest.device.js).to.equal(1);
+        expect(openrtbRequest.device.language).to.not.be.undefined;
+
+        expect(openrtbRequest.user.ext.consent).to.equal('testConsentString');
+
+        expect(openrtbRequest.regs.ext.gdpr).to.equal(1);
+        expect(openrtbRequest.regs.ext.us_privacy).to.equal('testCCPA');
+
+        expect(openrtbRequest.source.schain).to.deep.equal({
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              asi: 'publisher.com',
+              sid: '00001',
+              hp: 1
+            }
+          ]
+        });
+
+        expect(openrtbRequest.tmax).to.equal(1000);
+      });
+    });
+  });
+
+  describe('interpretResponse', function() {
+    const serverResponse = {
+      body: {
+        id: 'test-request-id',
+        cur: 'USD',
+        seatbid: [{
+          bid: [{
+            id: 'testId',
+            impid: 'test-imp-id',
+            price: 5.000,
+            adid: 'test-creative-id',
+            adm: 'test-ad-xml',
+            adomain: ['prebid.com'],
+            cat: ['test-iab-category'],
+            w: 200,
+            h: 150,
+            dealid: 'test-deal-id'
+          }],
+          seat: 1000
+        }]
+      }
+    };
+
+    const bidResponses = spec.interpretResponse(serverResponse);
+
+    expect(bidResponses).to.have.length(1);
+    const bid = bidResponses[0];
+    expect(bid.requestId).to.equal('test-request-id');
+    expect(bid.cpm).to.equal(5);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.width).to.equal(200);
+    expect(bid.height).to.equal(150);
+    expect(bid.creativeId).to.equal('test-creative-id');
+    expect(bid.vastXml).to.equal('test-ad-xml');
+    expect(bid.netRevenue).to.equal(false);
+    expect(bid.ttl).to.equal(3600);
+    expect(bid.ad).to.equal('test-ad-xml');
+    expect(bid.dealId).to.equal('test-deal-id');
+
+    expect(bid.meta).to.not.be.undefined;
+
+    expect(bid.meta.advertiserDomains).to.have.length(1);
+    expect(bid.meta.advertiserDomains[0]).to.equal('prebid.com');
+
+    expect(bid.meta.mediaType).to.equal('video');
+
+    expect(bid.meta.primaryCatId).to.have.length(1);
+    expect(bid.meta.primaryCatId[0]).to.equal('test-iab-category');
+  });
+
+  describe('getUserSyncs', function() {
+    const consentString = 'test_consent_string';
+    const baseGdprConsent = {
+      gdprApplies: true,
+      vendorData: {
+        purpose: {
+          consents: {
+            1: true
+          }
+        }
+      }
+    };
+
+    const expectedBaseUrl = 'https://ib.adnxs.com/getuid?https://vpb-server.jwplayer.com/setuid?bidder=jwplayer&uid=$UID&f=i';
+
+    it('should return empty when Purpose 1 consent is not granted', function() {
+      expect(spec.getUserSyncs({}, {})).to.be.empty;
+      expect(spec.getUserSyncs({}, {}, {})).to.be.empty;
+      expect(spec.getUserSyncs({}, {}, { gdprApplies: false })).to.be.empty;
+      expect(spec.getUserSyncs({}, {}, {
+        gdprApplies: true,
+        vendorData: {
+          purpose: {
+            consents: {
+              1: false
+            }
+          }
+        }
+      })).to.be.empty;
+    });
+
+    it('should return iframe when enabled', function () {
+      const userSyncs = spec.getUserSyncs({ iframeEnabled: true }, {}, baseGdprConsent);
+      expect(userSyncs.length).to.equal(1);
+      const sync = userSyncs[0];
+      expect(sync.type).to.equal('iframe');
+      expect(sync.url).to.equal(expectedBaseUrl);
+    });
+
+    it('should return image when enabled', function () {
+      const userSyncs = spec.getUserSyncs({ pixelEnabled: true }, {}, baseGdprConsent);
+      expect(userSyncs.length).to.equal(1);
+      const sync = userSyncs[0];
+      expect(sync.type).to.equal('image');
+      expect(sync.url).to.equal(expectedBaseUrl);
+    });
+
+    it('should return both iframe and image when enabled', function () {
+      const userSyncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, {}, baseGdprConsent);
+      expect(userSyncs.length).to.equal(2);
+
+      const iframeSync = userSyncs[0];
+      expect(iframeSync.type).to.equal('iframe');
+      expect(iframeSync.url).to.equal(expectedBaseUrl);
+
+      const imageSync = userSyncs[1];
+      expect(imageSync.type).to.equal('image');
+      expect(imageSync.url).to.equal(expectedBaseUrl);
+    });
+
+    it('should include gdpr consent query params in sync redirect url', function () {
+      const expectedUrl = expectedBaseUrl + '&gdpr=1&gdpr_consent=' + consentString;
+      const gdprConsent = Object.assign({ }, baseGdprConsent, { consentString });
+      const userSyncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, {}, gdprConsent);
+      expect(userSyncs.length).to.equal(2);
+
+      const iframeSync = userSyncs[0];
+      expect(iframeSync.type).to.equal('iframe');
+      expect(iframeSync.url).to.equal(expectedUrl);
+
+      const imageSync = userSyncs[1];
+      expect(imageSync.type).to.equal('image');
+      expect(imageSync.url).to.equal(expectedUrl);
+    });
+
+    it('should include gdpr 0 in consent query params when gdprApplies is false', function () {
+      const expectedUrl = expectedBaseUrl + '&gdpr=0&gdpr_consent=' + consentString;
+      const gdprConsent = Object.assign({ }, baseGdprConsent, { consentString, gdprApplies: false });
+      const userSyncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, {}, gdprConsent);
+      expect(userSyncs.length).to.equal(2);
+
+      const iframeSync = userSyncs[0];
+      expect(iframeSync.type).to.equal('iframe');
+      expect(iframeSync.url).to.equal(expectedUrl);
+
+      const imageSync = userSyncs[1];
+      expect(imageSync.type).to.equal('image');
+      expect(imageSync.url).to.equal(expectedUrl);
+    });
+
+    it('should include gdpr 0 in consent query params when gdprApplies is not a bool', function () {
+      const expectedUrl = expectedBaseUrl + '&gdpr=0&gdpr_consent=' + consentString;
+      const gdprConsent = Object.assign({ }, baseGdprConsent, { consentString, gdprApplies: 1 });
+      const userSyncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, {}, gdprConsent);
+      expect(userSyncs.length).to.equal(2);
+
+      const iframeSync = userSyncs[0];
+      expect(iframeSync.type).to.equal('iframe');
+      expect(iframeSync.url).to.equal(expectedUrl);
+
+      const imageSync = userSyncs[1];
+      expect(imageSync.type).to.equal('image');
+      expect(imageSync.url).to.equal(expectedUrl);
+    });
+  });
+});
diff --git a/test/spec/modules/jwplayerRtdProvider_spec.js b/test/spec/modules/jwplayerRtdProvider_spec.js
index 4638595e0d6..58cfc751a4f 100644
--- a/test/spec/modules/jwplayerRtdProvider_spec.js
+++ b/test/spec/modules/jwplayerRtdProvider_spec.js
@@ -11,6 +11,8 @@ import {
   getContentSegments,
   getVatFromCache,
   getVatFromPlayer,
+  setOverrides,
+  getPlayer,
   jwplayerSubmodule
 } from 'modules/jwplayerRtdProvider.js';
 import {server} from 'test/mocks/xhr.js';
@@ -47,7 +49,9 @@ describe('jwplayerRtdProvider', function() {
             playlist: [
               {
                 file: 'test.mp4',
-                jwpseg: validSegments
+                jwpseg: validSegments,
+                title: 'test',
+                description: 'this is a test'
               }
             ]
           })
@@ -57,7 +61,44 @@ describe('jwplayerRtdProvider', function() {
 
         const validTargeting = {
           segments: validSegments,
-          mediaID: testIdForSuccess
+          mediaID: testIdForSuccess,
+          mediaUrl: 'test.mp4',
+          title: 'test',
+          description: 'this is a test'
+        };
+
+        expect(targetingInfo).to.deep.equal(validTargeting);
+      });
+
+      it('should obtain file from sources', function () {
+        request.respond(
+          200,
+          responseHeader,
+          JSON.stringify({
+            playlist: [
+              {
+                sources: [{
+                  label: 'missing file',
+                }, {
+                  file: 'source.mp4',
+                  label: 'valid file'
+                }],
+                jwpseg: validSegments,
+                title: 'test',
+                description: 'this is a test'
+              }
+            ]
+          })
+        );
+
+        const targetingInfo = getVatFromCache(testIdForSuccess);
+
+        const validTargeting = {
+          segments: validSegments,
+          mediaID: testIdForSuccess,
+          mediaUrl: 'source.mp4',
+          title: 'test',
+          description: 'this is a test'
         };
 
         expect(targetingInfo).to.deep.equal(validTargeting);
@@ -82,16 +123,12 @@ describe('jwplayerRtdProvider', function() {
         expect(targetingInfo).to.be.null;
       });
 
-      it('should not write to cache when segments are absent', function() {
+      it('should not write to cache when playlist is empty', function() {
         request.respond(
           200,
           responseHeader,
           JSON.stringify({
-            playlist: [
-              {
-                file: 'test.mp4'
-              }
-            ]
+            playlist: []
           })
         );
         const targetingInfo = getVatFromCache(testIdForFailure);
@@ -150,26 +187,41 @@ describe('jwplayerRtdProvider', function() {
     describe('When jwplayer.js is on page', function () {
       const playlistItemWithSegmentMock = {
         mediaid: mediaIdWithSegment,
+        title: 'Media With Segment',
+        description: 'The media has segments',
+        file: 'mediaWithSegments.mp4',
         jwpseg: validSegments
       };
 
       const targetingForMediaWithSegment = {
         segments: validSegments,
-        mediaID: mediaIdWithSegment
+        mediaID: mediaIdWithSegment,
+        title: 'Media With Segment',
+        description: 'The media has segments',
+        mediaUrl: 'mediaWithSegments.mp4',
       };
 
       const playlistItemNoSegmentMock = {
-        mediaid: mediaIdNoSegment
+        mediaid: mediaIdNoSegment,
+        title: 'Media Without Segment',
+        description: 'The media has no segments',
+        file: 'mediaWithoutSegments.mp4',
       };
 
       const currentItemSegments = ['test_seg_3', 'test_seg_4'];
       const currentPlaylistItemMock = {
         mediaid: mediaIdForCurrentItem,
-        jwpseg: currentItemSegments
+        jwpseg: currentItemSegments,
+        title: 'Current Item',
+        description: 'The current playlist item',
+        file: 'currentItem.mp4',
       };
       const targetingForCurrentItem = {
         segments: currentItemSegments,
-        mediaID: mediaIdForCurrentItem
+        mediaID: mediaIdForCurrentItem,
+        title: 'Current Item',
+        description: 'The current playlist item',
+        mediaUrl: 'currentItem.mp4',
       };
 
       const playerInstanceMock = {
@@ -199,23 +251,23 @@ describe('jwplayerRtdProvider', function() {
         expect(targeting).to.be.null;
       });
 
-      it('returns segments when media ID matches a playlist item with segments', function () {
+      it('returns targeting when media ID matches a playlist item', function () {
         const targeting = getVatFromPlayer(validPlayerID, mediaIdWithSegment);
         expect(targeting).to.deep.equal(targetingForMediaWithSegment);
       });
 
-      it('caches segments when media ID matches a playist item with segments', function () {
+      it('caches item when media ID matches a valid playist item', function () {
         getVatFromPlayer(validPlayerID, mediaIdWithSegment);
         const vat = getVatFromCache(mediaIdWithSegment);
-        expect(vat.segments).to.deep.equal(validSegments);
+        expect(vat).to.deep.equal(targetingForMediaWithSegment);
       });
 
-      it('returns segments of current item when media ID is missing', function () {
+      it('returns targeting of current item when media ID is missing', function () {
         const targeting = getVatFromPlayer(validPlayerID);
         expect(targeting).to.deep.equal(targetingForCurrentItem);
       });
 
-      it('caches segments from the current item', function () {
+      it('caches metadata from the current item', function () {
         getVatFromPlayer(validPlayerID);
 
         window.jwplayer = null;
@@ -225,10 +277,11 @@ describe('jwplayerRtdProvider', function() {
 
       it('returns undefined segments when segments are absent', function () {
         const targeting = getVatFromPlayer(validPlayerID, mediaIdNoSegment);
-        expect(targeting).to.deep.equal({
-          mediaID: mediaIdNoSegment,
-          segments: undefined
-        });
+        expect(targeting.segments).to.be.undefined;
+        expect(targeting.mediaID).to.equal(mediaIdNoSegment);
+        expect(targeting.title).to.equal('Media Without Segment');
+        expect(targeting.description).to.equal('The media has no segments');
+        expect(targeting.mediaUrl).to.equal('mediaWithoutSegments.mp4');
       });
 
       describe('Get Bid Request Data', function () {
@@ -237,6 +290,41 @@ describe('jwplayerRtdProvider', function() {
 
           fetchTargetingForMediaId(mediaIdWithSegment);
 
+          const bid = {};
+          const adUnit = {
+            ortb2Imp: {
+              ext: {
+                data: {
+                  jwTargeting: {
+                    mediaID: mediaIdWithSegment,
+                    playerDivId: validPlayerID
+                  }
+                }
+              }
+            },
+            bids: [
+              bid
+            ]
+          };
+          const expectedContentId = 'jw_' + mediaIdWithSegment;
+          const expectedTargeting = {
+            segments: validSegments,
+            content: {
+              id: expectedContentId
+            }
+          };
+          jwplayerSubmodule.getBidRequestData({ adUnits: [adUnit] }, bidRequestSpy);
+          expect(bidRequestSpy.calledOnce).to.be.true;
+          expect(bid.rtd.jwplayer).to.have.deep.property('targeting', expectedTargeting);
+          server.respond();
+          expect(bidRequestSpy.calledOnce).to.be.true;
+        });
+
+        it('includes backwards support for playerID when playerDivId is not set', function () {
+          const bidRequestSpy = sinon.spy();
+
+          fetchTargetingForMediaId(mediaIdWithSegment);
+
           const bid = {};
           const adUnit = {
             ortb2Imp: {
@@ -454,7 +542,9 @@ describe('jwplayerRtdProvider', function() {
           playlist: [
             {
               file: 'test.mp4',
-              jwpseg: validSegments
+              jwpseg: validSegments,
+              title: 'test title',
+              description: 'test description',
             }
           ]
         })
@@ -463,6 +553,9 @@ describe('jwplayerRtdProvider', function() {
       expect(ortb2Fragments.global).to.have.property('site');
       expect(ortb2Fragments.global.site).to.have.property('content');
       expect(ortb2Fragments.global.site.content).to.have.property('id', 'jw_' + testIdForSuccess);
+      expect(ortb2Fragments.global.site.content).to.have.property('url', 'test.mp4');
+      expect(ortb2Fragments.global.site.content).to.have.property('title', 'test title');
+      expect(ortb2Fragments.global.site.content.ext).to.have.property('description', 'test description');
       expect(ortb2Fragments.global.site.content).to.have.property('data');
       const data = ortb2Fragments.global.site.content.data;
       expect(data).to.have.length(1);
@@ -537,7 +630,7 @@ describe('jwplayerRtdProvider', function() {
 
       expect(ortb2Fragments.global).to.have.property('site');
       expect(ortb2Fragments.global.site).to.have.property('content');
-      expect(ortb2Fragments.global.site.content).to.have.property('id', 'jw_' + testIdForSuccess);
+      expect(ortb2Fragments.global.site.content).to.have.property('id', 'randomContentId');
       expect(ortb2Fragments.global.site.content).to.have.property('data');
       const data = ortb2Fragments.global.site.content.data;
       expect(data).to.have.length(3);
@@ -605,23 +698,23 @@ describe('jwplayerRtdProvider', function() {
     it('should prioritize adUnit properties ', function () {
       const expectedMediaID = 'test_media_id';
       const expectedPlayerID = 'test_player_id';
-      const config = { playerID: 'bad_id', mediaID: 'bad_id' };
+      const config = { playerDivId: 'bad_id', mediaID: 'bad_id' };
 
-      const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: { mediaID: expectedMediaID, playerID: expectedPlayerID } } } } };
+      const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: { mediaID: expectedMediaID, playerDivId: expectedPlayerID } } } } };
       const targeting = extractPublisherParams(adUnit, config);
       expect(targeting).to.have.property('mediaID', expectedMediaID);
-      expect(targeting).to.have.property('playerID', expectedPlayerID);
+      expect(targeting).to.have.property('playerDivId', expectedPlayerID);
     });
 
     it('should use config properties as fallbacks', function () {
       const expectedMediaID = 'test_media_id';
       const expectedPlayerID = 'test_player_id';
-      const config = { playerID: expectedPlayerID, mediaID: 'bad_id' };
+      const config = { playerDivId: expectedPlayerID, mediaID: 'bad_id' };
 
       const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: { mediaID: expectedMediaID } } } } };
       const targeting = extractPublisherParams(adUnit, config);
       expect(targeting).to.have.property('mediaID', expectedMediaID);
-      expect(targeting).to.have.property('playerID', expectedPlayerID);
+      expect(targeting).to.have.property('playerDivId', expectedPlayerID);
     });
 
     it('should return undefined when Publisher Params are absent', function () {
@@ -707,6 +800,15 @@ describe('jwplayerRtdProvider', function() {
   });
 
   describe(' Add Ortb Site Content', function () {
+    beforeEach(() => {
+      setOverrides({
+        overrideContentId: 'whenEmpty',
+        overrideContentUrl: 'whenEmpty',
+        overrideContentTitle: 'whenEmpty',
+        overrideContentDescription: 'whenEmpty'
+      });
+    });
+
     it('should maintain object structure when id and data params are empty', function () {
       const ortb2 = {
         site: {
@@ -731,9 +833,15 @@ describe('jwplayerRtdProvider', function() {
     it('should create a structure compliant with the oRTB 2 spec', function() {
       const ortb2 = {}
       const expectedId = 'expectedId';
+      const expectedUrl = 'expectedUrl';
+      const expectedTitle = 'expectedTitle';
+      const expectedDescription = 'expectedDescription';
       const expectedData = { datum: 'datum' };
-      addOrtbSiteContent(ortb2, expectedId, expectedData);
+      addOrtbSiteContent(ortb2, expectedId, expectedData, expectedTitle, expectedDescription, expectedUrl);
       expect(ortb2).to.have.nested.property('site.content.id', expectedId);
+      expect(ortb2).to.have.nested.property('site.content.url', expectedUrl);
+      expect(ortb2).to.have.nested.property('site.content.title', expectedTitle);
+      expect(ortb2).to.have.nested.property('site.content.ext.description', expectedDescription);
       expect(ortb2).to.have.nested.property('site.content.data');
       expect(ortb2.site.content.data[0]).to.be.deep.equal(expectedData);
     });
@@ -742,11 +850,14 @@ describe('jwplayerRtdProvider', function() {
       const ortb2 = {
         site: {
           content: {
-            id: 'oldId'
+            id: 'oldId',
+            ext: {
+              random_field: 'randomField'
+            }
           },
           random: {
             random_sub: 'randomSub'
-          }
+          },
         },
         app: {
           content: {
@@ -755,24 +866,31 @@ describe('jwplayerRtdProvider', function() {
         }
       };
 
-      const expectedId = 'expectedId';
+      const newId = 'newId';
+      const expectedUrl = 'expectedUrl';
+      const expectedTitle = 'expectedTitle';
+      const expectedDescription = 'expectedDescription';
       const expectedData = { datum: 'datum' };
-      addOrtbSiteContent(ortb2, expectedId, expectedData);
+      addOrtbSiteContent(ortb2, newId, expectedData, expectedTitle, expectedDescription, expectedUrl);
       expect(ortb2).to.have.nested.property('site.random.random_sub', 'randomSub');
       expect(ortb2).to.have.nested.property('app.content.id', 'appId');
-      expect(ortb2).to.have.nested.property('site.content.id', expectedId);
+      expect(ortb2).to.have.nested.property('site.content.ext.random_field', 'randomField');
+      expect(ortb2).to.have.nested.property('site.content.id', 'oldId');
+      expect(ortb2).to.have.nested.property('site.content.url', expectedUrl);
+      expect(ortb2).to.have.nested.property('site.content.title', expectedTitle);
+      expect(ortb2).to.have.nested.property('site.content.ext.description', expectedDescription);
       expect(ortb2).to.have.nested.property('site.content.data');
       expect(ortb2.site.content.data[0]).to.be.deep.equal(expectedData);
     });
 
-    it('should set content id', function () {
+    it('should set content id by default when absent from ortb2', function () {
       const ortb2 = {};
       const expectedId = 'expectedId';
       addOrtbSiteContent(ortb2, expectedId);
       expect(ortb2).to.have.nested.property('site.content.id', expectedId);
     });
 
-    it('should override content id', function () {
+    it('should keep old content id by default', function () {
       const ortb2 = {
         site: {
           content: {
@@ -781,12 +899,11 @@ describe('jwplayerRtdProvider', function() {
         }
       };
 
-      const expectedId = 'expectedId';
-      addOrtbSiteContent(ortb2, expectedId);
-      expect(ortb2).to.have.nested.property('site.content.id', expectedId);
+      addOrtbSiteContent(ortb2, 'newId');
+      expect(ortb2).to.have.nested.property('site.content.id', 'oldId');
     });
 
-    it('should keep previous content id when not set', function () {
+    it('should keep previous content id when new value is not available', function () {
       const previousId = 'oldId';
       const ortb2 = {
         site: {
@@ -801,6 +918,122 @@ describe('jwplayerRtdProvider', function() {
       expect(ortb2).to.have.nested.property('site.content.id', previousId);
     });
 
+    it('should override content id when override is always', function () {
+      setOverrides({
+        overrideContentId: 'always',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            id: 'oldId'
+          }
+        }
+      };
+
+      const expectedId = 'expectedId';
+      addOrtbSiteContent(ortb2, expectedId);
+      expect(ortb2).to.have.nested.property('site.content.id', expectedId);
+    });
+
+    it('should keep previous content id when override is always and new value is not available', function () {
+      setOverrides({
+        overrideContentId: 'always',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            id: 'oldId'
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2);
+      expect(ortb2).to.have.nested.property('site.content.id', 'oldId');
+    });
+
+    it('should populate content id when override is whenEmpty and value is empty', function () {
+      setOverrides({
+        overrideContentId: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, 'newId');
+      expect(ortb2).to.have.nested.property('site.content.id', 'newId');
+    });
+
+    it('should keep previous content id when override is whenEmpty and value is already populated', function () {
+      setOverrides({
+        overrideContentId: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            id: 'oldId'
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, 'newId');
+      expect(ortb2).to.have.nested.property('site.content.id', 'oldId');
+    });
+
+    it('should keep previous content id when override is whenEmpty and new value is not available', function () {
+      setOverrides({
+        overrideContentId: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2);
+      expect(ortb2.site.content.id).to.be.undefined;
+    });
+
+    it('should keep previous content id when overrideContentId is set to never', function () {
+      setOverrides({
+        overrideContentId: 'never',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            id: 'oldId'
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, 'newId');
+      expect(ortb2).to.have.nested.property('site.content.id', 'oldId');
+    });
+
+    it('should not populate content id when override is set to never', function () {
+      setOverrides({
+        overrideContentId: 'never',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {}
+        }
+      };
+
+      addOrtbSiteContent(ortb2, 'newId');
+      expect(ortb2.site.content.id).to.be.undefined;
+    });
+
     it('should set content data', function () {
       const ortb2 = {};
       const expectedData = { datum: 'datum' };
@@ -843,6 +1076,451 @@ describe('jwplayerRtdProvider', function() {
       expect(ortb2.site.content.data[0]).to.be.deep.equal(expectedData);
       expect(ortb2).to.have.nested.property('site.content.id', expectedId);
     });
+
+    it('should set content title by default when absent from ortb2', function () {
+      const ortb2 = {};
+      const expectedTitle = 'expectedTitle';
+      addOrtbSiteContent(ortb2, null, null, expectedTitle);
+      expect(ortb2).to.have.nested.property('site.content.title', expectedTitle);
+    });
+
+    it('should keep previous content title by default when already defined', function () {
+      const ortb2 = {
+        site: {
+          content: {
+            title: 'oldTitle'
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, 'newTitle');
+      expect(ortb2).to.have.nested.property('site.content.title', 'oldTitle');
+    });
+
+    it('should keep previous content title by default when new value is not available', function () {
+      const ortb2 = {
+        site: {
+          content: {
+            title: 'oldTitle',
+            data: [{ datum: 'first_datum' }]
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, { datum: 'new_datum' });
+      expect(ortb2).to.have.nested.property('site.content.title', 'oldTitle');
+    });
+
+    it('should override content title when override is always', function () {
+      setOverrides({
+        overrideContentTitle: 'always',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            title: 'oldTitle'
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, 'newTitle');
+      expect(ortb2).to.have.nested.property('site.content.title', 'newTitle');
+    });
+
+    it('should keep previous content title when override is always and new value is not available', function () {
+      setOverrides({
+        overrideContentTitle: 'always',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            title: 'oldTitle'
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2);
+      expect(ortb2).to.have.nested.property('site.content.title', 'oldTitle');
+    });
+
+    it('should populate content title when override is whenEmpty and value is empty', function () {
+      setOverrides({
+        overrideContentTitle: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, 'newTitle');
+      expect(ortb2).to.have.nested.property('site.content.title', 'newTitle');
+    });
+
+    it('should keep previous content title when override is whenEmpty and value is already populated', function () {
+      setOverrides({
+        overrideContentTitle: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            title: 'oldTitle'
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, 'newTitle');
+      expect(ortb2).to.have.nested.property('site.content.title', 'oldTitle');
+    });
+
+    it('should keep previous content title when override is whenEmpty and new value is not available', function () {
+      setOverrides({
+        overrideContentTitle: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2);
+      expect(ortb2.site.content.title).to.be.undefined;
+    });
+
+    it('should keep previous content title when override is set to never', function () {
+      setOverrides({
+        overrideContentTitle: 'never',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            title: 'oldTitle'
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, 'newTitle');
+      expect(ortb2).to.have.nested.property('site.content.title', 'oldTitle');
+    });
+
+    it('should not populate content title when override is set to never', function () {
+      setOverrides({
+        overrideContentTitle: 'never',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {}
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, 'newTitle');
+      expect(ortb2.site.content.title).to.be.undefined;
+    });
+
+    it('should set content description by default when absent from ortb2', function () {
+      const ortb2 = {};
+      const expectedDescription = 'expectedDescription';
+      addOrtbSiteContent(ortb2, null, null, null, expectedDescription);
+      expect(ortb2).to.have.nested.property('site.content.ext.description', expectedDescription);
+    });
+
+    it('should keep previous content description by default when already defined', function () {
+      const ortb2 = {
+        site: {
+          content: {
+            ext: {
+              description: 'oldDescription'
+            }
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, null, 'newDescription');
+      expect(ortb2).to.have.nested.property('site.content.ext.description', 'oldDescription');
+    });
+
+    it('should override content description when override is always', function () {
+      setOverrides({
+        overrideContentDescription: 'always',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            ext: {
+              description: 'oldDescription'
+            }
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, null, 'newDescription');
+      expect(ortb2).to.have.nested.property('site.content.ext.description', 'newDescription');
+    });
+
+    it('should keep previous content description when override is always and new value is not available', function () {
+      setOverrides({
+        overrideContentDescription: 'always',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            ext: {
+              description: 'oldDescription'
+            }
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2);
+      expect(ortb2).to.have.nested.property('site.content.ext.description', 'oldDescription');
+    });
+
+    it('should populate content description when override is whenEmpty and value is empty', function () {
+      setOverrides({
+        overrideContentDescription: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, null, 'newDescription');
+      expect(ortb2).to.have.nested.property('site.content.ext.description', 'newDescription');
+    });
+
+    it('should keep previous content description when override is whenEmpty and value is already populated', function () {
+      setOverrides({
+        overrideContentDescription: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            ext: {
+              description: 'oldDescription'
+            }
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, null, 'newDescription');
+      expect(ortb2).to.have.nested.property('site.content.ext.description', 'oldDescription');
+    });
+
+    it('should keep previous content description when override is whenEmpty and new value is not available', function () {
+      setOverrides({
+        overrideContentDescription: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2);
+      expect(ortb2.site.content.ext).to.be.undefined;
+    });
+
+    it('should keep previous content description when override is set to never', function () {
+      setOverrides({
+        overrideContentDescription: 'never',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            ext: {
+              description: 'oldDescription'
+            }
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, null, 'newDescription');
+      expect(ortb2).to.have.nested.property('site.content.ext.description', 'oldDescription');
+    });
+
+    it('should not populate content description when override is set to never', function () {
+      setOverrides({
+        overrideContentDescription: 'never',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {}
+        }
+      };
+
+      addOrtbSiteContent(ortb2);
+      expect(ortb2.site.content.ext).to.be.undefined;
+    });
+
+    it('should set content url by default when absent from ortb2', function () {
+      const ortb2 = {};
+      const expectedUrl = 'expectedUrl';
+      addOrtbSiteContent(ortb2, null, null, null, null, expectedUrl);
+      expect(ortb2).to.have.nested.property('site.content.url', expectedUrl);
+    });
+
+    it('should keep previous content url by default when new value is not available', function () {
+      const ortb2 = {
+        site: {
+          content: {
+            url: 'oldUrl',
+            data: [{ datum: 'first_datum' }]
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, { datum: 'new_datum' });
+      expect(ortb2).to.have.nested.property('site.content.url', 'oldUrl');
+    });
+
+    it('should keep previous content url by default when already defined', function () {
+      const ortb2 = {
+        site: {
+          content: {
+            url: 'oldUrl',
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, null, null, 'newUrl');
+      expect(ortb2).to.have.nested.property('site.content.url', 'oldUrl');
+    });
+
+    it('should override content url when override is always', function () {
+      setOverrides({
+        overrideContentUrl: 'always',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            url: 'oldUrl',
+          }
+        }
+      };
+
+      const expectedUrl = 'expectedUrl';
+      addOrtbSiteContent(ortb2, null, null, null, null, expectedUrl);
+      expect(ortb2).to.have.nested.property('site.content.url', expectedUrl);
+    });
+
+    it('should keep previous content url when override is always and new value is not available', function () {
+      setOverrides({
+        overrideContentUrl: 'always',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            url: 'oldUrl',
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2);
+      expect(ortb2).to.have.nested.property('site.content.url', 'oldUrl');
+    });
+
+    it('should populate content url when override is whenEmpty and value is empty', function () {
+      setOverrides({
+        overrideContentUrl: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+          }
+        }
+      };
+
+      const expectedUrl = 'expectedUrl';
+      addOrtbSiteContent(ortb2, null, null, null, null, expectedUrl);
+      expect(ortb2).to.have.nested.property('site.content.url', expectedUrl);
+    });
+
+    it('should keep previous content url when override is whenEmpty and value is already populated', function () {
+      setOverrides({
+        overrideContentUrl: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            url: 'oldUrl',
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, null, null, 'newUrl');
+      expect(ortb2).to.have.nested.property('site.content.url', 'oldUrl');
+    });
+
+    it('should keep previous content url when override is whenEmpty and new value is not available', function () {
+      setOverrides({
+        overrideContentUrl: 'whenEmpty',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2);
+      expect(ortb2.site.content.url).to.be.undefined;
+    });
+
+    it('should keep previous content url when override is set to never', function () {
+      setOverrides({
+        overrideContentUrl: 'never',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {
+            url: 'oldUrl',
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, null, null, 'newUrl');
+      expect(ortb2).to.have.nested.property('site.content.url', 'oldUrl');
+    });
+
+    it('should not populate content url when override is set to never', function () {
+      setOverrides({
+        overrideContentUrl: 'never',
+      });
+
+      const ortb2 = {
+        site: {
+          content: {}
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, null, null, null, 'newUrl');
+      expect(ortb2.site.content.url).to.be.undefined;
+    });
   });
 
   describe('Add Targeting to Bid', function () {
@@ -926,6 +1604,66 @@ describe('jwplayerRtdProvider', function() {
     });
   });
 
+  describe('Player detection', function () {
+    const playerInstanceMock = {
+      getPlaylist: () => [],
+      getPlaylistItem: () => ({})
+    };
+
+    beforeEach(function () {
+      window.jwplayer = sinon.stub();
+    });
+
+    afterEach(function () {
+      delete window.jwplayer;
+    });
+
+    it('should fail if jwplayer global does not exist', function () {
+      delete window.jwplayer;
+      expect(getPlayer('divId')).to.be.undefined;
+    });
+
+    it('should return the player instance for the specified div id', function () {
+      window.jwplayer.returns(playerInstanceMock);
+      const player = getPlayer('divId');
+      expect(player).to.deep.equal(playerInstanceMock);
+    });
+
+    it('should request a player when the div id does not match a player on the page and only 1 player is in the DOM', function () {
+      const playerDomElement = document.createElement('div');
+      playerDomElement.className = 'jwplayer';
+      document.body.appendChild(playerDomElement);
+
+      window.jwplayer.withArgs('invalidDivId').returns(undefined);
+      window.jwplayer.returns(playerInstanceMock);
+
+      const playerInstance = getPlayer('invalidDivId');
+
+      expect(playerInstance).to.deep.equal(playerInstanceMock);
+
+      document.body.removeChild(playerDomElement);
+    });
+
+    it('should fail when the div id does not match a player on the page, and multiple players are instantiated', function () {
+      const firstPlayerDomElement = document.createElement('div');
+      const secondPlayerDomElement = document.createElement('div');
+      firstPlayerDomElement.className = 'jwplayer';
+      secondPlayerDomElement.className = 'jwplayer';
+      document.body.appendChild(firstPlayerDomElement);
+      document.body.appendChild(secondPlayerDomElement);
+
+      window.jwplayer.withArgs('invalidDivId').returns(undefined);
+      window.jwplayer.returns(playerInstanceMock);
+
+      const playerInstance = getPlayer('invalidDivId');
+
+      expect(playerInstance).to.be.undefined;
+
+      document.body.removeChild(firstPlayerDomElement);
+      document.body.removeChild(secondPlayerDomElement);
+    });
+  });
+
   describe('jwplayerSubmodule', function () {
     it('successfully instantiates', function () {
       expect(jwplayerSubmodule.init()).to.equal(true);
diff --git a/test/spec/modules/kargoAnalyticsAdapter_spec.js b/test/spec/modules/kargoAnalyticsAdapter_spec.js
index c27c8499aa1..c2acd86defa 100644
--- a/test/spec/modules/kargoAnalyticsAdapter_spec.js
+++ b/test/spec/modules/kargoAnalyticsAdapter_spec.js
@@ -1,8 +1,8 @@
 import kargoAnalyticsAdapter from 'modules/kargoAnalyticsAdapter.js';
 import { expect } from 'chai';
 import { server } from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('Kargo Analytics Adapter', function () {
   const adapterConfig = {
@@ -30,10 +30,10 @@ describe('Kargo Analytics Adapter', function () {
         timeToRespond: 192,
       };
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {
+      events.emit(EVENTS.AUCTION_INIT, {
         timeout: 1000
       });
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+      events.emit(EVENTS.BID_RESPONSE, bidResponse);
 
       expect(server.requests.length).to.equal(1);
       expect(server.requests[0].url).to.equal('https://krk.kargo.com/api/v1/event/auction-data?aid=66529d4c-8998-47c2-ab3e-5b953490b98f&ato=1000&rt=192&it=0');
diff --git a/test/spec/modules/kargoBidAdapter_spec.js b/test/spec/modules/kargoBidAdapter_spec.js
index 9f7a4854063..a9121a7a59f 100644
--- a/test/spec/modules/kargoBidAdapter_spec.js
+++ b/test/spec/modules/kargoBidAdapter_spec.js
@@ -1,421 +1,1509 @@
-import { expect, assert } from 'chai';
+import { expect } from 'chai';
 import { spec } from 'modules/kargoBidAdapter.js';
 import { config } from 'src/config.js';
 const utils = require('src/utils');
 
-describe('kargo adapter tests', function () {
-  var sandbox, clock, frozenNow = new Date();
-  const testSchain = {
-    complete: 1,
-    nodes: [
+describe('kargo adapter tests', function() {
+  let bid, outstreamBid, testBids, sandbox, clock, frozenNow = new Date(), oldBidderSettings;
+
+  const topUrl = 'https://random.com/this/is/a/url';
+  const domain = 'random.com';
+  const referer = 'https://random.com/';
+
+  const defaultBidParams = Object.freeze({
+    bidRequestsCount: 1,
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+    getFloor: () => {},
+    ortb2: {
+      device: {
+        w: 1720,
+        h: 1000,
+        dnt: 0,
+        language: 'en',
+        ua: 'Mozilla/5.0'
+      },
+      site: {
+        domain: domain,
+        mobile: 0,
+        page: topUrl,
+        publisher: {
+          domain: domain
+        },
+        ref: referer
+      },
+      source: {
+        tid: 'random-tid'
+      }
+    },
+    ortb2Imp: {
+      ext: {
+        data: {
+          pbadslot: '/1234/prebid/slot/path'
+        },
+        gpid: '/1234/prebid/slot/path',
+      }
+    },
+    userId: {
+      tdid: 'random-tdid'
+    },
+    userIdAsEids: [
+      {
+        source: 'adquery.io',
+        uids: [ {
+          id: 'adquery-id',
+          atype: 1
+        } ]
+      },
+      {
+        source: 'criteo.com',
+        uids: [ {
+          id: 'criteo-id',
+          atype: 1
+        } ]
+      },
       {
-        'asi': 'test-page.com',
-        'hp': 1,
-        'rid': '57bdd953-6e57-4d5b-9351-ed67ca238890',
-        'sid': '8190248274'
+        source: 'adserver.org',
+        uids: [ {
+          id: 'adserver-id',
+          atype: 1,
+          ext: { rtiPartner: 'TDID' }
+        } ]
+      },
+    ],
+    floorData: {
+      floorMin: 1
+    },
+    schain: {
+      validation: 'strict',
+      config: {
+        ver: '1.0',
+        complete: 1,
+        nodes: [ {
+          asi: 'indirectseller.com',
+          sid: '00001',
+          hp: 1,
+        } ]
       }
-    ]
+    },
+  });
+
+  const minimumBidParams = Object.freeze({
+    params: {
+      placementId: 'foobar'
+    },
+    mediaTypes: {
+      banner: { sizes: [ [1, 1] ] }
+    }
+  });
+
+  const validCrbIds = {
+    2: '82fa2555-5969-4614-b4ce-4dcf1080e9f9',
+    16: 'VoxIk8AoJz0AAEdCeyAAAAC2&502',
+    23: 'd2a855a5-1b1c-4300-940e-a708fa1f1bde',
+    24: 'VoxIk8AoJz0AAEdCeyAAAAC2&502',
+    25: '5ee24138-5e03-4b9d-a953-38e833f2849f',
+    '2_80': 'd2a855a5-1b1c-4300-940e-a708fa1f1bde',
+    '2_93': '5ee24138-5e03-4b9d-a953-38e833f2849f'
+  };
+  const validCrbIdsLs = {
+    2: '82fa2555-5969-4614-b4ce-4dcf1080e9f9',
+    16: 'VoxIk8AoJz0AAEdCeyAAAAC2&502',
+    23: 'd2a855a5-1b1c-4300-940e-a708fa1f1bde',
+    25: '5ee24138-5e03-4b9d-a953-38e833f2849f',
+    '2_80': 'd2a855a5-1b1c-4300-940e-a708fa1f1bde',
+    '2_93': '5ee24138-5e03-4b9d-a953-38e833f2849f'
+  };
+  function buildCrbValue(isCookie, withIds, withTdid, withLexId, withClientId, optOut) {
+    let value = {
+      expireTime: Date.now() + 60000,
+      lastSyncedAt: Date.now() - 60000,
+      optOut,
+    };
+    const locationString = isCookie ? 'cookie' : 'localstorage';
+
+    if (withIds) {
+      if (isCookie) {
+        value.syncIds = validCrbIds;
+      } else {
+        value.syncIds = validCrbIdsLs;
+      }
+    }
+    if (withTdid) {
+      value.tdID = `test-tdid-cerberus-${locationString}`;
+    }
+    if (withLexId) {
+      value.lexId = `test-lexid-cerberus-${locationString}`;
+    }
+    if (withClientId) {
+      value.clientId = `test-clientid-cerberus-${locationString}`;
+    }
+
+    const b64Value = btoa(JSON.stringify(value));
+    if (isCookie) {
+      return JSON.stringify({ v: b64Value });
+    }
+    return b64Value;
   }
 
-  beforeEach(function () {
+  beforeEach(function() {
+    oldBidderSettings = $$PREBID_GLOBAL$$.bidderSettings;
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      kargo: { storageAllowed: true }
+    };
+
+    bid = {
+      ...defaultBidParams,
+      bidder: 'kargo',
+      params: {
+        placementId: 'displayPlacement'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [ [970, 250], [1, 1] ]
+        }
+      },
+      adUnitCode: 'displayAdunitCode',
+      sizes: [ [300, 250], [300, 600] ],
+      bidId: 'randomBidId',
+      bidderRequestId: 'randomBidderRequestId',
+      auctionId: 'randomAuctionId'
+    };
+
+    outstreamBid = {
+      ...defaultBidParams,
+      bidder: 'kargo',
+      params: {
+        placementId: 'instreamPlacement'
+      },
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [640, 480],
+          api: [ 1, 2 ],
+          linearity: 1,
+          maxduration: 60,
+          mimes: [ 'video/mp4', 'video/webm', 'application/javascript' ],
+          minduration: 0,
+          placement: 1,
+          playbackmethod: [ 1, 2, 3 ],
+          plcmt: 1,
+          protocols: [ 2, 3, 5 ],
+          skip: 1
+        }
+      },
+      adUnitCode: 'instreamAdunitCode',
+      sizes: [ [300, 250], [300, 600] ],
+      bidId: 'randomBidId2',
+      bidderRequestId: 'randomBidderRequestId2',
+      auctionId: 'randomAuctionId2'
+    };
+
+    testBids = [{ ...minimumBidParams }];
+
     sandbox = sinon.sandbox.create();
     clock = sinon.useFakeTimers(frozenNow.getTime());
   });
 
-  afterEach(function () {
+  afterEach(function() {
     sandbox.restore();
     clock.restore();
+    $$PREBID_GLOBAL$$.bidderSettings = oldBidderSettings;
   });
 
-  describe('bid request validity', function () {
-    it('passes when the bid includes a placement ID', function () {
-      assert(spec.isBidRequestValid({ params: { placementId: 'foo' } }) === true);
+  describe('gvlid', function() {
+    it('exposes the gvlid (global vendor list ID) of 972', function() {
+      expect(spec.gvlid).to.exist.and.equal(972);
+    });
+  });
+
+  describe('code', function() {
+    it('exposes the code kargo', function() {
+      expect(spec.code).to.exist.and.equal('kargo');
+    });
+  });
+
+  describe('isBidRequestValid', function() {
+    it('fails when the bid object is undefined', function() {
+      expect(spec.isBidRequestValid()).to.equal(false);
+    });
+
+    it('fails when the bid object has no keys at all', function() {
+      expect(spec.isBidRequestValid({})).to.equal(false);
     });
 
-    it('fails when the bid does not include a placement ID', function () {
-      assert(spec.isBidRequestValid({ params: {} }) === false);
+    it('fails when the bid includes params but not a placement ID', function() {
+      expect(spec.isBidRequestValid({ params: {} })).to.equal(false);
+    });
+
+    it('passes when the bid includes a placement ID', function () {
+      expect(spec.isBidRequestValid({ params: { placementId: 'foo' } })).to.equal(true);
     });
 
-    it('fails when bid is falsey', function () {
-      assert(spec.isBidRequestValid() === false);
+    it('passes when the bid includes a placement ID and other keys', function() {
+      expect(spec.isBidRequestValid({ params: { placementId: 'foo', other: 'value' } })).to.equal(true);
     });
 
-    it('fails when the bid has no params at all', function () {
-      assert(spec.isBidRequestValid({}) === false);
+    it('passes when the full bid information is provided', function() {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(spec.isBidRequestValid(outstreamBid)).to.equal(true);
     });
   });
 
-  describe('build request', function () {
-    var bids, undefinedCurrency, noAdServerCurrency, nonUSDAdServerCurrency, cookies = [], localStorageItems = [], sessionIds = [], requestCount = 0;
+  describe('buildRequests', function() {
+    let bids,
+      bidderRequest,
+      undefinedCurrency,
+      noAdServerCurrency,
+      nonUSDAdServerCurrency,
+      cookies = [],
+      localStorageItems = [],
+      session_id = null;
+
+    before(function() {
+      sinon.spy(spec, 'buildRequests');
+    });
 
-    beforeEach(function () {
-      $$PREBID_GLOBAL$$.bidderSettings = {
-        kargo: {
-          storageAllowed: true
-        }
-      };
+    beforeEach(function() {
       undefinedCurrency = false;
       noAdServerCurrency = false;
       nonUSDAdServerCurrency = false;
       sandbox.stub(config, 'getConfig').callsFake(function (key) {
         if (key === 'currency') {
-          if (undefinedCurrency) {
-            return undefined;
-          }
-          if (noAdServerCurrency) {
-            return {};
-          }
-          if (nonUSDAdServerCurrency) {
-            return { adServerCurrency: 'EUR' };
-          }
+          if (undefinedCurrency) return undefined;
+
+          if (noAdServerCurrency) return {};
+
+          if (nonUSDAdServerCurrency) return { adServerCurrency: 'EUR' };
+
           return { adServerCurrency: 'USD' };
         }
+
         if (key === 'debug') return true;
         if (key === 'deviceAccess') return true;
-        throw new Error(`Config stub incomplete! Missing key "${key}"`)
+        throw new Error(`Config stub incomplete, missing key "${key}"`);
       });
 
       bids = [
-        {
-          params: {
-            placementId: 'foo',
-            socialCanvas: {
-              segments: ['segment_1', 'segment_2', 'segment_3'],
-              url: 'https://socan.url'
-            }
-          },
-          auctionId: '1234098',
-          bidId: '1',
-          adUnitCode: '101',
-          sizes: [[320, 50], [300, 250], [300, 600]],
-          mediaTypes: {
-            banner: {
-              sizes: [[320, 50], [300, 50]]
-            }
-          },
-          bidRequestsCount: 1,
-          bidderRequestsCount: 2,
-          bidderWinsCount: 3,
-          schain: testSchain,
-          userId: {
-            tdid: 'ed1562d5-e52b-406f-8e65-e5ab3ed5583c'
+        bid,
+        outstreamBid
+      ];
+
+      bidderRequest = {
+        bidderCode: 'kargo',
+        auctionId: 'test-auction-id',
+        bidderRequestId: 'test-request-id',
+        bids,
+        ortb2: defaultBidParams.ortb2,
+        refererInfo: {
+          canonicalUrl: topUrl,
+          domain,
+          isAmp: false,
+          location: topUrl,
+          numIframes: 0,
+          page: topUrl,
+          reachedTop: true,
+          ref: referer,
+          stack: [ topUrl ],
+          topmostLocation: topUrl,
+        },
+        start: Date.now(),
+        timeout: 2500,
+      };
+    });
+    afterEach(function() {
+      cookies.forEach(key => document.cookie = `${key}=; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/`);
+      cookies = [];
+
+      localStorageItems.forEach(key => localStorage.removeItem(key));
+      localStorageItems = [];
+    });
+
+    function getPayloadFromTestBids(testBids) {
+      const request = spec.buildRequests(testBids, { ...bidderRequest, bids: testBids });
+      const payload = request.data;
+      if (session_id === null) session_id = spec._getSessionId();
+
+      expect(payload).to.exist;
+      expect(payload.imp).to.have.length(testBids.length);
+      expect(payload.requestCount).to.equal(spec.buildRequests.callCount - 1);
+      expect(payload.sid).to.equal(session_id);
+
+      return payload;
+    }
+
+    function setCookieValue(name, value) {
+      cookies.push(name);
+      document.cookie = `${encodeURIComponent(name)}=${encodeURIComponent(value)}; max-age-in-seconds=1000; path=/`;
+    }
+
+    function setLocalStorageValue(name, value) {
+      localStorageItems.push(name);
+      localStorage.setItem(name, value);
+    }
+
+    const crbValues = {
+      valid: buildCrbValue(true, true, true, true, true, false),
+      validLs: buildCrbValue(false, true, true, true, true, false),
+      invalidB64: 'crbValue',
+      invalidB64Ls: 'crbValueLs',
+      invalidJson: 'eyJ0ZXN0OiJ2YWx1ZSJ9',
+      invalidJsonLs: 'eyJ0ZXN0OiJ2YWx1ZSJ9',
+    };
+    function setCrb(
+      setCookie = 'valid',
+      setLocalStorage = 'valid'
+    ) {
+      if (crbValues.hasOwnProperty(setCookie)) {
+        setCookieValue('krg_crb', crbValues[setCookie]);
+      }
+      if (crbValues.hasOwnProperty(`${setLocalStorage}Ls`)) {
+        setLocalStorageValue('krg_crb', crbValues[`${setLocalStorage}Ls`]);
+      }
+    }
+
+    it('exists and produces an object', function() {
+      const request = spec.buildRequests(bids, bidderRequest);
+      expect(request).to.exist.and.to.be.an('object');
+    });
+
+    it('produces a POST request with a payload', function() {
+      const request = spec.buildRequests(bids, bidderRequest);
+      expect(request.method).to.exist.and.equal('POST');
+      expect(request.url).to.exist.and.equal('https://krk2.kargo.com/api/v1/prebid');
+
+      const payload = request.data;
+      expect(payload).to.exist;
+      expect(payload.imp).to.have.length(2);
+
+      // Display bid
+      const bidImp = payload.imp[0];
+      expect(bidImp.id).to.equal('randomBidId');
+      expect(bidImp.banner).to.deep.equal({ sizes: [ [970, 250], [1, 1] ] });
+      expect(bidImp.video).to.be.undefined;
+      expect(bidImp.bidRequestCount).to.equal(1);
+      expect(bidImp.bidderRequestCount).to.equal(1);
+      expect(bidImp.code).to.equal('displayAdunitCode');
+      expect(bidImp.ext.ortb2Imp).to.deep.equal(defaultBidParams.ortb2Imp);
+      expect(bidImp.fpd).to.deep.equal({ gpid: '/1234/prebid/slot/path' });
+      expect(bidImp.pid).to.equal('displayPlacement');
+
+      // Video bid
+      const videoBidImp = payload.imp[1];
+      expect(videoBidImp.id).to.equal('randomBidId2');
+      expect(videoBidImp.banner).to.be.undefined;
+      expect(videoBidImp.video).to.deep.equal(outstreamBid.mediaTypes.video);
+      expect(videoBidImp.bidRequestCount).to.equal(1);
+      expect(videoBidImp.bidderRequestCount).to.equal(1);
+      expect(videoBidImp.code).to.equal('instreamAdunitCode');
+      expect(videoBidImp.ext.ortb2Imp).to.deep.equal(defaultBidParams.ortb2Imp);
+      expect(videoBidImp.fpd).to.deep.equal({ gpid: '/1234/prebid/slot/path' });
+      expect(videoBidImp.pid).to.equal('instreamPlacement');
+
+      // User
+      expect(payload.user).to.be.an('object');
+      expect(payload.user.crbIDs).to.deep.equal({});
+      expect(payload.user.data).to.deep.equal([]);
+      expect(payload.user.sharedIDEids).to.deep.equal(defaultBidParams.userIdAsEids);
+
+      // General keys
+      expect(payload.aid).to.equal('randomAuctionId');
+      expect(payload.device).to.deep.equal({ size: [ window.screen.width, window.screen.height ] });
+      expect(payload.ext.ortb2).to.deep.equal(defaultBidParams.ortb2);
+      expect(payload.pbv).to.equal('$prebid.version$');
+      expect(payload.requestCount).to.equal(spec.buildRequests.callCount - 1);
+      expect(payload.sid).to.be.a('string').with.length(36);
+      expect(payload.timeout).to.equal(2500);
+      expect(payload.url).to.equal(topUrl);
+      expect(payload.ts).to.be.a('number');
+    });
+
+    it('copies the ortb2 object from the first bid request if present', function() {
+      let payload;
+      payload = getPayloadFromTestBids([{
+        ...minimumBidParams,
+        ortb2: {
+          user: {
+            key: 'value'
+          }
+        }
+      }]);
+      expect(payload.ext.ortb2).to.deep.equal({
+        user: { key: 'value' }
+      });
+
+      payload = getPayloadFromTestBids(testBids);
+      expect(payload.ext.ortb2).to.be.undefined;
+
+      payload = getPayloadFromTestBids([{
+        ...minimumBidParams,
+        ortb2: {
+          user: {
+            key: 'value'
+          }
+        }
+      }, {
+        ...minimumBidParams,
+        ortb2: {
+          site: {
+            key2: 'value2'
+          }
+        }
+      }]);
+      expect(payload.ext.ortb2).to.deep.equal({
+        user: { key: 'value' }
+      }
+      );
+    });
+
+    it('copies the refererInfo object from bidderRequest if present', function() {
+      let payload;
+      payload = getPayloadFromTestBids(testBids);
+      expect(payload.ext.refererInfo).to.deep.equal({
+        canonicalUrl: 'https://random.com/this/is/a/url',
+        domain: 'random.com',
+        isAmp: false,
+        location: 'https://random.com/this/is/a/url',
+        numIframes: 0,
+        page: 'https://random.com/this/is/a/url',
+        reachedTop: true,
+        ref: 'https://random.com/',
+        stack: [
+          'https://random.com/this/is/a/url'
+        ],
+        topmostLocation: 'https://random.com/this/is/a/url'
+      });
+
+      delete bidderRequest.refererInfo
+      payload = getPayloadFromTestBids(testBids);
+      expect(payload.ext).to.be.undefined;
+    });
+
+    it('pulls the site category from the first bids ortb2 object', function() {
+      let payload;
+      payload = getPayloadFromTestBids([{
+        ...minimumBidParams,
+        ortb2: { site: { cat: 'test-cat' } }
+      }]);
+      expect(payload.site).to.deep.equal({ cat: 'test-cat' });
+
+      payload = getPayloadFromTestBids(testBids);
+      expect(payload.site).to.be.undefined;
+
+      payload = getPayloadFromTestBids([{
+        ...minimumBidParams,
+        ortb2: { site: { cat: 'test-cat' } }
+      }, {
+        ...minimumBidParams,
+        ortb2: { site: { cat: 'test-cat-2' } }
+      }]);
+      expect(payload.site).to.deep.equal({ cat: 'test-cat' });
+    });
+
+    it('pulls the schain from the first bid if it is populated', function() {
+      let payload;
+      payload = getPayloadFromTestBids(testBids);
+      expect(payload.schain).to.be.undefined;
+
+      payload = getPayloadFromTestBids([{
+        ...minimumBidParams,
+        schain: {}
+      }, {
+        ...minimumBidParams,
+        schain: {
+          complete: 1,
+          nodes: [{
+            asi: 'test-page.com',
+            hp: 1,
+            rid: '57bdd953-6e57-4d5b-9351-ed67ca238890',
+            sid: '8190248274'
+          }]
+        }
+      }]);
+      expect(payload.schain).to.be.undefined;
+
+      payload = getPayloadFromTestBids([{
+        ...minimumBidParams,
+        schain: {
+          complete: 1,
+          nodes: [{
+            asi: 'test-page.com',
+            hp: 1,
+            rid: '57bdd953-6e57-4d5b-9351-ed67ca238890',
+            sid: '8190248274'
+          }]
+        }
+      }, {
+        ...minimumBidParams,
+        schain: {
+          complete: 1,
+          nodes: [{
+            asi: 'test-page-2.com',
+            hp: 1,
+            rid: 'other-rid',
+            sid: 'other-sid'
+          }]
+        }
+      }]);
+      expect(payload.schain).to.deep.equal({
+        complete: 1,
+        nodes: [{
+          asi: 'test-page.com',
+          hp: 1,
+          rid: '57bdd953-6e57-4d5b-9351-ed67ca238890',
+          sid: '8190248274'
+        }]
+      });
+    });
+
+    it('does not send currency if it is not defined', function() {
+      undefinedCurrency = true;
+      let payload = getPayloadFromTestBids(testBids);
+      expect(payload.cur).to.be.undefined;
+    });
+
+    it('does not send currency if it is missing', function() {
+      noAdServerCurrency = true;
+      let payload = getPayloadFromTestBids(testBids);
+      expect(payload.cur).to.be.undefined;
+    });
+
+    it('does not send currency if it is USD', function() {
+      let payload = getPayloadFromTestBids(testBids);
+      expect(payload.cur).to.be.undefined;
+    });
+
+    it('provides the currency if it is not USD', function() {
+      nonUSDAdServerCurrency = true;
+      let payload = getPayloadFromTestBids(testBids);
+      expect(payload.cur).to.equal('EUR');
+    });
+
+    it('provides the social canvas segments and URL if provided', function() {
+      let payload;
+      payload = getPayloadFromTestBids([{
+        ...minimumBidParams,
+      }, {
+        ...minimumBidParams,
+        params: {
+          ...minimumBidParams.params,
+          socialCanvas: {
+            segments: ['segment_1', 'segment_2', 'segment_3'],
+            url: 'https://socan.url'
+          }
+        }
+      }]);
+      expect(payload.socan).to.be.undefined;
+
+      payload = getPayloadFromTestBids([{
+        ...minimumBidParams,
+        params: {
+          ...minimumBidParams.params,
+          socialCanvas: null
+        }
+      }, {
+        ...minimumBidParams,
+        params: {
+          ...minimumBidParams.params,
+          socialCanvas: {
+            segments: ['segment_1', 'segment_2', 'segment_3'],
+            url: 'https://socan.url'
+          }
+        }
+      }]);
+      expect(payload.socan).to.be.undefined;
+
+      payload = getPayloadFromTestBids([{
+        ...minimumBidParams,
+        params: {
+          ...minimumBidParams.params,
+          socialCanvas: {
+            segments: ['segment_1', 'segment_2', 'segment_3'],
+            url: 'https://socan.url'
+          }
+        }
+      }, {
+        ...minimumBidParams,
+        params: {
+          ...minimumBidParams.params,
+          socialCanvas: {
+            segments: ['segment_4', 'segment_5', 'segment_6'],
+            url: 'https://socan.url/new'
+          }
+        }
+      }]);
+      expect(payload.socan).to.deep.equal({
+        segments: ['segment_1', 'segment_2', 'segment_3'],
+        url: 'https://socan.url'
+      });
+    });
+
+    describe('imp', function() {
+      it('handles slots with different combinations of formats', function() {
+        const testBids = [
+          // Banner and Outstream
+          {
+            ...bid,
+            params: {
+              inventoryCode: 'banner_outstream_test',
+              floor: 1.0,
+              video: {
+                mimes: [ 'video/mp4' ],
+                maxduration: 30,
+                minduration: 6,
+                w: 640,
+                h: 480
+              }
+            },
+            mediaTypes: {
+              video: {
+                context: 'outstream',
+                playerSize: [640, 380]
+              },
+              banner: {
+                sizes: [ [970, 250], [1, 1] ]
+              }
+            },
+            adUnitCode: 'adunit-code-banner-outstream',
+            sizes: [ [300, 250], [300, 600], [1, 1, 1], ['flex'] ],
+            bidId: 'banner-outstream-bid-id',
+            bidderRequestId: 'kargo-request-id',
+            auctionId: 'kargo-auction-id',
           },
-          userIdAsEids: [
-            {
-              'source': 'adserver.org',
-              'uids': [
-                {
-                  'id': 'ed1562d5-e52b-406f-8e65-e5ab3ed5583c',
-                  'atype': 1,
-                  'ext': {
-                    'rtiPartner': 'TDID'
-                  }
-                }
-              ]
-            }
-          ],
-          floorData: {
-            floorMin: 1
+          // Banner and Native
+          {
+            ...bid,
+            params: {
+              inventoryCode: 'banner_outstream_test',
+              floor: 1.0,
+              video: {
+                mimes: [ 'video/mp4' ],
+                maxduration: 30,
+                minduration: 6,
+                w: 640,
+                h: 480
+              }
+            },
+            mediaTypes: {
+              banner: {
+                sizes: [ [970, 250], [1, 1] ]
+              },
+              native: {}
+            },
+            adUnitCode: 'adunit-code-banner-outstream',
+            sizes: [ [300, 250], [300, 600], [1, 1, 1], ['flex'] ],
+            bidId: 'banner-outstream-bid-id',
+            bidderRequestId: 'kargo-request-id',
+            auctionId: 'kargo-auction-id',
           },
-          ortb2: {
-            device: {
-              sua: {
-                platform: {
-                  brand: 'macOS',
-                  version: ['12', '6', '0']
-                },
-                browsers: [
-                  {
-                    brand: 'Chromium',
-                    version: ['106', '0', '5249', '119']
-                  },
-                  {
-                    brand: 'Google Chrome',
-                    version: ['106', '0', '5249', '119']
-                  },
-                  {
-                    brand: 'Not;A=Brand',
-                    version: ['99', '0', '0', '0']
-                  }
-                ],
-                mobile: 1,
-                model: 'model',
-                source: 1,
+          // Native and Outstream
+          {
+            ...bid,
+            params: {
+              inventoryCode: 'banner_outstream_test',
+              floor: 1.0,
+              video: {
+                mimes: [ 'video/mp4' ],
+                maxduration: 30,
+                minduration: 6,
+                w: 640,
+                h: 480
               }
-            }
+            },
+            mediaTypes: {
+              video: {
+                context: 'outstream',
+                playerSize: [640, 380]
+              },
+              native: {},
+            },
+            adUnitCode: 'adunit-code-banner-outstream',
+            sizes: [ [300, 250], [300, 600], [1, 1, 1], ['flex'] ],
+            bidId: 'banner-outstream-bid-id',
+            bidderRequestId: 'kargo-request-id',
+            auctionId: 'kargo-auction-id',
           },
-          ortb2Imp: {
-            ext: {
-              tid: '10101',
-              data: {
-                adServer: {
-                  name: 'gam',
-                  adSlot: '/22558409563,18834096/dfy_mobile_adhesion'
-                },
-                pbAdSlot: '/22558409563,18834096/dfy_mobile_adhesion'
+          // Banner and Native and Outstream
+          {
+            ...bid,
+            params: {
+              inventoryCode: 'banner_outstream_test',
+              floor: 1.0,
+              video: {
+                mimes: [ 'video/mp4' ],
+                maxduration: 30,
+                minduration: 6,
+                w: 640,
+                h: 480
+              }
+            },
+            mediaTypes: {
+              video: {
+                context: 'outstream',
+                playerSize: [640, 380]
               },
-              gpid: '/22558409563,18834096/dfy_mobile_adhesion'
-            }
-          }
-        },
-        {
-          params: {
-            placementId: 'bar'
+              banner: {
+                sizes: [ [970, 250], [1, 1] ]
+              },
+              native: {},
+            },
+            adUnitCode: 'adunit-code-banner-outstream',
+            sizes: [ [300, 250], [300, 600], [1, 1, 1], ['flex'] ],
+            bidId: 'banner-outstream-bid-id',
+            bidderRequestId: 'kargo-request-id',
+            auctionId: 'kargo-auction-id',
           },
-          bidId: '2',
-          adUnitCode: '202',
-          sizes: [[320, 50], [300, 250], [300, 600]],
-          mediaTypes: {
-            video: {
-              sizes: [[320, 50], [300, 50]]
+        ];
+
+        const payload = getPayloadFromTestBids(testBids);
+
+        const bannerImp = {
+          sizes: [ [970, 250], [1, 1] ]
+        };
+        const videoImp = {
+          context: 'outstream',
+          playerSize: [640, 380]
+        };
+        const nativeImp = {};
+
+        // Banner and Outstream
+        expect(payload.imp[0].banner).to.deep.equal(bannerImp);
+        expect(payload.imp[0].video).to.deep.equal(videoImp);
+        expect(payload.imp[0].native).to.be.undefined;
+        // Banner and Native
+        expect(payload.imp[1].banner).to.deep.equal(bannerImp);
+        expect(payload.imp[1].video).to.be.undefined;
+        expect(payload.imp[1].native).to.deep.equal(nativeImp);
+        // Native and Outstream
+        expect(payload.imp[2].banner).to.be.undefined;
+        expect(payload.imp[2].video).to.deep.equal(videoImp);
+        expect(payload.imp[2].native).to.deep.equal(nativeImp);
+        // Banner and Native and Outstream
+        expect(payload.imp[3].banner).to.deep.equal(bannerImp);
+        expect(payload.imp[3].video).to.deep.equal(videoImp);
+        expect(payload.imp[3].native).to.deep.equal(nativeImp);
+      });
+
+      it('pulls gpid from ortb2Imp.ext.gpid then ortb2Imp.ext.data.pbadslot', function () {
+        const gpidGpid = 'ortb2Imp.ext.gpid-gpid';
+        const gpidPbadslot = 'ortb2Imp.ext.data.pbadslot-gpid'
+        const testBids = [
+          {
+            ...minimumBidParams,
+            ortb2Imp: {
+              ext: {
+                gpid: gpidGpid,
+                data: {
+                  pbadslot: gpidPbadslot
+                }
+              }
             }
           },
-          bidRequestsCount: 0,
-          bidderRequestsCount: 0,
-          bidderWinsCount: 0,
-          ortb2Imp: {
-            ext: {
-              tid: '20202',
-              data: {
-                adServer: {
-                  name: 'gam',
-                  adSlot: '/22558409563,18834096/dfy_mobile_adhesion'
-                },
-                pbAdSlot: '/22558409563,18834096/dfy_mobile_adhesion'
+          {
+            ...minimumBidParams,
+            ortb2Imp: {
+              ext: {
+                gpid: gpidGpid,
+                data: {},
               }
             }
-          }
-        },
-        {
-          params: {
-            placementId: 'bar'
           },
-          bidId: '3',
-          adUnitCode: '303',
-          sizes: [[320, 50], [300, 250], [300, 600]],
-          mediaTypes: {
-            native: {
-              sizes: [[320, 50], [300, 50]]
+          {
+            ...minimumBidParams,
+            ortb2Imp: {
+              ext: {
+                data: {
+                  pbadslot: gpidPbadslot
+                }
+              }
             }
           },
-          ortb2Imp: {
-            ext: {
-              tid: '30303',
-              data: {
-                adServer: {
-                  name: 'gam',
-                  adSlot: '/22558409563,18834096/dfy_mobile_adhesion'
+          {
+            ...minimumBidParams,
+            ortb2Imp: {
+              ext: {
+                gpid: null,
+                data: {
+                  pbadslot: null
                 }
               }
             }
-          }
+          },
+          { ...minimumBidParams }
+        ];
+
+        const payload = getPayloadFromTestBids(testBids);
+
+        // Both present
+        expect(payload.imp[0].fpd).to.deep.equal({ gpid: gpidGpid });
+        // Only ext.gpid
+        expect(payload.imp[1].fpd).to.deep.equal({ gpid: gpidGpid });
+        // Only ext.data.pbadslot
+        expect(payload.imp[2].fpd).to.deep.equal({ gpid: gpidPbadslot });
+        // Neither present
+        expect(payload.imp[3].fpd).to.be.undefined;
+        expect(payload.imp[4].fpd).to.be.undefined;
+      });
+
+      it('includes bidRequestCount, bidderRequestCount, and bidderWinsCount if they are greater than 0', function() {
+        const testBids = [
+          {
+            ...minimumBidParams,
+            bidRequestsCount: 1,
+            bidderRequestsCount: 0,
+            bidderWinsCount: 0,
+          },
+          {
+            ...minimumBidParams,
+            bidRequestsCount: 0,
+            bidderRequestsCount: 2,
+            bidderWinsCount: 0,
+          },
+          {
+            ...minimumBidParams,
+            bidRequestsCount: 0,
+            bidderRequestsCount: 0,
+            bidderWinsCount: 3,
+          },
+          {
+            ...minimumBidParams,
+            bidRequestsCount: 4,
+            bidderRequestsCount: 1,
+            bidderWinsCount: 3,
+          },
+        ];
+
+        [ 0, null, false, 'foobar' ].forEach(value => testBids.push({
+          ...minimumBidParams,
+          bidRequestsCount: value,
+          bidderRequestsCount: value,
+          bidderWinsCount: value
+        }));
+
+        const payload = getPayloadFromTestBids(testBids);
+
+        // bidRequestCount
+        expect(payload.imp[0].bidRequestCount).to.equal(1);
+        expect(payload.imp[0].bidderRequestCount).to.be.undefined;
+        expect(payload.imp[0].bidderWinCount).to.be.undefined;
+        // bidderRequestCount
+        expect(payload.imp[1].bidRequestCount).to.be.undefined;
+        expect(payload.imp[1].bidderRequestCount).to.equal(2);
+        expect(payload.imp[1].bidderWinCount).to.be.undefined;
+        // bidderWinCount
+        expect(payload.imp[2].bidRequestCount).to.be.undefined;
+        expect(payload.imp[2].bidderRequestCount).to.be.undefined;
+        expect(payload.imp[2].bidderWinCount).to.equal(3);
+        // all
+        expect(payload.imp[3].bidRequestCount).to.equal(4);
+        expect(payload.imp[3].bidderRequestCount).to.equal(1);
+        expect(payload.imp[3].bidderWinCount).to.equal(3);
+        // none
+        for (let i = 4; i < payload.imp.length; i++) {
+          expect(payload.imp[i].bidRequestCount).to.be.undefined;
+          expect(payload.imp[i].bidderRequestCount).to.be.undefined;
+          expect(payload.imp[i].bidderWinCount).to.be.undefined;
         }
-      ];
-    });
+      });
 
-    afterEach(function () {
-      for (let key in cookies) {
-        let cookie = cookies[key];
-        removeCookie(cookie);
-      }
+      it('queries the getFloor function to retrieve the floor and validates it', function() {
+        const testBids = [];
+
+        [
+          { currency: 'USD', floor: 1.99 },
+          { currency: 'USD', floor: '1.99' },
+          { currency: 'EUR', floor: 1.99 },
+          { currency: 'USD', floor: 'foo' },
+          { currency: 'USD', floor: null },
+          { currency: 'USD', floor: true },
+          { currency: 'USD', floor: false },
+          { currency: 'USD', floor: {} },
+          { currency: 'USD', floor: [] },
+        ].forEach(floorValue => testBids.push({
+          ...minimumBidParams,
+          getFloor: () => floorValue
+        }));
+
+        const payload = getPayloadFromTestBids(testBids);
+
+        // Valid floor
+        expect(payload.imp[0].floor).to.equal(1.99);
+        // Valid floor but string
+        expect(payload.imp[1].floor).to.equal('1.99'); // @TODO - convert this to a number?
+        // Non-USD valid floor
+        expect(payload.imp[2].floor).to.be.undefined;
+        // Invalid floor
+        for (let i = 3; i < payload.imp.length; i++) {
+          expect(payload.imp[i].floor).to.be.undefined;
+        }
+      });
 
-      for (let key in localStorageItems) {
-        let localStorageItem = localStorageItems[key];
-        localStorage.removeItem(localStorageItem);
-      }
+      it('calls getFloor with the right values', function() {
+        const testBids = [
+          {
+            ...minimumBidParams,
+            getFloor: () => ({ currency: 'USD', value: 0.5 })
+          }
+        ];
+        sinon.spy(testBids[0], 'getFloor');
 
-      cookies.length = 0;
-      localStorageItems.length = 0;
-      $$PREBID_GLOBAL$$.bidderSettings = {};
+        getPayloadFromTestBids(testBids);
+
+        expect(testBids[0].getFloor.calledWith({
+          currency: 'USD',
+          mediaType: '*',
+          size: '*'
+        })).to.be.true;
+      });
     });
 
-    function setCookie(cname, cvalue, exdays = 1) {
-      _setCookie(cname, cvalue, exdays);
-      cookies.push(cname);
-    }
+    describe('cerberus', function() {
+      it('retrieves CRB from localStorage and cookies', function() {
+        setCrb('valid', 'valid');
 
-    function removeCookie(cname) {
-      _setCookie(cname, '', -1);
-    }
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function _setCookie(cname, cvalue, exdays = 1) {
-      var d = new Date(),
-        expires;
+        expect(payload.rawCRB).to.equal(crbValues.valid);
+        expect(payload.rawCRBLocalStorage).to.equal(crbValues.validLs);
+        expect(payload.user.crbIDs).to.deep.equal(validCrbIdsLs);
+        expect(payload.user.tdID).to.equal('test-tdid-cerberus-localstorage');
+        expect(payload.user.kargoID).to.equal('test-lexid-cerberus-localstorage');
+        expect(payload.user.clientID).to.equal('test-clientid-cerberus-localstorage');
+        expect(payload.user.optOut).to.equal(false);
+      });
 
-      d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
-      expires = `expires=${d.toUTCString()}`;
-      document.cookie = `${cname}=${cvalue};${expires};path=/`;
-    }
+      it('retrieves CRB from localStorage if cookie is missing', function() {
+        setCrb(false, 'valid');
 
-    function setLocalStorageItem(name, val) {
-      localStorage.setItem(name, val);
-      localStorageItems.push(name);
-    }
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function simulateNoLocalStorage() {
-      return sandbox.stub(localStorage, 'getItem').throws();
-    }
+        expect(payload.rawCRB).to.be.undefined;
+        expect(payload.rawCRBLocalStorage).to.equal(crbValues.validLs);
+        expect(payload.user.crbIDs).to.deep.equal(validCrbIdsLs);
+        expect(payload.user.tdID).to.equal('test-tdid-cerberus-localstorage');
+        expect(payload.user.kargoID).to.equal('test-lexid-cerberus-localstorage');
+        expect(payload.user.clientID).to.equal('test-clientid-cerberus-localstorage');
+        expect(payload.user.optOut).to.equal(false);
+      });
 
-    function simulateNoCurrencyObject() {
-      undefinedCurrency = true;
-      noAdServerCurrency = false;
-      nonUSDAdServerCurrency = false;
-    }
+      it('retrieves CRB from cookies if localstorage is missing', function() {
+        setCrb('valid', false);
 
-    function simulateNoAdServerCurrency() {
-      undefinedCurrency = false;
-      noAdServerCurrency = true;
-      nonUSDAdServerCurrency = false;
-    }
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function simulateNonUSDAdServerCurrency() {
-      undefinedCurrency = false;
-      noAdServerCurrency = false;
-      nonUSDAdServerCurrency = true;
-    }
+        expect(payload.rawCRB).to.equal(crbValues.valid);
+        expect(payload.rawCRBLocalStorage).to.be.undefined;
+        expect(payload.user.crbIDs).to.deep.equal(validCrbIds);
+        expect(payload.user.tdID).to.equal('test-tdid-cerberus-cookie');
+        expect(payload.user.kargoID).to.equal('test-lexid-cerberus-cookie');
+        expect(payload.user.clientID).to.equal('test-clientid-cerberus-cookie');
+        expect(payload.user.optOut).to.equal(false);
+      });
 
-    function generateGDPR(applies, haveConsent) {
-      var data = {
-        consentString: 'gdprconsentstring',
-        gdprApplies: applies,
-      };
-      return data;
-    }
+      it('retrieves CRB from cookies if localstorage is not functional', function() {
+        // Note: this does not cause localStorage to throw an error in Firefox so in that browser this
+        // test is not 100% true to its name
+        sandbox.stub(localStorage, 'getItem').throws();
+        setCrb('valid', 'invalid');
+
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
+
+        expect(payload.rawCRB).to.equal(crbValues.valid);
+        expect(payload.rawCRBLocalStorage).to.be.undefined;
+        expect(payload.user.crbIDs).to.deep.equal(validCrbIds);
+        expect(payload.user.tdID).to.equal('test-tdid-cerberus-cookie');
+        expect(payload.user.kargoID).to.equal('test-lexid-cerberus-cookie');
+        expect(payload.user.clientID).to.equal('test-clientid-cerberus-cookie');
+        expect(payload.user.optOut).to.equal(false);
+      });
 
-    function generateGDPRExpect(applies, haveConsent) {
-      return {
-        consent: 'gdprconsentstring',
-        applies: applies,
-      };
-    }
+      it('does not fail if CRB is missing', function() {
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function generatePageView() {
-      return {
-        id: '112233',
-        timestamp: frozenNow.getTime(),
-        url: 'http://pageview.url'
-      }
-    }
+        expect(payload.rawCRB).to.be.undefined;
+        expect(payload.rawCRBLocalStorage).to.be.undefined;
+        expect(payload.user.crbIDs).to.deep.equal({});
+        expect(payload.user.tdID).to.be.undefined;
+        expect(payload.user.kargoID).to.be.undefined;
+        expect(payload.user.clientID).to.be.undefined;
+        expect(payload.user.optOut).to.be.undefined;
+      });
 
-    function generateRawCRB(rawCRB, rawCRBLocalStorage) {
-      if (rawCRB == null && rawCRBLocalStorage == null) {
-        return null
-      }
+      it('fails gracefully if the CRB is invalid base 64 cookie', function() {
+        setCrb('invalidB64', false);
 
-      let result = {}
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-      if (rawCRB != null) {
-        result.rawCRB = rawCRB
-      }
+        expect(payload.rawCRB).to.equal(crbValues.invalidB64);
+        expect(payload.rawCRBLocalStorage).to.be.undefined;
+        expect(payload.user.crbIDs).to.deep.equal({});
+        expect(payload.user.tdID).to.be.undefined;
+        expect(payload.user.kargoID).to.be.undefined;
+        expect(payload.user.clientID).to.be.undefined;
+        expect(payload.user.optOut).to.be.undefined;
+      });
 
-      if (rawCRBLocalStorage != null) {
-        result.rawCRBLocalStorage = rawCRBLocalStorage
-      }
+      it('fails gracefully if the CRB is invalid base 64 localStorage', function() {
+        setCrb(false, 'invalidB64');
 
-      return result
-    }
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function getKrgCrb() {
-      return 'eyJzeW5jSWRzIjp7IjIiOiI4MmZhMjU1NS01OTY5LTQ2MTQtYjRjZS00ZGNmMTA4MGU5ZjkiLCIxNiI6IlZveElrOEFvSnowQUFFZENleUFBQUFDMiY1MDIiLCIyMyI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjI0IjoiVm94SWs4QW9KejBBQUVkQ2V5QUFBQUMyJjUwMiIsIjI1IjoiNWVlMjQxMzgtNWUwMy00YjlkLWE5NTMtMzhlODMzZjI4NDlmIiwiMl84MCI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjJfOTMiOiI1ZWUyNDEzOC01ZTAzLTRiOWQtYTk1My0zOGU4MzNmMjg0OWYifSwibGV4SWQiOiI1ZjEwODgzMS0zMDJkLTExZTctYmY2Yi00NTk1YWNkM2JmNmMiLCJjbGllbnRJZCI6IjI0MTBkOGYyLWMxMTEtNDgxMS04OGE1LTdiNWUxOTBlNDc1ZiIsIm9wdE91dCI6ZmFsc2UsImV4cGlyZVRpbWUiOjE0OTc0NDkzODI2NjgsImxhc3RTeW5jZWRBdCI6MTQ5NzM2Mjk3OTAxMn0=';
-    }
+        expect(payload.rawCRB).to.be.undefined;
+        expect(payload.rawCRBLocalStorage).to.equal(crbValues.invalidB64Ls);
+        expect(payload.user.crbIDs).to.deep.equal({});
+        expect(payload.user.tdID).to.be.undefined;
+        expect(payload.user.kargoID).to.be.undefined;
+        expect(payload.user.clientID).to.be.undefined;
+        expect(payload.user.optOut).to.be.undefined;
+      });
 
-    function getKrgCrbOldStyle() {
-      return '{"v":"eyJzeW5jSWRzIjp7IjIiOiI4MmZhMjU1NS01OTY5LTQ2MTQtYjRjZS00ZGNmMTA4MGU5ZjkiLCIxNiI6IlZveElrOEFvSnowQUFFZENleUFBQUFDMiY1MDIiLCIyMyI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjI0IjoiVm94SWs4QW9KejBBQUVkQ2V5QUFBQUMyJjUwMiIsIjI1IjoiNWVlMjQxMzgtNWUwMy00YjlkLWE5NTMtMzhlODMzZjI4NDlmIiwiMl84MCI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjJfOTMiOiI1ZWUyNDEzOC01ZTAzLTRiOWQtYTk1My0zOGU4MzNmMjg0OWYifSwibGV4SWQiOiI1ZjEwODgzMS0zMDJkLTExZTctYmY2Yi00NTk1YWNkM2JmNmMiLCJjbGllbnRJZCI6IjI0MTBkOGYyLWMxMTEtNDgxMS04OGE1LTdiNWUxOTBlNDc1ZiIsIm9wdE91dCI6ZmFsc2UsImV4cGlyZVRpbWUiOjE0OTc0NDkzODI2NjgsImxhc3RTeW5jZWRBdCI6MTQ5NzM2Mjk3OTAxMn0="}';
-    }
+      [
+        [ 'valid', 'invalidB64', 'cookie' ],
+        [ 'valid', 'invalidJson', 'cookie' ],
+        [ 'invalidB64', 'invalidJson', 'none' ],
+        [ 'invalidB64', 'invalidB64', 'none' ],
+        [ 'invalidB64', 'valid', 'localStorage' ],
+        [ 'invalidJson', 'invalidJson', 'none' ],
+        [ 'invalidJson', 'invalidB64', 'none' ],
+        [ 'invalidJson', 'valid', 'localStorage' ],
+      ].forEach(config => {
+        it(`uses ${config[2]} if the cookie is ${config[0]} and localStorage is ${config[1]}`, function() {
+          setCrb(config[0], config[1]);
+          const payload = getPayloadFromTestBids(testBids, bidderRequest);
+
+          expect(payload.rawCRB).to.equal(crbValues[config[0]]);
+          expect(payload.rawCRBLocalStorage).to.equal(crbValues[`${config[1]}Ls`]);
+          if (config[2] === 'cookie') {
+            expect(payload.user.crbIDs).to.deep.equal(validCrbIds);
+            expect(payload.user.tdID).to.equal('test-tdid-cerberus-cookie');
+            expect(payload.user.kargoID).to.equal('test-lexid-cerberus-cookie');
+            expect(payload.user.clientID).to.equal('test-clientid-cerberus-cookie');
+            expect(payload.user.optOut).to.equal(false);
+          } else if (config[2] === 'localStorage') {
+            expect(payload.user.crbIDs).to.deep.equal(validCrbIdsLs);
+            expect(payload.user.tdID).to.equal('test-tdid-cerberus-localstorage');
+            expect(payload.user.kargoID).to.equal('test-lexid-cerberus-localstorage');
+            expect(payload.user.clientID).to.equal('test-clientid-cerberus-localstorage');
+            expect(payload.user.optOut).to.equal(false);
+          } else {
+            expect(payload.user.crbIDs).to.deep.equal({});
+            expect(payload.user.tdID).to.be.undefined;
+            expect(payload.user.kargoID).to.be.undefined;
+            expect(payload.user.clientID).to.be.undefined;
+            expect(payload.user.optOut).to.be.undefined;
+          }
+        });
+      });
 
-    function initializeKrgCrb(cookieOnly) {
-      if (!cookieOnly) {
-        setLocalStorageItem('krg_crb', getKrgCrb());
-      }
-      setCookie('krg_crb', getKrgCrbOldStyle());
-    }
+      it('uses the tdID from cerberus to populate the tdID field', function() {
+        setCrb('valid', 'valid');
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function getInvalidKrgCrbType1() {
-      return 'invalid-krg-crb';
-    }
+        expect(payload.user.tdID).to.equal('test-tdid-cerberus-localstorage');
+      });
 
-    function initializeInvalidKrgCrbType1() {
-      setLocalStorageItem('krg_crb', getInvalidKrgCrbType1());
-    }
+      it('uses the lexId from cerberus to populate the kargoID field', function() {
+        setCrb('valid', 'valid');
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function initializeInvalidKrgCrbType1Cookie() {
-      setCookie('krg_crb', getInvalidKrgCrbType1());
-    }
+        expect(payload.user.kargoID).to.equal('test-lexid-cerberus-localstorage');
+      });
 
-    function getInvalidKrgCrbType2() {
-      return 'Ly8v';
-    }
+      it('uses the clientId from cerberus to populate the clientID field', function() {
+        setCrb('valid', 'valid');
+        const payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function getInvalidKrgCrbType2OldStyle() {
-      return '{"v":"&&&&&&"}';
-    }
+        expect(payload.user.clientID).to.equal('test-clientid-cerberus-localstorage');
+      });
 
-    function initializeInvalidKrgCrbType2() {
-      setLocalStorageItem('krg_crb', getInvalidKrgCrbType2());
-    }
+      it('uses the optOut from cerberus to populate the clientID field', function() {
+        setCrb('valid', 'valid');
+        let payload;
+        payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function initializeInvalidKrgCrbType2Cookie() {
-      setCookie('krg_crb', getInvalidKrgCrbType2OldStyle());
-    }
+        expect(payload.user.optOut).to.equal(false);
 
-    function getInvalidKrgCrbType3OldStyle() {
-      return '{"v":"Ly8v"}';
-    }
+        setLocalStorageValue('krg_crb', buildCrbValue(false, true, true, true, true, true));
+        payload = getPayloadFromTestBids(testBids, bidderRequest);
 
-    function initializeInvalidKrgCrbType3Cookie() {
-      setCookie('krg_crb', getInvalidKrgCrbType3OldStyle());
-    }
+        expect(payload.user.optOut).to.equal(true);
+      });
+    });
 
-    function getInvalidKrgCrbType4OldStyle() {
-      return '{"v":"bnVsbA=="}';
-    }
+    describe('user', function() {
+      it('fetches the trade desk id from the adapter if present', function() {
+        const payload = getPayloadFromTestBids([{
+          ...minimumBidParams,
+          userId: {
+            tdid: 'test-tdid-module'
+          }
+        }]);
 
-    function initializeInvalidKrgCrbType4Cookie() {
-      setCookie('krg_crb', getInvalidKrgCrbType4OldStyle());
-    }
+        expect(payload.user.tdID).to.equal('test-tdid-module');
+      });
 
-    function getEmptyKrgCrb() {
-      return 'eyJleHBpcmVUaW1lIjoxNDk3NDQ5MzgyNjY4LCJsYXN0U3luY2VkQXQiOjE0OTczNjI5NzkwMTJ9';
-    }
+      it('fetches the trade desk id from cerberus if present', function() {
+        setLocalStorageValue('krg_crb', btoa(JSON.stringify({ tdID: 'test-tdid-crb' })));
 
-    function getEmptyKrgCrbOldStyle() {
-      return '{"v":"eyJleHBpcmVUaW1lIjoxNDk3NDQ5MzgyNjY4LCJsYXN0U3luY2VkQXQiOjE0OTczNjI5NzkwMTJ9"}';
-    }
+        const payload = getPayloadFromTestBids([{
+          ...minimumBidParams,
+        }]);
 
-    function initializeEmptyKrgCrb() {
-      setLocalStorageItem('krg_crb', getEmptyKrgCrb());
-    }
+        expect(payload.user.tdID).to.equal('test-tdid-crb');
+      });
 
-    function initializePageView() {
-      setLocalStorageItem('pageViewId', 112233);
-      setLocalStorageItem('pageViewTimestamp', frozenNow.getTime());
-      setLocalStorageItem('pageViewUrl', 'http://pageview.url');
-    }
+      it('fetches the trade desk id from the adapter if adapter and cerberus are present', function() {
+        setLocalStorageValue('krg_crb', buildCrbValue(false, true, true, true, true, false));
 
-    function initializeEmptyKrgCrbCookie() {
-      setCookie('krg_crb', getEmptyKrgCrbOldStyle());
-    }
+        const payload = getPayloadFromTestBids([{
+          ...minimumBidParams,
+          userId: {
+            tdid: 'test-tdid-module'
+          }
+        }]);
+
+        expect(payload.user.tdID).to.equal('test-tdid-module');
+      });
+
+      it('does not set kargoId if it is not present', function() {
+        const payload = getPayloadFromTestBids([{ ...minimumBidParams }]);
+
+        expect(payload.user.lexId).to.be.undefined;
+      });
+
+      it('does not populate usp, gdpr, or gpp if they are not present', function() {
+        const payload = getPayloadFromTestBids([{ ...minimumBidParams }]);
+
+        expect(payload.user.usp).to.be.undefined;
+        expect(payload.user.gdpr).to.be.undefined;
+        expect(payload.user.gpp).to.be.undefined;
+      });
+
+      it('fetches usp from the bidder request if present', function() {
+        bidderRequest.uspConsent = '1---';
+        const payload = getPayloadFromTestBids([{ ...minimumBidParams }]);
+
+        expect(payload.user.usp).to.equal('1---');
+      });
+
+      it('fetches gpp from the bidder request if present', function() {
+        bidderRequest.gppConsent = {
+          consentString: 'gppString',
+          applicableSections: [-1]
+        };
+        const payload = getPayloadFromTestBids([{ ...minimumBidParams }]);
+
+        expect(payload.user.gpp).to.deep.equal({
+          gppString: 'gppString',
+          applicableSections: [-1]
+        });
+      });
+
+      it('does not send empty gpp values', function() {
+        bidderRequest.gppConsent = {
+          consentString: '',
+          applicableSections: ''
+        };
+        const payload = getPayloadFromTestBids([{ ...minimumBidParams }]);
+
+        expect(payload.user.gpp).to.be.undefined;
+      });
+
+      it('fetches gdpr consent from the bidder request if present', function() {
+        bidderRequest.gdprConsent = {
+          consentString: 'gdpr-consent-string',
+          gdprApplies: true
+        };
+        const payload = getPayloadFromTestBids([{ ...minimumBidParams }]);
+
+        expect(payload.user.gdpr).to.deep.equal({
+          consent: 'gdpr-consent-string',
+          applies: true
+        });
+      });
+
+      it('handles malformed gdpr applies from the bidder request', function() {
+        [
+          ['true', true],
+          ['false', true],
+          ['1', true],
+          [1, true],
+          [0, false],
+          ['0', true],
+          ['y', true],
+          ['yes', true],
+          ['n', true],
+          ['no', true],
+          [null, false],
+          [{}, true],
+        ].forEach(testValue => {
+          bidderRequest.gdprConsent = { gdprApplies: testValue[0] };
+          const payload = getPayloadFromTestBids([{ ...minimumBidParams }]);
+          expect(payload.user.gdpr, `Value - ${JSON.stringify(testValue[0])}`).to.deep.equal({
+            consent: '',
+            applies: testValue[1]
+          });
+        });
+      });
+
+      it('passes the user.data from the first bid request if availabale', function() {
+        let payload;
+        payload = getPayloadFromTestBids([{
+          ...minimumBidParams,
+        }, {
+          ...minimumBidParams,
+          ortb2: { user: { data: { test: 'value' } } }
+        }]);
+        expect(payload.user.data).to.deep.equal([]);
+
+        payload = getPayloadFromTestBids([{
+          ...minimumBidParams,
+          ortb2: { user: { data: { test: 'value' } } }
+        }, {
+          ...minimumBidParams,
+          ortb2: { user: { data: { test2: 'value2' } } }
+        }]);
+        expect(payload.user.data).to.deep.equal({
+          test: 'value'
+        });
+      });
+
+      it('fails gracefully if there is no localStorage', function() {
+        sandbox.stub(localStorage, 'getItem').throws();
+        let payload = getPayloadFromTestBids(testBids);
+        expect(payload.user).to.deep.equal({
+          crbIDs: {},
+          data: []
+        });
+      });
+    });
+
+    describe('sua', function() {
+      it('is not provided if not present in the first valid bid', function() {
+        let payload = getPayloadFromTestBids([
+          ...testBids,
+          {
+            ...minimumBidParams,
+            ortb2: { device: { sua: {
+              platform: {
+                brand: 'macOS',
+                version: ['12', '6', '0']
+              },
+              browsers: [
+                {
+                  brand: 'Chromium',
+                  version: ['106', '0', '5249', '119']
+                },
+                {
+                  brand: 'Google Chrome',
+                  version: ['106', '0', '5249', '119']
+                },
+                {
+                  brand: 'Not;A=Brand',
+                  version: ['99', '0', '0', '0']
+                }
+              ],
+              mobile: 1,
+              model: 'model',
+              source: 1,
+            } } }
+          }
+        ]);
+        expect(payload.device.sua).to.be.undefined;
+      });
+
+      it('is provided if present in the first valid bid', function() {
+        let payload = getPayloadFromTestBids([
+          {
+            ...minimumBidParams,
+            ortb2: { device: { sua: {
+              platform: {
+                brand: 'macOS',
+                version: ['12', '6', '0']
+              },
+              browsers: [
+                {
+                  brand: 'Chromium',
+                  version: ['106', '0', '5249', '119']
+                },
+                {
+                  brand: 'Google Chrome',
+                  version: ['106', '0', '5249', '119']
+                },
+                {
+                  brand: 'Not;A=Brand',
+                  version: ['99', '0', '0', '0']
+                }
+              ],
+              mobile: 1,
+              model: 'model',
+              source: 1,
+            } } }
+          },
+          {
+            ...minimumBidParams,
+            ortb2: { device: { sua: {
+              platform: {
+                brand: 'macOS2',
+                version: ['122', '6', '0']
+              },
+              browsers: [
+                {
+                  brand: 'Chromium2',
+                  version: ['1062', '0', '5249', '119']
+                },
+                {
+                  brand: 'Google Chrome2',
+                  version: ['102', '0', '5249', '119']
+                },
+                {
+                  brand: 'Not;A=Brand2',
+                  version: ['992', '0', '0', '0']
+                }
+              ],
+              mobile: 2,
+              model: 'model2',
+              source: 2,
+            } } }
+          }
+        ]);
+        expect(payload.device.sua).to.deep.equal({
+          platform: {
+            brand: 'macOS',
+            version: ['12', '6', '0']
+          },
+          browsers: [
+            {
+              brand: 'Chromium',
+              version: ['106', '0', '5249', '119']
+            },
+            {
+              brand: 'Google Chrome',
+              version: ['106', '0', '5249', '119']
+            },
+            {
+              brand: 'Not;A=Brand',
+              version: ['99', '0', '0', '0']
+            }
+          ],
+          mobile: 1,
+          model: 'model',
+          source: 1,
+        });
+      });
+
+      it('does not send non-mapped attributes', function() {
+        let payload = getPayloadFromTestBids([{...minimumBidParams,
+          ortb2: { device: { sua: {
+            other: 'value',
+            objectMissing: {
+              key: 'value'
+            },
+            platform: {
+              brand: 'macOS',
+              version: ['12', '6', '0']
+            },
+            browsers: [
+              {
+                brand: 'Chromium',
+                version: ['106', '0', '5249', '119']
+              },
+              {
+                brand: 'Google Chrome',
+                version: ['106', '0', '5249', '119']
+              },
+              {
+                brand: 'Not;A=Brand',
+                version: ['99', '0', '0', '0']
+              }
+            ],
+            mobile: 1,
+            model: 'model',
+            source: 1,
+          } } }
+        }]);
+        expect(payload.device.sua).to.deep.equal({
+          platform: {
+            brand: 'macOS',
+            version: ['12', '6', '0']
+          },
+          browsers: [
+            {
+              brand: 'Chromium',
+              version: ['106', '0', '5249', '119']
+            },
+            {
+              brand: 'Google Chrome',
+              version: ['106', '0', '5249', '119']
+            },
+            {
+              brand: 'Not;A=Brand',
+              version: ['99', '0', '0', '0']
+            }
+          ],
+          mobile: 1,
+          model: 'model',
+          source: 1,
+        });
+      });
 
-    function getSessionId() {
-      return spec._getSessionId();
-    }
+      it('does not send non-truthy values or empty strings', function() {
+        [
+          false,
+          0,
+          null,
+          '',
+          '      ',
+          ' ',
+        ].forEach(value => {
+          let payload = getPayloadFromTestBids([{...minimumBidParams,
+            ortb2: { device: { sua: {
+              platform: value,
+              browsers: [
+                {
+                  brand: 'Chromium',
+                  version: ['106', '0', '5249', '119']
+                },
+                {
+                  brand: 'Google Chrome',
+                  version: ['106', '0', '5249', '119']
+                },
+                {
+                  brand: 'Not;A=Brand',
+                  version: ['99', '0', '0', '0']
+                }
+              ],
+              mobile: 1,
+              model: 'model',
+              source: 1,
+            } } }
+          }]);
+          expect(payload.device.sua, `Value - ${JSON.stringify(value)}`).to.deep.equal({
+            browsers: [
+              {
+                brand: 'Chromium',
+                version: ['106', '0', '5249', '119']
+              },
+              {
+                brand: 'Google Chrome',
+                version: ['106', '0', '5249', '119']
+              },
+              {
+                brand: 'Not;A=Brand',
+                version: ['99', '0', '0', '0']
+              }
+            ],
+            mobile: 1,
+            model: 'model',
+            source: 1,
+          });
+        });
+      });
 
-    function getExpectedKrakenParams(expectedCRB, expectedPage, excludeUserIds, expectedGDPR, currency) {
-      var base = {
-        pbv: '$prebid.version$',
-        aid: '1234098',
-        requestCount: 0,
-        sid: getSessionId(),
-        url: 'https://www.prebid.org',
-        timeout: 200,
-        ts: frozenNow.getTime(),
-        schain: testSchain,
-        device: {
-          size: [
-            screen.width,
-            screen.height
-          ],
-          sua: {
+      it('does not send 0 for mobile or source', function() {
+        let payload = getPayloadFromTestBids([{
+          ...minimumBidParams,
+          ortb2: { device: { sua: {
             platform: {
               brand: 'macOS',
               version: ['12', '6', '0']
@@ -434,367 +1522,224 @@ describe('kargo adapter tests', function () {
                 version: ['99', '0', '0', '0']
               }
             ],
-            mobile: 1,
+            mobile: 0,
             model: 'model',
-            source: 1
-          },
-        },
-        imp: [
-          {
-            code: '101',
-            id: '1',
-            pid: 'foo',
-            tid: '10101',
-            banner: {
-              sizes: [[320, 50], [300, 50]]
-            },
-            bidRequestCount: 1,
-            bidderRequestCount: 2,
-            bidderWinCount: 3,
-            floor: 1,
-            fpd: {
-              gpid: '/22558409563,18834096/dfy_mobile_adhesion'
-            }
+            source: 0,
+          } } }
+        }]);
+        expect(payload.device.sua).to.deep.equal({
+          platform: {
+            brand: 'macOS',
+            version: ['12', '6', '0']
           },
-          {
-            code: '202',
-            id: '2',
-            pid: 'bar',
-            tid: '20202',
-            video: {
-              sizes: [[320, 50], [300, 50]]
+          browsers: [
+            {
+              brand: 'Chromium',
+              version: ['106', '0', '5249', '119']
             },
-            fpd: {
-              gpid: '/22558409563,18834096/dfy_mobile_adhesion'
-            }
-          },
-          {
-            code: '303',
-            id: '3',
-            pid: 'bar',
-            tid: '30303',
-            native: {
-              sizes: [[320, 50], [300, 50]]
+            {
+              brand: 'Google Chrome',
+              version: ['106', '0', '5249', '119']
             },
-            fpd: {
-              gpid: '/22558409563,18834096/dfy_mobile_adhesion'
-            }
-          }
-        ],
-        socan: {
-          segments: ['segment_1', 'segment_2', 'segment_3'],
-          url: 'https://socan.url'
-        },
-        user: {
-          kargoID: '5f108831-302d-11e7-bf6b-4595acd3bf6c',
-          clientID: '2410d8f2-c111-4811-88a5-7b5e190e475f',
-          tdID: 'ed1562d5-e52b-406f-8e65-e5ab3ed5583c',
-          crbIDs: {
-            2: '82fa2555-5969-4614-b4ce-4dcf1080e9f9',
-            16: 'VoxIk8AoJz0AAEdCeyAAAAC2&502',
-            23: 'd2a855a5-1b1c-4300-940e-a708fa1f1bde',
-            24: 'VoxIk8AoJz0AAEdCeyAAAAC2&502',
-            25: '5ee24138-5e03-4b9d-a953-38e833f2849f',
-            '2_80': 'd2a855a5-1b1c-4300-940e-a708fa1f1bde',
-            '2_93': '5ee24138-5e03-4b9d-a953-38e833f2849f'
-          },
-          optOut: false,
-          usp: '1---',
-          sharedIDEids: [
             {
-              source: 'adserver.org',
-              uids: [
-                {
-                  id: 'ed1562d5-e52b-406f-8e65-e5ab3ed5583c',
-                  atype: 1,
-                  ext: {
-                    rtiPartner: 'TDID'
-                  }
-                }
-              ]
+              brand: 'Not;A=Brand',
+              version: ['99', '0', '0', '0']
             }
-          ]
-        }
-      };
-
-      if (excludeUserIds) {
-        base.user.crbIDs = {};
-        delete base.user.clientID;
-        delete base.user.kargoID;
-        delete base.user.optOut;
-      }
-
-      if (expectedGDPR) {
-        base.user.gdpr = expectedGDPR;
-      }
-
-      if (expectedPage) {
-        base.page = expectedPage;
-      }
+          ],
+          model: 'model',
+        });
+      });
+    });
 
-      if (currency) {
-        base.cur = currency;
-      }
+    describe('page', function() {
+      it('pulls the page ID from localStorage', function() {
+        setLocalStorageValue('pageViewId', 'test-page-id');
+        let payload = getPayloadFromTestBids(testBids);
+        expect(payload.page).to.deep.equal({
+          id: 'test-page-id'
+        });
+      });
 
-      const reqCount = requestCount++;
-      base.requestCount = reqCount
+      it('pulls the page timestamp from localStorage', function() {
+        setLocalStorageValue('pageViewTimestamp', '123456789');
+        let payload = getPayloadFromTestBids(testBids);
+        expect(payload.page).to.deep.equal({
+          timestamp: 123456789
+        });
+      });
 
-      if (expectedCRB != null) {
-        if (expectedCRB.rawCRB != null) {
-          base.rawCRB = expectedCRB.rawCRB
-        }
-        if (expectedCRB.rawCRBLocalStorage != null) {
-          base.rawCRBLocalStorage = expectedCRB.rawCRBLocalStorage
-        }
-      }
+      it('pulls the page ID from localStorage', function() {
+        setLocalStorageValue('pageViewUrl', 'https://test-url.com');
+        let payload = getPayloadFromTestBids(testBids);
+        expect(payload.page).to.deep.equal({
+          url: 'https://test-url.com'
+        });
+      });
 
-      return base;
-    }
+      it('pulls all 3 together', function() {
+        setLocalStorageValue('pageViewId', 'test-page-id');
+        setLocalStorageValue('pageViewTimestamp', '123456789');
+        setLocalStorageValue('pageViewUrl', 'https://test-url.com');
+        let payload = getPayloadFromTestBids(testBids);
+        expect(payload.page).to.deep.equal({
+          id: 'test-page-id',
+          timestamp: 123456789,
+          url: 'https://test-url.com'
+        });
+      });
 
-    function testBuildRequests(expected, gdpr) {
-      var clonedBids = JSON.parse(JSON.stringify(bids));
+      it('fails gracefully without localStorage', function() {
+        sandbox.stub(localStorage, 'getItem').throws();
+        let payload = getPayloadFromTestBids(testBids);
+        expect(payload.page).to.be.undefined;
+      });
+    });
+  });
 
-      var payload = {
-        timeout: 200,
-        uspConsent: '1---',
-        refererInfo: {
-          page: 'https://www.prebid.org',
+  describe('interpretResponse', function() {
+    const response = Object.freeze({ body: {
+      1: {
+        id: 'foo',
+        cpm: 3,
+        adm: '
',
+        width: 320,
+        height: 50,
+        metadata: {},
+        creativeID: 'bar'
+      },
+      2: {
+        id: 'bar',
+        cpm: 2.5,
+        adm: '
',
+        width: 300,
+        height: 250,
+        targetingCustom: 'dmpmptest1234',
+        metadata: {
+          landingPageDomain: ['https://foobar.com']
         },
-      };
-
-      if (gdpr) {
-        payload['gdprConsent'] = gdpr
+        creativeID: 'foo'
+      },
+      3: {
+        id: 'bar',
+        cpm: 2.5,
+        adm: '
',
+        width: 300,
+        height: 250,
+        creativeID: 'foo'
+      },
+      4: {
+        id: 'bar',
+        cpm: 2.5,
+        adm: '
',
+        width: 300,
+        height: 250,
+        mediaType: 'banner',
+        metadata: {},
+        creativeID: 'foo',
+        currency: 'EUR'
+      },
+      5: {
+        id: 'bar',
+        cpm: 2.5,
+        adm: '',
+        width: 300,
+        height: 250,
+        mediaType: 'video',
+        metadata: {},
+        creativeID: 'foo',
+        currency: 'EUR'
+      },
+      6: {
+        id: 'bar',
+        cpm: 2.5,
+        adm: '',
+        admUrl: 'https://foobar.com/vast_adm',
+        width: 300,
+        height: 250,
+        mediaType: 'video',
+        metadata: {},
+        creativeID: 'foo',
+        currency: 'EUR'
       }
-
-      var request = spec.buildRequests(clonedBids, payload);
-      var krakenParams = request.data;
-
-      expect(request.url).to.equal('https://krk2.kargo.com/api/v1/prebid');
-      expect(request.method).to.equal('POST');
-      expect(request.timeout).to.equal(200);
-      expect(krakenParams).to.deep.equal(expected);
-
-      // Make sure session ID stays the same across requests simulating multiple auctions on one page load
-      for (let i in sessionIds) {
-        if (i == 0) {
-          continue;
+    }});
+    const bidderRequest = Object.freeze({
+      currency: 'USD',
+      bids: [{
+        bidId: 1,
+        params: {
+          placementId: 'foo'
         }
-        let sessionId = sessionIds[i];
-        expect(sessionIds[0]).to.equal(sessionId);
-      }
-    }
-
-    it('works when all params and localstorage and cookies are correctly set', function () {
-      initializeKrgCrb();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getKrgCrbOldStyle(), getKrgCrb()), generatePageView()));
-    });
-
-    it('works when all params and cookies are correctly set but no localstorage', function () {
-      initializeKrgCrb(true);
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getKrgCrbOldStyle())));
-    });
-
-    it('gracefully handles nothing being set', function () {
-      testBuildRequests(getExpectedKrakenParams(undefined, undefined, true));
-    });
-
-    it('gracefully handles browsers without localStorage', function () {
-      simulateNoLocalStorage();
-      testBuildRequests(getExpectedKrakenParams(undefined, undefined, true));
-    });
-
-    it('handles empty yet valid Kargo CRB', function () {
-      initializeEmptyKrgCrb();
-      initializeEmptyKrgCrbCookie();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getEmptyKrgCrbOldStyle(), getEmptyKrgCrb()), generatePageView(), true));
-    });
-
-    it('handles broken Kargo CRBs where base64 encoding is invalid', function () {
-      initializeInvalidKrgCrbType1();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(undefined, getInvalidKrgCrbType1()), generatePageView(), true));
-    });
-
-    it('handles broken Kargo CRBs where top level JSON is invalid on cookie', function () {
-      initializeInvalidKrgCrbType1Cookie();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getInvalidKrgCrbType1()), generatePageView(), true));
-    });
-
-    it('handles broken Kargo CRBs where decoded JSON is invalid', function () {
-      initializeInvalidKrgCrbType2();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(undefined, getInvalidKrgCrbType2()), generatePageView(), true));
-    });
-
-    it('handles broken Kargo CRBs where inner base 64 is invalid on cookie', function () {
-      initializeInvalidKrgCrbType2Cookie();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getInvalidKrgCrbType2OldStyle()), generatePageView(), true));
-    });
-
-    it('handles broken Kargo CRBs where inner JSON is invalid on cookie', function () {
-      initializeInvalidKrgCrbType3Cookie();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getInvalidKrgCrbType3OldStyle()), generatePageView(), true));
-    });
-
-    it('handles broken Kargo CRBs where inner JSON is falsey', function () {
-      initializeInvalidKrgCrbType4Cookie();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getInvalidKrgCrbType4OldStyle()), generatePageView(), true));
-    });
-
-    it('handles a non-existant currency object on the config', function () {
-      simulateNoCurrencyObject();
-      initializeKrgCrb();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getKrgCrbOldStyle(), getKrgCrb()), generatePageView()));
-    });
-
-    it('handles no ad server currency being set on the currency object in the config', function () {
-      simulateNoAdServerCurrency();
-      initializeKrgCrb();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getKrgCrbOldStyle(), getKrgCrb()), generatePageView()));
-    });
-
-    it('handles non-USD ad server currency being set on the currency object in the config', function () {
-      simulateNonUSDAdServerCurrency();
-      initializeKrgCrb();
-      initializePageView();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getKrgCrbOldStyle(), getKrgCrb()), generatePageView(), undefined, undefined, 'EUR'));
+      }, {
+        bidId: 2,
+        params: {
+          placementId: 'bar'
+        }
+      }, {
+        bidId: 3,
+        params: {
+          placementId: 'bar'
+        }
+      }, {
+        bidId: 4,
+        params: {
+          placementId: 'bar'
+        }
+      }, {
+        bidId: 5,
+        params: {
+          placementId: 'bar'
+        }
+      }, {
+        bidId: 6,
+        params: {
+          placementId: 'bar'
+        }
+      }]
     });
 
-    it('sends gdpr consent', function () {
-      initializeKrgCrb();
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getKrgCrbOldStyle(), getKrgCrb()), undefined, false, generateGDPRExpect(true, true)), generateGDPR(true, true));
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getKrgCrbOldStyle(), getKrgCrb()), undefined, false, generateGDPRExpect(false, true)), generateGDPR(false, true));
-      testBuildRequests(getExpectedKrakenParams(generateRawCRB(getKrgCrbOldStyle(), getKrgCrb()), undefined, false, generateGDPRExpect(false, false)), generateGDPR(false, false));
+    it('returns an empty array if the response body is empty or not an object', function() {
+      [
+        '',
+        undefined,
+        false,
+        true,
+        null,
+        [],
+        {},
+        1234,
+      ].forEach(value => {
+        let bids = spec.interpretResponse({ body: value }, bidderRequest);
+        expect(bids, `Value - ${JSON.stringify(value)}`).to.deep.equal([]);
+      });
     });
-  });
 
-  describe('response handler', function () {
-    it('handles bid responses', function () {
-      var resp = spec.interpretResponse({
-        body: {
-          1: {
-            id: 'foo',
-            cpm: 3,
-            adm: '
',
-            width: 320,
-            height: 50,
-            metadata: {}
-          },
-          2: {
-            id: 'bar',
-            cpm: 2.5,
-            adm: '
',
-            width: 300,
-            height: 250,
-            targetingCustom: 'dmpmptest1234',
-            metadata: {
-              landingPageDomain: ['https://foobar.com']
-            }
-          },
-          3: {
-            id: 'bar',
-            cpm: 2.5,
-            adm: '
',
-            width: 300,
-            height: 250
-          },
-          4: {
-            id: 'bar',
-            cpm: 2.5,
-            adm: '
',
-            width: 300,
-            height: 250,
-            mediaType: 'banner',
-            metadata: {},
-            currency: 'EUR'
-          },
-          5: {
-            id: 'bar',
-            cpm: 2.5,
-            adm: '',
-            width: 300,
-            height: 250,
-            mediaType: 'video',
-            metadata: {},
-            currency: 'EUR'
-          },
-          6: {
-            id: 'bar',
-            cpm: 2.5,
-            adm: '',
-            admUrl: 'https://foobar.com/vast_adm',
-            width: 300,
-            height: 250,
-            mediaType: 'video',
-            metadata: {},
-            currency: 'EUR'
-          }
-        }
-      }, {
-        currency: 'USD',
-        bids: [{
-          bidId: 1,
-          params: {
-            placementId: 'foo'
-          }
-        }, {
-          bidId: 2,
-          params: {
-            placementId: 'bar'
-          }
-        }, {
-          bidId: 3,
-          params: {
-            placementId: 'bar'
-          }
-        }, {
-          bidId: 4,
-          params: {
-            placementId: 'bar'
-          }
-        }, {
-          bidId: 5,
-          params: {
-            placementId: 'bar'
-          }
-        }, {
-          bidId: 6,
-          params: {
-            placementId: 'bar'
-          }
-        }]
-      });
-      var expectation = [{
+    it('returns bid response for various objects', function() {
+      let bids = spec.interpretResponse(response, bidderRequest);
+      expect(bids).to.have.length(Object.keys(response.body).length);
+      expect(bids[0]).to.deep.equal({
         ad: '
',
-        requestId: '1',
         cpm: 3,
-        width: 320,
-        height: 50,
-        ttl: 300,
-        creativeId: 'foo',
-        dealId: undefined,
-        netRevenue: true,
+        creativeId: 'bar',
         currency: 'USD',
+        dealId: undefined,
+        height: 50,
         mediaType: 'banner',
         meta: {
           mediaType: 'banner'
-        }
-      }, {
+        },
+        netRevenue: true,
+        requestId: '1',
+        ttl: 300,
+        width: 320,
+      });
+      expect(bids[1]).to.deep.equal({
         requestId: '2',
         ad: '
',
         cpm: 2.5,
         width: 300,
         height: 250,
         ttl: 300,
-        creativeId: 'bar',
+        creativeId: 'foo',
         dealId: 'dmpmptest1234',
         netRevenue: true,
         currency: 'USD',
@@ -804,14 +1749,15 @@ describe('kargo adapter tests', function () {
           clickUrl: 'https://foobar.com',
           advertiserDomains: ['https://foobar.com']
         }
-      }, {
+      });
+      expect(bids[2]).to.deep.equal({
         requestId: '3',
         ad: '
',
         cpm: 2.5,
         width: 300,
         height: 250,
         ttl: 300,
-        creativeId: 'bar',
+        creativeId: 'foo',
         dealId: undefined,
         netRevenue: true,
         currency: 'USD',
@@ -819,14 +1765,15 @@ describe('kargo adapter tests', function () {
         meta: {
           mediaType: 'banner'
         }
-      }, {
+      });
+      expect(bids[3]).to.deep.equal({
         requestId: '4',
         ad: '
',
         cpm: 2.5,
         width: 300,
         height: 250,
         ttl: 300,
-        creativeId: 'bar',
+        creativeId: 'foo',
         dealId: undefined,
         netRevenue: true,
         currency: 'EUR',
@@ -834,14 +1781,15 @@ describe('kargo adapter tests', function () {
         meta: {
           mediaType: 'banner'
         }
-      }, {
+      });
+      expect(bids[4]).to.deep.equal({
         requestId: '5',
         cpm: 2.5,
         width: 300,
         height: 250,
         vastXml: '',
         ttl: 300,
-        creativeId: 'bar',
+        creativeId: 'foo',
         dealId: undefined,
         netRevenue: true,
         currency: 'EUR',
@@ -849,14 +1797,15 @@ describe('kargo adapter tests', function () {
         meta: {
           mediaType: 'video'
         }
-      }, {
+      });
+      expect(bids[5]).to.deep.equal({
         requestId: '6',
         cpm: 2.5,
         width: 300,
         height: 250,
         vastUrl: 'https://foobar.com/vast_adm',
         ttl: 300,
-        creativeId: 'bar',
+        creativeId: 'foo',
         dealId: undefined,
         netRevenue: true,
         currency: 'EUR',
@@ -864,148 +1813,266 @@ describe('kargo adapter tests', function () {
         meta: {
           mediaType: 'video'
         }
-      }];
-      expect(resp).to.deep.equal(expectation);
+      });
     });
-  });
 
-  describe('user sync handler', function () {
-    const clientId = '74c81cbb-7d07-46d9-be9b-68ccb291c949';
-    var shouldSimulateOutdatedBrowser, crb, isActuallyOutdatedBrowser;
+    it('adds landingPageDomain data', function() {
+      let response = spec.interpretResponse({ body: { 0: {
+        metadata: {
+          landingPageDomain: [
+            'https://foo.com',
+            'https://bar.com'
+          ]
+        }
+      } } }, {});
+      expect(response[0].meta).to.deep.equal({
+        mediaType: 'banner',
+        clickUrl: 'https://foo.com',
+        advertiserDomains: [ 'https://foo.com', 'https://bar.com' ]
+      });
+    });
 
-    beforeEach(() => {
-      $$PREBID_GLOBAL$$.bidderSettings = {
-        kargo: {
-          storageAllowed: true
+    it('should return paapi if provided in bid response', function () {
+      const auctionConfig = {
+        seller: 'https://kargo.com',
+        decisionLogicUrl: 'https://kargo.com/decision_logic.js',
+        interestGroupBuyers: ['https://some_buyer.com'],
+        perBuyerSignals: {
+          'https://some_buyer.com': { a: 1 }
         }
-      };
-      crb = {};
-      shouldSimulateOutdatedBrowser = false;
-      isActuallyOutdatedBrowser = false;
-
-      // IE11 fails these tests in the Prebid test suite. Since this
-      // browser won't support any of this stuff we expect all user
-      // syncing to fail gracefully. Kargo is mobile only, so this
-      // doesn't really matter.
-      if (!window.crypto) {
-        isActuallyOutdatedBrowser = true;
-      } else {
-        sandbox.stub(crypto, 'getRandomValues').callsFake(function (buf) {
-          if (shouldSimulateOutdatedBrowser) {
-            throw new Error('Could not generate random values');
-          }
-          var bytes = [50, 5, 232, 133, 141, 55, 49, 57, 244, 126, 248, 44, 255, 38, 128, 0];
-          for (var i = 0; i < bytes.length; i++) {
-            buf[i] = bytes[i];
+      }
+
+      const body = response.body;
+      for (const key in body) {
+        if (body.hasOwnProperty(key)) {
+          if (key % 2 !== 0) { // Add auctionConfig to every other object
+            body[key].auctionConfig = auctionConfig;
           }
-          return buf;
-        });
+        }
       }
 
-      sandbox.stub(spec, '_getCrb').callsFake(function () {
-        return crb;
+      let result = spec.interpretResponse(response, bidderRequest);
+
+      // Test properties of bidResponses
+      result.bids.forEach(bid => {
+        expect(bid).to.have.property('requestId');
+        expect(bid).to.have.property('cpm');
+        expect(bid).to.have.property('width');
+        expect(bid).to.have.property('height');
+        expect(bid).to.have.property('ttl');
+        expect(bid).to.have.property('creativeId');
+        expect(bid.netRevenue).to.be.true;
+        expect(bid).to.have.property('meta').that.is.an('object');
       });
-    });
 
-    function getUserSyncsWhenAllowed(gdprConsent, usPrivacy, gppConsent) {
-      return spec.getUserSyncs({ iframeEnabled: true }, null, gdprConsent, usPrivacy, gppConsent);
-    }
+      // Test properties of paapi
+      expect(result.paapi).to.have.lengthOf(3);
 
-    function getUserSyncsWhenForbidden() {
-      return spec.getUserSyncs({});
-    }
+      const expectedBidIds = ['1', '3', '5']; // Expected bidIDs
+      result.paapi.forEach(config => {
+        expect(config).to.have.property('bidId');
+        expect(expectedBidIds).to.include(config.bidId);
 
-    function turnOnClientId() {
-      crb.clientId = clientId;
-    }
+        expect(config).to.have.property('config').that.is.an('object');
+        expect(config.config).to.have.property('seller', 'https://kargo.com');
+        expect(config.config).to.have.property('decisionLogicUrl', 'https://kargo.com/decision_logic.js');
+        expect(config.config.interestGroupBuyers).to.be.an('array').that.includes('https://some_buyer.com');
+        expect(config.config.perBuyerSignals).to.have.property('https://some_buyer.com').that.deep.equals({ a: 1 });
+      });
+    });
+  });
 
-    function simulateOutdatedBrowser() {
-      shouldSimulateOutdatedBrowser = true;
-    }
+  describe('getUserSyncs', function() {
+    let crb = {};
+    const clientId = 'random-client-id-string';
+    const baseUrl = 'https://crb.kargo.com/api/v1/initsyncrnd/random-client-id-string?seed=3205e885-8d37-4139-b47e-f82cff268000&gdpr=0&gdpr_consent=&us_privacy=&gpp=&gpp_sid=';
+
+    function buildSyncUrls(baseUrl = 'https://crb.kargo.com/api/v1/initsyncrnd/random-client-id-string?seed=3205e885-8d37-4139-b47e-f82cff268000&gdpr=0&gdpr_consent=&us_privacy=&gpp=&gpp_sid=') {
+      let syncs = [];
 
-    function getSyncUrl(index, gdprApplies, gdprConsentString, usPrivacy, gpp, gppSid) {
-      return {
+      syncs.push({
         type: 'iframe',
-        url: `https://crb.kargo.com/api/v1/initsyncrnd/${clientId}?seed=3205e885-8d37-4139-b47e-f82cff268000&idx=${index}&gdpr=${gdprApplies}&gdpr_consent=${gdprConsentString}&us_privacy=${usPrivacy}&gpp=${gpp}&gpp_sid=${gppSid}`
-      };
-    }
+        url: baseUrl
+      });
 
-    function getSyncUrls(gdprApplies, gdprConsentString, usPrivacy, gpp, gppSid) {
-      var syncs = [];
-      for (var i = 0; i < 5; i++) {
-        syncs[i] = getSyncUrl(i, gdprApplies || 0, gdprConsentString || '', usPrivacy || '', gpp || '', gppSid || '');
-      }
       return syncs;
     }
 
-    function safelyRun(runExpectation) {
-      if (isActuallyOutdatedBrowser) {
-        expect(getUserSyncsWhenAllowed()).to.be.an('array').that.is.empty;
-      } else {
-        runExpectation();
-      }
+    function getUserSyncs(gdpr, usp, gpp) {
+      return spec.getUserSyncs(
+        { iframeEnabled: true },
+        null,
+        gdpr,
+        usp,
+        gpp
+      );
     }
 
-    it('handles user syncs when there is a client id', function () {
-      turnOnClientId();
-      safelyRun(() => expect(getUserSyncsWhenAllowed()).to.deep.equal(getSyncUrls()));
+    beforeEach(function() {
+      crb = { clientId };
+      sandbox.stub(spec, '_getCrb').callsFake(function() { return crb; });
+
+      // Makes the seed in the URLs predictable
+      sandbox.stub(crypto, 'getRandomValues').callsFake(function (buf) {
+        var bytes = [50, 5, 232, 133, 141, 55, 49, 57, 244, 126, 248, 44, 255, 38, 128, 0];
+        for (var i = 0; i < bytes.length; i++) {
+          buf[i] = bytes[i];
+        }
+        return buf;
+      });
+    });
+
+    it('returns user syncs when an ID is present', function() {
+      expect(getUserSyncs()).to.deep.equal(buildSyncUrls());
+    });
+
+    it('returns no syncs if there is no user ID', function() {
+      delete crb.clientId;
+      expect(getUserSyncs()).to.deep.equal([]);
+    });
+
+    it('returns no syncs if there is no usp consent', function() {
+      expect(getUserSyncs(undefined, '1YYY')).to.deep.equal([]);
+    });
+
+    it('returns no syncs if iframe syncing is not allowed', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: false }, null, undefined, undefined, undefined))
+        .to.deep.equal([]);
+      expect(spec.getUserSyncs({}, null, undefined, undefined, undefined))
+        .to.deep.equal([]);
     });
 
-    it('no user syncs when there is no client id', function () {
-      safelyRun(() => expect(getUserSyncsWhenAllowed()).to.be.an('array').that.is.empty);
+    it('includes the US privacy string in the sync URL if present', function() {
+      [
+        '0---',
+        '1---',
+        '1NNN',
+        'invalid',
+        1234,
+      ].forEach(value => expect(getUserSyncs(undefined, value), `Value - ${value}`)
+        .to.deep.equal(buildSyncUrls(baseUrl.replace(/us_privacy=/, `us_privacy=${value}`))));
     });
 
-    it('no user syncs when there is no us privacy consent', function () {
-      turnOnClientId();
-      safelyRun(() => expect(getUserSyncsWhenAllowed(null, '1YYY')).to.be.an('array').that.is.empty);
+    it('includes gdpr information if provided', function() {
+      [
+        { gdprApplies: true, consentString: 'test-consent-string', ga: '1', cs: 'test-consent-string' },
+        { gdprApplies: false, consentString: 'test-consent-string', ga: '0', cs: 'test-consent-string' },
+        { gdprApplies: true, ga: '1', cs: '' },
+        { gdprApplies: false, ga: '0', cs: '' },
+        { ga: '0', cs: '' },
+      ].forEach(value => expect(getUserSyncs(value), `Value - ${value}`)
+        .to.deep.equal(buildSyncUrls(baseUrl
+          .replace(/gdpr=\d/, `gdpr=${value.ga}`)
+          .replace(/gdpr_consent=/, `gdpr_consent=${value.cs}`))));
     });
 
-    it('pass through us privacy consent', function () {
-      turnOnClientId();
-      safelyRun(() => expect(getUserSyncsWhenAllowed(null, '1YNY')).to.deep.equal(getSyncUrls(0, '', '1YNY')));
+    it('handles malformed gdpr information', function() {
+      [
+        null,
+        false,
+        true,
+        1,
+        '1',
+        'test-applies',
+        [],
+        {}
+      ].forEach(value => expect(getUserSyncs(value), `Value - ${JSON.stringify(value)}`)
+        .to.deep.equal(buildSyncUrls(baseUrl)));
     });
 
-    it('pass through gdpr consent', function () {
-      turnOnClientId();
-      safelyRun(() => expect(getUserSyncsWhenAllowed({ gdprApplies: true, consentString: 'consentstring' })).to.deep.equal(getSyncUrls(1, 'consentstring', '')));
+    it('includes gpp information if provided', function() {
+      [
+        { applicableSections: [-1], consentString: 'test-consent-string', as: '-1', cs: 'test-consent-string' },
+        { applicableSections: [1, 2, 3], consentString: 'test-consent-string', as: '1,2,3', cs: 'test-consent-string' },
+        { applicableSections: [-1], as: '-1', cs: '' },
+        { applicableSections: false, consentString: 'test-consent-string', as: '', cs: 'test-consent-string' },
+        { applicableSections: null, consentString: 'test-consent-string', as: '', cs: 'test-consent-string' },
+        { applicableSections: {}, consentString: 'test-consent-string', as: '', cs: 'test-consent-string' },
+        { applicableSections: [], consentString: 'test-consent-string', as: '', cs: 'test-consent-string' },
+        { as: '', cs: '' },
+      ].forEach(value => expect(getUserSyncs(undefined, undefined, value), `Value - ${value}`)
+        .to.deep.equal(buildSyncUrls(baseUrl
+          .replace(/gpp=/, `gpp=${value.cs}`)
+          .replace(/gpp_sid=/, `gpp_sid=${value.as}`))));
     });
 
-    it('pass through gpp consent', function () {
-      turnOnClientId();
-      safelyRun(() => expect(getUserSyncsWhenAllowed(null, null, { consentString: 'gppString', applicableSections: [-1] })).to.deep.equal(getSyncUrls('', '', '', 'gppString', '-1')));
+    it('handles malformed gpp information', function() {
+      [
+        null,
+        false,
+        true,
+        1,
+        '1',
+        'test-applies',
+        [],
+        {}
+      ].forEach(value => expect(getUserSyncs(undefined, undefined, value), `Value - ${JSON.stringify(value)}`)
+        .to.deep.equal(buildSyncUrls(baseUrl)));
     });
 
-    it('no user syncs when there is outdated browser', function () {
-      turnOnClientId();
-      simulateOutdatedBrowser();
-      safelyRun(() => expect(getUserSyncsWhenAllowed()).to.be.an('array').that.is.empty);
+    it('includes all 3 if provided', function() {
+      expect(getUserSyncs(
+        { gdprApplies: true, consentString: 'test-gdpr-consent' },
+        '1---',
+        { applicableSections: [1, 2, 3], consentString: 'test-gpp-consent' }
+      )).to.deep.equal(buildSyncUrls(baseUrl
+        .replace(/gdpr=\d/, 'gdpr=1')
+        .replace(/gdpr_consent=/, 'gdpr_consent=test-gdpr-consent')
+        .replace(/us_privacy=/, 'us_privacy=1---')
+        .replace(/gpp=/, 'gpp=test-gpp-consent')
+        .replace(/gpp_sid=/, 'gpp_sid=1,2,3')));
     });
+  });
 
-    it('no user syncs when no iframe syncing allowed', function () {
-      turnOnClientId();
-      safelyRun(() => expect(getUserSyncsWhenForbidden()).to.be.an('array').that.is.empty);
+  describe('supportedMediaTypes', function() {
+    it('exposes video and banner', function() {
+      expect(spec.supportedMediaTypes).to.deep.equal([ 'banner', 'video' ]);
     });
   });
 
-  describe('timeout pixel trigger', function () {
-    let triggerPixelStub;
+  describe('onTimeout', function () {
+    let fetchStub;
 
     beforeEach(function () {
-      triggerPixelStub = sinon.stub(utils, 'triggerPixel');
+      fetchStub = sinon.stub(global, 'fetch').resolves(); // Stub fetch globally
     });
 
     afterEach(function () {
-      utils.triggerPixel.restore();
+      fetchStub.restore(); // Restore the original fetch function
+    });
+
+    it('does not call fetch if timeout data is not provided', function () {
+      spec.onTimeout(null);
+      expect(fetchStub.callCount).to.equal(0);
     });
 
-    it('should call triggerPixel utils function when timed out is filled', function () {
-      spec.onTimeout();
-      expect(triggerPixelStub.getCall(0)).to.be.null;
-      spec.onTimeout([{ auctionId: '1234', timeout: 2000 }]);
-      expect(triggerPixelStub.getCall(0)).to.not.be.null;
-      expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('https://krk2.kargo.com/api/v1/event/timeout');
-      expect(triggerPixelStub.getCall(0).args[0]).to.include('aid=1234');
-      expect(triggerPixelStub.getCall(0).args[0]).to.include('ato=2000');
+    it('calls fetch with the correct URLs if timeout data is provided', function () {
+      spec.onTimeout([
+        { auctionId: 'test-auction-id', timeout: 400 },
+        { auctionId: 'test-auction-id-2', timeout: 100 },
+        { auctionId: 'test-auction-id-3', timeout: 450 },
+        { auctionId: 'test-auction-id-4', timeout: 500 },
+      ]);
+
+      expect(fetchStub.calledWith(
+        'https://krk2.kargo.com/api/v1/event/timeout?aid=test-auction-id&ato=400',
+        { method: 'GET', keepalive: true }
+      )).to.be.true;
+
+      expect(fetchStub.calledWith(
+        'https://krk2.kargo.com/api/v1/event/timeout?aid=test-auction-id-2&ato=100',
+        { method: 'GET', keepalive: true }
+      )).to.be.true;
+
+      expect(fetchStub.calledWith(
+        'https://krk2.kargo.com/api/v1/event/timeout?aid=test-auction-id-3&ato=450',
+        { method: 'GET', keepalive: true }
+      )).to.be.true;
+
+      expect(fetchStub.calledWith(
+        'https://krk2.kargo.com/api/v1/event/timeout?aid=test-auction-id-4&ato=500',
+        { method: 'GET', keepalive: true }
+      )).to.be.true;
     });
   });
 });
diff --git a/test/spec/modules/kimberliteBidAdapter_spec.js b/test/spec/modules/kimberliteBidAdapter_spec.js
new file mode 100644
index 00000000000..739a970603c
--- /dev/null
+++ b/test/spec/modules/kimberliteBidAdapter_spec.js
@@ -0,0 +1,260 @@
+import { spec, ENDPOINT_URL, expandAuctionMacros } from 'modules/kimberliteBidAdapter.js';
+import { assert } from 'chai';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+
+const BIDDER_CODE = 'kimberlite';
+
+describe('kimberliteBidAdapter', function () {
+  const sizes = [[640, 480]];
+
+  describe('isBidRequestValid', function () {
+    let bidRequests;
+
+    beforeEach(function () {
+      bidRequests = [
+        {
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[320, 240]]
+            }
+          },
+          params: {
+            placementId: 'test-placement'
+          }
+        },
+        {
+          mediaTypes: {
+            [VIDEO]: {
+              mimes: ['video/mp4']
+            }
+          },
+          params: {
+            placementId: 'test-placement'
+          }
+        }
+      ];
+    });
+
+    it('pass on valid banner bidRequest', function () {
+      assert.isTrue(spec.isBidRequestValid(bidRequests[0]));
+    });
+
+    it('fails on missed placementId', function () {
+      delete bidRequests[0].params.placementId;
+      assert.isFalse(spec.isBidRequestValid(bidRequests[0]));
+    });
+
+    it('fails on empty banner', function () {
+      delete bidRequests[0].mediaTypes.banner;
+      assert.isFalse(spec.isBidRequestValid(bidRequests[0]));
+    });
+
+    it('fails on empty banner.sizes', function () {
+      delete bidRequests[0].mediaTypes.banner.sizes;
+      assert.isFalse(spec.isBidRequestValid(bidRequests[0]));
+    });
+
+    it('fails on empty request', function () {
+      assert.isFalse(spec.isBidRequestValid());
+    });
+
+    it('pass on valid video bidRequest', function () {
+      assert.isTrue(spec.isBidRequestValid(bidRequests[1]));
+    });
+
+    it('fails on missed video.mimes', function () {
+      delete bidRequests[1].mediaTypes.video.mimes;
+      assert.isFalse(spec.isBidRequestValid(bidRequests[1]));
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests, bidderRequest;
+
+    beforeEach(function () {
+      bidRequests = [
+        {
+          mediaTypes: {
+            [BANNER]: {sizes: sizes}
+          },
+          params: {
+            placementId: 'test-placement'
+          }
+        },
+        {
+          mediaTypes: {
+            [VIDEO]: {
+              mimes: ['video/mp4'],
+            }
+          },
+          params: {
+            placementId: 'test-placement'
+          }
+        }
+      ];
+
+      bidderRequest = {
+        refererInfo: {
+          domain: 'example.com',
+          page: 'https://www.example.com/test.html',
+        }
+      };
+    });
+
+    it('valid bid request', function () {
+      const bidRequest = spec.buildRequests(bidRequests, bidderRequest);
+
+      assert.equal(bidRequest.method, 'POST');
+      assert.equal(bidRequest.url, ENDPOINT_URL);
+      assert.ok(bidRequest.data);
+
+      const requestData = bidRequest.data;
+      expect(requestData.site.page).to.equal(bidderRequest.refererInfo.page);
+      expect(requestData.site.publisher.domain).to.equal(bidderRequest.refererInfo.domain);
+
+      expect(requestData.imp).to.be.an('array').and.is.not.empty;
+
+      expect(requestData.ext).to.be.an('Object').and.have.all.keys('prebid');
+      expect(requestData.ext.prebid).to.be.an('Object').and.have.all.keys('ver', 'adapterVer');
+
+      const impBannerData = requestData.imp[0];
+      expect(impBannerData.banner).is.to.be.an('Object').and.have.all.keys(['format', 'topframe']);
+
+      const bannerData = impBannerData.banner;
+      expect(bannerData.format).to.be.an('array').and.is.not.empty;
+
+      const formatData = bannerData.format[0];
+      expect(formatData).to.be.an('Object').and.have.all.keys('w', 'h');
+
+      assert.equal(formatData.w, sizes[0][0]);
+      assert.equal(formatData.h, sizes[0][1]);
+
+      if (FEATURES.VIDEO) {
+        const impVideoData = requestData.imp[1];
+        expect(impVideoData.video).is.to.be.an('Object').and.have.all.keys(['mimes']);
+
+        const videoData = impVideoData.video;
+        expect(videoData.mimes).to.be.an('array').and.is.not.empty;
+        expect(videoData.mimes[0]).to.be.a('string').that.equals('video/mp4');
+      }
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let bidderResponse, bidderRequest, bidRequest, expectedBids;
+
+    const requestId = '07fba8b0-8812-4dc6-b91e-4a525d81729c';
+    const bannerAdm = 'landing';
+    const videoAdm = 'http://video-test.landing.com?p=${AUCTION_PRICE}&c=${AUCTION_CURRENCY}test vast';
+    const nurl = 'http://nurl.landing.com?p=${AUCTION_PRICE}&c=${AUCTION_CURRENCY}';
+    const nurlPixel = `
`;
+
+    const currencies = [
+      undefined,
+      'USD'
+    ];
+
+    currencies.forEach(function(currency) {
+      beforeEach(function () {
+        bidderResponse = {
+          body: {
+            id: requestId,
+            seatbid: [{
+              bid: [
+                {
+                  crid: 1,
+                  impid: 1,
+                  price: 1,
+                  adm: bannerAdm,
+                  nurl: nurl
+                },
+                {
+                  crid: 2,
+                  impid: 2,
+                  price: 1,
+                  adm: videoAdm
+                }
+              ]
+            }]
+          }
+        };
+
+        bidderRequest = {
+          refererInfo: {
+            domain: 'example.com',
+            page: 'https://www.example.com/test.html',
+          },
+          bids: [
+            {
+              bidId: 1,
+              mediaTypes: {
+                banner: {sizes: sizes}
+              },
+              params: {
+                placementId: 'test-placement'
+              }
+            },
+            {
+              bidId: 2,
+              mediaTypes: {
+                video: {
+                  mimes: ['video/mp4']
+                }
+              },
+              params: {
+                placementId: 'test-placement'
+              }
+            }
+          ]
+        };
+
+        expectedBids = [
+          {
+            mediaType: 'banner',
+            requestId: 1,
+            cpm: 1,
+            creative_id: 1,
+            creativeId: 1,
+            ttl: 300,
+            netRevenue: true,
+            ad: bannerAdm + nurlPixel,
+            meta: {}
+          },
+          {
+            mediaType: 'video',
+            requestId: 2,
+            cpm: 1,
+            creative_id: 2,
+            creativeId: 2,
+            ttl: 300,
+            netRevenue: true,
+            vastXml: videoAdm,
+            meta: {}
+          },
+        ];
+
+        if (currency) {
+          expectedBids[0].currency = expectedBids[1].currency = bidderResponse.body.cur = currency;
+        }
+
+        bidRequest = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      });
+
+      it('pass on valid request', function () {
+        const bids = spec.interpretResponse(bidderResponse, bidRequest);
+        expectedBids[0].ad = expandAuctionMacros(expectedBids[0].ad, expectedBids[0].cpm, bidderResponse.body.cur);
+        assert.deepEqual(bids[0], expectedBids[0]);
+        if (FEATURES.VIDEO) {
+          expectedBids[1].vastXml =
+            expandAuctionMacros(expectedBids[1].vastXml, expectedBids[1].cpm, bidderResponse.body.cur);
+          assert.deepEqual(bids[1], expectedBids[1]);
+        }
+      });
+
+      it('fails on empty response', function () {
+        const bids = spec.interpretResponse({body: ''}, bidRequest);
+        assert.empty(bids);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/kinessoIdSystem_spec.js b/test/spec/modules/kinessoIdSystem_spec.js
new file mode 100644
index 00000000000..e5d9721737d
--- /dev/null
+++ b/test/spec/modules/kinessoIdSystem_spec.js
@@ -0,0 +1,26 @@
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {kinessoIdSubmodule} from '../../../modules/kinessoIdSystem.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
+
+describe('kinesso ID', () => {
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(kinessoIdSubmodule);
+    });
+    it('kpuid', function() {
+      const userId = {
+        kpuid: 'Sample_Token'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'kpuid.com',
+        uids: [{
+          id: 'Sample_Token',
+          atype: 3
+        }]
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/kiviadsBidAdapter_spec.js b/test/spec/modules/kiviadsBidAdapter_spec.js
index 03d58cbc265..e2d23d06822 100644
--- a/test/spec/modules/kiviadsBidAdapter_spec.js
+++ b/test/spec/modules/kiviadsBidAdapter_spec.js
@@ -3,11 +3,21 @@ import { spec } from '../../../modules/kiviadsBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'kiviads'
+const bidder = 'kiviads';
 const adUrl = 'https://lb.kiviads.com/pbjs';
 const syncUrl = 'https://sync.kiviads.com';
 
 describe('KiviAdsBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -18,8 +28,9 @@ describe('KiviAdsBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -32,8 +43,9 @@ describe('KiviAdsBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -55,8 +67,9 @@ describe('KiviAdsBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -75,11 +88,22 @@ describe('KiviAdsBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
     },
-    bidderTimeout: 300
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
@@ -114,6 +138,7 @@ describe('KiviAdsBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -122,7 +147,6 @@ describe('KiviAdsBidAdapter', function () {
         'coppa',
         'ccpa',
         'gdpr',
-        'gpp',
         'tmax'
       );
       expect(data.deviceWidth).to.be.a('number');
@@ -130,11 +154,9 @@ describe('KiviAdsBidAdapter', function () {
       expect(data.language).to.be.a('string');
       expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
-      expect(data.host).to.contain('localhost');
       expect(data.page).to.be.a('string');
-      expect(data.page).to.equal('/');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -150,6 +172,56 @@ describe('KiviAdsBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -175,8 +247,10 @@ describe('KiviAdsBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -191,12 +265,38 @@ describe('KiviAdsBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -400,5 +500,17 @@ describe('KiviAdsBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal(`${syncUrl}/image?pbjs=1&ccpa_consent=1---&coppa=0`)
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal(`${syncUrl}/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0`)
+    });
   });
 });
diff --git a/test/spec/modules/koblerBidAdapter_spec.js b/test/spec/modules/koblerBidAdapter_spec.js
index 2b5830f68d2..8bee7c0e2cb 100644
--- a/test/spec/modules/koblerBidAdapter_spec.js
+++ b/test/spec/modules/koblerBidAdapter_spec.js
@@ -1,18 +1,43 @@
 import {expect} from 'chai';
-import {spec} from 'modules/koblerBidAdapter.js';
+import {pageViewId, spec} from 'modules/koblerBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
 import {getRefererInfo} from 'src/refererDetection.js';
-
-function createBidderRequest(auctionId, timeout, pageUrl) {
+import { setConfig as setCurrencyConfig } from '../../../modules/currency';
+import { addFPDToBidderRequest } from '../../helpers/fpd';
+
+function createBidderRequest(auctionId, timeout, pageUrl, addGdprConsent) {
+  const gdprConsent = addGdprConsent ? {
+    consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+    apiVersion: 2,
+    vendorData: {
+      purpose: {
+        consents: {
+          1: false,
+          2: true,
+          3: false
+        }
+      },
+      publisher: {
+        restrictions: {
+          '2': {
+            // require consent
+            '11': 1
+          }
+        }
+      }
+    },
+    gdprApplies: true
+  } : {};
   return {
     bidderRequestId: 'mock-uuid',
     auctionId: auctionId || 'c1243d83-0bed-4fdb-8c76-42b456be17d0',
     timeout: timeout || 2000,
     refererInfo: {
       page: pageUrl || 'example.com'
-    }
+    },
+    gdprConsent: gdprConsent
   };
 }
 
@@ -222,6 +247,21 @@ describe('KoblerAdapter', function () {
       expect(openRtbRequest.site.page).to.be.equal(testUrl);
     });
 
+    it('should reuse the same page view ID on subsequent calls', function () {
+      const testUrl = 'kobler.no';
+      const auctionId1 = '8319af54-9795-4642-ba3a-6f57d6ff9100';
+      const auctionId2 = 'e19f2d0c-602d-4969-96a1-69a22d483f47';
+      const timeout = 5000;
+      const validBidRequests = [createValidBidRequest()];
+      const bidderRequest1 = createBidderRequest(auctionId1, timeout, testUrl);
+      const bidderRequest2 = createBidderRequest(auctionId2, timeout, testUrl);
+
+      const openRtbRequest1 = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest1).data);
+      expect(openRtbRequest1.ext.kobler.page_view_id).to.be.equal(pageViewId);
+      const openRtbRequest2 = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest2).data);
+      expect(openRtbRequest2.ext.kobler.page_view_id).to.be.equal(pageViewId);
+    });
+
     it('should read data from valid bid requests', function () {
       const firstSize = [400, 800];
       const secondSize = [450, 950];
@@ -289,27 +329,6 @@ describe('KoblerAdapter', function () {
       expect(openRtbRequest.test).to.be.equal(1);
     });
 
-    it('should read pageUrl from config when testing', function () {
-      config.setConfig({
-        pageUrl: 'https://testing-url.com'
-      });
-      const validBidRequests = [
-        createValidBidRequest(
-          {
-            test: true
-          }
-        )
-      ];
-      const bidderRequest = createBidderRequest();
-
-      const result = spec.buildRequests(validBidRequests, bidderRequest);
-      expect(result.url).to.be.equal('https://bid-service.dev.essrtb.com/bid/prebid_rtb_call');
-
-      const openRtbRequest = JSON.parse(result.data);
-      expect(openRtbRequest.site.page).to.be.equal('https://testing-url.com');
-      expect(openRtbRequest.test).to.be.equal(1);
-    });
-
     it('should not read pageUrl from config when not testing', function () {
       config.setConfig({
         pageUrl: 'https://testing-url.com'
@@ -439,7 +458,8 @@ describe('KoblerAdapter', function () {
       const bidderRequest = createBidderRequest(
         '9ff580cf-e10e-4b66-add7-40ac0c804e21',
         4500,
-        'bid.kobler.no'
+        'bid.kobler.no',
+        true
       );
 
       const result = spec.buildRequests(validBidRequests, bidderRequest);
@@ -529,7 +549,14 @@ describe('KoblerAdapter', function () {
         site: {
           page: 'bid.kobler.no'
         },
-        test: 0
+        test: 0,
+        ext: {
+          kobler: {
+            tcf_purpose_2_given: true,
+            tcf_purpose_3_given: false,
+            page_view_id: pageViewId
+          }
+        }
       };
 
       expect(openRtbRequest).to.deep.equal(expectedOpenRtbRequest);
@@ -589,7 +616,7 @@ describe('KoblerAdapter', function () {
           cur: 'USD'
         }
       };
-      const bids = spec.interpretResponse(responseWithTwoBids)
+      const bids = spec.interpretResponse(responseWithTwoBids, {})
 
       const expectedBids = [
         {
@@ -656,25 +683,30 @@ describe('KoblerAdapter', function () {
     });
 
     it('Should trigger pixel with replaced nurl if nurl is not empty', function () {
-      config.setConfig({
-        'currency': {
-          'adServerCurrency': 'NOK'
-        }
-      });
-      spec.onBidWon({
-        originalCpm: 1.532,
-        cpm: 8.341,
-        currency: 'NOK',
-        nurl: 'https://atag.essrtb.com/serve/prebid_win_notification?payload=sdhfusdaobfadslf234324&sp=${AUCTION_PRICE}&sp_cur=${AUCTION_PRICE_CURRENCY}&asp=${AD_SERVER_PRICE}&asp_cur=${AD_SERVER_PRICE_CURRENCY}',
-        adserverTargeting: {
+      setCurrencyConfig({ adServerCurrency: 'NOK' });
+      let validBidRequests = [{ params: {} }];
+      let refererInfo = { page: 'page' };
+      const bidderRequest = { refererInfo };
+      return addFPDToBidderRequest(bidderRequest).then(res => {
+        JSON.parse(spec.buildRequests(validBidRequests, res).data);
+        const bids = spec.interpretResponse({ body: { seatbid: [{ bid: [{
+          originalCpm: 1.532,
+          price: 8.341,
+          currency: 'NOK',
+          nurl: 'https://atag.essrtb.com/serve/prebid_win_notification?payload=sdhfusdaobfadslf234324&sp=${AUCTION_PRICE}&sp_cur=${AUCTION_PRICE_CURRENCY}&asp=${AD_SERVER_PRICE}&asp_cur=${AD_SERVER_PRICE_CURRENCY}',
+        }]}]}}, { bidderRequest: res });
+        const bidToWon = bids[0];
+        bidToWon.adserverTargeting = {
           hb_pb: 8
         }
-      });
+        spec.onBidWon(bidToWon);
 
-      expect(utils.triggerPixel.callCount).to.be.equal(1);
-      expect(utils.triggerPixel.firstCall.args[0]).to.be.equal(
-        'https://atag.essrtb.com/serve/prebid_win_notification?payload=sdhfusdaobfadslf234324&sp=8.341&sp_cur=NOK&asp=8&asp_cur=NOK'
-      );
+        expect(utils.triggerPixel.callCount).to.be.equal(1);
+        expect(utils.triggerPixel.firstCall.args[0]).to.be.equal(
+          'https://atag.essrtb.com/serve/prebid_win_notification?payload=sdhfusdaobfadslf234324&sp=8.341&sp_cur=NOK&asp=8&asp_cur=NOK'
+        );
+        setCurrencyConfig({});
+      });
     });
   });
 
@@ -702,14 +734,12 @@ describe('KoblerAdapter', function () {
       spec.onTimeout([
         {
           adUnitCode: 'adunit-code',
-          auctionId: 'a1fba829-dd41-409f-acfb-b7b0ac5f30c6',
           bidId: 'ef236c6c-e934-406b-a877-d7be8e8a839a',
           timeout: 100,
           params: [],
         },
         {
           adUnitCode: 'adunit-code-2',
-          auctionId: 'a1fba829-dd41-409f-acfb-b7b0ac5f30c6',
           bidId: 'ca4121c8-9a4a-46ba-a624-e9b64af206f2',
           timeout: 100,
           params: [],
@@ -719,13 +749,11 @@ describe('KoblerAdapter', function () {
       expect(utils.triggerPixel.callCount).to.be.equal(2);
       expect(utils.triggerPixel.getCall(0).args[0]).to.be.equal(
         'https://bid.essrtb.com/notify/prebid_timeout?ad_unit_code=adunit-code&' +
-        'auction_id=a1fba829-dd41-409f-acfb-b7b0ac5f30c6&bid_id=ef236c6c-e934-406b-a877-d7be8e8a839a&timeout=100&' +
-        'page_url=' + encodeURIComponent(getRefererInfo().page)
+        'bid_id=ef236c6c-e934-406b-a877-d7be8e8a839a&timeout=100&page_url=' + encodeURIComponent(getRefererInfo().page)
       );
       expect(utils.triggerPixel.getCall(1).args[0]).to.be.equal(
         'https://bid.essrtb.com/notify/prebid_timeout?ad_unit_code=adunit-code-2&' +
-        'auction_id=a1fba829-dd41-409f-acfb-b7b0ac5f30c6&bid_id=ca4121c8-9a4a-46ba-a624-e9b64af206f2&timeout=100&' +
-        'page_url=' + encodeURIComponent(getRefererInfo().page)
+        'bid_id=ca4121c8-9a4a-46ba-a624-e9b64af206f2&timeout=100&page_url=' + encodeURIComponent(getRefererInfo().page)
       );
     });
   });
diff --git a/test/spec/modules/konduitAnalyticsAdapter_spec.js b/test/spec/modules/konduitAnalyticsAdapter_spec.js
index e79ae2feeeb..496dd171afa 100644
--- a/test/spec/modules/konduitAnalyticsAdapter_spec.js
+++ b/test/spec/modules/konduitAnalyticsAdapter_spec.js
@@ -2,19 +2,19 @@ import konduitAnalyticsAdapter from 'modules/konduitAnalyticsAdapter';
 import { expect } from 'chai';
 import { config } from '../../../src/config.js';
 import { server } from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
-let CONSTANTS = require('src/constants.json');
 
 const eventsData = {
-  [CONSTANTS.EVENTS.AUCTION_INIT]: {
+  [EVENTS.AUCTION_INIT]: {
     'auctionId': 'test_auction_id',
     'timestamp': Date.now(),
     'auctionStatus': 'inProgress',
     'adUnitCodes': ['video-test'],
     'timeout': 700
   },
-  [CONSTANTS.EVENTS.BID_REQUESTED]: {
+  [EVENTS.BID_REQUESTED]: {
     'bidderCode': 'test_bidder_code',
     'time': Date.now(),
     'bids': [{
@@ -25,13 +25,13 @@ const eventsData = {
       'params': { 'testParam': 'test_param' }
     }]
   },
-  [CONSTANTS.EVENTS.NO_BID]: {
+  [EVENTS.NO_BID]: {
     'bidderCode': 'test_bidder_code2',
     'transactionId': 'test_transaction_id',
     'adUnitCode': 'video-test',
     'bidId': 'test_bid_id'
   },
-  [CONSTANTS.EVENTS.BID_RESPONSE]: {
+  [EVENTS.BID_RESPONSE]: {
     'bidderCode': 'test_bidder_code',
     'adUnitCode': 'video-test',
     'statusMessage': 'Bid available',
@@ -44,7 +44,7 @@ const eventsData = {
     'requestId': 'test_request_id',
     'creativeId': 144876543
   },
-  [CONSTANTS.EVENTS.AUCTION_END]: {
+  [EVENTS.AUCTION_END]: {
     'auctionId': 'test_auction_id',
     'timestamp': Date.now(),
     'auctionEnd': Date.now() + 400,
@@ -52,7 +52,7 @@ const eventsData = {
     'adUnitCodes': ['video-test'],
     'timeout': 700
   },
-  [CONSTANTS.EVENTS.BID_WON]: {
+  [EVENTS.BID_WON]: {
     'bidderCode': 'test_bidder_code',
     'adUnitCode': 'video-test',
     'statusMessage': 'Bid available',
@@ -99,12 +99,12 @@ describe(`Konduit Analytics Adapter`, () => {
     expect(konduitAnalyticsAdapter.context.aggregatedEvents).to.be.an('array');
 
     const eventTypes = [
-      CONSTANTS.EVENTS.AUCTION_INIT,
-      CONSTANTS.EVENTS.BID_REQUESTED,
-      CONSTANTS.EVENTS.NO_BID,
-      CONSTANTS.EVENTS.BID_RESPONSE,
-      CONSTANTS.EVENTS.BID_WON,
-      CONSTANTS.EVENTS.AUCTION_END,
+      EVENTS.AUCTION_INIT,
+      EVENTS.BID_REQUESTED,
+      EVENTS.NO_BID,
+      EVENTS.BID_RESPONSE,
+      EVENTS.BID_WON,
+      EVENTS.AUCTION_END,
     ];
     const args = eventTypes.map(eventType => eventsData[eventType]);
 
diff --git a/test/spec/modules/krushmediaBidAdapter_spec.js b/test/spec/modules/krushmediaBidAdapter_spec.js
index fcdcc942290..516b587edff 100644
--- a/test/spec/modules/krushmediaBidAdapter_spec.js
+++ b/test/spec/modules/krushmediaBidAdapter_spec.js
@@ -1,147 +1,304 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/krushmediaBidAdapter.js';
+import { expect } from 'chai';
+import { spec } from '../../../modules/krushmediaBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'krushmedia';
 
 describe('KrushmediabBidAdapter', function () {
-  const bid = {
-    bidId: '23fhj33i987f',
-    bidder: 'krushmedia',
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        key: 783
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        key: 783
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        key: 783
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
     mediaTypes: {
       [BANNER]: {
         sizes: [[300, 250]]
       }
     },
     params: {
-      key: 783,
-      traffic: BANNER
+
     }
-  };
+  }
 
   const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'test.com'
-    }
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
     it('Should return true if there are bidId, params and key parameters present', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
     });
     it('Should return false if at least one of parameters is not present', function () {
-      delete bid.params.key;
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
     });
   });
 
   describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
       expect(serverRequest.url).to.exist;
       expect(serverRequest.data).to.exist;
     });
+
     it('Returns POST method', function () {
       expect(serverRequest.method).to.equal('POST');
     });
+
     it('Returns valid URL', function () {
       expect(serverRequest.url).to.equal('https://ads4.krushmedia.com/?c=rtb&m=hb');
     });
-    it('Returns valid data if array of bids is valid', function () {
+
+    it('Returns general data valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
       expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
-      expect(data.gdpr).to.not.exist;
-      expect(data.ccpa).to.not.exist;
-      let placement = data['placements'][0];
-      expect(placement).to.have.keys('key', 'bidId', 'traffic', 'sizes', 'schain', 'bidFloor');
-      expect(placement.key).to.equal(783);
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal(BANNER);
-      expect(placement.schain).to.be.an('object');
-      expect(placement.sizes).to.be.an('array');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
     });
 
-    it('Returns valid data for mediatype video', function () {
-      const playerSize = [300, 300];
-      bid.mediaTypes = {};
-      bid.params.traffic = VIDEO;
-      bid.mediaTypes[VIDEO] = {
-        playerSize
-      };
-      serverRequest = spec.buildRequests([bid], bidderRequest);
-      let data = serverRequest.data;
-      expect(data).to.be.an('object');
-      let placement = data['placements'][0];
-      expect(placement).to.be.an('object');
-      expect(placement).to.have.keys('key', 'bidId', 'traffic', 'wPlayer', 'hPlayer', 'schain', 'bidFloor',
-        'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement', 'skip',
-        'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity');
-      expect(placement.traffic).to.equal(VIDEO);
-      expect(placement.wPlayer).to.equal(playerSize[0]);
-      expect(placement.hPlayer).to.equal(playerSize[1]);
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.key).to.be.equal(783);
+        expect(placement.traffic).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.traffic === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.traffic) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.wPlayer).to.be.an('number');
+            expect(placement.hPlayer).to.be.an('number');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
     });
 
-    it('Returns valid data for mediatype native', function () {
-      const native = {
-        title: {
-          required: true
-        },
-        body: {
-          required: true
-        },
-        icon: {
-          required: true,
-          size: [64, 64]
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
         }
-      };
+      ];
 
-      bid.mediaTypes = {};
-      bid.params.traffic = NATIVE;
-      bid.mediaTypes[NATIVE] = native;
-      serverRequest = spec.buildRequests([bid], bidderRequest);
-      let data = serverRequest.data;
-      expect(data).to.be.an('object');
-      let placement = data['placements'][0];
-      expect(placement).to.be.an('object');
-      expect(placement).to.have.keys('key', 'bidId', 'traffic', 'native', 'schain', 'bidFloor');
-      expect(placement.traffic).to.equal(NATIVE);
-      expect(placement.native).to.equal(native);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.traffic).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.traffic === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.traffic) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.wPlayer).to.be.an('number');
+            expect(placement.hPlayer).to.be.an('number');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
     });
 
     it('Returns data with gdprConsent and without uspConsent', function () {
-      bidderRequest.gdprConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
 
     it('Returns data with uspConsent and without gdprConsent', function () {
-      bidderRequest.uspConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.ccpa).to.exist;
       expect(data.ccpa).to.be.a('string');
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
+
   describe('interpretResponse', function () {
     it('Should interpret banner response', function () {
       const banner = {
@@ -156,7 +313,11 @@ describe('KrushmediabBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let bannerResponses = spec.interpretResponse(banner);
@@ -164,15 +325,15 @@ describe('KrushmediabBidAdapter', function () {
       let dataItem = bannerResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
         'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
-      expect(dataItem.requestId).to.equal('23fhj33i987f');
-      expect(dataItem.cpm).to.equal(0.4);
-      expect(dataItem.width).to.equal(300);
-      expect(dataItem.height).to.equal(250);
-      expect(dataItem.ad).to.equal('Test');
-      expect(dataItem.ttl).to.equal(120);
-      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
       expect(dataItem.netRevenue).to.be.true;
-      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
       expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret video response', function () {
@@ -186,7 +347,11 @@ describe('KrushmediabBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let videoResponses = spec.interpretResponse(video);
@@ -220,6 +385,10 @@ describe('KrushmediabBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let nativeResponses = spec.interpretResponse(native);
@@ -306,6 +475,7 @@ describe('KrushmediabBidAdapter', function () {
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
+
   describe('getUserSyncs', function() {
     it('Should return array of objects with proper sync config , include GDPR', function() {
       const syncData = spec.getUserSyncs({}, {}, {
@@ -315,20 +485,32 @@ describe('KrushmediabBidAdapter', function () {
       expect(syncData).to.be.an('array').which.is.not.empty;
       expect(syncData[0]).to.be.an('object')
       expect(syncData[0].type).to.be.a('string')
-      expect(syncData[0].type).to.equal('iframe')
+      expect(syncData[0].type).to.equal('image')
       expect(syncData[0].url).to.be.a('string')
-      expect(syncData[0].url).to.equal('https://cs.krushmedia.com/html?src=pbjs&gdpr=1&gdpr_consent=ALL')
+      expect(syncData[0].url).to.equal('https://cs.krushmedia.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
     });
     it('Should return array of objects with proper sync config , include CCPA', function() {
       const syncData = spec.getUserSyncs({}, {}, {}, {
-        consentString: '1NNN'
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.krushmedia.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
       });
       expect(syncData).to.be.an('array').which.is.not.empty;
       expect(syncData[0]).to.be.an('object')
       expect(syncData[0].type).to.be.a('string')
-      expect(syncData[0].type).to.equal('iframe')
+      expect(syncData[0].type).to.equal('image')
       expect(syncData[0].url).to.be.a('string')
-      expect(syncData[0].url).to.equal('https://cs.krushmedia.com/html?src=pbjs&ccpa_consent=1NNN')
+      expect(syncData[0].url).to.equal('https://cs.krushmedia.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
     });
   });
 });
diff --git a/test/spec/modules/kueezRtbBidAdapter_spec.js b/test/spec/modules/kueezRtbBidAdapter_spec.js
index ebd11885af4..2df5e299aeb 100644
--- a/test/spec/modules/kueezRtbBidAdapter_spec.js
+++ b/test/spec/modules/kueezRtbBidAdapter_spec.js
@@ -2,6 +2,14 @@ import {expect} from 'chai';
 import {
   spec as adapter,
   createDomain,
+  storage
+} from 'modules/kueezRtbBidAdapter.js';
+import * as utils from 'src/utils.js';
+import {version} from 'package.json';
+import {useFakeTimers} from 'sinon';
+import {BANNER, VIDEO} from '../../../src/mediaTypes';
+import {config} from '../../../src/config';
+import {
   hashCode,
   extractPID,
   extractCID,
@@ -10,12 +18,7 @@ import {
   setStorageItem,
   tryParseJSON,
   getUniqueDealId,
-} from 'modules/kueezRtbBidAdapter.js';
-import * as utils from 'src/utils.js';
-import {version} from 'package.json';
-import {useFakeTimers} from 'sinon';
-import {BANNER, VIDEO} from '../../../src/mediaTypes';
-import {config} from '../../../src/config';
+} from '../../../libraries/vidazooUtils/bidderUtils.js';
 
 export const TEST_ID_SYSTEMS = ['britepoolid', 'criteoId', 'id5id', 'idl_env', 'lipb', 'netId', 'parrableId', 'pubcid', 'tdid', 'pubProvidedId'];
 
@@ -101,9 +104,15 @@ const BIDDER_REQUEST = {
     'ref': 'https://www.somereferrer.com'
   },
   'ortb2': {
+    'site': {
+      'content': {
+        'language': 'en'
+      }
+    },
     'regs': {
       'gpp': 'gpp_string',
-      'gpp_sid': [7]
+      'gpp_sid': [7],
+      'coppa': 0
     },
     'device': {
       'sua': {
@@ -322,7 +331,14 @@ describe('KueezRtbBidAdapter', function () {
               startdelay: 0
             }
           },
-          gpid: ''
+          gpid: '',
+          cat: [],
+          contentLang: 'en',
+          contentData: [],
+          isStorageAllowed: true,
+          pagecat: [],
+          userData: [],
+          coppa: 0
         }
       });
     });
@@ -384,6 +400,13 @@ describe('KueezRtbBidAdapter', function () {
           uqs: getTopWindowQueryParams(),
           'ext.param1': 'loremipsum',
           'ext.param2': 'dolorsitamet',
+          cat: [],
+          contentLang: 'en',
+          contentData: [],
+          isStorageAllowed: true,
+          pagecat: [],
+          userData: [],
+          coppa: 0
         }
       });
     });
@@ -526,8 +549,6 @@ describe('KueezRtbBidAdapter', function () {
         switch (idSystemProvider) {
           case 'lipb':
             return {lipbid: id};
-          case 'parrableId':
-            return {eid: id};
           case 'id5id':
             return {uid: id};
           default:
@@ -580,13 +601,13 @@ describe('KueezRtbBidAdapter', function () {
     const key = 'myKey';
     let uniqueDealId;
     beforeEach(() => {
-      uniqueDealId = getUniqueDealId(key, 0);
+      uniqueDealId = getUniqueDealId(storage, key, 0);
     })
 
     it('should get current unique deal id', function (done) {
       // waiting some time so `now` will become past
       setTimeout(() => {
-        const current = getUniqueDealId(key);
+        const current = getUniqueDealId(storage, key);
         expect(current).to.be.equal(uniqueDealId);
         done();
       }, 200);
@@ -594,7 +615,7 @@ describe('KueezRtbBidAdapter', function () {
 
     it('should get new unique deal id on expiration', function (done) {
       setTimeout(() => {
-        const current = getUniqueDealId(key, 100);
+        const current = getUniqueDealId(storage, key, 100);
         expect(current).to.not.be.equal(uniqueDealId);
         done();
       }, 200)
@@ -618,8 +639,8 @@ describe('KueezRtbBidAdapter', function () {
         shouldAdvanceTime: true,
         now
       });
-      setStorageItem('myKey', 2020);
-      const {value, created} = getStorageItem('myKey');
+      setStorageItem(storage, 'myKey', 2020);
+      const {value, created} = getStorageItem(storage, 'myKey');
       expect(created).to.be.equal(now);
       expect(value).to.be.equal(2020);
       expect(typeof value).to.be.equal('number');
@@ -630,7 +651,7 @@ describe('KueezRtbBidAdapter', function () {
     it('should get external stored value', function () {
       const value = 'superman'
       window.localStorage.setItem('myExternalKey', value);
-      const item = getStorageItem('myExternalKey');
+      const item = getStorageItem(storage, 'myExternalKey');
       expect(item).to.be.equal(value);
     });
 
diff --git a/test/spec/modules/lassoBidAdapter_spec.js b/test/spec/modules/lassoBidAdapter_spec.js
index 3695889aca0..f33869e9366 100644
--- a/test/spec/modules/lassoBidAdapter_spec.js
+++ b/test/spec/modules/lassoBidAdapter_spec.js
@@ -3,6 +3,7 @@ import { spec } from 'modules/lassoBidAdapter.js';
 import { server } from '../../mocks/xhr';
 
 const ENDPOINT_URL = 'https://trc.lhmos.com/prebid';
+const GET_IUD_URL = 'https://secure.adnxs.com/getuid?';
 
 const bid = {
   bidder: 'lasso',
@@ -62,14 +63,14 @@ describe('lassoBidAdapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
     it('should return true when there are extra params', function () {
-      const bid = Object.assign({}, bid, {
+      const invalidBid = Object.assign({}, bid, {
         params: {
           adUnitId: 123456,
           zone: 1,
           publisher: 'test'
         }
       })
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(true);
     });
     it('should return false when there are no params', function () {
       const invalidBid = { ...bid };
@@ -78,7 +79,7 @@ describe('lassoBidAdapter', function () {
     });
   });
 
-  describe('buildRequests', function () {
+  describe('buildRequests with standard flow', function () {
     let validBidRequests, bidRequest;
     before(() => {
       validBidRequests = spec.buildRequests([bid], bidderRequest);
@@ -97,6 +98,75 @@ describe('lassoBidAdapter', function () {
       expect(bidRequest.method).to.exist;
       expect(bidRequest.method).to.equal('GET');
     });
+
+    it('should send request to get uid and trc via get request', () => {
+      expect(bidRequest.method).to.equal('GET');
+      expect(bidRequest.url).to.equal(GET_IUD_URL + ENDPOINT_URL + '/request');
+    });
+  });
+
+  describe('buildRequests with npi', function () {
+    let validBidRequests, bidRequest;
+    before(() => {
+      const updateBidParams = Object.assign({}, bid, {
+        params: {
+          adUnitId: 123456,
+          npi: '123'
+        }
+      });
+      validBidRequests = spec.buildRequests([updateBidParams], bidderRequest);
+      expect(validBidRequests).to.be.an('array').that.is.not.empty;
+      bidRequest = validBidRequests[0];
+    })
+
+    it('Returns valid bidRequest', function () {
+      expect(bidRequest).to.exist;
+      expect(bidRequest.method).to.exist;
+      expect(bidRequest.url).to.exist;
+      expect(bidRequest.data).to.exist;
+    });
+
+    it('Returns GET method', function() {
+      expect(bidRequest.method).to.exist;
+      expect(bidRequest.method).to.equal('GET');
+    });
+
+    it('should send request to trc via get request with npi', () => {
+      expect(bidRequest.method).to.equal('GET');
+      expect(bidRequest.url).to.equal(ENDPOINT_URL + '/request');
+    });
+  });
+
+  describe('buildRequests with npi hash', function () {
+    let validBidRequests, bidRequest;
+    before(() => {
+      const updateBidParams = Object.assign({}, bid, {
+        params: {
+          adUnitId: 123456,
+          npiHash: '123'
+        }
+      });
+      validBidRequests = spec.buildRequests([updateBidParams], bidderRequest);
+      expect(validBidRequests).to.be.an('array').that.is.not.empty;
+      bidRequest = validBidRequests[0];
+    })
+
+    it('Returns valid bidRequest', function () {
+      expect(bidRequest).to.exist;
+      expect(bidRequest.method).to.exist;
+      expect(bidRequest.url).to.exist;
+      expect(bidRequest.data).to.exist;
+    });
+
+    it('Returns GET method', function() {
+      expect(bidRequest.method).to.exist;
+      expect(bidRequest.method).to.equal('GET');
+    });
+
+    it('should send request to trc via get request with npi', () => {
+      expect(bidRequest.method).to.equal('GET');
+      expect(bidRequest.url).to.equal(ENDPOINT_URL + '/request');
+    });
   });
 
   describe('interpretResponse', function () {
@@ -126,6 +196,7 @@ describe('lassoBidAdapter', function () {
     it('should get the correct bid response', function () {
       let expectedResponse = {
         requestId: '123456789',
+        bidId: '123456789',
         cpm: 1,
         currency: 'USD',
         width: 728,
diff --git a/test/spec/modules/lemmaDigitalBidAdapter_spec.js b/test/spec/modules/lemmaDigitalBidAdapter_spec.js
index d50728dce3c..ab4c3259671 100644
--- a/test/spec/modules/lemmaDigitalBidAdapter_spec.js
+++ b/test/spec/modules/lemmaDigitalBidAdapter_spec.js
@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import { spec } from 'modules/lemmaDigitalBidAdapter.js';
 import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
-const constants = require('src/constants.json');
+const constants = require('src/constants.js');
 
 describe('lemmaDigitalBidAdapter', function () {
   let bidRequests;
diff --git a/test/spec/modules/limelightDigitalBidAdapter_spec.js b/test/spec/modules/limelightDigitalBidAdapter_spec.js
index 0e6f4817e5e..b13beb26d28 100644
--- a/test/spec/modules/limelightDigitalBidAdapter_spec.js
+++ b/test/spec/modules/limelightDigitalBidAdapter_spec.js
@@ -26,7 +26,11 @@ describe('limelightDigitalAdapter', function () {
     },
     ortb2Imp: {
       ext: {
-        tid: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+        gpid: '/1111/homepage#300x250',
+        tid: '738d5915-6651-43b9-9b6b-d50517350917',
+        data: {
+          'pbadslot': '/1111/homepage#300x250'
+        }
       }
     },
     userIdAsEids: [
@@ -70,7 +74,11 @@ describe('limelightDigitalAdapter', function () {
     sizes: [[350, 200]],
     ortb2Imp: {
       ext: {
-        tid: '068867d1-46ec-40bb-9fa0-e24611786fb4',
+        gpid: '/1111/homepage#300x250',
+        tid: '738d5915-6651-43b9-9b6b-d50517350917',
+        data: {
+          'pbadslot': '/1111/homepage#300x250'
+        }
       }
     },
     userIdAsEids: [
@@ -120,7 +128,11 @@ describe('limelightDigitalAdapter', function () {
     sizes: [[800, 600]],
     ortb2Imp: {
       ext: {
+        gpid: '/1111/homepage#300x250',
         tid: '738d5915-6651-43b9-9b6b-d50517350917',
+        data: {
+          'pbadslot': '/1111/homepage#300x250'
+        }
       }
     },
     userIdAsEids: [
@@ -169,7 +181,11 @@ describe('limelightDigitalAdapter', function () {
     },
     ortb2Imp: {
       ext: {
+        gpid: '/1111/homepage#300x250',
         tid: '738d5915-6651-43b9-9b6b-d50517350917',
+        data: {
+          'pbadslot': '/1111/homepage#300x250'
+        }
       }
     },
     userIdAsEids: [
@@ -196,7 +212,22 @@ describe('limelightDigitalAdapter', function () {
   }
 
   describe('buildRequests', function () {
-    const serverRequests = spec.buildRequests([bid1, bid2, bid3, bid4])
+    const bidderRequest = {
+      ortb2: {
+        device: {
+          sua: {
+            browsers: [],
+            platform: [],
+            mobile: 1,
+            architecture: 'arm'
+          }
+        }
+      },
+      refererInfo: {
+        page: 'testPage'
+      }
+    }
+    const serverRequests = spec.buildRequests([bid1, bid2, bid3, bid4], bidderRequest)
     it('Creates two ServerRequests', function() {
       expect(serverRequests).to.exist
       expect(serverRequests).to.have.lengthOf(2)
@@ -218,7 +249,11 @@ describe('limelightDigitalAdapter', function () {
           'deviceWidth',
           'deviceHeight',
           'secure',
-          'adUnits'
+          'adUnits',
+          'sua',
+          'page',
+          'ortb2',
+          'refererInfo'
         );
         expect(data.deviceWidth).to.be.a('number');
         expect(data.deviceHeight).to.be.a('number');
@@ -237,7 +272,8 @@ describe('limelightDigitalAdapter', function () {
             'custom2',
             'custom3',
             'custom4',
-            'custom5'
+            'custom5',
+            'ortb2Imp'
           );
           expect(adUnit.id).to.be.a('number');
           expect(adUnit.bidId).to.be.a('string');
@@ -251,7 +287,15 @@ describe('limelightDigitalAdapter', function () {
           expect(adUnit.custom3).to.be.a('string');
           expect(adUnit.custom4).to.be.a('string');
           expect(adUnit.custom5).to.be.a('string');
+          expect(adUnit.ortb2Imp).to.be.an('object');
         })
+        expect(data.sua.browsers).to.be.a('array');
+        expect(data.sua.platform).to.be.a('array');
+        expect(data.sua.mobile).to.be.a('number');
+        expect(data.sua.architecture).to.be.a('string');
+        expect(data.page).to.be.a('string');
+        expect(data.page).to.be.equal('testPage');
+        expect(data.ortb2).to.be.an('object');
       })
     })
     it('Returns valid URL', function () {
@@ -267,6 +311,17 @@ describe('limelightDigitalAdapter', function () {
       const serverRequests = spec.buildRequests([])
       expect(serverRequests).to.be.an('array').that.is.empty
     })
+    it('Returns request with page field value from ortb2 object if ortb2 has page field', function () {
+      bidderRequest.ortb2.site = {
+        page: 'testSitePage'
+      }
+      const serverRequests = spec.buildRequests([bid1], bidderRequest)
+      expect(serverRequests).to.have.lengthOf(1)
+      serverRequests.forEach(serverRequest => {
+        expect(serverRequest.data.page).to.be.a('string');
+        expect(serverRequest.data.page).to.be.equal('testSitePage');
+      })
+    })
   })
   describe('interpretBannerResponse', function () {
     let resObject = {
@@ -685,4 +740,5 @@ function validateAdUnit(adUnit, bid) {
   expect(adUnit.publisherId).to.equal(bid.params.publisherId);
   expect(adUnit.userIdAsEids).to.deep.equal(bid.userIdAsEids);
   expect(adUnit.supplyChain).to.deep.equal(bid.schain);
+  expect(adUnit.ortb2Imp).to.deep.equal(bid.ortb2Imp);
 }
diff --git a/test/spec/modules/liveIntentAnalyticsAdapter_spec.js b/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
index fa4c5cd8cad..e833440bf03 100644
--- a/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
+++ b/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
@@ -3,6 +3,7 @@ import { expect } from 'chai';
 import { server } from 'test/mocks/xhr.js';
 import { auctionManager } from 'src/auctionManager.js';
 import {expectEvents} from '../../helpers/analytics.js';
+import { EVENTS } from 'src/constants.js';
 
 let utils = require('src/utils');
 let refererDetection = require('src/refererDetection');
@@ -13,10 +14,9 @@ let clock;
 let now = new Date();
 
 let events = require('src/events');
-let constants = require('src/constants.json');
 let auctionId = '99abbc81-c1f1-41cd-8f25-f7149244c897'
 
-const config = {
+const configWithSamplingAll = {
   provider: 'liveintent',
   options: {
     bidWonTimeout: 2000,
@@ -24,6 +24,14 @@ const config = {
   }
 }
 
+const configWithSamplingNone = {
+  provider: 'liveintent',
+  options: {
+    bidWonTimeout: 2000,
+    sampling: 0
+  }
+}
+
 let args = {
   auctionId: auctionId,
   timestamp: 1660915379703,
@@ -273,12 +281,12 @@ describe('LiveIntent Analytics Adapter ', () => {
     clock.restore();
   });
 
-  it('request is computed and sent correctly', () => {
-    liAnalytics.enableAnalytics(config);
+  it('request is computed and sent correctly when sampling is 1', () => {
+    liAnalytics.enableAnalytics(configWithSamplingAll);
     sandbox.stub(utils, 'generateUUID').returns(instanceId);
     sandbox.stub(refererDetection, 'getRefererInfo').returns({page: url});
     sandbox.stub(auctionManager.index, 'getAuction').withArgs(auctionId).returns({ getWinningBids: () => winningBids });
-    events.emit(constants.EVENTS.AUCTION_END, args);
+    events.emit(EVENTS.AUCTION_END, args);
     clock.tick(2000);
     expect(server.requests.length).to.equal(1);
 
@@ -288,7 +296,23 @@ describe('LiveIntent Analytics Adapter ', () => {
 
   it('track is called', () => {
     sandbox.stub(liAnalytics, 'track');
-    liAnalytics.enableAnalytics(config);
+    liAnalytics.enableAnalytics(configWithSamplingAll);
     expectEvents().to.beTrackedBy(liAnalytics.track);
   })
+
+  it('no request is computed when sampling is 0', () => {
+    liAnalytics.enableAnalytics(configWithSamplingNone);
+    sandbox.stub(utils, 'generateUUID').returns(instanceId);
+    sandbox.stub(refererDetection, 'getRefererInfo').returns({page: url});
+    sandbox.stub(auctionManager.index, 'getAuction').withArgs(auctionId).returns({ getWinningBids: () => winningBids });
+    events.emit(EVENTS.AUCTION_END, args);
+    clock.tick(2000);
+    expect(server.requests.length).to.equal(0);
+  });
+
+  it('track is not called', () => {
+    sandbox.stub(liAnalytics, 'track');
+    liAnalytics.enableAnalytics(configWithSamplingNone);
+    sinon.assert.callCount(liAnalytics.track, 0);
+  })
 });
diff --git a/test/spec/modules/liveIntentExternalIdSystem_spec.js b/test/spec/modules/liveIntentExternalIdSystem_spec.js
new file mode 100644
index 00000000000..3e49eb5fc4b
--- /dev/null
+++ b/test/spec/modules/liveIntentExternalIdSystem_spec.js
@@ -0,0 +1,463 @@
+import { liveIntentExternalIdSubmodule, resetSubmodule } from 'libraries/liveIntentId/externalIdSystem.js';
+import { gdprDataHandler, uspDataHandler, gppDataHandler, coppaDataHandler } from '../../../src/adapterManager.js';
+import * as refererDetection from '../../../src/refererDetection.js';
+const DEFAULT_AJAX_TIMEOUT = 5000
+const PUBLISHER_ID = '89899';
+const defaultConfigParams = { params: {publisherId: PUBLISHER_ID, fireEventDelay: 1} };
+
+describe('LiveIntentExternalId', function() {
+  let uspConsentDataStub;
+  let gdprConsentDataStub;
+  let gppConsentDataStub;
+  let coppaConsentDataStub;
+  let refererInfoStub;
+
+  beforeEach(function() {
+    uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
+    gdprConsentDataStub = sinon.stub(gdprDataHandler, 'getConsentData');
+    gppConsentDataStub = sinon.stub(gppDataHandler, 'getConsentData');
+    coppaConsentDataStub = sinon.stub(coppaDataHandler, 'getCoppa');
+    refererInfoStub = sinon.stub(refererDetection, 'getRefererInfo');
+  });
+
+  afterEach(function() {
+    uspConsentDataStub.restore();
+    gdprConsentDataStub.restore();
+    gppConsentDataStub.restore();
+    coppaConsentDataStub.restore();
+    refererInfoStub.restore();
+    window.liQHub = []; // reset
+    resetSubmodule();
+  });
+
+  it('should use appId in integration when both appId and distributorId are provided', function() {
+    const configParams = {
+      params: {
+        ...defaultConfigParams.params,
+        distributorId: 'did-1111',
+        liCollectConfig: {
+          appId: 'a-0001'
+        },
+        emailHash: '123'
+      }
+    }
+    liveIntentExternalIdSubmodule.decode({}, configParams);
+    expect(window.liQHub).to.eql([{
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: {},
+      integration: { appId: 'a-0001', publisherId: '89899', type: 'application' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'prebid', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    },
+    {
+      clientRef: {},
+      sourceEvent: { emailHash: '123' },
+      type: 'collect'
+    }])
+  });
+
+  it('should fire an event and resolve when getId and include the privacy settings into the resolution request', function () {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: true,
+      consentString: 'consentDataString'
+    })
+    gppConsentDataStub.returns({
+      gppString: 'gppConsentDataString',
+      applicableSections: [1, 2]
+    })
+    liveIntentExternalIdSubmodule.getId(defaultConfigParams).callback(() => {});
+
+    const expectedConsent = { gdpr: { consentString: 'consentDataString', gdprApplies: true }, gpp: { applicableSections: [1, 2], consentString: 'gppConsentDataString' }, usPrivacy: { consentString: '1YNY' } }
+
+    expect(window.liQHub).to.have.length(2)
+
+    expect(window.liQHub[0]).to.eql({
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: expectedConsent,
+      integration: { distributorId: defaultConfigParams.distributorId, publisherId: '89899', type: 'custom' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'prebid', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    })
+
+    const resolveCommand = window.liQHub[1]
+    // functions cannot be reasonably compared, remove them
+    delete resolveCommand.onSuccess[0].callback
+    delete resolveCommand.onFailure
+
+    expect(resolveCommand).to.eql({
+      clientRef: {},
+      onSuccess: [{ type: 'callback' }],
+      requestedAttributes: [ 'nonId' ],
+      type: 'resolve'
+    })
+  });
+
+  it('should fire an event when getId and a hash is provided', function() {
+    liveIntentExternalIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      emailHash: '58131bc547fb87af94cebdaf3102321f'
+    }}).callback(() => {});
+
+    expect(window.liQHub).to.have.length(3)
+
+    expect(window.liQHub[0]).to.eql({
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: {},
+      integration: { distributorId: defaultConfigParams.distributorId, publisherId: '89899', type: 'custom' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'prebid', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    })
+
+    expect(window.liQHub[1]).to.eql({
+      clientRef: {},
+      sourceEvent: { emailHash: '58131bc547fb87af94cebdaf3102321f' },
+      type: 'collect'
+    })
+
+    const resolveCommand = window.liQHub[2]
+    // functions cannot be reasonably compared, remove them
+    delete resolveCommand.onSuccess[0].callback
+    delete resolveCommand.onFailure
+
+    expect(resolveCommand).to.eql({
+      clientRef: {},
+      onSuccess: [{ type: 'callback' }],
+      requestedAttributes: [ 'nonId' ],
+      type: 'resolve'
+    })
+  });
+
+  it('should have the same data after call decode when appId, disrtributorId and sourceEvent is absent', function() {
+    liveIntentExternalIdSubmodule.decode({}, {
+      params: {
+        ...defaultConfigParams.params,
+        distributorId: undefined
+      }
+    });
+    expect(window.liQHub).to.eql([{
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: {},
+      integration: { distributorId: undefined, publisherId: '89899', type: 'custom' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'prebid', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    }])
+  });
+
+  it('should have the same data after call decode when appId and sourceEvent is present', function() {
+    const configParams = {
+      params: {
+        ...defaultConfigParams.params,
+        liCollectConfig: {
+          appId: 'a-0001'
+        },
+        emailHash: '123'
+      }
+    }
+    liveIntentExternalIdSubmodule.decode({}, configParams);
+    expect(window.liQHub).to.eql([{
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: {},
+      integration: { appId: 'a-0001', publisherId: '89899', type: 'application' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'prebid', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    },
+    {
+      clientRef: {},
+      sourceEvent: { emailHash: '123' },
+      type: 'collect'
+    }])
+  });
+
+  it('should have the same data after call decode when distributorId and sourceEvent is present', function() {
+    const configParams = {
+      params: {
+        ...defaultConfigParams.params,
+        distributorId: 'did-1111',
+        emailHash: '123'
+      }
+    }
+    liveIntentExternalIdSubmodule.decode({}, configParams);
+    expect(window.liQHub).to.eql([{
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: {},
+      integration: { distributorId: 'did-1111', publisherId: defaultConfigParams.params.publisherId, type: 'custom' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'did-1111', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    },
+    {
+      clientRef: {},
+      sourceEvent: { emailHash: '123' },
+      type: 'collect'
+    }])
+  });
+
+  it('should include the identifier data if it is present in config', function() {
+    const configParams = {
+      params: {
+        ...defaultConfigParams.params,
+        distributorId: 'did-1111',
+        emailHash: '123',
+        ipv4: 'foov4',
+        ipv6: 'foov6',
+        userAgent: 'bar'
+      }
+    }
+    liveIntentExternalIdSubmodule.decode({}, configParams);
+    expect(window.liQHub).to.eql([{
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: {},
+      integration: { distributorId: 'did-1111', publisherId: defaultConfigParams.params.publisherId, type: 'custom' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'did-1111', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    },
+    {
+      clientRef: {},
+      sourceEvent: { emailHash: '123', ipv4: 'foov4', ipv6: 'foov6', userAgent: 'bar' },
+      type: 'collect'
+    }])
+  });
+
+  it('should have the same data when decode with privacy settings', function() {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: false,
+      consentString: 'consentDataString'
+    })
+    gppConsentDataStub.returns({
+      gppString: 'gppConsentDataString',
+      applicableSections: [1]
+    })
+    liveIntentExternalIdSubmodule.decode({}, defaultConfigParams);
+    expect(window.liQHub).to.eql([{
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: { gdpr: { consentString: 'consentDataString', gdprApplies: false }, gpp: { applicableSections: [1], consentString: 'gppConsentDataString' }, usPrivacy: { consentString: '1YNY' } },
+      integration: { distributorId: defaultConfigParams.params.distributorId, publisherId: defaultConfigParams.params.publisherId, type: 'custom' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'prebid', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    }])
+  });
+
+  it('should not fire event again when it is already fired', function() {
+    liveIntentExternalIdSubmodule.decode({}, defaultConfigParams);
+    liveIntentExternalIdSubmodule.decode({}, defaultConfigParams);
+
+    expect(window.liQHub).to.have.length(1) // instead of 2
+  });
+
+  it('should not return a decoded identifier when the unifiedId is not present in the value', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ fireEventDelay: 1, additionalData: 'data' });
+    expect(result).to.be.eql({});
+  });
+
+  it('should decode a unifiedId to lipbId and remove it', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ unifiedId: 'data' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'data'}});
+  });
+
+  it('should decode a nonId to lipbId', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'data' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'data', 'nonId': 'data'}});
+  });
+
+  it('should resolve extra attributes', function() {
+    liveIntentExternalIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'foo': true, 'bar': false } }
+    } }).callback(() => {});
+
+    expect(window.liQHub).to.have.length(2)
+    expect(window.liQHub[0]).to.eql({
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: {},
+      integration: { distributorId: defaultConfigParams.distributorId, publisherId: '89899', type: 'custom' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'prebid', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    })
+
+    const resolveCommand = window.liQHub[1]
+
+    // functions cannot be reasonably compared, remove them
+    delete resolveCommand.onSuccess[0].callback
+    delete resolveCommand.onFailure
+
+    expect(resolveCommand).to.eql({
+      clientRef: {},
+      onSuccess: [{ type: 'callback' }],
+      requestedAttributes: [ 'nonId', 'foo' ],
+      type: 'resolve'
+    })
+  });
+
+  it('should decode a uid2 to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', uid2: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'uid2': 'bar'}, 'uid2': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode values with uid2 but no nonId', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ uid2: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'uid2': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a bidswitch id to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', bidswitch: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'bidswitch': 'bar'}, 'bidswitch': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a medianet id to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', medianet: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'medianet': 'bar'}, 'medianet': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a sovrn id to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', sovrn: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'sovrn': 'bar'}, 'sovrn': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a magnite id to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', magnite: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'magnite': 'bar'}, 'magnite': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode an index id to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', index: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'index': 'bar'}, 'index': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode an openx id to a separate object when present', function () {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', openx: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'openx': 'bar'}, 'openx': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode an pubmatic id to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', pubmatic: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'pubmatic': 'bar'}, 'pubmatic': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a thetradedesk id to a separate object when present', function() {
+    const provider = 'liveintent.com'
+    refererInfoStub.returns({domain: provider})
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', thetradedesk: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'tdid': 'bar'}, 'tdid': {'id': 'bar', 'ext': {'rtiPartner': 'TDID', 'provider': provider}}});
+  });
+
+  it('should allow disabling nonId resolution', function() {
+    liveIntentExternalIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'nonId': false, 'uid2': true } }
+    } }).callback(() => {});
+
+    expect(window.liQHub).to.have.length(2)
+    expect(window.liQHub[0]).to.eql({
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: {},
+      integration: { distributorId: defaultConfigParams.distributorId, publisherId: '89899', type: 'custom' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'prebid', timeout: DEFAULT_AJAX_TIMEOUT },
+      type: 'register_client'
+    })
+
+    const resolveCommand = window.liQHub[1]
+    // functions cannot be reasonably compared, remove them
+    delete resolveCommand.onSuccess[0].callback
+    delete resolveCommand.onFailure
+
+    expect(resolveCommand).to.eql({
+      clientRef: {},
+      onSuccess: [{ type: 'callback' }],
+      requestedAttributes: [ 'uid2' ],
+      type: 'resolve'
+    })
+  });
+
+  it('should decode a idCookie as fpid if it exists and coppa is false', function() {
+    coppaConsentDataStub.returns(false)
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', idCookie: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'fpid': 'bar'}, 'fpid': {'id': 'bar'}});
+  });
+
+  it('should not decode a idCookie as fpid if it exists and coppa is true', function() {
+    coppaConsentDataStub.returns(true)
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', idCookie: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo'}})
+  });
+
+  it('should resolve fpid from cookie', function() {
+    const cookieName = 'testcookie'
+    liveIntentExternalIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      fpid: { 'strategy': 'cookie', 'name': cookieName },
+      requestedAttributesOverrides: { 'fpid': true } }
+    }).callback(() => {});
+
+    expect(window.liQHub).to.have.length(2)
+    expect(window.liQHub[0]).to.eql({
+      clientDetails: { name: 'prebid', version: '$prebid.version$' },
+      clientRef: {},
+      collectSettings: { timeout: DEFAULT_AJAX_TIMEOUT },
+      consent: {},
+      integration: { distributorId: defaultConfigParams.distributorId, publisherId: PUBLISHER_ID, type: 'custom' },
+      partnerCookies: new Set(),
+      resolveSettings: { identityPartner: 'prebid', timeout: DEFAULT_AJAX_TIMEOUT },
+      idCookieSettings: { type: 'provided', key: 'testcookie', source: 'cookie' },
+      type: 'register_client'
+    })
+
+    const resolveCommand = window.liQHub[1]
+
+    // functions cannot be reasonably compared, remove them
+    delete resolveCommand.onSuccess[0].callback
+    delete resolveCommand.onFailure
+
+    expect(resolveCommand).to.eql({
+      clientRef: {},
+      onSuccess: [{ type: 'callback' }],
+      requestedAttributes: [ 'nonId', 'idCookie' ],
+      type: 'resolve'
+    })
+  });
+
+  it('should decode a sharethrough id to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', sharethrough: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'sharethrough': 'bar'}, 'sharethrough': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a sonobi id to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', sonobi: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'sonobi': 'bar'}, 'sonobi': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a vidazoo id to a separate object when present', function() {
+    const result = liveIntentExternalIdSubmodule.decode({ nonId: 'foo', vidazoo: 'bar' }, defaultConfigParams);
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'vidazoo': 'bar'}, 'vidazoo': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+});
diff --git a/test/spec/modules/liveIntentIdMinimalSystem_spec.js b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
index 0929a022937..a859b3e7995 100644
--- a/test/spec/modules/liveIntentIdMinimalSystem_spec.js
+++ b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
@@ -1,7 +1,8 @@
 import * as utils from 'src/utils.js';
 import { gdprDataHandler, uspDataHandler } from '../../../src/adapterManager.js';
 import { server } from 'test/mocks/xhr.js';
-import { liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage } from 'modules/liveIntentIdSystem.js';
+import { liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage } from '../../../libraries/liveIntentId/idSystem.js';
+import * as refererDetection from '../../../src/refererDetection.js';
 
 const PUBLISHER_ID = '89899';
 const defaultConfigParams = { params: {publisherId: PUBLISHER_ID} };
@@ -14,6 +15,7 @@ describe('LiveIntentMinimalId', function() {
   let getCookieStub;
   let getDataFromLocalStorageStub;
   let imgStub;
+  let refererInfoStub;
 
   beforeEach(function() {
     liveIntentIdSubmodule.setModuleMode('minimal');
@@ -23,6 +25,7 @@ describe('LiveIntentMinimalId', function() {
     logErrorStub = sinon.stub(utils, 'logError');
     uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
     gdprConsentDataStub = sinon.stub(gdprDataHandler, 'getConsentData');
+    refererInfoStub = sinon.stub(refererDetection, 'getRefererInfo');
   });
 
   afterEach(function() {
@@ -32,6 +35,7 @@ describe('LiveIntentMinimalId', function() {
     logErrorStub.restore();
     uspConsentDataStub.restore();
     gdprConsentDataStub.restore();
+    refererInfoStub.restore();
     liveIntentIdSubmodule.setModuleMode('minimal');
     resetLiveIntentIdSubmodule();
   });
@@ -73,7 +77,7 @@ describe('LiveIntentMinimalId', function() {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should call the Identity Exchange endpoint with the privided distributorId', function() {
+  it('should call the Identity Exchange endpoint with the provided distributorId', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: { fireEventDelay: 1, distributorId: 'did-1111' } }).callback;
@@ -87,7 +91,7 @@ describe('LiveIntentMinimalId', function() {
     expect(callBackSpy.calledOnceWith({})).to.be.true;
   });
 
-  it('should call the Identity Exchange endpoint without the privided distributorId when appId is provided', function() {
+  it('should call the Identity Exchange endpoint without the provided distributorId when appId is provided', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: { fireEventDelay: 1, distributorId: 'did-1111', liCollectConfig: { appId: 'a-0001' } } }).callback;
@@ -241,7 +245,7 @@ describe('LiveIntentMinimalId', function() {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should decode a uid2 to a seperate object when present', function() {
+  it('should decode a uid2 to a separate object when present', function() {
     const result = liveIntentIdSubmodule.decode({ nonId: 'foo', uid2: 'bar' });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'uid2': 'bar'}, 'uid2': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
@@ -251,26 +255,48 @@ describe('LiveIntentMinimalId', function() {
     expect(result).to.eql({'uid2': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
-  it('should decode a bidswitch id to a seperate object when present', function() {
+  it('should decode a bidswitch id to a separate object when present', function() {
     const result = liveIntentIdSubmodule.decode({ nonId: 'foo', bidswitch: 'bar' });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'bidswitch': 'bar'}, 'bidswitch': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
-  it('should decode a medianet id to a seperate object when present', function() {
+  it('should decode a medianet id to a separate object when present', function() {
     const result = liveIntentIdSubmodule.decode({ nonId: 'foo', medianet: 'bar' });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'medianet': 'bar'}, 'medianet': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
-  it('should decode a magnite id to a seperate object when present', function() {
+  it('should decode a sovrn id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', sovrn: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'sovrn': 'bar'}, 'sovrn': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a magnite id to a separate object when present', function() {
     const result = liveIntentIdSubmodule.decode({ nonId: 'foo', magnite: 'bar' });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'magnite': 'bar'}, 'magnite': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
-  it('should decode an index id to a seperate object when present', function() {
+  it('should decode an index id to a separate object when present', function() {
     const result = liveIntentIdSubmodule.decode({ nonId: 'foo', index: 'bar' });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'index': 'bar'}, 'index': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
+  it('should decode an openx id to a separate object when present', function () {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', openx: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'openx': 'bar'}, 'openx': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode an pubmatic id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', pubmatic: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'pubmatic': 'bar'}, 'pubmatic': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a thetradedesk id to a separate object when present', function() {
+    const provider = 'liveintent.com'
+    refererInfoStub.returns({domain: provider})
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', thetradedesk: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'tdid': 'bar'}, 'tdid': {'id': 'bar', 'ext': {'rtiPartner': 'TDID', 'provider': provider}}});
+  });
+
   it('should allow disabling nonId resolution', function() {
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
@@ -287,4 +313,19 @@ describe('LiveIntentMinimalId', function() {
     );
     expect(callBackSpy.calledOnce).to.be.true;
   });
+
+  it('should decode a sharethrough id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', sharethrough: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'sharethrough': 'bar'}, 'sharethrough': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a sonobi id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', sonobi: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'sonobi': 'bar'}, 'sonobi': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a vidazoo id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', vidazoo: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'vidazoo': 'bar'}, 'vidazoo': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
 });
diff --git a/test/spec/modules/liveIntentIdSystem_spec.js b/test/spec/modules/liveIntentIdSystem_spec.js
index 4f11af57711..50f51bd3dc8 100644
--- a/test/spec/modules/liveIntentIdSystem_spec.js
+++ b/test/spec/modules/liveIntentIdSystem_spec.js
@@ -1,20 +1,39 @@
-import { liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage } from 'modules/liveIntentIdSystem.js';
+import { liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage } from 'libraries/liveIntentId/idSystem.js';
 import * as utils from 'src/utils.js';
-import { gdprDataHandler, uspDataHandler } from '../../../src/adapterManager.js';
+import { gdprDataHandler, uspDataHandler, gppDataHandler, coppaDataHandler } from '../../../src/adapterManager.js';
 import { server } from 'test/mocks/xhr.js';
+import * as refererDetection from '../../../src/refererDetection.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+
 resetLiveIntentIdSubmodule();
 liveIntentIdSubmodule.setModuleMode('standard')
 const PUBLISHER_ID = '89899';
-const defaultConfigParams = { params: {publisherId: PUBLISHER_ID, fireEventDelay: 1} };
+const defaultConfigParams = {publisherId: PUBLISHER_ID, fireEventDelay: 1};
 const responseHeader = {'Content-Type': 'application/json'}
 
+function requests(...urlRegExps) {
+  return server.requests.filter((request) => urlRegExps.some((regExp) => request.url.match(regExp)))
+}
+
+function rpRequests() {
+  return requests(/https:\/\/rp.liadm.com.*/)
+}
+
+function idxRequests() {
+  return requests(/https:\/\/idx.liadm.com.*/)
+}
+
 describe('LiveIntentId', function() {
   let logErrorStub;
   let uspConsentDataStub;
   let gdprConsentDataStub;
+  let gppConsentDataStub;
   let getCookieStub;
   let getDataFromLocalStorageStub;
   let imgStub;
+  let coppaConsentDataStub;
+  let refererInfoStub;
 
   beforeEach(function() {
     liveIntentIdSubmodule.setModuleMode('standard');
@@ -24,6 +43,9 @@ describe('LiveIntentId', function() {
     logErrorStub = sinon.stub(utils, 'logError');
     uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
     gdprConsentDataStub = sinon.stub(gdprDataHandler, 'getConsentData');
+    gppConsentDataStub = sinon.stub(gppDataHandler, 'getConsentData');
+    coppaConsentDataStub = sinon.stub(coppaDataHandler, 'getCoppa');
+    refererInfoStub = sinon.stub(refererDetection, 'getRefererInfo');
   });
 
   afterEach(function() {
@@ -33,43 +55,49 @@ describe('LiveIntentId', function() {
     logErrorStub.restore();
     uspConsentDataStub.restore();
     gdprConsentDataStub.restore();
+    gppConsentDataStub.restore();
+    coppaConsentDataStub.restore();
+    refererInfoStub.restore();
     resetLiveIntentIdSubmodule();
   });
 
-  it('should initialize LiveConnect with a privacy string when getId, and include it in the resolution request', function () {
+  it('should initialize LiveConnect with a privacy string when getId but not send request', function (done) {
     uspConsentDataStub.returns('1YNY');
     gdprConsentDataStub.returns({
       gdprApplies: true,
       consentString: 'consentDataString'
     })
+    gppConsentDataStub.returns({
+      gppString: 'gppConsentDataString',
+      applicableSections: [1, 2]
+    })
     let callBackSpy = sinon.spy();
-    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: defaultConfigParams }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.match(/.*us_privacy=1YNY.*&gdpr=1&n3pc=1&gdpr_consent=consentDataString.*/);
-    const response = {
-      unifiedId: 'a_unified_id',
-      segments: [123, 234]
-    }
-    request.respond(
-      200,
-      responseHeader,
-      JSON.stringify(response)
-    );
-    expect(callBackSpy.calledOnceWith(response)).to.be.true;
+    setTimeout(() => {
+      let requests = idxRequests().concat(rpRequests());
+      expect(requests).to.be.empty;
+      expect(callBackSpy.notCalled).to.be.true;
+      done();
+    }, 300)
   });
 
-  it('should fire an event when getId', function(done) {
+  it('should fire an event without privacy setting when getId', function(done) {
     uspConsentDataStub.returns('1YNY');
     gdprConsentDataStub.returns({
-      gdprApplies: true,
+      gdprApplies: false,
       consentString: 'consentDataString'
     })
-    liveIntentIdSubmodule.getId(defaultConfigParams);
+    gppConsentDataStub.returns({
+      gppString: 'gppConsentDataString',
+      applicableSections: [1]
+    })
+    liveIntentIdSubmodule.getId({ params: defaultConfigParams });
     setTimeout(() => {
-      expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*&us_privacy=1YNY.*&wpn=prebid.*&gdpr=1&n3pc=1&n3pct=1&nb=1&gdpr_consent=consentDataString.*/);
+      let request = rpRequests()[0];
+      expect(request.url).to.match(/https:\/\/rp.liadm.com\/j\?.*&us_privacy=1YNY.*&wpn=prebid.*&gdpr=0.*&gdpr_consent=consentDataString.*&gpp_s=gppConsentDataString.*&gpp_as=1.*/);
       done();
-    }, 200);
+    }, 300);
   });
 
   it('should fire an event when getId and a hash is provided', function(done) {
@@ -78,14 +106,24 @@ describe('LiveIntentId', function() {
       emailHash: '58131bc547fb87af94cebdaf3102321f'
     }});
     setTimeout(() => {
-      expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*e=58131bc547fb87af94cebdaf3102321f.+/)
+      let request = rpRequests()[0];
+      expect(request.url).to.match(/https:\/\/rp.liadm.com\/j\?.*e=58131bc547fb87af94cebdaf3102321f.+/)
       done();
-    }, 200);
+    }, 300);
+  });
+
+  it('should initialize LiveConnect and forward the prebid version when decode and emit an event', function(done) {
+    liveIntentIdSubmodule.decode({}, { params: defaultConfigParams });
+    setTimeout(() => {
+      let request = rpRequests()[0];
+      expect(request.url).to.contain('tv=$prebid.version$')
+      done();
+    }, 300);
   });
 
   it('should initialize LiveConnect with the config params when decode and emit an event', function (done) {
     liveIntentIdSubmodule.decode({}, { params: {
-      ...defaultConfigParams.params,
+      ...defaultConfigParams,
       ...{
         url: 'https://dummy.liveintent.com',
         liCollectConfig: {
@@ -95,26 +133,29 @@ describe('LiveIntentId', function() {
       }
     }});
     setTimeout(() => {
-      expect(server.requests[0].url).to.match(/https:\/\/collector.liveintent.com\/j\?.*aid=a-0001.*&wpn=prebid.*/);
+      let request = requests(/https:\/\/collector.liveintent.com\/j\?.*aid=a-0001.*&wpn=prebid.*/);
+      expect(request.length).to.be.greaterThan(0);
       done();
-    }, 200);
+    }, 300);
   });
 
   it('should fire an event with the provided distributorId', function (done) {
     liveIntentIdSubmodule.decode({}, { params: { fireEventDelay: 1, distributorId: 'did-1111' } });
     setTimeout(() => {
-      expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*did=did-1111.*&wpn=prebid.*/);
+      let request = rpRequests()[0];
+      expect(request.url).to.match(/https:\/\/rp.liadm.com\/j\?.*did=did-1111.*&wpn=prebid.*/);
       done();
-    }, 200);
+    }, 300);
   });
 
   it('should fire an event without the provided distributorId when appId is provided', function (done) {
     liveIntentIdSubmodule.decode({}, { params: { fireEventDelay: 1, distributorId: 'did-1111', liCollectConfig: { appId: 'a-0001' } } });
     setTimeout(() => {
-      expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*aid=a-0001.*&wpn=prebid.*/);
-      expect(server.requests[0].url).to.not.match(/.*did=*/);
+      let request = rpRequests()[0];
+      expect(request.url).to.match(/https:\/\/rp.liadm.com\/j\?.*aid=a-0001.*&wpn=prebid.*/);
+      expect(request.url).to.not.match(/.*did=*/);
       done();
-    }, 200);
+    }, 300);
   });
 
   it('should initialize LiveConnect and emit an event with a privacy string when decode', function(done) {
@@ -123,55 +164,61 @@ describe('LiveIntentId', function() {
       gdprApplies: false,
       consentString: 'consentDataString'
     })
-    liveIntentIdSubmodule.decode({}, defaultConfigParams);
+    gppConsentDataStub.returns({
+      gppString: 'gppConsentDataString',
+      applicableSections: [1]
+    })
+    liveIntentIdSubmodule.decode({}, { params: defaultConfigParams });
     setTimeout(() => {
-      expect(server.requests[0].url).to.match(/.*us_privacy=1YNY.*&gdpr=0&gdpr_consent=consentDataString.*/);
+      let request = rpRequests()[0];
+      expect(request.url).to.match(/.*us_privacy=1YNY.*&gdpr=0&gdpr_consent=consentDataString.*&gpp_s=gppConsentDataString&gpp_as=1.*/);
       done();
-    }, 200);
+    }, 300);
   });
 
   it('should fire an event when decode and a hash is provided', function(done) {
     liveIntentIdSubmodule.decode({}, { params: {
-      ...defaultConfigParams.params,
+      ...defaultConfigParams,
       emailHash: '58131bc547fb87af94cebdaf3102321f'
     }});
     setTimeout(() => {
-      expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*e=58131bc547fb87af94cebdaf3102321f.+/);
+      let request = rpRequests()[0];
+      expect(request.url).to.match(/https:\/\/rp.liadm.com\/j\?.*e=58131bc547fb87af94cebdaf3102321f.+/);
       done();
-    }, 200);
+    }, 300);
   });
 
   it('should not return a decoded identifier when the unifiedId is not present in the value', function() {
-    const result = liveIntentIdSubmodule.decode({ additionalData: 'data' });
+    const result = liveIntentIdSubmodule.decode({ params: { fireEventDelay: 1, additionalData: 'data' } });
     expect(result).to.be.eql({});
   });
 
   it('should fire an event when decode', function(done) {
-    liveIntentIdSubmodule.decode({}, defaultConfigParams);
+    liveIntentIdSubmodule.decode({}, { params: defaultConfigParams });
     setTimeout(() => {
-      expect(server.requests[0].url).to.be.not.null
+      expect(rpRequests().length).to.be.eq(1);
       done();
-    }, 200);
+    }, 300);
   });
 
   it('should initialize LiveConnect and send data only once', function(done) {
-    liveIntentIdSubmodule.getId(defaultConfigParams);
-    liveIntentIdSubmodule.decode({}, defaultConfigParams);
-    liveIntentIdSubmodule.getId(defaultConfigParams);
-    liveIntentIdSubmodule.decode({}, defaultConfigParams);
+    liveIntentIdSubmodule.getId({ params: defaultConfigParams });
+    liveIntentIdSubmodule.decode({}, { params: defaultConfigParams });
+    liveIntentIdSubmodule.getId({ params: defaultConfigParams });
+    liveIntentIdSubmodule.decode({}, { params: defaultConfigParams });
     setTimeout(() => {
-      expect(server.requests.length).to.be.eq(1);
+      expect(rpRequests().length).to.be.eq(1);
       done();
-    }, 200);
+    }, 300);
   });
 
   it('should call the custom URL of the LiveIntent Identity Exchange endpoint', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
-    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {...defaultConfigParams.params, ...{'url': 'https://dummy.liveintent.com/idex'}} }).callback;
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {...defaultConfigParams, ...{'url': 'https://dummy.liveintent.com/idex'}} }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899?resolve=nonId');
+    let request = requests(/https:\/\/dummy.liveintent.com\/idex\/.*/)[0];
+    expect(request.url).to.match(/https:\/\/dummy.liveintent.com\/idex\/prebid\/89899\?.*cd=.localhost.*&resolve=nonId.*/);
     request.respond(
       204,
       responseHeader
@@ -179,13 +226,13 @@ describe('LiveIntentId', function() {
     expect(callBackSpy.calledOnceWith({})).to.be.true;
   });
 
-  it('should call the Identity Exchange endpoint with the privided distributorId', function() {
+  it('should call the Identity Exchange endpoint with the provided distributorId', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: { fireEventDelay: 1, distributorId: 'did-1111' } }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/did-1111/any?did=did-1111&resolve=nonId');
+    let request = idxRequests()[0];
+    expect(request.url).to.match(/https:\/\/idx.liadm.com\/idex\/did-1111\/any\?.*did=did-1111.*&cd=.localhost.*&resolve=nonId.*/);
     request.respond(
       204,
       responseHeader
@@ -193,13 +240,13 @@ describe('LiveIntentId', function() {
     expect(callBackSpy.calledOnceWith({})).to.be.true;
   });
 
-  it('should call the Identity Exchange endpoint without the privided distributorId when appId is provided', function() {
+  it('should call the Identity Exchange endpoint without the provided distributorId when appId is provided', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: { fireEventDelay: 1, distributorId: 'did-1111', liCollectConfig: { appId: 'a-0001' } } }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/any?resolve=nonId');
+    let request = idxRequests()[0];
+    expect(request.url).to.match(/https:\/\/idx.liadm.com\/idex\/prebid\/any\?.*cd=.localhost.*&resolve=nonId.*/);
     request.respond(
       204,
       responseHeader
@@ -211,15 +258,15 @@ describe('LiveIntentId', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
-      ...defaultConfigParams.params,
+      ...defaultConfigParams,
       ...{
         'url': 'https://dummy.liveintent.com/idex',
         'partner': 'rubicon'
       }
     } }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899?resolve=nonId');
+    let request = requests(/https:\/\/dummy.liveintent.com\/idex\/.*/)[0];
+    expect(request.url).to.match(/https:\/\/dummy.liveintent.com\/idex\/rubicon\/89899\?.*cd=.localhost.*&resolve=nonId.*/);
     request.respond(
       200,
       responseHeader,
@@ -231,10 +278,10 @@ describe('LiveIntentId', function() {
   it('should call the LiveIntent Identity Exchange endpoint, with no additional query params', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
-    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: defaultConfigParams }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
+    let request = idxRequests()[0];
+    expect(request.url).to.match(/https:\/\/idx.liadm.com\/idex\/prebid\/89899\?.*cd=.localhost.*&resolve=nonId.*/);
     request.respond(
       200,
       responseHeader,
@@ -246,10 +293,10 @@ describe('LiveIntentId', function() {
   it('should log an error and continue to callback if ajax request errors', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
-    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: defaultConfigParams }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
+    let request = idxRequests()[0];
+    expect(request.url).to.match(/https:\/\/idx.liadm.com\/idex\/prebid\/89899\?.*cd=.localhost.*&resolve=nonId.*/);
     request.respond(
       503,
       responseHeader,
@@ -263,10 +310,11 @@ describe('LiveIntentId', function() {
     const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
     getCookieStub.withArgs('_lc2_fpi').returns(oldCookie)
     let callBackSpy = sinon.spy();
-    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: defaultConfigParams }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&resolve=nonId`);
+    let request = idxRequests()[0];
+    const expected = new RegExp('https:\/\/idx.liadm.com\/idex\/prebid\/89899\?.*duid=' + oldCookie + '.*&cd=.localhost.*&resolve=nonId.*');
+    expect(request.url).to.match(expected);
     request.respond(
       200,
       responseHeader,
@@ -280,7 +328,7 @@ describe('LiveIntentId', function() {
     getCookieStub.withArgs('_lc2_fpi').returns(oldCookie);
     getDataFromLocalStorageStub.withArgs('_thirdPC').returns('third-pc');
     const configParams = { params: {
-      ...defaultConfigParams.params,
+      ...defaultConfigParams,
       ...{
         'identifiersToResolve': ['_thirdPC']
       }
@@ -288,8 +336,9 @@ describe('LiveIntentId', function() {
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc&resolve=nonId`);
+    let request = idxRequests()[0];
+    const expected = new RegExp('https:\/\/idx.liadm.com\/idex\/prebid\/89899\?.*duid=' + oldCookie + '.*&cd=.localhost.*&_thirdPC=third-pc.*&resolve=nonId.*');
+    expect(request.url).to.match(expected);
     request.respond(
       200,
       responseHeader,
@@ -302,7 +351,7 @@ describe('LiveIntentId', function() {
     getCookieStub.returns(null);
     getDataFromLocalStorageStub.withArgs('_thirdPC').returns({'key': 'value'});
     const configParams = { params: {
-      ...defaultConfigParams.params,
+      ...defaultConfigParams,
       ...{
         'identifiersToResolve': ['_thirdPC']
       }
@@ -310,8 +359,8 @@ describe('LiveIntentId', function() {
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D&resolve=nonId');
+    let request = idxRequests()[0];
+    expect(request.url).to.match(/https:\/\/idx.liadm.com\/idex\/prebid\/89899\?.*cd=.localhost.*&_thirdPC=%7B%22key%22%3A%22value%22%7D.*&resolve=nonId.*/);
     request.respond(
       200,
       responseHeader,
@@ -320,31 +369,46 @@ describe('LiveIntentId', function() {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
+  it('should include ip4,ip6,userAgent if it\'s present', function(done) {
+    liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams,
+      ipv4: 'foov4',
+      ipv6: 'foov6',
+      userAgent: 'boo'
+    }});
+    setTimeout(() => {
+      let request = rpRequests()[0];
+      expect(request.url).to.match(/^https:\/\/rp\.liadm\.com\/j?.*pip=.*&pip6=.*$/)
+      expect(request.requestHeaders['X-LI-Provided-User-Agent']).to.be.eq('boo')
+      done();
+    }, 300);
+  });
+
   it('should send an error when the cookie jar throws an unexpected error', function() {
     getCookieStub.throws('CookieError', 'A message');
-    liveIntentIdSubmodule.getId(defaultConfigParams);
+    liveIntentIdSubmodule.getId({ params: defaultConfigParams });
     expect(imgStub.getCall(0).args[0]).to.match(/.*ae=.+/);
   });
 
   it('should decode a unifiedId to lipbId and remove it', function() {
-    const result = liveIntentIdSubmodule.decode({ unifiedId: 'data' });
+    const result = liveIntentIdSubmodule.decode({ unifiedId: 'data' }, { params: defaultConfigParams });
     expect(result).to.eql({'lipb': {'lipbid': 'data'}});
   });
 
   it('should decode a nonId to lipbId', function() {
-    const result = liveIntentIdSubmodule.decode({ nonId: 'data' });
+    const result = liveIntentIdSubmodule.decode({ nonId: 'data' }, { params: defaultConfigParams });
     expect(result).to.eql({'lipb': {'lipbid': 'data', 'nonId': 'data'}});
   });
 
   it('should resolve extra attributes', function() {
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
-      ...defaultConfigParams.params,
+      ...defaultConfigParams,
       ...{ requestedAttributesOverrides: { 'foo': true, 'bar': false } }
     } }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=nonId&resolve=foo`);
+    let request = idxRequests()[0];
+    expect(request.url).to.match(/https:\/\/idx.liadm.com\/idex\/prebid\/89899\?.*cd=.localhost.*&resolve=nonId.*&resolve=foo.*/);
     request.respond(
       200,
       responseHeader,
@@ -353,45 +417,67 @@ describe('LiveIntentId', function() {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should decode a uid2 to a seperate object when present', function() {
-    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', uid2: 'bar' });
+  it('should decode a uid2 to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', uid2: 'bar' }, { params: defaultConfigParams });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'uid2': 'bar'}, 'uid2': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
   it('should decode values with uid2 but no nonId', function() {
-    const result = liveIntentIdSubmodule.decode({ uid2: 'bar' });
+    const result = liveIntentIdSubmodule.decode({ uid2: 'bar' }, { params: defaultConfigParams });
     expect(result).to.eql({'uid2': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
-  it('should decode a bidswitch id to a seperate object when present', function() {
-    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', bidswitch: 'bar' });
+  it('should decode a bidswitch id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', bidswitch: 'bar' }, { params: defaultConfigParams });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'bidswitch': 'bar'}, 'bidswitch': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
-  it('should decode a medianet id to a seperate object when present', function() {
-    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', medianet: 'bar' });
+  it('should decode a medianet id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', medianet: 'bar' }, { params: defaultConfigParams });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'medianet': 'bar'}, 'medianet': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
-  it('should decode a magnite id to a seperate object when present', function() {
-    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', magnite: 'bar' });
+  it('should decode a sovrn id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', sovrn: 'bar' }, { params: defaultConfigParams });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'sovrn': 'bar'}, 'sovrn': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a magnite id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', magnite: 'bar' }, { params: defaultConfigParams });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'magnite': 'bar'}, 'magnite': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
-  it('should decode an index id to a seperate object when present', function() {
-    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', index: 'bar' });
+  it('should decode an index id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', index: 'bar' }, { params: defaultConfigParams });
     expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'index': 'bar'}, 'index': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
   });
 
+  it('should decode an openx id to a separate object when present', function () {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', openx: 'bar' }, { params: defaultConfigParams });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'openx': 'bar'}, 'openx': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode an pubmatic id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', pubmatic: 'bar' }, { params: defaultConfigParams });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'pubmatic': 'bar'}, 'pubmatic': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a thetradedesk id to a separate object when present', function() {
+    const provider = 'liveintent.com'
+    refererInfoStub.returns({domain: provider})
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', thetradedesk: 'bar' }, { params: defaultConfigParams });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'tdid': 'bar'}, 'tdid': {'id': 'bar', 'ext': {'rtiPartner': 'TDID', 'provider': provider}}});
+  });
+
   it('should allow disabling nonId resolution', function() {
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
-      ...defaultConfigParams.params,
+      ...defaultConfigParams,
       ...{ requestedAttributesOverrides: { 'nonId': false, 'uid2': true } }
     } }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=uid2`);
+    let request = idxRequests()[0];
+    expect(request.url).to.match(/https:\/\/idx.liadm.com\/idex\/prebid\/89899\?.*cd=.localhost.*&resolve=uid2.*/);
     request.respond(
       200,
       responseHeader,
@@ -399,4 +485,434 @@ describe('LiveIntentId', function() {
     );
     expect(callBackSpy.calledOnce).to.be.true;
   });
-});
+
+  it('should decode a idCookie as fpid if it exists and coppa is false', function() {
+    coppaConsentDataStub.returns(false)
+    const result = liveIntentIdSubmodule.decode({nonId: 'foo', idCookie: 'bar'}, { params: defaultConfigParams })
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'fpid': 'bar'}, 'fpid': {'id': 'bar'}})
+  });
+
+  it('should not decode a idCookie as fpid if it exists and coppa is true', function() {
+    coppaConsentDataStub.returns(true)
+    const result = liveIntentIdSubmodule.decode({nonId: 'foo', idCookie: 'bar'}, { params: defaultConfigParams })
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo'}})
+  });
+
+  it('should resolve fpid from cookie', async function() {
+    const expectedValue = 'someValue'
+    const cookieName = 'testcookie'
+    getCookieStub.withArgs(cookieName).returns(expectedValue)
+    const config = { params: {
+      ...defaultConfigParams,
+      fpid: { 'strategy': 'cookie', 'name': cookieName },
+      requestedAttributesOverrides: { 'fpid': true } }
+    }
+    const submoduleCallback = liveIntentIdSubmodule.getId(config).callback;
+    const decodedResult = new Promise(resolve => {
+      submoduleCallback((x) => resolve(liveIntentIdSubmodule.decode(x, config)));
+    });
+    const request = idxRequests()[0];
+    expect(request.url).to.match(/https:\/\/idx.liadm.com\/idex\/prebid\/89899\?.*cd=.localhost.*&ic=someValue.*&resolve=nonId.*/);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+
+    const result = await decodedResult
+    expect(result).to.be.eql({
+      lipb: { 'fpid': expectedValue },
+      fpid: { id: expectedValue }
+    });
+  });
+
+  it('should decode a sharethrough id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', sharethrough: 'bar' }, { params: defaultConfigParams });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'sharethrough': 'bar'}, 'sharethrough': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a sonobi id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', sonobi: 'bar' }, { params: defaultConfigParams });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'sonobi': 'bar'}, 'sonobi': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  it('should decode a vidazoo id to a separate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', vidazoo: 'bar' }, { params: defaultConfigParams });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'vidazoo': 'bar'}, 'vidazoo': {'id': 'bar', 'ext': {'provider': 'liveintent.com'}}});
+  });
+
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(liveIntentIdSubmodule);
+    });
+    it('liveIntentId; getValue call and ext', function() {
+      const userId = {
+        lipb: {
+          lipbid: 'some-random-id-value',
+          segments: ['s1', 's2']
+        }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.com',
+        uids: [{id: 'some-random-id-value', atype: 3}],
+        ext: {segments: ['s1', 's2']}
+      });
+    });
+    it('fpid; getValue call', function() {
+      const userId = {
+        fpid: {
+          id: 'some-random-id-value'
+        }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'fpid.liveintent.com',
+        uids: [{id: 'some-random-id-value', atype: 1}]
+      });
+    });
+    it('bidswitch', function() {
+      const userId = {
+        bidswitch: {'id': 'sample_id'}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'bidswitch.net',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('bidswitch with ext', function() {
+      const userId = {
+        bidswitch: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'bidswitch.net',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+    it('medianet', function() {
+      const userId = {
+        medianet: {'id': 'sample_id'}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'media.net',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('medianet with ext', function() {
+      const userId = {
+        medianet: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'media.net',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+
+    it('sovrn', function() {
+      const userId = {
+        sovrn: {'id': 'sample_id'}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.sovrn.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('sovrn with ext', function() {
+      const userId = {
+        sovrn: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.sovrn.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+
+    it('magnite', function() {
+      const userId = {
+        magnite: {'id': 'sample_id'}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'rubiconproject.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('magnite with ext', function() {
+      const userId = {
+        magnite: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'rubiconproject.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+    it('index', function() {
+      const userId = {
+        index: {'id': 'sample_id'}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.indexexchange.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('index with ext', function() {
+      const userId = {
+        index: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.indexexchange.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+
+    it('openx', function () {
+      const userId = {
+        openx: { 'id': 'sample_id' }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'openx.net',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('openx with ext', function () {
+      const userId = {
+        openx: { 'id': 'sample_id', 'ext': { 'provider': 'some.provider.com' } }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'openx.net',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+
+    it('pubmatic', function() {
+      const userId = {
+        pubmatic: {'id': 'sample_id'}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'pubmatic.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('pubmatic with ext', function() {
+      const userId = {
+        pubmatic: {'id': 'sample_id', 'ext': {'provider': 'some.provider.com'}}
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'pubmatic.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+
+    it('liveIntentId; getValue call and NO ext', function() {
+      const userId = {
+        lipb: {
+          lipbid: 'some-random-id-value'
+        }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.com',
+        uids: [{id: 'some-random-id-value', atype: 3}]
+      });
+    });
+
+    it('sharethrough', function () {
+      const userId = {
+        sharethrough: { 'id': 'sample_id' }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'sharethrough.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('sharethrough with ext', function () {
+      const userId = {
+        sharethrough: { 'id': 'sample_id', 'ext': { 'provider': 'some.provider.com' } }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'sharethrough.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+
+    it('sonobi', function () {
+      const userId = {
+        sonobi: { 'id': 'sample_id' }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.sonobi.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('sonobi with ext', function () {
+      const userId = {
+        sonobi: { 'id': 'sample_id', 'ext': { 'provider': 'some.provider.com' } }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.sonobi.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+
+    it('vidazoo', function () {
+      const userId = {
+        vidazoo: { 'id': 'sample_id' }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.vidazoo.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3
+        }]
+      });
+    });
+
+    it('vidazoo with ext', function () {
+      const userId = {
+        vidazoo: { 'id': 'sample_id', 'ext': { 'provider': 'some.provider.com' } }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'liveintent.vidazoo.com',
+        uids: [{
+          id: 'sample_id',
+          atype: 3,
+          ext: {
+            provider: 'some.provider.com'
+          }
+        }]
+      });
+    });
+  })
+})
diff --git a/test/spec/modules/livewrappedAnalyticsAdapter_spec.js b/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
index d07b48752c6..4b7f7bc2bac 100644
--- a/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
+++ b/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
@@ -1,5 +1,5 @@
 import livewrappedAnalyticsAdapter, { BID_WON_TIMEOUT } from 'modules/livewrappedAnalyticsAdapter.js';
-import CONSTANTS from 'src/constants.json';
+import { AD_RENDER_FAILED_REASON, EVENTS, STATUS } from 'src/constants.js';
 import { config } from 'src/config.js';
 import { server } from 'test/mocks/xhr.js';
 import { setConfig } from 'modules/currency.js';
@@ -9,21 +9,16 @@ let utils = require('src/utils');
 let adapterManager = require('src/adapterManager').default;
 
 const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    BID_REQUESTED,
-    BID_RESPONSE,
-    BIDDER_DONE,
-    BID_WON,
-    BID_TIMEOUT,
-    SET_TARGETING,
-    AD_RENDER_FAILED
-  },
-  STATUS: {
-    GOOD
-  }
-} = CONSTANTS;
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_REQUESTED,
+  BID_RESPONSE,
+  BIDDER_DONE,
+  BID_WON,
+  BID_TIMEOUT,
+  SET_TARGETING,
+  AD_RENDER_FAILED
+} = EVENTS;
 
 const BID1 = {
   width: 980,
@@ -43,7 +38,7 @@ const BID1 = {
   },
   dealId: 'dealid',
   getStatusCode() {
-    return CONSTANTS.STATUS.GOOD;
+    return STATUS.GOOD;
   }
 };
 
@@ -64,6 +59,24 @@ const BID2 = Object.assign({}, BID1, {
   dealId: undefined
 });
 
+const BID2_2 = Object.assign({}, BID2, {
+  width: 320,
+  height: 320,
+  cpm: 10.0,
+  originalCpm: 20.0,
+  currency: 'USD',
+  originalCurrency: 'FOO',
+  timeToRespond: 300,
+  bidId: '3ecff0db240758',
+  requestId: '3ecff0db240757',
+  adId: '3ecff0db240758',
+  mediaType: 'video',
+  meta: {
+    data: 'value2_2'
+  },
+  dealId: 'deal2_2'
+});
+
 const BID3 = {
   bidId: '4ecff0db240757',
   requestId: '4ecff0db240757',
@@ -71,7 +84,7 @@ const BID3 = {
   auctionId: '25c6d7f5-699a-4bfc-87c9-996f915341fa',
   mediaType: 'banner',
   getStatusCode() {
-    return CONSTANTS.STATUS.GOOD;
+    return STATUS.GOOD;
   }
 };
 
@@ -104,7 +117,8 @@ const MOCK = {
   },
   BID_RESPONSE: [
     BID1,
-    BID2
+    BID2,
+    BID2_2
   ],
   AUCTION_END: {
   },
@@ -135,7 +149,7 @@ const MOCK = {
   AD_RENDER_FAILED: [
     {
       'bidId': '2ecff0db240757',
-      'reason': CONSTANTS.AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
+      'reason': AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
       'message': 'message',
       'bid': BID1
     }
@@ -275,7 +289,7 @@ const ANALYTICS_MESSAGE = {
       adUnitId: 'adunitid',
       bidder: 'livewrapped',
       auctionId: 0,
-      rsn: CONSTANTS.AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
+      rsn: AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
       msg: 'message'
     },
   ]
@@ -286,6 +300,7 @@ function performStandardAuction() {
   events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
   events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
   events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+  events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[2]);
   events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
   events.emit(AUCTION_END, MOCK.AUCTION_END);
   events.emit(SET_TARGETING, MOCK.SET_TARGETING);
@@ -346,7 +361,6 @@ describe('Livewrapped analytics adapter', function () {
     });
 
     it('should build a batched message from prebid events', function () {
-      sandbox.stub(utils, 'getWindowTop').returns({});
       performStandardAuction();
 
       clock.tick(BID_WON_TIMEOUT + 1000);
@@ -408,20 +422,6 @@ describe('Livewrapped analytics adapter', function () {
       expect(message.timeouts[0].adUnit).to.equal('panorama_d_1');
     });
 
-    it('should detect adblocker recovered request', function () {
-      sandbox.stub(utils, 'getWindowTop').returns({ I12C: { Morph: 1 } });
-      performStandardAuction();
-
-      clock.tick(BID_WON_TIMEOUT + 1000);
-
-      expect(server.requests.length).to.equal(1);
-      let request = server.requests[0];
-
-      let message = JSON.parse(request.requestBody);
-
-      expect(message.rcv).to.equal(true);
-    });
-
     it('should forward GDPR data', function () {
       events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
       events.emit(BID_REQUESTED, {
@@ -628,4 +628,79 @@ describe('Livewrapped analytics adapter', function () {
       expect(request.url).to.equal('https://whitelabeled.com/analytics/10');
     });
   });
+
+  describe('when given extended options', function () {
+    adapterManager.registerAnalyticsAdapter({
+      code: 'livewrapped',
+      adapter: livewrappedAnalyticsAdapter
+    });
+
+    beforeEach(function () {
+      adapterManager.enableAnalytics({
+        provider: 'livewrapped',
+        options: {
+          publisherId: 'CC411485-42BC-4F92-8389-42C503EE38D7',
+          ext: {
+            testparam: 123
+          }
+        }
+      });
+    });
+
+    afterEach(function () {
+      livewrappedAnalyticsAdapter.disableAnalytics();
+    });
+
+    it('should forward the extended options', function () {
+      performStandardAuction();
+
+      clock.tick(BID_WON_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      expect(message.ext).to.not.equal(null);
+      expect(message.ext.testparam).to.equal(123);
+    });
+
+    it('should forward the correct winning bid from a multi-bid response', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[2]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, Object.assign({}, BID2_2, {
+        'status': 'rendered',
+        'requestId': '3ecff0db240757'
+      }));
+
+      clock.tick(BID_WON_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      expect(message.wins.length).to.equal(1);
+      expect(message.wins[0]).to.deep.equal({
+        timeStamp: 1519149562216,
+        adUnit: 'box_d_1',
+        adUnitId: 'adunitid',
+        bidder: 'livewrapped',
+        width: 320,
+        height: 320,
+        cpm: 10.0,
+        orgCpm: 200,
+        mediaType: 4,
+        dealId: 'deal2_2',
+        gdpr: 0,
+        auctionId: 0,
+        meta: {
+          data: 'value2_2'
+        }
+      });
+    });
+  });
 });
diff --git a/test/spec/modules/livewrappedBidAdapter_spec.js b/test/spec/modules/livewrappedBidAdapter_spec.js
index 52eaf8d7d76..7a3cd26dbe7 100644
--- a/test/spec/modules/livewrappedBidAdapter_spec.js
+++ b/test/spec/modules/livewrappedBidAdapter_spec.js
@@ -3,6 +3,8 @@ import {spec, storage} from 'modules/livewrappedBidAdapter.js';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
 import { NATIVE, VIDEO } from 'src/mediaTypes.js';
+import { setConfig as setCurrencyConfig } from '../../../modules/currency';
+import { addFPDToBidderRequest } from '../../helpers/fpd';
 
 describe('Livewrapped adapter tests', function () {
   let sandbox,
@@ -38,10 +40,9 @@ describe('Livewrapped adapter tests', function () {
           auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
           ortb2Imp: {
             ext: {
-              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
             }
           },
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
         }
       ],
       start: 1472239426002,
@@ -120,8 +121,49 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
-          formats: [{width: 980, height: 240}, {width: 980, height: 120}]
+          formats: [{width: 980, height: 240}, {width: 980, height: 120}],
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          }
+        }]
+      };
+
+      expect(data).to.deep.equal(expectedQuery);
+    });
+
+    it('should send ortb2Imp', function() {
+      sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
+      sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
+      let ortb2ImpRequest = clone(bidderRequest);
+      ortb2ImpRequest.bids[0].ortb2Imp.ext.data = {key: 'value'};
+      let result = spec.buildRequests(ortb2ImpRequest.bids, ortb2ImpRequest);
+      let data = JSON.parse(result.data);
+
+      expect(result.url).to.equal('https://lwadm.com/ad');
+
+      let expectedQuery = {
+        auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
+        publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
+        userId: 'user id',
+        url: 'https://www.domain.com',
+        seats: {'dsp': ['seat 1']},
+        version: '1.4',
+        width: 100,
+        height: 100,
+        cookieSupport: true,
+        adRequests: [{
+          adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
+          callerAdUnitId: 'panorama_d_1',
+          bidId: '2ffb201a808da7',
+          formats: [{width: 980, height: 240}, {width: 980, height: 120}],
+          rtbData: {
+            ext: {
+              data: {key: 'value'},
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          }
         }]
       };
 
@@ -157,12 +199,20 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }, {
           callerAdUnitId: 'box_d_1',
           bidId: '3ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 300, height: 250}]
         }]
       };
@@ -194,7 +244,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'caller id 1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -225,7 +279,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -256,7 +314,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -289,7 +351,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -322,7 +388,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -352,7 +422,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}],
           options: {keyvalues: [{key: 'key', value: 'value'}]}
         }]
@@ -384,7 +458,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -414,7 +492,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}],
           native: {'nativedata': 'content parsed serverside only'}
         }]
@@ -445,7 +527,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}],
           native: {'nativedata': 'content parsed serverside only'},
           banner: true
@@ -477,7 +563,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}],
           video: {'videodata': 'content parsed serverside only'}
         }]
@@ -525,7 +615,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -555,7 +649,11 @@ describe('Livewrapped adapter tests', function () {
         adRequests: [{
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 728, height: 90}]
         }]
       };
@@ -592,7 +690,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -627,7 +729,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -660,7 +766,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -700,7 +810,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -730,7 +844,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -760,7 +878,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -810,7 +932,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -842,7 +968,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -876,7 +1006,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -910,7 +1044,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -946,7 +1084,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -982,7 +1124,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -1018,7 +1164,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}]
         }]
       };
@@ -1030,46 +1180,21 @@ describe('Livewrapped adapter tests', function () {
       sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
       sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
 
-      let origGetConfig = config.getConfig;
-      sandbox.stub(config, 'getConfig').callsFake(function (key) {
-        if (key === 'currency.adServerCurrency') {
-          return 'EUR';
-        }
-        return origGetConfig.apply(config, arguments);
-      });
-
+      setCurrencyConfig({ adServerCurrency: 'EUR' });
       let testbidRequest = clone(bidderRequest);
       let bids = testbidRequest.bids.map(b => {
         b.getFloor = function () { return { floor: 10, currency: 'EUR' }; }
         return b;
       });
-      let result = spec.buildRequests(bids, testbidRequest);
-      let data = JSON.parse(result.data);
-
-      expect(result.url).to.equal('https://lwadm.com/ad');
 
-      let expectedQuery = {
-        auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
-        publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
-        userId: 'user id',
-        url: 'https://www.domain.com',
-        seats: {'dsp': ['seat 1']},
-        version: '1.4',
-        width: 100,
-        height: 100,
-        cookieSupport: true,
-        flrCur: 'EUR',
-        adRequests: [{
-          adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
-          callerAdUnitId: 'panorama_d_1',
-          bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
-          formats: [{width: 980, height: 240}, {width: 980, height: 120}],
-          flr: 10
-        }]
-      };
-
-      expect(data).to.deep.equal(expectedQuery);
+      return addFPDToBidderRequest(testbidRequest).then(res => {
+        let result = spec.buildRequests(bids, res);
+        let data = JSON.parse(result.data);
+        expect(result.url).to.equal('https://lwadm.com/ad');
+        expect(data.adRequests[0].flr).to.eql(10)
+        expect(data.flrCur).to.eql('EUR')
+        setCurrencyConfig({});
+      });
     });
 
     it('getFloor returns valid floor - default currency', function() {
@@ -1101,7 +1226,11 @@ describe('Livewrapped adapter tests', function () {
           adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
           callerAdUnitId: 'panorama_d_1',
           bidId: '2ffb201a808da7',
-          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          rtbData: {
+            ext: {
+              tid: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D'
+            },
+          },
           formats: [{width: 980, height: 240}, {width: 980, height: 120}],
           flr: 10
         }]
diff --git a/test/spec/modules/lkqdBidAdapter_spec.js b/test/spec/modules/lkqdBidAdapter_spec.js
index 7fee9bf6e41..1e05b9deeb3 100644
--- a/test/spec/modules/lkqdBidAdapter_spec.js
+++ b/test/spec/modules/lkqdBidAdapter_spec.js
@@ -46,12 +46,12 @@ describe('lkqdBidAdapter', () => {
     });
 
     it('should return false when required params are not passed', () => {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         wrong: 'missing zone id'
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -140,7 +140,7 @@ describe('lkqdBidAdapter', () => {
     });
 
     it('should not populate unspecified parameters', () => {
-      const requests = spec.buildRequests(bidRequests);
+      const requests = spec.buildRequests(bidRequests, { timeout: 1000 });
 
       const serverRequestObject = requests[0];
       expect(serverRequestObject.data.device.dnt).to.be.a('undefined');
diff --git a/test/spec/modules/lm_kiviadsBidAdapter_spec.js b/test/spec/modules/lm_kiviadsBidAdapter_spec.js
new file mode 100644
index 00000000000..645dd756c19
--- /dev/null
+++ b/test/spec/modules/lm_kiviadsBidAdapter_spec.js
@@ -0,0 +1,447 @@
+import {expect} from 'chai';
+import {config} from 'src/config.js';
+import {spec} from 'modules/lm_kiviadsBidAdapter.js';
+import {deepClone} from 'src/utils';
+import {getBidFloor} from '../../../libraries/xeUtils/bidderUtils.js';
+
+const ENDPOINT = 'https://pbjs.kiviads.live';
+
+const defaultRequest = {
+  adUnitCode: 'test',
+  bidId: '1',
+  requestId: 'qwerty',
+  ortb2: {
+    source: {
+      tid: 'auctionId'
+    }
+  },
+  ortb2Imp: {
+    ext: {
+      tid: 'tr1',
+    }
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 200]
+      ]
+    }
+  },
+  bidder: 'lm_kiviads',
+  params: {
+    env: 'lm_kiviads',
+    pid: '40',
+    ext: {}
+  },
+  bidRequestsCount: 1
+};
+
+const defaultRequestVideo = deepClone(defaultRequest);
+defaultRequestVideo.mediaTypes = {
+  video: {
+    playerSize: [640, 480],
+    context: 'instream',
+    skipppable: true
+  }
+};
+describe('lm_kiviadsBidAdapter', () => {
+  describe('isBidRequestValid', function () {
+    it('should return false when request params is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when required env param is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params.env;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when required pid param is missing', function () {
+      const invalidRequest = deepClone(defaultRequest);
+      delete invalidRequest.params.pid;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return false when video.playerSize is missing', function () {
+      const invalidRequest = deepClone(defaultRequestVideo);
+      delete invalidRequest.mediaTypes.video.playerSize;
+      expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+    });
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(defaultRequest)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+
+    it('should send request with correct structure', function () {
+      const request = spec.buildRequests([defaultRequest], {});
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal(ENDPOINT + '/bid');
+      expect(request.options).to.have.property('contentType').and.to.equal('application/json');
+      expect(request).to.have.property('data');
+    });
+
+    it('should build basic request structure', function () {
+      const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
+      expect(request).to.have.property('bidId').and.to.equal(defaultRequest.bidId);
+      expect(request).to.have.property('auctionId').and.to.equal(defaultRequest.ortb2.source.tid);
+      expect(request).to.have.property('transactionId').and.to.equal(defaultRequest.ortb2Imp.ext.tid);
+      expect(request).to.have.property('tz').and.to.equal(new Date().getTimezoneOffset());
+      expect(request).to.have.property('bc').and.to.equal(1);
+      expect(request).to.have.property('floor').and.to.equal(null);
+      expect(request).to.have.property('banner').and.to.deep.equal({sizes: [[300, 250], [300, 200]]});
+      expect(request).to.have.property('gdprApplies').and.to.equal(0);
+      expect(request).to.have.property('consentString').and.to.equal('');
+      expect(request).to.have.property('userEids').and.to.deep.equal([]);
+      expect(request).to.have.property('usPrivacy').and.to.equal('');
+      expect(request).to.have.property('sizes').and.to.deep.equal(['300x250', '300x200']);
+      expect(request).to.have.property('ext').and.to.deep.equal({});
+      expect(request).to.have.property('env').and.to.deep.equal({
+        env: 'lm_kiviads',
+        pid: '40'
+      });
+      expect(request).to.have.property('device').and.to.deep.equal({
+        ua: navigator.userAgent,
+        lang: navigator.language
+      });
+    });
+
+    it('should build request with schain', function () {
+      const schainRequest = deepClone(defaultRequest);
+      schainRequest.schain = {
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([schainRequest], {}).data)[0];
+      expect(request).to.have.property('schain').and.to.deep.equal({
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      });
+    });
+
+    it('should build request with location', function () {
+      const bidderRequest = {
+        refererInfo: {
+          page: 'page',
+          location: 'location',
+          domain: 'domain',
+          ref: 'ref',
+          isAmp: false
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('location');
+      const location = request.location;
+      expect(location).to.have.property('page').and.to.equal('page');
+      expect(location).to.have.property('location').and.to.equal('location');
+      expect(location).to.have.property('domain').and.to.equal('domain');
+      expect(location).to.have.property('ref').and.to.equal('ref');
+      expect(location).to.have.property('isAmp').and.to.equal(false);
+    });
+
+    it('should build request with ortb2 info', function () {
+      const ortb2Request = deepClone(defaultRequest);
+      ortb2Request.ortb2 = {
+        site: {
+          name: 'name'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([ortb2Request], {}).data)[0];
+      expect(request).to.have.property('ortb2').and.to.deep.equal({
+        site: {
+          name: 'name'
+        }
+      });
+    });
+
+    it('should build request with ortb2Imp info', function () {
+      const ortb2ImpRequest = deepClone(defaultRequest);
+      ortb2ImpRequest.ortb2Imp = {
+        ext: {
+          data: {
+            pbadslot: 'home1',
+            adUnitSpecificAttribute: '1'
+          }
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([ortb2ImpRequest], {}).data)[0];
+      expect(request).to.have.property('ortb2Imp').and.to.deep.equal({
+        ext: {
+          data: {
+            pbadslot: 'home1',
+            adUnitSpecificAttribute: '1'
+          }
+        }
+      });
+    });
+
+    it('should build request with valid bidfloor', function () {
+      const bfRequest = deepClone(defaultRequest);
+      bfRequest.getFloor = () => ({floor: 5, currency: 'USD'});
+      const request = JSON.parse(spec.buildRequests([bfRequest], {}).data)[0];
+      expect(request).to.have.property('floor').and.to.equal(5);
+    });
+
+    it('should build request with gdpr consent data if applies', function () {
+      const bidderRequest = {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'qwerty'
+        }
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('gdprApplies').and.equals(1);
+      expect(request).to.have.property('consentString').and.equals('qwerty');
+    });
+
+    it('should build request with usp consent data if applies', function () {
+      const bidderRequest = {
+        uspConsent: '1YA-'
+      };
+      const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+      expect(request).to.have.property('usPrivacy').and.equals('1YA-');
+    });
+
+    it('should build request with extended ids', function () {
+      const idRequest = deepClone(defaultRequest);
+      idRequest.userIdAsEids = [
+        {source: 'adserver.org', uids: [{id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: {rtiPartner: 'TDID'}}]},
+        {source: 'pubcid.org', uids: [{id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1}]}
+      ];
+      const request = JSON.parse(spec.buildRequests([idRequest], {}).data)[0];
+      expect(request).to.have.property('userEids').and.deep.equal(idRequest.userIdAsEids);
+    });
+
+    it('should build request with video', function () {
+      const request = JSON.parse(spec.buildRequests([defaultRequestVideo], {}).data)[0];
+      expect(request).to.have.property('video').and.to.deep.equal({
+        playerSize: [640, 480],
+        context: 'instream',
+        skipppable: true
+      });
+      expect(request).to.have.property('sizes').and.to.deep.equal(['640x480']);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return empty bids', function () {
+      const serverResponse = {
+        body: {
+          data: null
+        }
+      };
+
+      const invalidResponse = spec.interpretResponse(serverResponse, {});
+      expect(invalidResponse).to.be.an('array').that.is.empty;
+    });
+
+    it('should interpret valid response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 300,
+            height: 250,
+            ttl: 600,
+            meta: {
+              advertiserDomains: ['lm_kiviads']
+            },
+            ext: {
+              pixels: [
+                ['iframe', 'surl1'],
+                ['image', 'surl2'],
+              ]
+            }
+          }]
+        }
+      };
+
+      const validResponse = spec.interpretResponse(serverResponse, {bidderRequest: defaultRequest});
+      const bid = validResponse[0];
+      expect(validResponse).to.be.an('array').that.is.not.empty;
+      expect(bid.requestId).to.equal('qwerty');
+      expect(bid.cpm).to.equal(1);
+      expect(bid.currency).to.equal('USD');
+      expect(bid.width).to.equal(300);
+      expect(bid.height).to.equal(250);
+      expect(bid.ttl).to.equal(600);
+      expect(bid.meta).to.deep.equal({advertiserDomains: ['lm_kiviads']});
+    });
+
+    it('should interpret valid banner response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 300,
+            height: 250,
+            ttl: 600,
+            mediaType: 'banner',
+            creativeId: 'xe-demo-banner',
+            ad: 'ad',
+            meta: {}
+          }]
+        }
+      };
+
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: defaultRequest});
+      const bid = validResponseBanner[0];
+      expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+      expect(bid.mediaType).to.equal('banner');
+      expect(bid.creativeId).to.equal('xe-demo-banner');
+      expect(bid.ad).to.equal('ad');
+    });
+
+    it('should interpret valid video response', function () {
+      const serverResponse = {
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            cpm: 1,
+            currency: 'USD',
+            width: 600,
+            height: 480,
+            ttl: 600,
+            mediaType: 'video',
+            creativeId: 'xe-demo-video',
+            ad: 'vast-xml',
+            meta: {}
+          }]
+        }
+      };
+
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: defaultRequestVideo});
+      const bid = validResponseBanner[0];
+      expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+      expect(bid.mediaType).to.equal('video');
+      expect(bid.creativeId).to.equal('xe-demo-video');
+      expect(bid.ad).to.equal('vast-xml');
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('shoukd handle no params', function () {
+      const opts = spec.getUserSyncs({}, []);
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty if sync is not allowed', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false});
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should allow iframe sync', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('iframe');
+      expect(opts[0].url).to.equal('surl1?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+    });
+
+    it('should allow pixel sync', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+    });
+
+    it('should allow pixel sync and parse consent params', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+        body: {
+          data: [{
+            requestId: 'qwerty',
+            ext: {
+              pixels: [
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
+              ]
+            }
+          }]
+        }
+      }], {
+        gdprApplies: 1,
+        consentString: '1YA-'
+      });
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=1&gdpr_consent=1YA-');
+    });
+  });
+
+  describe('getBidFloor', function () {
+    it('should return null when getFloor is not a function', () => {
+      const bid = {getFloor: 2};
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when getFloor doesnt return an object', () => {
+      const bid = {getFloor: () => 2};
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when floor is not a number', () => {
+      const bid = {
+        getFloor: () => ({floor: 'string', currency: 'USD'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when currency is not USD', () => {
+      const bid = {
+        getFloor: () => ({floor: 5, currency: 'EUR'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return floor value when everything is correct', () => {
+      const bid = {
+        getFloor: () => ({floor: 5, currency: 'USD'})
+      };
+      const result = getBidFloor(bid);
+      expect(result).to.equal(5);
+    });
+  });
+})
diff --git a/test/spec/modules/lmpIdSystem_spec.js b/test/spec/modules/lmpIdSystem_spec.js
new file mode 100644
index 00000000000..28f8ba0697d
--- /dev/null
+++ b/test/spec/modules/lmpIdSystem_spec.js
@@ -0,0 +1,130 @@
+import { expect } from 'chai';
+import { find } from 'src/polyfill.js';
+import { config } from 'src/config.js';
+import { init, startAuctionHook, setSubmoduleRegistry } from 'modules/userId/index.js';
+import { storage, lmpIdSubmodule } from 'modules/lmpIdSystem.js';
+import { mockGdprConsent } from '../../helpers/consentData.js';
+import 'src/prebid.js';
+
+function getConfigMock() {
+  return {
+    userSync: {
+      syncDelay: 0,
+      userIds: [{
+        name: 'lmpid'
+      }]
+    }
+  }
+}
+
+function getAdUnitMock(code = 'adUnit-code') {
+  return {
+    code,
+    mediaTypes: { banner: {}, native: {} },
+    sizes: [
+      [300, 200],
+      [300, 600]
+    ],
+    bids: [{
+      bidder: 'sampleBidder',
+      params: { placementId: 'banner-only-bidder' }
+    }]
+  };
+}
+
+describe('LMPID System', () => {
+  let getDataFromLocalStorageStub, localStorageIsEnabledStub;
+  let windowLmpidStub;
+
+  beforeEach(() => {
+    window.__lmpid = undefined;
+    windowLmpidStub = sinon.stub(window, '__lmpid');
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+  });
+
+  afterEach(() => {
+    getDataFromLocalStorageStub.restore();
+    localStorageIsEnabledStub.restore();
+    windowLmpidStub.restore();
+  });
+
+  describe('LMPID: test "getId" method', () => {
+    it('prefers the window cached LMPID', () => {
+      localStorageIsEnabledStub.returns(true);
+      getDataFromLocalStorageStub.withArgs('__lmpid').returns('stored-lmpid');
+
+      windowLmpidStub.value('lmpid');
+      expect(lmpIdSubmodule.getId()).to.deep.equal({ id: 'lmpid' });
+    });
+
+    it('fallbacks on localStorage when window cache is falsy', () => {
+      localStorageIsEnabledStub.returns(true);
+      getDataFromLocalStorageStub.withArgs('__lmpid').returns('stored-lmpid');
+
+      windowLmpidStub.value('');
+      expect(lmpIdSubmodule.getId()).to.deep.equal({ id: 'stored-lmpid' });
+
+      windowLmpidStub.value(false);
+      expect(lmpIdSubmodule.getId()).to.deep.equal({ id: 'stored-lmpid' });
+    });
+
+    it('fallbacks only if localStorageIsEnabled', () => {
+      localStorageIsEnabledStub.returns(false);
+      getDataFromLocalStorageStub.withArgs('__lmpid').returns('stored-lmpid');
+
+      expect(lmpIdSubmodule.getId()).to.be.undefined;
+    });
+  });
+
+  describe('LMPID: test "decode" method', () => {
+    it('provides the lmpid from a stored object', () => {
+      expect(lmpIdSubmodule.decode('lmpid')).to.deep.equal({ lmpid: 'lmpid' });
+    });
+  });
+
+  describe('LMPID: requestBids hook', () => {
+    let adUnits;
+    let sandbox;
+
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      mockGdprConsent(sandbox);
+      adUnits = [getAdUnitMock()];
+      init(config);
+      setSubmoduleRegistry([lmpIdSubmodule]);
+      getDataFromLocalStorageStub.withArgs('__lmpid').returns('stored-lmpid');
+      localStorageIsEnabledStub.returns(true);
+      config.setConfig(getConfigMock());
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+      config.resetConfig();
+    });
+
+    after(() => {
+      init(config);
+    })
+
+    it('when a stored LMPID exists it is added to bids', (done) => {
+      startAuctionHook(() => {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.lmpid');
+            expect(bid.userId.lmpid).to.equal('stored-lmpid');
+            const lmpidAsEid = find(bid.userIdAsEids, e => e.source == 'loblawmedia.ca');
+            expect(lmpidAsEid).to.deep.equal({
+              source: 'loblawmedia.ca',
+              uids: [{
+                id: 'stored-lmpid',
+                atype: 3,
+              }]
+            });
+          });
+        });
+        done();
+      }, { adUnits });
+    });
+  });
+});
diff --git a/test/spec/modules/lockrAIMIdSystem_spec.js b/test/spec/modules/lockrAIMIdSystem_spec.js
new file mode 100644
index 00000000000..c886fb305c2
--- /dev/null
+++ b/test/spec/modules/lockrAIMIdSystem_spec.js
@@ -0,0 +1,72 @@
+/* eslint-disable no-console */
+/* eslint-disable quotes */
+import * as lockrAIMSystem from "../../../modules/lockrAIMIdSystem.js";
+import { hook } from "../../../src/hook.js";
+import { expect } from "chai";
+import { coreStorage } from "../../../modules/userId/index.js";
+
+const defaultConfig = {
+  appID: "3b5a0f6c-7e91-11ec-b9c7-e330d98440a7",
+  email: "example@test.com",
+};
+
+const LIVE_RAMP_COOKIE = "_lr_env";
+const UID2_COOKIE = "_uid2_advertising_token";
+const ID5_COOKIE = "id5id";
+const dummyTokenValue = 'Success OK';
+
+const getDataFromStorage = (dataKey) => {
+  return coreStorage.getDataFromLocalStorage(dataKey);
+};
+
+const mockHTTPRequestSuccess = (key, value) => {
+  coreStorage.setDataInLocalStorage(key, value);
+}
+
+describe("lockr AIM ID System", function () {
+  before(() => {
+    hook.ready();
+  });
+
+  describe("Check for invalid publisher config and GDPR", function () {
+    it("Should fail for invalid config", async function () {
+      // no Config
+      const idResult = await lockrAIMSystem.lockrAIMSubmodule.getId();
+      expect(idResult).is.eq(undefined);
+      const idResultNoConfig = await lockrAIMSystem.lockrAIMSubmodule.getId({});
+      expect(idResultNoConfig).is.eq(undefined);
+    });
+
+    it("Does not generate the token, when GDPR is enabled", async function () {
+      // Mocking the GDPR
+      const idResult = await lockrAIMSystem.lockrAIMSubmodule.getId(
+        defaultConfig,
+        { gdprApplies: true }
+      );
+      expect(idResult).is.eq(undefined);
+    });
+  });
+
+  describe("Generates the token successfully", function () {
+    it("Generates the UID2 token successfully", async function () {
+      mockHTTPRequestSuccess(UID2_COOKIE, dummyTokenValue);
+      await lockrAIMSystem.lockrAIMSubmodule.getId(defaultConfig);
+      const uid2Cookie = getDataFromStorage(UID2_COOKIE);
+      expect(uid2Cookie).is.eq(dummyTokenValue);
+    });
+
+    it("Generates the ID5 token successfully", async function () {
+      mockHTTPRequestSuccess(ID5_COOKIE, dummyTokenValue);
+      await lockrAIMSystem.lockrAIMSubmodule.getId(defaultConfig);
+      const id5Cookie = getDataFromStorage(ID5_COOKIE);
+      expect(id5Cookie).is.eq(dummyTokenValue);
+    });
+
+    it("Generates the liveramp token successfully", async function () {
+      mockHTTPRequestSuccess(LIVE_RAMP_COOKIE, dummyTokenValue);
+      await lockrAIMSystem.lockrAIMSubmodule.getId(defaultConfig);
+      const liveRampCookie = getDataFromStorage(LIVE_RAMP_COOKIE);
+      expect(liveRampCookie).is.eq(dummyTokenValue);
+    });
+  });
+});
diff --git a/test/spec/modules/loganBidAdapter_spec.js b/test/spec/modules/loganBidAdapter_spec.js
index a9859bbd4ae..f51f22580e2 100644
--- a/test/spec/modules/loganBidAdapter_spec.js
+++ b/test/spec/modules/loganBidAdapter_spec.js
@@ -79,7 +79,7 @@ describe('LoganBidAdapter', function () {
       expect(data).to.be.an('object');
       let placement = data['placements'][0];
       expect(placement).to.be.an('object');
-      expect(placement).to.have.keys('placementId', 'bidId', 'adFormat', 'wPlayer', 'hPlayer', 'schain', 'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity', 'bidfloor');
+      expect(placement).to.have.keys('placementId', 'bidId', 'adFormat', 'wPlayer', 'hPlayer', 'schain', 'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement', 'plcmt', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity', 'bidfloor');
       expect(placement.adFormat).to.equal(VIDEO);
       expect(placement.wPlayer).to.equal(playerSize[0]);
       expect(placement.hPlayer).to.equal(playerSize[1]);
diff --git a/test/spec/modules/logicadBidAdapter_spec.js b/test/spec/modules/logicadBidAdapter_spec.js
index 3c1383781b9..5c86ffc9325 100644
--- a/test/spec/modules/logicadBidAdapter_spec.js
+++ b/test/spec/modules/logicadBidAdapter_spec.js
@@ -36,6 +36,11 @@ describe('LogicadAdapter', function () {
         }
       }]
     }],
+    ortb2Imp: {
+      ext: {
+        ae: 1
+      }
+    },
     ortb2: {
       device: {
         sua: {
@@ -176,7 +181,10 @@ describe('LogicadAdapter', function () {
       numIframes: 1,
       stack: []
     },
-    auctionStart: 1563337198010
+    auctionStart: 1563337198010,
+    paapi: {
+      enabled: true
+    }
   };
   const serverResponse = {
     body: {
@@ -203,6 +211,49 @@ describe('LogicadAdapter', function () {
       }
     }
   };
+
+  const paapiServerResponse = {
+    body: {
+      seatbid:
+        [{
+          bid: {
+            requestId: '51ef8751f9aead',
+            cpm: 101.0234,
+            width: 300,
+            height: 250,
+            creativeId: '2019',
+            currency: 'JPY',
+            netRevenue: true,
+            ttl: 60,
+            ad: '
TEST
',
+            meta: {
+              advertiserDomains: ['logicad.com']
+            }
+          }
+        }],
+      ext: {
+        fledgeAuctionConfigs: [{
+          bidId: '51ef8751f9aead',
+          config: {
+            seller: 'https://fledge.ladsp.com',
+            decisionLogicUrl: 'https://fledge.ladsp.com/decision_logic.js',
+            interestGroupBuyers: ['https://fledge.ladsp.com'],
+            requestedSize: {width: '300', height: '250'},
+            allSlotsRequestedSizes: [{width: '300', height: '250'}],
+            sellerSignals: {signal: 'signal'},
+            sellerTimeout: '500',
+            perBuyerSignals: {'https://fledge.ladsp.com': {signal: 'signal'}},
+            perBuyerCurrencies: {'https://fledge.ladsp.com': 'USD'}
+          }
+        }]
+      },
+      userSync: {
+        type: 'image',
+        url: 'https://cr-p31.ladsp.jp/cookiesender/31'
+      }
+    }
+  };
+
   const nativeServerResponse = {
     body: {
       seatbid:
@@ -272,6 +323,11 @@ describe('LogicadAdapter', function () {
 
       const data = JSON.parse(request.data);
       expect(data.auctionId).to.equal('18fd8b8b0bd757');
+
+      // Protected Audience API flag
+      expect(data.bids[0]).to.have.property('ae');
+      expect(data.bids[0].ae).to.equal(1);
+
       expect(data.eids[0].source).to.equal('sharedid.org');
       expect(data.eids[0].uids[0].id).to.equal('fakesharedid');
 
@@ -330,6 +386,13 @@ describe('LogicadAdapter', function () {
       expect(interpretedResponse[0].ttl).to.equal(serverResponse.body.seatbid[0].bid.ttl);
       expect(interpretedResponse[0].meta.advertiserDomains).to.equal(serverResponse.body.seatbid[0].bid.meta.advertiserDomains);
 
+      // Protected Audience API
+      const paapiRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
+      const paapiInterpretedResponse = spec.interpretResponse(paapiServerResponse, paapiRequest);
+      expect(paapiInterpretedResponse).to.have.property('bids');
+      expect(paapiInterpretedResponse).to.have.property('paapi');
+      expect(paapiInterpretedResponse.paapi[0]).to.deep.equal(paapiServerResponse.body.ext.fledgeAuctionConfigs[0]);
+
       // native
       const nativeRequest = spec.buildRequests(nativeBidRequests, bidderRequest)[0];
       const interpretedResponseForNative = spec.interpretResponse(nativeServerResponse, nativeRequest);
diff --git a/test/spec/modules/lotamePanoramaIdSystem_spec.js b/test/spec/modules/lotamePanoramaIdSystem_spec.js
index ea538db08e1..27efef9df50 100644
--- a/test/spec/modules/lotamePanoramaIdSystem_spec.js
+++ b/test/spec/modules/lotamePanoramaIdSystem_spec.js
@@ -2,10 +2,11 @@ import {
   lotamePanoramaIdSubmodule,
   storage,
 } from 'modules/lotamePanoramaIdSystem.js';
-import { uspDataHandler } from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
 import sinon from 'sinon';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
 
 const responseHeader = { 'Content-Type': 'application/json' };
 
@@ -17,11 +18,9 @@ describe('LotameId', function() {
   let setLocalStorageStub;
   let removeFromLocalStorageStub;
   let timeStampStub;
-  let uspConsentDataStub;
   let requestHost;
 
   const nowTimestamp = new Date().getTime();
-
   beforeEach(function () {
     logErrorStub = sinon.stub(utils, 'logError');
     getCookieStub = sinon.stub(storage, 'getCookie');
@@ -33,7 +32,6 @@ describe('LotameId', function() {
       'removeDataFromLocalStorage'
     );
     timeStampStub = sinon.stub(utils, 'timestamp').returns(nowTimestamp);
-    uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
     if (navigator.userAgent && navigator.userAgent.indexOf('Safari') != -1 && navigator.userAgent.indexOf('Chrome') == -1) {
       requestHost = 'https://c.ltmsphrcl.net/id';
     } else {
@@ -49,7 +47,6 @@ describe('LotameId', function() {
     setLocalStorageStub.restore();
     removeFromLocalStorageStub.restore();
     timeStampStub.restore();
-    uspConsentDataStub.restore();
   });
 
   describe('caching initial data received from the remote server', function () {
@@ -450,70 +447,6 @@ describe('LotameId', function() {
     });
   });
 
-  describe('when gdpr applies and falls back to eupubconsent cookie', function () {
-    let request;
-    let callBackSpy = sinon.spy();
-    let consentData = {
-      gdprApplies: true,
-      consentString: undefined
-    };
-
-    beforeEach(function () {
-      getCookieStub
-        .withArgs('eupubconsent-v2')
-        .returns('consentGiven');
-
-      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
-      submoduleCallback(callBackSpy);
-
-      // the contents of the response don't matter for this
-      request = server.requests[0];
-      request.respond(200, responseHeader, '');
-    });
-
-    it('should call the remote server when getId is called', function () {
-      expect(callBackSpy.calledOnce).to.be.true;
-    });
-
-    it('should pass the gdpr consent string back', function() {
-      expect(request.url).to.be.eq(
-        `${requestHost}?gdpr_applies=true&gdpr_consent=consentGiven`
-      );
-    });
-  });
-
-  describe('when gdpr applies and falls back to euconsent cookie', function () {
-    let request;
-    let callBackSpy = sinon.spy();
-    let consentData = {
-      gdprApplies: true,
-      consentString: undefined
-    };
-
-    beforeEach(function () {
-      getCookieStub
-        .withArgs('euconsent-v2')
-        .returns('consentGiven');
-
-      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
-      submoduleCallback(callBackSpy);
-
-      // the contents of the response don't matter for this
-      request = server.requests[0];
-      request.respond(200, responseHeader, '');
-    });
-
-    it('should call the remote server when getId is called', function () {
-      expect(callBackSpy.calledOnce).to.be.true;
-    });
-
-    it('should pass the gdpr consent string back', function() {
-      expect(request.url).to.be.eq(
-        `${requestHost}?gdpr_applies=true&gdpr_consent=consentGiven`
-      );
-    });
-  });
-
   describe('when gdpr applies but no consent string is available', function () {
     let request;
     let callBackSpy = sinon.spy();
@@ -542,64 +475,6 @@ describe('LotameId', function() {
     });
   });
 
-  describe('when no consentData and falls back to eupubconsent cookie', function () {
-    let request;
-    let callBackSpy = sinon.spy();
-    let consentData;
-
-    beforeEach(function () {
-      getCookieStub
-        .withArgs('eupubconsent-v2')
-        .returns('consentGiven');
-
-      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
-      submoduleCallback(callBackSpy);
-
-      // the contents of the response don't matter for this
-      request = server.requests[0];
-      request.respond(200, responseHeader, '');
-    });
-
-    it('should call the remote server when getId is called', function () {
-      expect(callBackSpy.calledOnce).to.be.true;
-    });
-
-    it('should pass the gdpr consent string back', function() {
-      expect(request.url).to.be.eq(
-        `${requestHost}?gdpr_consent=consentGiven`
-      );
-    });
-  });
-
-  describe('when no consentData and falls back to euconsent cookie', function () {
-    let request;
-    let callBackSpy = sinon.spy();
-    let consentData;
-
-    beforeEach(function () {
-      getCookieStub
-        .withArgs('euconsent-v2')
-        .returns('consentGiven');
-
-      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
-      submoduleCallback(callBackSpy);
-
-      // the contents of the response don't matter for this
-      request = server.requests[0];
-      request.respond(200, responseHeader, '');
-    });
-
-    it('should call the remote server when getId is called', function () {
-      expect(callBackSpy.calledOnce).to.be.true;
-    });
-
-    it('should pass the gdpr consent string back', function() {
-      expect(request.url).to.be.eq(
-        `${requestHost}?gdpr_consent=consentGiven`
-      );
-    });
-  });
-
   describe('when no consentData and no cookies', function () {
     let request;
     let callBackSpy = sinon.spy();
@@ -808,7 +683,6 @@ describe('LotameId', function() {
         let callBackSpy = sinon.spy();
 
         beforeEach(function () {
-          uspConsentDataStub.returns('1NNN');
           let submoduleCallback = lotamePanoramaIdSubmodule.getId(
             {
               params: {
@@ -839,12 +713,6 @@ describe('LotameId', function() {
           expect(callBackSpy.calledOnce).to.be.true;
         });
 
-        it('should pass the usp consent string and client id back', function () {
-          expect(request.url).to.be.eq(
-            `${requestHost}?gdpr_applies=false&us_privacy=1NNN&c=1234`
-          );
-        });
-
         it('should NOT set an expiry for the client', function () {
           sinon.assert.neverCalledWith(
             setCookieStub,
@@ -958,4 +826,20 @@ describe('LotameId', function() {
       });
     });
   });
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(lotamePanoramaIdSubmodule);
+    });
+    it('lotamePanoramaId', function () {
+      const userId = {
+        lotamePanoramaId: 'some-random-id-value',
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'crwdcntrl.net',
+        uids: [{ id: 'some-random-id-value', atype: 1 }],
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/loyalBidAdapter_spec.js b/test/spec/modules/loyalBidAdapter_spec.js
new file mode 100644
index 00000000000..fbfcdcd0742
--- /dev/null
+++ b/test/spec/modules/loyalBidAdapter_spec.js
@@ -0,0 +1,476 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/loyalBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'loyal';
+
+describe('LoyalBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://us-east-1.loyal.app/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+});
diff --git a/test/spec/modules/luceadBidAdapter_spec.js b/test/spec/modules/luceadBidAdapter_spec.js
new file mode 100755
index 00000000000..6f61071b653
--- /dev/null
+++ b/test/spec/modules/luceadBidAdapter_spec.js
@@ -0,0 +1,184 @@
+/* eslint-disable prebid/validate-imports,no-undef */
+import { expect } from 'chai';
+import { spec } from 'modules/luceadBidAdapter.js';
+import sinon from 'sinon';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import {deepClone} from 'src/utils.js';
+import * as ajax from 'src/ajax.js';
+
+describe('Lucead Adapter', () => {
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      // noinspection JSCheckFunctionSignatures
+      const adapter = newBidder(spec);
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('utils functions', function () {
+    it('returns false', function () {
+      expect(spec.isDevEnv()).to.be.false;
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid;
+    beforeEach(function () {
+      bid = {
+        bidder: 'lucead',
+        params: {
+          placementId: '1',
+          region: 'eu',
+        },
+      };
+    });
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+
+  describe('onBidWon', function () {
+    let sandbox;
+    const bids = [
+      { foo: 'bar', creativeId: 'ssp:improve' },
+      { foo: 'bar', creativeId: '123:456' },
+    ];
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+
+    it('should trigger impression pixel', function () {
+      sandbox.spy(ajax, 'fetch');
+
+      for (const bid of bids) {
+        spec.onBidWon(bid);
+        expect(ajax?.fetch?.args[0][0]).to.match(/report\/impression$/);
+      }
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        bidder: 'lucead',
+        adUnitCode: 'lucead_code',
+        bidId: 'abc1234',
+        sizes: [[1800, 1000], [640, 300]],
+        requestId: 'xyz654',
+        params: {
+          placementId: '123',
+        }
+      }
+    ];
+
+    const bidderRequest = {
+      bidderRequestId: '13aaa3df18bfe4',
+      bids: {}
+    };
+
+    it('should have a post method', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should contains a request id equals to the bid id', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(request.data).bid_requests[0].bid_id).to.equal(bidRequests[0].bidId);
+    });
+
+    it('should have an url that contains sra keyword', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.contain('/prebid/sra');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const serverResponseBody = {
+      'request_id': '17548f887fb722',
+      'bids': [
+        {
+          'bid_id': '2d663fdd390b49',
+          'ad': '\u003chtml lang="en"\u003e\u003cbody style="margin:0;background-color:#FFF"\u003e\u003ciframe src="urn:uuid:fb81a0f9-b83a-4f27-8676-26760d090f1c" style="width:300px;height:250px;border:none" seamless \u003e\u003c/iframe\u003e\u003c/body\u003e\u003c/html\u003e',
+          'size': {
+            'width': 300,
+            'height': 250
+          },
+          'ad_id': '1',
+          'ig_id': '1',
+          'cpm': 1,
+          'currency': 'EUR',
+          'time': 0,
+          'ssp': '',
+          'placement_id': '1',
+          'is_pa': true
+        }
+      ]
+    };
+
+    const serverResponse = {body: serverResponseBody};
+
+    const bidRequest = {
+      data: JSON.stringify({
+        'request_id': '17548f887fb722',
+        'domain': 'lucead.com',
+        'bid_requests': [{
+          'bid_id': '2d663fdd390b49',
+          'sizes': [[300, 250], [300, 150]],
+          'media_types': {'banner': {'sizes': [[300, 250], [300, 150]]}},
+          'placement_id': '1'
+        }],
+      }),
+    };
+
+    it('should get correct bid response', function () {
+      const result = spec.interpretResponse(serverResponse, bidRequest);
+
+      // noinspection JSCheckFunctionSignatures
+      expect(Object.keys(result.bids[0])).to.have.members([
+        'requestId',
+        'cpm',
+        'width',
+        'height',
+        'currency',
+        'ttl',
+        'creativeId',
+        'netRevenue',
+        'ad',
+        'meta',
+      ]);
+    });
+
+    it('should return bid empty response', function () {
+      const serverResponse = {body: {bids: [{cpm: 0}]}};
+      const bidRequest = {data: '{}'};
+      const result = spec.interpretResponse(serverResponse, bidRequest);
+      expect(result.bids[0].ad).to.be.equal('');
+      expect(result.bids[0].cpm).to.be.equal(0);
+    });
+
+    it('should add advertiserDomains', function () {
+      const bidRequest = {data: JSON.stringify({
+        bidder: 'lucead',
+        params: {
+          placementId: '1',
+        }
+      })};
+
+      const result = spec.interpretResponse(serverResponse, bidRequest);
+      expect(Object.keys(result.bids[0].meta)).to.include.members(['advertiserDomains']);
+    });
+
+    it('should support enable_pa = false', function () {
+      serverResponse.body.enable_pa = false;
+      const result = spec.interpretResponse(serverResponse, bidRequest);
+      expect(result).to.be.an('array');
+      expect(result[0].cpm).to.be.greaterThan(0);
+    });
+  });
+});
diff --git a/test/spec/modules/lunamediahbBidAdapter_spec.js b/test/spec/modules/lunamediahbBidAdapter_spec.js
index 181b6e75fe7..8ae3220504d 100644
--- a/test/spec/modules/lunamediahbBidAdapter_spec.js
+++ b/test/spec/modules/lunamediahbBidAdapter_spec.js
@@ -1,145 +1,253 @@
 import {expect} from 'chai';
 import {spec} from '../../../modules/lunamediahbBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'lunamediahb';
 
 describe('LunamediaHBBidAdapter', function () {
-  const bid = {
-    bidId: '23fhj33i987f',
-    bidder: 'lunamediahb',
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
     mediaTypes: {
       [BANNER]: {
         sizes: [[300, 250]]
       }
     },
     params: {
-      placementId: 783,
-      traffic: BANNER
+
     }
-  };
+  }
 
   const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'test.com'
-    }
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
     it('Should return true if there are bidId, params and key parameters present', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
     });
     it('Should return false if at least one of parameters is not present', function () {
-      delete bid.params.placementId;
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
     });
   });
 
   describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
       expect(serverRequest.url).to.exist;
       expect(serverRequest.data).to.exist;
     });
+
     it('Returns POST method', function () {
       expect(serverRequest.method).to.equal('POST');
     });
+
     it('Returns valid URL', function () {
       expect(serverRequest.url).to.equal('https://balancer.lmgssp.com/?c=o&m=multi');
     });
-    it('Returns valid data if array of bids is valid', function () {
+
+    it('Returns general data valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
       expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
-      expect(data.gdpr).to.not.exist;
-      expect(data.ccpa).to.not.exist;
-      let placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'schain');
-      expect(placement.placementId).to.equal(783);
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal(BANNER);
-      expect(placement.schain).to.be.an('object');
-      expect(placement.sizes).to.be.an('array');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
     });
 
-    it('Returns valid data for mediatype video', function () {
-      const playerSize = [300, 300];
-      bid.mediaTypes = {};
-      bid.params.traffic = VIDEO;
-      bid.mediaTypes[VIDEO] = {
-        playerSize
-      };
-      serverRequest = spec.buildRequests([bid], bidderRequest);
-      let data = serverRequest.data;
-      expect(data).to.be.an('object');
-      let placement = data['placements'][0];
-      expect(placement).to.be.an('object');
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'wPlayer', 'hPlayer', 'schain', 'videoContext');
-      expect(placement.traffic).to.equal(VIDEO);
-      expect(placement.wPlayer).to.equal(playerSize[0]);
-      expect(placement.hPlayer).to.equal(playerSize[1]);
-    });
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
-    it('Returns valid data for mediatype native', function () {
-      const native = {
-        title: {
-          required: true
-        },
-        body: {
-          required: true
-        },
-        icon: {
-          required: true,
-          size: [64, 64]
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
         }
-      };
-
-      bid.mediaTypes = {};
-      bid.params.traffic = NATIVE;
-      bid.mediaTypes[NATIVE] = native;
-      serverRequest = spec.buildRequests([bid], bidderRequest);
-      let data = serverRequest.data;
-      expect(data).to.be.an('object');
-      let placement = data['placements'][0];
-      expect(placement).to.be.an('object');
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'native', 'schain');
-      expect(placement.traffic).to.equal(NATIVE);
-      expect(placement.native).to.equal(native);
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
     });
 
     it('Returns data with gdprConsent and without uspConsent', function () {
-      bidderRequest.gdprConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
 
     it('Returns data with uspConsent and without gdprConsent', function () {
-      bidderRequest.uspConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.ccpa).to.exist;
       expect(data.ccpa).to.be.a('string');
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
+
   describe('interpretResponse', function () {
     it('Should interpret banner response', function () {
       const banner = {
@@ -154,23 +262,28 @@ describe('LunamediaHBBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let bannerResponses = spec.interpretResponse(banner);
       expect(bannerResponses).to.be.an('array').that.is.not.empty;
       let dataItem = bannerResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-        'netRevenue', 'currency', 'dealId', 'mediaType');
-      expect(dataItem.requestId).to.equal('23fhj33i987f');
-      expect(dataItem.cpm).to.equal(0.4);
-      expect(dataItem.width).to.equal(300);
-      expect(dataItem.height).to.equal(250);
-      expect(dataItem.ad).to.equal('Test');
-      expect(dataItem.ttl).to.equal(120);
-      expect(dataItem.creativeId).to.equal('2');
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
       expect(dataItem.netRevenue).to.be.true;
-      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret video response', function () {
       const video = {
@@ -183,7 +296,11 @@ describe('LunamediaHBBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let videoResponses = spec.interpretResponse(video);
@@ -191,7 +308,7 @@ describe('LunamediaHBBidAdapter', function () {
 
       let dataItem = videoResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
-        'netRevenue', 'currency', 'dealId', 'mediaType');
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
       expect(dataItem.requestId).to.equal('23fhj33i987f');
       expect(dataItem.cpm).to.equal(0.5);
       expect(dataItem.vastUrl).to.equal('test.com');
@@ -199,6 +316,7 @@ describe('LunamediaHBBidAdapter', function () {
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
       expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret native response', function () {
       const native = {
@@ -216,13 +334,17 @@ describe('LunamediaHBBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let nativeResponses = spec.interpretResponse(native);
       expect(nativeResponses).to.be.an('array').that.is.not.empty;
 
       let dataItem = nativeResponses[0];
-      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native');
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
       expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
       expect(dataItem.requestId).to.equal('23fhj33i987f');
       expect(dataItem.cpm).to.equal(0.4);
@@ -235,6 +357,7 @@ describe('LunamediaHBBidAdapter', function () {
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
       expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should return an empty array if invalid banner response is passed', function () {
       const invBanner = {
@@ -326,5 +449,17 @@ describe('LunamediaHBBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://cookie.lmgssp.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cookie.lmgssp.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/luponmediaBidAdapter_spec.js b/test/spec/modules/luponmediaBidAdapter_spec.js
index 1441abc0fe8..664c888b45e 100755
--- a/test/spec/modules/luponmediaBidAdapter_spec.js
+++ b/test/spec/modules/luponmediaBidAdapter_spec.js
@@ -21,12 +21,12 @@ describe('luponmediaBidAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'siteId': 12345
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -385,49 +385,4 @@ describe('luponmediaBidAdapter', function () {
       expect(checkSchain).to.equal(false);
     });
   });
-
-  describe('onBidWon', function () {
-    const bidWonEvent = {
-      'bidderCode': 'luponmedia',
-      'width': 300,
-      'height': 250,
-      'statusMessage': 'Bid available',
-      'adId': '105bbf8c54453ff',
-      'requestId': '934b8752185955',
-      'mediaType': 'banner',
-      'source': 'client',
-      'cpm': 0.364,
-      'creativeId': '443801010',
-      'currency': 'USD',
-      'netRevenue': false,
-      'ttl': 300,
-      'referrer': '',
-      'ad': '',
-      'auctionId': '926a8ea3-3dd4-4bf2-95ab-c85c2ce7e99b',
-      'responseTimestamp': 1598527728026,
-      'requestTimestamp': 1598527727629,
-      'bidder': 'luponmedia',
-      'adUnitCode': 'div-gpt-ad-1533155193780-5',
-      'timeToRespond': 397,
-      'size': '300x250',
-      'status': 'rendered'
-    };
-
-    let ajaxStub;
-
-    beforeEach(() => {
-      ajaxStub = sinon.stub(spec, 'sendWinningsToServer')
-    })
-
-    afterEach(() => {
-      ajaxStub.restore()
-    })
-
-    it('calls luponmedia\'s callback endpoint', () => {
-      const result = spec.onBidWon(bidWonEvent);
-      expect(result).to.equal(undefined);
-      expect(ajaxStub.calledOnce).to.equal(true);
-      expect(ajaxStub.firstCall.args[0]).to.deep.equal(JSON.stringify(bidWonEvent));
-    });
-  });
 });
diff --git a/test/spec/modules/madvertiseBidAdapter_spec.js b/test/spec/modules/madvertiseBidAdapter_spec.js
index 466d30acdd3..8128bcc2d42 100644
--- a/test/spec/modules/madvertiseBidAdapter_spec.js
+++ b/test/spec/modules/madvertiseBidAdapter_spec.js
@@ -118,7 +118,7 @@ describe('madvertise adapater', () => {
       expect(req[0].url).to.contain(`&zoneId=test`);
       expect(req[0].url).to.contain(`&sizes[0]=728x90`);
       expect(req[0].url).to.contain(`&gdpr=1`);
-      expect(req[0].url).to.contain(`&consent[0][format]=IAB`);
+      expect(req[0].url).to.contain(`&consent[0][format]=iab`);
       expect(req[0].url).to.contain(`&consent[0][value]=CO_5mtSPHOmEIAsAkBFRBOCsAP_AAH_AAAqIHQgB7SrERyNAYWB5gusAKYlfQAQCA2AABAYdASgJQQBAMJYEkGAIuAnAACAKAAAEIHQAAAAlCCmABAEAAIABBSGMAQgABZAAIiAEEAATAABACAABGYCSCAIQjIAAAAEAgEKEAAoAQGBAAAEgBABAAAogACADAgXmACIKkQBAkBAYAkAYQAogAhAAAAAIAAAAAAAKAABAAAghAAQQAAAAAAAAAgAAAAABAAAAAAAAQAAAAAAAAABAAgAAAAAAAAAIAAAAAAAAAAAAAAAABAAAAAAAAAAAQCAKCgBgEQALgAqkJADAIgAXABVIaACAAERABAACKgAgABA`)
     });
 
diff --git a/test/spec/modules/magniteAnalyticsAdapter_spec.js b/test/spec/modules/magniteAnalyticsAdapter_spec.js
index 0864a976d7d..a5644ffc6eb 100644
--- a/test/spec/modules/magniteAnalyticsAdapter_spec.js
+++ b/test/spec/modules/magniteAnalyticsAdapter_spec.js
@@ -3,9 +3,10 @@ import magniteAdapter, {
   getHostNameFromReferer,
   storage,
   rubiConf,
-  detectBrowserFromUa
+  detectBrowserFromUa,
+  callPrebidCacheHook
 } from '../../../modules/magniteAnalyticsAdapter.js';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 import { config } from 'src/config.js';
 import { server } from 'test/mocks/xhr.js';
 import * as mockGpt from '../integration/faker/googletag.js';
@@ -16,19 +17,18 @@ let events = require('src/events.js');
 let utils = require('src/utils.js');
 
 const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    BID_REQUESTED,
-    BID_RESPONSE,
-    BIDDER_DONE,
-    BID_WON,
-    BID_TIMEOUT,
-    BILLABLE_EVENT,
-    SEAT_NON_BID,
-    BID_REJECTED
-  }
-} = CONSTANTS;
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_REQUESTED,
+  BID_RESPONSE,
+  BIDDER_DONE,
+  BID_WON,
+  BID_TIMEOUT,
+  BILLABLE_EVENT,
+  SEAT_NON_BID,
+  PBS_ANALYTICS,
+  BID_REJECTED
+} = EVENTS;
 
 const STUBBED_UUID = '12345678-1234-1234-1234-123456789abc';
 
@@ -240,6 +240,7 @@ const ANALYTICS_MESSAGE = {
   },
   'auctions': [
     {
+      'auctionIndex': 1,
       'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
       'auctionStart': 1658868383741,
       'samplingFactor': 1,
@@ -602,7 +603,22 @@ describe('magnite analytics adapter', function () {
       it(`should parse browser from ${testData.expected} user agent correctly`, function () {
         expect(detectBrowserFromUa(testData.ua)).to.equal(testData.expected);
       });
-    })
+    });
+
+    it('should increment auctionIndex each auction', function () {
+      // run 3 auctions
+      performStandardAuction();
+      performStandardAuction();
+      performStandardAuction();
+
+      expect(server.requests.length).to.equal(3);
+      server.requests.forEach((request, index) => {
+        let message = JSON.parse(request.requestBody);
+
+        // should be index of array + 1
+        expect(message?.auctions?.[0].auctionIndex).to.equal(index + 1);
+      });
+    });
 
     it('should pass along 1x1 size if no sizes in adUnit', function () {
       const auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
@@ -624,6 +640,45 @@ describe('magnite analytics adapter', function () {
       ]);
     });
 
+    it('should pass along atag data', function () {
+      const PBS_ANALYTICS_EVENT = {
+        'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+        atag: [{
+          'stage': 'processed-auction-request',
+          'module': 'mgni-timeout-optimization',
+          'analyticstags': [{
+            activities: [{
+              name: 'optimize-tmax',
+              status: 'success',
+              results: [{
+                status: 'success',
+                values: {
+                  'scenario': 'a',
+                  'rule': 'b',
+                  'tmax': 3
+                }
+              }]
+            }]
+          }]
+        }]
+      }
+
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+      events.emit(PBS_ANALYTICS, PBS_ANALYTICS_EVENT)
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message.auctions[0].experiments[0]).to.deep.equal({
+        name: 'a',
+        rule: 'b',
+        value: 3
+      });
+    });
+
     it('should pass along user ids', function () {
       let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
       auctionInit.bidderRequests[0].bids[0].userId = {
@@ -1137,6 +1192,39 @@ describe('magnite analytics adapter', function () {
       });
     });
 
+    it('should not use pbsBidId if the bid was client side cached', function () {
+      // bid response
+      let seatBidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+      seatBidResponse.pbsBidId = 'do-not-use-me';
+
+      // Run auction
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // mock client side cache call
+      callPrebidCacheHook(() => {}, {}, seatBidResponse);
+
+      events.emit(BID_RESPONSE, seatBidResponse);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      // Expect the ids sent to server to use the original bidId not the pbsBidId thing
+      expect(message.auctions[0].adUnits[0].bids[0].bidId).to.equal(MOCK.BID_RESPONSE.requestId);
+      expect(message.bidsWon[0].bidId).to.equal(MOCK.BID_RESPONSE.requestId);
+    });
+
     [0, '0'].forEach(pbsParam => {
       it(`should generate new bidId if incoming pbsBidId is ${pbsParam}`, function () {
         // bid response
@@ -1488,6 +1576,8 @@ describe('magnite analytics adapter', function () {
 
       // bid source should be 'server'
       expectedMessage.auctions[0].adUnits[0].bids[0].source = 'server';
+      // if one of bids.source === server should add pbsRequest flag to adUnit
+      expectedMessage.auctions[0].adUnits[0].pbsRequest = 1;
       expectedMessage.bidsWon[0].source = 'server';
       expect(message).to.deep.equal(expectedMessage);
     });
@@ -1707,6 +1797,95 @@ describe('magnite analytics adapter', function () {
         expect(message1.bidsWon).to.deep.equal([expectedMessage1]);
       });
     });
+    describe('cookieless', () => {
+      afterEach(() => {
+        magniteAdapter.disableAnalytics();
+      })
+      it('should not add cookieless and preserve original rule name', () => {
+        // Set the confs
+        config.setConfig({
+          rubicon: {
+            wrapperName: '1001_general',
+            wrapperFamily: 'general',
+            rule_name: 'desktop-magnite.com',
+          }
+        });
+        performStandardAuction();
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+
+        expect(request.url).to.match(/\/\/localhost:9999\/event/);
+
+        let message = JSON.parse(request.requestBody);
+        expect(message.wrapper).to.deep.equal({
+          name: '1001_general',
+          family: 'general',
+          rule: 'desktop-magnite.com',
+        });
+      })
+      it('should add sufix _cookieless to the wrapper.rule if ortb2.device.ext.cdep start with "treatment" or  "control_2"', () => {
+        // Set the confs
+        config.setConfig({
+          rubicon: {
+            wrapperName: '1001_general',
+            wrapperFamily: 'general',
+            rule_name: 'desktop-magnite.com',
+          }
+        });
+        const auctionId = MOCK.AUCTION_INIT.auctionId;
+
+        let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+        auctionInit.bidderRequests[0].ortb2.device.ext = { cdep: 'treatment' };
+        // Run auction
+        events.emit(AUCTION_INIT, auctionInit);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+        [gptSlotRenderEnded0].forEach(gptEvent => mockGpt.emitEvent(gptEvent.eventName, gptEvent.params));
+        events.emit(BID_WON, { ...MOCK.BID_WON, auctionId });
+        clock.tick(rubiConf.analyticsEventDelay);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        expect(message.wrapper).to.deep.equal({
+          name: '1001_general',
+          family: 'general',
+          rule: 'desktop-magnite.com_cookieless',
+        });
+      })
+      it('should add cookieless to the wrapper.rule if ortb2.device.ext.cdep start with "treatment" or  "control_2"', () => {
+        // Set the confs
+        config.setConfig({
+          rubicon: {
+            wrapperName: '1001_general',
+            wrapperFamily: 'general',
+          }
+        });
+        const auctionId = MOCK.AUCTION_INIT.auctionId;
+
+        let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+        auctionInit.bidderRequests[0].ortb2.device.ext = { cdep: 'control_2' };
+        // Run auction
+        events.emit(AUCTION_INIT, auctionInit);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+        [gptSlotRenderEnded0].forEach(gptEvent => mockGpt.emitEvent(gptEvent.eventName, gptEvent.params));
+        events.emit(BID_WON, { ...MOCK.BID_WON, auctionId });
+        clock.tick(rubiConf.analyticsEventDelay);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        expect(message.wrapper).to.deep.equal({
+          family: 'general',
+          name: '1001_general',
+          rule: 'cookieless',
+        });
+      });
+    });
   });
 
   describe('billing events integration', () => {
@@ -2123,7 +2302,7 @@ describe('magnite analytics adapter', function () {
     const runNonBidAuction = () => {
       events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
       events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
-      events.emit(SEAT_NON_BID, seatnonbid)
+      events.emit(PBS_ANALYTICS, seatnonbid)
       events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
       events.emit(AUCTION_END, MOCK.AUCTION_END);
       clock.tick(rubiConf.analyticsBatchTimeout + 1000);
diff --git a/test/spec/modules/malltvAnalyticsAdapter_spec.js b/test/spec/modules/malltvAnalyticsAdapter_spec.js
index c96069df0f9..2be9fe4b09f 100644
--- a/test/spec/modules/malltvAnalyticsAdapter_spec.js
+++ b/test/spec/modules/malltvAnalyticsAdapter_spec.js
@@ -5,7 +5,7 @@ import {
 import { expect } from 'chai'
 import { getCpmInEur } from '../../../modules/malltvAnalyticsAdapter'
 import * as events from 'src/events'
-import constants from 'src/constants.json'
+import { EVENTS } from 'src/constants.js'
 
 const auctionId = 'b0b39610-b941-4659-a87c-de9f62d3e13e'
 const propertyId = '123456'
@@ -481,14 +481,14 @@ describe('Malltv Prebid AnalyticsAdapter Testing', function () {
 
     it('should call handleBidTimeout as BID_TIMEOUT trigger event', function() {
       sinon.spy(malltvAnalyticsAdapter, 'handleBidTimeout')
-      events.emit(constants.EVENTS.BID_TIMEOUT, {})
+      events.emit(EVENTS.BID_TIMEOUT, {})
       sinon.assert.callCount(malltvAnalyticsAdapter.handleBidTimeout, 1)
       malltvAnalyticsAdapter.handleBidTimeout.restore()
     })
 
     it('should call handleAuctionEnd as AUCTION_END trigger event', function() {
       sinon.spy(malltvAnalyticsAdapter, 'handleAuctionEnd')
-      events.emit(constants.EVENTS.AUCTION_END, {})
+      events.emit(EVENTS.AUCTION_END, {})
       sinon.assert.callCount(malltvAnalyticsAdapter.handleAuctionEnd, 1)
       malltvAnalyticsAdapter.handleAuctionEnd.restore()
     })
diff --git a/test/spec/modules/mantisBidAdapter_spec.js b/test/spec/modules/mantisBidAdapter_spec.js
index 579f41e620d..f0f453d32a0 100644
--- a/test/spec/modules/mantisBidAdapter_spec.js
+++ b/test/spec/modules/mantisBidAdapter_spec.js
@@ -35,10 +35,10 @@ describe('MantisAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/mathildeadsBidAdapter_spec.js b/test/spec/modules/mathildeadsBidAdapter_spec.js
index 107906ec83d..cdd1ffbc4bd 100644
--- a/test/spec/modules/mathildeadsBidAdapter_spec.js
+++ b/test/spec/modules/mathildeadsBidAdapter_spec.js
@@ -3,21 +3,32 @@ import { spec } from '../../../modules/mathildeadsBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'mathildeads'
+const bidder = 'mathildeads';
 
 describe('MathildeAdsBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
-      bidder: bidder,
+      bidder,
       mediaTypes: {
         [BANNER]: {
           sizes: [[300, 250]]
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -30,8 +41,9 @@ describe('MathildeAdsBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -53,8 +65,9 @@ describe('MathildeAdsBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -66,14 +79,27 @@ describe('MathildeAdsBidAdapter', function () {
         sizes: [[300, 250]]
       }
     },
-    params: {}
+    params: {
+
+    }
   }
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
     timeout: 500
   };
@@ -110,6 +136,7 @@ describe('MathildeAdsBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -127,7 +154,7 @@ describe('MathildeAdsBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -142,6 +169,8 @@ describe('MathildeAdsBidAdapter', function () {
         expect(placement.bidId).to.be.a('string');
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -167,8 +196,10 @@ describe('MathildeAdsBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -183,12 +214,38 @@ describe('MathildeAdsBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -367,6 +424,7 @@ describe('MathildeAdsBidAdapter', function () {
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
+
   describe('getUserSyncs', function() {
     it('Should return array of objects with proper sync config , include GDPR', function() {
       const syncData = spec.getUserSyncs({}, {}, {
@@ -391,5 +449,17 @@ describe('MathildeAdsBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://cs2.mathilde-ads.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs2.mathilde-ads.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/mediaConsortiumBidAdapter_spec.js b/test/spec/modules/mediaConsortiumBidAdapter_spec.js
new file mode 100644
index 00000000000..6a7ac6f5741
--- /dev/null
+++ b/test/spec/modules/mediaConsortiumBidAdapter_spec.js
@@ -0,0 +1,411 @@
+import { expect } from 'chai';
+import { spec, OPTIMIZATIONS_STORAGE_KEY, getOptimizationsFromLocalStorage } from 'modules/mediaConsortiumBidAdapter.js';
+
+const BANNER_BID = {
+  adUnitCode: 'dfp_ban_atf',
+  bidId: '2f0d9715f60be8',
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250]
+      ]
+    }
+  }
+}
+
+const VIDEO_BID = {
+  adUnitCode: 'video',
+  bidId: '2f0d9715f60be8',
+  mediaTypes: {
+    video: {
+      playerSize: [
+        [300, 250]
+      ],
+      context: 'outstream'
+    }
+  }
+}
+
+const VIDEO_BID_WITH_MISSING_CONTEXT = {
+  adUnitCode: 'video',
+  bidId: '2f0d9715f60be8',
+  mediaTypes: {
+    video: {
+      playerSize: [
+        [300, 250]
+      ]
+    }
+  }
+}
+
+const MULTI_MEDIATYPES_BID = {
+  adUnitCode: 'multi_type',
+  bidId: '2f0d9715f60be8',
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250]
+      ]
+    },
+    video: {
+      playerSize: [
+        [300, 250]
+      ],
+      context: 'outstream'
+    }
+  }
+}
+
+const MULTI_MEDIATYPES_WITH_INVALID_VIDEO_CONTEXT = {
+  adUnitCode: 'multi_type',
+  bidId: '2f0d9715f60be8',
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250]
+      ]
+    },
+    video: {
+      playerSize: [
+        [300, 250]
+      ],
+      context: 'instream'
+    }
+  }
+}
+
+describe('Media Consortium Bid Adapter', function () {
+  before(function () {
+    // The local storage variable is not cleaned in some other test so we need to do it ourselves here
+    localStorage.removeItem('ope_fpid')
+  })
+
+  beforeEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      mediaConsortium: {
+        storageAllowed: true
+      }
+    }
+  })
+
+  afterEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {};
+  })
+
+  describe('buildRequests', function () {
+    const bidderRequest = {
+      auctionId: '98bb5f61-4140-4ced-8b0e-65a33d792ab8',
+      ortb2: {
+        device: {
+          w: 1200,
+          h: 400,
+          dnt: 0
+        },
+        site: {
+          page: 'http://localhost.com',
+          domain: 'localhost.com'
+        }
+      }
+    };
+
+    it('should build a banner request', function () {
+      const builtSyncRequest = {
+        gdpr: false,
+        ad_unit_codes: BANNER_BID.adUnitCode
+      }
+
+      const builtBidRequest = {
+        id: '98bb5f61-4140-4ced-8b0e-65a33d792ab8',
+        impressions: [{
+          id: BANNER_BID.bidId,
+          adUnitCode: BANNER_BID.adUnitCode,
+          mediaTypes: BANNER_BID.mediaTypes
+        }],
+        device: {
+          w: 1200,
+          h: 400,
+          dnt: 0
+        },
+        site: {
+          page: 'http://localhost.com',
+          domain: 'localhost.com'
+        },
+        user: {
+          ids: {}
+        },
+        options: {
+          useProfileApi: false
+        },
+        regulations: {
+          gdpr: {
+            applies: false,
+            consentString: undefined
+          }
+        },
+        timeout: 3600
+      }
+
+      const bids = [BANNER_BID]
+      const [syncRequest, auctionRequest] = spec.buildRequests(bids, {...bidderRequest, bids});
+
+      expect(syncRequest.data).to.deep.equal(builtSyncRequest)
+      expect(auctionRequest.data).to.deep.equal(builtBidRequest)
+    })
+
+    it('should build a video request', function () {
+      const builtSyncRequest = {
+        gdpr: false,
+        ad_unit_codes: VIDEO_BID.adUnitCode
+      }
+
+      const builtBidRequest = {
+        id: '98bb5f61-4140-4ced-8b0e-65a33d792ab8',
+        impressions: [{
+          id: VIDEO_BID.bidId,
+          adUnitCode: VIDEO_BID.adUnitCode,
+          mediaTypes: VIDEO_BID.mediaTypes
+        }],
+        device: {
+          w: 1200,
+          h: 400,
+          dnt: 0
+        },
+        site: {
+          page: 'http://localhost.com',
+          domain: 'localhost.com'
+        },
+        user: {
+          ids: {}
+        },
+        options: {
+          useProfileApi: false
+        },
+        regulations: {
+          gdpr: {
+            applies: false,
+            consentString: undefined
+          }
+        },
+        timeout: 3600
+      }
+
+      const bids = [VIDEO_BID]
+      const [syncRequest, auctionRequest] = spec.buildRequests(bids, {...bidderRequest, bids});
+
+      expect(syncRequest.data).to.deep.equal(builtSyncRequest)
+      expect(auctionRequest.data).to.deep.equal(builtBidRequest)
+    })
+
+    it('should build a request with multiple mediatypes', function () {
+      const builtSyncRequest = {
+        gdpr: false,
+        ad_unit_codes: MULTI_MEDIATYPES_BID.adUnitCode
+      }
+
+      const builtBidRequest = {
+        id: '98bb5f61-4140-4ced-8b0e-65a33d792ab8',
+        impressions: [{
+          id: MULTI_MEDIATYPES_BID.bidId,
+          adUnitCode: MULTI_MEDIATYPES_BID.adUnitCode,
+          mediaTypes: MULTI_MEDIATYPES_BID.mediaTypes
+        }],
+        device: {
+          w: 1200,
+          h: 400,
+          dnt: 0
+        },
+        site: {
+          page: 'http://localhost.com',
+          domain: 'localhost.com'
+        },
+        user: {
+          ids: {}
+        },
+        options: {
+          useProfileApi: false
+        },
+        regulations: {
+          gdpr: {
+            applies: false,
+            consentString: undefined
+          }
+        },
+        timeout: 3600
+      }
+
+      const bids = [MULTI_MEDIATYPES_BID]
+      const [syncRequest, auctionRequest] = spec.buildRequests(bids, {...bidderRequest, bids});
+
+      expect(syncRequest.data).to.deep.equal(builtSyncRequest)
+      expect(auctionRequest.data).to.deep.equal(builtBidRequest)
+    })
+
+    it('should not build a request if optimizations are there for the adunit code', function () {
+      const bids = [BANNER_BID]
+      const optimizations = {
+        [bids[0].adUnitCode]: {isEnabled: false, expiresAt: Date.now() + 600000}
+      }
+
+      localStorage.setItem(OPTIMIZATIONS_STORAGE_KEY, JSON.stringify(optimizations))
+
+      const requests = spec.buildRequests(bids, {...bidderRequest, bids});
+
+      localStorage.removeItem(OPTIMIZATIONS_STORAGE_KEY)
+
+      expect(requests).to.be.undefined
+    })
+
+    it('should exclude video requests where context is missing or not equal to outstream', function () {
+      const builtSyncRequest = {
+        gdpr: false,
+        ad_unit_codes: MULTI_MEDIATYPES_WITH_INVALID_VIDEO_CONTEXT.adUnitCode
+      }
+
+      const builtBidRequest = {
+        id: '98bb5f61-4140-4ced-8b0e-65a33d792ab8',
+        impressions: [{
+          id: MULTI_MEDIATYPES_WITH_INVALID_VIDEO_CONTEXT.bidId,
+          adUnitCode: MULTI_MEDIATYPES_WITH_INVALID_VIDEO_CONTEXT.adUnitCode,
+          mediaTypes: {banner: MULTI_MEDIATYPES_WITH_INVALID_VIDEO_CONTEXT.mediaTypes.banner}
+        }],
+        device: {
+          w: 1200,
+          h: 400,
+          dnt: 0
+        },
+        site: {
+          page: 'http://localhost.com',
+          domain: 'localhost.com'
+        },
+        user: {
+          ids: {}
+        },
+        options: {
+          useProfileApi: false
+        },
+        regulations: {
+          gdpr: {
+            applies: false,
+            consentString: undefined
+          }
+        },
+        timeout: 3600
+      }
+
+      const invalidVideoBids = [VIDEO_BID_WITH_MISSING_CONTEXT]
+      const multiMediatypesBidWithInvalidVideo = [MULTI_MEDIATYPES_WITH_INVALID_VIDEO_CONTEXT]
+
+      expect(spec.buildRequests(invalidVideoBids, {...bidderRequest, bids: invalidVideoBids})).to.be.undefined
+
+      const [syncRequest, auctionRequest] = spec.buildRequests(multiMediatypesBidWithInvalidVideo, {...bidderRequest, bids: multiMediatypesBidWithInvalidVideo})
+
+      expect(syncRequest.data).to.deep.equal(builtSyncRequest)
+      expect(auctionRequest.data).to.deep.equal(builtBidRequest)
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('should return an empty array if the response is invalid', function () {
+      expect(spec.interpretResponse({body: 'INVALID_BODY'}, {})).to.deep.equal([]);
+    })
+
+    it('should return a formatted bid', function () {
+      const serverResponse = {
+        body: {
+          id: 'requestId',
+          bids: [{
+            impressionId: '2f0d9715f60be8',
+            price: {
+              cpm: 1,
+              currency: 'JPY'
+            },
+            dealId: 'TEST_DEAL_ID',
+            ad: {
+              creative: {
+                id: 'CREATIVE_ID',
+                mediaType: 'banner',
+                size: {width: 320, height: 250},
+                markup: '
1
'
+              }
+            },
+            ttl: 3600
+          }],
+          optimizations: [
+            {
+              adUnitCode: 'test_ad_unit_code',
+              isEnabled: false,
+              ttl: 12000
+            },
+            {
+              adUnitCode: 'test_ad_unit_code_2',
+              isEnabled: true,
+              ttl: 12000
+            }
+          ]
+        }
+      }
+
+      const formattedBid = {
+        requestId: '2f0d9715f60be8',
+        cpm: 1,
+        currency: 'JPY',
+        dealId: 'TEST_DEAL_ID',
+        ttl: 3600,
+        netRevenue: true,
+        creativeId: 'CREATIVE_ID',
+        mediaType: 'banner',
+        width: 320,
+        height: 250,
+        ad: '
1
',
+        adUrl: null
+      }
+
+      const formattedResponse = spec.interpretResponse(serverResponse, {})
+      const storedOptimizations = getOptimizationsFromLocalStorage()
+
+      localStorage.removeItem(OPTIMIZATIONS_STORAGE_KEY)
+
+      expect(formattedResponse).to.deep.equal([formattedBid]);
+
+      expect(storedOptimizations['test_ad_unit_code']).to.exist
+      expect(storedOptimizations['test_ad_unit_code'].isEnabled).to.equal(false)
+      expect(storedOptimizations['test_ad_unit_code'].expiresAt).to.be.a('number')
+
+      expect(storedOptimizations['test_ad_unit_code_2']).to.exist
+      expect(storedOptimizations['test_ad_unit_code_2'].isEnabled).to.equal(true)
+      expect(storedOptimizations['test_ad_unit_code_2'].expiresAt).to.be.a('number')
+    })
+  });
+
+  describe('getUserSyncs', function () {
+    it('should return an empty response if the response is invalid or missing data', function () {
+      expect(spec.getUserSyncs(null, [{body: 'INVALID_BODY'}])).to.be.undefined;
+      expect(spec.getUserSyncs(null, [{body: 'INVALID_BODY'}, {body: 'INVALID_BODY'}])).to.be.undefined;
+    })
+
+    it('should return an array of user syncs', function () {
+      const serverResponses = [
+        {
+          body: {
+            bidders: [
+              {type: 'image', url: 'https://test-url.com'},
+              {type: 'redirect', url: 'https://test-url.com'},
+              {type: 'iframe', url: 'https://test-url.com'}
+            ]
+          }
+        },
+        {
+          body: 'BID-RESPONSE-DATA'
+        }
+      ]
+
+      const formattedUserSyncs = [
+        {type: 'image', url: 'https://test-url.com'},
+        {type: 'image', url: 'https://test-url.com'},
+        {type: 'iframe', url: 'https://test-url.com'}
+      ]
+
+      expect(spec.getUserSyncs(null, serverResponses)).to.deep.equal(formattedUserSyncs);
+    })
+  });
+});
diff --git a/test/spec/modules/mediabramaBidAdapter_spec.js b/test/spec/modules/mediabramaBidAdapter_spec.js
new file mode 100644
index 00000000000..d7341e02f17
--- /dev/null
+++ b/test/spec/modules/mediabramaBidAdapter_spec.js
@@ -0,0 +1,256 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/mediabramaBidAdapter.js';
+import { BANNER } from '../../../src/mediaTypes.js';
+import * as utils from '../../../src/utils.js';
+
+describe('MediaBramaBidAdapter', function () {
+  const bid = {
+    bidId: '23dc19818e5293',
+    bidder: 'mediabrama',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 24428,
+    }
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      delete bid.params.placementId;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://prebid.mediabrama.com/pbjs');
+    });
+    it('Returns valid data if array of bids is valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'host', 'page', 'placements');
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.gdpr).to.not.exist;
+      expect(data.ccpa).to.not.exist;
+      let placement = data['placements'][0];
+      expect(placement).to.have.keys('placementId', 'bidId', 'adFormat', 'sizes', 'schain', 'bidfloor');
+      expect(placement.placementId).to.equal(24428);
+      expect(placement.bidId).to.equal('23dc19818e5293');
+      expect(placement.adFormat).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.sizes).to.be.an('array');
+      expect(placement.bidfloor).to.exist.and.to.equal(0);
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      bidderRequest.gdprConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([]);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23dc19818e5293',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {}
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23dc19818e5293');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.width).to.equal(300);
+      expect(dataItem.height).to.equal(250);
+      expect(dataItem.ad).to.equal('Test');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23dc19818e5293',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should do nothing on getUserSyncs', function () {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://prebid.mediabrama.com/sync/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+  });
+
+  describe('on bidWon', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('should replace nurl for banner', function () {
+      const nurl = 'nurl/?ap=${' + 'AUCTION_PRICE}';
+      const bid = {
+        'bidderCode': 'mediabrama',
+        'width': 300,
+        'height': 250,
+        'statusMessage': 'Bid available',
+        'adId': '5691dd18ba6ab6',
+        'requestId': '23dc19818e5293',
+        'transactionId': '948c716b-bf64-4303-bcf4-395c2f6a9770',
+        'auctionId': 'a6b7c61f-15a9-481b-8f64-e859787e9c07',
+        'mediaType': 'banner',
+        'source': 'client',
+        'ad': "
\n",
+        'cpm': 0.61,
+        'nurl': nurl,
+        'creativeId': 'test',
+        'currency': 'USD',
+        'dealId': '',
+        'meta': {
+          'advertiserDomains': [],
+          'dchain': {
+            'ver': '1.0',
+            'complete': 0,
+            'nodes': [
+              {
+                'name': 'mediabrama'
+              }
+            ]
+          }
+        },
+        'netRevenue': true,
+        'ttl': 185,
+        'metrics': {},
+        'adapterCode': 'mediabrama',
+        'originalCpm': 0.61,
+        'originalCurrency': 'USD',
+        'responseTimestamp': 1668162732297,
+        'requestTimestamp': 1668162732292,
+        'bidder': 'mediabrama',
+        'adUnitCode': 'div-prebid',
+        'timeToRespond': 5,
+        'pbLg': '0.50',
+        'pbMg': '0.60',
+        'pbHg': '0.61',
+        'pbAg': '0.61',
+        'pbDg': '0.61',
+        'pbCg': '',
+        'size': '300x250',
+        'adserverTargeting': {
+          'hb_bidder': 'mediabrama',
+          'hb_adid': '5691dd18ba6ab6',
+          'hb_pb': '0.61',
+          'hb_size': '300x250',
+          'hb_source': 'client',
+          'hb_format': 'banner',
+          'hb_adomain': ''
+        },
+        'status': 'rendered',
+        'params': [
+          {
+            'placementId': 24428
+          }
+        ]
+      };
+      spec.onBidWon(bid);
+      expect(bid.nurl).to.deep.equal('nurl/?ap=0.61');
+    });
+  });
+});
diff --git a/test/spec/modules/mediafilterRtdProvider_spec.js b/test/spec/modules/mediafilterRtdProvider_spec.js
new file mode 100644
index 00000000000..fe9fb855629
--- /dev/null
+++ b/test/spec/modules/mediafilterRtdProvider_spec.js
@@ -0,0 +1,147 @@
+import * as utils from '../../../src/utils.js';
+import * as hook from '../../../src/hook.js'
+import * as events from '../../../src/events.js';
+import { EVENTS } from '../../../src/constants.js';
+
+import {
+  MediaFilter,
+  MEDIAFILTER_EVENT_TYPE,
+  MEDIAFILTER_BASE_URL
+} from '../../../modules/mediafilterRtdProvider.js';
+
+describe('The Media Filter RTD module', function () {
+  describe('register()', function() {
+    let submoduleSpy, generateInitHandlerSpy;
+
+    beforeEach(function () {
+      submoduleSpy = sinon.spy(hook, 'submodule');
+      generateInitHandlerSpy = sinon.spy(MediaFilter, 'generateInitHandler');
+    });
+
+    afterEach(function () {
+      submoduleSpy.restore();
+      generateInitHandlerSpy.restore();
+    });
+
+    it('should register and call the submodule function(s)', function () {
+      MediaFilter.register();
+
+      expect(submoduleSpy.calledOnceWithExactly('realTimeData', sinon.match.object)).to.be.true;
+      expect(submoduleSpy.called).to.be.true;
+      expect(generateInitHandlerSpy.called).to.be.true;
+    });
+  });
+
+  describe('setup()', function() {
+    let setupEventListenerSpy, setupScriptSpy;
+
+    beforeEach(function() {
+      setupEventListenerSpy = sinon.spy(MediaFilter, 'setupEventListener');
+      setupScriptSpy = sinon.spy(MediaFilter, 'setupScript');
+    });
+
+    afterEach(function() {
+      setupEventListenerSpy.restore();
+      setupScriptSpy.restore();
+    });
+
+    it('should call setupEventListener and setupScript function(s)', function() {
+      MediaFilter.setup({ configurationHash: 'abc123' });
+
+      expect(setupEventListenerSpy.called).to.be.true;
+      expect(setupScriptSpy.called).to.be.true;
+    });
+  });
+
+  describe('setupEventListener()', function() {
+    let setupEventListenerSpy, addEventListenerSpy;
+
+    beforeEach(function() {
+      setupEventListenerSpy = sinon.spy(MediaFilter, 'setupEventListener');
+      addEventListenerSpy = sinon.spy(window, 'addEventListener');
+    });
+
+    afterEach(function() {
+      setupEventListenerSpy.restore();
+      addEventListenerSpy.restore();
+    });
+
+    it('should call addEventListener function(s)', function() {
+      MediaFilter.setupEventListener();
+      expect(addEventListenerSpy.called).to.be.true;
+      expect(addEventListenerSpy.calledWith('message', sinon.match.func)).to.be.true;
+    });
+  });
+
+  describe('generateInitHandler()', function() {
+    let generateInitHandlerSpy, setupMock, logErrorSpy;
+
+    beforeEach(function() {
+      generateInitHandlerSpy = sinon.spy(MediaFilter, 'generateInitHandler');
+      setupMock = sinon.stub(MediaFilter, 'setup').throws(new Error('Mocked error!'));
+      logErrorSpy = sinon.spy(utils, 'logError');
+    });
+
+    afterEach(function() {
+      generateInitHandlerSpy.restore();
+      setupMock.restore();
+      logErrorSpy.restore();
+    });
+
+    it('should handle errors in the catch block when setup throws an error', function() {
+      const initHandler = MediaFilter.generateInitHandler();
+      initHandler({});
+
+      expect(logErrorSpy.calledWith('Error in initialization: Mocked error!')).to.be.true;
+    });
+  });
+
+  describe('generateEventHandler()', function() {
+    let generateEventHandlerSpy, eventsEmitSpy;
+
+    beforeEach(function() {
+      generateEventHandlerSpy = sinon.spy(MediaFilter, 'generateEventHandler');
+      eventsEmitSpy = sinon.spy(events, 'emit');
+    });
+
+    afterEach(function() {
+      generateEventHandlerSpy.restore();
+      eventsEmitSpy.restore();
+    });
+
+    it('should emit a billable event when the event type matches', function() {
+      const configurationHash = 'abc123';
+      const eventHandler = MediaFilter.generateEventHandler(configurationHash);
+
+      const mockEvent = {
+        data: {
+          type: MEDIAFILTER_EVENT_TYPE.concat('.', configurationHash)
+        }
+      };
+
+      eventHandler(mockEvent);
+
+      expect(eventsEmitSpy.calledWith(EVENTS.BILLABLE_EVENT, {
+        'billingId': sinon.match.string,
+        'configurationHash': configurationHash,
+        'type': 'impression',
+        'vendor': 'mediafilter',
+      })).to.be.true;
+    });
+
+    it('should not emit a billable event when the event type does not match', function() {
+      const configurationHash = 'abc123';
+      const eventHandler = MediaFilter.generateEventHandler(configurationHash);
+
+      const mockEvent = {
+        data: {
+          type: 'differentEventType'
+        }
+      };
+
+      eventHandler(mockEvent);
+
+      expect(eventsEmitSpy.called).to.be.false;
+    });
+  });
+});
diff --git a/test/spec/modules/mediafuseBidAdapter_spec.js b/test/spec/modules/mediafuseBidAdapter_spec.js
index dd2b5df70bd..1fb09265d56 100644
--- a/test/spec/modules/mediafuseBidAdapter_spec.js
+++ b/test/spec/modules/mediafuseBidAdapter_spec.js
@@ -35,23 +35,23 @@ describe('MediaFuseAdapter', function () {
     });
 
     it('should return true when required params found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'member': '1234',
         'invCode': 'ABCD'
       };
 
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(true);
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placementId': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/mediagoBidAdapter_spec.js b/test/spec/modules/mediagoBidAdapter_spec.js
index e77af544429..5a1545ae028 100644
--- a/test/spec/modules/mediagoBidAdapter_spec.js
+++ b/test/spec/modules/mediagoBidAdapter_spec.js
@@ -1,5 +1,14 @@
 import { expect } from 'chai';
-import { spec } from 'modules/mediagoBidAdapter.js';
+import {
+  spec,
+  getPmgUID,
+  storage,
+  THIRD_PARTY_COOKIE_ORIGIN,
+  COOKIE_KEY_MGUID,
+  getCurrentTimeToUTCString
+} from 'modules/mediagoBidAdapter.js';
+import { getPageTitle, getPageDescription, getPageKeywords, getConnectionDownLink } from '../../../libraries/fpdUtils/pageInfo.js';
+import * as utils from 'src/utils.js';
 
 describe('mediago:BidAdapterTests', function () {
   let bidRequestData = {
@@ -11,12 +20,49 @@ describe('mediago:BidAdapterTests', function () {
         bidder: 'mediago',
         params: {
           token: '85a6b01e41ac36d49744fad726e3655d',
+          siteId: 'siteId_01',
+          zoneId: 'zoneId_01',
+          publisher: '52',
+          position: 'left',
+          referrer: 'https://trace.mediago.io',
           bidfloor: 0.01,
+          ortb2Imp: {
+            ext: {
+              gpid: 'adslot_gpid',
+              tid: 'tid_01',
+              data: {
+                browsi: {
+                  browsiViewability: 'NA'
+                },
+                adserver: {
+                  name: 'adserver_name',
+                  adslot: 'adslot_name'
+                },
+                pbadslot: '/12345/my-gpt-tag-0'
+              }
+            }
+          }
         },
         mediaTypes: {
           banner: {
             sizes: [[300, 250]],
+            pos: 'left'
+          }
+        },
+        ortb2: {
+          site: {
+        	cat: ['IAB2'],
+            keywords: 'power tools, drills, tools=industrial',
+            content: {
+              keywords: 'video, source=streaming'
+            },
+
           },
+          user: {
+            ext: {
+              data: {}
+            }
+          }
         },
         adUnitCode: 'regular_iframe',
         transactionId: '7b26fdae-96e6-4c35-a18b-218dda11397d',
@@ -27,9 +73,83 @@ describe('mediago:BidAdapterTests', function () {
         src: 'client',
         bidRequestsCount: 1,
         bidderRequestsCount: 1,
-        bidderWinsCount: 0,
-      },
+        bidderWinsCount: 0
+      }
     ],
+    gdprConsent: {
+      consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==',
+      gdprApplies: true,
+      apiVersion: 2,
+      vendorData: {
+        purpose: {
+          consents: {
+            1: false
+          }
+        }
+      }
+    },
+    userId: {
+      tdid: 'sample-userid',
+      uid2: { id: 'sample-uid2-value' },
+      criteoId: 'sample-criteo-userid',
+      netId: 'sample-netId-userid',
+      idl_env: 'sample-idl-userid',
+      pubProvidedId: [
+        {
+          source: 'puburl.com',
+          uids: [
+            {
+              id: 'pubid2',
+              atype: 1,
+              ext: {
+                stype: 'ppuid'
+              }
+            }
+          ]
+        },
+        {
+          source: 'puburl2.com',
+          uids: [
+            {
+              id: 'pubid2'
+            },
+            {
+              id: 'pubid2-123'
+            }
+          ]
+        }
+      ]
+    },
+    userIdAsEids: [
+      {
+        source: 'adserver.org',
+        uids: [{ id: 'sample-userid' }]
+      },
+      {
+        source: 'criteo.com',
+        uids: [{ id: 'sample-criteo-userid' }]
+      },
+      {
+        source: 'netid.de',
+        uids: [{ id: 'sample-netId-userid' }]
+      },
+      {
+        source: 'liveramp.com',
+        uids: [{ id: 'sample-idl-userid' }]
+      },
+      {
+        source: 'uidapi.com',
+        uids: [{ id: 'sample-uid2-value' }]
+      },
+      {
+        source: 'puburl.com',
+        uids: [{ id: 'pubid1' }]
+      },
+      {
+        source: 'puburl2.com',
+        uids: [{ id: 'pubid2' }, { id: 'pubid2-123' }]
+      }
+    ]
   };
   let request = [];
 
@@ -38,8 +158,8 @@ describe('mediago:BidAdapterTests', function () {
       spec.isBidRequestValid({
         bidder: 'mediago',
         params: {
-          token: ['85a6b01e41ac36d49744fad726e3655d'],
-        },
+          token: ['85a6b01e41ac36d49744fad726e3655d']
+        }
       })
     ).to.equal(true);
   });
@@ -50,11 +170,54 @@ describe('mediago:BidAdapterTests', function () {
     expect(req_data.imp).to.have.lengthOf(1);
   });
 
+  describe('mediago: buildRequests', function() {
+    describe('getPmgUID function', function() {
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.sandbox.create();
+        sandbox.stub(storage, 'getCookie');
+        sandbox.stub(storage, 'setCookie');
+        sandbox.stub(utils, 'generateUUID').returns('new-uuid');
+        sandbox.stub(storage, 'cookiesAreEnabled');
+      })
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should generate new UUID and set cookie if not exists', () => {
+        storage.cookiesAreEnabled.callsFake(() => true);
+        storage.getCookie.callsFake(() => null);
+        const uid = getPmgUID();
+        expect(uid).to.equal('new-uuid');
+        expect(storage.setCookie.calledOnce).to.be.true;
+      });
+
+      it('should return existing UUID from cookie', () => {
+        storage.cookiesAreEnabled.callsFake(() => true);
+        storage.getCookie.callsFake(() => 'existing-uuid');
+        const uid = getPmgUID();
+        expect(uid).to.equal('existing-uuid');
+        expect(storage.setCookie.called).to.be.false;
+      });
+
+      it('should not set new UUID when cookies are not enabled', () => {
+        storage.cookiesAreEnabled.callsFake(() => false);
+        storage.getCookie.callsFake(() => null);
+        getPmgUID();
+        expect(storage.setCookie.calledOnce).to.be.false;
+      });
+    })
+  });
+
   it('mediago:validate_response_params', function () {
-    let adm = "";
+    let adm =
+      '';
     let temp = '%3Cscr';
     temp += 'ipt%3E';
-    temp += '!function()%7B%22use%20strict%22%3Bfunction%20f(t)%7Breturn(f%3D%22function%22%3D%3Dtypeof%20Symbol%26%26%22symbol%22%3D%3Dtypeof%20Symbol.iterator%3Ffunction(t)%7Breturn%20typeof%20t%7D%3Afunction(t)%7Breturn%20t%26%26%22function%22%3D%3Dtypeof%20Symbol%26%26t.constructor%3D%3D%3DSymbol%26%26t!%3D%3DSymbol.prototype%3F%22symbol%22%3Atypeof%20t%7D)(t)%7Dfunction%20l(t)%7Bvar%20e%3D0%3Carguments.length%26%26void%200!%3D%3Dt%3Ft%3A%7B%7D%3Btry%7Be.random_t%3D(new%20Date).getTime()%2Cg(function(t)%7Bvar%20e%3D1%3Carguments.length%26%26void%200!%3D%3Darguments%5B1%5D%3Farguments%5B1%5D%3A%22%22%3Bif(%22object%22!%3D%3Df(t))return%20e%3Bvar%20n%3Dfunction(t)%7Bfor(var%20e%2Cn%3D%5B%5D%2Co%3D0%2Ci%3DObject.keys(t)%3Bo%3Ci.length%3Bo%2B%2B)e%3Di%5Bo%5D%2Cn.push(%22%22.concat(e%2C%22%3D%22).concat(t%5Be%5D))%3Breturn%20n%7D(t).join(%22%26%22)%2Co%3De.indexOf(%22%23%22)%2Ci%3De%2Ct%3D%22%22%3Breturn-1!%3D%3Do%26%26(i%3De.slice(0%2Co)%2Ct%3De.slice(o))%2Cn%26%26(i%26%26-1!%3D%3Di.indexOf(%22%3F%22)%3Fi%2B%3D%22%26%22%2Bn%3Ai%2B%3D%22%3F%22%2Bn)%2Ci%2Bt%7D(e%2C%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Flog%2Ftrack%22))%7Dcatch(t)%7B%7D%7Dfunction%20g(t%2Ce%2Cn)%7B(t%3Dt%3Ft.split(%22%3B%3B%3B%22)%3A%5B%5D).map(function(t)%7Btry%7B0%3C%3Dt.indexOf(%22%2Fapi%2Fbidder%2Ftrack%22)%26%26n%26%26(t%2B%3D%22%26inIframe%3D%22.concat(!(!self.frameElement%7C%7C%22IFRAME%22!%3Dself.frameElement.tagName)%7C%7Cwindow.frames.length!%3Dparent.frames.length%7C%7Cself!%3Dtop)%2Ct%2B%3D%22%26pos_x%3D%22.concat(n.left%2C%22%26pos_y%3D%22).concat(n.top%2C%22%26page_w%3D%22).concat(n.page_width%2C%22%26page_h%3D%22).concat(n.page_height))%7Dcatch(t)%7Bl(%7Btn%3As%2Cwinloss%3A1%2Cfe%3A2%2Cpos_err_c%3A1002%2Cpos_err_m%3At.toString()%7D)%7Dvar%20e%3Dnew%20Image%3Be.src%3Dt%2Ce.style.display%3D%22none%22%2Ce.style.visibility%3D%22hidden%22%2Ce.width%3D0%2Ce.height%3D0%2Cdocument.body.appendChild(e)%7D)%7Dvar%20d%3D%5B%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Fbidder%2Ftrack%3Ftn%3D39934c2bda4debbe4c680be1dd02f5d3%26price%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26evt%3D101%26rid%3D6e28cfaf115a354ea1ad8e1304d6d7b8%26campaignid%3D1339145%26impid%3D44-300x250-1%26offerid%3D24054386%26test%3D0%26time%3D1660789795%26cp%3DjZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM%26acid%3D599%26trackingid%3D99afea272c2b0e8626489674ddb7a0bb%26uid%3Da865b9ae-fa9e-4c09-8204-2db99ac7c8f7%26bm%3D2%26la%3Den%26cn%3Dus%26cid%3D3998296%26info%3DSi3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk%26sid%3D128__110__1__12__28__38__163__96__58__24__47__99%26sp%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26scp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26acu%3DUSD%26scu%3DUSD%26sgcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26gprice%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26gcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26ah%3D%26de%3Dwjh.popin.cc%26iv%3D0%22%2C%22%24%7BITRACKER2%7D%22%2C%22%24%7BITRACKER3%7D%22%2C%22%24%7BITRACKER4%7D%22%2C%22%24%7BITRACKER5%7D%22%2C%22%24%7BITRACKER6%7D%22%5D%2Cp%3D%5B%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Fbidder%2Ftrack%3Ftn%3D39934c2bda4debbe4c680be1dd02f5d3%26price%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26evt%3D104%26rid%3D6e28cfaf115a354ea1ad8e1304d6d7b8%26campaignid%3D1339145%26impid%3D44-300x250-1%26offerid%3D24054386%26test%3D0%26time%3D1660789795%26cp%3DjZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM%26acid%3D599%26trackingid%3D99afea272c2b0e8626489674ddb7a0bb%26uid%3Da865b9ae-fa9e-4c09-8204-2db99ac7c8f7%26sid%3D128__110__1__12__28__38__163__96__58__24__47__99%26format%3D%26crid%3Dff32b6f9b3bbc45c00b78b6674a2952e%26bm%3D2%26la%3Den%26cn%3Dus%26cid%3D3998296%26info%3DSi3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk%26sp%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26scp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26acu%3DUSD%26scu%3DUSD%26sgcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26gprice%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26gcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26ah%3D%26de%3Dwjh.popin.cc%26iv%3D0%22%2C%22%24%7BVTRACKER2%7D%22%2C%22%24%7BVTRACKER3%7D%22%2C%22%24%7BVTRACKER4%7D%22%2C%22%24%7BVTRACKER5%7D%22%2C%22%24%7BVTRACKER6%7D%22%5D%2Cs%3D%22f9f2b1ef23fe2759c2cad0953029a94b%22%2Cn%3Ddocument.getElementById(%22mgcontainer-99afea272c2b0e8626489674ddb7a0bb%22)%3Bn%26%26function()%7Bvar%20a%3Dn.getElementsByClassName(%22mediago-placement-track%22)%3Bif(a%26%26a.length)%7Bvar%20t%2Ce%3Dfunction(t)%7Bvar%20e%2Cn%2Co%2Ci%2Cc%2Cr%3B%22object%22%3D%3D%3Df(r%3Da%5Bt%5D)%26%26(e%3Dfunction(t)%7Btry%7Bvar%20e%3Dt.getBoundingClientRect()%2Cn%3De%26%26e.top%7C%7C-1%2Co%3De%26%26e.left%7C%7C-1%2Ci%3Ddocument.body.scrollWidth%7C%7C-1%2Ce%3Ddocument.body.scrollHeight%7C%7C-1%3Breturn%7Btop%3An.toFixed(0)%2Cleft%3Ao.toFixed(0)%2Cpage_width%3Ai%2Cpage_height%3Ae%7D%7Dcatch(o)%7Breturn%20l(%7Btn%3As%2Cwinloss%3A1%2Cfe%3A2%2Cpos_err_c%3A1001%2Cpos_err_m%3Ao.toString()%7D)%2C%7Btop%3A%22-1%22%2Cleft%3A%22-1%22%2Cpage_width%3A%22-1%22%2Cpage_height%3A%22-1%22%7D%7D%7D(r)%2C(n%3Dd%5Bt%5D)%26%26g(n%2C0%2Ce)%2Co%3Dp%5Bt%5D%2Ci%3D!1%2C(c%3Dfunction()%7BsetTimeout(function()%7Bvar%20t%2Ce%3B!i%26%26(t%3Dr%2Ce%3Dwindow.innerHeight%7C%7Cdocument.documentElement.clientHeight%7C%7Cdocument.body.clientHeight%2C(t.getBoundingClientRect()%26%26t.getBoundingClientRect().top)%3C%3De-.75*(t.offsetHeight%7C%7Ct.clientHeight))%3F(i%3D!0%2Co%26%26g(o))%3Ac()%7D%2C500)%7D)())%7D%3Bfor(t%20in%20a)e(t)%7D%7D()%7D()';
+    temp +=
+      '!function()%7B%22use%20strict%22%3Bfunction%20f(t)%7Breturn(f%3D%22function%22%3D%3Dtypeof%20Symbol%26%26%22symbol%22%3D%3Dtypeof%20Symbol.iterator%3Ffunction(t)%7Breturn%20typeof%20t%7D%3Afunction(t)%7Breturn%20t%26%26%22function%22%3D%3Dtypeof%20Symbol%26%26t.constructor%3D%3D%3DSymbol%26%26t!%3D%3DSymbol.prototype%3F%22symbol%22%3Atypeof%20t%7D)(t)%7Dfunction%20l(t)%7Bvar%20e%3D0%3Carguments.length%26%26void%200!%3D%3Dt%3Ft%3A%7B%7D%3Btry%7Be.random_t%3D(new%20Date).getTime()%2Cg(function(t)%7Bvar%20e%3D1%3Carguments.length%26%26void%200!%3D%3Darguments%5B1%5D%3Farguments%5B1%5D%3A%22%22%3Bif(%22object%22!%3D%3Df(t))return%20e%3Bvar%20n%3Dfunction(t)%7Bfor(var%20e%2Cn%3D%5B%5D%2Co%3D0%2Ci%3DObject.keys(t)%3Bo%3Ci.length%3Bo%2B%2B)e%3Di%5Bo%5D%2Cn.push(%22%22.concat(e%2C%22%3D%22).concat(t%5Be%5D))%3Breturn%20n%7D(t).join(%22%26%22)%2Co%3De.indexOf(%22%23%22)%2Ci%3De%2Ct%3D%22%22%3Breturn-1!%3D%3Do%26%26(i%3De.slice(0%2Co)%2Ct%3De.slice(o))%2Cn%26%26(i%26%26-1!%3D%3Di.indexOf(%22%3F%22)%3Fi%2B%3D%22%26%22%2Bn%3Ai%2B%3D%22%3F%22%2Bn)%2Ci%2Bt%7D(e%2C%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Flog%2Ftrack%22))%7Dcatch(t)%7B%7D%7Dfunction%20g(t%2Ce%2Cn)%7B(t%3Dt%3Ft.split(%22%3B%3B%3B%22)%3A%5B%5D).map(function(t)%7Btry%7B0%3C%3Dt.indexOf(%22%2Fapi%2Fbidder%2Ftrack%22)%26%26n%26%26(t%2B%3D%22%26inIframe%3D%22.concat(!(!self.frameElement%7C%7C%22IFRAME%22!%3Dself.frameElement.tagName)%7C%7Cwindow.frames.length!%3Dparent.frames.length%7C%7Cself!%3Dtop)%2Ct%2B%3D%22%26pos_x%3D%22.concat(n.left%2C%22%26pos_y%3D%22).concat(n.top%2C%22%26page_w%3D%22).concat(n.page_width%2C%22%26page_h%3D%22).concat(n.page_height))%7Dcatch(t)%7Bl(%7Btn%3As%2Cwinloss%3A1%2Cfe%3A2%2Cpos_err_c%3A1002%2Cpos_err_m%3At.toString()%7D)%7Dvar%20e%3Dnew%20Image%3Be.src%3Dt%2Ce.style.display%3D%22none%22%2Ce.style.visibility%3D%22hidden%22%2Ce.width%3D0%2Ce.height%3D0%2Cdocument.body.appendChild(e)%7D)%7Dvar%20d%3D%5B%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Fbidder%2Ftrack%3Ftn%3D39934c2bda4debbe4c680be1dd02f5d3%26price%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26evt%3D101%26rid%3D6e28cfaf115a354ea1ad8e1304d6d7b8%26campaignid%3D1339145%26impid%3D44-300x250-1%26offerid%3D24054386%26test%3D0%26time%3D1660789795%26cp%3DjZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM%26acid%3D599%26trackingid%3D99afea272c2b0e8626489674ddb7a0bb%26uid%3Da865b9ae-fa9e-4c09-8204-2db99ac7c8f7%26bm%3D2%26la%3Den%26cn%3Dus%26cid%3D3998296%26info%3DSi3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk%26sid%3D128__110__1__12__28__38__163__96__58__24__47__99%26sp%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26scp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26acu%3DUSD%26scu%3DUSD%26sgcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26gprice%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26gcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26ah%3D%26de%3Dwjh.popin.cc%26iv%3D0%22%2C%22%24%7BITRACKER2%7D%22%2C%22%24%7BITRACKER3%7D%22%2C%22%24%7BITRACKER4%7D%22%2C%22%24%7BITRACKER5%7D%22%2C%22%24%7BITRACKER6%7D%22%5D%2Cp%3D%5B%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Fbidder%2Ftrack%3Ftn%3D39934c2bda4debbe4c680be1dd02f5d3%26price%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26evt%3D104%26rid%3D6e28cfaf115a354ea1ad8e1304d6d7b8%26campaignid%3D1339145%26impid%3D44-300x250-1%26offerid%3D24054386%26test%3D0%26time%3D1660789795%26cp%3DjZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM%26acid%3D599%26trackingid%3D99afea272c2b0e8626489674ddb7a0bb%26uid%3Da865b9ae-fa9e-4c09-8204-2db99ac7c8f7%26sid%3D128__110__1__12__28__38__163__96__58__24__47__99%26format%3D%26crid%3Dff32b6f9b3bbc45c00b78b6674a2952e%26bm%3D2%26la%3Den%26cn%3Dus%26cid%3D3998296%26info%3DSi3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk%26sp%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26scp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26acu%3DUSD%26scu%3DUSD%26sgcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26gprice%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26gcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26ah%3D%26de%3Dwjh.popin.cc%26iv%3D0%22%2C%22%24%7BVTRACKER2%7D%22%2C%22%24%7BVTRACKER3%7D%22%2C%22%24%7BVTRACKER4%7D%22%2C%22%24%7BVTRACKER5%7D%22%2C%22%24%7BVTRACKER6%7D%22%5D%2Cs%3D%22f9f2b1ef23fe2759c2cad0953029a94b%22%2Cn%3Ddocument.getElementById(%22mgcontainer-99afea272c2b0e8626489674ddb7a0bb%22)%3Bn%26%26function()%7Bvar%20a%3Dn.getElementsByClassName(%22mediago-placement-track%22)%3Bif(a%26%26a.length)%7Bvar%20t%2Ce%3Dfunction(t)%7Bvar%20e%2Cn%2Co%2Ci%2Cc%2Cr%3B%22object%22%3D%3D%3Df(r%3Da%5Bt%5D)%26%26(e%3Dfunction(t)%7Btry%7Bvar%20e%3Dt.getBoundingClientRect()%2Cn%3De%26%26e.top%7C%7C-1%2Co%3De%26%26e.left%7C%7C-1%2Ci%3Ddocument.body.scrollWidth%7C%7C-1%2Ce%3Ddocument.body.scrollHeight%7C%7C-1%3Breturn%7Btop%3An.toFixed(0)%2Cleft%3Ao.toFixed(0)%2Cpage_width%3Ai%2Cpage_height%3Ae%7D%7Dcatch(o)%7Breturn%20l(%7Btn%3As%2Cwinloss%3A1%2Cfe%3A2%2Cpos_err_c%3A1001%2Cpos_err_m%3Ao.toString()%7D)%2C%7Btop%3A%22-1%22%2Cleft%3A%22-1%22%2Cpage_width%3A%22-1%22%2Cpage_height%3A%22-1%22%7D%7D%7D(r)%2C(n%3Dd%5Bt%5D)%26%26g(n%2C0%2Ce)%2Co%3Dp%5Bt%5D%2Ci%3D!1%2C(c%3Dfunction()%7BsetTimeout(function()%7Bvar%20t%2Ce%3B!i%26%26(t%3Dr%2Ce%3Dwindow.innerHeight%7C%7Cdocument.documentElement.clientHeight%7C%7Cdocument.body.clientHeight%2C(t.getBoundingClientRect()%26%26t.getBoundingClientRect().top)%3C%3De-.75*(t.offsetHeight%7C%7Ct.clientHeight))%3F(i%3D!0%2Co%26%26g(o))%3Ac()%7D%2C500)%7D)())%7D%3Bfor(t%20in%20a)e(t)%7D%7D()%7D()';
     temp += '%3B%3C%2Fscri';
     temp += 'pt%3E';
     adm += decodeURIComponent(temp);
@@ -72,13 +235,13 @@ describe('mediago:BidAdapterTests', function () {
                 cid: '1339145',
                 crid: 'ff32b6f9b3bbc45c00b78b6674a2952e',
                 w: 300,
-                h: 250,
-              },
-            ],
-          },
+                h: 250
+              }
+            ]
+          }
         ],
-        cur: 'USD',
-      },
+        cur: 'USD'
+      }
     };
 
     let bids = spec.interpretResponse(serverResponse);
@@ -95,3 +258,323 @@ describe('mediago:BidAdapterTests', function () {
     expect(bid.currency).to.equal('USD');
   });
 });
+
+describe('mediago: getUserSyncs', function() {
+  const COOKY_SYNC_IFRAME_URL = 'https://cdn.mediago.io/js/cookieSync.html';
+  const IFRAME_ENABLED = {
+    iframeEnabled: true,
+    pixelEnabled: false,
+  };
+  const IFRAME_DISABLED = {
+    iframeEnabled: false,
+    pixelEnabled: false,
+  };
+  const GDPR_CONSENT = {
+    consentString: 'gdprConsentString',
+    gdprApplies: true
+  };
+  const USP_CONSENT = {
+    consentString: 'uspConsentString'
+  }
+
+  let syncParamUrl = `dm=${encodeURIComponent(location.origin || `https://${location.host}`)}`;
+  syncParamUrl += '&gdpr=1&gdpr_consent=gdprConsentString&ccpa_consent=uspConsentString';
+  const expectedIframeSyncs = [
+    {
+      type: 'iframe',
+      url: `${COOKY_SYNC_IFRAME_URL}?${syncParamUrl}`
+    }
+  ];
+
+  it('should return nothing if iframe is disabled', () => {
+    const userSyncs = spec.getUserSyncs(IFRAME_DISABLED, undefined, GDPR_CONSENT, USP_CONSENT, undefined);
+    expect(userSyncs).to.be.undefined;
+  });
+
+  it('should do userSyncs if iframe is enabled', () => {
+    const userSyncs = spec.getUserSyncs(IFRAME_ENABLED, undefined, GDPR_CONSENT, USP_CONSENT, undefined);
+    expect(userSyncs).to.deep.equal(expectedIframeSyncs);
+  });
+});
+
+describe('mediago Bid Adapter Tests', function () {
+  describe('buildRequests', () => {
+    describe('getPageTitle function', function() {
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should return the top document title if available', function() {
+        const fakeTopDocument = {
+          title: 'Top Document Title',
+          querySelector: () => ({ content: 'Top Document Title test' })
+        };
+        const fakeTopWindow = {
+          document: fakeTopDocument
+        };
+        const result = getPageTitle({ top: fakeTopWindow });
+        expect(result).to.equal('Top Document Title');
+      });
+
+      it('should return the content of top og:title meta tag if title is empty', function() {
+        const ogTitleContent = 'Top OG Title Content';
+        const fakeTopWindow = {
+          document: {
+            title: '',
+            querySelector: sandbox.stub().withArgs('meta[property="og:title"]').returns({ content: ogTitleContent })
+          }
+        };
+
+        const result = getPageTitle({ top: fakeTopWindow });
+        expect(result).to.equal(ogTitleContent);
+      });
+
+      it('should return the document title if no og:title meta tag is present', function() {
+        document.title = 'Test Page Title';
+        sandbox.stub(document, 'querySelector').withArgs('meta[property="og:title"]').returns(null);
+
+        const result = getPageTitle({ top: undefined });
+        expect(result).to.equal('Test Page Title');
+      });
+
+      it('should return the content of og:title meta tag if present', function() {
+        document.title = '';
+        const ogTitleContent = 'Top OG Title Content';
+        sandbox.stub(document, 'querySelector').withArgs('meta[property="og:title"]').returns({ content: ogTitleContent });
+        const result = getPageTitle({ top: undefined });
+        expect(result).to.equal(ogTitleContent);
+      });
+
+      it('should return an empty string if no title or og:title meta tag is found', function() {
+        document.title = '';
+        sandbox.stub(document, 'querySelector').withArgs('meta[property="og:title"]').returns(null);
+        const result = getPageTitle({ top: undefined });
+        expect(result).to.equal('');
+      });
+
+      it('should handle exceptions when accessing top.document and fallback to current document', function() {
+        const fakeWindow = {
+          get top() {
+            throw new Error('Access denied');
+          }
+        };
+        const ogTitleContent = 'Current OG Title Content';
+        document.title = 'Current Document Title';
+        sandbox.stub(document, 'querySelector').withArgs('meta[property="og:title"]').returns({ content: ogTitleContent });
+        const result = getPageTitle(fakeWindow);
+        expect(result).to.equal('Current Document Title');
+      });
+    });
+
+    describe('getPageDescription function', function() {
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should return the top document description if available', function() {
+        const descriptionContent = 'Top Document Description';
+        const fakeTopDocument = {
+          querySelector: sandbox.stub().withArgs('meta[name="description"]').returns({ content: descriptionContent })
+        };
+        const fakeTopWindow = { document: fakeTopDocument };
+        const result = getPageDescription({ top: fakeTopWindow });
+        expect(result).to.equal(descriptionContent);
+      });
+
+      it('should return the top document og:description if description is not present', function() {
+        const ogDescriptionContent = 'Top OG Description';
+        const fakeTopDocument = {
+          querySelector: sandbox.stub().withArgs('meta[property="og:description"]').returns({ content: ogDescriptionContent })
+        };
+        const fakeTopWindow = { document: fakeTopDocument };
+        const result = getPageDescription({ top: fakeTopWindow });
+        expect(result).to.equal(ogDescriptionContent);
+      });
+
+      it('should return the current document description if top document is not accessible', function() {
+        const descriptionContent = 'Current Document Description';
+        sandbox.stub(document, 'querySelector')
+          .withArgs('meta[name="description"]').returns({ content: descriptionContent })
+        const fakeWindow = {
+          get top() {
+            throw new Error('Access denied');
+          }
+        };
+        const result = getPageDescription(fakeWindow);
+        expect(result).to.equal(descriptionContent);
+      });
+
+      it('should return the current document og:description if description is not present and top document is not accessible', function() {
+        const ogDescriptionContent = 'Current OG Description';
+        sandbox.stub(document, 'querySelector')
+          .withArgs('meta[property="og:description"]').returns({ content: ogDescriptionContent });
+
+        const fakeWindow = {
+          get top() {
+            throw new Error('Access denied');
+          }
+        };
+        const result = getPageDescription(fakeWindow);
+        expect(result).to.equal(ogDescriptionContent);
+      });
+    });
+
+    describe('getPageKeywords function', function() {
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should return the top document keywords if available', function() {
+        const keywordsContent = 'keyword1, keyword2, keyword3';
+        const fakeTopDocument = {
+          querySelector: sandbox.stub()
+            .withArgs('meta[name="keywords"]').returns({ content: keywordsContent })
+        };
+        const fakeTopWindow = { document: fakeTopDocument };
+
+        const result = getPageKeywords({ top: fakeTopWindow });
+        expect(result).to.equal(keywordsContent);
+      });
+
+      it('should return the current document keywords if top document is not accessible', function() {
+        const keywordsContent = 'keyword1, keyword2, keyword3';
+        sandbox.stub(document, 'querySelector')
+          .withArgs('meta[name="keywords"]').returns({ content: keywordsContent });
+
+        // 模拟顶层窗口访问异常
+        const fakeWindow = {
+          get top() {
+            throw new Error('Access denied');
+          }
+        };
+
+        const result = getPageKeywords(fakeWindow);
+        expect(result).to.equal(keywordsContent);
+      });
+
+      it('should return an empty string if no keywords meta tag is found', function() {
+        sandbox.stub(document, 'querySelector').withArgs('meta[name="keywords"]').returns(null);
+
+        const result = getPageKeywords();
+        expect(result).to.equal('');
+      });
+    });
+    describe('getConnectionDownLink function', function() {
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should return the downlink value as a string if available', function() {
+        const downlinkValue = 2.5;
+        const fakeNavigator = {
+          connection: {
+            downlink: downlinkValue
+          }
+        };
+
+        const result = getConnectionDownLink({ navigator: fakeNavigator });
+        expect(result).to.equal(downlinkValue.toString());
+      });
+
+      it('should return undefined if downlink is not available', function() {
+        const fakeNavigator = {
+          connection: {}
+        };
+
+        const result = getConnectionDownLink({ navigator: fakeNavigator });
+        expect(result).to.be.undefined;
+      });
+
+      it('should return undefined if connection is not available', function() {
+        const fakeNavigator = {};
+
+        const result = getConnectionDownLink({ navigator: fakeNavigator });
+        expect(result).to.be.undefined;
+      });
+
+      it('should handle cases where navigator is not defined', function() {
+        const result = getConnectionDownLink({});
+        expect(result).to.be.undefined;
+      });
+    });
+
+    describe('getUserSyncs with message event listener', function() {
+      function messageHandler(event) {
+        if (!event.data || event.origin !== THIRD_PARTY_COOKIE_ORIGIN) {
+          return;
+        }
+
+        window.removeEventListener('message', messageHandler, true);
+        event.stopImmediatePropagation();
+
+        const response = event.data;
+        if (!response.optout && response.mguid) {
+          storage.setCookie(COOKIE_KEY_MGUID, response.mguid, getCurrentTimeToUTCString());
+        }
+      }
+
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.createSandbox();
+        sandbox.stub(storage, 'setCookie');
+        sandbox.stub(window, 'removeEventListener');
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should set a cookie when a valid message is received', () => {
+        const fakeEvent = {
+          data: { optout: '', mguid: '12345' },
+          origin: THIRD_PARTY_COOKIE_ORIGIN,
+          stopImmediatePropagation: sinon.spy()
+        };
+
+        messageHandler(fakeEvent);
+
+        expect(fakeEvent.stopImmediatePropagation.calledOnce).to.be.true;
+        expect(window.removeEventListener.calledWith('message', messageHandler, true)).to.be.true;
+        expect(storage.setCookie.calledWith(COOKIE_KEY_MGUID, '12345', sinon.match.string)).to.be.true;
+      });
+      it('should not do anything when an invalid message is received', () => {
+        const fakeEvent = {
+          data: null,
+          origin: 'http://invalid-origin.com',
+          stopImmediatePropagation: sinon.spy()
+        };
+
+        messageHandler(fakeEvent);
+
+        expect(fakeEvent.stopImmediatePropagation.notCalled).to.be.true;
+        expect(window.removeEventListener.notCalled).to.be.true;
+        expect(storage.setCookie.notCalled).to.be.true;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/mediaimpactBidAdapter_spec.js b/test/spec/modules/mediaimpactBidAdapter_spec.js
new file mode 100644
index 00000000000..5bf088c0334
--- /dev/null
+++ b/test/spec/modules/mediaimpactBidAdapter_spec.js
@@ -0,0 +1,337 @@
+import {expect} from 'chai';
+import {spec, ENDPOINT_PROTOCOL, ENDPOINT_DOMAIN, ENDPOINT_PATH} from 'modules/mediaimpactBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import * as miUtils from 'libraries/mediaImpactUtils/index.js';
+
+const BIDDER_CODE = 'mediaimpact';
+
+describe('MediaimpactAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.be.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      let validRequest = {
+        'params': {
+          'unitId': 123
+        }
+      };
+      expect(spec.isBidRequestValid(validRequest)).to.equal(true);
+    });
+
+    it('should return true when required params is srting', function () {
+      let validRequest = {
+        'params': {
+          'unitId': '456'
+        }
+      };
+      expect(spec.isBidRequestValid(validRequest)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let validRequest = {
+        'params': {
+          'unknownId': 123
+        }
+      };
+      expect(spec.isBidRequestValid(validRequest)).to.equal(false);
+    });
+
+    it('should return false when required params is 0', function () {
+      let validRequest = {
+        'params': {
+          'unitId': 0
+        }
+      };
+      expect(spec.isBidRequestValid(validRequest)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let validEndpoint = ENDPOINT_PROTOCOL + '://' + ENDPOINT_DOMAIN + ENDPOINT_PATH + '?tag=123,456&partner=777&sizes=300x250|300x600,728x90,300x250&referer=https%3A%2F%2Ftest.domain';
+
+    let validRequest = [
+      {
+        'bidder': BIDDER_CODE,
+        'params': {
+          'unitId': 123
+        },
+        'adUnitCode': 'adunit-code-1',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e'
+      },
+      {
+        'bidder': BIDDER_CODE,
+        'params': {
+          'unitId': '456'
+        },
+        'adUnitCode': 'adunit-code-2',
+        'sizes': [[728, 90]],
+        'bidId': '22aidtbx5eabd9'
+      },
+      {
+        'bidder': BIDDER_CODE,
+        'params': {
+          'partnerId': 777
+        },
+        'adUnitCode': 'partner-code-3',
+        'sizes': [[300, 250]],
+        'bidId': '5d4531d5a6c013'
+      }
+    ];
+
+    let bidderRequest = {
+      refererInfo: {
+        page: 'https://test.domain'
+      }
+    };
+
+    it('bidRequest HTTP method', function () {
+      const request = spec.buildRequests(validRequest, bidderRequest);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('bidRequest url', function () {
+      const request = spec.buildRequests(validRequest, bidderRequest);
+      expect(request.url).to.equal(validEndpoint);
+    });
+
+    it('bidRequest data', function () {
+      const request = spec.buildRequests(validRequest, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload[0].unitId).to.equal(123);
+      expect(payload[0].sizes).to.deep.equal([[300, 250], [300, 600]]);
+      expect(payload[0].bidId).to.equal('30b31c1838de1e');
+      expect(payload[1].unitId).to.equal(456);
+      expect(payload[1].sizes).to.deep.equal([[728, 90]]);
+      expect(payload[1].bidId).to.equal('22aidtbx5eabd9');
+      expect(payload[2].partnerId).to.equal(777);
+      expect(payload[2].sizes).to.deep.equal([[300, 250]]);
+      expect(payload[2].bidId).to.equal('5d4531d5a6c013');
+    });
+  });
+
+  describe('joinSizesToString', function () {
+    it('success convert sizes list to string', function () {
+      const sizesStr = miUtils.joinSizesToString([[300, 250], [300, 600]]);
+      expect(sizesStr).to.equal('300x250|300x600');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidRequest = {
+      'method': 'POST',
+      'url': ENDPOINT_PROTOCOL + '://' + ENDPOINT_DOMAIN + ENDPOINT_PATH + '?tag=123,456&partner=777code=adunit-code-1,adunit-code-2,partner-code-3&bid=30b31c1838de1e,22aidtbx5eabd9,5d4531d5a6c013&sizes=300x250|300x600,728x90,300x250&referer=https%3A%2F%2Ftest.domain',
+      'data': '[{"unitId": 13144370,"adUnitCode": "div-gpt-ad-1460505748561-0","sizes": [[300, 250], [300, 600]],"bidId": "2bdcb0b203c17d","referer": "https://test.domain/index.html"},' +
+        '{"unitId": 13144370,"adUnitCode":"div-gpt-ad-1460505748561-1","sizes": [[768, 90]],"bidId": "3dc6b8084f91a8","referer": "https://test.domain/index.html"},' +
+        '{"unitId": 0,"partnerId": 777,"adUnitCode":"div-gpt-ad-1460505748561-2","sizes": [[300, 250]],"bidId": "5d4531d5a6c013","referer": "https://test.domain/index.html"}]'
+    };
+
+    const bidResponse = {
+      body: {
+        'div-gpt-ad-1460505748561-0':
+          {
+            'ad': '
ad
',
+            'width': 300,
+            'height': 250,
+            'creativeId': '8:123456',
+            'meta': {
+              'advertiserDomains': ['test.domain']
+            },
+            'syncs': [
+              {'type': 'image', 'url': 'https://test.domain/tracker_1.gif'},
+              {'type': 'image', 'url': 'https://test.domain/tracker_2.gif'},
+              {'type': 'image', 'url': 'https://test.domain/tracker_3.gif'}
+            ],
+            'winNotification': [
+              {
+                'method': 'POST',
+                'path': '/hb/bid_won?test=1',
+                'data': {
+                  'ad': [
+                    {'dsp': 8, 'id': 800008, 'cost': 1.0e-5, 'nurl': 'https://test.domain/'}
+                  ],
+                  'unit_id': 1234,
+                  'site_id': 123
+                }
+              }
+            ],
+            'cpm': 0.01,
+            'currency': 'USD',
+            'netRevenue': true
+          }
+      },
+      headers: {}
+    };
+
+    it('result is correct', function () {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+      expect(result[0].requestId).to.equal('2bdcb0b203c17d');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].width).to.equal(300);
+      expect(result[0].height).to.equal(250);
+      expect(result[0].creativeId).to.equal('8:123456');
+      expect(result[0].currency).to.equal('USD');
+      expect(result[0].ttl).to.equal(60);
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['test.domain']);
+      expect(result[0].winNotification[0]).to.deep.equal({'method': 'POST', 'path': '/hb/bid_won?test=1', 'data': {'ad': [{'dsp': 8, 'id': 800008, 'cost': 1.0e-5, 'nurl': 'https://test.domain/'}], 'unit_id': 1234, 'site_id': 123}});
+    });
+  });
+
+  describe('adResponse', function () {
+    const bid = {
+      'unitId': 13144370,
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '2bdcb0b203c17d',
+      'referer': 'https://test.domain/index.html'
+    };
+    const ad = {
+      'ad': '
ad
',
+      'width': 300,
+      'height': 250,
+      'creativeId': '8:123456',
+      'syncs': [],
+      'winNotification': [],
+      'cpm': 0.01,
+      'currency': 'USD',
+      'netRevenue': true,
+      'meta': {
+        'advertiserDomains': ['test.domain']
+      },
+    };
+
+    it('fill ad for response', function () {
+      const result = spec.adResponse(bid, ad);
+      expect(result.requestId).to.equal('2bdcb0b203c17d');
+      expect(result.cpm).to.equal(0.01);
+      expect(result.width).to.equal(300);
+      expect(result.height).to.equal(250);
+      expect(result.creativeId).to.equal('8:123456');
+      expect(result.currency).to.equal('USD');
+      expect(result.ttl).to.equal(60);
+      expect(result.meta.advertiserDomains).to.deep.equal(['test.domain']);
+    });
+  });
+
+  describe('onBidWon', function () {
+    const bid = {
+      winNotification: [
+        {
+          'method': 'POST',
+          'path': '/hb/bid_won?test=1',
+          'data': {
+            'ad': [
+              {'dsp': 8, 'id': 800008, 'cost': 0.01, 'nurl': 'http://test.domain/'}
+            ],
+            'unit_id': 1234,
+            'site_id': 123
+          }
+        }
+      ]
+    };
+
+    let ajaxStub;
+
+    beforeEach(() => {
+      ajaxStub = sinon.stub(miUtils, 'postRequest')
+    })
+
+    afterEach(() => {
+      ajaxStub.restore()
+    })
+
+    it('calls mediaimpact callback endpoint', () => {
+      const result = spec.onBidWon(bid);
+      expect(result).to.equal(true);
+      expect(ajaxStub.calledOnce).to.equal(true);
+      expect(ajaxStub.firstCall.args[0]).to.equal(ENDPOINT_PROTOCOL + '://' + ENDPOINT_DOMAIN + '/hb/bid_won?test=1');
+      expect(ajaxStub.firstCall.args[1]).to.deep.equal(JSON.stringify(bid.winNotification[0].data));
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    const bidResponse = [{
+      body: {
+        'div-gpt-ad-1460505748561-0':
+          {
+            'ad': '
ad
',
+            'width': 300,
+            'height': 250,
+            'creativeId': '8:123456',
+            'meta': {
+              'advertiserDomains': ['test.domain']
+            },
+            'syncs': [
+              {'type': 'image', 'link': 'https://test.domain/tracker_1.gif'},
+              {'type': 'image', 'link': 'https://test.domain/tracker_2.gif'},
+              {'type': 'image', 'link': 'https://test.domain/tracker_3.gif'}
+            ],
+            'winNotification': [
+              {
+                'method': 'POST',
+                'path': '/hb/bid_won?test=1',
+                'data': {
+                  'ad': [
+                    {'dsp': 8, 'id': 800008, 'cost': 1.0e-5, 'nurl': 'https://test.domain/'}
+                  ],
+                  'unit_id': 1234,
+                  'site_id': 123
+                }
+              }
+            ],
+            'cpm': 0.01,
+            'currency': 'USD',
+            'netRevenue': true
+          }
+      },
+      headers: {}
+    }];
+
+    it('should return nothing when sync is disabled', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': false
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should register image sync when only image is enabled where gdprConsent is undefined', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': true
+      };
+
+      const gdprConsent = undefined;
+      let syncs = spec.getUserSyncs(syncOptions, bidResponse, gdprConsent);
+      expect(syncs.length).to.equal(3);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://test.domain/tracker_1.gif');
+    });
+
+    it('should register image sync when only image is enabled where gdprConsent is defined', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'someString',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions, bidResponse, gdprConsent);
+      expect(syncs.length).to.equal(3);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://test.domain/tracker_1.gif?gdpr=1&gdpr_consent=someString');
+    });
+  });
+});
diff --git a/test/spec/modules/medianetAnalyticsAdapter_spec.js b/test/spec/modules/medianetAnalyticsAdapter_spec.js
index e19c27cc2d3..8a298acae80 100644
--- a/test/spec/modules/medianetAnalyticsAdapter_spec.js
+++ b/test/spec/modules/medianetAnalyticsAdapter_spec.js
@@ -1,13 +1,13 @@
 import { expect } from 'chai';
 import medianetAnalytics from 'modules/medianetAnalyticsAdapter.js';
 import * as utils from 'src/utils.js';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 import * as events from 'src/events.js';
 import {clearEvents} from 'src/events.js';
 
 const {
-  EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, NO_BID, BID_TIMEOUT, AUCTION_END, SET_TARGETING, BID_WON }
-} = CONSTANTS;
+  AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, NO_BID, BID_TIMEOUT, AUCTION_END, SET_TARGETING, BID_WON
+} = EVENTS;
 
 const ERROR_WINNING_BID_ABSENT = 'winning_bid_absent';
 
@@ -210,7 +210,7 @@ describe('Media.net Analytics Adapter', function() {
       expect(noBidLog.pvnm).to.have.ordered.members(['-2', 'bidder1', 'bidder1', 'medianet']);
       expect(noBidLog.mtype).to.have.ordered.members([banner, banner, banner, banner]);
       expect(noBidLog.status).to.have.ordered.members(['1', '2', '2', '2']);
-      expect(noBidLog.size).to.have.ordered.members(['', '', '', '']);
+      expect(noBidLog.size).to.have.ordered.members(['300x100|300x250', '300x100', '300x250', '300x250|300x100']);
       expect(noBidLog.szs).to.have.ordered.members(['300x100|300x250', '300x100', '300x250', '300x250|300x100']);
     });
 
@@ -225,7 +225,7 @@ describe('Media.net Analytics Adapter', function() {
     it('should have winner log in standard auction', function() {
       medianetAnalytics.clearlogsQueue();
       performStandardAuctionWithWinner();
-      let winnerLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter((log) => log.winner);
+      let winnerLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter((log) => log.winner === '1');
       medianetAnalytics.clearlogsQueue();
 
       expect(winnerLog.length).to.equal(1);
@@ -234,7 +234,7 @@ describe('Media.net Analytics Adapter', function() {
     it('should have correct values in winner log', function() {
       medianetAnalytics.clearlogsQueue();
       performStandardAuctionWithWinner();
-      let winnerLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter((log) => log.winner);
+      let winnerLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter((log) => log.winner === '1');
       medianetAnalytics.clearlogsQueue();
 
       expect(winnerLog[0]).to.include({
@@ -258,7 +258,7 @@ describe('Media.net Analytics Adapter', function() {
     it('should have correct bid floor data in winner log', function() {
       medianetAnalytics.clearlogsQueue();
       performAuctionWithFloorConfig();
-      let winnerLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter((log) => log.winner);
+      let winnerLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter((log) => log.winner === '1');
       medianetAnalytics.clearlogsQueue();
 
       expect(winnerLog[0]).to.include({
@@ -309,32 +309,32 @@ describe('Media.net Analytics Adapter', function() {
 
     it('should pick winning bid if multibids with same request id', function() {
       performStandardAuctionMultiBidWithSameRequestId(MOCK.BIDS_SAME_REQ_DIFF_CPM);
-      let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
+      let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner === '1')[0];
       expect(winningBid.adid).equals('3e6e4bce5c8fb3');
       medianetAnalytics.clearlogsQueue();
 
       const reversedResponseArray = [].concat(MOCK.BIDS_SAME_REQ_DIFF_CPM).reverse();
       performStandardAuctionMultiBidWithSameRequestId(reversedResponseArray);
-      winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
+      winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner === '1')[0];
       expect(winningBid.adid).equals('3e6e4bce5c8fb3');
     });
 
     it('should pick winning bid if multibids with same request id and same time to respond', function() {
       performStandardAuctionMultiBidWithSameRequestId(MOCK.BIDS_SAME_REQ_DIFF_CPM_SAME_TIME);
-      let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
+      let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner === '1')[0];
       expect(winningBid.adid).equals('3e6e4bce5c8fb3');
       medianetAnalytics.clearlogsQueue();
     });
 
     it('should pick winning bid if multibids with same request id and equal cpm', function() {
       performStandardAuctionMultiBidWithSameRequestId(MOCK.BIDS_SAME_REQ_EQUAL_CPM);
-      let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
+      let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner === '1')[0];
       expect(winningBid.adid).equals('3e6e4bce5c8fb3');
       medianetAnalytics.clearlogsQueue();
 
       const reversedResponseArray = [].concat(MOCK.BIDS_SAME_REQ_EQUAL_CPM).reverse();
       performStandardAuctionMultiBidWithSameRequestId(reversedResponseArray);
-      winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
+      winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner === '1')[0];
       expect(winningBid.adid).equals('3e6e4bce5c8fb3');
     });
 
diff --git a/test/spec/modules/medianetBidAdapter_spec.js b/test/spec/modules/medianetBidAdapter_spec.js
index 4a221e97444..009af5dbd66 100644
--- a/test/spec/modules/medianetBidAdapter_spec.js
+++ b/test/spec/modules/medianetBidAdapter_spec.js
@@ -1,7 +1,8 @@
 import {expect, assert} from 'chai';
-import {spec} from 'modules/medianetBidAdapter.js';
+import {spec, EVENT_PIXEL_URL, EVENTS} from 'modules/medianetBidAdapter.js';
 import { makeSlot } from '../integration/faker/googletag.js';
 import { config } from 'src/config.js';
+import {server} from '../../mocks/xhr.js';
 
 $$PREBID_GLOBAL$$.version = $$PREBID_GLOBAL$$.version || 'version';
 let VALID_BID_REQUEST = [{
@@ -29,7 +30,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '28f8f8130a583e',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1,
   }, {
     'bidder': 'medianet',
     'params': {
@@ -56,7 +57,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }],
 
   VALID_BID_REQUEST_WITH_CRID = [{
@@ -86,7 +87,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '28f8f8130a583e',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }, {
     'bidder': 'medianet',
     'params': {
@@ -114,7 +115,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }],
   VALID_BID_REQUEST_WITH_ORTB2 = [{
     'bidder': 'medianet',
@@ -143,7 +144,7 @@ let VALID_BID_REQUEST = [{
         'data': {'pbadslot': '/12345/my-gpt-tag-0'}
       }
     },
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }, {
     'bidder': 'medianet',
     'params': {
@@ -172,8 +173,39 @@ let VALID_BID_REQUEST = [{
         'data': {'pbadslot': '/12345/my-gpt-tag-0'}
       }
     },
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }],
+  // Protected Audience API Request
+  VALID_BID_REQUEST_WITH_AE_IN_ORTB2IMP = [{
+    'bidder': 'medianet',
+    'params': {
+      'crid': 'crid',
+      'cid': 'customer_id',
+      'site': {
+        'page': 'http://media.net/prebidtest',
+        'domain': 'media.net',
+        'ref': 'http://media.net/prebidtest',
+        'isTop': true
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 250]],
+      }
+    },
+    'bidId': '28f8f8130a583e',
+    'bidderRequestId': '1e9b1f07797c1c',
+    'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'ortb2Imp': {
+      'ext': {
+        'tid': '277b631f-92f5-4844-8b19-ea13c095d3f1',
+        'ae': 1
+      }
+    },
+    'auctionsCount': 1
+  }],
+
   VALID_BID_REQUEST_WITH_USERID = [{
     'bidder': 'medianet',
     'params': {
@@ -203,7 +235,73 @@ let VALID_BID_REQUEST = [{
     'bidId': '28f8f8130a583e',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
+  }, {
+    'bidder': 'medianet',
+    'params': {
+      'crid': 'crid',
+      'cid': 'customer_id',
+      'site': {
+        'page': 'http://media.net/prebidtest',
+        'domain': 'media.net',
+        'ref': 'http://media.net/prebidtest',
+        'isTop': true
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-123',
+    ortb2Imp: {
+      ext: {
+        tid: 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
+      }
+    },
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 251]],
+      }
+    },
+    'sizes': [[300, 251]],
+    'bidId': '3f97ca71b1e5c2',
+    'bidderRequestId': '1e9b1f07797c1c',
+    'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'auctionsCount': 1
+  }],
+  VALID_BID_REQUEST_WITH_USERIDASEIDS = [{
+    'bidder': 'medianet',
+    'params': {
+      'crid': 'crid',
+      'cid': 'customer_id',
+      'site': {
+        'page': 'http://media.net/prebidtest',
+        'domain': 'media.net',
+        'ref': 'http://media.net/prebidtest',
+        'isTop': true
+      }
+    },
+    userIdAsEids: [{
+      'source': 'criteo.com',
+      'uids': [
+        {
+          'id': 'VZME3l9ycFFORncwaGJRVUNtUzB1UVhpWVd5TElrR3A5SHVSWXAwSFVPJTJCWiUyRnV2UTBPWjZOZ1ZrWnN4SldxcWUlMkJhUnFmUVNzUVg4N1NsdW84SGpUU1BsUllQSnN5bERMdFdPM2pWVXAlMkZVSSUyQkZsJTJGcktlenpZaHp0YXlvU25INWRQQ2tXciUyRk9PQmdac3RHeG9adDNKVzlRWE51ZyUzRCUzRA',
+          'atype': 1
+        }
+      ]
+    }
+    ],
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    ortb2Imp: {
+      ext: {
+        tid: '277b631f-92f5-4844-8b19-ea13c095d3f1',
+      }
+    },
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 250]],
+      }
+    },
+    'bidId': '28f8f8130a583e',
+    'bidderRequestId': '1e9b1f07797c1c',
+    'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'auctionsCount': 1
   }, {
     'bidder': 'medianet',
     'params': {
@@ -231,7 +329,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }],
 
   VALID_BID_REQUEST_INVALID_BIDFLOOR = [{
@@ -261,7 +359,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '28f8f8130a583e',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }, {
     'bidder': 'medianet',
     'params': {
@@ -288,7 +386,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }],
   VALID_NATIVE_BID_REQUEST = [{
     'bidder': 'medianet',
@@ -316,7 +414,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '28f8f8130a583e',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1,
+    'auctionsCount': 1,
     'nativeParams': {
       'image': {
         'required': true,
@@ -373,7 +471,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1,
+    'auctionsCount': 1,
     'nativeParams': {
       'image': {
         'required': true,
@@ -426,13 +524,23 @@ let VALID_BID_REQUEST = [{
     },
     'ext': {
       'customer_id': 'customer_id',
-      'prebid_version': $$PREBID_GLOBAL$$.version,
+      'prebid_version': 'v' + '$prebid.version$',
       'gdpr_applies': false,
       'usp_applies': false,
       'coppa_applies': false,
       'screen': {
         'w': 1000,
         'h': 1000
+      },
+      'vcoords': {
+        'top_left': {
+          'x': 50,
+          'y': 100
+        },
+        'bottom_right': {
+          'x': 490,
+          'y': 880
+        }
       }
     },
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
@@ -504,6 +612,7 @@ let VALID_BID_REQUEST = [{
         }
       }
     }],
+    'ortb2': {},
     'tmax': config.getConfig('bidderTimeout')
   },
   VALID_PAYLOAD_NATIVE = {
@@ -516,13 +625,23 @@ let VALID_BID_REQUEST = [{
     },
     'ext': {
       'customer_id': 'customer_id',
-      'prebid_version': $$PREBID_GLOBAL$$.version,
+      'prebid_version': 'v' + '$prebid.version$',
       'gdpr_applies': false,
       'usp_applies': false,
       'coppa_applies': false,
       'screen': {
         'w': 1000,
         'h': 1000
+      },
+      'vcoords': {
+        'top_left': {
+          'x': 50,
+          'y': 100
+        },
+        'bottom_right': {
+          'x': 490,
+          'y': 880
+        }
       }
     },
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
@@ -595,6 +714,7 @@ let VALID_BID_REQUEST = [{
         }
       }
     }],
+    'ortb2': {},
     'tmax': config.getConfig('bidderTimeout')
   },
   VALID_PAYLOAD = {
@@ -607,13 +727,23 @@ let VALID_BID_REQUEST = [{
     },
     'ext': {
       'customer_id': 'customer_id',
-      'prebid_version': $$PREBID_GLOBAL$$.version,
+      'prebid_version': 'v' + '$prebid.version$',
       'gdpr_applies': false,
       'usp_applies': false,
       'coppa_applies': false,
       'screen': {
         'w': 1000,
         'h': 1000
+      },
+      'vcoords': {
+        'top_left': {
+          'x': 50,
+          'y': 100
+        },
+        'bottom_right': {
+          'x': 490,
+          'y': 880
+        }
       }
     },
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
@@ -684,6 +814,7 @@ let VALID_BID_REQUEST = [{
         }
       }
     }],
+    'ortb2': {},
     'tmax': config.getConfig('bidderTimeout')
   },
   VALID_PAYLOAD_WITH_USERID = {
@@ -696,7 +827,7 @@ let VALID_BID_REQUEST = [{
     },
     'ext': {
       'customer_id': 'customer_id',
-      'prebid_version': $$PREBID_GLOBAL$$.version,
+      'prebid_version': 'v' + '$prebid.version$',
       'gdpr_applies': false,
       'user_id': {
         britepoolid: '82efd5e1-816b-4f87-97f8-044f407e2911'
@@ -706,6 +837,16 @@ let VALID_BID_REQUEST = [{
       'screen': {
         'w': 1000,
         'h': 1000
+      },
+      'vcoords': {
+        'top_left': {
+          'x': 50,
+          'y': 100
+        },
+        'bottom_right': {
+          'x': 490,
+          'y': 880
+        }
       }
     },
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
@@ -780,6 +921,124 @@ let VALID_BID_REQUEST = [{
         }
       }
     }],
+    'ortb2': {},
+    'tmax': config.getConfig('bidderTimeout')
+  },
+  VALID_PAYLOAD_WITH_USERIDASEIDS = {
+    'site': {
+      'page': 'http://media.net/prebidtest',
+      'domain': 'media.net',
+      'ref': 'http://media.net/prebidtest',
+      'topMostLocation': 'http://media.net/topmost',
+      'isTop': true
+    },
+    'ext': {
+      'customer_id': 'customer_id',
+      'prebid_version': 'v' + '$prebid.version$',
+      'gdpr_applies': false,
+      'usp_applies': false,
+      'coppa_applies': false,
+      'screen': {
+        'w': 1000,
+        'h': 1000
+      },
+      'vcoords': {
+        'top_left': {
+          'x': 50,
+          'y': 100
+        },
+        'bottom_right': {
+          'x': 490,
+          'y': 880
+        }
+      }
+    },
+    'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'imp': [{
+      'id': '28f8f8130a583e',
+      ortb2Imp: VALID_BID_REQUEST_WITH_USERID[0].ortb2Imp,
+      'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
+      'tagid': 'crid',
+      'ext': {
+        'dfp_id': 'div-gpt-ad-1460505748561-0',
+        'visibility': 1,
+        'viewability': 1,
+        'coordinates': {
+          'top_left': {
+            x: 50,
+            y: 50
+          },
+          'bottom_right': {
+            x: 100,
+            y: 100
+          }
+        },
+        'display_count': 1
+      },
+      'banner': [{
+        'w': 300,
+        'h': 250
+      }],
+      'all': {
+        'cid': 'customer_id',
+        'crid': 'crid',
+        'site': {
+          'page': 'http://media.net/prebidtest',
+          'domain': 'media.net',
+          'ref': 'http://media.net/prebidtest',
+          'isTop': true
+        }
+      }
+    }, {
+      'id': '3f97ca71b1e5c2',
+      ortb2Imp: VALID_BID_REQUEST_WITH_USERID[1].ortb2Imp,
+      'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
+      'tagid': 'crid',
+      'ext': {
+        'dfp_id': 'div-gpt-ad-1460505748561-123',
+        'visibility': 1,
+        'viewability': 1,
+        'coordinates': {
+          'top_left': {
+            x: 50,
+            y: 50
+          },
+          'bottom_right': {
+            x: 100,
+            y: 100
+          }
+        },
+        'display_count': 1
+      },
+      'banner': [{
+        'w': 300,
+        'h': 251
+      }],
+      'all': {
+        'cid': 'customer_id',
+        'crid': 'crid',
+        'site': {
+          'page': 'http://media.net/prebidtest',
+          'domain': 'media.net',
+          'ref': 'http://media.net/prebidtest',
+          'isTop': true
+        }
+      }
+    }],
+    'ortb2': {
+      'user': {
+        'ext': {
+          'eids': [{
+            'source': 'criteo.com',
+            'uids': [{
+              'id': 'VZME3l9ycFFORncwaGJRVUNtUzB1UVhpWVd5TElrR3A5SHVSWXAwSFVPJTJCWiUyRnV2UTBPWjZOZ1ZrWnN4SldxcWUlMkJhUnFmUVNzUVg4N1NsdW84SGpUU1BsUllQSnN5bERMdFdPM2pWVXAlMkZVSSUyQkZsJTJGcktlenpZaHp0YXlvU25INWRQQ2tXciUyRk9PQmdac3RHeG9adDNKVzlRWE51ZyUzRCUzRA',
+              'atype': 1
+            }
+            ]
+          }]
+        }
+      },
+    },
     'tmax': config.getConfig('bidderTimeout')
   },
   VALID_PAYLOAD_WITH_CRID = {
@@ -792,13 +1051,23 @@ let VALID_BID_REQUEST = [{
     },
     'ext': {
       'customer_id': 'customer_id',
-      'prebid_version': $$PREBID_GLOBAL$$.version,
+      'prebid_version': 'v' + '$prebid.version$',
       'gdpr_applies': false,
       'usp_applies': false,
       'coppa_applies': true,
       'screen': {
         'w': 1000,
         'h': 1000
+      },
+      'vcoords': {
+        'top_left': {
+          'x': 50,
+          'y': 100
+        },
+        'bottom_right': {
+          'x': 490,
+          'y': 880
+        }
       }
     },
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
@@ -873,8 +1142,89 @@ let VALID_BID_REQUEST = [{
         }
       }
     }],
+    'ortb2': {},
     'tmax': config.getConfig('bidderTimeout')
   },
+  // Protected Audience API Valid Payload
+  VALID_PAYLOAD_PAAPI = {
+    'site': {
+      'domain': 'media.net',
+      'page': 'http://media.net/prebidtest',
+      'ref': 'http://media.net/prebidtest',
+      'topMostLocation': 'http://media.net/topmost',
+      'isTop': true
+    },
+    'ext': {
+      'customer_id': 'customer_id',
+      'prebid_version': 'v' + '$prebid.version$',
+      'gdpr_applies': false,
+      'usp_applies': false,
+      'coppa_applies': false,
+      'screen': {
+        'w': 1000,
+        'h': 1000
+      },
+      'vcoords': {
+        'top_left': {
+          'x': 50,
+          'y': 100
+        },
+        'bottom_right': {
+          'x': 490,
+          'y': 880
+        }
+      }
+    },
+    'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'imp': [
+      {
+        'id': '28f8f8130a583e',
+        'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
+        'ext': {
+          'ae': 1,
+          'dfp_id': 'div-gpt-ad-1460505748561-0',
+          'display_count': 1,
+          'coordinates': {
+            'top_left': {
+              'x': 50,
+              'y': 50
+            },
+            'bottom_right': {
+              'x': 100,
+              'y': 100
+            }
+          },
+          'viewability': 1,
+          'visibility': 1
+        },
+        'all': {
+          'cid': 'customer_id',
+          'crid': 'crid',
+          'site': {
+            'domain': 'media.net',
+            'isTop': true,
+            'page': 'http://media.net/prebidtest',
+            'ref': 'http://media.net/prebidtest'
+          }
+        },
+        'ortb2Imp': {
+          'ext': {
+            'tid': '277b631f-92f5-4844-8b19-ea13c095d3f1',
+            'ae': 1
+          }
+        },
+        'banner': [
+          {
+            'w': 300,
+            'h': 250
+          }
+        ],
+        'tagid': 'crid'
+      }
+    ],
+    'ortb2': {},
+    'tmax': 3000
+  },
 
   VALID_VIDEO_BID_REQUEST = [{
     'bidder': 'medianet',
@@ -894,7 +1244,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '28f8f8130a583e',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }],
 
   VALID_PAYLOAD_PAGE_META = (() => {
@@ -1104,6 +1454,126 @@ let VALID_BID_REQUEST = [{
       }
     }
   },
+  // Protected Audience API Response
+  SERVER_RESPONSE_PAAPI = {
+    body: {
+      'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+      'bidList': [{
+        'no_bid': false,
+        'requestId': '28f8f8130a583e',
+        'ad': 'ad',
+        'width': 300,
+        'height': 250,
+        'creativeId': 'crid',
+        'netRevenue': true,
+        'cpm': 0.1
+      }],
+      'ext': {
+        'paApiAuctionConfigs': [
+          {
+            'bidId': '28f8f8130a583e',
+            'config': {
+              'seller': 'https://hbx.test.media.net',
+              'decisionLogicUrl': 'https://hbx.test.media.net/decision-logic.js',
+              'interestGroupBuyers': ['https://buyer.test.media.net'],
+              'auctionSignals': {
+                'logging_params': {
+                  'cid': 'customer_id',
+                  'crid': 'crid',
+                  'bid_uuid': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+                  'browser_id': 2,
+                  'dfpid': 'div-gpt-ad-1460505748561-0'
+                },
+                'pvidLookup': {
+                  'https://buyer.test.media.net': {
+                    'pvid': '172',
+                    'seat': 'quantcast-qc1'
+                  }
+                },
+                'bidFlr': 0.0
+              },
+              'sellerTimout': 1000,
+              'sellerSignals': {
+                'callbackURL': 'https://test.com/paapi/v1/abcd'
+              },
+              'perBuyerSignals': {
+                'https://buyer.test.media.net': [ 'test_buyer_signals' ]
+              },
+              'perBuyerTimeouts': {
+                '*': 200
+              }
+            }
+          }
+        ],
+        'csUrl': [{
+          'type': 'iframe',
+          'url': 'http://contextual.media.net/checksync.php?&vsSync=1'
+        }]
+      }
+    }
+  },
+  // Protected Audience API OpenRTB Response
+  SERVER_RESPONSE_PAAPI_ORTB = {
+    body: {
+      'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+      'bidList': [{
+        'no_bid': false,
+        'requestId': '28f8f8130a583e',
+        'ad': 'ad',
+        'width': 300,
+        'height': 250,
+        'creativeId': 'crid',
+        'netRevenue': true,
+        'cpm': 0.1
+      }],
+      'ext': {
+        'igi': [{
+          'igs': [
+            {
+              'impid': '28f8f8130a583e',
+              'bidId': '28f8f8130a583e',
+              'config': {
+                'seller': 'https://hbx.test.media.net',
+                'decisionLogicUrl': 'https://hbx.test.media.net/decision-logic.js',
+                'interestGroupBuyers': ['https://buyer.test.media.net'],
+                'auctionSignals': {
+                  'logging_params': {
+                    'cid': 'customer_id',
+                    'crid': 'crid',
+                    'bid_uuid': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+                    'browser_id': 2,
+                    'dfpid': 'div-gpt-ad-1460505748561-0'
+                  },
+                  'pvidLookup': {
+                    'https://buyer.test.media.net': {
+                      'pvid': '172',
+                      'seat': 'quantcast-qc1'
+                    }
+                  },
+                  'bidFlr': 0.0
+                },
+                'sellerTimout': 1000,
+                'sellerSignals': {
+                  'callbackURL': 'https://test.com/paapi/v1/abcd'
+                },
+                'perBuyerSignals': {
+                  'https://buyer.test.media.net': [ 'test_buyer_signals' ]
+                },
+                'perBuyerTimeouts': {
+                  '*': 200
+                }
+              }
+            }
+          ],
+        }],
+        'csUrl': [{
+          'type': 'iframe',
+          'url': 'http://contextual.media.net/checksync.php?&vsSync=1'
+        }]
+      }
+    }
+  },
+
   SERVER_VIDEO_OUTSTREAM_RESPONSE_VALID_BID = {
     body: {
       'id': 'd90ca32f-3877-424a-b2f2-6a68988df57a',
@@ -1176,7 +1646,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '28f8f8130a583e',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }, {
     'bidder': 'medianet',
     'params': {
@@ -1203,7 +1673,7 @@ let VALID_BID_REQUEST = [{
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
-    'bidRequestsCount': 1
+    'auctionsCount': 1
   }],
   VALID_BIDDER_REQUEST_WITH_GDPR = {
     'gdprConsent': {
@@ -1231,7 +1701,7 @@ let VALID_BID_REQUEST = [{
     },
     'ext': {
       'customer_id': 'customer_id',
-      'prebid_version': $$PREBID_GLOBAL$$.version,
+      'prebid_version': 'v' + '$prebid.version$',
       'gdpr_consent_string': 'consentString',
       'gdpr_applies': true,
       'usp_applies': true,
@@ -1240,6 +1710,16 @@ let VALID_BID_REQUEST = [{
       'screen': {
         'w': 1000,
         'h': 1000
+      },
+      'vcoords': {
+        'top_left': {
+          'x': 50,
+          'y': 100
+        },
+        'bottom_right': {
+          'x': 490,
+          'y': 880
+        }
       }
     },
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
@@ -1310,6 +1790,7 @@ let VALID_BID_REQUEST = [{
         }
       }
     }],
+    'ortb2': {},
     'tmax': 3000,
   },
   VALID_BIDDER_REQUEST_WITH_GPP_IN_ORTB2 = {
@@ -1339,13 +1820,23 @@ let VALID_BID_REQUEST = [{
     },
     'ext': {
       'customer_id': 'customer_id',
-      'prebid_version': $$PREBID_GLOBAL$$.version,
+      'prebid_version': 'v' + '$prebid.version$',
       'gdpr_applies': false,
       'usp_applies': false,
       'coppa_applies': false,
       'screen': {
         'w': 1000,
         'h': 1000
+      },
+      'vcoords': {
+        'top_left': {
+          'x': 50,
+          'y': 100
+        },
+        'bottom_right': {
+          'x': 490,
+          'y': 880
+        }
       }
     },
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
@@ -1428,6 +1919,10 @@ describe('Media.net bid adapter', function () {
   let sandbox;
   beforeEach(function () {
     sandbox = sinon.sandbox.create();
+    sandbox.stub(window.top, 'innerHeight').value(780)
+    sandbox.stub(window.top, 'innerWidth').value(440)
+    sandbox.stub(window.top, 'scrollY').value(100)
+    sandbox.stub(window.top, 'scrollX').value(50)
   });
 
   afterEach(function () {
@@ -1547,9 +2042,27 @@ describe('Media.net bid adapter', function () {
       expect(JSON.parse(bidReq.data)).to.deep.equal(VALID_PAYLOAD_WITH_USERID);
     });
 
+    it('should have userIdAsEids in bid request', function () {
+      let bidReq = spec.buildRequests(VALID_BID_REQUEST_WITH_USERIDASEIDS, VALID_AUCTIONDATA);
+      expect(JSON.parse(bidReq.data)).to.deep.equal(VALID_PAYLOAD_WITH_USERIDASEIDS);
+    });
+
+    it('should have valid payload when PAAPI is enabled', function () {
+      let bidReq = spec.buildRequests(VALID_BID_REQUEST_WITH_AE_IN_ORTB2IMP, {...VALID_AUCTIONDATA, paapi: {enabled: true}});
+      expect(JSON.parse(bidReq.data)).to.deep.equal(VALID_PAYLOAD_PAAPI);
+    });
+
+    it('should send whatever is set in ortb2imp.ext.ae in all bid requests when PAAPI is enabled', function () {
+      let bidReq = spec.buildRequests(VALID_BID_REQUEST_WITH_AE_IN_ORTB2IMP, {...VALID_AUCTIONDATA, paapi: {enabled: true}});
+      let data = JSON.parse(bidReq.data);
+      expect(data).to.deep.equal(VALID_PAYLOAD_PAAPI);
+      expect(data.imp[0].ext).to.have.property('ae');
+      expect(data.imp[0].ext.ae).to.equal(1);
+    });
+
     describe('build requests: when page meta-data is available', () => {
       beforeEach(() => {
-        spec.clearMnData();
+        spec.clearPageMeta();
       });
       it('should pass canonical, twitter and fb paramters if available', () => {
         let documentStub = sandbox.stub(window.top.document, 'querySelector');
@@ -1721,19 +2234,140 @@ describe('Media.net bid adapter', function () {
       let bids = spec.interpretResponse(SERVER_RESPONSE_EMPTY_BIDLIST, []);
       expect(bids).to.deep.equal(validBids);
     });
+
+    it('should return paapi if PAAPI response is received', function() {
+      let response = spec.interpretResponse(SERVER_RESPONSE_PAAPI, []);
+      expect(response).to.have.property('bids');
+      expect(response).to.have.property('paapi');
+      expect(response.paapi[0]).to.deep.equal(SERVER_RESPONSE_PAAPI.body.ext.paApiAuctionConfigs[0]);
+    });
+
+    it('should return paapi if openRTB PAAPI response received', function () {
+      let response = spec.interpretResponse(SERVER_RESPONSE_PAAPI_ORTB, []);
+      expect(response).to.have.property('bids');
+      expect(response).to.have.property('paapi');
+      expect(response.paapi[0]).to.deep.equal(SERVER_RESPONSE_PAAPI_ORTB.body.ext.igi[0].igs[0])
+    });
+
+    it('should have the correlation between paapi[0].bidId and bidreq.imp[0].id', function() {
+      let bidReq = spec.buildRequests(VALID_BID_REQUEST_WITH_AE_IN_ORTB2IMP, {...VALID_AUCTIONDATA, paapi: {enabled: true}});
+      let bidRes = spec.interpretResponse(SERVER_RESPONSE_PAAPI, []);
+      expect(bidRes.paapi[0].bidId).to.equal(JSON.parse(bidReq.data).imp[0].id)
+    });
+
+    it('should have the correlation between paapi[0].bidId and bidreq.imp[0].id for openRTB response', function() {
+      let bidReq = spec.buildRequests(VALID_BID_REQUEST_WITH_AE_IN_ORTB2IMP, {...VALID_AUCTIONDATA, paapi: {enabled: true}});
+      let bidRes = spec.interpretResponse(SERVER_RESPONSE_PAAPI_ORTB, []);
+      expect(bidRes.paapi[0].bidId).to.equal(JSON.parse(bidReq.data).imp[0].id)
+    });
   });
 
   describe('onTimeout', function () {
-    it('should have valid timeout data', function() {
-      let response = spec.onTimeout({});
-      expect(response).to.deep.equal(undefined);
+    it('onTimeout exist as a function', () => {
+      assert.typeOf(spec.onTimeout, 'function');
+    });
+    it('should send timeout data correctly', function () {
+      const timeoutData = [{
+        bidder: 'medianet',
+        bidId: 'mnet-4644-442a-b5e0-93f268cf8d19',
+        adUnitCode: 'adUnit-code',
+        timeout: 3000,
+        auctionId: '12a34b56c'
+      }];
+      sandbox.stub(window.navigator, 'sendBeacon').returns(false);
+
+      spec.onTimeout(timeoutData);
+      const reqBody = new URLSearchParams(server.requests[0].requestBody);
+
+      assert.equal(server.requests[0].method, 'POST');
+      assert.equal(server.requests[0].url, EVENT_PIXEL_URL);
+      assert.equal(reqBody.get('event'), EVENTS.TIMEOUT_EVENT_NAME);
+      assert.equal(reqBody.get('rd'), timeoutData[0].timeout.toString());
+      assert.equal(reqBody.get('acid[]'), timeoutData[0].auctionId);
     });
   });
 
   describe('onBidWon', function () {
-    it('should have valid bid data', function() {
-      let response = spec.onBidWon(undefined);
-      expect(response).to.deep.equal(undefined);
+    it('onBidWon exist as a function', () => {
+      assert.typeOf(spec.onBidWon, 'function');
+    });
+    it('should send winning bid data correctly', function () {
+      const bid = {
+        bidder: 'medianet',
+        bidId: 'mnet-4644-442a-b5e0-93f268cf8d19',
+        adUnitCode: 'adUnit-code',
+        timeout: 3000,
+        auctionId: '12a34b56c',
+        cpm: 12.24
+      };
+      sandbox.stub(window.navigator, 'sendBeacon').returns(false);
+
+      spec.onBidWon(bid);
+      const reqBody = new URLSearchParams(server.requests[0].requestBody);
+
+      assert.equal(server.requests[0].method, 'POST');
+      assert.equal(server.requests[0].url, EVENT_PIXEL_URL);
+      assert.equal(reqBody.get('event'), EVENTS.BID_WON_EVENT_NAME);
+      assert.equal(reqBody.get('value'), bid.cpm.toString());
+      assert.equal(reqBody.get('acid[]'), bid.auctionId);
+    });
+  });
+
+  describe('onSetTargeting', function () {
+    it('onSetTargeting exist as a function', () => {
+      assert.typeOf(spec.onSetTargeting, 'function');
+    });
+    it('should send targeting data correctly', function () {
+      const bid = {
+        bidder: 'medianet',
+        bidId: 'mnet-4644-442a-b5e0-93f268cf8d19',
+        adUnitCode: 'adUnit-code',
+        timeout: 3000,
+        auctionId: '12a34b56c',
+        cpm: 12.24
+      };
+      sandbox.stub(window.navigator, 'sendBeacon').returns(false);
+      sandbox.stub(config, 'getConfig').withArgs('enableSendAllBids').returns(false);
+
+      spec.onSetTargeting(bid);
+      const reqBody = new URLSearchParams(server.requests[0].requestBody);
+
+      assert.equal(server.requests[0].method, 'POST');
+      assert.equal(server.requests[0].url, EVENT_PIXEL_URL);
+      assert.equal(reqBody.get('event'), EVENTS.SET_TARGETING);
+      assert.equal(reqBody.get('value'), bid.cpm.toString());
+      assert.equal(reqBody.get('acid[]'), bid.auctionId);
+    });
+  });
+
+  describe('onBidderError', function () {
+    it('onBidderError exist as a function', () => {
+      assert.typeOf(spec.onBidderError, 'function');
+    });
+    it('should send bidderError data correctly', function () {
+      const error = {
+        reason: {message: 'Failed to fetch', status: 500},
+        timedOut: true,
+        status: 0
+      }
+      const bids = [{
+        bidder: 'medianet',
+        bidId: 'mnet-4644-442a-b5e0-93f268cf8d19',
+        adUnitCode: 'adUnit-code',
+        timeout: 3000,
+        auctionId: '12a34b56c',
+        cpm: 12.24
+      }];
+      sandbox.stub(window.navigator, 'sendBeacon').returns(false);
+
+      spec.onBidderError({error, bidderRequest: {bids}});
+      const reqBody = new URLSearchParams(server.requests[0].requestBody);
+
+      assert.equal(server.requests[0].method, 'POST');
+      assert.equal(server.requests[0].url, EVENT_PIXEL_URL);
+      assert.equal(reqBody.get('event'), EVENTS.BIDDER_ERROR);
+      assert.equal(reqBody.get('rd'), `timedOut:${error.timedOut}|status:${error.status}|message:${error.reason.message}`);
+      assert.equal(reqBody.get('acid[]'), bids[0].auctionId);
     });
   });
 
diff --git a/test/spec/modules/mediasquareBidAdapter_spec.js b/test/spec/modules/mediasquareBidAdapter_spec.js
index 125d4bef02b..cdeae38aa19 100644
--- a/test/spec/modules/mediasquareBidAdapter_spec.js
+++ b/test/spec/modules/mediasquareBidAdapter_spec.js
@@ -101,10 +101,35 @@ describe('MediaSquare bid adapter tests', function () {
       'adomain': ['test.com'],
       'context': 'instream',
       'increment': 1.0,
+      'ova': 'cleared',
+      'dsa': {
+        'behalf': 'some-behalf',
+        'paid': 'some-paid',
+        'transparency': [{
+          'domain': 'test.com',
+          'dsaparams': [1, 2, 3]
+        }],
+        'adrender': 1
+      }
     }],
   }};
 
   const DEFAULT_OPTIONS = {
+    ortb2: {
+      regs: {
+        ext: {
+          dsa: {
+            dsarequired: '1',
+            pubrender: '2',
+            datatopub: '3',
+            transparency: [{
+              domain: 'test.com',
+              dsaparams: [1, 2, 3]
+            }]
+          }
+        }
+      }
+    },
     gdprConsent: {
       gdprApplies: true,
       consentString: 'BOzZdA0OzZdA0AGABBENDJ-AAAAvh7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__79__3z3_9pxP78k89r7337Mw_v-_v-b7JCPN_Y3v-8Kg',
@@ -143,10 +168,12 @@ describe('MediaSquare bid adapter tests', function () {
     expect(requestContent.codes[0]).to.have.property('mediatypes').exist;
     expect(requestContent.codes[0]).to.have.property('floor').exist;
     expect(requestContent.codes[0].floor).to.deep.equal({});
+    expect(requestContent).to.have.property('dsa');
     const requestfloor = spec.buildRequests(FLOORS_PARAMS, DEFAULT_OPTIONS);
     const responsefloor = JSON.parse(requestfloor.data);
     expect(responsefloor.codes[0]).to.have.property('floor').exist;
     expect(responsefloor.codes[0].floor).to.have.property('300x250').and.to.have.property('floor').and.to.equal(1);
+    expect(responsefloor.codes[0].floor).to.have.property('*');
   });
 
   it('Verify parse response', function () {
@@ -171,9 +198,11 @@ describe('MediaSquare bid adapter tests', function () {
     expect(bid.mediasquare.increment).to.exist;
     expect(bid.mediasquare.increment).to.equal(1.0);
     expect(bid.mediasquare.code).to.equal([DEFAULT_PARAMS[0].params.owner, DEFAULT_PARAMS[0].params.code].join('/'));
+    expect(bid.mediasquare.ova).to.exist.and.to.equal('cleared');
     expect(bid.meta).to.exist;
     expect(bid.meta.advertiserDomains).to.exist;
     expect(bid.meta.advertiserDomains).to.have.lengthOf(1);
+    expect(bid.meta.dsa).to.exist;
   });
   it('Verifies match', function () {
     const request = spec.buildRequests(DEFAULT_PARAMS, DEFAULT_OPTIONS);
@@ -213,6 +242,7 @@ describe('MediaSquare bid adapter tests', function () {
     let message = JSON.parse(server.requests[0].requestBody);
     expect(message).to.have.property('increment').exist;
     expect(message).to.have.property('increment').and.to.equal('1');
+    expect(message).to.have.property('ova').and.to.equal('cleared');
   });
   it('Verifies user sync without cookie in bid response', function () {
     var syncs = spec.getUserSyncs({}, [BID_RESPONSE], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
diff --git a/test/spec/modules/merkleIdSystem_spec.js b/test/spec/modules/merkleIdSystem_spec.js
index 82c17336d20..b12bb365e5b 100644
--- a/test/spec/modules/merkleIdSystem_spec.js
+++ b/test/spec/modules/merkleIdSystem_spec.js
@@ -3,6 +3,8 @@ import * as utils from 'src/utils.js';
 import {merkleIdSubmodule} from 'modules/merkleIdSystem.js';
 
 import sinon from 'sinon';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
 
 let expect = require('chai').expect;
 
@@ -248,4 +250,71 @@ describe('Merkle System', function () {
       expect(callbackSpy.calledOnce).to.be.true;
     });
   });
+
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(merkleIdSubmodule);
+    });
+    it('merkleId (legacy) - supports single id', function() {
+      const userId = {
+        merkleId: {
+          id: 'some-random-id-value', keyID: 1
+        }
+      };
+      const newEids = createEidsArray(userId);
+
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'merkleinc.com',
+        uids: [{
+          id: 'some-random-id-value',
+          atype: 3,
+          ext: { keyID: 1 }
+        }]
+      });
+    });
+
+    it('merkleId supports multiple source providers', function() {
+      const userId = {
+        merkleId: [{
+          id: 'some-random-id-value', ext: { enc: 1, keyID: 16, idName: 'pamId', ssp: 'ssp1' }
+        }, {
+          id: 'another-random-id-value',
+          ext: {
+            enc: 1,
+            idName: 'pamId',
+            third: 4,
+            ssp: 'ssp2'
+          }
+        }]
+      }
+
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(2);
+      expect(newEids[0]).to.deep.equal({
+        source: 'ssp1.merkleinc.com',
+        uids: [{id: 'some-random-id-value',
+          atype: 3,
+          ext: {
+            enc: 1,
+            keyID: 16,
+            idName: 'pamId',
+            ssp: 'ssp1'
+          }
+        }]
+      });
+      expect(newEids[1]).to.deep.equal({
+        source: 'ssp2.merkleinc.com',
+        uids: [{id: 'another-random-id-value',
+          atype: 3,
+          ext: {
+            third: 4,
+            enc: 1,
+            idName: 'pamId',
+            ssp: 'ssp2'
+          }
+        }]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/mgidBidAdapter_spec.js b/test/spec/modules/mgidBidAdapter_spec.js
index f9bb1fb91e1..180b0dc723e 100644
--- a/test/spec/modules/mgidBidAdapter_spec.js
+++ b/test/spec/modules/mgidBidAdapter_spec.js
@@ -320,6 +320,14 @@ describe('Mgid bid adapter', function () {
     let abid = {
       adUnitCode: 'div',
       bidder: 'mgid',
+      ortb2Imp: {
+        ext: {
+          gpid: '/1111/gpid',
+          data: {
+            pbadslot: '/1111/gpid',
+          }
+        }
+      },
       params: {
         accountId: '1',
         placementId: '2',
@@ -447,12 +455,13 @@ describe('Mgid bid adapter', function () {
       expect(data.device.w).equal(screenWidth);
       expect(data.device.language).to.deep.equal(lang);
       expect(data.imp[0].tagid).to.deep.equal('2/div');
+      expect(data.imp[0].ext.gpid).to.deep.equal('/1111/gpid');
       expect(data.imp[0].banner).to.deep.equal({w: 300, h: 250});
       expect(data.imp[0].secure).to.deep.equal(secure);
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"banner":{"w":300,"h":250}}],"tmax":3000}`,
+        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"ext":{"gpid":"/1111/gpid"},"banner":{"w":300,"h":250}}],"tmax":3000}`,
       });
     });
     it('should not return native imp if minimum asset list not requested', function () {
@@ -496,12 +505,13 @@ describe('Mgid bid adapter', function () {
       expect(data.device.w).equal(screenWidth);
       expect(data.device.language).to.deep.equal(lang);
       expect(data.imp[0].tagid).to.deep.equal('2/div');
+      expect(data.imp[0].ext.gpid).to.deep.equal('/1111/gpid');
       expect(data.imp[0].native).is.a('object').and.to.deep.equal({'request': {'assets': [{'id': 1, 'required': 1, 'title': {'len': 80}}, {'id': 2, 'img': {'h': 80, 'type': 3, 'w': 80}, 'required': 0}, {'data': {'type': 1}, 'id': 11, 'required': 0}], 'plcmtcnt': 1}});
       expect(data.imp[0].secure).to.deep.equal(secure);
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"native":{"request":{"plcmtcnt":1,"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":2,"required":0,"img":{"type":3,"w":80,"h":80}},{"id":11,"required":0,"data":{"type":1}}]}}}],"tmax":3000}`,
+        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"ext":{"gpid":"/1111/gpid"},"native":{"request":{"plcmtcnt":1,"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":2,"required":0,"img":{"type":3,"w":80,"h":80}},{"id":11,"required":0,"data":{"type":1}}]}}}],"tmax":3000}`,
       });
     });
     it('should return proper native imp with image altered', function () {
@@ -538,7 +548,7 @@ describe('Mgid bid adapter', function () {
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"native":{"request":{"plcmtcnt":1,"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":2,"required":1,"img":{"type":3,"w":492,"h":328,"wmin":50,"hmin":50}},{"id":3,"required":0,"img":{"type":1,"w":50,"h":50}},{"id":11,"required":0,"data":{"type":1}}]}}}],"tmax":3000}`,
+        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"ext":{"gpid":"/1111/gpid"},"native":{"request":{"plcmtcnt":1,"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":2,"required":1,"img":{"type":3,"w":492,"h":328,"wmin":50,"hmin":50}},{"id":3,"required":0,"img":{"type":1,"w":50,"h":50}},{"id":11,"required":0,"data":{"type":1}}]}}}],"tmax":3000}`,
       });
     });
     it('should return proper native imp with sponsoredBy', function () {
@@ -574,7 +584,7 @@ describe('Mgid bid adapter', function () {
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"native":{"request":{"plcmtcnt":1,"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":2,"required":0,"img":{"type":3,"w":80,"h":80}},{"id":4,"required":0,"data":{"type":1}}]}}}],"tmax":3000}`,
+        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"ext":{"gpid":"/1111/gpid"},"native":{"request":{"plcmtcnt":1,"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":2,"required":0,"img":{"type":3,"w":80,"h":80}},{"id":4,"required":0,"data":{"type":1}}]}}}],"tmax":3000}`,
       });
     });
     it('should return proper banner request', function () {
@@ -608,7 +618,7 @@ describe('Mgid bid adapter', function () {
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"banner":{"w":300,"h":600,"format":[{"w":300,"h":600},{"w":300,"h":250}],"pos":1}}],"tmax":3000}`,
+        'data': `{"site":{"domain":"${domain}","page":"${page}"},"cur":["USD"],"geo":{"utcoffset":${utcOffset}},"device":{"ua":"${ua}","js":1,"dnt":${dnt},"h":${screenHeight},"w":${screenWidth},"language":"${lang}"},"ext":{"mgid_ver":"${mgid_ver}","prebid_ver":"${version}"},"imp":[{"tagid":"2/div","secure":${secure},"ext":{"gpid":"/1111/gpid"},"banner":{"w":300,"h":600,"format":[{"w":300,"h":600},{"w":300,"h":250}],"pos":1}}],"tmax":3000}`,
       });
     });
     it('should proper handle ortb2 data', function () {
diff --git a/test/spec/modules/mgidXBidAdapter_spec.js b/test/spec/modules/mgidXBidAdapter_spec.js
index 14619e9c0e1..9b39b307dc4 100644
--- a/test/spec/modules/mgidXBidAdapter_spec.js
+++ b/test/spec/modules/mgidXBidAdapter_spec.js
@@ -5,10 +5,19 @@ import { getUniqueIdentifierStr } from '../../../src/utils.js';
 import { config } from '../../../src/config';
 import { USERSYNC_DEFAULT_CONFIG } from '../../../src/userSync';
 
-const bidder = 'mgidX'
-const adUrl = 'https://us-east-x.mgid.com/pbjs';
+const bidder = 'mgidX';
 
 describe('MGIDXBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -19,8 +28,10 @@ describe('MGIDXBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        region: 'eu',
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -33,8 +44,9 @@ describe('MGIDXBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -56,8 +68,10 @@ describe('MGIDXBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        region: 'eu',
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -76,10 +90,22 @@ describe('MGIDXBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
-    }
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
@@ -105,8 +131,16 @@ describe('MGIDXBidAdapter', function () {
       expect(serverRequest.method).to.equal('POST');
     });
 
-    it('Returns valid URL', function () {
-      expect(serverRequest.url).to.equal(adUrl);
+    it('Returns valid EU URL', function () {
+      bids[0].params.region = 'eu';
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      expect(serverRequest.url).to.equal('https://eu-x.mgid.com/pbjs');
+    });
+
+    it('Returns valid EAST URL', function () {
+      bids[0].params.region = 'other';
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      expect(serverRequest.url).to.equal('https://us-east-x.mgid.com/pbjs');
     });
 
     it('Returns general data valid', function () {
@@ -114,6 +148,7 @@ describe('MGIDXBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -131,7 +166,7 @@ describe('MGIDXBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -147,6 +182,56 @@ describe('MGIDXBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -172,8 +257,10 @@ describe('MGIDXBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -188,12 +275,38 @@ describe('MGIDXBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
diff --git a/test/spec/modules/microadBidAdapter_spec.js b/test/spec/modules/microadBidAdapter_spec.js
index bd6d04a6312..ac1738685db 100644
--- a/test/spec/modules/microadBidAdapter_spec.js
+++ b/test/spec/modules/microadBidAdapter_spec.js
@@ -301,10 +301,6 @@ describe('microadBidAdapter', () => {
         userId: {novatiq: {snowflake: 'novatiq-sample'}},
         expected: {aids: JSON.stringify([{type: 10, id: 'novatiq-sample'}])}
       },
-      'Parrable ID': {
-        userId: {parrableId: {eid: 'parrable-sample'}},
-        expected: {aids: JSON.stringify([{type: 11, id: 'parrable-sample'}])}
-      },
       'AudienceOne User ID': {
         userId: {dacId: {id: 'audience-one-sample'}},
         expected: {aids: JSON.stringify([{type: 12, id: 'audience-one-sample'}])}
@@ -382,6 +378,196 @@ describe('microadBidAdapter', () => {
         })
       });
     })
+
+    describe('should send gpid', () => {
+      it('from gpid', () => {
+        const bidRequest = Object.assign({}, bidRequestTemplate, {
+          ortb2Imp: {
+            ext: {
+              tid: 'transaction-id',
+              gpid: '1111/2222',
+              data: {
+                pbadslot: '3333/4444'
+              }
+            }
+          }
+        });
+        const requests = spec.buildRequests([bidRequest], bidderRequest)
+        requests.forEach(request => {
+          expect(request.data).to.deep.equal(
+            Object.assign({}, expectedResultTemplate, {
+              cbt: request.data.cbt,
+              gpid: '1111/2222',
+              pbadslot: '3333/4444'
+            })
+          );
+        })
+      })
+
+      it('from pbadslot', () => {
+        const bidRequest = Object.assign({}, bidRequestTemplate, {
+          ortb2Imp: {
+            ext: {
+              tid: 'transaction-id',
+              data: {
+                pbadslot: '3333/4444'
+              }
+            }
+          }
+        });
+        const requests = spec.buildRequests([bidRequest], bidderRequest)
+        requests.forEach(request => {
+          expect(request.data).to.deep.equal(
+            Object.assign({}, expectedResultTemplate, {
+              cbt: request.data.cbt,
+              gpid: '3333/4444',
+              pbadslot: '3333/4444'
+            })
+          );
+        })
+      })
+    })
+
+    const notGettingGpids = {
+      'they are not existing': bidRequestTemplate,
+      'they are blank': {
+        ortb2Imp: {
+          ext: {
+            tid: 'transaction-id',
+            gpid: '',
+            data: {
+              pbadslot: ''
+            }
+          }
+        }
+      }
+    }
+
+    Object.entries(notGettingGpids).forEach(([testTitle, param]) => {
+      it(`should not send gpid because ${testTitle}`, () => {
+        const bidRequest = Object.assign({}, bidRequestTemplate, param);
+        const requests = spec.buildRequests([bidRequest], bidderRequest)
+        requests.forEach(request => {
+          expect(request.data).to.deep.equal(
+            Object.assign({}, expectedResultTemplate, {
+              cbt: request.data.cbt,
+            })
+          );
+          expect(request.data.gpid).to.be.undefined;
+          expect(request.data.pbadslot).to.be.undefined;
+        })
+      })
+    })
+
+    it('should send adservname', () => {
+      const bidRequest = Object.assign({}, bidRequestTemplate, {
+        ortb2Imp: {
+          ext: {
+            tid: 'transaction-id',
+            data: {
+              adserver: {
+                name: 'gam'
+              }
+            }
+          }
+        }
+      });
+      const requests = spec.buildRequests([bidRequest], bidderRequest)
+      requests.forEach(request => {
+        expect(request.data).to.deep.equal(
+          Object.assign({}, expectedResultTemplate, {
+            cbt: request.data.cbt,
+            adservname: 'gam'
+          })
+        );
+      })
+    })
+
+    const notGettingAdservnames = {
+      'it is not existing': bidRequestTemplate,
+      'it is blank': {
+        ortb2Imp: {
+          ext: {
+            tid: 'transaction-id',
+            data: {
+              adserver: {
+                name: ''
+              }
+            }
+          }
+        }
+      }
+    }
+
+    Object.entries(notGettingAdservnames).forEach(([testTitle, param]) => {
+      it(`should not send adservname because ${testTitle}`, () => {
+        const bidRequest = Object.assign({}, bidRequestTemplate, param);
+        const requests = spec.buildRequests([bidRequest], bidderRequest)
+        requests.forEach(request => {
+          expect(request.data).to.deep.equal(
+            Object.assign({}, expectedResultTemplate, {
+              cbt: request.data.cbt,
+            })
+          );
+          expect(request.data.adservname).to.be.undefined;
+        })
+      })
+    })
+
+    it('should send adservadslot', () => {
+      const bidRequest = Object.assign({}, bidRequestTemplate, {
+        ortb2Imp: {
+          ext: {
+            tid: 'transaction-id',
+            data: {
+              adserver: {
+                adslot: '/1111/home'
+              }
+            }
+          }
+        }
+      });
+      const requests = spec.buildRequests([bidRequest], bidderRequest)
+      requests.forEach(request => {
+        expect(request.data).to.deep.equal(
+          Object.assign({}, expectedResultTemplate, {
+            cbt: request.data.cbt,
+            adservadslot: '/1111/home'
+          })
+        );
+      })
+    })
+
+    const notGettingAdservadslots = {
+      'it is not existing': bidRequestTemplate,
+      'it is blank': {
+        ortb2Imp: {
+          ext: {
+            tid: 'transaction-id',
+            data: {
+              adserver: {
+                adslot: ''
+              }
+            }
+          }
+        }
+      }
+    }
+
+    Object.entries(notGettingAdservadslots).forEach(([testTitle, param]) => {
+      it(`should not send adservadslot because ${testTitle}`, () => {
+        const bidRequest = Object.assign({}, bidRequestTemplate, param);
+        const requests = spec.buildRequests([bidRequest], bidderRequest)
+        requests.forEach(request => {
+          expect(request.data).to.deep.equal(
+            Object.assign({}, expectedResultTemplate, {
+              cbt: request.data.cbt,
+            })
+          );
+          expect(request.data.adservadslot).to.be.undefined;
+        })
+      })
+    })
   });
 
   describe('interpretResponse', () => {
diff --git a/test/spec/modules/minutemediaBidAdapter_spec.js b/test/spec/modules/minutemediaBidAdapter_spec.js
index 48f694bc79d..f2bdd3b6c9d 100644
--- a/test/spec/modules/minutemediaBidAdapter_spec.js
+++ b/test/spec/modules/minutemediaBidAdapter_spec.js
@@ -291,6 +291,22 @@ describe('minutemediaAdapter', function () {
       expect(request.data.params).to.have.property('gdpr_consent', 'test-consent-string');
     });
 
+    it('should not send the gpp param if gppConsent is false in the bidRequest', function () {
+      const bidderRequestWithGPP = Object.assign({gppConsent: false}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGPP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gpp');
+      expect(request.data.params).to.not.have.property('gpp_sid');
+    });
+
+    it('should send the gpp param if gppConsent is true in the bidRequest', function () {
+      const bidderRequestWithGPP = Object.assign({gppConsent: {gppString: 'test-consent-string', applicableSections: [7]}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGPP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gpp', 'test-consent-string');
+      expect(request.data.params.gpp_sid[0]).to.be.equal(7);
+    });
+
     it('should have schain param if it is available in the bidRequest', () => {
       const schain = {
         ver: '1.0',
@@ -424,6 +440,8 @@ describe('minutemediaAdapter', function () {
         width: 640,
         height: 480,
         requestId: '21e12606d47ba7',
+        creativeId: 'creative-id',
+        nurl: 'http://example.com/win/1234',
         adomain: ['abc.com'],
         mediaType: VIDEO
       },
@@ -433,6 +451,8 @@ describe('minutemediaAdapter', function () {
         width: 300,
         height: 250,
         requestId: '21e12606d47ba7',
+        creativeId: 'creative-id',
+        nurl: 'http://example.com/win/1234',
         adomain: ['abc.com'],
         mediaType: BANNER
       }]
@@ -445,7 +465,7 @@ describe('minutemediaAdapter', function () {
       width: 640,
       height: 480,
       ttl: TTL,
-      creativeId: '21e12606d47ba7',
+      creativeId: 'creative-id',
       netRevenue: true,
       nurl: 'http://example.com/win/1234',
       mediaType: VIDEO,
@@ -460,10 +480,10 @@ describe('minutemediaAdapter', function () {
       requestId: '21e12606d47ba7',
       cpm: 12.5,
       currency: 'USD',
-      width: 640,
-      height: 480,
+      width: 300,
+      height: 250,
       ttl: TTL,
-      creativeId: '21e12606d47ba7',
+      creativeId: 'creative-id',
       netRevenue: true,
       nurl: 'http://example.com/win/1234',
       mediaType: BANNER,
@@ -476,8 +496,8 @@ describe('minutemediaAdapter', function () {
 
     it('should get correct bid response', function () {
       const result = spec.interpretResponse({ body: response });
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedVideoResponse));
-      expect(Object.keys(result[1])).to.deep.equal(Object.keys(expectedBannerResponse));
+      expect(result[0]).to.deep.equal(expectedVideoResponse);
+      expect(result[1]).to.deep.equal(expectedBannerResponse);
     });
 
     it('video type should have vastXml key', function () {
diff --git a/test/spec/modules/missenaBidAdapter_spec.js b/test/spec/modules/missenaBidAdapter_spec.js
index f61987298e8..afd96091d84 100644
--- a/test/spec/modules/missenaBidAdapter_spec.js
+++ b/test/spec/modules/missenaBidAdapter_spec.js
@@ -1,23 +1,84 @@
 import { expect } from 'chai';
-import { spec, _getPlatform } from 'modules/missenaBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
+import { spec, storage } from 'modules/missenaBidAdapter.js';
+import { BANNER } from '../../../src/mediaTypes.js';
+import { config } from 'src/config.js';
+import * as autoplay from 'libraries/autoplayDetection/autoplay.js';
+
+const REFERRER = 'https://referer';
+const REFERRER2 = 'https://referer2';
+const COOKIE_DEPRECATION_LABEL = 'test';
+const API_KEY = 'PA-XXXXXX';
 
 describe('Missena Adapter', function () {
-  const adapter = newBidder(spec);
+  $$PREBID_GLOBAL$$.bidderSettings = {
+    missena: {
+      storageAllowed: true,
+    },
+  };
+  let sandbox = sinon.sandbox.create();
+  sandbox.stub(config, 'getConfig').withArgs('coppa').returns(true);
+  sandbox.stub(autoplay, 'isAutoplayEnabled').returns(false);
 
   const bidId = 'abc';
-
   const bid = {
     bidder: 'missena',
     bidId: bidId,
     sizes: [[1, 1]],
+    mediaTypes: { banner: { sizes: [[1, 1]] } },
+    ortb2: {
+      device: {
+        ext: { cdep: COOKIE_DEPRECATION_LABEL },
+      },
+    },
     params: {
-      apiKey: 'PA-34745704',
+      apiKey: API_KEY,
       placement: 'sticky',
       formats: ['sticky-banner'],
     },
+    schain: {
+      validation: 'strict',
+      config: {
+        ver: '1.0',
+      },
+    },
+    getFloor: (inputParams) => {
+      if (inputParams.mediaType === BANNER) {
+        return {
+          currency: 'EUR',
+          floor: 3.5,
+        };
+      } else {
+        return {};
+      }
+    },
   };
+  const bidWithoutFloor = {
+    bidder: 'missena',
+    bidId: bidId,
+    sizes: [[1, 1]],
+    mediaTypes: { banner: { sizes: [[1, 1]] } },
+    params: {
+      apiKey: API_KEY,
+      placement: 'sticky',
+      formats: ['sticky-banner'],
+    },
+  };
+  const consentString = 'AAAAAAAAA==';
 
+  const bidderRequest = {
+    gdprConsent: {
+      consentString: consentString,
+      gdprApplies: true,
+    },
+    uspConsent: 'IDO',
+    refererInfo: {
+      topmostLocation: REFERRER,
+      canonicalUrl: 'https://canonical',
+    },
+    ortb2: { regs: { coppa: 1 } },
+  };
+
+  const bids = [bid, bidWithoutFloor];
   describe('codes', function () {
     it('should return a bidder code of missena', function () {
       expect(spec.code).to.equal('missena');
@@ -31,34 +92,44 @@ describe('Missena Adapter', function () {
 
     it('should return false if the apiKey is missing', function () {
       expect(
-        spec.isBidRequestValid(Object.assign(bid, { params: {} }))
+        spec.isBidRequestValid(Object.assign(bid, { params: {} })),
       ).to.equal(false);
     });
 
     it('should return false if the apiKey is an empty string', function () {
       expect(
-        spec.isBidRequestValid(Object.assign(bid, { params: { apiKey: '' } }))
+        spec.isBidRequestValid(Object.assign(bid, { params: { apiKey: '' } })),
       ).to.equal(false);
     });
   });
 
   describe('buildRequests', function () {
-    const consentString = 'AAAAAAAAA==';
-
-    const bidderRequest = {
-      gdprConsent: {
-        consentString: consentString,
-        gdprApplies: true,
-      },
-      refererInfo: {
-        topmostLocation: 'https://referer',
-        canonicalUrl: 'https://canonical',
-      },
-    };
+    let getDataFromLocalStorageStub = sinon.stub(
+      storage,
+      'getDataFromLocalStorage',
+    );
 
-    const requests = spec.buildRequests([bid, bid], bidderRequest);
+    const requests = spec.buildRequests(bids, bidderRequest);
     const request = requests[0];
     const payload = JSON.parse(request.data);
+    const payloadNoFloor = JSON.parse(requests[1].data);
+
+    it('should send disabled autoplay', function () {
+      expect(payload.autoplay).to.equal(0);
+    });
+
+    it('should contain coppa', function () {
+      expect(payload.coppa).to.equal(1);
+    });
+    sandbox.restore();
+
+    it('should contain uspConsent', function () {
+      expect(payload.us_privacy).to.equal('IDO');
+    });
+
+    it('should contain schain', function () {
+      expect(payload.schain.config.ver).to.equal('1.0');
+    });
 
     it('should return as many server requests as bidder requests', function () {
       expect(requests.length).to.equal(2);
@@ -73,15 +144,15 @@ describe('Missena Adapter', function () {
     });
 
     it('should send placement', function () {
-      expect(payload.placement).to.equal('sticky');
+      expect(payload.params.placement).to.equal('sticky');
     });
 
     it('should send formats', function () {
-      expect(payload.formats).to.eql(['sticky-banner']);
+      expect(payload.params.formats).to.eql(['sticky-banner']);
     });
 
     it('should send referer information to the request', function () {
-      expect(payload.referer).to.equal('https://referer');
+      expect(payload.referer).to.equal(REFERRER);
       expect(payload.referer_canonical).to.equal('https://canonical');
     });
 
@@ -89,6 +160,83 @@ describe('Missena Adapter', function () {
       expect(payload.consent_string).to.equal(consentString);
       expect(payload.consent_required).to.equal(true);
     });
+    it('should send floor data', function () {
+      expect(payload.floor).to.equal(3.5);
+      expect(payload.floor_currency).to.equal('EUR');
+    });
+    it('should not send floor data if not available', function () {
+      expect(payloadNoFloor.floor).to.equal(undefined);
+      expect(payloadNoFloor.floor_currency).to.equal(undefined);
+    });
+    it('should send the idempotency key', function () {
+      expect(window.msna_ik).to.not.equal(undefined);
+      expect(payload.ik).to.equal(window.msna_ik);
+    });
+
+    it('should send screen', function () {
+      expect(payload.screen.width).to.equal(screen.width);
+      expect(payload.screen.height).to.equal(screen.height);
+    });
+
+    getDataFromLocalStorageStub.restore();
+    getDataFromLocalStorageStub = sinon.stub(
+      storage,
+      'getDataFromLocalStorage',
+    );
+    const localStorageData = {
+      [`missena.missena.capper.remove-bubble.${bid.params.apiKey}`]:
+        JSON.stringify({
+          expiry: new Date().getTime() + 600_000, // 10 min into the future
+        }),
+    };
+    getDataFromLocalStorageStub.callsFake((key) => localStorageData[key]);
+    const cappedRequests = spec.buildRequests(bids, bidderRequest);
+
+    it('should not participate if capped', function () {
+      expect(cappedRequests.length).to.equal(0);
+    });
+
+    const localStorageDataSamePage = {
+      [`missena.missena.capper.remove-bubble.${bid.params.apiKey}`]:
+        JSON.stringify({
+          expiry: new Date().getTime() + 600_000, // 10 min into the future
+          referer: REFERRER,
+        }),
+    };
+
+    getDataFromLocalStorageStub.callsFake(
+      (key) => localStorageDataSamePage[key],
+    );
+    const cappedRequestsSamePage = spec.buildRequests(bids, bidderRequest);
+
+    it('should not participate if capped on same page', function () {
+      expect(cappedRequestsSamePage.length).to.equal(0);
+    });
+
+    const localStorageDataOtherPage = {
+      [`missena.missena.capper.remove-bubble.${bid.params.apiKey}`]:
+        JSON.stringify({
+          expiry: new Date().getTime() + 600_000, // 10 min into the future
+          referer: REFERRER2,
+        }),
+    };
+
+    getDataFromLocalStorageStub.callsFake(
+      (key) => localStorageDataOtherPage[key],
+    );
+    const cappedRequestsOtherPage = spec.buildRequests(bids, bidderRequest);
+
+    it('should participate if capped on a different page', function () {
+      expect(cappedRequestsOtherPage.length).to.equal(2);
+    });
+
+    it('should send the prebid version', function () {
+      expect(payload.version).to.equal('$prebid.version$');
+    });
+
+    it('should send cookie deprecation', function () {
+      expect(payload.cdep).to.equal(COOKIE_DEPRECATION_LABEL);
+    });
   });
 
   describe('interpretResponse', function () {
@@ -121,14 +269,14 @@ describe('Missena Adapter', function () {
       expect(result.length).to.equal(1);
 
       expect(Object.keys(result[0])).to.have.members(
-        Object.keys(serverResponse)
+        Object.keys(serverResponse),
       );
     });
 
     it('should return an empty response when the server answers with a timeout', function () {
       const result = spec.interpretResponse(
         { body: serverTimeoutResponse },
-        bid
+        bid,
       );
       expect(result).to.deep.equal([]);
     });
@@ -136,7 +284,7 @@ describe('Missena Adapter', function () {
     it('should return an empty response when the server answers with an empty ad', function () {
       const result = spec.interpretResponse(
         { body: serverEmptyAdResponse },
-        bid
+        bid,
       );
       expect(result).to.deep.equal([]);
     });
@@ -157,7 +305,7 @@ describe('Missena Adapter', function () {
 
       expect(userSync.length).to.be.equal(1);
       expect(userSync[0].type).to.be.equal('iframe');
-      expect(userSync[0].url).to.be.equal(syncFrameUrl);
+      expect(userSync[0].url).to.be.equal(`${syncFrameUrl}?t=${API_KEY}`);
     });
 
     it('should return empty array when iframeEnabled is false', function () {
@@ -170,7 +318,7 @@ describe('Missena Adapter', function () {
         gdprApplies: true,
         consentString,
       });
-      const expectedUrl = `${syncFrameUrl}?gdpr=1&gdpr_consent=${consentString}`;
+      const expectedUrl = `${syncFrameUrl}?t=${API_KEY}&gdpr=1&gdpr_consent=${consentString}`;
       expect(userSync.length).to.be.equal(1);
       expect(userSync[0].type).to.be.equal('iframe');
       expect(userSync[0].url).to.be.equal(expectedUrl);
@@ -180,7 +328,7 @@ describe('Missena Adapter', function () {
         gdprApplies: false,
         consentString,
       });
-      const expectedUrl = `${syncFrameUrl}?gdpr=0&gdpr_consent=${consentString}`;
+      const expectedUrl = `${syncFrameUrl}?t=${API_KEY}&gdpr=0&gdpr_consent=${consentString}`;
       expect(userSync.length).to.be.equal(1);
       expect(userSync[0].type).to.be.equal('iframe');
       expect(userSync[0].url).to.be.equal(expectedUrl);
diff --git a/test/spec/modules/mobfoxpbBidAdapter_spec.js b/test/spec/modules/mobfoxpbBidAdapter_spec.js
index 766f8d1a848..1bf1ec12bc4 100644
--- a/test/spec/modules/mobfoxpbBidAdapter_spec.js
+++ b/test/spec/modules/mobfoxpbBidAdapter_spec.js
@@ -1,148 +1,303 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/mobfoxpbBidAdapter.js';
+import { expect } from 'chai';
+import { spec } from '../../../modules/mobfoxpbBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'mobfoxpb';
 
 describe('MobfoxHBBidAdapter', function () {
-  const bid = {
-    bidId: '23fhj33i987f',
-    bidder: 'mobfoxpb',
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
     mediaTypes: {
       [BANNER]: {
         sizes: [[300, 250]]
       }
     },
     params: {
-      placementId: 783,
-      traffic: BANNER
+
     }
-  };
+  }
 
   const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'test.com'
-    }
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {
     it('Should return true if there are bidId, params and key parameters present', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
     });
     it('Should return false if at least one of parameters is not present', function () {
-      delete bid.params.placementId;
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
     });
   });
 
   describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
       expect(serverRequest.url).to.exist;
       expect(serverRequest.data).to.exist;
     });
+
     it('Returns POST method', function () {
       expect(serverRequest.method).to.equal('POST');
     });
+
     it('Returns valid URL', function () {
       expect(serverRequest.url).to.equal('https://bes.mobfox.com/pbjs');
     });
-    it('Returns valid data if array of bids is valid', function () {
+
+    it('Returns general data valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
       expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
-      expect(data.gdpr).to.not.exist;
-      expect(data.ccpa).to.not.exist;
-      let placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'schain', 'bidfloor');
-      expect(placement.placementId).to.equal(783);
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal(BANNER);
-      expect(placement.schain).to.be.an('object');
-      expect(placement.sizes).to.be.an('array');
-      expect(placement.bidfloor).to.equal(0);
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
     });
 
-    it('Returns valid data for mediatype video', function () {
-      const playerSize = [300, 300];
-      bid.mediaTypes = {};
-      bid.params.traffic = VIDEO;
-      bid.mediaTypes[VIDEO] = {
-        playerSize
-      };
-      serverRequest = spec.buildRequests([bid], bidderRequest);
-      let data = serverRequest.data;
-      expect(data).to.be.an('object');
-      let placement = data['placements'][0];
-      expect(placement).to.be.an('object');
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'playerSize', 'wPlayer', 'hPlayer', 'schain', 'bidfloor',
-        'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement',
-        'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity');
-      expect(placement.traffic).to.equal(VIDEO);
-      expect(placement.wPlayer).to.equal(playerSize[0]);
-      expect(placement.hPlayer).to.equal(playerSize[1]);
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
     });
 
-    it('Returns valid data for mediatype native', function () {
-      const native = {
-        title: {
-          required: true
-        },
-        body: {
-          required: true
-        },
-        icon: {
-          required: true,
-          size: [64, 64]
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
         }
-      };
+      ];
 
-      bid.mediaTypes = {};
-      bid.params.traffic = NATIVE;
-      bid.mediaTypes[NATIVE] = native;
-      serverRequest = spec.buildRequests([bid], bidderRequest);
-      let data = serverRequest.data;
-      expect(data).to.be.an('object');
-      let placement = data['placements'][0];
-      expect(placement).to.be.an('object');
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'native', 'schain', 'bidfloor');
-      expect(placement.traffic).to.equal(NATIVE);
-      expect(placement.native).to.equal(native);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.traffic) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
     });
 
     it('Returns data with gdprConsent and without uspConsent', function () {
-      bidderRequest.gdprConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
 
     it('Returns data with uspConsent and without gdprConsent', function () {
-      bidderRequest.uspConsent = 'test';
-      serverRequest = spec.buildRequests([bid], bidderRequest);
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.ccpa).to.exist;
       expect(data.ccpa).to.be.a('string');
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
+
   describe('interpretResponse', function () {
     it('Should interpret banner response', function () {
       const banner = {
@@ -157,7 +312,11 @@ describe('MobfoxHBBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let bannerResponses = spec.interpretResponse(banner);
@@ -165,15 +324,16 @@ describe('MobfoxHBBidAdapter', function () {
       let dataItem = bannerResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
         'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
-      expect(dataItem.requestId).to.equal('23fhj33i987f');
-      expect(dataItem.cpm).to.equal(0.4);
-      expect(dataItem.width).to.equal(300);
-      expect(dataItem.height).to.equal(250);
-      expect(dataItem.ad).to.equal('Test');
-      expect(dataItem.ttl).to.equal(120);
-      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
       expect(dataItem.netRevenue).to.be.true;
-      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret video response', function () {
       const video = {
@@ -186,7 +346,11 @@ describe('MobfoxHBBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let videoResponses = spec.interpretResponse(video);
@@ -202,6 +366,7 @@ describe('MobfoxHBBidAdapter', function () {
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
       expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret native response', function () {
       const native = {
@@ -219,6 +384,10 @@ describe('MobfoxHBBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
         }]
       };
       let nativeResponses = spec.interpretResponse(native);
@@ -238,6 +407,7 @@ describe('MobfoxHBBidAdapter', function () {
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
       expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should return an empty array if invalid banner response is passed', function () {
       const invBanner = {
diff --git a/test/spec/modules/mobianRtdProvider_spec.js b/test/spec/modules/mobianRtdProvider_spec.js
new file mode 100644
index 00000000000..796a79e4e1c
--- /dev/null
+++ b/test/spec/modules/mobianRtdProvider_spec.js
@@ -0,0 +1,245 @@
+import { expect } from 'chai';
+import sinon from 'sinon';
+import * as ajax from 'src/ajax.js';
+import * as gptUtils from 'libraries/gptUtils/gptUtils.js';
+import {
+  CONTEXT_KEYS,
+  extendBidRequestConfig,
+  fetchContextData,
+  getConfig,
+  getContextData,
+  makeDataFromResponse,
+  setTargeting,
+} from 'modules/mobianRtdProvider.js';
+
+describe('Mobian RTD Submodule', function () {
+  let ajaxStub;
+  let bidReqConfig;
+  let setKeyValueSpy;
+
+  const mockResponse = JSON.stringify({
+    meta: {
+      url: 'https://example.com',
+      has_results: true
+    },
+    results: {
+      ap: { a0: [], a1: [2313, 12], p0: [1231231, 212], p1: [231, 419] },
+      mobianContentCategories: [],
+      mobianEmotions: ['affection'],
+      mobianGenres: [],
+      mobianRisk: 'low',
+      mobianSentiment: 'positive',
+      mobianThemes: [],
+      mobianTones: [],
+    }
+  });
+
+  const mockContextData = {
+    apValues: { a0: [], a1: [2313, 12], p0: [1231231, 212], p1: [231, 419] },
+    categories: [],
+    emotions: ['affection'],
+    genres: [],
+    risk: 'low',
+    sentiment: 'positive',
+    themes: [],
+    tones: [],
+  }
+
+  beforeEach(function () {
+    bidReqConfig = {
+      ortb2Fragments: {
+        global: {
+          site: {
+            ext: {
+              data: {}
+            }
+          }
+        }
+      }
+    };
+
+    setKeyValueSpy = sinon.spy(gptUtils, 'setKeyValue');
+  });
+
+  afterEach(function () {
+    ajaxStub.restore();
+    setKeyValueSpy.restore();
+  });
+
+  describe('fetchContextData', function () {
+    it('should return fetched context data', async function () {
+      ajaxStub = sinon.stub(ajax, 'ajaxBuilder').returns(function(url, callbacks) {
+        callbacks.success(mockResponse);
+      });
+
+      const contextData = await fetchContextData();
+      expect(contextData).to.deep.equal(mockResponse);
+    });
+  });
+
+  describe('makeDataFromResponse', function () {
+    it('should format context data response', async function () {
+      ajaxStub = sinon.stub(ajax, 'ajaxBuilder').returns(function(url, callbacks) {
+        callbacks.success(mockResponse);
+      });
+
+      const data = makeDataFromResponse(mockResponse);
+      expect(data).to.deep.equal(mockContextData);
+    });
+  });
+
+  describe('getContextData', function () {
+    it('should return formatted context data', async function () {
+      ajaxStub = sinon.stub(ajax, 'ajaxBuilder').returns(function(url, callbacks) {
+        callbacks.success(mockResponse);
+      });
+
+      const data = await getContextData();
+      expect(data).to.deep.equal(mockContextData);
+    });
+  });
+
+  describe('setTargeting', function () {
+    it('should set targeting key-value pairs as per config', function () {
+      const parsedConfig = {
+        prefix: 'mobian',
+        publisherTargeting: ['apValues', 'emotions', 'risk', 'sentiment', 'themes', 'tones', 'genres'],
+      };
+      setTargeting(parsedConfig, mockContextData);
+
+      expect(setKeyValueSpy.callCount).to.equal(6);
+      expect(setKeyValueSpy.calledWith('mobian_ap_a1', [2313, 12])).to.equal(true);
+      expect(setKeyValueSpy.calledWith('mobian_ap_p0', [1231231, 212])).to.equal(true);
+      expect(setKeyValueSpy.calledWith('mobian_ap_p1', [231, 419])).to.equal(true);
+      expect(setKeyValueSpy.calledWith('mobian_emotions', ['affection'])).to.equal(true);
+      expect(setKeyValueSpy.calledWith('mobian_risk', 'low')).to.equal(true);
+      expect(setKeyValueSpy.calledWith('mobian_sentiment', 'positive')).to.equal(true);
+
+      expect(setKeyValueSpy.calledWith('mobian_ap_a0')).to.equal(false);
+      expect(setKeyValueSpy.calledWith('mobian_themes')).to.equal(false);
+      expect(setKeyValueSpy.calledWith('mobian_tones')).to.equal(false);
+      expect(setKeyValueSpy.calledWith('mobian_genres')).to.equal(false);
+    });
+
+    it('should not set key-value pairs if context data is empty', function () {
+      const parsedConfig = {
+        prefix: 'mobian',
+        publisherTargeting: ['apValues', 'emotions', 'risk', 'sentiment', 'themes', 'tones', 'genres'],
+      };
+      setTargeting(parsedConfig, {});
+
+      expect(setKeyValueSpy.callCount).to.equal(0);
+    });
+
+    it('should only set key-value pairs for the keys specified in config', function () {
+      const parsedConfig = {
+        prefix: 'mobian',
+        publisherTargeting: ['emotions', 'risk'],
+      };
+
+      setTargeting(parsedConfig, mockContextData);
+
+      expect(setKeyValueSpy.callCount).to.equal(2);
+      expect(setKeyValueSpy.calledWith('mobian_emotions', ['affection'])).to.equal(true);
+      expect(setKeyValueSpy.calledWith('mobian_risk', 'low')).to.equal(true);
+
+      expect(setKeyValueSpy.calledWith('mobian_ap_a0')).to.equal(false);
+      expect(setKeyValueSpy.calledWith('mobian_ap_a1')).to.equal(false);
+      expect(setKeyValueSpy.calledWith('mobian_ap_p0')).to.equal(false);
+      expect(setKeyValueSpy.calledWith('mobian_ap_p1')).to.equal(false);
+      expect(setKeyValueSpy.calledWith('mobian_themes')).to.equal(false);
+      expect(setKeyValueSpy.calledWith('mobian_tones')).to.equal(false);
+      expect(setKeyValueSpy.calledWith('mobian_genres')).to.equal(false);
+    });
+  });
+
+  describe('extendBidRequestConfig', function () {
+    it('should extend bid request config with context data', function () {
+      const extendedConfig = extendBidRequestConfig(bidReqConfig, mockContextData);
+      expect(extendedConfig.ortb2Fragments.global.site.ext.data).to.deep.equal(mockContextData);
+    });
+
+    it('should not override existing data', function () {
+      bidReqConfig.ortb2Fragments.global.site.ext.data = {
+        existing: 'data'
+      };
+
+      const extendedConfig = extendBidRequestConfig(bidReqConfig, mockContextData);
+      expect(extendedConfig.ortb2Fragments.global.site.ext.data).to.deep.equal({
+        existing: 'data',
+        ...mockContextData
+      });
+    });
+
+    it('should create data object if missing', function () {
+      delete bidReqConfig.ortb2Fragments.global.site.ext.data;
+      const extendedConfig = extendBidRequestConfig(bidReqConfig, mockContextData);
+      expect(extendedConfig.ortb2Fragments.global.site.ext.data).to.deep.equal(mockContextData);
+    });
+  });
+
+  describe('getConfig', function () {
+    it('should return config with correct keys', function () {
+      const config = getConfig({
+        name: 'mobianBrandSafety',
+        params: {
+          prefix: 'mobiantest',
+          publisherTargeting: ['apValues'],
+          advertiserTargeting: ['emotions'],
+        }
+      });
+      expect(config).to.deep.equal({
+        prefix: 'mobiantest',
+        publisherTargeting: ['apValues'],
+        advertiserTargeting: ['emotions'],
+      });
+    });
+
+    it('should set default values for configs not set', function () {
+      const config = getConfig({
+        name: 'mobianBrandSafety',
+        params: {
+          publisherTargeting: ['apValues'],
+        }
+      });
+      expect(config).to.deep.equal({
+        prefix: 'mobian',
+        publisherTargeting: ['apValues'],
+        advertiserTargeting: [],
+      });
+    });
+
+    it('should set default values if not provided', function () {
+      const config = getConfig({});
+      expect(config).to.deep.equal({
+        prefix: 'mobian',
+        publisherTargeting: [],
+        advertiserTargeting: [],
+      });
+    });
+
+    it('should set default values if no config is provided', function () {
+      const config = getConfig();
+      expect(config).to.deep.equal({
+        prefix: 'mobian',
+        publisherTargeting: [],
+        advertiserTargeting: [],
+      });
+    });
+
+    it('should set all tarteging values if value is true', function () {
+      const config = getConfig({
+        name: 'mobianBrandSafety',
+        params: {
+          publisherTargeting: true,
+          advertiserTargeting: true,
+        }
+      });
+      expect(config).to.deep.equal({
+        prefix: 'mobian',
+        publisherTargeting: CONTEXT_KEYS,
+        advertiserTargeting: CONTEXT_KEYS,
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/mygaruIdSystem_spec.js b/test/spec/modules/mygaruIdSystem_spec.js
new file mode 100644
index 00000000000..2bfb5fdd4af
--- /dev/null
+++ b/test/spec/modules/mygaruIdSystem_spec.js
@@ -0,0 +1,62 @@
+import { mygaruIdSubmodule } from 'modules/mygaruIdSystem.js';
+import { server } from '../../mocks/xhr';
+
+describe('MygaruID module', function () {
+  it('should respond with async callback and get valid id', async () => {
+    const callBackSpy = sinon.spy();
+    const expectedUrl = `https://ident.mygaru.com/v2/id?gdprApplies=0`;
+    const result = mygaruIdSubmodule.getId({});
+
+    expect(result.callback).to.be.an('function');
+    const promise = result.callback(callBackSpy);
+
+    const request = server.requests[0];
+    expect(request.url).to.be.eq(expectedUrl);
+
+    request.respond(
+      200,
+      { 'Content-Type': 'application/json' },
+      JSON.stringify({ iuid: '123' })
+    );
+    await promise;
+
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.calledWith({mygaruId: '123'})).to.be.true;
+  });
+  it('should not fail on error', async () => {
+    const callBackSpy = sinon.spy();
+    const expectedUrl = `https://ident.mygaru.com/v2/id?gdprApplies=0`;
+    const result = mygaruIdSubmodule.getId({});
+
+    expect(result.callback).to.be.an('function');
+    const promise = result.callback(callBackSpy);
+
+    const request = server.requests[0];
+    expect(request.url).to.be.eq(expectedUrl);
+
+    request.respond(
+      500,
+      {},
+      ''
+    );
+    await promise;
+
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.calledWith({mygaruId: undefined})).to.be.true;
+  });
+
+  it('should not modify while decoding', () => {
+    const id = '222';
+    const newId = mygaruIdSubmodule.decode(id)
+
+    expect(id).to.eq(newId);
+  })
+  it('should buildUrl with consent data', () => {
+    const result = mygaruIdSubmodule.getId({}, {
+      gdprApplies: true,
+      consentString: 'consentString'
+    });
+
+    expect(result.url).to.eq('https://ident.mygaru.com/v2/id?gdprApplies=1&gdprConsentString=consentString');
+  })
+});
diff --git a/test/spec/modules/mytargetBidAdapter_spec.js b/test/spec/modules/mytargetBidAdapter_spec.js
deleted file mode 100644
index 8880efd3d7c..00000000000
--- a/test/spec/modules/mytargetBidAdapter_spec.js
+++ /dev/null
@@ -1,199 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/mytargetBidAdapter';
-
-describe('MyTarget Adapter', function() {
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found', function () {
-      let validBid = {
-        bidder: 'mytarget',
-        params: {
-          placementId: '1'
-        }
-      };
-
-      expect(spec.isBidRequestValid(validBid)).to.equal(true);
-    });
-
-    it('should return false for when required params are not passed', function () {
-      let invalidBid = {
-        bidder: 'mytarget',
-        params: {}
-      };
-
-      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        bidId: 'bid1',
-        bidder: 'mytarget',
-        params: {
-          placementId: '1'
-        }
-      },
-      {
-        bidId: 'bid2',
-        bidder: 'mytarget',
-        params: {
-          placementId: '2',
-          position: 1,
-          response: 1,
-          bidfloor: 10000
-        }
-      }
-    ];
-    let bidderRequest = {
-      refererInfo: {
-        page: 'https://example.com?param=value'
-      }
-    };
-
-    let bidRequest = spec.buildRequests(bidRequests, bidderRequest);
-
-    it('should build single POST request for multiple bids', function() {
-      expect(bidRequest.method).to.equal('POST');
-      expect(bidRequest.url).to.equal('//ad.mail.ru/hbid_prebid/');
-      expect(bidRequest.data).to.be.an('object');
-      expect(bidRequest.data.places).to.be.an('array');
-      expect(bidRequest.data.places).to.have.lengthOf(2);
-    });
-
-    it('should pass bid parameters', function() {
-      let place1 = bidRequest.data.places[0];
-      let place2 = bidRequest.data.places[1];
-
-      expect(place1.placementId).to.equal('1');
-      expect(place2.placementId).to.equal('2');
-      expect(place1.id).to.equal('bid1');
-      expect(place2.id).to.equal('bid2');
-    });
-
-    it('should pass default position and response type', function() {
-      let place = bidRequest.data.places[0];
-
-      expect(place.position).to.equal(0);
-      expect(place.response).to.equal(0);
-    });
-
-    it('should pass provided position and response type', function() {
-      let place = bidRequest.data.places[1];
-
-      expect(place.position).to.equal(1);
-      expect(place.response).to.equal(1);
-    });
-
-    it('should not pass default bidfloor', function() {
-      let place = bidRequest.data.places[0];
-
-      expect(place.bidfloor).not.to.exist;
-    });
-
-    it('should not pass provided bidfloor', function() {
-      let place = bidRequest.data.places[1];
-
-      expect(place.bidfloor).to.exist;
-      expect(place.bidfloor).to.equal(10000);
-    });
-
-    it('should pass site parameters', function() {
-      let site = bidRequest.data.site;
-
-      expect(site).to.be.an('object');
-      expect(site.sitename).to.equal('example.com');
-      expect(site.page).to.equal('https://example.com?param=value');
-    });
-
-    it('should pass settings', function() {
-      let settings = bidRequest.data.settings;
-
-      expect(settings).to.be.an('object');
-      expect(settings.currency).to.equal('RUB');
-      expect(settings.windowSize).to.be.an('object');
-      expect(settings.windowSize.width).to.equal(window.screen.width);
-      expect(settings.windowSize.height).to.equal(window.screen.height);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let serverResponse = {
-      body: {
-        'bidder_status':
-          [
-            {
-              'bidder': 'mail.ru',
-              'response_time_ms': 100,
-              'num_bids': 2
-            }
-          ],
-        'bids':
-          [
-            {
-              'displayUrl': 'https://ad.mail.ru/hbid_imp/12345',
-              'size':
-                {
-                  'height': '400',
-                  'width': '240'
-                },
-              'id': '1',
-              'currency': 'RUB',
-              'price': 100,
-              'ttl': 360,
-              'creativeId': '123456'
-            },
-            {
-              'adm': '
Ad
',
-              'size':
-                {
-                  'height': '250',
-                  'width': '300'
-                },
-              'id': '2',
-              'price': 200
-            }
-          ]
-      }
-    };
-
-    let bids = spec.interpretResponse(serverResponse);
-
-    it('should return empty array for response with no bids', function() {
-      let emptyBids = spec.interpretResponse({ body: {} });
-
-      expect(emptyBids).to.have.lengthOf(0);
-    });
-
-    it('should parse all bids from response', function() {
-      expect(bids).to.have.lengthOf(2);
-    });
-
-    it('should parse bid with ad url', function() {
-      expect(bids[0].requestId).to.equal('1');
-      expect(bids[0].cpm).to.equal(100);
-      expect(bids[0].width).to.equal('240');
-      expect(bids[0].height).to.equal('400');
-      expect(bids[0].ttl).to.equal(360);
-      expect(bids[0].currency).to.equal('RUB');
-      expect(bids[0]).to.have.property('creativeId');
-      expect(bids[0].creativeId).to.equal('123456');
-      expect(bids[0].netRevenue).to.equal(true);
-      expect(bids[0].adUrl).to.equal('https://ad.mail.ru/hbid_imp/12345');
-      expect(bids[0]).to.not.have.property('ad');
-    });
-
-    it('should parse bid with ad markup', function() {
-      expect(bids[1].requestId).to.equal('2');
-      expect(bids[1].cpm).to.equal(200);
-      expect(bids[1].width).to.equal('300');
-      expect(bids[1].height).to.equal('250');
-      expect(bids[1].ttl).to.equal(180);
-      expect(bids[1].currency).to.equal('RUB');
-      expect(bids[1]).to.have.property('creativeId');
-      expect(bids[1].creativeId).not.to.equal('123456');
-      expect(bids[1].netRevenue).to.equal(true);
-      expect(bids[1].ad).to.equal('
Ad
');
-      expect(bids[1]).to.not.have.property('adUrl');
-    });
-  });
-});
diff --git a/test/spec/modules/nativoBidAdapter_spec.js b/test/spec/modules/nativoBidAdapter_spec.js
index 75fb357b196..349051cb48e 100644
--- a/test/spec/modules/nativoBidAdapter_spec.js
+++ b/test/spec/modules/nativoBidAdapter_spec.js
@@ -221,6 +221,7 @@ describe('interpretResponse', function () {
         meta: {
           advertiserDomains: ['test.com'],
         },
+        mediaType: 'banner',
       },
     ]
 
@@ -681,16 +682,24 @@ describe('hasProtocol', () => {
 
 describe('addProtocol', () => {
   it('www.testpage.com', () => {
-    expect(addProtocol('www.testpage.com')).to.be.equal('https://www.testpage.com')
+    expect(addProtocol('www.testpage.com')).to.be.equal(
+      'https://www.testpage.com'
+    )
   })
   it('//www.testpage.com', () => {
-    expect(addProtocol('//www.testpage.com')).to.be.equal('https://www.testpage.com')
+    expect(addProtocol('//www.testpage.com')).to.be.equal(
+      'https://www.testpage.com'
+    )
   })
   it('http://www.testpage.com', () => {
-    expect(addProtocol('http://www.testpage.com')).to.be.equal('http://www.testpage.com')
+    expect(addProtocol('http://www.testpage.com')).to.be.equal(
+      'http://www.testpage.com'
+    )
   })
   it('https://www.testpage.com', () => {
-    expect(addProtocol('https://www.testpage.com')).to.be.equal('https://www.testpage.com')
+    expect(addProtocol('https://www.testpage.com')).to.be.equal(
+      'https://www.testpage.com'
+    )
   })
 })
 
@@ -786,7 +795,7 @@ describe('RequestData', () => {
 
 describe('UserEIDs', () => {
   const userEids = new UserEIDs()
-  const eids = [{ 'testId': 1111 }]
+  const eids = [{ testId: 1111 }]
 
   describe('processBidRequestData', () => {
     it('Processes bid request without eids', () => {
@@ -810,7 +819,7 @@ describe('UserEIDs', () => {
       expect(qs).to.include('ntv_pb_eid=')
       try {
         expect(JSON.parse(value)).to.be.equal(eids)
-      } catch (err) { }
+      } catch (err) {}
     })
   })
 })
@@ -828,12 +837,83 @@ describe('buildRequestUrl', () => {
   })
 
   it('Returns baseUrl + QS params if QS strings passed', () => {
-    const url = buildRequestUrl(baseUrl, ['ntv_ptd=123456&ntv_test=true', 'ntv_foo=bar'])
-    expect(url).to.be.equal(`${baseUrl}?ntv_ptd=123456&ntv_test=true&ntv_foo=bar`)
+    const url = buildRequestUrl(baseUrl, [
+      'ntv_ptd=123456&ntv_test=true',
+      'ntv_foo=bar',
+    ])
+    expect(url).to.be.equal(
+      `${baseUrl}?ntv_ptd=123456&ntv_test=true&ntv_foo=bar`
+    )
   })
 
   it('Returns baseUrl + QS params if mixed QS strings passed', () => {
-    const url = buildRequestUrl(baseUrl, ['ntv_ptd=123456&ntv_test=true', '', '', 'ntv_foo=bar'])
-    expect(url).to.be.equal(`${baseUrl}?ntv_ptd=123456&ntv_test=true&ntv_foo=bar`)
+    const url = buildRequestUrl(baseUrl, [
+      'ntv_ptd=123456&ntv_test=true',
+      '',
+      '',
+      'ntv_foo=bar',
+    ])
+    expect(url).to.be.equal(
+      `${baseUrl}?ntv_ptd=123456&ntv_test=true&ntv_foo=bar`
+    )
+  })
+})
+
+describe('Prebid Video', function () {
+  it('should handle video bid requests', function () {
+    const videoBidRequest = {
+      bidder: 'nativo',
+      params: {
+        video: {
+          mimes: ['video/mp4'],
+          protocols: [2, 3, 5, 6],
+          playbackmethod: [1, 2],
+          skip: 1,
+          skipafter: 5,
+        },
+      },
+    }
+
+    const isValid = spec.isBidRequestValid(videoBidRequest)
+    expect(isValid).to.be.true
+  })
+})
+
+describe('Prebid Native', function () {
+  it('should handle native bid requests', function () {
+    const nativeBidRequest = {
+      bidder: 'nativo',
+      params: {
+        native: {
+          title: {
+            required: true,
+            len: 80,
+          },
+          image: {
+            required: true,
+            sizes: [150, 50],
+          },
+          sponsoredBy: {
+            required: true,
+          },
+          clickUrl: {
+            required: true,
+          },
+          privacyLink: {
+            required: false,
+          },
+          body: {
+            required: true,
+          },
+          icon: {
+            required: true,
+            sizes: [50, 50],
+          },
+        },
+      },
+    }
+
+    const isValid = spec.isBidRequestValid(nativeBidRequest)
+    expect(isValid).to.be.true
   })
 })
diff --git a/test/spec/modules/naveggIdSystem_spec.js b/test/spec/modules/naveggIdSystem_spec.js
index 2c4f1cda859..4907a63abde 100644
--- a/test/spec/modules/naveggIdSystem_spec.js
+++ b/test/spec/modules/naveggIdSystem_spec.js
@@ -1,45 +1,155 @@
-import { naveggIdSubmodule, storage } from 'modules/naveggIdSystem.js';
+import { naveggIdSubmodule, storage, getIdFromAPI } from 'modules/naveggIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
+import * as ajaxLib from 'src/ajax.js';
 
-describe('naveggId', function () {
-  let sandbox;
-  beforeEach(() => {
-    sandbox = sinon.sandbox.create();
-    sandbox.stub(storage, 'getDataFromLocalStorage');
+const NAVEGGID_CONFIG_COOKIE_HTML5 = {
+  storage: {
+    name: 'nvggid',
+    type: 'cookie&html5',
+    expires: 8
+  }
+}
+
+const MOCK_RESPONSE = {
+  nvggid: 'test_nvggid'
+}
+
+const MOCK_RESPONSE_NULL = {
+  nvggid: null
+}
+
+function mockResponse(responseText, isSuccess = true) {
+  return function(url, callbacks) {
+    if (isSuccess) {
+      callbacks.success(responseText)
+    } else {
+      callbacks.error(new Error('Mock Error'))
+    }
+  }
+}
+
+function deleteAllCookies() {
+  document.cookie.split(';').forEach(cookie => {
+    const eqPos = cookie.indexOf('=');
+    const name = eqPos > -1 ? cookie.substring(0, eqPos) : cookie;
+    document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
+  });
+}
+
+function setLocalStorage() {
+  storage.setDataInLocalStorage('nvggid', 'localstorage_value');
+}
+
+describe('getId', function () {
+  let ajaxStub, ajaxBuilderStub;
+
+  beforeEach(function() {
+    ajaxStub = sinon.stub();
+    ajaxBuilderStub = sinon.stub(ajaxLib, 'ajaxBuilder').returns(ajaxStub);
+  });
+
+  afterEach(function() {
+    ajaxBuilderStub.restore();
+    deleteAllCookies();
+    storage.removeDataFromLocalStorage('nvggid');
+  });
+
+  it('should get the value from the existing localstorage', function() {
+    setLocalStorage();
+
+    const callback = sinon.spy();
+    const apiCallback = naveggIdSubmodule.getId(NAVEGGID_CONFIG_COOKIE_HTML5).callback;
+
+    ajaxStub.callsFake((url, successCallbacks, errorCallback, options) => {
+      if (successCallbacks && typeof successCallbacks === 'function') {
+        successCallbacks(JSON.stringify(MOCK_RESPONSE_NULL));
+      }
+    });
+    apiCallback(callback)
+
+    expect(callback.calledOnce).to.be.true;
+    expect(callback.calledWith('localstorage_value')).to.be.true;
   });
-  afterEach(() => {
-    sandbox.restore();
+
+  it('should get the value from a nid cookie', function() {
+    storage.setCookie('nid', 'old_nid_cookie', storage.expires)
+
+    const callback = sinon.spy();
+    const apiCallback = naveggIdSubmodule.getId(NAVEGGID_CONFIG_COOKIE_HTML5).callback;
+
+    ajaxStub.callsFake((url, successCallbacks, errorCallback, options) => {
+      if (successCallbacks && typeof successCallbacks === 'function') {
+        successCallbacks(JSON.stringify(MOCK_RESPONSE_NULL));
+      }
+    });
+    apiCallback(callback)
+
+    expect(callback.calledOnce).to.be.true;
+    expect(callback.calledWith('old_nid_cookie')).to.be.true;
   });
 
-  it('should NOT find navegg id', function () {
-    let id = naveggIdSubmodule.getId();
+  it('should get the value from a nav cookie', function() {
+    storage.setCookie('navId', 'old_nav_cookie', storage.expires)
+
+    const callback = sinon.spy();
+    const apiCallback = naveggIdSubmodule.getId(NAVEGGID_CONFIG_COOKIE_HTML5).callback;
 
-    expect(id).to.be.undefined;
+    ajaxStub.callsFake((url, successCallbacks, errorCallback, options) => {
+      if (successCallbacks && typeof successCallbacks === 'function') {
+        successCallbacks(JSON.stringify(MOCK_RESPONSE_NULL));
+      }
+    });
+    apiCallback(callback)
+
+    expect(callback.calledOnce).to.be.true;
+    expect(callback.calledWith('old_nav_cookie')).to.be.true;
   });
 
-  it('getId() should return "test-nid" id from cookie OLD_NAVEGG_ID', function() {
-    sinon.stub(storage, 'getCookie').withArgs('nid').returns('test-nid');
-    let id = naveggIdSubmodule.getId();
-    expect(id).to.be.deep.equal({id: 'test-nid'})
-  })
+  it('should get the value from an old nvg cookie', function() {
+    storage.setCookie('nvgid', 'old_nvg_cookie', storage.expires)
+
+    const callback = sinon.spy();
+    const apiCallback = naveggIdSubmodule.getId(NAVEGGID_CONFIG_COOKIE_HTML5).callback;
+
+    ajaxStub.callsFake((url, successCallbacks, errorCallback, options) => {
+      if (successCallbacks && typeof successCallbacks === 'function') {
+        successCallbacks(JSON.stringify(MOCK_RESPONSE_NULL));
+      }
+    });
+    apiCallback(callback)
 
-  it('getId() should return "test-nvggid" id from local storage NAVEGG_ID', function() {
-    storage.getDataFromLocalStorage.callsFake(() => 'test-ninvggidd')
+    expect(callback.calledOnce).to.be.true;
+    expect(callback.calledWith('old_nvg_cookie')).to.be.true;
+  });
 
-    let id = naveggIdSubmodule.getId();
-    expect(id).to.be.deep.equal({id: 'test-ninvggidd'})
-  })
+  it('should return correct value from API response', function(done) {
+    const callback = sinon.spy();
+    const apiCallback = naveggIdSubmodule.getId(NAVEGGID_CONFIG_COOKIE_HTML5).callback;
 
-  it('getId() should return "test-nvggid" id from local storage NAV0', function() {
-    storage.getDataFromLocalStorage.callsFake(() => 'nvgid-nav0')
+    ajaxStub.callsFake((url, successCallbacks, errorCallback, options) => {
+      if (successCallbacks && typeof successCallbacks === 'function') {
+        successCallbacks(JSON.stringify(MOCK_RESPONSE));
+      }
+    });
+    apiCallback(callback)
 
-    let id = naveggIdSubmodule.getId();
-    expect(id).to.be.deep.equal({id: 'nvgid-nav0'})
-  })
+    expect(callback.calledOnce).to.be.true;
+    expect(callback.calledWith('test_nvggid')).to.be.true;
+    done();
+  });
 
-  it('getId() should return "test-nvggid" id from local storage NVG0', function() {
-    storage.getDataFromLocalStorage.callsFake(() => 'nvgid-nvg0')
+  it('should return no value from API response', function(done) {
+    const callback = sinon.spy();
+    const apiCallback = naveggIdSubmodule.getId(NAVEGGID_CONFIG_COOKIE_HTML5).callback;
 
-    let id = naveggIdSubmodule.getId();
-    expect(id).to.be.deep.equal({id: 'nvgid-nvg0'})
-  })
+    ajaxStub.callsFake((url, successCallbacks, errorCallback, options) => {
+      if (successCallbacks && typeof successCallbacks === 'function') {
+        successCallbacks(JSON.stringify(MOCK_RESPONSE_NULL));
+      }
+    });
+    apiCallback(callback)
+    expect(callback.calledOnce).to.be.true;
+    expect(callback.calledWith(undefined)).to.be.true;
+    done();
+  });
 });
diff --git a/test/spec/modules/netIdSystem_spec.js b/test/spec/modules/netIdSystem_spec.js
new file mode 100644
index 00000000000..bbf59c39f32
--- /dev/null
+++ b/test/spec/modules/netIdSystem_spec.js
@@ -0,0 +1,23 @@
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {netIdSubmodule} from '../../../modules/netIdSystem.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
+
+describe('Net ID', () => {
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(netIdSubmodule);
+    });
+    it('NetId', function () {
+      const userId = {
+        netId: 'some-random-id-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'netid.de',
+        uids: [{id: 'some-random-id-value', atype: 1}]
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index 564788c8b56..bfcf7e80420 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -1,321 +1,897 @@
 import { expect } from 'chai';
-import { spec } from 'modules/nextMillenniumBidAdapter.js';
-
-describe('nextMillenniumBidAdapterTests', function() {
-  const bidRequestData = [
-    {
-      adUnitCode: 'test-div',
-      bidId: 'bid1234',
-      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
-      bidder: 'nextMillennium',
-      params: { placement_id: '-1' },
-      sizes: [[300, 250]],
-      uspConsent: '1---',
-      gdprConsent: {
-        consentString: 'kjfdniwjnifwenrif3',
-        gdprApplies: true
-      },
-      ortb2: {
-        device: {
-          w: 1500,
-          h: 1000
-        },
-        site: {
-          domain: 'example.com',
-          page: 'http://example.com'
-        }
-      }
-    }
-  ];
-
-  const serverResponse = {
-    body: {
-      id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
-      seatbid: [
-        {
-          bid: [
-            {
-              id: '7457329903666272789',
-              price: 0.5,
-              adm: 'Hello! It\'s a test ad!',
-              adid: '96846035',
-              adomain: ['test.addomain.com'],
-              w: 300,
-              h: 250
+import {
+  getImp,
+  getSourceObj,
+  replaceUsersyncMacros,
+  setConsentStrings,
+  setOrtb2Parameters,
+  setEids,
+  spec,
+} from 'modules/nextMillenniumBidAdapter.js';
+
+describe('nextMillenniumBidAdapterTests', () => {
+  describe('function getImp', () => {
+    const dataTests = [
+      {
+        title: 'imp - banner',
+        data: {
+          id: '123',
+          postBody: {ext: {nextMillennium: {refresh_counts: {}, elemOffsets: {}}}},
+          bid: {
+            mediaTypes: {banner: {sizes: [[300, 250], [320, 250]]}},
+            adUnitCode: 'test-banner-1',
+            bidId: 'e36ea395f67f',
+          },
+
+          mediaTypes: {
+            banner: {
+              data: {sizes: [[300, 250], [320, 250]]},
+              bidfloorcur: 'EUR',
+              bidfloor: 1.11,
+            },
+          },
+        },
+
+        expected: {
+          id: 'e36ea395f67f',
+          bidfloorcur: 'EUR',
+          bidfloor: 1.11,
+          ext: {prebid: {storedrequest: {id: '123'}}},
+          banner: {w: 300, h: 250, format: [{w: 300, h: 250}, {w: 320, h: 250}]},
+        },
+      },
+
+      {
+        title: 'imp - video',
+        data: {
+          id: '234',
+          postBody: {ext: {nextMillennium: {refresh_counts: {}, elemOffsets: {}}}},
+          bid: {
+            mediaTypes: {video: {playerSize: [400, 300], api: [2], placement: 1, plcmt: 1}},
+            adUnitCode: 'test-video-1',
+            bidId: 'e36ea395f67f',
+          },
+
+          mediaTypes: {
+            video: {
+              data: {playerSize: [400, 300], api: [2], placement: 1, plcmt: 1},
+              bidfloorcur: 'USD',
+            },
+          },
+        },
+
+        expected: {
+          id: 'e36ea395f67f',
+          bidfloorcur: 'USD',
+          ext: {prebid: {storedrequest: {id: '234'}}},
+          video: {
+            mimes: ['video/mp4', 'video/x-ms-wmv', 'application/javascript'],
+            api: [2],
+            placement: 1,
+            plcmt: 1,
+            w: 400,
+            h: 300,
+          },
+        },
+      },
+
+      {
+        title: 'imp - mediaTypes.video is empty',
+        data: {
+          id: '234',
+          postBody: {ext: {nextMillennium: {refresh_counts: {}, elemOffsets: {}}}},
+          bid: {
+            mediaTypes: {video: {w: 640, h: 480}},
+            bidId: 'e36ea395f67f',
+          },
+
+          mediaTypes: {
+            video: {
+              data: {w: 640, h: 480},
+              bidfloorcur: 'USD',
+            },
+          },
+        },
+
+        expected: {
+          id: 'e36ea395f67f',
+          bidfloorcur: 'USD',
+          ext: {prebid: {storedrequest: {id: '234'}}},
+          video: {w: 640, h: 480, mimes: ['video/mp4', 'video/x-ms-wmv', 'application/javascript']},
+        },
+      },
+
+      {
+        title: 'imp with gpid',
+        data: {
+          id: '123',
+          postBody: {ext: {nextMillennium: {refresh_counts: {}, elemOffsets: {}}}},
+          bid: {
+            mediaTypes: {banner: {sizes: [[300, 250], [320, 250]]}},
+            adUnitCode: 'test-gpid-1',
+            bidId: 'e36ea395f67a',
+            ortb2Imp: {ext: {gpid: 'imp-gpid-123'}},
+          },
+
+          mediaTypes: {
+            banner: {
+              data: {sizes: [[300, 250], [320, 250]]},
+            },
+          },
+        },
+
+        expected: {
+          id: 'e36ea395f67a',
+          ext: {
+            prebid: {storedrequest: {id: '123'}},
+            gpid: 'imp-gpid-123'
+          },
+          banner: {w: 300, h: 250, format: [{w: 300, h: 250}, {w: 320, h: 250}]},
+        },
+      },
+
+      {
+        title: 'imp with pbadslot',
+        data: {
+          id: '123',
+          postBody: {ext: {nextMillennium: {refresh_counts: {}, elemOffsets: {}}}},
+          bid: {
+            mediaTypes: {banner: {sizes: [[300, 250], [320, 250]]}},
+            adUnitCode: 'test-gpid-1',
+            bidId: 'e36ea395f67a',
+            ortb2Imp: {
+              ext: {
+                data: {
+                  pbadslot: 'slot-123'
+                }
+              }
+            },
+          },
+
+          mediaTypes: {
+            banner: {
+              data: {sizes: [[300, 250], [320, 250]]},
+            },
+          },
+        },
+
+        expected: {
+          id: 'e36ea395f67a',
+          ext: {
+            prebid: {storedrequest: {id: '123'}},
+            data: {
+              pbadslot: 'slot-123'
             }
-          ]
-        }
-      ],
-      cur: 'USD',
-      ext: {
-        sync: {
-          image: ['urlA?gdpr={{.GDPR}}'],
-          iframe: ['urlB'],
-        }
-      }
+          },
+          banner: {w: 300, h: 250, format: [{w: 300, h: 250}, {w: 320, h: 250}]},
+        },
+      },
+    ];
+
+    for (let {title, data, expected} of dataTests) {
+      it(title, () => {
+        const {bid, id, mediaTypes, postBody} = data;
+        const imp = getImp(bid, id, mediaTypes, postBody);
+        expect(imp).to.deep.equal(expected);
+      });
     }
-  };
-
-  const bidRequestDataGI = [
-    {
-      adUnitCode: 'test-banner-gi',
-      bidId: 'bid1234',
-      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
-      bidder: 'nextMillennium',
-      params: { group_id: '1234' },
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250]]
-        }
+  });
+
+  describe('function getSourceObj', () => {
+    const dataTests = [
+      {
+        title: 'schain is empty',
+        validBidRequests: [{}],
+        bidderRequest: {},
+        expected: undefined,
       },
 
-      sizes: [[300, 250]],
-      uspConsent: '1---',
-      gdprConsent: {
-        consentString: 'kjfdniwjnifwenrif3',
-        gdprApplies: true
-      }
-    },
-
-    {
-      adUnitCode: 'test-banner-gi',
-      bidId: 'bid1234',
-      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
-      bidder: 'nextMillennium',
-      params: { group_id: '1234' },
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250], [300, 300]]
-        }
+      {
+        title: 'schain is validBidReequest',
+        bidderRequest: {},
+        validBidRequests: [{
+          schain: {
+            validation: 'strict',
+            config: {
+              ver: '1.0',
+              complete: 1,
+              nodes: [{asi: 'test.test', sid: '00001', hp: 1}],
+            },
+          },
+        }],
+
+        expected: {
+          schain: {
+            validation: 'strict',
+            config: {
+              ver: '1.0',
+              complete: 1,
+              nodes: [{asi: 'test.test', sid: '00001', hp: 1}],
+            },
+          },
+        },
       },
 
-      sizes: [[300, 250], [300, 300]],
-      uspConsent: '1---',
-      gdprConsent: {
-        consentString: 'kjfdniwjnifwenrif3',
-        gdprApplies: true
-      }
-    },
-
-    {
-      adUnitCode: 'test-video-gi',
-      bidId: 'bid1234',
-      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
-      bidder: 'nextMillennium',
-      params: { group_id: '1234' },
-      mediaTypes: {
-        video: {
-          playerSize: [640, 480],
-        }
+      {
+        title: 'schain is bidderReequest.ortb2.source.schain',
+        bidderRequest: {
+          ortb2: {
+            source: {
+              schain: {
+                validation: 'strict',
+                config: {
+                  ver: '1.0',
+                  complete: 1,
+                  nodes: [{asi: 'test.test', sid: '00001', hp: 1}],
+                },
+              },
+            },
+          },
+        },
+
+        validBidRequests: [{}],
+        expected: {
+          schain: {
+            validation: 'strict',
+            config: {
+              ver: '1.0',
+              complete: 1,
+              nodes: [{asi: 'test.test', sid: '00001', hp: 1}],
+            },
+          },
+        },
       },
 
-      uspConsent: '1---',
-      gdprConsent: {
-        consentString: 'kjfdniwjnifwenrif3',
-        gdprApplies: true
-      }
-    },
-  ];
+      {
+        title: 'schain is bidderReequest.ortb2.source.ext.schain',
+        bidderRequest: {
+          ortb2: {
+            source: {
+              ext: {
+                schain: {
+                  validation: 'strict',
+                  config: {
+                    ver: '1.0',
+                    complete: 1,
+                    nodes: [{asi: 'test.test', sid: '00001', hp: 1}],
+                  },
+                },
+              },
+            },
+          },
+        },
 
-  it('Request params check with GDPR and USP Consent', function () {
-    const request = spec.buildRequests(bidRequestData, bidRequestData[0]);
-    expect(JSON.parse(request[0].data).user.ext.consent).to.equal('kjfdniwjnifwenrif3');
-    expect(JSON.parse(request[0].data).regs.ext.us_privacy).to.equal('1---');
-    expect(JSON.parse(request[0].data).regs.ext.gdpr).to.equal(1);
-  });
+        validBidRequests: [{}],
+        expected: {
+          schain: {
+            validation: 'strict',
+            config: {
+              ver: '1.0',
+              complete: 1,
+              nodes: [{asi: 'test.test', sid: '00001', hp: 1}],
+            },
+          },
+        },
+      },
+    ];
 
-  it('Test getUserSyncs function', function () {
-    const syncOptions = {
-      'iframeEnabled': false,
-      'pixelEnabled': true
+    for (let {title, validBidRequests, bidderRequest, expected} of dataTests) {
+      it(title, () => {
+        const source = getSourceObj(validBidRequests, bidderRequest);
+        expect(source).to.deep.equal(expected);
+      });
     }
-    let userSync = spec.getUserSyncs(syncOptions, [serverResponse], bidRequestData[0].gdprConsent, bidRequestData[0].uspConsent);
-    expect(userSync).to.be.an('array').with.lengthOf(1);
-    expect(userSync[0].type).to.equal('image');
-    expect(userSync[0].url).to.equal('urlA?gdpr=1');
-
-    syncOptions.iframeEnabled = true;
-    syncOptions.pixelEnabled = false;
-    userSync = spec.getUserSyncs(syncOptions, [serverResponse], bidRequestData[0].gdprConsent, bidRequestData[0].uspConsent);
-    expect(userSync).to.be.an('array').with.lengthOf(1);
-    expect(userSync[0].type).to.equal('iframe');
-    expect(userSync[0].url).to.equal('urlB');
   });
 
-  it('Test getUserSyncs with no response', function () {
-    const syncOptions = {
-      'iframeEnabled': true,
-      'pixelEnabled': false
-    }
-    let userSync = spec.getUserSyncs(syncOptions, [], bidRequestData[0].gdprConsent, bidRequestData[0].uspConsent);
-    expect(userSync).to.be.an('array')
-    expect(userSync[0].type).to.equal('iframe')
-    expect(userSync[0].url).to.equal('https://cookies.nextmillmedia.com/sync?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---&type=iframe')
-  })
-
-  it('Test getUserSyncs function if GDPR is undefined', function () {
-    const syncOptions = {
-      'iframeEnabled': false,
-      'pixelEnabled': true
-    }
+  describe('function setConsentStrings', () => {
+    const dataTests = [
+      {
+        title: 'full: uspConsent, gdprConsent and gppConsent',
+        data: {
+          postBody: {},
+          bidderRequest: {
+            uspConsent: '1---',
+            gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7]},
+            gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: true},
+            ortb2: {regs: {gpp: 'DSFHFHWEUYVDC', gpp_sid: [8, 9, 10], coppa: 1}},
+          },
+        },
+
+        expected: {
+          user: {consent: 'kjfdniwjnifwenrif3'},
+          regs: {
+            gpp: 'DBACNYA~CPXxRfAPXxR',
+            gpp_sid: [7],
+            gdpr: 1,
+            us_privacy: '1---',
+            coppa: 1
+          },
+        },
+      },
+
+      {
+        title: 'gdprConsent(false) and ortb2(gpp)',
+        data: {
+          postBody: {},
+          bidderRequest: {
+            gdprConsent: {consentString: 'ewtewbefbawyadexv', gdprApplies: false},
+            ortb2: {regs: {gpp: 'DSFHFHWEUYVDC', gpp_sid: [8, 9, 10], coppa: 0}},
+          },
+        },
+
+        expected: {
+          user: {consent: 'ewtewbefbawyadexv'},
+          regs: {
+            gpp: 'DSFHFHWEUYVDC',
+            gpp_sid: [8, 9, 10],
+            gdpr: 0,
+            coppa: 0,
+          },
+        },
+      },
+
+      {
+        title: 'gdprConsent(false)',
+        data: {
+          postBody: {},
+          bidderRequest: {gdprConsent: {gdprApplies: false}},
+        },
+
+        expected: {
+          regs: {gdpr: 0},
+        },
+      },
+
+      {
+        title: 'empty',
+        data: {
+          postBody: {},
+          bidderRequest: {},
+        },
 
-    let userSync = spec.getUserSyncs(syncOptions, [serverResponse], undefined, bidRequestData[0].uspConsent);
-    expect(userSync).to.be.an('array').with.lengthOf(1);
-    expect(userSync[0].type).to.equal('image');
-    expect(userSync[0].url).to.equal('urlA?gdpr=0');
+        expected: {},
+      },
+    ];
+
+    for (let {title, data, expected} of dataTests) {
+      it(title, () => {
+        const {postBody, bidderRequest} = data;
+        setConsentStrings(postBody, bidderRequest);
+        expect(postBody).to.deep.equal(expected);
+      });
+    }
   });
 
-  it('Request params check without GDPR Consent', function () {
-    delete bidRequestData[0].gdprConsent
-    const request = spec.buildRequests(bidRequestData, bidRequestData[0]);
-    expect(JSON.parse(request[0].data).regs.ext.gdpr).to.be.undefined;
-    expect(JSON.parse(request[0].data).regs.ext.us_privacy).to.equal('1---');
+  describe('function replaceUsersyncMacros', () => {
+    const dataTests = [
+      {
+        title: 'url with all macroses - consents full: uspConsent, gdprConsent and gppConsent',
+        data: {
+          url: 'https://some.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}&type={{.TYPE_PIXEL}}',
+          uspConsent: '1---',
+          gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7, 8]},
+          gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: true},
+          type: 'image',
+        },
+
+        expected: 'https://some.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8&type=image',
+      },
+
+      {
+        title: 'url with some macroses - consents full: uspConsent, gdprConsent and gppConsent',
+        data: {
+          url: 'https://some.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&type={{.TYPE_PIXEL}}',
+          uspConsent: '1---',
+          gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7, 8]},
+          gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: false},
+          type: 'iframe',
+        },
+
+        expected: 'https://some.url?gdpr=0&gdpr_consent=kjfdniwjnifwenrif3&type=iframe',
+      },
+
+      {
+        title: 'url without macroses - consents full: uspConsent, gdprConsent and gppConsent',
+        data: {
+          url: 'https://some.url?param1=value1¶m2=value2',
+          uspConsent: '1---',
+          gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7, 8]},
+          gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: false},
+          type: 'iframe',
+        },
+
+        expected: 'https://some.url?param1=value1¶m2=value2',
+      },
+
+      {
+        title: 'url with all macroses - consents are empty',
+        data: {
+          url: 'https://some.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}&type={{.TYPE_PIXEL}}',
+        },
+
+        expected: 'https://some.url?gdpr=0&gdpr_consent=&us_privacy=&gpp=&gpp_sid=&type=',
+      },
+    ];
+
+    for (let {title, data, expected} of dataTests) {
+      it(title, () => {
+        const {url, gdprConsent, uspConsent, gppConsent, type} = data;
+        const newUrl = replaceUsersyncMacros(url, gdprConsent, uspConsent, gppConsent, type);
+        expect(newUrl).to.equal(expected);
+      });
+    }
   });
 
-  it('validate_generated_params', function() {
-    const request = spec.buildRequests(bidRequestData, {bidderRequestId: 'mock-uuid'});
-    expect(request[0].bidId).to.equal('bid1234');
-    expect(JSON.parse(request[0].data).id).to.exist;
+  describe('function spec.getUserSyncs', () => {
+    const dataTests = [
+      {
+        title: 'pixels from responses ({iframeEnabled: true, pixelEnabled: true})',
+        data: {
+          syncOptions: {iframeEnabled: true, pixelEnabled: true},
+          responses: [
+            {body: {ext: {sync: {
+              image: [
+                'https://some.1.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.2.url?us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.3.url?param=1234',
+              ],
+
+              iframe: [
+                'https://some.4.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.5.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}',
+              ],
+            }}}},
+
+            {body: {ext: {sync: {
+              iframe: [
+                'https://some.6.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.7.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}',
+              ],
+            }}}},
+
+            {body: {ext: {sync: {
+              image: [
+                'https://some.8.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+              ],
+            }}}},
+          ],
+
+          uspConsent: '1---',
+          gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7, 8]},
+          gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: true},
+        },
+
+        expected: [
+          {type: 'image', url: 'https://some.1.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8'},
+          {type: 'image', url: 'https://some.2.url?us_privacy=1---&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8'},
+          {type: 'image', url: 'https://some.3.url?param=1234'},
+          {type: 'iframe', url: 'https://some.4.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8'},
+          {type: 'iframe', url: 'https://some.5.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---'},
+          {type: 'iframe', url: 'https://some.6.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8'},
+          {type: 'iframe', url: 'https://some.7.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---'},
+          {type: 'image', url: 'https://some.8.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8'},
+        ],
+      },
+
+      {
+        title: 'pixels from responses ({iframeEnabled: true, pixelEnabled: false})',
+        data: {
+          syncOptions: {iframeEnabled: true, pixelEnabled: false},
+          responses: [
+            {body: {ext: {sync: {
+              image: [
+                'https://some.1.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.2.url?us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.3.url?param=1234',
+              ],
+
+              iframe: [
+                'https://some.4.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.5.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}',
+              ],
+            }}}},
+          ],
+
+          uspConsent: '1---',
+          gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7, 8]},
+          gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: true},
+        },
+
+        expected: [
+          {type: 'iframe', url: 'https://some.4.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8'},
+          {type: 'iframe', url: 'https://some.5.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---'},
+        ],
+      },
+
+      {
+        title: 'pixels from responses ({iframeEnabled: false, pixelEnabled: true})',
+        data: {
+          syncOptions: {iframeEnabled: false, pixelEnabled: true},
+          responses: [
+            {body: {ext: {sync: {
+              image: [
+                'https://some.1.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.2.url?us_privacy={{.USPrivacy}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.3.url?param=1234',
+              ],
+
+              iframe: [
+                'https://some.4.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}',
+                'https://some.5.url?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}',
+              ],
+            }}}},
+          ],
+
+          uspConsent: '1---',
+          gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7, 8]},
+          gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: true},
+        },
+
+        expected: [
+          {type: 'image', url: 'https://some.1.url?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8'},
+          {type: 'image', url: 'https://some.2.url?us_privacy=1---&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8'},
+          {type: 'image', url: 'https://some.3.url?param=1234'},
+        ],
+      },
+
+      {
+        title: 'pixels - responses is empty ({iframeEnabled: true, pixelEnabled: true})',
+        data: {
+          syncOptions: {iframeEnabled: true, pixelEnabled: true},
+          responses: [],
+          uspConsent: '1---',
+          gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7, 8]},
+          gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: true},
+        },
+
+        expected: [
+          {type: 'image', url: 'https://cookies.nextmillmedia.com/sync?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8&type=image'},
+          {type: 'iframe', url: 'https://cookies.nextmillmedia.com/sync?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8&type=iframe'},
+        ],
+      },
+
+      {
+        title: 'pixels - responses is empty ({iframeEnabled: true, pixelEnabled: false})',
+        data: {
+          syncOptions: {iframeEnabled: true, pixelEnabled: false},
+          uspConsent: '1---',
+          gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7, 8]},
+          gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: true},
+        },
+
+        expected: [
+          {type: 'iframe', url: 'https://cookies.nextmillmedia.com/sync?gdpr=1&gdpr_consent=kjfdniwjnifwenrif3&us_privacy=1---&gpp=DBACNYA~CPXxRfAPXxR&gpp_sid=7,8&type=iframe'},
+        ],
+      },
+
+      {
+        title: 'pixels - responses is empty ({iframeEnabled: false, pixelEnabled: false})',
+        data: {
+          syncOptions: {iframeEnabled: false, pixelEnabled: false},
+          uspConsent: '1---',
+          gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7, 8]},
+          gdprConsent: {consentString: 'kjfdniwjnifwenrif3', gdprApplies: true},
+        },
+
+        expected: [],
+      },
+    ];
+
+    for (let {title, data, expected} of dataTests) {
+      it(title, () => {
+        const {syncOptions, responses, gdprConsent, uspConsent, gppConsent} = data;
+        const pixels = spec.getUserSyncs(syncOptions, responses, gdprConsent, uspConsent, gppConsent);
+        expect(pixels).to.deep.equal(expected);
+      });
+    }
   });
 
-  it('use parameters group_id', function() {
-    for (let test of bidRequestDataGI) {
-      const request = spec.buildRequests([test]);
-      const requestData = JSON.parse(request[0].data);
-      const storeRequestId = requestData.ext.prebid.storedrequest.id;
-      const templateRE = /^g[1-9]\d*;(?:[1-9]\d*x[1-9]\d*\|)*[1-9]\d*x[1-9]\d*;/;
-      expect(templateRE.test(storeRequestId)).to.be.true;
+  describe('function setOrtb2Parameters', () => {
+    const dataTests = [
+      {
+        title: 'site.pagecat, site.content.cat and site.content.language',
+        data: {
+          postBody: {},
+          ortb2: {
+            bcat: ['IAB1-3', 'IAB1-4'],
+            badv: ['domain1.com', 'domain2.com'],
+            wlang: ['en', 'fr', 'de'],
+            wlangb: ['en', 'fr', 'de'],
+            site: {
+              pagecat: ['IAB2-11', 'IAB2-12', 'IAB2-14'],
+              content: {cat: ['IAB2-11', 'IAB2-12', 'IAB2-14'], language: 'EN'},
+            }
+          },
+        },
+
+        expected: {
+          bcat: ['IAB1-3', 'IAB1-4'],
+          badv: ['domain1.com', 'domain2.com'],
+          wlang: ['en', 'fr', 'de'],
+          site: {
+            pagecat: ['IAB2-11', 'IAB2-12', 'IAB2-14'],
+            content: {cat: ['IAB2-11', 'IAB2-12', 'IAB2-14'], language: 'EN'},
+          }
+        },
+      },
+
+      {
+        title: 'site.keywords, site.content.keywords and user.keywords',
+        data: {
+          postBody: {},
+          ortb2: {
+            wlangb: ['en', 'fr', 'de'],
+            user: {keywords: 'key7,key8,key9'},
+            site: {
+              keywords: 'key1,key2,key3',
+              content: {keywords: 'key4,key5,key6'},
+            },
+          },
+        },
+
+        expected: {
+          wlangb: ['en', 'fr', 'de'],
+          user: {keywords: 'key7,key8,key9'},
+          site: {
+            keywords: 'key1,key2,key3',
+            content: {keywords: 'key4,key5,key6'},
+          },
+        },
+      },
+
+      {
+        title: 'only site.content.language',
+        data: {
+          postBody: {site: {domain: 'some.domain'}},
+          ortb2: {site: {
+            content: {language: 'EN'},
+          }},
+        },
+
+        expected: {site: {
+          domain: 'some.domain',
+          content: {language: 'EN'},
+        }},
+      },
+
+      {
+        title: 'object ortb2 is empty',
+        data: {
+          postBody: {imp: []},
+        },
+
+        expected: {imp: []},
+      },
+    ];
+
+    for (let {title, data, expected} of dataTests) {
+      it(title, () => {
+        const {postBody, ortb2} = data;
+        setOrtb2Parameters(postBody, ortb2);
+        expect(postBody).to.deep.equal(expected);
+      });
     };
   });
 
-  it('Check if refresh_count param is incremented', function() {
-    const request = spec.buildRequests(bidRequestData);
-    expect(JSON.parse(request[0].data).ext.nextMillennium.refresh_count).to.equal(3);
-  });
+  describe('function setEids', () => {
+    const dataTests = [
+      {
+        title: 'setEids - userIdAsEids is empty',
+        data: {
+          postBody: {},
+          bids: [{
+            userIdAsEids: undefined,
+          }],
+        },
 
-  it('Check if domain was added', function() {
-    const request = spec.buildRequests(bidRequestData)
-    expect(JSON.parse(request[0].data).site.domain).to.exist
-  })
+        expected: {},
+      },
 
-  it('Check if elOffsets was added', function() {
-    const request = spec.buildRequests(bidRequestData)
-    expect(JSON.parse(request[0].data).ext.nextMillennium.elOffsets).to.be.an('object')
-  })
+      {
+        title: 'setEids - userIdAsEids - array is empty',
+        data: {
+          postBody: {},
+          bids: [{
+            userIdAsEids: [],
+          }],
+        },
 
-  it('Check if imp object was added', function() {
-    const request = spec.buildRequests(bidRequestData)
-    expect(JSON.parse(request[0].data).imp).to.be.an('array')
-  });
+        expected: {},
+      },
 
-  it('Check if imp prebid stored id is correct', function() {
-    const request = spec.buildRequests(bidRequestData)
-    const requestData = JSON.parse(request[0].data);
-    const storedReqId = requestData.ext.prebid.storedrequest.id;
-    expect(requestData.imp[0].ext.prebid.storedrequest.id).to.equal(storedReqId)
-  });
+      {
+        title: 'setEids - userIdAsEids is',
+        data: {
+          postBody: {},
+          bids: [
+            {
+              userIdAsEids: [],
+            },
 
-  it('validate_response_params', function() {
-    let bids = spec.interpretResponse(serverResponse, bidRequestData[0]);
-    expect(bids).to.have.lengthOf(1);
+            {
+              userIdAsEids: [
+                {
+                  source: '33across.com',
+                  uids: [{id: 'some-random-id-value', atype: 1}],
+                },
 
-    let bid = bids[0];
+                {
+                  source: 'utiq.com',
+                  uids: [{id: 'some-random-id-value', atype: 1}],
+                },
+              ],
+            },
 
-    expect(bid.creativeId).to.equal('96846035');
-    expect(bid.ad).to.equal('Hello! It\'s a test ad!');
-    expect(bid.cpm).to.equal(0.5);
-    expect(bid.width).to.equal(300);
-    expect(bid.height).to.equal(250);
-    expect(bid.currency).to.equal('USD');
-  });
+            {
+              userIdAsEids: [
+                {
+                  source: 'test.test',
+                  uids: [{id: 'some-random-id-value', atype: 1}],
+                },
+              ],
+            },
+          ],
+        },
 
-  it('validate_videowrapper_response_params', function() {
-    const serverResponse = {
-      body: {
-        id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
-        seatbid: [
-          {
-            bid: [
+        expected: {
+          user: {
+            eids: [
               {
-                id: '7457329903666272789',
-                price: 0.5,
-                adm: 'https://some_vast_host.com/vast.xml',
-                adid: '96846035',
-                adomain: ['test.addomain.com'],
-                w: 300,
-                h: 250,
-                ext: {
-                  prebid: {
-                    type: 'video'
-                  }
-                }
-              }
-            ]
+                source: '33across.com',
+                uids: [{id: 'some-random-id-value', atype: 1}],
+              },
+
+              {
+                source: 'utiq.com',
+                uids: [{id: 'some-random-id-value', atype: 1}],
+              },
+            ],
+          },
+        },
+      },
+    ];
+
+    for (let { title, data, expected } of dataTests) {
+      it(title, () => {
+        const { postBody, bids } = data;
+        setEids(postBody, bids);
+        expect(postBody).to.deep.equal(expected);
+      });
+    }
+  });
+
+  const bidRequestDataGI = getBidRequestDataGI();
+  function getBidRequestDataGI(adUnitCodes = ['test-banner-gi', 'test-banner-gi', 'test-video-gi']) {
+    return [
+      {
+        adUnitCode: adUnitCodes[0],
+        bidId: 'bid1234',
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidder: 'nextMillennium',
+        params: { group_id: '1234' },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
           }
-        ],
-        cur: 'USD'
-      }
-    };
+        },
 
-    let bids = spec.interpretResponse(serverResponse, bidRequestData[0]);
-    expect(bids).to.have.lengthOf(1);
+        sizes: [[300, 250]],
+        uspConsent: '1---',
+        gdprConsent: {
+          consentString: 'kjfdniwjnifwenrif3',
+          gdprApplies: true
+        }
+      },
 
-    let bid = bids[0];
+      {
+        adUnitCode: adUnitCodes[1],
+        bidId: 'bid1235',
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidder: 'nextMillennium',
+        params: { group_id: '1234' },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 300]]
+          }
+        },
 
-    expect(bid.creativeId).to.equal('96846035');
-    expect(bid.vastUrl).to.equal('https://some_vast_host.com/vast.xml');
-    expect(bid.cpm).to.equal(0.5);
-    expect(bid.width).to.equal(300);
-    expect(bid.height).to.equal(250);
-    expect(bid.currency).to.equal('USD');
-  });
+        sizes: [[300, 250], [300, 300]],
+        uspConsent: '1---',
+        gdprConsent: {
+          consentString: 'kjfdniwjnifwenrif3',
+          gdprApplies: true
+        }
+      },
 
-  it('validate_videoxml_response_params', function() {
-    const serverResponse = {
-      body: {
-        id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
-        seatbid: [
-          {
-            bid: [
-              {
-                id: '7457329903666272789',
-                price: 0.5,
-                adm: '',
-                adid: '96846035',
-                adomain: ['test.addomain.com'],
-                w: 300,
-                h: 250,
-                ext: {
-                  prebid: {
-                    type: 'video'
-                  }
-                }
-              }
-            ]
+      {
+        adUnitCode: adUnitCodes[2],
+        bidId: 'bid1236',
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidder: 'nextMillennium',
+        params: { group_id: '1234' },
+        mediaTypes: {
+          video: {
+            playerSize: [640, 480],
           }
-        ],
-        cur: 'USD'
-      }
+        },
+
+        uspConsent: '1---',
+        gdprConsent: {
+          consentString: 'kjfdniwjnifwenrif3',
+          gdprApplies: true
+        }
+      },
+    ];
+  }
+
+  describe('check parameters group_id or placement_id', function() {
+    let numberTest = 0
+    for (let test of bidRequestDataGI) {
+      it(`test - ${++numberTest}`, () => {
+        const request = spec.buildRequests([test]);
+        const requestData = JSON.parse(request[0].data);
+        const storeRequestId = (requestData.imp[0].ext.prebid.storedrequest.id || '');
+        expect(storeRequestId.length).to.be.not.equal(0);
+
+        const srId = storeRequestId.split(';');
+        const isGroupId = (/^g[1-9]\d*/).test(srId[0]);
+        if (isGroupId) {
+          expect(srId.length).to.be.equal(3);
+          expect((/^g[1-9]\d*/).test(srId[0])).to.be.true;
+          const sizes = srId[1].split('|');
+          for (let size of sizes) {
+            if (!(/^[1-9]\d*[xX,][1-9]\d*$/).test(size)) {
+              expect(storeRequestId).to.be.equal('');
+            }
+
+            expect((/^[1-9]\d*[xX,][1-9]\d*$/).test(size)).to.be.true;
+          }
+        } else {
+          expect(srId.length).to.be.equal(1);
+          expect((/^[1-9]\d*/).test(srId[0])).to.be.true;
+        };
+      });
     };
+  });
 
-    let bids = spec.interpretResponse(serverResponse, bidRequestData[0]);
-    expect(bids).to.have.lengthOf(1);
+  describe('Check ext.next_mil_imps', function() {
+    const expectedNextMilImps = [
+      {
+        impId: 'bid1234',
+        nextMillennium: {refresh_count: 1},
+      },
 
-    let bid = bids[0];
+      {
+        impId: 'bid1235',
+        nextMillennium: {refresh_count: 1},
+      },
 
-    expect(bid.creativeId).to.equal('96846035');
-    expect(bid.vastXml).to.equal('');
-    expect(bid.cpm).to.equal(0.5);
-    expect(bid.width).to.equal(300);
-    expect(bid.height).to.equal(250);
-    expect(bid.currency).to.equal('USD');
+      {
+        impId: 'bid1236',
+        nextMillennium: {refresh_count: 1},
+      },
+    ];
+
+    const dataForRequest = getBidRequestDataGI(expectedNextMilImps.map(el => el.impId));
+    for (let j = 0; j < 2; j++) {
+      const request = spec.buildRequests(dataForRequest);
+      const bidRequest = JSON.parse(request[0].data);
+      for (let i = 0; i < bidRequest.ext.next_mil_imps.length; i++) {
+        it(`test - ${j * i + 1}`, () => {
+          const nextMilImp = bidRequest.ext.next_mil_imps[i];
+          expect(nextMilImp.impId).to.deep.equal(expectedNextMilImps[i].impId);
+          expect(nextMilImp.nextMillennium.refresh_count).to.deep.equal(expectedNextMilImps[i].nextMillennium.refresh_count + j);
+        })
+      };
+    };
   });
 
-  it('Check function of getting URL for sending statistics data', function() {
+  describe('function spec._getUrlPixelMetric', function() {
     const dataForTests = [
       {
+        title: 'Check function of getting URL for sending statistics data - 1',
         eventName: 'bidRequested',
-        bid: {
+        bids: {
           bidderCode: 'appnexus',
           bids: [{bidder: 'appnexus', params: {}}],
         },
@@ -324,8 +900,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 2',
         eventName: 'bidRequested',
-        bid: {
+        bids: {
           bidderCode: 'appnexus',
           bids: [{bidder: 'appnexus', params: {placement_id: '807'}}],
         },
@@ -334,8 +911,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 3',
         eventName: 'bidRequested',
-        bid: {
+        bids: {
           bidderCode: 'nextMillennium',
           bids: [{bidder: 'nextMillennium', params: {placement_id: '807'}}],
         },
@@ -344,8 +922,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 4',
         eventName: 'bidRequested',
-        bid: {
+        bids: {
           bidderCode: 'nextMillennium',
           bids: [
             {bidder: 'nextMillennium', params: {placement_id: '807'}},
@@ -357,8 +936,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 5',
         eventName: 'bidRequested',
-        bid: {
+        bids: {
           bidderCode: 'nextMillennium',
           bids: [{bidder: 'nextMillennium', params: {placement_id: '807', group_id: '123'}}],
         },
@@ -367,8 +947,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 6',
         eventName: 'bidRequested',
-        bid: {
+        bids: {
           bidderCode: 'nextMillennium',
           bids: [
             {bidder: 'nextMillennium', params: {placement_id: '807', group_id: '123'}},
@@ -381,8 +962,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 7',
         eventName: 'bidResponse',
-        bid: {
+        bids: {
           bidderCode: 'appnexus',
         },
 
@@ -390,8 +972,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 8',
         eventName: 'bidResponse',
-        bid: {
+        bids: {
           bidderCode: 'nextMillennium',
           params: {placement_id: '807'},
         },
@@ -400,8 +983,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 9',
         eventName: 'noBid',
-        bid: {
+        bids: {
           bidder: 'appnexus',
         },
 
@@ -409,8 +993,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 10',
         eventName: 'noBid',
-        bid: {
+        bids: {
           bidder: 'nextMillennium',
           params: {placement_id: '807'},
         },
@@ -419,8 +1004,9 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 11',
         eventName: 'bidTimeout',
-        bid: {
+        bids: {
           bidder: 'appnexus',
         },
 
@@ -428,19 +1014,250 @@ describe('nextMillenniumBidAdapterTests', function() {
       },
 
       {
+        title: 'Check function of getting URL for sending statistics data - 12',
         eventName: 'bidTimeout',
-        bid: {
+        bids: {
           bidder: 'nextMillennium',
           params: {placement_id: '807'},
         },
 
         expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidTimeout&bidder=nextMillennium&source=pbjs&placements=807',
       },
+
+      {
+        title: 'Check function of getting URL for sending statistics data - 13',
+        eventName: 'bidRequested',
+        bids: [
+          {
+            bidderCode: 'nextMillennium',
+            bids: [
+              {bidder: 'nextMillennium', params: {placement_id: '807', group_id: '123'}},
+              {bidder: 'nextMillennium', params: {group_id: '456'}},
+              {bidder: 'nextMillennium', params: {placement_id: '222'}},
+            ],
+          },
+
+          {
+            bidderCode: 'nextMillennium',
+            params: {group_id: '7777'},
+          },
+
+          {
+            bidderCode: 'nextMillennium',
+            params: {placement_id: '8888'},
+          },
+        ],
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidRequested&bidder=nextMillennium&source=pbjs&groups=123;456;7777&placements=222;8888',
+      },
     ];
 
-    for (let {eventName, bid, expected} of dataForTests) {
-      const url = spec.getUrlPixelMetric(eventName, bid);
-      expect(url).to.equal(expected);
+    for (let {title, eventName, bids, expected} of dataForTests) {
+      it(title, () => {
+        const url = spec._getUrlPixelMetric(eventName, bids);
+        expect(url).to.equal(expected);
+      });
     };
-  })
+  });
+
+  describe('check function buildRequests', () => {
+    const tests = [
+      {
+        title: 'test - 1',
+        bidderRequest: {bidderRequestId: 'mock-uuid', timeout: 1200},
+        bidRequests: [
+          {
+            adUnitCode: 'test-div',
+            bidId: 'bid1234',
+            auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+            bidder: 'nextMillennium',
+            params: { placement_id: '-1' },
+            sizes: [[300, 250]],
+            uspConsent: '1---',
+            gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7]},
+            gdprConsent: {
+              consentString: 'kjfdniwjnifwenrif3',
+              gdprApplies: true
+            },
+
+            ortb2: {
+              device: {
+                w: 1500,
+                h: 1000
+              },
+
+              site: {
+                domain: 'example.com',
+                page: 'http://example.com'
+              }
+            }
+          },
+
+          {
+            adUnitCode: 'test-div-2',
+            bidId: 'bid1235',
+            auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+            bidder: 'nextMillennium',
+            params: { placement_id: '333' },
+            sizes: [[300, 250]],
+            uspConsent: '1---',
+            gppConsent: {gppString: 'DBACNYA~CPXxRfAPXxR', applicableSections: [7]},
+            gdprConsent: {
+              consentString: 'kjfdniwjnifwenrif3',
+              gdprApplies: true
+            },
+
+            ortb2: {
+              device: {
+                w: 1500,
+                h: 1000
+              },
+
+              site: {
+                domain: 'example.com',
+                page: 'http://example.com'
+              }
+            },
+          },
+        ],
+
+        expected: {
+          id: 'mock-uuid',
+          impSize: 2,
+          requestSize: 1,
+          domain: 'example.com',
+          tmax: 1200,
+        },
+      },
+    ];
+
+    for (let {title, bidRequests, bidderRequest, expected} of tests) {
+      it(title, () => {
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request.length).to.equal(expected.requestSize);
+
+        const requestData = JSON.parse(request[0].data);
+        expect(requestData.id).to.equal(expected.id);
+        expect(requestData.tmax).to.equal(expected.tmax);
+        expect(requestData?.imp?.length).to.equal(expected.impSize);
+      });
+    };
+  });
+
+  describe('check function interpretResponse', () => {
+    const tests = [
+      {
+        title: 'test - 1',
+        serverResponse: {
+          body: {
+            id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: '7457329903666272789-0',
+                    impid: '700ce0a43f72',
+                    price: 0.5,
+                    adm: 'Hello! It\'s a test ad!',
+                    adid: '96846035-0',
+                    adomain: ['test.addomain.com'],
+                    w: 300,
+                    h: 250,
+                  },
+
+                  {
+                    id: '7457329903666272789-1',
+                    impid: '700ce0a43f73',
+                    price: 0.7,
+                    adm: 'https://some_vast_host.com/vast.xml',
+                    adid: '96846035-1',
+                    adomain: ['test.addomain.com'],
+                    w: 400,
+                    h: 300,
+                    ext: {prebid: {type: 'video'}},
+                  },
+
+                  {
+                    id: '7457329903666272789-2',
+                    impid: '700ce0a43f74',
+                    price: 1.0,
+                    adm: '',
+                    adid: '96846035-3',
+                    adomain: ['test.addomain.com'],
+                    w: 640,
+                    h: 480,
+                    ext: {prebid: {type: 'video'}},
+                  },
+                ],
+              },
+            ],
+            cur: 'USD',
+          },
+        },
+
+        expected: [
+          {
+            title: 'banner',
+            requestId: '700ce0a43f72',
+            creativeId: '96846035-0',
+            ad: 'Hello! It\'s a test ad!',
+            vastUrl: undefined,
+            vastXml: undefined,
+            cpm: 0.5,
+            width: 300,
+            height: 250,
+            currency: 'USD',
+          },
+
+          {
+            title: 'video - vastUrl',
+            requestId: '700ce0a43f73',
+            creativeId: '96846035-1',
+            ad: undefined,
+            vastUrl: 'https://some_vast_host.com/vast.xml',
+            vastXml: undefined,
+            cpm: 0.7,
+            width: 400,
+            height: 300,
+            currency: 'USD',
+          },
+
+          {
+            title: 'video - vastXml',
+            requestId: '700ce0a43f74',
+            creativeId: '96846035-3',
+            ad: undefined,
+            vastUrl: undefined,
+            vastXml: '',
+            cpm: 1.0,
+            width: 640,
+            height: 480,
+            currency: 'USD',
+          },
+        ],
+      },
+    ];
+
+    for (let {title, serverResponse, bidRequest, expected} of tests) {
+      describe(title, () => {
+        const bids = spec.interpretResponse(serverResponse, bidRequest);
+        for (let i = 0; i < bids.length; i++) {
+          it(expected[i].title, () => {
+            expect(bids).to.have.lengthOf(expected.length);
+
+            const bid = bids[i]
+            expect(bid.creativeId).to.equal(expected[i].creativeId);
+            expect(bid.requestId).to.equal(expected[i].requestId);
+            expect(bid.ad).to.equal(expected[i].ad);
+            expect(bid.vastUrl).to.equal(expected[i].vastUrl);
+            expect(bid.vastXml).to.equal(expected[i].vastXml);
+            expect(bid.cpm).to.equal(expected[i].cpm);
+            expect(bid.width).to.equal(expected[i].width);
+            expect(bid.height).to.equal(expected[i].height);
+            expect(bid.currency).to.equal(expected[i].currency);
+          });
+        };
+      });
+    };
+  });
 });
diff --git a/test/spec/modules/nexverseBidAdapter_spec.js b/test/spec/modules/nexverseBidAdapter_spec.js
new file mode 100644
index 00000000000..fb648a154f7
--- /dev/null
+++ b/test/spec/modules/nexverseBidAdapter_spec.js
@@ -0,0 +1,203 @@
+import { expect } from 'chai';
+import { spec } from 'modules/nexverseBidAdapter.js';
+import { getDeviceModel, buildEndpointUrl, parseNativeResponse } from '../../../libraries/nexverseUtils/index.js';
+import { getOsVersion } from '../../../libraries/advangUtils/index.js';
+
+const BIDDER_ENDPOINT = 'https://rtb.nexverse.ai/';
+
+describe('nexverseBidAdapterTests', () => {
+  describe('isBidRequestValid', function () {
+    let sbid = {
+      'adUnitCode': 'div',
+      'bidder': 'nexverse',
+      'params': {
+        'uid': '77d4a2eb3d209ce6c7691dc79fcab358',
+        'pubId': '24051'
+      },
+    };
+
+    it('should not accept bid without required params', function () {
+      let isValid = spec.isBidRequestValid(sbid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should return false when params are not passed', function () {
+      let bid = Object.assign({}, sbid);
+      delete bid.params;
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when valid params are not passed', function () {
+      let bid = Object.assign({}, sbid);
+      delete bid.params;
+      bid.params = {uid: '', pubId: '', pubEpid: ''};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when valid params are not passed', function () {
+      let bid = Object.assign({}, sbid);
+      delete bid.params;
+      bid.adUnitCode = '';
+      bid.mediaTypes = {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      };
+      bid.params = {uid: '77d4a2eb3d209ce6c7691dc79fcab358', pubId: '24051'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return true when valid params are passed as nums', function () {
+      let bid = Object.assign({}, sbid);
+      delete bid.params;
+      bid.mediaTypes = {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      };
+      bid.params = {uid: '77d4a2eb3d209ce6c7691dc79fcab358', pubId: '24051', pubEpid: '34561'};
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+
+  describe('getDeviceModel', () => {
+    it('should return "iPhone" for iPhone userAgent', function () {
+      Object.defineProperty(navigator, 'userAgent', { value: 'Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X)', configurable: true });
+      expect(getDeviceModel()).to.equal('iPhone');
+    });
+
+    it('should return "iPad" for iPad userAgent', function () {
+      Object.defineProperty(navigator, 'userAgent', { value: 'Mozilla/5.0 (iPad; CPU OS 14_0 like Mac OS X)', configurable: true });
+      expect(getDeviceModel()).to.equal('iPad');
+    });
+
+    it('should return the Android device name for Android userAgent', function () {
+      Object.defineProperty(navigator, 'userAgent', { value: 'Mozilla/5.0 (Linux; Android 10; Pixel 3 Build/QQ2A.200305.003) AppleWebKit/537.36', configurable: true });
+      expect(getDeviceModel()).to.equal('Pixel 3');
+    });
+
+    it('should return "Unknown Android Device" if device name is missing in Android userAgent', function () {
+      Object.defineProperty(navigator, 'userAgent', { value: 'Mozilla/5.0 (Linux; Android 10;) AppleWebKit/537.36', configurable: true });
+      expect(getDeviceModel()).to.equal('Unknown Android Device');
+    });
+
+    it('should return "Mac" for Mac userAgent', function () {
+      Object.defineProperty(navigator, 'userAgent', { value: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)', configurable: true });
+      expect(getDeviceModel()).to.equal('Mac');
+    });
+
+    it('should return "Linux" for Linux userAgent', function () {
+      Object.defineProperty(navigator, 'userAgent', { value: 'Mozilla/5.0 (X11; Linux x86_64)', configurable: true });
+      expect(getDeviceModel()).to.equal('Linux');
+    });
+
+    it('should return "Windows PC" for Windows userAgent', function () {
+      Object.defineProperty(navigator, 'userAgent', { value: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)', configurable: true });
+      expect(getDeviceModel()).to.equal('Windows PC');
+    });
+
+    it('should return "Unknown Device" for an unrecognized userAgent', function () {
+      Object.defineProperty(navigator, 'userAgent', { value: 'Mozilla/5.0 (Unknown OS)', configurable: true });
+      expect(getDeviceModel()).to.equal('');
+    });
+  });
+
+  describe('buildEndpointUrl', () => {
+    it('should construct the URL with uid, pubId, and pubEpid', function () {
+      const bid = {
+        params: {
+          uid: '12345',
+          pubId: '67890',
+          pubEpid: 'abcdef'
+        },
+        isDebug: false
+      };
+      const expectedUrl = `${BIDDER_ENDPOINT}?uid=12345&pub_id=67890&pub_epid=abcdef`;
+      expect(buildEndpointUrl(BIDDER_ENDPOINT, bid)).to.equal(expectedUrl);
+    });
+  });
+
+  describe('buildEndpointUrl', () => {
+    it('should construct the test URL with uid, pubId, and pubEpid', function () {
+      const bid = {
+        params: {
+          uid: '12345',
+          pubId: '67890',
+          pubEpid: 'abcdef'
+        },
+        isDebug: true
+      };
+      const expectedUrl = `${BIDDER_ENDPOINT}?uid=12345&pub_id=67890&pub_epid=abcdef&test=1`;
+      expect(buildEndpointUrl(BIDDER_ENDPOINT, bid)).to.equal(expectedUrl);
+    });
+  });
+
+  describe('parseNativeResponse', () => {
+    it('should parse and return the empty json object from a invalid JSON string', function () {
+      const adm = 'Nexverse test ad';
+      const result = parseNativeResponse(adm);
+      expect(result).to.deep.equal({});
+    });
+    it('should parse and return the native object from a valid JSON string', function () {
+      const adm = '{"native": "sample native ad"}'; // JSON string
+      const result = parseNativeResponse(adm);
+      expect(result).to.deep.equal('sample native ad');
+    });
+  });
+
+  describe('getOsVersion', () => {
+    it('should detect Android OS', function () {
+      Object.defineProperty(navigator, 'userAgent', { value: 'Mozilla/5.0 (Linux; Android 10; Pixel 3 Build/QQ2A.200305.003) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36', configurable: true });
+      expect(getOsVersion()).to.equal('Android');
+    });
+    it('should detect iOS', function () {
+      Object.defineProperty(navigator, 'userAgent', {
+        value: 'Mozilla/5.0 (iPhone; CPU iPhone OS 14_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0 Mobile/15E148 Safari/604.1',
+        configurable: true,
+      });
+      expect(getOsVersion()).to.equal('iOS');
+    });
+    it('should detect Mac OS X', function () {
+      Object.defineProperty(navigator, 'userAgent', {
+        value: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
+        configurable: true,
+      });
+      expect(getOsVersion()).to.equal('Mac OS X');
+    });
+    it('should detect Windows 10', function () {
+      Object.defineProperty(navigator, 'userAgent', {
+        value: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
+        configurable: true,
+      });
+      expect(getOsVersion()).to.equal('Windows 10');
+    });
+    it('should detect Linux', function () {
+      Object.defineProperty(navigator, 'userAgent', {
+        value: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
+        configurable: true,
+      });
+      expect(getOsVersion()).to.equal('Linux');
+    });
+    it('should detect Windows 7', function () {
+      Object.defineProperty(navigator, 'userAgent', {
+        value: 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
+        configurable: true,
+      });
+      expect(getOsVersion()).to.equal('Windows 7');
+    });
+    it('should detect Search Bot', function () {
+      Object.defineProperty(navigator, 'userAgent', {
+        value: 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)',
+        configurable: true,
+      });
+      expect(getOsVersion()).to.equal('Search Bot');
+    });
+    it('should return unknown for an unrecognized user agent', function () {
+      Object.defineProperty(navigator, 'userAgent', {
+        value: 'Mozilla/5.0 (Unknown OS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
+        configurable: true,
+      });
+      expect(getOsVersion()).to.equal('unknown');
+    });
+  });
+});
diff --git a/test/spec/modules/nexx360BidAdapter_spec.js b/test/spec/modules/nexx360BidAdapter_spec.js
index 7091bb56631..48fa0e2a021 100644
--- a/test/spec/modules/nexx360BidAdapter_spec.js
+++ b/test/spec/modules/nexx360BidAdapter_spec.js
@@ -3,6 +3,7 @@ import {
   spec, storage, getNexx360LocalStorage,
 } from 'modules/nexx360BidAdapter.js';
 import { sandbox } from 'sinon';
+import { getAmxId } from '../../../modules/nexx360BidAdapter';
 
 const instreamResponse = {
   'id': '2be64380-ba0c-405a-ab53-51f51c7bde51',
@@ -20,12 +21,12 @@ const instreamResponse = {
           'crid': '97517771',
           'h': 1,
           'w': 1,
+          'adm': '\n    \n      \n        Nexx360 Wrapper\n        \n        \n        \n        \n          \n            \n              \n                \n                \n                \n                \n                \n                \n              \n            \n          \n        \n      \n    \n  ',
           'ext': {
             'mediaType': 'instream',
             'ssp': 'appnexus',
             'divId': 'video1',
             'adUnitCode': 'video1',
-            'vastXml': '\n    \n      \n        Nexx360 Wrapper\n        \n        \n        \n        \n          \n            \n              \n                \n                \n                \n                \n                \n                \n              \n            \n          \n        \n      \n    \n  '
           }
         }
       ],
@@ -220,7 +221,7 @@ describe('Nexx360 bid adapter tests', function () {
     after(function () {
       sandbox.restore()
     });
-  })
+  });
 
   describe('getNexx360LocalStorage enabled', function () {
     before(function () {
@@ -235,7 +236,37 @@ describe('Nexx360 bid adapter tests', function () {
     after(function () {
       sandbox.restore()
     });
-  })
+  });
+
+  describe('getAmxId() with localStorage enabled and data not set', function() {
+    before(function () {
+      sandbox.stub(storage, 'localStorageIsEnabled').callsFake(() => true);
+      sandbox.stub(storage, 'setDataInLocalStorage');
+      sandbox.stub(storage, 'getDataFromLocalStorage').callsFake((key) => null);
+    });
+    it('We test if we get the amxId', function() {
+      const output = getAmxId();
+      expect(output).to.be.eql(false);
+    });
+    after(function () {
+      sandbox.restore()
+    });
+  });
+
+  describe('getAmxId() with localStorage enabled and data set', function() {
+    before(function () {
+      sandbox.stub(storage, 'localStorageIsEnabled').callsFake(() => true);
+      sandbox.stub(storage, 'setDataInLocalStorage');
+      sandbox.stub(storage, 'getDataFromLocalStorage').callsFake((key) => 'abcdef');
+    });
+    it('We test if we get the amxId', function() {
+      const output = getAmxId();
+      expect(output).to.be.eql('abcdef');
+    });
+    after(function () {
+      sandbox.restore()
+    });
+  });
 
   describe('buildRequests()', function() {
     before(function () {
@@ -374,7 +405,7 @@ describe('Nexx360 bid adapter tests', function () {
         expect(requestContent.imp[1].tagid).to.be.eql('div-2-abcd');
         expect(requestContent.imp[1].ext.adUnitCode).to.be.eql('div-2-abcd');
         expect(requestContent.imp[1].ext.divId).to.be.eql('div-2-abcd');
-        expect(requestContent.ext.bidderVersion).to.be.eql('3.0');
+        expect(requestContent.ext.bidderVersion).to.be.eql('4.2');
         expect(requestContent.ext.source).to.be.eql('prebid.js');
       });
 
@@ -561,7 +592,7 @@ describe('Nexx360 bid adapter tests', function () {
         }
       };
       const output = spec.interpretResponse(response);
-      expect(output[0].vastXml).to.be.eql(response.body.seatbid[0].bid[0].ext.vastXml);
+      expect(output[0].vastXml).to.be.eql(response.body.seatbid[0].bid[0].adm);
       expect(output[0].mediaType).to.be.eql('video');
       expect(output[0].currency).to.be.eql(response.body.cur);
       expect(output[0].cpm).to.be.eql(response.body.seatbid[0].bid[0].price);
@@ -585,11 +616,11 @@ describe('Nexx360 bid adapter tests', function () {
                   'crid': '97517771',
                   'h': 1,
                   'w': 1,
+                  'adm': '\n    \n      \n        Nexx360 Wrapper\n        \n        \n        \n        \n          \n            \n              \n                \n                \n                \n                \n                \n                \n              \n            \n          \n        \n      \n    \n  ',
                   'ext': {
                     'mediaType': 'outstream',
                     'ssp': 'appnexus',
                     'adUnitCode': 'div-1',
-                    'vastXml': '\n    \n      \n        Nexx360 Wrapper\n        \n        \n        \n        \n          \n            \n              \n                \n                \n                \n                \n                \n                \n              \n            \n          \n        \n      \n    \n  '
                   }
                 }
               ],
@@ -602,7 +633,7 @@ describe('Nexx360 bid adapter tests', function () {
         }
       };
       const output = spec.interpretResponse(response);
-      expect(output[0].vastXml).to.be.eql(response.body.seatbid[0].bid[0].ext.vastXml);
+      expect(output[0].vastXml).to.be.eql(response.body.seatbid[0].bid[0].adm);
       expect(output[0].mediaType).to.be.eql('video');
       expect(output[0].currency).to.be.eql(response.body.cur);
       expect(typeof output[0].renderer).to.be.eql('object');
diff --git a/test/spec/modules/nobidAnalyticsAdapter_spec.js b/test/spec/modules/nobidAnalyticsAdapter_spec.js
index 742b4c16abb..81b78dc14d6 100644
--- a/test/spec/modules/nobidAnalyticsAdapter_spec.js
+++ b/test/spec/modules/nobidAnalyticsAdapter_spec.js
@@ -1,9 +1,9 @@
 import nobidAnalytics from 'modules/nobidAnalyticsAdapter.js';
 import {expect} from 'chai';
 import {server} from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
-let constants = require('src/constants.json');
 
 const TOP_LOCATION = 'https://www.somesite.com';
 const SITE_ID = 1234;
@@ -46,7 +46,7 @@ describe('NoBid Prebid Analytic', function () {
       });
 
       // Step 2: Send init auction event
-      events.emit(constants.EVENTS.AUCTION_INIT, {config: initOptions,
+      events.emit(EVENTS.AUCTION_INIT, {config: initOptions,
         auctionId: '13',
         timestamp: Date.now(),
         bidderRequests: [{refererInfo: {topmostLocation: TOP_LOCATION}}]});
@@ -77,27 +77,27 @@ describe('NoBid Prebid Analytic', function () {
       });
 
       // Step 2: Send init auction event
-      events.emit(constants.EVENTS.AUCTION_INIT, {config: initOptions,
+      events.emit(EVENTS.AUCTION_INIT, {config: initOptions,
         auctionId: '13',
         timestamp: Date.now(),
         bidderRequests: [{refererInfo: {topmostLocation: TOP_LOCATION}}]});
-      events.emit(constants.EVENTS.BID_WON, {});
+      events.emit(EVENTS.BID_WON, {});
       clock.tick(5000);
       expect(server.requests).to.have.length(1);
 
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
+      events.emit(EVENTS.BID_REQUESTED, {});
       clock.tick(5000);
       expect(server.requests).to.have.length(1);
 
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
+      events.emit(EVENTS.BID_RESPONSE, {});
       clock.tick(5000);
       expect(server.requests).to.have.length(1);
 
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
+      events.emit(EVENTS.BID_TIMEOUT, {});
       clock.tick(5000);
       expect(server.requests).to.have.length(1);
 
-      events.emit(constants.EVENTS.AD_RENDER_SUCCEEDED, {});
+      events.emit(EVENTS.AD_RENDER_SUCCEEDED, {});
       clock.tick(5000);
       expect(server.requests).to.have.length(1);
 
@@ -127,9 +127,9 @@ describe('NoBid Prebid Analytic', function () {
         mediaType: 'banner',
         source: 'client',
         cpm: 6.4,
+        currency: 'EUR',
         creativeId: 'TEST',
         dealId: '',
-        currency: 'USD',
         netRevenue: true,
         ttl: 300,
         ad: 'AD HERE',
@@ -167,13 +167,17 @@ describe('NoBid Prebid Analytic', function () {
         ]
       };
 
-      const requestOutgoing = {
+      const expectedOutgoingRequest = {
+        version: nobidAnalyticsVersion,
         bidderCode: 'nobid',
         statusMessage: 'Bid available',
         adId: '106d14b7d06b607',
         requestId: '67a7f0e7ea55c4',
         mediaType: 'banner',
         cpm: 6.4,
+        currency: 'EUR',
+        originalCpm: 6.44,
+        originalCurrency: 'USD',
         adUnitCode: 'leaderboard',
         timeToRespond: 545,
         size: '728x90',
@@ -187,26 +191,30 @@ describe('NoBid Prebid Analytic', function () {
       });
 
       // Step 2: Send init auction event
-      events.emit(constants.EVENTS.AUCTION_INIT, {config: initOptions,
+      events.emit(EVENTS.AUCTION_INIT, {config: initOptions,
         auctionId: '13',
         timestamp: Date.now(),
         bidderRequests: [{refererInfo: {topmostLocation: TOP_LOCATION}}]});
 
       // Step 3: Send bid won event
-      events.emit(constants.EVENTS.BID_WON, requestIncoming);
+      events.emit(EVENTS.BID_WON, requestIncoming);
       clock.tick(5000);
       expect(server.requests).to.have.length(1);
       const bidWonRequest = JSON.parse(server.requests[0].requestBody);
-      expect(bidWonRequest).to.have.property('bidderCode', requestOutgoing.bidderCode);
-      expect(bidWonRequest).to.have.property('statusMessage', requestOutgoing.statusMessage);
-      expect(bidWonRequest).to.have.property('adId', requestOutgoing.adId);
-      expect(bidWonRequest).to.have.property('requestId', requestOutgoing.requestId);
-      expect(bidWonRequest).to.have.property('mediaType', requestOutgoing.mediaType);
-      expect(bidWonRequest).to.have.property('cpm', requestOutgoing.cpm);
-      expect(bidWonRequest).to.have.property('adUnitCode', requestOutgoing.adUnitCode);
-      expect(bidWonRequest).to.have.property('timeToRespond', requestOutgoing.timeToRespond);
-      expect(bidWonRequest).to.have.property('size', requestOutgoing.size);
-      expect(bidWonRequest).to.have.property('topLocation', requestOutgoing.topLocation);
+      expect(bidWonRequest).to.have.property('version', nobidAnalyticsVersion);
+      expect(bidWonRequest).to.have.property('bidderCode', expectedOutgoingRequest.bidderCode);
+      expect(bidWonRequest).to.have.property('statusMessage', expectedOutgoingRequest.statusMessage);
+      expect(bidWonRequest).to.have.property('adId', expectedOutgoingRequest.adId);
+      expect(bidWonRequest).to.have.property('requestId', expectedOutgoingRequest.requestId);
+      expect(bidWonRequest).to.have.property('mediaType', expectedOutgoingRequest.mediaType);
+      expect(bidWonRequest).to.have.property('cpm', expectedOutgoingRequest.cpm);
+      expect(bidWonRequest).to.have.property('currency', expectedOutgoingRequest.currency);
+      expect(bidWonRequest).to.have.property('originalCpm', expectedOutgoingRequest.originalCpm);
+      expect(bidWonRequest).to.have.property('originalCurrency', expectedOutgoingRequest.originalCurrency);
+      expect(bidWonRequest).to.have.property('adUnitCode', expectedOutgoingRequest.adUnitCode);
+      expect(bidWonRequest).to.have.property('timeToRespond', expectedOutgoingRequest.timeToRespond);
+      expect(bidWonRequest).to.have.property('size', expectedOutgoingRequest.size);
+      expect(bidWonRequest).to.have.property('topLocation', expectedOutgoingRequest.topLocation);
       expect(bidWonRequest).to.not.have.property('pbCg');
 
       done();
@@ -304,10 +312,10 @@ describe('NoBid Prebid Analytic', function () {
             auctionId: '4c056b3c-f1a6-46bd-8d82-58c15b22fcfa',
             mediaType: 'banner',
             source: 'client',
-            cpm: 6.44,
+            cpm: 5.93,
+            currency: 'EUR',
             creativeId: 'TEST',
             dealId: '',
-            currency: 'USD',
             netRevenue: true,
             ttl: 300,
             ad: '',
@@ -336,7 +344,7 @@ describe('NoBid Prebid Analytic', function () {
         timeout: 3000
       };
 
-      const requestOutgoing = {
+      const expectedOutgoingRequest = {
         auctionId: '4c056b3c-f1a6-46bd-8d82-58c15b22fcfa',
         bidderRequests: [
           {
@@ -344,7 +352,6 @@ describe('NoBid Prebid Analytic', function () {
             bidderRequestId: '7c1940bb285731',
             bids: [
               {
-                bidder: 'nobid',
                 params: { siteId: SITE_ID },
                 mediaTypes: { banner: { sizes: [[728, 90]] } },
                 adUnitCode: 'leaderboard',
@@ -365,7 +372,10 @@ describe('NoBid Prebid Analytic', function () {
             width: 728,
             height: 90,
             mediaType: 'banner',
-            cpm: 6.44,
+            cpm: 5.93,
+            currency: 'EUR',
+            originalCpm: 6.44,
+            originalCurrency: 'USD',
             adUnitCode: 'leaderboard'
           }
         ]
@@ -378,54 +388,68 @@ describe('NoBid Prebid Analytic', function () {
       });
 
       // Step 2: Send init auction event
-      events.emit(constants.EVENTS.AUCTION_INIT, {config: initOptions,
+      events.emit(EVENTS.AUCTION_INIT, {config: initOptions,
         auctionId: '13',
         timestamp: Date.now(),
         bidderRequests: [{refererInfo: {topmostLocation: `${TOP_LOCATION}_something`}}]});
 
       // Step 3: Send bid won event
-      events.emit(constants.EVENTS.AUCTION_END, requestIncoming);
+      events.emit(EVENTS.AUCTION_END, requestIncoming);
       clock.tick(5000);
       expect(server.requests).to.have.length(1);
       const auctionEndRequest = JSON.parse(server.requests[0].requestBody);
-      expect(auctionEndRequest).to.have.property('auctionId', requestOutgoing.auctionId);
+      expect(auctionEndRequest).to.have.property('version', nobidAnalyticsVersion);
+      expect(auctionEndRequest).to.have.property('pbver', '$prebid.version$');
+      expect(auctionEndRequest).to.have.property('auctionId', expectedOutgoingRequest.auctionId);
       expect(auctionEndRequest.bidderRequests).to.have.length(1);
-      expect(auctionEndRequest.bidderRequests[0]).to.have.property('bidderCode', requestOutgoing.bidderRequests[0].bidderCode);
+      expect(auctionEndRequest.bidderRequests[0].bidderCode).to.equal(expectedOutgoingRequest.bidderRequests[0].bidderCode);
       expect(auctionEndRequest.bidderRequests[0].bids).to.have.length(1);
-      expect(auctionEndRequest.bidderRequests[0].bids[0]).to.have.property('bidder', requestOutgoing.bidderRequests[0].bids[0].bidder);
-      expect(auctionEndRequest.bidderRequests[0].bids[0]).to.have.property('adUnitCode', requestOutgoing.bidderRequests[0].bids[0].adUnitCode);
-      expect(auctionEndRequest.bidderRequests[0].bids[0].params).to.have.property('siteId', requestOutgoing.bidderRequests[0].bids[0].params.siteId);
-      expect(auctionEndRequest.bidderRequests[0].refererInfo).to.have.property('topmostLocation', requestOutgoing.bidderRequests[0].refererInfo.topmostLocation);
+      expect(typeof auctionEndRequest.bidderRequests[0].bids[0].bidder).to.equal('undefined');
+      expect(auctionEndRequest.bidderRequests[0].bids[0].adUnitCode).to.equal(expectedOutgoingRequest.bidderRequests[0].bids[0].adUnitCode);
+      expect(typeof auctionEndRequest.bidderRequests[0].bids[0].params).to.equal('undefined');
+      expect(typeof auctionEndRequest.bidderRequests[0].bids[0].src).to.equal('undefined');
+      expect(auctionEndRequest.bidderRequests[0].refererInfo.topmostLocation).to.equal(expectedOutgoingRequest.bidderRequests[0].refererInfo.topmostLocation);
+      expect(auctionEndRequest.bidsReceived).to.have.length(1);
+      expect(auctionEndRequest.bidsReceived[0].bidderCode).to.equal(expectedOutgoingRequest.bidsReceived[0].bidderCode);
+      expect(auctionEndRequest.bidsReceived[0].width).to.equal(expectedOutgoingRequest.bidsReceived[0].width);
+      expect(auctionEndRequest.bidsReceived[0].height).to.equal(expectedOutgoingRequest.bidsReceived[0].height);
+      expect(auctionEndRequest.bidsReceived[0].mediaType).to.equal(expectedOutgoingRequest.bidsReceived[0].mediaType);
+      expect(auctionEndRequest.bidsReceived[0].cpm).to.equal(expectedOutgoingRequest.bidsReceived[0].cpm);
+      expect(auctionEndRequest.bidsReceived[0].currency).to.equal(expectedOutgoingRequest.bidsReceived[0].currency);
+      expect(auctionEndRequest.bidsReceived[0].originalCpm).to.equal(expectedOutgoingRequest.bidsReceived[0].originalCpm);
+      expect(auctionEndRequest.bidsReceived[0].originalCurrency).to.equal(expectedOutgoingRequest.bidsReceived[0].originalCurrency);
+      expect(auctionEndRequest.bidsReceived[0].adUnitCode).to.equal(expectedOutgoingRequest.bidsReceived[0].adUnitCode);
+      expect(typeof auctionEndRequest.bidsReceived[0].source).to.equal('undefined');
 
       done();
     });
 
     it('Analytics disabled test', function (done) {
       let disabled;
-      nobidAnalytics.processServerResponse(JSON.stringify({disabled: false}));
+      nobidAnalytics.processServerResponse(JSON.stringify({disabled: 0}));
       disabled = nobidAnalytics.isAnalyticsDisabled();
       expect(disabled).to.equal(false);
-      events.emit(constants.EVENTS.AUCTION_END, {auctionId: '1234567890'});
+      events.emit(EVENTS.AUCTION_END, {auctionId: '1234567890'});
       clock.tick(1000);
       expect(server.requests).to.have.length(1);
-      events.emit(constants.EVENTS.AUCTION_END, {auctionId: '12345678901'});
+      events.emit(EVENTS.AUCTION_END, {auctionId: '12345678901'});
       clock.tick(1000);
       expect(server.requests).to.have.length(2);
 
       nobidAnalytics.processServerResponse('disabled: true');
-      events.emit(constants.EVENTS.AUCTION_END, {auctionId: '12345678902'});
+      events.emit(EVENTS.AUCTION_END, {auctionId: '12345678902'});
       clock.tick(1000);
       expect(server.requests).to.have.length(3);
 
-      nobidAnalytics.processServerResponse(JSON.stringify({disabled: true}));
+      nobidAnalytics.processServerResponse(JSON.stringify({disabled: 1}));
       disabled = nobidAnalytics.isAnalyticsDisabled();
       expect(disabled).to.equal(true);
-      events.emit(constants.EVENTS.AUCTION_END, {auctionId: '12345678902'});
+      events.emit(EVENTS.AUCTION_END, {auctionId: '12345678902'});
       clock.tick(5000);
       expect(server.requests).to.have.length(3);
 
       nobidAnalytics.retentionSeconds = 5;
-      nobidAnalytics.processServerResponse(JSON.stringify({disabled: true}));
+      nobidAnalytics.processServerResponse(JSON.stringify({disabled: 1}));
       clock.tick(1000);
       disabled = nobidAnalytics.isAnalyticsDisabled();
       expect(disabled).to.equal(true);
@@ -437,6 +461,100 @@ describe('NoBid Prebid Analytic', function () {
     });
   });
 
+  describe('Analytics disabled event type test', function () {
+    beforeEach(function () {
+      sinon.stub(events, 'getEvents').returns([]);
+      clock = sinon.useFakeTimers(Date.now());
+    });
+
+    afterEach(function () {
+      events.getEvents.restore();
+      clock.restore();
+    });
+
+    after(function () {
+      nobidAnalytics.disableAnalytics();
+    });
+
+    it('Analytics disabled event type test', function (done) {
+      // Initialize adapter
+      const initOptions = { options: { siteId: SITE_ID } };
+      nobidAnalytics.enableAnalytics(initOptions);
+      adapterManager.enableAnalytics({ provider: 'nobid', options: initOptions });
+
+      let eventType = EVENTS.AUCTION_END;
+      let disabled;
+      nobidAnalytics.processServerResponse(JSON.stringify({disabled: 0}));
+      disabled = nobidAnalytics.isAnalyticsDisabled();
+      expect(disabled).to.equal(false);
+      events.emit(eventType, {auctionId: '1234567890'});
+      clock.tick(1000);
+      expect(server.requests).to.have.length(1);
+      events.emit(eventType, {auctionId: '12345678901'});
+      clock.tick(1000);
+      expect(server.requests).to.have.length(2);
+
+      server.requests.length = 0;
+      expect(server.requests).to.have.length(0);
+
+      nobidAnalytics.processServerResponse(JSON.stringify({disabled_auctionEnd: 1}));
+      disabled = nobidAnalytics.isAnalyticsDisabled(eventType);
+      expect(disabled).to.equal(true);
+      events.emit(eventType, {auctionId: '1234567890'});
+      clock.tick(1000);
+      expect(server.requests).to.have.length(0);
+
+      server.requests.length = 0;
+
+      nobidAnalytics.processServerResponse(JSON.stringify({disabled_auctionEnd: 0}));
+      disabled = nobidAnalytics.isAnalyticsDisabled(eventType);
+      expect(disabled).to.equal(false);
+      events.emit(EVENTS.AUCTION_END, {auctionId: '1234567890'});
+      clock.tick(1000);
+      expect(server.requests).to.have.length(1);
+
+      server.requests.length = 0;
+      expect(server.requests).to.have.length(0);
+
+      eventType = EVENTS.BID_WON;
+      nobidAnalytics.processServerResponse(JSON.stringify({disabled_bidWon: 1}));
+      disabled = nobidAnalytics.isAnalyticsDisabled(eventType);
+      expect(disabled).to.equal(true);
+      events.emit(eventType, {bidderCode: 'nobid'});
+      clock.tick(1000);
+      expect(server.requests).to.have.length(0);
+
+      server.requests.length = 0;
+      expect(server.requests).to.have.length(0);
+
+      eventType = EVENTS.AUCTION_END;
+      nobidAnalytics.processServerResponse(JSON.stringify({disabled: 1}));
+      disabled = nobidAnalytics.isAnalyticsDisabled(eventType);
+      expect(disabled).to.equal(true);
+      events.emit(eventType, {auctionId: '1234567890'});
+      clock.tick(1000);
+      expect(server.requests).to.have.length(0);
+
+      server.requests.length = 0;
+      expect(server.requests).to.have.length(0);
+
+      eventType = EVENTS.AUCTION_END;
+      nobidAnalytics.processServerResponse(JSON.stringify({disabled_auctionEnd: 1, disabled_bidWon: 0}));
+      disabled = nobidAnalytics.isAnalyticsDisabled(eventType);
+      expect(disabled).to.equal(true);
+      events.emit(eventType, {auctionId: '1234567890'});
+      clock.tick(1000);
+      expect(server.requests).to.have.length(0);
+      disabled = nobidAnalytics.isAnalyticsDisabled(EVENTS.BID_WON);
+      expect(disabled).to.equal(false);
+      events.emit(EVENTS.BID_WON, {bidderCode: 'nobid'});
+      clock.tick(1000);
+      expect(server.requests).to.have.length(1);
+
+      done();
+    });
+  });
+
   describe('NoBid Carbonizer', function () {
     beforeEach(function () {
       sinon.stub(events, 'getEvents').returns([]);
@@ -456,7 +574,8 @@ describe('NoBid Prebid Analytic', function () {
       let active = nobidCarbonizer.isActive();
       expect(active).to.equal(false);
 
-      active = nobidCarbonizer.isActive(JSON.stringify({carbonizer_active: false}));
+      nobidAnalytics.processServerResponse(JSON.stringify({carbonizer_active: false}));
+      active = nobidCarbonizer.isActive();
       expect(active).to.equal(false);
 
       nobidAnalytics.processServerResponse(JSON.stringify({carbonizer_active: true}));
@@ -466,15 +585,15 @@ describe('NoBid Prebid Analytic', function () {
       const previousRetention = nobidAnalytics.retentionSeconds;
       nobidAnalytics.retentionSeconds = 3;
       nobidAnalytics.processServerResponse(JSON.stringify({carbonizer_active: true}));
-      const stored = nobidCarbonizer.getStoredLocalData();
-      expect(stored).to.contain(`{"carbonizer_active":true,"ts":`);
+      let stored = nobidCarbonizer.getStoredLocalData();
+      expect(stored[nobidAnalytics.ANALYTICS_DATA_NAME]).to.contain(`{"carbonizer_active":true,"ts":`);
       clock.tick(5000);
-      active = nobidCarbonizer.isActive(adunits, true);
+      active = nobidCarbonizer.isActive();
       expect(active).to.equal(false);
 
       nobidAnalytics.retentionSeconds = previousRetention;
       nobidAnalytics.processServerResponse(JSON.stringify({carbonizer_active: true}));
-      active = nobidCarbonizer.isActive(adunits, true);
+      active = nobidCarbonizer.isActive();
       expect(active).to.equal(true);
 
       let adunits = [
@@ -486,6 +605,10 @@ describe('NoBid Prebid Analytic', function () {
         }
       ]
       nobidCarbonizer.carbonizeAdunits(adunits, true);
+      stored = nobidCarbonizer.getStoredLocalData();
+      expect(stored[nobidAnalytics.ANALYTICS_DATA_NAME]).to.contain('{"carbonizer_active":true,"ts":');
+      expect(stored[nobidAnalytics.ANALYTICS_OPT_NAME]).to.contain('{"bidder1":1,"bidder2":1}');
+      clock.tick(5000);
       expect(adunits[0].bids.length).to.equal(0);
 
       done();
diff --git a/test/spec/modules/nobidBidAdapter_spec.js b/test/spec/modules/nobidBidAdapter_spec.js
index b1e303bde6e..2f2c97eae51 100644
--- a/test/spec/modules/nobidBidAdapter_spec.js
+++ b/test/spec/modules/nobidBidAdapter_spec.js
@@ -62,7 +62,6 @@ describe('Nobid Adapter', function () {
     });
 
     it('should return true when required params found', function () {
-      let bid = Object.assign({}, bid);
       delete bid.params;
       bid.params = {
         'siteId': 2
@@ -72,7 +71,6 @@ describe('Nobid Adapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
       delete bid.params;
       bid.params = {
         'siteId': 0
@@ -399,6 +397,7 @@ describe('Nobid Adapter', function () {
       const payload = JSON.parse(request.data);
       expect(payload.sid).to.equal(SITE_ID);
       expect(payload.pjbdr).to.equal('nobid');
+      expect(payload.pbver).to.equal('$prebid.version$');
       expect(payload.l).to.exist.and.to.equal(encodeURIComponent(REFERER));
       expect(payload.a).to.exist;
       expect(payload.t).to.exist;
diff --git a/test/spec/modules/oguryBidAdapter_spec.js b/test/spec/modules/oguryBidAdapter_spec.js
index ed358af19b6..99c16d0b1af 100644
--- a/test/spec/modules/oguryBidAdapter_spec.js
+++ b/test/spec/modules/oguryBidAdapter_spec.js
@@ -13,6 +13,11 @@ describe('OguryBidAdapter', function () {
   bidRequests = [
     {
       adUnitCode: 'adUnitCode',
+      ortb2Imp: {
+        ext: {
+          gpid: 'gpid'
+        }
+      },
       auctionId: 'auctionId',
       bidId: 'bidId',
       bidder: 'ogury',
@@ -42,7 +47,21 @@ describe('OguryBidAdapter', function () {
 
         return floorResult;
       },
-      transactionId: 'transactionId'
+      transactionId: 'transactionId',
+      userId: {
+        pubcid: '2abb10e5-c4f6-4f70-9f45-2200e4487714'
+      },
+      userIdAsEids: [
+        {
+          source: 'pubcid.org',
+          uids: [
+            {
+              id: '2abb10e5-c4f6-4f70-9f45-2200e4487714',
+              atype: 1
+            }
+          ]
+        }
+      ]
     },
     {
       adUnitCode: 'adUnitCode2',
@@ -66,6 +85,8 @@ describe('OguryBidAdapter', function () {
     bidderRequestId: 'mock-uuid',
     auctionId: bidRequests[0].auctionId,
     gdprConsent: {consentString: 'myConsentString', vendorData: {}, gdprApplies: true},
+    gppConsent: {gppString: 'myGppString', gppData: {}, applicableSections: [7], parsedSections: {}},
+    timeout: 1000
   };
 
   describe('isBidRequestValid', function () {
@@ -111,13 +132,17 @@ describe('OguryBidAdapter', function () {
   });
 
   describe('getUserSyncs', function() {
-    let syncOptions, gdprConsent;
+    let syncOptions, gdprConsent, gppConsent;
 
     beforeEach(() => {
       gdprConsent = {
         gdprApplies: true,
         consentString: 'CPJl4C8PJl4C8OoAAAENAwCMAP_AAH_AAAAAAPgAAAAIAPgAAAAIAAA.IGLtV_T9fb2vj-_Z99_tkeYwf95y3p-wzhheMs-8NyZeH_B4Wv2MyvBX4JiQKGRgksjLBAQdtHGlcTQgBwIlViTLMYk2MjzNKJrJEilsbO2dYGD9Pn8HT3ZCY70-vv__7v3ff_3g'
       };
+      gppConsent = {
+        gppString: 'DBABLA~BAAAAAAAAQA.QA',
+        applicableSections: [7]
+      }
     });
 
     describe('pixel', () => {
@@ -126,7 +151,7 @@ describe('OguryBidAdapter', function () {
       });
 
       it('should return syncs array with three elements of type image', () => {
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
 
         expect(userSyncs).to.have.lengthOf(3);
         expect(userSyncs[0].type).to.equal('image');
@@ -138,22 +163,34 @@ describe('OguryBidAdapter', function () {
       });
 
       it('should set the source as query param', () => {
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-        expect(userSyncs[0].url).to.contain('source=prebid');
-        expect(userSyncs[1].url).to.contain('source=prebid');
-        expect(userSyncs[2].url).to.contain('source=prebid');
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(new URL(userSyncs[0].url).searchParams.get('source')).to.equal('prebid')
       });
 
       it('should set the tcString as query param', () => {
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-        expect(userSyncs[0].url).to.contain(`iab_string=${gdprConsent.consentString}`);
-        expect(userSyncs[1].url).to.contain(`iab_string=${gdprConsent.consentString}`);
-        expect(userSyncs[2].url).to.contain(`iab_string=${gdprConsent.consentString}`);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(new URL(userSyncs[0].url).searchParams.get('iab_string')).to.equal(gdprConsent.consentString)
+        expect(new URL(userSyncs[1].url).searchParams.get('iab_string')).to.equal(gdprConsent.consentString)
+        expect(new URL(userSyncs[2].url).searchParams.get('iab_string')).to.equal(gdprConsent.consentString)
+      });
+
+      it('should set the gppString as query param', () => {
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(new URL(userSyncs[0].url).searchParams.get('gpp')).to.equal(gppConsent.gppString)
+        expect(new URL(userSyncs[1].url).searchParams.get('gpp')).to.equal(gppConsent.gppString)
+        expect(new URL(userSyncs[2].url).searchParams.get('gpp')).to.equal(gppConsent.gppString)
+      });
+
+      it('should set the gpp_sid as query param', () => {
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(new URL(userSyncs[0].url).searchParams.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+        expect(new URL(userSyncs[1].url).searchParams.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+        expect(new URL(userSyncs[2].url).searchParams.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
       });
 
       it('should return an empty array when pixel is disable', () => {
         syncOptions.pixelEnabled = false;
-        expect(spec.getUserSyncs(syncOptions, [], gdprConsent)).to.have.lengthOf(0);
+        expect(spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent)).to.have.lengthOf(0);
       });
 
       it('should return syncs array with three elements of type image when consentString is undefined', () => {
@@ -162,14 +199,14 @@ describe('OguryBidAdapter', function () {
           consentString: undefined
         };
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(3);
         expect(userSyncs[0].type).to.equal('image');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[1].type).to.equal('image');
-        expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[1].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[2].type).to.equal('image');
-        expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[2].url).searchParams.get('iab_string')).to.equal('')
       });
 
       it('should return syncs array with three elements of type image when consentString is null', () => {
@@ -178,40 +215,40 @@ describe('OguryBidAdapter', function () {
           consentString: null
         };
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(3);
         expect(userSyncs[0].type).to.equal('image');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[1].type).to.equal('image');
-        expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[1].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[2].type).to.equal('image');
-        expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[2].url).searchParams.get('iab_string')).to.equal('')
       });
 
       it('should return syncs array with three elements of type image when gdprConsent is undefined', () => {
         gdprConsent = undefined;
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(3);
         expect(userSyncs[0].type).to.equal('image');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[1].type).to.equal('image');
-        expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[1].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[2].type).to.equal('image');
-        expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[2].url).searchParams.get('iab_string')).to.equal('')
       });
 
       it('should return syncs array with three elements of type image when gdprConsent is null', () => {
         gdprConsent = null;
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(3);
         expect(userSyncs[0].type).to.equal('image');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[1].type).to.equal('image');
-        expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[1].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[2].type).to.equal('image');
-        expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[2].url).searchParams.get('iab_string')).to.equal('')
       });
 
       it('should return syncs array with three elements of type image when gdprConsent is null and gdprApplies is false', () => {
@@ -220,14 +257,14 @@ describe('OguryBidAdapter', function () {
           consentString: null
         };
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(3);
         expect(userSyncs[0].type).to.equal('image');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[1].type).to.equal('image');
-        expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[1].url).searchParams.get('iab_string')).to.equal('')
         expect(userSyncs[2].type).to.equal('image');
-        expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+        expect(new URL(userSyncs[2].url).searchParams.get('iab_string')).to.equal('')
       });
 
       it('should return syncs array with three elements of type image when gdprConsent is empty string and gdprApplies is false', () => {
@@ -236,14 +273,158 @@ describe('OguryBidAdapter', function () {
           consentString: ''
         };
 
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(3);
+        expect(userSyncs[0].type).to.equal('image');
+        expect(new URL(userSyncs[0].url).searchParams.get('iab_string')).to.equal('')
+        expect(userSyncs[1].type).to.equal('image');
+        expect(new URL(userSyncs[1].url).searchParams.get('iab_string')).to.equal('')
+        expect(userSyncs[2].type).to.equal('image');
+        expect(new URL(userSyncs[2].url).searchParams.get('iab_string')).to.equal('')
+      });
+
+      it('should return syncs array with three elements of type image when gppString is undefined', () => {
+        gppConsent = {
+          applicableSections: [7],
+          gppString: undefined
+        };
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(3);
+        expect(userSyncs[0].type).to.equal('image');
+        expect(userSyncs[1].type).to.equal('image');
+        expect(userSyncs[2].type).to.equal('image');
+
+        const firstUrlSync = new URL(userSyncs[0].url).searchParams
+        expect(firstUrlSync.get('gpp')).to.equal('')
+        expect(firstUrlSync.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+
+        const secondtUrlSync = new URL(userSyncs[1].url).searchParams
+        expect(secondtUrlSync.get('gpp')).to.equal('')
+        expect(secondtUrlSync.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+
+        const thirdUrlSync = new URL(userSyncs[2].url).searchParams
+        expect(thirdUrlSync.get('gpp')).to.equal('')
+        expect(thirdUrlSync.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+      });
+
+      it('should return syncs array with three elements of type image when gppString is null', () => {
+        gppConsent = {
+          applicableSections: [7, 8],
+          gppString: null
+        };
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(3);
+        expect(userSyncs[0].type).to.equal('image');
+        expect(userSyncs[1].type).to.equal('image');
+        expect(userSyncs[2].type).to.equal('image');
+
+        const firstUrlSync = new URL(userSyncs[0].url).searchParams
+        expect(firstUrlSync.get('gpp')).to.equal('')
+        expect(firstUrlSync.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+
+        const secondtUrlSync = new URL(userSyncs[1].url).searchParams
+        expect(secondtUrlSync.get('gpp')).to.equal('')
+        expect(secondtUrlSync.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+
+        const thirdUrlSync = new URL(userSyncs[2].url).searchParams
+        expect(thirdUrlSync.get('gpp')).to.equal('')
+        expect(thirdUrlSync.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+      });
+
+      it('should return syncs array with three elements of type image when gppConsent is undefined', () => {
+        gppConsent = undefined;
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(3);
+        expect(userSyncs[0].type).to.equal('image');
+        expect(userSyncs[1].type).to.equal('image');
+        expect(userSyncs[2].type).to.equal('image');
+
+        const firstUrlSync = new URL(userSyncs[0].url).searchParams
+        expect(firstUrlSync.get('gpp')).to.equal('')
+        expect(firstUrlSync.get('gpp_sid')).to.equal('')
+
+        const secondtUrlSync = new URL(userSyncs[1].url).searchParams
+        expect(secondtUrlSync.get('gpp')).to.equal('')
+        expect(secondtUrlSync.get('gpp_sid')).to.equal('')
+
+        const thirdUrlSync = new URL(userSyncs[2].url).searchParams
+        expect(thirdUrlSync.get('gpp')).to.equal('')
+        expect(thirdUrlSync.get('gpp_sid')).to.equal('')
+      });
+
+      it('should return syncs array with three elements of type image when gppConsent is null', () => {
+        gppConsent = null;
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(3);
+        expect(userSyncs[0].type).to.equal('image');
+        expect(userSyncs[1].type).to.equal('image');
+        expect(userSyncs[2].type).to.equal('image');
+
+        const firstUrlSync = new URL(userSyncs[0].url).searchParams
+        expect(firstUrlSync.get('gpp')).to.equal('')
+        expect(firstUrlSync.get('gpp_sid')).to.equal('')
+
+        const secondtUrlSync = new URL(userSyncs[1].url).searchParams
+        expect(secondtUrlSync.get('gpp')).to.equal('')
+        expect(secondtUrlSync.get('gpp_sid')).to.equal('')
+
+        const thirdUrlSync = new URL(userSyncs[2].url).searchParams
+        expect(thirdUrlSync.get('gpp')).to.equal('')
+        expect(thirdUrlSync.get('gpp_sid')).to.equal('')
+      });
+
+      it('should return syncs array with three elements of type image when gppConsent is null and applicableSections is empty', () => {
+        gppConsent = {
+          applicableSections: [],
+          gppString: null
+        };
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(3);
+        expect(userSyncs[0].type).to.equal('image');
+        expect(userSyncs[1].type).to.equal('image');
+        expect(userSyncs[2].type).to.equal('image');
+
+        const firstUrlSync = new URL(userSyncs[0].url).searchParams
+        expect(firstUrlSync.get('gpp')).to.equal('')
+        expect(firstUrlSync.get('gpp_sid')).to.equal('')
+
+        const secondtUrlSync = new URL(userSyncs[1].url).searchParams
+        expect(secondtUrlSync.get('gpp')).to.equal('')
+        expect(secondtUrlSync.get('gpp_sid')).to.equal('')
+
+        const thirdUrlSync = new URL(userSyncs[2].url).searchParams
+        expect(thirdUrlSync.get('gpp')).to.equal('')
+        expect(thirdUrlSync.get('gpp_sid')).to.equal('')
+      });
+
+      it('should return syncs array with three elements of type image when gppString is empty string and applicableSections is empty', () => {
+        gppConsent = {
+          applicableSections: [],
+          gppString: ''
+        };
+
         const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
         expect(userSyncs).to.have.lengthOf(3);
         expect(userSyncs[0].type).to.equal('image');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
         expect(userSyncs[1].type).to.equal('image');
-        expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
         expect(userSyncs[2].type).to.equal('image');
-        expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+
+        const firstUrlSync = new URL(userSyncs[0].url).searchParams
+        expect(firstUrlSync.get('gpp')).to.equal('')
+        expect(firstUrlSync.get('gpp_sid')).to.equal('')
+
+        const secondtUrlSync = new URL(userSyncs[1].url).searchParams
+        expect(secondtUrlSync.get('gpp')).to.equal('')
+        expect(secondtUrlSync.get('gpp_sid')).to.equal('')
+
+        const thirdUrlSync = new URL(userSyncs[2].url).searchParams
+        expect(thirdUrlSync.get('gpp')).to.equal('')
+        expect(thirdUrlSync.get('gpp_sid')).to.equal('')
       });
     });
 
@@ -253,7 +434,7 @@ describe('OguryBidAdapter', function () {
       });
 
       it('should return syncs array with one element of type iframe', () => {
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
 
         expect(userSyncs).to.have.lengthOf(1);
         expect(userSyncs[0].type).to.equal('iframe');
@@ -261,18 +442,23 @@ describe('OguryBidAdapter', function () {
       });
 
       it('should set the source as query param', () => {
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-        expect(userSyncs[0].url).to.contain('source=prebid');
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(new URL(userSyncs[0].url).searchParams.get('source')).to.equal('prebid');
       });
 
       it('should set the tcString as query param', () => {
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-        expect(userSyncs[0].url).to.contain(`gdpr_consent=${gdprConsent.consentString}`);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(new URL(userSyncs[0].url).searchParams.get('gdpr_consent')).to.equal(gdprConsent.consentString);
+      });
+
+      it('should set the gppString as query param', () => {
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(new URL(userSyncs[0].url).searchParams.get('gpp')).to.equal(gppConsent.gppString);
       });
 
       it('should return an empty array when iframe is disable', () => {
         syncOptions.iframeEnabled = false;
-        expect(spec.getUserSyncs(syncOptions, [], gdprConsent)).to.have.lengthOf(0);
+        expect(spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent)).to.have.lengthOf(0);
       });
 
       it('should return syncs array with one element of type iframe when consentString is undefined', () => {
@@ -281,10 +467,10 @@ describe('OguryBidAdapter', function () {
           consentString: undefined
         };
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(1);
         expect(userSyncs[0].type).to.equal('iframe');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/user-sync.html?gdpr_consent=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('gdpr_consent')).to.equal('');
       });
 
       it('should return syncs array with one element of type iframe when consentString is null', () => {
@@ -293,28 +479,28 @@ describe('OguryBidAdapter', function () {
           consentString: null
         };
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(1);
         expect(userSyncs[0].type).to.equal('iframe');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/user-sync.html?gdpr_consent=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('gdpr_consent')).to.equal('');
       });
 
       it('should return syncs array with one element of type iframe when gdprConsent is undefined', () => {
         gdprConsent = undefined;
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(1);
         expect(userSyncs[0].type).to.equal('iframe');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/user-sync.html?gdpr_consent=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('gdpr_consent')).to.equal('');
       });
 
       it('should return syncs array with one element of type iframe when gdprConsent is null', () => {
         gdprConsent = null;
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(1);
         expect(userSyncs[0].type).to.equal('iframe');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/user-sync.html?gdpr_consent=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('gdpr_consent')).to.equal('');
       });
 
       it('should return syncs array with one element of type iframe when gdprConsent is null and gdprApplies is false', () => {
@@ -323,10 +509,10 @@ describe('OguryBidAdapter', function () {
           consentString: null
         };
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(1);
         expect(userSyncs[0].type).to.equal('iframe');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/user-sync.html?gdpr_consent=&source=prebid')
+        expect(new URL(userSyncs[0].url).searchParams.get('gdpr_consent')).to.equal('');
       });
 
       it('should return syncs array with one element of type iframe when gdprConsent is empty string and gdprApplies is false', () => {
@@ -335,10 +521,93 @@ describe('OguryBidAdapter', function () {
           consentString: ''
         };
 
-        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(1);
+        expect(userSyncs[0].type).to.equal('iframe');
+        expect(new URL(userSyncs[0].url).searchParams.get('gdpr_consent')).to.equal('');
+      });
+
+      it('should return syncs array with one element of type iframe when gppConsent is empty string and applicableSections is empty', () => {
+        gppConsent = {
+          applicableSections: [],
+          gppString: ''
+        };
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
         expect(userSyncs).to.have.lengthOf(1);
         expect(userSyncs[0].type).to.equal('iframe');
-        expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/user-sync.html?gdpr_consent=&source=prebid')
+
+        const urlParams = new URL(userSyncs[0].url).searchParams
+        expect(urlParams.get('gpp')).to.equal('')
+        expect(urlParams.get('gpp_sid')).to.equal('')
+      });
+
+      it('should return syncs array with one element of type iframe when gppString is undefined', () => {
+        gppConsent = {
+          applicableSections: [7],
+          gppString: undefined
+        };
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(1);
+        expect(userSyncs[0].type).to.equal('iframe');
+
+        const urlParams = new URL(userSyncs[0].url).searchParams
+        expect(urlParams.get('gpp')).to.equal('')
+        expect(urlParams.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+      });
+
+      it('should return syncs array with one element of type iframe when gppString is null', () => {
+        gppConsent = {
+          applicableSections: [7],
+          gppString: null
+        };
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(1);
+        expect(userSyncs[0].type).to.equal('iframe');
+
+        const urlParams = new URL(userSyncs[0].url).searchParams
+        expect(urlParams.get('gpp')).to.equal('')
+        expect(urlParams.get('gpp_sid')).to.equal(gppConsent.applicableSections.toString())
+      });
+
+      it('should return syncs array with one element of type iframe when gppConsent is undefined', () => {
+        gppConsent = undefined;
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(1);
+        expect(userSyncs[0].type).to.equal('iframe');
+
+        const urlParams = new URL(userSyncs[0].url).searchParams
+        expect(urlParams.get('gpp')).to.equal('')
+        expect(urlParams.get('gpp_sid')).to.equal('')
+      });
+
+      it('should return syncs array with one element of type iframe when gppConsent is null', () => {
+        gppConsent = null;
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(1);
+        expect(userSyncs[0].type).to.equal('iframe');
+
+        const urlParams = new URL(userSyncs[0].url).searchParams
+        expect(urlParams.get('gpp')).to.equal('')
+        expect(urlParams.get('gpp_sid')).to.equal('')
+      });
+
+      it('should return syncs array with one element of type iframe when gppConsent is null and applicableSections is empty', () => {
+        gppConsent = {
+          applicableSections: [],
+          gppString: null
+        };
+
+        const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent, [], gppConsent);
+        expect(userSyncs).to.have.lengthOf(1);
+        expect(userSyncs[0].type).to.equal('iframe');
+
+        const urlParams = new URL(userSyncs[0].url).searchParams
+        expect(urlParams.get('gpp')).to.equal('')
+        expect(urlParams.get('gpp_sid')).to.equal('')
       });
     });
   });
@@ -379,6 +648,7 @@ describe('OguryBidAdapter', function () {
         },
         ext: {
           ...bidRequests[0].params,
+          gpid: bidRequests[0].ortb2Imp.ext.gpid,
           timeSpentOnPage: stubbedCurrentTime
         }
       }, {
@@ -397,7 +667,9 @@ describe('OguryBidAdapter', function () {
       }],
       regs: {
         ext: {
-          gdpr: 1
+          gdpr: 1,
+          gpp: 'myGppString',
+          gpp_sid: [7]
         },
       },
       site: {
@@ -407,12 +679,26 @@ describe('OguryBidAdapter', function () {
       },
       user: {
         ext: {
-          consent: bidderRequest.gdprConsent.consentString
+          consent: bidderRequest.gdprConsent.consentString,
+          uids: {
+            pubcid: '2abb10e5-c4f6-4f70-9f45-2200e4487714'
+          },
+          eids: [
+            {
+              source: 'pubcid.org',
+              uids: [
+                {
+                  id: '2abb10e5-c4f6-4f70-9f45-2200e4487714',
+                  atype: 1
+                }
+              ]
+            }
+          ],
         },
       },
       ext: {
         prebidversion: '$prebid.version$',
-        adapterversion: '1.5.0'
+        adapterversion: '1.7.0'
       },
       device: {
         w: stubbedWidth,
@@ -632,12 +918,16 @@ describe('OguryBidAdapter', function () {
         ...expectedRequestObject,
         regs: {
           ext: {
-            gdpr: 0
+            gdpr: 0,
+            gpp: 'myGppString',
+            gpp_sid: [7]
           },
         },
         user: {
           ext: {
-            consent: ''
+            consent: '',
+            uids: expectedRequestObject.user.ext.uids,
+            eids: expectedRequestObject.user.ext.eids
           },
         }
       };
@@ -649,6 +939,33 @@ describe('OguryBidAdapter', function () {
       expect(request.data.regs.ext.gdpr).to.be.a('number');
     });
 
+    it('should not add gpp infos if not present', () => {
+      const bidderRequestWithoutGpp = {
+        ...bidderRequest,
+        gppConsent: {},
+      }
+      const expectedRequestObjectWithoutGpp = {
+        ...expectedRequestObject,
+        regs: {
+          ext: {
+            gdpr: 1
+          },
+        },
+        user: {
+          ext: {
+            consent: 'myConsentString',
+            uids: expectedRequestObject.user.ext.uids,
+            eids: expectedRequestObject.user.ext.eids
+          },
+        }
+      };
+
+      const validBidRequests = bidRequests
+
+      const request = spec.buildRequests(validBidRequests, bidderRequestWithoutGpp);
+      expect(request.data).to.deep.equal(expectedRequestObjectWithoutGpp);
+    });
+
     it('should not add gdpr infos if gdprConsent is undefined', () => {
       const bidderRequestWithoutGdpr = {
         ...bidderRequest,
@@ -658,12 +975,16 @@ describe('OguryBidAdapter', function () {
         ...expectedRequestObject,
         regs: {
           ext: {
-            gdpr: 0
+            gdpr: 0,
+            gpp: 'myGppString',
+            gpp_sid: [7]
           },
         },
         user: {
           ext: {
-            consent: ''
+            consent: '',
+            uids: expectedRequestObject.user.ext.uids,
+            eids: expectedRequestObject.user.ext.eids
           },
         }
       };
@@ -675,6 +996,26 @@ describe('OguryBidAdapter', function () {
       expect(request.data.regs.ext.gdpr).to.be.a('number');
     });
 
+    it('should not add gpp infos if gppConsent is undefined', () => {
+      const bidderRequestWithoutGdpr = {
+        ...bidderRequest,
+        gppConsent: undefined,
+      }
+      const expectedRequestObjectWithoutGdpr = {
+        ...expectedRequestObject,
+        regs: {
+          ext: {
+            gdpr: 1,
+          },
+        },
+      };
+
+      const validBidRequests = bidRequests
+
+      const request = spec.buildRequests(validBidRequests, bidderRequestWithoutGdpr);
+      expect(request.data).to.deep.equal(expectedRequestObjectWithoutGdpr);
+    });
+
     it('should not add tcString and turn off gdpr-applies if consentString and gdprApplies are undefined', () => {
       const bidderRequestWithoutGdpr = {
         ...bidderRequest,
@@ -684,12 +1025,16 @@ describe('OguryBidAdapter', function () {
         ...expectedRequestObject,
         regs: {
           ext: {
-            gdpr: 0
+            gdpr: 0,
+            gpp: 'myGppString',
+            gpp_sid: [7]
           },
         },
         user: {
           ext: {
-            consent: ''
+            consent: '',
+            uids: expectedRequestObject.user.ext.uids,
+            eids: expectedRequestObject.user.ext.eids
           },
         }
       };
@@ -701,6 +1046,48 @@ describe('OguryBidAdapter', function () {
       expect(request.data.regs.ext.gdpr).to.be.a('number');
     });
 
+    it('should should not add uids infos if userId is undefined', () => {
+      const expectedRequestWithUndefinedUserId = {
+        ...expectedRequestObject,
+        user: {
+          ext: {
+            consent: expectedRequestObject.user.ext.consent,
+            eids: expectedRequestObject.user.ext.eids
+          }
+        }
+      };
+
+      const validBidRequests = utils.deepClone(bidRequests);
+      validBidRequests[0] = {
+        ...validBidRequests[0],
+        userId: undefined
+      };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithUndefinedUserId);
+    });
+
+    it('should should not add uids infos if userIdAsEids is undefined', () => {
+      const expectedRequestWithUndefinedUserIdAsEids = {
+        ...expectedRequestObject,
+        user: {
+          ext: {
+            consent: expectedRequestObject.user.ext.consent,
+            uids: expectedRequestObject.user.ext.uids
+          }
+        }
+      };
+
+      const validBidRequests = utils.deepClone(bidRequests);
+      validBidRequests[0] = {
+        ...validBidRequests[0],
+        userIdAsEids: undefined
+      };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithUndefinedUserIdAsEids);
+    });
+
     it('should handle bidFloor undefined', () => {
       const expectedRequestWithUndefinedFloor = {
         ...expectedRequestObject
@@ -747,7 +1134,47 @@ describe('OguryBidAdapter', function () {
       const request = spec.buildRequests(validBidRequests, bidderRequest);
       expect(request.data).to.deep.equal(expectedRequestWithUnsupportedFloorCurrency);
     });
-  });
+
+    it('should not add gpid if ortb2 undefined', () => {
+      const expectedRequestWithUndefinedGpid = utils.deepClone(expectedRequestObject)
+
+      delete expectedRequestWithUndefinedGpid.imp[0].ext.gpid;
+      delete expectedRequestWithUndefinedGpid.imp[1].ext.gpid;
+
+      const validBidRequests = utils.deepClone(bidRequests);
+      delete validBidRequests[0].ortb2Imp.ext.gpid;
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithUndefinedGpid);
+    });
+
+    it('should not add gpid if gpid undefined', () => {
+      const expectedRequestWithUndefinedGpid = utils.deepClone(expectedRequestObject)
+
+      delete expectedRequestWithUndefinedGpid.imp[0].ext.gpid;
+      delete expectedRequestWithUndefinedGpid.imp[1].ext.gpid;
+
+      const validBidRequests = utils.deepClone(bidRequests);
+      validBidRequests[0] = {
+        ...validBidRequests[0],
+        ortb2Imp: {
+          ext: {}
+        }
+      };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithUndefinedGpid);
+    });
+
+    it('should send gpid in bid request', function() {
+      const validBidRequests = utils.deepClone(bidRequests)
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestObject);
+      expect(request.data.imp[0].ext.gpid).to.be.a('string');
+      expect(request.data.imp[1].ext.gpid).to.be.undefined
+    })
+  })
 
   describe('interpretResponse', function () {
     let openRtbBidResponse = {
@@ -814,7 +1241,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[0].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[0].nurl,
-        adapterVersion: '1.5.0',
+        adapterVersion: '1.7.0',
         prebidVersion: '$prebid.version$'
       }, {
         requestId: openRtbBidResponse.body.seatbid[0].bid[1].impid,
@@ -831,7 +1258,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[1].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[1].nurl,
-        adapterVersion: '1.5.0',
+        adapterVersion: '1.7.0',
         prebidVersion: '$prebid.version$'
       }]
 
diff --git a/test/spec/modules/brightcomSSPBidAdapter_spec.js b/test/spec/modules/omsBidAdapter_spec.js
similarity index 69%
rename from test/spec/modules/brightcomSSPBidAdapter_spec.js
rename to test/spec/modules/omsBidAdapter_spec.js
index 6f35a7a290b..dc2d8ffebb6 100644
--- a/test/spec/modules/brightcomSSPBidAdapter_spec.js
+++ b/test/spec/modules/omsBidAdapter_spec.js
@@ -1,18 +1,18 @@
-import { expect } from 'chai';
+import {expect} from 'chai';
 import * as utils from 'src/utils.js';
-import { spec } from 'modules/brightcomSSPBidAdapter';
-import { newBidder } from 'src/adapters/bidderFactory.js';
+import {spec} from 'modules/omsBidAdapter';
+import {newBidder} from 'src/adapters/bidderFactory.js';
 import {config} from '../../../src/config';
 
 const URL = 'https://rt.marphezis.com/hb';
 
-describe('brightcomSSPBidAdapter', function() {
+describe('omsBidAdapter', function () {
   const adapter = newBidder(spec);
   let element, win;
   let bidRequests;
   let sandbox;
 
-  beforeEach(function() {
+  beforeEach(function () {
     element = {
       x: 0,
       y: 0,
@@ -41,7 +41,7 @@ describe('brightcomSSPBidAdapter', function() {
       innerHeight: 600
     };
     bidRequests = [{
-      'bidder': 'bcmssp',
+      'bidder': 'oms',
       'params': {
         'publisherId': 1234567
       },
@@ -76,13 +76,13 @@ describe('brightcomSSPBidAdapter', function() {
     sandbox.stub(utils, 'getWindowSelf').returns(win);
   });
 
-  afterEach(function() {
+  afterEach(function () {
     sandbox.restore();
   });
 
   describe('isBidRequestValid', function () {
     let bid = {
-      'bidder': 'bcmssp',
+      'bidder': 'oms',
       'params': {
         'publisherId': 1234567
       },
@@ -107,9 +107,9 @@ describe('brightcomSSPBidAdapter', function() {
     });
 
     it('should return false when require params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -124,13 +124,13 @@ describe('brightcomSSPBidAdapter', function() {
       expect(request.url).to.equal(URL);
     });
 
-    it('sets the proper banner object', function() {
+    it('sets the proper banner object', function () {
       const request = spec.buildRequests(bidRequests);
       const payload = JSON.parse(request.data);
       expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
     });
 
-    it('accepts a single array as a size', function() {
+    it('accepts a single array as a size', function () {
       bidRequests[0].mediaTypes.banner.sizes = [300, 250];
       const request = spec.buildRequests(bidRequests);
       const payload = JSON.parse(request.data);
@@ -159,7 +159,7 @@ describe('brightcomSSPBidAdapter', function() {
     it('sends gdpr info if exists', function () {
       const consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
       const bidderRequest = {
-        'bidderCode': 'bcmssp',
+        'bidderCode': 'oms',
         'auctionId': '1d1a030790a437',
         'bidderRequestId': '22edbae2744bf5',
         'timeout': 3000,
@@ -182,21 +182,8 @@ describe('brightcomSSPBidAdapter', function() {
       expect(data.user.ext.consent).to.equal(consentString);
     });
 
-    it('sends us_privacy', function () {
-      const bidderRequest = {
-        uspConsent: '1YYY'
-      };
-      const data = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data)
-
-      expect(data.regs).to.not.equal(null);
-      expect(data.regs.ext).to.not.equal(null);
-      expect(data.regs.ext.us_privacy).to.equal('1YYY');
-    });
-
     it('sends coppa', function () {
-      sandbox.stub(config, 'getConfig').withArgs('coppa').returns(true);
-
-      const data = JSON.parse(spec.buildRequests(bidRequests).data)
+      const data = JSON.parse(spec.buildRequests(bidRequests, {ortb2: {regs: {coppa: 1}}}).data)
       expect(data.regs).to.not.be.undefined;
       expect(data.regs.coppa).to.equal(1);
     });
@@ -260,36 +247,58 @@ describe('brightcomSSPBidAdapter', function() {
       expect(data.user.ext.ids).is.deep.equal(userId);
     });
 
-    context('when element is fully in view', function() {
-      it('returns 100', function() {
-        Object.assign(element, { width: 600, height: 400 });
+    it('sends gpid parameters', function () {
+      bidRequests[0].ortb2Imp = {
+        'ext': {
+          'gpid': '/1111/home-left',
+          'data': {
+            'adserver': {
+              'name': 'gam',
+              'adslot': '/1111/home'
+            },
+            'pbadslot': '/1111/home-left'
+          }
+        }
+      }
+
+      const data = JSON.parse(spec.buildRequests(bidRequests).data);
+      expect(data.imp[0].ext).to.not.be.undefined;
+      expect(data.imp[0].ext.gpid).to.not.be.undefined;
+      expect(data.imp[0].ext.adserverName).to.not.be.undefined;
+      expect(data.imp[0].ext.adslot).to.not.be.undefined;
+      expect(data.imp[0].ext.pbadslot).to.not.be.undefined;
+    });
+
+    context('when element is fully in view', function () {
+      it('returns 100', function () {
+        Object.assign(element, {width: 600, height: 400});
         const request = spec.buildRequests(bidRequests);
         const payload = JSON.parse(request.data);
         expect(payload.imp[0].banner.ext.viewability).to.equal(100);
       });
     });
 
-    context('when element is out of view', function() {
-      it('returns 0', function() {
-        Object.assign(element, { x: -300, y: 0, width: 207, height: 320 });
+    context('when element is out of view', function () {
+      it('returns 0', function () {
+        Object.assign(element, {x: -300, y: 0, width: 207, height: 320});
         const request = spec.buildRequests(bidRequests);
         const payload = JSON.parse(request.data);
         expect(payload.imp[0].banner.ext.viewability).to.equal(0);
       });
     });
 
-    context('when element is partially in view', function() {
-      it('returns percentage', function() {
-        Object.assign(element, { width: 800, height: 800 });
+    context('when element is partially in view', function () {
+      it('returns percentage', function () {
+        Object.assign(element, {width: 800, height: 800});
         const request = spec.buildRequests(bidRequests);
         const payload = JSON.parse(request.data);
         expect(payload.imp[0].banner.ext.viewability).to.equal(75);
       });
     });
 
-    context('when width or height of the element is zero', function() {
-      it('try to use alternative values', function() {
-        Object.assign(element, { width: 0, height: 0 });
+    context('when width or height of the element is zero', function () {
+      it('try to use alternative values', function () {
+        Object.assign(element, {width: 0, height: 0});
         bidRequests[0].mediaTypes.banner.sizes = [[800, 2400]];
         const request = spec.buildRequests(bidRequests);
         const payload = JSON.parse(request.data);
@@ -297,9 +306,9 @@ describe('brightcomSSPBidAdapter', function() {
       });
     });
 
-    context('when nested iframes', function() {
-      it('returns \'na\'', function() {
-        Object.assign(element, { width: 600, height: 400 });
+    context('when nested iframes', function () {
+      it('returns \'na\'', function () {
+        Object.assign(element, {width: 600, height: 400});
 
         utils.getWindowTop.restore();
         utils.getWindowSelf.restore();
@@ -312,9 +321,9 @@ describe('brightcomSSPBidAdapter', function() {
       });
     });
 
-    context('when tab is inactive', function() {
-      it('returns 0', function() {
-        Object.assign(element, { width: 600, height: 400 });
+    context('when tab is inactive', function () {
+      it('returns 0', function () {
+        Object.assign(element, {width: 600, height: 400});
 
         utils.getWindowTop.restore();
         win.document.visibilityState = 'hidden';
@@ -360,7 +369,7 @@ describe('brightcomSSPBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `
`,
-        'ttl': 60,
+        'ttl': 300,
         'meta': {
           'advertiserDomains': ['example.com']
         }
@@ -381,7 +390,7 @@ describe('brightcomSSPBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `
`,
-        'ttl': 60,
+        'ttl': 300,
         'meta': {
           'advertiserDomains': ['example.com']
         }
@@ -401,11 +410,67 @@ describe('brightcomSSPBidAdapter', function() {
   });
 
   describe('getUserSyncs ', () => {
-    let syncOptions = {iframeEnabled: true, pixelEnabled: true};
+    const syncOptions = { iframeEnabled: true };
+    const userSyncUrlIframe = 'https://rt.marphezis.com/sync?dpid=0';
+
+    it('returns empty syncs arr when syncOptions.iframeEnabled is false', () => {
+      expect(spec.getUserSyncs({ iframeEnabled: false }, {}, undefined, undefined)).to.be.empty;
+    });
+
+    it('returns syncs arr when syncOptions.iframeEnabled is true', () => {
+      expect(spec.getUserSyncs(syncOptions, {}, undefined, undefined)).to.deep.equal([{
+        type: 'iframe',
+        url: userSyncUrlIframe
+      }]);
+    });
+
+    it('should pass gdpr param when gdprConsent.gdprApplies type is boolean', () => {
+      expect(spec.getUserSyncs(syncOptions, {}, { gdprApplies: true }, undefined)).to.deep.equal([{
+        type: 'iframe',
+        url: `${userSyncUrlIframe}&gdpr=1`
+      }]);
+      expect(spec.getUserSyncs(syncOptions, {}, { gdprApplies: false }, undefined)).to.deep.equal([{
+        type: 'iframe',
+        url: `${userSyncUrlIframe}&gdpr=0`
+      }]);
+    });
+
+    it('should pass gdpr_consent param when gdprConsent.consentString type is string', () => {
+      expect(spec.getUserSyncs(syncOptions, {}, { gdprApplies: false, consentString: 'test' }, undefined)).to.deep.equal([{
+        type: 'iframe',
+        url: `${userSyncUrlIframe}&gdpr=0&gdpr_consent=test`
+      }]);
+    });
+
+    it('should pass no params when gdprConsent.consentString and gdprConsent.gdprApplies types dont match', () => {
+      expect(spec.getUserSyncs(syncOptions, {}, { gdprApplies: 'true', consentString: 1 }, undefined)).to.deep.equal([{
+        type: 'iframe',
+        url: `${userSyncUrlIframe}`
+      }]);
+    });
+
+    it('should pass us_privacy param when uspConsent is defined', function () {
+      expect(spec.getUserSyncs(syncOptions, {}, undefined, 'test')).to.deep.equal([{
+        type: 'iframe', url: `${userSyncUrlIframe}&us_privacy=test`
+      }]);
+    });
+
+    it('should pass gpp and gpp_sid params when gppConsent.gppString is defined', function () {
+      expect(spec.getUserSyncs(syncOptions, {}, {}, undefined, {
+        gppString: 'test',
+        applicableSections: [1, 2]
+      })).to.deep.equal([{
+        type: 'iframe', url: `${userSyncUrlIframe}&gpp=test&gpp_sid=1,2`
+      }]);
+    });
 
-    it('should not return', () => {
-      let returnStatement = spec.getUserSyncs(syncOptions, []);
-      expect(returnStatement).to.be.empty;
+    it('should pass all params correctly', function () {
+      expect(spec.getUserSyncs(syncOptions, {}, { gdprApplies: false, consentString: 'test' }, 'test', {
+        gppString: 'test',
+        applicableSections: []
+      })).to.deep.equal([{
+        type: 'iframe', url: `${userSyncUrlIframe}&gdpr=0&gdpr_consent=test&us_privacy=test&gpp=test&gpp_sid=`
+      }]);
     });
   });
 });
diff --git a/test/spec/modules/onetagBidAdapter_spec.js b/test/spec/modules/onetagBidAdapter_spec.js
index df6456db82e..a6edaaabe79 100644
--- a/test/spec/modules/onetagBidAdapter_spec.js
+++ b/test/spec/modules/onetagBidAdapter_spec.js
@@ -15,9 +15,14 @@ describe('onetag', function () {
       'bidId': '30b31c1838de1e',
       'bidderRequestId': '22edbae2733bf6',
       'auctionId': '1d1a030790a475',
-      ortb2Imp: {
-        ext: {
-          tid: 'qwerty123'
+      'ortb2Imp': {
+        'ext': {
+          'tid': '0000'
+        }
+      },
+      'ortb2': {
+        'source': {
+          'tid': '1111'
         }
       },
       'schain': {
@@ -184,7 +189,7 @@ describe('onetag', function () {
     });
     it('Should contain all keys', function () {
       expect(data).to.be.an('object');
-      expect(data).to.include.all.keys('location', 'referrer', 'stack', 'numIframes', 'sHeight', 'sWidth', 'docHeight', 'wHeight', 'wWidth', 'oHeight', 'oWidth', 'aWidth', 'aHeight', 'sLeft', 'sTop', 'hLength', 'bids', 'docHidden', 'xOffset', 'yOffset', 'networkConnectionType', 'networkEffectiveConnectionType', 'timing', 'version');
+      expect(data).to.include.all.keys('location', 'referrer', 'stack', 'numIframes', 'sHeight', 'sWidth', 'docHeight', 'wHeight', 'wWidth', 'oHeight', 'oWidth', 'aWidth', 'aHeight', 'sLeft', 'sTop', 'hLength', 'bids', 'docHidden', 'xOffset', 'yOffset', 'networkConnectionType', 'networkEffectiveConnectionType', 'timing', 'version', 'fledgeEnabled');
       expect(data.location).to.satisfy(function (value) {
         return value === null || typeof value === 'string';
       });
@@ -208,6 +213,7 @@ describe('onetag', function () {
       expect(data.networkEffectiveConnectionType).to.satisfy(function (value) {
         return value === null || typeof value === 'string'
       });
+      expect(data.fledgeEnabled).to.be.a('boolean');
       expect(data.bids).to.be.an('array');
       expect(data.version).to.have.all.keys('prebid', 'adapter');
       const bids = data['bids'];
@@ -220,6 +226,7 @@ describe('onetag', function () {
             'bidId',
             'bidderRequestId',
             'pubId',
+            'ortb2Imp',
             'transactionId',
             'context',
             'playerSize',
@@ -234,6 +241,7 @@ describe('onetag', function () {
             'bidId',
             'bidderRequestId',
             'pubId',
+            'ortb2Imp',
             'transactionId',
             'mediaTypeInfo',
             'sizes',
@@ -256,8 +264,19 @@ describe('onetag', function () {
         expect(dataObj.bids).to.be.an('array').that.is.empty;
       } catch (e) { }
     });
+    it('Should pick each bid\'s auctionId and transactionId from ortb2 related fields', function () {
+      const serverRequest = spec.buildRequests([bannerBid]);
+      const payload = JSON.parse(serverRequest.data);
+
+      expect(payload).to.exist;
+      expect(payload.bids).to.exist.and.to.have.length(1);
+      expect(payload.bids[0].auctionId).to.equal(bannerBid.ortb2.source.tid);
+      expect(payload.bids[0].transactionId).to.equal(bannerBid.ortb2Imp.ext.tid);
+      expect(payload.bids[0].ortb2Imp).to.deep.equal(bannerBid.ortb2Imp);
+    });
     it('should send GDPR consent data', function () {
       let consentString = 'consentString';
+      let addtlConsent = '2~1.35.41.101~dv.9.21.81';
       let bidderRequest = {
         'bidderCode': 'onetag',
         'auctionId': '1d1a030790a475',
@@ -265,7 +284,8 @@ describe('onetag', function () {
         'timeout': 3000,
         'gdprConsent': {
           consentString: consentString,
-          gdprApplies: true
+          gdprApplies: true,
+          addtlConsent: addtlConsent
         }
       };
       let serverRequest = spec.buildRequests([bannerBid], bidderRequest);
@@ -274,6 +294,7 @@ describe('onetag', function () {
       expect(payload).to.exist;
       expect(payload.gdprConsent).to.exist;
       expect(payload.gdprConsent.consentString).to.exist.and.to.equal(consentString);
+      expect(payload.gdprConsent.addtlConsent).to.exist.and.to.equal(addtlConsent);
       expect(payload.gdprConsent.consentRequired).to.exist.and.to.be.true;
     });
     it('Should send GPP consent data', function () {
@@ -381,14 +402,94 @@ describe('onetag', function () {
       expect(payload.ortb2).to.exist;
       expect(payload.ortb2).to.exist.and.to.deep.equal(firtPartyData);
     });
+    it('Should send DSA (ortb2 field)', function () {
+      const dsa = {
+        'regs': {
+          'ext': {
+            'dsa': {
+              'required': 1,
+              'pubrender': 0,
+              'datatopub': 1,
+              'transparency': [{
+                'domain': 'dsa-domain',
+                'params': [1, 2]
+              }]
+            }
+          }
+        }
+      };
+      let bidderRequest = {
+        'bidderCode': 'onetag',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'ortb2': dsa
+      }
+      let serverRequest = spec.buildRequests([bannerBid], bidderRequest);
+      const payload = JSON.parse(serverRequest.data);
+      expect(payload.ortb2).to.exist;
+      expect(payload.ortb2).to.exist.and.to.deep.equal(dsa);
+    });
+    it('Should send FLEDGE eligibility flag when FLEDGE is enabled', function () {
+      let bidderRequest = {
+        'bidderCode': 'onetag',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'paapi': {
+          'enabled': true
+        }
+      };
+      let serverRequest = spec.buildRequests([bannerBid], bidderRequest);
+      const payload = JSON.parse(serverRequest.data);
+
+      expect(payload.fledgeEnabled).to.exist;
+      expect(payload.fledgeEnabled).to.exist.and.to.equal(bidderRequest.paapi.enabled);
+    });
+    it('Should send FLEDGE eligibility flag when FLEDGE is not enabled', function () {
+      let bidderRequest = {
+        'bidderCode': 'onetag',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        paapi: {
+          enabled: false
+        }
+      };
+      let serverRequest = spec.buildRequests([bannerBid], bidderRequest);
+      const payload = JSON.parse(serverRequest.data);
+
+      expect(payload.fledgeEnabled).to.exist;
+      expect(payload.fledgeEnabled).to.exist.and.to.equal(bidderRequest.paapi.enabled);
+    });
+    it('Should send FLEDGE eligibility flag set to false when fledgeEnabled is not defined', function () {
+      let bidderRequest = {
+        'bidderCode': 'onetag',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+      };
+      let serverRequest = spec.buildRequests([bannerBid], bidderRequest);
+      const payload = JSON.parse(serverRequest.data);
+
+      expect(payload.fledgeEnabled).to.exist;
+      expect(payload.fledgeEnabled).to.exist.and.to.equal(false);
+    });
   });
   describe('interpretResponse', function () {
     const request = getBannerVideoRequest();
     const response = getBannerVideoResponse();
+    const fledgeResponse = getFledgeBannerResponse();
     const requestData = JSON.parse(request.data);
     it('Returns an array of valid server responses if response object is valid', function () {
       const interpretedResponse = spec.interpretResponse(response, request);
+      const fledgeInterpretedResponse = spec.interpretResponse(fledgeResponse, request);
       expect(interpretedResponse).to.be.an('array').that.is.not.empty;
+      expect(fledgeInterpretedResponse).to.be.an('object');
+      expect(fledgeInterpretedResponse.bids).to.satisfy(function (value) {
+        return value === null || Array.isArray(value);
+      });
+      expect(fledgeInterpretedResponse.paapi).to.be.an('array').that.is.not.empty;
       for (let i = 0; i < interpretedResponse.length; i++) {
         let dataItem = interpretedResponse[i];
         expect(dataItem).to.include.all.keys('requestId', 'cpm', 'width', 'height', 'ttl', 'creativeId', 'netRevenue', 'currency', 'meta', 'dealId');
@@ -423,6 +524,21 @@ describe('onetag', function () {
       const serverResponses = spec.interpretResponse('invalid_response', { data: '{}' });
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
+    it('Returns meta dsa field if dsa field is present in response', function () {
+      const dsaResponseObj = {
+        'behalf': 'Advertiser',
+        'paid': 'Advertiser',
+        'transparency': {
+          'domain': 'dsp1domain.com',
+          'params': [1, 2]
+        },
+        'adrender': 1
+      };
+      const responseWithDsa = {...response};
+      responseWithDsa.body.bids.forEach(bid => bid.dsa = {...dsaResponseObj});
+      const serverResponse = spec.interpretResponse(responseWithDsa, request);
+      serverResponse.forEach(bid => expect(bid.meta.dsa).to.deep.equals(dsaResponseObj));
+    });
   });
   describe('getUserSyncs', function () {
     const sync_endpoint = 'https://onetag-sys.com/usync/';
@@ -586,6 +702,24 @@ function getBannerVideoResponse() {
   };
 }
 
+function getFledgeBannerResponse() {
+  const bannerVideoResponse = getBannerVideoResponse();
+  bannerVideoResponse.body.fledgeAuctionConfigs = [
+    {
+      bidId: 'fledge',
+      config: {
+        seller: 'https://onetag-sys.com',
+        decisionLogicUrl:
+          'https://onetag-sys.com/paapi/decision_logic.js',
+        interestGroupBuyers: [
+          'https://onetag-sys.com'
+        ],
+      }
+    }
+  ]
+  return bannerVideoResponse;
+}
+
 function getBannerVideoRequest() {
   return {
     data: JSON.stringify({
diff --git a/test/spec/modules/onomagicBidAdapter_spec.js b/test/spec/modules/onomagicBidAdapter_spec.js
index 6ddc0edd477..c636542c9c9 100644
--- a/test/spec/modules/onomagicBidAdapter_spec.js
+++ b/test/spec/modules/onomagicBidAdapter_spec.js
@@ -92,9 +92,9 @@ describe('onomagicBidAdapter', function() {
     });
 
     it('should return false when require params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/ooloAnalyticsAdapter_spec.js b/test/spec/modules/ooloAnalyticsAdapter_spec.js
index 1224c3f0740..f5b3cebf307 100644
--- a/test/spec/modules/ooloAnalyticsAdapter_spec.js
+++ b/test/spec/modules/ooloAnalyticsAdapter_spec.js
@@ -1,7 +1,7 @@
 import ooloAnalytics, { PAGEVIEW_ID } from 'modules/ooloAnalyticsAdapter.js';
 import {expect} from 'chai';
 import {server} from 'test/mocks/xhr.js';
-import constants from 'src/constants.json'
+import { EVENTS } from 'src/constants.js'
 import * as events from 'src/events'
 import { config } from 'src/config';
 import { buildAuctionData, generatePageViewId } from 'modules/ooloAnalyticsAdapter';
@@ -151,12 +151,12 @@ const bidWon = {
 }
 
 function simulateAuction () {
-  events.emit(constants.EVENTS.AUCTION_INIT, auctionInit);
-  events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
-  events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
-  events.emit(constants.EVENTS.NO_BID, noBid);
-  events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
-  events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
+  events.emit(EVENTS.AUCTION_INIT, auctionInit);
+  events.emit(EVENTS.BID_REQUESTED, bidRequested);
+  events.emit(EVENTS.BID_RESPONSE, bidResponse);
+  events.emit(EVENTS.NO_BID, noBid);
+  events.emit(EVENTS.BID_TIMEOUT, bidTimeout);
+  events.emit(EVENTS.AUCTION_END, auctionEnd);
 }
 
 describe('oolo Prebid Analytic', () => {
@@ -321,16 +321,16 @@ describe('oolo Prebid Analytic', () => {
         }
       })
 
-      events.emit(constants.EVENTS.AUCTION_INIT, auctionInit);
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+      events.emit(EVENTS.AUCTION_INIT, auctionInit);
+      events.emit(EVENTS.BID_REQUESTED, bidRequested);
+      events.emit(EVENTS.BID_RESPONSE, bidResponse);
 
       // configuration returned in an arbitrary moment
       server.requests[0].respond(500)
 
-      events.emit(constants.EVENTS.NO_BID, noBid);
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
-      events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
+      events.emit(EVENTS.NO_BID, noBid);
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeout);
+      events.emit(EVENTS.AUCTION_END, auctionEnd);
 
       clock.tick(1500)
 
@@ -442,7 +442,7 @@ describe('oolo Prebid Analytic', () => {
 
       server.requests[0].respond(500)
       simulateAuction()
-      events.emit(constants.EVENTS.BID_WON, bidWon);
+      events.emit(EVENTS.BID_WON, bidWon);
       clock.tick(1500)
 
       // no bidWon
@@ -466,7 +466,7 @@ describe('oolo Prebid Analytic', () => {
       }))
 
       simulateAuction()
-      events.emit(constants.EVENTS.BID_WON, bidWon);
+      events.emit(EVENTS.BID_WON, bidWon);
       clock.tick(499)
 
       // no auction data
@@ -491,7 +491,7 @@ describe('oolo Prebid Analytic', () => {
       server.requests[0].respond(500)
       simulateAuction()
       clock.tick(1500)
-      events.emit(constants.EVENTS.BID_WON, bidWon);
+      events.emit(EVENTS.BID_WON, bidWon);
 
       expect(server.requests).to.have.length(5)
 
@@ -516,7 +516,7 @@ describe('oolo Prebid Analytic', () => {
       server.requests[0].respond(500)
       simulateAuction()
       clock.tick(1500)
-      events.emit(constants.EVENTS.AD_RENDER_FAILED, { bidId: 'abcdef', reason: 'exception' });
+      events.emit(EVENTS.AD_RENDER_FAILED, { bidId: 'abcdef', reason: 'exception' });
 
       expect(server.requests).to.have.length(5)
 
@@ -557,12 +557,12 @@ describe('oolo Prebid Analytic', () => {
         }
       }))
 
-      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit });
-      events.emit(constants.EVENTS.BID_REQUESTED, { ...bidRequested, bids: bidRequested.bids.map(b => { b.transactionId = '123'; return b }) });
-      events.emit(constants.EVENTS.NO_BID, { ...noBid, src: 'client' });
-      events.emit(constants.EVENTS.BID_RESPONSE, { ...bidResponse, adUrl: '...' });
-      events.emit(constants.EVENTS.AUCTION_END, { ...auctionEnd, winningBids: [] });
-      events.emit(constants.EVENTS.BID_WON, { ...bidWon, statusMessage: 'msg2' });
+      events.emit(EVENTS.AUCTION_INIT, { ...auctionInit });
+      events.emit(EVENTS.BID_REQUESTED, { ...bidRequested, bids: bidRequested.bids.map(b => { b.transactionId = '123'; return b }) });
+      events.emit(EVENTS.NO_BID, { ...noBid, src: 'client' });
+      events.emit(EVENTS.BID_RESPONSE, { ...bidResponse, adUrl: '...' });
+      events.emit(EVENTS.AUCTION_END, { ...auctionEnd, winningBids: [] });
+      events.emit(EVENTS.BID_WON, { ...bidWon, statusMessage: 'msg2' });
 
       clock.tick(1500)
 
@@ -596,12 +596,12 @@ describe('oolo Prebid Analytic', () => {
         }
       }))
 
-      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit, custom_1: true });
-      events.emit(constants.EVENTS.BID_REQUESTED, { ...bidRequested, bids: bidRequested.bids.map(b => { b.custom_2 = true; return b }) });
-      events.emit(constants.EVENTS.NO_BID, { ...noBid, custom_3: true });
-      events.emit(constants.EVENTS.BID_RESPONSE, { ...bidResponse, custom_4: true });
-      events.emit(constants.EVENTS.AUCTION_END, { ...auctionEnd });
-      events.emit(constants.EVENTS.BID_WON, { ...bidWon, custom_5: true });
+      events.emit(EVENTS.AUCTION_INIT, { ...auctionInit, custom_1: true });
+      events.emit(EVENTS.BID_REQUESTED, { ...bidRequested, bids: bidRequested.bids.map(b => { b.custom_2 = true; return b }) });
+      events.emit(EVENTS.NO_BID, { ...noBid, custom_3: true });
+      events.emit(EVENTS.BID_RESPONSE, { ...bidResponse, custom_4: true });
+      events.emit(EVENTS.AUCTION_END, { ...auctionEnd });
+      events.emit(EVENTS.BID_WON, { ...bidWon, custom_5: true });
 
       clock.tick(1500)
 
@@ -633,7 +633,7 @@ describe('oolo Prebid Analytic', () => {
         }
       }))
 
-      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit, custom_1: true });
+      events.emit(EVENTS.AUCTION_INIT, { ...auctionInit, custom_1: true });
 
       clock.tick(1500)
 
@@ -661,7 +661,7 @@ describe('oolo Prebid Analytic', () => {
         }
       }))
 
-      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit });
+      events.emit(EVENTS.AUCTION_INIT, { ...auctionInit });
 
       expect(server.requests[3].url).to.equal('https://pbjs.com/')
     })
@@ -686,8 +686,8 @@ describe('oolo Prebid Analytic', () => {
         }
       }))
 
-      events.emit(constants.EVENTS.AUCTION_INIT, auctionInit)
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
+      events.emit(EVENTS.AUCTION_INIT, auctionInit)
+      events.emit(EVENTS.BID_REQUESTED, bidRequested);
 
       const request = JSON.parse(server.requests[3].requestBody)
 
diff --git a/test/spec/modules/openwebBidAdapter_spec.js b/test/spec/modules/openwebBidAdapter_spec.js
index c515c21690a..f6f6ad22476 100644
--- a/test/spec/modules/openwebBidAdapter_spec.js
+++ b/test/spec/modules/openwebBidAdapter_spec.js
@@ -2,386 +2,627 @@ import { expect } from 'chai';
 import { spec } from 'modules/openwebBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { config } from 'src/config.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import * as utils from 'src/utils.js';
 
-const DEFAULT_ADATPER_REQ = { bidderCode: 'openweb' };
-const DISPLAY_REQUEST = {
-  'bidder': 'openweb',
-  'params': {
-    'aid': 12345
-  },
-  'schain': { ver: 1 },
-  'userId': { criteo: 2 },
-  'mediaTypes': { 'banner': { 'sizes': [300, 250] } },
-  'bidderRequestId': '7101db09af0db2',
-  'auctionId': '2e41f65424c87c',
-  'adUnitCode': 'adunit-code',
-  'bidId': '84ab500420319d',
-};
-
-const VIDEO_REQUEST = {
-  'bidder': 'openweb',
-  'mediaTypes': {
-    'video': {
-      'playerSize': [[480, 360], [640, 480]]
-    }
-  },
-  'params': {
-    'aid': 12345
-  },
-  'bidderRequestId': '7101db09af0db2',
-  'auctionId': '2e41f65424c87c',
-  'adUnitCode': 'adunit-code',
-  'bidId': '84ab500420319d'
-};
-
-const ADPOD_REQUEST = {
-  'bidder': 'openweb',
-  'mediaTypes': {
-    'video': {
-      'context': 'adpod',
-      'playerSize': [[640, 480]],
-      'anyField': 10
-    }
-  },
-  'params': {
-    'aid': 12345
-  },
-  'bidderRequestId': '7101db09af0db2',
-  'auctionId': '2e41f65424c87c',
-  'adUnitCode': 'adunit-code',
-  'bidId': '2e41f65424c87c'
-};
-
-const SERVER_VIDEO_RESPONSE = {
-  'source': { 'aid': 12345, 'pubId': 54321 },
-  'bids': [{
-    'vastUrl': 'vastUrl',
-    'requestId': '2e41f65424c87c',
-    'url': '44F2AEB9BFC881B3',
-    'creative_id': 342516,
-    'durationSeconds': 30,
-    'cmpId': 342516,
-    'height': 480,
-    'cur': 'USD',
-    'width': 640,
-    'cpm': 0.9,
-    'adomain': ['a.com']
-  }]
-};
-const SERVER_OUSTREAM_VIDEO_RESPONSE = SERVER_VIDEO_RESPONSE;
-const SERVER_DISPLAY_RESPONSE = {
-  'source': { 'aid': 12345, 'pubId': 54321 },
-  'bids': [{
-    'ad': '',
-    'adUrl': 'adUrl',
-    'requestId': '2e41f65424c87c',
-    'creative_id': 342516,
-    'cmpId': 342516,
-    'height': 250,
-    'cur': 'USD',
-    'width': 300,
-    'cpm': 0.9
-  }],
-  'cookieURLs': ['link1', 'link2']
-};
-const SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS = {
-  'source': { 'aid': 12345, 'pubId': 54321 },
-  'bids': [{
-    'ad': '',
-    'requestId': '2e41f65424c87c',
-    'creative_id': 342516,
-    'cmpId': 342516,
-    'height': 250,
-    'cur': 'USD',
-    'width': 300,
-    'cpm': 0.9
-  }],
-  'cookieURLs': ['link3', 'link4'],
-  'cookieURLSTypes': ['image', 'iframe']
-};
-
-const videoBidderRequest = {
-  bidderCode: 'bidderCode',
-  bids: [{ mediaTypes: { video: {} }, bidId: '2e41f65424c87c' }]
-};
-
-const displayBidderRequest = {
-  bidderCode: 'bidderCode',
-  bids: [{ bidId: '2e41f65424c87c' }]
-};
-
-const displayBidderRequestWithConsents = {
-  bidderCode: 'bidderCode',
-  bids: [{ bidId: '2e41f65424c87c' }],
-  gdprConsent: {
-    gdprApplies: true,
-    consentString: 'test'
-  },
-  uspConsent: 'iHaveIt'
-};
-
-const videoEqResponse = [{
-  vastUrl: 'vastUrl',
-  requestId: '2e41f65424c87c',
-  creativeId: 342516,
-  mediaType: 'video',
-  netRevenue: true,
-  currency: 'USD',
-  height: 480,
-  width: 640,
-  ttl: 300,
-  cpm: 0.9,
-  meta: {
-    advertiserDomains: ['a.com']
-  }
-}];
-
-const displayEqResponse = [{
-  requestId: '2e41f65424c87c',
-  creativeId: 342516,
-  mediaType: 'banner',
-  netRevenue: true,
-  currency: 'USD',
-  ad: '',
-  adUrl: 'adUrl',
-  height: 250,
-  width: 300,
-  ttl: 300,
-  cpm: 0.9,
-  meta: {
-    advertiserDomains: []
-  }
-
-}];
-
-describe('openwebBidAdapter', () => {
+const ENDPOINT = 'https://hb.openwebmp.com/hb-multi';
+const TEST_ENDPOINT = 'https://hb.openwebmp.com/hb-multi-test';
+const TTL = 360;
+/* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
+
+describe('openwebAdapter', function () {
   const adapter = newBidder(spec);
-  describe('inherited functions', () => {
-    it('exists and is a function', () => {
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
   });
 
-  describe('user syncs', () => {
-    describe('as image', () => {
-      it('should be returned if pixel enabled', () => {
-        const syncs = spec.getUserSyncs({ pixelEnabled: true }, [{ body: SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS }]);
+  describe('isBidRequestValid', function () {
+    const bid = {
+      'bidder': spec.code,
+      'adUnitCode': 'adunit-code',
+      'sizes': [['640', '480']],
+      'params': {
+        'org': 'jdye8weeyirk00000001',
+        'placementId': '123'
+      }
+    };
+
+    it('should return true when required params are passed', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
 
-        expect(syncs.map(s => s.url)).to.deep.equal([SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS.cookieURLs[0]]);
-        expect(syncs.map(s => s.type)).to.deep.equal(['image']);
-      })
-    })
+    it('should return false when org param is not found', function () {
+      const newBid = Object.assign({}, bid);
+      delete newBid.params;
+      newBid.params = {
+        'org': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
 
-    describe('as iframe', () => {
-      it('should be returned if iframe enabled', () => {
-        const syncs = spec.getUserSyncs({ iframeEnabled: true }, [{ body: SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS }]);
+    it('should return false when placementId param is not found', function () {
+      const newBid = Object.assign({}, bid);
+      delete newBid.params;
+      newBid.params = {
+        'placementId': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
+  });
 
-        expect(syncs.map(s => s.url)).to.deep.equal([SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS.cookieURLs[1]]);
-        expect(syncs.map(s => s.type)).to.deep.equal(['iframe']);
-      })
-    })
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001',
+          'placementId': '123'
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 1,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'video': {
+            'playerSize': [[640, 480]],
+            'context': 'instream',
+            'plcmt': 1
+          }
+        },
+        'vastXml': '"..."'
+      },
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 1,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'banner': {
+          }
+        },
+        'ad': '""'
+      }
+    ];
+
+    const testModeBidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001',
+          'testMode': true
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 2,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'openweb',
+    }
+    const api = [1, 2];
+    const mimes = ['application/javascript', 'video/mp4', 'video/quicktime'];
+    const protocols = [2, 3, 5, 6];
 
-    describe('user sync', () => {
-      it('should not  be returned if passed syncs where already used', () => {
-        const syncs = spec.getUserSyncs({
-          iframeEnabled: true,
-          pixelEnabled: true
-        }, [{ body: SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS }]);
+    it('sends the placementId to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].placementId).to.equal('123');
+    });
 
-        expect(syncs).to.deep.equal([]);
-      })
+    it('sends the plcmt to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].plcmt).to.equal(1);
+    });
 
-      it('should not be returned if pixel not set', () => {
-        const syncs = spec.getUserSyncs({}, [{ body: SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS }]);
+    it('sends the is_wrapper parameter to ENDPOINT via POST', function() {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('is_wrapper');
+      expect(request.data.params.is_wrapper).to.equal(false);
+    });
 
-        expect(syncs).to.be.empty;
-      });
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
     });
-    describe('user syncs with both types', () => {
-      it('should be returned if pixel and iframe enabled', () => {
-        const mockedServerResponse = Object.assign({}, SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS, { 'cookieURLs': ['link5', 'link6'] });
-        const syncs = spec.getUserSyncs({
-          iframeEnabled: true,
-          pixelEnabled: true
-        }, [{ body: mockedServerResponse }]);
 
-        expect(syncs.map(s => s.url)).to.deep.equal(mockedServerResponse.cookieURLs);
-        expect(syncs.map(s => s.type)).to.deep.equal(mockedServerResponse.cookieURLSTypes);
-      });
+    it('sends bid request to TEST ENDPOINT via POST', function () {
+      const request = spec.buildRequests(testModeBidRequests, bidderRequest);
+      expect(request.url).to.equal(TEST_ENDPOINT);
+      expect(request.method).to.equal('POST');
     });
-  });
 
-  describe('isBidRequestValid', () => {
-    it('should return true when required params found', () => {
-      expect(spec.isBidRequestValid(VIDEO_REQUEST)).to.equal(true);
+    it('should send the correct bid Id', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].bidId).to.equal('299ffc8cca0b87');
     });
 
-    it('should return false when required params are not passed', () => {
-      let bid = Object.assign({}, VIDEO_REQUEST);
-      delete bid.params;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    it('should send the correct supported api array', function () {
+      bidRequests[0].mediaTypes.video.api = api;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].api).to.be.an('array');
+      expect(request.data.bids[0].api).to.eql([1, 2]);
     });
-  });
 
-  describe('buildRequests', () => {
-    let videoBidRequests = [VIDEO_REQUEST];
-    let displayBidRequests = [DISPLAY_REQUEST];
-    let videoAndDisplayBidRequests = [DISPLAY_REQUEST, VIDEO_REQUEST];
-    const displayRequest = spec.buildRequests(displayBidRequests, DEFAULT_ADATPER_REQ);
-    const videoRequest = spec.buildRequests(videoBidRequests, DEFAULT_ADATPER_REQ);
-    const videoAndDisplayRequests = spec.buildRequests(videoAndDisplayBidRequests, DEFAULT_ADATPER_REQ);
-
-    it('building requests as arrays', () => {
-      expect(videoRequest).to.be.a('array');
-      expect(displayRequest).to.be.a('array');
-      expect(videoAndDisplayRequests).to.be.a('array');
-    })
+    it('should send the correct mimes array', function () {
+      bidRequests[1].mediaTypes.banner.mimes = mimes;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[1].mimes).to.be.an('array');
+      expect(request.data.bids[1].mimes).to.eql(['application/javascript', 'video/mp4', 'video/quicktime']);
+    });
 
-    it('sending as POST', () => {
-      const postActionMethod = 'POST'
-      const comparator = br => br.method === postActionMethod;
-      expect(videoRequest.every(comparator)).to.be.true;
-      expect(displayRequest.every(comparator)).to.be.true;
-      expect(videoAndDisplayRequests.every(comparator)).to.be.true;
-    });
-    it('forms correct ADPOD request', () => {
-      const pbBidReqData = spec.buildRequests([ADPOD_REQUEST], DEFAULT_ADATPER_REQ)[0].data;
-      const impRequest = pbBidReqData.BidRequests[0]
-      expect(impRequest.AdType).to.be.equal('video');
-      expect(impRequest.Adpod).to.be.a('object');
-      expect(impRequest.Adpod.anyField).to.be.equal(10);
-    })
-    it('sends correct video bid parameters', () => {
-      const data = videoRequest[0].data;
-
-      const eq = {
-        CallbackId: '84ab500420319d',
-        AdType: 'video',
-        Aid: 12345,
-        Sizes: '480x360,640x480',
-        PlacementId: 'adunit-code'
-      };
-      expect(data.BidRequests[0]).to.deep.equal(eq);
+    it('should send the correct protocols array', function () {
+      bidRequests[0].mediaTypes.video.protocols = protocols;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].protocols).to.be.an('array');
+      expect(request.data.bids[0].protocols).to.eql([2, 3, 5, 6]);
     });
 
-    it('sends correct display bid parameters', () => {
-      const data = displayRequest[0].data;
+    it('should send the correct sizes array', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].sizes).to.be.an('array');
+      expect(request.data.bids[0].sizes).to.equal(bidRequests[0].sizes)
+      expect(request.data.bids[1].sizes).to.be.an('array');
+      expect(request.data.bids[1].sizes).to.equal(bidRequests[1].sizes)
+    });
 
-      const eq = {
-        CallbackId: '84ab500420319d',
-        AdType: 'display',
-        Aid: 12345,
-        Sizes: '300x250',
-        PlacementId: 'adunit-code'
-      };
+    it('should send the correct media type', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].mediaType).to.equal(VIDEO)
+      expect(request.data.bids[1].mediaType).to.equal(BANNER)
+    });
 
-      expect(data.BidRequests[0]).to.deep.equal(eq);
-    });
-
-    it('sends correct video and display bid parameters', () => {
-      const bidRequests = videoAndDisplayRequests[0].data;
-      const expectedBidReqs = [{
-        CallbackId: '84ab500420319d',
-        AdType: 'display',
-        Aid: 12345,
-        Sizes: '300x250',
-        PlacementId: 'adunit-code'
-      }, {
-        CallbackId: '84ab500420319d',
-        AdType: 'video',
-        Aid: 12345,
-        Sizes: '480x360,640x480',
-        PlacementId: 'adunit-code'
-      }]
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
 
-      expect(bidRequests.BidRequests).to.deep.equal(expectedBidReqs);
+    it('should respect "iframe" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            iframe: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
     });
 
-    describe('publisher environment', () => {
-      const sandbox = sinon.sandbox.create();
-      sandbox.stub(config, 'getConfig').callsFake((key) => {
-        const config = {
-          'coppa': true
-        };
-        return config[key];
+    it('should respect "all" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            all: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
       });
-      const bidRequestWithPubSettingsData = spec.buildRequests([DISPLAY_REQUEST], displayBidderRequestWithConsents)[0].data;
-      sandbox.restore();
-      it('sets GDPR', () => {
-        expect(bidRequestWithPubSettingsData.GDPR).to.be.equal(1);
-        expect(bidRequestWithPubSettingsData.GDPRConsent).to.be.equal(displayBidderRequestWithConsents.gdprConsent.consentString);
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should send the pixel user sync param if userSync is enabled and no "iframe" or "all" configs are present', function () {
+      config.resetConfig();
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+        }
       });
-      it('sets USP', () => {
-        expect(bidRequestWithPubSettingsData.USP).to.be.equal(displayBidderRequestWithConsents.uspConsent);
-      })
-      it('sets Coppa', () => {
-        expect(bidRequestWithPubSettingsData.Coppa).to.be.equal(1);
-      })
-      it('sets Schain', () => {
-        expect(bidRequestWithPubSettingsData.Schain).to.be.deep.equal(DISPLAY_REQUEST.schain);
-      })
-      it('sets UserId\'s', () => {
-        expect(bidRequestWithPubSettingsData.UserIds).to.be.deep.equal(DISPLAY_REQUEST.userId);
-      })
-    })
-  });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'pixel');
+    });
 
-  describe('interpretResponse', () => {
-    let serverResponse;
-    let adapterRequest;
-    let eqResponse;
+    it('should respect total exclusion', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            image: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            },
+            iframe: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
 
-    afterEach(() => {
-      serverResponse = null;
-      adapterRequest = null;
-      eqResponse = null;
+    it('should have us_privacy param if usPrivacy is available in the bidRequest', function () {
+      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('us_privacy', '1YNN');
     });
 
-    it('should get correct video bid response', () => {
-      serverResponse = SERVER_VIDEO_RESPONSE;
-      adapterRequest = videoBidderRequest;
-      eqResponse = videoEqResponse;
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('us_privacy');
+    });
 
-      bidServerResponseCheck();
+    it('should not send the gdpr param if gdprApplies is false in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: false}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gdpr');
+      expect(request.data.params).to.not.have.property('gdpr_consent');
     });
 
-    it('should get correct display bid response', () => {
-      serverResponse = SERVER_DISPLAY_RESPONSE;
-      adapterRequest = displayBidderRequest;
-      eqResponse = displayEqResponse;
+    it('should send the gdpr param if gdprApplies is true in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: true, consentString: 'test-consent-string'}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gdpr', true);
+      expect(request.data.params).to.have.property('gdpr_consent', 'test-consent-string');
+    });
 
-      bidServerResponseCheck();
+    it('should not send the gpp param if gppConsent is false in the bidRequest', function () {
+      const bidderRequestWithGPP = Object.assign({gppConsent: false}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGPP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gpp');
+      expect(request.data.params).to.not.have.property('gpp_sid');
     });
 
-    function bidServerResponseCheck() {
-      const result = spec.interpretResponse({ body: serverResponse }, { adapterRequest });
+    it('should send the gpp param if gppConsent is true in the bidRequest', function () {
+      const bidderRequestWithGPP = Object.assign({gppConsent: {gppString: 'test-consent-string', applicableSections: [7]}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGPP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gpp', 'test-consent-string');
+      expect(request.data.params.gpp_sid[0]).to.be.equal(7);
+    });
 
-      expect(result).to.deep.equal(eqResponse);
-    }
+    it('should have schain param if it is available in the bidRequest', () => {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
+      };
+      bidRequests[0].schain = schain;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('schain', '1.0,1!indirectseller.com,00001,1,,,');
+    });
+
+    it('should set flooPrice to getFloor.floor value if it is greater than params.floorPrice', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.32
+        }
+      }
+      bid.params.floorPrice = 0.64;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 3.32);
+    });
 
-    function nobidServerResponseCheck() {
-      const noBidServerResponse = { bids: [] };
-      const noBidResult = spec.interpretResponse({ body: noBidServerResponse }, { adapterRequest });
+    it('should set floorPrice to params.floorPrice value if it is greater than getFloor.floor', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 0.8
+        }
+      }
+      bid.params.floorPrice = 1.5;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 1.5);
+    });
 
-      expect(noBidResult.length).to.equal(0);
-    }
+    it('should check sua param in bid request', function() {
+      const sua = {
+        'platform': {
+          'brand': 'macOS',
+          'version': ['12', '4', '0']
+        },
+        'browsers': [
+          {
+            'brand': 'Chromium',
+            'version': [ '106', '0', '5249', '119' ]
+          },
+          {
+            'brand': 'Google Chrome',
+            'version': [ '106', '0', '5249', '119' ]
+          },
+          {
+            'brand': 'Not;A=Brand',
+            'version': [ '99', '0', '0', '0' ]
+          }
+        ],
+        'mobile': 0,
+        'model': '',
+        'bitness': '64',
+        'architecture': 'x86'
+      }
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.ortb2 = {
+        'device': {
+          'sua': {
+            'platform': {
+              'brand': 'macOS',
+              'version': [ '12', '4', '0' ]
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '106', '0', '5249', '119' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '106', '0', '5249', '119' ]
+              },
+              {
+                'brand': 'Not;A=Brand',
+                'version': [ '99', '0', '0', '0' ]
+              }
+            ],
+            'mobile': 0,
+            'model': '',
+            'bitness': '64',
+            'architecture': 'x86'
+          }
+        }
+      }
+      const requestWithSua = spec.buildRequests([bid], bidderRequest);
+      const data = requestWithSua.data;
+      expect(data.bids[0].sua).to.exist;
+      expect(data.bids[0].sua).to.deep.equal(sua);
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].sua).to.not.exist;
+    });
+
+    describe('COPPA Param', function() {
+      it('should set coppa equal 0 in bid request if coppa is set to false', function() {
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request.data.bids[0].coppa).to.be.equal(0);
+      });
+
+      it('should set coppa equal 1 in bid request if coppa is set to true', function() {
+        const bid = utils.deepClone(bidRequests[0]);
+        bid.ortb2 = {
+          'regs': {
+            'coppa': true,
+          }
+        };
+        const request = spec.buildRequests([bid], bidderRequest);
+        expect(request.data.bids[0].coppa).to.be.equal(1);
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      params: {
+        currency: 'USD',
+        netRevenue: true,
+      },
+      bids: [{
+        cpm: 12.5,
+        vastXml: '',
+        width: 640,
+        height: 480,
+        requestId: '21e12606d47ba7',
+        creativeId: 'creative-id-1',
+        nurl: 'http://example.com/win/1234',
+        adomain: ['abc.com'],
+        mediaType: VIDEO
+      },
+      {
+        cpm: 12.5,
+        ad: '""',
+        width: 300,
+        height: 250,
+        requestId: '21e12606d47ba7',
+        creativeId: 'creative-id-2',
+        nurl: 'http://example.com/win/1234',
+        adomain: ['abc.com'],
+        mediaType: BANNER
+      }]
+    };
+
+    const expectedVideoResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 640,
+      height: 480,
+      ttl: TTL,
+      creativeId: 'creative-id-1',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: VIDEO,
+      meta: {
+        mediaType: VIDEO,
+        advertiserDomains: ['abc.com']
+      },
+      vastXml: '',
+    };
+
+    const expectedBannerResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 300,
+      height: 250,
+      ttl: TTL,
+      creativeId: 'creative-id-2',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: BANNER,
+      meta: {
+        mediaType: BANNER,
+        advertiserDomains: ['abc.com']
+      },
+      ad: '""'
+    };
+
+    it('should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[0]).to.deep.equal(expectedVideoResponse);
+      expect(result[1]).to.deep.equal(expectedBannerResponse);
+    });
+
+    it('video type should have vastXml key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[0].vastXml).to.equal(expectedVideoResponse.vastXml)
+    });
+
+    it('banner type should have ad key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[1].ad).to.equal(expectedBannerResponse.ad)
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        params: {
+          userSyncPixels: [
+            'https://image-sync-url.test/1',
+            'https://image-sync-url.test/2',
+            'https://image-sync-url.test/3'
+          ]
+        }
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        params: {
+          userSyncURL: 'https://iframe-sync-url.test'
+        }
+      }
+    };
+
+    it('should register all img urls from the response', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
 
-    it('handles video nobid responses', () => {
-      adapterRequest = videoBidderRequest;
+    it('should register the iframe url from the response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [iframeSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        }
+      ]);
+    });
 
-      nobidServerResponseCheck();
+    it('should register both image and iframe urls from the responses', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, [iframeSyncResponse, imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
     });
 
-    it('handles display nobid responses', () => {
-      adapterRequest = displayBidderRequest;
+    it('should handle an empty response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, []);
+      expect(syncs).to.deep.equal([]);
+    });
 
-      nobidServerResponseCheck();
+    it('should handle when user syncs are disabled', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: false }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([]);
     });
+  })
 
-    it('forms correct ADPOD response', () => {
-      const videoBids = spec.interpretResponse({ body: SERVER_VIDEO_RESPONSE }, { adapterRequest: { bids: [ADPOD_REQUEST] } });
-      expect(videoBids[0].video.durationSeconds).to.be.equal(30);
-      expect(videoBids[0].video.context).to.be.equal('adpod');
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should trigger pixel if bid nurl', function() {
+      const bid = {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [['640', '480']],
+        'nurl': 'http://example.com/win/1234',
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        }
+      };
+
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.callCount).to.equal(1)
     })
-  });
+  })
 });
diff --git a/test/spec/modules/openxBidAdapter_spec.js b/test/spec/modules/openxBidAdapter_spec.js
index f2cff7f470c..5dc60b25ab0 100644
--- a/test/spec/modules/openxBidAdapter_spec.js
+++ b/test/spec/modules/openxBidAdapter_spec.js
@@ -10,13 +10,15 @@ import 'modules/currency.js';
 import 'modules/userId/index.js';
 import 'modules/multibid/index.js';
 import 'modules/priceFloors.js';
-import 'modules/consentManagement.js';
+import 'modules/consentManagementTcf.js';
 import 'modules/consentManagementUsp.js';
 import 'modules/schain.js';
+import 'modules/paapi.js';
+
 import {deepClone} from 'src/utils.js';
+import {version} from 'package.json';
 import {syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
 import {hook} from '../../../src/hook.js';
-
 const DEFAULT_SYNC = SYNC_URL + '?ph=' + DEFAULT_PH;
 
 const BidRequestBuilder = function BidRequestBuilder(options) {
@@ -186,9 +188,9 @@ describe('OpenxRtbAdapter', function () {
         });
 
         it('should return false when required params are not passed', function () {
-          let videoBidWithMediaTypes = Object.assign({}, videoBidWithMediaTypes);
-          videoBidWithMediaTypes.params = {};
-          expect(spec.isBidRequestValid(videoBidWithMediaTypes)).to.equal(false);
+          let invalidVideoBidWithMediaTypes = Object.assign({}, videoBidWithMediaTypes);
+          invalidVideoBidWithMediaTypes.params = {};
+          expect(spec.isBidRequestValid(invalidVideoBidWithMediaTypes)).to.equal(false);
         });
       });
       describe('and request config uses both delDomain and platform', () => {
@@ -215,9 +217,9 @@ describe('OpenxRtbAdapter', function () {
         });
 
         it('should return false when required params are not passed', function () {
-          let videoBidWithMediaTypes = Object.assign({}, videoBidWithDelDomainAndPlatform);
-          videoBidWithMediaTypes.params = {};
-          expect(spec.isBidRequestValid(videoBidWithMediaTypes)).to.equal(false);
+          let invalidVideoBidWithMediaTypes = Object.assign({}, videoBidWithDelDomainAndPlatform);
+          invalidVideoBidWithMediaTypes.params = {};
+          expect(spec.isBidRequestValid(invalidVideoBidWithMediaTypes)).to.equal(false);
         });
       });
       describe('and request config uses mediaType', () => {
@@ -240,10 +242,10 @@ describe('OpenxRtbAdapter', function () {
         });
 
         it('should return false when required params are not passed', function () {
-          let videoBidWithMediaType = Object.assign({}, videoBidWithMediaType);
-          delete videoBidWithMediaType.params;
-          videoBidWithMediaType.params = {};
-          expect(spec.isBidRequestValid(videoBidWithMediaType)).to.equal(false);
+          let invalidVideoBidWithMediaType = Object.assign({}, videoBidWithMediaType);
+          delete invalidVideoBidWithMediaType.params;
+          invalidVideoBidWithMediaType.params = {};
+          expect(spec.isBidRequestValid(invalidVideoBidWithMediaType)).to.equal(false);
         });
       });
     });
@@ -316,6 +318,7 @@ describe('OpenxRtbAdapter', function () {
         const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
         expect(request[0].url).to.equal(REQUEST_URL);
         expect(request[0].method).to.equal('POST');
+        expect(request[0].data.ext.pv).to.equal(version);
       });
 
       it('should send delivery domain, if available', function () {
@@ -969,7 +972,7 @@ describe('OpenxRtbAdapter', function () {
       });
 
       context('when there are userid providers', function () {
-        const userIdAsEids = [
+        const eids = [
           {
             source: 'adserver.org',
             uids: [{
@@ -1000,14 +1003,12 @@ describe('OpenxRtbAdapter', function () {
         ];
 
         it(`should send the user id under the extended ids`, function () {
-          const bidRequestsWithUserId = [{
+          const bidRequests = [{
             bidder: 'openx',
             params: {
               unit: '11',
               delDomain: 'test-del-domain'
             },
-            userId: {
-            },
             adUnitCode: 'adunit-code',
             mediaTypes: {
               banner: {
@@ -1017,12 +1018,12 @@ describe('OpenxRtbAdapter', function () {
             bidId: 'test-bid-id-1',
             bidderRequestId: 'test-bid-request-1',
             auctionId: 'test-auction-1',
-            userIdAsEids: userIdAsEids
           }];
           // enrich bid request with userId key/value
 
-          const request = spec.buildRequests(bidRequestsWithUserId, mockBidderRequest);
-          expect(request[0].data.user.ext.eids).to.equal(userIdAsEids);
+          mockBidderRequest.ortb2 = {user: {ext: {eids}}}
+          const request = spec.buildRequests(bidRequests, mockBidderRequest);
+          expect(request[0].data.user.ext.eids).to.eql(eids);
         });
 
         it(`when no user ids are available, it should not send any extended ids`, function () {
@@ -1035,7 +1036,9 @@ describe('OpenxRtbAdapter', function () {
         it('when FLEDGE is enabled, should send whatever is set in ortb2imp.ext.ae in all bid requests', function () {
           const request = spec.buildRequests(bidRequestsWithMediaTypes, {
             ...mockBidderRequest,
-            fledgeEnabled: true
+            paapi: {
+              enabled: true
+            }
           });
           expect(request[0].data.imp[0].ext.ae).to.equal(2);
         });
@@ -1085,7 +1088,6 @@ describe('OpenxRtbAdapter', function () {
             skipafter: 4,
             minduration: 10,
             maxduration: 30,
-            placement: 4,
             protocols: [8],
             w: 300,
             h: 250
@@ -1105,7 +1107,7 @@ describe('OpenxRtbAdapter', function () {
     let bid;
 
     context('when there is an nbr response', function () {
-      let bids;
+      let response;
       beforeEach(function () {
         bidRequestConfigs = [{
           bidder: 'openx',
@@ -1127,16 +1129,16 @@ describe('OpenxRtbAdapter', function () {
         bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
 
         bidResponse = {nbr: 0}; // Unknown error
-        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+        response = spec.interpretResponse({body: bidResponse}, bidRequest);
       });
 
       it('should not return any bids', function () {
-        expect(bids.length).to.equal(0);
+        expect(response.bids.length).to.equal(0);
       });
     });
 
     context('when no seatbid in response', function () {
-      let bids;
+      let response;
       beforeEach(function () {
         bidRequestConfigs = [{
           bidder: 'openx',
@@ -1158,16 +1160,16 @@ describe('OpenxRtbAdapter', function () {
         bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
 
         bidResponse = {ext: {}, id: 'test-bid-id'};
-        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+        response = spec.interpretResponse({body: bidResponse}, bidRequest);
       });
 
       it('should not return any bids', function () {
-        expect(bids.length).to.equal(0);
+        expect(response.bids.length).to.equal(0);
       });
     });
 
     context('when there is no response', function () {
-      let bids;
+      let response;
       beforeEach(function () {
         bidRequestConfigs = [{
           bidder: 'openx',
@@ -1189,11 +1191,11 @@ describe('OpenxRtbAdapter', function () {
         bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
 
         bidResponse = ''; // Unknown error
-        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+        response = spec.interpretResponse({body: bidResponse}, bidRequest);
       });
 
       it('should not return any bids', function () {
-        expect(bids.length).to.equal(0);
+        expect(response.bids.length).to.equal(0);
       });
     });
 
@@ -1228,19 +1230,11 @@ describe('OpenxRtbAdapter', function () {
           ext: {
             dsp_id: '123',
             buyer_id: '456',
-            brand_id: '789',
-            paf: {
-              content_id: 'paf_content_id'
-            }
+            brand_id: '789'
           }
         }]
       }],
-      cur: 'AUS',
-      ext: {
-        paf: {
-          transmission: {version: '12'}
-        }
-      }
+      cur: 'AUS'
     };
 
     context('when there is a response, the common response properties', function () {
@@ -1249,7 +1243,7 @@ describe('OpenxRtbAdapter', function () {
         bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
         bidResponse = deepClone(SAMPLE_BID_RESPONSE);
 
-        bid = spec.interpretResponse({body: bidResponse}, bidRequest)[0];
+        bid = spec.interpretResponse({body: bidResponse}, bidRequest).bids[0];
       });
 
       it('should return a price', function () {
@@ -1304,33 +1298,8 @@ describe('OpenxRtbAdapter', function () {
       it('should return adomain', function () {
         expect(bid.meta.advertiserDomains).to.equal(bidResponse.seatbid[0].bid[0].adomain);
       });
-
-      it('should return paf fields', function () {
-        const paf = {
-          transmission: {version: '12'},
-          content_id: 'paf_content_id'
-        }
-        expect(bid.meta.paf).to.deep.equal(paf);
-      });
     });
 
-    context('when there is more than one response', () => {
-      let bids;
-      beforeEach(function () {
-        bidRequestConfigs = deepClone(SAMPLE_BID_REQUESTS);
-        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
-        bidResponse = deepClone(SAMPLE_BID_RESPONSE);
-        bidResponse.seatbid[0].bid.push(deepClone(bidResponse.seatbid[0].bid[0]));
-        bidResponse.seatbid[0].bid[1].ext.paf.content_id = 'second_paf'
-
-        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
-      });
-
-      it('should not confuse paf content_id', () => {
-        expect(bids.map(b => b.meta.paf.content_id)).to.eql(['paf_content_id', 'second_paf']);
-      });
-    })
-
     context('when the response is a banner', function() {
       beforeEach(function () {
         bidRequestConfigs = [{
@@ -1367,7 +1336,7 @@ describe('OpenxRtbAdapter', function () {
           cur: 'AUS'
         };
 
-        bid = spec.interpretResponse({body: bidResponse}, bidRequest)[0];
+        bid = spec.interpretResponse({body: bidResponse}, bidRequest).bids[0];
       });
 
       it('should return the proper mediaType', function () {
@@ -1416,14 +1385,14 @@ describe('OpenxRtbAdapter', function () {
         });
 
         it('should return the proper mediaType', function () {
-          bid = spec.interpretResponse({body: bidResponse}, bidRequest)[0];
+          bid = spec.interpretResponse({body: bidResponse}, bidRequest).bids[0];
           expect(bid.mediaType).to.equal(Object.keys(bidRequestConfigs[0].mediaTypes)[0]);
         });
 
         it('should return the proper mediaType', function () {
           const winUrl = 'https//my.win.url';
           bidResponse.seatbid[0].bid[0].nurl = winUrl
-          bid = spec.interpretResponse({body: bidResponse}, bidRequest)[0];
+          bid = spec.interpretResponse({body: bidResponse}, bidRequest).bids[0];
 
           expect(bid.vastUrl).to.equal(winUrl);
         });
@@ -1502,10 +1471,30 @@ describe('OpenxRtbAdapter', function () {
 
       it('should return FLEDGE auction_configs alongside bids', function () {
         expect(response).to.have.property('bids');
-        expect(response).to.have.property('fledgeAuctionConfigs');
-        expect(response.fledgeAuctionConfigs.length).to.equal(1);
-        expect(response.fledgeAuctionConfigs[0].bidId).to.equal('test-bid-id');
+        expect(response).to.have.property('paapi');
+        expect(response.paapi.length).to.equal(1);
+        expect(response.paapi[0].bidId).to.equal('test-bid-id');
       });
+
+      it('should inject ortb2Imp in auctionSignals', function () {
+        const auctionConfig = response.paapi[0].config;
+        expect(auctionConfig).to.deep.include({
+          auctionSignals: {
+            ortb2Imp: {
+              id: 'test-bid-id',
+              tagid: '12345678',
+              banner: {
+                topframe: 0,
+                format: bidRequestConfigs[0].mediaTypes.banner.sizes.map(([w, h]) => ({w, h}))
+              },
+              ext: {
+                divid: 'adunit-code',
+              },
+              secure: 1
+            }
+          }
+        });
+      })
     });
   });
 
diff --git a/test/spec/modules/operaadsBidAdapter_spec.js b/test/spec/modules/operaadsBidAdapter_spec.js
index 37d4a2c7bc0..9a8981235d5 100644
--- a/test/spec/modules/operaadsBidAdapter_spec.js
+++ b/test/spec/modules/operaadsBidAdapter_spec.js
@@ -266,6 +266,95 @@ describe('Opera Ads Bid Adapter', function () {
       }
     });
 
+    describe('test fulfilling inventory information', function () {
+      const bidRequest = {
+        adUnitCode: 'test-div',
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidId: '22c4871113f461',
+        bidder: 'operaads',
+        bidderRequestId: '15246a574e859f',
+        mediaTypes: {
+          banner: {sizes: [[300, 250]]}
+        },
+        params: {
+          placementId: 's12345678',
+          publisherId: 'pub12345678',
+          endpointId: 'ep12345678'
+        }
+      }
+
+      const getRequest = function () {
+        let reqs;
+        expect(function () {
+          reqs = spec.buildRequests([bidRequest], bidderRequest);
+        }).to.not.throw();
+        return JSON.parse(reqs[0].data);
+      }
+
+      it('test default case', function () {
+        let requestData = getRequest();
+        expect(requestData.site).to.be.an('object');
+        expect(requestData.site.id).to.equal(bidRequest.params.publisherId);
+        expect(requestData.site.domain).to.not.be.empty;
+        expect(requestData.site.page).to.equal(bidderRequest.refererInfo.page);
+      });
+
+      it('test a case with site information specified', function () {
+        bidRequest.params = {
+          placementId: 's12345678',
+          publisherId: 'pub12345678',
+          endpointId: 'ep12345678',
+          site: {
+            name: 'test-site-1',
+            domain: 'www.test.com'
+          }
+        }
+        let requestData = getRequest();
+        expect(requestData.site).to.be.an('object');
+        expect(requestData.site.id).to.equal(bidRequest.params.publisherId);
+        expect(requestData.site.name).to.equal('test-site-1');
+        expect(requestData.site.domain).to.equal('www.test.com');
+        expect(requestData.site.page).to.equal(bidderRequest.refererInfo.page);
+      });
+
+      it('test a case with app information specified', function () {
+        bidRequest.params = {
+          placementId: 's12345678',
+          publisherId: 'pub12345678',
+          endpointId: 'ep12345678',
+          app: {
+            name: 'test-app-1'
+          }
+        }
+        let requestData = getRequest();
+        expect(requestData.app).to.be.an('object');
+        expect(requestData.app.id).to.equal(bidRequest.params.publisherId);
+        expect(requestData.app.name).to.equal('test-app-1');
+        expect(requestData.app.domain).to.not.be.empty;
+      });
+
+      it('test a case with both site and app information specified', function () {
+        bidRequest.params = {
+          placementId: 's12345678',
+          publisherId: 'pub12345678',
+          endpointId: 'ep12345678',
+          site: {
+            name: 'test-site-2',
+            page: 'test-page'
+          },
+          app: {
+            name: 'test-app-1'
+          }
+        }
+        let requestData = getRequest();
+        expect(requestData.site).to.be.an('object');
+        expect(requestData.site.id).to.equal(bidRequest.params.publisherId);
+        expect(requestData.site.name).to.equal('test-site-2');
+        expect(requestData.site.page).to.equal('test-page');
+        expect(requestData.site.domain).to.not.be.empty;
+      });
+    });
+
     it('test getBidFloor', function() {
       const bidRequests = [
         {
diff --git a/test/spec/modules/operaadsIdSystem_spec.js b/test/spec/modules/operaadsIdSystem_spec.js
index d81f643d62f..b6acb942331 100644
--- a/test/spec/modules/operaadsIdSystem_spec.js
+++ b/test/spec/modules/operaadsIdSystem_spec.js
@@ -1,53 +1,76 @@
 import { operaIdSubmodule } from 'modules/operaadsIdSystem'
 import * as ajaxLib from 'src/ajax.js'
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
 
 const TEST_ID = 'opera-test-id';
 const operaIdRemoteResponse = { uid: TEST_ID };
-
-describe('operaId submodule properties', () => {
-  it('should expose a "name" property equal to "operaId"', () => {
-    expect(operaIdSubmodule.name).to.equal('operaId');
+describe('operaads ID', () => {
+  describe('operaId submodule properties', () => {
+    it('should expose a "name" property equal to "operaId"', () => {
+      expect(operaIdSubmodule.name).to.equal('operaId');
+    });
   });
-});
 
-function fakeRequest(fn) {
-  const ajaxBuilderStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(() => {
-    return (url, cbObj) => {
-      cbObj.success(JSON.stringify(operaIdRemoteResponse));
-    }
-  });
-  fn();
-  ajaxBuilderStub.restore();
-}
+  function fakeRequest(fn) {
+    const ajaxBuilderStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(() => {
+      return (url, cbObj) => {
+        cbObj.success(JSON.stringify(operaIdRemoteResponse));
+      }
+    });
+    fn();
+    ajaxBuilderStub.restore();
+  }
 
-describe('operaId submodule getId', function() {
-  it('request to the fake server to correctly extract test ID', function() {
-    fakeRequest(() => {
-      const moduleIdCallbackResponse = operaIdSubmodule.getId({ params: { pid: 'pub123' } });
-      moduleIdCallbackResponse.callback((id) => {
-        expect(id).to.equal(operaIdRemoteResponse.operaId);
+  describe('operaId submodule getId', function() {
+    it('request to the fake server to correctly extract test ID', function() {
+      fakeRequest(() => {
+        const moduleIdCallbackResponse = operaIdSubmodule.getId({ params: { pid: 'pub123' } });
+        moduleIdCallbackResponse.callback((id) => {
+          expect(id).to.equal(operaIdRemoteResponse.operaId);
+        });
       });
     });
-  });
 
-  it('request to the fake server without publiser ID', function() {
-    fakeRequest(() => {
-      const moduleIdCallbackResponse = operaIdSubmodule.getId({ params: {} });
-      expect(moduleIdCallbackResponse).to.equal(undefined);
+    it('request to the fake server without publiser ID', function() {
+      fakeRequest(() => {
+        const moduleIdCallbackResponse = operaIdSubmodule.getId({ params: {} });
+        expect(moduleIdCallbackResponse).to.equal(undefined);
+      });
     });
   });
-});
 
-describe('operaId submodule decode', function() {
-  it('should respond with an object containing "operaId" as key with the value', () => {
-    expect(operaIdSubmodule.decode(TEST_ID)).to.deep.equal({
-      operaId: TEST_ID
+  describe('operaId submodule decode', function() {
+    it('should respond with an object containing "operaId" as key with the value', () => {
+      expect(operaIdSubmodule.decode(TEST_ID)).to.deep.equal({
+        operaId: TEST_ID
+      });
     });
-  });
 
-  it('should respond with undefined if the value is not a string or an empty string', () => {
-    [1, 2.0, null, undefined, NaN, [], {}].forEach((value) => {
-      expect(operaIdSubmodule.decode(value)).to.equal(undefined);
+    it('should respond with undefined if the value is not a string or an empty string', () => {
+      [1, 2.0, null, undefined, NaN, [], {}].forEach((value) => {
+        expect(operaIdSubmodule.decode(value)).to.equal(undefined);
+      });
     });
   });
-});
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(operaIdSubmodule);
+    });
+    it('operaId', function() {
+      const userId = {
+        operaId: 'some-random-id-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 't.adx.opera.com',
+        uids: [{
+          id: 'some-random-id-value',
+          atype: 1
+        }]
+      });
+    });
+  })
+})
diff --git a/test/spec/modules/opscoBidAdapter_spec.js b/test/spec/modules/opscoBidAdapter_spec.js
new file mode 100644
index 00000000000..38cacff8f82
--- /dev/null
+++ b/test/spec/modules/opscoBidAdapter_spec.js
@@ -0,0 +1,260 @@
+import {expect} from 'chai';
+import {spec} from 'modules/opscoBidAdapter';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+
+describe('opscoBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    const validBid = {
+      bidder: 'opsco',
+      params: {
+        placementId: '123',
+        publisherId: '456'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      }
+    };
+
+    it('should return true when required params are present', function () {
+      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    });
+
+    it('should return false when placementId is missing', function () {
+      const invalidBid = {...validBid};
+      delete invalidBid.params.placementId;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+
+    it('should return false when publisherId is missing', function () {
+      const invalidBid = {...validBid};
+      delete invalidBid.params.publisherId;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+
+    it('should return false when mediaTypes.banner.sizes is missing', function () {
+      const invalidBid = {...validBid};
+      delete invalidBid.mediaTypes.banner.sizes;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+
+    it('should return false when mediaTypes.banner is missing', function () {
+      const invalidBid = {...validBid};
+      delete invalidBid.mediaTypes.banner;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+
+    it('should return false when bid params are missing', function () {
+      const invalidBid = {bidder: 'opsco'};
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+
+    it('should return false when bid params are empty', function () {
+      const invalidBid = {bidder: 'opsco', params: {}};
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let validBid, bidderRequest;
+
+    beforeEach(function () {
+      validBid = {
+        bidder: 'opsco',
+        params: {
+          placementId: '123',
+          publisherId: '456'
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        }
+      };
+
+      bidderRequest = {
+        bidderRequestId: 'bid123',
+        refererInfo: {
+          domain: 'example.com',
+          page: 'https://example.com/page',
+          ref: 'https://referrer.com'
+        },
+        gdprConsent: {
+          consentString: 'GDPR_CONSENT_STRING',
+          gdprApplies: true
+        },
+      };
+    });
+
+    it('should return true when banner sizes are defined', function () {
+      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    });
+
+    it('should return false when banner sizes are invalid', function () {
+      const invalidSizes = [
+        '2:1',
+        undefined,
+        123,
+        'undefined'
+      ];
+
+      invalidSizes.forEach((sizes) => {
+        validBid.mediaTypes.banner.sizes = sizes;
+        expect(spec.isBidRequestValid(validBid)).to.be.false;
+      });
+    });
+
+    it('should send GDPR consent in the payload if present', function () {
+      const request = spec.buildRequests([validBid], bidderRequest);
+      expect(JSON.parse(request.data).user.ext.consent).to.deep.equal('GDPR_CONSENT_STRING');
+    });
+
+    it('should send CCPA in the payload if present', function () {
+      const ccpa = '1YYY';
+      bidderRequest.uspConsent = ccpa;
+      const request = spec.buildRequests([validBid], bidderRequest);
+      expect(JSON.parse(request.data).regs.ext.us_privacy).to.equal(ccpa);
+    });
+
+    it('should send eids in the payload if present', function () {
+      const eids = {data: [{source: 'test', uids: [{id: '123', ext: {}}]}]};
+      validBid.userIdAsEids = eids;
+      const request = spec.buildRequests([validBid], bidderRequest);
+      expect(JSON.parse(request.data).user.ext.eids).to.deep.equal(eids);
+    });
+
+    it('should send schain in the payload if present', function () {
+      const schain = {'ver': '1.0', 'complete': 1, 'nodes': [{'asi': 'exchange1.com', 'sid': '1234', 'hp': 1}]};
+      validBid.schain = schain;
+      const request = spec.buildRequests([validBid], bidderRequest);
+      expect(JSON.parse(request.data).source.ext.schain).to.deep.equal(schain);
+    });
+
+    it('should correctly identify test mode', function () {
+      validBid.params.test = true;
+      const request = spec.buildRequests([validBid], bidderRequest);
+      expect(JSON.parse(request.data).test).to.equal(1);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const validResponse = {
+      body: {
+        seatbid: [
+          {
+            bid: [
+              {
+                impid: 'bid1',
+                price: 1.5,
+                w: 300,
+                h: 250,
+                crid: 'creative1',
+                currency: 'USD',
+                netRevenue: true,
+                ttl: 300,
+                adm: '
Ad content
',
+                mtype: 1
+              },
+              {
+                impid: 'bid2',
+                price: 2.0,
+                w: 728,
+                h: 90,
+                crid: 'creative2',
+                currency: 'USD',
+                netRevenue: true,
+                ttl: 300,
+                adm: '
Ad content
',
+                mtype: 1
+              }
+            ]
+          }
+        ]
+      }
+    };
+
+    const emptyResponse = {
+      body: {
+        seatbid: []
+      }
+    };
+
+    it('should return an array of bid objects with valid response', function () {
+      const interpretedBids = spec.interpretResponse(validResponse);
+      const expectedBids = validResponse.body.seatbid[0].bid;
+      expect(interpretedBids).to.have.lengthOf(expectedBids.length);
+      expectedBids.forEach((expectedBid, index) => {
+        expect(interpretedBids[index]).to.have.property('requestId', expectedBid.impid);
+        expect(interpretedBids[index]).to.have.property('cpm', expectedBid.price);
+        expect(interpretedBids[index]).to.have.property('width', expectedBid.w);
+        expect(interpretedBids[index]).to.have.property('height', expectedBid.h);
+        expect(interpretedBids[index]).to.have.property('creativeId', expectedBid.crid);
+        expect(interpretedBids[index]).to.have.property('currency', expectedBid.currency);
+        expect(interpretedBids[index]).to.have.property('netRevenue', expectedBid.netRevenue);
+        expect(interpretedBids[index]).to.have.property('ttl', expectedBid.ttl);
+        expect(interpretedBids[index]).to.have.property('ad', expectedBid.adm);
+        expect(interpretedBids[index]).to.have.property('mediaType', expectedBid.mtype);
+      });
+    });
+
+    it('should return an empty array with empty response', function () {
+      const interpretedBids = spec.interpretResponse(emptyResponse);
+      expect(interpretedBids).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    const RESPONSE = {
+      body: {
+        ext: {
+          usersync: {
+            sovrn: {
+              syncs: [{type: 'iframe', url: 'https://sovrn.com/iframe_sync'}]
+            },
+            appnexus: {
+              syncs: [{type: 'image', url: 'https://appnexus.com/image_sync'}]
+            }
+          }
+        }
+      }
+    };
+
+    it('should return empty array if no options are provided', function () {
+      const opts = spec.getUserSyncs({});
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should return empty array if neither iframe nor pixel is enabled', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false});
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('should return syncs only for iframe sync type', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [RESPONSE]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('iframe');
+      expect(opts[0].url).to.equal(RESPONSE.body.ext.usersync.sovrn.syncs[0].url);
+    });
+
+    it('should return syncs only for pixel sync types', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [RESPONSE]);
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal(RESPONSE.body.ext.usersync.appnexus.syncs[0].url);
+    });
+
+    it('should return syncs when both iframe and pixel are enabled', function () {
+      const opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, [RESPONSE]);
+      expect(opts.length).to.equal(2);
+    });
+  });
+});
diff --git a/test/spec/modules/optableBidAdapter_spec.js b/test/spec/modules/optableBidAdapter_spec.js
new file mode 100644
index 00000000000..b7cf2e3b44d
--- /dev/null
+++ b/test/spec/modules/optableBidAdapter_spec.js
@@ -0,0 +1,116 @@
+import { expect } from 'chai';
+import { spec } from 'modules/optableBidAdapter';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+describe('optableBidAdapter', function() {
+  const adapter = newBidder(spec);
+
+  describe('isBidRequestValid', function() {
+    const validBid = {
+      bidder: 'optable',
+      params: { site: '123' },
+    };
+
+    it('should return true when required params are present', function() {
+      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    });
+
+    it('should return false when site is missing', function() {
+      const invalidBid = { ...validBid };
+      delete invalidBid.params.site;
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function() {
+    const validBid = {
+      bidder: 'optable',
+      params: {
+        site: '123',
+      },
+    };
+
+    const bidderRequest = {
+      bidderRequestId: 'bid123',
+      refererInfo: {
+        domain: 'example.com',
+        page: 'https://example.com/page',
+        ref: 'https://referrer.com'
+      },
+    };
+
+    it('should include site as tagid in imp', function() {
+      const request = spec.buildRequests([validBid], bidderRequest);
+      expect(request.url).to.equal('https://ads.optable.co/ca/ortb2/v1/ssp/bid');
+      expect(request.method).to.equal('POST');
+      expect(request.data.imp[0].tagid).to.equal('123')
+    });
+  });
+
+  describe('buildPAAPIConfigs', () => {
+    function makeRequest({bidId, site = 'mockSite', ae = 1}) {
+      return {
+        bidId,
+        params: {
+          site
+        },
+        ortb2Imp: {
+          ext: {ae}
+        }
+      }
+    }
+    it('should generate auction configs for ae requests', () => {
+      const configs = spec.buildPAAPIConfigs([
+        makeRequest({bidId: 'bid1', ae: 1}),
+        makeRequest({bidId: 'bid2', ae: 0}),
+        makeRequest({bidId: 'bid3', ae: 1}),
+      ]);
+      expect(configs.map(cfg => cfg.bidId)).to.eql(['bid1', 'bid3']);
+      configs.forEach(cfg => sinon.assert.match(cfg.config, {
+        seller: 'https://ads.optable.co',
+        decisionLogicURL: `https://ads.optable.co/ca/paapi/v1/ssp/decision-logic.js?origin=mockSite`,
+        interestGroupBuyers: ['https://ads.optable.co']
+      }))
+    })
+  })
+
+  describe('interpretResponse', function() {
+    const validBid = {
+      bidder: 'optable',
+      params: {
+        site: '123',
+      },
+    };
+
+    const bidderRequest = {
+      bidderRequestId: 'bid123',
+      refererInfo: {
+        domain: 'example.com',
+        page: 'https://example.com/page',
+        ref: 'https://referrer.com'
+      },
+    };
+
+    const response = {
+      body: {
+        ext: {
+          optable: {
+            fledge: {
+              auctionconfigs: [
+                { impid: 'bid123', seller: 'https://ads.optable.co' },
+              ]
+            }
+          }
+        }
+      }
+    };
+
+    it('maps paapi from ext.optable.fledge.auctionconfigs', function() {
+      const request = spec.buildRequests([validBid], bidderRequest);
+      const result = spec.interpretResponse(response, request);
+      expect(result.paapi).to.deep.equal([
+        { bidId: 'bid123', config: { seller: 'https://ads.optable.co' } }
+      ]);
+    });
+  });
+});
diff --git a/test/spec/modules/optidigitalBidAdapter_spec.js b/test/spec/modules/optidigitalBidAdapter_spec.js
index 30e72452c39..273b29001d1 100755
--- a/test/spec/modules/optidigitalBidAdapter_spec.js
+++ b/test/spec/modules/optidigitalBidAdapter_spec.js
@@ -423,7 +423,32 @@ describe('optidigitalAdapterTests', function () {
       bidderRequest.uspConsent = '1YYY';
       const request = spec.buildRequests(validBidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
-      expect(payload.uspConsent).to.exist;
+      expect(payload.us_privacy).to.exist;
+    });
+
+    it('should send gppConsent to given endpoint where there is gppConsent', function() {
+      let consentString = 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==';
+      bidderRequest.gppConsent = {
+        'gppString': consentString,
+        'applicableSections': [7]
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.gpp).to.exist;
+    });
+
+    it('should send gppConsent to given endpoint when there is gpp in ortb2', function() {
+      let consentString = 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==';
+      bidderRequest.gppConsent = undefined;
+      bidderRequest.ortb2 = {
+        regs: {
+          gpp: consentString,
+          gpp_sid: [7]
+        }
+      }
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.gpp).to.exist;
     });
 
     it('should use appropriate mediaTypes banner sizes', function() {
@@ -546,9 +571,14 @@ describe('optidigitalAdapterTests', function () {
         type: 'iframe', url: `${syncurlIframe}&gdpr=1&gdpr_consent=`
       }]);
     });
-    it('should return appropriate URL with GDPR equals to 1, GDPR consent and CCPA consent', function() {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, {consentString: 'fooUsp'})).to.deep.equal([{
-        type: 'iframe', url: `${syncurlIframe}&gdpr=1&gdpr_consent=foo&ccpa_consent=fooUsp`
+    it('should return appropriate URL with GDPR equals to 1, GDPR consent and US Privacy consent', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, 'fooUsp')).to.deep.equal([{
+        type: 'iframe', url: `${syncurlIframe}&gdpr=1&gdpr_consent=foo&us_privacy=fooUsp`
+      }]);
+    });
+    it('should return appropriate URL with GDPR equals to 1, GDPR consent, US Privacy consent and GPP consent', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, 'fooUsp', {gppString: 'fooGpp', applicableSections: [7]})).to.deep.equal([{
+        type: 'iframe', url: `${syncurlIframe}&gdpr=1&gdpr_consent=foo&us_privacy=fooUsp&gpp=fooGpp&gpp_sid=7`
       }]);
     });
   });
diff --git a/test/spec/modules/optimeraRtdProvider_spec.js b/test/spec/modules/optimeraRtdProvider_spec.js
index 8a9f000bbb9..e1d962d306c 100644
--- a/test/spec/modules/optimeraRtdProvider_spec.js
+++ b/test/spec/modules/optimeraRtdProvider_spec.js
@@ -37,7 +37,7 @@ describe('Optimera RTD score file URL is properly set for v0', () => {
     optimeraRTD.init(conf.dataProviders[0]);
     optimeraRTD.setScores();
     expect(optimeraRTD.apiVersion).to.equal('v0');
-    expect(optimeraRTD.scoresURL).to.equal('https://dyv1bugovvq1g.cloudfront.net/9999/localhost:9876/context.html.js');
+    expect(optimeraRTD.scoresURL).to.equal('https://dyv1bugovvq1g.cloudfront.net/9999/localhost%3A9876/context.html.js');
   });
 
   it('should properly set the score file URL without apiVersion set', () => {
@@ -54,7 +54,7 @@ describe('Optimera RTD score file URL is properly set for v0', () => {
     optimeraRTD.init(conf.dataProviders[0]);
     optimeraRTD.setScores();
     expect(optimeraRTD.apiVersion).to.equal('v0');
-    expect(optimeraRTD.scoresURL).to.equal('https://dyv1bugovvq1g.cloudfront.net/9999/localhost:9876/context.html.js');
+    expect(optimeraRTD.scoresURL).to.equal('https://dyv1bugovvq1g.cloudfront.net/9999/localhost%3A9876/context.html.js');
   });
 
   it('should properly set the score file URL with an api version other than v0 or v1', () => {
@@ -71,7 +71,7 @@ describe('Optimera RTD score file URL is properly set for v0', () => {
     };
     optimeraRTD.init(conf.dataProviders[0]);
     optimeraRTD.setScores();
-    expect(optimeraRTD.scoresURL).to.equal('https://dyv1bugovvq1g.cloudfront.net/9999/localhost:9876/context.html.js');
+    expect(optimeraRTD.scoresURL).to.equal('https://dyv1bugovvq1g.cloudfront.net/9999/localhost%3A9876/context.html.js');
   });
 });
 
diff --git a/test/spec/modules/optimonAnalyticsAdapter_spec.js b/test/spec/modules/optimonAnalyticsAdapter_spec.js
index f1aa00334b5..270f3aec395 100644
--- a/test/spec/modules/optimonAnalyticsAdapter_spec.js
+++ b/test/spec/modules/optimonAnalyticsAdapter_spec.js
@@ -3,7 +3,6 @@ import { expect } from 'chai';
 import optimonAnalyticsAdapter from '../../../modules/optimonAnalyticsAdapter.js';
 import adapterManager from 'src/adapterManager';
 import * as events from 'src/events';
-import constants from 'src/constants.json'
 import {expectEvents} from '../../helpers/analytics.js';
 
 const AD_UNIT_CODE = 'demo-adunit-1';
diff --git a/test/spec/modules/orakiBidAdapter_spec.js b/test/spec/modules/orakiBidAdapter_spec.js
new file mode 100644
index 00000000000..9a7c777212b
--- /dev/null
+++ b/test/spec/modules/orakiBidAdapter_spec.js
@@ -0,0 +1,511 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/orakiBidAdapter';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes';
+import { getUniqueIdentifierStr } from '../../../src/utils';
+
+const bidder = 'oraki';
+
+describe('OrakiBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK',
+      }
+    },
+    timeout: 500
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys(
+        'deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.oraki.io/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.oraki.io/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.oraki.io/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/orbidderBidAdapter_spec.js b/test/spec/modules/orbidderBidAdapter_spec.js
index 5af5a4d710f..cf58d35e636 100644
--- a/test/spec/modules/orbidderBidAdapter_spec.js
+++ b/test/spec/modules/orbidderBidAdapter_spec.js
@@ -9,39 +9,57 @@ describe('orbidderBidAdapter', () => {
   const defaultBidRequestBanner = {
     bidId: 'd66fa86787e0b0ca900a96eacfd5f0bb',
     auctionId: 'ccc4c7cdfe11cfbd74065e6dd28413d8',
-    ortb2Imp: {
-      ext: {
-        tid: 'd58851660c0c4461e4aa06344fc9c0c6',
-      }
-    },
+    transactionId: 'd58851660c0c4461e4aa06344fc9c0c6',
     bidRequestCount: 1,
     adUnitCode: 'adunit-code',
     sizes: [[300, 250], [300, 600]],
     params: {
       'accountId': 'string1',
-      'placementId': 'string2'
+      'placementId': 'string2',
+      'bidfloor': 1.23
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250], [300, 600]],
+        sizes: [[300, 250], [300, 600]]
       }
-    }
+    },
+    userId: {
+      'id5id': {
+        'uid': 'ID5*XXXXXXXXXXXXX',
+        'ext': {
+          'linkType': 2,
+          'pba': 'XXXXXXXXXXXX=='
+        }
+      }
+    },
+    userIdAsEids: [
+      {
+        'source': 'id5-sync.com',
+        'uids': [
+          {
+            'id': 'ID5*XXXXXXXXXXXXX',
+            'atype': 1,
+            'ext': {
+              'linkType': 2,
+              'pba': 'XXXXXXXXXXXX=='
+            }
+          }
+        ]
+      }
+    ]
   };
 
   const defaultBidRequestNative = {
     bidId: 'd66fa86787e0b0ca900a96eacfd5f0bc',
     auctionId: 'ccc4c7cdfe11cfbd74065e6dd28413d9',
-    ortb2Imp: {
-      ext: {
-        tid: 'd58851660c0c4461e4aa06344fc9c0c7',
-      }
-    },
+    transactionId: 'd58851660c0c4461e4aa06344fc9c0c6',
     bidRequestCount: 1,
     adUnitCode: 'adunit-code-native',
     sizes: [],
     params: {
       'accountId': 'string3',
-      'placementId': 'string4'
+      'placementId': 'string4',
+      'bidfloor': 2.34
     },
     mediaTypes: {
       native: {
@@ -56,7 +74,31 @@ describe('orbidderBidAdapter', () => {
           required: true
         }
       }
-    }
+    },
+    userId: {
+      'id5id': {
+        'uid': 'ID5*YYYYYYYYYYYYYYY',
+        'ext': {
+          'linkType': 2,
+          'pba': 'YYYYYYYYYYYYY=='
+        }
+      }
+    },
+    userIdAsEids: [
+      {
+        'source': 'id5-sync.com',
+        'uids': [
+          {
+            'id': 'ID5*YYYYYYYYYYYYYYY',
+            'atype': 1,
+            'ext': {
+              'linkType': 2,
+              'pba': 'YYYYYYYYYYYYY=='
+            }
+          }
+        ]
+      }
+    ]
   };
 
   const deepClone = function(val) {
@@ -179,34 +221,20 @@ describe('orbidderBidAdapter', () => {
       // we add two, because we add pageUrl and version from bidderRequest object
       expect(Object.keys(request.data).length).to.equal(Object.keys(defaultBidRequestBanner).length + 2);
 
-      expect(request.data.bidId).to.equal(defaultBidRequestBanner.bidId);
-      expect(request.data.auctionId).to.equal(defaultBidRequestBanner.auctionId);
-      expect(request.data.transactionId).to.equal(defaultBidRequestBanner.ortb2Imp.ext.tid);
-      expect(request.data.bidRequestCount).to.equal(defaultBidRequestBanner.bidRequestCount);
-      expect(request.data.adUnitCode).to.equal(defaultBidRequestBanner.adUnitCode);
-      expect(request.data.pageUrl).to.equal('https://localhost:9876/');
-      expect(request.data.v).to.equal($$PREBID_GLOBAL$$.version);
-      expect(request.data.sizes).to.equal(defaultBidRequestBanner.sizes);
-
-      expect(_.isEqual(request.data.params, defaultBidRequestBanner.params)).to.be.true;
-      expect(_.isEqual(request.data.mediaTypes, defaultBidRequestBanner.mediaTypes)).to.be.true;
+      const expectedBidRequest = deepClone(defaultBidRequestBanner);
+      expectedBidRequest.pageUrl = 'https://localhost:9876/';
+      expectedBidRequest.v = $$PREBID_GLOBAL$$.version;
+      expect(request.data).to.deep.equal(expectedBidRequest);
     });
 
     it('native: sends correct bid parameters', () => {
       // we add two, because we add pageUrl and version from bidderRequest object
       expect(Object.keys(nativeRequest.data).length).to.equal(Object.keys(defaultBidRequestNative).length + 2);
 
-      expect(nativeRequest.data.bidId).to.equal(defaultBidRequestNative.bidId);
-      expect(nativeRequest.data.auctionId).to.equal(defaultBidRequestNative.auctionId);
-      expect(nativeRequest.data.transactionId).to.equal(defaultBidRequestNative.ortb2Imp.ext.tid);
-      expect(nativeRequest.data.bidRequestCount).to.equal(defaultBidRequestNative.bidRequestCount);
-      expect(nativeRequest.data.adUnitCode).to.equal(defaultBidRequestNative.adUnitCode);
-      expect(nativeRequest.data.pageUrl).to.equal('https://localhost:9876/');
-      expect(nativeRequest.data.v).to.equal($$PREBID_GLOBAL$$.version);
-      expect(nativeRequest.data.sizes).to.be.empty;
-
-      expect(_.isEqual(nativeRequest.data.params, defaultBidRequestNative.params)).to.be.true;
-      expect(_.isEqual(nativeRequest.data.mediaTypes, defaultBidRequestNative.mediaTypes)).to.be.true;
+      const expectedBidRequest = deepClone(defaultBidRequestNative);
+      expectedBidRequest.pageUrl = 'https://localhost:9876/';
+      expectedBidRequest.v = $$PREBID_GLOBAL$$.version;
+      expect(nativeRequest.data).to.deep.equal(expectedBidRequest);
     });
 
     it('banner: handles empty gdpr object', () => {
diff --git a/test/spec/modules/outbrainBidAdapter_spec.js b/test/spec/modules/outbrainBidAdapter_spec.js
index d8690aeb6a5..5e9d76b59b9 100644
--- a/test/spec/modules/outbrainBidAdapter_spec.js
+++ b/test/spec/modules/outbrainBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { spec } from 'modules/outbrainBidAdapter.js';
+import { spec, storage } from 'modules/outbrainBidAdapter.js';
 import { config } from 'src/config.js';
 import { server } from 'test/mocks/xhr';
 
@@ -58,12 +58,30 @@ describe('Outbrain Adapter', function () {
           minduration: 3,
           maxduration: 10,
           startdelay: 2,
-          placement: 4,
+          plcmt: 4,
+          placement: 5,
           linearity: 1
         }
       }
     }
 
+    const ortb2WithDeviceData = {
+      ortb2: {
+        device: {
+          w: 980,
+          h: 1720,
+          dnt: 0,
+          ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+          language: 'en',
+          devicetype: 1,
+          make: 'Apple',
+          model: 'iPhone 12 Pro Max',
+          os: 'iOS',
+          osv: '17.4'
+        }
+      }
+    };
+
     describe('isBidRequestValid', function () {
       before(() => {
         config.setConfig({
@@ -213,15 +231,18 @@ describe('Outbrain Adapter', function () {
     })
 
     describe('buildRequests', function () {
+      let getDataFromLocalStorageStub;
+
       before(() => {
+        getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage')
         config.setConfig({
           outbrain: {
             bidderUrl: 'https://bidder-url.com',
           }
-        }
-        )
+        })
       })
       after(() => {
+        getDataFromLocalStorageStub.restore()
         config.resetConfig()
       })
 
@@ -386,7 +407,8 @@ describe('Outbrain Adapter', function () {
                 minduration: 3,
                 maxduration: 10,
                 startdelay: 2,
-                placement: 4,
+                placement: 5,
+                plcmt: 4,
                 linearity: 1
               }
             }
@@ -424,7 +446,7 @@ describe('Outbrain Adapter', function () {
         expect(resData.badv).to.deep.equal(['bad-advertiser'])
       });
 
-      it('first party data', function () {
+      it('should pass first party data', function () {
         const bidRequest = {
           ...commonBidRequest,
           ...nativeBidRequestParams,
@@ -505,6 +527,28 @@ describe('Outbrain Adapter', function () {
         config.resetConfig()
       });
 
+      it('should pass gpp information', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        };
+        const bidderRequest = {
+          ...commonBidderRequest,
+          'gppConsent': {
+            'gppString': 'abc12345',
+            'applicableSections': [8]
+          }
+        }
+
+        const res = spec.buildRequests([bidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+
+        expect(resData.regs.ext.gpp).to.exist;
+        expect(resData.regs.ext.gpp_sid).to.exist;
+        expect(resData.regs.ext.gpp).to.equal('abc12345');
+        expect(resData.regs.ext.gpp_sid).to.deep.equal([8]);
+      });
+
       it('should pass extended ids', function () {
         let bidRequest = {
           bidId: 'bidId',
@@ -522,6 +566,22 @@ describe('Outbrain Adapter', function () {
         ]);
       });
 
+      it('should pass OB user token', function () {
+        getDataFromLocalStorageStub.returns('12345');
+
+        let bidRequest = {
+          bidId: 'bidId',
+          params: {},
+          ...commonBidRequest,
+        };
+
+        let res = spec.buildRequests([bidRequest], commonBidderRequest);
+        const resData = JSON.parse(res.data)
+        expect(resData.user.ext.obusertoken).to.equal('12345')
+        expect(getDataFromLocalStorageStub.called).to.be.true;
+        sinon.assert.calledWith(getDataFromLocalStorageStub, 'OB-USER-TOKEN');
+      });
+
       it('should pass bidfloor', function () {
         const bidRequest = {
           ...commonBidRequest,
@@ -578,6 +638,19 @@ describe('Outbrain Adapter', function () {
         const resData = JSON.parse(res.data)
         expect(resData.imp[0].native.request).to.equal(JSON.stringify(expectedNativeAssets));
       });
+
+      it('should pass ortb2 device data', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        };
+
+        const res = spec.buildRequests(
+          [bidRequest],
+          {...commonBidderRequest, ...ortb2WithDeviceData},
+        );
+        expect(JSON.parse(res.data).device).to.deep.equal(ortb2WithDeviceData.ortb2.device);
+      });
     })
 
     describe('interpretResponse', function () {
@@ -842,6 +915,12 @@ describe('Outbrain Adapter', function () {
         type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=foo&us_privacy=1NYN`
       }]);
     });
+
+    it('should pass gpp consent', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, '', { gppString: 'abc12345', applicableSections: [1, 2] })).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gpp=abc12345&gpp_sid=1%2C2`
+      }]);
+    });
   })
 
   describe('onBidWon', function () {
diff --git a/test/spec/modules/ownadxBidAdapter_spec.js b/test/spec/modules/ownadxBidAdapter_spec.js
new file mode 100644
index 00000000000..13d69b3a261
--- /dev/null
+++ b/test/spec/modules/ownadxBidAdapter_spec.js
@@ -0,0 +1,103 @@
+import { expect } from 'chai';
+import { spec } from 'modules/ownadxBidAdapter.js';
+
+describe('ownadx', function () {
+  const METHOD = 'POST';
+  const URL = 'https://pbs-js.prebid-ownadx.com/publisher/prebid/9/1231?token=3f2941af4f7e446f9a19ca6045f8cff4';
+
+  const bidRequest = {
+    bidder: 'ownadx',
+    params: {
+      tokenId: '3f2941af4f7e446f9a19ca6045f8cff4',
+      sspId: '1231',
+      seatId: '9'
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    },
+    sizes: [
+      [300, 250],
+      [300, 600]
+    ],
+    bidId: 'bid-id-123456',
+    adUnitCode: 'ad-unit-code-1',
+    bidderRequestId: 'bidder-request-id-123456',
+    auctionId: 'auction-id-123456',
+    transactionId: 'transaction-id-123456'
+  };
+
+  describe('isBidRequestValid', function () {
+    it('should return true where required params found', function () {
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidderRequest = {
+      refererInfo: {
+        page: 'https://www.test.com',
+        reachedTop: true,
+        isAmp: false,
+        numIframes: 0,
+        stack: [
+          'https://www.test.com'
+        ],
+        canonicalUrl: null
+      }
+    };
+
+    it('should build correct POST request for banner bid', function () {
+      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      expect(request).to.be.an('object');
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal('https://pbs-js.prebid-ownadx.com/publisher/prebid/9/1231?token=3f2941af4f7e446f9a19ca6045f8cff4');
+      const payload = request.data;
+      expect(payload).to.be.an('object');
+      expect(payload.sizes).to.be.an('array');
+      expect(payload.slotBidId).to.be.a('string');
+      expect(payload.PageUrl).to.be.a('string');
+      expect(payload.mediaChannel).to.be.a('number');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let serverResponse = {
+      body: {
+        tokenId: '3f2941af4f7e446f9a19ca6045f8cff4',
+        bid: 'BID-XXXX-XXXX',
+        width: '300',
+        height: '250',
+        cpm: '0.7',
+        adm: '
Ad from OwnAdX
',
+        slotBidId: 'bid-id-123456',
+        adType: '1',
+        statusText: 'Success'
+      }
+    };
+
+    let expectedResponse = [{
+      token: '3f2941af4f7e446f9a19ca6045f8cff4',
+      requestId: 'bid-id-123456',
+      cpm: '0.7',
+      currency: 'USD',
+      aType: '1',
+      netRevenue: false,
+      width: '300',
+      height: '250',
+      creativeId: 0,
+      ttl: 300,
+      ad: '
Ad from OwnAdX
',
+      meta: {
+        mediaType: 'banner',
+        advertiserDomains: []
+      }
+    }];
+
+    it('should correctly interpret valid banner response', function () {
+      let result = spec.interpretResponse(serverResponse);
+      expect(result).to.deep.equal(expectedResponse);
+    });
+  });
+});
diff --git a/test/spec/modules/oxxionAnalyticsAdapter_spec.js b/test/spec/modules/oxxionAnalyticsAdapter_spec.js
index 13dc395968a..f9bcdb40e16 100644
--- a/test/spec/modules/oxxionAnalyticsAdapter_spec.js
+++ b/test/spec/modules/oxxionAnalyticsAdapter_spec.js
@@ -2,10 +2,10 @@ import oxxionAnalytics from 'modules/oxxionAnalyticsAdapter.js';
 import {dereferenceWithoutRenderer} from 'modules/oxxionAnalyticsAdapter.js';
 import { expect } from 'chai';
 import { server } from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
+
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
-let constants = require('src/constants.json');
-
 describe('Oxxion Analytics', function () {
   let timestamp = new Date() - 256;
   let auctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
@@ -86,20 +86,21 @@ describe('Oxxion Analytics', function () {
               }
             },
             'adUnitCode': 'tag_200124_banner',
-            'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b40',
+            'transactionId': '8b2a8629-d1ea-4bb1-aff0-e335b96dd002',
             'sizes': [
               [
                 300,
                 600
               ]
             ],
-            'bidId': '34a63e5d5378a3',
+            'bidId': '2bd3e8ff8a113f',
             'bidderRequestId': '11dc6ff6378de7',
             'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
             'src': 'client',
             'bidRequestsCount': 1,
             'bidderRequestsCount': 1,
-            'bidderWinsCount': 0
+            'bidderWinsCount': 0,
+            'ova': 'cleared'
           }
         ],
         'auctionStart': 1647424261187,
@@ -149,12 +150,12 @@ describe('Oxxion Analytics', function () {
     'bidsReceived': [
       {
         'bidderCode': 'appnexus',
-        'width': 300,
-        'height': 600,
+        'width': 970,
+        'height': 250,
         'statusMessage': 'Bid available',
-        'adId': '7a4ced80f33d33',
-        'requestId': '34a63e5d5378a3',
-        'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b40',
+        'adId': '65d16ef039a97a',
+        'requestId': '2bd3e8ff8a113f',
+        'transactionId': '8b2a8629-d1ea-4bb1-aff0-e335b96dd002',
         'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
         'mediaType': 'video',
         'source': 'client',
@@ -187,7 +188,7 @@ describe('Oxxion Analytics', function () {
         'size': '300x600',
         'adserverTargeting': {
           'hb_bidder': 'appnexus',
-          'hb_adid': '7a4ced80f33d33',
+          'hb_adid': '65d16ef039a97a',
           'hb_pb': '20.000000',
           'hb_size': '300x600',
           'hb_source': 'client',
@@ -302,10 +303,10 @@ describe('Oxxion Analytics', function () {
         }
       });
 
-      events.emit(constants.EVENTS.BID_REQUESTED, auctionEnd['bidderRequests'][0]);
-      events.emit(constants.EVENTS.BID_RESPONSE, auctionEnd['bidsReceived'][0]);
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
-      events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
+      events.emit(EVENTS.BID_REQUESTED, auctionEnd['bidderRequests'][0]);
+      events.emit(EVENTS.BID_RESPONSE, auctionEnd['bidsReceived'][0]);
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeout);
+      events.emit(EVENTS.AUCTION_END, auctionEnd);
       expect(server.requests.length).to.equal(1);
       let message = JSON.parse(server.requests[0].requestBody);
       expect(message).to.have.property('auctionEnd').exist;
@@ -335,14 +336,14 @@ describe('Oxxion Analytics', function () {
           domain: 'test'
         }
       });
-      events.emit(constants.EVENTS.BID_WON, bidWon);
+      events.emit(EVENTS.BID_WON, bidWon);
       expect(server.requests.length).to.equal(1);
       let message = JSON.parse(server.requests[0].requestBody);
       expect(message).not.to.have.property('ad');
       expect(message).to.have.property('adId')
       expect(message).to.have.property('cpmIncrement').and.to.equal(27.4276);
       expect(message).to.have.property('oxxionMode').and.to.have.property('abtest').and.to.equal(true);
-      // sinon.assert.callCount(oxxionAnalytics.track, 1);
+      expect(message).to.have.property('ova').and.to.equal('cleared');
     });
   });
 });
diff --git a/test/spec/modules/oxxionRtdProvider_spec.js b/test/spec/modules/oxxionRtdProvider_spec.js
index 7bccf2319a4..2a8024f3565 100644
--- a/test/spec/modules/oxxionRtdProvider_spec.js
+++ b/test/spec/modules/oxxionRtdProvider_spec.js
@@ -113,77 +113,6 @@ let bids = [{
 },
 ];
 
-let originalBidderRequests = [{
-  'bidderCode': 'rubicon',
-  'auctionId': 'dd42b870-2072-4b71-8ab7-e7789b14c5ce',
-  'bidderRequestId': '16c2bceb2e891a',
-  'bids': [
-    {
-      'bidder': 'rubicon',
-      'params': {
-        'accountId': 1234,
-        'siteId': 2345,
-        'zoneId': 3456
-      },
-      'auctionId': 'dd42b870-2072-4b71-8ab7-e7789b14c5ce',
-      'mediaTypes': {'banner': {'sizes': [[970, 250]]}},
-      'adUnitCode': 'adunit1',
-      'transactionId': '8f20b49c-5e47-4bb5-a7d5-0b816cf527f3',
-      'bidId': '2d9920072ab028',
-      'bidderRequestId': '16c2bceb2e891a',
-    },
-    {
-      'bidder': 'rubicon',
-      'params': {
-        'accountId': 1234,
-        'siteId': 2345,
-        'zoneId': 4567
-      },
-      'auctionId': 'dd42b870-2072-4b71-8ab7-e7789b14c5ce',
-      'mediaTypes': {'banner': {'sizes': [[300, 250]]}},
-      'adUnitCode': 'adunit2',
-      'transactionId': '4161f09e-7870-4486-b2a6-b4158a327bc4',
-      'bidId': '331c3d708f4864',
-      'bidderRequestId': '16c2bceb2e891a',
-      'src': 'client',
-    }
-  ],
-  'auctionStart': 1683383333809,
-  'timeout': 3000,
-  'gdprConsent': {
-    'consentString': 'consent_hash',
-    'gdprApplies': true,
-    'apiVersion': 2
-  }
-},
-{
-  'bidderCode': 'appnexusAst',
-  'auctionId': 'dd42b870-2072-4b71-8ab7-e7789b14c5ce',
-  'bidderRequestId': '4d83b8c60d45e7',
-  'bids': [
-    {
-      'bidder': 'appnexusAst',
-      'params': {
-        'placementId': 10471298
-      },
-      'auctionId': 'dd42b870-2072-4b71-8ab7-e7789b14c5ce',
-      'mediaTypes': {'banner': {'sizes': [[300, 250]]}},
-      'adUnitCode': 'adunit2',
-      'transactionId': '4161f09e-7870-4486-b2a6-b4158a327bc4',
-      'bidId': '5b7cd5abc6aea3',
-      'bidderRequestId': '4d83b8c60d45e7',
-    }
-  ],
-  'auctionStart': 1683383333809,
-  'timeout': 3000,
-  'gdprConsent': {
-    'consentString': 'consent_hash',
-    'gdprApplies': true,
-    'apiVersion': 2
-  }
-}
-];
-
 let bidInterests = [
   {'id': 0, 'rate': 50.0, 'suggestion': true},
   {'id': 1, 'rate': 12.0, 'suggestion': false},
@@ -212,8 +141,6 @@ describe('oxxionRtdProvider', () => {
     auctionEnd.bidsReceived = bids;
     it('call everything', function() {
       oxxionSubmodule.getBidRequestData(request, null, moduleConfig);
-      oxxionSubmodule.onBidResponseEvent(auctionEnd.bidsReceived[0], moduleConfig);
-      oxxionSubmodule.onBidResponseEvent(auctionEnd.bidsReceived[1], moduleConfig);
     });
     it('check bid filtering', function() {
       let requestsList = oxxionSubmodule.getRequestsList(request);
@@ -229,27 +156,5 @@ describe('oxxionRtdProvider', () => {
       expect(filteredBiddderRequests[1]).to.have.property('bids');
       expect(filteredBiddderRequests[1].bids.length).to.equal(1);
     });
-    it('check vastImpUrl', function() {
-      expect(auctionEnd.bidsReceived[0]).to.have.property('vastImpUrl');
-      let expectVastImpUrl = 'https://' + moduleConfig.params.domain + '.oxxion.io/analytics/vast_imp?';
-      expect(auctionEnd.bidsReceived[1].vastImpUrl).to.contain(expectVastImpUrl);
-      expect(auctionEnd.bidsReceived[1].vastImpUrl).to.contain(encodeURI('https://some.tracking-url.com'));
-    });
-    it('check vastXml', function() {
-      expect(auctionEnd.bidsReceived[0]).to.have.property('vastXml');
-      let vastWrapper = new DOMParser().parseFromString(auctionEnd.bidsReceived[0].vastXml, 'text/xml');
-      let impressions = vastWrapper.querySelectorAll('VAST Ad Wrapper Impression');
-      expect(impressions.length).to.equal(2);
-      expect(auctionEnd.bidsReceived[1]).to.have.property('vastXml');
-      expect(auctionEnd.bidsReceived[1].adId).to.equal('4b2e1581c0ca1a');
-      let vastInline = new DOMParser().parseFromString(auctionEnd.bidsReceived[1].vastXml, 'text/xml');
-      let inline = vastInline.querySelectorAll('VAST Ad InLine');
-      expect(inline).to.have.lengthOf(1);
-      let inlineImpressions = vastInline.querySelectorAll('VAST Ad InLine Impression');
-      expect(inlineImpressions).to.have.lengthOf.above(0);
-    });
-    it('check cpmIncrement', function() {
-      expect(auctionEnd.bidsReceived[1].vastImpUrl).to.contain(encodeURI('cpmIncrement=0'));
-    });
   });
 });
diff --git a/test/spec/modules/ozoneBidAdapter_spec.js b/test/spec/modules/ozoneBidAdapter_spec.js
index 64b345c5d9c..f504af91df5 100644
--- a/test/spec/modules/ozoneBidAdapter_spec.js
+++ b/test/spec/modules/ozoneBidAdapter_spec.js
@@ -4,6 +4,7 @@ import { config } from 'src/config.js';
 import {Renderer} from '../../../src/Renderer.js';
 import {getGranularityKeyName, getGranularityObject} from '../../../modules/ozoneBidAdapter.js';
 import * as utils from '../../../src/utils.js';
+import {deepSetValue} from '../../../src/utils.js';
 const OZONEURI = 'https://elb.the-ozone-project.com/openrtb2/auction';
 const BIDDER_CODE = 'ozone';
 var validBidRequests = [
@@ -62,6 +63,699 @@ var validBidRequestsMulti = [
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
 ];
+var validBidRequestsWithAuctionIdTransactionId = [{
+  'bidder': 'ozone',
+  'params': {
+    'publisherId': 'OZONENUK0001',
+    'siteId': '4204204201',
+    'placementId': '8000000330',
+    'customData': [
+      {
+        'settings': {},
+        'targeting': {
+          'sens': 'f',
+          'pt1': '/uk',
+          'pt5': [
+            'uk'
+          ],
+          'pt7': 'desktop',
+          'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+        }
+      }
+    ]
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': 'mpu_pbadslot_from_adunit',
+      'data': {
+        'pbadslot': 'mpu_pbadslot_from_adunit',
+        'adserver': {
+          'name': 'gam',
+          'adslot': '/22037345/projectozone'
+        }
+      },
+      'tid': 'f0dac8b5-09df-4da7-9d83-c99786d4517a'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'mpu',
+  'transactionId': 'f0dac8b5-09df-4da7-9d83-c99786d4517a',
+  'adUnitId': '715b4bdc-515f-488b-8633-333654e72f3f',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '3da18cc31f1dda',
+  'bidderRequestId': '263c3b0d970326',
+  'auctionId': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'ortb2': {
+    'source': {
+      'tid': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0'
+    },
+    'regs': {
+      'ext': {
+        'gdpr': 1,
+        'us_privacy': '1Y--'
+      }
+    },
+    'user': {
+      'ext': {
+        'consent': 'CQAaAwAQAaAwAAKA1AENA5EsAP_gAEPgACiQKRNV_G__bWlr8X73aftkeY1P9_h77sQxBhfJE-4FzLuW_JwXx2ExNA36tqIKmRIEu3bBIQNlHJDUTVCgaogVryDMakWcoTNKJ6BkiFMRO2dYCF5vmwtj-QKY5vr993dx2B-t_dv83dzyz4VHn3a5_2e0WJCdA58tDfv9bROb-9IPd_58v4v8_F_rE2_eT1l_tevp7D9-cts7_XW-9_fff79Ll_-mBwUcALMNCogDLIkJCDQMIIEAKgrCAigQAAAAkDRAQAmDAp2BgEusJEAIAUAAwQAgABRkACAAASABCIAIACgQAAQCBQAAgAACAQAMDAAGACwEAgABAdAhTAggUCwASMyIhTAgCgSCAlsqEEgCBBXCEIs8CCAREwUAAAJABWAAICwWAxJICViQQJcQbQAAEACAQQAVCKTswBBAGbLVXiibRlaQFo-ACjgAAAAA.YAAAAAAAAAAA'
+      }
+    },
+    'site': {
+      'domain': 'ardm.io',
+      'publisher': {
+        'domain': 'ardm.io'
+      },
+      'page': 'https://www.ardm.io/ozone/2.9.4/20240715-test-singlereq-optin.html?pbjs_debug=true'
+    },
+    'device': {
+      'w': 1609,
+      'h': 279,
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36',
+      'language': 'en'
+    }
+  }
+}];
+var valid6BidRequestsWithAuctionIdTransactionId = [{
+  'bidder': 'ozone',
+  'params': {
+    'publisherId': 'OZONENUK0001',
+    'siteId': '4204204201',
+    'placementId': '8000000330',
+    'customData': [
+      {
+        'settings': {},
+        'targeting': {
+          'sens': 'f',
+          'pt1': '/uk',
+          'pt5': [
+            'uk'
+          ],
+          'pt7': 'desktop',
+          'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+        }
+      }
+    ]
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': 'mpu_pbadslot_from_adunit',
+      'data': {
+        'pbadslot': 'mpu_pbadslot_from_adunit',
+        'adserver': {
+          'name': 'gam',
+          'adslot': '/22037345/projectozone'
+        }
+      },
+      'tid': 'f0dac8b5-09df-4da7-9d83-c99786d4517a'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'mpu',
+  'transactionId': 'f0dac8b5-09df-4da7-9d83-c99786d4517a',
+  'adUnitId': '715b4bdc-515f-488b-8633-333654e72f3f',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '3da18cc31f1dda',
+  'bidderRequestId': '263c3b0d970326',
+  'auctionId': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'ortb2': {
+    'source': {
+      'tid': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0'
+    },
+    'regs': {
+      'ext': {
+        'gdpr': 1,
+        'us_privacy': '1Y--'
+      }
+    },
+    'user': {
+      'ext': {
+        'consent': 'CQAaAwAQAaAwAAKA1AENA5EsAP_gAEPgACiQKRNV_G__bWlr8X73aftkeY1P9_h77sQxBhfJE-4FzLuW_JwXx2ExNA36tqIKmRIEu3bBIQNlHJDUTVCgaogVryDMakWcoTNKJ6BkiFMRO2dYCF5vmwtj-QKY5vr993dx2B-t_dv83dzyz4VHn3a5_2e0WJCdA58tDfv9bROb-9IPd_58v4v8_F_rE2_eT1l_tevp7D9-cts7_XW-9_fff79Ll_-mBwUcALMNCogDLIkJCDQMIIEAKgrCAigQAAAAkDRAQAmDAp2BgEusJEAIAUAAwQAgABRkACAAASABCIAIACgQAAQCBQAAgAACAQAMDAAGACwEAgABAdAhTAggUCwASMyIhTAgCgSCAlsqEEgCBBXCEIs8CCAREwUAAAJABWAAICwWAxJICViQQJcQbQAAEACAQQAVCKTswBBAGbLVXiibRlaQFo-ACjgAAAAA.YAAAAAAAAAAA'
+      }
+    },
+    'site': {
+      'domain': 'ardm.io',
+      'publisher': {
+        'domain': 'ardm.io'
+      },
+      'page': 'https://www.ardm.io/ozone/2.9.4/20240715-test-singlereq-optin.html?pbjs_debug=true'
+    },
+    'device': {
+      'w': 1609,
+      'h': 279,
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36',
+      'language': 'en'
+    }
+  }
+},
+{
+  'bidder': 'ozone',
+  'params': {
+    'publisherId': 'OZONENUK0001',
+    'siteId': '4204204201',
+    'placementId': '8000000330',
+    'customData': [
+      {
+        'settings': {},
+        'targeting': {
+          'sens': 'f',
+          'pt1': '/uk',
+          'pt5': [
+            'uk'
+          ],
+          'pt7': 'desktop',
+          'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+        }
+      }
+    ]
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': 'mpu_pbadslot_from_adunit',
+      'data': {
+        'pbadslot': 'mpu_pbadslot_from_adunit',
+        'adserver': {
+          'name': 'gam',
+          'adslot': '/22037345/projectozone'
+        }
+      },
+      'tid': 'f0dac8b5-09df-4da7-9d83-c99786d4517a'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'mpu2',
+  'transactionId': 'f0dac8b5-09df-4da7-9d83-c99786d4517a',
+  'adUnitId': '715b4bdc-515f-488b-8633-333654e72f3f',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '3da18cc31f1ddb',
+  'bidderRequestId': '263c3b0d970326',
+  'auctionId': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'ortb2': {
+    'source': {
+      'tid': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0'
+    },
+    'regs': {
+      'ext': {
+        'gdpr': 1,
+        'us_privacy': '1Y--'
+      }
+    },
+    'user': {
+      'ext': {
+        'consent': 'CQAaAwAQAaAwAAKA1AENA5EsAP_gAEPgACiQKRNV_G__bWlr8X73aftkeY1P9_h77sQxBhfJE-4FzLuW_JwXx2ExNA36tqIKmRIEu3bBIQNlHJDUTVCgaogVryDMakWcoTNKJ6BkiFMRO2dYCF5vmwtj-QKY5vr993dx2B-t_dv83dzyz4VHn3a5_2e0WJCdA58tDfv9bROb-9IPd_58v4v8_F_rE2_eT1l_tevp7D9-cts7_XW-9_fff79Ll_-mBwUcALMNCogDLIkJCDQMIIEAKgrCAigQAAAAkDRAQAmDAp2BgEusJEAIAUAAwQAgABRkACAAASABCIAIACgQAAQCBQAAgAACAQAMDAAGACwEAgABAdAhTAggUCwASMyIhTAgCgSCAlsqEEgCBBXCEIs8CCAREwUAAAJABWAAICwWAxJICViQQJcQbQAAEACAQQAVCKTswBBAGbLVXiibRlaQFo-ACjgAAAAA.YAAAAAAAAAAA'
+      }
+    },
+    'site': {
+      'domain': 'ardm.io',
+      'publisher': {
+        'domain': 'ardm.io'
+      },
+      'page': 'https://www.ardm.io/ozone/2.9.4/20240715-test-singlereq-optin.html?pbjs_debug=true'
+    },
+    'device': {
+      'w': 1609,
+      'h': 279,
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36',
+      'language': 'en'
+    }
+  }
+},
+{
+  'bidder': 'ozone',
+  'params': {
+    'publisherId': 'OZONENUK0001',
+    'siteId': '4204204201',
+    'placementId': '8000000330',
+    'customData': [
+      {
+        'settings': {},
+        'targeting': {
+          'sens': 'f',
+          'pt1': '/uk',
+          'pt5': [
+            'uk'
+          ],
+          'pt7': 'desktop',
+          'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+        }
+      }
+    ]
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': 'mpu_pbadslot_from_adunit',
+      'data': {
+        'pbadslot': 'mpu_pbadslot_from_adunit',
+        'adserver': {
+          'name': 'gam',
+          'adslot': '/22037345/projectozone'
+        }
+      },
+      'tid': 'f0dac8b5-09df-4da7-9d83-c99786d4517a'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'mpu3',
+  'transactionId': 'f0dac8b5-09df-4da7-9d83-c99786d4517a',
+  'adUnitId': '715b4bdc-515f-488b-8633-333654e72f3f',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '3da18cc31f1ddc',
+  'bidderRequestId': '263c3b0d970326',
+  'auctionId': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'ortb2': {
+    'source': {
+      'tid': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0'
+    },
+    'regs': {
+      'ext': {
+        'gdpr': 1,
+        'us_privacy': '1Y--'
+      }
+    },
+    'user': {
+      'ext': {
+        'consent': 'CQAaAwAQAaAwAAKA1AENA5EsAP_gAEPgACiQKRNV_G__bWlr8X73aftkeY1P9_h77sQxBhfJE-4FzLuW_JwXx2ExNA36tqIKmRIEu3bBIQNlHJDUTVCgaogVryDMakWcoTNKJ6BkiFMRO2dYCF5vmwtj-QKY5vr993dx2B-t_dv83dzyz4VHn3a5_2e0WJCdA58tDfv9bROb-9IPd_58v4v8_F_rE2_eT1l_tevp7D9-cts7_XW-9_fff79Ll_-mBwUcALMNCogDLIkJCDQMIIEAKgrCAigQAAAAkDRAQAmDAp2BgEusJEAIAUAAwQAgABRkACAAASABCIAIACgQAAQCBQAAgAACAQAMDAAGACwEAgABAdAhTAggUCwASMyIhTAgCgSCAlsqEEgCBBXCEIs8CCAREwUAAAJABWAAICwWAxJICViQQJcQbQAAEACAQQAVCKTswBBAGbLVXiibRlaQFo-ACjgAAAAA.YAAAAAAAAAAA'
+      }
+    },
+    'site': {
+      'domain': 'ardm.io',
+      'publisher': {
+        'domain': 'ardm.io'
+      },
+      'page': 'https://www.ardm.io/ozone/2.9.4/20240715-test-singlereq-optin.html?pbjs_debug=true'
+    },
+    'device': {
+      'w': 1609,
+      'h': 279,
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36',
+      'language': 'en'
+    }
+  }
+},
+{
+  'bidder': 'ozone',
+  'params': {
+    'publisherId': 'OZONENUK0001',
+    'siteId': '4204204201',
+    'placementId': '8000000330',
+    'customData': [
+      {
+        'settings': {},
+        'targeting': {
+          'sens': 'f',
+          'pt1': '/uk',
+          'pt5': [
+            'uk'
+          ],
+          'pt7': 'desktop',
+          'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+        }
+      }
+    ]
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': 'mpu_pbadslot_from_adunit',
+      'data': {
+        'pbadslot': 'mpu_pbadslot_from_adunit',
+        'adserver': {
+          'name': 'gam',
+          'adslot': '/22037345/projectozone'
+        }
+      },
+      'tid': 'f0dac8b5-09df-4da7-9d83-c99786d4517a'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'mpu4',
+  'transactionId': 'f0dac8b5-09df-4da7-9d83-c99786d4517a',
+  'adUnitId': '715b4bdc-515f-488b-8633-333654e72f3f',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '3da18cc31f1ddd',
+  'bidderRequestId': '263c3b0d970326',
+  'auctionId': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'ortb2': {
+    'source': {
+      'tid': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0'
+    },
+    'regs': {
+      'ext': {
+        'gdpr': 1,
+        'us_privacy': '1Y--'
+      }
+    },
+    'user': {
+      'ext': {
+        'consent': 'CQAaAwAQAaAwAAKA1AENA5EsAP_gAEPgACiQKRNV_G__bWlr8X73aftkeY1P9_h77sQxBhfJE-4FzLuW_JwXx2ExNA36tqIKmRIEu3bBIQNlHJDUTVCgaogVryDMakWcoTNKJ6BkiFMRO2dYCF5vmwtj-QKY5vr993dx2B-t_dv83dzyz4VHn3a5_2e0WJCdA58tDfv9bROb-9IPd_58v4v8_F_rE2_eT1l_tevp7D9-cts7_XW-9_fff79Ll_-mBwUcALMNCogDLIkJCDQMIIEAKgrCAigQAAAAkDRAQAmDAp2BgEusJEAIAUAAwQAgABRkACAAASABCIAIACgQAAQCBQAAgAACAQAMDAAGACwEAgABAdAhTAggUCwASMyIhTAgCgSCAlsqEEgCBBXCEIs8CCAREwUAAAJABWAAICwWAxJICViQQJcQbQAAEACAQQAVCKTswBBAGbLVXiibRlaQFo-ACjgAAAAA.YAAAAAAAAAAA'
+      }
+    },
+    'site': {
+      'domain': 'ardm.io',
+      'publisher': {
+        'domain': 'ardm.io'
+      },
+      'page': 'https://www.ardm.io/ozone/2.9.4/20240715-test-singlereq-optin.html?pbjs_debug=true'
+    },
+    'device': {
+      'w': 1609,
+      'h': 279,
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36',
+      'language': 'en'
+    }
+  }
+},
+{
+  'bidder': 'ozone',
+  'params': {
+    'publisherId': 'OZONENUK0001',
+    'siteId': '4204204201',
+    'placementId': '8000000330',
+    'customData': [
+      {
+        'settings': {},
+        'targeting': {
+          'sens': 'f',
+          'pt1': '/uk',
+          'pt5': [
+            'uk'
+          ],
+          'pt7': 'desktop',
+          'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+        }
+      }
+    ]
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': 'mpu_pbadslot_from_adunit',
+      'data': {
+        'pbadslot': 'mpu_pbadslot_from_adunit',
+        'adserver': {
+          'name': 'gam',
+          'adslot': '/22037345/projectozone'
+        }
+      },
+      'tid': 'f0dac8b5-09df-4da7-9d83-c99786d4517a'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'mpu5',
+  'transactionId': 'f0dac8b5-09df-4da7-9d83-c99786d4517a',
+  'adUnitId': '715b4bdc-515f-488b-8633-333654e72f3f',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '3da18cc31f1dde',
+  'bidderRequestId': '263c3b0d970326',
+  'auctionId': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'ortb2': {
+    'source': {
+      'tid': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0'
+    },
+    'regs': {
+      'ext': {
+        'gdpr': 1,
+        'us_privacy': '1Y--'
+      }
+    },
+    'user': {
+      'ext': {
+        'consent': 'CQAaAwAQAaAwAAKA1AENA5EsAP_gAEPgACiQKRNV_G__bWlr8X73aftkeY1P9_h77sQxBhfJE-4FzLuW_JwXx2ExNA36tqIKmRIEu3bBIQNlHJDUTVCgaogVryDMakWcoTNKJ6BkiFMRO2dYCF5vmwtj-QKY5vr993dx2B-t_dv83dzyz4VHn3a5_2e0WJCdA58tDfv9bROb-9IPd_58v4v8_F_rE2_eT1l_tevp7D9-cts7_XW-9_fff79Ll_-mBwUcALMNCogDLIkJCDQMIIEAKgrCAigQAAAAkDRAQAmDAp2BgEusJEAIAUAAwQAgABRkACAAASABCIAIACgQAAQCBQAAgAACAQAMDAAGACwEAgABAdAhTAggUCwASMyIhTAgCgSCAlsqEEgCBBXCEIs8CCAREwUAAAJABWAAICwWAxJICViQQJcQbQAAEACAQQAVCKTswBBAGbLVXiibRlaQFo-ACjgAAAAA.YAAAAAAAAAAA'
+      }
+    },
+    'site': {
+      'domain': 'ardm.io',
+      'publisher': {
+        'domain': 'ardm.io'
+      },
+      'page': 'https://www.ardm.io/ozone/2.9.4/20240715-test-singlereq-optin.html?pbjs_debug=true'
+    },
+    'device': {
+      'w': 1609,
+      'h': 279,
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36',
+      'language': 'en'
+    }
+  }
+},
+{
+  'bidder': 'ozone',
+  'params': {
+    'publisherId': 'OZONENUK0001',
+    'siteId': '4204204201',
+    'placementId': '8000000330',
+    'customData': [
+      {
+        'settings': {},
+        'targeting': {
+          'sens': 'f',
+          'pt1': '/uk',
+          'pt5': [
+            'uk'
+          ],
+          'pt7': 'desktop',
+          'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+        }
+      }
+    ]
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': 'mpu_pbadslot_from_adunit',
+      'data': {
+        'pbadslot': 'mpu_pbadslot_from_adunit',
+        'adserver': {
+          'name': 'gam',
+          'adslot': '/22037345/projectozone'
+        }
+      },
+      'tid': 'f0dac8b5-09df-4da7-9d83-c99786d4517a'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'mpu6',
+  'transactionId': 'f0dac8b5-09df-4da7-9d83-c99786d4517a',
+  'adUnitId': '715b4bdc-515f-488b-8633-333654e72f3f',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '3da18cc31f1ddf',
+  'bidderRequestId': '263c3b0d970326',
+  'auctionId': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'ortb2': {
+    'source': {
+      'tid': 'a9c479d0-d9cc-4505-a0a6-5982ce8fb8f0'
+    },
+    'regs': {
+      'ext': {
+        'gdpr': 1,
+        'us_privacy': '1Y--'
+      }
+    },
+    'user': {
+      'ext': {
+        'consent': 'CQAaAwAQAaAwAAKA1AENA5EsAP_gAEPgACiQKRNV_G__bWlr8X73aftkeY1P9_h77sQxBhfJE-4FzLuW_JwXx2ExNA36tqIKmRIEu3bBIQNlHJDUTVCgaogVryDMakWcoTNKJ6BkiFMRO2dYCF5vmwtj-QKY5vr993dx2B-t_dv83dzyz4VHn3a5_2e0WJCdA58tDfv9bROb-9IPd_58v4v8_F_rE2_eT1l_tevp7D9-cts7_XW-9_fff79Ll_-mBwUcALMNCogDLIkJCDQMIIEAKgrCAigQAAAAkDRAQAmDAp2BgEusJEAIAUAAwQAgABRkACAAASABCIAIACgQAAQCBQAAgAACAQAMDAAGACwEAgABAdAhTAggUCwASMyIhTAgCgSCAlsqEEgCBBXCEIs8CCAREwUAAAJABWAAICwWAxJICViQQJcQbQAAEACAQQAVCKTswBBAGbLVXiibRlaQFo-ACjgAAAAA.YAAAAAAAAAAA'
+      }
+    },
+    'site': {
+      'domain': 'ardm.io',
+      'publisher': {
+        'domain': 'ardm.io'
+      },
+      'page': 'https://www.ardm.io/ozone/2.9.4/20240715-test-singlereq-optin.html?pbjs_debug=true'
+    },
+    'device': {
+      'w': 1609,
+      'h': 279,
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36',
+      'language': 'en'
+    }
+  }
+}];
 var validBidRequestsWithUserIdData = [
   {
     adUnitCode: 'div-gpt-ad-1460505748561-0',
@@ -401,6 +1095,66 @@ var validBidderRequest = {
   start: 1536838908987,
   timeout: 3000
 };
+var validBidderRequestWithCookieDeprecation = {
+  auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+  auctionStart: 1536838908986,
+  bidderCode: 'ozone',
+  bidderRequestId: '1c1586b27a1b5c8',
+  bids: [{
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'ozone',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }],
+  doneCbCallCount: 1,
+  start: 1536838908987,
+  timeout: 3000,
+  ortb2: {
+    'device': {
+      'w': 1617,
+      'h': 317,
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36',
+      'language': 'en',
+      'sua': {
+        'source': 1,
+        'platform': {
+          'brand': 'macOS'
+        },
+        'browsers': [
+          {
+            'brand': 'Google Chrome',
+            'version': [
+              '125'
+            ]
+          },
+          {
+            'brand': 'Chromium',
+            'version': [
+              '125'
+            ]
+          },
+          {
+            'brand': 'Not.A/Brand',
+            'version': [
+              '24'
+            ]
+          }
+        ],
+        'mobile': 0
+      },
+      'ext': {
+        'cdep': 'fake_control_2'
+      }
+    }
+  }
+};
 var bidderRequestWithFullGdpr = {
   auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
   auctionStart: 1536838908986,
@@ -1814,7 +2568,7 @@ describe('ozone Adapter', function () {
     });
     it('should add gdpr consent information to the request when ozone is true', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest;
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: true,
@@ -1832,7 +2586,7 @@ describe('ozone Adapter', function () {
     });
     it('should add gdpr consent information to the request when vendorData is missing vendorConsents (Mirror)', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest;
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: true,
@@ -1848,7 +2602,7 @@ describe('ozone Adapter', function () {
     });
     it('should set regs.ext.gdpr flag to 0 when gdprApplies is false', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest;
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: false,
@@ -1863,9 +2617,24 @@ describe('ozone Adapter', function () {
       const payload = JSON.parse(request.data);
       expect(payload.regs.ext.gdpr).to.equal(0);
     });
+    it('should set gpp and gpp_sid when available', function() {
+      let gppString = 'gppConsentString';
+      let gppSections = [7, 8, 9];
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {regs: {gpp: gppString, gpp_sid: gppSections}};
+      const request = spec.buildRequests(validBidRequestsNoSizes, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.regs.gpp).to.equal(gppString);
+      expect(payload.regs.gpp_sid).to.have.same.members(gppSections);
+    });
+    it('should not set gpp and gpp_sid keys when not available', function() {
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload).to.not.contain.keys(['gpp', 'gpp_sid', 'ext', 'regs']);
+    });
     it('should not have imp[N].ext.ozone.userId', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest;
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: false,
@@ -1876,7 +2645,7 @@ describe('ozone Adapter', function () {
           purposeConsents: {1: true, 2: true, 3: true, 4: true, 5: true}
         }
       };
-      let bidRequests = validBidRequests;
+      let bidRequests = JSON.parse(JSON.stringify(validBidRequests));
       bidRequests[0]['userId'] = {
         'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
         'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
@@ -1891,23 +2660,12 @@ describe('ozone Adapter', function () {
       const payload = JSON.parse(request.data);
       let firstBid = payload.imp[0].ext.ozone;
       expect(firstBid).to.not.have.property('userId');
-      delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
     });
     it('should pick up the value of pubcid when built using the pubCommonId module (not userId)', function () {
       let bidRequests = validBidRequests;
-      bidRequests[0]['userId'] = {
-        'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-        'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
-        'idl_env': '3333',
-        'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
-        'tdid': '6666',
-        'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
-      };
-      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
       const request = spec.buildRequests(bidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.pubcid).to.equal(bidRequests[0]['crumbs']['pubcid']);
-      delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
     });
     it('should add a user.ext.eids object to contain user ID data in the new location (Nov 2019) Updated Aug 2020', function() {
       const request = spec.buildRequests(validBidRequestsWithUserIdData, validBidderRequest);
@@ -2056,7 +2814,7 @@ describe('ozone Adapter', function () {
       const data = JSON.parse(request.data);
       expect(data.imp[0].ext.gpid).to.equal('/22037345/projectozone');
     });
-    it('should batch into 10s if config is set', function () {
+    it('should batch into 10s if config is set to true', function () {
       config.setConfig({ozone: {'batchRequests': true}});
       var specMock = utils.deepClone(spec);
       let arrReq = [];
@@ -2069,6 +2827,83 @@ describe('ozone Adapter', function () {
       expect(request.length).to.equal(3);
       config.resetConfig();
     });
+    it('should batch into 7 if config is set to 7', function () {
+      config.setConfig({ozone: {'batchRequests': 7}});
+      var specMock = utils.deepClone(spec);
+      let arrReq = [];
+      for (let i = 0; i < 25; i++) {
+        let b = validBidRequests[0];
+        b.adUnitCode += i;
+        arrReq.push(b);
+      }
+      const request = specMock.buildRequests(arrReq, validBidderRequest);
+      expect(request.length).to.equal(4);
+      config.resetConfig();
+    });
+    it('should not batch if config is set to false and singleRequest is true', function () {
+      config.setConfig({ozone: {'batchRequests': false, 'singleRequest': true}});
+      var specMock = utils.deepClone(spec);
+      let arrReq = [];
+      for (let i = 0; i < 15; i++) {
+        let b = validBidRequests[0];
+        b.adUnitCode += i;
+        arrReq.push(b);
+      }
+      const request = specMock.buildRequests(arrReq, validBidderRequest);
+      expect(request.method).to.equal('POST');
+      config.resetConfig();
+    });
+    it('should not batch if config is set to invalid value -10 and singleRequest is true', function () {
+      config.setConfig({ozone: {'batchRequests': -10, 'singleRequest': true}});
+      var specMock = utils.deepClone(spec);
+      let arrReq = [];
+      for (let i = 0; i < 15; i++) {
+        let b = validBidRequests[0];
+        b.adUnitCode += i;
+        arrReq.push(b);
+      }
+      const request = specMock.buildRequests(arrReq, validBidderRequest);
+      expect(request.method).to.equal('POST');
+      config.resetConfig();
+    });
+    it('should use GET values for batchRequests if found', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'batchRequests': '5'};
+      };
+      let arrReq = [];
+      for (let i = 0; i < 25; i++) {
+        let b = validBidRequests[0];
+        b.adUnitCode += i;
+        arrReq.push(b);
+      }
+      let request = specMock.buildRequests(arrReq, validBidderRequest);
+      expect(request.length).to.equal(5); // 5 x 5 = 25
+      specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'batchRequests': '10'}; // the built in function will return '10' (string)
+      };
+      request = specMock.buildRequests(arrReq, validBidderRequest);
+      expect(request.length).to.equal(3); // 10, 10, 5
+      specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'batchRequests': true};
+      };
+      request = specMock.buildRequests(arrReq, validBidderRequest);
+      expect(request.method).to.equal('POST'); // no batching - GET param must be numeric
+      specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'batchRequests': 'true'};
+      };
+      request = specMock.buildRequests(arrReq, validBidderRequest);
+      expect(request.method).to.equal('POST'); // no batching - GET param must be numeric
+      specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'batchRequests': -5};
+      };
+      request = specMock.buildRequests(arrReq, validBidderRequest);
+      expect(request.method).to.equal('POST'); // no batching
+    });
     it('should use GET values auction=dev & cookiesync=dev if set', function() {
       var specMock = utils.deepClone(spec);
       specMock.getGetParametersAsObject = function() {
@@ -2282,6 +3117,67 @@ describe('ozone Adapter', function () {
       expect(data.source.ext).to.haveOwnProperty('schain');
       expect(data.source.ext.schain).to.deep.equal(schainConfigObject); // .deep.equal() : Target object deeply (but not strictly) equals `{a: 1}`
     });
+    it('should find ortb2 cookieDeprecation values', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequestWithCookieDeprecation));
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.ozone.cookieDeprecationLabel).to.equal('fake_control_2');
+    });
+    it('should set ortb2 cookieDeprecation to "none" if there is none', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.ozone.cookieDeprecationLabel).to.equal('none');
+    });
+    it('should handle fledge requests', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      let bidRequests = JSON.parse(JSON.stringify(validBidRequests));
+      deepSetValue(bidRequests[0], 'ortb2Imp.ext.ae', 1);
+      bidderRequest.fledgeEnabled = true;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].ext.ae).to.equal(1);
+    });
+    it('Single request: should use ortb auction ID & transaction ID values if set (this will be the case when publisher opts in with config)', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.propertyBag.whitelabel = null;
+      config.setConfig({'ozone': {'singleRequest': true}});
+      specMock.loadWhitelabelData(validBidRequestsWithAuctionIdTransactionId[0]);
+      const request = specMock.buildRequests(validBidRequestsWithAuctionIdTransactionId, validBidderRequest); // I don't look in the bidderRequest for this - there's no point
+      expect(request).to.be.an('Object');
+      const payload = JSON.parse(request.data);
+      expect(payload.source.tid).to.equal(validBidRequestsWithAuctionIdTransactionId[0].ortb2.source.tid);
+      expect(payload.imp[0].ext.ozone.auctionId).to.equal(validBidRequestsWithAuctionIdTransactionId[0].ortb2.source.tid);
+      expect(payload.imp[0].ext.ozone.transactionId).to.equal(validBidRequestsWithAuctionIdTransactionId[0].ortb2Imp.ext.tid);
+      config.resetConfig();
+    });
+    it('non-Single request: should use ortb auction ID & transaction ID values if set (this will be the case when publisher opts in with config)', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.propertyBag.whitelabel = null;
+      config.setConfig({'ozone': {'singleRequest': false}});
+      specMock.loadWhitelabelData(validBidRequestsWithAuctionIdTransactionId[0]);
+      const request = specMock.buildRequests(validBidRequestsWithAuctionIdTransactionId, validBidderRequest); // I don't look in the bidderRequest for this - there's no point
+      expect(request).to.be.an('Array');
+      const payload = JSON.parse(request[0].data);
+      expect(payload.source.tid).to.equal(validBidRequestsWithAuctionIdTransactionId[0].ortb2.source.tid);
+      expect(payload.imp[0].ext.ozone.auctionId).to.equal(validBidRequestsWithAuctionIdTransactionId[0].ortb2.source.tid);
+      expect(payload.imp[0].ext.ozone.transactionId).to.equal(validBidRequestsWithAuctionIdTransactionId[0].ortb2Imp.ext.tid);
+      config.resetConfig();
+    });
+    it('Batch request (flat array of single requests): should use ortb auction ID & transaction ID values if set (this will be the case when publisher opts in with config)', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.propertyBag.whitelabel = null;
+      config.setConfig({'ozone': {'batchRequests': 3}});
+      specMock.loadWhitelabelData(valid6BidRequestsWithAuctionIdTransactionId[0]);
+      const request = specMock.buildRequests(valid6BidRequestsWithAuctionIdTransactionId, validBidderRequest); // I don't look in the bidderRequest for this - there's no point
+      expect(request).to.be.an('Array');
+      expect(request).to.have.lengthOf(2);
+      const payload = JSON.parse(request[0].data);
+      expect(payload.source.tid).to.equal(valid6BidRequestsWithAuctionIdTransactionId[0].ortb2.source.tid);
+      expect(payload.imp[0].ext.ozone.auctionId).to.equal(valid6BidRequestsWithAuctionIdTransactionId[0].ortb2.source.tid);
+      expect(payload.imp[0].ext.ozone.transactionId).to.equal(valid6BidRequestsWithAuctionIdTransactionId[0].ortb2Imp.ext.tid);
+      config.resetConfig();
+    });
   });
   describe('interpretResponse', function () {
     beforeEach(function () {
@@ -2496,6 +3392,20 @@ describe('ozone Adapter', function () {
       const bid = result[0];
       expect(bid.mediaType).to.equal('video');
     });
+    it('should handle fledge response', function () {
+      const req = spec.buildRequests(validBidRequests, validBidderRequest);
+      let objResp = JSON.parse(JSON.stringify(validResponse));
+      objResp.body.ext = {igi: [{
+        'impid': '1',
+        'igb': [{
+          'origin': 'https://paapi.dsp.com',
+          'pbs': '{"key": "value"}'
+        }]
+      }]};
+      const result = spec.interpretResponse(objResp, req);
+      expect(result).to.be.an('object');
+      expect(result.fledgeAuctionConfigs[0]['impid']).to.equal('1');
+    });
   });
   describe('userSyncs', function () {
     it('should fail gracefully if no server response', function () {
@@ -2527,6 +3437,10 @@ describe('ozone Adapter', function () {
       expect(result).to.be.an('array');
       expect(result[0].url).to.include('usp_consent=&');
     });
+    it('should add gpp if its present', function () {
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', gdpr1, '1---', { gppString: 'gppStringHere', applicableSections: [7, 8, 9] });
+      expect(result[0].url).to.include('gpp=gppStringHere&gpp_sid=7,8,9');
+    });
   });
   describe('video object utils', function () {
     it('should find width & height from video object', function () {
@@ -2685,7 +3599,7 @@ describe('ozone Adapter', function () {
     });
   });
   describe('addVideoDefaults', function() {
-    it('should correctly add video defaults', function () {
+    it('should not add video defaults if there is no videoParams config', function () {
       let mediaTypes = {
         playerSize: [640, 480],
         mimes: ['video/mp4'],
@@ -2702,12 +3616,14 @@ describe('ozone Adapter', function () {
         testKey: 'child value'
       };
       let result = spec.addVideoDefaults({}, mediaTypes, mediaTypes);
-      expect(result.placement).to.equal(3);
+      expect(result.placement).to.be.undefined;
       expect(result.skip).to.equal(0);
       result = spec.addVideoDefaults({}, mediaTypes, bid_params_video);
       expect(result.skip).to.equal(1);
     });
-    it('should correctly add video defaults including skippable in parent', function () {
+    it('should correctly add video defaults if page config videoParams is defined, also check skip in the parent', function () {
+      var specMock = utils.deepClone(spec);
+      specMock.propertyBag.whitelabel.videoParams = {outstream: 3, instream: 1};
       let mediaTypes = {
         playerSize: [640, 480],
         mimes: ['video/mp4'],
@@ -2723,7 +3639,7 @@ describe('ozone Adapter', function () {
         skipafter: 5,
         testKey: 'child value'
       };
-      let result = spec.addVideoDefaults({}, mediaTypes, bid_params_video);
+      let result = specMock.addVideoDefaults({}, mediaTypes, bid_params_video);
       expect(result.placement).to.equal(3);
       expect(result.skip).to.equal(1);
     });
@@ -2759,6 +3675,7 @@ describe('ozone Adapter', function () {
       let testKey2 = 'ozone.singleRequest';
       let markbidder_config2 = specMock.getWhitelabelConfigItem(testKey2);
       expect(markbidder_config2).to.equal('markbidder-singlerequest-value');
+      config.resetConfig();
     });
   });
   describe('setBidMediaTypeIfNotExist', function() {
diff --git a/test/spec/modules/paapiForGpt_spec.js b/test/spec/modules/paapiForGpt_spec.js
new file mode 100644
index 00000000000..9a6637f82aa
--- /dev/null
+++ b/test/spec/modules/paapiForGpt_spec.js
@@ -0,0 +1,216 @@
+import {
+  getPAAPISizeHook,
+  onAuctionConfigFactory,
+  setPAAPIConfigFactory, setTargetingHookFactory,
+  slotConfigurator
+} from 'modules/paapiForGpt.js';
+import * as gptUtils from '../../../libraries/gptUtils/gptUtils.js';
+import 'modules/appnexusBidAdapter.js';
+import 'modules/rubiconBidAdapter.js';
+import {deepSetValue} from '../../../src/utils.js';
+import {config} from 'src/config.js';
+
+describe('paapiForGpt module', () => {
+  let sandbox, fledgeAuctionConfig;
+
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+    fledgeAuctionConfig = {
+      seller: 'bidder',
+      mock: 'config'
+    };
+  });
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  describe('slotConfigurator', () => {
+    let setGptConfig;
+    function mockGptSlot(auPath) {
+      return {
+        setConfig: sinon.stub(),
+        getAdUnitPath: () => auPath
+      }
+    }
+    beforeEach(() => {
+      setGptConfig = slotConfigurator();
+    });
+
+    Object.entries({
+      'single slot': [mockGptSlot('mock/gpt/au')],
+      'multiple slots': [mockGptSlot('mock/gpt/au'), mockGptSlot('mock/gpt/au2')]
+    }).forEach(([t, gptSlots]) => {
+      describe(`when ad unit code matches ${t}`, () => {
+        it('should set GPT slot config', () => {
+          setGptConfig('au', gptSlots, [fledgeAuctionConfig]);
+          gptSlots.forEach(slot => {
+            sinon.assert.calledWith(slot.setConfig, {
+              componentAuction: [{
+                configKey: 'bidder',
+                auctionConfig: fledgeAuctionConfig,
+              }]
+            });
+          })
+        });
+        describe('when reset = true', () => {
+          it('should reset GPT slot config', () => {
+            setGptConfig('au', gptSlots, [fledgeAuctionConfig]);
+            gptSlots.forEach(slot => slot.setConfig.resetHistory());
+            setGptConfig('au', gptSlots, [], true);
+            gptSlots.forEach(slot => {
+              sinon.assert.calledWith(slot.setConfig, {
+                componentAuction: [{
+                  configKey: 'bidder',
+                  auctionConfig: null
+                }]
+              });
+            })
+          });
+
+          it('should reset only sellers with no fresh config', () => {
+            setGptConfig('au', gptSlots, [{seller: 's1'}, {seller: 's2'}]);
+            gptSlots.forEach(slot => slot.setConfig.resetHistory());
+            setGptConfig('au', gptSlots, [{seller: 's1'}], true);
+            gptSlots.forEach(slot => {
+              sinon.assert.calledWith(slot.setConfig, {
+                componentAuction: [{
+                  configKey: 's1',
+                  auctionConfig: {seller: 's1'}
+                }, {
+                  configKey: 's2',
+                  auctionConfig: null
+                }]
+              })
+            })
+          });
+
+          it('should not reset sellers that were already reset', () => {
+            setGptConfig('au', gptSlots, [{seller: 's1'}]);
+            setGptConfig('au', gptSlots, [], true);
+            gptSlots.forEach(slot => slot.setConfig.resetHistory());
+            setGptConfig('au', gptSlots, [], true);
+            gptSlots.forEach(slot => sinon.assert.notCalled(slot.setConfig));
+          })
+
+          it('should keep track of configuration history by ad unit', () => {
+            setGptConfig('au1', gptSlots, [{seller: 's1'}]);
+            setGptConfig('au1', gptSlots, [{seller: 's2'}], false);
+            setGptConfig('au2', gptSlots, [{seller: 's3'}]);
+            gptSlots.forEach(slot => slot.setConfig.resetHistory());
+            setGptConfig('au1', gptSlots, [], true);
+            gptSlots.forEach(slot => {
+              sinon.assert.calledWith(slot.setConfig, {
+                componentAuction: [{
+                  configKey: 's1',
+                  auctionConfig: null
+                }, {
+                  configKey: 's2',
+                  auctionConfig: null
+                }]
+              });
+            })
+          })
+        });
+      })
+    })
+  });
+  describe('setTargeting hook', () => {
+    let setPaapiConfig, setTargetingHook, next;
+    beforeEach(() => {
+      setPaapiConfig = sinon.stub()
+      setTargetingHook = setTargetingHookFactory(setPaapiConfig);
+      next = sinon.stub();
+    });
+    function expectFilters(...filters) {
+      expect(setPaapiConfig.args.length).to.eql(filters.length)
+      filters.forEach(filter => {
+        sinon.assert.calledWith(setPaapiConfig, filter, 'mock-matcher')
+      })
+    }
+    function runHook(adUnit) {
+      setTargetingHook(next, adUnit, 'mock-matcher');
+      sinon.assert.calledWith(next, adUnit, 'mock-matcher');
+    }
+    it('should invoke with no filters when adUnit is undef', () => {
+      runHook();
+      expectFilters(undefined);
+    });
+    it('should invoke once when adUnit is a string', () => {
+      runHook('mock-au');
+      expectFilters({adUnitCode: 'mock-au'})
+    });
+    it('should invoke once per ad unit when an array', () => {
+      runHook(['au1', 'au2']);
+      expectFilters({adUnitCode: 'au1'}, {adUnitCode: 'au2'});
+    })
+  })
+  describe('setPAAPIConfigForGpt', () => {
+    let getPAAPIConfig, setGptConfig, getSlots, setPAAPIConfigForGPT;
+    beforeEach(() => {
+      getPAAPIConfig = sinon.stub();
+      setGptConfig = sinon.stub();
+      getSlots = sinon.stub().callsFake((codes) => Object.fromEntries(codes.map(code => [code, ['mock-slot']])))
+      setPAAPIConfigForGPT = setPAAPIConfigFactory(getPAAPIConfig, setGptConfig, getSlots);
+    });
+
+    Object.entries({
+      missing: null,
+      empty: {}
+    }).forEach(([t, configs]) => {
+      it(`does not set GPT slot config when config is ${t}`, () => {
+        getPAAPIConfig.returns(configs);
+        setPAAPIConfigForGPT('mock-filters');
+        sinon.assert.calledWith(getPAAPIConfig, 'mock-filters');
+        sinon.assert.notCalled(setGptConfig);
+      })
+    });
+
+    it('passes customSlotMatching to getSlots', () => {
+      getPAAPIConfig.returns({au1: {}});
+      setPAAPIConfigForGPT('mock-filters', 'mock-custom-matching');
+      sinon.assert.calledWith(getSlots, ['au1'], 'mock-custom-matching');
+    })
+
+    it('sets GPT slot config for each ad unit that has PAAPI config, and resets the rest', () => {
+      const cfg = {
+        au1: {
+          componentAuctions: [{seller: 's1'}, {seller: 's2'}]
+        },
+        au2: {
+          componentAuctions: [{seller: 's3'}]
+        },
+        au3: null
+      }
+      getPAAPIConfig.returns(cfg);
+      setPAAPIConfigForGPT('mock-filters');
+      sinon.assert.calledWith(getPAAPIConfig, 'mock-filters');
+      Object.entries(cfg).forEach(([au, config]) => {
+        sinon.assert.calledWith(setGptConfig, au, ['mock-slot'], config?.componentAuctions ?? [], true);
+      })
+    });
+  });
+
+  describe('getPAAPISizeHook', () => {
+    let next;
+    beforeEach(() => {
+      next = sinon.stub();
+      next.bail = sinon.stub();
+    });
+
+    it('should pick largest supported size over larger unsupported size', () => {
+      getPAAPISizeHook(next, [[999, 999], [300, 250], [300, 600], [1234, 4321]]);
+      sinon.assert.calledWith(next.bail, [300, 600]);
+    });
+
+    Object.entries({
+      'present': [],
+      'supported': [[123, 4], [321, 5]],
+      'defined': undefined,
+    }).forEach(([t, sizes]) => {
+      it(`should defer to next when no size is ${t}`, () => {
+        getPAAPISizeHook(next, sizes);
+        sinon.assert.calledWith(next, sizes);
+      })
+    })
+  })
+});
diff --git a/test/spec/modules/paapi_spec.js b/test/spec/modules/paapi_spec.js
new file mode 100644
index 00000000000..c41419074ad
--- /dev/null
+++ b/test/spec/modules/paapi_spec.js
@@ -0,0 +1,1857 @@
+import {expect} from 'chai';
+import {config} from '../../../src/config.js';
+import adapterManager from '../../../src/adapterManager.js';
+import * as utils from '../../../src/utils.js';
+import {deepAccess, deepClone} from '../../../src/utils.js';
+import {hook} from '../../../src/hook.js';
+import 'modules/appnexusBidAdapter.js';
+import 'modules/rubiconBidAdapter.js';
+import {
+  addPaapiConfigHook,
+  addPaapiData,
+  ASYNC_SIGNALS,
+  buyersToAuctionConfigs,
+  getPAAPIConfig,
+  getPAAPISize,
+  IGB_TO_CONFIG,
+  mergeBuyers,
+  onAuctionInit,
+  parallelPaapiProcessing,
+  parseExtIgi,
+  parseExtPrebidFledge,
+  partitionBuyers,
+  partitionBuyersByBidder,
+  registerSubmodule,
+  reset,
+  setImpExtAe,
+  setResponsePaapiConfigs
+} from 'modules/paapi.js';
+import * as events from 'src/events.js';
+import {EVENTS} from 'src/constants.js';
+import {getGlobal} from '../../../src/prebidGlobal.js';
+import {auctionManager} from '../../../src/auctionManager.js';
+import {stubAuctionIndex} from '../../helpers/indexStub.js';
+import {AuctionIndex} from '../../../src/auctionIndex.js';
+
+describe('paapi module', () => {
+  let sandbox;
+  before(reset);
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+  afterEach(() => {
+    sandbox.restore();
+    reset();
+  });
+
+  describe(`using paapi configuration`, () => {
+    let getPAAPISizeStub;
+
+    function getPAAPISizeHook(next, sizes) {
+      next.bail(getPAAPISizeStub(sizes));
+    }
+
+    before(() => {
+      getPAAPISize.before(getPAAPISizeHook, 100);
+    });
+
+    after(() => {
+      getPAAPISize.getHooks({hook: getPAAPISizeHook}).remove();
+    });
+
+    beforeEach(() => {
+      getPAAPISizeStub = sinon.stub();
+    });
+
+    describe('getPAAPIConfig', function () {
+      let nextFnSpy, auctionConfig, paapiConfig;
+      before(() => {
+        config.setConfig({paapi: {enabled: true}});
+      });
+      beforeEach(() => {
+        auctionConfig = {
+          seller: 'bidder',
+          mock: 'config'
+        };
+        paapiConfig = {
+          config: auctionConfig
+        };
+        nextFnSpy = sinon.spy();
+      });
+
+      describe('on a single auction', function () {
+        const auctionId = 'aid';
+        beforeEach(function () {
+          sandbox.stub(auctionManager, 'index').value(stubAuctionIndex({auctionId}));
+        });
+
+        it('should call next()', function () {
+          const request = {auctionId, adUnitCode: 'auc'};
+          addPaapiConfigHook(nextFnSpy, request, paapiConfig);
+          sinon.assert.calledWith(nextFnSpy, request, paapiConfig);
+        });
+
+        describe('igb', () => {
+          let igb1, igb2, buyerAuctionConfig;
+          beforeEach(() => {
+            igb1 = {
+              origin: 'buyer.1'
+            };
+            igb2 = {
+              origin: 'buyer.2'
+            };
+            buyerAuctionConfig = {
+              seller: 'seller',
+              decisionLogicURL: 'seller-decision-logic'
+            };
+            config.mergeConfig({
+              paapi: {
+                componentSeller: {
+                  auctionConfig: buyerAuctionConfig
+                }
+              }
+            });
+          });
+
+          function addIgb(request, igb) {
+            addPaapiConfigHook(nextFnSpy, Object.assign({auctionId}, request), {igb});
+          }
+
+          it('should be collected into an auction config', () => {
+            addIgb({adUnitCode: 'au1'}, igb1);
+            addIgb({adUnitCode: 'au1'}, igb2);
+            events.emit(EVENTS.AUCTION_END, {auctionId, adUnitCodes: ['au1']});
+            const buyerConfig = getPAAPIConfig({auctionId}).au1.componentAuctions[0];
+            sinon.assert.match(buyerConfig, {
+              interestGroupBuyers: [igb1.origin, igb2.origin],
+              ...buyerAuctionConfig
+            });
+          });
+
+          describe('FPD', () => {
+            let ortb2, ortb2Imp;
+            beforeEach(() => {
+              ortb2 = {'fpd': 1};
+              ortb2Imp = {'fpd': 2};
+            });
+
+            function getBuyerAuctionConfig() {
+              addIgb({adUnitCode: 'au1', ortb2, ortb2Imp}, igb1);
+              events.emit(EVENTS.AUCTION_END, {auctionId, adUnitCodes: ['au1']});
+              return getPAAPIConfig({auctionId}).au1.componentAuctions[0];
+            }
+
+            it('should be added to auction config', () => {
+              sinon.assert.match(getBuyerAuctionConfig().perBuyerSignals[igb1.origin], {
+                prebid: {
+                  ortb2,
+                  ortb2Imp
+                }
+              });
+            });
+
+            it('should not override existing perBuyerSignals', () => {
+              const original = {
+                ortb2: {
+                  fpd: 'original'
+                }
+              };
+              igb1.pbs = {
+                prebid: deepClone(original)
+              };
+              sinon.assert.match(getBuyerAuctionConfig().perBuyerSignals[igb1.origin], {
+                prebid: original
+              });
+            });
+          });
+        });
+
+        describe('should collect auction configs', () => {
+          let cf1, cf2;
+          beforeEach(() => {
+            cf1 = {...auctionConfig, id: 1, seller: 'b1'};
+            cf2 = {...auctionConfig, id: 2, seller: 'b2'};
+            addPaapiConfigHook(nextFnSpy, {auctionId, adUnitCode: 'au1'}, {config: cf1});
+            addPaapiConfigHook(nextFnSpy, {auctionId, adUnitCode: 'au2'}, {config: cf2});
+            events.emit(EVENTS.AUCTION_END, {auctionId, adUnitCodes: ['au1', 'au2', 'au3']});
+          });
+
+          it('and make them available at end of auction', () => {
+            sinon.assert.match(getPAAPIConfig({auctionId}), {
+              au1: {
+                componentAuctions: [cf1]
+              },
+              au2: {
+                componentAuctions: [cf2]
+              }
+            });
+          });
+
+          it('and filter them by ad unit', () => {
+            const cfg = getPAAPIConfig({auctionId, adUnitCode: 'au1'});
+            expect(Object.keys(cfg)).to.have.members(['au1']);
+            sinon.assert.match(cfg.au1, {
+              componentAuctions: [cf1]
+            });
+          });
+
+          it('and not return them again', () => {
+            getPAAPIConfig();
+            const cfg = getPAAPIConfig();
+            expect(cfg).to.eql({});
+          });
+
+          describe('includeBlanks = true', () => {
+            it('includes all ad units', () => {
+              const cfg = getPAAPIConfig({}, true);
+              expect(Object.keys(cfg)).to.have.members(['au1', 'au2', 'au3']);
+              expect(cfg.au3).to.eql(null);
+            });
+            it('includes the targeted adUnit', () => {
+              expect(getPAAPIConfig({adUnitCode: 'au3'}, true)).to.eql({
+                au3: null
+              });
+            });
+            it('includes the targeted auction', () => {
+              const cfg = getPAAPIConfig({auctionId}, true);
+              expect(Object.keys(cfg)).to.have.members(['au1', 'au2', 'au3']);
+              expect(cfg.au3).to.eql(null);
+            });
+            it('does not include non-existing ad units', () => {
+              expect(getPAAPIConfig({adUnitCode: 'other'})).to.eql({});
+            });
+            it('does not include non-existing auctions', () => {
+              expect(getPAAPIConfig({auctionId: 'other'})).to.eql({});
+            });
+          });
+        });
+
+        it('should drop auction configs after end of auction', () => {
+          events.emit(EVENTS.AUCTION_END, {auctionId});
+          addPaapiConfigHook(nextFnSpy, {auctionId, adUnitCode: 'au'}, paapiConfig);
+          expect(getPAAPIConfig({auctionId})).to.eql({});
+        });
+
+        describe('FPD', () => {
+          let ortb2, ortb2Imp;
+          beforeEach(() => {
+            ortb2 = {fpd: 1};
+            ortb2Imp = {fpd: 2};
+          });
+
+          function getComponentAuctionConfig() {
+            addPaapiConfigHook(nextFnSpy, {
+              auctionId,
+              adUnitCode: 'au1',
+              ortb2: {fpd: 1},
+              ortb2Imp: {fpd: 2}
+            }, paapiConfig);
+            events.emit(EVENTS.AUCTION_END, {auctionId});
+            return getPAAPIConfig({auctionId}).au1.componentAuctions[0];
+          }
+
+          it('should be added to auctionSignals', () => {
+            sinon.assert.match(getComponentAuctionConfig().auctionSignals, {
+              prebid: {ortb2, ortb2Imp}
+            });
+          });
+          it('should not override existing auctionSignals', () => {
+            auctionConfig.auctionSignals = {prebid: {ortb2: {fpd: 'original'}}};
+            sinon.assert.match(getComponentAuctionConfig().auctionSignals, {
+              prebid: {
+                ortb2: {fpd: 'original'},
+                ortb2Imp
+              }
+            });
+          });
+
+          it('should be added to perBuyerSignals', () => {
+            auctionConfig.interestGroupBuyers = ['buyer.1', 'buyer.2'];
+            const pbs = getComponentAuctionConfig().perBuyerSignals;
+            sinon.assert.match(pbs, {
+              'buyer.1': {prebid: {ortb2, ortb2Imp}},
+              'buyer.2': {prebid: {ortb2, ortb2Imp}}
+            });
+          });
+
+          it('should not override existing perBuyerSignals', () => {
+            auctionConfig.interestGroupBuyers = ['buyer'];
+            const original = {
+              prebid: {
+                ortb2: {
+                  fpd: 'original'
+                }
+              }
+            };
+            auctionConfig.perBuyerSignals = {
+              buyer: deepClone(original)
+            };
+            sinon.assert.match(getComponentAuctionConfig().perBuyerSignals.buyer, original);
+          });
+        });
+
+        describe('submodules', () => {
+          let submods;
+          beforeEach(() => {
+            submods = [1, 2].map(i => ({
+              name: `test${i}`,
+              onAuctionConfig: sinon.stub()
+            }));
+            submods.forEach(registerSubmodule);
+          });
+
+          describe('onAuctionConfig', () => {
+            const auctionId = 'aid';
+            it('is invoked with null configs when there\'s no config', () => {
+              events.emit(EVENTS.AUCTION_END, {auctionId, adUnitCodes: ['au']});
+              submods.forEach(submod => sinon.assert.calledWith(submod.onAuctionConfig, auctionId, {au: null}));
+            });
+            it('is invoked with relevant configs', () => {
+              addPaapiConfigHook(nextFnSpy, {auctionId, adUnitCode: 'au1'}, paapiConfig);
+              addPaapiConfigHook(nextFnSpy, {auctionId, adUnitCode: 'au2'}, paapiConfig);
+              events.emit(EVENTS.AUCTION_END, {auctionId, adUnitCodes: ['au1', 'au2', 'au3']});
+              submods.forEach(submod => {
+                sinon.assert.calledWith(submod.onAuctionConfig, auctionId, {
+                  au1: {componentAuctions: [auctionConfig]},
+                  au2: {componentAuctions: [auctionConfig]},
+                  au3: null
+                });
+              });
+            });
+          });
+        });
+
+        describe('floor signal', () => {
+          before(() => {
+            if (!getGlobal().convertCurrency) {
+              getGlobal().convertCurrency = () => null;
+              getGlobal().convertCurrency.mock = true;
+            }
+          });
+          after(() => {
+            if (getGlobal().convertCurrency.mock) {
+              delete getGlobal().convertCurrency;
+            }
+          });
+
+          beforeEach(() => {
+            sandbox.stub(getGlobal(), 'convertCurrency').callsFake((amount, from, to) => {
+              if (from === to) return amount;
+              if (from === 'USD' && to === 'JPY') return amount * 100;
+              if (from === 'JPY' && to === 'USD') return amount / 100;
+              throw new Error('unexpected currency conversion');
+            });
+          });
+
+          Object.entries({
+            'bids': (payload, values) => {
+              payload.bidsReceived = values
+                .map((val) => ({adUnitCode: 'au', cpm: val.amount, currency: val.cur}))
+                .concat([{adUnitCode: 'other', cpm: 10000, currency: 'EUR'}]);
+            },
+            'no bids': (payload, values) => {
+              payload.bidderRequests = values
+                .map((val) => ({
+                  bids: [{
+                    adUnitCode: 'au',
+                    getFloor: () => ({floor: val.amount, currency: val.cur})
+                  }]
+                }))
+                .concat([{bids: {adUnitCode: 'other', getFloor: () => ({floor: -10000, currency: 'EUR'})}}]);
+            }
+          }).forEach(([tcase, setup]) => {
+            describe(`when auction has ${tcase}`, () => {
+              Object.entries({
+                'no currencies': {
+                  values: [{amount: 1}, {amount: 100}, {amount: 10}, {amount: 100}],
+                  'bids': {
+                    bidfloor: 100,
+                    bidfloorcur: undefined
+                  },
+                  'no bids': {
+                    bidfloor: 1,
+                    bidfloorcur: undefined,
+                  }
+                },
+                'only zero values': {
+                  values: [{amount: 0, cur: 'USD'}, {amount: 0, cur: 'JPY'}],
+                  'bids': {
+                    bidfloor: undefined,
+                    bidfloorcur: undefined,
+                  },
+                  'no bids': {
+                    bidfloor: undefined,
+                    bidfloorcur: undefined,
+                  }
+                },
+                'matching currencies': {
+                  values: [{amount: 10, cur: 'JPY'}, {amount: 100, cur: 'JPY'}],
+                  'bids': {
+                    bidfloor: 100,
+                    bidfloorcur: 'JPY',
+                  },
+                  'no bids': {
+                    bidfloor: 10,
+                    bidfloorcur: 'JPY',
+                  }
+                },
+                'mixed currencies': {
+                  values: [{amount: 10, cur: 'USD'}, {amount: 10, cur: 'JPY'}],
+                  'bids': {
+                    bidfloor: 10,
+                    bidfloorcur: 'USD'
+                  },
+                  'no bids': {
+                    bidfloor: 10,
+                    bidfloorcur: 'JPY',
+                  }
+                }
+              }).forEach(([t, testConfig]) => {
+                const values = testConfig.values;
+                const {bidfloor, bidfloorcur} = testConfig[tcase];
+
+                describe(`with ${t}`, () => {
+                  let payload;
+                  beforeEach(() => {
+                    payload = {auctionId};
+                    setup(payload, values);
+                  });
+
+                  it('should populate bidfloor/bidfloorcur', () => {
+                    addPaapiConfigHook(nextFnSpy, {auctionId, adUnitCode: 'au'}, paapiConfig);
+                    events.emit(EVENTS.AUCTION_END, payload);
+                    const cfg = getPAAPIConfig({auctionId}).au;
+                    const signals = cfg.auctionSignals;
+                    sinon.assert.match(cfg.componentAuctions[0].auctionSignals, signals || {});
+                    expect(signals?.prebid?.bidfloor).to.eql(bidfloor);
+                    expect(signals?.prebid?.bidfloorcur).to.eql(bidfloorcur);
+                  });
+                });
+              });
+            });
+          });
+        });
+
+        describe('requestedSize', () => {
+          let adUnit;
+          beforeEach(() => {
+            adUnit = {
+              code: 'au',
+            };
+          });
+
+          function getConfig() {
+            addPaapiConfigHook(nextFnSpy, {auctionId, adUnitCode: adUnit.code}, paapiConfig);
+            events.emit(EVENTS.AUCTION_END, {auctionId, adUnitCodes: [adUnit.code], adUnits: [adUnit]});
+            return getPAAPIConfig()[adUnit.code];
+          }
+
+          Object.entries({
+            'adUnit.ortb2Imp.ext.paapi.requestedSize'() {
+              adUnit.ortb2Imp = {
+                ext: {
+                  paapi: {
+                    requestedSize: {
+                      width: 123,
+                      height: 321
+                    }
+                  }
+                }
+              };
+            },
+            'largest size'() {
+              getPAAPISizeStub.returns([123, 321]);
+            }
+          }).forEach(([t, setup]) => {
+            describe(`should be set from ${t}`, () => {
+              beforeEach(setup);
+
+              it('without overriding component auctions, if set', () => {
+                auctionConfig.requestedSize = {width: '1px', height: '2px'};
+                expect(getConfig().componentAuctions[0].requestedSize).to.eql({
+                  width: '1px',
+                  height: '2px'
+                });
+              });
+
+              it('on component auction, if missing', () => {
+                expect(getConfig().componentAuctions[0].requestedSize).to.eql({
+                  width: 123,
+                  height: 321
+                });
+              });
+
+              it('on top level auction', () => {
+                expect(getConfig().requestedSize).to.eql({
+                  width: 123,
+                  height: 321,
+                });
+              });
+            });
+          });
+        });
+      });
+
+      describe('with multiple auctions', () => {
+        const AUCTION1 = 'auction1';
+        const AUCTION2 = 'auction2';
+
+        function mockAuction(auctionId) {
+          return {
+            getAuctionId() {
+              return auctionId;
+            }
+          };
+        }
+
+        function expectAdUnitsFromAuctions(actualConfig, auToAuctionMap) {
+          expect(Object.keys(actualConfig)).to.have.members(Object.keys(auToAuctionMap));
+          Object.entries(actualConfig).forEach(([au, cfg]) => {
+            cfg.componentAuctions.forEach(cmp => expect(cmp.auctionId).to.eql(auToAuctionMap[au]));
+          });
+        }
+
+        let configs;
+        beforeEach(() => {
+          const mockAuctions = [mockAuction(AUCTION1), mockAuction(AUCTION2)];
+          sandbox.stub(auctionManager, 'index').value(new AuctionIndex(() => mockAuctions));
+          configs = {[AUCTION1]: {}, [AUCTION2]: {}};
+          Object.entries({
+            [AUCTION1]: [['au1', 'au2'], ['missing-1']],
+            [AUCTION2]: [['au2', 'au3'], []],
+          }).forEach(([auctionId, [adUnitCodes, noConfigAdUnitCodes]]) => {
+            adUnitCodes.forEach(adUnitCode => {
+              const cfg = {...auctionConfig, auctionId, adUnitCode};
+              configs[auctionId][adUnitCode] = cfg;
+              addPaapiConfigHook(nextFnSpy, {auctionId, adUnitCode}, {config: cfg});
+            });
+            events.emit(EVENTS.AUCTION_END, {auctionId, adUnitCodes: adUnitCodes.concat(noConfigAdUnitCodes)});
+          });
+        });
+
+        it('should filter by auction', () => {
+          expectAdUnitsFromAuctions(getPAAPIConfig({auctionId: AUCTION1}), {au1: AUCTION1, au2: AUCTION1});
+          expectAdUnitsFromAuctions(getPAAPIConfig({auctionId: AUCTION2}), {au2: AUCTION2, au3: AUCTION2});
+        });
+
+        it('should filter by auction and ad unit', () => {
+          expectAdUnitsFromAuctions(getPAAPIConfig({auctionId: AUCTION1, adUnitCode: 'au2'}), {au2: AUCTION1});
+          expectAdUnitsFromAuctions(getPAAPIConfig({auctionId: AUCTION2, adUnitCode: 'au2'}), {au2: AUCTION2});
+        });
+
+        it('should use last auction for each ad unit', () => {
+          expectAdUnitsFromAuctions(getPAAPIConfig(), {au1: AUCTION1, au2: AUCTION2, au3: AUCTION2});
+        });
+
+        it('should filter by ad unit and use latest auction', () => {
+          expectAdUnitsFromAuctions(getPAAPIConfig({adUnitCode: 'au2'}), {au2: AUCTION2});
+        });
+
+        it('should keep track of which configs were returned', () => {
+          expectAdUnitsFromAuctions(getPAAPIConfig({auctionId: AUCTION1}), {au1: AUCTION1, au2: AUCTION1});
+          expect(getPAAPIConfig({auctionId: AUCTION1})).to.eql({});
+          expectAdUnitsFromAuctions(getPAAPIConfig(), {au2: AUCTION2, au3: AUCTION2});
+        });
+
+        describe('includeBlanks = true', () => {
+          Object.entries({
+            'auction with blanks': {
+              filters: {auctionId: AUCTION1},
+              expected: {au1: true, au2: true, 'missing-1': false}
+            },
+            'blank adUnit in an auction': {
+              filters: {auctionId: AUCTION1, adUnitCode: 'missing-1'},
+              expected: {'missing-1': false}
+            },
+            'non-existing auction': {
+              filters: {auctionId: 'other'},
+              expected: {}
+            },
+            'non-existing adUnit in an auction': {
+              filters: {auctionId: AUCTION2, adUnitCode: 'other'},
+              expected: {}
+            },
+            'non-existing ad unit': {
+              filters: {adUnitCode: 'other'},
+              expected: {},
+            },
+            'non existing ad unit in a non-existing auction': {
+              filters: {adUnitCode: 'other', auctionId: 'other'},
+              expected: {}
+            },
+            'all ad units': {
+              filters: {},
+              expected: {'au1': true, 'au2': true, 'missing-1': false, 'au3': true}
+            }
+          }).forEach(([t, {filters, expected}]) => {
+            it(t, () => {
+              const cfg = getPAAPIConfig(filters, true);
+              expect(Object.keys(cfg)).to.have.members(Object.keys(expected));
+              Object.entries(expected).forEach(([au, shouldBeFilled]) => {
+                if (shouldBeFilled) {
+                  expect(cfg[au]).to.not.be.null;
+                } else {
+                  expect(cfg[au]).to.be.null;
+                }
+              });
+            });
+          });
+        });
+      });
+    });
+
+    describe('markForFledge', function () {
+      const navProps = Object.fromEntries(['runAdAuction', 'joinAdInterestGroup'].map(p => [p, navigator[p]]));
+      let adUnits;
+
+      before(function () {
+        // navigator.runAdAuction & co may not exist, so we can't stub it normally with
+        // sinon.stub(navigator, 'runAdAuction') or something
+        Object.keys(navProps).forEach(p => {
+          navigator[p] = sinon.stub();
+        });
+        hook.ready();
+        config.resetConfig();
+      });
+
+      after(function () {
+        Object.entries(navProps).forEach(([p, orig]) => navigator[p] = orig);
+      });
+
+      beforeEach(() => {
+        getPAAPISizeStub = sinon.stub();
+        adUnits = [{
+          'code': '/19968336/header-bid-tag1',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[728, 90]]
+            },
+          },
+          'bids': [
+            {
+              'bidder': 'appnexus',
+            },
+            {
+              'bidder': 'rubicon',
+            },
+          ]
+        }];
+      });
+
+      afterEach(function () {
+        config.resetConfig();
+      });
+
+      describe('makeBidRequests', () => {
+        function mark() {
+          return Object.fromEntries(
+            adapterManager.makeBidRequests(
+              adUnits,
+              Date.now(),
+              utils.getUniqueIdentifierStr(),
+              function callback() {
+              },
+              []
+            ).map(b => [b.bidderCode, b])
+          );
+        }
+
+        function expectFledgeFlags(...enableFlags) {
+          const bidRequests = mark();
+          expect(bidRequests.appnexus.paapi?.enabled).to.eql(enableFlags[0].enabled);
+          bidRequests.appnexus.bids.forEach(bid => expect(bid.ortb2Imp.ext.ae).to.eql(enableFlags[0].ae));
+
+          expect(bidRequests.rubicon.paapi?.enabled).to.eql(enableFlags[1].enabled);
+          bidRequests.rubicon.bids.forEach(bid => expect(bid.ortb2Imp?.ext?.ae).to.eql(enableFlags[1].ae));
+
+          Object.values(bidRequests).flatMap(req => req.bids).forEach(bid => {
+            if (bid.ortb2Imp?.ext?.ae) {
+              sinon.assert.match(bid.ortb2Imp.ext.igs, {
+                ae: bid.ortb2Imp.ext.ae,
+                biddable: 1
+              });
+            }
+          });
+        }
+
+        describe('with setConfig()', () => {
+          it('should set paapi.enabled correctly per bidder', function () {
+            config.setConfig({
+              bidderSequence: 'fixed',
+              paapi: {
+                enabled: true,
+                bidders: ['appnexus'],
+                defaultForSlots: 1,
+              }
+            });
+            expectFledgeFlags({enabled: true, ae: 1}, {enabled: false, ae: 0});
+          });
+
+          it('should set paapi.enabled correctly for all bidders', function () {
+            config.setConfig({
+              bidderSequence: 'fixed',
+              paapi: {
+                enabled: true,
+                defaultForSlots: 1,
+              }
+            });
+            expectFledgeFlags({enabled: true, ae: 1}, {enabled: true, ae: 1});
+          });
+
+          Object.entries({
+            'not set': {
+              cfg: {},
+              componentSeller: false
+            },
+            'set': {
+              cfg: {
+                componentSeller: {
+                  auctionConfig: {
+                    decisionLogicURL: 'publisher.example'
+                  }
+                }
+              },
+              componentSeller: true
+            }
+          }).forEach(([t, {cfg, componentSeller}]) => {
+            it(`should set request paapi.componentSeller = ${componentSeller} when config componentSeller is ${t}`, () => {
+              config.setConfig({
+                paapi: {
+                  enabled: true,
+                  defaultForSlots: 1,
+                  ...cfg
+                }
+              });
+              Object.values(mark()).forEach(br => expect(br.paapi?.componentSeller).to.eql(componentSeller));
+            });
+          });
+        });
+      });
+      describe('addPaapiData', () => {
+        function getEnrichedAdUnits() {
+          const next = sinon.stub();
+          addPaapiData(next, adUnits);
+          sinon.assert.calledWith(next, adUnits);
+          return adUnits;
+        }
+
+        function getImpExt() {
+          const next = sinon.stub();
+          addPaapiData(next, adUnits);
+          sinon.assert.calledWith(next, adUnits);
+          return {
+            global: adUnits[0].ortb2Imp?.ext,
+            ...Object.fromEntries(adUnits[0].bids.map(bid => [bid.bidder, bid.ortb2Imp?.ext]))
+          }
+        }
+
+        it('should not override pub-defined ext.ae', () => {
+          config.setConfig({
+            paapi: {
+              enabled: true,
+              defaultForSlots: 1,
+            }
+          });
+          Object.assign(adUnits[0], {ortb2Imp: {ext: {ae: 0}}});
+          sinon.assert.match(getImpExt(), {
+            global: {
+              ae: 0,
+            },
+            rubicon: undefined,
+            appnexus: undefined
+          });
+        });
+
+        it('should override per-bidder when excluded via paapi.bidders', () => {
+          config.setConfig({
+            paapi: {
+              enabled: true,
+              defaultForSlots: 1,
+              bidders: ['rubicon']
+            }
+          })
+          sinon.assert.match(getImpExt(), {
+            global: {
+              ae: 1,
+              igs: {
+                ae: 1,
+                biddable: 1
+              }
+            },
+            rubicon: undefined,
+            appnexus: {
+              ae: 0,
+              igs: {
+                ae: 0,
+                biddable: 0
+              }
+            }
+          })
+        })
+
+        it('should populate ext.igs when request has ext.ae', () => {
+          config.setConfig({
+            paapi: {
+              enabled: true
+            }
+          });
+          Object.assign(adUnits[0], {ortb2Imp: {ext: {ae: 3}}});
+          sinon.assert.match(getImpExt(), {
+            global: {
+              ae: 3,
+              igs: {
+                ae: 3,
+                biddable: 1
+              }
+            },
+            rubicon: undefined,
+            appnexus: undefined,
+          });
+        });
+
+        it('should not override pub-defined ext.igs', () => {
+          config.setConfig({
+            paapi: {
+              enabled: true
+            }
+          });
+          Object.assign(adUnits[0], {ortb2Imp: {ext: {ae: 1, igs: {biddable: 0}}}});
+          sinon.assert.match(getImpExt(), {
+            global: {
+              ae: 1,
+              igs: {
+                ae: 1,
+                biddable: 0
+              }
+            },
+            rubicon: undefined,
+            appnexus: undefined
+          })
+        });
+
+        it('should fill ext.ae from ext.igs, if defined', () => {
+          config.setConfig({
+            paapi: {
+              enabled: true
+            }
+          });
+          Object.assign(adUnits[0], {ortb2Imp: {ext: {igs: {}}}});
+          sinon.assert.match(getImpExt(), {
+            global: {
+              ae: 1,
+              igs: {
+                ae: 1,
+                biddable: 1
+              }
+            },
+            appnexus: undefined,
+            rubicon: undefined
+          })
+        });
+
+        describe('ortb2Imp.ext.paapi.requestedSize', () => {
+          beforeEach(() => {
+            config.setConfig({
+              paapi: {
+                enabled: true,
+                defaultForSlots: 1,
+              }
+            });
+          });
+
+          it('should default to value returned by getPAAPISize', () => {
+            getPAAPISizeStub.returns([123, 321]);
+            expect(getImpExt().global.paapi).to.eql({
+              requestedSize: {
+                width: 123,
+                height: 321
+              }
+            });
+          });
+
+          it('should not be overridden, if provided by the pub', () => {
+            adUnits[0].ortb2Imp = {
+              ext: {
+                paapi: {
+                  requestedSize: {
+                    width: '123px',
+                    height: '321px'
+                  }
+                }
+              }
+            };
+            expect(getImpExt().global.paapi).to.eql({
+              requestedSize: {
+                width: '123px',
+                height: '321px'
+              }
+            })
+            sinon.assert.notCalled(getPAAPISizeStub);
+          });
+
+          it('should not be set if adUnit has no banner sizes', () => {
+            adUnits[0].mediaTypes = {
+              video: {}
+            };
+            expect(getImpExt().global?.paapi?.requestedSize).to.not.exist;
+          });
+        });
+      });
+    });
+  });
+
+  describe('igb', () => {
+    let igb1, igb2;
+    const buyer1 = 'https://buyer1.example';
+    const buyer2 = 'https://buyer2.example';
+    beforeEach(() => {
+      igb1 = {
+        origin: buyer1,
+        cur: 'EUR',
+        maxbid: 1,
+        pbs: {
+          signal: 1
+        },
+        ps: {
+          priority: 1
+        }
+      };
+      igb2 = {
+        origin: buyer2,
+        cur: 'USD',
+        maxbid: 2,
+        pbs: {
+          signal: 2
+        },
+        ps: {
+          priority: 2
+        }
+      };
+    });
+
+    describe('mergeBuyers', () => {
+      it('should merge multiple igb into a partial auction config', () => {
+        sinon.assert.match(mergeBuyers([igb1, igb2]), {
+          interestGroupBuyers: [buyer1, buyer2],
+          perBuyerCurrencies: {
+            [buyer1]: 'EUR',
+            [buyer2]: 'USD'
+          },
+          perBuyerSignals: {
+            [buyer1]: {
+              signal: 1
+            },
+            [buyer2]: {
+              signal: 2
+            }
+          },
+          perBuyerPrioritySignals: {
+            [buyer1]: {
+              priority: 1
+            },
+            [buyer2]: {
+              priority: 2
+            }
+          },
+          auctionSignals: {
+            prebid: {
+              perBuyerMaxbid: {
+                [buyer1]: 1,
+                [buyer2]: 2
+              }
+            }
+          }
+        });
+      });
+
+      Object.entries(IGB_TO_CONFIG).forEach(([igbField, configField]) => {
+        it(`should not set ${configField} if ${igbField} is undefined`, () => {
+          delete igb1[igbField];
+          expect(deepAccess(mergeBuyers([igb1, igb2]), configField)[buyer1]).to.not.exist;
+        });
+      });
+
+      it('ignores igbs that have no origin', () => {
+        delete igb1.origin;
+        expect(mergeBuyers([igb1, igb2])).to.eql(mergeBuyers([igb2]));
+      });
+
+      it('ignores igbs with duplicate origin', () => {
+        igb2.origin = igb1.origin;
+        expect(mergeBuyers([igb1, igb2])).to.eql(mergeBuyers([igb1]));
+      });
+    });
+
+    describe('partitionBuyers', () => {
+      it('should return a single partition when there are no duplicates', () => {
+        expect(partitionBuyers([igb1, igb2])).to.eql([[igb1, igb2]]);
+      });
+      it('should ignore igbs that have no origin', () => {
+        delete igb1.origin;
+        expect(partitionBuyers([igb1, igb2])).to.eql([[igb2]]);
+      });
+      it('should return a single partition when duplicates exist, but do not conflict', () => {
+        expect(partitionBuyers([igb1, igb2, deepClone(igb1)])).to.eql([[igb1, igb2]]);
+      });
+      it('should return multiple partitions when there are conflicts', () => {
+        const igb3 = deepClone(igb1);
+        const igb4 = deepClone(igb1);
+        igb3.pbs.signal = 'conflict';
+        igb4.ps.signal = 'conflict';
+        expect(partitionBuyers([igb1, igb2, igb3, igb4])).to.eql([
+          [igb1, igb2],
+          [igb3],
+          [igb4]
+        ]);
+      });
+    });
+
+    describe('partitionBuyersByBidder', () => {
+      it('should split requests by bidder', () => {
+        expect(partitionBuyersByBidder([[{bidder: 'a'}, igb1], [{bidder: 'b'}, igb2]])).to.eql([
+          [{bidder: 'a'}, [igb1]],
+          [{bidder: 'b'}, [igb2]]
+        ]);
+      });
+
+      it('accepts repeated buyers, if from different bidders', () => {
+        expect(partitionBuyersByBidder([
+          [{bidder: 'a', extra: 'data'}, igb1],
+          [{bidder: 'b', more: 'data'}, igb1],
+          [{bidder: 'a'}, igb2],
+          [{bidder: 'b'}, igb2]
+        ])).to.eql([
+          [{bidder: 'a', extra: 'data'}, [igb1, igb2]],
+          [{bidder: 'b', more: 'data'}, [igb1, igb2]]
+        ]);
+      });
+      describe('buyersToAuctionConfig', () => {
+        let config, partitioners, merge, igbRequests;
+        beforeEach(() => {
+          config = {
+            auctionConfig: {
+              decisionLogicURL: 'mock-decision-logic'
+            }
+          };
+          partitioners = {
+            compact: sinon.stub(),
+            expand: sinon.stub(),
+          };
+          let i = 0;
+          merge = sinon.stub().callsFake(() => ({config: i++}));
+          igbRequests = [
+            [{}, igb1],
+            [{}, igb2]
+          ];
+        });
+
+        function toAuctionConfig(reqs = igbRequests) {
+          return buyersToAuctionConfigs(reqs, merge, config, partitioners);
+        }
+
+        it('uses compact partitions by default, and returns an auction config for each one', () => {
+          partitioners.compact.returns([[{}, 1], [{}, 2]]);
+          const [cf1, cf2] = toAuctionConfig();
+          sinon.assert.match(cf1[1], {
+            ...config.auctionConfig,
+            config: 0
+          });
+          sinon.assert.match(cf2[1], {
+            ...config.auctionConfig,
+            config: 1
+          });
+          sinon.assert.calledWith(partitioners.compact, igbRequests);
+          [1, 2].forEach(mockPart => sinon.assert.calledWith(merge, mockPart));
+        });
+
+        it('uses per-bidder partition when config has separateAuctions', () => {
+          config.separateAuctions = true;
+          partitioners.expand.returns([]);
+          toAuctionConfig();
+          sinon.assert.called(partitioners.expand);
+        });
+
+        it('does not return any auction config when configuration does not specify auctionConfig', () => {
+          delete config.auctionConfig;
+          expect(toAuctionConfig()).to.eql([]);
+          Object.values(partitioners).forEach(part => sinon.assert.notCalled(part));
+        });
+
+        it('sets FPD in auction signals when partitioner returns it', () => {
+          const fpd = {
+            ortb2: {fpd: 1},
+            ortb2Imp: {fpd: 2}
+          };
+          partitioners.compact.returns([[{}], [fpd]]);
+          const [cf1, cf2] = toAuctionConfig();
+          expect(cf1[1].auctionSignals?.prebid).to.not.exist;
+          expect(cf2[1].auctionSignals.prebid).to.eql(fpd);
+        });
+      });
+    });
+  });
+
+  describe('getPAAPISize', () => {
+    before(() => {
+      getPAAPISize.getHooks().remove();
+    });
+
+    Object.entries({
+      'ignores placeholders': {
+        in: [[1, 1], [0, 0], [3, 4]],
+        out: [3, 4]
+      },
+      'picks largest size by area': {
+        in: [[200, 100], [150, 150]],
+        out: [150, 150]
+      },
+      'can handle no sizes': {
+        in: [],
+        out: undefined
+      },
+      'can handle no input': {
+        in: undefined,
+        out: undefined
+      },
+      'can handle placeholder sizes': {
+        in: [[1, 1]],
+        out: undefined
+      }
+    }).forEach(([t, {in: input, out}]) => {
+      it(t, () => {
+        expect(getPAAPISize(input)).to.eql(out);
+      });
+    });
+  });
+
+  describe('parallel PAAPI auctions', () => {
+    describe('parallellPaapiProcessing', () => {
+      let next, spec, bids, bidderRequest, restOfTheArgs, mockConfig, mockAuction, bidsReceived, bidderRequests, adUnitCodes, adUnits;
+
+      beforeEach(() => {
+        next = sinon.stub();
+        spec = {
+          code: 'mockBidder',
+        };
+        bids = [{
+          bidder: 'mockBidder',
+          bidId: 'bidId',
+          adUnitCode: 'au',
+          auctionId: 'aid',
+          mediaTypes: {
+            banner: {
+              sizes: [[123, 321]]
+            }
+          }
+        }];
+        bidderRequest = {auctionId: 'aid', bidderCode: 'mockBidder', paapi: {enabled: true}, bids};
+        restOfTheArgs = [{more: 'args'}];
+        mockConfig = {
+          seller: 'mock.seller',
+          decisionLogicURL: 'mock.seller/decisionLogic',
+          interestGroupBuyers: ['mock.buyer']
+        }
+        mockAuction = {};
+        bidsReceived = [{adUnitCode: 'au', cpm: 1}];
+        adUnits = [{code: 'au'}]
+        adUnitCodes = ['au'];
+        bidderRequests = [bidderRequest];
+        sandbox.stub(auctionManager.index, 'getAuction').callsFake(() => mockAuction);
+        sandbox.stub(auctionManager.index, 'getAdUnit').callsFake((req) => bids.find(bid => bid.adUnitCode === req.adUnitCode))
+        config.setConfig({paapi: {enabled: true}});
+      });
+
+      afterEach(() => {
+        sinon.assert.calledWith(next, spec, bids, bidderRequest, ...restOfTheArgs);
+        config.resetConfig();
+      });
+
+      function startParallel() {
+        parallelPaapiProcessing(next, spec, bids, bidderRequest, ...restOfTheArgs);
+        onAuctionInit({auctionId: 'aid'})
+      }
+
+      function endAuction() {
+        events.emit(EVENTS.AUCTION_END, {auctionId: 'aid', bidsReceived, bidderRequests, adUnitCodes, adUnits})
+      }
+
+      describe('should have no effect when', () => {
+        afterEach(() => {
+          expect(getPAAPIConfig({}, true)).to.eql({au: null});
+        })
+        it('spec has no buildPAAPIConfigs', () => {
+          startParallel();
+        });
+        Object.entries({
+          'returns no configs': () => { spec.buildPAAPIConfigs = sinon.stub().callsFake(() => []); },
+          'throws': () => { spec.buildPAAPIConfigs = sinon.stub().callsFake(() => { throw new Error() }) },
+          'returns too little config': () => { spec.buildPAAPIConfigs = sinon.stub().callsFake(() => [ {bidId: 'bidId', config: {seller: 'mock.seller'}} ]) },
+          'bidder is not paapi enabled': () => {
+            bidderRequest.paapi.enabled = false;
+            spec.buildPAAPIConfigs = sinon.stub().callsFake(() => [{config: mockConfig, bidId: 'bidId'}])
+          },
+          'paapi module is not enabled': () => {
+            delete bidderRequest.paapi;
+            spec.buildPAAPIConfigs = sinon.stub().callsFake(() => [{config: mockConfig, bidId: 'bidId'}])
+          },
+          'bidId points to missing bid': () => { spec.buildPAAPIConfigs = sinon.stub().callsFake(() => [{config: mockConfig, bidId: 'missing'}]) }
+        }).forEach(([t, setup]) => {
+          it(`buildPAAPIConfigs ${t}`, () => {
+            setup();
+            startParallel();
+          });
+        });
+      });
+
+      function resolveConfig(auctionConfig) {
+        return Promise.all(
+          Object.entries(auctionConfig)
+            .map(([key, value]) => Promise.resolve(value).then(value => [key, value]))
+        ).then(result => Object.fromEntries(result))
+      }
+
+      describe('when buildPAAPIConfigs returns valid config', () => {
+        let builtCfg;
+        beforeEach(() => {
+          builtCfg = [{bidId: 'bidId', config: mockConfig}];
+          spec.buildPAAPIConfigs = sinon.stub().callsFake(() => builtCfg);
+        });
+
+        it('should make async config available from getPAAPIConfig', () => {
+          startParallel();
+          const actual = getPAAPIConfig();
+          const promises = Object.fromEntries(ASYNC_SIGNALS.map(signal => [signal, sinon.match((arg) => arg instanceof Promise)]))
+          sinon.assert.match(actual, {
+            au: sinon.match({
+              ...promises,
+              requestedSize: {
+                width: 123,
+                height: 321
+              },
+              componentAuctions: [
+                sinon.match({
+                  ...mockConfig,
+                  ...promises,
+                  requestedSize: {
+                    width: 123,
+                    height: 321
+                  }
+                })
+              ]
+            })
+          });
+        });
+
+        it('should work when called multiple times for the same auction', () => {
+          startParallel();
+          spec.buildPAAPIConfigs = sinon.stub().callsFake(() => []);
+          startParallel();
+          expect(getPAAPIConfig().au.componentAuctions.length).to.eql(1);
+        });
+
+        it('should hide TIDs from buildPAAPIConfigs', () => {
+          config.setConfig({enableTIDs: false});
+          startParallel();
+          sinon.assert.calledWith(
+            spec.buildPAAPIConfigs,
+            sinon.match(bidRequests => bidRequests.every(req => req.auctionId == null)),
+            sinon.match(bidderRequest => bidderRequest.auctionId == null)
+          );
+        });
+
+        it('should show TIDs when enabled', () => {
+          config.setConfig({enableTIDs: true});
+          startParallel();
+          sinon.assert.calledWith(
+            spec.buildPAAPIConfigs,
+            sinon.match(bidRequests => bidRequests.every(req => req.auctionId === 'aid')),
+            sinon.match(bidderRequest => bidderRequest.auctionId === 'aid')
+          )
+        })
+
+        it('should respect requestedSize from adapter', () => {
+          mockConfig.requestedSize = {width: 1, height: 2};
+          startParallel();
+          sinon.assert.match(getPAAPIConfig().au, {
+            requestedSize: {
+              width: 123,
+              height: 321
+            },
+            componentAuctions: [sinon.match({
+              requestedSize: {
+                width: 1,
+                height: 2
+              }
+            })]
+          })
+        })
+
+        it('should not accept multiple partial configs for the same bid/seller', () => {
+          builtCfg.push(builtCfg[0])
+          startParallel();
+          expect(getPAAPIConfig().au.componentAuctions.length).to.eql(1);
+        });
+        it('should resolve top level config with auction signals', async () => {
+          startParallel();
+          let config = getPAAPIConfig().au;
+          endAuction();
+          config = await resolveConfig(config);
+          sinon.assert.match(config, {
+            auctionSignals: {
+              prebid: {bidfloor: 1}
+            }
+          })
+        });
+
+        describe('when adapter returns the rest of auction config', () => {
+          let configRemainder;
+          beforeEach(() => {
+            configRemainder = {
+              ...Object.fromEntries(ASYNC_SIGNALS.map(signal => [signal, {type: signal}])),
+              seller: 'mock.seller'
+            };
+          })
+          function returnRemainder() {
+            addPaapiConfigHook(sinon.stub(), bids[0], {config: configRemainder});
+          }
+          it('should resolve component configs with values returned by adapters', async () => {
+            startParallel();
+            let config = getPAAPIConfig().au.componentAuctions[0];
+            returnRemainder();
+            endAuction();
+            config = await resolveConfig(config);
+            sinon.assert.match(config, configRemainder);
+          });
+
+          it('should pick first config that matches bidId/seller', async () => {
+            startParallel();
+            let config = getPAAPIConfig().au.componentAuctions[0];
+            returnRemainder();
+            const expectedSignals = {...configRemainder};
+            configRemainder = {
+              ...configRemainder,
+              auctionSignals: {
+                this: 'should be ignored'
+              }
+            }
+            returnRemainder();
+            endAuction();
+            config = await resolveConfig(config);
+            sinon.assert.match(config, expectedSignals);
+          });
+
+          describe('should default to values returned from buildPAAPIConfigs when interpretResponse does not return', () => {
+            beforeEach(() => {
+              ASYNC_SIGNALS.forEach(signal => mockConfig[signal] = {default: signal})
+            });
+            Object.entries({
+              'returns no matching config'() {
+              },
+              'does not include values in response'() {
+                configRemainder = {};
+                returnRemainder();
+              }
+            }).forEach(([t, postResponse]) => {
+              it(t, async () => {
+                startParallel();
+                let config = getPAAPIConfig().au.componentAuctions[0];
+                postResponse();
+                endAuction();
+                config = await resolveConfig(config);
+                sinon.assert.match(config, mockConfig);
+              });
+            });
+          });
+
+          it('should resolve to undefined when no value is available', async () => {
+            startParallel();
+            let config = getPAAPIConfig().au.componentAuctions[0];
+            delete configRemainder.sellerSignals;
+            returnRemainder();
+            endAuction();
+            config = await resolveConfig(config);
+            expect(config.sellerSignals).to.be.undefined;
+          });
+
+          [
+            {
+              start: {t: 'scalar', value: 'str'},
+              end: {t: 'array', value: ['abc']},
+              should: {t: 'array', value: ['abc']}
+            },
+            {
+              start: {t: 'object', value: {a: 'b'}},
+              end: {t: 'scalar', value: 'abc'},
+              should: {t: 'scalar', value: 'abc'}
+            },
+            {
+              start: {t: 'object', value: {outer: {inner: 'val'}}},
+              end: {t: 'object', value: {outer: {other: 'val'}}},
+              should: {t: 'merge', value: {outer: {inner: 'val', other: 'val'}}}
+            }
+          ].forEach(({start, end, should}) => {
+            it(`when buildPAAPIConfigs returns ${start.t}, interpretResponse return ${end.t}, promise should resolve to ${should.t}`, async () => {
+              mockConfig.sellerSignals = start.value
+              startParallel();
+              let config = getPAAPIConfig().au.componentAuctions[0];
+              configRemainder.sellerSignals = end.value;
+              returnRemainder();
+              endAuction();
+              config = await resolveConfig(config);
+              expect(config.sellerSignals).to.eql(should.value);
+            })
+          })
+
+          it('should make extra configs available', async () => {
+            startParallel();
+            returnRemainder();
+            configRemainder = {...configRemainder, seller: 'other.seller'};
+            returnRemainder();
+            endAuction();
+            let configs = getPAAPIConfig().au.componentAuctions;
+            configs = [await resolveConfig(configs[0]), configs[1]];
+            expect(configs.map(cfg => cfg.seller)).to.eql(['mock.seller', 'other.seller']);
+          });
+
+          describe('submodule\'s onAuctionConfig', () => {
+            let onAuctionConfig;
+            beforeEach(() => {
+              onAuctionConfig = sinon.stub();
+              registerSubmodule({onAuctionConfig})
+            });
+
+            Object.entries({
+              'parallel=true, some configs deferred': {
+                setup() {
+                  config.mergeConfig({paapi: {parallel: true}})
+                },
+                delayed: false,
+              },
+              'parallel=true, no deferred configs': {
+                setup() {
+                  config.mergeConfig({paapi: {parallel: true}});
+                  spec.buildPAAPIConfigs = sinon.stub().callsFake(() => []);
+                },
+                delayed: true
+              },
+              'parallel=false, some configs deferred': {
+                setup() {
+                  config.mergeConfig({paapi: {parallel: false}})
+                },
+                delayed: true
+              }
+            }).forEach(([t, {setup, delayed}]) => {
+              describe(`when ${t}`, () => {
+                beforeEach(() => {
+                  mockAuction.requestsDone = Promise.resolve();
+                  setup();
+                });
+
+                function expectInvoked(shouldBeInvoked) {
+                  if (shouldBeInvoked) {
+                    sinon.assert.calledWith(onAuctionConfig, 'aid', sinon.match(arg => arg.au.componentAuctions[0].seller === 'mock.seller'));
+                  } else {
+                    sinon.assert.notCalled(onAuctionConfig);
+                  }
+                }
+
+                it(`should invoke onAuctionConfig when ${delayed ? 'auction ends' : 'auction requests have started'}`, async () => {
+                  startParallel();
+                  await mockAuction.requestsDone;
+                  expectInvoked(!delayed);
+                  onAuctionConfig.reset();
+                  returnRemainder();
+                  endAuction();
+                  expectInvoked(delayed);
+                })
+              })
+            })
+          })
+        });
+      });
+      describe('when buildPAAPIConfigs returns igb', () => {
+        let builtCfg, igb, auctionConfig;
+        beforeEach(() => {
+          igb = {origin: 'mock.buyer'}
+          builtCfg = [{bidId: 'bidId', igb}];
+          spec.buildPAAPIConfigs = sinon.stub().callsFake(() => builtCfg);
+          auctionConfig = {
+            seller: 'mock.seller',
+            decisionLogicUrl: 'mock.seller/decisionLogic'
+          }
+          config.mergeConfig({
+            paapi: {
+              componentSeller: {
+                auctionConfig
+              }
+            }
+          })
+          bidderRequest.paapi.componentSeller = true;
+        });
+        Object.entries({
+          'componentSeller not configured'() {
+            bidderRequest.paapi.componentSeller = false;
+          },
+          'buildPAAPIconfig returns nothing'() {
+            builtCfg = []
+          },
+          'returned igb is not valid'() {
+            builtCfg = [{bidId: 'bidId', igb: {}}];
+          }
+        }).forEach(([t, setup]) => {
+          it(`should have no effect when ${t}`, () => {
+            setup();
+            startParallel();
+            expect(getPAAPIConfig()).to.eql({});
+          })
+        })
+
+        describe('when component seller is set up', () => {
+          it('should generate a deferred auctionConfig', () => {
+            startParallel();
+            sinon.assert.match(getPAAPIConfig().au.componentAuctions[0], {
+              ...auctionConfig,
+              interestGroupBuyers: ['mock.buyer'],
+            })
+          });
+
+          it('should use signal values from componentSeller.auctionConfig', async () => {
+            auctionConfig.auctionSignals = {test: 'signal'};
+            config.mergeConfig({
+              paapi: {componentSeller: {auctionConfig}}
+            })
+            startParallel();
+            endAuction();
+            const cfg = await resolveConfig(getPAAPIConfig().au.componentAuctions[0]);
+            sinon.assert.match(cfg.auctionSignals, auctionConfig.auctionSignals);
+          })
+
+          it('should collate buyers', () => {
+            startParallel();
+            startParallel();
+            sinon.assert.match(getPAAPIConfig().au.componentAuctions[0], {
+              interestGroupBuyers: ['mock.buyer']
+            });
+          });
+
+          function returnIgb(igb) {
+            addPaapiConfigHook(sinon.stub(), bids[0], {igb});
+          }
+
+          it('should resolve to values from interpretResponse as well as buildPAAPIConfigs', async () => {
+            igb.cur = 'cur';
+            igb.pbs = {over: 'ridden'}
+            startParallel();
+            let cfg = getPAAPIConfig().au.componentAuctions[0];
+            returnIgb({
+              origin: 'mock.buyer',
+              pbs: {some: 'signal'}
+            });
+            endAuction();
+            cfg = await resolveConfig(cfg);
+            sinon.assert.match(cfg, {
+              perBuyerSignals: {
+                [igb.origin]: {some: 'signal'},
+              },
+              perBuyerCurrencies: {
+                [igb.origin]: 'cur'
+              }
+            })
+          });
+
+          it('should not overwrite config once resolved', () => {
+            startParallel();
+            returnIgb({
+              origin: 'mock.buyer',
+            });
+            endAuction();
+            const cfg = getPAAPIConfig().au;
+            sinon.assert.match(cfg, Object.fromEntries(ASYNC_SIGNALS.map(signal => [signal, sinon.match(arg => arg instanceof Promise)])))
+          })
+
+          it('can resolve multiple igbs', async () => {
+            igb.cur = 'cur1';
+            startParallel();
+            spec.code = 'other';
+            igb.origin = 'other.buyer'
+            igb.cur = 'cur2'
+            startParallel();
+            let cfg = getPAAPIConfig().au.componentAuctions[0];
+            returnIgb({
+              origin: 'mock.buyer',
+              pbs: {signal: 1}
+            });
+            returnIgb({
+              origin: 'other.buyer',
+              pbs: {signal: 2}
+            });
+            endAuction();
+            cfg = await resolveConfig(cfg);
+            sinon.assert.match(cfg, {
+              perBuyerSignals: {
+                'mock.buyer': {signal: 1},
+                'other.buyer': {signal: 2}
+              },
+              perBuyerCurrencies: {
+                'mock.buyer': 'cur1',
+                'other.buyer': 'cur2'
+              }
+            })
+          })
+
+          function startMultiple() {
+            startParallel();
+            spec.code = 'other';
+            igb.origin = 'other.buyer'
+            startParallel();
+          }
+
+          describe('when using separateAuctions=false', () => {
+            beforeEach(() => {
+              config.mergeConfig({
+                paapi: {
+                  componentSeller: {
+                    separateAuctions: false
+                  }
+                }
+              })
+            });
+
+            it('should merge igb from different specs into a single auction config', () => {
+              startMultiple();
+              sinon.assert.match(getPAAPIConfig().au.componentAuctions[0], {
+                interestGroupBuyers: ['mock.buyer', 'other.buyer']
+              });
+            });
+          })
+
+          describe('when using separateAuctions=true', () => {
+            beforeEach(() => {
+              config.mergeConfig({
+                paapi: {
+                  componentSeller: {
+                    separateAuctions: true
+                  }
+                }
+              })
+            });
+            it('should generate an auction config for each bidder', () => {
+              startMultiple();
+              const components = getPAAPIConfig().au.componentAuctions;
+              sinon.assert.match(components[0], {
+                interestGroupBuyers: ['mock.buyer']
+              })
+              sinon.assert.match(components[1], {
+                interestGroupBuyers: ['other.buyer']
+              })
+            })
+          })
+        })
+      })
+    });
+  });
+
+  describe('ortb processors for fledge', () => {
+    it('imp.ext.ae should be removed if fledge is not enabled', () => {
+      const imp = {ext: {ae: 1, igs: {}}};
+      setImpExtAe(imp, {}, {bidderRequest: {}});
+      expect(imp.ext.ae).to.not.exist;
+      expect(imp.ext.igs).to.not.exist;
+    });
+    it('imp.ext.ae should be left intact if fledge is enabled', () => {
+      const imp = {ext: {ae: 2, igs: {biddable: 0}}};
+      setImpExtAe(imp, {}, {bidderRequest: {paapi: {enabled: true}}});
+      expect(imp.ext).to.eql({
+        ae: 2,
+        igs: {
+          biddable: 0
+        }
+      });
+    });
+
+    describe('response parsing', () => {
+      function generateImpCtx(fledgeFlags) {
+        return Object.fromEntries(Object.entries(fledgeFlags).map(([impid, fledgeEnabled]) => [impid, {imp: {ext: {ae: fledgeEnabled}}}]));
+      }
+
+      function extractResult(type, ctx) {
+        return Object.fromEntries(
+          Object.entries(ctx)
+            .map(([impid, ctx]) => [impid, ctx.paapiConfigs?.map(cfg => cfg[type].id)])
+            .filter(([_, val]) => val != null)
+        );
+      }
+
+      Object.entries({
+        'parseExtPrebidFledge': {
+          parser: parseExtPrebidFledge,
+          responses: {
+            'ext.prebid.fledge'(configs) {
+              return {
+                ext: {
+                  prebid: {
+                    fledge: {
+                      auctionconfigs: configs
+                    }
+                  }
+                }
+              };
+            },
+          }
+        },
+        'parseExtIgi': {
+          parser: parseExtIgi,
+          responses: {
+            'ext.igi.igs'(configs) {
+              return {
+                ext: {
+                  igi: [{
+                    igs: configs
+                  }]
+                }
+              };
+            },
+            'ext.igi.igs with impid on igi'(configs) {
+              return {
+                ext: {
+                  igi: configs.map(cfg => {
+                    const impid = cfg.impid;
+                    delete cfg.impid;
+                    return {
+                      impid,
+                      igs: [cfg]
+                    };
+                  })
+                }
+              };
+            },
+            'ext.igi.igs with conflicting impid'(configs) {
+              return {
+                ext: {
+                  igi: [{
+                    impid: 'conflict',
+                    igs: configs
+                  }]
+                }
+              };
+            }
+          }
+        }
+      }).forEach(([t, {parser, responses}]) => {
+        describe(t, () => {
+          Object.entries(responses).forEach(([t, packageConfigs]) => {
+            describe(`when response uses ${t}`, () => {
+              function generateCfg(impid, ...ids) {
+                return ids.map((id) => ({impid, config: {id}}));
+              }
+
+              it('should collect auction configs by imp', () => {
+                const ctx = {
+                  impContext: generateImpCtx({e1: 1, e2: 1, d1: 0})
+                };
+                const resp = packageConfigs(
+                  generateCfg('e1', 1, 2, 3)
+                    .concat(generateCfg('e2', 4)
+                      .concat(generateCfg('d1', 5, 6)))
+                );
+                parser({}, resp, ctx);
+                expect(extractResult('config', ctx.impContext)).to.eql({
+                  e1: [1, 2, 3],
+                  e2: [4],
+                });
+              });
+              it('should not choke if fledge config references unknown imp', () => {
+                const ctx = {impContext: generateImpCtx({i: 1})};
+                const resp = packageConfigs(generateCfg('unknown', 1));
+                parser({}, resp, ctx);
+                expect(extractResult('config', ctx.impContext)).to.eql({});
+              });
+            });
+          });
+        });
+      });
+
+      describe('response ext.igi.igb', () => {
+        it('should collect igb by imp', () => {
+          const ctx = {
+            impContext: generateImpCtx({e1: 1, e2: 1, d1: 0})
+          };
+          const resp = {
+            ext: {
+              igi: [
+                {
+                  impid: 'e1',
+                  igb: [
+                    {id: 1},
+                    {id: 2}
+                  ]
+                },
+                {
+                  impid: 'e2',
+                  igb: [
+                    {id: 3}
+                  ]
+                },
+                {
+                  impid: 'd1',
+                  igb: [
+                    {id: 4}
+                  ]
+                }
+              ]
+            }
+          };
+          parseExtIgi({}, resp, ctx);
+          expect(extractResult('igb', ctx.impContext)).to.eql({
+            e1: [1, 2],
+            e2: [3],
+          });
+        });
+      });
+    });
+
+    describe('setResponsePaapiConfigs', () => {
+      it('should set paapi configs/igb paired with their corresponding bid id', () => {
+        const ctx = {
+          impContext: {
+            1: {
+              bidRequest: {bidId: 'bid1'},
+              paapiConfigs: [{config: {id: 1}}, {config: {id: 2}}]
+            },
+            2: {
+              bidRequest: {bidId: 'bid2'},
+              paapiConfigs: [{config: {id: 3}}]
+            },
+            3: {
+              bidRequest: {bidId: 'bid3'}
+            },
+            4: {
+              bidRequest: {bidId: 'bid1'},
+              paapiConfigs: [{igb: {id: 4}}]
+            }
+          }
+        };
+        const resp = {};
+        setResponsePaapiConfigs(resp, {}, ctx);
+        expect(resp.paapi).to.eql([
+          {bidId: 'bid1', config: {id: 1}},
+          {bidId: 'bid1', config: {id: 2}},
+          {bidId: 'bid2', config: {id: 3}},
+          {bidId: 'bid1', igb: {id: 4}}
+        ]);
+      });
+      it('should not set paapi if no config or igb exists', () => {
+        const resp = {};
+        setResponsePaapiConfigs(resp, {}, {
+          impContext: {
+            1: {
+              paapiConfigs: []
+            },
+            2: {}
+          }
+        });
+        expect(resp).to.eql({});
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/pangleBidAdapter_spec.js b/test/spec/modules/pangleBidAdapter_spec.js
index 79cbc30b4ec..f2504a810c4 100644
--- a/test/spec/modules/pangleBidAdapter_spec.js
+++ b/test/spec/modules/pangleBidAdapter_spec.js
@@ -45,6 +45,7 @@ const REQUEST = [{
     appid: 111,
   },
 }];
+
 const DEFAULT_OPTIONS = {
   userId: {
     britepoolid: 'pangle-britepool',
@@ -82,6 +83,7 @@ const RESPONSE = {
             'cat': [],
             'w': 300,
             'h': 250,
+            'mtype': 1,
             'ext': {
               'prebid': {
                 'type': 'banner'
@@ -125,11 +127,15 @@ describe('pangle bid adapter', function () {
 
   describe('buildRequests', function () {
     it('creates request data', function () {
-      let request = spec.buildRequests(REQUEST, DEFAULT_OPTIONS)[0];
-      expect(request).to.exist.and.to.be.a('object');
-      const payload = request.data;
-      expect(payload.imp[0]).to.have.property('id', REQUEST[0].bidId);
-      expect(payload.imp[1]).to.have.property('id', REQUEST[1].bidId);
+      let request1 = spec.buildRequests(REQUEST, DEFAULT_OPTIONS)[0];
+      expect(request1).to.exist.and.to.be.a('object');
+      const payload1 = request1.data;
+      expect(payload1.imp[0]).to.have.property('id', REQUEST[0].bidId);
+
+      let request2 = spec.buildRequests(REQUEST, DEFAULT_OPTIONS)[1];
+      expect(request2).to.exist.and.to.be.a('object');
+      const payload2 = request2.data;
+      expect(payload2.imp[0]).to.have.property('id', REQUEST[1].bidId);
     });
   });
 
@@ -185,3 +191,201 @@ describe('pangle bid adapter', function () {
     });
   });
 });
+
+describe('Pangle Adapter with video', function() {
+  const videoBidRequest = [
+    {
+      bidId: '2820132fe18114',
+      mediaTypes: { video: { context: 'outstream', playerSize: [[300, 250]] } },
+      params: { token: 'test-token' }
+    }
+  ];
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'https://example.com'
+    }
+  };
+  const serverResponse = {
+    'headers': null,
+    'body': {
+      'id': '233f1693-68d1-470a-ad85-c156c3faaf6f',
+      'seatbid': [
+        {
+          'bid': [
+            {
+              'id': '2820132fe18114',
+              'impid': '2820132fe18114',
+              'price': 0.03294,
+              'nurl': 'https://api16-event-sg2.pangle.io/api/ad/union/openrtb/win/?req_id=233f1693-68d1-470a-ad85-c156c3faaf6fu1450&ttdsp_adx_index=256&rit=980589944&extra=oqveoB%2Bg4%2ByNz9L8wwu%2Fy%2FwKxQsGaKsJHuB4NMK77uqZ9%2FJKpnsVZculJX8%2FxrRBAtaktU1DRN%2Fy6TKAqibCbj%2FM3%2BZ6biAKQG%2BCyt4eIV0KVvri9jCCnaajbkN7YNJWJJw2lW6cJ6Va3SuJG9H7a%2FAJd2PMbhK7fXWhoW72TwgOcKHKBgjM6sNDISBKbWlZyY3L1PhKSX%2FM8LOvL6qahsb%2FDpEObIx24vhQLNWp28XY1L4UqeibuRjam3eCvN7nXoQq74KkJ45QQsTgvV4j6I6EbLOdjOi%2FURhWMDjUD1VCMpqUT%2B6L8ZROgrX9Tp53eJ3bFOczmSTOmDSazKMHa%2B3uZZ7JHcSx32eoY4hfYc99NOJmYBKXNKCmoXyJvS3PCM3PlAz97hKrDMGnVv1wAQ7QGDCbittF0vZwtsRAvvx2mWINNIB3%2FUB2PjhxFsoDA%2BWE2urVZwEdyu%2FJrCznJsMwenXjcbMD5jmUF5vDkkLS%2B7TMDIEawJPJKZ62pK35enrwGxCs6ePXi21rJJkA0bF8tgAdl4mU1illBIVO4kCL%2ByRASskHPjgg%2FcdFe9HP%2Fi8byjAprH%2BhRerN%2FRKFxC3xv8b75x2pb1g7dY%2FTj9IjT0evsBSPVwFNqtKmPId35IcY%2FSXiqPHh%2FrAHZzr5BPsTT19P49SlNMR9UZYTzViX1iJpcCL1UFjuDdrdff%2BhHCviXxo%2FkRmufEF3umHZwxbdDOPAghuZ0DtRCY6S1rnb%2FK9BbpsVKSndOtgfCwMHFwiPmdw1XjEXGc1eOWXY6qfSp90PIfL6WS7Neh3ba2qMv6WxG3HSOBYvrcCqVTsNxk4UdVm3qb1J0CMVByweTMo45usSkCTdvX3JuEB7tVA6%2BrEk57b3XJd5Phf2AN8hon%2F7lmcXE41kwMQuXq89ViwQmW0G247UFWOQx4t1cmBqFiP6qNA%2F%2BunkZDno1pmAsGnTv7Mz9xtpOaIqKl8BKrVQSTopZ9WcUVzdBUutF19mn1f43BvyA9gIEhcDJHOj&win_price=${AUCTION_PRICE}&auction_mwb=${AUCTION_BID_TO_WIN}&use_pb=1',
+              'lurl': 'https://api16-event-sg2.pangle.io/api/ad/union/openrtb/loss/?req_id=233f1693-68d1-470a-ad85-c156c3faaf6fu1450&ttdsp_adx_index=256&rit=980589944&extra=oqveoB%2Bg4%2ByNz9L8wwu%2Fy%2FwKxQsGaKsJHuB4NMK77uqZ9%2FJKpnsVZculJX8%2FxrRBAtaktU1DRN%2Fy6TKAqibCbj%2FM3%2BZ6biAKQG%2BCyt4eIV0KVvri9jCCnaajbkN7YNJWJJw2lW6cJ6Va3SuJG9H7a%2FAJd2PMbhK7fXWhoW72TwgOcKHKBgjM6sNDISBKbWlZyY3L1PhKSX%2FM8LOvL6qahsb%2FDpEObIx24vhQLNWp28XY1L4UqeibuRjam3eCvN7nXoQq74KkJ45QQsTgvV4j6I6EbLOdjOi%2FURhWMDjUD1VCMpqUT%2B6L8ZROgrX9Tp53eJ3bFOczmSTOmDSazKMHa%2B3uZZ7JHcSx32eoY4hfYc99NOJmYBKXNKCmoXyJvS3PCM3PlAz97hKrDMGnVv1wAQ7QGDCbittF0vZwtsRAvvx2mWINNIB3%2FUB2PjhxFsoDA%2BWE2urVZwEdyu%2FJrCznJsMwenXjcbMD5jmUF5vDkkLS%2B7TMDIEawJPJKZ62pK35enrwGxCs6ePXi21rJJkA0bF8tgAdl4mU1illBIVO4kCL%2ByRASskHPjgg%2FcdFe9HP%2Fi8byjAprH%2BhRerN%2FRKFxC3xv8b75x2pb1g7dY%2FTj9IjT0evsBSPVwFNqtKmPId35IcY%2FSXiqPHh%2FrAHZzr5BPsTT19P49SlNMR9UZYTzViX1iJpcCL1UFjuDdrdff%2BhHCviXxo%2FkRmufEF3umHZwxbdDOPAghuZ0DtRCY6S1rnb%2FK9BbpsVKSndOtgfCwMHFwiPmdw1XjEXGc1eOWXY6qfSp90PIfL6WS7Neh3ba2qMv6WxG3HSOBYvrcCqVTsNxk4UdVm3qb1J0CMVByweTMo45usSkCTdvX3JuEB7tVA6%2BrEk57b3XJd5Phf2AN8hon%2F7lmcXE41kwMQuXq89ViwQmW0G247UFWOQx4t1cmBqFiP6qNA%2F%2BunkZDno1pmAsGnTv7Mz9xtpOaIqKl8BKrVQSTopZ9WcUVzdBUutF19mn1f43BvyA9gIEhcDJHOj&reason=${AUCTION_LOSS}&ad_slot_type=8&auction_mwb=${AUCTION_PRICE}&use_pb=1',
+              'adm': '',
+              'adid': '1780626232977441',
+              'adomain': [
+                'swi.esxcmnb.com'
+              ],
+              'iurl': 'https://p16-ttam-va.ibyteimg.com/origin/ad-site-i18n-sg/202310245d0d598b3ff5993c4f129a8b',
+              'cid': '1780626232977441',
+              'crid': '1780626232977441',
+              'attr': [
+                4
+              ],
+              'w': 640,
+              'h': 640,
+              'mtype': 1,
+              'ext': {
+                'pangle': {
+                  'adtype': 8
+                },
+                'event_notification_token': {
+                  'payload': '980589944:8:1450:7492'
+                }
+              }
+            }
+          ],
+          'seat': 'pangle'
+        }
+      ]
+    }
+  };
+
+  describe('Video: buildRequests', function() {
+    it('should create a POST request for video bid', function() {
+      const requests = spec.buildRequests(videoBidRequest, bidderRequest);
+      expect(requests[0].method).to.equal('POST');
+    });
+
+    it('should have a valid URL and payload for an out-stream video bid', function () {
+      const requests = spec.buildRequests(videoBidRequest, bidderRequest);
+      expect(requests[0].url).to.equal('https://pangle.pangleglobal.com/api/ad/union/web_js/common/get_ads');
+      expect(requests[0].data).to.exist;
+    });
+  });
+
+  describe('interpretResponse: Video', function () {
+    it('should get correct bid response', function () {
+      const request = spec.buildRequests(videoBidRequest, bidderRequest)[0];
+      const interpretedResponse = spec.interpretResponse(serverResponse, request);
+      expect(interpretedResponse).to.be.an('array');
+      const bid = interpretedResponse[0];
+      expect(bid).to.exist;
+      expect(bid.requestId).to.exist;
+      expect(bid.cpm).to.be.above(0);
+      expect(bid.ttl).to.exist;
+      expect(bid.creativeId).to.exist;
+      if (bid.renderer) {
+        expect(bid.renderer.render).to.exist;
+      }
+    });
+  });
+});
+
+describe('pangle multi-format ads', function () {
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'https://example.com'
+    }
+  };
+  const multiRequest = [
+    {
+      bidId: '2820132fe18114',
+      mediaTypes: { banner: { sizes: [[300, 250]] }, video: { context: 'outstream', playerSize: [[300, 250]] } },
+      params: { token: 'test-token' }
+    }
+  ];
+  const videoResponse = {
+    'headers': null,
+    'body': {
+      'id': '233f1693-68d1-470a-ad85-c156c3faaf6f',
+      'seatbid': [
+        {
+          'bid': [
+            {
+              'id': '2820132fe18114',
+              'impid': '2820132fe18114',
+              'price': 0.03294,
+              'nurl': 'https://api16-event-sg2.pangle.io/api/ad/union/openrtb/win/?req_id=233f1693-68d1-470a-ad85-c156c3faaf6fu1450&ttdsp_adx_index=256&rit=980589944&extra=oqveoB%2Bg4%2ByNz9L8wwu%2Fy%2FwKxQsGaKsJHuB4NMK77uqZ9%2FJKpnsVZculJX8%2FxrRBAtaktU1DRN%2Fy6TKAqibCbj%2FM3%2BZ6biAKQG%2BCyt4eIV0KVvri9jCCnaajbkN7YNJWJJw2lW6cJ6Va3SuJG9H7a%2FAJd2PMbhK7fXWhoW72TwgOcKHKBgjM6sNDISBKbWlZyY3L1PhKSX%2FM8LOvL6qahsb%2FDpEObIx24vhQLNWp28XY1L4UqeibuRjam3eCvN7nXoQq74KkJ45QQsTgvV4j6I6EbLOdjOi%2FURhWMDjUD1VCMpqUT%2B6L8ZROgrX9Tp53eJ3bFOczmSTOmDSazKMHa%2B3uZZ7JHcSx32eoY4hfYc99NOJmYBKXNKCmoXyJvS3PCM3PlAz97hKrDMGnVv1wAQ7QGDCbittF0vZwtsRAvvx2mWINNIB3%2FUB2PjhxFsoDA%2BWE2urVZwEdyu%2FJrCznJsMwenXjcbMD5jmUF5vDkkLS%2B7TMDIEawJPJKZ62pK35enrwGxCs6ePXi21rJJkA0bF8tgAdl4mU1illBIVO4kCL%2ByRASskHPjgg%2FcdFe9HP%2Fi8byjAprH%2BhRerN%2FRKFxC3xv8b75x2pb1g7dY%2FTj9IjT0evsBSPVwFNqtKmPId35IcY%2FSXiqPHh%2FrAHZzr5BPsTT19P49SlNMR9UZYTzViX1iJpcCL1UFjuDdrdff%2BhHCviXxo%2FkRmufEF3umHZwxbdDOPAghuZ0DtRCY6S1rnb%2FK9BbpsVKSndOtgfCwMHFwiPmdw1XjEXGc1eOWXY6qfSp90PIfL6WS7Neh3ba2qMv6WxG3HSOBYvrcCqVTsNxk4UdVm3qb1J0CMVByweTMo45usSkCTdvX3JuEB7tVA6%2BrEk57b3XJd5Phf2AN8hon%2F7lmcXE41kwMQuXq89ViwQmW0G247UFWOQx4t1cmBqFiP6qNA%2F%2BunkZDno1pmAsGnTv7Mz9xtpOaIqKl8BKrVQSTopZ9WcUVzdBUutF19mn1f43BvyA9gIEhcDJHOj&win_price=${AUCTION_PRICE}&auction_mwb=${AUCTION_BID_TO_WIN}&use_pb=1',
+              'lurl': 'https://api16-event-sg2.pangle.io/api/ad/union/openrtb/loss/?req_id=233f1693-68d1-470a-ad85-c156c3faaf6fu1450&ttdsp_adx_index=256&rit=980589944&extra=oqveoB%2Bg4%2ByNz9L8wwu%2Fy%2FwKxQsGaKsJHuB4NMK77uqZ9%2FJKpnsVZculJX8%2FxrRBAtaktU1DRN%2Fy6TKAqibCbj%2FM3%2BZ6biAKQG%2BCyt4eIV0KVvri9jCCnaajbkN7YNJWJJw2lW6cJ6Va3SuJG9H7a%2FAJd2PMbhK7fXWhoW72TwgOcKHKBgjM6sNDISBKbWlZyY3L1PhKSX%2FM8LOvL6qahsb%2FDpEObIx24vhQLNWp28XY1L4UqeibuRjam3eCvN7nXoQq74KkJ45QQsTgvV4j6I6EbLOdjOi%2FURhWMDjUD1VCMpqUT%2B6L8ZROgrX9Tp53eJ3bFOczmSTOmDSazKMHa%2B3uZZ7JHcSx32eoY4hfYc99NOJmYBKXNKCmoXyJvS3PCM3PlAz97hKrDMGnVv1wAQ7QGDCbittF0vZwtsRAvvx2mWINNIB3%2FUB2PjhxFsoDA%2BWE2urVZwEdyu%2FJrCznJsMwenXjcbMD5jmUF5vDkkLS%2B7TMDIEawJPJKZ62pK35enrwGxCs6ePXi21rJJkA0bF8tgAdl4mU1illBIVO4kCL%2ByRASskHPjgg%2FcdFe9HP%2Fi8byjAprH%2BhRerN%2FRKFxC3xv8b75x2pb1g7dY%2FTj9IjT0evsBSPVwFNqtKmPId35IcY%2FSXiqPHh%2FrAHZzr5BPsTT19P49SlNMR9UZYTzViX1iJpcCL1UFjuDdrdff%2BhHCviXxo%2FkRmufEF3umHZwxbdDOPAghuZ0DtRCY6S1rnb%2FK9BbpsVKSndOtgfCwMHFwiPmdw1XjEXGc1eOWXY6qfSp90PIfL6WS7Neh3ba2qMv6WxG3HSOBYvrcCqVTsNxk4UdVm3qb1J0CMVByweTMo45usSkCTdvX3JuEB7tVA6%2BrEk57b3XJd5Phf2AN8hon%2F7lmcXE41kwMQuXq89ViwQmW0G247UFWOQx4t1cmBqFiP6qNA%2F%2BunkZDno1pmAsGnTv7Mz9xtpOaIqKl8BKrVQSTopZ9WcUVzdBUutF19mn1f43BvyA9gIEhcDJHOj&reason=${AUCTION_LOSS}&ad_slot_type=8&auction_mwb=${AUCTION_PRICE}&use_pb=1',
+              'adm': '',
+              'adid': '1780626232977441',
+              'adomain': [
+                'swi.esxcmnb.com'
+              ],
+              'iurl': 'https://p16-ttam-va.ibyteimg.com/origin/ad-site-i18n-sg/202310245d0d598b3ff5993c4f129a8b',
+              'cid': '1780626232977441',
+              'crid': '1780626232977441',
+              'attr': [
+                4
+              ],
+              'w': 640,
+              'h': 640,
+              'mtype': 2,
+              'ext': {
+                'pangle': {
+                  'adtype': 8
+                },
+                'event_notification_token': {
+                  'payload': '980589944:8:1450:7492'
+                }
+              }
+            }
+          ],
+          'seat': 'pangle'
+        }
+      ]
+    }
+  };
+  const bannerResponse = {
+    'headers': null,
+    'body': {
+      'id': '233f1693-68d1-470a-ad85-c156c3faaf6f',
+      'seatbid': [
+        {
+          'bid': [
+            {
+              'id': '2820132fe18114',
+              'impid': '2820132fe18114',
+              'price': 0.03294,
+              'nurl': 'https://api16-event-sg2.pangle.io/api/ad/union/openrtb/win/?req_id=233f1693-68d1-470a-ad85-c156c3faaf6fu1450&ttdsp_adx_index=256&rit=980589944&extra=oqveoB%2Bg4%2ByNz9L8wwu%2Fy%2FwKxQsGaKsJHuB4NMK77uqZ9%2FJKpnsVZculJX8%2FxrRBAtaktU1DRN%2Fy6TKAqibCbj%2FM3%2BZ6biAKQG%2BCyt4eIV0KVvri9jCCnaajbkN7YNJWJJw2lW6cJ6Va3SuJG9H7a%2FAJd2PMbhK7fXWhoW72TwgOcKHKBgjM6sNDISBKbWlZyY3L1PhKSX%2FM8LOvL6qahsb%2FDpEObIx24vhQLNWp28XY1L4UqeibuRjam3eCvN7nXoQq74KkJ45QQsTgvV4j6I6EbLOdjOi%2FURhWMDjUD1VCMpqUT%2B6L8ZROgrX9Tp53eJ3bFOczmSTOmDSazKMHa%2B3uZZ7JHcSx32eoY4hfYc99NOJmYBKXNKCmoXyJvS3PCM3PlAz97hKrDMGnVv1wAQ7QGDCbittF0vZwtsRAvvx2mWINNIB3%2FUB2PjhxFsoDA%2BWE2urVZwEdyu%2FJrCznJsMwenXjcbMD5jmUF5vDkkLS%2B7TMDIEawJPJKZ62pK35enrwGxCs6ePXi21rJJkA0bF8tgAdl4mU1illBIVO4kCL%2ByRASskHPjgg%2FcdFe9HP%2Fi8byjAprH%2BhRerN%2FRKFxC3xv8b75x2pb1g7dY%2FTj9IjT0evsBSPVwFNqtKmPId35IcY%2FSXiqPHh%2FrAHZzr5BPsTT19P49SlNMR9UZYTzViX1iJpcCL1UFjuDdrdff%2BhHCviXxo%2FkRmufEF3umHZwxbdDOPAghuZ0DtRCY6S1rnb%2FK9BbpsVKSndOtgfCwMHFwiPmdw1XjEXGc1eOWXY6qfSp90PIfL6WS7Neh3ba2qMv6WxG3HSOBYvrcCqVTsNxk4UdVm3qb1J0CMVByweTMo45usSkCTdvX3JuEB7tVA6%2BrEk57b3XJd5Phf2AN8hon%2F7lmcXE41kwMQuXq89ViwQmW0G247UFWOQx4t1cmBqFiP6qNA%2F%2BunkZDno1pmAsGnTv7Mz9xtpOaIqKl8BKrVQSTopZ9WcUVzdBUutF19mn1f43BvyA9gIEhcDJHOj&win_price=${AUCTION_PRICE}&auction_mwb=${AUCTION_BID_TO_WIN}&use_pb=1',
+              'lurl': 'https://api16-event-sg2.pangle.io/api/ad/union/openrtb/loss/?req_id=233f1693-68d1-470a-ad85-c156c3faaf6fu1450&ttdsp_adx_index=256&rit=980589944&extra=oqveoB%2Bg4%2ByNz9L8wwu%2Fy%2FwKxQsGaKsJHuB4NMK77uqZ9%2FJKpnsVZculJX8%2FxrRBAtaktU1DRN%2Fy6TKAqibCbj%2FM3%2BZ6biAKQG%2BCyt4eIV0KVvri9jCCnaajbkN7YNJWJJw2lW6cJ6Va3SuJG9H7a%2FAJd2PMbhK7fXWhoW72TwgOcKHKBgjM6sNDISBKbWlZyY3L1PhKSX%2FM8LOvL6qahsb%2FDpEObIx24vhQLNWp28XY1L4UqeibuRjam3eCvN7nXoQq74KkJ45QQsTgvV4j6I6EbLOdjOi%2FURhWMDjUD1VCMpqUT%2B6L8ZROgrX9Tp53eJ3bFOczmSTOmDSazKMHa%2B3uZZ7JHcSx32eoY4hfYc99NOJmYBKXNKCmoXyJvS3PCM3PlAz97hKrDMGnVv1wAQ7QGDCbittF0vZwtsRAvvx2mWINNIB3%2FUB2PjhxFsoDA%2BWE2urVZwEdyu%2FJrCznJsMwenXjcbMD5jmUF5vDkkLS%2B7TMDIEawJPJKZ62pK35enrwGxCs6ePXi21rJJkA0bF8tgAdl4mU1illBIVO4kCL%2ByRASskHPjgg%2FcdFe9HP%2Fi8byjAprH%2BhRerN%2FRKFxC3xv8b75x2pb1g7dY%2FTj9IjT0evsBSPVwFNqtKmPId35IcY%2FSXiqPHh%2FrAHZzr5BPsTT19P49SlNMR9UZYTzViX1iJpcCL1UFjuDdrdff%2BhHCviXxo%2FkRmufEF3umHZwxbdDOPAghuZ0DtRCY6S1rnb%2FK9BbpsVKSndOtgfCwMHFwiPmdw1XjEXGc1eOWXY6qfSp90PIfL6WS7Neh3ba2qMv6WxG3HSOBYvrcCqVTsNxk4UdVm3qb1J0CMVByweTMo45usSkCTdvX3JuEB7tVA6%2BrEk57b3XJd5Phf2AN8hon%2F7lmcXE41kwMQuXq89ViwQmW0G247UFWOQx4t1cmBqFiP6qNA%2F%2BunkZDno1pmAsGnTv7Mz9xtpOaIqKl8BKrVQSTopZ9WcUVzdBUutF19mn1f43BvyA9gIEhcDJHOj&reason=${AUCTION_LOSS}&ad_slot_type=8&auction_mwb=${AUCTION_PRICE}&use_pb=1',
+              'adm': '',
+              'adid': '1780626232977441',
+              'adomain': [
+                'swi.esxcmnb.com'
+              ],
+              'iurl': 'https://p16-ttam-va.ibyteimg.com/origin/ad-site-i18n-sg/202310245d0d598b3ff5993c4f129a8b',
+              'cid': '1780626232977441',
+              'crid': '1780626232977441',
+              'attr': [
+                4
+              ],
+              'w': 640,
+              'h': 640,
+              'mtype': 1,
+              'ext': {
+                'pangle': {
+                  'adtype': 8
+                },
+                'event_notification_token': {
+                  'payload': '980589944:8:1450:7492'
+                }
+              }
+            }
+          ],
+          'seat': 'pangle'
+        }
+      ]
+    }
+  };
+  it('should set mediaType to banner', function() {
+    const request = spec.buildRequests(multiRequest, bidderRequest)[0];
+    const interpretedResponse = spec.interpretResponse(bannerResponse, request);
+    const bid = interpretedResponse[0];
+    expect(bid.mediaType).to.equal('banner');
+  })
+  it('should set mediaType to video', function() {
+    const request = spec.buildRequests(multiRequest, bidderRequest)[0];
+    const interpretedResponse = spec.interpretResponse(videoResponse, request);
+    const bid = interpretedResponse[0];
+    expect(bid.mediaType).to.equal('video');
+  })
+});
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
deleted file mode 100644
index 55287e0bfec..00000000000
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ /dev/null
@@ -1,762 +0,0 @@
-import { expect } from 'chai';
-import {find} from 'src/polyfill.js';
-import { config } from 'src/config.js';
-import * as utils from 'src/utils.js';
-import { newStorageManager } from 'src/storageManager.js';
-import { getRefererInfo } from 'src/refererDetection.js';
-import { uspDataHandler } from 'src/adapterManager.js';
-import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
-import { parrableIdSubmodule } from 'modules/parrableIdSystem.js';
-import { server } from 'test/mocks/xhr.js';
-import {mockGdprConsent} from '../../helpers/consentData.js';
-
-const storage = newStorageManager();
-
-const EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
-const EXPIRE_COOKIE_TIME = 864000000;
-const P_COOKIE_NAME = '_parrable_id';
-const P_COOKIE_EID = '01.1563917337.test-eid';
-const P_XHR_EID = '01.1588030911.test-new-eid'
-const P_CONFIG_MOCK = {
-  name: 'parrableId',
-  params: {
-    partners: 'parrable_test_partner_123,parrable_test_partner_456'
-  }
-};
-const RESPONSE_HEADERS = { 'Content-Type': 'application/json' };
-
-function getConfigMock() {
-  return {
-    userSync: {
-      syncDelay: 0,
-      userIds: [P_CONFIG_MOCK]
-    }
-  }
-}
-
-function getAdUnitMock(code = 'adUnit-code') {
-  return {
-    code,
-    mediaTypes: {banner: {}, native: {}},
-    sizes: [
-      [300, 200],
-      [300, 600]
-    ],
-    bids: [{
-      bidder: 'sampleBidder',
-      params: { placementId: 'banner-only-bidder' }
-    }]
-  };
-}
-
-function serializeParrableId(parrableId) {
-  let str = '';
-  if (parrableId.eid) {
-    str += 'eid:' + parrableId.eid;
-  }
-  if (parrableId.ibaOptout) {
-    str += ',ibaOptout:1';
-  }
-  if (parrableId.ccpaOptout) {
-    str += ',ccpaOptout:1';
-  }
-  if (parrableId.tpc !== undefined) {
-    const tpcSupportComponent = parrableId.tpc === true ? 'tpc:1' : 'tpc:0';
-    str += `,${tpcSupportComponent}`;
-    str += `,tpcUntil:${parrableId.tpcUntil}`;
-  }
-  if (parrableId.filteredUntil) {
-    str += `,filteredUntil:${parrableId.filteredUntil}`;
-    str += `,filterHits:${parrableId.filterHits}`;
-  }
-  return str;
-}
-
-function writeParrableCookie(parrableId) {
-  let cookieValue = encodeURIComponent(serializeParrableId(parrableId));
-  storage.setCookie(
-    P_COOKIE_NAME,
-    cookieValue,
-    (new Date(Date.now() + EXPIRE_COOKIE_TIME).toUTCString()),
-    'lax'
-  );
-}
-
-function removeParrableCookie() {
-  storage.setCookie(P_COOKIE_NAME, '', EXPIRED_COOKIE_DATE);
-}
-
-function decodeBase64UrlSafe(encBase64) {
-  const DEC = {
-    '-': '+',
-    '_': '/',
-    '.': '='
-  };
-  return encBase64.replace(/[-_.]/g, (m) => DEC[m]);
-}
-
-describe('Parrable ID System', function() {
-  after(() => {
-    // reset ID system to avoid delayed callbacks in other tests
-    config.resetConfig();
-    init(config);
-  });
-
-  describe('parrableIdSystem.getId()', function() {
-    describe('response callback function', function() {
-      let logErrorStub;
-      let callbackSpy = sinon.spy();
-
-      beforeEach(function() {
-        logErrorStub = sinon.stub(utils, 'logError');
-        callbackSpy.resetHistory();
-        writeParrableCookie({ eid: P_COOKIE_EID });
-      });
-
-      afterEach(function() {
-        removeParrableCookie();
-        logErrorStub.restore();
-      })
-
-      it('creates xhr to Parrable that synchronizes the ID', function() {
-        let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-
-        getIdResult.callback(callbackSpy);
-
-        let request = server.requests[0];
-        let queryParams = utils.parseQS(request.url.split('?')[1]);
-        let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
-
-        expect(getIdResult.callback).to.be.a('function');
-        expect(request.url).to.contain('h.parrable.com');
-
-        expect(queryParams).to.not.have.property('us_privacy');
-        expect(data).to.deep.equal({
-          eid: P_COOKIE_EID,
-          trackers: P_CONFIG_MOCK.params.partners.split(','),
-          url: getRefererInfo().page,
-          prebidVersion: '$prebid.version$',
-          isIframe: true
-        });
-
-        server.requests[0].respond(200,
-          { 'Content-Type': 'text/plain' },
-          JSON.stringify({ eid: P_XHR_EID })
-        );
-        expect(callbackSpy.lastCall.lastArg).to.deep.equal({
-          eid: P_XHR_EID
-        });
-
-        expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
-          encodeURIComponent('eid:' + P_XHR_EID)
-        );
-      });
-
-      it('xhr passes the uspString to Parrable', function() {
-        let uspString = '1YNN';
-        uspDataHandler.setConsentData(uspString);
-        parrableIdSubmodule.getId(
-          P_CONFIG_MOCK,
-          null,
-          null
-        ).callback(callbackSpy);
-        uspDataHandler.setConsentData(null);
-        expect(server.requests[0].url).to.contain('us_privacy=' + uspString);
-      });
-
-      it('xhr base64 safely encodes url data object', function() {
-        const urlSafeBase64EncodedData = '-_.';
-        const btoaStub = sinon.stub(window, 'btoa').returns('+/=');
-        let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-
-        getIdResult.callback(callbackSpy);
-
-        let request = server.requests[0];
-        let queryParams = utils.parseQS(request.url.split('?')[1]);
-        expect(queryParams.data).to.equal(urlSafeBase64EncodedData);
-        btoaStub.restore();
-      });
-
-      it('should log an error and continue to callback if ajax request errors', function () {
-        let callBackSpy = sinon.spy();
-        let submoduleCallback = parrableIdSubmodule.getId({ params: {partners: 'prebid'} }).callback;
-        submoduleCallback(callBackSpy);
-        let request = server.requests[0];
-        expect(request.url).to.contain('h.parrable.com');
-        request.respond(
-          503,
-          null,
-          'Unavailable'
-        );
-        expect(logErrorStub.calledOnce).to.be.true;
-        expect(callBackSpy.calledOnce).to.be.true;
-      });
-    });
-
-    describe('response id', function() {
-      it('provides the stored Parrable values if a cookie exists', function() {
-        writeParrableCookie({ eid: P_COOKIE_EID });
-        let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-        removeParrableCookie();
-
-        expect(getIdResult.id).to.deep.equal({
-          eid: P_COOKIE_EID
-        });
-      });
-
-      it('provides the stored legacy Parrable ID values if cookies exist', function() {
-        let oldEid = '01.111.old-eid';
-        let oldEidCookieName = '_parrable_eid';
-        let oldOptoutCookieName = '_parrable_optout';
-
-        storage.setCookie(oldEidCookieName, oldEid);
-        storage.setCookie(oldOptoutCookieName, 'true');
-
-        let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-        expect(getIdResult.id).to.deep.equal({
-          eid: oldEid,
-          ibaOptout: true
-        });
-
-        // The ID system is expected to migrate old cookies to the new format
-        expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
-          encodeURIComponent('eid:' + oldEid + ',ibaOptout:1')
-        );
-        expect(storage.getCookie(oldEidCookieName)).to.equal(null);
-        expect(storage.getCookie(oldOptoutCookieName)).to.equal(null);
-        removeParrableCookie();
-      });
-    });
-
-    describe('GDPR consent', () => {
-      let callbackSpy = sinon.spy();
-
-      const config = {
-        params: {
-          partner: 'partner'
-        }
-      };
-
-      const gdprConsentTestCases = [
-        { consentData: { gdprApplies: true, consentString: 'expectedConsentString' }, expected: { gdpr: 1, gdpr_consent: 'expectedConsentString' } },
-        { consentData: { gdprApplies: false, consentString: 'expectedConsentString' }, expected: { gdpr: 0 } },
-        { consentData: { gdprApplies: true, consentString: undefined }, expected: { gdpr: 1, gdpr_consent: '' } },
-        { consentData: { gdprApplies: 'yes', consentString: 'expectedConsentString' }, expected: { gdpr: 0 } },
-        { consentData: undefined, expected: { gdpr: 0 } }
-      ];
-
-      gdprConsentTestCases.forEach((testCase, index) => {
-        it(`should call user sync url with the gdprConsent - case ${index}`, () => {
-          parrableIdSubmodule.getId(config, testCase.consentData).callback(callbackSpy);
-
-          if (testCase.expected.gdpr === 1) {
-            expect(server.requests[0].url).to.contain('gdpr=' + testCase.expected.gdpr);
-            expect(server.requests[0].url).to.contain('gdpr_consent=' + testCase.expected.gdpr_consent);
-          } else {
-            expect(server.requests[0].url).to.contain('gdpr=' + testCase.expected.gdpr);
-            expect(server.requests[0].url).to.not.contain('gdpr_consent');
-          }
-        })
-      });
-    });
-
-    describe('third party cookie support', function () {
-      let logErrorStub;
-      let callbackSpy = sinon.spy();
-
-      beforeEach(function() {
-        logErrorStub = sinon.stub(utils, 'logError');
-      });
-
-      afterEach(function () {
-        callbackSpy.resetHistory();
-        removeParrableCookie();
-      });
-
-      afterEach(function() {
-        logErrorStub.restore();
-      });
-
-      describe('when getting tpcSupport from XHR response', function () {
-        let request;
-        let dateNowStub;
-        const dateNowMock = Date.now();
-        const tpcSupportTtl = 1;
-
-        before(() => {
-          dateNowStub = sinon.stub(Date, 'now').returns(dateNowMock);
-        });
-
-        after(() => {
-          dateNowStub.restore();
-        });
-
-        it('should set tpcSupport: true and tpcUntil in the cookie', function () {
-          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-          callback(callbackSpy);
-          request = server.requests[0];
-
-          request.respond(
-            200,
-            RESPONSE_HEADERS,
-            JSON.stringify({ eid: P_XHR_EID, tpcSupport: true, tpcSupportTtl })
-          );
-
-          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
-            encodeURIComponent('eid:' + P_XHR_EID + ',tpc:1,tpcUntil:' + Math.floor((dateNowMock / 1000) + tpcSupportTtl))
-          );
-        });
-
-        it('should set tpcSupport: false and tpcUntil in the cookie', function () {
-          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-          callback(callbackSpy);
-          request = server.requests[0];
-          request.respond(
-            200,
-            RESPONSE_HEADERS,
-            JSON.stringify({ eid: P_XHR_EID, tpcSupport: false, tpcSupportTtl })
-          );
-
-          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
-            encodeURIComponent('eid:' + P_XHR_EID + ',tpc:0,tpcUntil:' + Math.floor((dateNowMock / 1000) + tpcSupportTtl))
-          );
-        });
-
-        it('should not set tpcSupport in the cookie', function () {
-          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-          callback(callbackSpy);
-          request = server.requests[0];
-
-          request.respond(
-            200,
-            RESPONSE_HEADERS,
-            JSON.stringify({ eid: P_XHR_EID })
-          );
-
-          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
-            encodeURIComponent('eid:' + P_XHR_EID)
-          );
-        });
-      });
-    });
-
-    describe('request-filter status', function () {
-      let logErrorStub;
-      let callbackSpy = sinon.spy();
-
-      beforeEach(function() {
-        logErrorStub = sinon.stub(utils, 'logError');
-      });
-
-      afterEach(function () {
-        callbackSpy.resetHistory();
-        removeParrableCookie();
-      });
-
-      afterEach(function() {
-        logErrorStub.restore();
-      });
-
-      describe('when getting filterTtl from XHR response', function () {
-        let request;
-        let dateNowStub;
-        const dateNowMock = Date.now();
-        const filterTtl = 1000;
-
-        before(() => {
-          dateNowStub = sinon.stub(Date, 'now').returns(dateNowMock);
-        });
-
-        after(() => {
-          dateNowStub.restore();
-        });
-
-        it('should set filteredUntil in the cookie', function () {
-          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-          callback(callbackSpy);
-          request = server.requests[0];
-
-          request.respond(
-            200,
-            RESPONSE_HEADERS,
-            JSON.stringify({ eid: P_XHR_EID, filterTtl })
-          );
-
-          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
-            encodeURIComponent(
-              'eid:' + P_XHR_EID +
-              ',filteredUntil:' + Math.floor((dateNowMock / 1000) + filterTtl) +
-              ',filterHits:0')
-          );
-        });
-
-        it('should increment filterHits in the cookie', function () {
-          writeParrableCookie({
-            eid: P_XHR_EID,
-            filteredUntil: Math.floor((dateNowMock / 1000) + filterTtl),
-            filterHits: 0
-          });
-          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-          callback(callbackSpy);
-
-          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
-            encodeURIComponent(
-              'eid:' + P_XHR_EID +
-              ',filteredUntil:' + Math.floor((dateNowMock / 1000) + filterTtl) +
-              ',filterHits:1')
-          );
-        });
-
-        it('should send filterHits in the XHR', function () {
-          const filterHits = 1;
-          writeParrableCookie({
-            eid: P_XHR_EID,
-            filteredUntil: Math.floor(dateNowMock / 1000),
-            filterHits
-          });
-          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
-          callback(callbackSpy);
-          request = server.requests[0];
-
-          let queryParams = utils.parseQS(request.url.split('?')[1]);
-          let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
-
-          expect(data.filterHits).to.equal(filterHits);
-        });
-      });
-    });
-  });
-
-  describe('parrableIdSystem.decode()', function() {
-    it('provides the Parrable ID (EID) from a stored object', function() {
-      let eid = '01.123.4567890';
-      let parrableId = {
-        eid,
-        ibaOptout: true
-      };
-
-      expect(parrableIdSubmodule.decode(parrableId)).to.deep.equal({
-        parrableId
-      });
-    });
-  });
-
-  describe('timezone filtering', function() {
-    before(function() {
-      sinon.stub(Intl, 'DateTimeFormat');
-    });
-
-    after(function() {
-      Intl.DateTimeFormat.restore();
-    });
-
-    it('permits an impression when no timezoneFilter is configured', function() {
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-      } })).to.have.property('callback');
-    });
-
-    it('permits an impression from a blocked timezone when a cookie exists', function() {
-      const blockedZone = 'Antarctica/South_Pole';
-      const resolvedOptions = sinon.stub().returns({ timeZone: blockedZone });
-      Intl.DateTimeFormat.returns({ resolvedOptions });
-
-      writeParrableCookie({ eid: P_COOKIE_EID });
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          blockedZones: [ blockedZone ]
-        }
-      } })).to.have.property('callback');
-      expect(resolvedOptions.called).to.equal(false);
-
-      removeParrableCookie();
-    })
-
-    it('permits an impression from an allowed timezone', function() {
-      const allowedZone = 'America/New_York';
-      const resolvedOptions = sinon.stub().returns({ timeZone: allowedZone });
-      Intl.DateTimeFormat.returns({ resolvedOptions });
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          allowedZones: [ allowedZone ]
-        }
-      } })).to.have.property('callback');
-      expect(resolvedOptions.called).to.equal(true);
-    });
-
-    it('permits an impression from a lower cased allowed timezone', function() {
-      const allowedZone = 'America/New_York';
-      const resolvedOptions = sinon.stub().returns({ timeZone: allowedZone });
-      Intl.DateTimeFormat.returns({ resolvedOptions });
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
-        timezoneFilter: {
-          allowedZones: [ allowedZone.toLowerCase() ]
-        }
-      } })).to.have.property('callback');
-      expect(resolvedOptions.called).to.equal(true);
-    });
-
-    it('permits an impression from a timezone that is not blocked', function() {
-      const blockedZone = 'America/New_York';
-      const resolvedOptions = sinon.stub().returns({ timeZone: 'Iceland' });
-      Intl.DateTimeFormat.returns({ resolvedOptions });
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          blockedZones: [ blockedZone ]
-        }
-      } })).to.have.property('callback');
-      expect(resolvedOptions.called).to.equal(true);
-    });
-
-    it('does not permit an impression from a blocked timezone', function() {
-      const blockedZone = 'America/New_York';
-      const resolvedOptions = sinon.stub().returns({ timeZone: blockedZone });
-      Intl.DateTimeFormat.returns({ resolvedOptions });
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          blockedZones: [ blockedZone ]
-        }
-      } })).to.equal(null);
-      expect(resolvedOptions.called).to.equal(true);
-    });
-
-    it('does not permit an impression from a lower cased blocked timezone', function() {
-      const blockedZone = 'America/New_York';
-      const resolvedOptions = sinon.stub().returns({ timeZone: blockedZone });
-      Intl.DateTimeFormat.returns({ resolvedOptions });
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
-        timezoneFilter: {
-          blockedZones: [ blockedZone.toLowerCase() ]
-        }
-      } })).to.equal(null);
-      expect(resolvedOptions.called).to.equal(true);
-    });
-
-    it('does not permit an impression from a blocked timezone even when also allowed', function() {
-      const timezone = 'America/New_York';
-      const resolvedOptions = sinon.stub().returns({ timeZone: timezone });
-      Intl.DateTimeFormat.returns({ resolvedOptions });
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          allowedZones: [ timezone ],
-          blockedZones: [ timezone ]
-        }
-      } })).to.equal(null);
-      expect(resolvedOptions.called).to.equal(true);
-    });
-  });
-
-  describe('timezone offset filtering', function() {
-    before(function() {
-      sinon.stub(Date.prototype, 'getTimezoneOffset');
-    });
-
-    afterEach(function() {
-      Date.prototype.getTimezoneOffset.reset();
-    })
-
-    after(function() {
-      Date.prototype.getTimezoneOffset.restore();
-    });
-
-    it('permits an impression from a blocked offset when a cookie exists', function() {
-      const blockedOffset = -4;
-      Date.prototype.getTimezoneOffset.returns(blockedOffset * 60);
-
-      writeParrableCookie({ eid: P_COOKIE_EID });
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          blockedOffsets: [ blockedOffset ]
-        }
-      } })).to.have.property('callback');
-
-      removeParrableCookie();
-    });
-
-    it('permits an impression from an allowed offset', function() {
-      const allowedOffset = -5;
-      Date.prototype.getTimezoneOffset.returns(allowedOffset * 60);
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          allowedOffsets: [ allowedOffset ]
-        }
-      } })).to.have.property('callback');
-      expect(Date.prototype.getTimezoneOffset.called).to.equal(true);
-    });
-
-    it('permits an impression from an offset that is not blocked', function() {
-      const allowedOffset = -5;
-      const blockedOffset = 5;
-      Date.prototype.getTimezoneOffset.returns(allowedOffset * 60);
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          blockedOffsets: [ blockedOffset ]
-        }
-      }})).to.have.property('callback');
-      expect(Date.prototype.getTimezoneOffset.called).to.equal(true);
-    });
-
-    it('does not permit an impression from a blocked offset', function() {
-      const blockedOffset = -5;
-      Date.prototype.getTimezoneOffset.returns(blockedOffset * 60);
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          blockedOffsets: [ blockedOffset ]
-        }
-      } })).to.equal(null);
-      expect(Date.prototype.getTimezoneOffset.called).to.equal(true);
-    });
-
-    it('does not permit an impression from a blocked offset even when also allowed', function() {
-      const offset = -5;
-      Date.prototype.getTimezoneOffset.returns(offset * 60);
-
-      expect(parrableIdSubmodule.getId({ params: {
-        partners: 'prebid-test',
-        timezoneFilter: {
-          allowedOffset: [ offset ],
-          blockedOffsets: [ offset ]
-        }
-      } })).to.equal(null);
-      expect(Date.prototype.getTimezoneOffset.called).to.equal(true);
-    });
-  });
-
-  describe('userId requestBids hook', function() {
-    let adUnits;
-    let sandbox;
-
-    beforeEach(function() {
-      sandbox = sinon.sandbox.create();
-      mockGdprConsent(sandbox);
-      adUnits = [getAdUnitMock()];
-      writeParrableCookie({ eid: P_COOKIE_EID, ibaOptout: true });
-      init(config);
-      setSubmoduleRegistry([parrableIdSubmodule]);
-    });
-
-    afterEach(function() {
-      removeParrableCookie();
-      storage.setCookie(P_COOKIE_NAME, '', EXPIRED_COOKIE_DATE);
-      sandbox.restore();
-    });
-
-    it('when a stored Parrable ID exists it is added to bids', function(done) {
-      config.setConfig(getConfigMock());
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.parrableId');
-            expect(bid.userId.parrableId.eid).to.equal(P_COOKIE_EID);
-            expect(bid.userId.parrableId.ibaOptout).to.equal(true);
-            const parrableIdAsEid = find(bid.userIdAsEids, e => e.source == 'parrable.com');
-            expect(parrableIdAsEid).to.deep.equal({
-              source: 'parrable.com',
-              uids: [{
-                id: P_COOKIE_EID,
-                atype: 1,
-                ext: {
-                  ibaOptout: true
-                }
-              }]
-            });
-          });
-        });
-        done();
-      }, { adUnits });
-    });
-
-    it('supplies an optout reason when the EID is missing due to CCPA non-consent', function(done) {
-      // the ID system itself will not write a cookie with an EID when CCPA=true
-      writeParrableCookie({ ccpaOptout: true });
-      config.setConfig(getConfigMock());
-
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.parrableId');
-            expect(bid.userId.parrableId).to.not.have.property('eid');
-            expect(bid.userId.parrableId.ccpaOptout).to.equal(true);
-            const parrableIdAsEid = find(bid.userIdAsEids, e => e.source == 'parrable.com');
-            expect(parrableIdAsEid).to.deep.equal({
-              source: 'parrable.com',
-              uids: [{
-                id: '',
-                atype: 1,
-                ext: {
-                  ccpaOptout: true
-                }
-              }]
-            });
-          });
-        });
-        done();
-      }, { adUnits });
-    });
-  });
-
-  describe('partners parsing', function () {
-    let callbackSpy = sinon.spy();
-
-    const partnersTestCase = [
-      {
-        name: '"partners" as an array',
-        config: { params: { partners: ['parrable_test_partner_123', 'parrable_test_partner_456'] } },
-        expected: ['parrable_test_partner_123', 'parrable_test_partner_456']
-      },
-      {
-        name: '"partners" as a string list',
-        config: { params: { partners: 'parrable_test_partner_123,parrable_test_partner_456' } },
-        expected: ['parrable_test_partner_123', 'parrable_test_partner_456']
-      },
-      {
-        name: '"partners" as a string',
-        config: { params: { partners: 'parrable_test_partner_123' } },
-        expected: ['parrable_test_partner_123']
-      },
-      {
-        name: '"partner" as a string list',
-        config: { params: { partner: 'parrable_test_partner_123,parrable_test_partner_456' } },
-        expected: ['parrable_test_partner_123', 'parrable_test_partner_456']
-      },
-      {
-        name: '"partner" as string',
-        config: { params: { partner: 'parrable_test_partner_123' } },
-        expected: ['parrable_test_partner_123']
-      },
-    ];
-    partnersTestCase.forEach(testCase => {
-      it(`accepts config property ${testCase.name}`, () => {
-        parrableIdSubmodule.getId(testCase.config).callback(callbackSpy);
-
-        let request = server.requests[0];
-        let queryParams = utils.parseQS(request.url.split('?')[1]);
-        let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
-
-        expect(data.trackers).to.deep.equal(testCase.expected);
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/performaxBidAdapter_spec.js b/test/spec/modules/performaxBidAdapter_spec.js
new file mode 100644
index 00000000000..49a6a83e29d
--- /dev/null
+++ b/test/spec/modules/performaxBidAdapter_spec.js
@@ -0,0 +1,175 @@
+import { expect } from 'chai';
+import { spec, converter } from 'modules/performaxBidAdapter.js';
+
+describe('Performax adapter', function () {
+  let bids = [{
+    bidder: 'performax',
+    params: {
+      tagid: 'sample'
+    },
+    ortb2Imp: {
+      ext: {}
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 300],
+        ]}},
+    adUnitCode: 'postbid_iframe',
+    transactionId: '84deda92-e9ba-4b0d-a797-43be5e522430',
+    adUnitId: '4ee4643b-931f-4a17-a571-ccba57886dc8',
+    sizes: [
+      [300, 300],
+    ],
+    bidId: '2bc545c347dbbe',
+    bidderRequestId: '1534dec005b9a',
+    auctionId: 'acd97e55-01e1-45ad-813c-67fa27fc5c1b',
+    src: 'client',
+    bidRequestsCount: 1,
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+    ortb2: {
+      source: {},
+      site: {},
+      device: {}
+    },
+  },
+
+  {
+    bidder: 'performax',
+    params: {
+      tagid: '1545'
+    },
+    ortb2Imp: {
+      ext: {}
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 600],
+        ]}},
+    adUnitCode: 'postbid_halfpage_iframe',
+    transactionId: '84deda92-e9ba-4b0d-a797-43be5e522430',
+    adUnitId: '4ee4643b-931f-4a17-a571-ccba57886dc8',
+    sizes: [
+      [300, 600],
+    ],
+    bidId: '3dd53d30c691fe',
+    bidderRequestId: '1534dec005b9a',
+    auctionId: 'acd97e55-01e1-45ad-813c-67fa27fc5c1b',
+    src: 'client',
+    bidRequestsCount: 1,
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+    ortb2: {
+      source: {},
+      site: {},
+      device: {}
+    }}];
+
+  let bidderRequest = {
+    bidderCode: 'performax2',
+    auctionId: 'acd97e55-01e1-45ad-813c-67fa27fc5c1b',
+    id: 'acd97e55-01e1-45ad-813c-67fa27fc5c1b',
+    bidderRequestId: '1534dec005b9a',
+    bids: bids,
+    ortb2: {
+      regs: {
+        ext: {
+          gdpr: 1
+        }},
+      user: {
+        ext: {
+          consent: 'consent-string'
+        }
+      },
+      site: {},
+      device: {}
+    }};
+
+  let serverResponse = {
+    body: {
+      cur: 'CZK',
+      seatbid: [
+        {
+          seat: 'performax',
+          bid: [
+            {
+              id: 'sample',
+              price: 20,
+              w: 300,
+              h: 300,
+              adm: 'My ad'
+            }
+          ]}]},
+  }
+
+  describe('isBidRequestValid', function () {
+    let bid = {};
+    it('should return false when missing "tagid" param', function() {
+      bid.params = {slotId: 'param'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true when tagid is correct', function() {
+      bid.params = {tagid: 'sample'};
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  })
+
+  describe('buildRequests', function () {
+    it('should set correct request method and url', function () {
+      let requests = spec.buildRequests([bids[0]], bidderRequest);
+      expect(requests).to.be.an('array').that.has.lengthOf(1);
+      let request = requests[0];
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal('https://dale.performax.cz/ortb');
+      expect(request.data).to.be.an('object');
+    });
+
+    it('should pass correct imp', function () {
+      let requests = spec.buildRequests([bids[0]], bidderRequest);
+      let {data} = requests[0];
+      let {imp} = data;
+      expect(imp).to.be.an('array').that.has.lengthOf(1);
+      expect(imp[0]).to.be.an('object');
+      let bid = imp[0];
+      expect(bid.id).to.equal('2bc545c347dbbe');
+      expect(bid.banner).to.deep.equal({topframe: 0, format: [{w: 300, h: 300}]});
+    });
+
+    it('should process multiple bids', function () {
+      let requests = spec.buildRequests(bids, bidderRequest);
+      expect(requests).to.be.an('array').that.has.lengthOf(1);
+      let {data} = requests[0];
+      let {imp} = data;
+      expect(imp).to.be.an('array').that.has.lengthOf(bids.length);
+      let bid1 = imp[0];
+      expect(bid1.banner).to.deep.equal({topframe: 0, format: [{w: 300, h: 300}]});
+      let bid2 = imp[1];
+      expect(bid2.banner).to.deep.equal({topframe: 0, format: [{w: 300, h: 600}]});
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should map params correctly', function () {
+      let ortbRequest = {data: converter.toORTB({bidderRequest, bids})};
+      serverResponse.body.id = ortbRequest.data.id;
+      serverResponse.body.seatbid[0].bid[0].imp_id = ortbRequest.data.imp[0].id;
+
+      let result = spec.interpretResponse(serverResponse, ortbRequest);
+      expect(result).to.be.an('array').that.has.lengthOf(1);
+      let bid = result[0];
+
+      expect(bid.cpm).to.equal(20);
+      expect(bid.ad).to.equal('My ad');
+      expect(bid.currency).to.equal('CZK');
+      expect(bid.mediaType).to.equal('banner');
+      expect(bid.netRevenue).to.equal(true);
+      expect(bid.ttl).to.equal(360);
+      expect(bid.creativeId).to.equal('sample');
+    });
+  });
+});
diff --git a/test/spec/modules/permutiveIdentityManagerIdSystem_spec.js b/test/spec/modules/permutiveIdentityManagerIdSystem_spec.js
new file mode 100644
index 00000000000..96c581844c1
--- /dev/null
+++ b/test/spec/modules/permutiveIdentityManagerIdSystem_spec.js
@@ -0,0 +1,126 @@
+import { permutiveIdentityManagerIdSubmodule, storage } from 'modules/permutiveIdentityManagerIdSystem'
+import { deepSetValue } from 'src/utils.js'
+
+const STORAGE_KEY = 'permutive-prebid-id'
+
+describe('permutiveIdentityManagerIdSystem', () => {
+  afterEach(() => {
+    storage.removeDataFromLocalStorage(STORAGE_KEY)
+  })
+
+  describe('decode', () => {
+    it('returns the input unchanged', () => {
+      const input = {
+        id5id: {
+          uid: '0',
+          ext: {
+            abTestingControlGroup: false,
+            linkType: 2,
+            pba: 'somepba'
+          }
+        }
+      }
+      const result = permutiveIdentityManagerIdSubmodule.decode(input)
+      expect(result).to.be.equal(input)
+    })
+  })
+
+  describe('getId', () => {
+    it('returns relevant IDs from localStorage and does not return unexpected IDs', () => {
+      const data = getUserIdData()
+      storage.setDataInLocalStorage(STORAGE_KEY, JSON.stringify(data))
+      const result = permutiveIdentityManagerIdSubmodule.getId({})
+      const expected = {
+        'id': {
+          'id5id': {
+            'uid': '0',
+            'linkType': 0,
+            'ext': {
+              'abTestingControlGroup': false,
+              'linkType': 0,
+              'pba': 'EVqgf9vY0fSrsrqJZMOm+Q=='
+            }
+          }
+        }
+      }
+      expect(result).to.deep.equal(expected)
+    })
+
+    it('returns undefined if no relevant IDs are found in localStorage', () => {
+      storage.setDataInLocalStorage(STORAGE_KEY, '{}')
+      const result = permutiveIdentityManagerIdSubmodule.getId({})
+      expect(result).to.be.undefined
+    })
+
+    it('will optionally wait for Permutive SDK if no identities are in local storage already', async () => {
+      const cleanup = setWindowPermutive()
+      const result = permutiveIdentityManagerIdSubmodule.getId({params: {ajaxTimeout: 50}})
+      expect(result).not.to.be.undefined
+      expect(result.id).to.be.undefined
+      expect(result.callback).not.to.be.undefined
+      const expected = {
+        'id5id': {
+          'uid': '0',
+          'linkType': 0,
+          'ext': {
+            'abTestingControlGroup': false,
+            'linkType': 0,
+            'pba': 'EVqgf9vY0fSrsrqJZMOm+Q=='
+          }
+        }
+      }
+      const r = await new Promise(result.callback)
+      expect(r).to.deep.equal(expected)
+      cleanup()
+    })
+  })
+})
+
+const setWindowPermutive = () => {
+  // Read from Permutive
+  const backup = window.permutive
+
+  deepSetValue(window, 'permutive.ready', (f) => {
+    setTimeout(() => f(), 5)
+  })
+
+  deepSetValue(window, 'permutive.addons.identity_manager.prebid.onReady', (f) => {
+    setTimeout(() => f(sdkUserIdData()), 5)
+  })
+
+  // Cleanup
+  return () => window.permutive = backup
+}
+
+const sdkUserIdData = () => ({
+  'id5id': {
+    'uid': '0',
+    'linkType': 0,
+    'ext': {
+      'abTestingControlGroup': false,
+      'linkType': 0,
+      'pba': 'EVqgf9vY0fSrsrqJZMOm+Q=='
+    }
+  },
+})
+
+const getUserIdData = () => ({
+  'providers': {
+    'id5id': {
+      'userId': {
+        'uid': '0',
+        'linkType': 0,
+        'ext': {
+          'abTestingControlGroup': false,
+          'linkType': 0,
+          'pba': 'EVqgf9vY0fSrsrqJZMOm+Q=='
+        }
+      }
+    },
+    'fooid': {
+      'userId': {
+        'id': '1'
+      }
+    }
+  }
+})
diff --git a/test/spec/modules/permutiveRtdProvider_spec.js b/test/spec/modules/permutiveRtdProvider_spec.js
index 942ec2eaa46..51fbba7e936 100644
--- a/test/spec/modules/permutiveRtdProvider_spec.js
+++ b/test/spec/modules/permutiveRtdProvider_spec.js
@@ -212,6 +212,28 @@ describe('permutiveRtdProvider', function () {
               return { id: seg }
             }),
           },
+          {
+            name: 'permutive.com',
+            ext: {
+              segtax: 600
+            },
+            segment: [
+              { id: '1' },
+              { id: '2' },
+              { id: '3' },
+            ],
+          },
+          {
+            name: 'permutive.com',
+            ext: {
+              segtax: 601
+            },
+            segment: [
+              { id: '100' },
+              { id: '101' },
+              { id: '102' },
+            ],
+          },
         ])
       })
     })
@@ -462,7 +484,9 @@ describe('permutiveRtdProvider', function () {
           _psegs: [],
           _ppam: [],
           _pcrprs: [],
-          _pssps: { ssps: [], cohorts: [] }
+          _pindexs: [],
+          _pssps: { ssps: [], cohorts: [] },
+          _ppsts: {},
         })
 
         setBidderRtb(bidderConfig, moduleConfig, segmentsData)
@@ -546,6 +570,7 @@ describe('permutiveRtdProvider', function () {
       const data = transformedTargeting()
       expect(getSegments(250)).to.deep.equal(data)
     })
+
     it('should enforce max segments', function () {
       const max = 1
       const segments = getSegments(max)
@@ -553,11 +578,35 @@ describe('permutiveRtdProvider', function () {
       for (const key in segments) {
         if (key === 'ssp') {
           expect(segments[key].cohorts).to.have.length(max)
+        } else if (key === 'topics') {
+          for (const topic in segments[key]) {
+            expect(segments[key][topic]).to.have.length(max)
+          }
         } else {
           expect(segments[key]).to.have.length(max)
         }
       }
     })
+
+    it('should coerce numbers to strings', function () {
+      setLocalStorage({ _prubicons: [1, 2, 3], _pssps: { ssps: ['foo', 'bar'], cohorts: [4, 5, 6] } })
+
+      const segments = getSegments(200)
+
+      expect(segments.rubicon).to.deep.equal(['1', '2', '3'])
+      expect(segments.ssp.ssps).to.deep.equal(['foo', 'bar'])
+      expect(segments.ssp.cohorts).to.deep.equal(['4', '5', '6'])
+    })
+
+    it('should return empty values on unexpected format', function () {
+      setLocalStorage({ _prubicons: 'a string instead?', _pssps: 123 })
+
+      const segments = getSegments(200)
+
+      expect(segments.rubicon).to.deep.equal([])
+      expect(segments.ssp.ssps).to.deep.equal([])
+      expect(segments.ssp.cohorts).to.deep.equal([])
+    })
   })
 
   describe('Existing key-value targeting', function () {
@@ -677,13 +726,25 @@ function getConfig () {
 }
 
 function transformedTargeting (data = getTargetingData()) {
+  const topics = (() => {
+    const topics = {}
+    for (const topic in data._ppsts) {
+      topics[topic] = data._ppsts[topic].map(String)
+    }
+    return topics
+  })()
+
   return {
-    ac: [...data._pcrprs, ...data._ppam, ...data._psegs.filter(seg => seg >= 1000000)],
-    appnexus: data._papns,
-    ix: data._pindexs,
-    rubicon: data._prubicons,
-    gam: data._pdfps,
-    ssp: data._pssps,
+    ac: [...data._pcrprs, ...data._ppam, ...data._psegs.filter(seg => seg >= 1000000)].map(String),
+    appnexus: data._papns.map(String),
+    ix: data._pindexs.map(String),
+    rubicon: data._prubicons.map(String),
+    gam: data._pdfps.map(String),
+    ssp: {
+      ssps: data._pssps.ssps.map(String),
+      cohorts: data._pssps.cohorts.map(String)
+    },
+    topics,
   }
 }
 
@@ -696,7 +757,8 @@ function getTargetingData () {
     _ppam: ['ppam1', 'ppam2'],
     _pindexs: ['pindex1', 'pindex2'],
     _pcrprs: ['pcrprs1', 'pcrprs2', 'dup'],
-    _pssps: { ssps: ['xyz', 'abc', 'dup'], cohorts: ['123', 'abc'] }
+    _pssps: { ssps: ['xyz', 'abc', 'dup'], cohorts: ['123', 'abc'] },
+    _ppsts: { '600': [1, 2, 3], '601': [100, 101, 102] },
   }
 }
 
diff --git a/test/spec/modules/pgamsspBidAdapter_spec.js b/test/spec/modules/pgamsspBidAdapter_spec.js
index 7e2323d4b81..bdb837b70a4 100644
--- a/test/spec/modules/pgamsspBidAdapter_spec.js
+++ b/test/spec/modules/pgamsspBidAdapter_spec.js
@@ -3,9 +3,19 @@ import { spec } from '../../../modules/pgamsspBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'pgamssp'
+const bidder = 'pgamssp';
 
 describe('PGAMBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -16,8 +26,9 @@ describe('PGAMBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -30,8 +41,9 @@ describe('PGAMBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -53,8 +65,9 @@ describe('PGAMBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -73,9 +86,20 @@ describe('PGAMBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
     timeout: 500
   };
@@ -112,6 +136,7 @@ describe('PGAMBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -129,7 +154,7 @@ describe('PGAMBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -145,6 +170,56 @@ describe('PGAMBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -170,8 +245,10 @@ describe('PGAMBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -186,12 +263,38 @@ describe('PGAMBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -395,5 +498,17 @@ describe('PGAMBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://cs.pgammedia.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.pgammedia.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js b/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
index 0c4949264a7..ea0dd4ab793 100644
--- a/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
@@ -1,7 +1,7 @@
 import pianoDmpAnalytics from 'modules/pianoDmpAnalyticsAdapter.js';
 import adapterManager from 'src/adapterManager';
 import * as events from 'src/events';
-import constants from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 import { expect } from 'chai';
 
 describe('Piano DMP Analytics Adapter', () => {
@@ -31,14 +31,14 @@ describe('Piano DMP Analytics Adapter', () => {
 
     it('should pass events to call queue', () => {
       const eventsList = [
-        constants.EVENTS.AUCTION_INIT,
-        constants.EVENTS.AUCTION_END,
-        constants.EVENTS.BID_ADJUSTMENT,
-        constants.EVENTS.BID_TIMEOUT,
-        constants.EVENTS.BID_REQUESTED,
-        constants.EVENTS.BID_RESPONSE,
-        constants.EVENTS.NO_BID,
-        constants.EVENTS.BID_WON,
+        EVENTS.AUCTION_INIT,
+        EVENTS.AUCTION_END,
+        EVENTS.BID_ADJUSTMENT,
+        EVENTS.BID_TIMEOUT,
+        EVENTS.BID_REQUESTED,
+        EVENTS.BID_RESPONSE,
+        EVENTS.NO_BID,
+        EVENTS.BID_WON,
       ];
 
       // Given
diff --git a/test/spec/modules/pixfutureBidAdapter_spec.js b/test/spec/modules/pixfutureBidAdapter_spec.js
index a236478c9b4..bdf40fbb06b 100644
--- a/test/spec/modules/pixfutureBidAdapter_spec.js
+++ b/test/spec/modules/pixfutureBidAdapter_spec.js
@@ -43,12 +43,12 @@ describe('PixFutureAdapter', function () {
       });
 
       it('should return false when required params are not passed', function () {
-        let bid = Object.assign({}, bid);
-        delete bid.params;
-        bid.params = {
+        let invalidBid = Object.assign({}, bid);
+        delete invalidBid.params;
+        invalidBid.params = {
           'pix_id': 0
         };
-        expect(spec.isBidRequestValid(bid)).to.equal(false);
+        expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
       });
     });
 
diff --git a/test/spec/modules/playdigoBidAdapter_spec.js b/test/spec/modules/playdigoBidAdapter_spec.js
new file mode 100644
index 00000000000..591892beb8c
--- /dev/null
+++ b/test/spec/modules/playdigoBidAdapter_spec.js
@@ -0,0 +1,476 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/playdigoBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'playdigo'
+
+describe('PlaydigoBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://server.playdigo.com/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+});
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 717a5cd6c6d..058175b878c 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -12,9 +12,8 @@ import {deepAccess, deepClone, mergeDeep} from 'src/utils.js';
 import {ajax} from 'src/ajax.js';
 import {config} from 'src/config.js';
 import * as events from 'src/events.js';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 import {server} from 'test/mocks/xhr.js';
-import {createEidsArray} from 'modules/userId/eids.js';
 import 'modules/appnexusBidAdapter.js'; // appnexus alias test
 import 'modules/rubiconBidAdapter.js'; // rubicon alias test
 import 'src/prebid.js'; // $$PREBID_GLOBAL$$.aliasBidder test
@@ -22,30 +21,32 @@ import 'modules/currency.js'; // adServerCurrency test
 import 'modules/userId/index.js';
 import 'modules/multibid/index.js';
 import 'modules/priceFloors.js';
-import 'modules/consentManagement.js';
+import 'modules/consentManagementTcf.js';
 import 'modules/consentManagementUsp.js';
 import 'modules/schain.js';
-import 'modules/fledgeForGpt.js';
+import 'modules/paapi.js';
 import * as redactor from 'src/activities/redactor.js';
 import * as activityRules from 'src/activities/rules.js';
 import {hook} from '../../../src/hook.js';
 import {decorateAdUnitsWithNativeParams} from '../../../src/native.js';
 import {auctionManager} from '../../../src/auctionManager.js';
 import {stubAuctionIndex} from '../../helpers/indexStub.js';
-import {addComponentAuction, registerBidder} from 'src/adapters/bidderFactory.js';
+import {addPaapiConfig, registerBidder} from 'src/adapters/bidderFactory.js';
 import {getGlobal} from '../../../src/prebidGlobal.js';
-import {syncAddFPDEnrichments, syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
+import {syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
 import {deepSetValue} from '../../../src/utils.js';
-import {sandbox} from 'sinon';
 import {ACTIVITY_TRANSMIT_UFPD} from '../../../src/activities/activities.js';
-import {activityParams} from '../../../src/activities/activityParams.js';
 import {MODULE_TYPE_PREBID} from '../../../src/activities/modules.js';
+import {
+  consolidateEids,
+  extractEids,
+  getPBSBidderConfig
+} from '../../../modules/prebidServerBidAdapter/bidderConfig.js';
 
 let CONFIG = {
   accountId: '1',
   enabled: true,
   bidders: ['appnexus'],
-  timeout: 1000,
   cacheMarkup: 2,
   endpoint: {
     p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
@@ -94,6 +95,7 @@ const REQUEST = {
         }
       },
       'transactionId': '4ef956ad-fd83-406d-bd35-e4bb786ab86c',
+      'adUnitId': 'au-id-1',
       'bids': [
         {
           'bid_id': '123',
@@ -765,12 +767,82 @@ describe('S2S Adapter', function () {
       });
     })
 
-    it('should set tmax to s2sConfig.timeout', () => {
-      const cfg = {...CONFIG, timeout: 123};
-      config.setConfig({s2sConfig: cfg});
-      adapter.callBids({...REQUEST, s2sConfig: cfg}, BID_REQUESTS, addBidResponse, done, ajax);
+    it('should set tmaxmax correctly when publisher has specified it', () => {
+      const cfg = {...CONFIG};
+      config.setConfig({s2sConfig: cfg})
+
+      // publisher has specified a tmaxmax in their setup
+      const ortb2Fragments = {
+        global: {
+          ext: {
+            tmaxmax: 4242
+          }
+        }
+      };
+      const s2sCfg = {...REQUEST, cfg}
+      const payloadWithFragments = { ...s2sCfg, ortb2Fragments };
+
+      adapter.callBids(payloadWithFragments, BID_REQUESTS, addBidResponse, done, ajax);
+      const req = JSON.parse(server.requests[0].requestBody);
+
+      expect(req.ext.tmaxmax).to.eql(4242);
+    });
+
+    it('should set tmaxmax correctly when publisher has not specified it', () => {
+      const cfg = {...CONFIG};
+      config.setConfig({s2sConfig: cfg})
+
+      // publisher has not specified a tmaxmax in their setup - so we should be
+      // falling back to requestBidsTimeout
+      const ortb2Fragments = {};
+      const s2sCfg = {...REQUEST, cfg};
+      const requestBidsTimeout = 808;
+      const payloadWithFragments = { ...s2sCfg, ortb2Fragments, requestBidsTimeout };
+
+      adapter.callBids(payloadWithFragments, BID_REQUESTS, addBidResponse, done, ajax);
       const req = JSON.parse(server.requests[0].requestBody);
-      expect(req.tmax).to.eql(123);
+
+      expect(req.ext.tmaxmax).to.eql(808);
+    });
+
+    describe('default tmax', () => {
+      [null, 3000].forEach(maxTimeout => {
+        describe(`when maxTimeout is ${maxTimeout}`, () => {
+          let cfg;
+
+          beforeEach(() => {
+            cfg = {accountId: '1', endpoint: 'mock-endpoint', maxTimeout};
+            config.setConfig({s2sConfig: cfg});
+            maxTimeout = maxTimeout ?? s2sDefaultConfig.maxTimeout
+          });
+
+          it('should cap tmax to maxTimeout', () => {
+            adapter.callBids({...REQUEST, requestBidsTimeout: maxTimeout * 2, s2sConfig: cfg}, BID_REQUESTS, addBidResponse, done, ajax);
+            const req = JSON.parse(server.requests[0].requestBody);
+            expect(req.tmax).to.eql(maxTimeout);
+          });
+
+          it('should be set to 0.75 * requestTimeout, if lower than maxTimeout', () => {
+            adapter.callBids({...REQUEST, requestBidsTimeout: maxTimeout / 2}, BID_REQUESTS, addBidResponse, done, ajax);
+            const req = JSON.parse(server.requests[0].requestBody);
+            expect(req.tmax).to.eql(maxTimeout / 2 * 0.75);
+          })
+        })
+      })
+    })
+
+    it('should set customHeaders correctly when publisher has provided it', () => {
+      let configWithCustomHeaders = utils.deepClone(CONFIG);
+      configWithCustomHeaders.customHeaders = { customHeader1: 'customHeader1Value' };
+      config.setConfig({ s2sConfig: configWithCustomHeaders });
+
+      let reqWithNewConfig = utils.deepClone(REQUEST);
+      reqWithNewConfig.s2sConfig = configWithCustomHeaders;
+
+      adapter.callBids(reqWithNewConfig, BID_REQUESTS, addBidResponse, done, ajax);
+      const reqHeaders = server.requests[0].requestHeaders
+      expect(reqHeaders.customHeader1).to.exist;
+      expect(reqHeaders.customHeader1).to.equal('customHeader1Value');
     });
 
     it('should block request if config did not define p1Consent URL in endpoint object config', function () {
@@ -838,22 +910,6 @@ describe('S2S Adapter', function () {
         expect(requestBid.imp[0].video).to.exist;
       });
 
-      it('should default video placement if not defined and instream', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint.p1Consent = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-
-        config.setConfig({ s2sConfig: ortb2Config });
-
-        let videoBid = utils.deepClone(VIDEO_REQUEST);
-        videoBid.ad_units[0].mediaTypes.video.context = 'instream';
-        adapter.callBids(videoBid, BID_REQUESTS, addBidResponse, done, ajax);
-
-        const requestBid = JSON.parse(server.requests[0].requestBody);
-        expect(requestBid.imp[0].banner).to.not.exist;
-        expect(requestBid.imp[0].video).to.exist;
-        expect(requestBid.imp[0].video.placement).to.equal(1);
-      });
-
       it('converts video mediaType properties into openRTB format', function () {
         let ortb2Config = utils.deepClone(CONFIG);
         ortb2Config.endpoint.p1Consent = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
@@ -867,7 +923,6 @@ describe('S2S Adapter', function () {
         const requestBid = JSON.parse(server.requests[0].requestBody);
         expect(requestBid.imp[0].banner).to.not.exist;
         expect(requestBid.imp[0].video).to.exist;
-        expect(requestBid.imp[0].video.placement).to.equal(1);
         expect(requestBid.imp[0].video.w).to.equal(640);
         expect(requestBid.imp[0].video.h).to.equal(480);
         expect(requestBid.imp[0].video.playerSize).to.be.undefined;
@@ -1023,17 +1078,23 @@ describe('S2S Adapter', function () {
     it('adds device and app objects to request', function () {
       const _config = {
         s2sConfig: CONFIG,
-        device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
-        app: { bundle: 'com.test.app' },
       };
-
       config.setConfig(_config);
-      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sreq = addFpdEnrichmentsToS2SRequest({
+        ...REQUEST,
+        ortb2Fragments: {
+          global: {
+            device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
+            app: { bundle: 'com.test.app' },
+          }
+        }
+      }, BID_REQUESTS)
+      adapter.callBids(s2sreq, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       sinon.assert.match(requestBid.device, {
         ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC',
-        w: window.innerWidth,
-        h: window.innerHeight
+        w: window.screen.width,
+        h: window.screen.height,
       })
       sinon.assert.match(requestBid.app, {
         bundle: 'com.test.app',
@@ -1047,20 +1108,25 @@ describe('S2S Adapter', function () {
           p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
         }
       });
-
       const _config = {
         s2sConfig: s2sConfig,
-        device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
-        app: { bundle: 'com.test.app' },
       };
-
       config.setConfig(_config);
-      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sReq = addFpdEnrichmentsToS2SRequest({
+        ...REQUEST,
+        ortb2Fragments: {
+          global: {
+            device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
+            app: { bundle: 'com.test.app' },
+          }
+        }
+      }, BID_REQUESTS)
+      adapter.callBids(s2sReq, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       sinon.assert.match(requestBid.device, {
         ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC',
-        w: window.innerWidth,
-        h: window.innerHeight
+        w: window.screen.width,
+        h: window.screen.height,
       })
       sinon.assert.match(requestBid.app, {
         bundle: 'com.test.app',
@@ -1414,20 +1480,14 @@ describe('S2S Adapter', function () {
         it('adds device.w and device.h even if the config lacks a device object', function () {
           const _config = {
             s2sConfig: CONFIG,
-            app: { bundle: 'com.test.app' },
           };
-
           config.setConfig(_config);
           adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
           const requestBid = JSON.parse(server.requests[0].requestBody);
           sinon.assert.match(requestBid.device, {
-            w: window.innerWidth,
-            h: window.innerHeight
+            w: window.screen.width,
+            h: window.screen.height,
           })
-          sinon.assert.match(requestBid.app, {
-            bundle: 'com.test.app',
-            publisher: { 'id': '1' }
-          });
           expect(requestBid.imp[0].native.ver).to.equal('1.2');
         });
 
@@ -1511,19 +1571,26 @@ describe('S2S Adapter', function () {
     it('adds site if app is not present', function () {
       const _config = {
         s2sConfig: CONFIG,
-        site: {
-          publisher: {
-            id: '1234',
-            domain: 'test.com'
-          },
-          content: {
-            language: 'en'
-          }
-        }
       };
 
       config.setConfig(_config);
-      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sReq = addFpdEnrichmentsToS2SRequest({
+        ...REQUEST,
+        ortb2Fragments: {
+          global: {
+            site: {
+              publisher: {
+                id: '1234',
+                domain: 'test.com'
+              },
+              content: {
+                language: 'en'
+              }
+            }
+          }
+        }
+      }, BID_REQUESTS);
+      adapter.callBids(s2sReq, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.site).to.exist.and.to.be.a('object');
       expect(requestBid.site.publisher).to.exist.and.to.be.a('object');
@@ -1548,23 +1615,31 @@ describe('S2S Adapter', function () {
     it('site should not be present when app is present', function () {
       const _config = {
         s2sConfig: CONFIG,
-        app: { bundle: 'com.test.app' },
-        site: {
-          publisher: {
-            id: '1234',
-            domain: 'test.com'
-          },
-          content: {
-            language: 'en'
-          }
-        }
       };
 
       config.setConfig(_config);
-      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sReq = addFpdEnrichmentsToS2SRequest({
+        ...REQUEST,
+        ortb2Fragments: {
+          global: {
+            app: { bundle: 'com.test.app' },
+            site: {
+              publisher: {
+                id: '1234',
+                domain: 'test.com'
+              },
+              content: {
+                language: 'en'
+              }
+            }
+          }
+        }
+      }, BID_REQUESTS)
+      adapter.callBids(s2sReq, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.site).to.not.exist;
-      expect(requestBid.app).to.exist.and.to.be.a('object');
+      expect(requestBid.app.bundle).to.eql('com.test.app');
     });
 
     it('adds appnexus aliases to request', function () {
@@ -1728,39 +1803,6 @@ describe('S2S Adapter', function () {
       });
     });
 
-    it('converts appnexus params to expected format for PBS', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: {
-          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-        }
-      });
-      config.setConfig({ s2sConfig: s2sConfig });
-
-      Object.assign(BID_REQUESTS[0].bids[0].params, {
-        usePaymentRule: true,
-        keywords: {
-          foo: ['bar', 'baz'],
-          fizz: ['buzz']
-        }
-      })
-
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
-      const requestBid = JSON.parse(server.requests[0].requestBody);
-
-      const requestParams = requestBid.imp[0].ext.prebid.bidder;
-      expect(requestParams.appnexus).to.exist;
-      expect(requestParams.appnexus.placement_id).to.exist.and.to.equal(10433394);
-      expect(requestParams.appnexus.use_pmt_rule).to.exist.and.to.be.true;
-      expect(requestParams.appnexus.member).to.exist;
-      expect(requestParams.appnexus.keywords).to.exist.and.to.deep.equal([{
-        key: 'foo',
-        value: ['bar', 'baz']
-      }, {
-        key: 'fizz',
-        value: ['buzz']
-      }]);
-    });
-
     describe('cookie sync', () => {
       let s2sConfig, bidderReqs;
 
@@ -1978,15 +2020,21 @@ describe('S2S Adapter', function () {
       it('and overrides publisher and page', function () {
         config.setConfig({
           s2sConfig: s2sConfig,
-          site: {
-            domain: 'nytimes.com',
-            page: 'http://www.nytimes.com',
-            publisher: { id: '2' }
-          },
-          device: device
         });
-
-        adapter.callBids(addFpdEnrichmentsToS2SRequest(s2sBidRequest, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
+        const s2sReq = addFpdEnrichmentsToS2SRequest({
+          ...s2sBidRequest,
+          ortb2Fragments: {
+            global: {
+              site: {
+                domain: 'nytimes.com',
+                page: 'http://www.nytimes.com',
+                publisher: { id: '2' }
+              },
+              device,
+            }
+          }
+        }, BID_REQUESTS);
+        adapter.callBids(s2sReq, BID_REQUESTS, addBidResponse, done, ajax);
         const requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.site).to.exist.and.to.be.a('object');
@@ -1999,13 +2047,19 @@ describe('S2S Adapter', function () {
       it('and merges domain and page with the config site value', function () {
         config.setConfig({
           s2sConfig: s2sConfig,
-          site: {
-            foo: 'bar'
-          },
-          device: device
         });
-
-        adapter.callBids(addFpdEnrichmentsToS2SRequest(s2sBidRequest, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
+        const s2sReq = addFpdEnrichmentsToS2SRequest({
+          ...s2sBidRequest,
+          ortb2Fragments: {
+            global: {
+              site: {
+                foo: 'bar'
+              },
+              device: device
+            }
+          }
+        }, BID_REQUESTS);
+        adapter.callBids(s2sReq, BID_REQUESTS, addBidResponse, done, ajax);
 
         const requestBid = JSON.parse(server.requests[0].requestBody);
         expect(requestBid.site).to.exist.and.to.be.a('object');
@@ -2016,35 +2070,95 @@ describe('S2S Adapter', function () {
       });
     });
 
-    it('when userId is defined on bids, it\'s properties should be copied to user.ext.tpid properties', function () {
-      let consentConfig = { s2sConfig: CONFIG };
-      config.setConfig(consentConfig);
-
-      let userIdBidRequest = utils.deepClone(BID_REQUESTS);
-      userIdBidRequest[0].bids[0].userId = {
-        criteoId: '44VmRDeUE3ZGJ5MzRkRVJHU3BIUlJ6TlFPQUFU',
-        tdid: 'abc123',
-        pubcid: '1234',
-        parrableId: { eid: '01.1563917337.test-eid' },
-        lipb: {
-          lipbid: 'li-xyz',
-          segments: ['segA', 'segB']
-        },
-        idl_env: '0000-1111-2222-3333',
-        id5id: {
-          uid: '11111',
-          ext: {
-            linkType: 'some-link-type'
+    describe('user.ext.eids', () => {
+      let req;
+      beforeEach(() => {
+        const s2sConfig = {
+          ...CONFIG,
+          bidders: ['appnexus', 'rubicon']
+        }
+        config.setConfig({s2sConfig});
+        req = {
+          ...REQUEST,
+          s2sConfig,
+          ortb2Fragments: {
+            global: {
+              user: {
+                ext: {
+                  eids: [{source: 'idA', id: 1}, {source: 'idB', id: 2}]
+                }
+              }
+            },
+            bidder: {
+              appnexus: {
+                user: {
+                  ext: {
+                    eids: [{source: 'idC', id: 3}]
+                  }
+                }
+              }
+            }
           }
         }
-      };
-      userIdBidRequest[0].bids[0].userIdAsEids = [{id: 1}, {id: 2}];
+      })
+      it('should get picked up from from FPD', function () {
+        adapter.callBids(req, BID_REQUESTS, addBidResponse, done, ajax);
+        const payload = JSON.parse(server.requests[0].requestBody);
+        expect(payload.user.ext.eids).to.eql([
+          {source: 'idA', id: 1},
+          {source: 'idB', id: 2},
+          {source: 'idC', id: 3}
+        ]);
+        expect(payload.ext.prebid.data.eidpermissions).to.eql([{
+          bidders: ['appnexus'],
+          source: 'idC'
+        }]);
+      });
 
-      adapter.callBids(REQUEST, userIdBidRequest, addBidResponse, done, ajax);
-      let requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(typeof requestBid.user.ext.eids).is.equal('object');
-      expect(requestBid.user.ext.eids).to.eql([{id: 1}, {id: 2}]);
-    });
+      it('should repeat global EIDs when bidder-specific EIDs conflict', () => {
+        BID_REQUESTS.push({
+          ...BID_REQUESTS[0],
+          bidderCode: 'rubicon',
+          bids: [{
+            bidder: 'rubicon',
+            params: {}
+          }]
+        })
+        req.ortb2Fragments.bidder.rubicon = {
+          user: {
+            ext: {
+              eids: [{source: 'idC', id: 4}]
+            }
+          }
+        }
+        adapter.callBids(req, BID_REQUESTS, addBidResponse, done, ajax);
+        const payload = JSON.parse(server.requests[0].requestBody);
+        const globalEids = [
+          {source: 'idA', id: 1},
+          {source: 'idB', id: 2},
+        ]
+        expect(payload.user.ext.eids).to.eql(globalEids);
+        expect(payload.ext.prebid?.data?.eidpermissions).to.not.exist;
+        expect(payload.ext.prebid.bidderconfig).to.have.deep.members([
+          {
+            bidders: ['appnexus'],
+            config: {
+              ortb2: {
+                user: {ext: {eids: globalEids.concat([{source: 'idC', id: 3}])}}
+              }
+            }
+          },
+          {
+            bidders: ['rubicon'],
+            config: {
+              ortb2: {
+                user: {ext: {eids: globalEids.concat([{source: 'idC', id: 4}])}}
+              }
+            }
+          }
+        ])
+      })
+    })
 
     it('when config \'currency.adServerCurrency\' value is a string: ORTB has property \'cur\' value set to a single item array', function () {
       config.setConfig({
@@ -2054,7 +2168,7 @@ describe('S2S Adapter', function () {
       const bidRequests = utils.deepClone(BID_REQUESTS);
       adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
 
-      const parsedRequestBody = JSON.parse(server.requests[1].requestBody);
+      const parsedRequestBody = JSON.parse(server.requests.find(req => req.method === 'POST').requestBody);
       expect(parsedRequestBody.cur).to.deep.equal(['NZ']);
     });
 
@@ -2379,23 +2493,28 @@ describe('S2S Adapter', function () {
       ]);
     });
 
-    it('should "promote" the most reused bidder schain to source.ext.schain', () => {
-      const bidderReqs = [
-        {...deepClone(BID_REQUESTS[0]), bidderCode: 'A'},
-        {...deepClone(BID_REQUESTS[0]), bidderCode: 'B'},
-        {...deepClone(BID_REQUESTS[0]), bidderCode: 'C'}
-      ];
-      const chain1 = {chain: 1};
-      const chain2 = {chain: 2};
+    Object.entries({
+      'set': {},
+      'override': {source: {ext: {schain: 'pub-provided'}}}
+    }).forEach(([t, fpd]) => {
+      it(`should not ${t} source.ext.schain`, () => {
+        const bidderReqs = [
+          {...deepClone(BID_REQUESTS[0]), bidderCode: 'A'},
+          {...deepClone(BID_REQUESTS[0]), bidderCode: 'B'},
+          {...deepClone(BID_REQUESTS[0]), bidderCode: 'C'}
+        ];
+        const chain1 = {chain: 1};
+        const chain2 = {chain: 2};
 
-      bidderReqs[0].bids[0].schain = chain1;
-      bidderReqs[1].bids[0].schain = chain2;
-      bidderReqs[2].bids[0].schain = chain2;
+        bidderReqs[0].bids[0].schain = chain1;
+        bidderReqs[1].bids[0].schain = chain2;
+        bidderReqs[2].bids[0].schain = chain2;
 
-      adapter.callBids(REQUEST, bidderReqs, addBidResponse, done, ajax);
-      const req = JSON.parse(server.requests[0].requestBody);
-      expect(req.source.ext.schain).to.eql(chain2);
-    });
+        adapter.callBids({...REQUEST, ortb2Fragments: {global: fpd}}, bidderReqs, addBidResponse, done, ajax);
+        const req = JSON.parse(server.requests[0].requestBody);
+        expect(req.source?.ext?.schain).to.eql(fpd?.source?.ext?.schain);
+      })
+    })
 
     it('passes multibid array in request', function () {
       const bidRequests = utils.deepClone(BID_REQUESTS);
@@ -2881,7 +3000,33 @@ describe('S2S Adapter', function () {
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(400, {}, {});
       BID_REQUESTS.forEach(bidderRequest => {
-        sinon.assert.calledWith(events.emit, CONSTANTS.EVENTS.BIDDER_ERROR, sinon.match({bidderRequest}))
+        sinon.assert.calledWith(events.emit, EVENTS.BIDDER_ERROR, sinon.match({ bidderRequest }))
+      })
+    })
+
+    describe('calls done', () => {
+      let success, error;
+      beforeEach(() => {
+        const mockAjax = function (_, callback) {
+          ({success, error} = callback);
+        }
+        config.setConfig({ s2sConfig: CONFIG });
+        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, mockAjax);
+      })
+
+      it('passing timedOut = false on succcess', () => {
+        success({});
+        sinon.assert.calledWith(done, false);
+      });
+
+      Object.entries({
+        'timeouts': true,
+        'other errors': false
+      }).forEach(([t, timedOut]) => {
+        it(`passing timedOut = ${timedOut} on ${t}`, () => {
+          error('', {timedOut});
+          sinon.assert.calledWith(done, timedOut);
+        })
       })
     })
 
@@ -3038,7 +3183,7 @@ describe('S2S Adapter', function () {
 
       sinon.assert.calledOnce(events.emit);
       const event = events.emit.firstCall.args;
-      expect(event[0]).to.equal(CONSTANTS.EVENTS.BIDDER_DONE);
+      expect(event[0]).to.equal(EVENTS.BIDDER_DONE);
       expect(event[1].bids[0]).to.have.property('serverResponseTimeMs', 8);
 
       sinon.assert.calledOnce(addBidResponse);
@@ -3069,12 +3214,45 @@ describe('S2S Adapter', function () {
       Object.assign(responding.ext.seatnonbid, [{auctionId: 2}])
       server.requests[0].respond(200, {}, JSON.stringify(responding));
       const event = events.emit.secondCall.args;
-      expect(event[0]).to.equal(CONSTANTS.EVENTS.SEAT_NON_BID);
+      expect(event[0]).to.equal(EVENTS.SEAT_NON_BID);
+      expect(event[1].seatnonbid[0]).to.have.property('auctionId', 2);
+      expect(event[1].requestedBidders).to.deep.equal(['appnexus']);
+      expect(event[1].response).to.deep.equal(responding);
+    });
+
+    it('emits the PBS_ANALYTICS event and captures seatnonbid responses', function () {
+      const original = CONFIG;
+      CONFIG.extPrebid = { returnallbidstatus: true };
+      const nonbidResponse = {...RESPONSE_OPENRTB, ext: {seatnonbid: [{}]}};
+      config.setConfig({ CONFIG });
+      CONFIG = original;
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const responding = deepClone(nonbidResponse);
+      Object.assign(responding.ext.seatnonbid, [{auctionId: 2}])
+      server.requests[0].respond(200, {}, JSON.stringify(responding));
+      const event = events.emit.thirdCall.args;
+      expect(event[0]).to.equal(EVENTS.PBS_ANALYTICS);
       expect(event[1].seatnonbid[0]).to.have.property('auctionId', 2);
       expect(event[1].requestedBidders).to.deep.equal(['appnexus']);
       expect(event[1].response).to.deep.equal(responding);
     });
 
+    it('emits the PBS_ANALYTICS event and captures atag responses', function () {
+      const original = CONFIG;
+      CONFIG.extPrebid = { returnallbidstatus: true };
+      const atagResponse = {...RESPONSE_OPENRTB, ext: {prebid: {analytics: {tags: ['data']}}}};
+      config.setConfig({ CONFIG });
+      CONFIG = original;
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const responding = deepClone(atagResponse);
+      Object.assign(responding.ext.prebid.analytics.tags, ['stuff'])
+      server.requests[0].respond(200, {}, JSON.stringify(responding));
+      const event = events.emit.secondCall.args;
+      expect(event[0]).to.equal(EVENTS.PBS_ANALYTICS);
+      expect(event[1].atag[0]).to.deep.equal('stuff');
+      expect(event[1].response).to.deep.equal(responding);
+    });
+
     it('respects defaultTtl', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
         defaultTtl: 30
@@ -3395,6 +3573,18 @@ describe('S2S Adapter', function () {
       expect(response).to.have.property('adapterCode', 'appnexus2');
     });
 
+    it('should set deferBilling and deferRendering to true when request has deferBilling = true', () => {
+      config.setConfig({ CONFIG });
+      const req = deepClone(REQUEST);
+      req.ad_units.forEach(au => au.deferBilling = true);
+      adapter.callBids(req, BID_REQUESTS, addBidResponse, done, ajax);
+      server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
+      sinon.assert.match(addBidResponse.firstCall.args[1], {
+        deferBilling: true,
+        deferRendering: true
+      });
+    });
+
     describe('on sync requested with no cookie', () => {
       let cfg, req, csRes;
 
@@ -3425,29 +3615,6 @@ describe('S2S Adapter', function () {
       });
     });
     describe('when the response contains ext.prebid.fledge', () => {
-      let fledgeStub, request, bidderRequests;
-
-      function fledgeHook(next, ...args) {
-        fledgeStub(...args);
-      }
-
-      before(() => {
-        addComponentAuction.before(fledgeHook);
-      });
-
-      after(() => {
-        addComponentAuction.getHooks({hook: fledgeHook}).remove();
-      })
-
-      beforeEach(function () {
-        fledgeStub = sinon.stub();
-        config.setConfig({CONFIG});
-        request = deepClone(REQUEST);
-        request.ad_units.forEach(au => deepSetValue(au, 'ortb2Imp.ext.ae', 1));
-        bidderRequests = deepClone(BID_REQUESTS);
-        bidderRequests.forEach(req => req.fledgeEnabled = true);
-      });
-
       const AU = 'div-gpt-ad-1460505748561-0';
       const FLEDGE_RESP = {
         ext: {
@@ -3456,12 +3623,14 @@ describe('S2S Adapter', function () {
               auctionconfigs: [
                 {
                   impid: AU,
+                  bidder: 'appnexus',
                   config: {
                     id: 1
                   }
                 },
                 {
                   impid: AU,
+                  bidder: 'other',
                   config: {
                     id: 2
                   }
@@ -3472,36 +3641,95 @@ describe('S2S Adapter', function () {
         }
       }
 
-      it('calls addComponentAuction alongside addBidResponse', function () {
-        adapter.callBids(request, bidderRequests, addBidResponse, done, ajax);
-        server.requests[0].respond(200, {}, JSON.stringify(mergeDeep({}, RESPONSE_OPENRTB, FLEDGE_RESP)));
-        expect(addBidResponse.called).to.be.true;
-        sinon.assert.calledWith(fledgeStub, bidderRequests[0].auctionId, AU, {id: 1});
-        sinon.assert.calledWith(fledgeStub, bidderRequests[0].auctionId, AU, {id: 2});
-      });
+      let fledgeStub, request, bidderRequests;
 
-      it('calls addComponentAuction when there is no bid in the response', () => {
-        adapter.callBids(request, bidderRequests, addBidResponse, done, ajax);
-        server.requests[0].respond(200, {}, JSON.stringify(FLEDGE_RESP));
-        expect(addBidResponse.called).to.be.false;
-        sinon.assert.calledWith(fledgeStub, bidderRequests[0].auctionId, AU, {id: 1});
-        sinon.assert.calledWith(fledgeStub, bidderRequests[0].auctionId, AU, {id: 2});
-      })
-    });
-  });
+      function fledgeHook(next, ...args) {
+        fledgeStub(...args);
+      }
 
-  describe('bid won events', function () {
-    let uniqueIdCount = 0;
-    let triggerPixelStub;
-    const staticUniqueIds = ['1000', '1001', '1002', '1003'];
+      before(() => {
+        addPaapiConfig.before(fledgeHook);
+      });
 
-    before(function () {
-      triggerPixelStub = sinon.stub(utils, 'triggerPixel');
-    });
+      after(() => {
+        addPaapiConfig.getHooks({hook: fledgeHook}).remove();
+      })
 
-    beforeEach(function () {
-      resetWurlMap();
-      sinon.stub(utils, 'insertUserSyncIframe');
+      beforeEach(function () {
+        fledgeStub = sinon.stub();
+        config.setConfig({
+          s2sConfig: CONFIG,
+        });
+        bidderRequests = deepClone(BID_REQUESTS);
+        bidderRequests.forEach(req => {
+          Object.assign(req, {
+            paapi: {
+              enabled: true
+            },
+            ortb2: {
+              fpd: 1
+            }
+          })
+          req.bids.forEach(bid => {
+            Object.assign(bid, {
+              ortb2Imp: {
+                fpd: 2,
+              }
+            })
+          })
+        });
+        request = deepClone(REQUEST);
+        request.ad_units.forEach(au => deepSetValue(au, 'ortb2Imp.ext.ae', 1));
+      });
+
+      function expectFledgeCalls() {
+        const auctionId = bidderRequests[0].auctionId;
+        sinon.assert.calledWith(fledgeStub, sinon.match({auctionId, adUnitCode: AU, ortb2: bidderRequests[0].ortb2, ortb2Imp: bidderRequests[0].bids[0].ortb2Imp}), sinon.match({config: {id: 1}}))
+        sinon.assert.calledWith(fledgeStub, sinon.match({auctionId, adUnitCode: AU, ortb2: undefined, ortb2Imp: undefined}), sinon.match({config: {id: 2}}))
+      }
+
+      it('calls addPaapiConfig alongside addBidResponse', function () {
+        adapter.callBids(request, bidderRequests, addBidResponse, done, ajax);
+        server.requests[0].respond(200, {}, JSON.stringify(mergeDeep({}, RESPONSE_OPENRTB, FLEDGE_RESP)));
+        expect(addBidResponse.called).to.be.true;
+        expectFledgeCalls();
+      });
+
+      it('calls addPaapiConfig when there is no bid in the response', () => {
+        adapter.callBids(request, bidderRequests, addBidResponse, done, ajax);
+        server.requests[0].respond(200, {}, JSON.stringify(FLEDGE_RESP));
+        expect(addBidResponse.called).to.be.false;
+        expectFledgeCalls();
+      });
+
+      it('wraps call in runWithBidder', () => {
+        let fail = false;
+        fledgeStub.callsFake(({bidder}) => {
+          try {
+            expect(bidder).to.exist.and.to.eql(config.getCurrentBidder());
+          } catch (e) {
+            fail = true;
+          }
+        });
+        adapter.callBids(request, bidderRequests, addBidResponse, done, ajax);
+        server.requests[0].respond(200, {}, JSON.stringify(FLEDGE_RESP));
+        expect(fail).to.be.false;
+      })
+    });
+  });
+
+  describe('bid won events', function () {
+    let uniqueIdCount = 0;
+    let triggerPixelStub;
+    const staticUniqueIds = ['1000', '1001', '1002', '1003'];
+
+    before(function () {
+      triggerPixelStub = sinon.stub(utils, 'triggerPixel');
+    });
+
+    beforeEach(function () {
+      resetWurlMap();
+      sinon.stub(utils, 'insertUserSyncIframe');
       sinon.stub(utils, 'logError');
       sinon.stub(utils, 'getUniqueIdentifierStr').callsFake(() => {
         uniqueIdCount++;
@@ -3539,7 +3767,7 @@ describe('S2S Adapter', function () {
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(clonedResponse));
 
-      events.emit(CONSTANTS.EVENTS.BID_WON, {
+      events.emit(EVENTS.BID_WON, {
         auctionId: '173afb6d132ba3',
         adId: '1000'
       });
@@ -3558,7 +3786,7 @@ describe('S2S Adapter', function () {
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(clonedResponse));
 
-      events.emit(CONSTANTS.EVENTS.BID_WON, {
+      events.emit(EVENTS.BID_WON, {
         auctionId: '173afb6d132ba3',
         adId: 'missingAdId'
       });
@@ -3574,7 +3802,7 @@ describe('S2S Adapter', function () {
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(clonedResponse));
 
-      events.emit(CONSTANTS.EVENTS.BID_WON, {
+      events.emit(EVENTS.BID_WON, {
         auctionId: '173afb6d132ba3',
         adId: '1060'
       });
@@ -3634,137 +3862,135 @@ describe('S2S Adapter', function () {
       config.setConfig({ s2sConfig: options });
       sinon.assert.calledOnce(logErrorSpy);
     });
+    describe('vendor: appnexuspsp', () => {
+      it('should configure the s2sConfig object with appnexuspsp vendor defaults unless specified by user', function () {
+        const options = {
+          accountId: '123',
+          bidders: ['appnexus'],
+          defaultVendor: 'appnexuspsp',
+          timeout: 750
+        };
 
-    it('should configure the s2sConfig object with appnexus vendor defaults unless specified by user', function () {
-      const options = {
-        accountId: '123',
-        bidders: ['appnexus'],
-        defaultVendor: 'appnexus',
-        timeout: 750
-      };
-
-      config.setConfig({ s2sConfig: options });
-      sinon.assert.notCalled(logErrorSpy);
-
-      let vendorConfig = config.getConfig('s2sConfig');
-      expect(vendorConfig).to.have.property('accountId', '123');
-      expect(vendorConfig).to.have.property('adapter', 'prebidServer');
-      expect(vendorConfig.bidders).to.deep.equal(['appnexus']);
-      expect(vendorConfig.enabled).to.be.true;
-      expect(vendorConfig.endpoint).to.deep.equal({
-        p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
-        noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/openrtb2/auction'
-      });
-      expect(vendorConfig.syncEndpoint).to.deep.equal({
-        p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync',
-        noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/cookie_sync'
-      });
-      expect(vendorConfig).to.have.property('timeout', 750);
-    });
-
-    it('should configure the s2sConfig object with appnexuspsp vendor defaults unless specified by user', function () {
-      const options = {
-        accountId: '123',
-        bidders: ['appnexus'],
-        defaultVendor: 'appnexuspsp',
-        timeout: 750
-      };
-
-      config.setConfig({ s2sConfig: options });
-      sinon.assert.notCalled(logErrorSpy);
-
-      let vendorConfig = config.getConfig('s2sConfig');
-      expect(vendorConfig).to.have.property('accountId', '123');
-      expect(vendorConfig).to.have.property('adapter', 'prebidServer');
-      expect(vendorConfig.bidders).to.deep.equal(['appnexus']);
-      expect(vendorConfig.enabled).to.be.true;
-      expect(vendorConfig.endpoint).to.deep.equal({
-        p1Consent: 'https://ib.adnxs.com/openrtb2/prebid',
-        noP1Consent: 'https://ib.adnxs-simple.com/openrtb2/prebid'
+        config.setConfig({ s2sConfig: options });
+        sinon.assert.notCalled(logErrorSpy);
+
+        let vendorConfig = config.getConfig('s2sConfig');
+        expect(vendorConfig).to.have.property('accountId', '123');
+        expect(vendorConfig).to.have.property('adapter', 'prebidServer');
+        expect(vendorConfig.bidders).to.deep.equal(['appnexus']);
+        expect(vendorConfig.enabled).to.be.true;
+        expect(vendorConfig.endpoint).to.deep.equal({
+          p1Consent: 'https://ib.adnxs.com/openrtb2/prebid',
+          noP1Consent: 'https://ib.adnxs-simple.com/openrtb2/prebid'
+        });
+        expect(vendorConfig.syncEndpoint).to.deep.equal({
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync',
+          noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/cookie_sync'
+        });
+        expect(vendorConfig).to.have.property('timeout', 750);
       });
-      expect(vendorConfig.syncEndpoint).to.be.undefined;
-      expect(vendorConfig).to.have.property('timeout', 750);
-    });
-
-    it('should configure the s2sConfig object with rubicon vendor defaults unless specified by user', function () {
-      const options = {
-        accountId: 'abc',
-        bidders: ['rubicon'],
-        defaultVendor: 'rubicon',
-        timeout: 750
-      };
+    })
 
-      config.setConfig({ s2sConfig: options });
-      sinon.assert.notCalled(logErrorSpy);
-
-      let vendorConfig = config.getConfig('s2sConfig');
-      expect(vendorConfig).to.have.property('accountId', 'abc');
-      expect(vendorConfig).to.have.property('adapter', 'prebidServer');
-      expect(vendorConfig.bidders).to.deep.equal(['rubicon']);
-      expect(vendorConfig.enabled).to.be.true;
-      expect(vendorConfig.endpoint).to.deep.equal({
-        p1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
-        noP1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction'
-      });
-      expect(vendorConfig.syncEndpoint).to.deep.equal({
-        p1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
-        noP1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync'
-      });
-      expect(vendorConfig).to.have.property('timeout', 750);
-    });
+    describe('vendor: rubicon', () => {
+      it('should configure the s2sConfig object with rubicon vendor defaults unless specified by user', function () {
+        const options = {
+          accountId: 'abc',
+          bidders: ['rubicon'],
+          defaultVendor: 'rubicon',
+          timeout: 750
+        };
 
-    it('should return proper defaults', function () {
-      const options = {
-        accountId: 'abc',
-        bidders: ['rubicon'],
-        defaultVendor: 'rubicon',
-        timeout: 750
-      };
+        config.setConfig({ s2sConfig: options });
+        sinon.assert.notCalled(logErrorSpy);
 
-      config.setConfig({ s2sConfig: options });
-      expect(config.getConfig('s2sConfig')).to.deep.equal({
-        'accountId': 'abc',
-        'adapter': 'prebidServer',
-        'bidders': ['rubicon'],
-        'defaultVendor': 'rubicon',
-        'enabled': true,
-        'endpoint': {
+        let vendorConfig = config.getConfig('s2sConfig');
+        expect(vendorConfig).to.have.property('accountId', 'abc');
+        expect(vendorConfig).to.have.property('adapter', 'prebidServer');
+        expect(vendorConfig.bidders).to.deep.equal(['rubicon']);
+        expect(vendorConfig.enabled).to.be.true;
+        expect(vendorConfig.endpoint).to.deep.equal({
           p1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
           noP1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction'
-        },
-        'syncEndpoint': {
+        });
+        expect(vendorConfig.syncEndpoint).to.deep.equal({
           p1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
           noP1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync'
-        },
-        'timeout': 750
-      })
-    });
-
-    it('should return default adapterOptions if not set', function () {
-      config.setConfig({
-        s2sConfig: {
+        });
+        expect(vendorConfig).to.have.property('timeout', 750);
+      });
+      it('should return proper defaults', function () {
+        const options = {
           accountId: 'abc',
           bidders: ['rubicon'],
           defaultVendor: 'rubicon',
           timeout: 750
-        }
+        };
+
+        config.setConfig({ s2sConfig: options });
+        expect(config.getConfig('s2sConfig')).to.deep.equal({
+          'accountId': 'abc',
+          'adapter': 'prebidServer',
+          'bidders': ['rubicon'],
+          'defaultVendor': 'rubicon',
+          'enabled': true,
+          'endpoint': {
+            p1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
+            noP1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction'
+          },
+          'syncEndpoint': {
+            p1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
+            noP1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync'
+          },
+          'timeout': 750,
+          maxTimeout: 500,
+        })
+      });
+    })
+
+    describe('vendor: openwrap', () => {
+      it('should configure the s2sConfig object with openwrap vendor defaults unless specified by user', function () {
+        const options = {
+          accountId: '1234',
+          bidders: ['pubmatic'],
+          defaultVendor: 'openwrap'
+        };
+
+        config.setConfig({ s2sConfig: options });
+        sinon.assert.notCalled(logErrorSpy);
+
+        let vendorConfig = config.getConfig('s2sConfig');
+        expect(vendorConfig).to.have.property('accountId', '1234');
+        expect(vendorConfig).to.have.property('adapter', 'prebidServer');
+        expect(vendorConfig.bidders).to.deep.equal(['pubmatic']);
+        expect(vendorConfig.enabled).to.be.true;
+        expect(vendorConfig.endpoint).to.deep.equal({
+          p1Consent: 'https://ow.pubmatic.com/openrtb2/auction?source=pbjs',
+          noP1Consent: 'https://ow.pubmatic.com/openrtb2/auction?source=pbjs'
+        });
+      });
+      it('should return proper defaults', function () {
+        const options = {
+          accountId: '1234',
+          bidders: ['pubmatic'],
+          defaultVendor: 'openwrap',
+          timeout: 500
+        };
+
+        config.setConfig({ s2sConfig: options });
+        expect(config.getConfig('s2sConfig')).to.deep.equal({
+          'accountId': '1234',
+          'adapter': 'prebidServer',
+          'bidders': ['pubmatic'],
+          'defaultVendor': 'openwrap',
+          'enabled': true,
+          'endpoint': {
+            p1Consent: 'https://ow.pubmatic.com/openrtb2/auction?source=pbjs',
+            noP1Consent: 'https://ow.pubmatic.com/openrtb2/auction?source=pbjs'
+          },
+          'timeout': 500,
+          maxTimeout: 500,
+        })
       });
-      expect(config.getConfig('s2sConfig')).to.deep.equal({
-        enabled: true,
-        timeout: 750,
-        adapter: 'prebidServer',
-        accountId: 'abc',
-        bidders: ['rubicon'],
-        defaultVendor: 'rubicon',
-        endpoint: {
-          p1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
-          noP1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction'
-        },
-        syncEndpoint: {
-          p1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
-          noP1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync'
-        },
-      })
     });
 
     it('should set adapterOptions', function () {
@@ -3807,77 +4033,94 @@ describe('S2S Adapter', function () {
       expect(typeof config.getConfig('s2sConfig').syncUrlModifier.appnexus).to.equal('function')
     });
 
-    it('should set correct bidder names to bidders property when using an alias for that bidder', function () {
-      const s2sConfig = utils.deepClone(CONFIG);
-
-      // Add syncEndpoint so that the request goes to the User Sync endpoint
-      // Modify the bidders property to include an alias for Rubicon adapter
-      s2sConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
-      s2sConfig.bidders = ['appnexus', 'rubicon-alias'];
-
-      const s2sBidRequest = utils.deepClone(REQUEST);
-      s2sBidRequest.s2sConfig = s2sConfig;
-
-      // Add another bidder, `rubicon-alias`
-      s2sBidRequest.ad_units[0].bids.push({
-        bidder: 'rubicon-alias',
-        params: {
-          accoundId: 14062,
-          siteId: 70608,
-          zoneId: 498816
+    Object.entries({
+      'an alias'() {
+        adapterManager.aliasBidAdapter('rubicon', 'rubicon-alias');
+      },
+      'a server side alias'(s2sConfig) {
+        s2sConfig.extPrebid = {
+          aliases: {
+            'rubicon-alias': 'rubicon'
+          }
         }
-      });
-
-      // create an alias for the Rubicon Bid Adapter
-      adapterManager.aliasBidAdapter('rubicon', 'rubicon-alias');
+      }
+    }).forEach(([t, setupAlias]) => {
+      describe(`when using ${t}`, () => {
+        afterEach(() => {
+          delete adapterManager.aliasRegistry['rubicon-alias'];
+        });
+        it(`should set correct bidder names to bidders property`, function () {
+          const s2sConfig = utils.deepClone(CONFIG);
+
+          // Add syncEndpoint so that the request goes to the User Sync endpoint
+          // Modify the bidders property to include an alias for Rubicon adapter
+          s2sConfig.syncEndpoint = {p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync'};
+          s2sConfig.bidders = ['appnexus', 'rubicon-alias'];
+
+          setupAlias(s2sConfig);
+
+          const s2sBidRequest = utils.deepClone(REQUEST);
+          s2sBidRequest.s2sConfig = s2sConfig;
+
+          // Add another bidder, `rubicon-alias`
+          s2sBidRequest.ad_units[0].bids.push({
+            bidder: 'rubicon-alias',
+            params: {
+              accoundId: 14062,
+              siteId: 70608,
+              zoneId: 498816
+            }
+          });
 
-      const bidRequest = utils.deepClone(BID_REQUESTS);
-      bidRequest.push({
-        'bidderCode': 'rubicon-alias',
-        'auctionId': '4146ab2b-9422-4040-9b1c-966fffbfe2d4',
-        'bidderRequestId': '4b1a4f9c3e4546',
-        'tid': 'd7fa8342-ae22-4ca1-b237-331169350f84',
-        'bids': [
-          {
-            'bidder': 'rubicon-alias',
-            'params': {
-              'accountId': 14062,
-              'siteId': 70608,
-              'zoneId': 498816
-            },
-            'bid_id': '2a9523915411c3',
-            'mediaTypes': {
-              'banner': {
+          const bidRequest = utils.deepClone(BID_REQUESTS);
+          bidRequest.push({
+            'bidderCode': 'rubicon-alias',
+            'auctionId': '4146ab2b-9422-4040-9b1c-966fffbfe2d4',
+            'bidderRequestId': '4b1a4f9c3e4546',
+            'tid': 'd7fa8342-ae22-4ca1-b237-331169350f84',
+            'bids': [
+              {
+                'bidder': 'rubicon-alias',
+                'params': {
+                  'accountId': 14062,
+                  'siteId': 70608,
+                  'zoneId': 498816
+                },
+                'bid_id': '2a9523915411c3',
+                'mediaTypes': {
+                  'banner': {
+                    'sizes': [
+                      [
+                        300,
+                        250
+                      ]
+                    ]
+                  }
+                },
+                'adUnitCode': 'div-gpt-ad-1460505748561-0',
+                'transactionId': '78ddc106-b7d8-45d1-bd29-86993098e53d',
                 'sizes': [
                   [
                     300,
                     250
                   ]
-                ]
+                ],
+                'bidId': '2a9523915411c3',
+                'bidderRequestId': '4b1a4f9c3e4546',
+                'auctionId': '4146ab2b-9422-4040-9b1c-966fffbfe2d4'
               }
-            },
-            'adUnitCode': 'div-gpt-ad-1460505748561-0',
-            'transactionId': '78ddc106-b7d8-45d1-bd29-86993098e53d',
-            'sizes': [
-              [
-                300,
-                250
-              ]
             ],
-            'bidId': '2a9523915411c3',
-            'bidderRequestId': '4b1a4f9c3e4546',
-            'auctionId': '4146ab2b-9422-4040-9b1c-966fffbfe2d4'
-          }
-        ],
-        'auctionStart': 1569234122602,
-        'timeout': 1000,
-        'src': 's2s'
-      });
+            'auctionStart': 1569234122602,
+            'timeout': 1000,
+            'src': 's2s'
+          });
 
-      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+          adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
 
-      const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.bidders).to.deep.equal(['appnexus', 'rubicon']);
+          const requestBid = JSON.parse(server.requests[0].requestBody);
+          expect(requestBid.bidders).to.deep.equal(['appnexus', 'rubicon']);
+        });
+      });
     });
 
     it('should add cooperative sync flag to cookie_sync request if property is present', function () {
@@ -4125,4 +4368,350 @@ describe('S2S Adapter', function () {
       expect(requestBid.ext.prebid.floors).to.deep.equal({ enabled: true, floorMin: 1, floorMinCur: 'CUR' });
     });
   });
+
+  describe('getPBSBidderConfig', () => {
+    [
+      {
+        t: 'does not alter config when there are no conflicts',
+        global: {
+          k1: 'val'
+        },
+        bidder: {
+          bidderA: {
+            k2: 'val'
+          }
+        },
+        expected: {
+          bidderA: {
+            k2: 'val'
+          }
+        }
+      },
+      {
+        t: 'uses bidder config on type mismatch (scalar/object)',
+        global: {
+          k1: 'val',
+          k2: 'val'
+        },
+        bidder: {
+          bidderA: {
+            k1: {k3: 'val'}
+          }
+        },
+        expected: {
+          bidderA: {
+            k1: {k3: 'val'}
+          }
+        }
+      },
+      {
+        t: 'uses bidder config on type mismatch (array/object)',
+        global: {
+          k: [1, 2]
+        },
+        bidder: {
+          bidderA: {
+            k: {inner: 'val'}
+          }
+        },
+        expected: {
+          bidderA: {
+            k: {inner: 'val'}
+          }
+        }
+      },
+      {
+        t: 'uses bidder config on type mismatch (object/array)',
+        global: {
+          k: {inner: 'val'}
+        },
+        bidder: {
+          bidderA: {
+            k: [1, 2]
+          }
+        },
+        expected: {
+          bidderA: {
+            k: [1, 2]
+          }
+        }
+      },
+      {
+        t: 'uses bidder config on type mismatch (array/null)',
+        global: {
+          k: [1, 2]
+        },
+        bidder: {
+          bidderA: {
+            k: null
+          }
+        },
+        expected: {
+          bidderA: {
+            k: null
+          }
+        }
+      },
+      {
+        t: 'uses bidder config on type mismatch (null/array)',
+        global: {},
+        bidder: {
+          bidderA: {
+            k: [1, 2]
+          }
+        },
+        expected: {
+          bidderA: {
+            k: [1, 2]
+          }
+        }
+      },
+      {
+        t: 'concatenates arrays',
+        global: {
+          key: 'value',
+          array: [1]
+        },
+        bidder: {
+          bidderA: {
+            array: [2]
+          }
+        },
+        expected: {
+          bidderA: {
+            array: [1, 2]
+          }
+        }
+      },
+      {
+        t: 'concatenates nested arrays',
+        global: {
+          nested: {
+            array: [1]
+          }
+        },
+        bidder: {
+          bidderA: {
+            key: 'value',
+            nested: {
+              array: [2]
+            }
+          }
+        },
+        expected: {
+          bidderA: {
+            key: 'value',
+            nested: {
+              array: [1, 2]
+            }
+          }
+        }
+      },
+      {
+        t: 'does not repeat equal elements',
+        global: {
+          array: [{id: 1}]
+        },
+        bidder: {
+          bidderA: {
+            array: [{id: 1}, {id: 2}]
+          }
+        },
+        expected: {
+          bidderA: {
+            array: [{id: 1}, {id: 2}]
+          }
+        }
+      }
+    ].forEach(({t, global, bidder, expected}) => {
+      it(t, () => {
+        expect(getPBSBidderConfig({global, bidder})).to.eql(expected);
+      })
+    })
+  });
+  describe('EID handling', () => {
+    function mkEid(source, value = source) {
+      return {source, value};
+    }
+
+    function eidEntry(source, value = source, bidders = false) {
+      return {eid: {source, value}, bidders};
+    }
+
+    describe('extractEids', () => {
+      [
+        {
+          t: 'no bidder-specific eids',
+          global: {
+            user: {
+              ext: {
+                eids: [
+                  mkEid('idA', 'id1'),
+                  mkEid('idA', 'id2')
+                ]
+              },
+              eids: [mkEid('idB')]
+            }
+          },
+          expected: {
+            eids: [
+              eidEntry('idA', 'id1'),
+              eidEntry('idA', 'id2'),
+              eidEntry('idB')
+            ],
+            conflicts: ['idA']
+          }
+        },
+        {
+          t: 'bidder-specific eids',
+          global: {
+            user: {
+              eids: [
+                mkEid('idA')
+              ]
+            },
+          },
+          bidder: {
+            bidderA: {
+              user: {
+                ext: {
+                  eids: [
+                    mkEid('idB')
+                  ]
+                }
+              }
+            }
+          },
+          expected: {
+            eids: [
+              eidEntry('idA'),
+              eidEntry('idB', 'idB', ['bidderA'])
+            ]
+          }
+        },
+        {
+          t: 'conflicting bidder-specific eids',
+          global: {
+            user: {
+              eids: [mkEid('idA', 'idA1')]
+            },
+          },
+          bidder: {
+            bidderA: {
+              user: {
+                eids: [mkEid('idA', 'idA2'), mkEid('idB', 'idB1'), mkEid('idD')]
+              },
+            },
+            bidderB: {
+              user: {
+                ext: {
+                  eids: [mkEid('idB', 'idB2'), mkEid('idC'), mkEid('idD')]
+                }
+              }
+            },
+          },
+          expected: {
+            eids: [
+              eidEntry('idA', 'idA1'),
+              eidEntry('idA', 'idA2', ['bidderA']),
+              eidEntry('idB', 'idB1', ['bidderA']),
+              eidEntry('idB', 'idB2', ['bidderB']),
+              eidEntry('idC', 'idC', ['bidderB']),
+              eidEntry('idD', 'idD', ['bidderA', 'bidderB'])
+            ],
+            conflicts: ['idA', 'idB']
+          }
+        }
+      ].forEach(({t, global = {}, bidder = {}, expected}) => {
+        it(t, () => {
+          const {eids, conflicts} = extractEids({global, bidder});
+          expect(eids).to.have.deep.members(expected.eids);
+          expect(Array.from(conflicts)).to.have.members(expected.conflicts || []);
+        })
+      });
+    });
+    describe('consolidateEids', () => {
+      it('returns global EIDs without permissions', () => {
+        expect(consolidateEids({
+          eids: [eidEntry('idA'), eidEntry('idB')]
+        })).to.eql({
+          global: [mkEid('idA'), mkEid('idB')],
+          permissions: [],
+          bidder: {}
+        })
+      });
+
+      it('returns conflicting, but global EIDs', () => {
+        expect(consolidateEids({
+          eids: [eidEntry('idA', 'idA1'), eidEntry('idA', 'idA2')],
+          conflicts: new Set(['idA'])
+        })).to.eql({
+          global: [mkEid('idA', 'idA1'), mkEid('idA', 'idA2')],
+          permissions: [],
+          bidder: {}
+        })
+      })
+
+      it('sets permissions for bidder-speficic EIDS', () => {
+        expect(consolidateEids({
+          eids: [
+            eidEntry('idA'),
+            eidEntry('idB', 'idB', ['bidderB'])
+          ]
+        })).to.eql({
+          global: [mkEid('idA'), mkEid('idB')],
+          permissions: [{source: 'idB', bidders: ['bidderB']}],
+          bidder: {}
+        })
+      })
+
+      it('does not consolidate conflicting bidder-specific EIDs', () => {
+        expect(consolidateEids({
+          eids: [
+            eidEntry('global'),
+            eidEntry('idA', 'idA1', ['bidderA']),
+            eidEntry('idA', 'idA2', ['bidderB'])
+          ],
+          conflicts: new Set(['idA'])
+        })).to.eql({
+          global: [mkEid('global')],
+          permissions: [],
+          bidder: {
+            bidderA: [mkEid('idA', 'idA1')],
+            bidderB: [mkEid('idA', 'idA2')]
+          }
+        })
+      })
+
+      it('does not set permissions for conflicting bidder-specific eids', () => {
+        expect(consolidateEids({
+          eids: [eidEntry('idA', 'idA1'), eidEntry('idA', 'idA2', ['bidderA'])],
+          conflicts: new Set(['idA'])
+        })).to.eql({
+          global: [mkEid('idA', 'idA1')],
+          permissions: [],
+          bidder: {
+            bidderA: [mkEid('idA', 'idA2')]
+          }
+        })
+      });
+
+      it('can do partial consolidation when only some IDs are conflicting', () => {
+        expect(consolidateEids({
+          eids: [
+            eidEntry('idA', 'idA1'),
+            eidEntry('idB', 'idB', ['bidderB']),
+            eidEntry('idA', 'idA2', ['bidderA'])
+          ],
+          conflicts: new Set(['idA'])
+        })).to.eql({
+          global: [mkEid('idA', 'idA1'), mkEid('idB')],
+          permissions: [{source: 'idB', bidders: ['bidderB']}],
+          bidder: {
+            bidderA: [mkEid('idA', 'idA2')]
+          }
+        })
+      })
+    })
+  });
 });
diff --git a/test/spec/modules/precisoBidAdapter_spec.js b/test/spec/modules/precisoBidAdapter_spec.js
index 1a7e24d64cb..9a5ce1ae330 100644
--- a/test/spec/modules/precisoBidAdapter_spec.js
+++ b/test/spec/modules/precisoBidAdapter_spec.js
@@ -1,6 +1,9 @@
 import { expect } from 'chai';
 import { spec } from '../../../modules/precisoBidAdapter.js';
-import { config } from '../../../src/config.js';
+import { NATIVE } from '../../../src/mediaTypes.js';
+import { OPENRTB } from '../../../libraries/precisoUtils/bidNativeUtils.js';
+
+// simport { config } from '../../../src/config.js';
 
 const DEFAULT_PRICE = 1
 const DEFAULT_CURRENCY = 'USD'
@@ -10,8 +13,10 @@ const BIDDER_CODE = 'preciso';
 
 describe('PrecisoAdapter', function () {
   let bid = {
+    precisoBid: true,
     bidId: '23fhj33i987f',
     bidder: 'preciso',
+    buyerUid: 'testuid',
     mediaTypes: {
       banner: {
         sizes: [[DEFAULT_BANNER_WIDTH, DEFAULT_BANNER_HEIGHT]]
@@ -22,10 +27,101 @@ describe('PrecisoAdapter', function () {
       sourceid: '0',
       publisherId: '0',
       mediaType: 'banner',
+      region: 'IND'
+
+    },
+    userId: {
+      pubcid: '12355454test'
 
-      region: 'prebid-eu'
+    },
+    user: {
+      geo: {
+        region: 'IND',
+      }
+    },
+    ortb2: {
+      device: {
+        w: 1920,
+        h: 166,
+        dnt: 0,
+      },
+      site: {
+        domain: 'localHost'
+      },
+      source: {
+        tid: 'eaff09b-a1ab-4ec6-a81e-c5a75bc1dde3'
+      }
 
     }
+
+  };
+
+  let nativeBid = {
+
+    precisoBid: true,
+    bidId: '23fhj33i987f',
+    bidder: 'precisonat',
+    buyerUid: 'testuid',
+    params: {
+      host: 'prebid',
+      sourceid: '0',
+      publisherId: '0',
+      mediaType: 'native',
+      region: 'IND'
+
+    },
+    userId: {
+      pubcid: '12355454test'
+
+    },
+    user: {
+      geo: {
+        region: 'IND',
+      }
+    },
+    ortb2: {
+      device: {
+        w: 1920,
+        h: 166,
+        dnt: 0,
+      },
+      site: {
+        domain: 'localHost'
+      },
+      source: {
+        tid: 'eaff09b-a1ab-4ec6-a81e-c5a75bc1dde3'
+      }
+
+    },
+    mediaType: 'native',
+    nativeOrtbRequest: {
+      assets: [
+        {
+          id: 2,
+          required: 1,
+          img: {
+            type: 3,
+            w: 300,
+            h: 250
+          }
+        }
+      ]
+    },
+    nativeParams: {
+      ortb: {
+        assets: [
+          {
+            id: 2,
+            required: 1,
+            img: {
+              type: 3,
+              w: 300,
+              h: 250
+            }
+          }
+        ]
+      }
+    }
   };
 
   describe('isBidRequestValid', function () {
@@ -36,6 +132,14 @@ describe('PrecisoAdapter', function () {
       delete bid.params.publisherId;
       expect(spec.isBidRequestValid(bid)).to.be.false;
     });
+    it('Should return true if there are bidId, params and sourceid parameters present native Bid', function () {
+      expect(spec.isBidRequestValid(nativeBid)).to.be.true;
+    });
+
+    it('Should return false if at least one of parameters is not present in native bid', function () {
+      delete nativeBid.params.publisherId;
+      expect(spec.isBidRequestValid(nativeBid)).to.be.false;
+    });
   });
 
   describe('buildRequests', function () {
@@ -55,37 +159,41 @@ describe('PrecisoAdapter', function () {
     it('Returns valid data if array of bids is valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-
-      // expect(data).to.have.all.keys('bidId', 'imp', 'site', 'deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'coppa');
-
-      expect(data.deviceWidth).to.be.a('number');
-      expect(data.deviceHeight).to.be.a('number');
-      expect(data.coppa).to.be.a('number');
-      expect(data.language).to.be.a('string');
-      expect(data.secure).to.be.within(0, 1);
-      expect(data.host).to.be.a('string');
-      expect(data.page).to.be.a('string');
+      expect(data.device).to.be.a('object');
+      expect(data.user).to.be.a('object');
+      expect(data.source).to.be.a('object');
+      expect(data.site).to.be.a('object');
     });
     it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
+      delete bid.ortb2.device;
+      serverRequest = spec.buildRequests([bid]);
       let data = serverRequest.data;
-      expect(data.imp).to.be.an('array').that.is.empty;
+      expect(data.device).to.be.undefined;
     });
-  });
 
-  describe('with COPPA', function () {
-    beforeEach(function () {
-      sinon.stub(config, 'getConfig')
-        .withArgs('coppa')
-        .returns(true);
-    });
-    afterEach(function () {
-      config.getConfig.restore();
+    let ServeNativeRequest = spec.buildRequests([nativeBid]);
+    it('Creates a valid nativeServerRequest object ', function () {
+      expect(ServeNativeRequest).to.exist;
+      expect(ServeNativeRequest.method).to.exist;
+      expect(ServeNativeRequest.url).to.exist;
+      expect(ServeNativeRequest.data).to.exist;
+      expect(ServeNativeRequest.method).to.equal('POST');
+      expect(ServeNativeRequest.url).to.equal('https://ssp-bidder.mndtrk.com/bid_request/openrtb');
     });
 
-    it('should send the Coppa "required" flag set to "1" in the request', function () {
-      let serverRequest = spec.buildRequests([bid]);
-      expect(serverRequest.data.coppa).to.equal(1);
+    it('should extract the native params', function () {
+      let nativeData = ServeNativeRequest.data;
+      const asset = JSON.parse(nativeData.imp[0].native.request).assets[0]
+      expect(asset).to.deep.equal({
+        id: OPENRTB.NATIVE.ASSET_ID.IMAGE,
+        required: 1,
+        img: {
+          w: 300,
+          h: 250,
+          type: OPENRTB.NATIVE.IMAGE_TYPE.MAIN,
+        }
+      }
+      )
     });
   });
 
@@ -133,11 +241,92 @@ describe('PrecisoAdapter', function () {
 
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]))
     })
+
+    it('should get correct native bid response', function () {
+      const adm = {
+        native: {
+          ver: 1.2,
+          link: {
+            url: 'https://example.com',
+            clicktrackers: 'https://example.com/clktracker'
+          },
+          eventtrackers: [
+            {
+              url: 'https://example.com/imptracker'
+            }
+          ],
+          imptrackers: [
+            'https://example.com/imptracker'
+          ],
+          assets: [{
+            id: OPENRTB.NATIVE.ASSET_ID.IMAGE,
+            required: 1,
+            img: {
+              url: 'https://example.com/image.jpg',
+              w: 150,
+              h: 50
+            }
+          }],
+        }
+      }
+      let nativeResponse = {
+        bidderRequestId: 'f6adb85f-4e19-45a0-b41e-2a5b9a48f23a',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '123',
+                impid: 'b4f290d7-d4ab-4778-ab94-2baf06420b22',
+                price: DEFAULT_PRICE,
+                adm: JSON.stringify(adm),
+                cid: 'test_cid',
+                crid: 'test_banner_crid',
+                w: DEFAULT_BANNER_WIDTH,
+                h: DEFAULT_BANNER_HEIGHT,
+                adomain: [],
+              }
+            ],
+            seat: BIDDER_CODE
+          }
+        ],
+      }
+
+      let expectedNativeResponse = [
+        {
+          requestId: 'b4f290d7-d4ab-4778-ab94-2baf06420b22',
+          mediaType: NATIVE,
+          cpm: DEFAULT_PRICE,
+          creativeId: 'test_banner_crid',
+          width: 1,
+          height: 1,
+          ttl: 300,
+          meta: {
+            advertiserDomains: []
+          },
+          netRevenue: true,
+          currency: 'USD',
+          // meta: { advertiserDomains: [] },
+          native: {
+            clickUrl: encodeURI('https://example.com'),
+            impressionTrackers: ['https://example.com/imptracker'],
+            image: {
+              url: encodeURI('https://example.com/image.jpg'),
+              width: 150,
+              height: 50
+            },
+          }
+        }
+      ]
+      let result = spec.interpretResponse({ body: nativeResponse });
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedNativeResponse[0]));
+    })
   })
+
   describe('getUserSyncs', function () {
-    const syncUrl = 'https://ck.2trk.info/rtb/user/usersync.aspx?id=preciso_srl&gdpr=0&gdpr_consent=&us_privacy=&t=4';
+    const syncUrl = 'https://ck.2trk.info/rtb/user/usersync.aspx?id=NA&gdpr=0&gdpr_consent=&us_privacy=&t=4';
     const syncOptions = {
-      iframeEnabled: true
+      iframeEnabled: true,
+      spec: true
     };
     let userSync = spec.getUserSyncs(syncOptions);
     it('Returns valid URL and type', function () {
diff --git a/test/spec/modules/priceFloors_spec.js b/test/spec/modules/priceFloors_spec.js
index 950e039491d..41f1609f74f 100644
--- a/test/spec/modules/priceFloors_spec.js
+++ b/test/spec/modules/priceFloors_spec.js
@@ -1,8 +1,9 @@
 import {expect} from 'chai';
 import * as utils from 'src/utils.js';
 import { getGlobal } from 'src/prebidGlobal.js';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS, STATUS } from 'src/constants.js';
 import {
+  FLOOR_SKIPPED_REASON,
   _floorDataForAuction,
   getFloorsDataForAuction,
   getFirstMatchingFloor,
@@ -12,7 +13,7 @@ import {
   isFloorsDataValid,
   addBidResponseHook,
   fieldMatchingFunctions,
-  allowedFields, parseFloorData, normalizeDefault, getFloorDataFromAdUnits
+  allowedFields, parseFloorData, normalizeDefault, getFloorDataFromAdUnits, updateAdUnitsForAuction, createFloorsDataForAuction
 } from 'modules/priceFloors.js';
 import * as events from 'src/events.js';
 import * as mockGpt from '../integration/faker/googletag.js';
@@ -116,7 +117,8 @@ describe('the price floors module', function () {
     bidder: 'rubicon',
     adUnitCode: 'test_div_1',
     auctionId: '1234-56-789',
-    transactionId: 'tr_test_div_1'
+    transactionId: 'tr_test_div_1',
+    adUnitId: 'tr_test_div_1',
   };
 
   function getAdUnitMock(code = 'adUnit-code') {
@@ -618,8 +620,8 @@ describe('the price floors module', function () {
         });
       });
       it('picks the gptSlot from the adUnit and does not call the slotMatching', function () {
-        const newBidRequest1 = { ...basicBidRequest, transactionId: 'au1' };
-        adUnits = [{code: newBidRequest1.code, transactionId: 'au1'}];
+        const newBidRequest1 = { ...basicBidRequest, adUnitId: 'au1' };
+        adUnits = [{code: newBidRequest1.adUnitCode, adUnitId: 'au1'}];
         utils.deepSetValue(adUnits[0], 'ortb2Imp.ext.data.adserver', {
           name: 'gam',
           adslot: '/12345/news/politics'
@@ -632,8 +634,8 @@ describe('the price floors module', function () {
           matchingRule: '/12345/news/politics'
         });
 
-        const newBidRequest2 = { ...basicBidRequest, adUnitCode: 'test_div_2', transactionId: 'au2' };
-        adUnits = [{code: newBidRequest2.adUnitCode, transactionId: newBidRequest2.transactionId}];
+        const newBidRequest2 = { ...basicBidRequest, adUnitCode: 'test_div_2', adUnitId: 'au2' };
+        adUnits = [{code: newBidRequest2.adUnitCode, adUnitId: newBidRequest2.adUnitId}];
         utils.deepSetValue(adUnits[0], 'ortb2Imp.ext.data.adserver', {
           name: 'gam',
           adslot: '/12345/news/weather'
@@ -648,6 +650,107 @@ describe('the price floors module', function () {
       });
     });
   });
+
+  describe('updateAdUnitsForAuction', function() {
+    let inputFloorData;
+    let adUnits;
+
+    beforeEach(function() {
+      adUnits = [getAdUnitMock()];
+      inputFloorData = utils.deepClone(minFloorConfigLow);
+      inputFloorData.skipRate = 0.5;
+    });
+
+    it('should set the skipRate to the skipRate from the data property before using the skipRate from floorData directly', function() {
+      utils.deepSetValue(inputFloorData, 'data', {
+        skipRate: 0.7
+      });
+      updateAdUnitsForAuction(adUnits, inputFloorData, 'id');
+
+      const skipRate = utils.deepAccess(adUnits, '0.bids.0.floorData.skipRate');
+      expect(skipRate).to.equal(0.7);
+    });
+
+    it('should set the skipRate to the skipRate from floorData directly if it does not exist in the data property of floorData', function() {
+      updateAdUnitsForAuction(adUnits, inputFloorData, 'id');
+
+      const skipRate = utils.deepAccess(adUnits, '0.bids.0.floorData.skipRate');
+      expect(skipRate).to.equal(0.5);
+    });
+
+    it('should set the skipRate in the bid floorData to undefined if both skipRate and skipRate in the data property are undefined', function() {
+      inputFloorData.skipRate = undefined;
+      utils.deepSetValue(inputFloorData, 'data', {
+        skipRate: undefined,
+      });
+      updateAdUnitsForAuction(adUnits, inputFloorData, 'id');
+
+      const skipRate = utils.deepAccess(adUnits, '0.bids.0.floorData.skipRate');
+      expect(skipRate).to.equal(undefined);
+    });
+  });
+
+  describe('createFloorsDataForAuction', function() {
+    let adUnits;
+    let floorConfig;
+
+    beforeEach(function() {
+      adUnits = [getAdUnitMock()];
+      floorConfig = utils.deepClone(basicFloorConfig);
+    });
+
+    it('should return skipRate as 0 if both skipRate and skipRate in the data property are undefined', function() {
+      floorConfig.skipRate = undefined;
+      floorConfig.data.skipRate = undefined;
+      handleSetFloorsConfig(floorConfig);
+
+      const floorData = createFloorsDataForAuction(adUnits, 'id');
+
+      expect(floorData.skipRate).to.equal(0);
+      expect(floorData.skipped).to.equal(false);
+    });
+
+    it('should properly set skipRate if it is available in the data property', function() {
+      // this will force skipped to be true
+      floorConfig.skipRate = 101;
+      floorConfig.data.skipRate = 201;
+      handleSetFloorsConfig(floorConfig);
+
+      const floorData = createFloorsDataForAuction(adUnits, 'id');
+
+      expect(floorData.data.skipRate).to.equal(201);
+      expect(floorData.skipped).to.equal(true);
+    });
+
+    it('should should use the skipRate if its not available in the data property ', function() {
+      // this will force skipped to be true
+      floorConfig.skipRate = 101;
+      handleSetFloorsConfig(floorConfig);
+
+      const floorData = createFloorsDataForAuction(adUnits, 'id');
+
+      expect(floorData.skipRate).to.equal(101);
+      expect(floorData.skipped).to.equal(true);
+    });
+
+    it('should have skippedReason set to "not_found" if there is no valid floor data', function() {
+      floorConfig.data = {}
+      handleSetFloorsConfig(floorConfig);
+
+      const floorData = createFloorsDataForAuction(adUnits, 'id');
+      expect(floorData.skippedReason).to.equal(FLOOR_SKIPPED_REASON.NOT_FOUND);
+    });
+
+    it('should have skippedReason set to "random" if there is floor data and skipped is true', function() {
+      // this will force skipped to be true
+      floorConfig.skipRate = 101;
+      handleSetFloorsConfig(floorConfig);
+
+      const floorData = createFloorsDataForAuction(adUnits, 'id');
+      expect(floorData.skippedReason).to.equal(FLOOR_SKIPPED_REASON.RANDOM);
+    });
+  });
+
   describe('pre-auction tests', function () {
     let exposedAdUnits;
     const validateBidRequests = (getFloorExpected, FloorDataExpected) => {
@@ -689,6 +792,124 @@ describe('the price floors module', function () {
         floorProvider: undefined
       });
     });
+    it('should not do floor stuff if floors.data is defined by noFloorSignalBidders[]', function() {
+      handleSetFloorsConfig({
+        ...basicFloorConfig,
+        data: {
+          ...basicFloorDataLow,
+          noFloorSignalBidders: ['someBidder', 'someOtherBidder']
+        }});
+      runStandardAuction();
+      validateBidRequests(false, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: undefined,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: undefined,
+        noFloorSignaled: true
+      })
+    });
+    it('should not do floor stuff if floors.enforcement is defined by noFloorSignalBidders[]', function() {
+      handleSetFloorsConfig({ ...basicFloorConfig,
+        enforcement: {
+          enforceJS: true,
+          noFloorSignalBidders: ['someBidder', 'someOtherBidder']
+        },
+        data: basicFloorDataLow
+      });
+      runStandardAuction();
+      validateBidRequests(false, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: undefined,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: undefined,
+        noFloorSignaled: true
+      })
+    });
+    it('should not do floor stuff and use first floors.data.noFloorSignalBidders if its defined betwen enforcement.noFloorSignalBidders', function() {
+      handleSetFloorsConfig({ ...basicFloorConfig,
+        enforcement: {
+          enforceJS: true,
+          noFloorSignalBidders: ['someBidder']
+        },
+        data: {
+          ...basicFloorDataLow,
+          noFloorSignalBidders: ['someBidder', 'someOtherBidder']
+        }
+      });
+      runStandardAuction();
+      validateBidRequests(false, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: undefined,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: undefined,
+        noFloorSignaled: true
+      })
+    });
+    it('it shouldn`t return floor stuff for bidder in the noFloorSignalBidders list', function() {
+      handleSetFloorsConfig({ ...basicFloorConfig,
+        enforcement: {
+          enforceJS: true,
+        },
+        data: {
+          ...basicFloorDataLow,
+          noFloorSignalBidders: ['someBidder']
+        }
+      });
+      runStandardAuction()
+      const bidRequestData = exposedAdUnits[0].bids.find(bid => bid.bidder === 'someBidder');
+      expect(bidRequestData.hasOwnProperty('getFloor')).to.equal(false);
+      sinon.assert.match(bidRequestData.floorData, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: undefined,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: undefined,
+        noFloorSignaled: true
+      });
+    })
+    it('it should return floor stuff if we defined wrong bidder name in data.noFloorSignalBidders', function() {
+      handleSetFloorsConfig({ ...basicFloorConfig,
+        enforcement: {
+          enforceJS: true,
+        },
+        data: {
+          ...basicFloorDataLow,
+          noFloorSignalBidders: ['randomBiider']
+        }
+      });
+      runStandardAuction();
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: undefined,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: undefined,
+        noFloorSignaled: false
+      })
+    });
     it('should use adUnit level data if not setConfig or fetch has occured', function () {
       handleSetFloorsConfig({
         ...basicFloorConfig,
@@ -1530,7 +1751,7 @@ describe('the price floors module', function () {
         const req = utils.deepClone(bidRequest);
         _floorDataForAuction[req.auctionId] = utils.deepClone(basicFloorConfig);
 
-        expect(guardTids('mock-bidder').bidRequest(req).getFloor({})).to.deep.equal({
+        expect(guardTids({bidderCode: 'mock-bidder'}).bidRequest(req).getFloor({})).to.deep.equal({
           currency: 'USD',
           floor: 1.0
         });
@@ -1998,7 +2219,7 @@ describe('the price floors module', function () {
       let next = (adUnitCode, bid) => {
         returnedBidResponse = bid;
       };
-      addBidResponseHook(next, bidResp.adUnitCode, Object.assign(createBid(CONSTANTS.STATUS.GOOD, {auctionId: AUCTION_ID}), bidResp), reject);
+      addBidResponseHook(next, bidResp.adUnitCode, Object.assign(createBid(STATUS.GOOD, { auctionId: AUCTION_ID }), bidResp), reject);
     };
     it('continues with the auction if not floors data is present without any flooring', function () {
       runBidResponse();
@@ -2011,6 +2232,12 @@ describe('the price floors module', function () {
       expect(returnedBidResponse).to.not.haveOwnProperty('floorData');
       expect(logWarnSpy.calledOnce).to.equal(true);
     });
+    it('if it finds a rule with a floor price of zero it should not call log warn', function () {
+      _floorDataForAuction[AUCTION_ID] = utils.deepClone(basicFloorConfig);
+      _floorDataForAuction[AUCTION_ID].data.values = { '*': 0 };
+      runBidResponse();
+      expect(logWarnSpy.calledOnce).to.equal(false);
+    });
     it('if it finds a rule and floors should update the bid accordingly', function () {
       _floorDataForAuction[AUCTION_ID] = utils.deepClone(basicFloorConfig);
       _floorDataForAuction[AUCTION_ID].data.values = { 'banner': 1.0 };
@@ -2119,7 +2346,7 @@ describe('the price floors module', function () {
     it('should wait 3 seconds before deleting auction floor data', function () {
       handleSetFloorsConfig({enabled: true});
       _floorDataForAuction[AUCTION_END_EVENT.auctionId] = utils.deepClone(basicFloorConfig);
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, AUCTION_END_EVENT);
+      events.emit(EVENTS.AUCTION_END, AUCTION_END_EVENT);
       // should still be here
       expect(_floorDataForAuction[AUCTION_END_EVENT.auctionId]).to.not.be.undefined;
       // tick for 4 seconds
@@ -2137,7 +2364,7 @@ describe('the price floors module', function () {
     }
 
     const resp = {
-      transactionId: req.transactionId,
+      adUnitId: req.adUnitId,
       size: [100, 100],
       mediaType: 'banner',
     }
@@ -2148,7 +2375,7 @@ describe('the price floors module', function () {
         adUnits: [
           {
             code: req.adUnitCode,
-            transactionId: req.transactionId,
+            adUnitId: req.adUnitId,
             ortb2Imp: {ext: {data: {adserver: {name: 'gam', adslot: 'slot'}}}}
           }
         ]
@@ -2174,3 +2401,87 @@ describe('the price floors module', function () {
     })
   });
 });
+
+describe('setting null as rule value', () => {
+  const nullFloorData = {
+    modelVersion: 'basic model',
+    modelWeight: 10,
+    modelTimestamp: 1606772895,
+    currency: 'USD',
+    schema: {
+      delimiter: '|',
+      fields: ['mediaType', 'size']
+    },
+    values: {
+      'banner|600x300': null,
+    }
+  };
+
+  const basicBidRequest = {
+    bidder: 'rubicon',
+    adUnitCode: 'test_div_1',
+    auctionId: '1234-56-789',
+    transactionId: 'tr_test_div_1',
+    adUnitId: 'tr_test_div_1',
+  };
+
+  it('should validate for null values', function () {
+    let data = utils.deepClone(nullFloorData);
+    data.floorsSchemaVersion = 1;
+    expect(isFloorsDataValid(data)).to.to.equal(true);
+  });
+
+  it('getFloor should not return numeric value if null set as value', function () {
+    const bidRequest = { ...basicBidRequest, getFloor };
+    const basicFloorConfig = {
+      enabled: true,
+      auctionDelay: 0,
+      endpoint: {},
+      enforcement: {
+        enforceJS: true,
+        enforcePBS: false,
+        floorDeals: false,
+        bidAdjustment: true
+      },
+      data: nullFloorData
+    }
+    _floorDataForAuction[bidRequest.auctionId] = basicFloorConfig;
+
+    let inputParams = {mediaType: 'banner', size: [600, 300]};
+    expect(bidRequest.getFloor(inputParams)).to.deep.equal(null);
+  })
+
+  it('getFloor should not return numeric value if null set as value - external floor provider', function () {
+    const basicFloorConfig = {
+      enabled: true,
+      auctionDelay: 0,
+      endpoint: {},
+      enforcement: {
+        enforceJS: true,
+        enforcePBS: false,
+        floorDeals: false,
+        bidAdjustment: true
+      },
+      data: nullFloorData
+    }
+    server.respondWith(JSON.stringify(nullFloorData));
+    let exposedAdUnits;
+
+    handleSetFloorsConfig({...basicFloorConfig, floorProvider: 'floorprovider', endpoint: {url: 'http://www.fakefloorprovider.json/'}});
+
+    const adUnits = [{
+      cod: 'test_div_1',
+      mediaTypes: {banner: { sizes: [[600, 300]] }, native: {}},
+      bids: [{bidder: 'someBidder', adUnitCode: 'test_div_1'}, {bidder: 'someOtherBidder', adUnitCode: 'test_div_1'}]
+    }];
+
+    requestBidsHook(config => exposedAdUnits = config.adUnits, {
+      auctionId: basicBidRequest.auctionId,
+      adUnits
+    });
+
+    let inputParams = {mediaType: 'banner', size: [600, 300]};
+
+    expect(exposedAdUnits[0].bids[0].getFloor(inputParams)).to.deep.equal(null);
+  });
+})
diff --git a/test/spec/modules/prismaBidAdapter_spec.js b/test/spec/modules/prismaBidAdapter_spec.js
index be1c16c9059..b0d068e5614 100644
--- a/test/spec/modules/prismaBidAdapter_spec.js
+++ b/test/spec/modules/prismaBidAdapter_spec.js
@@ -3,7 +3,7 @@ import {spec} from 'modules/prismaBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
-import { requestBidsHook } from 'modules/consentManagement.js';
+import { requestBidsHook } from 'modules/consentManagementTcf.js';
 
 describe('Prisma bid adapter tests', function () {
   const DISPLAY_BID_REQUEST = [{
diff --git a/test/spec/modules/programmaticaBidAdapter_spec.js b/test/spec/modules/programmaticaBidAdapter_spec.js
new file mode 100644
index 00000000000..247d20752c3
--- /dev/null
+++ b/test/spec/modules/programmaticaBidAdapter_spec.js
@@ -0,0 +1,263 @@
+import { expect } from 'chai';
+import { spec } from 'modules/programmaticaBidAdapter.js';
+import { deepClone } from 'src/utils.js';
+
+describe('programmaticaBidAdapterTests', function () {
+  let bidRequestData = {
+    bids: [
+      {
+        bidId: 'testbid',
+        bidder: 'programmatica',
+        params: {
+          siteId: 'testsite',
+          placementId: 'testplacement',
+        },
+        sizes: [[300, 250]]
+      }
+    ]
+  };
+  let request = [];
+
+  it('validate_pub_params', function () {
+    expect(
+      spec.isBidRequestValid({
+        bidder: 'programmatica',
+        params: {
+          siteId: 'testsite',
+          placementId: 'testplacement',
+        }
+      })
+    ).to.equal(true);
+  });
+
+  it('validate_generated_url', function () {
+    const request = spec.buildRequests(deepClone(bidRequestData.bids), { timeout: 1234 });
+    let req_url = request[0].url;
+
+    expect(req_url).to.equal('https://asr.programmatica.com/get');
+  });
+
+  it('validate_response_params', function () {
+    let serverResponse = {
+      body: {
+        'id': 'crid',
+        'type': {
+          'format': 'Image',
+          'source': 'passback',
+          'dspId': '',
+          'dspCreativeId': ''
+        },
+        'content': {
+          'data': 'test ad',
+          'imps': null,
+          'click': {
+            'url': '',
+            'track': null
+          }
+        },
+        'size': '300x250',
+        'matching': '',
+        'cpm': 10,
+        'currency': 'USD'
+      }
+    };
+
+    const bidRequest = deepClone(bidRequestData.bids)
+    bidRequest[0].mediaTypes = {
+      banner: {}
+    }
+
+    const request = spec.buildRequests(bidRequest);
+    let bids = spec.interpretResponse(serverResponse, request[0]);
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+    expect(bid.ad).to.equal('test ad');
+    expect(bid.cpm).to.equal(10);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('crid');
+    expect(bid.meta.advertiserDomains).to.deep.equal(['programmatica.com']);
+  });
+
+  it('validate_response_params_imps', function () {
+    let serverResponse = {
+      body: {
+        'id': 'crid',
+        'type': {
+          'format': 'Image',
+          'source': 'passback',
+          'dspId': '',
+          'dspCreativeId': ''
+        },
+        'content': {
+          'data': 'test ad',
+          'imps': [
+            'testImp'
+          ],
+          'click': {
+            'url': '',
+            'track': null
+          }
+        },
+        'size': '300x250',
+        'matching': '',
+        'cpm': 10,
+        'currency': 'USD'
+      }
+    };
+
+    const bidRequest = deepClone(bidRequestData.bids)
+    bidRequest[0].mediaTypes = {
+      banner: {}
+    }
+
+    const request = spec.buildRequests(bidRequest);
+    let bids = spec.interpretResponse(serverResponse, request[0]);
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+    expect(bid.ad).to.equal('test ad');
+    expect(bid.cpm).to.equal(10);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('crid');
+    expect(bid.meta.advertiserDomains).to.deep.equal(['programmatica.com']);
+  })
+
+  it('validate_invalid_response', function () {
+    let serverResponse = {
+      body: {}
+    };
+
+    const bidRequest = deepClone(bidRequestData.bids)
+    bidRequest[0].mediaTypes = {
+      banner: {}
+    }
+
+    const request = spec.buildRequests(bidRequest);
+    let bids = spec.interpretResponse(serverResponse, request[0]);
+    expect(bids).to.have.lengthOf(0);
+  })
+
+  it('video_bid', function () {
+    const bidRequest = deepClone(bidRequestData.bids);
+    bidRequest[0].mediaTypes = {
+      video: {
+        playerSize: [234, 765]
+      }
+    };
+
+    const request = spec.buildRequests(bidRequest, { timeout: 1234 });
+    const vastXml = '';
+    let serverResponse = {
+      body: {
+        'id': 'cki2n3n6snkuulqutpf0',
+        'type': {
+          'format': '',
+          'source': 'rtb',
+          'dspId': '1'
+        },
+        'content': {
+          'data': vastXml,
+          'imps': [
+            'https://asr.dev.programmatica.com/track/imp'
+          ],
+          'click': {
+            'url': '',
+            'track': null
+          }
+        },
+        'size': '',
+        'matching': '',
+        'cpm': 70,
+        'currency': 'RUB'
+      }
+    };
+
+    let bids = spec.interpretResponse(serverResponse, request[0]);
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+    expect(bid.mediaType).to.equal('video');
+    expect(bid.vastXml).to.equal(vastXml);
+    expect(bid.width).to.equal(234);
+    expect(bid.height).to.equal(765);
+  });
+});
+
+describe('getUserSyncs', function() {
+  it('returns empty sync array', function() {
+    const syncOptions = {};
+
+    expect(spec.getUserSyncs(syncOptions)).to.deep.equal([]);
+  });
+
+  it('Should return array of objects with proper sync config , include CCPA', function() {
+    const syncData = spec.getUserSyncs({
+      pixelEnabled: true,
+    }, {}, {}, '1---');
+    expect(syncData).to.be.an('array').which.is.not.empty;
+    expect(syncData[0]).to.be.an('object')
+    expect(syncData[0].type).to.be.a('string')
+    expect(syncData[0].type).to.equal('image')
+    expect(syncData[0].url).to.be.a('string')
+    expect(syncData[0].url).to.equal('//sync.programmatica.com/match/sp?usp=1---&consent=')
+  });
+
+  it('Should return array of objects with proper sync config , include GDPR', function() {
+    const syncData = spec.getUserSyncs({
+      iframeEnabled: true,
+    }, {}, {
+      gdprApplies: true,
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {
+        purpose: {
+          consents: {
+            1: true
+          },
+        },
+      }
+    }, '');
+    expect(syncData).to.be.an('array').which.is.not.empty;
+    expect(syncData[0]).to.be.an('object')
+    expect(syncData[0].type).to.be.a('string')
+    expect(syncData[0].type).to.equal('iframe')
+    expect(syncData[0].url).to.be.a('string')
+    expect(syncData[0].url).to.equal('//sync.programmatica.com/match/sp.ifr?usp=&consent=COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw&gdpr=1')
+  });
+
+  it('Should return array of objects with proper sync config , include GDPR, no purpose', function() {
+    const syncData = spec.getUserSyncs({
+      iframeEnabled: true,
+    }, {}, {
+      gdprApplies: true,
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {
+        purpose: {
+          consents: {
+            1: false
+          },
+        },
+      }
+    }, '');
+    expect(syncData).is.empty;
+  });
+
+  it('Should return array of objects with proper sync config , GDPR not applies', function() {
+    const syncData = spec.getUserSyncs({
+      iframeEnabled: true,
+    }, {}, {
+      gdprApplies: false,
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    }, '');
+    expect(syncData).to.be.an('array').which.is.not.empty;
+    expect(syncData[0]).to.be.an('object')
+    expect(syncData[0].type).to.be.a('string')
+    expect(syncData[0].type).to.equal('iframe')
+    expect(syncData[0].url).to.be.a('string')
+    expect(syncData[0].url).to.equal('//sync.programmatica.com/match/sp.ifr?usp=&consent=COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw&gdpr=0')
+  });
+})
diff --git a/test/spec/modules/proxistoreBidAdapter_spec.js b/test/spec/modules/proxistoreBidAdapter_spec.js
index bcddb9e8b04..92e68f60b85 100644
--- a/test/spec/modules/proxistoreBidAdapter_spec.js
+++ b/test/spec/modules/proxistoreBidAdapter_spec.js
@@ -81,7 +81,7 @@ describe('ProxistoreBidAdapter', function () {
     it('should contain a valid url', function () {
       // has gdpr consent
       expect(request.url).equal(url.cookieBase);
-      // doens't have gpdr consent
+      // doens't have gdpr consent
       bidderRequest.gdprConsent.vendorData = null;
 
       request = spec.buildRequests([bid], bidderRequest);
diff --git a/test/spec/modules/pstudioBidAdapter_spec.js b/test/spec/modules/pstudioBidAdapter_spec.js
new file mode 100644
index 00000000000..2ec38e8dcda
--- /dev/null
+++ b/test/spec/modules/pstudioBidAdapter_spec.js
@@ -0,0 +1,514 @@
+import { assert } from 'chai';
+import sinon from 'sinon';
+import { spec, storage } from 'modules/pstudioBidAdapter.js';
+import { deepClone } from '../../../src/utils.js';
+
+describe('PStudioAdapter', function () {
+  let sandbox;
+
+  beforeEach(function () {
+    sandbox = sinon.createSandbox();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
+
+  const bannerBid = {
+    bidder: 'pstudio',
+    params: {
+      pubid: '258c2a8d-d2ad-4c31-a2a5-e63001186456',
+      adtagid: 'aae1aabb-6699-4b5a-9c3f-9ed034b1932c',
+    },
+    adUnitCode: 'test-div-1',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 600],
+        ],
+        pos: 0,
+        name: 'some-name',
+      },
+    },
+    bidId: '30b31c1838de1e',
+  };
+
+  const videoBid = {
+    bidder: 'pstudio',
+    params: {
+      pubid: '258c2a8d-d2ad-4c31-a2a5-e63001186456',
+      adtagid: '34833639-f17c-40bc-9c4b-222b1b7459c7',
+    },
+    adUnitCode: 'test-div-1',
+    mediaTypes: {
+      video: {
+        playerSize: [[300, 250]],
+        mimes: ['video/mp4'],
+        minduration: 5,
+        maxduration: 30,
+        protocols: [2, 3],
+        startdelay: 5,
+        placement: 2,
+        skip: 1,
+        skipafter: 1,
+        minbitrate: 10,
+        maxbitrate: 10,
+        delivery: 1,
+        playbackmethod: [1, 3],
+        api: [2],
+        linearity: 1,
+      },
+    },
+    bidId: '30b31c1838de1e',
+  };
+
+  const bidWithOptionalParams = deepClone(bannerBid);
+  bidWithOptionalParams.params['bcat'] = ['IAB17-18', 'IAB7-42'];
+  bidWithOptionalParams.params['badv'] = ['ford.com'];
+  bidWithOptionalParams.params['bapp'] = ['com.foo.mygame'];
+  bidWithOptionalParams.params['regs'] = {
+    coppa: 1,
+  };
+
+  bidWithOptionalParams.userId = {
+    uid2: {
+      id: '7505e78e-4a9b-4011-8901-0e00c3f55ea9',
+    },
+  };
+
+  const emptyOrtb2BidderRequest = { ortb2: {} };
+
+  const baseBidderRequest = {
+    ortb2: {
+      device: {
+        w: 1680,
+        h: 342,
+      },
+    },
+  };
+
+  const extendedBidderRequest = deepClone(baseBidderRequest);
+  extendedBidderRequest.ortb2['device'] = {
+    dnt: 0,
+    ua: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36',
+    lmt: 0,
+    ip: '192.0.0.1',
+    ipv6: '2001:0000:130F:0000:0000:09C0:876A:130B',
+    devicetype: 2,
+    make: 'some_producer',
+    model: 'some_model',
+    os: 'some_os',
+    osv: 'some_version',
+    js: 1,
+    language: 'en',
+    carrier: 'WiFi',
+    connectiontype: 0,
+    ifa: 'some_ifa',
+    geo: {
+      lat: 50.4,
+      lon: 40.2,
+      country: 'some_country_code',
+      region: 'some_region_code',
+      regionfips104: 'some_fips_code',
+      metro: 'metro_code',
+      city: 'city_code',
+      zip: 'zip_code',
+      type: 2,
+    },
+    ext: {
+      ifatype: 'dpid',
+    },
+  };
+  extendedBidderRequest.ortb2['site'] = {
+    id: 'some_id',
+    name: 'example',
+    domain: 'page.example.com',
+    cat: ['IAB2'],
+    sectioncat: ['IAB2-2'],
+    pagecat: ['IAB2-2'],
+    page: 'https://page.example.com/here.html',
+    ref: 'https://ref.example.com',
+    publisher: {
+      name: 'some_name',
+      cat: ['IAB2'],
+      domain: 'https://page.example.com/here.html',
+    },
+    content: {
+      id: 'some_id',
+      episode: 22,
+      title: 'New episode.',
+      series: 'New series.',
+      artist: 'New artist',
+      genre: 'some genre',
+      album: 'New album',
+      isrc: 'AA-6Q7-20-00047',
+      season: 'New season',
+    },
+    mobile: 0,
+  };
+  extendedBidderRequest.ortb2['app'] = {
+    id: 'some_id',
+    name: 'example',
+    bundle: 'some_bundle',
+    domain: 'page.example.com',
+    storeurl: 'https://store.example.com',
+    cat: ['IAB2'],
+    sectioncat: ['IAB2-2'],
+    pagecat: ['IAB2-2'],
+    ver: 'some_version',
+    privacypolicy: 0,
+    paid: 0,
+    keywords: 'some, example, keywords',
+    publisher: {
+      name: 'some_name',
+      cat: ['IAB2'],
+      domain: 'https://page.example.com/here.html',
+    },
+    content: {
+      id: 'some_id',
+      episode: 22,
+      title: 'New episode.',
+      series: 'New series.',
+      artist: 'New artist',
+      genre: 'some genre',
+      album: 'New album',
+      isrc: 'AA-6Q7-20-00047',
+      season: 'New season',
+    },
+  };
+  extendedBidderRequest.ortb2['user'] = {
+    yob: 1992,
+    gender: 'M',
+  };
+  extendedBidderRequest.ortb2['regs'] = {
+    coppa: 0,
+  };
+
+  describe('isBidRequestValid', function () {
+    it('should return true when publisher id found', function () {
+      expect(spec.isBidRequestValid(bannerBid)).to.equal(true);
+    });
+
+    it('should return true for video bid', () => {
+      expect(spec.isBidRequestValid(videoBid)).to.equal(true);
+    });
+
+    it('should return false when publisher id not found', function () {
+      const localBid = deepClone(bannerBid);
+      delete localBid.params.pubid;
+      delete localBid.params.adtagid;
+
+      expect(spec.isBidRequestValid(localBid)).to.equal(false);
+    });
+
+    it('should return false when playerSize in video not found', () => {
+      const localBid = deepClone(videoBid);
+      delete localBid.mediaTypes.video.playerSize;
+
+      expect(spec.isBidRequestValid(localBid)).to.equal(false);
+    });
+
+    it('should return false when mimes in video not found', () => {
+      const localBid = deepClone(videoBid);
+      delete localBid.mediaTypes.video.mimes;
+
+      expect(spec.isBidRequestValid(localBid)).to.equal(false);
+    });
+
+    it('should return false when protocols in video not found', () => {
+      const localBid = deepClone(videoBid);
+      delete localBid.mediaTypes.video.protocols;
+
+      expect(spec.isBidRequestValid(localBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bannerRequest = spec.buildRequests([bannerBid], baseBidderRequest);
+    const bannerPayload = JSON.parse(bannerRequest[0].data);
+    const videoRequest = spec.buildRequests([videoBid], baseBidderRequest);
+    const videoPayload = JSON.parse(videoRequest[0].data);
+
+    it('should properly map ids in request payload', function () {
+      expect(bannerPayload.id).to.equal(bannerBid.bidId);
+      expect(bannerPayload.adtagid).to.equal(bannerBid.params.adtagid);
+    });
+
+    it('should properly map banner mediaType in request payload', function () {
+      expect(bannerPayload.banner_properties).to.deep.equal({
+        name: bannerBid.mediaTypes.banner.name,
+        sizes: bannerBid.mediaTypes.banner.sizes,
+        pos: bannerBid.mediaTypes.banner.pos,
+      });
+    });
+
+    it('should properly map video mediaType in request payload', () => {
+      expect(videoPayload.video_properties).to.deep.equal({
+        w: videoBid.mediaTypes.video.playerSize[0][0],
+        h: videoBid.mediaTypes.video.playerSize[0][1],
+        mimes: videoBid.mediaTypes.video.mimes,
+        minduration: videoBid.mediaTypes.video.minduration,
+        maxduration: videoBid.mediaTypes.video.maxduration,
+        protocols: videoBid.mediaTypes.video.protocols,
+        startdelay: videoBid.mediaTypes.video.startdelay,
+        placement: videoBid.mediaTypes.video.placement,
+        skip: videoBid.mediaTypes.video.skip,
+        skipafter: videoBid.mediaTypes.video.skipafter,
+        minbitrate: videoBid.mediaTypes.video.minbitrate,
+        maxbitrate: videoBid.mediaTypes.video.maxbitrate,
+        delivery: videoBid.mediaTypes.video.delivery,
+        playbackmethod: videoBid.mediaTypes.video.playbackmethod,
+        api: videoBid.mediaTypes.video.api,
+        linearity: videoBid.mediaTypes.video.linearity,
+      });
+    });
+
+    it('should properly set required bidder params in request payload', function () {
+      expect(bannerPayload.pubid).to.equal(bannerBid.params.pubid);
+      expect(bannerPayload.adtagid).to.equal(bannerBid.params.adtagid);
+    });
+
+    it('should omit optional bidder params or first-party data from bid request if they are not provided', function () {
+      assert.isUndefined(bannerPayload.bcat);
+      assert.isUndefined(bannerPayload.badv);
+      assert.isUndefined(bannerPayload.bapp);
+      assert.isUndefined(bannerPayload.user);
+      assert.isUndefined(bannerPayload.device);
+      assert.isUndefined(bannerPayload.site);
+      assert.isUndefined(bannerPayload.app);
+      assert.isUndefined(bannerPayload.user_ids);
+      assert.isUndefined(bannerPayload.regs);
+    });
+
+    it('should properly set optional bidder parameters', function () {
+      const request = spec.buildRequests(
+        [bidWithOptionalParams],
+        baseBidderRequest
+      );
+      const payload = JSON.parse(request[0].data);
+
+      expect(payload.bcat).to.deep.equal(['IAB17-18', 'IAB7-42']);
+      expect(payload.badv).to.deep.equal(['ford.com']);
+      expect(payload.bapp).to.deep.equal(['com.foo.mygame']);
+    });
+
+    it('should properly set optional user_ids', function () {
+      const request = spec.buildRequests(
+        [bidWithOptionalParams],
+        baseBidderRequest
+      );
+      const {
+        user: { uid2_token },
+      } = JSON.parse(request[0].data);
+      const expectedUID = '7505e78e-4a9b-4011-8901-0e00c3f55ea9';
+
+      expect(uid2_token).to.equal(expectedUID);
+    });
+
+    it('should properly set optional user_ids when no first party data is provided', function () {
+      const request = spec.buildRequests(
+        [bidWithOptionalParams],
+        emptyOrtb2BidderRequest
+      );
+      const {
+        user: { uid2_token },
+      } = JSON.parse(request[0].data);
+      const expectedUID = '7505e78e-4a9b-4011-8901-0e00c3f55ea9';
+
+      expect(uid2_token).to.equal(expectedUID);
+    });
+
+    it('should properly handle first-party data', function () {
+      const request = spec.buildRequests([bannerBid], extendedBidderRequest);
+      const payload = JSON.parse(request[0].data);
+
+      expect(payload.user).to.deep.equal(extendedBidderRequest.ortb2.user);
+      expect(payload.device).to.deep.equal(extendedBidderRequest.ortb2.device);
+      expect(payload.site).to.deep.equal(extendedBidderRequest.ortb2.site);
+      expect(payload.app).to.deep.equal(extendedBidderRequest.ortb2.app);
+      expect(payload.regs).to.deep.equal(extendedBidderRequest.ortb2.regs);
+    });
+
+    it('should not set first-party data if nothing is provided in ORTB2 param', function () {
+      const request = spec.buildRequests([bannerBid], emptyOrtb2BidderRequest);
+      const payload = JSON.parse(request[0].data);
+
+      expect(payload).not.to.haveOwnProperty('user');
+      expect(payload).not.to.haveOwnProperty('device');
+      expect(payload).not.to.haveOwnProperty('site');
+      expect(payload).not.to.haveOwnProperty('app');
+      expect(payload).not.to.haveOwnProperty('regs');
+    });
+
+    it('should set user id if proper cookie is present', function () {
+      const cookie = '157bc918-b961-4216-ac72-29fc6363edcb';
+      sandbox.stub(storage, 'getCookie').returns(cookie);
+
+      const request = spec.buildRequests([bannerBid], emptyOrtb2BidderRequest);
+      const payload = JSON.parse(request[0].data);
+
+      expect(payload.user.id).to.equal(cookie);
+    });
+
+    it('should not set user id if proper cookie not present', function () {
+      const request = spec.buildRequests([bannerBid], emptyOrtb2BidderRequest);
+      const payload = JSON.parse(request[0].data);
+
+      expect(payload).not.to.haveOwnProperty('user');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const serverResponse = {
+      body: {
+        id: '123141241231',
+        bids: [
+          {
+            cpm: 1.02,
+            width: 300,
+            height: 600,
+            currency: 'USD',
+            ad: '
Hello ad
',
+            creative_id: 'crid12345',
+            net_revenue: true,
+            meta: {
+              advertiser_domains: ['https://advertiser.com'],
+            },
+          },
+        ],
+      },
+    };
+
+    const serverVideoResponse = {
+      body: {
+        id: '123141241231',
+        bids: [
+          {
+            vast_url: 'https://v.a/st.xml',
+            cpm: 5,
+            width: 640,
+            height: 480,
+            currency: 'USD',
+            creative_id: 'crid12345',
+            net_revenue: true,
+            meta: {
+              advertiser_domains: ['https://advertiser.com'],
+            },
+          },
+        ],
+      },
+    };
+
+    const bidRequest = {
+      method: 'POST',
+      url: 'test-url',
+      data: JSON.stringify({
+        id: '12345',
+        pubid: 'somepubid',
+      }),
+    };
+
+    it('should properly parse response from server', function () {
+      const expectedResponse = {
+        requestId: JSON.parse(bidRequest.data).id,
+        cpm: serverResponse.body.bids[0].cpm,
+        width: serverResponse.body.bids[0].width,
+        height: serverResponse.body.bids[0].height,
+        ad: serverResponse.body.bids[0].ad,
+        currency: serverResponse.body.bids[0].currency,
+        creativeId: serverResponse.body.bids[0].creative_id,
+        netRevenue: serverResponse.body.bids[0].net_revenue,
+        meta: {
+          advertiserDomains:
+            serverResponse.body.bids[0].meta.advertiser_domains,
+        },
+        ttl: 300,
+      };
+      const parsedResponse = spec.interpretResponse(serverResponse, bidRequest);
+
+      expect(parsedResponse[0]).to.deep.equal(expectedResponse);
+    });
+
+    it('should properly parse video response from server', function () {
+      const expectedResponse = {
+        requestId: JSON.parse(bidRequest.data).id,
+        cpm: serverVideoResponse.body.bids[0].cpm,
+        width: serverVideoResponse.body.bids[0].width,
+        height: serverVideoResponse.body.bids[0].height,
+        currency: serverVideoResponse.body.bids[0].currency,
+        creativeId: serverVideoResponse.body.bids[0].creative_id,
+        netRevenue: serverVideoResponse.body.bids[0].net_revenue,
+        mediaType: 'video',
+        vastUrl: serverVideoResponse.body.bids[0].vast_url,
+        vastXml: undefined,
+        meta: {
+          advertiserDomains:
+            serverVideoResponse.body.bids[0].meta.advertiser_domains,
+        },
+        ttl: 300,
+      };
+      const parsedResponse = spec.interpretResponse(
+        serverVideoResponse,
+        bidRequest
+      );
+
+      expect(parsedResponse[0]).to.deep.equal(expectedResponse);
+    });
+
+    it('should return empty array if no bids are returned', function () {
+      const emptyResponse = deepClone(serverResponse);
+      emptyResponse.body.bids = undefined;
+
+      const parsedResponse = spec.interpretResponse(emptyResponse, bidRequest);
+
+      expect(parsedResponse).to.deep.equal([]);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should return sync object with correctly injected user id', function () {
+      sandbox.stub(storage, 'getCookie').returns('testid');
+
+      const result = spec.getUserSyncs({}, {}, {}, {});
+
+      expect(result).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://match.adsrvr.org/track/cmf/generic?ttd_pid=k1on5ig&ttd_tpi=1&ttd_puid=testid&dsp=ttd',
+        },
+        {
+          type: 'image',
+          url: 'https://dsp.myads.telkomsel.com/api/v1/pixel?uid=testid',
+        },
+      ]);
+    });
+
+    it('should generate user id and put the same uuid it into sync object', function () {
+      sandbox.stub(storage, 'getCookie').returns(undefined);
+
+      const result = spec.getUserSyncs({}, {}, {}, {});
+      const url1 = result[0].url;
+      const url2 = result[1].url;
+
+      const expectedUID1 = extractValueFromURL(url1, 'ttd_puid');
+      const expectedUID2 = extractValueFromURL(url2, 'uid');
+
+      expect(expectedUID1).to.equal(expectedUID2);
+
+      expect(result[0]).deep.equal({
+        type: 'image',
+        url: `https://match.adsrvr.org/track/cmf/generic?ttd_pid=k1on5ig&ttd_tpi=1&ttd_puid=${expectedUID1}&dsp=ttd`,
+      });
+      expect(result[1]).deep.equal({
+        type: 'image',
+        url: `https://dsp.myads.telkomsel.com/api/v1/pixel?uid=${expectedUID2}`,
+      });
+      // Helper function to extract UUID from URL
+      function extractValueFromURL(url, key) {
+        const match = url.match(new RegExp(`[?&]${key}=([^&]*)`));
+        return match ? match[1] : null;
+      }
+    });
+  });
+});
diff --git a/test/spec/modules/pubCircleBidAdapter_spec.js b/test/spec/modules/pubCircleBidAdapter_spec.js
index 8aaa023ee1c..083031101f1 100644
--- a/test/spec/modules/pubCircleBidAdapter_spec.js
+++ b/test/spec/modules/pubCircleBidAdapter_spec.js
@@ -1,11 +1,21 @@
 import { expect } from 'chai';
-import { spec } from '../../../modules/pubCircleBidAdapter';
+import { spec } from '../../../modules/pubCircleBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'pubcircle'
+const bidder = 'pubcircle';
 
 describe('PubCircleBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -16,8 +26,9 @@ describe('PubCircleBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -30,8 +41,9 @@ describe('PubCircleBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -53,8 +65,9 @@ describe('PubCircleBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -73,9 +86,20 @@ describe('PubCircleBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
     timeout: 500
   };
@@ -112,6 +136,7 @@ describe('PubCircleBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -129,7 +154,7 @@ describe('PubCircleBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -145,6 +170,7 @@ describe('PubCircleBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -170,8 +196,10 @@ describe('PubCircleBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -186,12 +214,38 @@ describe('PubCircleBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -395,5 +449,17 @@ describe('PubCircleBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal('https://cs.pubcircle.ai/image?pbjs=1&ccpa_consent=1---&coppa=0')
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.pubcircle.ai/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
   });
 });
diff --git a/test/spec/modules/pubgeniusBidAdapter_spec.js b/test/spec/modules/pubgeniusBidAdapter_spec.js
index 86c8794dc4c..e1d579aaa4a 100644
--- a/test/spec/modules/pubgeniusBidAdapter_spec.js
+++ b/test/spec/modules/pubgeniusBidAdapter_spec.js
@@ -383,7 +383,6 @@ describe('pubGENIUS adapter', () => {
         w: 200,
         h: 100,
         startdelay: -1,
-        placement: 1,
         skip: 1,
         skipafter: 1,
         playbackmethod: [3, 4],
diff --git a/test/spec/modules/publinkIdSystem_spec.js b/test/spec/modules/publinkIdSystem_spec.js
index f35a7453403..5ad58ea1a37 100644
--- a/test/spec/modules/publinkIdSystem_spec.js
+++ b/test/spec/modules/publinkIdSystem_spec.js
@@ -72,11 +72,6 @@ describe('PublinkIdSystem', () => {
       expect(result.callback).to.be.a('function');
     });
 
-    it('Use local copy', () => {
-      const result = publinkIdSubmodule.getId({}, undefined, TEST_COOKIE_VALUE);
-      expect(result).to.be.undefined;
-    });
-
     describe('callout for id', () => {
       let callbackSpy = sinon.spy();
 
@@ -84,6 +79,44 @@ describe('PublinkIdSystem', () => {
         callbackSpy.resetHistory();
       });
 
+      it('Has cached id', () => {
+        const config = {storage: {type: 'cookie'}};
+        let submoduleCallback = publinkIdSubmodule.getId(config, undefined, TEST_COOKIE_VALUE).callback;
+        submoduleCallback(callbackSpy);
+
+        const request = server.requests[0];
+        const parsed = parseUrl(request.url);
+
+        expect(parsed.hostname).to.equal('proc.ad.cpe.dotomi.com');
+        expect(parsed.pathname).to.equal('/cvx/client/sync/publink/refresh');
+        expect(parsed.search.mpn).to.equal('Prebid.js');
+        expect(parsed.search.mpv).to.equal('$prebid.version$');
+        expect(parsed.search.publink).to.equal(TEST_COOKIE_VALUE);
+
+        request.respond(200, {}, JSON.stringify(serverResponse));
+        expect(callbackSpy.calledOnce).to.be.true;
+        expect(callbackSpy.lastCall.lastArg).to.equal(serverResponse.publink);
+      });
+
+      it('Request path has priority', () => {
+        const config = {storage: {type: 'cookie'}, params: {e: 'ca11c0ca7', site_id: '102030'}};
+        let submoduleCallback = publinkIdSubmodule.getId(config, undefined, TEST_COOKIE_VALUE).callback;
+        submoduleCallback(callbackSpy);
+
+        const request = server.requests[0];
+        const parsed = parseUrl(request.url);
+
+        expect(parsed.hostname).to.equal('proc.ad.cpe.dotomi.com');
+        expect(parsed.pathname).to.equal('/cvx/client/sync/publink');
+        expect(parsed.search.mpn).to.equal('Prebid.js');
+        expect(parsed.search.mpv).to.equal('$prebid.version$');
+        expect(parsed.search.publink).to.equal(TEST_COOKIE_VALUE);
+
+        request.respond(200, {}, JSON.stringify(serverResponse));
+        expect(callbackSpy.calledOnce).to.be.true;
+        expect(callbackSpy.lastCall.lastArg).to.equal(serverResponse.publink);
+      });
+
       it('Fetch with consent data', () => {
         const config = {storage: {type: 'cookie'}, params: {e: 'ca11c0ca7', site_id: '102030'}};
         const consentData = {gdprApplies: 1, consentString: 'myconsentstring'};
diff --git a/test/spec/modules/publirBidAdapter_spec.js b/test/spec/modules/publirBidAdapter_spec.js
new file mode 100644
index 00000000000..60840b82efb
--- /dev/null
+++ b/test/spec/modules/publirBidAdapter_spec.js
@@ -0,0 +1,488 @@
+import { expect } from 'chai';
+import { spec } from 'modules/publirBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { BANNER } from '../../../src/mediaTypes.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT = 'https://prebid.publir.com/publirPrebidEndPoint';
+const RTB_DOMAIN_TEST = 'prebid.publir.com';
+const TTL = 360;
+
+describe('publirAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('bid adapter', function () {
+    it('should have aliases', function () {
+      expect(spec.aliases).to.be.an('array').that.is.not.empty;
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      'bidder': spec.code,
+      'adUnitCode': 'adunit-code',
+      'sizes': [['640', '480']],
+      'params': {
+        'pubId': 'jdye8weeyirk00000001'
+      }
+    };
+
+    it('should return true when required params are passed', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when pubId is missing', function () {
+      const bid = {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [['640', '480']],
+        'params': {}
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when required params are not found', function () {
+      const newBid = Object.assign({}, bid);
+      delete newBid.params;
+      newBid.params = {
+        'pubId': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'params': {
+          'pubId': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 1,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'banner': {
+          }
+        },
+        'ad': '""'
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'publir',
+    }
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to rtbDomain ENDPOINT via POST', function () {
+      bidRequests[0].params.rtbDomain = RTB_DOMAIN_TEST;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send the correct bid Id', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].bidId).to.equal('299ffc8cca0b87');
+    });
+
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should respect "iframe" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            iframe: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should respect "all" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            all: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should send the pixel user sync param if userSync is enabled and no "iframe" or "all" configs are present', function () {
+      config.resetConfig();
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'pixel');
+    });
+
+    it('should respect total exclusion', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            image: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            },
+            iframe: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should have us_privacy param if usPrivacy is available in the bidRequest', function () {
+      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('us_privacy', '1YNN');
+    });
+
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('us_privacy');
+    });
+
+    it('should not send the gdpr param if gdprApplies is false in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: false}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gdpr');
+      expect(request.data.params).to.not.have.property('gdpr_consent');
+    });
+
+    it('should send the gdpr param if gdprApplies is true in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: true, consentString: 'test-consent-string'}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gdpr', true);
+      expect(request.data.params).to.have.property('gdpr_consent', 'test-consent-string');
+    });
+
+    it('should have schain param if it is available in the bidRequest', () => {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
+      };
+      bidRequests[0].schain = schain;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('schain', '1.0,1!indirectseller.com,00001,1,,,');
+    });
+
+    it('should set flooPrice to getFloor.floor value if it is greater than params.floorPrice', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.32
+        }
+      }
+      bid.params.floorPrice = 0.64;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 3.32);
+    });
+
+    it('should set floorPrice to params.floorPrice value if it is greater than getFloor.floor', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 0.8
+        }
+      }
+      bid.params.floorPrice = 1.5;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 1.5);
+    });
+
+    it('should check sua param in bid request', function() {
+      const sua = {
+        'platform': {
+          'brand': 'macOS',
+          'version': ['12', '4', '0']
+        },
+        'browsers': [
+          {
+            'brand': 'Chromium',
+            'version': [ '106', '0', '5249', '119' ]
+          },
+          {
+            'brand': 'Google Chrome',
+            'version': [ '106', '0', '5249', '119' ]
+          },
+          {
+            'brand': 'Not;A=Brand',
+            'version': [ '99', '0', '0', '0' ]
+          }
+        ],
+        'mobile': 0,
+        'model': '',
+        'bitness': '64',
+        'architecture': 'x86'
+      }
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.ortb2 = {
+        'device': {
+          'sua': {
+            'platform': {
+              'brand': 'macOS',
+              'version': [ '12', '4', '0' ]
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '106', '0', '5249', '119' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '106', '0', '5249', '119' ]
+              },
+              {
+                'brand': 'Not;A=Brand',
+                'version': [ '99', '0', '0', '0' ]
+              }
+            ],
+            'mobile': 0,
+            'model': '',
+            'bitness': '64',
+            'architecture': 'x86'
+          }
+        }
+      }
+      const requestWithSua = spec.buildRequests([bid], bidderRequest);
+      const data = requestWithSua.data;
+      expect(data.bids[0].sua).to.exist;
+      expect(data.bids[0].sua).to.deep.equal(sua);
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].sua).to.not.exist;
+    });
+
+    describe('COPPA Param', function() {
+      it('should set coppa equal 0 in bid request if coppa is set to false', function() {
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request.data.bids[0].coppa).to.be.equal(0);
+      });
+
+      it('should set coppa equal 1 in bid request if coppa is set to true', function() {
+        const bid = utils.deepClone(bidRequests[0]);
+        bid.ortb2 = {
+          'regs': {
+            'coppa': true,
+          }
+        };
+        const request = spec.buildRequests([bid], bidderRequest);
+        expect(request.data.bids[0].coppa).to.be.equal(1);
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      params: {
+        currency: 'USD',
+        netRevenue: true,
+      },
+      bids: [
+        {
+          cpm: 12.5,
+          ad: '""',
+          width: 300,
+          height: 250,
+          requestId: '21e12606d47ba7',
+          adomain: ['abc.com'],
+          mediaType: BANNER,
+          campId: '65902db45721d690ee0bc8c3'
+        }]
+    };
+
+    const expectedBannerResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 300,
+      height: 250,
+      ttl: TTL,
+      creativeId: '639153ddd0s443',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: BANNER,
+      meta: {
+        mediaType: BANNER,
+        ad_key: '9b5e00f2-8831-4efa-a933-c4f68710ffc0'
+      },
+      ad: '""',
+      campId: '65902db45721d690ee0bc8c3',
+      bidder: 'publir'
+    };
+
+    it('should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedBannerResponse));
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        params: {
+          userSyncPixels: [
+            'https://image-sync-url.test/1',
+            'https://image-sync-url.test/2',
+            'https://image-sync-url.test/3'
+          ]
+        }
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        params: {
+          userSyncURL: 'https://iframe-sync-url.test'
+        }
+      }
+    };
+
+    it('should register all img urls from the response', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should register the iframe url from the response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [iframeSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        }
+      ]);
+    });
+
+    it('should register both image and iframe urls from the responses', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, [iframeSyncResponse, imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should handle an empty response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, []);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should handle when user syncs are disabled', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: false }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([]);
+    });
+  })
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should trigger pixel if bid nurl', function() {
+      const bid = {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [['640', '480']],
+        'nurl': 'http://example.com/win/1234',
+        'params': {
+          'pubId': 'jdye8weeyirk00000001'
+        }
+      };
+
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.callCount).to.equal(1)
+    })
+  })
+});
diff --git a/test/spec/modules/pubmaticAnalyticsAdapter_spec.js b/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
index ad471252f30..f77b167a3e9 100755
--- a/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
@@ -1,10 +1,11 @@
-import pubmaticAnalyticsAdapter, {getMetadata} from 'modules/pubmaticAnalyticsAdapter.js';
+import pubmaticAnalyticsAdapter, { getMetadata } from 'modules/pubmaticAnalyticsAdapter.js';
 import adapterManager from 'src/adapterManager.js';
-import CONSTANTS from 'src/constants.json';
-import {config} from 'src/config.js';
-import {setConfig} from 'modules/currency.js';
-import {server} from '../../mocks/xhr.js';
+import { EVENTS, REJECTION_REASON } from 'src/constants.js';
+import { config } from 'src/config.js';
+import { setConfig } from 'modules/currency.js';
+import { server } from '../../mocks/xhr.js';
 import 'src/prebid.js';
+import { getGlobal } from 'src/prebidGlobal';
 
 let events = require('src/events');
 let ajax = require('src/ajax');
@@ -17,18 +18,16 @@ const setUAMobile = () => { window.navigator.__defineGetter__('userAgent', funct
 const setUANull = () => { window.navigator.__defineGetter__('userAgent', function () { return null }) };
 
 const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    BID_REQUESTED,
-    BID_RESPONSE,
-    BID_REJECTED,
-    BIDDER_DONE,
-    BID_WON,
-    BID_TIMEOUT,
-    SET_TARGETING
-  }
-} = CONSTANTS;
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_REQUESTED,
+  BID_RESPONSE,
+  BID_REJECTED,
+  BIDDER_DONE,
+  BID_WON,
+  BID_TIMEOUT,
+  SET_TARGETING
+} = EVENTS;
 
 const BID = {
   'bidder': 'pubmatic',
@@ -99,7 +98,7 @@ const BID2 = Object.assign({}, BID, {
   adserverTargeting: {
     'hb_bidder': 'pubmatic',
     'hb_adid': '3bd4ebb1c900e2',
-    'hb_pb': '1.500',
+    'hb_pb': 1.50,
     'hb_size': '728x90',
     'hb_source': 'server'
   },
@@ -109,7 +108,7 @@ const BID2 = Object.assign({}, BID, {
 });
 
 const BID3 = Object.assign({}, BID2, {
-  rejectionReason: CONSTANTS.REJECTION_REASON.FLOOR_NOT_MET
+  rejectionReason: REJECTION_REASON.FLOOR_NOT_MET
 })
 const MOCK = {
   SET_TARGETING: {
@@ -315,6 +314,208 @@ describe('pubmatic analytics adapter', function () {
     expect(utils.logError.called).to.equal(true);
   });
 
+  describe('OW S2S', function() {
+    this.beforeEach(function() {
+      pubmaticAnalyticsAdapter.enableAnalytics({
+        options: {
+          publisherId: 9999,
+          profileId: 1111,
+          profileVersionId: 20
+        }
+      });
+      config.setConfig({
+        s2sConfig: {
+          accountId: '1234',
+          bidders: ['pubmatic'],
+          defaultVendor: 'openwrap',
+          timeout: 500
+        }
+      });
+    });
+
+    this.afterEach(function() {
+      pubmaticAnalyticsAdapter.disableAnalytics();
+    });
+
+    it('Pubmatic Won: No tracker fired', function() {
+      this.timeout(5000)
+
+      sandbox.stub($$PREBID_GLOBAL$$, 'getHighestCpmBids').callsFake((key) => {
+        return [MOCK.BID_RESPONSE[0], MOCK.BID_RESPONSE[1]]
+      });
+
+      config.setConfig({
+        testGroupId: 15
+      });
+
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(1); // only logger is fired
+      let request = requests[0];
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.pubid).to.equal('9999');
+      expect(data.pid).to.equal('1111');
+      expect(data.pdvid).to.equal('20');
+    });
+
+    it('Non-pubmatic won: logger, tracker fired', function() {
+      const APPNEXUS_BID = Object.assign({}, BID, {
+        'bidder': 'appnexus',
+        'adserverTargeting': {
+          'hb_bidder': 'appnexus',
+          'hb_adid': '2ecff0db240757',
+          'hb_pb': 1.20,
+          'hb_size': '640x480',
+          'hb_source': 'server'
+        }
+      });
+
+      const MOCK_AUCTION_INIT_APPNEXUS = {
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'timestamp': 1519767010567,
+        'auctionStatus': 'inProgress',
+        'adUnits': [ {
+          'code': '/19968336/header-bid-tag-1',
+          'sizes': [[640, 480]],
+          'bids': [ {
+            'bidder': 'appnexus',
+            'params': {
+              'publisherId': '1001'
+            }
+          } ],
+          'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014'
+        }
+        ],
+        'adUnitCodes': ['/19968336/header-bid-tag-1'],
+        'bidderRequests': [ {
+          'bidderCode': 'appnexus',
+          'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+          'bidderRequestId': '1be65d7958826a',
+          'bids': [ {
+            'bidder': 'appnexus',
+            'params': {
+              'publisherId': '1001',
+              'kgpv': 'this-is-a-kgpv'
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [[640, 480]]
+              }
+            },
+            'adUnitCode': '/19968336/header-bid-tag-1',
+            'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+            'sizes': [[640, 480]],
+            'bidId': '2ecff0db240757',
+            'bidderRequestId': '1be65d7958826a',
+            'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+            'src': 'client',
+            'bidRequestsCount': 1
+          }
+          ],
+          'timeout': 3000,
+          'refererInfo': {
+            'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+          }
+        }
+        ],
+        'bidsReceived': [],
+        'winningBids': [],
+        'timeout': 3000
+      };
+
+      const MOCK_BID_REQUESTED_APPNEXUS = {
+        'bidder': 'appnexus',
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'bidderRequestId': '1be65d7958826a',
+        'bids': [
+          {
+            'bidder': 'appnexus',
+            'adapterCode': 'appnexus',
+            'bidderCode': 'appnexus',
+            'params': {
+              'publisherId': '1001',
+              'video': {
+                'minduration': 30,
+                'skippable': true
+              }
+            },
+            'mediaType': 'video',
+            'adUnitCode': '/19968336/header-bid-tag-0',
+            'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
+            'sizes': [[640, 480]],
+            'bidId': '2ecff0db240757',
+            'bidderRequestId': '1be65d7958826a',
+            'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+          }
+        ],
+        'auctionStart': 1519149536560,
+        'timeout': 5000,
+        'start': 1519149562216,
+        'refererInfo': {
+          'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+        },
+        'gdprConsent': {
+          'consentString': 'here-goes-gdpr-consent-string',
+          'gdprApplies': true
+        }
+      };
+
+      this.timeout(5000)
+
+      sandbox.stub($$PREBID_GLOBAL$$, 'getHighestCpmBids').callsFake((key) => {
+        return [APPNEXUS_BID]
+      });
+
+      events.emit(AUCTION_INIT, MOCK_AUCTION_INIT_APPNEXUS);
+      events.emit(BID_REQUESTED, MOCK_BID_REQUESTED_APPNEXUS);
+      events.emit(BID_RESPONSE, APPNEXUS_BID);
+      events.emit(BIDDER_DONE, {
+        'bidderCode': 'appnexus',
+        'bids': [
+          APPNEXUS_BID,
+          Object.assign({}, APPNEXUS_BID, {
+            'serverResponseTimeMs': 42,
+          })
+        ]
+      });
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, {
+        [APPNEXUS_BID.adUnitCode]: APPNEXUS_BID.adserverTargeting,
+      });
+      events.emit(BID_WON, Object.assign({}, APPNEXUS_BID, {
+        'status': 'rendered'
+      }));
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(2); // logger as well as tracker is fired
+      let request = requests[1]; // logger is executed late, trackers execute first
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.pubid).to.equal('9999');
+      expect(data.pid).to.equal('1111');
+      expect(data.pdvid).to.equal('20');
+
+      let firstTracker = requests[0].url;
+      expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
+      firstTracker.split('?')[1].split('&').map(e => e.split('=')).forEach(e => data[e[0]] = e[1]);
+      expect(data.pubid).to.equal('9999');
+      expect(decodeURIComponent(data.purl)).to.equal('http://www.test.com/page.html');
+
+      expect(data.s).to.be.an('array');
+      expect(data.s.length).to.equal(1);
+      expect(data.s[0].ps[0].pn).to.equal('appnexus');
+      expect(data.s[0].ps[0].bc).to.equal('appnexus');
+    })
+  });
+
   describe('when handling events', function() {
     beforeEach(function () {
       pubmaticAnalyticsAdapter.enableAnalytics({
@@ -367,19 +568,24 @@ describe('pubmatic analytics adapter', function () {
       expect(data.tgid).to.equal(15);
       expect(data.fmv).to.equal('floorModelTest');
       expect(data.ft).to.equal(1);
+      expect(data.pbv).to.equal('$prebid.version$' || '-1');
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].fskp).to.equal(0);
+      expect(data.s[0].sid).not.to.be.undefined;
+      expect(data.s[0].ffs).to.equal(1);
+      expect(data.s[0].fsrc).to.equal(2);
+      expect(data.s[0].fp).to.equal('pubmatic');
       expect(data.s[0].sz).to.deep.equal(['640x480']);
       expect(data.s[0].ps).to.be.an('array');
-	  expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
-	  expect(data.s[0].ps.length).to.equal(1);
+      expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].ps.length).to.equal(1);
       expect(data.s[0].ps[0].pn).to.equal('pubmatic');
       expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
-      expect(data.s[0].ps[0].piid).to.equal('partnerImpressionID-1');
+      expect(data.s[0].ps[0].origbidid).to.equal('partnerImpressionID-1');
       expect(data.s[0].ps[0].db).to.equal(0);
       expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps[0].kgpsv).to.equal('/19968336/header-bid-tag-0');
@@ -388,8 +594,8 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].en).to.equal(1.23);
       expect(data.s[0].ps[0].di).to.equal('-1');
       expect(data.s[0].ps[0].dc).to.equal('');
-	  expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].l1).to.equal(944);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[0].ps[0].l2).to.equal(0);
       expect(data.s[0].ps[0].ss).to.equal(1);
       expect(data.s[0].ps[0].t).to.equal(0);
@@ -398,16 +604,21 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
       expect(data.s[0].ps[0].frv).to.equal(1.1);
+      expect(data.s[0].ps[0].pb).to.equal(1.2);
       // slot 2
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].sid).not.to.be.undefined;
+      expect(data.s[1].ffs).to.equal(1);
+      expect(data.s[1].fsrc).to.equal(2);
+      expect(data.s[1].fp).to.equal('pubmatic');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
       expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
-      expect(data.s[1].ps[0].piid).to.equal('partnerImpressionID-2');
+      expect(data.s[1].ps[0].origbidid).to.equal('partnerImpressionID-2');
       expect(data.s[1].ps[0].db).to.equal(0);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
       expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
@@ -419,7 +630,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(0);
@@ -428,6 +639,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
       expect(data.s[1].ps[0].frv).to.equal(1.1);
+      expect(data.s[1].ps[0].pb).to.equal(1.50);
 
       // tracker slot1
       let firstTracker = requests[0].url;
@@ -447,7 +659,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.bc).to.equal('pubmatic');
       expect(data.eg).to.equal('1.23');
       expect(data.en).to.equal('1.23');
-      expect(data.piid).to.equal('partnerImpressionID-1');
+      expect(data.origbidid).to.equal('partnerImpressionID-1');
       expect(data.plt).to.equal('1');
       expect(data.psz).to.equal('640x480');
       expect(data.tgid).to.equal('15');
@@ -457,7 +669,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.af).to.equal('video');
     });
 
-    it('Logger: do not log floor fields when prebids floor shows noData in location property', function() {
+    it('Logger : do not log floor fields when prebids floor shows noData in location property', function() {
       const BID_REQUESTED_COPY = utils.deepClone(MOCK.BID_REQUESTED);
       BID_REQUESTED_COPY['bids'][1]['floorData']['location'] = 'noData';
 
@@ -574,15 +786,20 @@ describe('pubmatic analytics adapter', function () {
       expect(data.pid).to.equal('1111');
       expect(data.fmv).to.equal('floorModelTest');
       expect(data.ft).to.equal(1);
+      expect(data.pbv).to.equal('$prebid.version$' || '-1');
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
       expect(data.tgid).to.equal(0);
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].fskp).to.equal(0);
+      expect(data.s[0].sid).not.to.be.undefined;
+      expect(data.s[0].ffs).to.equal(1);
+      expect(data.s[0].fsrc).to.equal(2);
+      expect(data.s[0].fp).to.equal('pubmatic');
       expect(data.s[0].sz).to.deep.equal(['640x480']);
       expect(data.s[0].ps).to.be.an('array');
-	  expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps.length).to.equal(1);
       expect(data.s[0].ps[0].pn).to.equal('pubmatic');
       expect(data.s[0].ps[0].bc).to.equal('pubmatic');
@@ -595,6 +812,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
       expect(data.s[1].ps[0].frv).to.equal(1.1);
+      expect(data.s[1].ps[0].pb).to.equal(1.50);
       // tracker slot1
       let firstTracker = requests[0].url;
       expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
@@ -648,6 +866,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.tgid).to.equal(0);// test group id should be between 0-15 else set to 0
       expect(data.fmv).to.equal('floorModelTest');
       expect(data.ft).to.equal(1);
+      expect(data.pbv).to.equal('$prebid.version$' || '-1');
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
       // slot 1
@@ -655,7 +874,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].sz).to.deep.equal(['640x480']);
       expect(data.s[0].ps).to.be.an('array');
       expect(data.s[0].ps.length).to.equal(1);
-	  expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps[0].pn).to.equal('pubmatic');
       expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
@@ -698,6 +917,13 @@ describe('pubmatic analytics adapter', function () {
       expect(data.tgid).to.equal(0);// test group id should be an INT between 0-15 else set to 0
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].fskp).to.equal(0);
+
+      expect(data.s[1].sid).not.to.be.undefined;
+
+      expect(data.s[1].ffs).to.equal(1);
+      expect(data.s[1].fsrc).to.equal(2);
+      expect(data.s[1].fp).to.equal('pubmatic');
+
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -780,6 +1006,10 @@ describe('pubmatic analytics adapter', function () {
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].sid).not.to.be.undefined;
+      expect(data.s[1].ffs).to.equal(1);
+      expect(data.s[1].fsrc).to.equal(2);
+      expect(data.s[1].fp).to.equal('pubmatic');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -796,8 +1026,8 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].dc).to.equal('PMP');
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
-	  expect(data.s[0].ps[0].l1).to.equal(0);
-	  expect(data.s[0].ps[0].ol1).to.equal(0);
+      expect(data.s[0].ps[0].l1).to.equal(0);
+      expect(data.s[0].ps[0].ol1).to.equal(0);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(1);
@@ -806,6 +1036,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
       expect(data.s[1].ps[0].frv).to.equal(1.1);
+      expect(data.s[1].ps[0].pb).to.equal(1.50);
     });
 
     it('Logger: currency conversion check', function() {
@@ -842,6 +1073,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
+      expect(data.s[1].sid).not.to.be.undefined;
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
       expect(data.s[1].ps[0].bc).to.equal('pubmatic');
@@ -857,7 +1089,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(0);
@@ -889,6 +1121,10 @@ describe('pubmatic analytics adapter', function () {
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].sid).not.to.be.undefined;
+      expect(data.s[1].ffs).to.equal(1);
+      expect(data.s[1].fsrc).to.equal(2);
+      expect(data.s[1].fp).to.equal('pubmatic');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -906,7 +1142,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(0);
@@ -915,6 +1151,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
       expect(data.s[1].ps[0].frv).to.equal(1.1);
+      expect(data.s[1].ps[0].pb).to.equal(1.50);
       expect(data.dvc).to.deep.equal({'plt': 2});
       // respective tracker slot
       let firstTracker = requests[1].url;
@@ -948,6 +1185,7 @@ describe('pubmatic analytics adapter', function () {
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].sid).not.to.be.undefined;
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
@@ -964,7 +1202,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(0);
@@ -974,6 +1212,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].ocry).to.equal('USD');
       expect(data.dvc).to.deep.equal({'plt': 1});
       expect(data.s[1].ps[0].frv).to.equal(1.1);
+      expect(data.s[1].ps[0].pb).to.equal(1.50);
       // respective tracker slot
       let firstTracker = requests[1].url;
       expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
@@ -1002,6 +1241,10 @@ describe('pubmatic analytics adapter', function () {
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].sid).not.to.be.undefined;
+      expect(data.s[1].ffs).to.equal(1);
+      expect(data.s[1].fsrc).to.equal(2);
+      expect(data.s[1].fp).to.equal('pubmatic');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -1019,7 +1262,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(0);
@@ -1028,6 +1271,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
       expect(data.s[1].ps[0].frv).to.equal(1.1);
+      expect(data.s[1].ps[0].pb).to.equal(1.50);
       // respective tracker slot
       let firstTracker = requests[1].url;
       expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
@@ -1059,6 +1303,7 @@ describe('pubmatic analytics adapter', function () {
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].sid).not.to.be.undefined;
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
@@ -1075,7 +1320,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(0);
@@ -1117,13 +1362,17 @@ describe('pubmatic analytics adapter', function () {
       // Testing only for rejected bid as other scenarios will be covered under other TCs
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].ffs).to.equal(1);
+      expect(data.s[1].fsrc).to.equal(2);
+      expect(data.s[1].fp).to.equal('pubmatic');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].sid).not.to.be.undefined;
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
       expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
-      expect(data.s[1].ps[0].piid).to.equal('partnerImpressionID-2');
+      expect(data.s[1].ps[0].origbidid).to.equal('partnerImpressionID-2');
       expect(data.s[1].ps[0].db).to.equal(0);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
       expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
@@ -1135,7 +1384,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(0);
@@ -1144,6 +1393,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
       expect(data.s[1].ps[0].frv).to.equal(1.1);
+      expect(data.s[1].ps[0].pb).to.equal(1.50);
     });
 
     it('Logger: best case + win tracker in case of Bidder Aliases', function() {
@@ -1184,6 +1434,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.tst).to.equal(1519767016);
       expect(data.tgid).to.equal(15);
       expect(data.fmv).to.equal('floorModelTest');
+      expect(data.pbv).to.equal('$prebid.version$' || '-1');
       expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
@@ -1191,14 +1442,18 @@ describe('pubmatic analytics adapter', function () {
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].fskp).to.equal(0);
+      expect(data.s[0].ffs).to.equal(1);
+      expect(data.s[0].fsrc).to.equal(2);
+      expect(data.s[0].fp).to.equal('pubmatic');
       expect(data.s[0].sz).to.deep.equal(['640x480']);
+      expect(data.s[0].sid).not.to.be.undefined;
       expect(data.s[0].ps).to.be.an('array');
-	    expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps.length).to.equal(1);
       expect(data.s[0].ps[0].pn).to.equal('pubmatic');
       expect(data.s[0].ps[0].bc).to.equal('pubmatic_alias');
       expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
-      expect(data.s[0].ps[0].piid).to.equal('partnerImpressionID-1');
+      expect(data.s[0].ps[0].origbidid).to.equal('partnerImpressionID-1');
       expect(data.s[0].ps[0].db).to.equal(0);
       expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps[0].kgpsv).to.equal('/19968336/header-bid-tag-0');
@@ -1208,7 +1463,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].di).to.equal('-1');
       expect(data.s[0].ps[0].dc).to.equal('');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[0].ps[0].l2).to.equal(0);
       expect(data.s[0].ps[0].ss).to.equal(0);
       expect(data.s[0].ps[0].t).to.equal(0);
@@ -1217,17 +1472,22 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
       expect(data.s[0].ps[0].frv).to.equal(1.1);
+      expect(data.s[0].ps[0].pb).to.equal(1.2);
 
       // slot 2
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].ffs).to.equal(1);
+      expect(data.s[1].fsrc).to.equal(2);
+      expect(data.s[1].fp).to.equal('pubmatic');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].sid).not.to.be.undefined;
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
       expect(data.s[1].ps[0].bc).to.equal('pubmatic');
       expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
-      expect(data.s[1].ps[0].piid).to.equal('partnerImpressionID-2');
+      expect(data.s[1].ps[0].origbidid).to.equal('partnerImpressionID-2');
       expect(data.s[1].ps[0].db).to.equal(0);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
       expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
@@ -1238,8 +1498,8 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].dc).to.equal('PMP');
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
-	  expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].l1).to.equal(944);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(0);
@@ -1248,6 +1508,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
       expect(data.s[1].ps[0].frv).to.equal(1.1);
+      expect(data.s[1].ps[0].pb).to.equal(1.50);
 
       // tracker slot1
       let firstTracker = requests[0].url;
@@ -1267,7 +1528,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.bc).to.equal('pubmatic_alias');
       expect(data.eg).to.equal('1.23');
       expect(data.en).to.equal('1.23');
-      expect(data.piid).to.equal('partnerImpressionID-1');
+      expect(data.origbidid).to.equal('partnerImpressionID-1');
     });
 
     it('Logger: best case + win tracker in case of GroupM as alternate bidder', function() {
@@ -1305,6 +1566,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.tst).to.equal(1519767016);
       expect(data.tgid).to.equal(15);
       expect(data.fmv).to.equal('floorModelTest');
+      expect(data.pbv).to.equal('$prebid.version$' || '-1');
       expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
@@ -1312,14 +1574,18 @@ describe('pubmatic analytics adapter', function () {
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].fskp).to.equal(0);
+      expect(data.s[0].ffs).to.equal(1);
+      expect(data.s[0].fsrc).to.equal(2);
+      expect(data.s[0].fp).to.equal('pubmatic');
       expect(data.s[0].sz).to.deep.equal(['640x480']);
+      expect(data.s[0].sid).not.to.be.undefined;
       expect(data.s[0].ps).to.be.an('array');
-	    expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].au).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps.length).to.equal(1);
       expect(data.s[0].ps[0].pn).to.equal('pubmatic');
       expect(data.s[0].ps[0].bc).to.equal('groupm');
       expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
-      expect(data.s[0].ps[0].piid).to.equal('partnerImpressionID-1');
+      expect(data.s[0].ps[0].origbidid).to.equal('partnerImpressionID-1');
       expect(data.s[0].ps[0].db).to.equal(0);
       expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps[0].kgpsv).to.equal('/19968336/header-bid-tag-0');
@@ -1329,7 +1595,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].di).to.equal('-1');
       expect(data.s[0].ps[0].dc).to.equal('');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[0].ps[0].l2).to.equal(0);
       expect(data.s[0].ps[0].ss).to.equal(0);
       expect(data.s[0].ps[0].t).to.equal(0);
@@ -1338,16 +1604,18 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
       expect(data.s[0].ps[0].frv).to.equal(1.1);
+      expect(data.s[0].ps[0].pb).to.equal(1.2);
 
       // slot 2
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].sid).not.to.be.undefined;
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
       expect(data.s[1].ps[0].bc).to.equal('pubmatic');
       expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
-      expect(data.s[1].ps[0].piid).to.equal('partnerImpressionID-2');
+      expect(data.s[1].ps[0].origbidid).to.equal('partnerImpressionID-2');
       expect(data.s[1].ps[0].db).to.equal(0);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
       expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
@@ -1359,7 +1627,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
       expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[0].ps[0].l1).to.equal(944);
-	  expect(data.s[0].ps[0].ol1).to.equal(3214);
+      expect(data.s[0].ps[0].ol1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
       expect(data.s[1].ps[0].t).to.equal(0);
@@ -1386,7 +1654,100 @@ describe('pubmatic analytics adapter', function () {
       expect(data.bc).to.equal('groupm');
       expect(data.eg).to.equal('1.23');
       expect(data.en).to.equal('1.23');
-      expect(data.piid).to.equal('partnerImpressionID-1');
+      expect(data.origbidid).to.equal('partnerImpressionID-1');
+    });
+
+    it('Logger: should use originalRequestId to find the bid', function() {
+      MOCK.BID_RESPONSE[1]['originalRequestId'] = '3bd4ebb1c900e2';
+      MOCK.BID_RESPONSE[1]['requestId'] = '54d4ebb1c9003e';
+      sandbox.stub($$PREBID_GLOBAL$$, 'getHighestCpmBids').callsFake((key) => {
+        return [MOCK.BID_RESPONSE[0], MOCK.BID_RESPONSE[1]]
+      });
+
+      config.setConfig({
+        testGroupId: 15
+      });
+
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
+      let request = requests[2]; // logger is executed late, trackers execute first
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.s).to.be.an('array');
+      expect(data.s.length).to.equal(2);
+
+      // slot 1
+      expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
+      expect(data.s[0].ps[0].origbidid).to.equal('partnerImpressionID-1');
+
+      // slot 2
+      expect(data.s[1].ps[0].bidid).to.equal('54d4ebb1c9003e');
+      expect(data.s[1].ps[0].origbidid).to.equal('partnerImpressionID-2');
+
+      // tracker slot1
+      let firstTracker = requests[0].url;
+      expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
+      data = {};
+      firstTracker.split('?')[1].split('&').map(e => e.split('=')).forEach(e => data[e[0]] = e[1]);
+      expect(data.bidid).to.equal('2ecff0db240757');
+      expect(data.origbidid).to.equal('partnerImpressionID-1');
+    });
+
+    it('Logger: best case + win tracker. Log bidId when partnerimpressionid is missing', function() {
+      delete MOCK.BID_RESPONSE[1]['partnerImpId'];
+      MOCK.BID_RESPONSE[1]['requestId'] = '3bd4ebb1c900e2';
+      MOCK.BID_RESPONSE[1]['prebidBidId'] = 'Prebid-bid-id-1';
+      sandbox.stub($$PREBID_GLOBAL$$, 'getHighestCpmBids').callsFake((key) => {
+        return [MOCK.BID_RESPONSE[0], MOCK.BID_RESPONSE[1]]
+      });
+
+      config.setConfig({
+        testGroupId: 15
+      });
+
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
+      let request = requests[2]; // logger is executed late, trackers execute first
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.s).to.be.an('array');
+      expect(data.s.length).to.equal(2);
+
+      // slot 1
+      expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
+      expect(data.s[0].ps[0].origbidid).to.equal('partnerImpressionID-1');
+
+      // slot 2
+      expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
+      expect(data.s[1].ps[0].origbidid).to.equal('3bd4ebb1c900e2');
+
+      // tracker slot1
+      let firstTracker = requests[0].url;
+      expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
+      data = {};
+      firstTracker.split('?')[1].split('&').map(e => e.split('=')).forEach(e => data[e[0]] = e[1]);
+      expect(data.bidid).to.equal('2ecff0db240757');
+      expect(data.origbidid).to.equal('partnerImpressionID-1');
     });
   });
 
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 066004bd954..834db255e01 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -1,10 +1,10 @@
 import { expect } from 'chai';
-import { spec, checkVideoPlacement, _getDomainFromURL, assignDealTier, prepareMetaObject } from 'modules/pubmaticBidAdapter.js';
+import { spec, checkVideoPlacement, _getDomainFromURL, assignDealTier, prepareMetaObject, getDeviceConnectionType, setIBVField, setTTL } from 'modules/pubmaticBidAdapter.js';
 import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 import { createEidsArray } from 'modules/userId/eids.js';
 import { bidderSettings } from 'src/bidderSettings.js';
-const constants = require('src/constants.json');
+const constants = require('src/constants.js');
 
 describe('PubMatic adapter', function () {
   let bidRequests;
@@ -82,6 +82,7 @@ describe('PubMatic adapter', function () {
         ortb2Imp: {
           ext: {
             tid: '92489f71-1bf2-49a0-adf9-000cea934729',
+            gpid: '/1111/homepage-leftnav'
           }
         },
         schain: schainConfig
@@ -103,6 +104,7 @@ describe('PubMatic adapter', function () {
         params: {
           publisherId: '5890',
           adSlot: 'Div1@0x0', // ad_id or tagid
+          wiid: 'new-unique-wiid',
           video: {
             mimes: ['video/mp4', 'video/x-flv'],
             skippable: true,
@@ -153,6 +155,7 @@ describe('PubMatic adapter', function () {
         params: {
           publisherId: '5890',
           adSlot: 'Div1@640x480', // ad_id or tagid
+          wiid: '1234567890',
           video: {
             mimes: ['video/mp4', 'video/x-flv'],
             skippable: true,
@@ -212,6 +215,7 @@ describe('PubMatic adapter', function () {
       params: {
         publisherId: '5670',
         adSlot: '/43743431/NativeAutomationPrebid@1x1',
+        wiid: 'new-unique-wiid'
       },
       bidId: '2a5571261281d4',
       requestId: 'B68287E1-DC39-4B38-9790-FE4F179739D6',
@@ -277,6 +281,7 @@ describe('PubMatic adapter', function () {
       params: {
         publisherId: '5670',
         adSlot: '/43743431/NativeAutomationPrebid@1x1',
+        wiid: 'new-unique-wiid'
       },
       bidId: '2a5571261281d4',
       requestId: 'B68287E1-DC39-4B38-9790-FE4F179739D6',
@@ -303,6 +308,7 @@ describe('PubMatic adapter', function () {
       params: {
         publisherId: '5670',
         adSlot: '/43743431/NativeAutomationPrebid@1x1',
+        wiid: 'new-unique-wiid'
       }
     }];
 
@@ -343,6 +349,7 @@ describe('PubMatic adapter', function () {
       params: {
         publisherId: '5670',
         adSlot: '/43743431/NativeAutomationPrebid@1x1',
+        wiid: 'new-unique-wiid'
       }
     }];
 
@@ -501,6 +508,7 @@ describe('PubMatic adapter', function () {
         params: {
           publisherId: '301',
           adSlot: '/15671365/DMDemo@300x250:0',
+          wiid: 'new-unique-wiid',
           video: {
             mimes: ['video/mp4', 'video/x-flv'],
             skippable: true,
@@ -571,6 +579,7 @@ describe('PubMatic adapter', function () {
         params: {
           publisherId: '301',
           adSlot: '/15671365/DMDemo@300x250:0',
+          wiid: 'new-unique-wiid',
           video: {
             mimes: ['video/mp4', 'video/x-flv'],
             skippable: true,
@@ -1172,11 +1181,14 @@ describe('PubMatic adapter', function () {
   		  expect(data.imp[0].tagid).to.equal('/15671365/DMDemo'); // tagid
   		  expect(data.imp[0].banner.w).to.equal(300); // width
   		  expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.imp[0].ext.gpid).to.equal(bidRequests[0].ortb2Imp.ext.gpid);
   		  expect(data.imp[0].ext.pmZoneId).to.equal(bidRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
         expect(data.imp[0].ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
         expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
         expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
         expect(data.ext.epoch).to.exist;
+        expect(data.imp[0].displaymanager).to.equal('Prebid.js');
+        expect(data.imp[0].displaymanagerver).to.equal('$prebid.version$');
   		});
 
       it('Set tmax from global config if not set by requestBids method', function() {
@@ -1439,6 +1451,7 @@ describe('PubMatic adapter', function () {
         expect(data.imp[0].banner.w).to.equal(728); // width
         expect(data.imp[0].banner.h).to.equal(90); // height
         expect(data.imp[0].banner.format).to.deep.equal([{w: 160, h: 600}]);
+        expect(data.imp[0].ext.gpid).to.equal(bidRequests[0].ortb2Imp.ext.gpid);
         expect(data.imp[0].ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
         expect(data.imp[0].ext.pmZoneId).to.equal(bidRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
         expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
@@ -1663,6 +1676,7 @@ describe('PubMatic adapter', function () {
         expect(data.imp[0].tagid).to.equal('/15671365/DMDemo'); // tagid
         expect(data.imp[0].banner.w).to.equal(300); // width
         expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.imp[0].ext.gpid).to.equal(bidRequests[0].ortb2Imp.ext.gpid);
         expect(data.imp[0].ext.pmZoneId).to.equal(bidRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
       });
 
@@ -1711,6 +1725,7 @@ describe('PubMatic adapter', function () {
   		  expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
   		  expect(data.imp[0].bidfloor).to.equal(parseFloat(bidRequests[0].params.kadfloor)); // kadfloor
   		  expect(data.imp[0].tagid).to.equal('/15671365/DMDemo'); // tagid
+        expect(data.imp[0].ext.gpid).to.equal(bidRequests[0].ortb2Imp.ext.gpid);
   		  expect(data.imp[0].banner.w).to.equal(300); // width
   		  expect(data.imp[0].banner.h).to.equal(250); // height
   		  expect(data.imp[0].ext.pmZoneId).to.equal(bidRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
@@ -1759,6 +1774,7 @@ describe('PubMatic adapter', function () {
         expect(data.imp[0].tagid).to.equal('/15671365/DMDemo'); // tagid
         expect(data.imp[0].banner.w).to.equal(300); // width
         expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.imp[0].ext.gpid).to.equal(bidRequests[0].ortb2Imp.ext.gpid);
         expect(data.imp[0].ext.pmZoneId).to.equal(bidRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
 
         // second request without USP/CCPA
@@ -1767,6 +1783,37 @@ describe('PubMatic adapter', function () {
         expect(data2.regs).to.equal(undefined);// USP/CCPAs
       });
 
+      it('Request params should include DSA signals if present', function () {
+        const dsa = {
+          dsarequired: 3,
+          pubrender: 0,
+          datatopub: 2,
+          transparency: [
+            {
+              domain: 'platform1domain.com',
+              dsaparams: [1]
+            },
+            {
+              domain: 'SSP2domain.com',
+              dsaparams: [1, 2]
+            }
+          ]
+        };
+
+        let bidRequest = {
+		      ortb2: {
+            regs: {
+              ext: {
+                dsa
+              }
+            }
+          }
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        assert.deepEqual(data.regs.ext.dsa, dsa);
+      });
+
       it('Request params check with JW player params', function() {
         let bidRequests = [
           {
@@ -1908,7 +1955,43 @@ describe('PubMatic adapter', function () {
           expect(data.user.yob).to.equal(1985);
         });
 
+        it('ortb2.badv should be merged in the request', function() {
+          const ortb2 = {
+            badv: ['example.com']
+          };
+          const request = spec.buildRequests(bidRequests, {ortb2});
+          let data = JSON.parse(request.data);
+          expect(data.badv).to.deep.equal(['example.com']);
+        });
+
         describe('ortb2Imp', function() {
+          describe('ortb2Imp.ext.gpid', function() {
+            beforeEach(function () {
+              if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                delete bidRequests[0].ortb2Imp;
+              }
+            });
+
+            it('should send gpid if imp[].ext.gpid is specified', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  gpid: 'ortb2Imp.ext.gpid'
+                }
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.imp[0].ext).to.have.property('gpid');
+              expect(data.imp[0].ext.gpid).to.equal('ortb2Imp.ext.gpid');
+            });
+
+            it('should not send if imp[].ext.gpid is not specified', function() {
+              bidRequests[0].ortb2Imp = { ext: { } };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.imp[0].ext).to.not.have.property('gpid');
+            });
+          });
+
           describe('ortb2Imp.ext.data.pbadslot', function() {
             beforeEach(function () {
               if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
@@ -2278,6 +2361,57 @@ describe('PubMatic adapter', function () {
         expect(data.device.sua).to.deep.equal(suaObject);
       });
 
+      it('should pass device.ext.cdep if present in bidderRequest fpd ortb2 object', function () {
+        const cdepObj = {
+          cdep: 'example_label_1'
+        };
+        let request = spec.buildRequests(multipleMediaRequests, {
+          auctionId: 'new-auction-id',
+          ortb2: {
+            device: {
+              ext: cdepObj
+            }
+          }
+        });
+        let data = JSON.parse(request.data);
+        expect(data.device.ext.cdep).to.exist.and.to.be.an('string');
+        expect(data.device.ext).to.deep.equal(cdepObj);
+      });
+
+      it('should pass enriched device data from ortb2 object if present in bidderRequest fpd', function () {
+        const fpdBidderRequest = {
+          auctionId: 'new-auction-id',
+          ortb2: {
+            device: {
+              w: 980,
+              h: 1720,
+              dnt: 0,
+              ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+              language: 'en',
+              devicetype: 1,
+              make: 'Apple',
+              model: 'iPhone 12 Pro Max',
+              os: 'iOS',
+              osv: '17.4',
+            }
+          },
+        };
+
+        const request = spec.buildRequests(multipleMediaRequests, fpdBidderRequest);
+        const data = JSON.parse(request.data);
+
+        expect(data.device.w).to.equal(fpdBidderRequest.ortb2.device.w);
+        expect(data.device.h).to.equal(fpdBidderRequest.ortb2.device.h);
+        expect(data.device.dnt).to.equal(fpdBidderRequest.ortb2.device.dnt);
+        expect(data.device.ua).to.equal(fpdBidderRequest.ortb2.device.ua);
+        expect(data.device.language).to.equal(fpdBidderRequest.ortb2.device.language);
+        expect(data.device.devicetype).to.equal(fpdBidderRequest.ortb2.device.devicetype);
+        expect(data.device.make).to.equal(fpdBidderRequest.ortb2.device.make);
+        expect(data.device.model).to.equal(fpdBidderRequest.ortb2.device.model);
+        expect(data.device.os).to.equal(fpdBidderRequest.ortb2.device.os);
+        expect(data.device.osv).to.equal(fpdBidderRequest.ortb2.device.osv);
+      });
+
       it('Request params should have valid native bid request for all valid params', function () {
         let request = spec.buildRequests(nativeBidRequests, {
           auctionId: 'new-auction-id'
@@ -2848,7 +2982,7 @@ describe('PubMatic adapter', function () {
           bidRequest[0].ortb2Imp = {
             ext: { ae: 1 }
           };
-          const req = spec.buildRequests(bidRequest, { ...bidRequest, fledgeEnabled: false });
+          const req = spec.buildRequests(bidRequest, { ...bidRequest, paapi: {enabled: false} });
           let data = JSON.parse(req.data);
           if (data.imp[0].ext) {
             expect(data.imp[0].ext).to.not.have.property('ae');
@@ -2861,11 +2995,37 @@ describe('PubMatic adapter', function () {
           bidRequest[0].ortb2Imp = {
             ext: { ae: 1 }
           };
-          const req = spec.buildRequests(bidRequest, { ...bidRequest, fledgeEnabled: true });
+          const req = spec.buildRequests(bidRequest, { ...bidRequest, paapi: {enabled: true} });
           let data = JSON.parse(req.data);
           expect(data.imp[0].ext.ae).to.equal(1);
         });
       });
+
+      it('should send connectiontype parameter if browser contains navigator.connection property', function () {
+        const bidRequest = spec.buildRequests(bidRequests);
+        let data = JSON.parse(bidRequest.data);
+        if (window.navigator && window.navigator.connection) {
+          expect(data.device).to.include.any.keys('connectiontype');
+        }
+      });
+
+      it('should send imp.pmp in request if pmp json is present in adUnit ortb2Imp object', function () {
+        let originalBidRequests = utils.deepClone(bidRequests);
+        originalBidRequests[0].ortb2Imp.pmp = {
+          'private_auction': 0,
+          'deals': [{ 'id': '5678' }]
+        }
+        const bidRequest = spec.buildRequests(originalBidRequests);
+        let data = JSON.parse(bidRequest.data);
+        expect(data.imp[0].pmp).to.exist.and.to.be.an('object');
+      })
+
+      it('should not send imp.pmp in request if pmp json is not present in adUnit ortb2Imp object', function () {
+        let originalBidRequests = utils.deepClone(bidRequests);
+        const bidRequest = spec.buildRequests(originalBidRequests);
+        let data = JSON.parse(bidRequest.data);
+        expect(data.imp[0].pmp).to.deep.equal(undefined);
+      })
   	});
 
     it('Request params dctr check', function () {
@@ -3303,7 +3463,7 @@ describe('PubMatic adapter', function () {
         expect(response[0].dealId).to.equal(bidResponses.body.seatbid[0].bid[0].dealid);
         expect(response[0].currency).to.equal('USD');
         expect(response[0].netRevenue).to.equal(true);
-        expect(response[0].ttl).to.equal(300);
+        expect(response[0].ttl).to.equal(360);
         expect(response[0].meta.networkId).to.equal(123);
         expect(response[0].adserverTargeting.hb_buyid_pubmatic).to.equal('BUYER-ID-987');
         expect(response[0].meta.buyerId).to.equal('seat-id');
@@ -3328,7 +3488,7 @@ describe('PubMatic adapter', function () {
         expect(response[1].dealId).to.equal(bidResponses.body.seatbid[1].bid[0].dealid);
         expect(response[1].currency).to.equal('USD');
         expect(response[1].netRevenue).to.equal(true);
-        expect(response[1].ttl).to.equal(300);
+        expect(response[1].ttl).to.equal(360);
         expect(response[1].meta.networkId).to.equal(422);
         expect(response[1].adserverTargeting.hb_buyid_pubmatic).to.equal('BUYER-ID-789');
         expect(response[1].meta.buyerId).to.equal(832);
@@ -3419,6 +3579,33 @@ describe('PubMatic adapter', function () {
         expect(response[0].renderer).to.not.exist;
       });
 
+      it('should set ibv field in bid.ext when bid.ext.ibv exists', function() {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+
+        let copyOfBidResponse = utils.deepClone(bannerBidResponse);
+        let bidExt = utils.deepClone(copyOfBidResponse.body.seatbid[0].bid[0].ext);
+        copyOfBidResponse.body.seatbid[0].bid[0].ext = Object.assign(bidExt, {
+          ibv: true
+        });
+
+        let response = spec.interpretResponse(copyOfBidResponse, request);
+        expect(response[0].ext.ibv).to.equal(true);
+        expect(response[0].meta.mediaType).to.equal('video');
+      });
+
+      it('should not set ibv field when bid.ext does not exist ', function() {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+
+        let response = spec.interpretResponse(bannerBidResponse, request);
+        expect(response[0].ext).to.not.exist;
+        expect(response[0].meta).to.exist;
+        expect(response[0].meta.mediaType).to.equal('banner');
+      });
+
       if (FEATURES.VIDEO) {
         it('should check for valid video mediaType in case of multiformat request', function() {
           let request = spec.buildRequests(videoBidRequests, {
@@ -3678,14 +3865,24 @@ describe('PubMatic adapter', function () {
       response = spec.interpretResponse({ body: bidResponse }, bidRequest);
       it('should return FLEDGE auction_configs alongside bids', function () {
         expect(response).to.have.property('bids');
-        expect(response).to.have.property('fledgeAuctionConfigs');
-        expect(response.fledgeAuctionConfigs.length).to.equal(1);
-        expect(response.fledgeAuctionConfigs[0].bidId).to.equal('test_bid_id');
+        expect(response).to.have.property('paapi');
+        expect(response.paapi.length).to.equal(1);
+        expect(response.paapi[0].bidId).to.equal('test_bid_id');
       });
     });
 
     describe('Preapare metadata', function () {
       it('Should copy all fields from ext to meta', function () {
+        const dsa = {
+          behalf: 'Advertiser',
+          paid: 'Advertiser',
+          transparency: [{
+            domain: 'dsp1domain.com',
+            dsaparams: [1, 2]
+          }],
+          adrender: 1
+        };
+
         const bid = {
           'adomain': [
             'mystartab.com'
@@ -3697,6 +3894,7 @@ describe('PubMatic adapter', function () {
             'deal_channel': 1,
             'bidtype': 0,
             advertiserId: 'adid',
+            dsa,
             // networkName: 'nwnm',
             // primaryCatId: 'pcid',
             // advertiserName: 'adnm',
@@ -3707,10 +3905,12 @@ describe('PubMatic adapter', function () {
             // dchain: 'dc',
             // demandSource: 'ds',
             // secondaryCatIds: ['secondaryCatIds']
-          }
+          },
         };
 
-        const br = {};
+        const br = {
+          mediaType: 'video'
+        };
         prepareMetaObject(br, bid, null);
         expect(br.meta.networkId).to.equal(6); // dspid
         expect(br.meta.buyerId).to.equal('12'); // adid
@@ -3728,6 +3928,8 @@ describe('PubMatic adapter', function () {
         expect(br.meta.secondaryCatIds[0]).to.equal('IAB_CATEGORY');
         expect(br.meta.advertiserDomains).to.be.an('array').with.length.above(0); // adomain
         expect(br.meta.clickUrl).to.equal('mystartab.com'); // adomain
+        expect(br.meta.dsa).to.equal(dsa); // dsa
+        expect(br.meta.mediaType).to.equal('video'); // mediaType
       });
 
       it('Should be empty, when ext and adomain is absent in bid object', function () {
@@ -3910,11 +4112,26 @@ describe('PubMatic adapter', function () {
       });
     });
 
+    describe('getDeviceConnectionType', function() {
+      it('is a function', function(done) {
+        getDeviceConnectionType.should.be.a('function');
+        done();
+      });
+
+      it('should return matched value if navigator.connection is present', function(done) {
+        const connectionValue = getDeviceConnectionType();
+        if (window?.navigator?.connection) {
+          expect(connectionValue).to.be.a('number');
+        }
+        done();
+      });
+    });
+
     if (FEATURES.VIDEO) {
-      describe('Checking for Video.Placement property', function() {
+      describe('Checking for Video.plcmt property', function() {
         let sandbox, utilsMock;
         const adUnit = 'Div1';
-        const msg_placement_missing = 'Video.Placement param missing for Div1';
+        const msg_placement_missing = 'Video.plcmt param missing for Div1';
         let videoData = {
           battr: [6, 7],
           skipafter: 15,
@@ -3938,17 +4155,109 @@ describe('PubMatic adapter', function () {
           sandbox.restore();
         })
 
-        it('should log Video.Placement param missing', function() {
+        it('should log Video.plcmt param missing', function() {
           checkVideoPlacement(videoData, adUnit);
           sinon.assert.calledWith(utils.logWarn, msg_placement_missing);
         })
-        it('shoud not log Video.Placement param missing', function() {
-          videoData['placement'] = 1;
+        it('shoud not log Video.plcmt param missing', function() {
+          videoData['plcmt'] = 1;
           checkVideoPlacement(videoData, adUnit);
           sinon.assert.neverCalledWith(utils.logWarn, msg_placement_missing);
         })
       });
     }
+
+    describe('Banner Request param battr checking', function() {
+      it('should add battr params to bannerObj if present in ortb2Imp.banner', function() {
+        let originalBidRequests = utils.deepClone(bidRequests);
+        let bannerObj = utils.deepClone(originalBidRequests[0].ortb2Imp.banner);
+        originalBidRequests[0].ortb2Imp.banner = Object.assign(bannerObj, {
+          battr: [1, 2]
+        });
+
+        const req = spec.buildRequests(originalBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(req.data);
+        expect(data.imp[0]['banner']['battr']).to.exist.and.to.be.an('array');
+        expect(data.imp[0]['banner']['battr'][0]).to.equal(originalBidRequests[0].ortb2Imp.banner['battr'][0]);
+        expect(data.imp[0]['banner']['battr'][1]).to.equal(originalBidRequests[0].ortb2Imp.banner['battr'][1]);
+      });
+
+      it('should not add battr params to bannerObj if not present in ortb2Imp.banner', function() {
+        const req = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(req.data);
+        expect(data.imp[0]['banner']['battr']).to.equal(undefined);
+      });
+
+      it('should not add battr params if _checkParamDataType returns undefined (Mismatch data type)', function() {
+        let originalBidRequests = utils.deepClone(bidRequests);
+        let bannerObj = utils.deepClone(originalBidRequests[0].ortb2Imp.banner);
+        originalBidRequests[0].ortb2Imp.banner = Object.assign(bannerObj, {
+          battr: 1
+        });
+
+        const req = spec.buildRequests(originalBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(req.data);
+        expect(data.imp[0]['banner']['battr']).to.equal(undefined);
+      });
+    });
+
+    describe('setIBVField', function() {
+      it('should set ibv field in newBid.ext when bid.ext.ibv exists', function() {
+        const bid = {
+          ext: {
+            ibv: true
+          }
+        };
+        const newBid = {};
+        setIBVField(bid, newBid);
+        expect(newBid.ext).to.exist;
+        expect(newBid.ext.ibv).to.equal(true);
+        expect(newBid.meta).to.exist;
+        expect(newBid.meta.mediaType).to.equal('video');
+      });
+
+      it('should not set ibv field when bid.ext.ibv does not exist', function() {
+        const bid = {
+          ext: {}
+        };
+        const newBid = {};
+        setIBVField(bid, newBid);
+        expect(newBid.ext).to.not.exist;
+        expect(newBid.meta).to.not.exist;
+      });
+
+      it('should not set ibv field when bid.ext does not exist', function() {
+        const bid = {};
+        const newBid = {};
+        setIBVField(bid, newBid);
+        expect(newBid.ext).to.not.exist;
+        expect(newBid.meta).to.not.exist;
+      });
+
+      it('should preserve existing newBid.ext properties', function() {
+        const bid = {
+          ext: {
+            ibv: true
+          }
+        };
+        const newBid = {
+          ext: {
+            existingProp: 'should remain'
+          }
+        };
+        setIBVField(bid, newBid);
+        expect(newBid.ext.existingProp).to.equal('should remain');
+        expect(newBid.ext.ibv).to.equal(true);
+        expect(newBid.meta).to.exist;
+        expect(newBid.meta.mediaType).to.equal('video');
+      });
+    });
   });
 
   if (FEATURES.VIDEO) {
@@ -4074,4 +4383,49 @@ describe('PubMatic adapter', function () {
       expect(response[0].bidderCode).to.equal('groupm');
     });
   });
+
+  describe('setTTL', function() {
+    it('should set ttl field in newBid.ttl when bid.exp exists', function() {
+      const bid = {
+        exp: 200
+      };
+      const newBid = {};
+      setTTL(bid, newBid);
+      expect(newBid.ttl).to.equal(200);
+    });
+
+    it('should set ttl as 360 mediatype banner', function() {
+      const bid = {};
+      const newBid = {
+        mediaType: 'banner'
+      };
+      setTTL(bid, newBid);
+      expect(newBid.ttl).to.equal(360);
+    });
+
+    it('should set ttl as 1800 mediatype video', function() {
+      const bid = {};
+      const newBid = {
+        mediaType: 'video'
+      };
+      setTTL(bid, newBid);
+      expect(newBid.ttl).to.equal(1800);
+    });
+
+    it('should set ttl as 1800 mediatype native', function() {
+      const bid = {};
+      const newBid = {
+        mediaType: 'native'
+      };
+      setTTL(bid, newBid);
+      expect(newBid.ttl).to.equal(1800);
+    });
+
+    it('should set ttl as 360 as default if all condition fails', function() {
+      const bid = {};
+      const newBid = {};
+      setTTL(bid, newBid);
+      expect(newBid.ttl).to.equal(360);
+    });
+  });
 });
diff --git a/test/spec/modules/pubriseBidAdapter_spec.js b/test/spec/modules/pubriseBidAdapter_spec.js
new file mode 100644
index 00000000000..e6dc710382c
--- /dev/null
+++ b/test/spec/modules/pubriseBidAdapter_spec.js
@@ -0,0 +1,515 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/pubriseBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'pubrise';
+
+describe('PubriseBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://backend.pubrise.ai/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys(
+        'device',
+        'deviceWidth',
+        'deviceHeight',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.pubrise.ai/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.pubrise.ai/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.pubrise.ai/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/pubstackAnalyticsAdapter_spec.js b/test/spec/modules/pubstackAnalyticsAdapter_spec.js
index fe7441e91e5..6e532698d8b 100644
--- a/test/spec/modules/pubstackAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubstackAnalyticsAdapter_spec.js
@@ -2,7 +2,6 @@ import * as utils from 'src/utils.js';
 import pubstackAnalytics from '../../../modules/pubstackAnalyticsAdapter.js';
 import adapterManager from 'src/adapterManager';
 import * as events from 'src/events';
-import constants from 'src/constants.json'
 import {expectEvents} from '../../helpers/analytics.js';
 
 describe('Pubstack Analytics Adapter', () => {
diff --git a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
index 92d5972cc13..688a827de03 100644
--- a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
@@ -2,10 +2,10 @@ import {expect} from 'chai';
 import pubwiseAnalytics from 'modules/pubwiseAnalyticsAdapter.js';
 import {expectEvents} from '../../helpers/analytics.js';
 import {server} from '../../mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
 
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
-let constants = require('src/constants.json');
 
 describe('PubWise Prebid Analytics', function () {
   let requests;
@@ -54,14 +54,14 @@ describe('PubWise Prebid Analytics', function () {
       sandbox.spy(pubwiseAnalytics, 'track');
 
       expectEvents([
-        constants.EVENTS.AUCTION_INIT,
-        constants.EVENTS.BID_REQUESTED,
-        constants.EVENTS.BID_RESPONSE,
-        constants.EVENTS.BID_WON,
-        constants.EVENTS.AD_RENDER_FAILED,
-        constants.EVENTS.TCF2_ENFORCEMENT,
-        constants.EVENTS.BID_TIMEOUT,
-        constants.EVENTS.AUCTION_END,
+        EVENTS.AUCTION_INIT,
+        EVENTS.BID_REQUESTED,
+        EVENTS.BID_RESPONSE,
+        EVENTS.BID_WON,
+        EVENTS.AD_RENDER_FAILED,
+        EVENTS.TCF2_ENFORCEMENT,
+        EVENTS.BID_TIMEOUT,
+        EVENTS.AUCTION_END,
       ]).to.beTrackedBy(pubwiseAnalytics.track);
     });
 
@@ -69,10 +69,10 @@ describe('PubWise Prebid Analytics', function () {
       pubwiseAnalytics.enableAnalytics(mock.DEFAULT_PW_CONFIG);
 
       // sent
-      events.emit(constants.EVENTS.AUCTION_INIT, mock.AUCTION_INIT);
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
+      events.emit(EVENTS.AUCTION_INIT, mock.AUCTION_INIT);
+      events.emit(EVENTS.BID_REQUESTED, {});
+      events.emit(EVENTS.BID_RESPONSE, {});
+      events.emit(EVENTS.BID_WON, {});
       // force flush
       clock.tick(500);
 
@@ -120,7 +120,7 @@ describe('PubWise Prebid Analytics', function () {
       pubwiseAnalytics.enableAnalytics(mock.DEFAULT_PW_CONFIG);
 
       // sent
-      events.emit(constants.EVENTS.AUCTION_INIT, mock.AUCTION_INIT_EXTRAS);
+      events.emit(EVENTS.AUCTION_INIT, mock.AUCTION_INIT_EXTRAS);
       // force flush
       clock.tick(500);
 
diff --git a/test/spec/modules/pubxBidAdapter_spec.js b/test/spec/modules/pubxBidAdapter_spec.js
index b387264bf91..38efccac2a6 100644
--- a/test/spec/modules/pubxBidAdapter_spec.js
+++ b/test/spec/modules/pubxBidAdapter_spec.js
@@ -26,10 +26,10 @@ describe('pubxAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
index e0f4497a8c8..05b32dae434 100644
--- a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
@@ -1,704 +1,1177 @@
-import pubxaiAnalyticsAdapter, {getBrowser, getDeviceType, getOS} from 'modules/pubxaiAnalyticsAdapter.js';
-import {expect} from 'chai';
+/* globals describe, beforeEach, afterEach, sinon */
+import { expect } from 'chai';
+import { getGptSlotInfoForAdUnitCode } from 'libraries/gptUtils/gptUtils.js';
+import { getDeviceType, getBrowser, getOS } from 'libraries/userAgentUtils';
+import pubxaiAnalyticsAdapter, {
+  auctionCache,
+} from 'modules/pubxaiAnalyticsAdapter.js';
+import { EVENTS } from 'src/constants.js';
 import adapterManager from 'src/adapterManager.js';
-import * as utils from 'src/utils.js';
-import {server} from 'test/mocks/xhr.js';
-import {getGptSlotInfoForAdUnitCode} from '../../../libraries/gptUtils/gptUtils.js';
+import { getWindowLocation } from 'src/utils.js';
+import { getGlobal } from 'src/prebidGlobal.js';
+import * as events from 'src/events.js'
 
-let events = require('src/events');
-let constants = require('src/constants.json');
+const readBlobSafariCompat = (blob) => {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = () => resolve(reader.result)
+    reader.onerror = reject
+    reader.readAsText(blob)
+  })
+}
 
-describe('pubxai analytics adapter', function() {
-  beforeEach(function() {
+describe('pubxai analytics adapter', () => {
+  beforeEach(() => {
     sinon.stub(events, 'getEvents').returns([]);
+    getGlobal().refreshUserIds?.()
   });
 
-  afterEach(function() {
+  afterEach(() => {
     events.getEvents.restore();
   });
 
-  describe('track', function() {
+  describe('track', () => {
+    const pubxId = '6c415fc0-8b0e-4cf5-be73-01526a4db625';
     let initOptions = {
       samplingRate: '1',
-      pubxId: '6c415fc0-8b0e-4cf5-be73-01526a4db625'
+      pubxId: pubxId,
     };
 
-    let location = utils.getWindowLocation();
-    let storage = window.top['sessionStorage'];
+    let originalVS;
+
+    let location = getWindowLocation();
+
+    const replaceProperty = (obj, params) => {
+      let strObj = JSON.stringify(obj);
+      params.forEach(({ field, updated, replaced }) => {
+        strObj = strObj.replace(
+          new RegExp('"' + field + '":' + replaced, 'g'),
+          '"' + field + '":' + updated
+        );
+      });
+      return JSON.parse(strObj);
+    };
 
     let prebidEvent = {
-      'auctionInit': {
-        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-        'timestamp': 1603865707180,
-        'auctionStatus': 'inProgress',
-        'adUnits': [{
-          'code': '/19968336/header-bid-tag-1',
-          'mediaTypes': {
-            'banner': {
-              'sizes': [
-                [
-                  300,
-                  250
-                ]
-              ]
-            }
-          },
-          'bids': [{
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
+      auctionInit: {
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        timestamp: 1603865707180,
+        auctionStatus: 'inProgress',
+        adUnits: [
+          {
+            code: '/19968336/header-bid-tag-1',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250]],
+              },
             },
-            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-            'floorData': {
-              'skipped': false,
-              'skipRate': 0,
-              'modelVersion': 'test model 1.0',
-              'location': 'fetch',
-              'floorProvider': 'PubXFloorProvider',
-              'fetchStatus': 'success'
-            }
-          }],
-          'sizes': [
-            [
-              300,
-              250
-            ]
-          ],
-          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294'
-        }],
-        'adUnitCodes': [
-          '/19968336/header-bid-tag-1'
+            bids: [
+              {
+                bidder: 'appnexus',
+                params: {
+                  placementId: 13144370,
+                },
+                auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+                floorData: {
+                  skipped: false,
+                  skipRate: 0,
+                  modelVersion: 'test model 1.0',
+                  location: 'fetch',
+                  floorProvider: 'PubXFloorProvider',
+                  fetchStatus: 'success',
+                },
+              },
+            ],
+            sizes: [[300, 250]],
+            transactionId: '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+          },
         ],
-        'bidderRequests': [{
-          'bidderCode': 'appnexus',
-          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-          'bidderRequestId': '184cbc05bb90ba',
-          'bids': [{
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
-            },
-            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-            'floorData': {
-              'skipped': false,
-              'skipRate': 0,
-              'modelVersion': 'test model 1.0',
-              'location': 'fetch',
-              'floorProvider': 'PubXFloorProvider',
-              'fetchStatus': 'success'
+        adUnitCodes: ['/19968336/header-bid-tag-1'],
+        bidderRequests: [
+          {
+            bidderCode: 'appnexus',
+            auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            bidderRequestId: '184cbc05bb90ba',
+            bids: [
+              {
+                bidder: 'appnexus',
+                params: {
+                  placementId: 13144370,
+                },
+                auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+                floorData: {
+                  skipped: false,
+                  skipRate: 0,
+                  modelVersion: 'test model 1.0',
+                  location: 'fetch',
+                  floorProvider: 'PubXFloorProvider',
+                  fetchStatus: 'success',
+                },
+                mediaTypes: {
+                  banner: {
+                    sizes: [[300, 250]],
+                  },
+                },
+                adUnitCode: '/19968336/header-bid-tag-1',
+                transactionId: '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+                sizes: [[300, 250]],
+                bidId: '248f9a4489835e',
+                bidderRequestId: '184cbc05bb90ba',
+                src: 'client',
+                bidRequestsCount: 1,
+                bidderRequestsCount: 1,
+                bidderWinsCount: 0,
+              },
+            ],
+            ortb2: {
+              device: {
+                ext: {
+                  cdep: true,
+                },
+              },
             },
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ]
-                ]
-              }
+            auctionStart: 1603865707180,
+            timeout: 1000,
+            refererInfo: {
+              referer: 'http://local-pnh.net:8080/stream/',
+              reachedTop: true,
+              isAmp: false,
+              numIframes: 0,
+              stack: ['http://local-pnh.net:8080/stream/'],
+              canonicalUrl: null,
             },
-            'adUnitCode': '/19968336/header-bid-tag-1',
-            'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
-            'sizes': [
-              [
-                300,
-                250
-              ]
-            ],
-            'bidId': '248f9a4489835e',
-            'bidderRequestId': '184cbc05bb90ba',
-            'src': 'client',
-            'bidRequestsCount': 1,
-            'bidderRequestsCount': 1,
-            'bidderWinsCount': 0
-          }],
-          'auctionStart': 1603865707180,
-          'timeout': 1000,
-          'refererInfo': {
-            'referer': 'http://local-pnh.net:8080/stream/',
-            'reachedTop': true,
-            'isAmp': false,
-            'numIframes': 0,
-            'stack': [
-              'http://local-pnh.net:8080/stream/'
-            ],
-            'canonicalUrl': null
+            start: 1603865707182,
           },
-          'start': 1603865707182
-        }],
-        'noBids': [],
-        'bidsReceived': [],
-        'winningBids': [],
-        'timeout': 1000,
-        'config': {
-          'samplingRate': '1',
-          'pubxId': '6c415fc0-8b0e-4cf5-be73-01526a4db625'
-        }
+        ],
+        noBids: [],
+        bidsReceived: [],
+        winningBids: [],
+        timeout: 1000,
+        config: {
+          samplingRate: '1',
+          pubxId: pubxId,
+        },
       },
-      'bidRequested': {
-        'bidderCode': 'appnexus',
-        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-        'bidderRequestId': '184cbc05bb90ba',
-        'bids': [{
-          'bidder': 'appnexus',
-          'params': {
-            'placementId': 13144370
-          },
-          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-          'floorData': {
-            'skipped': false,
-            'skipRate': 0,
-            'modelVersion': 'test model 1.0',
-            'location': 'fetch',
-            'floorProvider': 'PubXFloorProvider',
-            'fetchStatus': 'success'
+      bidRequested: {
+        bidderCode: 'appnexus',
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        bidderRequestId: '184cbc05bb90ba',
+        bids: [
+          {
+            bidder: 'appnexus',
+            params: {
+              placementId: 13144370,
+            },
+            auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            floorData: {
+              skipped: false,
+              skipRate: 0,
+              modelVersion: 'test model 1.0',
+              location: 'fetch',
+              floorProvider: 'PubXFloorProvider',
+              fetchStatus: 'success',
+            },
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250]],
+              },
+            },
+            adUnitCode: '/19968336/header-bid-tag-1',
+            transactionId: '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+            sizes: [[300, 250]],
+            bidId: '248f9a4489835e',
+            bidderRequestId: '184cbc05bb90ba',
+            src: 'client',
+            bidRequestsCount: 1,
+            bidderRequestsCount: 1,
+            bidderWinsCount: 0,
           },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [
-                [
-                  300,
-                  250
-                ]
-              ]
-            }
+        ],
+        ortb2: {
+          device: {
+            ext: {
+              cdep: true,
+            },
           },
-          'adUnitCode': '/19968336/header-bid-tag-1',
-          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
-          'sizes': [
-            [
-              300,
-              250
-            ]
-          ],
-          'bidId': '248f9a4489835e',
-          'bidderRequestId': '184cbc05bb90ba',
-          'src': 'client',
-          'bidRequestsCount': 1,
-          'bidderRequestsCount': 1,
-          'bidderWinsCount': 0
-        }],
-        'auctionStart': 1603865707180,
-        'timeout': 1000,
-        'refererInfo': {
-          'referer': 'http://local-pnh.net:8080/stream/',
-          'reachedTop': true,
-          'isAmp': false,
-          'numIframes': 0,
-          'stack': [
-            'http://local-pnh.net:8080/stream/'
-          ],
-          'canonicalUrl': null
         },
-        'start': 1603865707182
+        auctionStart: 1603865707180,
+        timeout: 1000,
+        refererInfo: {
+          referer: 'http://local-pnh.net:8080/stream/',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['http://local-pnh.net:8080/stream/'],
+          canonicalUrl: null,
+        },
+        start: 1603865707182,
       },
-      'bidTimeout': [],
-      'bidResponse': {
-        'bidderCode': 'appnexus',
-        'width': 300,
-        'height': 250,
-        'statusMessage': 'Bid available',
-        'adId': '32780c4bc382cb',
-        'requestId': '248f9a4489835e',
-        'mediaType': 'banner',
-        'source': 'client',
-        'cpm': 0.5,
-        'creativeId': 96846035,
-        'currency': 'USD',
-        'netRevenue': true,
-        'ttl': 300,
-        'adUnitCode': '/19968336/header-bid-tag-1',
-        'appnexus': {
-          'buyerMemberId': 9325
+      bidTimeout: [],
+      bidResponse: {
+        bidderCode: 'appnexus',
+        width: 300,
+        height: 250,
+        statusMessage: 'Bid available',
+        adId: '32780c4bc382cb',
+        requestId: '248f9a4489835e',
+        mediaType: 'banner',
+        source: 'client',
+        cpm: 0.5,
+        creativeId: 96846035,
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 300,
+        adUnitCode: '/19968336/header-bid-tag-1',
+        appnexus: {
+          buyerMemberId: 9325,
         },
-        'meta': {
-          'advertiserId': 2529885
+        meta: {
+          advertiserId: 2529885,
         },
-        'ad': '',
-        'originalCpm': 0.5,
-        'originalCurrency': 'USD',
-        'floorData': {
-          'fetchStatus': 'success',
-          'floorProvider': 'PubXFloorProvider',
-          'location': 'fetch',
-          'modelVersion': 'test model 1.0',
-          'skipRate': 0,
-          'skipped': false,
-          'floorValue': 0.4,
-          'floorRule': '/19968336/header-bid-tag-1|banner',
-          'floorCurrency': 'USD',
-          'cpmAfterAdjustments': 0.5,
-          'enforcements': {
-            'enforceJS': true,
-            'enforcePBS': false,
-            'floorDeals': true,
-            'bidAdjustment': true
+        ad: '',
+        originalCpm: 0.5,
+        originalCurrency: 'USD',
+        floorData: {
+          fetchStatus: 'success',
+          floorProvider: 'PubXFloorProvider',
+          location: 'fetch',
+          modelVersion: 'test model 1.0',
+          skipRate: 0,
+          skipped: false,
+          floorValue: 0.4,
+          floorRule: '/19968336/header-bid-tag-1|banner',
+          floorCurrency: 'USD',
+          cpmAfterAdjustments: 0.5,
+          enforcements: {
+            enforceJS: true,
+            enforcePBS: false,
+            floorDeals: true,
+            bidAdjustment: true,
+          },
+          matchedFields: {
+            gptSlot: '/19968336/header-bid-tag-1',
+            mediaType: 'banner',
           },
-          'matchedFields': {
-            'gptSlot': '/19968336/header-bid-tag-1',
-            'mediaType': 'banner'
-          }
         },
-        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-        'responseTimestamp': 1616654313071,
-        'requestTimestamp': 1616654312804,
-        'bidder': 'appnexus',
-        'timeToRespond': 267,
-        'pbLg': '0.50',
-        'pbMg': '0.50',
-        'pbHg': '0.50',
-        'pbAg': '0.50',
-        'pbDg': '0.50',
-        'pbCg': '0.50',
-        'size': '300x250',
-        'adserverTargeting': {
-          'hb_bidder': 'appnexus',
-          'hb_adid': '32780c4bc382cb',
-          'hb_pb': '0.50',
-          'hb_size': '300x250',
-          'hb_source': 'client',
-          'hb_format': 'banner'
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        responseTimestamp: 1616654313071,
+        requestTimestamp: 1616654312804,
+        bidder: 'appnexus',
+        timeToRespond: 267,
+        pbLg: '0.50',
+        pbMg: '0.50',
+        pbHg: '0.50',
+        pbAg: '0.50',
+        pbDg: '0.50',
+        pbCg: '0.50',
+        size: '300x250',
+        adserverTargeting: {
+          hb_bidder: 'appnexus',
+          hb_adid: '32780c4bc382cb',
+          hb_pb: '0.50',
+          hb_size: '300x250',
+          hb_source: 'client',
+          hb_format: 'banner',
         },
       },
-      'auctionEnd': {
-        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-        'timestamp': 1616654312804,
-        'auctionEnd': 1616654313090,
-        'auctionStatus': 'completed',
-        'adUnits': [{
-          'code': '/19968336/header-bid-tag-1',
-          'mediaTypes': {
-            'banner': {
-              'sizes': [
-                [
-                  300,
-                  250
-                ]
-              ]
-            }
+      auctionEnd: {
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        timestamp: 1616654312804,
+        auctionEnd: 1616654313090,
+        auctionStatus: 'completed',
+        adUnits: [
+          {
+            code: '/19968336/header-bid-tag-1',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250]],
+              },
+            },
+            bids: [
+              {
+                bidder: 'appnexus',
+                params: {
+                  placementId: 13144370,
+                },
+                auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+                floorData: {
+                  skipped: false,
+                  skipRate: 0,
+                  modelVersion: 'test model 1.0',
+                  location: 'fetch',
+                  floorProvider: 'PubXFloorProvider',
+                  fetchStatus: 'success',
+                },
+              },
+            ],
+            sizes: [[300, 250]],
+            transactionId: '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
           },
-          'bids': [{
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
+        ],
+        adUnitCodes: ['/19968336/header-bid-tag-1'],
+        bidderRequests: [
+          {
+            bidderCode: 'appnexus',
+            auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            bidderRequestId: '184cbc05bb90ba',
+            bids: [
+              {
+                bidder: 'appnexus',
+                params: {
+                  placementId: 13144370,
+                },
+                auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+                floorData: {
+                  skipped: false,
+                  skipRate: 0,
+                  modelVersion: 'test model 1.0',
+                  location: 'fetch',
+                  floorProvider: 'PubXFloorProvider',
+                  fetchStatus: 'success',
+                },
+                mediaTypes: {
+                  banner: {
+                    sizes: [[300, 250]],
+                  },
+                },
+                adUnitCode: '/19968336/header-bid-tag-1',
+                transactionId: '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+                sizes: [[300, 250]],
+                bidId: '248f9a4489835e',
+                bidderRequestId: '184cbc05bb90ba',
+                src: 'client',
+                bidRequestsCount: 1,
+                bidderRequestsCount: 1,
+                bidderWinsCount: 0,
+              },
+            ],
+            ortb2: {
+              device: {
+                ext: {
+                  cdep: true,
+                },
+              },
+            },
+            auctionStart: 1603865707180,
+            timeout: 1000,
+            refererInfo: {
+              referer: 'http://local-pnh.net:8080/stream/',
+              reachedTop: true,
+              isAmp: false,
+              numIframes: 0,
+              stack: ['http://local-pnh.net:8080/stream/'],
+              canonicalUrl: null,
             },
-            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-            'floorData': {
-              'skipped': false,
-              'skipRate': 0,
-              'modelVersion': 'test model 1.0',
-              'location': 'fetch',
-              'floorProvider': 'PubXFloorProvider',
-              'fetchStatus': 'success'
-            }
-          }],
-          'sizes': [
-            [
-              300,
-              250
-            ]
-          ],
-          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294'
-        }],
-        'adUnitCodes': [
-          '/19968336/header-bid-tag-1'
+            start: 1603865707182,
+          },
         ],
-        'bidderRequests': [{
-          'bidderCode': 'appnexus',
-          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-          'bidderRequestId': '184cbc05bb90ba',
-          'bids': [{
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
+        noBids: [],
+        bidsReceived: [
+          {
+            bidderCode: 'appnexus',
+            width: 300,
+            height: 250,
+            statusMessage: 'Bid available',
+            adId: '32780c4bc382cb',
+            requestId: '248f9a4489835e',
+            mediaType: 'banner',
+            source: 'client',
+            cpm: 0.5,
+            creativeId: 96846035,
+            currency: 'USD',
+            netRevenue: true,
+            ttl: 300,
+            adUnitCode: '/19968336/header-bid-tag-1',
+            appnexus: {
+              buyerMemberId: 9325,
             },
-            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-            'floorData': {
-              'skipped': false,
-              'skipRate': 0,
-              'modelVersion': 'test model 1.0',
-              'location': 'fetch',
-              'floorProvider': 'PubXFloorProvider',
-              'fetchStatus': 'success'
+            meta: {
+              advertiserId: 2529885,
             },
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ]
-                ]
-              }
+            ad: '',
+            originalCpm: 0.5,
+            originalCurrency: 'USD',
+            floorData: {
+              fetchStatus: 'success',
+              floorProvider: 'PubXFloorProvider',
+              location: 'fetch',
+              modelVersion: 'test model 1.0',
+              skipRate: 0,
+              skipped: false,
+              floorValue: 0.4,
+              floorRule: '/19968336/header-bid-tag-1|banner',
+              floorCurrency: 'USD',
+              cpmAfterAdjustments: 0.5,
+              enforcements: {
+                enforceJS: true,
+                enforcePBS: false,
+                floorDeals: true,
+                bidAdjustment: true,
+              },
+              matchedFields: {
+                gptSlot: '/19968336/header-bid-tag-1',
+                mediaType: 'banner',
+              },
             },
-            'adUnitCode': '/19968336/header-bid-tag-1',
-            'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
-            'sizes': [
-              [
-                300,
-                250
-              ]
-            ],
-            'bidId': '248f9a4489835e',
-            'bidderRequestId': '184cbc05bb90ba',
-            'src': 'client',
-            'bidRequestsCount': 1,
-            'bidderRequestsCount': 1,
-            'bidderWinsCount': 0
-          }],
-          'auctionStart': 1603865707180,
-          'timeout': 1000,
-          'refererInfo': {
-            'referer': 'http://local-pnh.net:8080/stream/',
-            'reachedTop': true,
-            'isAmp': false,
-            'numIframes': 0,
-            'stack': [
-              'http://local-pnh.net:8080/stream/'
-            ],
-            'canonicalUrl': null
-          },
-          'start': 1603865707182
-        }],
-        'noBids': [],
-        'bidsReceived': [{
-          'bidderCode': 'appnexus',
-          'width': 300,
-          'height': 250,
-          'statusMessage': 'Bid available',
-          'adId': '32780c4bc382cb',
-          'requestId': '248f9a4489835e',
-          'mediaType': 'banner',
-          'source': 'client',
-          'cpm': 0.5,
-          'creativeId': 96846035,
-          'currency': 'USD',
-          'netRevenue': true,
-          'ttl': 300,
-          'adUnitCode': '/19968336/header-bid-tag-1',
-          'appnexus': {
-            'buyerMemberId': 9325
-          },
-          'meta': {
-            'advertiserId': 2529885
-          },
-          'ad': '',
-          'originalCpm': 0.5,
-          'originalCurrency': 'USD',
-          'floorData': {
-            'fetchStatus': 'success',
-            'floorProvider': 'PubXFloorProvider',
-            'location': 'fetch',
-            'modelVersion': 'test model 1.0',
-            'skipRate': 0,
-            'skipped': false,
-            'floorValue': 0.4,
-            'floorRule': '/19968336/header-bid-tag-1|banner',
-            'floorCurrency': 'USD',
-            'cpmAfterAdjustments': 0.5,
-            'enforcements': {
-              'enforceJS': true,
-              'enforcePBS': false,
-              'floorDeals': true,
-              'bidAdjustment': true
+            auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            responseTimestamp: 1616654313071,
+            requestTimestamp: 1616654312804,
+            bidder: 'appnexus',
+            timeToRespond: 267,
+            pbLg: '0.50',
+            pbMg: '0.50',
+            pbHg: '0.50',
+            pbAg: '0.50',
+            pbDg: '0.50',
+            pbCg: '0.50',
+            size: '300x250',
+            adserverTargeting: {
+              hb_bidder: 'appnexus',
+              hb_adid: '32780c4bc382cb',
+              hb_pb: '0.50',
+              hb_size: '300x250',
+              hb_source: 'client',
+              hb_format: 'banner',
             },
-            'matchedFields': {
-              'gptSlot': '/19968336/header-bid-tag-1',
-              'mediaType': 'banner'
-            }
-          },
-          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-          'responseTimestamp': 1616654313071,
-          'requestTimestamp': 1616654312804,
-          'bidder': 'appnexus',
-          'timeToRespond': 267,
-          'pbLg': '0.50',
-          'pbMg': '0.50',
-          'pbHg': '0.50',
-          'pbAg': '0.50',
-          'pbDg': '0.50',
-          'pbCg': '0.50',
-          'size': '300x250',
-          'adserverTargeting': {
-            'hb_bidder': 'appnexus',
-            'hb_adid': '32780c4bc382cb',
-            'hb_pb': '0.50',
-            'hb_size': '300x250',
-            'hb_source': 'client',
-            'hb_format': 'banner'
+            status: 'rendered',
+            params: [
+              {
+                placementId: 13144370,
+              },
+            ],
           },
-          'status': 'rendered',
-          'params': [{
-            'placementId': 13144370
-          }]
-        }],
-        'winningBids': [],
-        'timeout': 1000
+        ],
+        winningBids: [],
+        timeout: 1000,
       },
-      'bidWon': {
-        'bidderCode': 'appnexus',
-        'width': 300,
-        'height': 250,
-        'statusMessage': 'Bid available',
-        'adId': '32780c4bc382cb',
-        'requestId': '248f9a4489835e',
-        'mediaType': 'banner',
-        'source': 'client',
-        'cpm': 0.5,
-        'creativeId': 96846035,
-        'currency': 'USD',
-        'netRevenue': true,
-        'ttl': 300,
-        'adUnitCode': '/19968336/header-bid-tag-1',
-        'appnexus': {
-          'buyerMemberId': 9325
+      bidWon: {
+        bidderCode: 'appnexus',
+        width: 300,
+        height: 250,
+        statusMessage: 'Bid available',
+        adId: '32780c4bc382cb',
+        requestId: '248f9a4489835e',
+        mediaType: 'banner',
+        source: 'client',
+        cpm: 0.5,
+        creativeId: 96846035,
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 300,
+        adUnitCode: '/19968336/header-bid-tag-1',
+        appnexus: {
+          buyerMemberId: 9325,
         },
-        'meta': {
-          'advertiserId': 2529885
+        meta: {
+          advertiserId: 2529885,
         },
-        'ad': '',
-        'originalCpm': 0.5,
-        'originalCurrency': 'USD',
-        'floorData': {
-          'fetchStatus': 'success',
-          'floorProvider': 'PubXFloorProvider',
-          'location': 'fetch',
-          'modelVersion': 'test model 1.0',
-          'skipRate': 0,
-          'skipped': false,
-          'floorValue': 0.4,
-          'floorRule': '/19968336/header-bid-tag-1|banner',
-          'floorCurrency': 'USD',
-          'cpmAfterAdjustments': 0.5,
-          'enforcements': {
-            'enforceJS': true,
-            'enforcePBS': false,
-            'floorDeals': true,
-            'bidAdjustment': true
+        ad: '',
+        originalCpm: 0.5,
+        originalCurrency: 'USD',
+        floorData: {
+          fetchStatus: 'success',
+          floorProvider: 'PubXFloorProvider',
+          location: 'fetch',
+          modelVersion: 'test model 1.0',
+          skipRate: 0,
+          skipped: false,
+          floorValue: 0.4,
+          floorRule: '/19968336/header-bid-tag-1|banner',
+          floorCurrency: 'USD',
+          cpmAfterAdjustments: 0.5,
+          enforcements: {
+            enforceJS: true,
+            enforcePBS: false,
+            floorDeals: true,
+            bidAdjustment: true,
+          },
+          matchedFields: {
+            gptSlot: '/19968336/header-bid-tag-1',
+            mediaType: 'banner',
           },
-          'matchedFields': {
-            'gptSlot': '/19968336/header-bid-tag-1',
-            'mediaType': 'banner'
-          }
         },
-        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-        'responseTimestamp': 1616654313071,
-        'requestTimestamp': 1616654312804,
-        'bidder': 'appnexus',
-        'timeToRespond': 267,
-        'pbLg': '0.50',
-        'pbMg': '0.50',
-        'pbHg': '0.50',
-        'pbAg': '0.50',
-        'pbDg': '0.50',
-        'pbCg': '0.50',
-        'size': '300x250',
-        'adserverTargeting': {
-          'hb_bidder': 'appnexus',
-          'hb_adid': '32780c4bc382cb',
-          'hb_pb': '0.50',
-          'hb_size': '300x250',
-          'hb_source': 'client',
-          'hb_format': 'banner'
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        responseTimestamp: 1616654313071,
+        requestTimestamp: 1616654312804,
+        bidder: 'appnexus',
+        timeToRespond: 267,
+        pbLg: '0.50',
+        pbMg: '0.50',
+        pbHg: '0.50',
+        pbAg: '0.50',
+        pbDg: '0.50',
+        pbCg: '0.50',
+        size: '300x250',
+        adserverTargeting: {
+          hb_bidder: 'appnexus',
+          hb_adid: '32780c4bc382cb',
+          hb_pb: '0.50',
+          hb_size: '300x250',
+          hb_source: 'client',
+          hb_format: 'banner',
         },
-        'status': 'rendered',
-        'params': [{
-          'placementId': 13144370
-        }]
-      },
-      'pageDetail': {
-        'host': location.host,
-        'path': location.pathname,
-        'search': location.search
+        status: 'rendered',
+        params: [
+          {
+            placementId: 13144370,
+          },
+        ],
       },
-      'pmcDetail': {
-        'bidDensity': storage.getItem('pbx:dpbid'),
-        'maxBid': storage.getItem('pbx:mxbid'),
-        'auctionId': storage.getItem('pbx:aucid')
-      }
     };
 
     let expectedAfterBid = {
-      'bids': [{
-        'bidderCode': 'appnexus',
-        'bidId': '248f9a4489835e',
-        'adUnitCode': '/19968336/header-bid-tag-1',
-        'gptSlotCode': getGptSlotInfoForAdUnitCode('/19968336/header-bid-tag-1').gptSlot || null,
-        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-        'sizes': '300x250',
-        'renderStatus': 2,
-        'requestTimestamp': 1616654312804,
-        'creativeId': 96846035,
-        'currency': 'USD',
-        'cpm': 0.5,
-        'netRevenue': true,
-        'mediaType': 'banner',
-        'statusMessage': 'Bid available',
-        'floorData': {
-          'fetchStatus': 'success',
-          'floorProvider': 'PubXFloorProvider',
-          'location': 'fetch',
-          'modelVersion': 'test model 1.0',
-          'skipRate': 0,
-          'skipped': false,
-          'floorValue': 0.4,
-          'floorRule': '/19968336/header-bid-tag-1|banner',
-          'floorCurrency': 'USD',
-          'cpmAfterAdjustments': 0.5,
-          'enforcements': {
-            'enforceJS': true,
-            'enforcePBS': false,
-            'floorDeals': true,
-            'bidAdjustment': true
+      bids: [
+        {
+          bidderCode: 'appnexus',
+          bidId: '248f9a4489835e',
+          adUnitCode: '/19968336/header-bid-tag-1',
+          gptSlotCode:
+            getGptSlotInfoForAdUnitCode('/19968336/header-bid-tag-1').gptSlot ||
+            null,
+          auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          sizes: '300x250',
+          bidType: 2,
+          requestTimestamp: 1616654312804,
+          creativeId: 96846035,
+          currency: 'USD',
+          cpm: 0.5,
+          netRevenue: true,
+          mediaType: 'banner',
+          statusMessage: 'Bid available',
+          floorData: {
+            fetchStatus: 'success',
+            floorProvider: 'PubXFloorProvider',
+            location: 'fetch',
+            modelVersion: 'test model 1.0',
+            skipRate: 0,
+            skipped: false,
+            floorValue: 0.4,
+            floorRule: '/19968336/header-bid-tag-1|banner',
+            floorCurrency: 'USD',
+            cpmAfterAdjustments: 0.5,
+            enforcements: {
+              enforceJS: true,
+              enforcePBS: false,
+              floorDeals: true,
+              bidAdjustment: true,
+            },
+            matchedFields: {
+              gptSlot: '/19968336/header-bid-tag-1',
+              mediaType: 'banner',
+            },
           },
-          'matchedFields': {
-            'gptSlot': '/19968336/header-bid-tag-1',
-            'mediaType': 'banner'
-          }
+          placementId: null,
+          timeToRespond: 267,
+          source: 'client',
+          responseTimestamp: 1616654313071,
         },
-        'timeToRespond': 267,
-        'responseTimestamp': 1616654313071
-      }],
-      'pageDetail': {
-        'host': location.host,
-        'path': location.pathname,
-        'search': location.search,
-        'adUnits': [
-          '/19968336/header-bid-tag-1'
-        ]
+      ],
+      auctionDetail: {
+        adUnitCodes: ['/19968336/header-bid-tag-1'],
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        refreshRank: 0,
+        timestamp: 1616654312804,
+      },
+      pageDetail: {
+        host: location.host,
+        path: location.pathname,
+        search: location.search,
       },
-      'floorDetail': {
-        'fetchStatus': 'success',
-        'floorProvider': 'PubXFloorProvider',
-        'location': 'fetch',
-        'modelVersion': 'test model 1.0',
-        'skipRate': 0,
-        'skipped': false
+      floorDetail: {
+        fetchStatus: 'success',
+        floorProvider: 'PubXFloorProvider',
+        location: 'fetch',
+        modelVersion: 'test model 1.0',
+        skipRate: 0,
+        skipped: false,
       },
-      'deviceDetail': {
-        'platform': navigator.platform,
-        'deviceType': getDeviceType(),
-        'deviceOS': getOS(),
-        'browser': getBrowser()
+      deviceDetail: {
+        platform: navigator.platform,
+        deviceType: getDeviceType(),
+        deviceOS: getOS(),
+        browser: getBrowser(),
+        cdep: true,
       },
-      'pmcDetail': {
-        'bidDensity': storage.getItem('pbx:dpbid'),
-        'maxBid': storage.getItem('pbx:mxbid'),
-        'auctionId': storage.getItem('pbx:aucid')
+      userDetail: {
+        userIdTypes: Object.keys(getGlobal().getUserIds?.() || {}),
+      },
+      consentDetail: {
+        consentTypes: Object.keys(getGlobal().getConsentMetadata?.() || {}),
+      },
+      pmacDetail: {},
+      extraData: {},
+      initOptions: {
+        ...initOptions,
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
       },
-      'initOptions': initOptions
     };
 
     let expectedAfterBidWon = {
-      'winningBid': {
-        'adUnitCode': '/19968336/header-bid-tag-1',
-        'gptSlotCode': getGptSlotInfoForAdUnitCode('/19968336/header-bid-tag-1').gptSlot || null,
-        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-        'bidderCode': 'appnexus',
-        'bidId': '248f9a4489835e',
-        'cpm': 0.5,
-        'creativeId': 96846035,
-        'currency': 'USD',
-        'floorData': {
-          'fetchStatus': 'success',
-          'floorProvider': 'PubXFloorProvider',
-          'location': 'fetch',
-          'modelVersion': 'test model 1.0',
-          'skipRate': 0,
-          'skipped': false,
-          'floorValue': 0.4,
-          'floorRule': '/19968336/header-bid-tag-1|banner',
-          'floorCurrency': 'USD',
-          'cpmAfterAdjustments': 0.5,
-          'enforcements': {
-            'enforceJS': true,
-            'enforcePBS': false,
-            'floorDeals': true,
-            'bidAdjustment': true
+      winningBid: {
+        adUnitCode: '/19968336/header-bid-tag-1',
+        gptSlotCode:
+          getGptSlotInfoForAdUnitCode('/19968336/header-bid-tag-1').gptSlot ||
+          null,
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        bidderCode: 'appnexus',
+        bidId: '248f9a4489835e',
+        cpm: 0.5,
+        creativeId: 96846035,
+        currency: 'USD',
+        floorData: {
+          fetchStatus: 'success',
+          floorProvider: 'PubXFloorProvider',
+          location: 'fetch',
+          modelVersion: 'test model 1.0',
+          skipRate: 0,
+          skipped: false,
+          floorValue: 0.4,
+          floorRule: '/19968336/header-bid-tag-1|banner',
+          floorCurrency: 'USD',
+          cpmAfterAdjustments: 0.5,
+          enforcements: {
+            enforceJS: true,
+            enforcePBS: false,
+            floorDeals: true,
+            bidAdjustment: true,
+          },
+          matchedFields: {
+            gptSlot: '/19968336/header-bid-tag-1',
+            mediaType: 'banner',
           },
-          'matchedFields': {
-            'gptSlot': '/19968336/header-bid-tag-1',
-            'mediaType': 'banner'
-          }
         },
-        'floorProvider': 'PubXFloorProvider',
-        'floorFetchStatus': 'success',
-        'floorLocation': 'fetch',
-        'floorModelVersion': 'test model 1.0',
-        'floorSkipRate': 0,
-        'isFloorSkipped': false,
-        'isWinningBid': true,
-        'mediaType': 'banner',
-        'netRevenue': true,
-        'placementId': 13144370,
-        'renderedSize': '300x250',
-        'renderStatus': 4,
-        'responseTimestamp': 1616654313071,
-        'requestTimestamp': 1616654312804,
-        'status': 'rendered',
-        'statusMessage': 'Bid available',
-        'timeToRespond': 267
+        adServerData: {},
+        floorProvider: 'PubXFloorProvider',
+        floorFetchStatus: 'success',
+        floorLocation: 'fetch',
+        floorModelVersion: 'test model 1.0',
+        floorSkipRate: 0,
+        isFloorSkipped: false,
+        isWinningBid: true,
+        mediaType: 'banner',
+        netRevenue: true,
+        placementId: 13144370,
+        renderedSize: '300x250',
+        sizes: '300x250',
+        bidType: 4,
+        responseTimestamp: 1616654313071,
+        requestTimestamp: 1616654312804,
+        status: 'rendered',
+        statusMessage: 'Bid available',
+        timeToRespond: 267,
+        source: 'client',
+      },
+      auctionDetail: {
+        adUnitCodes: ['/19968336/header-bid-tag-1'],
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        refreshRank: 0,
+        timestamp: 1616654312804,
+      },
+      pageDetail: {
+        host: location.host,
+        path: location.pathname,
+        search: location.search,
       },
-      'pageDetail': {
-        'host': location.host,
-        'path': location.pathname,
-        'search': location.search
+      floorDetail: {
+        fetchStatus: 'success',
+        floorProvider: 'PubXFloorProvider',
+        location: 'fetch',
+        modelVersion: 'test model 1.0',
+        skipRate: 0,
+        skipped: false,
       },
-      'deviceDetail': {
-        'platform': navigator.platform,
-        'deviceType': getDeviceType(),
-        'deviceOS': getOS(),
-        'browser': getBrowser()
+      deviceDetail: {
+        platform: navigator.platform,
+        deviceType: getDeviceType(),
+        deviceOS: getOS(),
+        browser: getBrowser(),
+        cdep: true,
       },
-      'initOptions': initOptions
-    }
+      userDetail: {
+        userIdTypes: Object.keys(getGlobal().getUserIds?.() || {}),
+      },
+      consentDetail: {
+        consentTypes: Object.keys(getGlobal().getConsentMetadata?.() || {}),
+      },
+      pmacDetail: {},
+      extraData: {},
+      initOptions: {
+        ...initOptions,
+        auctionId: 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+      },
+    };
 
     adapterManager.registerAnalyticsAdapter({
       code: 'pubxai',
-      adapter: pubxaiAnalyticsAdapter
+      adapter: pubxaiAnalyticsAdapter,
     });
 
-    beforeEach(function() {
+    beforeEach(() => {
       adapterManager.enableAnalytics({
         provider: 'pubxai',
-        options: initOptions
+        options: initOptions,
+      });
+      sinon.stub(navigator, 'sendBeacon').returns(true);
+      originalVS = document.visibilityState;
+      document['__defineGetter__']('visibilityState', function () {
+        return 'hidden';
       });
     });
 
-    afterEach(function() {
+    afterEach(() => {
       pubxaiAnalyticsAdapter.disableAnalytics();
+      navigator.sendBeacon.restore();
+      delete auctionCache['bc3806e4-873e-453c-8ae5-204f35e923b4'];
+      delete auctionCache['auction2'];
+      document['__defineGetter__']('visibilityState', function () {
+        return originalVS;
+      });
     });
 
-    it('builds and sends auction data', function() {
+    it('builds and sends auction data', async () => {
       // Step 1: Send auction init event
-      events.emit(constants.EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
+      events.emit(EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
 
       // Step 2: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
+      events.emit(EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
 
       // Step 3: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, prebidEvent['bidResponse']);
+      events.emit(EVENTS.BID_RESPONSE, prebidEvent['bidResponse']);
 
       // Step 4: Send bid time out event
-      events.emit(constants.EVENTS.BID_TIMEOUT, prebidEvent['bidTimeout']);
+      events.emit(EVENTS.BID_TIMEOUT, prebidEvent['bidTimeout']);
 
       // Step 5: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
-
-      expect(server.requests.length).to.equal(1);
+      events.emit(EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
 
-      let realAfterBid = JSON.parse(server.requests[0].requestBody);
+      // Simulate "navigate away" behaviour
+      document.dispatchEvent(new Event('visibilitychange'));
 
-      expect(realAfterBid).to.deep.equal(expectedAfterBid);
+      expect(navigator.sendBeacon.callCount).to.equal(0);
 
       // Step 6: Send auction bid won event
-      events.emit(constants.EVENTS.BID_WON, prebidEvent['bidWon']);
+      events.emit(EVENTS.BID_WON, prebidEvent['bidWon']);
+
+      // Simulate end of session
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      expect(navigator.sendBeacon.callCount).to.equal(2);
+
+      for (const [index, arg] of navigator.sendBeacon.args.entries()) {
+        const [expectedUrl, expectedData] = arg;
+        const parsedUrl = new URL(expectedUrl);
+        expect(parsedUrl.pathname).to.equal(
+          ['/analytics/bidwon', '/analytics/auction'][index]
+        );
+        expect(Object.fromEntries(parsedUrl.searchParams)).to.deep.equal({
+          auctionTimestamp: '1616654312804',
+          pubxaiAnalyticsVersion: 'v2.1.0',
+          prebidVersion: '$prebid.version$',
+          pubxId: pubxId,
+        });
+        expect(expectedData.type).to.equal('text/json');
+        expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
+          [expectedAfterBidWon, expectedAfterBid][index],
+        ]);
+      }
+    });
+
+    it('auction data with only rejected bids', async () => {
+      // Step 1: Send auction init event
+      events.emit(EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
+
+      // Step 2: Send bid requested event
+      events.emit(EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
+
+      // Step 3: Send bid rejected (afaict the only expected reason would be a bid being too low)
+      events.emit(EVENTS.BID_REJECTED, prebidEvent['bidResponse']);
+
+      // Simulate "navigate away" behaviour
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 4: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(0);
+
+      // Step 5: Send auction end event
+      events.emit(EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
+
+      // Simulate end of session
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 6: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(1);
+
+      // Step 7: check the pathname of the calls is correct (sent only to the auction endpoint)
+      const [expectedUrl, expectedData] = navigator.sendBeacon.args[0];
+      const parsedUrl = new URL(expectedUrl);
+      expect(parsedUrl.pathname).to.equal('/analytics/auction');
+
+      // Step 8: check that the meta information in the call is correct
+      expect(Object.fromEntries(parsedUrl.searchParams)).to.deep.equal({
+        auctionTimestamp: '1616654312804',
+        pubxaiAnalyticsVersion: 'v2.1.0',
+        prebidVersion: '$prebid.version$',
+        pubxId: pubxId,
+      });
+
+      // Step 9: check that the data sent in the request is correct
+      expect(expectedData.type).to.equal('text/json');
+      expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
+        {
+          ...expectedAfterBid,
+          bids: [{
+            ...expectedAfterBid.bids[0],
+            bidType: 1
+          }]
+        }
+      ]);
+    });
 
-      expect(server.requests.length).to.equal(2);
+    it('auction data with only timed out bids', async () => {
+      // Step 1: Send auction init event
+      events.emit(EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
+
+      // Step 2: Send bid requested event
+      events.emit(EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
+
+      // Step 3: Send bid rejected (afaict the only expected reason would be a bid being too low)
+      events.emit(EVENTS.BID_TIMEOUT, [prebidEvent['bidResponse']]);
+
+      // Simulate "navigate away" behaviour
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 4: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(0);
+
+      // Step 5: Send auction end event
+      events.emit(EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
+
+      // Simulate end of session
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 6: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(1);
+
+      // Step 7: check the pathname of the calls is correct (sent only to the auction endpoint)
+      const [expectedUrl, expectedData] = navigator.sendBeacon.args[0];
+      const parsedUrl = new URL(expectedUrl);
+      expect(parsedUrl.pathname).to.equal('/analytics/auction');
+
+      // Step 8: check that the meta information in the call is correct
+      expect(Object.fromEntries(parsedUrl.searchParams)).to.deep.equal({
+        auctionTimestamp: '1616654312804',
+        pubxaiAnalyticsVersion: 'v2.1.0',
+        prebidVersion: '$prebid.version$',
+        pubxId: pubxId,
+      });
+
+      // Step 9: check that the data sent in the request is correct
+      expect(expectedData.type).to.equal('text/json');
+      expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
+        {
+          ...expectedAfterBid,
+          bids: [{
+            ...expectedAfterBid.bids[0],
+            bidType: 3
+          }]
+        }
+      ]);
+    });
+
+    it('auction with no bids', async () => {
+      // Step 1: Send auction init event
+      events.emit(EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
+
+      // Step 2: Send bid requested event
+      events.emit(EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
+
+      // Simulate "navigate away" behaviour
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 3: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(0);
+
+      // Step 4: Send auction end event
+      events.emit(EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
+
+      // Simulate end of session
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 5: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(1);
+
+      // Step 6: check the pathname of the calls is correct (sent only to the auction endpoint)
+      const [expectedUrl, expectedData] = navigator.sendBeacon.args[0];
+      const parsedUrl = new URL(expectedUrl);
+      expect(parsedUrl.pathname).to.equal('/analytics/auction');
+
+      // Step 7: check that the meta information in the call is correct
+      expect(Object.fromEntries(parsedUrl.searchParams)).to.deep.equal({
+        auctionTimestamp: '1616654312804',
+        pubxaiAnalyticsVersion: 'v2.1.0',
+        prebidVersion: '$prebid.version$',
+        pubxId: pubxId,
+      });
+
+      // Step 8: check that the data sent in the request is correct
+      expect(expectedData.type).to.equal('text/json');
+      expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
+        {
+          ...expectedAfterBid,
+          bids: [],
+        },
+      ]);
+    });
+
+    it('2 concurrent auctions', async () => {
+      // Step 1: Send auction init event for auction 1
+      events.emit(EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
+
+      // Step 2: Send bid requested event for auction 1
+      events.emit(EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
+
+      // Step 3: Send auction init event for auction 2
+      events.emit(
+        EVENTS.AUCTION_INIT,
+        replaceProperty(prebidEvent['auctionInit'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Step 4: Send bid requested event for auction 2
+      events.emit(
+        EVENTS.BID_REQUESTED,
+        replaceProperty(prebidEvent['bidRequested'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Step 5: Send bid response event for auction 1
+      events.emit(EVENTS.BID_RESPONSE, prebidEvent['bidResponse']);
+
+      // Step 6: Send bid time out event for auction 1
+      events.emit(EVENTS.BID_TIMEOUT, prebidEvent['bidTimeout']);
 
-      let winEventData = JSON.parse(server.requests[1].requestBody);
+      // Step 7: Send bid response event for auction 2
+      events.emit(
+        EVENTS.BID_RESPONSE,
+        replaceProperty(prebidEvent['bidResponse'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Step 8: Send auction end event for auction 1
+      events.emit(EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
+
+      // Simulate "navigate away" behaviour
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 9: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(0);
+
+      // Step 10: Send auction bid won event for auction 1
+      events.emit(EVENTS.BID_WON, prebidEvent['bidWon']);
+
+      // Simulate "navigate away" behaviour
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 11: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(2);
+
+      // Step 12: Send auction end event for auction 2
+      events.emit(
+        EVENTS.AUCTION_END,
+        replaceProperty(prebidEvent['auctionEnd'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Simulate "navigate away" behaviour
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 13: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(2);
+
+      // Step 14: Send auction bid won event for auction 2
+      events.emit(
+        EVENTS.BID_WON,
+        replaceProperty(prebidEvent['bidWon'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Simulate end of session
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 15: check the calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(4);
+      for (const [index, arg] of navigator.sendBeacon.args.entries()) {
+        const [expectedUrl, expectedData] = arg;
+        const parsedUrl = new URL(expectedUrl);
+        const auctionIdMapFn = index < 2 ? (i, _) => i : replaceProperty;
+        expect(parsedUrl.pathname).to.equal(
+          ['/analytics/bidwon', '/analytics/auction'][index % 2]
+        );
+        expect(Object.fromEntries(parsedUrl.searchParams)).to.deep.equal({
+          auctionTimestamp: '1616654312804',
+          pubxaiAnalyticsVersion: 'v2.1.0',
+          prebidVersion: '$prebid.version$',
+          pubxId: pubxId,
+        });
+        expect(expectedData.type).to.equal('text/json');
+        expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
+          auctionIdMapFn([expectedAfterBidWon, expectedAfterBid][index % 2], [
+            {
+              field: 'auctionId',
+              updated: '"auction2"',
+              replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+            },
+            {
+              field: 'refreshRank',
+              updated: '1',
+              replaced: '0',
+            },
+          ]),
+        ]);
+      }
+    });
+
+    it('2 concurrent auctions with batch sending', async () => {
+      // Step 1: Send auction init event for auction 1
+      events.emit(EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
 
-      expect(winEventData).to.deep.equal(expectedAfterBidWon);
+      // Step 2: Send bid requested event for auction 1
+      events.emit(EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
+
+      // Step 3: Send auction init event for auction 2
+      events.emit(
+        EVENTS.AUCTION_INIT,
+        replaceProperty(prebidEvent['auctionInit'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Step 4: Send bid requested event for auction 2
+      events.emit(
+        EVENTS.BID_REQUESTED,
+        replaceProperty(prebidEvent['bidRequested'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Step 5: Send bid response event for auction 1
+      events.emit(EVENTS.BID_RESPONSE, prebidEvent['bidResponse']);
+
+      // Step 6: Send bid time out event for auction 1
+      events.emit(EVENTS.BID_TIMEOUT, prebidEvent['bidTimeout']);
+
+      // Step 7: Send bid response event for auction 2
+      events.emit(
+        EVENTS.BID_RESPONSE,
+        replaceProperty(prebidEvent['bidResponse'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Step 8: Send auction end event for auction 1
+      events.emit(EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
+
+      // Step 9: Send auction bid won event for auction 1
+      events.emit(EVENTS.BID_WON, prebidEvent['bidWon']);
+
+      // Step 10: Send auction end event for auction 2
+      events.emit(
+        EVENTS.AUCTION_END,
+        replaceProperty(prebidEvent['auctionEnd'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Step 11: Send auction bid won event for auction 2
+      events.emit(
+        EVENTS.BID_WON,
+        replaceProperty(prebidEvent['bidWon'], [
+          {
+            field: 'auctionId',
+            updated: '"auction2"',
+            replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+          },
+        ])
+      );
+
+      // Step 12: check the number of calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(0);
+
+      // Simulate end of session
+      document.dispatchEvent(new Event('visibilitychange'));
+
+      // Step 13: check the calls made to pubx.ai
+      expect(navigator.sendBeacon.callCount).to.equal(2);
+      for (const [index, arg] of navigator.sendBeacon.args.entries()) {
+        const [expectedUrl, expectedData] = arg;
+        const parsedUrl = new URL(expectedUrl);
+        expect(parsedUrl.pathname).to.equal(
+          ['/analytics/bidwon', '/analytics/auction'][index]
+        );
+        expect(Object.fromEntries(parsedUrl.searchParams)).to.deep.equal({
+          auctionTimestamp: '1616654312804',
+          pubxaiAnalyticsVersion: 'v2.1.0',
+          prebidVersion: '$prebid.version$',
+          pubxId: pubxId,
+        });
+        expect(expectedData.type).to.equal('text/json');
+        expect(JSON.parse(await readBlobSafariCompat(expectedData))).to.deep.equal([
+          [expectedAfterBidWon, expectedAfterBid][index],
+          replaceProperty([expectedAfterBidWon, expectedAfterBid][index], [
+            {
+              field: 'auctionId',
+              updated: '"auction2"',
+              replaced: '"bc3806e4-873e-453c-8ae5-204f35e923b4"',
+            },
+            {
+              field: 'refreshRank',
+              updated: '1',
+              replaced: '0',
+            },
+          ]),
+        ]);
+      }
     });
   });
 });
diff --git a/test/spec/modules/pubxaiRtdProvider_spec.js b/test/spec/modules/pubxaiRtdProvider_spec.js
new file mode 100644
index 00000000000..6ffa4952992
--- /dev/null
+++ b/test/spec/modules/pubxaiRtdProvider_spec.js
@@ -0,0 +1,429 @@
+import * as priceFloors from '../../../modules/priceFloors';
+import {
+  FLOORS_END_POINT,
+  storage,
+  FLOORS_EVENT_HANDLE,
+  FloorsApiStatus,
+  beforeInit,
+  fetchFloorRules,
+  getFloorsConfig,
+  getUrl,
+  pubxaiSubmodule,
+  setDefaultPriceFloors,
+  setFloorsApiStatus,
+  setFloorsConfig,
+  setPriceFloors,
+} from '../../../modules/pubxaiRtdProvider';
+import { config } from '../../../src/config';
+import * as hook from '../../../src/hook.js';
+import { server } from '../../mocks/xhr.js';
+
+const getConfig = () => ({
+  params: {
+    useRtd: true,
+    endpoint: 'http://pubxai.com:3001/floors',
+    data: {
+      currency: 'EUR',
+      floorProvider: 'PubxFloorProvider',
+      modelVersion: 'gpt-mvm_AB_0.50_dt_0.75_dwt_0.95_dnt_0.25_fm_0.50',
+      schema: { fields: ['gptSlot', 'mediaType'] },
+      values: { '*|banner': 0.02 },
+    },
+  },
+});
+
+const getFloorsResponse = () => ({
+  currency: 'USD',
+  floorProvider: 'PubxFloorProvider',
+  modelVersion: 'gpt-mvm_AB_0.50_dt_0.75_dwt_0.95_dnt_0.25_fm_0.50',
+  schema: { fields: ['gptSlot', 'mediaType'] },
+  values: { '*|banner': 0.02 },
+});
+
+const resetGlobals = () => {
+  window.__pubxLoaded__ = undefined;
+  window.__pubxPrevFloorsConfig__ = undefined;
+  window.__pubxFloorsConfig__ = undefined;
+  window.__pubxFloorsApiStatus__ = undefined;
+  window.__pubxFloorRulesPromise__ = null;
+  localStorage.removeItem('pubx:dynamicFloors');
+};
+
+const fakeServer = (
+  fakeResponse = '',
+  providerConfig = undefined,
+  statusCode = 200
+) => {
+  const fakeResponseHeaders = {
+    'Content-Type': 'application/json',
+    'Access-Control-Allow-Origin': '*',
+  };
+  const request = server.requests[0];
+  request.respond(
+    statusCode,
+    fakeResponseHeaders,
+    fakeResponse ? JSON.stringify(fakeResponse) : ''
+  );
+  return request;
+};
+
+const stubConfig = () => {
+  const stub = sinon.stub(config, 'setConfig');
+  return stub;
+};
+
+describe('pubxaiRtdProvider', () => {
+  describe('beforeInit', () => {
+    it('should register RTD submodule provider', function () {
+      let submoduleStub = sinon.stub(hook, 'submodule');
+      beforeInit();
+      assert(submoduleStub.calledOnceWith('realTimeData', pubxaiSubmodule));
+      submoduleStub.restore();
+    });
+  });
+  describe('submodule', () => {
+    describe('name', function () {
+      it('should be pubxai', function () {
+        expect(pubxaiSubmodule.name).to.equal('pubxai');
+      });
+    });
+  });
+  describe('init', () => {
+    let stub;
+    beforeEach(() => {
+      resetGlobals();
+      stub = stubConfig();
+    });
+    afterEach(() => {
+      stub.restore();
+    });
+    it('standard case - returns true', () => {
+      const initResult = pubxaiSubmodule.init({ params: { useRtd: true } });
+      expect(initResult).to.be.true;
+    });
+    it('setPriceFloors called when `useRtd` is true in the provider config', () => {
+      pubxaiSubmodule.init(getConfig());
+      expect(window.__pubxLoaded__).to.equal(true);
+    });
+  });
+  describe('getBidRequestData', () => {
+    const reqBidsConfigObj = {
+      adUnits: [{ code: 'ad-slot-code-0' }],
+      auctionId: 'auction-id-0',
+    };
+    let stub;
+    beforeEach(() => {
+      window.__pubxFloorRulesPromise__ = Promise.resolve();
+      stub = sinon.stub(priceFloors, 'createFloorsDataForAuction');
+    });
+    afterEach(() => {
+      resetGlobals();
+      stub.restore();
+    });
+    it('createFloorsDataForAuction called once before and once after __pubxFloorRulesPromise__. Also getBidRequestData executed only once', async () => {
+      pubxaiSubmodule.getBidRequestData(reqBidsConfigObj, () => { });
+      assert(priceFloors.createFloorsDataForAuction.calledOnce);
+      await window.__pubxFloorRulesPromise__;
+      assert(priceFloors.createFloorsDataForAuction.calledTwice);
+      assert(
+        priceFloors.createFloorsDataForAuction.alwaysCalledWith(
+          reqBidsConfigObj.adUnits,
+          reqBidsConfigObj.auctionId
+        )
+      );
+      pubxaiSubmodule.getBidRequestData(reqBidsConfigObj, () => { });
+      await window.__pubxFloorRulesPromise__;
+      assert(priceFloors.createFloorsDataForAuction.calledTwice);
+    });
+  });
+  describe('fetchFloorRules', () => {
+    const providerConfig = getConfig();
+    const floorsResponse = getFloorsResponse();
+    let storageStub;
+
+    beforeEach(() => {
+      storageStub = sinon.stub(storage, 'getDataFromSessionStorage');
+    });
+
+    afterEach(() => {
+      storageStub.restore();
+    });
+
+    it('success with floors response', (done) => {
+      const promise = fetchFloorRules(providerConfig);
+      fakeServer(floorsResponse);
+      promise.then((res) => {
+        expect(res).to.deep.equal(floorsResponse);
+        done();
+      });
+    });
+
+    it('success with no floors response', (done) => {
+      const promise = fetchFloorRules(providerConfig);
+      fakeServer(undefined);
+      promise.then((res) => {
+        expect(res).to.deep.equal(null);
+        done();
+      });
+    });
+
+    it('API call error', (done) => {
+      const promise = fetchFloorRules(providerConfig);
+      fakeServer(undefined, undefined, 404);
+      promise
+        .then((res) => {
+          expect(true).to.be.false;
+        })
+        .catch((e) => {
+          expect(e).to.not.be.undefined;
+        })
+        .finally(() => {
+          done();
+        });
+    });
+
+    it('Wrong API response', (done) => {
+      const promise = fetchFloorRules(providerConfig);
+      fakeServer('floorsResponse');
+      promise
+        .then((res) => {
+          expect(true).to.be.false;
+        })
+        .catch((e) => {
+          expect(e).to.not.be.undefined;
+        })
+        .finally(() => {
+          done();
+        });
+    });
+
+    it('success with local data response', (done) => {
+      const localFloorsResponse = getFloorsResponse();
+      storageStub.withArgs('pubx:dynamicFloors').returns(JSON.stringify(localFloorsResponse));
+      const promise = fetchFloorRules({ params: {} });
+      promise.then((res) => {
+        expect(res).to.deep.equal(localFloorsResponse);
+        done();
+      });
+    });
+
+    it('no local data response', (done) => {
+      storageStub.withArgs('pubx:dynamicFloors').returns(null);
+      const promise = fetchFloorRules({ params: {} });
+      promise.then((res) => {
+        expect(res).to.deep.equal(null);
+        done();
+      });
+    });
+  });
+  describe('setPriceFloors', () => {
+    const providerConfig = getConfig();
+    const floorsResponse = getFloorsResponse();
+    let stub;
+    beforeEach(() => {
+      resetGlobals();
+      stub = stubConfig();
+    });
+    afterEach(() => {
+      stub.restore();
+    });
+    it('with floors response', (done) => {
+      const floorsPromise = setPriceFloors(providerConfig);
+      fakeServer(floorsResponse);
+      expect(window.__pubxLoaded__).to.be.true;
+      expect(window.__pubxFloorsConfig__).to.deep.equal(
+        getFloorsConfig(providerConfig, providerConfig.params.data)
+      );
+      floorsPromise.then(() => {
+        expect(window.__pubxLoaded__).to.be.true;
+        expect(window.__pubxFloorsConfig__).to.deep.equal(
+          getFloorsConfig(providerConfig, floorsResponse)
+        );
+        done();
+      });
+    });
+    it('without floors response', (done) => {
+      const floorsPromise = setPriceFloors(providerConfig);
+      fakeServer(undefined);
+      expect(window.__pubxLoaded__).to.be.true;
+      expect(window.__pubxFloorsConfig__).to.deep.equal(
+        getFloorsConfig(providerConfig, providerConfig.params.data)
+      );
+      floorsPromise.then(() => {
+        expect(window.__pubxLoaded__).to.be.false;
+        expect(window.__pubxFloorsConfig__).to.deep.equal(null);
+        done();
+      });
+    });
+    it('default floors', (done) => {
+      const floorsPromise = setPriceFloors(providerConfig);
+      fakeServer(undefined, undefined, 404);
+      expect(window.__pubxLoaded__).to.be.true;
+      expect(window.__pubxFloorsConfig__).to.deep.equal(
+        getFloorsConfig(providerConfig, providerConfig.params.data)
+      );
+      floorsPromise
+        .then(() => {
+          expect(true).to.be.false;
+        })
+        .catch((e) => {
+          expect(window.__pubxLoaded__).to.be.true;
+          expect(window.__pubxFloorsConfig__).to.deep.equal(
+            getFloorsConfig(providerConfig, providerConfig.params.data)
+          );
+        })
+        .finally(() => {
+          done();
+        });
+    });
+  });
+  describe('setFloorsConfig', () => {
+    const providerConfig = getConfig();
+    let stub;
+    beforeEach(() => {
+      resetGlobals();
+      stub = stubConfig();
+    });
+    afterEach(function () {
+      stub.restore();
+    });
+    it('non-empty floorResponse', () => {
+      const floorsResponse = getFloorsResponse();
+      setFloorsConfig(providerConfig, floorsResponse);
+      const floorsConfig = getFloorsConfig(providerConfig, floorsResponse);
+      assert(config.setConfig.calledOnceWith(floorsConfig));
+      expect(window.__pubxLoaded__).to.be.true;
+      expect(window.__pubxFloorsConfig__).to.deep.equal(floorsConfig);
+    });
+    it('empty floorResponse', () => {
+      const floorsResponse = null;
+      setFloorsConfig(providerConfig, floorsResponse);
+      assert(config.setConfig.calledOnceWith({ floors: undefined }));
+      expect(window.__pubxLoaded__).to.be.false;
+      expect(window.__pubxFloorsConfig__).to.be.null;
+    });
+  });
+  describe('getFloorsConfig', () => {
+    let providerConfig;
+    const floorsResponse = getFloorsResponse();
+    beforeEach(() => {
+      providerConfig = getConfig();
+    });
+    it('no customizations in the provider config', () => {
+      const result = getFloorsConfig(providerConfig, floorsResponse);
+      expect(result).to.deep.equal({
+        floors: {
+          enforcement: { floorDeals: true },
+          data: floorsResponse,
+        },
+      });
+    });
+    it('only floormin in the provider config', () => {
+      providerConfig.params.floorMin = 2;
+      expect(getFloorsConfig(providerConfig, floorsResponse)).to.deep.equal({
+        floors: {
+          enforcement: { floorDeals: true },
+          floorMin: 2,
+          data: floorsResponse,
+        },
+      });
+    });
+    it('only enforcement in the provider config', () => {
+      providerConfig.params.enforcement = {
+        bidAdjustment: true,
+        enforceJS: false,
+      };
+      expect(getFloorsConfig(providerConfig, floorsResponse)).to.deep.equal({
+        floors: {
+          enforcement: {
+            bidAdjustment: true,
+            enforceJS: false,
+          },
+          data: floorsResponse,
+        },
+      });
+    });
+    it('both floorMin and enforcement in the provider config', () => {
+      providerConfig.params.floorMin = 2;
+      providerConfig.params.enforcement = {
+        bidAdjustment: true,
+        enforceJS: false,
+      };
+      expect(getFloorsConfig(providerConfig, floorsResponse)).to.deep.equal({
+        floors: {
+          enforcement: {
+            bidAdjustment: true,
+            enforceJS: false,
+          },
+          floorMin: 2,
+          data: floorsResponse,
+        },
+      });
+    });
+  });
+  describe('setDefaultPriceFloors', () => {
+    let stub;
+    beforeEach(() => {
+      resetGlobals();
+      stub = stubConfig();
+    });
+    afterEach(function () {
+      stub.restore();
+    });
+    it('should set default floors config', () => {
+      const providerConfig = getConfig();
+      setDefaultPriceFloors(providerConfig);
+      assert(
+        config.setConfig.calledOnceWith(
+          getFloorsConfig(providerConfig, providerConfig.params.data)
+        )
+      );
+      expect(window.__pubxLoaded__).to.be.true;
+    });
+  });
+  describe('setFloorsApiStatus', () => {
+    let stub;
+    beforeEach(() => {
+      resetGlobals();
+      stub = sinon.stub(window, 'dispatchEvent');
+    });
+    afterEach(function () {
+      stub.restore();
+    });
+    it('set status', () => {
+      setFloorsApiStatus(FloorsApiStatus.SUCCESS);
+      expect(window.__pubxFloorsApiStatus__).to.equal(FloorsApiStatus.SUCCESS);
+    });
+    it('dispatch event', () => {
+      setFloorsApiStatus(FloorsApiStatus.SUCCESS);
+      assert(
+        window.dispatchEvent.calledOnceWith(
+          new CustomEvent(FLOORS_EVENT_HANDLE, {
+            detail: { status: FloorsApiStatus.SUCCESS },
+          })
+        )
+      );
+    });
+  });
+  describe('getUrl', () => {
+    const provider = {
+      name: 'pubxai',
+      waitForIt: true,
+      params: {
+        pubxId: '12345',
+      },
+    };
+    it('floors end point', () => {
+      expect(FLOORS_END_POINT).to.equal('https://floor.pbxai.com/');
+    });
+    it('standard case', () => {
+      expect(getUrl(provider)).to.equal(null);
+    });
+    it('custom url provided', () => {
+      provider.params.endpoint = 'https://custom.floor.com/';
+      expect(getUrl(provider)).to.equal(
+        `https://custom.floor.com/?pubxId=12345&page=${window.location.href}`
+      );
+    });
+  });
+});
diff --git a/test/spec/modules/pulsepointBidAdapter_spec.js b/test/spec/modules/pulsepointBidAdapter_spec.js
index 8db7e909771..5b63e201e42 100644
--- a/test/spec/modules/pulsepointBidAdapter_spec.js
+++ b/test/spec/modules/pulsepointBidAdapter_spec.js
@@ -3,6 +3,9 @@ import {expect} from 'chai';
 import {spec} from 'modules/pulsepointBidAdapter.js';
 import {syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
 import {deepClone} from '../../../src/utils';
+import 'modules/consentManagementTcf.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js';
 
 describe('PulsePoint Adapter Tests', function () {
   const slotConfigs = [{
@@ -362,7 +365,7 @@ describe('PulsePoint Adapter Tests', function () {
     const bidderRequestGdpr = {
       gdprConsent: {
         gdprApplies: true,
-        consentString: 'serialized_gpdr_data'
+        consentString: 'serialized_gdpr_data'
       }
     };
     const request = spec.buildRequests(slotConfigs, syncAddFPDToBidderRequest(Object.assign({}, bidderRequest, bidderRequestGdpr)));
@@ -372,7 +375,7 @@ describe('PulsePoint Adapter Tests', function () {
     // user object
     expect(ortbRequest.user).to.not.equal(null);
     expect(ortbRequest.user.ext).to.not.equal(null);
-    expect(ortbRequest.user.ext.consent).to.equal('serialized_gpdr_data');
+    expect(ortbRequest.user.ext.consent).to.equal('serialized_gdpr_data');
     // regs object
     expect(ortbRequest.regs).to.not.equal(null);
     expect(ortbRequest.regs.ext).to.not.equal(null);
@@ -484,22 +487,33 @@ describe('PulsePoint Adapter Tests', function () {
 
   it('Verify common id parameters', function () {
     const bidRequests = deepClone(slotConfigs);
-    bidRequests[0].userIdAsEids = [{
-      source: 'pubcid.org',
-      uids: [{
-        id: 'userid_pubcid'
-      }]
-    }, {
-      source: 'adserver.org',
-      uids: [{
-        id: 'userid_ttd',
-        ext: {
-          rtiPartner: 'TDID'
+    const eids = [
+      {
+        source: 'pubcid.org',
+        uids: [{
+          id: 'userid_pubcid'
+        }]
+      }, {
+        source: 'adserver.org',
+        uids: [{
+          id: 'userid_ttd',
+          ext: {
+            rtiPartner: 'TDID'
+          }
+        }]
+      }
+    ];
+    const br = {
+      ...bidderRequest,
+      ortb2: {
+        user: {
+          ext: {
+            eids
+          }
         }
-      }]
+      }
     }
-    ];
-    const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+    const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(br));
     expect(request).to.be.not.null;
     expect(request.data).to.be.not.null;
     const ortbRequest = request.data;
@@ -507,7 +521,7 @@ describe('PulsePoint Adapter Tests', function () {
     expect(ortbRequest.user).to.not.be.undefined;
     expect(ortbRequest.user.ext).to.not.be.undefined;
     expect(ortbRequest.user.ext.eids).to.not.be.undefined;
-    expect(ortbRequest.user.ext.eids).to.deep.equal(bidRequests[0].userIdAsEids);
+    expect(ortbRequest.user.ext.eids).to.deep.equal(eids);
   });
 
   it('Verify user level first party data', function () {
@@ -518,7 +532,7 @@ describe('PulsePoint Adapter Tests', function () {
       },
       gdprConsent: {
         gdprApplies: true,
-        consentString: 'serialized_gpdr_data'
+        consentString: 'serialized_gdpr_data'
       },
       ortb2: {
         user: {
@@ -545,7 +559,7 @@ describe('PulsePoint Adapter Tests', function () {
           registered: true,
           interests: ['cars']
         },
-        consent: 'serialized_gpdr_data'
+        consent: 'serialized_gdpr_data'
       }
     });
   });
diff --git a/test/spec/modules/pxyzBidAdapter_spec.js b/test/spec/modules/pxyzBidAdapter_spec.js
index 3a336c86e46..87dc5ff0783 100644
--- a/test/spec/modules/pxyzBidAdapter_spec.js
+++ b/test/spec/modules/pxyzBidAdapter_spec.js
@@ -39,12 +39,12 @@ describe('pxyzBidAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placementId': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -210,30 +210,15 @@ describe('pxyzBidAdapter', function () {
   });
 
   describe('getUserSyncs', function () {
-    const syncUrl = '//ib.adnxs.com/getuidnb?https://ads.playground.xyz/usersync?partner=appnexus&uid=$UID';
-
-    describe('when iframeEnabled is true', function () {
-      const syncOptions = {
-        'iframeEnabled': true
-      }
-      it('should return one image type user sync pixel', function () {
-        let result = spec.getUserSyncs(syncOptions);
-        expect(result.length).to.equal(1);
-        expect(result[0].type).to.equal('image')
-        expect(result[0].url).to.equal(syncUrl);
-      });
-    });
-
-    describe('when iframeEnabled is false', function () {
-      const syncOptions = {
-        'iframeEnabled': false
-      }
-      it('should return one image type user sync pixel', function () {
-        let result = spec.getUserSyncs(syncOptions);
-        expect(result.length).to.equal(1);
-        expect(result[0].type).to.equal('image')
-        expect(result[0].url).to.equal(syncUrl);
-      });
+    const syncImageUrl = '//ib.adnxs.com/getuidnb?https://ads.playground.xyz/usersync?partner=appnexus&uid=$UID';
+    const syncIframeUrl = '//rtb.gumgum.com/getuid/15801?r=https%3A%2F%2Fads.playground.xyz%2Fusersync%3Fpartner%3Dgumgum%26uid%3D';
+    it('should return one image type user sync pixel', function () {
+      let result = spec.getUserSyncs();
+      expect(result.length).to.equal(2);
+      expect(result[0].type).to.equal('image')
+      expect(result[0].url).to.equal(syncImageUrl);
+      expect(result[1].type).to.equal('iframe')
+      expect(result[1].url).to.equal(syncIframeUrl);
     });
   })
 });
diff --git a/test/spec/modules/qortexRtdProvider_spec.js b/test/spec/modules/qortexRtdProvider_spec.js
new file mode 100644
index 00000000000..b5006e45d56
--- /dev/null
+++ b/test/spec/modules/qortexRtdProvider_spec.js
@@ -0,0 +1,408 @@
+import * as utils from 'src/utils.js';
+import * as events from 'src/events.js';
+import { EVENTS } from '../../../src/constants.js';
+import {loadExternalScript} from 'src/adloader.js';
+import {
+  qortexSubmodule as module,
+  addContextToRequests,
+  setContextData,
+  loadScriptTag,
+  initializeModuleData,
+  setGroupConfigData,
+  requestContextData,
+  windowPostMessageReceived
+} from '../../../modules/qortexRtdProvider';
+import {server} from '../../mocks/xhr.js';
+import { cloneDeep } from 'lodash';
+
+describe('qortexRtdProvider', () => {
+  let logWarnSpy;
+  let logMessageSpy;
+  let ortb2Stub;
+
+  const defaultApiHost = 'https://demand.qortex.ai';
+  const defaultGroupId = 'test';
+  const validBidderArray = ['qortex', 'test'];
+  const validTagConfig = {
+    videoContainer: 'my-video-container'
+  }
+  const validModuleConfig = {
+    params: {
+      groupId: defaultGroupId,
+      apiUrl: defaultApiHost,
+      bidders: validBidderArray,
+      enableBidEnrichment: true
+    }
+  }
+  const bidEnrichmentDisabledModuleConfig = {
+    params: {
+      groupId: defaultGroupId,
+      apiUrl: defaultApiHost,
+      bidders: validBidderArray
+    }
+  }
+  const invalidApiUrlModuleConfig = {
+    params: {
+      groupId: defaultGroupId,
+      apiUrl: 'test123',
+      bidders: validBidderArray
+    }
+  }
+  const emptyModuleConfig = {
+    params: {}
+  }
+  const validImpressionEvent = {
+    detail: {
+      uid: 'uid123',
+      type: 'qx-impression'
+    }
+  }
+  const validImpressionEvent2 = {
+    detail: {
+      uid: 'uid1234',
+      type: 'qx-impression'
+    }
+  }
+  const missingIdImpressionEvent = {
+    detail: {
+      type: 'qx-impression'
+    }
+  }
+  const QortexPostMessageInitialized = {
+    target: 'QORTEX-PREBIDJS-RTD-MODULE',
+    message: 'CX-BID-ENRICH-INITIALIZED',
+    params: {groupConfig: {data: true}}
+  }
+  const QortexPostMessageContext = {
+    target: 'QORTEX-PREBIDJS-RTD-MODULE',
+    message: 'DISPATCH-CONTEXT',
+    params: {context: {data: true}}
+  }
+  const invalidTypeQortexEvent = {
+    detail: {
+      type: 'invalid-type'
+    }
+  }
+  const responseHeaders = {
+    'content-type': 'application/json',
+    'access-control-allow-origin': '*'
+  };
+  const contextResponseObj = {
+    content: {
+      id: '123456',
+      episode: 15,
+      title: 'test episode',
+      series: 'test show',
+      season: '1',
+      url: 'https://example.com/file.mp4'
+    }
+  }
+  const contextResponse = JSON.stringify(contextResponseObj);
+  const validGroupConfigResponseObj = {
+    groupId: defaultGroupId,
+    active: true,
+    prebidBidEnrichment: true,
+    prebidBidEnrichmentPercentage: 100,
+    prebidReportingPercentage: 100
+  }
+  const validGroupConfigResponse = JSON.stringify(validGroupConfigResponseObj);
+  const inactiveGroupConfigResponseObj = {
+    groupId: defaultGroupId,
+    active: false,
+    PrebidBidEnrichment: true,
+    PrebidReportingPercentage: 100
+  }
+  const inactiveGroupConfigResponse = JSON.stringify(inactiveGroupConfigResponseObj);
+  const noEnrichmentGroupConfigResponseObj = {
+    groupId: defaultGroupId,
+    active: true,
+    prebidBidEnrichment: true,
+    prebidBidEnrichmentPercentage: 0,
+    prebidReportingPercentage: 100
+  }
+  const reqBidsConfig = {
+    auctionId: '1234',
+    adUnits: [{
+      bids: [
+        { bidder: 'qortex' }
+      ]
+    }],
+    ortb2Fragments: {
+      bidder: {},
+      global: {}
+    }
+  }
+
+  beforeEach(() => {
+    ortb2Stub = sinon.stub(reqBidsConfig, 'ortb2Fragments').value({bidder: {}, global: {}})
+    logWarnSpy = sinon.spy(utils, 'logWarn');
+    logMessageSpy = sinon.spy(utils, 'logMessage');
+  })
+
+  afterEach(() => {
+    logWarnSpy.restore();
+    logMessageSpy.restore();
+    ortb2Stub.restore();
+    setContextData(null);
+  })
+
+  describe('init', () => {
+    it('will not initialize bid enrichment if it is disabled', () => {
+      module.init(bidEnrichmentDisabledModuleConfig);
+      expect(logWarnSpy.calledWith('Bid Enrichment Function has been disabled in module configuration')).to.be.true;
+    })
+
+    it('returns false and logs error for missing groupId', () => {
+      expect(module.init(emptyModuleConfig)).to.be.false;
+      expect(logWarnSpy.calledOnce).to.be.true;
+      expect(logWarnSpy.calledWith('Qortex RTD module config does not contain valid groupId parameter. Config params: {}')).to.be.ok;
+    })
+
+    it('loads Qortex script if tagConfig is present in module config params', () => {
+      const config = cloneDeep(validModuleConfig);
+      config.params.tagConfig = validTagConfig;
+      expect(module.init(config)).to.be.true;
+      expect(loadExternalScript.calledOnce).to.be.true;
+    })
+  })
+
+  describe('loadScriptTag', () => {
+    let addEventListenerSpy;
+    let billableEvents = [];
+
+    let config = cloneDeep(validModuleConfig);
+    config.params.tagConfig = validTagConfig;
+
+    events.on(EVENTS.BILLABLE_EVENT, (e) => {
+      billableEvents.push(e);
+    })
+
+    beforeEach(() => {
+      initializeModuleData(config);
+      addEventListenerSpy = sinon.spy(window, 'addEventListener');
+    })
+
+    afterEach(() => {
+      addEventListenerSpy.restore();
+      billableEvents = [];
+    })
+
+    it('adds event listener', () => {
+      loadScriptTag(config);
+      expect(addEventListenerSpy.calledOnce).to.be.true;
+    })
+
+    it('parses incoming qortex-impression events', () => {
+      loadScriptTag(config);
+      dispatchEvent(new CustomEvent('qortex-rtd', validImpressionEvent));
+      expect(billableEvents.length).to.be.equal(1);
+      expect(billableEvents[0].type).to.be.equal(validImpressionEvent.detail.type);
+      expect(billableEvents[0].transactionId).to.be.equal(validImpressionEvent.detail.uid);
+    })
+
+    it('will emit two events for impressions with two different ids', () => {
+      loadScriptTag(config);
+      dispatchEvent(new CustomEvent('qortex-rtd', validImpressionEvent));
+      dispatchEvent(new CustomEvent('qortex-rtd', validImpressionEvent2));
+      expect(billableEvents.length).to.be.equal(2);
+      expect(billableEvents[0].transactionId).to.be.equal(validImpressionEvent.detail.uid);
+      expect(billableEvents[1].transactionId).to.be.equal(validImpressionEvent2.detail.uid);
+    })
+
+    it('will not allow multiple events with the same id', () => {
+      loadScriptTag(config);
+      dispatchEvent(new CustomEvent('qortex-rtd', validImpressionEvent));
+      dispatchEvent(new CustomEvent('qortex-rtd', validImpressionEvent));
+      expect(billableEvents.length).to.be.equal(1);
+      expect(logWarnSpy.calledWith('Received invalid billable event due to duplicate uid: qx-impression')).to.be.ok;
+    })
+
+    it('will not allow events with missing uid', () => {
+      loadScriptTag(config);
+      dispatchEvent(new CustomEvent('qortex-rtd', missingIdImpressionEvent));
+      expect(billableEvents.length).to.be.equal(0);
+      expect(logWarnSpy.calledWith('Received invalid billable event due to missing uid: qx-impression')).to.be.ok;
+    })
+
+    it('will not allow events with unavailable type', () => {
+      loadScriptTag(config);
+      dispatchEvent(new CustomEvent('qortex-rtd', invalidTypeQortexEvent));
+      expect(billableEvents.length).to.be.equal(0);
+      expect(logWarnSpy.calledWith('Received invalid billable event: invalid-type')).to.be.ok;
+    })
+  })
+
+  describe('getBidRequestData', () => {
+    let callbackSpy;
+
+    beforeEach(() => {
+      initializeModuleData(validModuleConfig);
+      setGroupConfigData(validGroupConfigResponseObj);
+      callbackSpy = sinon.spy();
+      server.reset();
+    })
+
+    afterEach(() => {
+      initializeModuleData(emptyModuleConfig);
+      callbackSpy.resetHistory();
+    })
+
+    it('will call callback immediately if no adunits', () => {
+      const reqBidsConfigNoBids = { adUnits: [] };
+      module.getBidRequestData(reqBidsConfigNoBids, callbackSpy);
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(logWarnSpy.calledOnce).to.be.true;
+    })
+
+    it('will not request context if prebid disable toggle is true', (done) => {
+      initializeModuleData(bidEnrichmentDisabledModuleConfig);
+      const cb = function () {
+        expect(server.requests.length).to.be.eql(0);
+        expect(logWarnSpy.called).to.be.true;
+        expect(logWarnSpy.calledWith('Bid enrichment disabled at prebid config')).to.be.true;
+        done();
+      }
+      module.getBidRequestData(reqBidsConfig, cb);
+    })
+
+    it('will request to add context when ad units present and enabled', (done) => {
+      const cb = function () {
+        setContextData(null);
+        expect(server.requests.length).to.be.eql(0);
+        expect(logWarnSpy.called).to.be.true;
+        expect(logWarnSpy.calledWith('No context data received at this time')).to.be.true;
+        done();
+      }
+      module.getBidRequestData(reqBidsConfig, cb);
+    })
+  })
+
+  describe('onAuctionEndEvent', () => {
+    beforeEach(() => {
+      initializeModuleData(validModuleConfig);
+      setGroupConfigData(validGroupConfigResponseObj);
+    })
+
+    afterEach(() => {
+      initializeModuleData(emptyModuleConfig);
+      setGroupConfigData(null);
+    })
+
+    it('Properly sends analytics event with valid config', () => {
+      const testData = {auctionId: reqBidsConfig.auctionId, data: 'data'};
+      module.onAuctionEndEvent(testData);
+    })
+  })
+
+  describe('requestContextData', () => {
+    before(() => {
+      setContextData({data: true});
+    })
+
+    after(() => {
+      setContextData(null);
+    })
+
+    it('Will log properly when context data already available', () => {
+      requestContextData();
+      expect(logMessageSpy.calledWith('Context data already retrieved.')).to.be.true;
+    })
+  })
+
+  describe('addContextToRequests', () => {
+    let testReqBids;
+    beforeEach(() => {
+      setGroupConfigData(validGroupConfigResponseObj);
+      testReqBids = {
+        auctionId: '1234',
+        adUnits: [{
+          bids: [
+            { bidder: 'qortex' }
+          ]
+        }],
+        ortb2Fragments: {
+          bidder: {},
+          global: {}
+        }
+      }
+    })
+
+    afterEach(() => {
+      setGroupConfigData(null);
+    })
+
+    it('logs error if no data was retrieved from get context call', () => {
+      initializeModuleData(validModuleConfig);
+      addContextToRequests(reqBidsConfig);
+      expect(logWarnSpy.calledOnce).to.be.true;
+      expect(logWarnSpy.calledWith('No context data received at this time')).to.be.ok;
+      expect(reqBidsConfig.ortb2Fragments.global).to.be.eql({});
+      expect(reqBidsConfig.ortb2Fragments.bidder).to.be.eql({});
+    })
+
+    it('adds site.content only to global ortb2 when bidders array is omitted', () => {
+      const omittedBidderArrayConfig = cloneDeep(validModuleConfig);
+      delete omittedBidderArrayConfig.params.bidders;
+      initializeModuleData(omittedBidderArrayConfig);
+      setContextData(contextResponseObj.content);
+      addContextToRequests(reqBidsConfig);
+      expect(reqBidsConfig.ortb2Fragments.global).to.have.property('site');
+      expect(reqBidsConfig.ortb2Fragments.global.site).to.have.property('content');
+      expect(reqBidsConfig.ortb2Fragments.global.site.content).to.be.eql(contextResponseObj.content);
+      expect(reqBidsConfig.ortb2Fragments.bidder).to.be.eql({});
+    })
+
+    it('adds site.content only to bidder ortb2 when bidders array is included', () => {
+      initializeModuleData(validModuleConfig);
+      setContextData(contextResponseObj.content);
+      addContextToRequests(reqBidsConfig);
+
+      const qortexOrtb2Fragment = reqBidsConfig.ortb2Fragments.bidder['qortex']
+      expect(qortexOrtb2Fragment).to.not.be.null;
+      expect(qortexOrtb2Fragment).to.have.property('site');
+      expect(qortexOrtb2Fragment.site).to.have.property('content');
+      expect(qortexOrtb2Fragment.site.content).to.be.eql(contextResponseObj.content);
+
+      const testOrtb2Fragment = reqBidsConfig.ortb2Fragments.bidder['test']
+      expect(testOrtb2Fragment).to.not.be.null;
+      expect(testOrtb2Fragment).to.have.property('site');
+      expect(testOrtb2Fragment.site).to.have.property('content');
+      expect(testOrtb2Fragment.site.content).to.be.eql(contextResponseObj.content);
+
+      expect(reqBidsConfig.ortb2Fragments.global).to.be.eql({});
+    })
+
+    it('logs error if there is an empty bidder array', () => {
+      const invalidBidderArrayConfig = cloneDeep(validModuleConfig);
+      invalidBidderArrayConfig.params.bidders = [];
+      initializeModuleData(invalidBidderArrayConfig);
+      setContextData(contextResponseObj.content)
+      addContextToRequests(reqBidsConfig);
+
+      expect(logWarnSpy.calledWith('Config contains an empty bidders array, unable to determine which bids to enrich')).to.be.ok;
+      expect(reqBidsConfig.ortb2Fragments.global).to.be.eql({});
+      expect(reqBidsConfig.ortb2Fragments.bidder).to.be.eql({});
+    })
+  })
+
+  describe('initializeBidEnrichment', () => {
+    beforeEach(() => {
+      initializeModuleData(validModuleConfig);
+      setGroupConfigData(validGroupConfigResponseObj);
+      setContextData(null);
+    })
+
+    afterEach(() => {
+      setGroupConfigData(null);
+      setContextData(null);
+    })
+
+    it('processes incoming qortex component "initialize" message', () => {
+      windowPostMessageReceived({data: QortexPostMessageInitialized})
+    })
+
+    it('processes incoming qortex component "context" message', () => {
+      windowPostMessageReceived({data: QortexPostMessageContext})
+    })
+  })
+})
diff --git a/test/spec/modules/qtBidAdapter_spec.js b/test/spec/modules/qtBidAdapter_spec.js
new file mode 100644
index 00000000000..f1c1ca61664
--- /dev/null
+++ b/test/spec/modules/qtBidAdapter_spec.js
@@ -0,0 +1,514 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/qtBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'qt';
+
+describe('QTBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo'
+      },
+      userIdAsEids
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative'
+      },
+      userIdAsEids
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
+    },
+    timeout: 500
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://endpoint1.qt.io/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'device',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.qt.io/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.qt.io/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.qt.io/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/quantcastBidAdapter_spec.js b/test/spec/modules/quantcastBidAdapter_spec.js
index d10fea829bc..fdde8d290f4 100644
--- a/test/spec/modules/quantcastBidAdapter_spec.js
+++ b/test/spec/modules/quantcastBidAdapter_spec.js
@@ -181,7 +181,6 @@ describe('Quantcast adapter', function () {
         maxbitrate: 10, // optional
         playbackmethod: [1], // optional
         delivery: [1], // optional
-        placement: 1, // optional
         api: [2, 3] // optional
       }, {
         context: 'instream',
@@ -205,7 +204,6 @@ describe('Quantcast adapter', function () {
               maxbitrate: 10,
               playbackmethod: [1],
               delivery: [1],
-              placement: 1,
               api: [2, 3],
               w: 600,
               h: 300
@@ -242,7 +240,6 @@ describe('Quantcast adapter', function () {
         maxbitrate: 10, // optional
         playbackmethod: [1], // optional
         delivery: [1], // optional
-        placement: 1, // optional
         api: [2, 3], // optional
         context: 'instream',
         playerSize: [600, 300]
@@ -265,7 +262,6 @@ describe('Quantcast adapter', function () {
               maxbitrate: 10,
               playbackmethod: [1],
               delivery: [1],
-              placement: 1,
               api: [2, 3],
               w: 600,
               h: 300
diff --git a/test/spec/modules/quantcastIdSystem_spec.js b/test/spec/modules/quantcastIdSystem_spec.js
index e9d44dd6124..157c00e7567 100644
--- a/test/spec/modules/quantcastIdSystem_spec.js
+++ b/test/spec/modules/quantcastIdSystem_spec.js
@@ -1,6 +1,9 @@
 import { quantcastIdSubmodule, storage, firePixel, hasCCPAConsent, hasGDPRConsent, checkTCFv2 } from 'modules/quantcastIdSystem.js';
 import * as utils from 'src/utils.js';
 import {coppaDataHandler} from 'src/adapterManager';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {expect} from 'chai/index.mjs';
 
 describe('QuantcastId module', function () {
   beforeEach(function() {
@@ -380,4 +383,23 @@ describe('Quantcast GDPR consent check', function() {
       }
     })).to.equal(false);
   });
+  describe('eids', () => {
+    before(() => {
+      attachIdSystem(quantcastIdSubmodule);
+    });
+    it('quantcastId', function() {
+      const userId = {
+        quantcastId: 'some-random-id-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'quantcast.com',
+        uids: [{
+          id: 'some-random-id-value',
+          atype: 1
+        }]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/r2b2BidAdapter_spec.js b/test/spec/modules/r2b2BidAdapter_spec.js
new file mode 100644
index 00000000000..63850b78c40
--- /dev/null
+++ b/test/spec/modules/r2b2BidAdapter_spec.js
@@ -0,0 +1,689 @@
+import {expect} from 'chai';
+import {spec, internal as r2b2, internal} from 'modules/r2b2BidAdapter.js';
+import * as utils from '../../../src/utils';
+import 'modules/schain.js';
+import 'modules/userId/index.js';
+
+function encodePlacementIds (ids) {
+  return btoa(JSON.stringify(ids));
+}
+
+describe('R2B2 adapter', function () {
+  let serverResponse, requestForInterpretResponse;
+  let bidderRequest;
+  let bids = [];
+  let gdprConsent = {
+    gdprApplies: true,
+    consentString: 'consent-string',
+  };
+  let schain = {
+    ver: '1.0',
+    complete: 1,
+    nodes: [{
+      asi: 'example.com',
+      sid: '00001',
+      hp: 1
+    }]
+  };
+  const usPrivacyString = '1YNN';
+  const impId = 'impID';
+  const price = 10.6;
+  const ad = 'adm';
+  const creativeId = 'creativeID';
+  const cid = 41849;
+  const cdid = 595121;
+  const unitCode = 'unitCode';
+  const bidId1 = '1';
+  const bidId2 = '2';
+  const bidId3 = '3';
+  const bidId4 = '4';
+  const bidId5 = '5';
+  const bidWonUrl = 'url1';
+  const setTargetingUrl = 'url2';
+  const bidder = 'r2b2';
+  const foreignBidder = 'differentBidder';
+  const id1 = { pid: 'd/g/p' };
+  const id1Object = { d: 'd', g: 'g', p: 'p', m: 0 };
+  const id2 = { pid: 'd/g/p/1' };
+  const id2Object = { d: 'd', g: 'g', p: 'p', m: 1 };
+  const badId = { pid: 'd/g/' };
+  const bid1 = { bidId: bidId1, bidder, params: [ id1 ] };
+  const bid2 = { bidId: bidId2, bidder, params: [ id2 ] };
+  const bidWithBadSetup = { bidId: bidId3, bidder, params: [ badId ] };
+  const bidForeign1 = { bidId: bidId4, bidder: foreignBidder, params: [ { id: 'abc' } ] };
+  const bidForeign2 = { bidId: bidId5, bidder: foreignBidder, params: [ { id: 'xyz' } ] };
+  const fakeTime = 1234567890;
+  const cacheBusterRegex = /[\?&]cb=([^&]+)/;
+  let bidStub, time;
+
+  beforeEach(function () {
+    bids = [{
+      bidder: 'r2b2',
+      params: {
+        pid: 'example.com/generic/300x250/1'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250]
+          ]
+        }
+      },
+      adUnitCode: unitCode,
+      transactionId: '29c408b9-65ce-48b1-9167-18a57791f908',
+      sizes: [
+        [300, 250]
+      ],
+      bidId: '20917a54ee9858',
+      bidderRequestId: '15270d403778d',
+      auctionId: '36acef1b-f635-4f57-b693-5cc55ee16346',
+      src: 'client',
+      ortb2: {
+        regs: {
+          ext: {
+            gdpr: 1,
+            us_privacy: '1YYY'
+          }
+        },
+        user: {
+          ext: {
+            consent: 'consent-string'
+          }
+        },
+        site: {},
+        device: {}
+      },
+      schain
+    }, {
+      bidder: 'r2b2',
+      params: {
+        pid: 'example.com/generic/300x600/0'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 600]
+          ]
+        }
+      },
+      adUnitCode: unitCode,
+      transactionId: '29c408b9-65ce-48b1-9167-18a57791f908',
+      sizes: [
+        [300, 600]
+      ],
+      bidId: '3dd53d30c691fe',
+      bidderRequestId: '15270d403778d',
+      auctionId: '36acef1b-f635-4f57-b693-5cc55ee16346',
+      src: 'client',
+      ortb2: {
+        regs: {
+          ext: {
+            gdpr: 1,
+            us_privacy: '1YYY'
+          }
+        },
+        user: {
+          ext: {
+            consent: 'consent-string'
+          }
+        },
+        site: {},
+        device: {}
+      },
+      schain
+    }];
+    bidderRequest = {
+      bidderCode: 'r2b2',
+      auctionId: '36acef1b-f635-4f57-b693-5cc55ee16346',
+      bidderRequestId: '15270d403778d',
+      bids: bids,
+      ortb2: {
+        regs: {
+          ext: {
+            gdpr: 1,
+            us_privacy: '1YYY'
+          }
+        },
+        user: {
+          ext: {
+            consent: 'consent-string'
+          }
+        },
+        site: {},
+        device: {}
+      },
+      gdprConsent: {
+        consentString: 'consent-string',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      },
+      uspConsent: '1YYY',
+    };
+    serverResponse = {
+      id: 'a66a6e32-2a7d-4ed3-bb13-6f3c9bdcf6a1',
+      seatbid: [{
+        bid: [{
+          id: '4756cc9e9b504fd0bd39fdd594506545',
+          impid: impId,
+          price: price,
+          adm: ad,
+          crid: creativeId,
+          w: 300,
+          h: 250,
+          ext: {
+            prebid: {
+              meta: {
+                adaptercode: 'r2b2'
+              },
+              type: 'banner'
+            },
+            r2b2: {
+              cdid: cdid,
+              cid: cid,
+              useRenderer: true
+            }
+          }
+        }],
+        seat: 'seat'
+      }]
+    };
+    requestForInterpretResponse = {
+      data: {
+        imp: [
+          {id: impId}
+        ]
+      },
+      bids
+    };
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid = {};
+
+    it('should return false when missing required "pid" param', function () {
+      bid.params = {random: 'param'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params = {d: 'd', g: 'g', p: 'p', m: 1};
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    });
+
+    it('should return false when "pid" is malformed', function () {
+      bid.params = {pid: 'pid'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params = {pid: '///'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params = {pid: '/g/p/m'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params = {pid: 'd//p/m'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params = {pid: 'd/g//m'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params = {pid: 'd/p/'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params = {pid: 'd/g/p/m/t'};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true when "pid" is a correct dgpm', function () {
+      bid.params = {pid: 'd/g/p/m'};
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return true when type is blank', function () {
+      bid.params = {pid: 'd/g/p/'};
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return true when type is missing', function () {
+      bid.params = {pid: 'd/g/p'};
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return true when "pid" is a number', function () {
+      bid.params = {pid: 12356};
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return true when "pid" is a numeric string', function () {
+      bid.params = {pid: '12356'};
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return true for selfpromo unit', function () {
+      bid.params = {pid: 'selfpromo'};
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    });
+  });
+
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      r2b2.placementsToSync = [];
+      r2b2.mappedParams = {};
+    });
+
+    it('should set correct request method and url and pass bids', function () {
+      let requests = spec.buildRequests([bids[0]], bidderRequest);
+      expect(requests).to.be.an('array').that.has.lengthOf(1);
+      let request = requests[0]
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal('https://hb.r2b2.cz/openrtb2/bid');
+      expect(request.data).to.be.an('object');
+      expect(request.bids).to.deep.equal(bids);
+    });
+
+    it('should pass correct parameters', function () {
+      let requests = spec.buildRequests([bids[0]], bidderRequest);
+      let {data} = requests[0];
+      let {imp, device, site, source, ext, cur, test} = data;
+      expect(imp).to.be.an('array').that.has.lengthOf(1);
+      expect(device).to.be.an('object');
+      expect(site).to.be.an('object');
+      expect(source).to.be.an('object');
+      expect(cur).to.deep.equal(['USD']);
+      expect(ext.version).to.equal('1.0.0');
+      expect(test).to.equal(0);
+    });
+
+    it('should pass correct imp', function () {
+      let requests = spec.buildRequests([bids[0]], bidderRequest);
+      let {data} = requests[0];
+      let {imp} = data;
+      expect(imp).to.be.an('array').that.has.lengthOf(1);
+      expect(imp[0]).to.be.an('object');
+      let bid = imp[0];
+      expect(bid.id).to.equal('20917a54ee9858');
+      expect(bid.banner).to.deep.equal({topframe: 0, format: [{w: 300, h: 250}]});
+      expect(bid.ext).to.be.an('object');
+      expect(bid.ext.r2b2).to.deep.equal({d: 'example.com', g: 'generic', p: '300x250', m: 1});
+    });
+
+    it('should map type correctly', function () {
+      let result, bid;
+      let requestWithId = function(id) {
+        let b = bids[0];
+        b.params.pid = id;
+        let passedBids = [b];
+        bidderRequest.bids = passedBids;
+        return spec.buildRequests(passedBids, bidderRequest);
+      };
+
+      result = requestWithId('example.com/generic/300x250/mobile');
+      bid = result[0].data.imp[0];
+      expect(bid.ext.r2b2.m).to.be.a('number').that.is.equal(1);
+
+      result = requestWithId('example.com/generic/300x250/desktop');
+      bid = result[0].data.imp[0];
+      expect(bid.ext.r2b2.m).to.be.a('number').that.is.equal(0);
+
+      result = requestWithId('example.com/generic/300x250/1');
+      bid = result[0].data.imp[0];
+      expect(bid.ext.r2b2.m).to.be.a('number').that.is.equal(1);
+
+      result = requestWithId('example.com/generic/300x250/0');
+      bid = result[0].data.imp[0];
+      expect(bid.ext.r2b2.m).to.be.a('number').that.is.equal(0);
+
+      result = requestWithId('example.com/generic/300x250/m');
+      bid = result[0].data.imp[0];
+      expect(bid.ext.r2b2.m).to.be.a('number').that.is.equal(1);
+
+      result = requestWithId('example.com/generic/300x250');
+      bid = result[0].data.imp[0];
+      expect(bid.ext.r2b2.m).to.be.a('number').that.is.equal(0);
+    });
+
+    it('should pass correct parameters for test ad', function () {
+      let testAdBid = bids[0];
+      testAdBid.params = {pid: 'selfpromo'};
+      let requests = spec.buildRequests([testAdBid], bidderRequest);
+      let {data} = requests[0];
+      let {imp} = data;
+      expect(imp).to.be.an('array').that.has.lengthOf(1);
+      expect(imp[0]).to.be.an('object');
+      let bid = imp[0];
+      expect(bid.ext).to.be.an('object');
+      expect(bid.ext.r2b2).to.deep.equal({d: 'test', g: 'test', p: 'selfpromo', m: 0, 'selfpromo': 1});
+    });
+
+    it('should pass multiple bids', function () {
+      let requests = spec.buildRequests(bids, bidderRequest);
+      expect(requests).to.be.an('array').that.has.lengthOf(1);
+      let {data} = requests[0];
+      let {imp} = data;
+      expect(imp).to.be.an('array').that.has.lengthOf(bids.length);
+      let bid1 = imp[0];
+      expect(bid1.ext.r2b2).to.deep.equal({d: 'example.com', g: 'generic', p: '300x250', m: 1});
+      let bid2 = imp[1];
+      expect(bid2.ext.r2b2).to.deep.equal({d: 'example.com', g: 'generic', p: '300x600', m: 0});
+    });
+
+    it('should set up internal variables', function () {
+      let requests = spec.buildRequests(bids, bidderRequest);
+      let bid1Id = bids[0].bidId;
+      let bid2Id = bids[1].bidId;
+      expect(r2b2.placementsToSync).to.be.an('array').that.has.lengthOf(2);
+      expect(r2b2.mappedParams).to.have.property(bid1Id);
+      expect(r2b2.mappedParams[bid1Id]).to.deep.equal({d: 'example.com', g: 'generic', p: '300x250', m: 1, pid: 'example.com/generic/300x250/1'});
+      expect(r2b2.mappedParams).to.have.property(bid2Id);
+      expect(r2b2.mappedParams[bid2Id]).to.deep.equal({d: 'example.com', g: 'generic', p: '300x600', m: 0, pid: 'example.com/generic/300x600/0'});
+    });
+
+    it('should pass gdpr properties', function () {
+      let requests = spec.buildRequests(bids, bidderRequest);
+      let {data} = requests[0];
+      let {user, regs} = data;
+      expect(user).to.be.an('object').that.has.property('ext');
+      expect(regs).to.be.an('object').that.has.property('ext');
+      expect(user.ext.consent).to.equal('consent-string');
+      expect(regs.ext.gdpr).to.equal(1);
+    });
+
+    it('should pass us privacy properties', function () {
+      let requests = spec.buildRequests(bids, bidderRequest);
+      let {data} = requests[0];
+      let {regs} = data;
+      expect(regs).to.be.an('object').that.has.property('ext');
+      expect(regs.ext.us_privacy).to.equal('1YYY');
+    });
+
+    it('should pass supply chain', function () {
+      let requests = spec.buildRequests(bids, bidderRequest);
+      let {data} = requests[0];
+      let {source} = data;
+      expect(source).to.be.an('object').that.has.property('ext');
+      expect(source.ext.schain).to.deep.equal({
+        complete: 1,
+        nodes: [
+          {asi: 'example.com', hp: 1, sid: '00001'}
+        ],
+        ver: '1.0'
+      })
+    });
+
+    it('should pass extended ids', function () {
+      let eidsArray = [
+        {
+          source: 'adserver.org',
+          uids: [
+            {
+              atype: 1,
+              ext: {
+                rtiPartner: 'TDID',
+              },
+              id: 'TTD_ID_FROM_USER_ID_MODULE',
+            },
+          ],
+        },
+        {
+          source: 'pubcid.org',
+          uids: [
+            {
+              atype: 1,
+              id: 'pubCommonId_FROM_USER_ID_MODULE',
+            },
+          ],
+        },
+      ];
+      bidderRequest.ortb2 = {user: {ext: {eids: eidsArray}}}
+      let requests = spec.buildRequests(bids, bidderRequest);
+      let request = requests[0];
+      let eids = request.data.user.ext.eids;
+
+      expect(eids).to.deep.equal(eidsArray);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should respond with empty response when there are no bids', function () {
+      let result = spec.interpretResponse({ body: {} }, {});
+      expect(result).to.be.an('array').that.has.lengthOf(0);
+      result = spec.interpretResponse({ body: { seatbid: [] } }, {});
+      expect(result).to.be.an('array').that.has.lengthOf(0);
+      result = spec.interpretResponse({ body: { seatbid: [ {} ] } }, {});
+      expect(result).to.be.an('array').that.has.lengthOf(0);
+      result = spec.interpretResponse({ body: { seatbid: [ { bids: [] } ] } }, {});
+      expect(result).to.be.an('array').that.has.lengthOf(0);
+    });
+
+    it('should map params correctly', function () {
+      let result = spec.interpretResponse({ body: serverResponse }, requestForInterpretResponse);
+      expect(result).to.be.an('array').that.has.lengthOf(1);
+      let bid = result[0];
+      expect(bid.requestId).to.equal(impId);
+      expect(bid.cpm).to.equal(price);
+      expect(bid.ad).to.equal(ad);
+      expect(bid.currency).to.equal('USD');
+      expect(bid.mediaType).to.equal('banner');
+      expect(bid.width).to.equal(300);
+      expect(bid.height).to.equal(250);
+      expect(bid.netRevenue).to.equal(true);
+      expect(bid.ttl).to.equal(360);
+      expect(bid.creativeId).to.equal(creativeId);
+    });
+
+    it('should set up renderer on bid', function () {
+      let result = spec.interpretResponse({ body: serverResponse }, requestForInterpretResponse);
+      expect(result).to.be.an('array').that.has.lengthOf(1);
+      let bid = result[0];
+      expect(bid.renderer).to.be.an('object');
+      expect(bid.renderer).to.have.property('render').that.is.a('function');
+      expect(bid.renderer).to.have.property('url').that.is.a('string');
+    });
+
+    it('should map ext params correctly', function() {
+      let dgpm = {something: 'something'};
+      r2b2.mappedParams = {};
+      r2b2.mappedParams[impId] = dgpm;
+      let result = spec.interpretResponse({ body: serverResponse }, requestForInterpretResponse);
+      expect(result).to.be.an('array').that.has.lengthOf(1);
+      let bid = result[0];
+      expect(bid.ext).to.be.an('object');
+      let { ext } = bid;
+      expect(ext.dgpm).to.deep.equal(dgpm);
+      expect(ext.cid).to.equal(cid);
+      expect(ext.cdid).to.equal(cdid);
+      expect(ext.adUnit).to.equal(unitCode);
+      expect(ext.mediaType).to.deep.equal({
+        type: 'banner',
+        settings: {
+          chd: null,
+          width: 300,
+          height: 250,
+          ad: {
+            type: 'content',
+            data: ad
+          }
+        }
+      });
+    });
+
+    it('should handle multiple bids', function() {
+      const impId2 = '123456';
+      const price2 = 12;
+      const ad2 = 'gaeouho';
+      const w2 = 300;
+      const h2 = 600;
+      let b = serverResponse.seatbid[0].bid[0];
+      let b2 = Object.assign({}, b);
+      b2.impid = impId2;
+      b2.price = price2;
+      b2.adm = ad2;
+      b2.w = w2;
+      b2.h = h2;
+      serverResponse.seatbid[0].bid.push(b2);
+      requestForInterpretResponse.data.imp.push({id: impId2});
+      let result = spec.interpretResponse({ body: serverResponse }, requestForInterpretResponse);
+      expect(result).to.be.an('array').that.has.lengthOf(2);
+      let firstBid = result[0];
+      let secondBid = result[1];
+      expect(firstBid.requestId).to.equal(impId);
+      expect(firstBid.ad).to.equal(ad);
+      expect(firstBid.cpm).to.equal(price);
+      expect(firstBid.width).to.equal(300);
+      expect(firstBid.height).to.equal(250);
+      expect(secondBid.requestId).to.equal(impId2);
+      expect(secondBid.ad).to.equal(ad2);
+      expect(secondBid.cpm).to.equal(price2);
+      expect(secondBid.width).to.equal(w2);
+      expect(secondBid.height).to.equal(h2);
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    const syncOptions = {
+      iframeEnabled: true,
+      pixelEnabled: true
+    };
+
+    it('should return an array with a sync for all bids', function() {
+      r2b2.placementsToSync = [id1Object, id2Object];
+      const expectedEncodedIds = encodePlacementIds(r2b2.placementsToSync);
+      const syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs).to.be.an('array').that.has.lengthOf(1);
+      const sync = syncs[0];
+      expect(sync).to.be.an('object');
+      expect(sync.type).to.equal('iframe');
+      expect(sync.url).to.include(`?p=${expectedEncodedIds}`);
+    });
+
+    it('should return the sync and include gdpr and usp parameters in the url', function() {
+      r2b2.placementsToSync = [id1Object, id2Object];
+      const syncs = spec.getUserSyncs(syncOptions, {}, gdprConsent, usPrivacyString);
+      const sync = syncs[0];
+      expect(sync).to.be.an('object');
+      expect(sync.url).to.include(`&gdpr=1`);
+      expect(sync.url).to.include(`&gdpr_consent=${gdprConsent.consentString}`);
+      expect(sync.url).to.include(`&us_privacy=${usPrivacyString}`);
+    });
+  });
+
+  describe('events', function() {
+    beforeEach(function() {
+      time = sinon.useFakeTimers(fakeTime);
+      sinon.stub(utils, 'triggerPixel');
+      r2b2.mappedParams = {};
+      r2b2.mappedParams[bidId1] = id1Object;
+      r2b2.mappedParams[bidId2] = id2Object;
+      bidStub = {
+        adserverTargeting: { hb_bidder: bidder, hb_pb: '10.00', hb_size: '300x300' },
+        cpm: 10,
+        currency: 'USD',
+        ext: {
+          dgpm: { d: 'r2b2.cz', g: 'generic', m: 1, p: '300x300', pid: 'r2b2.cz/generic/300x300/1' }
+        },
+        params: [ { pid: 'r2b2.cz/generic/300x300/1' } ],
+      };
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+      time.restore();
+    });
+
+    describe('onBidWon', function () {
+      it('exists and is a function', () => {
+        expect(spec.onBidWon).to.exist.and.to.be.a('function');
+      });
+      it('should return nothing and trigger a pixel with passed url', function () {
+        bidStub.ext.events = {
+          onBidWon: bidWonUrl,
+          onSetTargeting: setTargetingUrl
+        };
+        const response = spec.onBidWon(bidStub);
+        expect(response).to.be.an('undefined');
+        expect(utils.triggerPixel.called).to.equal(true);
+        expect(utils.triggerPixel.callCount).to.equal(1);
+        expect(utils.triggerPixel.calledWithMatch(bidWonUrl)).to.equal(true);
+      });
+      it('should not trigger a pixel if url is not available', function () {
+        bidStub.ext.events = null;
+        spec.onBidWon(bidStub);
+        expect(utils.triggerPixel.callCount).to.equal(0);
+        bidStub.ext.events = {
+          onBidWon: '',
+          onSetTargeting: '',
+        };
+        spec.onBidWon(bidStub);
+        expect(utils.triggerPixel.callCount).to.equal(0);
+      });
+    });
+
+    describe('onSetTargeting', function () {
+      it('exists and is a function', () => {
+        expect(spec.onSetTargeting).to.exist.and.to.be.a('function');
+      });
+      it('should return nothing and trigger a pixel with passed url', function () {
+        bidStub.ext.events = {
+          onBidWon: bidWonUrl,
+          onSetTargeting: setTargetingUrl
+        };
+        const response = spec.onSetTargeting(bidStub);
+        expect(response).to.be.an('undefined');
+        expect(utils.triggerPixel.called).to.equal(true);
+        expect(utils.triggerPixel.callCount).to.equal(1);
+        expect(utils.triggerPixel.calledWithMatch(setTargetingUrl)).to.equal(true);
+      });
+      it('should not trigger a pixel if url is not available', function () {
+        bidStub.ext.events = null;
+        spec.onSetTargeting(bidStub);
+        expect(utils.triggerPixel.callCount).to.equal(0);
+        bidStub.ext.events = {
+          onBidWon: '',
+          onSetTargeting: '',
+        };
+        spec.onSetTargeting(bidStub);
+        expect(utils.triggerPixel.callCount).to.equal(0);
+      });
+    });
+
+    describe('onTimeout', function () {
+      it('exists and is a function', () => {
+        expect(spec.onTimeout).to.exist.and.to.be.a('function');
+      });
+      it('should return nothing and trigger a pixel', function () {
+        const bids = [bid1, bid2];
+        const response = spec.onTimeout(bids);
+        expect(response).to.be.an('undefined');
+        expect(utils.triggerPixel.callCount).to.equal(1);
+      });
+      it('should not trigger a pixel if no bids available', function () {
+        const bids = [];
+        spec.onTimeout(bids);
+        expect(utils.triggerPixel.callCount).to.equal(0);
+      });
+      it('should trigger a pixel with correct ids and a cache buster', function () {
+        const bids = [bid1, bidForeign1, bidForeign2, bid2, bidWithBadSetup];
+        const expectedIds = [id1Object, id2Object];
+        const expectedEncodedIds = encodePlacementIds(expectedIds);
+        spec.onTimeout(bids);
+        expect(utils.triggerPixel.callCount).to.equal(1);
+        const triggeredUrl = utils.triggerPixel.args[0][0];
+        expect(triggeredUrl).to.include(`p=${expectedEncodedIds}`);
+        expect(triggeredUrl.match(cacheBusterRegex)).to.exist;
+      });
+    });
+
+    describe('onBidderError', function () {
+      it('exists and is a function', () => {
+        expect(spec.onBidderError).to.exist.and.to.be.a('function');
+      });
+      it('should return nothing and trigger a pixel', function () {
+        const bidderRequest = { bids: [bid1, bid2] };
+        const response = spec.onBidderError({ bidderRequest });
+        expect(response).to.be.an('undefined')
+        expect(utils.triggerPixel.callCount).to.equal(1);
+      });
+      it('should not trigger a pixel if no bids available', function () {
+        const bidderRequest = { bids: [] };
+        spec.onBidderError({ bidderRequest });
+        expect(utils.triggerPixel.callCount).to.equal(0);
+      });
+      it('should call triggerEvent with correct ids and a cache buster', function () {
+        const bids = [bid1, bid2, bidWithBadSetup]
+        const bidderRequest = { bids };
+        const expectedIds = [id1Object, id2Object];
+        const expectedEncodedIds = encodePlacementIds(expectedIds);
+        spec.onBidderError({ bidderRequest });
+        expect(utils.triggerPixel.callCount).to.equal(1);
+        const triggeredUrl = utils.triggerPixel.args[0][0];
+        expect(triggeredUrl).to.include(`p=${expectedEncodedIds}`);
+        expect(triggeredUrl.match(cacheBusterRegex)).to.exist;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/radsBidAdapter_spec.js b/test/spec/modules/radsBidAdapter_spec.js
index 3ad7ada2ae7..4a64e2922f1 100644
--- a/test/spec/modules/radsBidAdapter_spec.js
+++ b/test/spec/modules/radsBidAdapter_spec.js
@@ -32,12 +32,12 @@ describe('radsAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'someIncorrectParam': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/rakutenBidAdapter_spec.js b/test/spec/modules/rakutenBidAdapter_spec.js
index 15b22afbe29..2a9fcb9f83b 100644
--- a/test/spec/modules/rakutenBidAdapter_spec.js
+++ b/test/spec/modules/rakutenBidAdapter_spec.js
@@ -40,10 +40,10 @@ describe('rakutenBidAdapter', function() {
     });
 
     it('should return false when required params are not passed', () => {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false)
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false)
     })
   });
 
diff --git a/test/spec/modules/rasBidAdapter_spec.js b/test/spec/modules/rasBidAdapter_spec.js
deleted file mode 100644
index bfa72a2510e..00000000000
--- a/test/spec/modules/rasBidAdapter_spec.js
+++ /dev/null
@@ -1,196 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/rasBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-const CSR_ENDPOINT = 'https://csr.onet.pl/4178463/csr-006/csr.json?nid=4178463&';
-
-describe('rasBidAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found', function () {
-      const bid = {
-        sizes: [[300, 250], [300, 600]],
-        bidder: 'ras',
-        params: {
-          slot: 'slot',
-          area: 'areatest',
-          site: 'test',
-          network: '4178463'
-        }
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params not found', function () {
-      const failBid = {
-        sizes: [[300, 250], [300, 300]],
-        bidder: 'ras',
-        params: {
-          site: 'test',
-          network: '4178463'
-        }
-      };
-      expect(spec.isBidRequestValid(failBid)).to.equal(false);
-    });
-
-    it('should return nothing when bid request is malformed', function () {
-      const failBid = {
-        sizes: [[300, 250], [300, 300]],
-        bidder: 'ras',
-      };
-      expect(spec.isBidRequestValid(failBid)).to.equal(undefined);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const bid = {
-      sizes: [[300, 250], [300, 600]],
-      bidder: 'ras',
-      bidId: 1,
-      params: {
-        slot: 'test',
-        area: 'areatest',
-        site: 'test',
-        slotSequence: '0',
-        network: '4178463',
-        customParams: {
-          test: 'name=value'
-        }
-      }
-    };
-    const bid2 = {
-      sizes: [[750, 300]],
-      bidder: 'ras',
-      bidId: 2,
-      params: {
-        slot: 'test2',
-        area: 'areatest',
-        site: 'test',
-        network: '4178463'
-      }
-    };
-
-    it('should parse bids to request', function () {
-      const requests = spec.buildRequests([bid], {
-        'gdprConsent': {
-          'gdprApplies': true,
-          'consentString': 'some-consent-string'
-        },
-        'refererInfo': {
-          'ref': 'https://example.org/',
-          'page': 'https://example.com/'
-        }
-      });
-      expect(requests[0].url).to.have.string(CSR_ENDPOINT);
-      expect(requests[0].url).to.have.string('slot0=test');
-      expect(requests[0].url).to.have.string('id0=1');
-      expect(requests[0].url).to.have.string('site=test');
-      expect(requests[0].url).to.have.string('area=areatest');
-      expect(requests[0].url).to.have.string('cre_format=html');
-      expect(requests[0].url).to.have.string('systems=das');
-      expect(requests[0].url).to.have.string('ems_url=1');
-      expect(requests[0].url).to.have.string('bid_rate=1');
-      expect(requests[0].url).to.have.string('gdpr_applies=true');
-      expect(requests[0].url).to.have.string('euconsent=some-consent-string');
-      expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
-      expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
-      expect(requests[0].url).to.have.string('test=name%3Dvalue');
-    });
-
-    it('should return empty consent string when undefined', function () {
-      const requests = spec.buildRequests([bid]);
-      const gdpr = requests[0].url.search('gdpr_applies');
-      const euconsent = requests[0].url.search('euconsent=');
-      expect(gdpr).to.equal(-1);
-      expect(euconsent).to.equal(-1);
-    });
-
-    it('should parse bids to request from pageContext', function () {
-      const bidCopy = { ...bid };
-      bidCopy.params = {
-        ...bid.params,
-        pageContext: {
-          dv: 'test/areatest',
-          du: 'https://example.com/',
-          dr: 'https://example.org/',
-          keyWords: ['val1', 'val2'],
-          keyValues: {
-            adunit: 'test/areatest'
-          }
-        }
-      };
-      const requests = spec.buildRequests([bidCopy, bid2]);
-      expect(requests[0].url).to.have.string(CSR_ENDPOINT);
-      expect(requests[0].url).to.have.string('slot0=test');
-      expect(requests[0].url).to.have.string('id0=1');
-      expect(requests[0].url).to.have.string('iusizes0=300x250%2C300x600');
-      expect(requests[0].url).to.have.string('slot1=test2');
-      expect(requests[0].url).to.have.string('id1=2');
-      expect(requests[0].url).to.have.string('iusizes1=750x300');
-      expect(requests[0].url).to.have.string('site=test');
-      expect(requests[0].url).to.have.string('area=areatest');
-      expect(requests[0].url).to.have.string('cre_format=html');
-      expect(requests[0].url).to.have.string('systems=das');
-      expect(requests[0].url).to.have.string('ems_url=1');
-      expect(requests[0].url).to.have.string('bid_rate=1');
-      expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
-      expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
-      expect(requests[0].url).to.have.string('DV=test%2Fareatest');
-      expect(requests[0].url).to.have.string('kwrd=val1%2Bval2');
-      expect(requests[0].url).to.have.string('kvadunit=test%2Fareatest');
-      expect(requests[0].url).to.have.string('pos0=0');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const response = {
-      'adsCheck': 'ok',
-      'geoloc': {},
-      'ir': '92effd60-0c84-4dac-817e-763ea7b8ac65',
-      'ads': [
-        {
-          'id': 'flat-belkagorna',
-          'slot': 'flat-belkagorna',
-          'prio': 10,
-          'type': 'html',
-          'bid_rate': 0.321123,
-          'adid': 'das,50463,152276',
-          'id_3': '12734',
-          'html': ''
-        }
-      ],
-      'iv': '202003191334467636346500'
-    };
-
-    it('should get correct bid response', function () {
-      const resp = spec.interpretResponse({ body: response }, { bidIds: [{ slot: 'flat-belkagorna', bidId: 1 }] });
-      expect(resp[0]).to.have.all.keys('cpm', 'currency', 'netRevenue', 'requestId', 'ttl', 'width', 'height', 'creativeId', 'dealId', 'ad', 'meta');
-      expect(resp.length).to.equal(1);
-    });
-
-    it('should handle empty ad', function () {
-      let res = {
-        'ads': [{
-          type: 'empty'
-        }]
-      };
-      const resp = spec.interpretResponse({ body: res }, {});
-      expect(resp).to.deep.equal([]);
-    });
-
-    it('should handle empty server response', function () {
-      let res = {
-        'ads': []
-      };
-      const resp = spec.interpretResponse({ body: res }, {});
-      expect(resp).to.deep.equal([]);
-    });
-  });
-});
diff --git a/test/spec/modules/raynRtdProvider_spec.js b/test/spec/modules/raynRtdProvider_spec.js
new file mode 100644
index 00000000000..3920d090550
--- /dev/null
+++ b/test/spec/modules/raynRtdProvider_spec.js
@@ -0,0 +1,333 @@
+import * as raynRTD from 'modules/raynRtdProvider.js';
+import { config } from 'src/config.js';
+import * as utils from 'src/utils.js';
+
+const TEST_CHECKSUM = '-1135402174';
+const TEST_URL = 'http://localhost:9876/context.html';
+const TEST_SEGMENTS = {
+  [TEST_CHECKSUM]: {
+    7: {
+      2: ['51', '246', '652', '48', '324']
+    }
+  }
+};
+
+const RTD_CONFIG = {
+  auctionDelay: 250,
+  dataProviders: [
+    {
+      name: 'rayn',
+      waitForIt: true,
+      params: {
+        bidders: [],
+        integration: {
+          iabAudienceCategories: {
+            v1_1: {
+              tier: 6,
+              enabled: true,
+            },
+          },
+          iabContentCategories: {
+            v3_0: {
+              tier: 4,
+              enabled: true,
+            },
+            v2_2: {
+              tier: 4,
+              enabled: true,
+            },
+          },
+        }
+      },
+    },
+  ],
+};
+
+describe('rayn RTD Submodule', function () {
+  let getDataFromLocalStorageStub;
+
+  beforeEach(function () {
+    config.resetConfig();
+    getDataFromLocalStorageStub = sinon.stub(
+      raynRTD.storage,
+      'getDataFromLocalStorage',
+    );
+  });
+
+  afterEach(function () {
+    getDataFromLocalStorageStub.restore();
+  });
+
+  describe('Initialize module', function () {
+    it('should initialize and return true', function () {
+      expect(raynRTD.raynSubmodule.init(RTD_CONFIG.dataProviders[0])).to.equal(
+        true,
+      );
+    });
+  });
+
+  describe('Generate ortb data object', function () {
+    it('should set empty segment array', function () {
+      expect(raynRTD.generateOrtbDataObject(7, 'invalid', 2).segment).to.be.instanceOf(Array).and.lengthOf(0);
+    });
+
+    it('should set segment array', function () {
+      const expectedSegmentIdsMap = TEST_SEGMENTS[TEST_CHECKSUM][7][2].map((id) => {
+        return { id };
+      });
+      expect(raynRTD.generateOrtbDataObject(7, TEST_SEGMENTS[TEST_CHECKSUM][7], 4)).to.deep.equal({
+        name: raynRTD.SEGMENTS_RESOLVER,
+        ext: {
+          segtax: 7,
+        },
+        segment: expectedSegmentIdsMap,
+      });
+    });
+  });
+
+  describe('Generate checksum', function () {
+    it('should generate checksum', function () {
+      expect(raynRTD.generateChecksum(TEST_URL)).to.equal(TEST_CHECKSUM);
+    });
+  });
+
+  describe('Get segments', function () {
+    it('should get segments from local storage', function () {
+      getDataFromLocalStorageStub
+        .withArgs(raynRTD.RAYN_LOCAL_STORAGE_KEY)
+        .returns(JSON.stringify(TEST_SEGMENTS));
+
+      const segments = raynRTD.readSegments(raynRTD.RAYN_LOCAL_STORAGE_KEY);
+
+      expect(segments).to.deep.equal(TEST_SEGMENTS);
+    });
+
+    it('should return null if unable to read and parse data from local storage', function () {
+      const testString = 'test';
+      getDataFromLocalStorageStub
+        .withArgs(raynRTD.RAYN_LOCAL_STORAGE_KEY)
+        .returns(testString);
+
+      const segments = raynRTD.readSegments(raynRTD.RAYN_LOCAL_STORAGE_KEY);
+
+      expect(segments).to.equal(null);
+    });
+  });
+
+  describe('Set segments as bidder ortb2', function () {
+    it('should set global ortb2 config', function () {
+      const globalOrtb2 = {};
+      const bidders = RTD_CONFIG.dataProviders[0].params.bidders;
+      const integrationConfig = RTD_CONFIG.dataProviders[0].params.integration;
+
+      raynRTD.setSegmentsAsBidderOrtb2({ ortb2Fragments: { global: globalOrtb2 } }, bidders, integrationConfig, TEST_SEGMENTS, TEST_CHECKSUM);
+
+      TEST_SEGMENTS[TEST_CHECKSUM]['7']['2'].forEach((id) => {
+        expect(globalOrtb2.site.content.data[0].segment.find(segment => segment.id === id)).to.exist;
+      })
+    });
+
+    it('should set bidder specific ortb2 config', function () {
+      RTD_CONFIG.dataProviders[0].params.bidders = ['appnexus'];
+
+      const bidderOrtb2 = {};
+      const bidders = RTD_CONFIG.dataProviders[0].params.bidders;
+      const integrationConfig = RTD_CONFIG.dataProviders[0].params.integration;
+
+      raynRTD.setSegmentsAsBidderOrtb2({ ortb2Fragments: { bidder: bidderOrtb2 } }, bidders, integrationConfig, TEST_SEGMENTS, TEST_CHECKSUM);
+
+      bidders.forEach((bidder) => {
+        const ortb2 = bidderOrtb2[bidder];
+        TEST_SEGMENTS[TEST_CHECKSUM]['7']['2'].forEach((id) => {
+          expect(ortb2.site.content.data[0].segment.find(segment => segment.id === id)).to.exist;
+        })
+      });
+    });
+
+    it('should set bidder specific ortb2 config with all segments', function () {
+      TEST_SEGMENTS['4'] = {
+        3: ['4', '17', '72', '612']
+      };
+      TEST_SEGMENTS[TEST_CHECKSUM]['6'] = {
+        2: ['71', '313'],
+        4: ['33', '145', '712']
+      };
+      TEST_SEGMENTS['103015'] = ['agdv23', 'avscg3'];
+
+      const bidderOrtb2 = {};
+      const bidders = RTD_CONFIG.dataProviders[0].params.bidders;
+      const integrationConfig = RTD_CONFIG.dataProviders[0].params.integration;
+
+      raynRTD.setSegmentsAsBidderOrtb2({ ortb2Fragments: { bidder: bidderOrtb2 } }, bidders, integrationConfig, TEST_SEGMENTS, TEST_CHECKSUM);
+
+      bidders.forEach((bidder) => {
+        const ortb2 = bidderOrtb2[bidder];
+
+        TEST_SEGMENTS[TEST_CHECKSUM]['6']['2'].forEach((id) => {
+          expect(ortb2.site.content.data[0].segment.find(segment => segment.id === id)).to.exist;
+        });
+        TEST_SEGMENTS[TEST_CHECKSUM]['6']['4'].forEach((id) => {
+          expect(ortb2.site.content.data[0].segment.find(segment => segment.id === id)).to.exist;
+        });
+        TEST_SEGMENTS[TEST_CHECKSUM]['7']['2'].forEach((id) => {
+          expect(ortb2.site.content.data[1].segment.find(segment => segment.id === id)).to.exist;
+        });
+        TEST_SEGMENTS['4']['3'].forEach((id) => {
+          expect(ortb2.user.data[0].segment.find(segment => segment.id === id)).to.exist;
+        });
+        TEST_SEGMENTS['103015'].forEach((id) => {
+          expect(ortb2.user.data[1].segment.find(segment => segment.id === id)).to.exist;
+        });
+      });
+    });
+  });
+
+  describe('Alter Bid Requests', function () {
+    it('should update reqBidsConfigObj and execute callback', function () {
+      const callbackSpy = sinon.spy();
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+
+      getDataFromLocalStorageStub
+        .withArgs(raynRTD.RAYN_LOCAL_STORAGE_KEY)
+        .returns(JSON.stringify(TEST_SEGMENTS));
+
+      const reqBidsConfigObj = { ortb2Fragments: { bidder: {} } };
+
+      raynRTD.raynSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, RTD_CONFIG);
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(logMessageSpy.lastCall.lastArg).to.equal(`Segtax data from localStorage: ${JSON.stringify(TEST_SEGMENTS)}`);
+
+      logMessageSpy.restore();
+    });
+
+    it('should update reqBidsConfigObj and execute callback using user segments from localStorage', function () {
+      const callbackSpy = sinon.spy();
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const testSegments = {
+        4: {
+          3: ['4', '17', '72', '612']
+        }
+      };
+
+      getDataFromLocalStorageStub
+        .withArgs(raynRTD.RAYN_LOCAL_STORAGE_KEY)
+        .returns(JSON.stringify(testSegments));
+
+      RTD_CONFIG.dataProviders[0].params.integration.iabContentCategories = {
+        v3_0: {
+          enabled: false,
+        },
+        v2_2: {
+          enabled: false,
+        },
+      };
+
+      const reqBidsConfigObj = { ortb2Fragments: { bidder: {} } };
+
+      raynRTD.raynSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, RTD_CONFIG.dataProviders[0]);
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(logMessageSpy.lastCall.lastArg).to.equal(`Segtax data from localStorage: ${JSON.stringify(testSegments)}`);
+
+      logMessageSpy.restore();
+    });
+
+    it('should update reqBidsConfigObj and execute callback using persona segment from localStorage', function () {
+      const callbackSpy = sinon.spy();
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const testSegments = {
+        103015: ['agdv23', 'avscg3']
+      };
+
+      getDataFromLocalStorageStub
+        .withArgs(raynRTD.RAYN_LOCAL_STORAGE_KEY)
+        .returns(JSON.stringify(testSegments));
+
+      const reqBidsConfigObj = { ortb2Fragments: { bidder: {} } };
+
+      raynRTD.raynSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, RTD_CONFIG.dataProviders[0]);
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(logMessageSpy.lastCall.lastArg).to.equal(`Segtax data from localStorage: ${JSON.stringify(testSegments)}`);
+
+      logMessageSpy.restore();
+    });
+
+    it('should update reqBidsConfigObj and execute callback using segments from raynJS', function () {
+      const callbackSpy = sinon.spy();
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+
+      getDataFromLocalStorageStub
+        .withArgs(raynRTD.RAYN_LOCAL_STORAGE_KEY)
+        .returns(null);
+
+      const reqBidsConfigObj = { ortb2Fragments: { bidder: {} } };
+
+      raynRTD.raynSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, RTD_CONFIG.dataProviders[0]);
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(logMessageSpy.lastCall.lastArg).to.equal(`No segtax data`);
+
+      logMessageSpy.restore();
+    });
+
+    it('should update reqBidsConfigObj and execute callback using audience from localStorage', function (done) {
+      const callbackSpy = sinon.spy();
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const testSegments = {
+        6: {
+          4: ['3', '27', '177']
+        }
+      };
+
+      global.window.raynJS = {
+        getSegtax: function () {
+          return Promise.resolve(testSegments);
+        }
+      };
+
+      getDataFromLocalStorageStub
+        .withArgs(raynRTD.RAYN_LOCAL_STORAGE_KEY)
+        .returns(null);
+
+      const reqBidsConfigObj = { ortb2Fragments: { bidder: {} } };
+
+      raynRTD.raynSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, RTD_CONFIG.dataProviders[0]);
+
+      setTimeout(() => {
+        expect(callbackSpy.calledOnce).to.be.true;
+        expect(logMessageSpy.lastCall.lastArg).to.equal(`Segtax data from RaynJS: ${JSON.stringify(testSegments)}`);
+        logMessageSpy.restore();
+        done();
+      }, 0)
+    });
+
+    it('should execute callback if log error', function (done) {
+      const callbackSpy = sinon.spy();
+      const logErrorSpy = sinon.spy(utils, 'logError');
+      const rejectError = 'Error';
+
+      global.window.raynJS = {
+        getSegtax: function () {
+          return Promise.reject(rejectError);
+        }
+      };
+
+      getDataFromLocalStorageStub
+        .withArgs(raynRTD.RAYN_LOCAL_STORAGE_KEY)
+        .returns(null);
+
+      const reqBidsConfigObj = { ortb2Fragments: { bidder: {} } };
+
+      raynRTD.raynSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, RTD_CONFIG.dataProviders[0]);
+
+      setTimeout(() => {
+        expect(callbackSpy.calledOnce).to.be.true;
+        expect(logErrorSpy.lastCall.lastArg).to.equal(rejectError);
+        logErrorSpy.restore();
+        done();
+      }, 0)
+    });
+  });
+});
diff --git a/test/spec/modules/readpeakBidAdapter_spec.js b/test/spec/modules/readpeakBidAdapter_spec.js
index 8772aeac88f..32a4d991054 100644
--- a/test/spec/modules/readpeakBidAdapter_spec.js
+++ b/test/spec/modules/readpeakBidAdapter_spec.js
@@ -376,7 +376,7 @@ describe('ReadPeakAdapter', function() {
           height: 500
         });
         expect(bidResponse.native.clickUrl).to.equal(
-          'http%3A%2F%2Furl.to%2Ftarget'
+          'http://url.to/target'
         );
         expect(bidResponse.native.impressionTrackers).to.contain(
           'http://url.to/pixeltracker'
diff --git a/test/spec/modules/realTimeDataModule_spec.js b/test/spec/modules/realTimeDataModule_spec.js
index 938e2e2f3c1..0f66b0253a2 100644
--- a/test/spec/modules/realTimeDataModule_spec.js
+++ b/test/spec/modules/realTimeDataModule_spec.js
@@ -1,7 +1,7 @@
 import * as rtdModule from 'modules/rtdModule/index.js';
 import {config} from 'src/config.js';
 import * as sinon from 'sinon';
-import {default as CONSTANTS} from '../../../src/constants.json';
+import { EVENTS } from '../../../src/constants.js';
 import * as events from '../../../src/events.js';
 import 'src/prebid.js';
 import {attachRealTimeDataProvider, onDataDeletionRequest} from 'modules/rtdModule/index.js';
@@ -255,11 +255,11 @@ describe('Real time module', function () {
   });
 
   describe('event', () => {
-    const EVENTS = {
-      [CONSTANTS.EVENTS.AUCTION_INIT]: 'onAuctionInitEvent',
-      [CONSTANTS.EVENTS.AUCTION_END]: 'onAuctionEndEvent',
-      [CONSTANTS.EVENTS.BID_RESPONSE]: 'onBidResponseEvent',
-      [CONSTANTS.EVENTS.BID_REQUESTED]: 'onBidRequestEvent'
+    const TEST_EVENTS = {
+      [EVENTS.AUCTION_INIT]: 'onAuctionInitEvent',
+      [EVENTS.AUCTION_END]: 'onAuctionEndEvent',
+      [EVENTS.BID_RESPONSE]: 'onBidResponseEvent',
+      [EVENTS.BID_REQUESTED]: 'onBidRequestEvent'
     }
     const conf = {
       'realTimeData': {
@@ -281,7 +281,7 @@ describe('Real time module', function () {
         name: name,
         init: () => true,
       }
-      Object.values(EVENTS).forEach((ev) => provider[ev] = sinon.spy());
+      Object.values(TEST_EVENTS).forEach((ev) => provider[ev] = sinon.spy());
       return provider;
     }
 
@@ -303,13 +303,13 @@ describe('Real time module', function () {
         adUnitCodes: ['a1'],
         adUnits: [{code: 'a1'}]
       };
-      mockEmitEvent(CONSTANTS.EVENTS.AUCTION_END, auction);
+      mockEmitEvent(EVENTS.AUCTION_END, auction);
       providers.forEach(p => {
         expect(p.getTargetingData.calledWith(auction.adUnitCodes)).to.be.true;
       });
     });
 
-    Object.entries(EVENTS).forEach(([event, hook]) => {
+    Object.entries(TEST_EVENTS).forEach(([event, hook]) => {
       it(`'${event}' should be propagated to providers through '${hook}'`, () => {
         const eventArg = {};
         mockEmitEvent(event, eventArg);
diff --git a/test/spec/modules/relaidoBidAdapter_spec.js b/test/spec/modules/relaidoBidAdapter_spec.js
index 7778e9cbf80..5cb47eb8f51 100644
--- a/test/spec/modules/relaidoBidAdapter_spec.js
+++ b/test/spec/modules/relaidoBidAdapter_spec.js
@@ -3,6 +3,7 @@ import {spec} from 'modules/relaidoBidAdapter.js';
 import * as utils from 'src/utils.js';
 import {VIDEO} from 'src/mediaTypes.js';
 import {getCoreStorageManager} from '../../../src/storageManager.js';
+import * as mockGpt from '../integration/faker/googletag.js';
 
 const UUID_KEY = 'relaido_uuid';
 const relaido_uuid = 'hogehoge';
@@ -15,14 +16,18 @@ describe('RelaidoAdapter', function () {
   let serverRequest;
   let generateUUIDStub;
   let triggerPixelStub;
+  let sandbox;
+
   before(() => {
     const storage = getCoreStorageManager();
     storage.setCookie(UUID_KEY, relaido_uuid);
   });
 
   beforeEach(function () {
+    mockGpt.disable();
     generateUUIDStub = sinon.stub(utils, 'generateUUID').returns(relaido_uuid);
     triggerPixelStub = sinon.stub(utils, 'triggerPixel');
+    sandbox = sinon.sandbox.create();
     bidRequest = {
       bidder: 'relaido',
       params: {
@@ -110,11 +115,17 @@ describe('RelaidoAdapter', function () {
         }]
       }
     };
+    window.RelaidoPlayer = {
+      renderAd: function() {
+        return null;
+      }
+    };
   });
 
   afterEach(() => {
     generateUUIDStub.restore();
     triggerPixelStub.restore();
+    sandbox.restore();
   });
 
   describe('spec.isBidRequestValid', function () {
@@ -239,6 +250,7 @@ describe('RelaidoAdapter', function () {
       const request = data.bids[0];
       expect(bidRequests.method).to.equal('POST');
       expect(bidRequests.url).to.equal('https://api.relaido.jp/bid/v1/sprebid');
+      expect(data.canonical_url).to.equal('https://publisher.com/home');
       expect(data.canonical_url_hash).to.equal('e6092f44a0044903ae3764126eedd6187c1d9f04');
       expect(data.ref).to.equal(bidderRequest.refererInfo.page);
       expect(data.timeout_ms).to.equal(bidderRequest.timeout);
@@ -250,8 +262,10 @@ describe('RelaidoAdapter', function () {
       expect(request.bid_id).to.equal(bidRequest.bidId);
       expect(request.transaction_id).to.equal(bidRequest.ortb2Imp.ext.tid);
       expect(request.media_type).to.equal('video');
+      expect(request.pagekvt).to.deep.equal({});
       expect(data.uuid).to.equal(relaido_uuid);
       expect(data.pv).to.equal('$prebid.version$');
+      expect(request.userIdAsEids).to.be.an('array');
     });
 
     it('should build bid requests by banner', function () {
@@ -317,6 +331,77 @@ describe('RelaidoAdapter', function () {
       expect(data.bids).to.have.lengthOf(1);
       expect(data.imuid).to.equal('i.tjHcK_7fTcqnbrS_YA2vaw');
     });
+
+    it('should get userIdAsEids', function () {
+      const userIdAsEids = [
+        {
+          source: 'hogehoge.com',
+          uids: {
+            atype: 1,
+            id: 'hugahuga'
+          }
+        }
+      ]
+      bidRequest.userIdAsEids = userIdAsEids
+      const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids[0].userIdAsEids).to.have.lengthOf(1);
+      expect(data.bids[0].userIdAsEids[0].source).to.equal('hogehoge.com');
+    });
+
+    it('should get pagekvt', function () {
+      mockGpt.enable();
+      window.googletag.pubads().clearTargeting();
+      window.googletag.pubads().setTargeting('testkey', ['testvalue']);
+      bidRequest.adUnitCode = 'test-adunit-code-1';
+      window.googletag.pubads().setSlots([mockGpt.makeSlot({ code: bidRequest.adUnitCode })]);
+      const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids).to.have.lengthOf(1);
+      const request = data.bids[0];
+      expect(request.pagekvt).to.deep.equal({testkey: ['testvalue']});
+    });
+
+    it('should get canonicalUrl (ogUrl:true)', function () {
+      bidRequest.params.ogUrl = true;
+      bidderRequest.refererInfo.canonicalUrl = null;
+      let documentStub = sandbox.stub(window.top.document, 'querySelector');
+      documentStub.withArgs('meta[property="og:url"]').returns({
+        content: 'http://localhost:9999/fb-test'
+      });
+      const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids).to.have.lengthOf(1);
+      expect(data.canonical_url).to.equal('http://localhost:9999/fb-test');
+      expect(data.canonical_url_hash).to.equal('cd106829f866d60ee4ed43c6e2a5d0a5212ffc97');
+    });
+
+    it('should not get canonicalUrl (ogUrl:false)', function () {
+      bidRequest.params.ogUrl = false;
+      bidderRequest.refererInfo.canonicalUrl = null;
+      let documentStub = sandbox.stub(window.top.document, 'querySelector');
+      documentStub.withArgs('meta[property="og:url"]').returns({
+        content: 'http://localhost:9999/fb-test'
+      });
+      const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids).to.have.lengthOf(1);
+      expect(data.canonical_url).to.be.null;
+      expect(data.canonical_url_hash).to.be.null;
+    });
+
+    it('should not get canonicalUrl (ogUrl:nothing)', function () {
+      bidderRequest.refererInfo.canonicalUrl = null;
+      let documentStub = sandbox.stub(window.top.document, 'querySelector');
+      documentStub.withArgs('meta[property="og:url"]').returns({
+        content: 'http://localhost:9999/fb-test'
+      });
+      const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids).to.have.lengthOf(1);
+      expect(data.canonical_url).to.be.null;
+      expect(data.canonical_url_hash).to.be.null;
+    });
   });
 
   describe('spec.interpretResponse', function () {
@@ -325,6 +410,7 @@ describe('RelaidoAdapter', function () {
       expect(bidResponses).to.have.lengthOf(1);
       const response = bidResponses[0];
       expect(response.requestId).to.equal(serverRequest.data.bids[0].bidId);
+      expect(response.placementId).to.equal(serverResponse.body.ads[0].placementId);
       expect(response.width).to.equal(serverRequest.data.bids[0].width);
       expect(response.height).to.equal(serverRequest.data.bids[0].height);
       expect(response.cpm).to.equal(serverResponse.body.ads[0].price);
@@ -343,6 +429,7 @@ describe('RelaidoAdapter', function () {
       expect(bidResponses).to.have.lengthOf(1);
       const response = bidResponses[0];
       expect(response.requestId).to.equal(serverRequest.data.bids[0].bidId);
+      expect(response.placementId).to.equal(serverResponse.body.ads[0].placementId);
       expect(response.width).to.equal(serverRequest.data.bids[0].width);
       expect(response.height).to.equal(serverRequest.data.bids[0].height);
       expect(response.cpm).to.equal(serverResponse.body.ads[0].price);
@@ -360,6 +447,7 @@ describe('RelaidoAdapter', function () {
       expect(bidResponses).to.have.lengthOf(1);
       const response = bidResponses[0];
       expect(response.requestId).to.equal(serverRequest.data.bids[0].bidId);
+      expect(response.placementId).to.equal(serverResponseBanner.body.ads[0].placementId);
       expect(response.cpm).to.equal(serverResponseBanner.body.ads[0].price);
       expect(response.currency).to.equal(serverResponseBanner.body.ads[0].currency);
       expect(response.creativeId).to.equal(serverResponseBanner.body.ads[0].creativeId);
@@ -486,4 +574,20 @@ describe('RelaidoAdapter', function () {
       expect(query.ref).to.include(window.location.href);
     });
   });
+
+  describe('spec.outstreamRender', function () {
+    it('Should to pass a Bid to renderAd', function () {
+      const bidResponses = spec.interpretResponse(serverResponse, serverRequest);
+      const response = bidResponses[0];
+      sinon.spy(window.RelaidoPlayer, 'renderAd');
+      response.renderer.render(response);
+      const renderCall = window.RelaidoPlayer.renderAd.getCall(0);
+      const arg = renderCall.args[0];
+      expect(arg.width).to.equal(640);
+      expect(arg.height).to.equal(360);
+      expect(arg.vastXml).to.equal('');
+      expect(arg.mediaType).to.equal(VIDEO);
+      expect(arg.placementId).to.equal(100000);
+    });
+  });
 });
diff --git a/test/spec/modules/relevantAnalyticsAdapter_spec.js b/test/spec/modules/relevantAnalyticsAdapter_spec.js
index 5c818fe01d4..e3d0eca1b7b 100644
--- a/test/spec/modules/relevantAnalyticsAdapter_spec.js
+++ b/test/spec/modules/relevantAnalyticsAdapter_spec.js
@@ -1,7 +1,7 @@
 import relevantAnalytics from '../../../modules/relevantAnalyticsAdapter.js';
 import adapterManager from 'src/adapterManager';
 import * as events from 'src/events';
-import constants from 'src/constants.json'
+import { EVENTS } from 'src/constants.js'
 import { expect } from 'chai';
 
 describe('Relevant Analytics Adapter', () => {
@@ -18,8 +18,8 @@ describe('Relevant Analytics Adapter', () => {
   it('should pass all events to the global array', () => {
     // Given
     const testEvents = [
-      { ev: constants.EVENTS.AUCTION_INIT, args: { test: 1 } },
-      { ev: constants.EVENTS.BID_REQUESTED, args: { test: 2 } },
+      { ev: EVENTS.AUCTION_INIT, args: { test: 1 } },
+      { ev: EVENTS.BID_REQUESTED, args: { test: 2 } },
     ];
 
     // When
diff --git a/test/spec/modules/relevantdigitalBidAdapter_spec.js b/test/spec/modules/relevantdigitalBidAdapter_spec.js
index b2a5495b3cb..45a84d5991d 100644
--- a/test/spec/modules/relevantdigitalBidAdapter_spec.js
+++ b/test/spec/modules/relevantdigitalBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import {spec, resetBidderConfigs} from 'modules/relevantdigitalBidAdapter.js';
-import { parseUrl, deepClone } from 'src/utils.js';
+import { parseUrl } from 'src/utils.js';
 
 const expect = require('chai').expect;
 
@@ -8,15 +8,19 @@ const PLACEMENT_ID = 'example_placement_id';
 const ACCOUNT_ID = 'example_account_id';
 const TEST_DOMAIN = 'example.com';
 const TEST_PAGE = `https://${TEST_DOMAIN}/page.html`;
+const ADUNIT_CODE = '/19968336/header-bid-tag-0';
 
-const BID_REQUEST =
-{
-  'bidder': 'relevantdigital',
+const BID_PARAMS = {
   'params': {
     'placementId': PLACEMENT_ID,
     'accountId': ACCOUNT_ID,
-    'pbsHost': PBS_HOST,
-  },
+    'pbsHost': PBS_HOST
+  }
+};
+
+const BID_REQUEST = {
+  'bidder': 'relevantdigital',
+  ...BID_PARAMS,
   'ortb2Imp': {
     'ext': {
       'tid': 'e13391ea-00f3-495d-99a6-d937990d73a9'
@@ -32,7 +36,7 @@ const BID_REQUEST =
       ]
     }
   },
-  'adUnitCode': '/19968336/header-bid-tag-0',
+  'adUnitCode': ADUNIT_CODE,
   'transactionId': 'e13391ea-00f3-495d-99a6-d937990d73a9',
   'sizes': [
     [
diff --git a/test/spec/modules/relevatehealthBidAdapter_spec.js b/test/spec/modules/relevatehealthBidAdapter_spec.js
new file mode 100644
index 00000000000..ef974bc3ac1
--- /dev/null
+++ b/test/spec/modules/relevatehealthBidAdapter_spec.js
@@ -0,0 +1,239 @@
+import {
+  expect
+} from 'chai';
+import {
+  spec
+} from '../../../modules/relevatehealthBidAdapter.js';
+import * as utils from '../../../src/utils.js';
+
+describe('relevatehealth adapter', function() {
+  let request;
+  let bannerResponse, invalidResponse;
+
+  beforeEach(function() {
+    request = [{
+      bidder: 'relevatehealth',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [160, 600]
+          ]
+        }
+      },
+      params: {
+        placement_id: 110011,
+        user_id: '11211',
+        width: 160,
+        height: 600,
+        domain: '',
+        bid_floor: 0.5
+      }
+    }];
+    bannerResponse = {
+      'body': {
+        'id': 'a48b79e7-7104-4213-99f3-55f3234f2e54',
+        'seatbid': [{
+          'bid': [{
+            'id': '3d7dd6dc-7665-4cdc-96a4-5ea192df32b8',
+            'impid': '285b9c53b2c662',
+            'price': 20.68,
+            'adid': '3389',
+            'adm': "",
+            'adomain': ['google.com'],
+            'iurl': 'https://rtb.relevate.health/prebid/relevate',
+            'cid': '1431/3389',
+            'crid': '3389',
+            'w': 160,
+            'h': 600,
+            'cat': ['IAB1-15']
+          }],
+          'seat': '00001',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_1276'
+      }
+    };
+    invalidResponse = {
+      'body': {
+        'id': 'a48b79e7-7104-4213-99f3-55f3234f2e54',
+        'seatbid': [{
+          'bid': [{
+            'id': '3d7dd6dc-7665-4cdc-96a4-5ea192df32b8',
+            'impid': '285b9c53b2c662',
+            'price': 20.68,
+            'adid': '3389',
+            'adm': 'invalid response',
+            'adomain': ['google.com'],
+            'iurl': 'https://rtb.relevate.health/prebid/relevate',
+            'cid': '1431/3389',
+            'crid': '3389',
+            'w': 160,
+            'h': 600,
+            'cat': ['IAB1-15']
+          }],
+          'seat': '00001',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_1276'
+      }
+    };
+  });
+
+  describe('validations', function() {
+    it('isBidValid : placement_id and user_id are passed', function() {
+      let bid = {
+          bidder: 'relevatehealth',
+          params: {
+            placement_id: 110011,
+            user_id: '11211'
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(true);
+    });
+    it('isBidValid : placement_id and user_id are not passed', function() {
+      let bid = {
+          bidder: 'relevatehealth',
+          params: {
+            width: 160,
+            height: 600,
+            domain: '',
+            bid_floor: 0.5
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(false);
+    });
+    it('isBidValid : placement_id is passed but user_id is not passed', function() {
+      let bid = {
+          bidder: 'relevatehealth',
+          params: {
+            placement_id: 110011,
+            width: 160,
+            height: 600,
+            domain: '',
+            bid_floor: 0.5
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(false);
+    });
+    it('isBidValid : user_id is passed but placement_id is not passed', function() {
+      let bid = {
+          bidder: 'relevatehealth',
+          params: {
+            width: 160,
+            height: 600,
+            domain: '',
+            bid_floor: 0.5,
+            user_id: '11211'
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(false);
+    });
+  });
+  describe('Validate Request', function() {
+    it('Immutable bid request validate', function() {
+      let _Request = utils.deepClone(request),
+        bidRequest = spec.buildRequests(request);
+      expect(request).to.deep.equal(_Request);
+    });
+    it('Validate bidder connection', function() {
+      let _Request = spec.buildRequests(request);
+      expect(_Request.url).to.equal('https://rtb.relevate.health/prebid/relevate');
+      expect(_Request.method).to.equal('POST');
+      expect(_Request.options.contentType).to.equal('application/json');
+    });
+    it('Validate bid request : Impression', function() {
+      let _Request = spec.buildRequests(request);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].imp[0].id).to.equal(request[0].bidId);
+      expect(data[0].placementId).to.equal(110011);
+    });
+    it('Validate bid request : ad size', function() {
+      let _Request = spec.buildRequests(request);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].imp[0].banner).to.be.a('object');
+      expect(data[0].imp[0].banner.w).to.equal(160);
+      expect(data[0].imp[0].banner.h).to.equal(600);
+    });
+    it('Validate bid request : user object', function() {
+      let _Request = spec.buildRequests(request);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].user).to.be.a('object');
+      expect(data[0].user.id).to.be.a('string');
+    });
+    it('Validate bid request : CCPA Check', function() {
+      let bidRequest = {
+        uspConsent: '1NYN'
+      };
+      let _Request = spec.buildRequests(request, bidRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].us_privacy).to.equal('1NYN');
+    });
+  });
+  describe('Validate response ', function() {
+    it('Validate bid response : valid bid response', function() {
+      let bResponse = spec.interpretResponse(bannerResponse, request);
+      expect(bResponse).to.be.an('array').with.length.above(0);
+      expect(bResponse[0].requestId).to.equal(bannerResponse.body.seatbid[0].bid[0].impid);
+      expect(bResponse[0].width).to.equal(bannerResponse.body.seatbid[0].bid[0].w);
+      expect(bResponse[0].height).to.equal(bannerResponse.body.seatbid[0].bid[0].h);
+      expect(bResponse[0].currency).to.equal('USD');
+      expect(bResponse[0].netRevenue).to.equal(false);
+      expect(bResponse[0].mediaType).to.equal('banner');
+      expect(bResponse[0].meta.advertiserDomains).to.deep.equal(['google.com']);
+      expect(bResponse[0].ttl).to.equal(300);
+      expect(bResponse[0].creativeId).to.equal(bannerResponse.body.seatbid[0].bid[0].crid);
+      expect(bResponse[0].dealId).to.equal(bannerResponse.body.seatbid[0].bid[0].dealId);
+    });
+    it('Invalid bid response check ', function() {
+      let bRequest = spec.buildRequests(request);
+      let response = spec.interpretResponse(invalidResponse, bRequest);
+      expect(response[0].ad).to.equal('invalid response');
+    });
+  });
+  describe('GPP and coppa', function() {
+    it('Request params check with GPP Consent', function() {
+      let bidderReq = {
+        gppConsent: {
+          gppString: 'gpp-string-test',
+          applicableSections: [5]
+        }
+      };
+      let _Request = spec.buildRequests(request, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].gpp).to.equal('gpp-string-test');
+      expect(data[0].gpp_sid[0]).to.equal(5);
+    });
+    it('Request params check with GPP Consent read from ortb2', function() {
+      let bidderReq = {
+        ortb2: {
+          regs: {
+            gpp: 'gpp-test-string',
+            gpp_sid: [5]
+          }
+        }
+      };
+      let _Request = spec.buildRequests(request, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].gpp).to.equal('gpp-test-string');
+      expect(data[0].gpp_sid[0]).to.equal(5);
+    });
+    it(' Bid request should have coppa flag if its true', () => {
+      let bidderReq = {
+        ortb2: {
+          regs: {
+            coppa: 1
+          }
+        }
+      };
+      let _Request = spec.buildRequests(request, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].coppa).to.equal(1);
+    });
+  });
+});
diff --git a/test/spec/modules/retailspotBidAdapter_spec.js b/test/spec/modules/retailspotBidAdapter_spec.js
index 39cddb323b8..f1fb5ae3fd3 100644
--- a/test/spec/modules/retailspotBidAdapter_spec.js
+++ b/test/spec/modules/retailspotBidAdapter_spec.js
@@ -286,19 +286,19 @@ describe('RetailSpot Adapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.size;
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.sizes;
 
-      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placement': 0
       };
-      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/rewardedInterestIdSystem_spec.js b/test/spec/modules/rewardedInterestIdSystem_spec.js
new file mode 100644
index 00000000000..b6ce1e03f76
--- /dev/null
+++ b/test/spec/modules/rewardedInterestIdSystem_spec.js
@@ -0,0 +1,190 @@
+import sinon from 'sinon';
+import {expect} from 'chai';
+import * as utils from 'src/utils.js';
+import {attachIdSystem} from 'modules/userId';
+import {createEidsArray} from 'modules/userId/eids';
+import {
+  MODULE_NAME,
+  SOURCE,
+  getRewardedInterestApi,
+  watchRewardedInterestApi,
+  getRewardedInterestId,
+  apiNotAvailable,
+  rewardedInterestIdSubmodule
+} from 'modules/rewardedInterestIdSystem.js';
+
+describe('rewardedInterestIdSystem', () => {
+  const mockUserId = 'rewarded_interest_id';
+  const mockApi = {
+    getApiVersion: () => '1.0',
+    getIdentityToken: () => Promise.resolve(mockUserId)
+  };
+  const errorApiNotFound = `${MODULE_NAME} module: Rewarded Interest API not found`;
+  const errorIdFetch = `${MODULE_NAME} module: ID fetch encountered an error`;
+  let mockReadySate = 'complete';
+  let logErrorSpy;
+  let callbackSpy;
+
+  before(() => {
+    Object.defineProperty(document, 'readyState', {
+      get() {
+        return mockReadySate;
+      },
+    });
+  });
+
+  beforeEach(() => {
+    logErrorSpy = sinon.spy(utils, 'logError');
+    callbackSpy = sinon.spy();
+  });
+
+  afterEach(() => {
+    mockReadySate = 'complete';
+    delete window.__riApi;
+    logErrorSpy.restore();
+  });
+
+  describe('getRewardedInterestApi', () => {
+    it('should return Rewarded Interest Api if exists', () => {
+      expect(getRewardedInterestApi()).to.be.undefined;
+      window.__riApi = {};
+      expect(getRewardedInterestApi()).to.be.undefined;
+      window.__riApi.getIdentityToken = mockApi.getIdentityToken;
+      expect(getRewardedInterestApi()).to.deep.equal(window.__riApi);
+    });
+  });
+
+  describe('watchRewardedInterestApi', () => {
+    it('should execute callback when __riApi is set', () => {
+      watchRewardedInterestApi(callbackSpy);
+      expect(window.__riApi).to.be.undefined;
+      window.__riApi = mockApi;
+      expect(callbackSpy.calledOnceWithExactly(mockApi)).to.be.true;
+      expect(getRewardedInterestApi()).to.deep.equal(mockApi);
+    });
+  });
+
+  describe('getRewardedInterestId', () => {
+    it('should get id from API and pass it to callback', async () => {
+      await getRewardedInterestId(mockApi, callbackSpy);
+      expect(callbackSpy.calledOnceWithExactly(mockUserId)).to.be.true;
+    });
+  });
+
+  describe('apiNotAvailable', () => {
+    it('should call callback without ID and log error', () => {
+      apiNotAvailable(callbackSpy);
+      expect(callbackSpy.calledOnceWithExactly()).to.be.true;
+      expect(logErrorSpy.calledOnceWithExactly(errorApiNotFound)).to.be.true;
+    });
+  });
+
+  describe('rewardedInterestIdSubmodule.name', () => {
+    it('should expose the name of the submodule', () => {
+      expect(rewardedInterestIdSubmodule).to.be.an.instanceof(Object);
+      expect(rewardedInterestIdSubmodule.name).to.equal(MODULE_NAME);
+    });
+  });
+
+  describe('rewardedInterestIdSubmodule.decode', () => {
+    it('should wrap the given value inside an object literal', () => {
+      expect(rewardedInterestIdSubmodule.decode(mockUserId)).to.deep.equal({ [MODULE_NAME]: mockUserId });
+      expect(rewardedInterestIdSubmodule.decode('')).to.be.undefined;
+      expect(rewardedInterestIdSubmodule.decode(null)).to.be.undefined;
+    });
+  });
+
+  describe('rewardedInterestIdSubmodule.getId', () => {
+    it('should return object with callback property', () => {
+      const idResponse = rewardedInterestIdSubmodule.getId();
+      expect(idResponse).to.be.an.instanceof(Object);
+      expect(idResponse).to.have.property('callback');
+      expect(idResponse.callback).to.be.a('function');
+    });
+
+    it('API not found, window loaded', async () => {
+      const idResponse = rewardedInterestIdSubmodule.getId();
+      idResponse.callback(callbackSpy);
+      await Promise.resolve();
+      expect(callbackSpy.calledOnceWithExactly()).to.be.true;
+      expect(logErrorSpy.calledOnceWithExactly(errorApiNotFound)).to.be.true;
+    });
+
+    it('API not found, window not loaded', async () => {
+      mockReadySate = 'loading';
+      const idResponse = rewardedInterestIdSubmodule.getId();
+      idResponse.callback(callbackSpy);
+      window.dispatchEvent(new Event('load'));
+      expect(callbackSpy.calledOnceWithExactly()).to.be.true;
+      expect(logErrorSpy.calledOnceWithExactly(errorApiNotFound)).to.be.true;
+    });
+
+    it('API is set before getId, getIdentityToken return error', async () => {
+      const error = Error();
+      window.__riApi = {getIdentityToken: () => Promise.reject(error)};
+      const idResponse = rewardedInterestIdSubmodule.getId();
+      idResponse.callback(callbackSpy);
+      await window.__riApi.getIdentityToken().catch(() => {});
+      expect(callbackSpy.calledOnceWithExactly()).to.be.true;
+      expect(logErrorSpy.calledOnceWithExactly(errorIdFetch, error)).to.be.true;
+    });
+
+    it('API is set after getId, getIdentityToken return error', async () => {
+      const error = Error();
+      mockReadySate = 'loading';
+      const idResponse = rewardedInterestIdSubmodule.getId();
+      idResponse.callback(callbackSpy);
+      window.__riApi = {getIdentityToken: () => Promise.reject(error)};
+      await window.__riApi.getIdentityToken().catch(() => {});
+      expect(callbackSpy.calledOnceWithExactly()).to.be.true;
+      expect(logErrorSpy.calledOnceWithExactly(errorIdFetch, error)).to.be.true;
+    });
+
+    it('API is set before getId, getIdentityToken return user ID', async () => {
+      window.__riApi = mockApi;
+      const idResponse = rewardedInterestIdSubmodule.getId();
+      idResponse.callback(callbackSpy);
+      await mockApi.getIdentityToken();
+      expect(callbackSpy.calledOnceWithExactly(mockUserId)).to.be.true;
+    });
+
+    it('API is set after getId, getIdentityToken return user ID', async () => {
+      mockReadySate = 'loading';
+      const idResponse = rewardedInterestIdSubmodule.getId();
+      idResponse.callback(callbackSpy);
+      window.__riApi = mockApi;
+      window.dispatchEvent(new Event('load'));
+      await window.__riApi.getIdentityToken().catch(() => {});
+      expect(callbackSpy.calledOnceWithExactly(mockUserId)).to.be.true;
+    });
+  });
+
+  describe('rewardedInterestIdSubmodule.eids', () => {
+    it('should expose the eids of the submodule', () => {
+      expect(rewardedInterestIdSubmodule).to.have.property('eids');
+      expect(rewardedInterestIdSubmodule.eids).to.be.a('object');
+      expect(rewardedInterestIdSubmodule.eids).to.deep.equal({
+        [MODULE_NAME]: {
+          source: SOURCE,
+          atype: 3,
+        },
+      });
+    });
+
+    it('createEidsArray', () => {
+      attachIdSystem(rewardedInterestIdSubmodule);
+      const eids = createEidsArray({
+        [MODULE_NAME]: mockUserId
+      });
+      expect(eids).to.be.a('array');
+      expect(eids.length).to.equal(1);
+      expect(eids[0]).to.deep.equal({
+        source: SOURCE,
+        uids: [{
+          id: mockUserId,
+          atype: 3,
+        }]
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/richaudienceBidAdapter_spec.js b/test/spec/modules/richaudienceBidAdapter_spec.js
index ea45ff7e0b0..26d226b65f3 100644
--- a/test/spec/modules/richaudienceBidAdapter_spec.js
+++ b/test/spec/modules/richaudienceBidAdapter_spec.js
@@ -4,6 +4,8 @@ import {
   spec
 } from 'modules/richaudienceBidAdapter.js';
 import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+import sinon from 'sinon';
 
 describe('Richaudience adapter tests', function () {
   var DEFAULT_PARAMS_NEW_SIZES = [{
@@ -33,6 +35,53 @@ describe('Richaudience adapter tests', function () {
     user: {}
   }];
 
+  var DEFAULT_PARAMS_NEW_DSA = [{
+    adUnitCode: 'test-div',
+    bidId: '2c7c8e9c900244',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250], [300, 600], [728, 90], [970, 250]]
+      }
+    },
+    bidder: 'richaudience',
+    params: {
+      bidfloor: 0.5,
+      pid: 'ADb1f40rmi',
+      supplyType: 'site',
+      keywords: 'key1=value1;key2=value2'
+    },
+    auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
+    bidRequestsCount: 1,
+    bidderRequestId: '1858b7382993ca',
+    ortb2: {
+      regs: {
+        ext: {
+          dsa: {
+            dsarequired: 2,
+            pubrender: 1,
+            datatopub: 1,
+            transparency: [
+              {
+                domain: 'richaudience.com',
+                dsaparams: [1, 3, 6]
+              },
+              {
+                domain: 'adpone.com',
+                dsaparams: [8, 10, 12]
+              },
+              {
+                domain: 'sunmedia.com',
+                dsaparams: [14, 16, 18]
+              }
+            ]
+          }
+        }
+      }
+    },
+    user: {}
+  }];
+
   var DEFAULT_PARAMS_NEW_SIZES_GPID = [{
     adUnitCode: 'test-div',
     bidId: '2c7c8e9c900244',
@@ -64,6 +113,30 @@ describe('Richaudience adapter tests', function () {
     user: {}
   }];
 
+  var DEFAULT_PARAMS_VIDEO_TIMEOUT = [{
+    adUnitCode: 'test-div',
+    bidId: '2c7c8e9c900244',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        mimes: ['video/mp4']
+      }
+    },
+    bidder: 'richaudience',
+    params: [{
+      bidfloor: 0.5,
+      pid: 'ADb1f40rmi',
+      supplyType: 'site'
+    }],
+    timeout: 3000,
+    auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
+    bidRequestsCount: 1,
+    bidderRequestId: '1858b7382993ca',
+    transactionId: '29df2112-348b-4961-8863-1b33684d95e6',
+    user: {}
+  }]
+
   var DEFAULT_PARAMS_VIDEO_IN = [{
     adUnitCode: 'test-div',
     bidId: '2c7c8e9c900244',
@@ -185,7 +258,7 @@ describe('Richaudience adapter tests', function () {
       currency: 'USD',
       ttl: 300,
       dealId: 'dealId',
-      adomain: 'richaudience.com'
+      adomain: ['richaudience.com']
     }
   };
 
@@ -201,7 +274,7 @@ describe('Richaudience adapter tests', function () {
       ttl: 300,
       vastXML: '',
       dealId: 'dealId',
-      adomain: 'richaudience.com'
+      adomain: ['richaudience.com']
     }
   };
 
@@ -267,7 +340,7 @@ describe('Richaudience adapter tests', function () {
     expect(requestContent.sizes[3]).to.have.property('w').and.to.equal(970);
     expect(requestContent.sizes[3]).to.have.property('h').and.to.equal(250);
     expect(requestContent).to.have.property('transactionId').and.to.equal('29df2112-348b-4961-8863-1b33684d95e6');
-    expect(requestContent).to.have.property('timeout').and.to.equal(3000);
+    expect(requestContent).to.have.property('timeout').and.to.equal(600);
     expect(requestContent).to.have.property('numIframes').and.to.equal(0);
     expect(typeof requestContent.scr_rsl === 'string')
     expect(typeof requestContent.cpuc === 'number')
@@ -637,7 +710,7 @@ describe('Richaudience adapter tests', function () {
     expect(bid.currency).to.equal('USD');
     expect(bid.ttl).to.equal(300);
     expect(bid.dealId).to.equal('dealId');
-    expect(bid.meta).to.equal('richaudience.com');
+    expect(bid.meta.advertiserDomains[0]).to.equal('richaudience.com');
   });
 
   it('no banner media response inestream', function () {
@@ -666,7 +739,7 @@ describe('Richaudience adapter tests', function () {
     expect(bid.currency).to.equal('USD');
     expect(bid.ttl).to.equal(300);
     expect(bid.dealId).to.equal('dealId');
-    expect(bid.meta).to.equal('richaudience.com');
+    expect(bid.meta.advertiserDomains[0]).to.equal('richaudience.com');
   });
 
   it('no banner media response outstream', function () {
@@ -723,7 +796,7 @@ describe('Richaudience adapter tests', function () {
 
   it('Verifies bidder aliases', function () {
     expect(spec.aliases).to.have.lengthOf(1);
-    expect(spec.aliases[0]).to.equal('ra');
+    expect(spec.aliases[0]).to.deep.equal({code: 'ra', gvlid: 108});
   });
 
   it('Verifies bidder gvlid', function () {
@@ -867,6 +940,21 @@ describe('Richaudience adapter tests', function () {
     expect(requestContent).to.have.property('schain').to.deep.equal(schain);
   })
 
+  it('should pass DSA', function() {
+    const request = spec.buildRequests(DEFAULT_PARAMS_NEW_DSA, {
+      gdprConsent: {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      },
+      refererInfo: {}
+    })
+    const requestContent = JSON.parse(request[0].data);
+    expect(requestContent).to.have.property('dsa').property('dsarequired').and.to.equal(2)
+    expect(requestContent).to.have.property('dsa').property('pubrender').and.to.equal(1);
+    expect(requestContent).to.have.property('dsa').property('datatopub').and.to.equal(1);
+    expect(requestContent.dsa.transparency[0]).to.have.property('domain').and.to.equal('richaudience.com');
+  })
+
   it('should pass gpid', function() {
     const request = spec.buildRequests(DEFAULT_PARAMS_NEW_SIZES_GPID, {
       gdprConsent: {
@@ -879,7 +967,32 @@ describe('Richaudience adapter tests', function () {
     expect(requestContent).to.have.property('gpid').and.to.equal('/19968336/header-bid-tag-1#example-2');
   })
 
+  describe('onTimeout', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('onTimeout exist as a function', () => {
+      expect(spec.onTimeout).to.exist.and.to.be.a('function');
+    });
+    it('should send timeouts', function () {
+      spec.onTimeout(DEFAULT_PARAMS_VIDEO_TIMEOUT);
+      expect(utils.triggerPixel.called).to.equal(true);
+      expect(utils.triggerPixel.firstCall.args[0]).to.equal('https://s.richaudience.com/err/?ec=6&ev=3000&pla=ADb1f40rmi&int=PREBID&pltfm=&node=&dm=localhost:9876');
+    });
+  });
+
   describe('userSync', function () {
+    let sandbox;
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+    afterEach(function() {
+      sandbox.restore();
+    });
     it('Verifies user syncs iframe include', function () {
       config.setConfig({
         'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'include'}}}
@@ -1217,5 +1330,37 @@ describe('Richaudience adapter tests', function () {
       }, [], {consentString: '', gdprApplies: true});
       expect(syncs).to.have.lengthOf(0);
     });
+
+    it('Verifies user syncs iframe/image include with GPP', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'include'}}}
+      })
+
+      var syncs = spec.getUserSyncs({iframeEnabled: true}, [BID_RESPONSE], {
+        gppString: 'DBABL~BVVqAAEABgA.QA',
+        applicableSections: [7]},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+
+      config.setConfig({
+        'userSync': {filterSettings: {image: {bidders: '*', filter: 'include'}}}
+      })
+
+      var syncs = spec.getUserSyncs({pixelEnabled: true}, [BID_RESPONSE], {
+        gppString: 'DBABL~BVVqAAEABgA.QA',
+        applicableSections: [7, 5]},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
+    });
+
+    it('Verifies user syncs URL image include with GPP', function () {
+      const gppConsent = { gppString: 'DBACMYA~CP5P4cAP5P4cAPoABAESAlEAAAAAAAAAAAAAA2QAQA2ADZABADYAAAAA.QA2QAQA2AAAA.IA2QAQA2AAAA~BP5P4cAP5P4cAPoABABGBACAAAAAAAAAAAAAAAAAAA.YAAAAAAAAAA', applicableSections: [0] };
+      const result = spec.getUserSyncs({pixelEnabled: true}, undefined, undefined, undefined, gppConsent);
+      expect(result).to.deep.equal([{
+        type: 'image', url: `https://sync.richaudience.com/bf7c142f4339da0278e83698a02b0854/?referrer=http%3A%2F%2Fdomain.com&gpp=DBACMYA~CP5P4cAP5P4cAPoABAESAlEAAAAAAAAAAAAAA2QAQA2ADZABADYAAAAA.QA2QAQA2AAAA.IA2QAQA2AAAA~BP5P4cAP5P4cAPoABABGBACAAAAAAAAAAAAAAAAAAA.YAAAAAAAAAA&gpp_sid=0`
+      }]);
+    });
   })
 });
diff --git a/test/spec/modules/ringieraxelspringerBidAdapter_spec.js b/test/spec/modules/ringieraxelspringerBidAdapter_spec.js
new file mode 100644
index 00000000000..3539dad9362
--- /dev/null
+++ b/test/spec/modules/ringieraxelspringerBidAdapter_spec.js
@@ -0,0 +1,678 @@
+import { expect } from 'chai';
+import { spec } from 'modules/ringieraxelspringerBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+const CSR_ENDPOINT = 'https://csr.onet.pl/4178463/csr-006/csr.json?nid=4178463&';
+
+describe('ringieraxelspringerBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      const bid = {
+        sizes: [[300, 250], [300, 600]],
+        bidder: 'ringieraxelspringer',
+        params: {
+          slot: 'slot',
+          area: 'areatest',
+          site: 'test',
+          network: '4178463'
+        }
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params not found', function () {
+      const failBid = {
+        sizes: [[300, 250], [300, 300]],
+        bidder: 'ringieraxelspringer',
+        params: {
+          site: 'test',
+          network: '4178463'
+        }
+      };
+      expect(spec.isBidRequestValid(failBid)).to.equal(false);
+    });
+
+    it('should return nothing when bid request is malformed', function () {
+      const failBid = {
+        sizes: [[300, 250], [300, 300]],
+        bidder: 'ringieraxelspringer',
+      };
+      expect(spec.isBidRequestValid(failBid)).to.equal(undefined);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bid = {
+      sizes: [[300, 250], [300, 600]],
+      bidder: 'ringieraxelspringer',
+      bidId: 1,
+      params: {
+        slot: 'test',
+        area: 'areatest',
+        site: 'test',
+        slotSequence: '0',
+        network: '4178463',
+        customParams: {
+          test: 'name=value'
+        }
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [
+              300,
+              250
+            ],
+            [
+              300,
+              600
+            ]
+          ]
+        }
+      }
+    };
+    const bid2 = {
+      sizes: [[750, 300]],
+      bidder: 'ringieraxelspringer',
+      bidId: 2,
+      params: {
+        slot: 'test2',
+        area: 'areatest',
+        site: 'test',
+        network: '4178463'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [
+              750,
+              300
+            ]
+          ]
+        }
+      }
+    };
+
+    it('should parse bids to request', function () {
+      const requests = spec.buildRequests([bid], {
+        'gdprConsent': {
+          'gdprApplies': true,
+          'consentString': 'some-consent-string'
+        },
+        'refererInfo': {
+          'ref': 'https://example.org/',
+          'page': 'https://example.com/'
+        }
+      });
+      expect(requests[0].url).to.have.string(CSR_ENDPOINT);
+      expect(requests[0].url).to.have.string('slot0=test');
+      expect(requests[0].url).to.have.string('id0=1');
+      expect(requests[0].url).to.have.string('site=test');
+      expect(requests[0].url).to.have.string('area=areatest');
+      expect(requests[0].url).to.have.string('cre_format=html');
+      expect(requests[0].url).to.have.string('systems=das');
+      expect(requests[0].url).to.have.string('ems_url=1');
+      expect(requests[0].url).to.have.string('bid_rate=1');
+      expect(requests[0].url).to.have.string('gdpr_applies=true');
+      expect(requests[0].url).to.have.string('euconsent=some-consent-string');
+      expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
+      expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
+      expect(requests[0].url).to.have.string('test=name%3Dvalue');
+    });
+
+    it('should return empty consent string when undefined', function () {
+      const requests = spec.buildRequests([bid]);
+      const gdpr = requests[0].url.search('gdpr_applies');
+      const euconsent = requests[0].url.search('euconsent=');
+      expect(gdpr).to.equal(-1);
+      expect(euconsent).to.equal(-1);
+    });
+
+    it('should parse bids to request from pageContext', function () {
+      const bidCopy = { ...bid };
+      bidCopy.params = {
+        ...bid.params,
+        pageContext: {
+          dv: 'test/areatest',
+          du: 'https://example.com/',
+          dr: 'https://example.org/',
+          keyWords: ['val1', 'val2'],
+          keyValues: {
+            adunit: 'test/areatest'
+          }
+        }
+      };
+      const requests = spec.buildRequests([bidCopy, bid2]);
+
+      expect(requests[0].url).to.have.string(CSR_ENDPOINT);
+      expect(requests[0].url).to.have.string('slot0=test');
+      expect(requests[0].url).to.have.string('id0=1');
+      expect(requests[0].url).to.have.string('iusizes0=300x250%2C300x600');
+      expect(requests[0].url).to.have.string('slot1=test2');
+      expect(requests[0].url).to.have.string('kvhb_format0=banner');
+      expect(requests[0].url).to.have.string('id1=2');
+      expect(requests[0].url).to.have.string('iusizes1=750x300');
+      expect(requests[0].url).to.have.string('kvhb_format1=banner');
+      expect(requests[0].url).to.have.string('site=test');
+      expect(requests[0].url).to.have.string('area=areatest');
+      expect(requests[0].url).to.have.string('cre_format=html');
+      expect(requests[0].url).to.have.string('systems=das');
+      expect(requests[0].url).to.have.string('ems_url=1');
+      expect(requests[0].url).to.have.string('bid_rate=1');
+      expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
+      expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
+      expect(requests[0].url).to.have.string('DV=test%2Fareatest');
+      expect(requests[0].url).to.have.string('kwrd=val1%2Bval2');
+      expect(requests[0].url).to.have.string('kvadunit=test%2Fareatest');
+      expect(requests[0].url).to.have.string('pos0=0');
+    });
+
+    it('should parse dsainfo when available', function () {
+      const bidCopy = { ...bid };
+      bidCopy.params = {
+        ...bid.params,
+        pageContext: {
+          dv: 'test/areatest',
+          du: 'https://example.com/',
+          dr: 'https://example.org/',
+          keyWords: ['val1', 'val2'],
+          keyValues: {
+            adunit: 'test/areatest'
+          }
+        }
+      };
+      let bidderRequest = {
+        ortb2: {
+          regs: {
+            ext: {
+              dsa: {
+                required: 1
+              }
+            }
+          }
+        }
+      };
+      let requests = spec.buildRequests([bidCopy], bidderRequest);
+      expect(requests[0].url).to.have.string('dsainfo=1');
+
+      bidderRequest.ortb2.regs.ext.dsa.required = 0;
+      requests = spec.buildRequests([bidCopy], bidderRequest);
+      expect(requests[0].url).to.have.string('dsainfo=0');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      'adsCheck': 'ok',
+      'geoloc': {},
+      'ir': '92effd60-0c84-4dac-817e-763ea7b8ac65',
+      'ads': [
+        {
+          'id': 'flat-belkagorna',
+          'slot': 'flat-belkagorna',
+          'prio': 10,
+          'type': 'html',
+          'bid_rate': 0.321123,
+          'adid': 'das,50463,152276',
+          'id_3': '12734',
+          'html': ''
+        }
+      ],
+      'iv': '202003191334467636346500'
+    };
+
+    it('should get correct bid response', function () {
+      const resp = spec.interpretResponse({ body: response }, { bidIds: [{ slot: 'flat-belkagorna', bidId: 1 }] });
+      expect(resp[0]).to.have.all.keys('cpm', 'currency', 'netRevenue', 'requestId', 'ttl', 'width', 'height', 'creativeId', 'dealId', 'ad', 'meta', 'actgMatch', 'mediaType');
+      expect(resp.length).to.equal(1);
+    });
+
+    it('should handle empty ad', function () {
+      let res = {
+        'ads': [{
+          type: 'empty'
+        }]
+      };
+      const resp = spec.interpretResponse({ body: res }, {});
+      expect(resp).to.deep.equal([]);
+    });
+
+    it('should handle empty server response', function () {
+      let res = {
+        'ads': []
+      };
+      const resp = spec.interpretResponse({ body: res }, {});
+      expect(resp).to.deep.equal([]);
+    });
+
+    it('should generate auctionConfig when fledge is enabled', function () {
+      let bidRequest = {
+        method: 'GET',
+        url: 'https://example.com',
+        bidIds: [{
+          slot: 'top',
+          bidId: '123',
+          network: 'testnetwork',
+          sizes: ['300x250'],
+          params: {
+            site: 'testsite',
+            area: 'testarea',
+            network: 'testnetwork'
+          },
+          fledgeEnabled: true
+        },
+        {
+          slot: 'top',
+          bidId: '456',
+          network: 'testnetwork',
+          sizes: ['300x250'],
+          params: {
+            site: 'testsite',
+            area: 'testarea',
+            network: 'testnetwork'
+          },
+          fledgeEnabled: false
+        }]
+      };
+
+      let auctionConfigs = [{
+        'bidId': '123',
+        'config': {
+          'seller': 'https://csr.onet.pl',
+          'decisionLogicUrl': 'https://csr.onet.pl/testnetwork/v1/protected-audience-api/decision-logic.js',
+          'interestGroupBuyers': ['https://csr.onet.pl'],
+          'auctionSignals': {
+            'params': {
+              site: 'testsite',
+              area: 'testarea',
+              network: 'testnetwork'
+            },
+            'sizes': ['300x250'],
+            'gctx': '1234567890'
+          }
+        }
+      }];
+      const resp = spec.interpretResponse({body: {gctx: '1234567890'}}, bidRequest);
+      expect(resp).to.deep.equal({bids: [], paapi: auctionConfigs});
+    });
+  });
+
+  describe('buildNativeRequests', function () {
+    const bid = {
+      sizes: 'fluid',
+      bidder: 'ringieraxelspringer',
+      bidId: 1,
+      params: {
+        slot: 'nativestd',
+        area: 'areatest',
+        site: 'test',
+        slotSequence: '0',
+        network: '4178463',
+        customParams: {
+          test: 'name=value'
+        }
+      },
+      mediaTypes: {
+        native: {
+          clickUrl: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          sponsoredBy: {
+            len: 25,
+            required: true
+          },
+          title: {
+            len: 50,
+            required: true
+          }
+        }
+      }
+    };
+
+    it('should parse bids to native request', function () {
+      const requests = spec.buildRequests([bid], {
+        'gdprConsent': {
+          'gdprApplies': true,
+          'consentString': 'some-consent-string'
+        },
+        'refererInfo': {
+          'ref': 'https://example.org/',
+          'page': 'https://example.com/'
+        }
+      });
+
+      expect(requests[0].url).to.have.string(CSR_ENDPOINT);
+      expect(requests[0].url).to.have.string('slot0=nativestd');
+      expect(requests[0].url).to.have.string('id0=1');
+      expect(requests[0].url).to.have.string('site=test');
+      expect(requests[0].url).to.have.string('area=areatest');
+      expect(requests[0].url).to.have.string('cre_format=html');
+      expect(requests[0].url).to.have.string('systems=das');
+      expect(requests[0].url).to.have.string('ems_url=1');
+      expect(requests[0].url).to.have.string('bid_rate=1');
+      expect(requests[0].url).to.have.string('gdpr_applies=true');
+      expect(requests[0].url).to.have.string('euconsent=some-consent-string');
+      expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
+      expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
+      expect(requests[0].url).to.have.string('test=name%3Dvalue');
+      expect(requests[0].url).to.have.string('cre_format0=native');
+      expect(requests[0].url).to.have.string('kvhb_format0=native');
+      expect(requests[0].url).to.have.string('iusizes0=fluid');
+    });
+  });
+
+  describe('interpretNativeResponse', function () {
+    const response = {
+      'adsCheck': 'ok',
+      'geoloc': {},
+      'ir': '92effd60-0c84-4dac-817e-763ea7b8ac65',
+      'iv': '202003191334467636346500',
+      'ads': [
+        {
+          'id': 'nativestd',
+          'slot': 'nativestd',
+          'prio': 10,
+          'type': 'native',
+          'bid_rate': 0.321123,
+          'adid': 'das,50463,152276',
+          'id_3': '12734'
+        }
+      ]
+    };
+    const responseTeaserStandard = {
+      adsCheck: 'ok',
+      geoloc: {},
+      ir: '92effd60-0c84-4dac-817e-763ea7b8ac65',
+      iv: '202003191334467636346500',
+      ads: [
+        {
+          id: 'nativestd',
+          slot: 'nativestd',
+          prio: 10,
+          type: 'native',
+          bid_rate: 0.321123,
+          adid: 'das,50463,152276',
+          id_3: '12734',
+          data: {
+            fields: {
+              leadtext: 'BODY',
+              title: 'Headline',
+              image: '//img.url',
+              url: '//link.url',
+              partner_logo: '//logo.url',
+              adInfo: 'REKLAMA',
+              impression: '//impression.url',
+              impression1: '//impression1.url',
+              impressionJs1: '//impressionJs1.url'
+            },
+            meta: {
+              slot: 'nativestd',
+              height: 1,
+              width: 1,
+              advertiser_name: 'Test Onet',
+              dsaurl: '//dsa.url',
+              adclick: '//adclick.url'
+            }
+          },
+          ems_link: '//ems.url'
+        }
+      ]
+    };
+    const responseNativeInFeed = {
+      adsCheck: 'ok',
+      geoloc: {},
+      ir: '92effd60-0c84-4dac-817e-763ea7b8ac65',
+      iv: '202003191334467636346500',
+      ads: [
+        {
+          id: 'nativestd',
+          slot: 'nativestd',
+          prio: 10,
+          type: 'native',
+          bid_rate: 0.321123,
+          adid: 'das,50463,152276',
+          id_3: '12734',
+          data: {
+            fields: {
+              Body: 'BODY',
+              Calltoaction: 'Calltoaction',
+              Headline: 'Headline',
+              Image: '//img.url',
+              adInfo: 'REKLAMA',
+              Thirdpartyclicktracker: '//link.url',
+              imp: '//imp.url',
+              thirdPartyClickTracker2: '//thirdPartyClickTracker.url'
+            },
+            meta: {
+              slot: 'nativestd',
+              height: 1,
+              width: 1,
+              advertiser_name: 'Test Onet',
+              dsaurl: '//dsa.url',
+              adclick: '//adclick.url'
+            }
+          },
+          ems_link: '//ems.url'
+        }
+      ]
+    };
+    const expectedTeaserStandardOrtbResponse = {
+      ver: '1.2',
+      assets: [
+        {
+          id: 0,
+          data: {
+            value: '',
+            type: 2
+          },
+        },
+        {
+          id: 1,
+          data: {
+            value: 'REKLAMA',
+            type: 10
+          },
+        },
+        {
+          id: 3,
+          img: {
+            type: 1,
+            url: '//logo.url',
+            w: 1,
+            h: 1
+          }
+        },
+        {
+          id: 4,
+          img: {
+            type: 3,
+            url: '//img.url',
+            w: 1,
+            h: 1
+          }
+        },
+        {
+          id: 5,
+          data: {
+            value: 'Test Onet',
+            type: 1
+          },
+        },
+        {
+          id: 6,
+          title: {
+            text: 'Headline'
+          }
+        },
+      ],
+      link: {
+        url: '//adclick.url//link.url',
+        clicktrackers: []
+      },
+      eventtrackers: [
+        {
+          event: 1,
+          method: 1,
+          url: '//ems.url'
+        },
+        {
+          event: 1,
+          method: 1,
+          url: '//impression.url'
+        },
+        {
+          event: 1,
+          method: 1,
+          url: '//impression1.url'
+        },
+        {
+          event: 1,
+          method: 2,
+          url: '//impressionJs1.url'
+        }
+      ],
+      privacy: '//dsa.url'
+    };
+    const expectedTeaserStandardResponse = {
+      sendTargetingKeys: false,
+      title: 'Headline',
+      image: {
+        url: '//img.url',
+        width: 1,
+        height: 1
+      },
+      icon: {
+        url: '//logo.url',
+        width: 1,
+        height: 1
+      },
+      clickUrl: '//adclick.url//link.url',
+      cta: '',
+      body: 'BODY',
+      body2: 'REKLAMA',
+      sponsoredBy: 'Test Onet',
+      ortb: expectedTeaserStandardOrtbResponse,
+      privacyLink: '//dsa.url'
+    };
+    const expectedNativeInFeedOrtbResponse = {
+      ver: '1.2',
+      assets: [
+        {
+          id: 0,
+          data: {
+            value: '',
+            type: 2
+          },
+        },
+        {
+          id: 1,
+          data: {
+            value: 'REKLAMA',
+            type: 10
+          },
+        },
+        {
+          id: 3,
+          img: {
+            type: 1,
+            url: '',
+            w: 1,
+            h: 1
+          }
+        },
+        {
+          id: 4,
+          img: {
+            type: 3,
+            url: '//img.url',
+            w: 1,
+            h: 1
+          }
+        },
+        {
+          id: 5,
+          data: {
+            value: 'Test Onet',
+            type: 1
+          },
+        },
+        {
+          id: 6,
+          title: {
+            text: 'Headline'
+          }
+        },
+      ],
+      link: {
+        url: '//adclick.url//link.url',
+        clicktrackers: ['//thirdPartyClickTracker.url']
+      },
+      eventtrackers: [
+        {
+          event: 1,
+          method: 1,
+          url: '//ems.url'
+        },
+        {
+          event: 1,
+          method: 1,
+          url: '//imp.url'
+        }
+      ],
+      privacy: '//dsa.url',
+    };
+    const expectedNativeInFeedResponse = {
+      sendTargetingKeys: false,
+      title: 'Headline',
+      image: {
+        url: '//img.url',
+        width: 1,
+        height: 1
+      },
+      icon: {
+        url: '',
+        width: 1,
+        height: 1
+      },
+      clickUrl: '//adclick.url//link.url',
+      cta: 'Calltoaction',
+      body: 'BODY',
+      body2: 'REKLAMA',
+      sponsoredBy: 'Test Onet',
+      ortb: expectedNativeInFeedOrtbResponse,
+      privacyLink: '//dsa.url'
+    };
+
+    it('should get correct bid native response', function () {
+      const resp = spec.interpretResponse({ body: response }, { bidIds: [{ slot: 'nativestd', bidId: 1, mediaType: 'native' }] });
+
+      expect(resp[0]).to.have.all.keys('cpm', 'currency', 'netRevenue', 'requestId', 'ttl', 'width', 'height', 'creativeId', 'dealId', 'meta', 'actgMatch', 'mediaType', 'native');
+      expect(resp.length).to.equal(1);
+    });
+
+    it('should get correct native response for TeaserStandard', function () {
+      const resp = spec.interpretResponse({ body: responseTeaserStandard }, { bidIds: [{ slot: 'nativestd', bidId: 1, mediaType: 'native' }] });
+      const teaserStandardResponse = resp[0].native;
+
+      expect(JSON.stringify(teaserStandardResponse)).to.equal(JSON.stringify(expectedTeaserStandardResponse));
+    });
+
+    it('should get correct native response for NativeInFeed', function () {
+      const resp = spec.interpretResponse({ body: responseNativeInFeed }, { bidIds: [{ slot: 'nativestd', bidId: 1, mediaType: 'native' }] });
+      const nativeInFeedResponse = resp[0].native;
+
+      expect(JSON.stringify(nativeInFeedResponse)).to.equal(JSON.stringify(expectedNativeInFeedResponse));
+    });
+  });
+});
diff --git a/test/spec/modules/riseBidAdapter_spec.js b/test/spec/modules/riseBidAdapter_spec.js
index eed8d74f271..2d11ae16cb7 100644
--- a/test/spec/modules/riseBidAdapter_spec.js
+++ b/test/spec/modules/riseBidAdapter_spec.js
@@ -22,6 +22,12 @@ describe('riseAdapter', function () {
     });
   });
 
+  describe('bid adapter', function () {
+    it('should have aliases', function () {
+      expect(spec.aliases).to.be.an('array').that.is.not.empty;
+    });
+  });
+
   describe('isBidRequestValid', function () {
     const bid = {
       'bidder': spec.code,
@@ -53,7 +59,7 @@ describe('riseAdapter', function () {
         'adUnitCode': 'adunit-code',
         'sizes': [[640, 480]],
         'params': {
-          'org': 'jdye8weeyirk00000001'
+          'org': 'jdye8weeyirk00000001',
         },
         'bidId': '299ffc8cca0b87',
         'loop': 1,
@@ -105,6 +111,7 @@ describe('riseAdapter', function () {
 
     const bidderRequest = {
       bidderCode: 'rise',
+      ortb2: {device: {}},
     }
     const placementId = '12345678';
     const api = [1, 2];
@@ -308,6 +315,24 @@ describe('riseAdapter', function () {
       expect(request.data.params).to.have.property('gdpr_consent', 'test-consent-string');
     });
 
+    it('should not send the gpp param if gppConsent is false in the bidRequest', function () {
+      const bidderRequestWithoutGPP = Object.assign({gppConsent: false}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithoutGPP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gpp');
+      expect(request.data.params).to.not.have.property('gpp_sid');
+    });
+
+    it('should send the gpp param if gppConsent is true in the bidRequest', function () {
+      const bidderRequestWithGPP = Object.assign({gppConsent: {gppString: 'gpp-consent', applicableSections: [7]}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGPP);
+      console.log('request.data.params');
+      console.log(request.data.params);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gpp', 'gpp-consent');
+      expect(request.data.params.gpp_sid[0]).to.be.equal(7);
+    });
+
     it('should have schain param if it is available in the bidRequest', () => {
       const schain = {
         ver: '1.0',
@@ -410,6 +435,31 @@ describe('riseAdapter', function () {
       expect(request.data.bids[0].sua).to.not.exist;
     });
 
+    it('should send ORTB2 device data in bid request', function() {
+      const ortb2 = {
+        device: {
+          w: 980,
+          h: 1720,
+          dnt: 0,
+          ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+          language: 'en',
+          devicetype: 1,
+          make: 'Apple',
+          model: 'iPhone 12 Pro Max',
+          os: 'iOS',
+          osv: '17.4',
+          ext: {fiftyonedegrees_deviceId: '17595-133085-133468-18092'},
+        },
+      };
+
+      const request = spec.buildRequests(bidRequests, {
+        ...bidderRequest,
+        ortb2,
+      });
+
+      expect(request.data.params.device).to.deep.equal(ortb2.device);
+    });
+
     describe('COPPA Param', function() {
       it('should set coppa equal 0 in bid request if coppa is set to false', function() {
         const request = spec.buildRequests(bidRequests, bidderRequest);
@@ -442,6 +492,8 @@ describe('riseAdapter', function () {
         height: 480,
         requestId: '21e12606d47ba7',
         adomain: ['abc.com'],
+        creativeId: 'creative-id',
+        nurl: 'http://example.com/win/1234',
         mediaType: VIDEO
       },
       {
@@ -451,6 +503,8 @@ describe('riseAdapter', function () {
         height: 250,
         requestId: '21e12606d47ba7',
         adomain: ['abc.com'],
+        creativeId: 'creative-id',
+        nurl: 'http://example.com/win/1234',
         mediaType: BANNER
       }]
     };
@@ -462,7 +516,7 @@ describe('riseAdapter', function () {
       width: 640,
       height: 480,
       ttl: TTL,
-      creativeId: '21e12606d47ba7',
+      creativeId: 'creative-id',
       netRevenue: true,
       nurl: 'http://example.com/win/1234',
       mediaType: VIDEO,
@@ -477,10 +531,10 @@ describe('riseAdapter', function () {
       requestId: '21e12606d47ba7',
       cpm: 12.5,
       currency: 'USD',
-      width: 640,
-      height: 480,
+      width: 300,
+      height: 250,
       ttl: TTL,
-      creativeId: '21e12606d47ba7',
+      creativeId: 'creative-id',
       netRevenue: true,
       nurl: 'http://example.com/win/1234',
       mediaType: BANNER,
@@ -493,8 +547,8 @@ describe('riseAdapter', function () {
 
     it('should get correct bid response', function () {
       const result = spec.interpretResponse({ body: response });
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedVideoResponse));
-      expect(Object.keys(result[1])).to.deep.equal(Object.keys(expectedBannerResponse));
+      expect(result[0]).to.deep.equal(expectedVideoResponse);
+      expect(result[1]).to.deep.equal(expectedBannerResponse);
     });
 
     it('video type should have vastXml key', function () {
diff --git a/test/spec/modules/rivrAnalyticsAdapter_spec.js b/test/spec/modules/rivrAnalyticsAdapter_spec.js
index 9add7ed5f7d..6aab92b6b5d 100644
--- a/test/spec/modules/rivrAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rivrAnalyticsAdapter_spec.js
@@ -19,7 +19,7 @@ import {
 import {expect} from 'chai';
 import adapterManager from 'src/adapterManager.js';
 import * as ajax from 'src/ajax.js';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 
 const events = require('../../../src/events');
 
@@ -98,7 +98,7 @@ describe('RIVR Analytics adapter', () => {
 
     expect(rivraddonsTrackPbjsEventStub.callCount).to.be.equal(0);
 
-    events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {auctionId: EMITTED_AUCTION_ID, config: {}, timeout: 3000});
+    events.emit(EVENTS.AUCTION_INIT, { auctionId: EMITTED_AUCTION_ID, config: {}, timeout: 3000 });
 
     expect(rivraddonsTrackPbjsEventStub.callCount).to.be.equal(0);
 
@@ -111,12 +111,12 @@ describe('RIVR Analytics adapter', () => {
 
     expect(rivraddonsTrackPbjsEventStub.callCount).to.be.equal(0);
 
-    events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {auctionId: EMITTED_AUCTION_ID, config: {}, timeout: 3000});
+    events.emit(EVENTS.AUCTION_INIT, { auctionId: EMITTED_AUCTION_ID, config: {}, timeout: 3000 });
 
     expect(rivraddonsTrackPbjsEventStub.callCount).to.be.equal(1);
 
     const firstArgument = rivraddonsTrackPbjsEventStub.getCall(0).args[0];
-    expect(firstArgument.eventType).to.be.equal(CONSTANTS.EVENTS.AUCTION_INIT);
+    expect(firstArgument.eventType).to.be.equal(EVENTS.AUCTION_INIT);
     expect(firstArgument.args.auctionId).to.be.equal(EMITTED_AUCTION_ID);
 
     window.rivraddon.analytics.trackPbjsEvent.restore();
diff --git a/test/spec/modules/rixengineBidAdapter_spec.js b/test/spec/modules/rixengineBidAdapter_spec.js
new file mode 100644
index 00000000000..a400b5c755b
--- /dev/null
+++ b/test/spec/modules/rixengineBidAdapter_spec.js
@@ -0,0 +1,141 @@
+import { spec } from 'modules/rixengineBidAdapter.js';
+const ENDPOINT = 'http://demo.svr.rixengine.com/rtb?sid=36540&token=1e05a767930d7d96ef6ce16318b4ab99';
+
+const REQUEST = [
+  {
+    adUnitCode: 'adUnitCode1',
+    bidId: 'bidId1',
+    auctionId: 'auctionId-56a2-4f71-9098-720a68f2f708',
+    mediaTypes: {
+      banner: {},
+    },
+    bidder: 'rixengine',
+    params: {
+      endpoint: 'http://demo.svr.rixengine.com/rtb',
+      token: '1e05a767930d7d96ef6ce16318b4ab99',
+      sid: '36540',
+    },
+  },
+];
+
+const RESPONSE = {
+  headers: null,
+  body: {
+    id: 'requestId',
+    bidid: 'bidId1',
+    cur: 'USD',
+    seatbid: [
+      {
+        bid: [
+          {
+            id: 'bidId1',
+            impid: 'bidId1',
+            adm: '',
+            cid: '24:17:18',
+            crid: '40_37_66:30_32_132:31_27_70',
+            adomain: ['www.rixengine.com'],
+            price: 10.00,
+            bundle:
+              'com.xinggame.cast.video.screenmirroring.casttotv:https://www.greysa.com.tw/Product/detail/pid/119/?utm_source=popIn&utm_medium=cpc&utm_campaign=neck_202307_300*250:https://www.avaige.top/',
+            iurl: 'https://crs.rixbeedesk.com/test/kkd2ms/04c6d62912cff9037106fb50ed21b558.png:https://crs.rixbeedesk.com/test/kkd2ms/69a72b23c6c52e703c0c8e3f634e44eb.png:https://crs.rixbeedesk.com/test/kkd2ms/d229c5cd66bcc5856cb26bb2817718c9.png',
+            w: 300,
+            h: 250,
+            exp: 30,
+          },
+        ],
+        seat: 'Zh2Kiyk=',
+      },
+    ],
+  },
+};
+
+describe('rixengine bid adapter', function () {
+  describe('isBidRequestValid', function () {
+    let bid = {
+      bidder: 'rixengine',
+      params: {
+        endpoint: 'http://demo.svr.rixengine.com/rtb',
+        token: '1e05a767930d7d96ef6ce16318b4ab99',
+        sid: '36540',
+      },
+    };
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return false when missing endpoint', function () {
+      delete bid.params.endpoint;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false when missing sid', function () {
+      delete bid.params.sid;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false when missing token', function () {
+      delete bid.params.token;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+  describe('buildRequests', function () {
+    it('creates request data', function () {
+      const request = spec.buildRequests(REQUEST, {
+        refererInfo: {
+          page: 'page',
+        },
+      })[0];
+      expect(request).to.exist.and.to.be.a('object');
+    });
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(REQUEST, {})[0];
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('has bids', function () {
+      let request = spec.buildRequests(REQUEST, {})[0];
+      let bids = spec.interpretResponse(RESPONSE, request);
+      expect(bids).to.be.an('array').that.is.not.empty;
+      validateBidOnIndex(0);
+
+      function validateBidOnIndex(index) {
+        expect(bids[index]).to.have.property('currency', 'USD');
+        expect(bids[index]).to.have.property(
+          'requestId',
+          RESPONSE.body.seatbid[0].bid[index].id
+        );
+        expect(bids[index]).to.have.property(
+          'cpm',
+          RESPONSE.body.seatbid[0].bid[index].price
+        );
+        expect(bids[index]).to.have.property(
+          'width',
+          RESPONSE.body.seatbid[0].bid[index].w
+        );
+        expect(bids[index]).to.have.property(
+          'height',
+          RESPONSE.body.seatbid[0].bid[index].h
+        );
+        expect(bids[index]).to.have.property(
+          'ad',
+          RESPONSE.body.seatbid[0].bid[index].adm
+        );
+        expect(bids[index]).to.have.property(
+          'creativeId',
+          RESPONSE.body.seatbid[0].bid[index].crid
+        );
+        expect(bids[index]).to.have.property('ttl', 30);
+        expect(bids[index]).to.have.property('netRevenue', true);
+      }
+    });
+
+    it('handles empty response', function () {
+      it('No bid response', function() {
+        var noBidResponse = spec.interpretResponse({
+          body: '',
+        });
+        expect(noBidResponse.length).to.equal(0);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/roxotAnalyticsAdapter_spec.js b/test/spec/modules/roxotAnalyticsAdapter_spec.js
index 79c58e36735..6fc7f356333 100644
--- a/test/spec/modules/roxotAnalyticsAdapter_spec.js
+++ b/test/spec/modules/roxotAnalyticsAdapter_spec.js
@@ -1,9 +1,9 @@
 import roxotAnalytic from 'modules/roxotAnalyticsAdapter.js';
 import {expect} from 'chai';
 import {server} from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
 
 let events = require('src/events');
-let constants = require('src/constants.json');
 
 describe('Roxot Prebid Analytic', function () {
   let roxotConfigServerUrl = 'config-server';
@@ -181,18 +181,18 @@ describe('Roxot Prebid Analytic', function () {
       expect(server.requests[0].url).to.equal('https://' + roxotConfigServerUrl + '/c?publisherId=' + publisherId + '&host=localhost');
       server.requests[0].respond(200, {'Content-Type': 'application/json'}, '{"a": 1, "i": 1, "bat": 1}');
 
-      events.emit(constants.EVENTS.AUCTION_INIT, auctionInit);
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
-      events.emit(constants.EVENTS.BID_ADJUSTMENT, bidAdjustmentWithBid);
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponseWithBid);
-      events.emit(constants.EVENTS.BID_ADJUSTMENT, bidAdjustmentNoBid);
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponseNoBid);
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
-      events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
-      events.emit(constants.EVENTS.BID_ADJUSTMENT, bidAdjustmentAfterTimeout);
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponseAfterTimeout);
-      events.emit(constants.EVENTS.BIDDER_DONE, bidderDone);
-      events.emit(constants.EVENTS.BID_WON, bidWon);
+      events.emit(EVENTS.AUCTION_INIT, auctionInit);
+      events.emit(EVENTS.BID_REQUESTED, bidRequested);
+      events.emit(EVENTS.BID_ADJUSTMENT, bidAdjustmentWithBid);
+      events.emit(EVENTS.BID_RESPONSE, bidResponseWithBid);
+      events.emit(EVENTS.BID_ADJUSTMENT, bidAdjustmentNoBid);
+      events.emit(EVENTS.BID_RESPONSE, bidResponseNoBid);
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeout);
+      events.emit(EVENTS.AUCTION_END, auctionEnd);
+      events.emit(EVENTS.BID_ADJUSTMENT, bidAdjustmentAfterTimeout);
+      events.emit(EVENTS.BID_RESPONSE, bidResponseAfterTimeout);
+      events.emit(EVENTS.BIDDER_DONE, bidderDone);
+      events.emit(EVENTS.BID_WON, bidWon);
 
       expect(server.requests.length).to.equal(4);
 
@@ -260,18 +260,18 @@ describe('Roxot Prebid Analytic', function () {
       expect(server.requests[0].url).to.equal('https://' + roxotConfigServerUrl + '/c?publisherId=' + publisherId + '&host=localhost');
       server.requests[0].respond(200, {'Content-Type': 'application/json'}, '{"a": 1, "i": 1, "bat": 1}');
 
-      events.emit(constants.EVENTS.AUCTION_INIT, auctionInit);
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
-      events.emit(constants.EVENTS.BID_ADJUSTMENT, bidAdjustmentWithBid);
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponseWithBid);
-      events.emit(constants.EVENTS.BID_ADJUSTMENT, bidAdjustmentNoBid);
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponseNoBid);
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
-      events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
-      events.emit(constants.EVENTS.BID_ADJUSTMENT, bidAdjustmentAfterTimeout);
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponseAfterTimeout);
-      events.emit(constants.EVENTS.BIDDER_DONE, bidderDone);
-      events.emit(constants.EVENTS.BID_WON, bidWon);
+      events.emit(EVENTS.AUCTION_INIT, auctionInit);
+      events.emit(EVENTS.BID_REQUESTED, bidRequested);
+      events.emit(EVENTS.BID_ADJUSTMENT, bidAdjustmentWithBid);
+      events.emit(EVENTS.BID_RESPONSE, bidResponseWithBid);
+      events.emit(EVENTS.BID_ADJUSTMENT, bidAdjustmentNoBid);
+      events.emit(EVENTS.BID_RESPONSE, bidResponseNoBid);
+      events.emit(EVENTS.BID_TIMEOUT, bidTimeout);
+      events.emit(EVENTS.AUCTION_END, auctionEnd);
+      events.emit(EVENTS.BID_ADJUSTMENT, bidAdjustmentAfterTimeout);
+      events.emit(EVENTS.BID_RESPONSE, bidResponseAfterTimeout);
+      events.emit(EVENTS.BIDDER_DONE, bidderDone);
+      events.emit(EVENTS.BID_WON, bidWon);
 
       expect(server.requests.length).to.equal(3);
 
diff --git a/test/spec/modules/rtbhouseBidAdapter_spec.js b/test/spec/modules/rtbhouseBidAdapter_spec.js
index 0b944dcb077..dded1fe15a0 100644
--- a/test/spec/modules/rtbhouseBidAdapter_spec.js
+++ b/test/spec/modules/rtbhouseBidAdapter_spec.js
@@ -1,7 +1,9 @@
 import { expect } from 'chai';
-import { OPENRTB, spec } from 'modules/rtbhouseBidAdapter.js';
+import { spec } from 'modules/rtbhouseBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { config } from 'src/config.js';
+import { mergeDeep } from '../../../src/utils';
+import { OPENRTB } from '../../../libraries/precisoUtils/bidNativeUtils';
 
 describe('RTBHouseAdapter', () => {
   const adapter = newBidder(spec);
@@ -42,12 +44,12 @@ describe('RTBHouseAdapter', () => {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'someIncorrectParam': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -304,6 +306,152 @@ describe('RTBHouseAdapter', () => {
       expect(data.user).to.nested.include({'ext.data': 'some user data'});
     });
 
+    context('DSA', () => {
+      const validDSAObject = {
+        'dsarequired': 3,
+        'pubrender': 0,
+        'datatopub': 2,
+        'transparency': [
+          {
+            'domain': 'platform1domain.com',
+            'dsaparams': [1]
+          },
+          {
+            'domain': 'SSP2domain.com',
+            'dsaparams': [1, 2]
+          }
+        ]
+      };
+      const invalidDSAObjects = [
+        -1,
+        0,
+        '',
+        'x',
+        true,
+        [],
+        [1],
+        {},
+        {
+          'dsarequired': -1
+        },
+        {
+          'pubrender': -1
+        },
+        {
+          'datatopub': -1
+        },
+        {
+          'dsarequired': 4
+        },
+        {
+          'pubrender': 3
+        },
+        {
+          'datatopub': 3
+        },
+        {
+          'dsarequired': '1'
+        },
+        {
+          'pubrender': '1'
+        },
+        {
+          'datatopub': '1'
+        },
+        {
+          'transparency': '1'
+        },
+        {
+          'transparency': 2
+        },
+        {
+          'transparency': [
+            1, 2
+          ]
+        },
+        {
+          'transparency': [
+            {
+              domain: '',
+              dsaparams: []
+            }
+          ]
+        },
+        {
+          'transparency': [
+            {
+              domain: 'x',
+              dsaparams: null
+            }
+          ]
+        },
+        {
+          'transparency': [
+            {
+              domain: 'x',
+              dsaparams: [1, '2']
+            }
+          ]
+        },
+      ];
+      let bidRequest;
+
+      beforeEach(() => {
+        bidRequest = Object.assign([], bidRequests);
+      });
+
+      it('should add dsa information to the request via bidderRequest.ortb2.regs.ext.dsa', function () {
+        const localBidderRequest = {
+          ...bidderRequest,
+          ortb2: {
+            regs: {
+              ext: {
+                dsa: validDSAObject
+              }
+            }
+          }
+        };
+
+        const request = spec.buildRequests(bidRequest, localBidderRequest);
+        const data = JSON.parse(request.data);
+
+        expect(data).to.have.nested.property('regs.ext.dsa');
+        expect(data.regs.ext.dsa.dsarequired).to.equal(3);
+        expect(data.regs.ext.dsa.pubrender).to.equal(0);
+        expect(data.regs.ext.dsa.datatopub).to.equal(2);
+        expect(data.regs.ext.dsa.transparency).to.deep.equal([
+          {
+            'domain': 'platform1domain.com',
+            'dsaparams': [1]
+          },
+          {
+            'domain': 'SSP2domain.com',
+            'dsaparams': [1, 2]
+          }
+        ]);
+      });
+
+      invalidDSAObjects.forEach((invalidDSA, index) => {
+        it(`should not add dsa information to the request via bidderRequest.ortb2.regs.ext.dsa; test# ${index}`, function () {
+          const localBidderRequest = {
+            ...bidderRequest,
+            ortb2: {
+              regs: {
+                ext: {
+                  dsa: invalidDSA
+                }
+              }
+            }
+          };
+
+          const request = spec.buildRequests(bidRequest, localBidderRequest);
+          const data = JSON.parse(request.data);
+
+          expect(data).to.not.have.nested.property('regs.ext.dsa');
+        });
+      });
+    });
+
     context('FLEDGE', function() {
       afterEach(function () {
         config.resetConfig();
@@ -313,7 +461,7 @@ describe('RTBHouseAdapter', () => {
         let bidRequest = Object.assign([], bidRequests);
         delete bidRequest[0].params.test;
         config.setConfig({ fledgeConfig: true });
-        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: true });
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, paapi: { enabled: true } });
         expect(request.url).to.equal('https://prebid-eu.creativecdn.com/bidder/prebidfledge/bids');
         expect(request.method).to.equal('POST');
       });
@@ -323,7 +471,7 @@ describe('RTBHouseAdapter', () => {
         delete bidRequest[0].params.test;
 
         config.setConfig({ fledgeConfig: false });
-        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: true });
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, paapi: {enabled: true} });
         const data = JSON.parse(request.data);
         expect(data.ext).to.exist.and.to.be.a('object');
         expect(data.ext.fledge_config).to.exist.and.to.be.a('object');
@@ -333,7 +481,7 @@ describe('RTBHouseAdapter', () => {
         expect(data.ext.fledge_config.sellerTimeout).to.equal(500);
       });
 
-      it('sets a fledgeConfig object values when available from config', function () {
+      it('sets request.ext.fledge_config object values when available from fledgeConfig', function () {
         let bidRequest = Object.assign([], bidRequests);
         delete bidRequest[0].params.test;
 
@@ -343,7 +491,27 @@ describe('RTBHouseAdapter', () => {
             decisionLogicUrl: 'https://sellers.domain/decision.url'
           }
         });
-        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: true });
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, paapi: {enabled: true} });
+        const data = JSON.parse(request.data);
+        expect(data.ext).to.exist.and.to.be.a('object');
+        expect(data.ext.fledge_config).to.exist.and.to.be.a('object');
+        expect(data.ext.fledge_config).to.contain.keys('seller', 'decisionLogicUrl');
+        expect(data.ext.fledge_config.seller).to.equal('https://sellers.domain');
+        expect(data.ext.fledge_config.decisionLogicUrl).to.equal('https://sellers.domain/decision.url');
+        expect(data.ext.fledge_config.sellerTimeout).to.not.exist;
+      });
+
+      it('sets request.ext.fledge_config object values when available from paapiConfig', function () {
+        let bidRequest = Object.assign([], bidRequests);
+        delete bidRequest[0].params.test;
+
+        config.setConfig({
+          paapiConfig: {
+            seller: 'https://sellers.domain',
+            decisionLogicUrl: 'https://sellers.domain/decision.url'
+          }
+        });
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, paapi: {enabled: true} });
         const data = JSON.parse(request.data);
         expect(data.ext).to.exist.and.to.be.a('object');
         expect(data.ext.fledge_config).to.exist.and.to.be.a('object');
@@ -353,13 +521,36 @@ describe('RTBHouseAdapter', () => {
         expect(data.ext.fledge_config.sellerTimeout).to.not.exist;
       });
 
+      it('sets request.ext.fledge_config object values when available from paapiConfig rather than from fledgeConfig if both exist', function () {
+        let bidRequest = Object.assign([], bidRequests);
+        delete bidRequest[0].params.test;
+
+        config.setConfig({
+          paapiConfig: {
+            seller: 'https://paapiconfig.sellers.domain',
+            decisionLogicUrl: 'https://paapiconfig.sellers.domain/decision.url'
+          },
+          fledgeConfig: {
+            seller: 'https://fledgeconfig.sellers.domain',
+            decisionLogicUrl: 'https://fledgeconfig.sellers.domain/decision.url'
+          }
+        });
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, paapi: {enabled: true} });
+        const data = JSON.parse(request.data);
+        expect(data.ext).to.exist.and.to.be.a('object');
+        expect(data.ext.fledge_config).to.exist.and.to.be.a('object');
+        expect(data.ext.fledge_config).to.contain.keys('seller', 'decisionLogicUrl');
+        expect(data.ext.fledge_config.seller).to.equal('https://paapiconfig.sellers.domain');
+        expect(data.ext.fledge_config.decisionLogicUrl).to.equal('https://paapiconfig.sellers.domain/decision.url');
+      });
+
       it('when FLEDGE is disabled, should not send imp.ext.ae', function () {
         let bidRequest = Object.assign([], bidRequests);
         delete bidRequest[0].params.test;
         bidRequest[0].ortb2Imp = {
           ext: { ae: 2 }
         };
-        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: false });
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, paapi: {enabled: false} });
         let data = JSON.parse(request.data);
         if (data.imp[0].ext) {
           expect(data.imp[0].ext).to.not.have.property('ae');
@@ -372,7 +563,7 @@ describe('RTBHouseAdapter', () => {
         bidRequest[0].ortb2Imp = {
           ext: { ae: 2 }
         };
-        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: true });
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, paapi: {enabled: true} });
         let data = JSON.parse(request.data);
         expect(data.imp[0].ext.ae).to.equal(2);
       });
@@ -563,17 +754,20 @@ describe('RTBHouseAdapter', () => {
   });
 
   describe('interpretResponse', function () {
-    let response = [{
-      'id': 'bidder_imp_identifier',
-      'impid': '552b8922e28f27',
-      'price': 0.5,
-      'adid': 'Ad_Identifier',
-      'adm': '',
-      'adomain': ['rtbhouse.com'],
-      'cid': 'Ad_Identifier',
-      'w': 300,
-      'h': 250
-    }];
+    let response;
+    beforeEach(() => {
+      response = [{
+        'id': 'bidder_imp_identifier',
+        'impid': '552b8922e28f27',
+        'price': 0.5,
+        'adid': 'Ad_Identifier',
+        'adm': '',
+        'adomain': ['rtbhouse.com'],
+        'cid': 'Ad_Identifier',
+        'w': 300,
+        'h': 250
+      }];
+    });
 
     let fledgeResponse = {
       'id': 'bid-identifier',
@@ -632,9 +826,84 @@ describe('RTBHouseAdapter', () => {
 
       it('should return FLEDGE auction_configs alongside bids', function () {
         expect(response).to.have.property('bids');
-        expect(response).to.have.property('fledgeAuctionConfigs');
-        expect(response.fledgeAuctionConfigs.length).to.equal(1);
-        expect(response.fledgeAuctionConfigs[0].bidId).to.equal('test-bid-id');
+        expect(response).to.have.property('paapi');
+        expect(response.paapi.length).to.equal(1);
+        expect(response.paapi[0].bidId).to.equal('test-bid-id');
+      });
+    });
+
+    context('when the response contains FLEDGE auction config and bid request has additional signals in paapiConfig', function () {
+      let bidderRequest;
+      config.setConfig({
+        paapiConfig: {
+          interestGroupBuyers: ['https://buyer1.com'],
+          perBuyerSignals: {
+            'https://buyer1.com': { signal: 1 }
+          },
+          customSignal: 1
+        }
+      });
+      let response = spec.interpretResponse({body: fledgeResponse}, {bidderRequest});
+
+      it('should have 2 buyers in interestGroupBuyers', function () {
+        expect(response.paapi[0].config.interestGroupBuyers.length).to.equal(2);
+        expect(response.paapi[0].config.interestGroupBuyers).to.have.members(['https://buyer1.com', 'https://buyer-domain.com']);
+      });
+
+      it('should have 2 perBuyerSignals with proper values', function () {
+        expect(response.paapi[0].config.perBuyerSignals).to.contain.keys('https://buyer1.com', 'https://buyer-domain.com');
+        expect(response.paapi[0].config.perBuyerSignals['https://buyer1.com']).to.deep.equal({ signal: 1 });
+        expect(response.paapi[0].config.perBuyerSignals['https://buyer-domain.com']).to.deep.equal({});
+      });
+
+      it('should contain any custom signal passed via paapiConfig', function () {
+        expect(response.paapi[0].config).to.contain.keys('customSignal');
+        expect(response.paapi[0].config.customSignal).to.equal(1);
+      });
+    });
+
+    context('when the response contains DSA object', function () {
+      it('should get correct bid response', function () {
+        const dsa = {
+          'dsa': {
+            'behalf': 'Advertiser',
+            'paid': 'Advertiser',
+            'transparency': [{
+              'domain': 'dsp1domain.com',
+              'dsaparams': [1, 2]
+            }],
+            'adrender': 1
+          }
+        };
+        mergeDeep(response[0], { ext: dsa });
+
+        const expectedResponse = [
+          {
+            'requestId': '552b8922e28f27',
+            'cpm': 0.5,
+            'creativeId': 29681110,
+            'width': 300,
+            'height': 250,
+            'ad': '',
+            'mediaType': 'banner',
+            'currency': 'USD',
+            'ttl': 300,
+            'meta': {
+              'advertiserDomains': ['rtbhouse.com'],
+              ...dsa
+            },
+            'netRevenue': true,
+            ext: { ...dsa }
+          }
+        ];
+        let bidderRequest;
+        let result = spec.interpretResponse({body: response}, {bidderRequest});
+
+        expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+        expect(result[0]).to.have.nested.property('meta.dsa');
+        expect(result[0]).to.have.nested.property('ext.dsa');
+        expect(result[0].meta.dsa).to.deep.equal(expectedResponse[0].meta.dsa);
+        expect(result[0].ext.dsa).to.deep.equal(expectedResponse[0].meta.dsa);
       });
     });
 
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index dd6f52c0646..aff6c6df171 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -6,21 +6,22 @@ import {
   resetUserSync,
   classifiedAsVideo,
   resetRubiConf,
+  resetImpIdMap,
   converter
 } from 'modules/rubiconBidAdapter.js';
-import {parse as parseQuery} from 'querystring';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
 import {find} from 'src/polyfill.js';
 import {createEidsArray} from 'modules/userId/eids.js';
 import 'modules/schain.js';
-import 'modules/consentManagement.js';
+import 'modules/consentManagementTcf.js';
 import 'modules/consentManagementUsp.js';
 import 'modules/userId/index.js';
 import 'modules/priceFloors.js';
 import 'modules/multibid/index.js';
 import adapterManager from 'src/adapterManager.js';
 import {syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
+import { deepClone } from '../../../src/utils.js';
 
 const INTEGRATION = `pbjs_lite_v$prebid.version$`; // $prebid.version$ will be substituted in by gulp in built prebid
 const PBS_INTEGRATION = 'pbjs';
@@ -33,6 +34,7 @@ describe('the rubicon adapter', function () {
     logErrorSpy;
 
   /**
+   * @typedef {import('../../../src/adapters/bidderFactory.js').BidRequest} BidRequest
    * @typedef {Object} sizeMapConverted
    * @property {string} sizeId
    * @property {string} size
@@ -270,7 +272,7 @@ describe('the rubicon adapter', function () {
       }],
       criteoId: '1111',
     };
-    bid.userIdAsEids = [
+    const eids = [
       {
         'source': 'liveintent.com',
         'uids': [
@@ -345,6 +347,7 @@ describe('the rubicon adapter', function () {
         ]
       }
     ];
+    bidderRequest.ortb2 = {user: {ext: {eids}}};
     return bidderRequest;
   }
 
@@ -483,6 +486,7 @@ describe('the rubicon adapter', function () {
     utils.logError.restore();
     config.resetConfig();
     resetRubiConf();
+    resetImpIdMap();
     delete $$PREBID_GLOBAL$$.installedModules;
   });
 
@@ -513,7 +517,7 @@ describe('the rubicon adapter', function () {
           duplicate.bids[0].params.floor = 0.01;
 
           let [request] = spec.buildRequests(duplicate.bids, duplicate);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
           expect(request.url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
 
@@ -545,9 +549,9 @@ describe('the rubicon adapter', function () {
           Object.keys(expectedQuery).forEach(key => {
             let value = expectedQuery[key];
             if (value instanceof RegExp) {
-              expect(data[key]).to.match(value);
+              expect(data.get(key)).to.match(value);
             } else {
-              expect(data[key]).to.equal(value);
+              expect(data.get(key)).to.equal(value);
             }
           });
         });
@@ -567,38 +571,38 @@ describe('the rubicon adapter', function () {
             })
           ).to.be.true;
 
-          let data = parseQuery(request.data);
-          expect(data.rp_hard_floor).to.be.undefined;
+          let data = new URLSearchParams(request.data);
+          expect(data.get('rp_hard_floor')).to.be.null;
 
           // not an object should work and not send
           getFloorResponse = undefined;
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          data = parseQuery(request.data);
-          expect(data.rp_hard_floor).to.be.undefined;
+          data = new URLSearchParams(request.data);
+          expect(data.get('rp_hard_floor')).to.be.null;
 
           // make it respond with a non USD floor should not send it
           getFloorResponse = {currency: 'EUR', floor: 1.0};
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          data = parseQuery(request.data);
-          expect(data.rp_hard_floor).to.be.undefined;
+          data = new URLSearchParams(request.data);
+          expect(data.get('rp_hard_floor')).to.be.null;
 
           // make it respond with a non USD floor should not send it
           getFloorResponse = {currency: 'EUR'};
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          data = parseQuery(request.data);
-          expect(data.rp_hard_floor).to.be.undefined;
+          data = new URLSearchParams(request.data);
+          expect(data.get('rp_hard_floor')).to.be.null;
 
           // make it respond with USD floor and string floor
           getFloorResponse = {currency: 'USD', floor: '1.23'};
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          data = parseQuery(request.data);
-          expect(data.rp_hard_floor).to.equal('1.23');
+          data = new URLSearchParams(request.data);
+          expect(data.get('rp_hard_floor')).to.equal('1.23');
 
           // make it respond with USD floor and num floor
           getFloorResponse = {currency: 'USD', floor: 1.23};
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          data = parseQuery(request.data);
-          expect(data.rp_hard_floor).to.equal('1.23');
+          data = new URLSearchParams(request.data);
+          expect(data.get('rp_hard_floor')).to.equal('1.23');
         });
 
         it('should send rp_maxbids to AE if rubicon multibid config exists', function () {
@@ -606,9 +610,9 @@ describe('the rubicon adapter', function () {
           multibidRequest.bidLimit = 5;
 
           let [request] = spec.buildRequests(multibidRequest.bids, multibidRequest);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
-          expect(data['rp_maxbids']).to.equal('5');
+          expect(data.get('rp_maxbids')).to.equal('5');
         });
 
         it('should not send p_pos to AE if not params.position specified', function () {
@@ -616,10 +620,10 @@ describe('the rubicon adapter', function () {
           delete noposRequest.bids[0].params.position;
 
           let [request] = spec.buildRequests(noposRequest.bids, noposRequest);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
-          expect(data['site_id']).to.equal('70608');
-          expect(data['p_pos']).to.equal(undefined);
+          expect(data.get('site_id')).to.equal('70608');
+          expect(data.get('p_pos')).to.equal(null);
         });
 
         it('should not send p_pos to AE if not mediaTypes.banner.pos is invalid', function () {
@@ -632,10 +636,10 @@ describe('the rubicon adapter', function () {
           delete bidRequest.bids[0].params.position;
 
           let [request] = spec.buildRequests(bidRequest.bids, bidRequest);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
-          expect(data['site_id']).to.equal('70608');
-          expect(data['p_pos']).to.equal(undefined);
+          expect(data.get('site_id')).to.equal('70608');
+          expect(data.get('p_pos')).to.equal(null);
         });
 
         it('should send p_pos to AE if mediaTypes.banner.pos is valid', function () {
@@ -648,10 +652,10 @@ describe('the rubicon adapter', function () {
           delete bidRequest.bids[0].params.position;
 
           let [request] = spec.buildRequests(bidRequest.bids, bidRequest);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
-          expect(data['site_id']).to.equal('70608');
-          expect(data['p_pos']).to.equal('atf');
+          expect(data.get('site_id')).to.equal('70608');
+          expect(data.get('p_pos')).to.equal('atf');
         });
 
         it('should not send p_pos to AE if not params.position is invalid', function () {
@@ -659,10 +663,10 @@ describe('the rubicon adapter', function () {
           badposRequest.bids[0].params.position = 'bad';
 
           let [request] = spec.buildRequests(badposRequest.bids, badposRequest);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
-          expect(data['site_id']).to.equal('70608');
-          expect(data['p_pos']).to.equal(undefined);
+          expect(data.get('site_id')).to.equal('70608');
+          expect(data.get('p_pos')).to.equal(null);
         });
 
         it('should correctly send p_pos in sra fashion', function() {
@@ -691,9 +695,41 @@ describe('the rubicon adapter', function () {
           sraPosRequest.bids.push(bidCopy3);
 
           let [request] = spec.buildRequests(sraPosRequest.bids, sraPosRequest);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
-          expect(data['p_pos']).to.equal('atf;;btf;;');
+          expect(data.get('p_pos')).to.equal('atf;;btf;;');
+        });
+
+        it('should correctly send cdep signal when requested', () => {
+          var badposRequest = utils.deepClone(bidderRequest);
+          badposRequest.bids[0].ortb2 = {device: {ext: {cdep: 3}}};
+
+          let [request] = spec.buildRequests(badposRequest.bids, badposRequest);
+          let data = new URLSearchParams(request.data);
+
+          expect(data.get('o_cdep')).to.equal('3');
+        });
+
+        it('should correctly send ip signal when ortb2.device.ip is provided', () => {
+          const ipRequest = utils.deepClone(bidderRequest);
+          ipRequest.bids[0].ortb2 = { device: { ip: '123.45.67.89' } };
+
+          let [request] = spec.buildRequests(ipRequest.bids, ipRequest);
+          let data = new URLSearchParams(request.data);
+
+          // Verify if 'ip' is correctly added to the request data
+          expect(data.get('ip')).to.equal('123.45.67.89');
+        });
+
+        it('should correctly send ipv6 signal when ortb2.device.ipv6 is provided', () => {
+          const ipv6Request = utils.deepClone(bidderRequest);
+          ipv6Request.bids[0].ortb2 = { device: { ipv6: '2001:db8::ff00:42:8329' } };
+
+          let [request] = spec.buildRequests(ipv6Request.bids, ipv6Request);
+          let data = new URLSearchParams(request.data);
+
+          // Verify if 'ipv6' is correctly added to the request data
+          expect(data.get('ipv6')).to.equal('2001:db8::ff00:42:8329');
         });
 
         it('ad engine query params should be ordered correctly', function () {
@@ -729,15 +765,15 @@ describe('the rubicon adapter', function () {
             'tg_i.rating': '5-star',
             'tg_i.prodtype': 'tech,mobile',
             'rf': 'localhost',
-            'p_geo.latitude': undefined,
-            'p_geo.longitude': undefined
+            'p_geo.latitude': null,
+            'p_geo.longitude': null
           };
 
           sandbox.stub(Math, 'random').callsFake(() => 0.1);
 
           delete bidderRequest.bids[0].params.latLong;
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
           expect(request.url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
 
@@ -745,15 +781,15 @@ describe('the rubicon adapter', function () {
           Object.keys(expectedQuery).forEach(key => {
             let value = expectedQuery[key];
             if (value instanceof RegExp) {
-              expect(data[key]).to.match(value);
+              expect(data.get(key)).to.match(value);
             } else {
-              expect(data[key]).to.equal(value);
+              expect(data.get(key)).to.equal(value);
             }
           });
 
           bidderRequest.bids[0].params.latLong = [];
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          data = parseQuery(request.data);
+          data = new URLSearchParams(request.data);
 
           expect(request.url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
 
@@ -761,9 +797,9 @@ describe('the rubicon adapter', function () {
           Object.keys(expectedQuery).forEach(key => {
             let value = expectedQuery[key];
             if (value instanceof RegExp) {
-              expect(data[key]).to.match(value);
+              expect(data.get(key)).to.match(value);
             } else {
-              expect(data[key]).to.equal(value);
+              expect(data.get(key)).to.equal(value);
             }
           });
         });
@@ -783,24 +819,24 @@ describe('the rubicon adapter', function () {
           delete bidderRequest.bids[0].params.referrer;
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
-          expect(parseQuery(request.data).rf).to.exist;
-          expect(parseQuery(request.data).rf).to.equal('https://www.prebid.org');
+          expect(new URLSearchParams(request.data).get('rf')).to.exist;
+          expect(new URLSearchParams(request.data).get('rf')).to.equal('https://www.prebid.org');
         });
 
         it('page_url should use params.referrer, bidderRequest.refererInfo in that order', function () {
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(parseQuery(request.data).rf).to.equal('localhost');
+          expect(new URLSearchParams(request.data).get('rf')).to.equal('localhost');
 
           delete bidderRequest.bids[0].params.referrer;
           let refererInfo = {page: 'https://www.prebid.org'};
           bidderRequest = Object.assign({refererInfo}, bidderRequest);
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(parseQuery(request.data).rf).to.equal('https://www.prebid.org');
+          expect(new URLSearchParams(request.data).get('rf')).to.equal('https://www.prebid.org');
 
           bidderRequest.refererInfo.page = 'http://www.prebid.org';
           bidderRequest.bids[0].params.secure = true;
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(parseQuery(request.data).rf).to.equal('https://www.prebid.org');
+          expect(new URLSearchParams(request.data).get('rf')).to.equal('https://www.prebid.org');
         });
 
         it('should use rubicon sizes if present (including non-mappable sizes)', function () {
@@ -808,10 +844,10 @@ describe('the rubicon adapter', function () {
           sizesBidderRequest.bids[0].params.sizes = [55, 57, 59, 801];
 
           let [request] = spec.buildRequests(sizesBidderRequest.bids, sizesBidderRequest);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
-          expect(data['size_id']).to.equal('55');
-          expect(data['alt_size_ids']).to.equal('57,59,801');
+          expect(data.get('size_id')).to.equal('55');
+          expect(data.get('alt_size_ids')).to.equal('57,59,801');
         });
 
         it('should not validate bid request if no valid sizes', function () {
@@ -837,48 +873,48 @@ describe('the rubicon adapter', function () {
           floorBidderRequest.bids[0].params.floor = 2;
 
           let [request] = spec.buildRequests(floorBidderRequest.bids, floorBidderRequest);
-          let data = parseQuery(request.data);
+          let data = new URLSearchParams(request.data);
 
-          expect(data['rp_floor']).to.equal('2');
+          expect(data.get('rp_floor')).to.equal('2');
         });
 
         describe('GDPR consent config', function () {
           it('should send "gdpr" and "gdpr_consent", when gdprConsent defines consentString and gdprApplies', function () {
             const bidderRequest = createGdprBidderRequest(true);
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
 
-            expect(data['gdpr']).to.equal('1');
-            expect(data['gdpr_consent']).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
+            expect(data.get('gdpr')).to.equal('1');
+            expect(data.get('gdpr_consent')).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
           });
 
           it('should send only "gdpr_consent", when gdprConsent defines only consentString', function () {
             const bidderRequest = createGdprBidderRequest();
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
 
-            expect(data['gdpr_consent']).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
-            expect(data['gdpr']).to.equal(undefined);
+            expect(data.get('gdpr_consent')).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
+            expect(data.get('gdpr')).to.equal(null);
           });
 
           it('should not send GDPR params if gdprConsent is not defined', function () {
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
 
-            expect(data['gdpr']).to.equal(undefined);
-            expect(data['gdpr_consent']).to.equal(undefined);
+            expect(data.get('gdpr')).to.equal(null);
+            expect(data.get('gdpr_consent')).to.equal(null);
           });
 
           it('should set "gdpr" value as 1 or 0, using "gdprApplies" value of either true/false', function () {
             let bidderRequest = createGdprBidderRequest(true);
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
-            expect(data['gdpr']).to.equal('1');
+            let data = new URLSearchParams(request.data);
+            expect(data.get('gdpr')).to.equal('1');
 
             bidderRequest = createGdprBidderRequest(false);
             [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            data = parseQuery(request.data);
-            expect(data['gdpr']).to.equal('0');
+            data = new URLSearchParams(request.data);
+            expect(data.get('gdpr')).to.equal('0');
           });
         });
 
@@ -886,16 +922,16 @@ describe('the rubicon adapter', function () {
           it('should send us_privacy if bidderRequest has a value for uspConsent', function () {
             addUspToBidderRequest(bidderRequest);
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
 
-            expect(data['us_privacy']).to.equal('1NYN');
+            expect(data.get('us_privacy')).to.equal('1NYN');
           });
 
           it('should not send us_privacy if bidderRequest has no uspConsent value', function () {
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
 
-            expect(data['us_privacy']).to.equal(undefined);
+            expect(data.get('us_privacy')).to.equal(null);
           });
         });
 
@@ -906,19 +942,19 @@ describe('the rubicon adapter', function () {
               applicableSections: 2
             };
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
             delete bidderRequest.gppConsent;
 
-            expect(data['gpp']).to.equal('consent');
-            expect(data['gpp_sid']).to.equal('2');
+            expect(data.get('gpp')).to.equal('consent');
+            expect(data.get('gpp_sid')).to.equal('2');
           });
 
           it('should not send gpp information if bidderRequest does not have a value for gppConsent', function () {
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
 
-            expect(data['gpp']).to.equal(undefined);
-            expect(data['gpp_sid']).to.equal(undefined);
+            expect(data.get('gpp')).to.equal(null);
+            expect(data.get('gpp_sid')).to.equal(null);
           });
         });
 
@@ -941,13 +977,14 @@ describe('the rubicon adapter', function () {
 
             // get the built request
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
 
             // make sure that no tg_v or tg_i keys are present in the request
-            let matchingExp = RegExp('^tg_(i|v)\..*$')
-            Object.keys(data).forEach(key => {
+            let matchingExp = RegExp('^tg_(i|v)\..*$');
+            // Display the keys
+            for (const key of data.keys()) {
               expect(key).to.not.match(matchingExp);
-            });
+            }
           });
 
           it('should contain valid params when some are undefined', function () {
@@ -973,17 +1010,17 @@ describe('the rubicon adapter', function () {
 
             // get the built request
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
 
             // make sure none of the undefined keys are in query
             undefinedKeys.forEach(key => {
-              expect(typeof data[key]).to.equal('undefined');
+              expect(data.get(key)).to.equal(null);
             });
 
             // make sure the expected and defined ones do show up still
             Object.keys(expectedQuery).forEach(key => {
               let value = expectedQuery[key];
-              expect(data[key]).to.equal(value);
+              expect(data.get(key)).to.equal(value);
             });
           });
 
@@ -1067,12 +1104,12 @@ describe('the rubicon adapter', function () {
 
             // get the built request
             let [request] = spec.buildRequests(bidderRequest.bids.map((b) => ({...b, ortb2})), bidderRequest);
-            let data = parseQuery(request.data);
+            let data = new URLSearchParams(request.data);
 
             // make sure that tg_v, tg_i, and kw values are correct
             Object.keys(expectedQuery).forEach(key => {
               let value = expectedQuery[key];
-              expect(data[key]).to.deep.equal(value);
+              expect(data.get(key)).to.deep.equal(value);
             });
           });
         });
@@ -1151,13 +1188,13 @@ describe('the rubicon adapter', function () {
                 expect(bidRequestItem.params.siteId).to.equal(array[0].params.siteId);
               });
 
-              const data = parseQuery(item.data);
+              const data = new URLSearchParams(item.data);
 
               Object.keys(expectedQuery).forEach(key => {
-                expect(data).to.have.property(key);
+                expect(data.get(key)).to.be.exist;
 
                 // extract semicolon delineated values
-                const params = data[key].split(';');
+                const params = data.get(key).split(';');
 
                 // skip value test for site and zone ids
                 if (key !== 'site_id' && key !== 'zone_id') {
@@ -1206,10 +1243,10 @@ describe('the rubicon adapter', function () {
             // check that slots param value matches
             expect(serverRequests[0].data.indexOf('&slots=10&') !== -1).to.equal(true);
             // check that zone_id has 10 values (since all zone_ids are unique all should exist in get param)
-            data = parseQuery(serverRequests[0].data);
-            expect(data).to.be.a('object');
-            expect(data).to.have.property('zone_id');
-            expect(data.zone_id.split(';')).to.have.lengthOf(10);
+            data = new URLSearchParams(serverRequests[0].data);
+            expect(typeof data).to.equal('object');
+            expect(data.get('zone_id')).to.be.exist;
+            expect(data.get('zone_id').split(';')).to.have.lengthOf(10);
 
             // TEST '100' BIDS, add 90 to the previously added 10
             for (let i = 0; i < 90; i++) {
@@ -1247,10 +1284,10 @@ describe('the rubicon adapter', function () {
             expect(serverRequests).that.is.an('array').of.length(1);
 
             // get the built query
-            let data = parseQuery(serverRequests[0].data);
+            let data = new URLSearchParams(serverRequests[0].data);
 
             // num slots should be 4
-            expect(data.slots).to.equal('4');
+            expect(data.get('slots')).to.equal('4');
           });
 
           it('should not group bid requests if singleRequest does not equal true', function () {
@@ -1317,173 +1354,60 @@ describe('the rubicon adapter', function () {
         });
 
         describe('user id config', function () {
-          it('should send tpid_tdid when userIdAsEids contains unifiedId', function () {
-            const clonedBid = utils.deepClone(bidderRequest.bids[0]);
-            clonedBid.userId = {
-              tdid: 'abcd-efgh-ijkl-mnop-1234'
-            };
-            clonedBid.userIdAsEids = [
-              {
-                'source': 'adserver.org',
-                'uids': [
-                  {
-                    'id': 'abcd-efgh-ijkl-mnop-1234',
-                    'atype': 1,
-                    'ext': {
-                      'rtiPartner': 'TDID'
-                    }
-                  }
-                ]
-              }
-            ];
-            let [request] = spec.buildRequests([clonedBid], bidderRequest);
-            let data = parseQuery(request.data);
-
-            expect(data['tpid_tdid']).to.equal('abcd-efgh-ijkl-mnop-1234');
-            expect(data['eid_adserver.org']).to.equal('abcd-efgh-ijkl-mnop-1234');
-          });
-
-          describe('LiveIntent support', function () {
-            it('should send tpid_liveintent.com when userIdAsEids contains liveintentId', function () {
-              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
-              clonedBid.userId = {
-                lipb: {
-                  lipbid: '0000-1111-2222-3333',
-                  segments: ['segA', 'segB']
-                }
-              };
-              clonedBid.userIdAsEids = [
-                {
-                  'source': 'liveintent.com',
-                  'uids': [
-                    {
-                      'id': '0000-1111-2222-3333',
-                      'atype': 3
-                    }
-                  ],
-                  'ext': {
-                    'segments': [
-                      'segA',
-                      'segB'
-                    ]
-                  }
-                }
-              ];
-              let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              let data = parseQuery(request.data);
-
-              expect(data['tpid_liveintent.com']).to.equal('0000-1111-2222-3333');
-              expect(data['eid_liveintent.com']).to.equal('0000-1111-2222-3333');
-              expect(data['tg_v.LIseg']).to.equal('segA,segB');
-            });
-
-            it('should send tg_v.LIseg when userIdAsEids contains liveintentId with ext.segments as array', function () {
-              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
-              clonedBid.userId = {
-                lipb: {
-                  lipbid: '1111-2222-3333-4444',
-                  segments: ['segD', 'segE']
-                }
-              };
-              clonedBid.userIdAsEids = [
-                {
-                  'source': 'liveintent.com',
-                  'uids': [
-                    {
-                      'id': '1111-2222-3333-4444',
-                      'atype': 3
-                    }
-                  ],
-                  'ext': {
-                    'segments': [
-                      'segD',
-                      'segE'
-                    ]
-                  }
-                }
-              ]
-              let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              const unescapedData = unescape(request.data);
-
-              expect(unescapedData.indexOf('&tpid_liveintent.com=1111-2222-3333-4444&') !== -1).to.equal(true);
-              expect(unescapedData.indexOf('&tg_v.LIseg=segD,segE&') !== -1).to.equal(true);
-            });
-          });
-
-          describe('LiveRamp support', function () {
-            it('should send x_liverampidl when userIdAsEids contains liverampId', function () {
-              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
-              clonedBid.userId = {
-                idl_env: '1111-2222-3333-4444'
-              };
-              clonedBid.userIdAsEids = [
-                {
-                  'source': 'liveramp.com',
-                  'uids': [
-                    {
-                      'id': '1111-2222-3333-4444',
-                      'atype': 3
-                    }
-                  ]
-                }
-              ]
-              let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              let data = parseQuery(request.data);
-
-              expect(data['x_liverampidl']).to.equal('1111-2222-3333-4444');
-            });
-          });
-
           describe('pubcid support', function () {
-            it('should send eid_pubcid.org when userIdAsEids contains pubcid', function () {
+            it('should send eid_pubcid.org when ortb2.user.ext.eids contains pubcid', function () {
               const clonedBid = utils.deepClone(bidderRequest.bids[0]);
               clonedBid.userId = {
                 pubcid: '1111'
               };
-              clonedBid.userIdAsEids = [
-                {
-                  'source': 'pubcid.org',
-                  'uids': [
-                    {
-                      'id': '1111',
-                      'atype': 1
-                    }
-                  ]
+              clonedBid.ortb2 = {
+                user: {
+                  ext: {
+                    eids: [{
+                      'source': 'pubcid.org',
+                      'uids': [{
+                        'id': '1111',
+                        'atype': 1
+                      }]
+                    }]
+                  }
                 }
-              ]
+              };
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              let data = parseQuery(request.data);
+              let data = new URLSearchParams(request.data);
 
-              expect(data['eid_pubcid.org']).to.equal('1111^1');
+              expect(data.get('eid_pubcid.org')).to.equal('1111^1^^^^^');
             });
           });
 
           describe('Criteo support', function () {
-            it('should send eid_criteo.com when userIdAsEids contains criteo', function () {
+            it('should send eid_criteo.com when ortb2.user.ext.eids contains criteo', function () {
               const clonedBid = utils.deepClone(bidderRequest.bids[0]);
               clonedBid.userId = {
                 criteoId: '1111'
               };
-              clonedBid.userIdAsEids = [
-                {
-                  'source': 'criteo.com',
-                  'uids': [
-                    {
-                      'id': '1111',
-                      'atype': 1
-                    }
-                  ]
+              clonedBid.ortb2 = {
+                user: {
+                  ext: {
+                    eids: [{
+                      'source': 'criteo.com',
+                      'uids': [{
+                        'id': '1111',
+                        'atype': 1
+                      }]
+                    }]
+                  }
                 }
-              ]
+              };
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              let data = parseQuery(request.data);
+              let data = new URLSearchParams(request.data);
 
-              expect(data['eid_criteo.com']).to.equal('1111^1');
+              expect(data.get('eid_criteo.com')).to.equal('1111^1^^^^^');
             });
           });
 
           describe('pubProvidedId support', function () {
-            it('should send pubProvidedId when userIdAsEids contains pubProvidedId ids', function () {
+            it('should send pubProvidedId when ortb2.user.ext.eids contains pubProvidedId ids', function () {
               const clonedBid = utils.deepClone(bidderRequest.bids[0]);
               clonedBid.userId = {
                 pubProvidedId: [{
@@ -1501,36 +1425,36 @@ describe('the rubicon adapter', function () {
                   }]
                 }]
               };
-              clonedBid.userIdAsEids = [
-                {
-                  'source': 'example.com',
-                  'uids': [
-                    {
-                      'id': '11111',
-                      'ext': {
-                        'stype': 'ppuid'
-                      }
-                    }
-                  ]
-                },
-                {
-                  'source': 'id-partner.com',
-                  'uids': [
+              clonedBid.ortb2 = {
+                user: {
+                  ext: {
+                    eids: [{
+                      'source': 'example.com',
+                      'uids': [{
+                        'id': '11111',
+                        'ext': {
+                          'stype': 'ppuid'
+                        }
+                      }]
+                    },
                     {
-                      'id': '222222'
-                    }
-                  ]
+                      'source': 'id-partner.com',
+                      'uids': [{
+                        'id': '222222'
+                      }]
+                    }]
+                  }
                 }
-              ];
+              };
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              let data = parseQuery(request.data);
+              let data = new URLSearchParams(request.data);
 
-              expect(data['ppuid']).to.equal('11111');
+              expect(data.get('ppuid')).to.equal('11111');
             });
           });
 
           describe('ID5 support', function () {
-            it('should send ID5 id when userIdAsEids contains ID5', function () {
+            it('should send ID5 id when ortb2.user.ext.eids contains ID5', function () {
               const clonedBid = utils.deepClone(bidderRequest.bids[0]);
               clonedBid.userId = {
                 id5id: {
@@ -1540,24 +1464,26 @@ describe('the rubicon adapter', function () {
                   }
                 }
               };
-              clonedBid.userIdAsEids = [
-                {
-                  'source': 'id5-sync.com',
-                  'uids': [
-                    {
-                      'id': '11111',
-                      'atype': 1,
-                      'ext': {
-                        'linkType': '22222'
-                      }
-                    }
-                  ]
+              clonedBid.ortb2 = {
+                user: {
+                  ext: {
+                    eids: [{
+                      'source': 'id5-sync.com',
+                      'uids': [{
+                        'id': '11111',
+                        'atype': 1,
+                        'ext': {
+                          'linkType': '22222'
+                        }
+                      }]
+                    }]
+                  }
                 }
-              ];
+              };
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              let data = parseQuery(request.data);
+              let data = new URLSearchParams(request.data);
 
-              expect(data['eid_id5-sync.com']).to.equal('11111^1^22222');
+              expect(data.get('eid_id5-sync.com')).to.equal('11111^1^^^^^');
             });
           });
 
@@ -1565,36 +1491,82 @@ describe('the rubicon adapter', function () {
             it('should send user id with generic format', function () {
               const clonedBid = utils.deepClone(bidderRequest.bids[0]);
               // Hardcoding userIdAsEids since createEidsArray returns empty array if source not found in eids.js
-              clonedBid.userIdAsEids = [{
-                source: 'catchall',
-                uids: [{
-                  id: '11111',
-                  atype: 2
-                }]
-              }]
+              clonedBid.ortb2 = {
+                user: {
+                  ext: {
+                    eids: [{
+                      'source': 'catchall',
+                      'uids': [{
+                        'id': '11111',
+                        'atype': 2
+                      }]
+                    }]
+                  }
+                }
+              };
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              let data = parseQuery(request.data);
+              let data = new URLSearchParams(request.data);
 
-              expect(data['eid_catchall']).to.equal('11111^2');
+              expect(data.get('eid_catchall')).to.equal('11111^2^^^^^');
             });
 
             it('should send rubiconproject special case', function () {
               const clonedBid = utils.deepClone(bidderRequest.bids[0]);
               // Hardcoding userIdAsEids since createEidsArray returns empty array if source not found in eids.js
-              clonedBid.userIdAsEids = [{
-                source: 'rubiconproject.com',
-                uids: [{
-                  id: 'some-cool-id',
-                  atype: 3
-                }]
-              }]
+              clonedBid.ortb2 = {
+                user: {
+                  ext: {
+                    eids: [{
+                      source: 'rubiconproject.com',
+                      uids: [{
+                        id: 'some-cool-id',
+                        atype: 3
+                      }]
+                    }]
+                  }
+                }
+              };
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              let data = parseQuery(request.data);
+              let data = new URLSearchParams(request.data);
 
-              expect(data['eid_rubiconproject.com']).to.equal('some-cool-id');
+              expect(data.get('eid_rubiconproject.com')).to.equal('some-cool-id^3^^^^^');
             });
-          });
+            describe('Full eidValue format validation', function () {
+              it('should send complete eidValue in the format uid^atype^third^inserter^matcher^mm^rtipartner', function () {
+                const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+                // Simulating a full EID object with multiple fields
+                clonedBid.ortb2 = {
+                  user: {
+                    ext: {
+                      eids: [{
+                        source: 'example.com',
+                        uids: [{
+                          id: '11111', // UID
+                          atype: 2, // atype
+                          ext: {
+                            rtipartner: 'rtipartner123', // rtipartner
+                            stype: 'ppuid' // stype
+                          }
+                        }],
+                        inserter: 'inserter123', // inserter
+                        matcher: 'matcher123', // matcher
+                        mm: 'mm123' // mm
+                      }]
+                    }
+                  }
+                };
+
+                let [request] = spec.buildRequests([clonedBid], bidderRequest);
+                let data = new URLSearchParams(request.data);
+
+                // Expected format: uid^atype^third^inserter^matcher^mm^rtipartner
+                const expectedEidValue = '11111^2^^inserter123^matcher123^mm123^rtipartner123';
 
+                // Check if the generated EID value matches the expected format
+                expect(data.get('eid_example.com')).to.equal(expectedEidValue);
+              });
+            });
+          });
           describe('Config user.id support', function () {
             it('should send ppuid when config defines user.id', function () {
               config.setConfig({user: {id: '123'}});
@@ -1603,9 +1575,9 @@ describe('the rubicon adapter', function () {
                 pubcid: '1111'
               };
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
-              let data = parseQuery(request.data);
+              let data = new URLSearchParams(request.data);
 
-              expect(data['ppuid']).to.equal('123');
+              expect(data.get('ppuid')).to.equal('123');
             });
           });
         });
@@ -1620,20 +1592,20 @@ describe('the rubicon adapter', function () {
 
           it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data\" object is not valid', function () {
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.pbadslot’');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.pbadslot’')).to.be.null;
           });
 
           it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data.pbadslot\" is undefined', function () {
             bidderRequest.bids[0].ortb2Imp = {};
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.pbadslot’');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.pbadslot’')).to.be.null;
           });
 
           it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data.pbadslot\" value is an empty string', function () {
@@ -1646,10 +1618,10 @@ describe('the rubicon adapter', function () {
             };
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.pbadslot');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.pbadslot')).to.be.null;
           });
 
           it('should send \"tg_i.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a valid string', function () {
@@ -1662,11 +1634,11 @@ describe('the rubicon adapter', function () {
             }
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.have.property('tg_i.pbadslot');
-            expect(data['tg_i.pbadslot']).to.equal('abc');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.pbadslot')).to.be.exist;
+            expect(data.get('tg_i.pbadslot')).to.equal('abc');
           });
 
           it('should send \"tg_i.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a valid string', function () {
@@ -1679,11 +1651,11 @@ describe('the rubicon adapter', function () {
             }
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.have.property('tg_i.pbadslot');
-            expect(data['tg_i.pbadslot']).to.equal('/a/b/c');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.pbadslot')).to.be.exist;
+            expect(data.get('tg_i.pbadslot')).to.equal('/a/b/c');
           });
 
           it('should send gpid as p_gpid if valid', function () {
@@ -1694,13 +1666,122 @@ describe('the rubicon adapter', function () {
             }
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.have.property('p_gpid');
-            expect(data['p_gpid']).to.equal('/1233/sports&div1');
+            expect(typeof data).to.equal('object');
+            expect(data.get('p_gpid')).to.be.exist;
+            expect(data.get('p_gpid')).to.equal('/1233/sports&div1');
           });
 
+          describe('Pass DSA signals', function() {
+            const ortb2 = {
+              regs: {
+                ext: {
+                  dsa: {
+                    dsarequired: 3,
+                    pubrender: 0,
+                    datatopub: 2,
+                    transparency: [
+                      {
+                        domain: 'testdomain.com',
+                        dsaparams: [1],
+                      },
+                      {
+                        domain: 'testdomain2.com',
+                        dsaparams: [1, 2]
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+            it('should send valid dsaparams but filter out invalid ones', function () {
+              const ortb2Clone = JSON.parse(JSON.stringify(ortb2));
+              ortb2Clone.regs.ext.dsa.transparency = [
+                {
+                  domain: 'testdomain.com',
+                  dsaparams: [1],
+                },
+                {
+                  domain: '',
+                  dsaparams: [2],
+                }
+              ];
+
+              const expectedTransparency = 'testdomain.com~1';
+              const [request] = spec.buildRequests(bidderRequest.bids.map((b) => ({ ...b, ortb2: ortb2Clone })), bidderRequest);
+              const data = new URLSearchParams(request.data);
+
+              expect(data.get('dsatransparency')).to.equal(expectedTransparency);
+            })
+            it('should send dsaparams if \"ortb2.regs.ext.dsa.transparancy[0].params\"', function() {
+              const ortb2Clone = JSON.parse(JSON.stringify(ortb2));
+
+              ortb2Clone.regs.ext.dsa.transparency = [{
+                domain: 'testdomain.com',
+                dsaparams: [1],
+              }];
+
+              const expectedTransparency = 'testdomain.com~1';
+              const [request] = spec.buildRequests(bidderRequest.bids.map((b) => ({...b, ortb2: ortb2Clone})), bidderRequest);
+              const data = new URLSearchParams(request.data);
+
+              expect(data.get('dsatransparency')).to.equal(expectedTransparency);
+            })
+            it('should pass an empty transparency param if \"ortb2.regs.ext.dsa.transparency[0].params\" is empty', function() {
+              const ortb2Clone = JSON.parse(JSON.stringify(ortb2));
+
+              ortb2Clone.regs.ext.dsa.transparency = [{
+                domain: 'testdomain.com',
+                params: [],
+              }];
+
+              const [request] = spec.buildRequests(bidderRequest.bids.map((b) => ({...b, ortb2: ortb2Clone})), bidderRequest);
+              const data = new URLSearchParams(request.data);
+              expect(data.get('dsatransparency')).to.be.null
+            })
+            it('should send an empty transparency if \"ortb2.regs.ext.dsa.transparency[0].domain\" is empty', function() {
+              const ortb2Clone = JSON.parse(JSON.stringify(ortb2));
+
+              ortb2Clone.regs.ext.dsa.transparency = [{
+                domain: '',
+                dsaparams: [1],
+              }];
+
+              const [request] = spec.buildRequests(bidderRequest.bids.map((b) => ({...b, ortb2: ortb2Clone})), bidderRequest);
+              const data = new URLSearchParams(request.data);
+
+              expect(data.get('dsatransparency')).to.be.null
+            })
+            it('should send dsa signals if \"ortb2.regs.ext.dsa\"', function() {
+              const expectedTransparency = 'testdomain.com~1~~testdomain2.com~1_2'
+              const [request] = spec.buildRequests(bidderRequest.bids.map((b) => ({...b, ortb2})), bidderRequest)
+              const data = new URLSearchParams(request.data);
+
+              expect(typeof data).to.equal('object');
+              expect(data.get('dsarequired')).to.be.exist;
+              expect(data.get('dsapubrender')).to.be.exist;
+              expect(data.get('dsadatatopubs')).to.be.exist;
+              expect(data.get('dsatransparency')).to.be.exist;
+
+              expect(data.get('dsarequired')).to.equal(ortb2.regs.ext.dsa.dsarequired.toString());
+              expect(data.get('dsapubrender')).to.equal(ortb2.regs.ext.dsa.pubrender.toString());
+              expect(data.get('dsadatatopubs')).to.equal(ortb2.regs.ext.dsa.datatopub.toString());
+              expect(data.get('dsatransparency')).to.equal(expectedTransparency);
+            })
+            it('should return one transparency param', function() {
+              const expectedTransparency = 'testdomain.com~1';
+              const ortb2Clone = deepClone(ortb2);
+              ortb2Clone.regs.ext.dsa.transparency.pop()
+              const [request] = spec.buildRequests(bidderRequest.bids.map((b) => ({...b, ortb2: ortb2Clone})), bidderRequest)
+              const data = new URLSearchParams(request.data);
+
+              expect(typeof data).to.equal('object');
+              expect(data.get('dsatransparency')).to.be.exist;
+              expect(data.get('dsatransparency')).to.equal(expectedTransparency);
+            })
+          })
+
           it('should send gpid and pbadslot since it is prefered over dfp code', function () {
             bidderRequest.bids[0].ortb2Imp = {
               ext: {
@@ -1716,12 +1797,12 @@ describe('the rubicon adapter', function () {
             }
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data['p_gpid']).to.equal('/1233/sports&div1');
-            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
-            expect(data['tg_i.pbadslot']).to.equal('pb_slot');
+            expect(typeof data).to.equal('object');
+            expect(data.get('p_gpid')).to.equal('/1233/sports&div1');
+            expect(data.get('tg_i.dfp_ad_unit_code')).to.be.null;
+            expect(data.get('tg_i.pbadslot')).to.equal('pb_slot');
           });
         });
 
@@ -1735,20 +1816,20 @@ describe('the rubicon adapter', function () {
 
           it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data\" object is not valid', function () {
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code’');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.dfp_ad_unit_code’')).to.be.null;
           });
 
           it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data.adServer.adslot\" is undefined', function () {
             bidderRequest.bids[0].ortb2Imp = {};
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code’');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.dfp_ad_unit_code’')).to.be.null;
           });
 
           it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data.adServer.adslot\" value is an empty string', function () {
@@ -1763,10 +1844,10 @@ describe('the rubicon adapter', function () {
             };
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.dfp_ad_unit_code')).to.be.null;
           });
 
           it('should send NOT \"tg_i.dfp_ad_unit_code\" if \"ortb2Imp.ext.data.adServer.adslot\" value is a valid string but not gam', function () {
@@ -1782,10 +1863,10 @@ describe('the rubicon adapter', function () {
             }
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.dfp_ad_unit_code')).to.but.null;
           });
 
           it('should send \"tg_i.dfp_ad_unit_code\" if \"ortb2Imp.ext.data.adServer.adslot\" value is a valid string and name is gam', function () {
@@ -1801,11 +1882,131 @@ describe('the rubicon adapter', function () {
             };
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            const data = parseQuery(request.data);
+            const data = new URLSearchParams(request.data);
 
-            expect(data).to.be.an('Object');
-            expect(data).to.have.property('tg_i.dfp_ad_unit_code');
-            expect(data['tg_i.dfp_ad_unit_code']).to.equal('/a/b/c');
+            expect(typeof data).to.equal('object');
+            expect(data.get('tg_i.dfp_ad_unit_code')).to.be.exist;
+            expect(data.get('tg_i.dfp_ad_unit_code')).to.equal('/a/b/c');
+          });
+        });
+
+        describe('client hints', function () {
+          let standardSuaObject;
+          beforeEach(function () {
+            standardSuaObject = {
+              source: 2,
+              platform: {
+                brand: 'macOS',
+                version: [
+                  '12',
+                  '6',
+                  '0'
+                ]
+              },
+              browsers: [
+                {
+                  brand: 'Not.A/Brand',
+                  version: [
+                    '8',
+                    '0',
+                    '0',
+                    '0'
+                  ]
+                },
+                {
+                  brand: 'Chromium',
+                  version: [
+                    '114',
+                    '0',
+                    '5735',
+                    '198'
+                  ]
+                },
+                {
+                  brand: 'Google Chrome',
+                  version: [
+                    '114',
+                    '0',
+                    '5735',
+                    '198'
+                  ]
+                }
+              ],
+              mobile: 0,
+              model: '',
+              bitness: '64',
+              architecture: 'x86'
+            }
+          });
+          it('should send m_ch_* params if ortb2.device.sua object is there', function () {
+            let bidRequestSua = utils.deepClone(bidderRequest);
+            bidRequestSua.bids[0].ortb2 = { device: { sua: standardSuaObject } };
+
+            // How should fastlane query be constructed with default SUA
+            let expectedValues = {
+              m_ch_arch: 'x86',
+              m_ch_bitness: '64',
+              m_ch_ua: `"Not.A/Brand"|v="8","Chromium"|v="114","Google Chrome"|v="114"`,
+              m_ch_full_ver: `"Not.A/Brand"|v="8.0.0.0","Chromium"|v="114.0.5735.198","Google Chrome"|v="114.0.5735.198"`,
+              m_ch_mobile: '?0',
+              m_ch_platform: 'macOS',
+              m_ch_platform_ver: '12.6.0'
+            }
+
+            // Build Fastlane call
+            let [request] = spec.buildRequests(bidRequestSua.bids, bidRequestSua);
+            let data = new URLSearchParams(request.data);
+
+            // Loop through expected values and if they do not match push an error
+            const errors = Object.entries(expectedValues).reduce((accum, [key, val]) => {
+              if (data.get(key) !== val) accum.push(`${key} - expect: ${val} - got: ${data[key]}`)
+              return accum;
+            }, []);
+
+            // should be no errors
+            expect(errors).to.deep.equal([]);
+          });
+          it('should not send invalid values for m_ch_*', function () {
+            let bidRequestSua = utils.deepClone(bidderRequest);
+
+            // Alter input SUA object
+            // send model
+            standardSuaObject.model = 'Suface Duo';
+            // send mobile = 1
+            standardSuaObject.mobile = 1;
+
+            // make browsers not an array
+            standardSuaObject.browsers = 'My Browser';
+
+            // make platform not have version
+            delete standardSuaObject.platform.version;
+
+            // delete architecture
+            delete standardSuaObject.architecture;
+
+            // add SUA to bid
+            bidRequestSua.bids[0].ortb2 = { device: { sua: standardSuaObject } };
+
+            // Build Fastlane request
+            let [request] = spec.buildRequests(bidRequestSua.bids, bidRequestSua);
+            let data = new URLSearchParams(request.data);
+
+            // should show new names
+            expect(data.get('m_ch_model')).to.equal('Suface Duo');
+            expect(data.get('m_ch_mobile')).to.equal('?1');
+
+            // should still send platform
+            expect(data.get('m_ch_platform')).to.equal('macOS');
+
+            // platform version not sent
+            expect(data.get('m_ch_platform_ver')).to.be.null;
+
+            // both ua and full_ver not sent because browsers not array
+            expect(data.get('m_ch_ua')).to.be.null;
+            expect(data.get('m_ch_full_ver')).to.be.null;
+
+            // arch not sent
+            expect(data.get('m_ch_arch')).to.be.null;
           });
         });
       });
@@ -2085,17 +2286,6 @@ describe('the rubicon adapter', function () {
             expect(payload.ext.prebid.analytics).to.be.undefined;
           });
 
-          it('should send video exp param correctly when set', function () {
-            const bidderRequest = createVideoBidderRequest();
-            config.setConfig({s2sConfig: {defaultTtl: 600}});
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let post = request.data;
-
-            // should exp set to the right value according to config
-            let imp = post.imp[0];
-            expect(imp.exp).to.equal(600);
-          });
-
           it('should not send video exp at all if not set in s2sConfig config', function () {
             const bidderRequest = createVideoBidderRequest();
             let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
@@ -2251,16 +2441,6 @@ describe('the rubicon adapter', function () {
             bidderRequest = createVideoBidderRequest();
             delete bidderRequest.bids[0].mediaTypes.video.linearity;
             expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.equal(false);
-
-            // change api to an string, no good
-            bidderRequest = createVideoBidderRequest();
-            bidderRequest.bids[0].mediaTypes.video.api = 'string';
-            expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.equal(false);
-
-            // delete api, no good
-            bidderRequest = createVideoBidderRequest();
-            delete bidderRequest.bids[0].mediaTypes.video.api;
-            expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.equal(false);
           });
 
           it('bid request is valid when video context is outstream', function () {
@@ -2589,6 +2769,95 @@ describe('the rubicon adapter', function () {
           const slotParams = spec.createSlotParams(bidderRequest.bids[0], bidderRequest);
           expect(slotParams.kw).to.equal('a,b,c');
         });
+
+        it('should pass along o_ae param when fledge is enabled', () => {
+          const localBidRequest = Object.assign({}, bidderRequest.bids[0]);
+          localBidRequest.ortb2Imp.ext.ae = true;
+
+          const slotParams = spec.createSlotParams(localBidRequest, bidderRequest);
+
+          expect(slotParams['o_ae']).to.equal(1)
+        });
+
+        it('should pass along desired segtaxes, but not non-desired ones', () => {
+          const localBidderRequest = Object.assign({}, bidderRequest);
+          localBidderRequest.refererInfo = {domain: 'bob'};
+          config.setConfig({
+            rubicon: {
+              sendUserSegtax: [9],
+              sendSiteSegtax: [10]
+            }
+          });
+          localBidderRequest.ortb2.user = {
+            data: [{
+              ext: {
+                segtax: '404'
+              },
+              segment: [{id: 5}, {id: 6}]
+            }, {
+              ext: {
+                segtax: '508'
+              },
+              segment: [{id: 5}, {id: 2}]
+            }, {
+              ext: {
+                segtax: '9'
+              },
+              segment: [{id: 1}, {id: 2}]
+            }]
+          }
+          localBidderRequest.ortb2.site = {
+            content: {
+              data: [{
+                ext: {
+                  segtax: '10'
+                },
+                segment: [{id: 2}, {id: 3}]
+              }, {
+                ext: {
+                  segtax: '507'
+                },
+                segment: [{id: 3}, {id: 4}]
+              }]
+            }
+          }
+          const slotParams = spec.createSlotParams(bidderRequest.bids[0], localBidderRequest);
+          expect(slotParams['tg_i.tax507']).is.equal('3,4');
+          expect(slotParams['tg_v.tax508']).is.equal('5,2');
+          expect(slotParams['tg_v.tax9']).is.equal('1,2');
+          expect(slotParams['tg_i.tax10']).is.equal('2,3');
+          expect(slotParams['tg_v.tax404']).is.equal(undefined);
+        });
+
+        it('should add p_site.mobile if mobile is a number in ortb2.site', function () {
+          // Set up a bidRequest with mobile property as a number
+          const localBidderRequest = Object.assign({}, bidderRequest);
+          localBidderRequest.bids[0].ortb2 = {
+            site: {
+              mobile: 1 // Valid mobile value (number)
+            }
+          };
+
+          // Call the function
+          const slotParams = spec.createSlotParams(localBidderRequest.bids[0], localBidderRequest);
+          // Check that p_site.mobile was added to the slotParams with the correct value
+          expect(slotParams['p_site.mobile']).to.equal(1);
+        });
+        it('should not add p_site.mobile if mobile is not a number in ortb2.site', function () {
+          // Set up a bidRequest with mobile property as a string (invalid value)
+          const localBidderRequest = Object.assign({}, bidderRequest);
+          localBidderRequest.bids[0].ortb2 = {
+            site: {
+              mobile: 'not-a-number' // Invalid mobile value (string)
+            }
+          };
+
+          // Call the function
+          const slotParams = spec.createSlotParams(localBidderRequest.bids[0], localBidderRequest);
+
+          // Check that p_site.mobile is not added to the slotParams
+          expect(slotParams['p_site.mobile']).to.be.undefined;
+        });
       });
 
       describe('classifiedAsVideo', function () {
@@ -2780,6 +3049,21 @@ describe('the rubicon adapter', function () {
               expect(other).to.be.empty;
             });
           });
+
+          describe('with duplicate adUnitCodes', () => {
+            it('should increment PBS request imp[].id starting at 2', () => {
+              const nativeBidderRequest = addNativeToBidRequest(bidderRequest, {twin: true});
+              const request = converter.toORTB({bidderRequest: nativeBidderRequest, bidRequests: nativeBidderRequest.bids});
+              for (let i = 0; i < nativeBidderRequest.bids.length; i++) {
+                var adUnitCode = nativeBidderRequest.bids[i].adUnitCode;
+                if (i === 0) {
+                  expect(request.imp[i].id).to.equal(adUnitCode);
+                } else {
+                  expect(request.imp[i].id).to.equal(adUnitCode + (i + 1));
+                }
+              }
+            });
+          });
         });
       }
     });
@@ -2855,7 +3139,7 @@ describe('the rubicon adapter', function () {
           expect(bids[0].width).to.equal(320);
           expect(bids[0].height).to.equal(50);
           expect(bids[0].cpm).to.equal(0.911);
-          expect(bids[0].ttl).to.equal(300);
+          expect(bids[0].ttl).to.equal(360);
           expect(bids[0].netRevenue).to.equal(true);
           expect(bids[0].rubicon.advertiserId).to.equal(7);
           expect(bids[0].rubicon.networkId).to.equal(8);
@@ -2872,7 +3156,7 @@ describe('the rubicon adapter', function () {
           expect(bids[1].width).to.equal(300);
           expect(bids[1].height).to.equal(250);
           expect(bids[1].cpm).to.equal(0.811);
-          expect(bids[1].ttl).to.equal(300);
+          expect(bids[1].ttl).to.equal(360);
           expect(bids[1].netRevenue).to.equal(true);
           expect(bids[1].rubicon.advertiserId).to.equal(7);
           expect(bids[1].rubicon.networkId).to.equal(8);
@@ -3147,6 +3431,86 @@ describe('the rubicon adapter', function () {
           expect(bids[0].cpm).to.be.equal(0);
         });
 
+        it('should handle DSA object from response', function() {
+          let response = {
+            'status': 'ok',
+            'account_id': 14062,
+            'site_id': 70608,
+            'zone_id': 530022,
+            'size_id': 15,
+            'alt_size_ids': [
+              43
+            ],
+            'tracking': '',
+            'inventory': {},
+            'ads': [
+              {
+                'status': 'ok',
+                'impression_id': '153dc240-8229-4604-b8f5-256933b9374c',
+                'size_id': '15',
+                'ad_id': '6',
+                'adomain': ['test.com'],
+                'advertiser': 7,
+                'network': 8,
+                'creative_id': 'crid-9',
+                'type': 'script',
+                'script': 'alert(\'foo\')',
+                'campaign_id': 10,
+                'cpm': 0.811,
+                'targeting': [
+                  {
+                    'key': 'rpfl_14062',
+                    'values': [
+                      '15_tier_all_test'
+                    ]
+                  }
+                ],
+                'dsa': {
+                  'behalf': 'Advertiser',
+                  'paid': 'Advertiser',
+                  'transparency': [{
+                    'domain': 'dsp1domain.com',
+                    'dsaparams': [1, 2]
+                  }],
+                  'adrender': 1
+                }
+              },
+              {
+                'status': 'ok',
+                'impression_id': '153dc240-8229-4604-b8f5-256933b9374d',
+                'size_id': '43',
+                'ad_id': '7',
+                'adomain': ['test.com'],
+                'advertiser': 7,
+                'network': 8,
+                'creative_id': 'crid-9',
+                'type': 'script',
+                'script': 'alert(\'foo\')',
+                'campaign_id': 10,
+                'cpm': 0.911,
+                'targeting': [
+                  {
+                    'key': 'rpfl_14062',
+                    'values': [
+                      '43_tier_all_test'
+                    ]
+                  }
+                ],
+                'dsa': {}
+              }
+            ]
+          };
+          let bids = spec.interpretResponse({body: response}, {
+            bidRequest: bidderRequest.bids[0]
+          });
+          expect(bids).to.be.lengthOf(2);
+          expect(bids[1].meta.dsa).to.have.property('behalf');
+          expect(bids[1].meta.dsa).to.have.property('paid');
+
+          // if we dont have dsa field in response or the dsa object is empty
+          expect(bids[0].meta).to.not.have.property('dsa');
+        })
+
         it('should create bids with matching requestIds if imp id matches', function () {
           let bidRequests = [{
             'bidder': 'rubicon',
@@ -3309,6 +3673,43 @@ describe('the rubicon adapter', function () {
           expect(bids).to.be.lengthOf(0);
         });
 
+        it('Should support recieving an auctionConfig and pass it along to Prebid', function () {
+          let response = {
+            'status': 'ok',
+            'account_id': 14062,
+            'site_id': 70608,
+            'zone_id': 530022,
+            'size_id': 15,
+            'alt_size_ids': [
+              43
+            ],
+            'tracking': '',
+            'inventory': {},
+            'ads': [{
+              'status': 'ok',
+              'cpm': 0,
+              'size_id': 15
+            }],
+            'component_auction_config': [{
+              'random': 'value',
+              'bidId': '5432'
+            },
+            {
+              'random': 'string',
+              'bidId': '6789'
+            }]
+          };
+
+          let {bids, paapi} = spec.interpretResponse({body: response}, {
+            bidRequest: bidderRequest.bids[0]
+          });
+
+          expect(bids).to.be.lengthOf(1);
+          expect(paapi[0].bidId).to.equal('5432');
+          expect(paapi[0].config.random).to.equal('value');
+          expect(paapi[1].bidId).to.equal('6789');
+        });
+
         it('should handle an error', function () {
           let response = {
             'status': 'ok',
@@ -3370,6 +3771,71 @@ describe('the rubicon adapter', function () {
           expect(bids[0].cpm).to.be.equal(0);
         });
 
+        it('should use ads.emulated_format if defined for bid.meta.mediaType', function () {
+          let response = {
+            'status': 'ok',
+            'account_id': 14062,
+            'site_id': 70608,
+            'zone_id': 530022,
+            'size_id': 15,
+            'alt_size_ids': [
+              43
+            ],
+            'tracking': '',
+            'inventory': {},
+            'ads': [
+              {
+                'status': 'ok',
+                'impression_id': '153dc240-8229-4604-b8f5-256933b9374c',
+                'size_id': '15',
+                'ad_id': '6',
+                'advertiser': 7,
+                'network': 8,
+                'creative_id': 'crid-9',
+                'type': 'script',
+                'script': 'alert(\'foo\')',
+                'campaign_id': 10,
+                'cpm': 0.811,
+                'emulated_format': 'video',
+                'targeting': [
+                  {
+                    'key': 'rpfl_14062',
+                    'values': [
+                      '15_tier_all_test'
+                    ]
+                  }
+                ]
+              },
+              {
+                'status': 'ok',
+                'impression_id': '153dc240-8229-4604-b8f5-256933b9374d',
+                'size_id': '43',
+                'ad_id': '7',
+                'advertiser': 7,
+                'network': 8,
+                'creative_id': 'crid-9',
+                'type': 'script',
+                'script': 'alert(\'foo\')',
+                'campaign_id': 10,
+                'cpm': 0.911,
+                'targeting': [
+                  {
+                    'key': 'rpfl_14062',
+                    'values': [
+                      '43_tier_all_test'
+                    ]
+                  }
+                ]
+              }
+            ]
+          };
+          let bids = spec.interpretResponse({body: response}, {
+            bidRequest: bidderRequest.bids[0]
+          });
+          expect(bids[0].meta.mediaType).to.equal('banner');
+          expect(bids[1].meta.mediaType).to.equal('video');
+        });
+
         describe('singleRequest enabled', function () {
           it('handles bidRequest of type Array and returns associated adUnits', function () {
             const overrideMap = [];
@@ -3567,7 +4033,7 @@ describe('the rubicon adapter', function () {
             expect(bids[0].seatBidId).to.equal('0');
             expect(bids[0].creativeId).to.equal('4259970');
             expect(bids[0].cpm).to.equal(2);
-            expect(bids[0].ttl).to.equal(300);
+            expect(bids[0].ttl).to.equal(360);
             expect(bids[0].netRevenue).to.equal(true);
             expect(bids[0].adserverTargeting).to.deep.equal({hb_uuid: '0c498f63-5111-4bed-98e2-9be7cb932a64'});
             expect(bids[0].mediaType).to.equal('video');
@@ -3591,6 +4057,16 @@ describe('the rubicon adapter', function () {
             let bids = spec.interpretResponse({body: response}, {data: request});
             expect(bids).to.have.nested.property('[0].native');
           });
+          it('should set 0 to bids width and height if `w` and `h` in response object not defined', () => {
+            const nativeBidderRequest = addNativeToBidRequest(bidderRequest);
+            const request = converter.toORTB({bidderRequest: nativeBidderRequest, bidRequests: nativeBidderRequest.bids});
+            let response = getNativeResponse({impid: request.imp[0].id});
+            delete response.seatbid[0].bid[0].w;
+            delete response.seatbid[0].bid[0].h
+            let bids = spec.interpretResponse({body: response}, {data: request});
+            expect(bids[0].width).to.equal(0);
+            expect(bids[0].height).to.equal(0);
+          });
         });
       }
 
@@ -3601,7 +4077,8 @@ describe('the rubicon adapter', function () {
             config.setConfig({rubicon: {
               rendererConfig: {
                 align: 'left',
-                closeButton: true
+                closeButton: true,
+                collapse: false
               },
               rendererUrl: 'https://example.test/renderer.js'
             }});
@@ -3658,7 +4135,7 @@ describe('the rubicon adapter', function () {
             expect(bids[0].seatBidId).to.equal('0');
             expect(bids[0].creativeId).to.equal('4259970');
             expect(bids[0].cpm).to.equal(2);
-            expect(bids[0].ttl).to.equal(300);
+            expect(bids[0].ttl).to.equal(360);
             expect(bids[0].netRevenue).to.equal(true);
             expect(bids[0].adserverTargeting).to.deep.equal({hb_uuid: '0c498f63-5111-4bed-98e2-9be7cb932a64'});
             expect(bids[0].mediaType).to.equal('video');
@@ -3673,7 +4150,8 @@ describe('the rubicon adapter', function () {
             expect(typeof bids[0].renderer).to.equal('object');
             expect(bids[0].renderer.getConfig()).to.deep.equal({
               align: 'left',
-              closeButton: true
+              closeButton: true,
+              collapse: false
             });
             expect(bids[0].renderer.url).to.equal('https://example.test/renderer.js');
           });
@@ -3719,6 +4197,7 @@ describe('the rubicon adapter', function () {
             const bid = bids[0];
             bid.adUnitCode = 'outstream_video1_placement';
             const adUnit = document.createElement('div');
+            const adUnitSelector = `#${bid.adUnitCode}`
             adUnit.id = bid.adUnitCode;
             document.body.appendChild(adUnit);
 
@@ -3727,12 +4206,12 @@ describe('the rubicon adapter', function () {
             const renderCall = window.MagniteApex.renderAd.getCall(0);
             expect(renderCall.args[0]).to.deep.equal({
               closeButton: true,
-              collapse: true,
+              collapse: false,
               height: 320,
               label: undefined,
               placement: {
                 align: 'left',
-                attachTo: adUnit,
+                attachTo: adUnitSelector,
                 position: 'append',
               },
               vastUrl: 'https://test.com/vast.xml',
@@ -3788,6 +4267,7 @@ describe('the rubicon adapter', function () {
             const bid = bids[0];
             bid.adUnitCode = 'outstream_video1_placement';
             const adUnit = document.createElement('div');
+            const adUnitSelector = `#${bid.adUnitCode}`
             adUnit.id = bid.adUnitCode;
             document.body.appendChild(adUnit);
 
@@ -3796,12 +4276,12 @@ describe('the rubicon adapter', function () {
             const renderCall = window.MagniteApex.renderAd.getCall(0);
             expect(renderCall.args[0]).to.deep.equal({
               closeButton: true,
-              collapse: true,
+              collapse: false,
               height: 480,
               label: undefined,
               placement: {
                 align: 'left',
-                attachTo: adUnit,
+                attachTo: adUnitSelector,
                 position: 'append',
               },
               vastUrl: 'https://test.com/vast.xml',
@@ -3817,7 +4297,7 @@ describe('the rubicon adapter', function () {
         it('should use the integration type provided in the config instead of the default', () => {
           config.setConfig({rubicon: {int_type: 'testType'}});
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(parseQuery(request.data).tk_flint).to.equal('testType_v$prebid.version$');
+          expect(new URLSearchParams(request.data).get('tk_flint')).to.equal('testType_v$prebid.version$');
         });
       });
     });
@@ -4040,7 +4520,7 @@ describe('the rubicon adapter', function () {
     it('should properly serialize schain object with correct delimiters', () => {
       const results = spec.buildRequests(bidRequests.bids, bidRequests);
       const numNodes = schainConfig.nodes.length;
-      const schain = parseQuery(results[0].data).rp_schain;
+      const schain = new URLSearchParams(results[0].data).get('rp_schain');
 
       // each node serialization should start with an !
       expect(schain.match(/!/g).length).to.equal(numNodes);
@@ -4051,21 +4531,21 @@ describe('the rubicon adapter', function () {
 
     it('should send the proper version for the schain', () => {
       const results = spec.buildRequests(bidRequests.bids, bidRequests);
-      const schain = parseQuery(results[0].data).rp_schain.split('!');
+      const schain = new URLSearchParams(results[0].data).get('rp_schain').split('!');
       const version = schain.shift().split(',')[0];
       expect(version).to.equal(bidRequests.bids[0].schain.ver);
     });
 
     it('should send the correct value for complete in schain', () => {
       const results = spec.buildRequests(bidRequests.bids, bidRequests);
-      const schain = parseQuery(results[0].data).rp_schain.split('!');
+      const schain = new URLSearchParams(results[0].data).get('rp_schain').split('!');
       const complete = schain.shift().split(',')[1];
       expect(complete).to.equal(String(bidRequests.bids[0].schain.complete));
     });
 
     it('should send available params in the right order', () => {
       const results = spec.buildRequests(bidRequests.bids, bidRequests);
-      const schain = parseQuery(results[0].data).rp_schain.split('!');
+      const schain = new URLSearchParams(results[0].data).get('rp_schain').split('!');
       schain.shift();
 
       schain.forEach((serializeNode, nodeIndex) => {
@@ -4136,7 +4616,7 @@ describe('the rubicon adapter', function () {
   });
 });
 
-function addNativeToBidRequest(bidderRequest) {
+function addNativeToBidRequest(bidderRequest, options = {twin: false}) {
   const nativeOrtbRequest = {
     assets: [{
       id: 0,
@@ -4165,27 +4645,30 @@ function addNativeToBidRequest(bidderRequest) {
   bidderRequest.refererInfo = {
     page: 'localhost'
   }
-  bidderRequest.bids[0] = {
-    bidder: 'rubicon',
-    params: {
-      accountId: '14062',
-      siteId: '70608',
-      zoneId: '335918',
-    },
-    adUnitCode: '/19968336/header-bid-tag-0',
-    code: 'div-1',
-    bidId: '2ffb201a808da7',
-    bidderRequestId: '178e34bad3658f',
-    auctionId: 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
-    transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
-    mediaTypes: {
-      native: {
-        ortb: {
-          ...nativeOrtbRequest
+  const numBids = !options.twin ? 1 : 2;
+  for (let i = 0; i < numBids; i++) {
+    bidderRequest.bids[i] = {
+      bidder: 'rubicon',
+      params: {
+        accountId: '14062',
+        siteId: '70608',
+        zoneId: '335918',
+      },
+      adUnitCode: '/19968336/header-bid-tag-0',
+      code: 'div-1',
+      bidId: '2ffb201a808da7',
+      bidderRequestId: '178e34bad3658f',
+      auctionId: 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
+      transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
+      mediaTypes: {
+        native: {
+          ortb: {
+            ...nativeOrtbRequest
+          }
         }
-      }
-    },
-    nativeOrtbRequest
+      },
+      nativeOrtbRequest
+    }
   }
   return bidderRequest;
 }
diff --git a/test/spec/modules/scaleableAnalyticsAdapter_spec.js b/test/spec/modules/scaleableAnalyticsAdapter_spec.js
index c65740252d2..5f86073894a 100644
--- a/test/spec/modules/scaleableAnalyticsAdapter_spec.js
+++ b/test/spec/modules/scaleableAnalyticsAdapter_spec.js
@@ -1,13 +1,13 @@
 import scaleableAnalytics from 'modules/scaleableAnalyticsAdapter.js';
 import { expect } from 'chai';
 import * as events from 'src/events.js';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 import { server } from 'test/mocks/xhr.js';
 
-const BID_TIMEOUT = CONSTANTS.EVENTS.BID_TIMEOUT;
-const AUCTION_INIT = CONSTANTS.EVENTS.AUCTION_INIT;
-const BID_WON = CONSTANTS.EVENTS.BID_WON;
-const AUCTION_END = CONSTANTS.EVENTS.AUCTION_END;
+const BID_TIMEOUT = EVENTS.BID_TIMEOUT;
+const AUCTION_INIT = EVENTS.AUCTION_INIT;
+const BID_WON = EVENTS.BID_WON;
+const AUCTION_END = EVENTS.AUCTION_END;
 
 describe('Scaleable Analytics Adapter', function() {
   const bidsReceivedObj = {
diff --git a/test/spec/modules/seedingAllianceAdapter_spec.js b/test/spec/modules/seedingAllianceAdapter_spec.js
index 03548cf923a..e3ff85e9c83 100755
--- a/test/spec/modules/seedingAllianceAdapter_spec.js
+++ b/test/spec/modules/seedingAllianceAdapter_spec.js
@@ -1,8 +1,7 @@
 // jshint esversion: 6, es3: false, node: true
 import {assert, expect} from 'chai';
+import {getStorageManager} from 'src/storageManager.js';
 import {spec} from 'modules/seedingAllianceBidAdapter.js';
-import { NATIVE } from 'src/mediaTypes.js';
-import { config } from 'src/config.js';
 
 describe('SeedingAlliance adapter', function () {
   let serverResponse, bidRequest, bidResponses;
@@ -13,6 +12,14 @@ describe('SeedingAlliance adapter', function () {
     }
   };
 
+  let validBidRequests = [{
+    bidId: 'bidId',
+    params: {},
+    mediaType: {
+      native: {}
+    }
+  }];
+
   describe('isBidRequestValid', function () {
     it('should return true when required params found', function () {
       assert(spec.isBidRequestValid(bid));
@@ -26,11 +33,6 @@ describe('SeedingAlliance adapter', function () {
 
   describe('buildRequests', function () {
     it('should send request with correct structure', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {}
-      }];
-
       let request = spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } });
 
       assert.equal(request.method, 'POST');
@@ -39,64 +41,96 @@ describe('SeedingAlliance adapter', function () {
 
     it('should have default request structure', function () {
       let keys = 'site,cur,imp,regs'.split(',');
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {}
-      }];
       let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
       let data = Object.keys(request);
 
-      assert.deepEqual(keys, data);
+      assert.includeDeepMembers(data, keys);
     });
 
     it('Verify the site url', function () {
       let siteUrl = 'https://www.yourdomain.tld/your-directory/';
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {
-          url: siteUrl
-        }
-      }];
+      validBidRequests[0].params.url = siteUrl;
       let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
 
       assert.equal(request.site.page, siteUrl);
     });
+  });
 
-    it('Verify native asset ids', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {},
-        nativeParams: {
-          body: {
-            required: true,
-            len: 350
-          },
-          image: {
-            required: true
-          },
-          title: {
-            required: true
-          },
-          sponsoredBy: {
-            required: true
-          },
-          cta: {
-            required: true
-          },
-          icon: {
-            required: true
-          }
+  describe('check user ID functionality', function () {
+    let storage = getStorageManager({ bidderCode: 'seedingAlliance' });
+    let localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+    let getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    const bidRequests = [{
+      bidId: 'bidId',
+      params: {}
+    }];
+    const bidderRequest = {
+      refererInfo: { referer: 'page' },
+      gdprConsent: 'CP0j9IAP0j9IAAGABCENAYEgAP_gAAAAAAYgIxBVBCpNDWFAMHBVAJIgCYAU1sARIAQAABCAAyAFAAOA8IAA0QECEAQAAAACAAAAgVABAAAAAABEAACAAAAEAQFkAAQQgAAIAAAAAAEQQgBQAAgAAAAAEAAIgAABAwQAkACQIYLEBUCAhIAgCgAAAIgBgICAAgMACEAYAAAAAAIAAIBAAgIEMIAAAAECAQAAAFhIEoACAAKgAcgA-AEAAMgAaABEACYAG8APwAhIBDAESAJYATQAw4B9gH6ARQAjQBKQC5gF6AMUAbQA3ACdgFDgLzAYMAw0BmYDVwGsgOCAcmA8cCEMELQQuCAAgGQgQMHQKAAKgAcgA-AEAAMgAaABEACYAG8AP0AhgCJAEsAJoAYYA0YB9gH6ARQAiwBIgCUgFzAL0AYoA2gBuAEXgJkATsAocBeYDBgGGgMqAZYAzMBpoDVwHFgOTAeOBC0cAHAAQABcAKACEAF0AMEAZCQgFABMADeARQAlIBcwDFAG0AeOBCgCFpAAGAAgBggEMyUAwABAAHAAPgBEACZAIYAiQB-AFzAMUAi8BeYEISQAMAC4DLAIZlIEAAFQAOQAfACAAGQANAAiABMACkAH6AQwBEgDRgH4AfoBFgCRAEpALmAYoA2gBuAEXgJ2AUOAvMBhoDLAGsgOCAcmA8cCEIELQIZlAAoAFwB9gLoAYIBAwtADAL0AzMB44AAA.f_wAAAAAAAAA'
+    }
+    let request;
+
+    before(function () {
+      storage.removeDataFromLocalStorage('nativendo_id');
+      const localStorageData = {
+        nativendo_id: '123'
+      };
+
+      getDataFromLocalStorageStub.callsFake(function (key) {
+        return localStorageData[key];
+      });
+    });
+
+    it('should return an empty array if local storage is not enabled', function () {
+      localStorageIsEnabledStub.returns(false);
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        seedingAlliance: {
+          storageAllowed: false
         }
-      }];
+      };
+
+      request = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data);
+      expect(request.user.ext.eids).to.be.an('array').that.is.empty;
+    });
+
+    it('should return an empty array if local storage is enabled but storageAllowed is false', function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        seedingAlliance: {
+          storageAllowed: false
+        }
+      };
+      localStorageIsEnabledStub.returns(true);
+
+      request = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data);
+      expect(request.user.ext.eids).to.be.an('array').that.is.empty;
+    });
+
+    it('should return a non empty array if local storage is enabled and storageAllowed is true', function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        seedingAlliance: {
+          storageAllowed: true
+        }
+      };
+      localStorageIsEnabledStub.returns(true);
+
+      request = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data);
+      expect(request.user.ext.eids).to.be.an('array').that.is.not.empty;
+    });
+
+    it('should return an array containing the nativendoUserEid', function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        seedingAlliance: {
+          storageAllowed: true
+        }
+      };
+      localStorageIsEnabledStub.returns(true);
+
+      let nativendoUserEid = { source: 'nativendo.de', uids: [{ id: '123', atype: 1 }] };
+      storage.setDataInLocalStorage('nativendo_id', '123');
 
-      let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp[0].native.request.assets;
+      request = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data);
 
-      assert.equal(assets[0].id, 1);
-      assert.equal(assets[1].id, 3);
-      assert.equal(assets[2].id, 0);
-      assert.equal(assets[3].id, 2);
-      assert.equal(assets[4].id, 4);
-      assert.equal(assets[5].id, 5);
+      expect(request.user.ext.eids).to.deep.include(nativendoUserEid);
     });
   });
 
@@ -104,23 +138,24 @@ describe('SeedingAlliance adapter', function () {
     const goodNativeResponse = {
       body: {
         cur: 'EUR',
-        id: '4b516b80-886e-4ec0-82ae-9209e6d625fb',
+        id: 'bidid1',
         seatbid: [
           {
           	seat: 'seedingAlliance',
           	bid: [{
-              adm: {
-            	native: {
-            		assets: [
-            			{id: 0, title: {text: 'this is a title'}}
-            		],
-            		imptrackers: ['https://domain.for/imp/tracker?price=${AUCTION_PRICE}'],
-            		link: {
-            			clicktrackers: ['https://domain.for/imp/tracker?price=${AUCTION_PRICE}'],
-            			url: 'https://domain.for/ad/'
-            		}
-            	}
-              },
+              adm: JSON.stringify({
+                native: {
+                  assets: [
+                    {id: 0, title: {text: 'this is a title'}},
+                    {id: 1, img: {url: 'https://domain.for/img.jpg'}},
+                  ],
+                  imptrackers: ['https://domain.for/imp/tracker?price=${AUCTION_PRICE}'],
+                  link: {
+                    clicktrackers: ['https://domain.for/imp/tracker?price=${AUCTION_PRICE}'],
+                    url: 'https://domain.for/ad/'
+                  }
+                }
+              }),
               impid: 1,
               price: 0.55
             }]
@@ -132,7 +167,7 @@ describe('SeedingAlliance adapter', function () {
     const goodBannerResponse = {
       body: {
         cur: 'EUR',
-        id: 'b4516b80-886e-4ec0-82ae-9209e6d625fb',
+        id: 'bidid1',
         seatbid: [
           {
           	seat: 'seedingAlliance',
@@ -150,18 +185,18 @@ describe('SeedingAlliance adapter', function () {
 
     const badResponse = { body: {
       cur: 'EUR',
-      id: '4b516b80-886e-4ec0-82ae-9209e6d625fb',
+      id: 'bidid1',
       seatbid: []
     }};
 
     const bidNativeRequest = {
       data: {},
-      bidRequests: [{bidId: 'bidId1', nativeParams: {title: {required: true, len: 800}}}]
+      bidRequests: [{bidId: '1', nativeParams: {title: {required: true, len: 800}, image: {required: true, sizes: [300, 250]}}}]
     };
 
     const bidBannerRequest = {
       data: {},
-      bidRequests: [{bidId: 'bidId1', sizes: [300, 250]}]
+      bidRequests: [{bidId: '1', sizes: [300, 250]}]
     };
 
     it('should return null if body is missing or empty', function () {
diff --git a/test/spec/modules/seedtagBidAdapter_spec.js b/test/spec/modules/seedtagBidAdapter_spec.js
index fb666e89f73..db19d71f23f 100644
--- a/test/spec/modules/seedtagBidAdapter_spec.js
+++ b/test/spec/modules/seedtagBidAdapter_spec.js
@@ -1,11 +1,26 @@
 import { expect } from 'chai';
-import { spec, getTimeoutUrl } from 'modules/seedtagBidAdapter.js';
+import { getTimeoutUrl, spec } from 'modules/seedtagBidAdapter.js';
 import * as utils from 'src/utils.js';
+import * as mockGpt from 'test/spec/integration/faker/googletag.js';
 import { config } from '../../../src/config.js';
+import { BIDFLOOR_CURRENCY } from '../../../modules/seedtagBidAdapter.js';
 
 const PUBLISHER_ID = '0000-0000-01';
 const ADUNIT_ID = '000000';
 
+const adUnitCode = '/19968336/header-bid-tag-0'
+
+// create a default adunit
+const slot = document.createElement('div');
+slot.id = adUnitCode;
+slot.style.width = '300px'
+slot.style.height = '250px'
+slot.style.position = 'absolute'
+slot.style.top = '10px'
+slot.style.left = '20px'
+
+document.body.appendChild(slot);
+
 function getSlotConfigs(mediaTypes, params) {
   return {
     params: params,
@@ -23,9 +38,10 @@ function getSlotConfigs(mediaTypes, params) {
     ortb2Imp: {
       ext: {
         tid: 'd704d006-0d6e-4a09-ad6c-179e7e758096',
+        gpid: 'some-gpid'
       }
     },
-    adUnitCode: 'adunit-code',
+    adUnitCode: adUnitCode,
   };
 }
 
@@ -33,65 +49,90 @@ function createInStreamSlotConfig(mediaType) {
   return getSlotConfigs(mediaType, {
     publisherId: PUBLISHER_ID,
     adUnitId: ADUNIT_ID,
-    placement: 'inStream',
   });
 }
 
-const createBannerSlotConfig = (placement, mediatypes) => {
+const createBannerSlotConfig = (mediatypes) => {
   return getSlotConfigs(mediatypes || { banner: {} }, {
     publisherId: PUBLISHER_ID,
     adUnitId: ADUNIT_ID,
-    placement,
   });
 };
 
 describe('Seedtag Adapter', function () {
+  beforeEach(function () {
+    mockGpt.reset();
+  });
+
+  afterEach(function () {
+    mockGpt.enable();
+  });
   describe('isBidRequestValid method', function () {
     describe('returns true', function () {
       describe('when banner slot config has all mandatory params', () => {
-        const placements = ['inBanner', 'inImage', 'inScreen', 'inArticle'];
-        placements.forEach((placement) => {
-          it(placement + 'should be valid', function () {
+        it('should be valid', function () {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createBannerSlotConfig()
+          );
+          expect(isBidRequestValid).to.equal(true);
+        });
+
+        it('should be valid when has display and video mediatypes, and video context is outstream',
+          function () {
             const isBidRequestValid = spec.isBidRequestValid(
-              createBannerSlotConfig(placement)
+              createBannerSlotConfig({
+                banner: {},
+                video: {
+                  context: 'outstream',
+                  playerSize: [[600, 200]],
+                },
+              })
             );
             expect(isBidRequestValid).to.equal(true);
-          });
-
-          it(
-            placement +
-              ' should be valid when has display and video mediatypes, and video context is outstream',
-            function () {
-              const isBidRequestValid = spec.isBidRequestValid(
-                createBannerSlotConfig(placement, {
-                  banner: {},
-                  video: {
-                    context: 'outstream',
-                    playerSize: [[600, 200]],
-                  },
-                })
-              );
-              expect(isBidRequestValid).to.equal(true);
-            }
-          );
+          }
+        );
 
-          it(
-            placement +
-              " shouldn't be valid when has display and video mediatypes, and video context is instream",
-            function () {
-              const isBidRequestValid = spec.isBidRequestValid(
-                createBannerSlotConfig(placement, {
-                  banner: {},
-                  video: {
-                    context: 'instream',
-                    playerSize: [[600, 200]],
-                  },
-                })
-              );
-              expect(isBidRequestValid).to.equal(false);
-            }
-          );
-        });
+        it('should be valid when has only video mediatypes, and video context is outstream',
+          function () {
+            const isBidRequestValid = spec.isBidRequestValid(
+              createBannerSlotConfig({
+                video: {
+                  context: 'outstream',
+                  playerSize: [[600, 200]],
+                },
+              })
+            );
+            expect(isBidRequestValid).to.equal(true);
+          }
+        );
+        it('should be valid when has display and video mediatypes, and video context is instream',
+          function () {
+            const isBidRequestValid = spec.isBidRequestValid(
+              createBannerSlotConfig({
+                banner: {},
+                video: {
+                  context: 'instream',
+                  playerSize: [[600, 200]],
+                },
+              })
+            );
+            expect(isBidRequestValid).to.equal(false);
+          }
+        );
+        it("shouldn't be valid when has display and video mediatypes, and video context is instream",
+          function () {
+            const isBidRequestValid = spec.isBidRequestValid(
+              createBannerSlotConfig({
+                banner: {},
+                video: {
+                  context: 'instream',
+                  playerSize: [[600, 200]],
+                },
+              })
+            );
+            expect(isBidRequestValid).to.equal(false);
+          }
+        );
       });
       describe('when video slot has all mandatory params', function () {
         it('should return true, when video context is instream', function () {
@@ -104,7 +145,7 @@ describe('Seedtag Adapter', function () {
           const isBidRequestValid = spec.isBidRequestValid(slotConfig);
           expect(isBidRequestValid).to.equal(true);
         });
-        it('should return true, when video context is instream and mediatype is video and banner', function () {
+        it('should return false, when video context is instream and mediatype is video and banner', function () {
           const slotConfig = createInStreamSlotConfig({
             video: {
               context: 'instream',
@@ -113,33 +154,6 @@ describe('Seedtag Adapter', function () {
             banner: {},
           });
           const isBidRequestValid = spec.isBidRequestValid(slotConfig);
-          expect(isBidRequestValid).to.equal(true);
-        });
-        it('should return false, when video context is instream, but placement is not inStream', function () {
-          const slotConfig = getSlotConfigs(
-            {
-              video: {
-                context: 'instream',
-                playerSize: [[600, 200]],
-              },
-            },
-            {
-              publisherId: PUBLISHER_ID,
-              adUnitId: ADUNIT_ID,
-              placement: 'inBanner',
-            }
-          );
-          const isBidRequestValid = spec.isBidRequestValid(slotConfig);
-          expect(isBidRequestValid).to.equal(false);
-        });
-        it('should return false, when video context is outstream', function () {
-          const slotConfig = createInStreamSlotConfig({
-            video: {
-              context: 'outstream',
-              playerSize: [[600, 200]],
-            },
-          });
-          const isBidRequestValid = spec.isBidRequestValid(slotConfig);
           expect(isBidRequestValid).to.equal(false);
         });
       });
@@ -153,7 +167,6 @@ describe('Seedtag Adapter', function () {
           const isBidRequestValid = spec.isBidRequestValid(
             createSlotConfig({
               adUnitId: ADUNIT_ID,
-              placement: 'inBanner',
             })
           );
           expect(isBidRequestValid).to.equal(false);
@@ -162,26 +175,6 @@ describe('Seedtag Adapter', function () {
           const isBidRequestValid = spec.isBidRequestValid(
             createSlotConfig({
               publisherId: PUBLISHER_ID,
-              placement: 'inBanner',
-            })
-          );
-          expect(isBidRequestValid).to.equal(false);
-        });
-        it('does not have the placement.', function () {
-          const isBidRequestValid = spec.isBidRequestValid(
-            createSlotConfig({
-              publisherId: PUBLISHER_ID,
-              adUnitId: ADUNIT_ID,
-            })
-          );
-          expect(isBidRequestValid).to.equal(false);
-        });
-        it('does not have a the correct placement.', function () {
-          const isBidRequestValid = spec.isBidRequestValid(
-            createSlotConfig({
-              publisherId: PUBLISHER_ID,
-              adUnitId: ADUNIT_ID,
-              placement: 'another_thing',
             })
           );
           expect(isBidRequestValid).to.equal(false);
@@ -201,17 +194,7 @@ describe('Seedtag Adapter', function () {
           );
           expect(isBidRequestValid).to.equal(false);
         });
-        it('is outstream ', function () {
-          const isBidRequestValid = spec.isBidRequestValid(
-            createInStreamSlotConfig({
-              video: {
-                context: 'outstream',
-                playerSize: [[600, 200]],
-              },
-            })
-          );
-          expect(isBidRequestValid).to.equal(false);
-        });
+
         describe('order does not matter', function () {
           it('when video is not the first slot', function () {
             const isBidRequestValid = spec.isBidRequestValid(
@@ -231,6 +214,7 @@ describe('Seedtag Adapter', function () {
   });
 
   describe('buildRequests method', function () {
+    const bidFloor = 0.60
     const bidderRequest = {
       refererInfo: { page: 'referer' },
       timeout: 1000,
@@ -238,12 +222,10 @@ describe('Seedtag Adapter', function () {
     const mandatoryDisplayParams = {
       publisherId: PUBLISHER_ID,
       adUnitId: ADUNIT_ID,
-      placement: 'inBanner',
     };
     const mandatoryVideoParams = {
       publisherId: PUBLISHER_ID,
       adUnitId: ADUNIT_ID,
-      placement: 'inStream',
     };
     const validBidRequests = [
       getSlotConfigs({ banner: {} }, mandatoryDisplayParams),
@@ -258,6 +240,11 @@ describe('Seedtag Adapter', function () {
         mandatoryVideoParams
       ),
     ];
+    validBidRequests[0].getFloor = () => ({
+      currency: BIDFLOOR_CURRENCY,
+      floor: bidFloor
+    })
+
     it('Url params should be correct ', function () {
       const request = spec.buildRequests(validBidRequests, bidderRequest);
       expect(request.method).to.equal('POST');
@@ -277,7 +264,8 @@ describe('Seedtag Adapter', function () {
       expect(data.auctionStart).to.be.greaterThanOrEqual(now);
       expect(data.ttfb).to.be.greaterThanOrEqual(0);
 
-      expect(data.bidRequests[0].adUnitCode).to.equal('adunit-code');
+      expect(data.bidRequests[0].adUnitCode).to.equal(adUnitCode);
+      expect(data.bidRequests[0].gpid).to.equal('some-gpid');
     });
 
     describe('GDPR params', function () {
@@ -374,6 +362,44 @@ describe('Seedtag Adapter', function () {
         expect(videoBid.sizes[1][1]).to.equal(600);
         expect(videoBid.requestCount).to.equal(1);
       });
+
+      it('should have geom parameters if slot is available', function() {
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        const bidRequests = data.bidRequests;
+        const bannerBid = bidRequests[0];
+
+        // on some CI, the DOM is not initialized, so we need to check if the slot is available
+        const slot = document.getElementById(adUnitCode)
+        if (slot) {
+          expect(bannerBid).to.have.property('geom')
+
+          const params = [['width', 300], ['height', 250], ['top', 10], ['left', 20], ['scrollY', 0]]
+          params.forEach(([param, value]) => {
+            expect(bannerBid.geom).to.have.property(param)
+            expect(bannerBid.geom[param]).to.be.a('number')
+            expect(bannerBid.geom[param]).to.be.equal(value)
+          })
+
+          expect(bannerBid.geom).to.have.property('viewport')
+          const viewportParams = ['width', 'height']
+          viewportParams.forEach(param => {
+            expect(bannerBid.geom.viewport).to.have.property(param)
+            expect(bannerBid.geom.viewport[param]).to.be.a('number')
+          })
+        } else {
+          expect(bannerBid).to.not.have.property('geom')
+        }
+      })
+
+      it('should have bidfloor parameter if available', function() {
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        const bidRequests = data.bidRequests;
+
+        expect(bidRequests[0].bidFloor).to.be.equal(bidFloor)
+        expect(bidRequests[1]).not.to.have.property('bidFloor')
+      })
     });
 
     describe('COPPA param', function () {
@@ -486,8 +512,179 @@ describe('Seedtag Adapter', function () {
         expect(data.gppConsent).to.be.undefined;
       });
     });
-  });
 
+    describe('User param', function () {
+      it('should be added to payload user data param when bidderRequest has ortb2 user info', function () {
+        var ortb2 = {
+
+          user: {
+
+            data: [
+              {
+                ext: {
+                  segtax: 601,
+                  segclass: '4'
+                },
+                segment: [
+                  {
+                    id: '149'
+                  }
+                ],
+                name: 'randomname'
+              }
+
+            ]
+          }
+        }
+        bidderRequest['ortb2'] = ortb2
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+
+        expect(data.user).to.exist;
+        expect(data.user.topics).to.exist;
+        expect(data.user.topics).to.be.an('array').that.is.not.empty;
+        expect(data.user.topics[0].ext).to.eql(ortb2.user.data[0].ext);
+        expect(data.user.topics[0].segment).to.eql(ortb2.user.data[0].segment);
+        expect(data.user.topics[0].name).to.eql(ortb2.user.data[0].name);
+      })
+
+      it('should be added to payload user eids param when validRequest has userId info', function () {
+        var userIdAsEids = [{
+          source: 'sourceid',
+          uids: [{
+            atype: 1,
+            id: 'randomId'
+          }]
+        }]
+        validBidRequests[0]['userIdAsEids'] = userIdAsEids
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+
+        expect(data.user).to.exist;
+        expect(data.user.eids).to.exist;
+        expect(data.user.eids).to.be.an('array').that.is.not.empty;
+        expect(data.user.eids).to.deep.equal(userIdAsEids);
+      })
+    });
+
+    describe('Blocking params', function () {
+      it('should add bcat param to payload when bidderRequest has ortb2 bcat info', function () {
+        const blockedCategories = ['IAB1', 'IAB2']
+        var ortb2 = {
+          bcat: blockedCategories
+        }
+        bidderRequest['ortb2'] = ortb2
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.bcat).to.deep.equal(blockedCategories);
+      });
+
+      it('should add badv param to payload when bidderRequest has ortb2 badv info', function () {
+        const blockedAdvertisers = ['blocked.com']
+        var ortb2 = {
+          badv: blockedAdvertisers
+        }
+        bidderRequest['ortb2'] = ortb2
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.badv).to.deep.equal(blockedAdvertisers);
+      });
+
+      it('should not add bcat and badv params to payload when bidderRequest does not have ortb2 badv and bcat info', function () {
+        var ortb2 = {}
+        bidderRequest['ortb2'] = ortb2
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.bcat).to.be.undefined;
+        expect(data.badv).to.be.undefined;
+      });
+    });
+
+    describe('Site params', function () {
+      it('should add cat param to payload when bidderRequest has ortb2 site cat info', function () {
+        const siteCategories = ['1217', 'bsr004', '692']
+        var ortb2 = {
+          site: {
+            cat: siteCategories
+          }
+        }
+        bidderRequest['ortb2'] = ortb2
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.site.cat).to.deep.equal(siteCategories);
+      });
+
+      it('should add pagecat param to payload when bidderRequest has ortb2 site pagecat info', function () {
+        const pageCategories = ['1217', 'bsr004', '692']
+        var ortb2 = {
+          site: {
+            pagecat: pageCategories
+          }
+        }
+        bidderRequest['ortb2'] = ortb2
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.site.pagecat).to.deep.equal(pageCategories);
+      });
+
+      it('should add cattac param to payload when bidderRequest has ortb2 site cattax info', function () {
+        const taxonomy = 6
+        var ortb2 = {
+          site: {
+            cattax: taxonomy
+          }
+        }
+        bidderRequest['ortb2'] = ortb2
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.site.cattax).to.equal(taxonomy);
+      });
+
+      it('should not add site params to payload when bidderRequest does not have ortb2 site info', function () {
+        var ortb2 = {}
+        bidderRequest['ortb2'] = ortb2
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.site.cattax).to.be.undefined;
+        expect(data.site.cat).to.be.undefined;
+        expect(data.site.pagecat).to.be.undefined;
+      });
+    });
+
+    describe('device.sua param', function () {
+      it('should add device.sua param to payload when bidderRequest has ortb2 device.sua info', function () {
+        const sua = 1
+        var ortb2 = {
+          device: {
+            sua: sua
+          }
+        }
+        bidderRequest['ortb2'] = ortb2
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.sua).to.equal(sua);
+      });
+
+      it('should not add device.sua param to payload when bidderRequest does not have ortb2 device.sua info', function () {
+        var ortb2 = {
+          device: {}
+        }
+        bidderRequest['ortb2'] = ortb2
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.sua).to.be.undefined;
+      });
+    });
+  })
   describe('interpret response method', function () {
     it('should return a void array, when the server response are not correct.', function () {
       const request = { data: JSON.stringify({}) };
diff --git a/test/spec/modules/setupadBidAdapter_spec.js b/test/spec/modules/setupadBidAdapter_spec.js
new file mode 100644
index 00000000000..3a184c50922
--- /dev/null
+++ b/test/spec/modules/setupadBidAdapter_spec.js
@@ -0,0 +1,390 @@
+import { spec, biddersCreativeIds } from 'modules/setupadBidAdapter.js';
+
+describe('SetupadAdapter', function () {
+  const userIdAsEids = [
+    {
+      source: 'pubcid.org',
+      uids: [
+        {
+          atype: 1,
+          id: '01EAJWWNEPN3CYMM5N8M5VXY22',
+        },
+      ],
+    },
+  ];
+
+  const bidRequests = [
+    {
+      adUnitCode: 'test-div',
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: '22c4871113f461',
+      bidder: 'rubicon',
+      bidderRequestId: '15246a574e859f',
+      uspConsent: 'usp-context-string',
+      gdprConsent: {
+        consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+        gdprApplies: true,
+      },
+      params: {
+        placement_id: '123',
+        account_id: 'test-account-id',
+      },
+      sizes: [[300, 250]],
+      ortb2: {
+        device: {
+          w: 1500,
+          h: 1000,
+        },
+        site: {
+          domain: 'test.com',
+          page: 'http://test.com',
+        },
+      },
+      userIdAsEids,
+    },
+    {
+      adUnitCode: 'test-div-2',
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidId: '22c4871113f461',
+      bidder: 'rubicon',
+      bidderRequestId: '15246a574e859f',
+      uspConsent: 'usp-context-string',
+      gdprConsent: {
+        consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+        gdprApplies: true,
+      },
+      params: {
+        placement_id: '123',
+        account_id: 'test-account-id',
+      },
+      sizes: [[300, 250]],
+      ortb2: {
+        device: {
+          w: 1500,
+          h: 1000,
+        },
+        site: {
+          domain: 'test.com',
+          page: 'http://test.com',
+        },
+      },
+      userIdAsEids,
+    },
+  ];
+
+  const bidderRequest = {
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    auctionStart: 1579746300522,
+    bidderCode: 'setupad',
+    bidderRequestId: '15246a574e859f',
+    bids: [
+      {
+        adUnitCode: 'test-div',
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidId: '22c4871113f461',
+        bidder: 'rubicon',
+        bidderRequestId: '15246a574e859f',
+        uspConsent: 'usp-context-string',
+        gdprConsent: {
+          consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+          gdprApplies: true,
+        },
+        params: {
+          placement_id: '123',
+          account_id: 'test-account-id',
+        },
+        sizes: [[300, 250]],
+        ortb2: {
+          device: {
+            w: 1500,
+            h: 1000,
+          },
+          site: {
+            domain: 'test.com',
+            page: 'http://test.com',
+          },
+        },
+        userIdAsEids,
+      },
+      {
+        adUnitCode: 'test-div-2',
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidId: '22c4871113f461',
+        bidder: 'rubicon',
+        bidderRequestId: '15246a574e859f',
+        uspConsent: 'usp-context-string',
+        gdprConsent: {
+          consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+          gdprApplies: true,
+        },
+        params: {
+          placement_id: '123',
+          account_id: 'test-account-id',
+        },
+        sizes: [[300, 250]],
+        ortb2: {
+          device: {
+            w: 1500,
+            h: 1000,
+          },
+          site: {
+            domain: 'test.com',
+            page: 'http://test.com',
+          },
+        },
+        userIdAsEids,
+      },
+    ],
+    gdprConsent: {
+      consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+      vendorData: {},
+      gdprApplies: true,
+    },
+    ortb2: {
+      device: {
+        w: 1500,
+        h: 1000,
+      },
+    },
+    refererInfo: {
+      canonicalUrl: null,
+      domain: 'test.com',
+      page: 'http://test.com',
+      referer: null,
+    },
+  };
+
+  const serverResponse = {
+    body: {
+      seatbid: [
+        {
+          bid: [{ crid: 123 }, { crid: 1234 }],
+          seat: 'pubmatic',
+        },
+        {
+          bid: [{ crid: 12345 }],
+          seat: 'setupad',
+        },
+      ],
+    },
+    testCase: 1,
+  };
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      bidder: 'setupad',
+      params: {
+        placement_id: '123',
+        account_id: '123',
+      },
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when placement_id is missing', function () {
+      const bidWithoutPlacementId = { ...bid };
+      delete bidWithoutPlacementId.params.placement_id;
+      expect(spec.isBidRequestValid(bidWithoutPlacementId)).to.equal(false);
+    });
+
+    it('should return false when account_id is missing', function () {
+      const bidWithoutAccountId = { ...bid };
+      delete bidWithoutAccountId.params.account_id;
+      expect(spec.isBidRequestValid(bidWithoutAccountId)).to.equal(false);
+    });
+
+    it('should return false when required params are not passed', function () {
+      delete bid.params.placement_id;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('should return correct storedrequest id for bids if placement_id is provided', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.imp[0].ext.prebid.storedrequest.id).to.equal('123');
+    });
+
+    it('should return correct storedrequest id if account_id is provided', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.ext.prebid.storedrequest.id).to.equal('test-account-id');
+    });
+
+    it('should return setupad custom adapter param', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.setupad).to.equal('adapter');
+    });
+
+    // Change this to 1 whenever TEST_REQUEST = 1. This is allowed only for testing requests locally
+    it('should return correct test attribute value from global value', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.test).to.equal(0);
+    });
+  });
+
+  describe('getUserSyncs', () => {
+    it('should return user sync', () => {
+      const syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: true,
+      };
+      const responses = [
+        {
+          body: {
+            ext: {
+              responsetimemillis: {
+                'test seat 1': 2,
+                'test seat 2': 1,
+              },
+            },
+          },
+        },
+      ];
+      const gdprConsent = {
+        gdprApplies: 1,
+        consentString: 'dkj49Sjmfjuj34as:12jaf90123hufabidfy9u23brfpoig',
+      };
+      const uspConsent = 'mkjvbiniwot4827obfoy8sdg8203gb';
+      const expectedUserSyncs = [
+        {
+          type: 'iframe',
+          url: 'https://cookie.stpd.cloud/sync?bidders=%5B%22test%20seat%201%22%2C%22test%20seat%202%22%5D&gdpr=1&gdpr_consent=dkj49Sjmfjuj34as:12jaf90123hufabidfy9u23brfpoig&usp_consent=mkjvbiniwot4827obfoy8sdg8203gb&type=iframe',
+        },
+      ];
+
+      const userSyncs = spec.getUserSyncs(syncOptions, responses, gdprConsent, uspConsent);
+
+      expect(userSyncs).to.deep.equal(expectedUserSyncs);
+    });
+
+    it('should return empty user syncs when responsetimemillis is not defined', () => {
+      const syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: true,
+      };
+      const responses = [
+        {
+          body: {
+            ext: {},
+          },
+        },
+      ];
+      const gdprConsent = {
+        gdprApplies: 1,
+        consentString: 'dkj49Sjmfjuj34as:12jaf90123hufabidfy9u23brfpoig',
+      };
+      const uspConsent = 'mkjvbiniwot4827obfoy8sdg8203gb';
+      const expectedUserSyncs = [];
+
+      const userSyncs = spec.getUserSyncs(syncOptions, responses, gdprConsent, uspConsent);
+
+      expect(userSyncs).to.deep.equal(expectedUserSyncs);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return empty array if error during parsing', () => {
+      const wrongServerResponse = 'wrong data';
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      let result = spec.interpretResponse(wrongServerResponse, request);
+
+      expect(result).to.be.instanceof(Array);
+      expect(result.length).to.equal(0);
+    });
+
+    it('should update biddersCreativeIds correctly', function () {
+      spec.interpretResponse(serverResponse, bidderRequest);
+
+      expect(biddersCreativeIds).to.deep.equal({
+        123: 'pubmatic',
+        1234: 'pubmatic',
+        12345: 'setupad',
+      });
+    });
+  });
+
+  describe('onBidWon', function () {
+    it('should stop if bidder is not equal to BIDDER_CODE', function () {
+      const bid = {
+        bidder: 'rubicon',
+      };
+      const result = spec.onBidWon(bid);
+      expect(result).to.be.undefined;
+    });
+
+    it('should stop if bid.params is not provided', function () {
+      const bid = {
+        bidder: 'setupad',
+      };
+      const result = spec.onBidWon(bid);
+      expect(result).to.be.undefined;
+    });
+
+    it('should stop if bid.params is empty array', function () {
+      const bid = {
+        bidder: 'setupad',
+        params: [],
+      };
+      const result = spec.onBidWon(bid);
+      expect(result).to.be.undefined;
+    });
+
+    it('should stop if bid.params is not array', function () {
+      expect(
+        spec.onBidWon({
+          bidder: 'setupad',
+          params: {},
+        })
+      ).to.be.undefined;
+
+      expect(
+        spec.onBidWon({
+          bidder: 'setupad',
+          params: 'test',
+        })
+      ).to.be.undefined;
+
+      expect(
+        spec.onBidWon({
+          bidder: 'setupad',
+          params: 1,
+        })
+      ).to.be.undefined;
+
+      expect(
+        spec.onBidWon({
+          bidder: 'setupad',
+          params: null,
+        })
+      ).to.be.undefined;
+
+      expect(
+        spec.onBidWon({
+          bidder: 'setupad',
+          params: undefined,
+        })
+      ).to.be.undefined;
+    });
+
+    it('should stop if bid.params.placement_id is not provided', function () {
+      const bid = {
+        bidder: 'setupad',
+        params: [{ account_id: 'test' }],
+      };
+      const result = spec.onBidWon(bid);
+      expect(result).to.be.undefined;
+    });
+
+    it('should stop if bid.params is not provided and bid.bids is not an array', function () {
+      const bid = {
+        bidder: 'setupad',
+        params: undefined,
+        bids: {},
+      };
+      const result = spec.onBidWon(bid);
+      expect(result).to.be.undefined;
+    });
+  });
+});
diff --git a/test/spec/modules/sharedIdSystem_spec.js b/test/spec/modules/sharedIdSystem_spec.js
index fcfbe5f7c3f..359cbeb4651 100644
--- a/test/spec/modules/sharedIdSystem_spec.js
+++ b/test/spec/modules/sharedIdSystem_spec.js
@@ -3,6 +3,8 @@ import {coppaDataHandler} from 'src/adapterManager';
 
 import sinon from 'sinon';
 import * as utils from 'src/utils.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
 
 let expect = require('chai').expect;
 
@@ -91,4 +93,20 @@ describe('SharedId System', function () {
       expect(result).to.be.undefined;
     });
   });
+  describe('eid', () => {
+    before(() => {
+      attachIdSystem(sharedIdSystemSubmodule);
+    });
+    it('pubCommonId', function() {
+      const userId = {
+        pubcid: 'some-random-id-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'pubcid.org',
+        uids: [{id: 'some-random-id-value', atype: 1}]
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/sharethroughBidAdapter_spec.js b/test/spec/modules/sharethroughBidAdapter_spec.js
index 68bf14ae9c1..0e0bc7fd14c 100644
--- a/test/spec/modules/sharethroughBidAdapter_spec.js
+++ b/test/spec/modules/sharethroughBidAdapter_spec.js
@@ -4,6 +4,7 @@ import * as sinon from 'sinon';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { config } from 'src/config';
 import * as utils from 'src/utils';
+import { deepSetValue } from '../../../src/utils';
 
 const spec = newBidder(sharethroughAdapterSpec).getSpec();
 
@@ -38,19 +39,8 @@ describe('sharethrough adapter spec', function () {
       expect(spec.isBidRequestValid(invalidBidRequest)).to.eql(false);
     });
 
-    it('should return false if req has wrong bidder code', function () {
-      const invalidBidRequest = {
-        bidder: 'notSharethrough',
-        params: {
-          pkey: 'abc123',
-        },
-      };
-      expect(spec.isBidRequestValid(invalidBidRequest)).to.eql(false);
-    });
-
     it('should return true if req is correct', function () {
       const validBidRequest = {
-        bidder: 'sharethrough',
         params: {
           pkey: 'abc123',
         },
@@ -85,6 +75,7 @@ describe('sharethrough adapter spec', function () {
           mediaTypes: {
             banner: {
               pos: 1,
+              battr: [6, 7],
             },
           },
           ortb2Imp: {
@@ -226,7 +217,7 @@ describe('sharethrough adapter spec', function () {
             video: {
               pos: 3,
               skip: 1,
-              linearity: 0,
+              linearity: 1,
               minduration: 10,
               maxduration: 30,
               playbackmethod: [1],
@@ -238,9 +229,12 @@ describe('sharethrough adapter spec', function () {
               skipmin: 10,
               skipafter: 20,
               delivery: 1,
+              battr: [13, 14],
               companiontype: 'companion type',
               companionad: 'companion ad',
               context: 'instream',
+              placement: 1,
+              plcmt: 1,
             },
           },
           getFloor: () => ({ currency: 'USD', floor: 42 }),
@@ -346,6 +340,41 @@ describe('sharethrough adapter spec', function () {
 
           expect(openRtbReq.user.ext.eids).to.deep.equal([]);
         });
+
+        it('should add ORTB2 device data to the request', () => {
+          const bidderRequestWithOrtb2Device = {
+            ...bidderRequest,
+            ...{
+              ortb2: {
+                device: {
+                  w: 980,
+                  h: 1720,
+                  dnt: 0,
+                  ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+                  language: 'en',
+                  devicetype: 1,
+                  make: 'Apple',
+                  model: 'iPhone 12 Pro Max',
+                  os: 'iOS',
+                  osv: '17.4',
+                },
+              },
+            },
+          };
+
+          const [request] = spec.buildRequests(bidRequests, bidderRequestWithOrtb2Device);
+
+          expect(request.data.device.w).to.equal(bidderRequestWithOrtb2Device.ortb2.device.w);
+          expect(request.data.device.h).to.equal(bidderRequestWithOrtb2Device.ortb2.device.h);
+          expect(request.data.device.dnt).to.equal(bidderRequestWithOrtb2Device.ortb2.device.dnt);
+          expect(request.data.device.ua).to.equal(bidderRequestWithOrtb2Device.ortb2.device.ua);
+          expect(request.data.device.language).to.equal(bidderRequestWithOrtb2Device.ortb2.device.language);
+          expect(request.data.device.devicetype).to.equal(bidderRequestWithOrtb2Device.ortb2.device.devicetype);
+          expect(request.data.device.make).to.equal(bidderRequestWithOrtb2Device.ortb2.device.make);
+          expect(request.data.device.model).to.equal(bidderRequestWithOrtb2Device.ortb2.device.model);
+          expect(request.data.device.os).to.equal(bidderRequestWithOrtb2Device.ortb2.device.os);
+          expect(request.data.device.osv).to.equal(bidderRequestWithOrtb2Device.ortb2.device.osv);
+        });
       });
 
       describe('no referer provided', () => {
@@ -409,12 +438,12 @@ describe('sharethrough adapter spec', function () {
           it('should properly attach GPP information to the request when applicable', () => {
             bidderRequest.gppConsent = {
               gppString: 'some-gpp-string',
-              applicableSections: [3, 5]
+              applicableSections: [3, 5],
             };
 
             const openRtbReq = spec.buildRequests(bidRequests, bidderRequest)[0].data;
-            expect(openRtbReq.regs.gpp).to.equal(bidderRequest.gppConsent.gppString)
-            expect(openRtbReq.regs.gpp_sid).to.equal(bidderRequest.gppConsent.applicableSections)
+            expect(openRtbReq.regs.gpp).to.equal(bidderRequest.gppConsent.gppString);
+            expect(openRtbReq.regs.gpp_sid).to.equal(bidderRequest.gppConsent.applicableSections);
           });
 
           it('should populate request accordingly when gpp explicitly does not apply', function () {
@@ -425,6 +454,41 @@ describe('sharethrough adapter spec', function () {
         });
       });
 
+      describe('dsa', () => {
+        it('should properly attach dsa information to the request when applicable', () => {
+          bidderRequest.ortb2 = {
+            regs: {
+              ext: {
+                dsa: {
+                  'dsarequired': 1,
+                  'pubrender': 0,
+                  'datatopub': 1,
+                  'transparency': [{
+                    'domain': 'good-domain',
+                    'dsaparams': [1, 2]
+                  }, {
+                    'domain': 'bad-setup',
+                    'dsaparams': ['1', 3]
+                  }]
+                }
+              }
+            }
+          }
+
+          const openRtbReq = spec.buildRequests(bidRequests, bidderRequest)[0].data;
+          expect(openRtbReq.regs.ext.dsa.dsarequired).to.equal(1);
+          expect(openRtbReq.regs.ext.dsa.pubrender).to.equal(0);
+          expect(openRtbReq.regs.ext.dsa.datatopub).to.equal(1);
+          expect(openRtbReq.regs.ext.dsa.transparency).to.deep.equal([{
+            'domain': 'good-domain',
+            'dsaparams': [1, 2]
+          }, {
+            'domain': 'bad-setup',
+            'dsaparams': ['1', 3]
+          }]);
+        });
+      });
+
       describe('transaction id at the impression level', () => {
         it('should include transaction id when provided', () => {
           const requests = spec.buildRequests(bidRequests, bidderRequest);
@@ -489,8 +553,58 @@ describe('sharethrough adapter spec', function () {
           ]);
         });
 
+        it('should correctly harvest battr values for banner if present in mediaTypes.banner of impression and battr is not defined in ortb2Imp.banner', () => {
+          // assemble
+          const EXPECTED_BATTR_VALUES = [6, 7];
+
+          // act
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
+          const ACTUAL_BATTR_VALUES = builtRequest.data.imp[0].banner.battr
+
+          // assert
+          expect(ACTUAL_BATTR_VALUES).to.deep.equal(EXPECTED_BATTR_VALUES);
+        });
+
+        it('should not include battr values for banner if NOT present in mediaTypes.banner of impression and battr is not defined in ortb2Imp.banner', () => {
+          // assemble
+          delete bidRequests[0].mediaTypes.banner.battr;
+
+          // act
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
+
+          // assert
+          expect(builtRequest.data.imp[0].banner.battr).to.be.undefined;
+        });
+
+        it('should prefer battr values from mediaTypes.banner over ortb2Imp.banner', () => {
+          // assemble
+          deepSetValue(bidRequests[0], 'ortb2Imp.banner.battr', [1, 2, 3]);
+          const EXPECTED_BATTR_VALUES = [6, 7]; // values from mediaTypes.banner
+
+          // act
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
+          const ACTUAL_BATTR_VALUES = builtRequest.data.imp[0].banner.battr
+
+          // assert
+          expect(ACTUAL_BATTR_VALUES).to.deep.equal(EXPECTED_BATTR_VALUES);
+        });
+
+        it('should use battr values from ortb2Imp.banner if mediaTypes.banner.battr is not present', () => {
+          // assemble
+          delete bidRequests[0].mediaTypes.banner.battr;
+          const EXPECTED_BATTR_VALUES = [1, 2, 3];
+          deepSetValue(bidRequests[0], 'ortb2Imp.banner.battr', EXPECTED_BATTR_VALUES);
+
+          // act
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
+          const ACTUAL_BATTR_VALUES = builtRequest.data.imp[0].banner.battr
+
+          // assert
+          expect(ACTUAL_BATTR_VALUES).to.deep.equal(EXPECTED_BATTR_VALUES);
+        });
+
         it('should default to pos 0 if not provided', () => {
-          delete bidRequests[0].mediaTypes;
+          delete bidRequests[0].mediaTypes.banner.pos;
           const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
 
           const bannerImp = builtRequest.data.imp[0].banner;
@@ -506,7 +620,7 @@ describe('sharethrough adapter spec', function () {
           expect(videoImp.pos).to.equal(3);
           expect(videoImp.topframe).to.equal(1);
           expect(videoImp.skip).to.equal(1);
-          expect(videoImp.linearity).to.equal(0);
+          expect(videoImp.linearity).to.equal(1);
           expect(videoImp.minduration).to.equal(10);
           expect(videoImp.maxduration).to.equal(30);
           expect(videoImp.playbackmethod).to.deep.equal([1]);
@@ -520,50 +634,60 @@ describe('sharethrough adapter spec', function () {
           expect(videoImp.skipafter).to.equal(20);
           expect(videoImp.placement).to.equal(1);
           expect(videoImp.delivery).to.equal(1);
+          expect(videoImp.battr).to.deep.equal([13, 14]);
           expect(videoImp.companiontype).to.equal('companion type');
           expect(videoImp.companionad).to.equal('companion ad');
         });
 
-        it('should set defaults if no value provided', () => {
+        it('should set defaults in some circumstances if no value provided', () => {
           delete bidRequests[1].mediaTypes.video.pos;
-          delete bidRequests[1].mediaTypes.video.skip;
-          delete bidRequests[1].mediaTypes.video.linearity;
-          delete bidRequests[1].mediaTypes.video.minduration;
-          delete bidRequests[1].mediaTypes.video.maxduration;
-          delete bidRequests[1].mediaTypes.video.playbackmethod;
-          delete bidRequests[1].mediaTypes.video.api;
-          delete bidRequests[1].mediaTypes.video.mimes;
-          delete bidRequests[1].mediaTypes.video.protocols;
           delete bidRequests[1].mediaTypes.video.playerSize;
-          delete bidRequests[1].mediaTypes.video.startdelay;
-          delete bidRequests[1].mediaTypes.video.skipmin;
-          delete bidRequests[1].mediaTypes.video.skipafter;
-          delete bidRequests[1].mediaTypes.video.placement;
-          delete bidRequests[1].mediaTypes.video.delivery;
-          delete bidRequests[1].mediaTypes.video.companiontype;
-          delete bidRequests[1].mediaTypes.video.companionad;
 
           const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[1];
 
           const videoImp = builtRequest.data.imp[0].video;
           expect(videoImp.pos).to.equal(0);
-          expect(videoImp.skip).to.equal(0);
-          expect(videoImp.linearity).to.equal(1);
-          expect(videoImp.minduration).to.equal(5);
-          expect(videoImp.maxduration).to.equal(60);
-          expect(videoImp.playbackmethod).to.deep.equal([2]);
-          expect(videoImp.api).to.deep.equal([2]);
-          expect(videoImp.mimes).to.deep.equal(['video/mp4']);
-          expect(videoImp.protocols).to.deep.equal([2, 3, 5, 6, 7, 8]);
           expect(videoImp.w).to.equal(640);
           expect(videoImp.h).to.equal(360);
-          expect(videoImp.startdelay).to.equal(0);
-          expect(videoImp.skipmin).to.equal(0);
-          expect(videoImp.skipafter).to.equal(0);
-          expect(videoImp.placement).to.equal(1);
-          expect(videoImp.delivery).to.be.undefined;
-          expect(videoImp.companiontype).to.be.undefined;
-          expect(videoImp.companionad).to.be.undefined;
+        });
+
+        it('should not set values in some circumstances when non-valid values are supplied', () => {
+          // arrange
+          bidRequests[1].mediaTypes.video.api = 1; // non-array value, will not be used
+          bidRequests[1].mediaTypes.video.battr = undefined; // non-array value, will not be used
+          bidRequests[1].mediaTypes.video.mimes = 'video/3gpp'; // non-array value, will not be used
+          bidRequests[1].mediaTypes.video.playbackmethod = null; // non-array value, will not be used
+          bidRequests[1].mediaTypes.video.protocols = []; // empty array, will not be used
+
+          // act
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[1];
+          const videoImp = builtRequest.data.imp[0].video;
+
+          // assert
+          expect(videoImp.api).to.be.undefined;
+          expect(videoImp.battr).to.be.undefined;
+          expect(videoImp.mimes).to.be.undefined;
+          expect(videoImp.playbackmethod).to.be.undefined;
+          expect(videoImp.protocols).to.be.undefined;
+        });
+
+        it('should not set a property if no corresponding property is detected on mediaTypes.video', () => {
+          // arrange
+          const propertiesToConsider = [
+            'api', 'battr', 'companionad', 'companiontype', 'delivery', 'linearity', 'maxduration', 'mimes', 'minduration', 'placement', 'playbackmethod', 'plcmt', 'protocols', 'skip', 'skipafter', 'skipmin', 'startdelay'
+          ]
+
+          // act
+          propertiesToConsider.forEach(propertyToConsider => {
+            delete bidRequests[1].mediaTypes.video[propertyToConsider];
+          });
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[1];
+          const videoImp = builtRequest.data.imp[0].video;
+
+          // assert
+          propertiesToConsider.forEach(propertyToConsider => {
+            expect(videoImp[propertyToConsider]).to.be.undefined;
+          });
         });
 
         describe('outstream', () => {
@@ -576,15 +700,43 @@ describe('sharethrough adapter spec', function () {
 
             expect(videoImp.placement).to.equal(3);
           });
+        });
+      });
 
-          it('should default placement to 4 if not provided', () => {
-            bidRequests[1].mediaTypes.video.context = 'outstream';
-
-            const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[1];
-            const videoImp = builtRequest.data.imp[0].video;
+      describe('cookie deprecation', () => {
+        it('should not add cdep if we do not get it in an impression request', () => {
+          const builtRequests = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id',
+            ortb2: {
+              device: {
+                ext: {
+                  propThatIsNotCdep: 'value-we-dont-care-about',
+                },
+              },
+            },
+          });
+          const noCdep = builtRequests.every((builtRequest) => {
+            const ourCdepValue = builtRequest.data.device?.ext?.cdep;
+            return ourCdepValue === undefined;
+          });
+          expect(noCdep).to.be.true;
+        });
 
-            expect(videoImp.placement).to.equal(4);
+        it('should add cdep if we DO get it in an impression request', () => {
+          const builtRequests = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id',
+            ortb2: {
+              device: {
+                ext: {
+                  cdep: 'cdep-value',
+                },
+              },
+            },
+          });
+          const cdepPresent = builtRequests.every((builtRequest) => {
+            return builtRequest.data.device.ext.cdep === 'cdep-value';
           });
+          expect(cdepPresent).to.be.true;
         });
       });
 
@@ -618,7 +770,7 @@ describe('sharethrough adapter spec', function () {
           badv: ['domain1.com', 'domain2.com'],
           regs: {
             gpp: 'gpp_string',
-            gpp_sid: [7]
+            gpp_sid: [7],
           },
         };
 
@@ -655,6 +807,22 @@ describe('sharethrough adapter spec', function () {
           expect(openRtbReq.regs.ext.gpp_sid).to.equal(firstPartyData.regs.gpp_sid);
         });
       });
+
+      describe('fledge', () => {
+        it('should attach "ae" as a property to the request if 1) fledge auctions are enabled, and 2) request is display (only supporting display for now)', () => {
+          // ASSEMBLE
+          const EXPECTED_AE_VALUE = 1;
+
+          // ACT
+          bidderRequest.paapi = {enabled: true};
+          const builtRequests = spec.buildRequests(bidRequests, bidderRequest);
+          const ACTUAL_AE_VALUE = builtRequests[0].data.imp[0].ext.ae;
+
+          // ASSERT
+          expect(ACTUAL_AE_VALUE).to.equal(EXPECTED_AE_VALUE);
+          expect(builtRequests[1].data.imp[0].ext.ae).to.be.undefined;
+        });
+      });
     });
 
     describe('interpretResponse', function () {
@@ -870,25 +1038,6 @@ describe('sharethrough adapter spec', function () {
         const syncArray = spec.getUserSyncs({ pixelEnabled: false }, serverResponses);
         expect(syncArray).to.be.an('array').that.is.empty;
       });
-
-      it('returns GDPR Consent Params in UserSync url', function () {
-        const syncArray = spec.getUserSyncs({ pixelEnabled: true }, serverResponses, { gdprApplies: true,
-          consentString: 'consent' });
-        expect(syncArray).to.deep.equal([
-          { type: 'image', url: 'cookieUrl1&gdpr=1&gdpr_consent=consent' },
-          { type: 'image', url: 'cookieUrl2&gdpr=1&gdpr_consent=consent' },
-          { type: 'image', url: 'cookieUrl3&gdpr=1&gdpr_consent=consent' },
-        ]);
-      });
-
-      it('returns GPP Consent Params in UserSync url', function () {
-        const syncArray = spec.getUserSyncs({ pixelEnabled: true }, serverResponses, {}, {gppString: 'gpp-string', applicableSections: [1, 2]});
-        expect(syncArray).to.deep.equal([
-          { type: 'image', url: 'cookieUrl1&gdpr=0&gdpr_consent=&gpp=gpp-string&gpp_sid=1%2C2' },
-          { type: 'image', url: 'cookieUrl2&gdpr=0&gdpr_consent=&gpp=gpp-string&gpp_sid=1%2C2' },
-          { type: 'image', url: 'cookieUrl3&gdpr=0&gdpr_consent=&gpp=gpp-string&gpp_sid=1%2C2' },
-        ]);
-      });
     });
   });
 });
diff --git a/test/spec/modules/shinezRtbBidAdapter_spec.js b/test/spec/modules/shinezRtbBidAdapter_spec.js
new file mode 100644
index 00000000000..ebd2e987491
--- /dev/null
+++ b/test/spec/modules/shinezRtbBidAdapter_spec.js
@@ -0,0 +1,657 @@
+import {expect} from 'chai';
+import {
+  spec as adapter,
+  createDomain,
+  storage
+} from 'modules/shinezRtbBidAdapter';
+import {
+  hashCode,
+  extractPID,
+  extractCID,
+  extractSubDomain,
+  getStorageItem,
+  setStorageItem,
+  tryParseJSON,
+  getUniqueDealId,
+} from '../../../libraries/vidazooUtils/bidderUtils.js';
+import {parseUrl, deepClone} from 'src/utils.js';
+import {version} from 'package.json';
+import {useFakeTimers} from 'sinon';
+import {BANNER, VIDEO} from '../../../src/mediaTypes';
+import {config} from '../../../src/config';
+
+export const TEST_ID_SYSTEMS = ['criteoId', 'id5id', 'idl_env', 'lipb', 'netId', 'pubcid', 'tdid', 'pubProvidedId'];
+
+const SUB_DOMAIN = 'exchange';
+
+const BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': 'div-gpt-ad-12345-0',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '59db6b3b4ffaa70004f45cdc',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1,
+    'ext': {
+      'param1': 'loremipsum',
+      'param2': 'dolorsitamet'
+    }
+  },
+  'placementCode': 'div-gpt-ad-1460505748561-0',
+  'sizes': [[300, 250], [300, 600]],
+  'bidderRequestId': '1fdb5ff1b6eaa7',
+  'bidRequestsCount': 4,
+  'bidderRequestsCount': 3,
+  'bidderWinsCount': 1,
+  'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'mediaTypes': [BANNER],
+  'ortb2Imp': {
+    'ext': {
+      'gpid': '0123456789',
+      'tid': '56e184c6-bde9-497b-b9b9-cf47a61381ee'
+    }
+  }
+};
+
+const VIDEO_BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': '63550ad1ff6642d368cba59dh5884270560',
+  'bidderRequestId': '12a8ae9ada9c13',
+  'bidRequestsCount': 4,
+  'bidderRequestsCount': 3,
+  'bidderWinsCount': 1,
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '635509f7ff6642d368cb9837',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1
+  },
+  'sizes': [[545, 307]],
+  'mediaTypes': {
+    'video': {
+      'playerSize': [[545, 307]],
+      'context': 'instream',
+      'mimes': [
+        'video/mp4',
+        'application/javascript'
+      ],
+      'protocols': [2, 3, 5, 6],
+      'maxduration': 60,
+      'minduration': 0,
+      'startdelay': 0,
+      'linearity': 1,
+      'api': [2],
+      'placement': 1
+    }
+  },
+  'ortb2Imp': {
+    'ext': {
+      'gpid': '0123456789',
+      'tid': '56e184c6-bde9-497b-b9b9-cf47a61381ee'
+    }
+  }
+}
+
+const BIDDER_REQUEST = {
+  'gdprConsent': {
+    'consentString': 'consent_string',
+    'gdprApplies': true
+  },
+  'gppConsent': {
+    'gppString': 'gpp_string',
+    'applicableSections': [7]
+  },
+  'uspConsent': 'consent_string',
+  'refererInfo': {
+    'page': 'https://www.greatsite.com',
+    'ref': 'https://www.somereferrer.com'
+  },
+  'ortb2': {
+    'site': {
+      'content': {
+        'language': 'en'
+      }
+    },
+    'regs': {
+      'gpp': 'gpp_string',
+      'gpp_sid': [7],
+      'coppa': 0
+    },
+    'device': {
+      'sua': {
+        'source': 2,
+        'platform': {
+          'brand': 'Android',
+          'version': ['8', '0', '0']
+        },
+        'browsers': [
+          {'brand': 'Not_A Brand', 'version': ['99', '0', '0', '0']},
+          {'brand': 'Google Chrome', 'version': ['109', '0', '5414', '119']},
+          {'brand': 'Chromium', 'version': ['109', '0', '5414', '119']}
+        ],
+        'mobile': 1,
+        'model': 'SM-G955U',
+        'bitness': '64',
+        'architecture': ''
+      }
+    }
+  }
+};
+
+const SERVER_RESPONSE = {
+  body: {
+    cid: 'testcid123',
+    results: [{
+      'ad': '',
+      'price': 0.8,
+      'creativeId': '12610997325162499419',
+      'exp': 30,
+      'width': 300,
+      'height': 250,
+      'advertiserDomains': ['securepubads.g.doubleclick.net'],
+      'cookies': [{
+        'src': 'https://sync.com',
+        'type': 'iframe'
+      }, {
+        'src': 'https://sync.com',
+        'type': 'img'
+      }]
+    }]
+  }
+};
+
+const VIDEO_SERVER_RESPONSE = {
+  body: {
+    'cid': '635509f7ff6642d368cb9837',
+    'results': [{
+      'ad': '',
+      'advertiserDomains': ['sweetgum.io'],
+      'exp': 60,
+      'width': 545,
+      'height': 307,
+      'mediaType': 'video',
+      'creativeId': '12610997325162499419',
+      'price': 2,
+      'cookies': []
+    }]
+  }
+};
+
+const REQUEST = {
+  data: {
+    width: 300,
+    height: 250,
+    bidId: '2d52001cabd527'
+  }
+};
+
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = parseUrl(window.top.document.URL, {decodeSearchAsString: true});
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
+
+describe('ShinezRtbBidAdapter', function () {
+  describe('validtae spec', function () {
+    it('exists and is a function', function () {
+      expect(adapter.isBidRequestValid).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.buildRequests).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.interpretResponse).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.getUserSyncs).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a string', function () {
+      expect(adapter.code).to.exist.and.to.be.a('string');
+    });
+
+    it('exists and contains media types', function () {
+      expect(adapter.supportedMediaTypes).to.exist.and.to.be.an('array').with.length(2);
+      expect(adapter.supportedMediaTypes).to.contain.members([BANNER, VIDEO]);
+    });
+  });
+
+  describe('validate bid requests', function () {
+    it('should require cId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should require pId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should validate correctly', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid',
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.true;
+    });
+  });
+
+  describe('build requests', function () {
+    let sandbox;
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        shinezRtb: {
+          storageAllowed: true
+        }
+      };
+      sandbox = sinon.sandbox.create();
+      sandbox.stub(Date, 'now').returns(1000);
+    });
+
+    it('should build video request', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      config.setConfig({
+        bidderTimeout: 3000,
+        enableTIDs: true
+      });
+      const requests = adapter.buildRequests([VIDEO_BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/635509f7ff6642d368cb9837`,
+        data: {
+          adUnitCode: '63550ad1ff6642d368cba59dh5884270560',
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          bidderVersion: adapter.version,
+          bidderRequestId: '12a8ae9ada9c13',
+          cb: 1000,
+          gdpr: 1,
+          gdprConsent: 'consent_string',
+          usPrivacy: 'consent_string',
+          gppString: 'gpp_string',
+          gppSid: [7],
+          transactionId: '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+          prebidVersion: version,
+          bidRequestsCount: 4,
+          bidderRequestsCount: 3,
+          bidderWinsCount: 1,
+          bidderTimeout: 3000,
+          publisherId: '59ac17c192832d0011283fe3',
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          schain: VIDEO_BID.schain,
+          sizes: ['545x307'],
+          sua: {
+            'source': 2,
+            'platform': {
+              'brand': 'Android',
+              'version': ['8', '0', '0']
+            },
+            'browsers': [
+              {'brand': 'Not_A Brand', 'version': ['99', '0', '0', '0']},
+              {'brand': 'Google Chrome', 'version': ['109', '0', '5414', '119']},
+              {'brand': 'Chromium', 'version': ['109', '0', '5414', '119']}
+            ],
+            'mobile': 1,
+            'model': 'SM-G955U',
+            'bitness': '64',
+            'architecture': ''
+          },
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          uqs: getTopWindowQueryParams(),
+          mediaTypes: {
+            video: {
+              api: [2],
+              context: 'instream',
+              linearity: 1,
+              maxduration: 60,
+              mimes: [
+                'video/mp4',
+                'application/javascript'
+              ],
+              minduration: 0,
+              placement: 1,
+              playerSize: [[545, 307]],
+              protocols: [2, 3, 5, 6],
+              startdelay: 0
+            }
+          },
+          gpid: '0123456789',
+          cat: [],
+          contentLang: 'en',
+          contentData: [],
+          isStorageAllowed: true,
+          pagecat: [],
+          userData: [],
+          coppa: 0
+        }
+      });
+    });
+
+    it('should build banner request for each size', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      config.setConfig({
+        bidderTimeout: 3000,
+        enableTIDs: true
+      });
+      const requests = adapter.buildRequests([BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/59db6b3b4ffaa70004f45cdc`,
+        data: {
+          gdprConsent: 'consent_string',
+          gdpr: 1,
+          gppString: 'gpp_string',
+          gppSid: [7],
+          usPrivacy: 'consent_string',
+          bidRequestsCount: 4,
+          bidderRequestsCount: 3,
+          bidderWinsCount: 1,
+          bidderTimeout: 3000,
+          bidderRequestId: '1fdb5ff1b6eaa7',
+          transactionId: '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+          sizes: ['300x250', '300x600'],
+          sua: {
+            'source': 2,
+            'platform': {
+              'brand': 'Android',
+              'version': ['8', '0', '0']
+            },
+            'browsers': [
+              {'brand': 'Not_A Brand', 'version': ['99', '0', '0', '0']},
+              {'brand': 'Google Chrome', 'version': ['109', '0', '5414', '119']},
+              {'brand': 'Chromium', 'version': ['109', '0', '5414', '119']}
+            ],
+            'mobile': 1,
+            'model': 'SM-G955U',
+            'bitness': '64',
+            'architecture': ''
+          },
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          cb: 1000,
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          adUnitCode: 'div-gpt-ad-12345-0',
+          publisherId: '59ac17c192832d0011283fe3',
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          bidderVersion: adapter.version,
+          prebidVersion: version,
+          schain: BID.schain,
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          mediaTypes: [BANNER],
+          gpid: '0123456789',
+          uqs: getTopWindowQueryParams(),
+          'ext.param1': 'loremipsum',
+          'ext.param2': 'dolorsitamet',
+          cat: [],
+          contentLang: 'en',
+          contentData: [],
+          isStorageAllowed: true,
+          pagecat: [],
+          userData: [],
+          coppa: 0
+        }
+      });
+    });
+
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+      sandbox.restore();
+    });
+  });
+  describe('getUserSyncs', function () {
+    it('should have valid user sync with iframeEnabled', function () {
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.sweetgum.io/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with cid on response', function () {
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.sweetgum.io/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with pixelEnabled', function () {
+      const result = adapter.getUserSyncs({pixelEnabled: true}, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        'url': 'https://sync.sweetgum.io/api/sync/image/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy=',
+        'type': 'image'
+      }]);
+    })
+  });
+
+  describe('interpret response', function () {
+    it('should return empty array when there is no response', function () {
+      const responses = adapter.interpretResponse(null);
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no ad', function () {
+      const responses = adapter.interpretResponse({price: 1, ad: ''});
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no price', function () {
+      const responses = adapter.interpretResponse({price: null, ad: 'great ad'});
+      expect(responses).to.be.empty;
+    });
+
+    it('should return an array of interpreted banner responses', function () {
+      const responses = adapter.interpretResponse(SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 0.8,
+        width: 300,
+        height: 250,
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 30,
+        ad: '',
+        meta: {
+          advertiserDomains: ['securepubads.g.doubleclick.net']
+        }
+      });
+    });
+
+    it('should get meta from response metaData', function () {
+      const serverResponse = deepClone(SERVER_RESPONSE);
+      serverResponse.body.results[0].metaData = {
+        advertiserDomains: ['sweetgum.io'],
+        agencyName: 'Agency Name',
+      };
+      const responses = adapter.interpretResponse(serverResponse, REQUEST);
+      expect(responses[0].meta).to.deep.equal({
+        advertiserDomains: ['sweetgum.io'],
+        agencyName: 'Agency Name'
+      });
+    });
+
+    it('should return an array of interpreted video responses', function () {
+      const responses = adapter.interpretResponse(VIDEO_SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 2,
+        width: 545,
+        height: 307,
+        mediaType: 'video',
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 60,
+        vastXml: '',
+        meta: {
+          advertiserDomains: ['sweetgum.io']
+        }
+      });
+    });
+
+    it('should take default TTL', function () {
+      const serverResponse = deepClone(SERVER_RESPONSE);
+      delete serverResponse.body.results[0].exp;
+      const responses = adapter.interpretResponse(serverResponse, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0].ttl).to.equal(300);
+    });
+  });
+
+  describe('user id system', function () {
+    TEST_ID_SYSTEMS.forEach((idSystemProvider) => {
+      const id = Date.now().toString();
+      const bid = deepClone(BID);
+
+      const userId = (function () {
+        switch (idSystemProvider) {
+          case 'lipb':
+            return {lipbid: id};
+          case 'id5id':
+            return {uid: id};
+          default:
+            return id;
+        }
+      })();
+
+      bid.userId = {
+        [idSystemProvider]: userId
+      };
+
+      it(`should include 'uid.${idSystemProvider}' in request params`, function () {
+        const requests = adapter.buildRequests([bid], BIDDER_REQUEST);
+        expect(requests[0].data[`uid.${idSystemProvider}`]).to.equal(id);
+      });
+    });
+  });
+
+  describe('alternate param names extractors', function () {
+    it('should return undefined when param not supported', function () {
+      const cid = extractCID({'c_id': '1'});
+      const pid = extractPID({'p_id': '1'});
+      const subDomain = extractSubDomain({'sub_domain': 'prebid'});
+      expect(cid).to.be.undefined;
+      expect(pid).to.be.undefined;
+      expect(subDomain).to.be.undefined;
+    });
+
+    it('should return value when param supported', function () {
+      const cid = extractCID({'cID': '1'});
+      const pid = extractPID({'Pid': '2'});
+      const subDomain = extractSubDomain({'subDOMAIN': 'prebid'});
+      expect(cid).to.be.equal('1');
+      expect(pid).to.be.equal('2');
+      expect(subDomain).to.be.equal('prebid');
+    });
+  });
+
+  describe('unique deal id', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        shinezRtb: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    const key = 'myKey';
+    let uniqueDealId;
+    beforeEach(() => {
+      uniqueDealId = getUniqueDealId(storage, key, 0);
+    })
+
+    it('should get current unique deal id', function (done) {
+      // waiting some time so `now` will become past
+      setTimeout(() => {
+        const current = getUniqueDealId(storage, key);
+        expect(current).to.be.equal(uniqueDealId);
+        done();
+      }, 200);
+    });
+
+    it('should get new unique deal id on expiration', function (done) {
+      setTimeout(() => {
+        const current = getUniqueDealId(storage, key, 100);
+        expect(current).to.not.be.equal(uniqueDealId);
+        done();
+      }, 200)
+    });
+  });
+
+  describe('storage utils', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        shinezRtb: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    it('should get value from storage with create param', function () {
+      const now = Date.now();
+      const clock = useFakeTimers({
+        shouldAdvanceTime: true,
+        now
+      });
+      setStorageItem(storage, 'myKey', 2020);
+      const {value, created} = getStorageItem(storage, 'myKey');
+      expect(created).to.be.equal(now);
+      expect(value).to.be.equal(2020);
+      expect(typeof value).to.be.equal('number');
+      expect(typeof created).to.be.equal('number');
+      clock.restore();
+    });
+
+    it('should get external stored value', function () {
+      const value = 'superman'
+      window.localStorage.setItem('myExternalKey', value);
+      const item = getStorageItem(storage, 'myExternalKey');
+      expect(item).to.be.equal(value);
+    });
+
+    it('should parse JSON value', function () {
+      const data = JSON.stringify({event: 'send'});
+      const {event} = tryParseJSON(data);
+      expect(event).to.be.equal('send');
+    });
+
+    it('should get original value on parse fail', function () {
+      const value = 21;
+      const parsed = tryParseJSON(value);
+      expect(typeof parsed).to.be.equal('number');
+      expect(parsed).to.be.equal(value);
+    });
+  });
+});
diff --git a/test/spec/modules/showheroes-bsBidAdapter_spec.js b/test/spec/modules/showheroes-bsBidAdapter_spec.js
index 30e95b04ccf..b03f6eb9a8a 100644
--- a/test/spec/modules/showheroes-bsBidAdapter_spec.js
+++ b/test/spec/modules/showheroes-bsBidAdapter_spec.js
@@ -1,98 +1,67 @@
-import {expect} from 'chai'
-import {spec} from 'modules/showheroes-bsBidAdapter.js'
-import {newBidder} from 'src/adapters/bidderFactory.js'
-import {VIDEO, BANNER} from 'src/mediaTypes.js'
+import { expect } from 'chai'
+import { spec } from 'modules/showheroes-bsBidAdapter.js'
+import { syncAddFPDToBidderRequest } from '../../helpers/fpd.js';
+import 'modules/priceFloors.js';
+import 'modules/consentManagementTcf.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js';
+import { VIDEO } from 'src/mediaTypes.js'
 
 const bidderRequest = {
   refererInfo: {
-    canonicalUrl: 'https://example.com'
+    page: 'https://example.com/home',
+    ref: 'https://referrer'
   }
 }
 
 const adomain = ['showheroes.com'];
 
 const gdpr = {
-  'gdprConsent': {
-    'apiVersion': 2,
-    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
-    'gdprApplies': true
+  gdprConsent: {
+    apiVersion: 2,
+    consentString: 'CONSENT',
+    vendorData: { purpose: { consents: { 1: true } } },
+    gdprApplies: true,
   }
 }
 
 const uspConsent = '1---';
 
 const schain = {
-  'schain': {
-    'validation': 'strict',
-    'config': {
-      'ver': '1.0',
-      'complete': 1,
-      'nodes': [
+  schain: {
+    validation: 'strict',
+    config: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
         {
-          'asi': 'some.com',
-          'sid': '00001',
-          'hp': 1
+          asi: 'some.com',
+          sid: '00001',
+          hp: 1
         }
       ]
     }
   }
 }
 
-const bidRequestCommonParams = {
-  'bidder': 'showheroes-bs',
-  'params': {
-    'playerId': '47427aa0-f11a-4d24-abca-1295a46a46cd',
-  },
-  'adUnitCode': 'adunit-code-1',
-  'sizes': [[640, 480]],
-  'bidId': '38b373e1e31c18',
-  'bidderRequestId': '12e3ade2543ba6',
-  'auctionId': '43aa080090a47f',
-}
-
 const bidRequestCommonParamsV2 = {
-  'bidder': 'showheroes-bs',
-  'params': {
-    'unitId': 'AACBWAcof-611K4U',
+  bidder: 'showheroes-bs',
+  params: {
+    unitId: 'AACBWAcof-611K4U',
   },
-  'adUnitCode': 'adunit-code-1',
-  'sizes': [[640, 480]],
-  'bidId': '38b373e1e31c18',
-  'bidderRequestId': '12e3ade2543ba6',
-  'auctionId': '43aa080090a47f',
-}
-
-const bidRequestVideo = {
-  ...bidRequestCommonParams,
-  ...{
-    'mediaTypes': {
-      'video': {
-        'playerSize': [640, 480],
-        'context': 'instream',
-      }
-    }
-  }
-}
-
-const bidRequestOutstream = {
-  ...bidRequestCommonParams,
-  ...{
-    'mediaTypes': {
-      'video': {
-        'playerSize': [640, 480],
-        'context': 'outstream',
-      }
-    }
-  }
+  adUnitCode: 'adunit-code-1',
+  bidId: '38b373e1e31c18',
+  bidderRequestId: '12e3ade2543ba6',
+  auctionId: '43aa080090a47f',
 }
 
 const bidRequestVideoV2 = {
   ...bidRequestCommonParamsV2,
   ...{
-    'mediaTypes': {
-      'video': {
-        'playerSize': [640, 480],
-        'context': 'instream',
+    mediaTypes: {
+      video: {
+        playerSize: [640, 480],
+        context: 'instream',
       }
     }
   }
@@ -101,541 +70,188 @@ const bidRequestVideoV2 = {
 const bidRequestOutstreamV2 = {
   ...bidRequestCommonParamsV2,
   ...{
-    'mediaTypes': {
-      'video': {
-        'playerSize': [640, 480],
-        'context': 'outstream'
-      }
-    }
-  }
-}
-
-const bidRequestVideoVpaid = {
-  ...bidRequestCommonParams,
-  ...{
-    'params': {
-      'playerId': '47427aa0-f11a-4d24-abca-1295a46a46cd',
-      'vpaidMode': true,
-    },
-    'mediaTypes': {
-      'video': {
-        'playerSize': [640, 480],
-        'context': 'instream',
-      }
-    }
-  }
-}
-
-const bidRequestBanner = {
-  ...bidRequestCommonParams,
-  ...{
-    'mediaTypes': {
-      'banner': {
-        'sizes': [[640, 360]]
-      }
-    }
-  }
-}
-
-const bidRequestBannerMultiSizes = {
-  ...bidRequestCommonParams,
-  ...{
-    'mediaTypes': {
-      'banner': {
-        'sizes': [[640, 360], [480, 320]]
-      }
+    mediaTypes: {
+      video: {
+        playerSize: [640, 480],
+        context: 'outstream'
+      },
     }
   }
 }
 
-const bidRequestVideoAndBanner = {
-  ...bidRequestCommonParams,
-  'mediaTypes': {
-    ...bidRequestBanner.mediaTypes,
-    ...bidRequestVideo.mediaTypes
-  }
-}
-
-describe('shBidAdapter', function () {
-  const adapter = newBidder(spec)
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function')
-    })
-  })
-
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found', function () {
-      const requestV1 = {
-        'params': {
-          'playerId': '47427aa0-f11a-4d24-abca-1295a46a46cd',
-        }
-      }
-      expect(spec.isBidRequestValid(requestV1)).to.equal(true)
-
-      const requestV2 = {
-        'params': {
-          'unitId': 'AACBTwsZVANd9NlB',
-        }
-      }
-      expect(spec.isBidRequestValid(requestV2)).to.equal(true)
-    })
-
-    it('should return false when required params are not passed', function () {
-      const request = {
-        'params': {}
-      }
-      expect(spec.isBidRequestValid(request)).to.equal(false)
-    })
-  })
-
-  describe('buildRequests', function () {
-    it('sends bid request to ENDPOINT via POST', function () {
-      const request = spec.buildRequests([bidRequestVideo], bidderRequest)
-      expect(request.method).to.equal('POST')
-
-      const requestV2 = spec.buildRequests([bidRequestVideoV2], bidderRequest)
-      expect(requestV2.method).to.equal('POST')
-    })
-
-    it('check sizes formats', function () {
-      const request = spec.buildRequests([{
-        'params': {},
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[320, 240]]
-          }
-        },
-      }], bidderRequest)
-      const payload = request.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload.size).to.have.property('width', 320);
-      expect(payload.size).to.have.property('height', 240);
-
-      const request2 = spec.buildRequests([{
-        'params': {},
-        'mediaTypes': {
-          'video': {
-            'playerSize': [640, 360]
-          }
-        },
-      }], bidderRequest)
-      const payload2 = request2.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload2.size).to.have.property('width', 640);
-      expect(payload2.size).to.have.property('height', 360);
-    })
-
-    it('should get size from mediaTypes when sizes property is empty', function () {
-      const request = spec.buildRequests([{
-        'params': {},
-        'mediaTypes': {
-          'video': {
-            'playerSize': [640, 480]
-          }
-        },
-        'sizes': [],
-      }], bidderRequest)
-      const payload = request.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload.size).to.have.property('width', 640);
-      expect(payload.size).to.have.property('height', 480);
-
-      const request2 = spec.buildRequests([{
-        'params': {},
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[320, 240]]
-          }
-        },
-        'sizes': [],
-      }], bidderRequest)
-      const payload2 = request2.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload2.size).to.have.property('width', 320);
-      expect(payload2.size).to.have.property('height', 240);
-    })
-
-    it('should attach valid params to the payload when type is video', function () {
-      const request = spec.buildRequests([bidRequestVideo], bidderRequest)
-      const payload = request.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('playerId', '47427aa0-f11a-4d24-abca-1295a46a46cd');
-      expect(payload).to.have.property('mediaType', VIDEO);
-      expect(payload).to.have.property('type', 2);
-    })
-
-    it('should attach valid params to the payload when type is video & vpaid mode on', function () {
-      const request = spec.buildRequests([bidRequestVideoVpaid], bidderRequest)
-      const payload = request.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('playerId', '47427aa0-f11a-4d24-abca-1295a46a46cd');
-      expect(payload).to.have.property('mediaType', VIDEO);
-      expect(payload).to.have.property('type', 1);
-    })
-
-    it('should attach valid params to the payload when type is banner', function () {
-      const request = spec.buildRequests([bidRequestBanner], bidderRequest)
-      const payload = request.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('playerId', '47427aa0-f11a-4d24-abca-1295a46a46cd');
-      expect(payload).to.have.property('mediaType', BANNER);
-      expect(payload).to.have.property('type', 5);
-    })
-
-    it('should attach valid params to the payload when type is banner (multi sizes)', function () {
-      const request = spec.buildRequests([bidRequestBannerMultiSizes], bidderRequest)
-      const payload = request.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('playerId', '47427aa0-f11a-4d24-abca-1295a46a46cd');
-      expect(payload).to.have.property('mediaType', BANNER);
-      expect(payload).to.have.property('type', 5);
-      expect(payload).to.have.nested.property('size.width', 640);
-      expect(payload).to.have.nested.property('size.height', 360);
-      const payload2 = request.data.requests[1];
-      expect(payload2).to.be.an('object');
-      expect(payload2).to.have.property('playerId', '47427aa0-f11a-4d24-abca-1295a46a46cd');
-      expect(payload2).to.have.property('mediaType', BANNER);
-      expect(payload2).to.have.property('type', 5);
-      expect(payload2).to.have.nested.property('size.width', 480);
-      expect(payload2).to.have.nested.property('size.height', 320);
-    })
-
-    it('should attach valid params to the payload when type is banner and video', function () {
-      const request = spec.buildRequests([bidRequestVideoAndBanner], bidderRequest)
-      const payload = request.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('playerId', '47427aa0-f11a-4d24-abca-1295a46a46cd');
-      expect(payload).to.have.property('mediaType', VIDEO);
-      expect(payload).to.have.property('type', 2);
-      const payload2 = request.data.requests[1];
-      expect(payload2).to.be.an('object');
-      expect(payload2).to.have.property('playerId', '47427aa0-f11a-4d24-abca-1295a46a46cd');
-      expect(payload2).to.have.property('mediaType', BANNER);
-      expect(payload2).to.have.property('type', 5);
-    })
-
-    it('should attach valid params to the payload when type is video (instream V2)', function () {
-      const request = spec.buildRequests([bidRequestVideoV2], bidderRequest)
-      const payload = request.data.bidRequests[0];
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('unitId', 'AACBWAcof-611K4U');
-      expect(payload.mediaTypes).to.eql({
-        [VIDEO]: {
-          'context': 'instream'
-        }
-      });
-    })
-
-    it('should attach valid params to the payload when type is video (outstream V2)', function () {
-      const request = spec.buildRequests([bidRequestOutstreamV2], bidderRequest)
-      const payload = request.data.bidRequests[0];
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('unitId', 'AACBWAcof-611K4U');
-      expect(payload.mediaTypes).to.eql({
-        [VIDEO]: {
-          'context': 'outstream'
-        }
-      });
-    })
-
-    it('passes gdpr & uspConsent if present', function () {
-      const request = spec.buildRequests([bidRequestVideo], {
-        ...bidderRequest,
-        ...gdpr,
-        uspConsent,
-      })
-      const payload = request.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload.gdprConsent).to.eql(gdpr.gdprConsent)
-      expect(payload.uspConsent).to.eql(uspConsent)
-    })
-
-    it('passes gdpr & usp if present (V2)', function () {
-      const request = spec.buildRequests([bidRequestVideoV2], {
-        ...bidderRequest,
-        ...gdpr,
-        uspConsent,
-      })
-      const context = request.data.context;
-      expect(context).to.be.an('object');
-      expect(context.gdprConsent).to.eql(gdpr.gdprConsent)
-      expect(context.uspConsent).to.eql(uspConsent)
-    })
-
-    it('passes schain object if present', function() {
-      const request = spec.buildRequests([{
-        ...bidRequestVideo,
-        ...schain
-      }], bidderRequest)
-      const payload = request.data.requests[0];
-      expect(payload).to.be.an('object');
-      expect(payload.schain).to.eql(schain.schain);
-    })
-
-    it('passes schain object if present (V2)', function() {
-      const request = spec.buildRequests([{
-        ...bidRequestVideoV2,
-        ...schain
-      }], bidderRequest)
-      const context = request.data.context;
-      expect(context).to.be.an('object');
-      expect(context.schain).to.eql(schain.schain);
-    })
-  })
-
-  describe('interpretResponse', function () {
-    it('handles nobid responses', function () {
-      expect(spec.interpretResponse({body: {}}, {data: {meta: {}}}).length).to.equal(0)
-      expect(spec.interpretResponse({body: []}, {data: {meta: {}}}).length).to.equal(0)
-    })
-
-    const vastTag = 'https://test.com/commercial/wrapper?player_id=47427aa0-f11a-4d24-abca-1295a46a46cd&ad_bidder=showheroes-bs&master_shadt=1&description_url=https%3A%2F%2Fbid-service.stage.showheroes.com%2Fvast%2Fad%2Fcache%2F4840b920-40e1-4e09-9231-60bbf088c8d6'
-    const vastXml = ''
-
-    const basicResponse = {
-      'cpm': 5,
-      'currency': 'EUR',
-      'mediaType': VIDEO,
-      'context': 'instream',
-      'bidId': '38b373e1e31c18',
-      'size': {'width': 640, 'height': 480},
-      'vastTag': 'https:\/\/test.com\/commercial\/wrapper?player_id=47427aa0-f11a-4d24-abca-1295a46a46cd&ad_bidder=showheroes-bs&master_shadt=1&description_url=https%3A%2F%2Fbid-service.stage.showheroes.com%2Fvast%2Fad%2Fcache%2F4840b920-40e1-4e09-9231-60bbf088c8d6',
-      'vastXml': vastXml,
-      'adomain': adomain,
-    };
-
-    const responseVideo = {
-      'bids': [{
-        ...basicResponse,
-      }],
+describe('shBidAdapter', () => {
+  it('validates request', () => {
+    const bid = {
+      params: {
+        testKey: 'testValue',
+      },
     };
-
-    const responseVideoOutstream = {
-      'bids': [{
-        ...basicResponse,
-        'context': 'outstream',
-      }],
+    expect(spec.isBidRequestValid(bid)).to.eql(false);
+    bid.params = {
+      unitId: 'test_unit',
     };
+    expect(spec.isBidRequestValid(bid)).to.eql(true);
+  });
 
-    const responseBanner = {
-      'bids': [{
-        ...basicResponse,
-        'mediaType': BANNER,
-      }],
+  it('passes gdpr, usp, schain, floor in ortb request', () => {
+    const bidRequest = Object.assign({}, bidRequestVideoV2)
+    const fullRequest = {
+      bids: [bidRequestVideoV2],
+      ...bidderRequest,
+      ...gdpr,
+      ...schain,
+      ...{ uspConsent: uspConsent },
     };
+    bidRequest.schain = schain.schain.config;
+    const getFloorResponse = { currency: 'EUR', floor: 3 };
+    bidRequest.getFloor = () => getFloorResponse;
+    const request = spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(fullRequest));
+    const payload = request.data;
+    expect(payload.regs.ext.gdpr).to.eql(Number(gdpr.gdprConsent.gdprApplies));
+    expect(payload.regs.ext.us_privacy).to.eql(uspConsent);
+    expect(payload.user.ext.consent).to.eql(gdpr.gdprConsent.consentString);
+    expect(payload.source.ext.schain).to.eql(bidRequest.schain);
+    expect(payload.test).to.eql(0);
+    expect(payload.imp[0].bidfloor).eql(3);
+    expect(payload.imp[0].bidfloorcur).eql('EUR');
+    expect(payload.imp[0].displaymanager).eql('Prebid.js');
+    expect(payload.site.page).to.eql('https://example.com/home');
+  });
 
-    const basicResponseV2 = {
-      'requestId': '38b373e1e31c18',
-      'adUnitCode': 'adunit-code-1',
-      'cpm': 1,
-      'currency': 'EUR',
-      'width': 640,
-      'height': 480,
-      'advertiserDomain': [],
-      'callbacks': {
-        'won': ['https://test.com/track/?ver=15&session_id=01ecd03ce381505ccdeb88e555b05001&category=request_session&type=event&request_session_id=01ecd03ce381505ccdeb88e555b05001&label=prebid_won&reason=ok']
-      },
-      'mediaType': 'video',
-      'adomain': adomain,
-    };
+  describe('interpretResponse', function () {
+    const vastXml = ''
 
+    const callback_won = 'https://test.com/track/?ver=15&session_id=01ecd03ce381505ccdeb88e555b05001&category=request_session&type=event&request_session_id=01ecd03ce381505ccdeb88e555b05001&label=prebid_won&reason=ok'
+    const basicResponse = {
+      cur: 'EUR',
+      seatbid: [{
+        bid: [{
+          price: 1,
+          w: 640,
+          h: 480,
+          adm: vastXml,
+          impid: '38b373e1e31c18',
+          crid: 'c_38b373e1e31c18',
+          adomain: adomain,
+          ext: {
+            callbacks: {
+              won: [callback_won],
+            },
+            extra: 'test',
+          },
+        }],
+        seat: 'showheroes',
+      }]
+    }
     const vastUrl = 'https://test.com/vast/?zid=AACBWAcof-611K4U&u=https://example.org/?foo=bar&gdpr=0&cs=XXXXXXXXXXXXXXXXXXXX&sid=01ecd03ce381505ccdeb88e555b05001&width=300&height=200&prebidmode=1'
 
-    const responseVideoV2 = {
-      'bidResponses': [{
-        ...basicResponseV2,
-        'context': 'instream',
-        'vastUrl': vastUrl,
-      }],
-    };
-
-    const responseVideoOutstreamV2 = {
-      'bidResponses': [{
-        ...basicResponseV2,
-        'context': 'outstream',
-        'ad': '',
-      }],
-    };
-
-    it('should get correct bid response when type is video', function () {
-      const request = spec.buildRequests([bidRequestVideo], bidderRequest)
-      const expectedResponse = [
-        {
-          'cpm': 5,
-          'creativeId': 'c_38b373e1e31c18',
-          'adUnitCode': 'adunit-code-1',
-          'currency': 'EUR',
-          'width': 640,
-          'height': 480,
-          'mediaType': 'video',
-          'netRevenue': true,
-          'vastUrl': vastTag,
-          'vastXml': vastXml,
-          'requestId': '38b373e1e31c18',
-          'ttl': 300,
-          'adResponse': {
-            'content': vastXml
-          },
-          'meta': {
-            'advertiserDomains': adomain
+    if (FEATURES.VIDEO) {
+      it('should get correct bid response when type is video (V2)', function () {
+        const request = spec.buildRequests([bidRequestVideoV2], bidderRequest)
+        const expectedResponse = [
+          {
+            cpm: 1,
+            creativeId: 'c_38b373e1e31c18',
+            creative_id: 'c_38b373e1e31c18',
+            currency: 'EUR',
+            width: 640,
+            height: 480,
+            playerHeight: 480,
+            playerWidth: 640,
+            mediaType: 'video',
+            netRevenue: true,
+            requestId: '38b373e1e31c18',
+            ttl: 300,
+            meta: {
+              advertiserDomains: adomain
+            },
+            vastXml: vastXml,
+            callbacks: {
+              won: [callback_won],
+            },
+            extra: 'test',
           }
-        }
-      ]
+        ]
 
-      const result = spec.interpretResponse({'body': responseVideo}, request)
-      expect(result).to.deep.equal(expectedResponse)
-    })
+        const result = spec.interpretResponse({ 'body': basicResponse }, request)
+        expect(result).to.deep.equal(expectedResponse)
+      })
 
-    it('should get correct bid response when type is video (V2)', function () {
-      const request = spec.buildRequests([bidRequestVideoV2], bidderRequest)
-      const expectedResponse = [
-        {
-          'cpm': 1,
-          'creativeId': 'c_38b373e1e31c18',
-          'adUnitCode': 'adunit-code-1',
-          'currency': 'EUR',
-          'width': 640,
-          'height': 480,
-          'mediaType': 'video',
-          'netRevenue': true,
-          'vastUrl': vastUrl,
-          'requestId': '38b373e1e31c18',
-          'ttl': 300,
-          'meta': {
-            'advertiserDomains': adomain
+      it('should get correct bid response when type is outstream (slot V2)', function () {
+        window.myRenderer = {
+          renderAd: function() {
+            return null;
           }
         }
-      ]
-
-      const result = spec.interpretResponse({'body': responseVideoV2}, request)
-      expect(result).to.deep.equal(expectedResponse)
-    })
-
-    it('should get correct bid response when type is banner', function () {
-      const request = spec.buildRequests([bidRequestBanner], bidderRequest)
-
-      const result = spec.interpretResponse({'body': responseBanner}, request)
-      expect(result[0]).to.have.property('mediaType', BANNER);
-      expect(result[0].ad).to.include('
",
+      'cpm': 0.1,
+      'ttl': 120,
+      'creativeId': '123',
+      'netRevenue': true,
+      'currency': 'USD',
+      'dealId': 'HASH',
+      'sid': 1234,
+      'meta': {
+        'advertiserDomains': [
+          'smartyads.com'
+        ],
+        'dchain': {
+          'ver': '1.0',
+          'complete': 0,
+          'nodes': [
+            {
+              'name': 'smartyads'
+            }
+          ]
+        }
+      },
+      'metrics': {
+        'requestBids.usp': 0.20000000298023224,
+        'requestBids.gdpr': 67.19999999925494,
+        'requestBids.fpd': 4.299999997019768,
+        'requestBids.validate': 0.29999999701976776,
+        'requestBids.makeRequests': 1.800000000745058,
+        'requestBids.total': 740.9000000022352,
+        'requestBids.callBids': 663,
+        'adapter.client.validate': 0,
+        'adapters.client.smartyads.validate': 0,
+        'adapter.client.buildRequests': 1,
+        'adapters.client.smartyads.buildRequests': 1,
+        'adapter.client.total': 661.6999999992549,
+        'adapters.client.smartyads.total': 661.6999999992549,
+        'adapter.client.net': 657.8999999985099,
+        'adapters.client.smartyads.net': 657.8999999985099,
+        'adapter.client.interpretResponse': 0,
+        'adapters.client.smartyads.interpretResponse': 0,
+        'addBidResponse.validate': 0.19999999925494194,
+        'addBidResponse.categoryTranslation': 0,
+        'addBidResponse.dchain': 0.10000000149011612,
+        'addBidResponse.dsa': 0,
+        'addBidResponse.multibid': 0,
+        'addBidResponse.total': 1.5999999977648258,
+        'render.pending': 368.80000000074506,
+        'render.e2e': 1109.7000000029802
+      },
+      'adapterCode': 'smartyads',
+      'originalCpm': 0.1,
+      'originalCurrency': 'USD',
+      'responseTimestamp': 1715350155081,
+      'requestTimestamp': 1715350154420,
+      'bidder': 'smartyads',
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'timeToRespond': 661,
+      'pbLg': '0.00',
+      'pbMg': '0.10',
+      'pbHg': '0.10',
+      'pbAg': '0.10',
+      'pbDg': '0.10',
+      'pbCg': '',
+      'size': '300x250',
+      'adserverTargeting': {
+        'hb_bidder': 'smartyads',
+        'hb_adid': '3c81d46b03abb',
+        'hb_pb': '0.10',
+        'hb_size': '300x250',
+        'hb_deal': 'HASH',
+        'hb_source': 'client',
+        'hb_format': 'banner',
+        'hb_adomain': 'smartyads.com',
+        'hb_crid': '123'
+      },
+      'latestTargetedAuctionId': '5c0d10bf-96cb-4afa-92ac-2ef75470da22',
+      'status': 'rendered',
+      'params': [
+        {
+          'sourceid': '983',
+          'host': 'prebid',
+          'accountid': '18349',
+          'traffic': 'banner'
+        }
+      ]
+    }
+  };
+
+  after(function () {
+    smartyadsAnalytics.disableAnalytics();
+  });
+
+  describe('main test', function () {
+    beforeEach(function () {
+      sinon.stub(events, 'getEvents').returns([]);
+      sinon.spy(smartyadsAnalytics, 'track');
+    });
+
+    afterEach(function () {
+      events.getEvents.restore();
+      smartyadsAnalytics.disableAnalytics();
+      smartyadsAnalytics.track.restore();
+    });
+
+    it('test auctionEnd', function () {
+      adapterManager.registerAnalyticsAdapter({
+        code: 'smartyads',
+        adapter: smartyadsAnalytics
+      });
+
+      adapterManager.enableAnalytics({
+        provider: 'smartyads',
+      });
+
+      events.emit(EVENTS.AUCTION_END, auctionEnd);
+      expect(server.requests.length).to.equal(1);
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.have.property('auctionData');
+      expect(message).to.have.property('eventType').and.to.equal(EVENTS.AUCTION_END);
+      expect(message.auctionData).to.have.property('auctionId');
+      expect(message.auctionData.bidderRequests).to.have.length(1);
+    });
+
+    it('test bidWon', function() {
+      adapterManager.registerAnalyticsAdapter({
+        code: 'smartyads',
+        adapter: smartyadsAnalytics
+      });
+
+      adapterManager.enableAnalytics({
+        provider: 'smartyads',
+      });
+
+      events.emit(EVENTS.BID_WON, bidWon);
+      expect(server.requests.length).to.equal(1);
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.have.property('eventType').and.to.equal(EVENTS.BID_WON);
+      expect(message).to.have.property('bid');
+      expect(message.bid).to.have.property('bidder').and.to.equal('smartyads');
+      expect(message.bid).to.have.property('cpm').and.to.equal(bidWon.cpm);
+    });
+
+    it('test adRender', function() {
+      adapterManager.registerAnalyticsAdapter({
+        code: 'smartyads',
+        adapter: smartyadsAnalytics
+      });
+
+      adapterManager.enableAnalytics({
+        provider: 'smartyads',
+      });
+
+      events.emit(EVENTS.AD_RENDER_SUCCEEDED, renderData);
+      expect(server.requests.length).to.equal(1);
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.have.property('eventType').and.to.equal(EVENTS.AD_RENDER_SUCCEEDED);
+      expect(message).to.have.property('renderData');
+      expect(message.renderData).to.have.property('doc');
+      expect(message.renderData).to.have.property('doc');
+      expect(message.renderData).to.have.property('bid');
+      expect(message.renderData.bid).to.have.property('adId').and.to.equal(renderData.bid.adId);
+    });
+  });
+});
diff --git a/test/spec/modules/smartyadsBidAdapter_spec.js b/test/spec/modules/smartyadsBidAdapter_spec.js
index 992fff14f33..65480ee11e6 100644
--- a/test/spec/modules/smartyadsBidAdapter_spec.js
+++ b/test/spec/modules/smartyadsBidAdapter_spec.js
@@ -52,17 +52,19 @@ describe('SmartyadsAdapter', function () {
       expect(serverRequest.method).to.equal('POST');
     });
     it('Returns valid URL', function () {
-      expect(serverRequest.url).to.equal('https://n1.smartyads.com/?c=o&m=prebid&secret_key=prebid_js');
+      expect(serverRequest.url).to.be.oneOf([
+        'https://n1.smartyads.com/?c=o&m=prebid&secret_key=prebid_js',
+        'https://n2.smartyads.com/?c=o&m=prebid&secret_key=prebid_js',
+        'https://n6.smartyads.com/?c=o&m=prebid&secret_key=prebid_js'
+      ]);
     });
     it('Returns valid data if array of bids is valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'coppa');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'host', 'page', 'placements', 'coppa', 'eeid', 'ifa');
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.coppa).to.be.a('number');
-      expect(data.language).to.be.a('string');
-      expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       let placement = data['placements'][0];
@@ -122,8 +124,8 @@ describe('SmartyadsAdapter', function () {
       expect(dataItem.width).to.equal(300);
       expect(dataItem.height).to.equal(250);
       expect(dataItem.ad).to.equal('Test');
-      expect(dataItem.meta).to.have.property('advertiserDomains')
-      expect(dataItem.meta.advertiserDomains).to.deep.equal(['example.com']);
+      expect(dataItem.meta).to.have.property('advertiserDomains');
+      expect(dataItem.meta.advertiserDomains).to.be.an('array');
       expect(dataItem.ttl).to.equal(120);
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
@@ -148,7 +150,7 @@ describe('SmartyadsAdapter', function () {
 
       let dataItem = videoResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
-        'netRevenue', 'currency', 'dealId', 'mediaType');
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
       expect(dataItem.requestId).to.equal('23fhj33i987f');
       expect(dataItem.cpm).to.equal(0.5);
       expect(dataItem.vastUrl).to.equal('test.com');
@@ -179,7 +181,7 @@ describe('SmartyadsAdapter', function () {
       expect(nativeResponses).to.be.an('array').that.is.not.empty;
 
       let dataItem = nativeResponses[0];
-      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native');
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
       expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
       expect(dataItem.requestId).to.equal('23fhj33i987f');
       expect(dataItem.cpm).to.equal(0.4);
@@ -259,7 +261,7 @@ describe('SmartyadsAdapter', function () {
     });
   });
   describe('getUserSyncs', function () {
-    const syncUrl = 'https://as.ck-ie.com/prebidjs?p=7c47322e527cf8bdeb7facc1bb03387a&gdpr=0&gdpr_consent=&type=iframe&us_privacy=&gpp=';
+    const syncUrl = 'https://as.ck-ie.com/prebidjs?p=7c47322e527cf8bdeb7facc1bb03387a/iframe?pbjs=1&coppa=0';
     const syncOptions = {
       iframeEnabled: true
     };
@@ -273,79 +275,4 @@ describe('SmartyadsAdapter', function () {
       ]);
     });
   });
-
-  describe('onBidWon', function () {
-    it('should exists', function () {
-      expect(spec.onBidWon).to.exist.and.to.be.a('function');
-    });
-
-    it('should send a valid bid won notice', function () {
-      const bid = {
-        'c': 'o',
-        'm': 'prebid',
-        'secret_key': 'prebid_js',
-        'winTest': '1',
-        'postData': [{
-          'bidder': 'smartyads',
-          'params': [
-            {'host': 'prebid',
-              'accountid': '123',
-              'sourceid': '12345'
-            }]
-        }]
-      };
-      spec.onBidWon(bid);
-      expect(server.requests.length).to.equal(1);
-    });
-  });
-
-  describe('onTimeout', function () {
-    it('should exists', function () {
-      expect(spec.onTimeout).to.exist.and.to.be.a('function');
-    });
-
-    it('should send a valid bid timeout notice', function () {
-      const bid = {
-        'c': 'o',
-        'm': 'prebid',
-        'secret_key': 'prebid_js',
-        'bidTimeout': '1',
-        'postData': [{
-          'bidder': 'smartyads',
-          'params': [
-            {'host': 'prebid',
-              'accountid': '123',
-              'sourceid': '12345'
-            }]
-        }]
-      };
-      spec.onTimeout(bid);
-      expect(server.requests.length).to.equal(1);
-    });
-  });
-
-  describe('onBidderError', function () {
-    it('should exists', function () {
-      expect(spec.onBidderError).to.exist.and.to.be.a('function');
-    });
-
-    it('should send a valid bidder error notice', function () {
-      const bid = {
-        'c': 'o',
-        'm': 'prebid',
-        'secret_key': 'prebid_js',
-        'bidderError': '1',
-        'postData': [{
-          'bidder': 'smartyads',
-          'params': [
-            {'host': 'prebid',
-              'accountid': '123',
-              'sourceid': '12345'
-            }]
-        }]
-      };
-      spec.onBidderError(bid);
-      expect(server.requests.length).to.equal(1);
-    });
-  });
 });
diff --git a/test/spec/modules/smartytechBidAdapter_spec.js b/test/spec/modules/smartytechBidAdapter_spec.js
index 6b3147859bf..3b6d5d0c5fc 100644
--- a/test/spec/modules/smartytechBidAdapter_spec.js
+++ b/test/spec/modules/smartytechBidAdapter_spec.js
@@ -204,7 +204,11 @@ function mockResponseData(requestData) {
       creativeId: `creative-id-${index}`,
       cpm: Math.floor(Math.random() * 100),
       currency: `UAH-${rndIndex}`,
-      mediaType: mediaType
+      mediaType: mediaType,
+      meta: {
+        primaryCatId: 'IAB2-2',
+        secondaryCatIds: ['IAB2-14', 'IAB2-6']
+      }
     };
   });
   return {
diff --git a/test/spec/modules/smilewantedBidAdapter_spec.js b/test/spec/modules/smilewantedBidAdapter_spec.js
index 22221dbe1ef..1c71c7bee07 100644
--- a/test/spec/modules/smilewantedBidAdapter_spec.js
+++ b/test/spec/modules/smilewantedBidAdapter_spec.js
@@ -76,6 +76,49 @@ const DISPLAY_REQUEST_WITH_POSITION_TYPE = [{
   },
 }];
 
+const SCHAIN = {
+  'ver': '1.0',
+  'complete': 1,
+  'nodes': [
+    {
+      'asi': 'exchange1.com',
+      'sid': '1234',
+      'hp': 1,
+      'rid': 'bid-request-1',
+      'name': 'publisher',
+      'domain': 'publisher.com'
+    },
+    {
+      'asi': 'exchange2.com',
+      'sid': 'abcd',
+      'hp': 1,
+      'rid': 'bid-request-2',
+      'name': 'intermediary',
+      'domain': 'intermediary.com'
+    }
+  ]
+};
+
+const DISPLAY_REQUEST_WITH_SCHAIN = [{
+  adUnitCode: 'sw_300x250',
+  bidId: '12345',
+  sizes: [
+    [300, 250],
+    [300, 200]
+  ],
+  bidder: 'smilewanted',
+  params: {
+    zoneId: 1,
+  },
+  requestId: 'request_abcd1234',
+  ortb2Imp: {
+    ext: {
+      tid: 'trans_abcd1234',
+    }
+  },
+  schain: SCHAIN,
+}];
+
 const BID_RESPONSE_DISPLAY = {
   body: {
     cpm: 3,
@@ -93,7 +136,24 @@ const BID_RESPONSE_DISPLAY = {
 const VIDEO_INSTREAM_REQUEST = [{
   code: 'video1',
   mediaTypes: {
-    video: {}
+    video: {
+      context: 'instream',
+      mimes: ['video/mp4'],
+      minduration: 0,
+      maxduration: 120,
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+      startdelay: 0,
+      placement: 1,
+      skip: 1,
+      skipafter: 10,
+      minbitrate: 10,
+      maxbitrate: 10,
+      delivery: [1],
+      playbackmethod: [2],
+      api: [1, 2],
+      linearity: 1,
+      playerSize: [640, 480]
+    }
   },
   sizes: [
     [640, 480]
@@ -163,6 +223,99 @@ const BID_RESPONSE_VIDEO_OUTSTREAM = {
   }
 };
 
+const NATIVE_REQUEST = [{
+  adUnitCode: 'native_300x250',
+  code: '/19968336/prebid_native_example_1',
+  bidId: '12345',
+  sizes: [
+    [300, 250]
+  ],
+  mediaTypes: {
+    native: {
+      sendTargetingKeys: false,
+      title: {
+        required: true,
+        len: 140
+      },
+      image: {
+        required: true,
+        sizes: [300, 250]
+      },
+      icon: {
+        required: false,
+        sizes: [50, 50]
+      },
+      sponsoredBy: {
+        required: true
+      },
+      body: {
+        required: true
+      },
+      clickUrl: {
+        required: false
+      },
+      privacyLink: {
+        required: false
+      },
+      cta: {
+        required: false
+      },
+      rating: {
+        required: false
+      },
+      likes: {
+        required: false
+      },
+      downloads: {
+        required: false
+      },
+      price: {
+        required: false
+      },
+      salePrice: {
+        required: false
+      },
+      phone: {
+        required: false
+      },
+      address: {
+        required: false
+      },
+      desc2: {
+        required: false
+      },
+      displayUrl: {
+        required: false
+      }
+    }
+  },
+  bidder: 'smilewanted',
+  params: {
+    zoneId: 4,
+  },
+  requestId: 'request_abcd1234',
+  ortb2Imp: {
+    ext: {
+      tid: 'trans_abcd1234',
+    }
+  },
+}];
+
+const BID_RESPONSE_NATIVE = {
+  body: {
+    cpm: 3,
+    width: 300,
+    height: 250,
+    creativeId: 'crea_sw_1',
+    currency: 'EUR',
+    isNetCpm: true,
+    ttl: 300,
+    ad: '{"link":{"url":"https://www.smilewanted.com"},"assets":[{"id":0,"required":1,"title":{"len":50}},{"id":1,"required":1,"img":{"type":3,"w":150,"h":50,"ext":{"aspectratios":["2:1"]}}},{"id":2,"required":0,"img":{"type":1,"w":50,"h":50,"ext":{"aspectratios":["2:1"]}}},{"id":3,"required":1,"data":{"type":1,"value":"Smilewanted sponsor"}},{"id":4,"required":1,"data":{"type":2,"value":"Smilewanted Description"}}]}',
+    cSyncUrl: 'https://csync.smilewanted.com',
+    formatTypeSw: 'native'
+  }
+};
+
 // Default params with optional ones
 describe('smilewantedBidAdapterTests', function () {
   it('SmileWanted - Verify build request', function () {
@@ -195,6 +348,23 @@ describe('smilewantedBidAdapterTests', function () {
     expect(requestVideoInstreamContent.sizes[0]).to.have.property('w').and.to.equal(640);
     expect(requestVideoInstreamContent.sizes[0]).to.have.property('h').and.to.equal(480);
     expect(requestVideoInstreamContent).to.have.property('transactionId').and.to.not.equal(null).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent).to.have.property('videoParams');
+    expect(requestVideoInstreamContent.videoParams).to.have.property('context').and.to.equal('instream').and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('mimes').to.be.an('array').that.include('video/mp4').and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('minduration').and.to.equal(0).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('maxduration').and.to.equal(120).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('protocols').to.be.an('array').that.include.members([1, 2, 3, 4, 5, 6, 7, 8]).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('startdelay').and.to.equal(0).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('placement').and.to.equal(1).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('skip').and.to.equal(1).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('skipafter').and.to.equal(10).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('minbitrate').and.to.equal(10).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('maxbitrate').and.to.equal(10).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('delivery').to.be.an('array').that.include(1).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('playbackmethod').to.be.an('array').that.include(2).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('api').to.be.an('array').that.include.members([1, 2]).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('linearity').and.to.equal(1).and.to.not.be.undefined;
+    expect(requestVideoInstreamContent.videoParams).to.have.property('playerSize').to.be.an('array').that.include.members([640, 480]).and.to.not.be.undefined;
 
     const requestVideoOutstream = spec.buildRequests(VIDEO_OUTSTREAM_REQUEST);
     expect(requestVideoOutstream[0]).to.have.property('url').and.to.equal('https://prebid.smilewanted.com');
@@ -206,6 +376,39 @@ describe('smilewantedBidAdapterTests', function () {
     expect(requestVideoOutstreamContent.sizes[0]).to.have.property('w').and.to.equal(640);
     expect(requestVideoOutstreamContent.sizes[0]).to.have.property('h').and.to.equal(480);
     expect(requestVideoOutstreamContent).to.have.property('transactionId').and.to.not.equal(null).and.to.not.be.undefined;
+
+    const requestNative = spec.buildRequests(NATIVE_REQUEST);
+    expect(requestNative[0]).to.have.property('url').and.to.equal('https://prebid.smilewanted.com');
+    expect(requestNative[0]).to.have.property('method').and.to.equal('POST');
+    const requestNativeContent = JSON.parse(requestNative[0].data);
+    expect(requestNativeContent).to.have.property('zoneId').and.to.equal(4);
+    expect(requestNativeContent).to.have.property('currencyCode').and.to.equal('EUR');
+    expect(requestNativeContent).to.have.property('sizes');
+    expect(requestNativeContent.sizes[0]).to.have.property('w').and.to.equal(300);
+    expect(requestNativeContent.sizes[0]).to.have.property('h').and.to.equal(250);
+    expect(requestNativeContent).to.have.property('transactionId').and.to.not.equal(null).and.to.not.be.undefined;
+    expect(requestNativeContent).to.have.property('context').and.to.equal('native').and.to.not.be.undefined;
+    expect(requestNativeContent).to.have.property('nativeParams');
+    expect(requestNativeContent.nativeParams.title).to.have.property('required').and.to.equal(true);
+    expect(requestNativeContent.nativeParams.title).to.have.property('len').and.to.equal(140);
+    expect(requestNativeContent.nativeParams.image).to.have.property('required').and.to.equal(true);
+    expect(requestNativeContent.nativeParams.image).to.have.property('sizes').to.be.an('array').that.include.members([300, 250]).and.to.not.be.undefined;
+    expect(requestNativeContent.nativeParams.icon).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.icon).to.have.property('sizes').to.be.an('array').that.include.members([50, 50]).and.to.not.be.undefined;
+    expect(requestNativeContent.nativeParams.sponsoredBy).to.have.property('required').and.to.equal(true);
+    expect(requestNativeContent.nativeParams.body).to.have.property('required').and.to.equal(true);
+    expect(requestNativeContent.nativeParams.clickUrl).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.privacyLink).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.cta).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.rating).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.likes).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.downloads).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.price).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.salePrice).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.phone).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.address).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.desc2).to.have.property('required').and.to.equal(false);
+    expect(requestNativeContent.nativeParams.displayUrl).to.have.property('required').and.to.equal(false);
   });
 
   it('SmileWanted - Verify build request with referrer', function () {
@@ -337,7 +540,7 @@ describe('smilewantedBidAdapterTests', function () {
     }).to.not.throw();
   });
 
-  it('SmileWanted - Verify parse response - Video Oustream', function () {
+  it('SmileWanted - Verify parse response - Video Outstream', function () {
     const request = spec.buildRequests(VIDEO_OUTSTREAM_REQUEST);
     const bids = spec.interpretResponse(BID_RESPONSE_VIDEO_OUTSTREAM, request[0]);
     expect(bids).to.have.lengthOf(1);
@@ -360,6 +563,28 @@ describe('smilewantedBidAdapterTests', function () {
     }).to.not.throw();
   });
 
+  it('SmileWanted - Verify parse response - Native', function () {
+    const request = spec.buildRequests(NATIVE_REQUEST);
+    const bids = spec.interpretResponse(BID_RESPONSE_NATIVE, request[0]);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.cpm).to.equal(3);
+    expect(bid.ad).to.equal('{"link":{"url":"https://www.smilewanted.com"},"assets":[{"id":0,"required":1,"title":{"len":50}},{"id":1,"required":1,"img":{"type":3,"w":150,"h":50,"ext":{"aspectratios":["2:1"]}}},{"id":2,"required":0,"img":{"type":1,"w":50,"h":50,"ext":{"aspectratios":["2:1"]}}},{"id":3,"required":1,"data":{"type":1,"value":"Smilewanted sponsor"}},{"id":4,"required":1,"data":{"type":2,"value":"Smilewanted Description"}}]}');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('crea_sw_1');
+    expect(bid.currency).to.equal('EUR');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.ttl).to.equal(300);
+    expect(bid.requestId).to.equal(NATIVE_REQUEST[0].bidId);
+
+    expect(function () {
+      spec.interpretResponse(BID_RESPONSE_NATIVE, {
+        data: 'invalid Json'
+      })
+    }).to.not.throw();
+  });
+
   it('SmileWanted - Verify bidder code', function () {
     expect(spec.code).to.equal('smilewanted');
   });
@@ -398,8 +623,21 @@ describe('smilewantedBidAdapterTests', function () {
     expect(requestContent).to.have.property('positionType').and.to.equal('infeed');
   });
 
+  it('SmileWanted - Verify if schain is well passed', function () {
+    const request = spec.buildRequests(DISPLAY_REQUEST_WITH_SCHAIN, {});
+    const requestContent = JSON.parse(request[0].data);
+    expect(requestContent).to.have.property('schain').and.to.equal('1.0,1!exchange1.com,1234,1,bid-request-1,publisher,publisher.com,!exchange2.com,abcd,1,bid-request-2,intermediary,intermediary.com,');
+  });
+
+  it('SmileWanted - Verify user sync - empty data', function () {
+    let syncs = spec.getUserSyncs({iframeEnabled: true}, {}, {}, null);
+    expect(syncs).to.have.lengthOf(1);
+    expect(syncs[0].type).to.equal('iframe');
+    expect(syncs[0].url).to.equal('https://csync.smilewanted.com');
+  });
+
   it('SmileWanted - Verify user sync', function () {
-    var syncs = spec.getUserSyncs({iframeEnabled: true}, {}, {
+    let syncs = spec.getUserSyncs({iframeEnabled: true}, {}, {
       consentString: 'foo'
     }, '1NYN');
     expect(syncs).to.have.lengthOf(1);
diff --git a/test/spec/modules/smootBidAdapter_spec.js b/test/spec/modules/smootBidAdapter_spec.js
new file mode 100644
index 00000000000..cf72b41b348
--- /dev/null
+++ b/test/spec/modules/smootBidAdapter_spec.js
@@ -0,0 +1,595 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/smootBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'smoot';
+
+describe('SmootBidAdapter', function () {
+  const userIdAsEids = [
+    {
+      source: 'test.org',
+      uids: [
+        {
+          id: '01**********',
+          atype: 1,
+          ext: {
+            third: '01***********',
+          },
+        },
+      ],
+    },
+  ];
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]],
+        },
+      },
+      params: {
+        placementId: 'testBanner',
+      },
+      userIdAsEids,
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60,
+        },
+      },
+      params: {
+        placementId: 'testVideo',
+      },
+      userIdAsEids,
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true,
+            },
+            body: {
+              required: true,
+            },
+            icon: {
+              required: true,
+              size: [64, 64],
+            },
+          },
+        },
+      },
+      params: {
+        placementId: 'testNative',
+      },
+      userIdAsEids,
+    },
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]],
+      },
+    },
+    params: {},
+  };
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: {
+      consentString:
+        'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {},
+    },
+    refererInfo: {
+      referer: 'https://test.com',
+    },
+    timeout: 500,
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys(
+        'deviceWidth',
+        'deviceHeight',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('object');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf([
+          'testBanner',
+          'testVideo',
+          'testNative',
+        ]);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]],
+            },
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids,
+        },
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf([
+          'testBanner',
+          'testVideo',
+          'testNative',
+        ]);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(
+        bidderRequest.gdprConsent.consentString
+      );
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8],
+      };
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    });
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [
+          {
+            mediaType: 'banner',
+            width: 300,
+            height: 250,
+            cpm: 0.4,
+            ad: 'Test',
+            requestId: '23fhj33i987f',
+            ttl: 120,
+            creativeId: '2',
+            netRevenue: true,
+            currency: 'USD',
+            dealId: '1',
+            meta: {
+              advertiserDomains: ['google.com'],
+              advertiserId: 1234,
+            },
+          },
+        ],
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys(
+        'requestId',
+        'cpm',
+        'width',
+        'height',
+        'ad',
+        'ttl',
+        'creativeId',
+        'netRevenue',
+        'currency',
+        'dealId',
+        'mediaType',
+        'meta'
+      );
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta)
+        .to.be.an('object')
+        .that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [
+          {
+            vastUrl: 'test.com',
+            mediaType: 'video',
+            cpm: 0.5,
+            requestId: '23fhj33i987f',
+            ttl: 120,
+            creativeId: '2',
+            netRevenue: true,
+            currency: 'USD',
+            dealId: '1',
+            meta: {
+              advertiserDomains: ['google.com'],
+              advertiserId: 1234,
+            },
+          },
+        ],
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys(
+        'requestId',
+        'cpm',
+        'vastUrl',
+        'ttl',
+        'creativeId',
+        'netRevenue',
+        'currency',
+        'dealId',
+        'mediaType',
+        'meta'
+      );
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta)
+        .to.be.an('object')
+        .that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [
+          {
+            mediaType: 'native',
+            native: {
+              clickUrl: 'test.com',
+              title: 'Test',
+              image: 'test.com',
+              impressionTrackers: ['test.com'],
+            },
+            ttl: 120,
+            cpm: 0.4,
+            requestId: '23fhj33i987f',
+            creativeId: '2',
+            netRevenue: true,
+            currency: 'USD',
+            meta: {
+              advertiserDomains: ['google.com'],
+              advertiserId: 1234,
+            },
+          },
+        ],
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys(
+        'requestId',
+        'cpm',
+        'ttl',
+        'creativeId',
+        'netRevenue',
+        'currency',
+        'mediaType',
+        'native',
+        'meta'
+      );
+      expect(dataItem.native).to.have.keys(
+        'clickUrl',
+        'impressionTrackers',
+        'title',
+        'image'
+      );
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not
+        .empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta)
+        .to.be.an('object')
+        .that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [
+          {
+            width: 300,
+            cpm: 0.4,
+            ad: 'Test',
+            requestId: '23fhj33i987f',
+            ttl: 120,
+            creativeId: '2',
+            netRevenue: true,
+            currency: 'USD',
+            dealId: '1',
+          },
+        ],
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [
+          {
+            mediaType: 'video',
+            cpm: 0.5,
+            requestId: '23fhj33i987f',
+            ttl: 120,
+            creativeId: '2',
+            netRevenue: true,
+            currency: 'USD',
+            dealId: '1',
+          },
+        ],
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [
+          {
+            mediaType: 'native',
+            clickUrl: 'test.com',
+            title: 'Test',
+            impressionTrackers: ['test.com'],
+            ttl: 120,
+            requestId: '23fhj33i987f',
+            creativeId: '2',
+            netRevenue: true,
+            currency: 'USD',
+          },
+        ],
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [
+          {
+            ttl: 120,
+            creativeId: '2',
+            netRevenue: true,
+            currency: 'USD',
+            dealId: '1',
+          },
+        ],
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('Should return array of objects with proper sync config , include GDPR', function () {
+      const syncData = spec.getUserSyncs(
+        {},
+        {},
+        {
+          consentString: 'ALL',
+          gdprApplies: true,
+        },
+        {}
+      );
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object');
+      expect(syncData[0].type).to.be.a('string');
+      expect(syncData[0].type).to.equal('image');
+      expect(syncData[0].url).to.be.a('string');
+      expect(syncData[0].url).to.equal(
+        'https://usync.smxconv.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0'
+      );
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function () {
+      const syncData = spec.getUserSyncs(
+        {},
+        {},
+        {},
+        {
+          consentString: '1---',
+        }
+      );
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object');
+      expect(syncData[0].type).to.be.a('string');
+      expect(syncData[0].type).to.equal('image');
+      expect(syncData[0].url).to.be.a('string');
+      expect(syncData[0].url).to.equal(
+        'https://usync.smxconv.com/image?pbjs=1&ccpa_consent=1---&coppa=0'
+      );
+    });
+    it('Should return array of objects with proper sync config , include GPP', function () {
+      const syncData = spec.getUserSyncs(
+        {},
+        {},
+        {},
+        {},
+        {
+          gppString: 'abc123',
+          applicableSections: [8],
+        }
+      );
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object');
+      expect(syncData[0].type).to.be.a('string');
+      expect(syncData[0].type).to.equal('image');
+      expect(syncData[0].url).to.be.a('string');
+      expect(syncData[0].url).to.equal(
+        'https://usync.smxconv.com/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0'
+      );
+    });
+  });
+});
diff --git a/test/spec/modules/snigelBidAdapter_spec.js b/test/spec/modules/snigelBidAdapter_spec.js
index 7fe2387ca6c..69ab85ba825 100644
--- a/test/spec/modules/snigelBidAdapter_spec.js
+++ b/test/spec/modules/snigelBidAdapter_spec.js
@@ -2,6 +2,8 @@ import {expect} from 'chai';
 import {spec} from 'modules/snigelBidAdapter.js';
 import {config} from 'src/config.js';
 import {isValid} from 'src/adapters/bidderFactory.js';
+import {registerActivityControl} from 'src/activities/rules.js';
+import {ACTIVITY_ACCESS_DEVICE} from 'src/activities/activities.js';
 
 const BASE_BID_REQUEST = {
   adUnitCode: 'top_leaderboard',
@@ -23,6 +25,7 @@ const BASE_BIDDER_REQUEST = {
   auctionId: 'test',
   bidderRequestId: 'test',
   refererInfo: {
+    page: 'https://localhost',
     canonicalUrl: 'https://localhost',
   },
 };
@@ -178,6 +181,50 @@ describe('snigelBidAdapter', function () {
       expect(data.placements[2].refresh.count).to.equal(1);
       expect(data.placements[2].refresh.time).to.be.greaterThanOrEqual(0);
     });
+
+    it('should increment auction counter upon every request', function () {
+      const bidderRequest = makeBidderRequest({});
+
+      let request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      let data = JSON.parse(request.data);
+      const previousCounter = data.counter;
+
+      request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      data = JSON.parse(request.data);
+      expect(data.counter).to.equal(previousCounter + 1);
+    });
+
+    it('should increment placement counter for each placement', function () {
+      const bidderRequest = Object.assign({}, BASE_BIDDER_REQUEST);
+      const topLeaderboard = makeBidRequest({adUnitCode: 'top_leaderboard', params: {placement: 'ros'}});
+      const bottomLeaderboard = makeBidRequest({adUnitCode: 'bottom_leaderboard', params: {placement: 'ros'}});
+      const sidebar = makeBidRequest({adUnitCode: 'sidebar', params: {placement: 'other'}});
+
+      let request = spec.buildRequests([topLeaderboard, bottomLeaderboard, sidebar], bidderRequest);
+      expect(request).to.have.property('data');
+      let data = JSON.parse(request.data);
+      const previousCounters = {};
+      data.placements.forEach((placement) => {
+        previousCounters[placement.name] = Math.max(previousCounters[placement.name] || 0, placement.counter);
+      });
+
+      request = spec.buildRequests([topLeaderboard, bottomLeaderboard, sidebar], bidderRequest);
+      expect(request).to.have.property('data');
+      data = JSON.parse(request.data);
+      expect(data).to.have.property('placements');
+      expect(data.placements.length).to.equal(3);
+      expect(data.placements[0].id).to.equal('top_leaderboard');
+      expect(previousCounters).to.have.property(data.placements[0].name);
+      expect(data.placements[0].counter).to.equal(previousCounters[data.placements[0].name] + 1);
+      expect(data.placements[1].id).to.equal('bottom_leaderboard');
+      expect(previousCounters).to.have.property(data.placements[1].name);
+      expect(data.placements[1].counter).to.equal(previousCounters[data.placements[1].name] + 2);
+      expect(data.placements[2].id).to.equal('sidebar');
+      expect(previousCounters).to.have.property(data.placements[2].name);
+      expect(data.placements[2].counter).to.equal(previousCounters[data.placements[2].name] + 1);
+    });
   });
 
   describe('interpretResponse', function () {
@@ -343,5 +390,56 @@ describe('snigelBidAdapter', function () {
       expect(sync).to.have.property('url');
       expect(sync.url).to.equal(`https://somesyncurl?gdpr=1&gdpr_consent=${DUMMY_GDPR_CONSENT_STRING}`);
     });
+
+    it('should omit session ID if no device access', function () {
+      const bidderRequest = makeBidderRequest();
+      const unregisterRule = registerActivityControl(ACTIVITY_ACCESS_DEVICE, 'denyAccess', () => {
+        return {allow: false, reason: 'no consent'};
+      });
+
+      try {
+        const request = spec.buildRequests([], bidderRequest);
+        expect(request).to.have.property('data');
+        const data = JSON.parse(request.data);
+        expect(data.sessionId).to.be.undefined;
+      } finally {
+        unregisterRule();
+      }
+    });
+
+    it('should determine full GDPR consent correctly', function () {
+      const baseBidderRequest = makeBidderRequest({
+        gdprConsent: {
+          gdprApplies: true,
+          vendorData: {
+            purpose: {
+              consents: {1: true, 2: true, 3: true, 4: true, 5: true},
+            },
+            vendor: {
+              consents: {[spec.gvlid]: true},
+            },
+          },
+        },
+      });
+      let request = spec.buildRequests([], baseBidderRequest);
+      expect(request).to.have.property('data');
+      let data = JSON.parse(request.data);
+      expect(data.gdprConsent).to.be.true;
+
+      let bidderRequest = {...baseBidderRequest, ...{gdprConsent: {vendorData: {purpose: {consents: {1: false}}}}}};
+      request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      data = JSON.parse(request.data);
+      expect(data.gdprConsent).to.be.false;
+
+      bidderRequest = {
+        ...baseBidderRequest,
+        ...{gdprConsent: {vendorData: {vendor: {consents: {[spec.gvlid]: false}}}}},
+      };
+      request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      data = JSON.parse(request.data);
+      expect(data.gdprConsent).to.be.false;
+    });
   });
 });
diff --git a/test/spec/modules/sonobiAnalyticsAdapter_spec.js b/test/spec/modules/sonobiAnalyticsAdapter_spec.js
deleted file mode 100644
index 76ff88836d4..00000000000
--- a/test/spec/modules/sonobiAnalyticsAdapter_spec.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import sonobiAnalytics from 'modules/sonobiAnalyticsAdapter.js';
-import {expect} from 'chai';
-import {server} from 'test/mocks/xhr.js';
-let events = require('src/events');
-let adapterManager = require('src/adapterManager').default;
-let constants = require('src/constants.json');
-
-describe('Sonobi Prebid Analytic', function () {
-  var clock;
-
-  describe('enableAnalytics', function () {
-    beforeEach(function () {
-      sinon.stub(events, 'getEvents').returns([]);
-      clock = sinon.useFakeTimers(Date.now());
-    });
-
-    afterEach(function () {
-      events.getEvents.restore();
-      clock.restore();
-    });
-
-    after(function () {
-      sonobiAnalytics.disableAnalytics();
-    });
-
-    it('should catch all events', function (done) {
-      const initOptions = {
-        pubId: 'A3B254F',
-        siteId: '1234',
-        delay: 100
-      };
-
-      sonobiAnalytics.enableAnalytics(initOptions)
-
-      const bid = {
-        bidderCode: 'sonobi_test_bid',
-        width: 300,
-        height: 250,
-        statusMessage: 'Bid available',
-        adId: '1234',
-        auctionId: '13',
-        responseTimestamp: 1496410856397,
-        requestTimestamp: 1496410856295,
-        cpm: 1.13,
-        bidder: 'sonobi',
-        adUnitCode: 'dom-sample-id',
-        timeToRespond: 100,
-        placementCode: 'placementtest'
-      };
-
-      // Step 1: Initialize adapter
-      adapterManager.enableAnalytics({
-        provider: 'sonobi',
-        options: initOptions
-      });
-
-      // Step 2: Send init auction event
-      events.emit(constants.EVENTS.AUCTION_INIT, {config: initOptions, auctionId: '13', timestamp: Date.now()});
-
-      expect(sonobiAnalytics.initOptions).to.have.property('pubId', 'A3B254F');
-      expect(sonobiAnalytics.initOptions).to.have.property('siteId', '1234');
-      expect(sonobiAnalytics.initOptions).to.have.property('delay', 100);
-      // Step 3: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, { bids: [bid], auctionId: '13' });
-
-      // Step 4: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bid);
-
-      // Step 5: Send bid won event
-      events.emit(constants.EVENTS.BID_WON, bid);
-
-      // Step 6: Send bid timeout event
-      events.emit(constants.EVENTS.BID_TIMEOUT, {auctionId: '13'});
-
-      // Step 7: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {auctionId: '13', bidsReceived: [bid]});
-
-      clock.tick(5000);
-      expect(server.requests).to.have.length(1);
-      expect(JSON.parse(server.requests[0].requestBody)).to.have.length(3)
-      done();
-    });
-  });
-});
diff --git a/test/spec/modules/sonobiBidAdapter_spec.js b/test/spec/modules/sonobiBidAdapter_spec.js
index 164aa06d9b7..75da1983f0c 100644
--- a/test/spec/modules/sonobiBidAdapter_spec.js
+++ b/test/spec/modules/sonobiBidAdapter_spec.js
@@ -1,8 +1,8 @@
-import {expect} from 'chai';
-import {_getPlatform, spec} from 'modules/sonobiBidAdapter.js';
-import {newBidder} from 'src/adapters/bidderFactory.js';
-import {userSync} from '../../../src/userSync.js';
-import {config} from 'src/config.js';
+import { expect } from 'chai';
+import { _getPlatform, spec } from 'modules/sonobiBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { userSync } from '../../../src/userSync.js';
+import { config } from 'src/config.js';
 import * as gptUtils from '../../../libraries/gptUtils/gptUtils.js';
 
 describe('SonobiBidAdapter', function () {
@@ -302,6 +302,29 @@ describe('SonobiBidAdapter', function () {
         }
       }
     },
+    {
+
+      'bidder': 'sonobi',
+      'params': {
+        'keywords': 'sports,news,some_other_keyword',
+        'placement_id': '1a2b3c4d5e6f1a2b3c4d',
+        'sizes': [[300, 250], [300, 600]],
+        'floor': '1.25',
+      },
+      'adUnitCode': 'adunit-code-42',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1g',
+      ortb2Imp: {
+        ext: {
+          gpid: '/123123/gpt_publisher/adunit-code-42'
+        }
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        }
+      }
+    },
     {
       'bidder': 'sonobi',
       'params': {
@@ -343,6 +366,7 @@ describe('SonobiBidAdapter', function () {
 
     let keyMakerData = {
       '30b31c1838de1f': '1a2b3c4d5e6f1a2b3c4d|640x480|f=1.25,gpid=/123123/gpt_publisher/adunit-code-1,c=v,pm=1:2:3,p=2,pl=3,',
+      '30b31c1838de1g': '1a2b3c4d5e6f1a2b3c4d|300x250,300x600|f=1.25,gpid=/123123/gpt_publisher/adunit-code-42,c=d,',
       '30b31c1838de1d': '1a2b3c4d5e6f1a2b3c4e|300x250,300x600|f=0.42,gpid=/123123/gpt_publisher/adunit-code-3,c=d,',
       '/7780971/sparks_prebid_LB|30b31c1838de1e': '300x250,300x600|gpid=/7780971/sparks_prebid_LB,c=d,',
     };
@@ -359,7 +383,9 @@ describe('SonobiBidAdapter', function () {
         'page': 'https://example.com',
         'stack': ['https://example.com']
       },
-      uspConsent: 'someCCPAString'
+      uspConsent: 'someCCPAString',
+      ortb2: {}
+
     };
 
     it('should set fpd if there is any data in ortb2', function () {
@@ -493,6 +519,12 @@ describe('SonobiBidAdapter', function () {
       expect(bidRequests.data.hfa).to.equal('hfakey')
     })
 
+    it('should return a properly formatted request with experianRtidData and exexperianRtidKeypKey omitted from fpd', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
+      expect(bidRequests.data.fpd.indexOf('experianRtidData')).to.equal(-1);
+      expect(bidRequests.data.fpd.indexOf('exexperianRtidKeypKey')).to.equal(-1);
+    });
+
     it('should return null if there is nothing to bid on', function () {
       const bidRequests = spec.buildRequests([{ params: {} }], bidderRequests)
       expect(bidRequests).to.equal(null);
diff --git a/test/spec/modules/sovrnAnalyticsAdapter_spec.js b/test/spec/modules/sovrnAnalyticsAdapter_spec.js
deleted file mode 100644
index 68552eb3d8a..00000000000
--- a/test/spec/modules/sovrnAnalyticsAdapter_spec.js
+++ /dev/null
@@ -1,530 +0,0 @@
-import sovrnAnalyticsAdapter from '../../../modules/sovrnAnalyticsAdapter.js';
-import {expect} from 'chai';
-import {config} from 'src/config.js';
-import adaptermanager from 'src/adapterManager.js';
-import {server} from 'test/mocks/xhr.js';
-import {expectEvents, fireEvents} from '../../helpers/analytics.js';
-
-var assert = require('assert');
-
-let events = require('src/events');
-let constants = require('src/constants.json');
-
-/**
- * Emit analytics events
- * @param {array} eventArr - array of objects to define the events that will fire
- *    @param {object} eventObj - key is eventType, value is event
- * @param {string} auctionId - the auction id to attached to the events
- */
-function emitEvent(eventType, event, auctionId) {
-  event.auctionId = auctionId;
-  events.emit(constants.EVENTS[eventType], event);
-}
-
-let auctionStartTimestamp = Date.now();
-let timeout = 3000;
-let auctionInit = {
-  timestamp: auctionStartTimestamp,
-  timeout: timeout
-};
-let bidderCode = 'sovrn';
-let bidderRequestId = '123bri';
-let adUnitCode = 'div';
-let adUnitCode2 = 'div2';
-let bidId = 'bidid';
-let bidId2 = 'bidid2';
-let tId = '7aafa3ee-a80a-46d7-a4a0-cbcba463d97a';
-let tId2 = '99dca3ee-a80a-46d7-a4a0-cbcba463d97e';
-let bidRequested = {
-  auctionStart: auctionStartTimestamp,
-  bidderCode: bidderCode,
-  bidderRequestId: bidderRequestId,
-  bids: [
-    {
-      adUnitCode: adUnitCode,
-      bidId: bidId,
-      bidder: bidderCode,
-      bidderRequestId: '10340af0c7dc72',
-      sizes: [[300, 250]],
-      startTime: auctionStartTimestamp + 100,
-      transactionId: tId
-    },
-    {
-      adUnitCode: adUnitCode2,
-      bidId: bidId2,
-      bidder: bidderCode,
-      bidderRequestId: '10340af0c7dc72',
-      sizes: [[300, 250]],
-      startTime: auctionStartTimestamp + 100,
-      transactionId: tId2
-    }
-  ],
-  doneCbCallCount: 1,
-  start: auctionStartTimestamp,
-  timeout: timeout
-};
-let bidResponse = {
-  bidderCode: bidderCode,
-  width: 300,
-  height: 250,
-  statusMessage: 'Bid available',
-  adId: '3870e27a5752fb',
-  mediaType: 'banner',
-  source: 'client',
-  requestId: bidId,
-  cpm: 0.8584999918937682,
-  creativeId: 'cridprebidrtb',
-  dealId: null,
-  currency: 'USD',
-  netRevenue: true,
-  ad: '
divvy mcdiv
',
-  ttl: 60000,
-  responseTimestamp: auctionStartTimestamp + 150,
-  requestTimestamp: auctionStartTimestamp + 100,
-  bidder: bidderCode,
-  adUnitCode: adUnitCode,
-  timeToRespond: 50,
-  pbLg: '0.50',
-  pbMg: '0.80',
-  pbHg: '0.85',
-  pbAg: '0.85',
-  pbDg: '0.85',
-  pbCg: '',
-  size: '300x250',
-  adserverTargeting: {
-    hb_bidder: bidderCode,
-    hb_adid: '3870e27a5752fb',
-    hb_pb: '0.85'
-  },
-  status: 'rendered'
-};
-
-let bidResponse2 = {
-  bidderCode: bidderCode,
-  width: 300,
-  height: 250,
-  statusMessage: 'Bid available',
-  adId: '9999e27a5752fb',
-  mediaType: 'banner',
-  source: 'client',
-  requestId: bidId2,
-  cpm: 0.12,
-  creativeId: 'cridprebidrtb',
-  dealId: null,
-  currency: 'USD',
-  netRevenue: true,
-  ad: '
divvy mcdiv
',
-  ttl: 60000,
-  responseTimestamp: auctionStartTimestamp + 150,
-  requestTimestamp: auctionStartTimestamp + 100,
-  bidder: bidderCode,
-  adUnitCode: adUnitCode2,
-  timeToRespond: 50,
-  pbLg: '0.10',
-  pbMg: '0.10',
-  pbHg: '0.10',
-  pbAg: '0.10',
-  pbDg: '0.10',
-  pbCg: '',
-  size: '300x250',
-  adserverTargeting: {
-    hb_bidder: bidderCode,
-    hb_adid: '9999e27a5752fb',
-    hb_pb: '0.10'
-  },
-  status: 'rendered'
-};
-let bidAdjustment = {};
-for (var k in bidResponse) bidAdjustment[k] = bidResponse[k];
-bidAdjustment.cpm = 0.8;
-let bidAdjustmentNoMatchingRequest = {
-  bidderCode: 'not-sovrn',
-  width: 300,
-  height: 250,
-  statusMessage: 'Bid available',
-  adId: '1',
-  mediaType: 'banner',
-  source: 'client',
-  requestId: '1',
-  cpm: 0.10,
-  creativeId: '',
-  dealId: null,
-  currency: 'USD',
-  netRevenue: true,
-  ad: '
divvy mcdiv
',
-  ttl: 60000,
-  responseTimestamp: auctionStartTimestamp + 150,
-  requestTimestamp: auctionStartTimestamp + 100,
-  bidder: 'not-sovrn',
-  adUnitCode: '',
-  timeToRespond: 50,
-  pbLg: '0.00',
-  pbMg: '0.10',
-  pbHg: '0.10',
-  pbAg: '0.10',
-  pbDg: '0.10',
-  pbCg: '',
-  size: '300x250',
-  adserverTargeting: {
-    hb_bidder: 'not-sovrn',
-    hb_adid: '1',
-    hb_pb: '0.10'
-  },
-};
-let bidResponseNoMatchingRequest = bidAdjustmentNoMatchingRequest;
-
-describe('Sovrn Analytics Adapter', function () {
-  beforeEach(() => {
-    sinon.stub(events, 'getEvents').returns([]);
-  });
-  afterEach(() => {
-    events.getEvents.restore();
-  });
-
-  describe('enableAnalytics ', function () {
-    beforeEach(() => {
-      sinon.spy(sovrnAnalyticsAdapter, 'track');
-    });
-    afterEach(() => {
-      sovrnAnalyticsAdapter.disableAnalytics();
-      sovrnAnalyticsAdapter.track.restore();
-    });
-
-    it('should catch all events if affiliate id present', function () {
-      adaptermanager.enableAnalytics({
-        provider: 'sovrn',
-        options: {
-          sovrnId: 123
-        }
-      });
-      expectEvents().to.beTrackedBy(sovrnAnalyticsAdapter.track);
-    });
-
-    it('should catch no events if no affiliate id', function () {
-      adaptermanager.enableAnalytics({
-        provider: 'sovrn',
-        options: {
-        }
-      });
-      fireEvents();
-      sinon.assert.callCount(sovrnAnalyticsAdapter.track, 0);
-    });
-  });
-
-  describe('sovrnAnalyticsAdapter ', function() {
-    beforeEach(() => {
-      sovrnAnalyticsAdapter.enableAnalytics({
-        provider: 'sovrn',
-        options: {
-          sovrnId: 123
-        }
-      });
-      sinon.spy(sovrnAnalyticsAdapter, 'track');
-    });
-    afterEach(() => {
-      sovrnAnalyticsAdapter.disableAnalytics();
-      sovrnAnalyticsAdapter.track.restore();
-    });
-    it('should have correct type', function () {
-      assert.equal(sovrnAnalyticsAdapter.getAdapterType(), 'endpoint')
-    })
-  });
-
-  describe('auction data collector ', function() {
-    beforeEach(() => {
-      sovrnAnalyticsAdapter.enableAnalytics({
-        provider: 'sovrn',
-        options: {
-          sovrnId: 123
-        }
-      });
-      sinon.spy(sovrnAnalyticsAdapter, 'track');
-    });
-    afterEach(() => {
-      sovrnAnalyticsAdapter.disableAnalytics();
-      sovrnAnalyticsAdapter.track.restore();
-    });
-    it('should create auctiondata record from init ', function () {
-      let auctionId = '123.123.123.123';
-      emitEvent('AUCTION_INIT', auctionInit, auctionId);
-
-      let auctionData = sovrnAnalyticsAdapter.getAuctions();
-      let currentAuction = auctionData[auctionId];
-      assert(currentAuction);
-      let expectedTimeOutData = {
-        buffer: config.getConfig('timeoutBuffer'),
-        bidder: config.getConfig('bidderTimeout'),
-      };
-      expect(currentAuction.auction.timeouts).to.deep.equal(expectedTimeOutData);
-      assert.equal(currentAuction.auction.payload, 'auction');
-      assert.equal(currentAuction.auction.priceGranularity, config.getConfig('priceGranularity'))
-      assert.equal(currentAuction.auction.auctionId, auctionId);
-      assert.equal(currentAuction.auction.sovrnId, 123);
-    });
-    it('should create a bidrequest object ', function() {
-      let auctionId = '234.234.234.234';
-      emitEvent('AUCTION_INIT', auctionInit, auctionId);
-      emitEvent('BID_REQUESTED', bidRequested, auctionId);
-
-      let auctionData = sovrnAnalyticsAdapter.getAuctions();
-      let currentAuction = auctionData[auctionId];
-      assert(currentAuction);
-      let requests = currentAuction.auction.requests;
-      assert(requests);
-      assert.equal(requests.length, 1);
-      assert.equal(requests[0].bidderCode, bidderCode);
-      assert.equal(requests[0].bidderRequestId, bidderRequestId);
-      assert.equal(requests[0].timeout, timeout);
-      let bids = requests[0].bids;
-      assert(bids);
-      assert.equal(bids.length, 2);
-      assert.equal(bids[0].bidId, bidId);
-      assert.equal(bids[0].bidder, bidderCode);
-      assert.equal(bids[0].transactionId, tId);
-      assert.equal(bids[0].sizes.length, 1);
-      assert.equal(bids[0].sizes[0][0], 300);
-      assert.equal(bids[0].sizes[0][1], 250);
-      expect(requests[0]).to.not.have.property('doneCbCallCount');
-      expect(requests[0]).to.not.have.property('auctionId');
-    });
-    it('should add results to the bid with response ', function () {
-      let auctionId = '345.345.345.345';
-      emitEvent('AUCTION_INIT', auctionInit, auctionId);
-      emitEvent('BID_REQUESTED', bidRequested, auctionId);
-      emitEvent('BID_RESPONSE', bidResponse, auctionId);
-
-      let auctionData = sovrnAnalyticsAdapter.getAuctions();
-      let currentAuction = auctionData[auctionId];
-      let returnedBid = currentAuction.auction.requests[0].bids[0];
-      assert.equal(returnedBid.bidId, bidId);
-      assert.equal(returnedBid.bidder, bidderCode);
-      assert.equal(returnedBid.transactionId, tId);
-      assert.equal(returnedBid.sizes.length, 1);
-      assert.equal(returnedBid.sizes[0][0], 300);
-      assert.equal(returnedBid.sizes[0][1], 250);
-      assert.equal(returnedBid.adserverTargeting.hb_adid, '3870e27a5752fb');
-      assert.equal(returnedBid.adserverTargeting.hb_bidder, bidderCode);
-      assert.equal(returnedBid.adserverTargeting.hb_pb, '0.85');
-      assert.equal(returnedBid.cpm, 0.8584999918937682);
-    });
-    it('should add new unsynced bid if no request exists for response ', function () {
-      let auctionId = '456.456.456.456';
-      emitEvent('AUCTION_INIT', auctionInit, auctionId);
-      emitEvent('BID_REQUESTED', bidRequested, auctionId);
-      emitEvent('BID_RESPONSE', bidResponseNoMatchingRequest, auctionId);
-
-      let auctionData = sovrnAnalyticsAdapter.getAuctions();
-      let currentAuction = auctionData[auctionId];
-      let requests = currentAuction.auction.requests;
-      assert(requests);
-      assert.equal(requests.length, 1);
-      let bidRequest = requests[0].bids[0];
-      expect(bidRequest).to.not.have.property('adserverTargeting');
-      expect(bidRequest).to.not.have.property('cpm');
-      expect(currentAuction.auction.unsynced[0]).to.deep.equal(bidResponseNoMatchingRequest);
-    });
-    it('should adjust the bid ', function () {
-      let auctionId = '567.567.567.567';
-      emitEvent('AUCTION_INIT', auctionInit, auctionId);
-      emitEvent('BID_REQUESTED', bidRequested, auctionId);
-      emitEvent('BID_ADJUSTMENT', bidResponse, auctionId);
-      emitEvent('BID_RESPONSE', bidAdjustment, auctionId);
-
-      let auctionData = sovrnAnalyticsAdapter.getAuctions();
-      let currentAuction = auctionData[auctionId];
-      let returnedBid = currentAuction.auction.requests[0].bids[0];
-      assert.equal(returnedBid.cpm, 0.8);
-      assert.equal(returnedBid.originalValues.cpm, 0.8584999918937682);
-    });
-  });
-  describe('auction data send ', function() {
-    let expectedPostBody = {
-      sovrnId: 123,
-      auctionId: '678.678.678.678',
-      payload: 'auction',
-      priceGranularity: 'medium',
-    };
-    let expectedRequests = {
-      bidderCode: 'sovrn',
-      bidderRequestId: '123bri',
-      timeout: 3000
-    };
-    let expectedBids = {
-      adUnitCode: 'div',
-      bidId: 'bidid',
-      bidder: 'sovrn',
-      bidderRequestId: '10340af0c7dc72',
-      transactionId: '7aafa3ee-a80a-46d7-a4a0-cbcba463d97a',
-      width: 300,
-      height: 250,
-      statusMessage: 'Bid available',
-      adId: '3870e27a5752fb',
-      mediaType: 'banner',
-      source: 'client',
-      cpm: 0.8584999918937682,
-      creativeId: 'cridprebidrtb',
-      dealId: null,
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 60000,
-      timeToRespond: 50,
-      size: '300x250',
-      status: 'rendered',
-      isAuctionWinner: true
-    };
-    let SecondAdUnitExpectedBids = {
-      adUnitCode: 'div2',
-      bidId: 'bidid2',
-      bidder: 'sovrn',
-      bidderRequestId: '10340af0c7dc72',
-      transactionId: '99dca3ee-a80a-46d7-a4a0-cbcba463d97e',
-      width: 300,
-      height: 250,
-      statusMessage: 'Bid available',
-      adId: '9999e27a5752fb',
-      mediaType: 'banner',
-      source: 'client',
-      cpm: 0.12,
-      creativeId: 'cridprebidrtb',
-      dealId: null,
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 60000,
-      timeToRespond: 50,
-      size: '300x250',
-      status: 'rendered',
-      isAuctionWinner: true
-    };
-    let expectedAdServerTargeting = {
-      hb_bidder: 'sovrn',
-      hb_adid: '3870e27a5752fb',
-      hb_pb: '0.85'
-    };
-    beforeEach(() => {
-      sovrnAnalyticsAdapter.enableAnalytics({
-        provider: 'sovrn',
-        options: {
-          sovrnId: 123
-        }
-      });
-      sinon.spy(sovrnAnalyticsAdapter, 'track');
-    });
-    afterEach(() => {
-      sovrnAnalyticsAdapter.disableAnalytics();
-      sovrnAnalyticsAdapter.track.restore();
-    });
-    it('should send auction data ', function () {
-      let auctionId = '678.678.678.678';
-      emitEvent('AUCTION_INIT', auctionInit, auctionId);
-      emitEvent('BID_REQUESTED', bidRequested, auctionId);
-      emitEvent('BID_RESPONSE', bidResponse, auctionId);
-      emitEvent('BID_RESPONSE', bidResponse2, auctionId)
-      emitEvent('AUCTION_END', {}, auctionId);
-      let requestBody = JSON.parse(server.requests[0].requestBody);
-      let requestsFromRequestBody = requestBody.requests[0];
-      let bidsFromRequests = requestsFromRequestBody.bids[0];
-      expect(requestBody).to.deep.include(expectedPostBody);
-      expect(requestBody.timeouts).to.deep.equal({buffer: 400, bidder: 3000});
-      expect(requestsFromRequestBody).to.deep.include(expectedRequests);
-      expect(bidsFromRequests).to.deep.include(expectedBids);
-      let bidsFromRequests2 = requestsFromRequestBody.bids[1];
-      expect(bidsFromRequests2).to.deep.include(SecondAdUnitExpectedBids);
-      expect(bidsFromRequests.adserverTargeting).to.deep.include(expectedAdServerTargeting);
-    });
-  });
-  describe('bid won data send ', function() {
-    let auctionId = '789.789.789.789';
-    let creativeId = 'cridprebidrtb';
-    let requestId = 'requestId69';
-    let bidWonEvent = {
-      ad: 'html',
-      adId: 'adId',
-      adUnitCode: adUnitCode,
-      auctionId: auctionId,
-      bidder: bidderCode,
-      bidderCode: bidderCode,
-      cpm: 1.01,
-      creativeId: creativeId,
-      currency: 'USD',
-      height: 250,
-      mediaType: 'banner',
-      requestId: requestId,
-      size: '300x250',
-      source: 'client',
-      status: 'rendered',
-      statusMessage: 'Bid available',
-      timeToRespond: 421,
-      ttl: 60,
-      width: 300
-    };
-    let expectedBidWonBody = {
-      sovrnId: 123,
-      payload: 'winner'
-    };
-    let expectedWinningBid = {
-      bidderCode: bidderCode,
-      width: 300,
-      height: 250,
-      statusMessage: 'Bid available',
-      adId: 'adId',
-      mediaType: 'banner',
-      source: 'client',
-      requestId: requestId,
-      cpm: 1.01,
-      creativeId: creativeId,
-      currency: 'USD',
-      ttl: 60,
-      auctionId: auctionId,
-      bidder: bidderCode,
-      adUnitCode: adUnitCode,
-      timeToRespond: 421,
-      size: '300x250',
-    };
-    beforeEach(() => {
-      sovrnAnalyticsAdapter.enableAnalytics({
-        provider: 'sovrn',
-        options: {
-          sovrnId: 123
-        }
-      });
-      sinon.spy(sovrnAnalyticsAdapter, 'track');
-    });
-    afterEach(() => {
-      sovrnAnalyticsAdapter.disableAnalytics();
-      sovrnAnalyticsAdapter.track.restore();
-    });
-    it('should send bid won data ', function () {
-      emitEvent('AUCTION_INIT', auctionInit, auctionId);
-      emitEvent('BID_WON', bidWonEvent, auctionId);
-      let requestBody = JSON.parse(server.requests[0].requestBody);
-      expect(requestBody).to.deep.include(expectedBidWonBody);
-      expect(requestBody.winningBid).to.deep.include(expectedWinningBid);
-    });
-  });
-  describe('Error Tracking', function() {
-    beforeEach(() => {
-      sovrnAnalyticsAdapter.enableAnalytics({
-        provider: 'sovrn',
-        options: {
-          sovrnId: 123
-        }
-      });
-      sinon.spy(sovrnAnalyticsAdapter, 'track');
-    });
-    afterEach(() => {
-      sovrnAnalyticsAdapter.disableAnalytics()
-      sovrnAnalyticsAdapter.track.restore()
-    });
-    it('should send an error message when a bid is received for a closed auction', function() {
-      let auctionId = '678.678.678.678';
-      emitEvent('AUCTION_INIT', auctionInit, auctionId)
-      emitEvent('BID_REQUESTED', bidRequested, auctionId)
-      emitEvent('AUCTION_END', {}, auctionId)
-      server.requests[0].respond(200)
-      emitEvent('BID_RESPONSE', bidResponse, auctionId)
-      let requestBody = JSON.parse(server.requests[1].requestBody)
-      expect(requestBody.payload).to.equal('error')
-      expect(requestBody.message).to.include('Event Received after Auction Close Auction Id')
-    })
-  })
-})
diff --git a/test/spec/modules/sovrnBidAdapter_spec.js b/test/spec/modules/sovrnBidAdapter_spec.js
index 90913c6f130..c684f8691aa 100644
--- a/test/spec/modules/sovrnBidAdapter_spec.js
+++ b/test/spec/modules/sovrnBidAdapter_spec.js
@@ -64,6 +64,29 @@ describe('sovrnBidAdapter', function() {
 
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false)
     })
+
+    it('should return true when minduration is not passed', function() {
+      const width = 300
+      const height = 250
+      const mimes = ['video/mp4', 'application/javascript']
+      const protocols = [2, 5]
+      const maxduration = 60
+      const startdelay = 0
+      const videoBidRequest = {
+        ...baseBidRequest,
+        mediaTypes: {
+          video: {
+            mimes,
+            protocols,
+            playerSize: [[width, height], [360, 240]],
+            maxduration,
+            startdelay
+          }
+        }
+      }
+
+      expect(spec.isBidRequestValid(videoBidRequest)).to.equal(true)
+    })
   })
 
   describe('buildRequests', function () {
@@ -217,6 +240,55 @@ describe('sovrnBidAdapter', function() {
         expect(payload.imp[0]?.ext?.tid).to.equal('1a2c032473f4983')
       })
 
+      it('when FLEDGE is enabled, should send ortb2imp.ext.ae', function () {
+        const bidderRequest = {
+          ...baseBidderRequest,
+          paapi: {enabled: true}
+        }
+        const bidRequest = {
+          ...baseBidRequest,
+          ortb2Imp: {
+            ext: {
+              ae: 1
+            }
+          },
+        }
+        const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest).data)
+        expect(payload.imp[0].ext.ae).to.equal(1)
+      })
+
+      it('when FLEDGE is not enabled, should not send ortb2imp.ext.ae', function () {
+        const bidRequest = {
+          ...baseBidRequest,
+          ortb2Imp: {
+            ext: {
+              ae: 1
+            }
+          },
+        }
+        const payload = JSON.parse(spec.buildRequests([bidRequest], baseBidderRequest).data)
+        expect(payload.imp[0].ext.ae).to.be.undefined
+      })
+
+      it('when FLEDGE is enabled, but env is malformed, should not send ortb2imp.ext.ae', function () {
+        const bidderRequest = {
+          ...baseBidderRequest,
+          paapi: {
+            enabled: true
+          }
+        }
+        const bidRequest = {
+          ...baseBidRequest,
+          ortb2Imp: {
+            ext: {
+              ae: 'malformed'
+            }
+          },
+        }
+        const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest).data)
+        expect(payload.imp[0].ext.ae).to.be.undefined
+      })
+
       it('includes the ad unit code in the request', function() {
         const impression = payload.imp[0]
         expect(impression.adunitcode).to.equal('adunit-code')
@@ -295,6 +367,41 @@ describe('sovrnBidAdapter', function() {
       expect(data.regs.ext['us_privacy']).to.equal(bidderRequest.uspConsent)
     })
 
+    it('should not set coppa when coppa is undefined', function () {
+      const bidderRequest = {
+        ...baseBidderRequest,
+        bidderCode: 'sovrn',
+        auctionId: '1d1a030790a475',
+        bidderRequestId: '22edbae2733bf6',
+        timeout: 3000,
+        bids: [baseBidRequest],
+        gdprConsent: {
+          consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==',
+          gdprApplies: true
+        },
+      }
+      const {regs} = JSON.parse(spec.buildRequests([baseBidRequest], bidderRequest).data)
+      expect(regs.coppa).to.be.undefined
+    })
+
+    it('should set coppa to 1 when coppa is provided with value true', function () {
+      const bidderRequest = {
+        ...baseBidderRequest,
+        ortb2: {
+          regs: {
+            coppa: true
+          }
+        },
+        bidderCode: 'sovrn',
+        auctionId: '1d1a030790a475',
+        bidderRequestId: '22edbae2733bf6',
+        timeout: 3000,
+        bids: [baseBidRequest]
+      }
+      const {regs} = JSON.parse(spec.buildRequests([baseBidRequest], bidderRequest).data)
+      expect(regs.coppa).to.equal(1)
+    })
+
     it('should send gpp info in OpenRTB 2.6 location when gppConsent defined', function () {
       const bidderRequest = {
         ...baseBidderRequest,
@@ -314,6 +421,31 @@ describe('sovrnBidAdapter', function() {
       expect(regs.gpp_sid).to.include(8)
     })
 
+    it('should add ORTB2 device data to the request', function () {
+      const bidderRequest = {
+        ...baseBidderRequest,
+        ortb2: {
+          device: {
+            w: 980,
+            h: 1720,
+            dnt: 0,
+            ua: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/125.0.6422.80 Mobile/15E148 Safari/604.1',
+            language: 'en',
+            devicetype: 1,
+            make: 'Apple',
+            model: 'iPhone 12 Pro Max',
+            os: 'iOS',
+            osv: '17.4',
+          },
+        },
+      };
+
+      const request = spec.buildRequests([baseBidRequest], bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.device).to.deep.equal(bidderRequest.ortb2.device);
+    });
+
     it('should not send gpp info when gppConsent is not defined', function () {
       const bidderRequest = {
         ...baseBidderRequest,
@@ -472,6 +604,45 @@ describe('sovrnBidAdapter', function() {
 
       expect(impression.bidfloor).to.equal(2.00)
     })
+    it('floor should be undefined if there is no floor from the floor module and params', function() {
+      const floorBid = {
+        ...baseBidRequest
+      }
+      floorBid.params = {
+        tagid: 1234
+      }
+      const request = spec.buildRequests([floorBid], baseBidderRequest)
+      const impression = JSON.parse(request.data).imp[0]
+
+      expect(impression.bidfloor).to.be.undefined
+    })
+    it('floor should be undefined if there is incorrect floor value from the floor module', function() {
+      const floorBid = {
+        ...baseBidRequest,
+        getFloor: () => ({currency: 'USD', floor: 'incorrect_value'}),
+        params: {
+          tagid: 1234
+        }
+      }
+      const request = spec.buildRequests([floorBid], baseBidderRequest)
+      const impression = JSON.parse(request.data).imp[0]
+
+      expect(impression.bidfloor).to.be.undefined
+    })
+    it('floor should be undefined if there is incorrect floor value from the params', function() {
+      const floorBid = {
+        ...baseBidRequest,
+        getFloor: () => ({})
+      }
+      floorBid.params = {
+        tagid: 1234,
+        bidfloor: 'incorrect_value'
+      }
+      const request = spec.buildRequests([floorBid], baseBidderRequest)
+      const impression = JSON.parse(request.data).imp[0]
+
+      expect(impression.bidfloor).to.be.undefined
+    })
     describe('First Party Data', function () {
       it('should provide first party data if provided', function() {
         const ortb2 = {
@@ -683,6 +854,158 @@ describe('sovrnBidAdapter', function() {
     })
   })
 
+  describe('fledge response', function () {
+    let fledgeResponse = {
+      body: {
+        id: '37386aade21a71',
+        seatbid: [{
+          bid: [{
+            id: 'a_403370_332fdb9b064040ddbec05891bd13ab28',
+            crid: 'creativelycreatedcreativecreative',
+            impid: '263c448586f5a1',
+            price: 0.45882675,
+            nurl: '',
+            adm: '',
+            h: 90,
+            w: 728
+          }]
+        }],
+        ext: {
+          seller: 'seller.lijit.com',
+          decisionLogicUrl: 'https://decision.lijit.com',
+          igbid: [{
+            impid: 'test_imp_id',
+            igbuyer: [{
+              igdomain: 'ap.lijit.com',
+              buyerdata: {
+                base_bid_micros: 0.1,
+                use_bid_multiplier: true,
+                multiplier: '1.3'
+              }
+            }, {
+              igdomain: 'buyer2.com',
+              buyerdata: {}
+            }, {
+              igdomain: 'buyer3.com',
+              buyerdata: {}
+            }]
+          }, {
+            impid: 'test_imp_id_2',
+            igbuyer: [{
+              igdomain: 'ap2.lijit.com',
+              buyerdata: {
+                base_bid_micros: '0.2',
+              }
+            }]
+          }, {
+            impid: '',
+            igbuyer: [{
+              igdomain: 'ap3.lijit.com',
+              buyerdata: {
+                base_bid_micros: '0.3',
+              }
+            }]
+          }, {
+            impid: 'test_imp_id_3',
+            igbuyer: [{
+              igdomain: '',
+              buyerdata: {
+                base_bid_micros: '0.3',
+              }
+            }]
+          }, {
+            impid: 'test_imp_id_4',
+            igbuyer: []
+          }]
+        }
+      }
+    }
+    let emptyFledgeResponse = {
+      body: {
+        id: '37386aade21a71',
+        seatbid: [{
+          bid: [{
+            id: 'a_403370_332fdb9b064040ddbec05891bd13ab28',
+            crid: 'creativelycreatedcreativecreative',
+            impid: '263c448586f5a1',
+            price: 0.45882675,
+            nurl: '',
+            adm: '',
+            h: 90,
+            w: 728
+          }]
+        }],
+        ext: {
+          igbid: {
+          }
+        }
+      }
+    }
+    let expectedResponse = {
+      requestId: '263c448586f5a1',
+      cpm: 0.45882675,
+      width: 728,
+      height: 90,
+      creativeId: 'creativelycreatedcreativecreative',
+      dealId: null,
+      currency: 'USD',
+      netRevenue: true,
+      mediaType: 'banner',
+      ttl: 60000,
+      meta: { advertiserDomains: [] },
+      ad: decodeURIComponent(`>`)
+    }
+    let expectedFledgeResponse = [
+      {
+        bidId: 'test_imp_id',
+        config: {
+          seller: 'seller.lijit.com',
+          decisionLogicUrl: 'https://decision.lijit.com',
+          sellerTimeout: undefined,
+          auctionSignals: {},
+          interestGroupBuyers: ['ap.lijit.com', 'buyer2.com', 'buyer3.com'],
+          perBuyerSignals: {
+            'ap.lijit.com': {
+              base_bid_micros: 0.1,
+              use_bid_multiplier: true,
+              multiplier: '1.3'
+            },
+            'buyer2.com': {},
+            'buyer3.com': {}
+          }
+        }
+      },
+      {
+        bidId: 'test_imp_id_2',
+        config: {
+          seller: 'seller.lijit.com',
+          decisionLogicUrl: 'https://decision.lijit.com',
+          sellerTimeout: undefined,
+          auctionSignals: {},
+          interestGroupBuyers: ['ap2.lijit.com'],
+          perBuyerSignals: {
+            'ap2.lijit.com': {
+              base_bid_micros: '0.2',
+            }
+          }
+        }
+      }
+    ]
+
+    it('should return valid fledge auction configs alongside bids', function () {
+      const result = spec.interpretResponse(fledgeResponse)
+      expect(result).to.have.property('bids')
+      expect(result).to.have.property('paapi')
+      expect(result.paapi.length).to.equal(2)
+      expect(result.paapi).to.deep.equal(expectedFledgeResponse)
+    })
+    it('should ignore empty fledge auction configs array', function () {
+      const result = spec.interpretResponse(emptyFledgeResponse)
+      expect(result.length).to.equal(1)
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse))
+    })
+  })
+
   describe('interpretResponse video', function () {
     let videoResponse
     const bidAdm = 'key%3Dvalue'
@@ -834,7 +1157,7 @@ describe('sovrnBidAdapter', function() {
     it('should return if iid present on server response & iframe syncs enabled', function() {
       const expectedReturnStatement = {
         type: 'iframe',
-        url: 'https://ap.lijit.com/beacon?informer=13487408',
+        url: 'https://ce.lijit.com/beacon?informer=13487408',
       }
       const returnStatement = spec.getUserSyncs(syncOptions, serverResponse)
 
@@ -848,7 +1171,7 @@ describe('sovrnBidAdapter', function() {
       }
       const expectedReturnStatement = {
         type: 'iframe',
-        url: `https://ap.lijit.com/beacon?gdpr_consent=${gdprConsent.consentString}&informer=13487408`,
+        url: `https://ce.lijit.com/beacon?gdpr_consent=${gdprConsent.consentString}&informer=13487408`,
       }
 
       const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent, '', null)
@@ -860,7 +1183,7 @@ describe('sovrnBidAdapter', function() {
       const uspString = '1NYN'
       const expectedReturnStatement = {
         type: 'iframe',
-        url: `https://ap.lijit.com/beacon?us_privacy=${uspString}&informer=13487408`,
+        url: `https://ce.lijit.com/beacon?us_privacy=${uspString}&informer=13487408`,
       }
 
       const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, null, uspString, null)
@@ -875,7 +1198,7 @@ describe('sovrnBidAdapter', function() {
       }
       const expectedReturnStatement = {
         type: 'iframe',
-        url: `https://ap.lijit.com/beacon?gpp=${gppConsent.gppString}&gpp_sid=${gppConsent.applicableSections}&informer=13487408`,
+        url: `https://ce.lijit.com/beacon?gpp=${gppConsent.gppString}&gpp_sid=${gppConsent.applicableSections}&informer=13487408`,
       }
 
       const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, null, '', gppConsent)
@@ -896,7 +1219,7 @@ describe('sovrnBidAdapter', function() {
 
       const expectedReturnStatement = {
         type: 'iframe',
-        url: `https://ap.lijit.com/beacon?gdpr_consent=${gdprConsent.consentString}&us_privacy=${uspString}&gpp=${gppConsent.gppString}&gpp_sid=${gppConsent.applicableSections}&informer=13487408`,
+        url: `https://ce.lijit.com/beacon?gdpr_consent=${gdprConsent.consentString}&us_privacy=${uspString}&gpp=${gppConsent.gppString}&gpp_sid=${gppConsent.applicableSections}&informer=13487408`,
       }
 
       const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent, uspString, gppConsent)
diff --git a/test/spec/modules/sparteoBidAdapter_spec.js b/test/spec/modules/sparteoBidAdapter_spec.js
new file mode 100644
index 00000000000..ec90d4c7eeb
--- /dev/null
+++ b/test/spec/modules/sparteoBidAdapter_spec.js
@@ -0,0 +1,478 @@
+import {expect} from 'chai';
+import { deepClone, mergeDeep } from 'src/utils';
+import {spec as adapter} from 'modules/sparteoBidAdapter';
+
+const CURRENCY = 'EUR';
+const TTL = 60;
+const HTTP_METHOD = 'POST';
+const REQUEST_URL = 'https://bid.sparteo.com/auction';
+const USER_SYNC_URL_IFRAME = 'https://sync.sparteo.com/sync/iframe.html?from=prebidjs';
+
+const VALID_BID_BANNER = {
+  bidder: 'sparteo',
+  bidId: '1a2b3c4d',
+  adUnitCode: 'id-1234',
+  params: {
+    networkId: '1234567a-eb1b-1fae-1d23-e1fbaef234cf',
+    formats: ['corner']
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [1, 1]
+      ]
+    }
+  }
+};
+
+const VALID_BID_VIDEO = {
+  bidder: 'sparteo',
+  bidId: '5e6f7g8h',
+  adUnitCode: 'id-5678',
+  params: {
+    networkId: '1234567a-eb1b-1fae-1d23-e1fbaef234cf'
+  },
+  mediaTypes: {
+    video: {
+      playerSize: [640, 360],
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+      api: [1, 2],
+      mimes: ['video/mp4'],
+      skip: 1,
+      startdelay: 0,
+      placement: 1,
+      linearity: 1,
+      minduration: 5,
+      maxduration: 30,
+      context: 'instream'
+    }
+  },
+  ortb2Imp: {
+    ext: {
+      pbadslot: 'video'
+    }
+  }
+};
+
+const VALID_REQUEST_BANNER = {
+  method: HTTP_METHOD,
+  url: REQUEST_URL,
+  data: {
+    'imp': [{
+      'secure': 1,
+      'id': '1a2b3c4d',
+      'banner': {
+        'format': [{
+          'h': 1,
+          'w': 1
+        }],
+        'topframe': 0
+      },
+      'ext': {
+        'sparteo': {
+          'params': {
+            'networkId': '1234567a-eb1b-1fae-1d23-e1fbaef234cf',
+            'adUnitCode': 'id-1234',
+            'formats': ['corner']
+          }
+        }
+      }
+    }],
+    'site': {
+      'publisher': {
+        'ext': {
+          'params': {
+            'networkId': '1234567a-eb1b-1fae-1d23-e1fbaef234cf',
+            'pbjsVersion': '$prebid.version$'
+          }
+        }
+      }
+    },
+    'test': 0
+  }
+};
+
+const VALID_REQUEST_VIDEO = {
+  method: HTTP_METHOD,
+  url: REQUEST_URL,
+  data: {
+    'imp': [{
+      'secure': 1,
+      'id': '5e6f7g8h',
+      'video': {
+        'w': 640,
+        'h': 360,
+        'protocols': [1, 2, 3, 4, 5, 6, 7, 8],
+        'api': [1, 2],
+        'mimes': ['video/mp4'],
+        'skip': 1,
+        'startdelay': 0,
+        'placement': 1,
+        'linearity': 1,
+        'minduration': 5,
+        'maxduration': 30,
+      },
+      'ext': {
+        'pbadslot': 'video',
+        'sparteo': {
+          'params': {
+            'networkId': '1234567a-eb1b-1fae-1d23-e1fbaef234cf',
+            'adUnitCode': 'id-5678'
+          }
+        }
+      }
+    }],
+    'site': {
+      'publisher': {
+        'ext': {
+          'params': {
+            'networkId': '1234567a-eb1b-1fae-1d23-e1fbaef234cf',
+            'pbjsVersion': '$prebid.version$'
+          }
+        }
+      }
+    },
+    'test': 0
+  }
+};
+
+const VALID_REQUEST = {
+  method: HTTP_METHOD,
+  url: REQUEST_URL,
+  data: {
+    'imp': [{
+      'secure': 1,
+      'id': '1a2b3c4d',
+      'banner': {
+        'format': [{
+          'h': 1,
+          'w': 1
+        }],
+        'topframe': 0
+      },
+      'ext': {
+        'sparteo': {
+          'params': {
+            'networkId': '1234567a-eb1b-1fae-1d23-e1fbaef234cf',
+            'adUnitCode': 'id-1234',
+            'formats': ['corner']
+          }
+        }
+      }
+    }, {
+      'secure': 1,
+      'id': '5e6f7g8h',
+      'video': {
+        'w': 640,
+        'h': 360,
+        'protocols': [1, 2, 3, 4, 5, 6, 7, 8],
+        'api': [1, 2],
+        'mimes': ['video/mp4'],
+        'skip': 1,
+        'startdelay': 0,
+        'placement': 1,
+        'linearity': 1,
+        'minduration': 5,
+        'maxduration': 30,
+      },
+      'ext': {
+        'pbadslot': 'video',
+        'sparteo': {
+          'params': {
+            'networkId': '1234567a-eb1b-1fae-1d23-e1fbaef234cf',
+            'adUnitCode': 'id-5678'
+          }
+        }
+      }
+    }],
+    'site': {
+      'publisher': {
+        'ext': {
+          'params': {
+            'networkId': '1234567a-eb1b-1fae-1d23-e1fbaef234cf',
+            'pbjsVersion': '$prebid.version$'
+          }
+        }
+      }
+    },
+    'test': 0
+  }
+};
+
+const BIDDER_REQUEST = {
+  bids: [VALID_BID_BANNER, VALID_BID_VIDEO]
+}
+
+const BIDDER_REQUEST_BANNER = {
+  bids: [VALID_BID_BANNER]
+}
+
+const BIDDER_REQUEST_VIDEO = {
+  bids: [VALID_BID_VIDEO]
+}
+
+describe('SparteoAdapter', function () {
+  describe('isBidRequestValid', function () {
+    describe('Check method return', function () {
+      it('should return true', function () {
+        expect(adapter.isBidRequestValid(VALID_BID_BANNER)).to.equal(true);
+        expect(adapter.isBidRequestValid(VALID_BID_VIDEO)).to.equal(true);
+      });
+
+      it('should return false because the networkId is missing', function () {
+        let wrongBid = deepClone(VALID_BID_BANNER);
+        delete wrongBid.params.networkId;
+
+        expect(adapter.isBidRequestValid(wrongBid)).to.equal(false);
+      });
+
+      it('should return false because the banner size is missing', function () {
+        let wrongBid = deepClone(VALID_BID_BANNER);
+
+        wrongBid.mediaTypes.banner.sizes = '123456';
+        expect(adapter.isBidRequestValid(wrongBid)).to.equal(false);
+
+        delete wrongBid.mediaTypes.banner.sizes;
+        expect(adapter.isBidRequestValid(wrongBid)).to.equal(false);
+      });
+
+      it('should return false because the video player size paramater is missing', function () {
+        let wrongBid = deepClone(VALID_BID_VIDEO);
+
+        wrongBid.mediaTypes.video.playerSize = '123456';
+        expect(adapter.isBidRequestValid(wrongBid)).to.equal(false);
+
+        delete wrongBid.mediaTypes.video.playerSize;
+        expect(adapter.isBidRequestValid(wrongBid)).to.equal(false);
+      });
+    });
+  });
+
+  describe('buildRequests', function () {
+    describe('Check method return', function () {
+      if (FEATURES.VIDEO) {
+        it('should return the right formatted requests', function() {
+          const request = adapter.buildRequests([VALID_BID_BANNER, VALID_BID_VIDEO], BIDDER_REQUEST);
+          delete request.data.id;
+
+          expect(request).to.deep.equal(VALID_REQUEST);
+        });
+      }
+
+      it('should return the right formatted banner requests', function() {
+        const request = adapter.buildRequests([VALID_BID_BANNER], BIDDER_REQUEST_BANNER);
+        delete request.data.id;
+
+        expect(request).to.deep.equal(VALID_REQUEST_BANNER);
+      });
+
+      if (FEATURES.VIDEO) {
+        it('should return the right formatted video requests', function() {
+          const request = adapter.buildRequests([VALID_BID_VIDEO], BIDDER_REQUEST_VIDEO);
+          delete request.data.id;
+
+          expect(request).to.deep.equal(VALID_REQUEST_VIDEO);
+        });
+      }
+
+      it('should return the right formatted request with endpoint test', function() {
+        let endpoint = 'https://bid-test.sparteo.com/auction';
+
+        let bids = mergeDeep(deepClone([VALID_BID_BANNER, VALID_BID_VIDEO]), {
+          params: {
+            endpoint: endpoint
+          }
+        });
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST));
+
+        const request = adapter.buildRequests(bids, BIDDER_REQUEST);
+        requests.url = endpoint;
+        delete request.data.id;
+
+        expect(requests).to.deep.equal(requests);
+      });
+    });
+  });
+
+  describe('interpretResponse', function() {
+    describe('Check method return', function () {
+      it('should return the right formatted response', function() {
+        let response = {
+          body: {
+            'id': '63f4d300-6896-4bdc-8561-0932f73148b1',
+            'cur': 'EUR',
+            'seatbid': [
+              {
+                'seat': 'sparteo',
+                'group': 0,
+                'bid': [
+                  {
+                    'id': 'cdbb6982-a269-40c7-84e5-04797f11d87a',
+                    'impid': '1a2b3c4d',
+                    'price': 4.5,
+                    'ext': {
+                      'prebid': {
+                        'type': 'banner'
+                      }
+                    },
+                    'adm': 'script',
+                    'crid': 'crid',
+                    'w': 1,
+                    'h': 1,
+                    'nurl': 'https://t.bidder.sparteo.com/img'
+                  }
+                ]
+              }
+            ]
+          }
+        };
+
+        if (FEATURES.VIDEO) {
+          response.body.seatbid[0].bid.push({
+            'id': 'cdbb6982-a269-40c7-84e5-04797f11d87b',
+            'impid': '5e6f7g8h',
+            'price': 5,
+            'ext': {
+              'prebid': {
+                'type': 'video',
+                'cache': {
+                  'vastXml': {
+                    'url': 'https://pbs.tet.com/cache?uuid=1234'
+                  }
+                }
+              }
+            },
+            'adm': 'tag',
+            'crid': 'crid',
+            'w': 640,
+            'h': 480,
+            'nurl': 'https://t.bidder.sparteo.com/img'
+          });
+        }
+
+        let formattedReponse = [
+          {
+            requestId: '1a2b3c4d',
+            seatBidId: 'cdbb6982-a269-40c7-84e5-04797f11d87a',
+            cpm: 4.5,
+            width: 1,
+            height: 1,
+            creativeId: 'crid',
+            creative_id: 'crid',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'banner',
+            meta: {},
+            ad: 'script
'
+          }
+        ];
+
+        if (FEATURES.VIDEO) {
+          formattedReponse.push({
+            requestId: '5e6f7g8h',
+            seatBidId: 'cdbb6982-a269-40c7-84e5-04797f11d87b',
+            cpm: 5,
+            width: 640,
+            height: 480,
+            playerWidth: 640,
+            playerHeight: 360,
+            creativeId: 'crid',
+            creative_id: 'crid',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            nurl: 'https://t.bidder.sparteo.com/img',
+            vastUrl: 'https://pbs.tet.com/cache?uuid=1234',
+            vastXml: 'tag'
+          });
+        }
+
+        if (FEATURES.VIDEO) {
+          const request = adapter.buildRequests([VALID_BID_BANNER, VALID_BID_VIDEO], BIDDER_REQUEST);
+          expect(adapter.interpretResponse(response, request)).to.deep.equal(formattedReponse);
+        } else {
+          const request = adapter.buildRequests([VALID_BID_BANNER], BIDDER_REQUEST_BANNER);
+          expect(adapter.interpretResponse(response, request)).to.deep.equal(formattedReponse);
+        }
+      });
+    });
+  });
+
+  describe('onBidWon', function() {
+    describe('Check methods succeed', function () {
+      it('should not throw error', function() {
+        let bids = [
+          {
+            requestId: '1a2b3c4d',
+            seatBidId: 'cdbb6982-a269-40c7-84e5-04797f11d87a',
+            cpm: 4.5,
+            width: 1,
+            height: 1,
+            creativeId: 'crid',
+            creative_id: 'crid',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'banner',
+            meta: {},
+            ad: 'script
',
+            nurl: [
+              'win.domain.com'
+            ]
+          },
+          {
+            requestId: '2570',
+            seatBidId: 'cdbb6982-a269-40c7-84e5-04797f11d87b',
+            id: 'id-5678',
+            cpm: 5,
+            width: 640,
+            height: 480,
+            creativeId: 'crid',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            vastXml: 'vast xml',
+            nurl: [
+              'win.domain2.com'
+            ]
+          }
+        ];
+
+        bids.forEach(function(bid) {
+          expect(adapter.onBidWon.bind(adapter, bid)).to.not.throw();
+        });
+      });
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    describe('Check methods succeed', function () {
+      it('should return the sync url', function() {
+        const syncOptions = {
+          'iframeEnabled': true,
+          'pixelEnabled': false
+        };
+        const gdprConsent = {
+          gdprApplies: 1,
+          consentString: 'tcfv2'
+        };
+        const uspConsent = {
+          consentString: '1Y---'
+        };
+
+        const syncUrls = [{
+          type: 'iframe',
+          url: USER_SYNC_URL_IFRAME + '&gdpr=1&gdpr_consent=tcfv2&usp_consent=1Y---'
+        }];
+
+        expect(adapter.getUserSyncs(syncOptions, null, gdprConsent, uspConsent)).to.deep.equal(syncUrls);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/spotxBidAdapter_spec.js b/test/spec/modules/spotxBidAdapter_spec.js
deleted file mode 100644
index ec99d0f7142..00000000000
--- a/test/spec/modules/spotxBidAdapter_spec.js
+++ /dev/null
@@ -1,711 +0,0 @@
-import {expect} from 'chai';
-import {config} from 'src/config.js';
-import {loadExternalScript} from '../../../src/adloader';
-import {isRendererRequired} from '../../../src/Renderer';
-import {spec, GOOGLE_CONSENT} from 'modules/spotxBidAdapter.js';
-
-describe('the spotx adapter', function () {
-  function getValidBidObject() {
-    return {
-      bidId: 123,
-      mediaTypes: {
-        video: {
-          playerSize: [['300', '200']]
-        }
-      },
-      params: {
-        channel_id: 12345,
-      }
-    };
-  };
-
-  describe('isBidRequestValid', function() {
-    let bid;
-
-    beforeEach(function() {
-      bid = getValidBidObject();
-    });
-
-    it('should fail validation if the bid isn\'t defined or not an object', function() {
-      let result = spec.isBidRequestValid();
-
-      expect(result).to.equal(false);
-
-      result = spec.isBidRequestValid('not an object');
-
-      expect(result).to.equal(false);
-    });
-
-    it('should succeed validation with all the right parameters', function() {
-      expect(spec.isBidRequestValid(getValidBidObject())).to.equal(true);
-    });
-
-    it('should succeed validation with mediaType and outstream_function or outstream_options', function() {
-      bid.mediaType = 'video';
-      bid.params.outstream_function = 'outstream_func';
-
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-
-      delete bid.params.outstream_function;
-      bid.params.outstream_options = {
-        slot: 'elemID'
-      };
-
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should succeed with ad_unit outstream and outstream function set', function() {
-      bid.params.ad_unit = 'outstream';
-      bid.params.outstream_function = function() {};
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should succeed with ad_unit outstream, options set for outstream and slot provided', function() {
-      bid.params.ad_unit = 'outstream';
-      bid.params.outstream_options = {slot: 'ad_container_id'};
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should fail without a channel_id', function() {
-      delete bid.params.channel_id;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail without playerSize', function() {
-      delete bid.mediaTypes.video.playerSize;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail without video', function() {
-      delete bid.mediaTypes.video;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail with ad_unit outstream but no options set for outstream', function() {
-      bid.params.ad_unit = 'outstream';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should fail with ad_unit outstream, options set for outstream but no slot provided', function() {
-      bid.params.ad_unit = 'outstream';
-      bid.params.outstream_options = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function() {
-    let bid, bidRequestObj;
-
-    beforeEach(function() {
-      bid = getValidBidObject();
-      bidRequestObj = {
-        refererInfo: {
-          page: 'prebid.js'
-        }
-      };
-    });
-
-    it('should build a very basic request', function() {
-      let request = spec.buildRequests([bid], bidRequestObj)[0];
-      expect(request.method).to.equal('POST');
-      expect(request.url).to.equal('https://search.spotxchange.com/openrtb/2.3/dados/12345?src_sys=prebid');
-      expect(request.bidRequest).to.equal(bidRequestObj);
-      expect(request.data.id).to.equal(12345);
-      expect(request.data.ext.wrap_response).to.equal(1);
-      expect(request.data.imp.id).to.match(/\d+/);
-      expect(request.data.imp.secure).to.equal(0);
-      expect(request.data.imp.video).to.deep.equal({
-        ext: {
-          sdk_name: 'Prebid 1+',
-          versionOrtb: '2.3'
-        },
-        h: '200',
-        mimes: [
-          'application/javascript',
-          'video/mp4',
-          'video/webm'
-        ],
-        w: '300'
-      });
-      expect(request.data.site).to.deep.equal({
-        content: 'content',
-        id: '',
-        page: 'prebid.js'
-      });
-    });
-
-    it('should change request parameters based on options sent', function() {
-      let request = spec.buildRequests([bid], bidRequestObj)[0];
-      expect(request.data.imp.video.ext).to.deep.equal({
-        sdk_name: 'Prebid 1+',
-        versionOrtb: '2.3'
-      });
-
-      bid.params = {
-        channel_id: 54321,
-        ad_mute: 1,
-        hide_skin: 1,
-        ad_volume: 1,
-        ad_unit: 'incontent',
-        outstream_options: {foo: 'bar'},
-        outstream_function: '987',
-        custom: {bar: 'foo'},
-        start_delay: true,
-        number_of_ads: 2,
-        spotx_all_google_consent: 1,
-        min_duration: 5,
-        max_duration: 10,
-        placement_type: 1,
-        position: 1
-      };
-
-      bid.userIdAsEids = [{
-        source: 'adserver.org',
-        uids: [{id: 'tdid_1', atype: 1, ext: {rtiPartner: 'TDID'}}]
-      },
-      {
-        source: 'id5-sync.com',
-        uids: [{id: 'id5id_1', ext: {}}]
-      },
-      {
-        source: 'uidapi.com',
-        uids: [{
-          id: 'uid_1',
-          atype: 3
-        }]
-      }
-      ];
-
-      bid.crumbs = {
-        pubcid: 'pubcid_1'
-      };
-
-      bid.schain = {
-        complete: 1,
-        nodes: [
-          {
-            asi: 'indirectseller.com',
-            sid: '00001',
-            hp: 1
-          }
-        ]
-      }
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-      expect(request.data.id).to.equal(54321);
-      expect(request.data.imp.video).to.contain({
-        minduration: 5,
-        maxduration: 10
-      })
-      expect(request.data.imp.video.ext).to.deep.equal({
-        ad_volume: 1,
-        hide_skin: 1,
-        ad_unit: 'incontent',
-        outstream_options: {foo: 'bar'},
-        outstream_function: '987',
-        custom: {bar: 'foo'},
-        sdk_name: 'Prebid 1+',
-        versionOrtb: '2.3',
-        placement: 1,
-        pos: 1
-      });
-
-      expect(request.data.imp.video.startdelay).to.equal(1);
-      expect(request.data.ext).to.deep.equal({
-        number_of_ads: 2,
-        wrap_response: 1
-      });
-      expect(request.data.user.ext).to.deep.equal({
-        consented_providers_settings: GOOGLE_CONSENT,
-        eids: [{
-          source: 'adserver.org',
-          uids: [{
-            id: 'tdid_1',
-            atype: 1,
-            ext: {
-              rtiPartner: 'TDID'
-            }
-          }]
-        }, {
-          source: 'id5-sync.com',
-          uids: [{
-            id: 'id5id_1',
-            ext: {}
-          }]
-        },
-        {
-          source: 'uidapi.com',
-          uids: [{
-            id: 'uid_1',
-            atype: 3,
-            ext: {
-              rtiPartner: 'UID2'
-            }
-          }]
-        }],
-        fpc: 'pubcid_1'
-      });
-
-      expect(request.data.source).to.deep.equal({
-        ext: {
-          schain: {
-            complete: 1,
-            nodes: [
-              {
-                asi: 'indirectseller.com',
-                sid: '00001',
-                hp: 1
-              }
-            ]
-          }
-        }
-      })
-    });
-
-    it('should process premarket bids', function() {
-      let request;
-      sinon.stub(Date, 'now').returns(1000);
-
-      bid.params.pre_market_bids = [{
-        vast_url: 'prebid.js',
-        deal_id: '123abc',
-        price: 12,
-        currency: 'USD'
-      }];
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-      expect(request.data.imp.video.ext.pre_market_bids).to.deep.equal([
-        {
-          'cur': 'USD',
-          'ext': {
-            'event_log': [
-              {}
-            ]
-          },
-          'id': '123abc',
-          'seatbid': [
-            {
-              'bid': [
-                {
-                  'adm': 'prebid.js',
-                  'dealid': '123abc',
-                  'impid': 1000,
-                  'price': 12,
-                }
-              ]
-            }
-          ]
-        }
-      ]);
-      Date.now.restore();
-    });
-
-    it('should pass GDPR params', function() {
-      let request;
-
-      bidRequestObj.gdprConsent = {
-        consentString: 'consent123',
-        gdprApplies: true
-      };
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-
-      expect(request.data.regs.ext.gdpr).to.equal(1);
-      expect(request.data.user.ext.consent).to.equal('consent123');
-    });
-
-    it('should pass CCPA us_privacy string', function() {
-      let request;
-
-      bidRequestObj.uspConsent = '1YYY'
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-      expect(request.data.regs.ext.us_privacy).to.equal('1YYY');
-    });
-
-    it('should pass both GDPR params and CCPA us_privacy', function() {
-      let request;
-
-      bidRequestObj.gdprConsent = {
-        consentString: 'consent123',
-        gdprApplies: true
-      };
-      bidRequestObj.uspConsent = '1YYY'
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-      expect(request.data.regs.ext.gdpr).to.equal(1);
-      expect(request.data.user.ext.consent).to.equal('consent123');
-      expect(request.data.regs.ext.us_privacy).to.equal('1YYY');
-    });
-
-    it('should pass min and max duration params', function() {
-      let request;
-
-      bid.params.min_duration = 3
-      bid.params.max_duration = 15
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-
-      expect(request.data.imp.video.minduration).to.equal(3);
-      expect(request.data.imp.video.maxduration).to.equal(15);
-    });
-
-    it('should pass placement_type and position params', function() {
-      let request;
-
-      bid.params.placement_type = 2
-      bid.params.position = 5
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-
-      expect(request.data.imp.video.ext.placement).to.equal(2);
-      expect(request.data.imp.video.ext.pos).to.equal(5);
-    });
-
-    it('should pass page param and override refererInfo.referer', function() {
-      let request;
-
-      bid.params.page = 'https://example.com';
-
-      let origGetConfig = config.getConfig;
-      sinon.stub(config, 'getConfig').callsFake(function (key) {
-        if (key === 'pageUrl') {
-          return 'https://www.spotx.tv';
-        }
-        return origGetConfig.apply(config, arguments);
-      });
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-
-      expect(request.data.site.page).to.equal('https://example.com');
-      config.getConfig.restore();
-    });
-
-    it('should use refererInfo.referer if no page is passed', function() {
-      let request;
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-
-      expect(request.data.site.page).to.equal('prebid.js');
-    });
-
-    it('should set ext.wrap_response to 0 when cache url is set and ignoreBidderCacheKey is true', function() {
-      let request;
-
-      let origGetConfig = config.getConfig;
-      sinon.stub(config, 'getConfig').callsFake(function (key) {
-        if (key === 'cache') {
-          return {
-            url: 'prebidCacheLocation',
-            ignoreBidderCacheKey: true
-          };
-        }
-        if (key === 'cache.url') {
-          return 'prebidCacheLocation';
-        }
-        if (key === 'cache.ignoreBidderCacheKey') {
-          return true;
-        }
-        return origGetConfig.apply(config, arguments);
-      });
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-
-      expect(request.data.ext.wrap_response).to.equal(0);
-      config.getConfig.restore();
-    });
-
-    it('should pass price floor in USD from the floors module if available', function () {
-      let request;
-
-      bid.getFloor = function () {
-        return { currency: 'USD', floor: 3 };
-      }
-
-      bid.params.price_floor = 2;
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-
-      expect(request.data.imp.bidfloor).to.equal(3);
-    });
-
-    it('should not pass price floor if price floors module gives a non-USD currency', function () {
-      let request;
-
-      bid.getFloor = function () {
-        return { currency: 'EUR', floor: 3 };
-      }
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-
-      expect(request.data.imp.bidfloor).to.be.undefined;
-    });
-
-    it('if floors module is not available, should pass price floor from price_floor param if available', function () {
-      let request;
-
-      bid.params.price_floor = 2;
-
-      request = spec.buildRequests([bid], bidRequestObj)[0];
-
-      expect(request.data.imp.bidfloor).to.equal(2);
-    });
-  });
-
-  describe('interpretResponse', function() {
-    let serverResponse, bidderRequestObj;
-
-    beforeEach(function() {
-      bidderRequestObj = {
-        bidRequest: {
-          bids: [{
-            mediaTypes: {
-              video: {
-                playerSize: [['400', '300']]
-              }
-            },
-            bidId: 123,
-            params: {
-              ad_unit: 'outstream',
-              player_width: 400,
-              player_height: 300,
-              content_page_url: 'prebid.js',
-              ad_mute: 1,
-              outstream_options: {foo: 'bar'},
-              outstream_function: 'function'
-            }
-          }, {
-            mediaTypes: {
-              video: {
-                playerSize: [['200', '100']]
-              }
-            },
-            bidId: 124,
-            params: {
-              player_width: 200,
-              player_height: 100,
-              content_page_url: 'prebid.js',
-              ad_mute: 1,
-              outstream_options: {foo: 'bar'},
-              outstream_function: 'function'
-            }
-          }]
-        }
-      };
-
-      serverResponse = {
-        body: {
-          id: 12345,
-          seatbid: [{
-            bid: [{
-              impid: 123,
-              cur: 'USD',
-              price: 12,
-              adomain: ['abc.com'],
-              crid: 321,
-              w: 400,
-              h: 300,
-              ext: {
-                cache_key: 'cache123',
-                slot: 'slot123'
-              }
-            }, {
-              impid: 124,
-              cur: 'USD',
-              price: 13,
-              adomain: ['def.com'],
-              w: 200,
-              h: 100,
-              ext: {
-                cache_key: 'cache124',
-                slot: 'slot124'
-              }
-            }]
-          }]
-        }
-      };
-    });
-
-    it('should return an array of bid responses', function() {
-      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
-      expect(responses).to.be.an('array').with.length(2);
-      expect(responses[0].cache_key).to.equal('cache123');
-      expect(responses[0].channel_id).to.equal(12345);
-      expect(responses[0].meta.advertiserDomains[0]).to.equal('abc.com');
-      expect(responses[0].cpm).to.equal(12);
-      expect(responses[0].creativeId).to.equal(321);
-      expect(responses[0].currency).to.equal('USD');
-      expect(responses[0].height).to.equal(300);
-      expect(responses[0].mediaType).to.equal('video');
-      expect(responses[0].netRevenue).to.equal(true);
-      expect(responses[0].requestId).to.equal(123);
-      expect(responses[0].ttl).to.equal(360);
-      expect(responses[0].vastUrl).to.equal('https://search.spotxchange.com/ad/vast.html?key=cache123');
-      expect(responses[0].videoCacheKey).to.equal('cache123');
-      expect(responses[0].width).to.equal(400);
-      expect(responses[1].cache_key).to.equal('cache124');
-      expect(responses[1].channel_id).to.equal(12345);
-      expect(responses[1].cpm).to.equal(13);
-      expect(responses[1].meta.advertiserDomains[0]).to.equal('def.com');
-      expect(responses[1].creativeId).to.equal('');
-      expect(responses[1].currency).to.equal('USD');
-      expect(responses[1].height).to.equal(100);
-      expect(responses[1].mediaType).to.equal('video');
-      expect(responses[1].netRevenue).to.equal(true);
-      expect(responses[1].requestId).to.equal(124);
-      expect(responses[1].ttl).to.equal(360);
-      expect(responses[1].vastUrl).to.equal('https://search.spotxchange.com/ad/vast.html?key=cache124');
-      expect(responses[1].videoCacheKey).to.equal('cache124');
-      expect(responses[1].width).to.equal(200);
-    });
-
-    it('should set the renderer attached to the bid to render immediately', function () {
-      var renderer = spec.interpretResponse(serverResponse, bidderRequestObj)[0].renderer,
-        hasRun = false;
-      expect(renderer._render).to.be.a('function');
-      renderer._render = () => {
-        hasRun = true;
-      }
-      renderer.render();
-      expect(hasRun).to.equal(true);
-    });
-
-    it('should include the url property on the renderer for Prebid Core checks', function () {
-      var renderer = spec.interpretResponse(serverResponse, bidderRequestObj)[0].renderer;
-      expect(isRendererRequired(renderer)).to.be.true;
-    });
-  });
-
-  describe('outstreamRender', function() {
-    let serverResponse, bidderRequestObj;
-
-    beforeEach(function() {
-      sinon.stub(window.document, 'getElementById').returns({
-        clientWidth: 200,
-        appendChild: sinon.stub().callsFake(function(script) {})
-      });
-      sinon.stub(window.document, 'createElement').returns({
-        setAttribute: function () {}
-      });
-      bidderRequestObj = {
-        bidRequest: {
-          bids: [{
-            mediaTypes: {
-              video: {
-                playerSize: [['400', '300']]
-              }
-            },
-            bidId: 123,
-            params: {
-              ad_unit: 'outstream',
-              player_width: 400,
-              player_height: 300,
-              content_page_url: 'prebid.js',
-              outstream_options: {
-                ad_mute: 1,
-                foo: 'bar',
-                slot: 'slot123',
-                playersize_auto_adapt: true,
-                custom_override: {
-                  digitrust_opt_out: 1,
-                  vast_url: 'bad_vast'
-                }
-              },
-            }
-          }]
-        }
-      };
-
-      serverResponse = {
-        body: {
-          id: 12345,
-          seatbid: [{
-            bid: [{
-              impid: 123,
-              cur: 'USD',
-              price: 12,
-              crid: 321,
-              w: 400,
-              h: 300,
-              ext: {
-                cache_key: 'cache123',
-                slot: 'slot123'
-              }
-            }]
-          }]
-        }
-      };
-    });
-    afterEach(function () {
-      window.document.getElementById.restore();
-      window.document.createElement.restore();
-    });
-
-    it('should attempt to insert the EASI script', function() {
-      window.document.getElementById.restore();
-      sinon.stub(window.document, 'getElementById').returns({
-        appendChild: sinon.stub().callsFake(function(script) {}),
-      });
-      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
-      let attrs;
-
-      responses[0].renderer.render(responses[0]);
-      expect(loadExternalScript.called).to.be.true;
-      attrs = valuesToString(loadExternalScript.args[0][4]);
-
-      expect(attrs['data-spotx_channel_id']).to.equal('12345');
-      expect(attrs['data-spotx_vast_url']).to.equal('https://search.spotxchange.com/ad/vast.html?key=cache123');
-      expect(attrs['data-spotx_ad_unit']).to.equal('incontent');
-      expect(attrs['data-spotx_collapse']).to.equal('0');
-      expect(attrs['data-spotx_autoplay']).to.equal('1');
-      expect(attrs['data-spotx_blocked_autoplay_override_mode']).to.equal('1');
-      expect(attrs['data-spotx_video_slot_can_autoplay']).to.equal('1');
-      expect(attrs['data-spotx_digitrust_opt_out']).to.equal('1');
-      expect(attrs['data-spotx_content_width']).to.equal('400');
-      expect(attrs['data-spotx_content_height']).to.equal('300');
-      expect(attrs['data-spotx_ad_mute']).to.equal('1');
-    });
-
-    it('should append into an iframe', function() {
-      bidderRequestObj.bidRequest.bids[0].params.outstream_options.in_iframe = 'iframeId';
-      window.document.getElementById.restore();
-      sinon.stub(window.document, 'getElementById').returns({
-        nodeName: 'IFRAME',
-        clientWidth: 200,
-        appendChild: sinon.stub().callsFake(function(script) {}),
-        contentDocument: {nodeName: 'IFRAME'}
-      });
-
-      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
-      responses[0].renderer.render(responses[0]);
-      expect(loadExternalScript.called).to.be.true;
-      expect(loadExternalScript.args[0][3].nodeName).to.equal('IFRAME');
-    });
-
-    it('should adjust width and height to match slot clientWidth if playersize_auto_adapt is used', function() {
-      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
-
-      responses[0].renderer.render(responses[0]);
-      expect(loadExternalScript.args[0][4]['data-spotx_content_width']).to.equal('200');
-      expect(loadExternalScript.args[0][4]['data-spotx_content_height']).to.equal('150');
-    });
-
-    it('should use a default 4/3 ratio if playersize_auto_adapt is used and response does not contain width or height', function() {
-      delete serverResponse.body.seatbid[0].bid[0].w;
-      delete serverResponse.body.seatbid[0].bid[0].h;
-      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
-
-      responses[0].renderer.render(responses[0]);
-      expect(loadExternalScript.args[0][4]['data-spotx_content_width']).to.equal('200');
-      expect(loadExternalScript.args[0][4]['data-spotx_content_height']).to.equal('150');
-    });
-  });
-});
-
-function valuesToString(obj) {
-  let newObj = {};
-  for (let prop in obj) {
-    newObj[prop] = '' + obj[prop];
-  }
-  return newObj;
-}
diff --git a/test/spec/modules/sspBCBidAdapter_spec.js b/test/spec/modules/sspBCBidAdapter_spec.js
index 71619424e4b..ceaad85faac 100644
--- a/test/spec/modules/sspBCBidAdapter_spec.js
+++ b/test/spec/modules/sspBCBidAdapter_spec.js
@@ -4,7 +4,8 @@ import * as utils from 'src/utils.js';
 
 const BIDDER_CODE = 'sspBC';
 const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
-const SYNC_URL = 'https://ssp.wp.pl/bidder/usersync';
+const SYNC_URL_IFRAME = 'https://ssp.wp.pl/bidder/usersync';
+const SYNC_URL_IMAGE = 'https://ssp.wp.pl/v1/sync/pixel';
 
 describe('SSPBC adapter', function () {
   function prepareTestData() {
@@ -303,7 +304,7 @@ describe('SSPBC adapter', function () {
             'price': 1,
             'adid': 'lxHWkB7OnZeso3QiN1N4',
             'nurl': '',
-            'adm': 'AD CODE 1',
+            'adm': 'AD_CODE1',
             'adomain': ['adomain.pl'],
             'cid': 'BZ4gAg21T5nNtxlUCDSW',
             'crid': 'lxHWkB7OnZeso3QiN1N4',
@@ -319,7 +320,7 @@ describe('SSPBC adapter', function () {
             'siteid': '8816',
             'slotid': '005',
             'price': 2,
-            'adm': 'AD CODE 2',
+            'adm': 'AD_CODE2',
             'cid': '57744',
             'crid': '858252',
             'w': 300,
@@ -343,7 +344,64 @@ describe('SSPBC adapter', function () {
             'price': 1,
             'adid': 'lxHWkB7OnZeso3QiN1N4',
             'nurl': '',
-            'adm': 'AD CODE 1',
+            'adm': 'AD_CODE',
+            'adomain': ['adomain.pl'],
+            'cid': 'BZ4gAg21T5nNtxlUCDSW',
+            'crid': 'lxHWkB7OnZeso3QiN1N4',
+            'w': 728,
+            'h': 90,
+          }],
+          'seat': 'dsp1',
+          'group': 0
+        }],
+        'cur': 'PLN'
+      }
+    };
+
+    const serverResponsePaapi = {
+      'body': {
+        'id': bidderRequestId,
+        'seatbid': [{
+          'bid': [{
+            'id': '3347324c-6889-46d2-a800-ae78a5214c06',
+            'impid': '003',
+            'siteid': '8816',
+            'slotid': '003',
+            'price': 1,
+            'adid': 'lxHWkB7OnZeso3QiN1N4',
+            'nurl': '',
+            'adm': 'AD_CODE',
+            'adomain': ['adomain.pl'],
+            'cid': 'BZ4gAg21T5nNtxlUCDSW',
+            'crid': 'lxHWkB7OnZeso3QiN1N4',
+            'w': 728,
+            'h': 90,
+          }],
+          'seat': 'dsp1',
+          'group': 0
+        }],
+        'cur': 'PLN',
+        'ext': {
+          'paapi': [
+            { 'config_data': 'config value' },
+          ]
+        },
+      }
+    };
+
+    const serverResponseIncorrect = {
+      'body': {
+        'id': bidderRequestId,
+        'seatbid': [{
+          'bid': [{
+            'id': '3347324c-6889-46d2-a800-ae78a5214c06',
+            'impid': '003',
+            'siteid': '8816',
+            'slotid': '003',
+            'price': 1,
+            'adid': 'lxHWkB7OnZeso3QiN1N4',
+            'nurl': '',
+            'adm': 'THIS_IS_NOT_AN_AD',
             'adomain': ['adomain.pl'],
             'cid': 'BZ4gAg21T5nNtxlUCDSW',
             'crid': 'lxHWkB7OnZeso3QiN1N4',
@@ -366,7 +424,7 @@ describe('SSPBC adapter', function () {
             'price': 1,
             'adid': 'lxHWkB7OnZeso3QiN1N4',
             'nurl': '',
-            'adm': 'AD CODE 1',
+            'adm': 'AD_CODE',
             'adomain': ['adomain.pl'],
             'cid': 'BZ4gAg21T5nNtxlUCDSW',
             'crid': 'lxHWkB7OnZeso3QiN1N4',
@@ -458,6 +516,8 @@ describe('SSPBC adapter', function () {
       serverResponse,
       serverResponseOneCode,
       serverResponseSingle,
+      serverResponseIncorrect,
+      serverResponsePaapi,
       serverResponseVideo,
       serverResponseNative,
       emptyResponse
@@ -590,10 +650,29 @@ describe('SSPBC adapter', function () {
       expect(extAssets1).to.have.property('pbsize').that.equals('750x200_1')
       expect(extAssets2).to.have.property('pbsize').that.equals('750x200_1')
     });
+
+    it('should send supply chain data', function () {
+      const supplyChain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'first-seller.com',
+            sid: '00001',
+            hp: 1
+          },
+        ]
+      }
+      const bidWithSupplyChain = Object.assign(bids[0], { schain: supplyChain });
+      const requestWithSupplyChain = spec.buildRequests([bidWithSupplyChain], bidRequest);
+      const payloadWithSupplyChain = requestWithSupplyChain ? JSON.parse(requestWithSupplyChain.data) : { site: false, imp: false };
+
+      expect(payloadWithSupplyChain.source).to.have.property('schain').that.has.keys('ver', 'complete', 'nodes');
+    });
   });
 
   describe('interpretResponse', function () {
-    const { bid_OneCode, bid_video, bid_native, bids, emptyResponse, serverResponse, serverResponseOneCode, serverResponseSingle, serverResponseVideo, serverResponseNative, bidRequest, bidRequestOneCode, bidRequestSingle, bidRequestVideo, bidRequestNative } = prepareTestData();
+    const { bid_OneCode, bid_video, bid_native, bids, emptyResponse, serverResponse, serverResponseOneCode, serverResponseSingle, serverResponseIncorrect, serverResponsePaapi, serverResponseVideo, serverResponseNative, bidRequest, bidRequestOneCode, bidRequestSingle, bidRequestVideo, bidRequestNative } = prepareTestData();
     const request = spec.buildRequests(bids, bidRequest);
     const requestSingle = spec.buildRequests([bids[0]], bidRequestSingle);
     const requestOneCode = spec.buildRequests([bid_OneCode], bidRequestOneCode);
@@ -632,15 +711,11 @@ describe('SSPBC adapter', function () {
       expect(resultPartial.length).to.equal(1);
     });
 
-    it('banner ad code should contain required variables', function () {
+    it('should not alter HTML from response', function () {
       let resultSingle = spec.interpretResponse(serverResponseSingle, requestSingle);
       let adcode = resultSingle[0].ad;
-      expect(adcode).to.be.a('string');
-      expect(adcode).to.contain('window.rekid');
-      expect(adcode).to.contain('window.mcad');
-      expect(adcode).to.contain('window.gdpr');
-      expect(adcode).to.contain('window.page');
-      expect(adcode).to.contain('window.requestPVID');
+
+      expect(adcode).to.be.equal(serverResponseSingle.body.seatbid[0].bid[0].adm);
     });
 
     it('should create a correct video bid', function () {
@@ -666,6 +741,19 @@ describe('SSPBC adapter', function () {
       expect(nativeBid).to.have.keys('cpm', 'creativeId', 'currency', 'width', 'height', 'meta', 'mediaType', 'netRevenue', 'requestId', 'ttl', 'native', 'vurls');
       expect(nativeBid.native).to.have.keys('image', 'icon', 'title', 'sponsoredBy', 'body', 'clickUrl', 'impressionTrackers', 'javascriptTrackers', 'clickTrackers');
     });
+
+    it('should reject responses that are not HTML, VATS/VPAID or native', function () {
+      let resultIncorrect = spec.interpretResponse(serverResponseIncorrect, requestSingle);
+
+      expect(resultIncorrect.length).to.equal(0);
+    });
+
+    it('should response with fledge auction configs', function () {
+      const { bids, fledgeAuctionConfigs } = spec.interpretResponse(serverResponsePaapi, requestSingle);
+
+      expect(bids.length).to.equal(1);
+      expect(fledgeAuctionConfigs.length).to.equal(1);
+    });
   });
 
   describe('getUserSyncs', function () {
@@ -673,13 +761,18 @@ describe('SSPBC adapter', function () {
     let syncResultImage = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: true });
     let syncResultNone = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: false });
 
-    it('should provide correct url, if frame sync is allowed', function () {
+    it('should provide correct iframe url, if frame sync is allowed', function () {
       expect(syncResultAll).to.have.length(1);
-      expect(syncResultAll[0].url).to.have.string(SYNC_URL);
+      expect(syncResultAll[0].url).to.have.string(SYNC_URL_IFRAME);
+    });
+
+    it('should provide correct image url, if image sync is allowed', function () {
+      expect(syncResultImage).to.have.length(1);
+      expect(syncResultImage[0].url).to.have.string(SYNC_URL_IMAGE);
     });
 
-    it('should send no syncs, if frame sync is not allowed', function () {
-      expect(syncResultImage).to.have.length(0);
+    it('should send no syncs, if no sync is allowed', function () {
+      expect(syncResultNone).to.have.length(0);
       expect(syncResultNone).to.have.length(0);
     });
   });
@@ -703,6 +796,25 @@ describe('SSPBC adapter', function () {
     });
   });
 
+  describe('onBidBillable', function () {
+    it('should generate no notification if bid is undefined', function () {
+      let notificationPayload = spec.onBidBillable();
+      expect(notificationPayload).to.be.undefined;
+    });
+
+    it('should generate notification with event name and request/adUnit data, if correct bid is provided. Should also contain site/slot data as arrays.', function () {
+      const { bids } = prepareTestData();
+      let bid = bids[0];
+
+      let notificationPayload = spec.onBidBillable(bid);
+      expect(notificationPayload).to.have.property('event').that.equals('bidBillable');
+      expect(notificationPayload).to.have.property('requestId').that.equals(bid.bidderRequestId);
+      expect(notificationPayload).to.have.property('tagid').that.deep.equals([bid.adUnitCode]);
+      expect(notificationPayload).to.have.property('siteId').that.is.an('array');
+      expect(notificationPayload).to.have.property('slotId').that.is.an('array');
+    });
+  });
+
   describe('onTimeout', function () {
     it('should generate no notification if timeout data is undefined / has no bids', function () {
       let notificationPayloadUndefined = spec.onTimeout();
diff --git a/test/spec/modules/ssp_genieeBidAdapter_spec.js b/test/spec/modules/ssp_genieeBidAdapter_spec.js
new file mode 100644
index 00000000000..dbf8ded5199
--- /dev/null
+++ b/test/spec/modules/ssp_genieeBidAdapter_spec.js
@@ -0,0 +1,401 @@
+import { expect } from 'chai';
+import {
+  spec,
+  BANNER_ENDPOINT,
+} from 'modules/ssp_genieeBidAdapter.js';
+import { config } from 'src/config.js';
+
+describe('ssp_genieeBidAdapter', function () {
+  const ZONE_ID = 1234567;
+  const AD_UNIT_CODE = 'adunit-code';
+  const BANNER_BID = {
+    bidder: spec.code,
+    params: {
+      zoneId: ZONE_ID,
+      invalidImpBeacon: false,
+    },
+    adUnitCode: AD_UNIT_CODE,
+    sizes: [[300, 250]],
+    bidId: 'bidId12345',
+    bidderRequestId: 'bidderRequestId12345',
+    auctionId: 'auctionId12345',
+  };
+
+  function getGeparamsDefinedBid(bid, params) {
+    const newBid = { ...bid };
+    newBid.params.geparams = params;
+    return newBid;
+  }
+
+  function hasParamsNotBlankStringTestGeparams(param, query) {
+    it(`should set the ${query} query to geparams.${param} when geparams.${param} is neither undefined nor null nor a blank string`, function () {
+      window.geparams[param] = undefined;
+      let request = spec.buildRequests([BANNER_BID]);
+      expect(request[0].data).to.not.have.property(`"${query}:`);
+
+      window.geparams[param] = null;
+      request = spec.buildRequests([BANNER_BID]);
+      expect(request[0].data).to.not.have.property(`"${query}:`);
+
+      window.geparams[param] = '';
+      request = spec.buildRequests([BANNER_BID]);
+      expect(request[0].data).to.not.have.property(`"${query}:`);
+
+      const value = 'hoge';
+      window.geparams[param] = value;
+      request = spec.buildRequests([BANNER_BID]);
+      expect(JSON.stringify(request[0].data)).to.have.string(`"${query}":"${value}"`);
+    });
+  }
+
+  function hasParamsNotBlankStringTestGecuparams(param, query) {
+    it(`should set the ${query} query to gecuparams.${param} when gecuparams.${param} is neither undefined nor null nor a blank string`, function () {
+      window.gecuparams = {};
+      window.gecuparams[param] = undefined;
+      let request = spec.buildRequests([BANNER_BID]);
+      expect(request[0].data).to.not.have.property(`"${query}:`);
+
+      window.gecuparams[param] = null;
+      request = spec.buildRequests([BANNER_BID]);
+      expect(request[0].data).to.not.have.property(`"${query}:`);
+
+      window.gecuparams[param] = '';
+      request = spec.buildRequests([BANNER_BID]);
+      expect(request[0].data).to.not.have.property(`"${query}:`);
+
+      const value = 'hoge';
+      window.gecuparams[param] = value;
+      request = spec.buildRequests([BANNER_BID]);
+      expect(JSON.stringify(request[0].data)).to.have.string(`"${query}":"${value}"`);
+    });
+  }
+
+  beforeEach(function () {
+    document.documentElement.innerHTML = '';
+    const adTagParent = document.createElement('div');
+    adTagParent.id = AD_UNIT_CODE;
+    document.body.appendChild(adTagParent);
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true when params.zoneId exists and params.currency does not exist', function () {
+      expect(spec.isBidRequestValid(BANNER_BID)).to.be.true;
+    });
+
+    it('should return true when params.zoneId and params.currency exist and params.currency is JPY or USD', function () {
+      config.setConfig({ currency: { adServerCurrency: 'JPY' } });
+      expect(
+        spec.isBidRequestValid({
+          ...BANNER_BID,
+          params: { ...BANNER_BID.params },
+        })
+      ).to.be.true;
+      config.setConfig({ currency: { adServerCurrency: 'USD' } });
+      expect(
+        spec.isBidRequestValid({
+          ...BANNER_BID,
+          params: { ...BANNER_BID.params },
+        })
+      ).to.be.true;
+    });
+
+    it('should return false when params.zoneId does not exist', function () {
+      expect(spec.isBidRequestValid({ ...BANNER_BID, params: {} })).to.be.false;
+    });
+
+    it('should return false when params.zoneId and params.currency exist and params.currency is neither JPY nor USD', function () {
+      config.setConfig({ currency: { adServerCurrency: 'EUR' } });
+      expect(
+        spec.isBidRequestValid({
+          ...BANNER_BID,
+          params: { ...BANNER_BID.params },
+        })
+      ).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('should changes the endpoint with banner ads or naive ads', function () {
+      const request = spec.buildRequests([BANNER_BID]);
+      expect(request[0].url).to.equal(BANNER_ENDPOINT);
+    });
+
+    it('should return a ServerRequest where the bid is a bid for validBidRequests', function () {
+      const request = spec.buildRequests([BANNER_BID]);
+      expect(request[0].bid).to.equal(BANNER_BID);
+    });
+
+    describe('QueryStringParameters', function () {
+      it('should sets the value of the zoneid query to bid.params.zoneId', function () {
+        const request = spec.buildRequests([BANNER_BID]);
+        expect(request[0].data.zoneid).to.deep.equal(BANNER_BID.params.zoneId);
+      });
+
+      it('should sets the values for loc and referer queries when bidderRequest.refererInfo.referer has a value', function () {
+        const referer = 'https://example.com/';
+        const request = spec.buildRequests([BANNER_BID], {
+          refererInfo: { legacy: { referer: referer }, ref: referer },
+        });
+        expect(request[0].data.loc).to.deep.equal(referer);
+        expect(request[0].data.referer).to.deep.equal(referer);
+      });
+
+      it('should makes the values of loc query and referer query geparams value when bidderRequest.refererInfo.referer is a falsy value', function () {
+        const loc = 'https://www.google.com/';
+        const referer = 'https://example.com/';
+        window.geparams = {
+          loc: 'https://www.google.com/',
+          ref: 'https://example.com/',
+        };
+        const request = spec.buildRequests([
+          getGeparamsDefinedBid(BANNER_BID, { loc: loc, ref: referer }),
+        ]);
+        expect(request[0].data.loc).to.deep.equal(encodeURIComponent(loc));
+        expect(request[0].data.referer).to.deep.equal(encodeURIComponent(referer));
+      });
+
+      it('should sets the value of the ct0 query to geparams.ct0', function () {
+        const ct0 = 'hoge';
+        window.geparams = {
+          ct0: 'hoge',
+        };
+        const request = spec.buildRequests([
+          getGeparamsDefinedBid(BANNER_BID, { ct0: ct0 }),
+        ]);
+        expect(request[0].data.ct0).to.deep.equal(ct0);
+      });
+
+      it('should replaces currency with JPY if there is no currency provided', function () {
+        const request = spec.buildRequests([BANNER_BID]);
+        expect(request[0].data.cur).to.deep.equal('JPY');
+      });
+
+      it('should makes currency the value of params.currency when params.currency exists', function () {
+        const request = spec.buildRequests([
+          {
+            ...BANNER_BID,
+            params: { ...BANNER_BID.params, currency: 'JPY' },
+          },
+          {
+            ...BANNER_BID,
+            params: { ...BANNER_BID.params, currency: 'USD' },
+          },
+        ]);
+        expect(request[0].data.cur).to.deep.equal('JPY');
+        expect(request[1].data.cur).to.deep.equal('USD');
+      });
+
+      it('should makes invalidImpBeacon the value of params.invalidImpBeacon when params.invalidImpBeacon exists (in current version, this parameter is not necessary and ib is always `0`)', function () {
+        const request = spec.buildRequests([
+          {
+            ...BANNER_BID,
+            params: { ...BANNER_BID.params, invalidImpBeacon: true },
+          },
+          {
+            ...BANNER_BID,
+            params: { ...BANNER_BID.params, invalidImpBeacon: false },
+          },
+          {
+            ...BANNER_BID,
+            params: { ...BANNER_BID.params },
+          },
+        ]);
+        expect(request[0].data.ib).to.deep.equal(0);
+        expect(request[1].data.ib).to.deep.equal(0);
+        expect(request[2].data.ib).to.deep.equal(0);
+      });
+
+      it('should not sets the value of the adtk query when geparams.lat does not exist', function () {
+        const request = spec.buildRequests([BANNER_BID]);
+        expect(request[0].data).to.not.have.property('adtk');
+      });
+
+      it('should sets the value of the adtk query to 0 when geparams.lat is truthy value', function () {
+        window.geparams = {
+          lat: 1,
+        };
+        const request = spec.buildRequests([
+          getGeparamsDefinedBid(BANNER_BID, { lat: 1 }),
+        ]);
+        expect(request[0].data.adtk).to.deep.equal('0');
+      });
+
+      it('should sets the value of the adtk query to 1 when geparams.lat is falsy value', function () {
+        window.geparams = {
+          lat: 0,
+        };
+        const request = spec.buildRequests([
+          getGeparamsDefinedBid(BANNER_BID, { lat: 0 }),
+        ]);
+        expect(request[0].data.adtk).to.deep.equal('1');
+      });
+
+      it('should sets the value of the idfa query to geparams.idfa', function () {
+        const idfa = 'hoge';
+        window.geparams = {
+          idfa: 'hoge',
+        };
+        const request = spec.buildRequests([
+          getGeparamsDefinedBid(BANNER_BID, { idfa: idfa }),
+        ]);
+        expect(request[0].data.idfa).to.deep.equal(idfa);
+      });
+
+      it('should set the sw query to screen.height and the sh query to screen.width when screen.width is greater than screen.height', function () {
+        const width = 1440;
+        const height = 900;
+        const stub = sinon.stub(window, 'screen').get(function () {
+          return { width: width, height: height };
+        });
+        const request = spec.buildRequests([BANNER_BID]);
+        expect(request[0].data.sw).to.deep.equal(height);
+        expect(request[0].data.sh).to.deep.equal(width);
+        stub.restore();
+      });
+
+      it('should set the sw query to screen.width and the sh query to screen.height when screen.width is not greater than screen.height', function () {
+        const width = 411;
+        const height = 731;
+        const stub = sinon.stub(window, 'screen').get(function () {
+          return { width: width, height: height };
+        });
+        const request = spec.buildRequests([BANNER_BID]);
+        expect(request[0].data.sw).to.deep.equal(width);
+        expect(request[0].data.sh).to.deep.equal(height);
+        stub.restore();
+      });
+
+      hasParamsNotBlankStringTestGeparams('zip', 'zip');
+      hasParamsNotBlankStringTestGeparams('country', 'country');
+      hasParamsNotBlankStringTestGeparams('city', 'city');
+      hasParamsNotBlankStringTestGeparams('long', 'long');
+      hasParamsNotBlankStringTestGeparams('lati', 'lati');
+
+      it('should set the custom query to geparams.custom', function () {
+        const params = {
+          custom: {
+            c1: undefined,
+            c2: null,
+            c3: '',
+            c4: 'hoge',
+          },
+        };
+        window.geparams = {
+          custom: {
+            c1: undefined,
+            c2: null,
+            c3: '',
+            c4: 'hoge',
+          },
+        };
+        const request = spec.buildRequests([
+          getGeparamsDefinedBid(BANNER_BID, params),
+        ]);
+        expect(request[0].data).to.not.have.property('custom_c1');
+        expect(request[0].data).to.not.have.property('custom_c2');
+        expect(request[0].data).to.not.have.property('custom_c3');
+        expect(request[0].data.custom_c4).to.have.string(
+          `${params.custom.c4}`
+        );
+      });
+
+      hasParamsNotBlankStringTestGecuparams('ver', 'gc_ver');
+      hasParamsNotBlankStringTestGecuparams('minor', 'gc_minor');
+      hasParamsNotBlankStringTestGecuparams('value', 'gc_value');
+
+      it('should sets the value of the gfuid query to geparams.gfuid', function () {
+        const gfuid = 'hoge';
+        window.geparams = {
+          gfuid: 'hoge',
+        };
+        const request = spec.buildRequests([
+          getGeparamsDefinedBid(BANNER_BID, { gfuid: gfuid }),
+        ]);
+        expect(request[0].data).to.not.have.property('gfuid');
+      });
+
+      it('should sets the value of the adt query to geparams.adt', function () {
+        const adt = 'hoge';
+        window.geparams = {
+          adt: 'hoge',
+        };
+        const request = spec.buildRequests([
+          getGeparamsDefinedBid(BANNER_BID, { adt: adt }),
+        ]);
+        expect(request[0].data).to.not.have.property('adt');
+      });
+
+      it('should adds a query for naive ads and no query for banner ads', function () {
+        // const query = '&tkf=1&ad_track=1&apiv=1.1.0';
+        const query_apiv = '1.1.0';
+        const query_tkf = '1';
+        const query_ad_track = '1';
+        const request = spec.buildRequests([BANNER_BID]);
+        expect(String(request[0].data.apiv)).to.not.have.string(query_apiv);
+        expect(String(request[0].data.tkf)).to.not.have.string(query_tkf);
+        expect(String(request[0].data.ad_track)).to.not.have.string(query_ad_track);
+      });
+
+      it('should sets the value of the apid query to geparams.bundle when media type is banner', function () {
+        const bundle = 'hoge';
+        window.geparams = {
+          bundle: 'hoge',
+        };
+        const request = spec.buildRequests([
+          getGeparamsDefinedBid(BANNER_BID, { bundle: bundle }),
+        ]);
+        expect(request[0].data.apid).to.deep.equal(bundle);
+      });
+
+      it('should not include the extuid query when bid.userId.imuid does not exist', function () {
+        const request = spec.buildRequests([BANNER_BID]);
+        expect(request[0].data).to.not.have.property('extuid');
+      });
+
+      it('should include an extuid query when bid.userId.imuid exists', function () {
+        const imuid = 'b.a4ad1d3eeb51e600';
+        const request = spec.buildRequests([{...BANNER_BID, userId: {imuid}}]);
+        expect(request[0].data.extuid).to.deep.equal(`im:${imuid}`);
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {};
+    response[ZONE_ID] = {
+      creativeId: '',
+      cur: 'JPY',
+      price: 0.092,
+      width: 300,
+      height: 250,
+      requestid: '2e42361a6172bf',
+      adm: '',
+    };
+    const expected = {
+      requestId: response[ZONE_ID].requestid,
+      cpm: response[ZONE_ID].price,
+      creativeId: response[ZONE_ID].creativeId,
+      netRevenue: true,
+      currency: 'JPY',
+      ttl: 700,
+      width: response[ZONE_ID].width,
+      height: response[ZONE_ID].height,
+    };
+
+    it('should sets the response correctly when it comes to banner ads', function () {
+      const expectedBanner = {
+        ...expected,
+        ad:
+          '
' +
+          response[ZONE_ID].adm +
+          '
',
+        mediaType: 'banner',
+      };
+      const request = spec.buildRequests([BANNER_BID])[0];
+      const result = spec.interpretResponse({ body: response }, request);
+      expect(result[0]).to.deep.equal(expectedBanner);
+    });
+  });
+});
diff --git a/test/spec/modules/staqAnalyticsAdapter_spec.js b/test/spec/modules/staqAnalyticsAdapter_spec.js
deleted file mode 100644
index f8e3ba83bbe..00000000000
--- a/test/spec/modules/staqAnalyticsAdapter_spec.js
+++ /dev/null
@@ -1,302 +0,0 @@
-import analyticsAdapter, { ExpiringQueue, getUmtSource, storage } from 'modules/staqAnalyticsAdapter.js';
-import { expect } from 'chai';
-import adapterManager from 'src/adapterManager.js';
-import CONSTANTS from 'src/constants.json';
-
-const events = require('../../../src/events');
-
-const DIRECT = {
-  source: '(direct)',
-  medium: '(direct)',
-  campaign: '(direct)'
-};
-const REFERRER = {
-  source: 'lander.com',
-  medium: '(referral)',
-  campaign: '(referral)',
-  content: '/lander.html'
-};
-const GOOGLE_ORGANIC = {
-  source: 'google',
-  medium: '(organic)',
-  campaign: '(organic)'
-};
-const CAMPAIGN = {
-  source: 'adkernel',
-  medium: 'email',
-  campaign: 'new_campaign',
-  c1: '1',
-  c2: '2',
-  c3: '3',
-  c4: '4',
-  c5: '5'
-
-};
-describe('', function() {
-  let sandbox;
-
-  before(function() {
-    sandbox = sinon.sandbox.create();
-  });
-
-  after(function() {
-    sandbox.restore();
-    analyticsAdapter.disableAnalytics();
-  });
-
-  describe('UTM source parser', function() {
-    let stubSetItem;
-    let stubGetItem;
-
-    before(function() {
-      stubSetItem = sandbox.stub(storage, 'setItem');
-      stubGetItem = sandbox.stub(storage, 'getItem');
-    });
-
-    afterEach(function() {
-      sandbox.reset();
-    });
-
-    it('should parse first direct visit as (direct)', function() {
-      stubGetItem.withArgs('adk_dpt_analytics').returns(undefined);
-      stubSetItem.returns(undefined);
-      let source = getUmtSource('https://example.com');
-      expect(source).to.be.eql(DIRECT);
-    });
-
-    it('should parse visit from google as organic', function() {
-      stubGetItem.withArgs('adk_dpt_analytics').returns(undefined);
-      stubSetItem.returns(undefined);
-      let source = getUmtSource('https://example.com', 'https://www.google.com/search?q=pikachu');
-      expect(source).to.be.eql(GOOGLE_ORGANIC);
-    });
-
-    it('should parse referral visit', function() {
-      stubGetItem.withArgs('adk_dpt_analytics').returns(undefined);
-      stubSetItem.returns(undefined);
-      let source = getUmtSource('https://example.com', 'https://lander.com/lander.html');
-      expect(source).to.be.eql(REFERRER);
-    });
-
-    it('should parse referral visit from same domain as direct', function() {
-      stubGetItem.withArgs('adk_dpt_analytics').returns(undefined);
-      stubSetItem.returns(undefined);
-      let source = getUmtSource('https://lander.com/news.html', 'https://lander.com/lander.html');
-      expect(source).to.be.eql(DIRECT);
-    });
-
-    it('should parse campaign visit', function() {
-      stubGetItem.withArgs('adk_dpt_analytics').returns(undefined);
-      stubSetItem.returns(undefined);
-      let source = getUmtSource('https://lander.com/index.html?utm_campaign=new_campaign&utm_source=adkernel&utm_medium=email&utm_c1=1&utm_c2=2&utm_c3=3&utm_c4=4&utm_c5=5');
-      expect(source).to.be.eql(CAMPAIGN);
-    });
-  });
-
-  describe('ExpiringQueue', function() {
-    let timer;
-    before(function() {
-      timer = sandbox.useFakeTimers(0);
-    });
-    after(function() {
-      timer.restore();
-    });
-
-    it('should notify after timeout period', (done) => {
-      let queue = new ExpiringQueue(() => {
-        let elements = queue.popAll();
-        expect(elements).to.be.eql([1, 2, 3, 4]);
-        elements = queue.popAll();
-        expect(elements).to.have.lengthOf(0);
-        expect(Date.now()).to.be.equal(200);
-        done();
-      }, 100);
-
-      queue.push(1);
-      setTimeout(() => {
-        queue.push([2, 3]);
-        timer.tick(50);
-      }, 50);
-      setTimeout(() => {
-        queue.push([4]);
-        timer.tick(100);
-      }, 100);
-      timer.tick(50);
-    });
-  });
-
-  const REQUEST = {
-    bidderCode: 'AppNexus',
-    bidderName: 'AppNexus',
-    auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f',
-    bidderRequestId: '1a6fc81528d0f6',
-    bids: [{
-      bidder: 'AppNexus',
-      params: {},
-      adUnitCode: 'container-1',
-      transactionId: 'de90df62-7fd0-4fbc-8787-92d133a7dc06',
-      sizes: [
-        [300, 250]
-      ],
-      bidId: '208750227436c1',
-      bidderRequestId: '1a6fc81528d0f6',
-      auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f'
-    }],
-    auctionStart: 1509369418387,
-    timeout: 3000,
-    start: 1509369418389
-  };
-
-  const RESPONSE = {
-    bidderCode: 'AppNexus',
-    width: 300,
-    height: 250,
-    statusMessage: 'Bid available',
-    adId: '208750227436c1',
-    mediaType: 'banner',
-    cpm: 0.015,
-    ad: '',
-    auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f',
-    responseTimestamp: 1509369418832,
-    requestTimestamp: 1509369418389,
-    bidder: 'AppNexus',
-    adUnitCode: 'container-1',
-    timeToRespond: 443,
-    size: '300x250'
-  };
-
-  const bidTimeoutArgsV1 = [{
-    bidId: '2baa51527bd015',
-    bidderCode: 'AppNexus',
-    adUnitCode: 'container-1',
-    auctionId: '66529d4c-8998-47c2-ab3e-5b953490b98f'
-  },
-  {
-    bidId: '6fe3b4c2c23092',
-    bidderCode: 'AppNexus',
-    adUnitCode: 'container-2',
-    auctionId: '66529d4c-8998-47c2-ab3e-5b953490b98f'
-  }];
-
-  describe('Analytics adapter', function() {
-    let ajaxStub;
-    let timer;
-
-    before(function() {
-      ajaxStub = sandbox.stub(analyticsAdapter, 'ajaxCall');
-      timer = sandbox.useFakeTimers(0);
-    });
-
-    beforeEach(function() {
-      sandbox.stub(events, 'getEvents').callsFake(() => {
-        return []
-      });
-    });
-
-    afterEach(function() {
-      events.getEvents.restore();
-    });
-
-    it('should be configurable', function() {
-      adapterManager.registerAnalyticsAdapter({
-        code: 'staq',
-        adapter: analyticsAdapter
-      });
-
-      adapterManager.enableAnalytics({
-        provider: 'staq',
-        options: {
-          connId: 777,
-          queueTimeout: 1000,
-          url: 'https://localhost/prebid'
-        }
-      });
-
-      expect(analyticsAdapter.context).to.have.property('connectionId', 777);
-    });
-
-    it('should handle auction init event', function() {
-      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, { config: {}, timeout: 3000 });
-      const ev = analyticsAdapter.context.queue.peekAll();
-      expect(ev).to.have.length(1);
-      expect(ev[0]).to.be.eql({ event: 'auctionInit', auctionId: undefined });
-    });
-
-    it('should handle bid request event', function() {
-      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, REQUEST);
-      const ev = analyticsAdapter.context.queue.peekAll();
-      expect(ev).to.have.length(2);
-      expect(ev[1]).to.be.eql({
-        adUnitCode: 'container-1',
-        auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f',
-        event: 'bidRequested',
-        adapter: 'AppNexus',
-        bidderName: 'AppNexus'
-      });
-    });
-
-    it('should handle bid response event', function() {
-      events.emit(CONSTANTS.EVENTS.BID_RESPONSE, RESPONSE);
-      const ev = analyticsAdapter.context.queue.peekAll();
-      expect(ev).to.have.length(3);
-      expect(ev[2]).to.be.eql({
-        adId: '208750227436c1',
-        event: 'bidResponse',
-        adapter: 'AppNexus',
-        bidderName: 'AppNexus',
-        auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f',
-        adUnitCode: 'container-1',
-        cpm: 0.015,
-        timeToRespond: 0.443,
-        height: 250,
-        width: 300,
-        bidWon: false,
-      });
-    });
-
-    it('should handle timeouts properly', function() {
-      events.emit(CONSTANTS.EVENTS.BID_TIMEOUT, bidTimeoutArgsV1);
-
-      const ev = analyticsAdapter.context.queue.peekAll();
-      expect(ev).to.have.length(5); // remember, we added 2 timeout events
-      expect(ev[3]).to.be.eql({
-        adapter: 'AppNexus',
-        auctionId: '66529d4c-8998-47c2-ab3e-5b953490b98f',
-        bidderName: 'AppNexus',
-        event: 'adapterTimedOut'
-      })
-    });
-
-    it('should handle winning bid', function() {
-      events.emit(CONSTANTS.EVENTS.BID_WON, RESPONSE);
-      const ev = analyticsAdapter.context.queue.peekAll();
-      expect(ev).to.have.length(6);
-      expect(ev[5]).to.be.eql({
-        auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f',
-        adId: '208750227436c1',
-        event: 'bidWon',
-        adapter: 'AppNexus',
-        bidderName: 'AppNexus',
-        adUnitCode: 'container-1',
-        cpm: 0.015,
-        height: 250,
-        width: 300,
-        bidWon: true,
-      });
-    });
-
-    it('should handle auction end event', function() {
-      timer.tick(447);
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, RESPONSE);
-      let ev = analyticsAdapter.context.queue.peekAll();
-      expect(ev).to.have.length(0);
-      expect(ajaxStub.calledOnce).to.be.equal(true);
-      let firstCallArgs0 = ajaxStub.firstCall.args[0];
-      ev = JSON.parse(firstCallArgs0);
-      const ev6 = ev['events'][6];
-      expect(ev['connId']).to.be.eql(777);
-      expect(ev6.auctionId).to.be.eql('5018eb39-f900-4370-b71e-3bb5b48d324f');
-      expect(ev6.event).to.be.eql('auctionEnd');
-    });
-  });
-});
diff --git a/test/spec/modules/stnBidAdapter_spec.js b/test/spec/modules/stnBidAdapter_spec.js
new file mode 100644
index 00000000000..de851158ed0
--- /dev/null
+++ b/test/spec/modules/stnBidAdapter_spec.js
@@ -0,0 +1,619 @@
+import { expect } from 'chai';
+import { spec } from 'modules/stnBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT = 'https://hb.stngo.com/hb-multi';
+const TEST_ENDPOINT = 'https://hb.stngo.com/hb-multi-test';
+const TTL = 360;
+/* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
+
+describe('stnAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      'bidder': spec.code,
+      'adUnitCode': 'adunit-code',
+      'sizes': [['640', '480']],
+      'params': {
+        'org': 'jdye8weeyirk00000001'
+      }
+    };
+
+    it('should return true when required params are passed', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not found', function () {
+      const newBid = Object.assign({}, bid);
+      delete newBid.params;
+      newBid.params = {
+        'org': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 1,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'video': {
+            'playerSize': [[640, 480]],
+            'context': 'instream',
+            'plcmt': 1
+          }
+        },
+        'vastXml': '"..."'
+      },
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 1,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'banner': {
+          }
+        },
+        'ad': '""'
+      }
+    ];
+
+    const testModeBidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001',
+          'testMode': true
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 2,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'stn',
+    }
+    const placementId = '12345678';
+    const api = [1, 2];
+    const mimes = ['application/javascript', 'video/mp4', 'video/quicktime'];
+    const protocols = [2, 3, 5, 6];
+
+    it('sends the placementId to ENDPOINT via POST', function () {
+      bidRequests[0].params.placementId = placementId;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].placementId).to.equal(placementId);
+    });
+
+    it('sends the plcmt to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].plcmt).to.equal(1);
+    });
+
+    it('sends the is_wrapper parameter to ENDPOINT via POST', function() {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('is_wrapper');
+      expect(request.data.params.is_wrapper).to.equal(false);
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to TEST ENDPOINT via POST', function () {
+      const request = spec.buildRequests(testModeBidRequests, bidderRequest);
+      expect(request.url).to.equal(TEST_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send the correct bid Id', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].bidId).to.equal('299ffc8cca0b87');
+    });
+
+    it('should send the correct supported api array', function () {
+      bidRequests[0].mediaTypes.video.api = api;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].api).to.be.an('array');
+      expect(request.data.bids[0].api).to.eql([1, 2]);
+    });
+
+    it('should send the correct mimes array', function () {
+      bidRequests[1].mediaTypes.banner.mimes = mimes;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[1].mimes).to.be.an('array');
+      expect(request.data.bids[1].mimes).to.eql(['application/javascript', 'video/mp4', 'video/quicktime']);
+    });
+
+    it('should send the correct protocols array', function () {
+      bidRequests[0].mediaTypes.video.protocols = protocols;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].protocols).to.be.an('array');
+      expect(request.data.bids[0].protocols).to.eql([2, 3, 5, 6]);
+    });
+
+    it('should send the correct sizes array', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].sizes).to.be.an('array');
+      expect(request.data.bids[0].sizes).to.equal(bidRequests[0].sizes)
+      expect(request.data.bids[1].sizes).to.be.an('array');
+      expect(request.data.bids[1].sizes).to.equal(bidRequests[1].sizes)
+    });
+
+    it('should send the correct media type', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].mediaType).to.equal(VIDEO)
+      expect(request.data.bids[1].mediaType).to.equal(BANNER)
+    });
+
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should respect "iframe" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            iframe: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should respect "all" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            all: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should send the pixel user sync param if userSync is enabled and no "iframe" or "all" configs are present', function () {
+      config.resetConfig();
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'pixel');
+    });
+
+    it('should respect total exclusion', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            image: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            },
+            iframe: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should have us_privacy param if usPrivacy is available in the bidRequest', function () {
+      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('us_privacy', '1YNN');
+    });
+
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('us_privacy');
+    });
+
+    it('should not send the gdpr param if gdprApplies is false in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: false}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gdpr');
+      expect(request.data.params).to.not.have.property('gdpr_consent');
+    });
+
+    it('should send the gdpr param if gdprApplies is true in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: true, consentString: 'test-consent-string'}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gdpr', true);
+      expect(request.data.params).to.have.property('gdpr_consent', 'test-consent-string');
+    });
+
+    it('should not send the gpp param if gppConsent is false in the bidRequest', function () {
+      const bidderRequestWithGPP = Object.assign({gppConsent: false}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGPP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gpp');
+      expect(request.data.params).to.not.have.property('gpp_sid');
+    });
+
+    it('should send the gpp param if gppConsent is true in the bidRequest', function () {
+      const bidderRequestWithGPP = Object.assign({gppConsent: {gppString: 'test-consent-string', applicableSections: [7]}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGPP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gpp', 'test-consent-string');
+      expect(request.data.params.gpp_sid[0]).to.be.equal(7);
+    });
+
+    it('should have schain param if it is available in the bidRequest', () => {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
+      };
+      bidRequests[0].schain = schain;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('schain', '1.0,1!indirectseller.com,00001,1,,,');
+    });
+
+    it('should set flooPrice to getFloor.floor value if it is greater than params.floorPrice', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.32
+        }
+      }
+      bid.params.floorPrice = 0.64;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 3.32);
+    });
+
+    it('should set floorPrice to params.floorPrice value if it is greater than getFloor.floor', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 0.8
+        }
+      }
+      bid.params.floorPrice = 1.5;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 1.5);
+    });
+
+    it('should check sua param in bid request', function() {
+      const sua = {
+        'platform': {
+          'brand': 'macOS',
+          'version': ['12', '4', '0']
+        },
+        'browsers': [
+          {
+            'brand': 'Chromium',
+            'version': [ '106', '0', '5249', '119' ]
+          },
+          {
+            'brand': 'Google Chrome',
+            'version': [ '106', '0', '5249', '119' ]
+          },
+          {
+            'brand': 'Not;A=Brand',
+            'version': [ '99', '0', '0', '0' ]
+          }
+        ],
+        'mobile': 0,
+        'model': '',
+        'bitness': '64',
+        'architecture': 'x86'
+      }
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.ortb2 = {
+        'device': {
+          'sua': {
+            'platform': {
+              'brand': 'macOS',
+              'version': [ '12', '4', '0' ]
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '106', '0', '5249', '119' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '106', '0', '5249', '119' ]
+              },
+              {
+                'brand': 'Not;A=Brand',
+                'version': [ '99', '0', '0', '0' ]
+              }
+            ],
+            'mobile': 0,
+            'model': '',
+            'bitness': '64',
+            'architecture': 'x86'
+          }
+        }
+      }
+      const requestWithSua = spec.buildRequests([bid], bidderRequest);
+      const data = requestWithSua.data;
+      expect(data.bids[0].sua).to.exist;
+      expect(data.bids[0].sua).to.deep.equal(sua);
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].sua).to.not.exist;
+    });
+
+    describe('COPPA Param', function() {
+      it('should set coppa equal 0 in bid request if coppa is set to false', function() {
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request.data.bids[0].coppa).to.be.equal(0);
+      });
+
+      it('should set coppa equal 1 in bid request if coppa is set to true', function() {
+        const bid = utils.deepClone(bidRequests[0]);
+        bid.ortb2 = {
+          'regs': {
+            'coppa': true,
+          }
+        };
+        const request = spec.buildRequests([bid], bidderRequest);
+        expect(request.data.bids[0].coppa).to.be.equal(1);
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      params: {
+        currency: 'USD',
+        netRevenue: true,
+      },
+      bids: [{
+        cpm: 12.5,
+        vastXml: '',
+        width: 640,
+        height: 480,
+        requestId: '21e12606d47ba7',
+        creativeId: 'creative-id-1',
+        adomain: ['abc.com'],
+        mediaType: VIDEO,
+        nurl: 'http://example.com/win/1234',
+      },
+      {
+        cpm: 12.5,
+        ad: '""',
+        width: 300,
+        height: 250,
+        requestId: '21e12606d47ba7',
+        creativeId: 'creative-id-2',
+        adomain: ['abc.com'],
+        mediaType: BANNER,
+        nurl: 'http://example.com/win/1234',
+      }]
+    };
+
+    const expectedVideoResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 640,
+      height: 480,
+      ttl: TTL,
+      creativeId: 'creative-id-1',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: VIDEO,
+      meta: {
+        mediaType: VIDEO,
+        advertiserDomains: ['abc.com']
+      },
+      vastXml: '',
+    };
+
+    const expectedBannerResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 300,
+      height: 250,
+      ttl: TTL,
+      creativeId: 'creative-id-2',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: BANNER,
+      meta: {
+        mediaType: BANNER,
+        advertiserDomains: ['abc.com']
+      },
+      ad: '""'
+    };
+
+    it('should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[0]).to.deep.equal(expectedVideoResponse);
+      expect(result[1]).to.deep.equal(expectedBannerResponse);
+    });
+
+    it('video type should have vastXml key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[0].vastXml).to.equal(expectedVideoResponse.vastXml)
+    });
+
+    it('banner type should have ad key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[1].ad).to.equal(expectedBannerResponse.ad)
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        params: {
+          userSyncPixels: [
+            'https://image-sync-url.test/1',
+            'https://image-sync-url.test/2',
+            'https://image-sync-url.test/3'
+          ]
+        }
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        params: {
+          userSyncURL: 'https://iframe-sync-url.test'
+        }
+      }
+    };
+
+    it('should register all img urls from the response', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should register the iframe url from the response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [iframeSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        }
+      ]);
+    });
+
+    it('should register both image and iframe urls from the responses', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, [iframeSyncResponse, imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should handle an empty response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, []);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should handle when user syncs are disabled', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: false }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([]);
+    });
+  })
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should trigger pixel if bid nurl', function() {
+      const bid = {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [['640', '480']],
+        'nurl': 'http://example.com/win/1234',
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        }
+      };
+
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.callCount).to.equal(1)
+    })
+  })
+});
diff --git a/test/spec/modules/stroeerCoreBidAdapter_spec.js b/test/spec/modules/stroeerCoreBidAdapter_spec.js
index 2ed5f80f152..d186b0d5cd0 100644
--- a/test/spec/modules/stroeerCoreBidAdapter_spec.js
+++ b/test/spec/modules/stroeerCoreBidAdapter_spec.js
@@ -169,16 +169,17 @@ describe('stroeerCore bid adapter', function () {
   }
 
   function setupSingleWindow(sandBox, placementElements = [createElement('div-1', 17), createElement('div-2', 54)]) {
-    const win = createWindow('http://www.xyz.com/', {
-      parent: win, top: win, frameElement: createElement(undefined, 304), placementElements: placementElements
+    let singleWin = null
+    singleWin = createWindow('http://www.xyz.com/', {
+      parent: singleWin, top: singleWin, frameElement: createElement(undefined, 304), placementElements: placementElements
     });
 
-    win.innerHeight = 200;
+    singleWin.innerHeight = 200;
 
-    sandBox.stub(utils, 'getWindowSelf').returns(win);
-    sandBox.stub(utils, 'getWindowTop').returns(win);
+    sandBox.stub(utils, 'getWindowSelf').returns(singleWin);
+    sandBox.stub(utils, 'getWindowTop').returns(singleWin);
 
-    return win;
+    return singleWin;
   }
 
   function setupNestedWindows(sandBox, placementElements = [createElement('div-1', 17), createElement('div-2', 54)]) {
@@ -407,7 +408,6 @@ describe('stroeerCore bid adapter', function () {
           'timeout': expectedTimeout,
           'ref': 'https://www.example.com/?search=monkey',
           'mpa': true,
-          'ssl': false,
           'url': 'https://www.example.com/monkey/index.html',
           'bids': [{
             'sid': 'NDA=',
@@ -533,6 +533,7 @@ describe('stroeerCore bid adapter', function () {
                 'siz': [[300, 600], [160, 60]],
                 'fp': undefined
               },
+              'sfp': undefined,
             },
             {
               'sid': 'ABC=',
@@ -541,7 +542,8 @@ describe('stroeerCore bid adapter', function () {
                 'siz': [[100, 200], [300, 500]],
                 'fp': undefined
               },
-              'viz': undefined
+              'viz': undefined,
+              'sfp': undefined,
             }
           ];
 
@@ -555,7 +557,8 @@ describe('stroeerCore bid adapter', function () {
                 'siz': [640, 480],
                 'mim': ['video/mp4', 'video/quicktime'],
                 'fp': undefined
-              }
+              },
+              'sfp': undefined,
             }
           ];
 
@@ -597,7 +600,8 @@ describe('stroeerCore bid adapter', function () {
               'ban': {
                 'siz': [[100, 200], [300, 500]],
                 'fp': undefined
-              }
+              },
+              'sfp': undefined,
             }
           ];
 
@@ -611,14 +615,14 @@ describe('stroeerCore bid adapter', function () {
                 'siz': [640, 480],
                 'mim': ['video/mp4', 'video/quicktime'],
                 'fp': undefined
-              }
+              },
+              'sfp': undefined,
             }
           ];
 
           assert.deepEqual(serverRequestInfo.data.bids, [...expectedBannerBids, ...expectedVideoBids]);
         });
       });
-
       describe('optional fields', () => {
         it('should skip viz field when unable to determine visibility of placement', () => {
           placementElements.length = 0;
@@ -844,6 +848,115 @@ describe('stroeerCore bid adapter', function () {
           assert.nestedPropertyVal(bid, 'ban.fp.cur', 'EUR');
           assert.deepNestedPropertyVal(bid, 'ban.fp.siz', [{w: 160, h: 60, p: 2.7}]);
         });
+
+        it('should add the DSA signals', () => {
+          const bidReq = buildBidderRequest();
+          const dsa = {
+            dsarequired: 3,
+            pubrender: 0,
+            datatopub: 2,
+            transparency: [
+              {
+                domain: 'testplatform.com',
+                dsaparams: [1],
+              },
+              {
+                domain: 'testdomain.com',
+                dsaparams: [1, 2]
+              }
+            ]
+          }
+          const ortb2 = {
+            regs: {
+              ext: {
+                dsa
+              }
+            }
+          }
+
+          bidReq.ortb2 = utils.deepClone(ortb2);
+
+          const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+          const sentOrtb2 = serverRequestInfo.data.ortb2;
+
+          assert.deepEqual(sentOrtb2, ortb2);
+        });
+
+        it('should add the Cookie Deprecation Label', () => {
+          const bidReq = buildBidderRequest();
+
+          const cDepObj = {
+            cdep: 'example_label_1'
+          };
+
+          const ortb2 = {
+            device: {
+              ext: cDepObj
+            }
+          };
+
+          bidReq.ortb2 = utils.deepClone(ortb2);
+
+          const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+          const sentOrtb2 = serverRequestInfo.data.ortb2;
+
+          assert.deepEqual(sentOrtb2, ortb2);
+        });
+
+        it('should add the special format parameters', () => {
+          const bidReq = buildBidderRequest();
+
+          const sfp0 = {
+            'field1': {
+              'abc': '123',
+            }
+          };
+
+          const sfp1 = {
+            'field3': 'xyz'
+          };
+
+          bidReq.bids[0].params.sfp = utils.deepClone(sfp0);
+          bidReq.bids[1].params.sfp = utils.deepClone(sfp1);
+
+          const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+
+          assert.deepEqual(serverRequestInfo.data.bids[0].sfp, sfp0);
+          assert.deepEqual(serverRequestInfo.data.bids[1].sfp, sfp1);
+        });
+
+        it('should add the special format parameters even when it is an empty object', () => {
+          const bidReq = buildBidderRequest();
+
+          bidReq.bids[0].params.sfp = {};
+
+          const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+
+          assert.deepEqual(serverRequestInfo.data.bids[0].sfp, {});
+          assert.isUndefined(serverRequestInfo.data.bids[1].sfp);
+        });
+
+        it('should add the ortb2 site extension', () => {
+          const bidReq = buildBidderRequest();
+
+          const ortb2 = {
+            site: {
+              domain: 'example.com',
+              ext: {
+                data: {
+                  abc: '123'
+                }
+              }
+            }
+          };
+
+          bidReq.ortb2 = utils.deepClone(ortb2);
+
+          const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+
+          const sentOrtb2 = serverRequestInfo.data.ortb2;
+          assert.deepEqual(sentOrtb2, {site: {ext: ortb2.site.ext}})
+        });
       });
     });
   });
@@ -882,13 +995,42 @@ describe('stroeerCore bid adapter', function () {
       assertStandardFieldsOnVideoBid(videoBidResponse, 'bid1', 'video', 800, 250, 4);
     })
 
-    it('should add data to meta object', () => {
+    it('should add advertiser domains to meta object', () => {
       const response = buildBidderResponse();
       response.bids[0] = Object.assign(response.bids[0], {adomain: ['website.org', 'domain.com']});
       const result = spec.interpretResponse({body: response});
-      assert.deepPropertyVal(result[0], 'meta', {advertiserDomains: ['website.org', 'domain.com']});
-      // nothing provided for the second bid
-      assert.deepPropertyVal(result[1], 'meta', {advertiserDomains: undefined});
+      assert.deepPropertyVal(result[0].meta, 'advertiserDomains', ['website.org', 'domain.com']);
+      assert.propertyVal(result[1].meta, 'advertiserDomains', undefined);
+    });
+
+    it('should add dsa info to meta object', () => {
+      const dsaResponse = {
+        behalf: 'AdvertiserA',
+        paid: 'AdvertiserB',
+        transparency: [{
+          domain: 'dspexample.com',
+          dsaparams: [1, 2],
+        }],
+        adrender: 1
+      };
+
+      const response = buildBidderResponse();
+      response.bids[0] = Object.assign(response.bids[0], {dsa: utils.deepClone(dsaResponse)});
+
+      const result = spec.interpretResponse({body: response});
+
+      assert.deepPropertyVal(result[0].meta, 'dsa', dsaResponse);
+      assert.propertyVal(result[1].meta, 'dsa', undefined);
+    });
+
+    it('should add campaignType to meta object', () => {
+      const response = buildBidderResponse();
+      response.bids[1] = Object.assign(response.bids[1], {campaignType: 'RTB'});
+
+      const result = spec.interpretResponse({body: response});
+
+      assert.propertyVal(result[0].meta, 'campaignType', undefined);
+      assert.propertyVal(result[1].meta, 'campaignType', 'RTB');
     });
   });
 
diff --git a/test/spec/modules/stvBidAdapter_spec.js b/test/spec/modules/stvBidAdapter_spec.js
index 41f29cced34..9dc311562ba 100644
--- a/test/spec/modules/stvBidAdapter_spec.js
+++ b/test/spec/modules/stvBidAdapter_spec.js
@@ -30,12 +30,12 @@ describe('stvAdapter', function() {
     });
 
     it('should return false when required params are not passed', function() {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'someIncorrectParam': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
@@ -71,6 +71,24 @@ describe('stvAdapter', function() {
               'hp': 1
             }
           ]
+        },
+        'userId': {
+          'id5id': {
+            'uid': '1234',
+            'ext': {
+              'linkType': 'abc'
+            }
+          },
+          'netId': '2345',
+          'uid2': {
+            'id': '3456',
+          },
+          'sharedid': {
+            'id': '4567',
+          },
+          'idl_env': '5678',
+          'criteoId': '6789',
+          'utiq': '7890',
         }
       },
       {
@@ -84,7 +102,27 @@ describe('stvAdapter', function() {
         ],
         'bidId': '30b31c1838de1e2',
         'bidderRequestId': '22edbae2733bf62',
-        'auctionId': '1d1a030790a476'
+        'auctionId': '1d1a030790a476',
+        'userId': { // with other utiq variant
+          'id5id': {
+            'uid': '1234',
+            'ext': {
+              'linkType': 'abc'
+            }
+          },
+          'netId': '2345',
+          'uid2': {
+            'id': '3456',
+          },
+          'sharedid': {
+            'id': '4567',
+          },
+          'idl_env': '5678',
+          'criteoId': '6789',
+          'utiq': {
+            'id': '7890'
+          },
+        }
       }, {
         'bidder': 'stv',
         'params': {
@@ -181,7 +219,7 @@ describe('stvAdapter', function() {
       expect(request1.method).to.equal('GET');
       expect(request1.url).to.equal(ENDPOINT_URL);
       let data = request1.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid').replace(/pbver=.*?&/g, 'pbver=test&');
-      expect(data).to.equal('_f=html&alternative=prebid_js&_ps=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e1&pbver=test&schain=1.0,0!reseller.com,aaaaa,1,BidRequest4,,,&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&gdpr_consent=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&gdpr=true&bcat=IAB2%2CIAB4&dvt=desktop&pbcode=testDiv1&media_types%5Bbanner%5D=300x250');
+      expect(data).to.equal('_f=html&alternative=prebid_js&_ps=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e1&pbver=test&schain=1.0,0!reseller.com,aaaaa,1,BidRequest4,,&uids=id5%3A1234,id5_linktype%3Aabc,netid%3A2345,uid2%3A3456,sharedid%3A4567,liverampid%3A5678,criteoid%3A6789,utiq%3A7890&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&gdpr_consent=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&gdpr=true&bcat=IAB2%2CIAB4&dvt=desktop&pbcode=testDiv1&media_types%5Bbanner%5D=300x250');
     });
 
     var request2 = spec.buildRequests([bidRequests[1]], bidderRequest)[0];
@@ -189,7 +227,7 @@ describe('stvAdapter', function() {
       expect(request2.method).to.equal('GET');
       expect(request2.url).to.equal(ENDPOINT_URL);
       let data = request2.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid').replace(/pbver=.*?&/g, 'pbver=test&');
-      expect(data).to.equal('_f=html&alternative=prebid_js&_ps=101&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e2&pbver=test&gdpr_consent=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&gdpr=true&prebidDevMode=1&media_types%5Bbanner%5D=300x250');
+      expect(data).to.equal('_f=html&alternative=prebid_js&_ps=101&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e2&pbver=test&uids=id5%3A1234,id5_linktype%3Aabc,netid%3A2345,uid2%3A3456,sharedid%3A4567,liverampid%3A5678,criteoid%3A6789,utiq%3A7890&gdpr_consent=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&gdpr=true&prebidDevMode=1&media_types%5Bbanner%5D=300x250');
     });
 
     // Without gdprConsent
@@ -239,7 +277,7 @@ describe('stvAdapter', function() {
         'width': '300',
         'height': '250',
         'type': 'sspHTML',
-        'tag': '',
+        'adTag': '',
         'requestId': '220ed41385952a',
         'currency': 'EUR',
         'ttl': 60,
@@ -300,7 +338,7 @@ describe('stvAdapter', function() {
         }
       }];
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(Object.keys(result[0])).to.include.members(Object.keys(expectedResponse[0]));
       expect(result[0].meta.advertiserDomains.length).to.equal(1);
       expect(result[0].meta.advertiserDomains[0]).to.equal(expectedResponse[0].meta.advertiserDomains[0]);
     });
@@ -320,7 +358,7 @@ describe('stvAdapter', function() {
         }
       }];
       let result = spec.interpretResponse(serverVideoResponse, bidRequest[0]);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[1]));
+      expect(Object.keys(result[0])).to.include.members(Object.keys(expectedResponse[1]));
       expect(result[0].meta.advertiserDomains.length).to.equal(0);
     });
 
diff --git a/test/spec/modules/symitriAnalyticsAdapter_spec.js b/test/spec/modules/symitriAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..c02d5b55696
--- /dev/null
+++ b/test/spec/modules/symitriAnalyticsAdapter_spec.js
@@ -0,0 +1,90 @@
+import symitriAnalyticsAdapter from 'modules/symitriAnalyticsAdapter.js';
+import { expect } from 'chai';
+import adapterManager from 'src/adapterManager.js';
+import { server } from 'test/mocks/xhr.js';
+import { EVENTS } from 'src/constants.js';
+
+let events = require('src/events');
+
+describe('symitri analytics adapter', function () {
+  beforeEach(function () {
+    sinon.stub(events, 'getEvents').returns([]);
+  });
+
+  afterEach(function () {
+    events.getEvents.restore();
+  });
+
+  describe('track', function () {
+    let initOptionsValid = {
+      apiAuthToken: 'TOKEN1234'
+    };
+    let initOptionsInValid = {
+    };
+
+    let bidWon = {
+      'bidderCode': 'appnexus',
+      'width': 300,
+      'height': 250,
+      'statusMessage': 'Bid available',
+      'adId': '393976d8770041',
+      'requestId': '263efc09896d0c',
+      'mediaType': 'banner',
+      'source': 'client',
+      'cpm': 0.5,
+      'creativeId': 96846035,
+      'currency': 'USD',
+      'netRevenue': true,
+      'ttl': 300,
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'originalCpm': 0.5,
+      'originalCurrency': 'USD',
+      'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
+      'responseTimestamp': 1576823894050,
+      'requestTimestamp': 1576823893838,
+      'bidder': 'appnexus',
+      'timeToRespond': 212,
+      'status': 'rendered'
+    };
+
+    adapterManager.registerAnalyticsAdapter({
+      code: 'symitri',
+      adapter: symitriAnalyticsAdapter
+    });
+
+    afterEach(function () {
+      symitriAnalyticsAdapter.disableAnalytics();
+    });
+
+    it('Test with valid apiAuthToken', function () {
+      adapterManager.enableAnalytics({
+        provider: 'symitri',
+        options: initOptionsValid
+      });
+      events.emit(EVENTS.BID_WON, bidWon);
+      expect(server.requests.length).to.equal(1);
+    });
+
+    it('Test with missing apiAuthToken', function () {
+      adapterManager.enableAnalytics({
+        provider: 'symitri',
+        options: initOptionsInValid
+      });
+      events.emit(EVENTS.BID_WON, bidWon);
+      expect(server.requests.length).to.equal(0);
+    });
+
+    it('Test correct winning bid is sent to server', function () {
+      adapterManager.enableAnalytics({
+        provider: 'symitri',
+        options: initOptionsValid
+      });
+      events.emit(EVENTS.BID_WON, bidWon);
+      expect(server.requests.length).to.equal(1);
+      let winEventData = JSON.parse(server.requests[0].requestBody);
+      expect(winEventData).to.deep.equal(bidWon);
+      let authToken = server.requests[0].requestHeaders['Authorization'];
+      expect(authToken).to.equal(initOptionsValid.apiAuthToken);
+    });
+  });
+});
diff --git a/test/spec/modules/symitriDapRtdProvider_spec.js b/test/spec/modules/symitriDapRtdProvider_spec.js
new file mode 100644
index 00000000000..ec3ba4fdbed
--- /dev/null
+++ b/test/spec/modules/symitriDapRtdProvider_spec.js
@@ -0,0 +1,661 @@
+import {config} from 'src/config.js';
+import {
+  dapUtils,
+  generateRealTimeData,
+  symitriDapRtdSubmodule,
+  onBidWonListener,
+  storage, DAP_MAX_RETRY_TOKENIZE, DAP_SS_ID, DAP_TOKEN, DAP_MEMBERSHIP, DAP_ENCRYPTED_MEMBERSHIP
+} from 'modules/symitriDapRtdProvider.js';
+import {server} from 'test/mocks/xhr.js';
+import {hook} from '../../../src/hook.js';
+import { EVENTS } from 'src/constants.js';
+const responseHeader = {'Content-Type': 'application/json'};
+
+let events = require('src/events');
+
+describe('symitriDapRtdProvider', function() {
+  const testReqBidsConfigObj = {
+    adUnits: [
+      {
+        bids: ['bid1', 'bid2']
+      }
+    ]
+  };
+
+  const onDone = function() { return true };
+
+  const sampleGdprConsentConfig = {
+    'gdpr': {
+      'consentString': null,
+      'vendorData': {},
+      'gdprApplies': true
+    }
+  };
+
+  const sampleUspConsentConfig = {
+    'usp': '1YYY'
+  };
+
+  const sampleIdentity = {
+    type: 'dap-signature:1.0.0'
+  };
+
+  const cmoduleConfig = {
+    'name': 'symitriDap',
+    'waitForIt': true,
+    'params': {
+      'apiHostname': 'prebid.dap.akadns.net',
+      'apiVersion': 'x1',
+      'apiAuthToken': 'Token 1234',
+      'domain': 'prebid.org',
+      'identityType': 'dap-signature:1.0.0',
+      'segtax': 708
+    }
+  }
+
+  const emoduleConfig = {
+    'name': 'symitriDap',
+    'waitForIt': true,
+    'params': {
+      'apiHostname': 'prebid.dap.akadns.net',
+      'apiVersion': 'x1',
+      'domain': 'prebid.org',
+      'identityType': 'dap-signature:1.0.0',
+      'segtax': 710,
+      'pixelUrl': 'https://www.test.com/pixel'
+    }
+  }
+
+  const sampleConfig = {
+    'api_hostname': 'prebid.dap.akadns.net',
+    'api_version': 'x1',
+    'domain': 'prebid.org',
+    'segtax': 708,
+    'identity': sampleIdentity
+  }
+
+  const esampleConfig = {
+    'api_hostname': 'prebid.dap.akadns.net',
+    'api_version': 'x1',
+    'domain': 'prebid.org',
+    'segtax': 710,
+    'identity': sampleIdentity
+  }
+  let cacheExpiry = Math.round(Date.now() / 1000.0) + 300; // in seconds
+  const sampleCachedToken = {'expires_at': cacheExpiry, 'token': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIn0..6buzBd2BjtgoyaNbHN8YnQ.l38avCfm3sYNy798-ETYOugz0cOx1cCkjACkAhYszxzrZ0sUJ0AiF-NdDXVTiTyp2Ih3vCWKzS0rKJ8lbS1zhyEVWVu91QwtwseM2fBbwA5ggAgBEo5wV-IXqDLPxVnxsPF0D3hP6cNCiH9Q2c-vULfsLhMhG5zvvZDPBbn4hUY5fKB8LoCBTF9rbuuWGYK1nramnb4AlS5UK82wBsHQea1Ou_Kp5wWCMNZ6TZk5qKIuRBfPIAhQblWvHECaHXkg1wyoM9VASs_yNhne7RR-qkwzbFiPFiMJibNOt9hF3_vPDJO5-06ZBjRTP1BllYGWxI-uQX6InzN18Wtun2WHqg.63sH0SNlIRcsK57v0pMujfB_nhU8Y5CuQbsHqH5MGoM'};
+  const cachedEncryptedMembership = {'expires_at': cacheExpiry, 'encryptedSegments': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoic29tZXNlY3JldGludmF1bHQifQ..IvnIUQDqWBVYIS0gbcE9bw.Z4NZGvtogWaWlGH4e-GdYKe_PUc15M2x3Bj85rMWsN1A17mIxQIMOfg2hsQ2tgieLu5LggWPmsFu1Wbph6P0k3kOu1dVReoIhOHzxw50rP0DLHKaEZ5mLMJ7Lcosvwh4miIfFuCHlsX7J0sFgOTAp0zGo1S_UsHLtev1JflhjoSB0AoX95ALbAnyctirPuLJM8gZ1vXTiZ01jpvucGyR1lM4cWjPOeD8jPtgwaPGgSRZXE-3X2Cqy7z4Giam5Uqu74LPWTBuKtUQTGyAXA5QJoP7xwTbsU4O1f69lu3fWNqC92GijeTH1A4Zd_C-WXxWuQlDEURjlkWQoaqTHka2OqlnwukEQIf_v0r5KQQX64CTLhEUH91jeD0-E9ClcIP7pwOLxxqiKoaBmx8Mrnm_6Agj5DtTA1rusy3AL63sI_rsUxrmLrVt0Wft4aCfRkW8QpQxu8clFdOmce0NNCGeBCyCPVw9d9izrILlXJ6rItU2cpFrcbz8uw2otamF5eOFCOY3IzHedWVNNuKHFIUVC_xYSlsYvQ8f2QIP1eiMbmukcuPzmTzjw1h1_7IKaj-jJkXrnrY-TdDgX_4-_Z3rmbpXK2yTR7dBrsg-ubqFbgbKic1b4zlQEO_LbBlgPl3DYdWEuJ8CY2NUt1GfpATQGsufS2FTY1YGw_gkPe3q04l_cgLafDoxHvHh_t_0ZgPjciW82gThB_kN4RP7Mc3krVcXl_P6N1VbV07xyx0hCyVsrrxbLslI8q9wYDiLGci7mNmByM5j7SXV9jPwwPkHtn0HfMJlw2PFbIDPjgG3h7sOyLcBIJTTvuUIgpHPIkRWLIl_4FlIucXbJ7orW2nt5BWleBVHgumzGcnl9ZNcZb3W-dsdYPSOmuj0CY28MRTP2oJ1rzLInbDDpIRffJBtR7SS4nYyy7Vi09PtBigod5YNz1Q0WDSJxr8zeH_aKFaXInw7Bfo_U0IAcLiRgcT0ogsMLeQRjRFy27mr4XNJv3NtHhbdjDAwF2aClCktXyXbQaVdsPH2W71v6m2Q9rB5GQWOktw2s5f-4N1-_EBPGq6TgjF-aJZP22MJVwp1pimT50DfOzoeEqDwi862NNwNNoHmcObH0ZfwAXlhRxsgupNBe20-MNNABj2Phlfv4DUrtQbMdfCnNiypzNCmoTb7G7c_o5_JUwoV_GVkwUtvmi_IUm05P4GeMASSUw8zDKVRAj9h31C2cabM8RjMHGhkbCWpUP2pcz9zlJ7Y76Dh3RLnctfTw7DG9U4w4UlaxNZOgLUiSrGwfyapuSiuGUpuOJkBBLiHmEqAGI5C8oJpcVRccNlHxJAYowgXyFopD5Fr-FkXmv8KMkS0h5C9F6KihmDt5sqDD0qnjM0hHJgq01l7wjVnhEmPpyD-6auFQ-xDnbh1uBOJ_0gCVbRad--FSa5p-dXenggegRxOvZXJ0iAtM6Fal5Og-RCjexIHa9WhVbXhQBJpkSTWwAajZJ64eQ.yih49XB51wE-Xob7COT9OYqBrzBmIMVCQbLFx2UdzkI'};
+  const cachedMembership = {'expires_at': cacheExpiry, 'said': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIn0..QwvU5h0NVJYaJbs5EqWCKA.XNaJHSlnsH8P-yBIr3gIEqavLONWDIFyj7QCHFwJVkwXH_EYkxrk0_26b0uMPzfJp5URnqxKZusMH9DzEJsmj8EMrKQv1y3IYYMsW5_0BdP5bcAWfG6fzOqtMOwLiYRkYiQOqn1ZVGzhovheHWEmNr2_oCY0LvAr3iN1eG_K-l-bBKvBWnwvuuGKquUfCqO8NMMq6wtkecEXM9blqFRZ7oNYmW2aIG7qcHUsrUW7HMr9Ev2Ik0sIeEUsOYrgf_X_VA64RgKSTRugS9FupMv1p54JkHokwduF9pOFmW8QLQi8itFogKGbbgvOTNnmahxQUX5FcrjjYLqHwKqC8htLdlHnO5LWU9l4A7vLXrRurvoSnh0cAJy0GsdoyEwTqR9bwVFHoPquxlJjQ4buEd7PIxpBj9Qg9oOPH3b2upbMTu5CQ9oj526eXPhP5G54nwGklm2AZ3Vggd7jCQJn45Jjiq0iIfsXAtpqS2BssCLBN8WhmUTnStK8m5sux6WUBdrpDESQjPj-EEHVS-DB5rA7icRUh6EzRxzen2rndvHvnwVhSG_l6cwPYuJ0HE0KBmYHOoqNpKwzoGiKFHrf4ReA06iWB3V2TEGJucGujhtQ9_18WwHCeJ1XtQiiO1eqa3tp5MwAbFXawVFl3FFOBgadrPyvGmkmUJ6FCLU2MSwHiYZmANMnJsokFX_6DwoAgO3U_QnvEHIVSvefc7ReeJ8fBDdmrH3LtuLrUpXsvLvEIMQdWQ_SXhjKIi7tOODR8CfrhUcdIjsp3PZs1DpuOcDB6YJKbGnKZTluLUJi3TyHgyi-DHXdTm-jSE5i_DYJGW-t2Gf23FoQhexv4q7gdrfsKfcRJNrZLp6Gd6jl4zHhUtY.nprKBsy9taQBk6dCPbA7BFF0CiGhQOEF_MazZ2bedqk', 'cohorts': ['9', '11', '13']};
+  const cachedMembershipWithDeals = {'expires_at': cacheExpiry, 'said': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIn0..QwvU5h0NVJYaJbs5EqWCKA.XNaJHSlnsH8P-yBIr3gIEqavLONWDIFyj7QCHFwJVkwXH_EYkxrk0_26b0uMPzfJp5URnqxKZusMH9DzEJsmj8EMrKQv1y3IYYMsW5_0BdP5bcAWfG6fzOqtMOwLiYRkYiQOqn1ZVGzhovheHWEmNr2_oCY0LvAr3iN1eG_K-l-bBKvBWnwvuuGKquUfCqO8NMMq6wtkecEXM9blqFRZ7oNYmW2aIG7qcHUsrUW7HMr9Ev2Ik0sIeEUsOYrgf_X_VA64RgKSTRugS9FupMv1p54JkHokwduF9pOFmW8QLQi8itFogKGbbgvOTNnmahxQUX5FcrjjYLqHwKqC8htLdlHnO5LWU9l4A7vLXrRurvoSnh0cAJy0GsdoyEwTqR9bwVFHoPquxlJjQ4buEd7PIxpBj9Qg9oOPH3b2upbMTu5CQ9oj526eXPhP5G54nwGklm2AZ3Vggd7jCQJn45Jjiq0iIfsXAtpqS2BssCLBN8WhmUTnStK8m5sux6WUBdrpDESQjPj-EEHVS-DB5rA7icRUh6EzRxzen2rndvHvnwVhSG_l6cwPYuJ0HE0KBmYHOoqNpKwzoGiKFHrf4ReA06iWB3V2TEGJucGujhtQ9_18WwHCeJ1XtQiiO1eqa3tp5MwAbFXawVFl3FFOBgadrPyvGmkmUJ6FCLU2MSwHiYZmANMnJsokFX_6DwoAgO3U_QnvEHIVSvefc7ReeJ8fBDdmrH3LtuLrUpXsvLvEIMQdWQ_SXhjKIi7tOODR8CfrhUcdIjsp3PZs1DpuOcDB6YJKbGnKZTluLUJi3TyHgyi-DHXdTm-jSE5i_DYJGW-t2Gf23FoQhexv4q7gdrfsKfcRJNrZLp6Gd6jl4zHhUtY.nprKBsy9taQBk6dCPbA7BFF0CiGhQOEF_MazZ2bedqk', 'cohorts': ['9', '11', '13'], 'deals': ['{"id":"DEMODEAL555","bidfloor":5.0,"at":1,"guar":0}', '{"id":"DEMODEAL111","bidfloor":5.0,"at":1,"guar":0}', '{"id":"DEMODEAL123","bidfloor":5.0,"at":1,"guar":0}']};
+  const rtdUserObj = {
+    name: 'www.dataprovider3.com',
+    ext: {
+      taxonomyname: 'iab_audience_taxonomy'
+    },
+    segment: [
+      {
+        id: '1918'
+      },
+      {
+        id: '1939'
+      }
+    ]
+  };
+
+  const encRtdUserObj = {
+    name: 'www.dataprovider3.com',
+    ext: {
+      segtax: 710,
+      taxonomyname: 'iab_audience_taxonomy'
+    },
+    segment: []
+  };
+
+  const cachedRtd = {
+    rtd: {
+      ortb2: {
+        user: {
+          data: [rtdUserObj]
+        }
+      }
+    }
+  };
+
+  let membership = {
+    said: cachedMembership.said,
+    cohorts: cachedMembership.cohorts,
+    attributes: null
+  };
+  let encMembership = {
+    encryptedSegments: cachedEncryptedMembership.encryptedSegments
+  };
+  encRtdUserObj.segment.push({ id: encMembership.encryptedSegments });
+  const cachedEncRtd = {
+    rtd: {
+      ortb2: {
+        user: {
+          data: [encRtdUserObj]
+        }
+      }
+    }
+  };
+
+  before(() => {
+    hook.ready();
+  });
+
+  let ortb2, bidConfig;
+
+  beforeEach(function() {
+    bidConfig = {ortb2Fragments: {}};
+    ortb2 = bidConfig.ortb2Fragments.global = {};
+    config.resetConfig();
+    storage.removeDataFromLocalStorage(DAP_TOKEN);
+    storage.removeDataFromLocalStorage(DAP_MEMBERSHIP);
+    storage.removeDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP);
+    storage.removeDataFromLocalStorage(DAP_SS_ID);
+  });
+
+  afterEach(function () {
+  });
+
+  describe('symitriDapRtdSubmodule', function() {
+    it('successfully instantiates', function () {
+      expect(symitriDapRtdSubmodule.init()).to.equal(true);
+    });
+  });
+
+  describe('Get Real-Time Data', function() {
+    it('gets rtd from local storage cache', function() {
+      let dapGetMembershipFromLocalStorageStub = sinon.stub(dapUtils, 'dapGetMembershipFromLocalStorage').returns(membership)
+      let dapGetRtdObjStub = sinon.stub(dapUtils, 'dapGetRtdObj').returns(cachedRtd)
+      let dapGetEncryptedMembershipFromLocalStorageStub = sinon.stub(dapUtils, 'dapGetEncryptedMembershipFromLocalStorage').returns(encMembership)
+      let dapGetEncryptedRtdObjStub = sinon.stub(dapUtils, 'dapGetEncryptedRtdObj').returns(cachedEncRtd)
+      let callDapApisStub = sinon.stub(dapUtils, 'callDapAPIs')
+      try {
+        storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+        expect(ortb2).to.eql({});
+        generateRealTimeData(bidConfig, () => {}, emoduleConfig, {});
+
+        expect(ortb2.user.data).to.deep.include.members([encRtdUserObj]);
+        generateRealTimeData(bidConfig, () => {}, cmoduleConfig, {});
+        expect(ortb2.user.data).to.deep.include.members([rtdUserObj]);
+      } finally {
+        dapGetRtdObjStub.restore()
+        dapGetMembershipFromLocalStorageStub.restore()
+        dapGetEncryptedRtdObjStub.restore()
+        dapGetEncryptedMembershipFromLocalStorageStub.restore()
+        callDapApisStub.restore()
+      }
+    });
+  });
+
+  describe('calling DAP APIs', function() {
+    it('Calls callDapAPIs for unencrypted segments flow', function() {
+      storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+      let dapExtractExpiryFromTokenStub = sinon.stub(dapUtils, 'dapExtractExpiryFromToken').returns(cacheExpiry)
+      try {
+        expect(ortb2).to.eql({});
+        dapUtils.callDapAPIs(bidConfig, () => {}, cmoduleConfig, {});
+        let membership = {'cohorts': ['9', '11', '13'], 'said': 'sample-said'}
+        let membershipRequest = server.requests[0];
+        membershipRequest.respond(200, responseHeader, JSON.stringify(membership));
+        let tokenWithExpiry = 'Sample-token-with-exp'
+        let tokenizeRequest = server.requests[1];
+        responseHeader['Symitri-DAP-Token'] = tokenWithExpiry;
+        tokenizeRequest.respond(200, responseHeader, JSON.stringify(tokenWithExpiry));
+        let data = dapUtils.dapGetRtdObj(membership, cmoduleConfig.params.segtax);
+        expect(ortb2.user.data).to.deep.include.members(data.rtd.ortb2.user.data);
+      } finally {
+        dapExtractExpiryFromTokenStub.restore();
+      }
+    });
+
+    it('Calls callDapAPIs for encrypted segments flow', function() {
+      storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+      let dapExtractExpiryFromTokenStub = sinon.stub(dapUtils, 'dapExtractExpiryFromToken').returns(cacheExpiry)
+      try {
+        expect(ortb2).to.eql({});
+        dapUtils.callDapAPIs(bidConfig, () => {}, emoduleConfig, {});
+        let encMembership = 'Sample-enc-token';
+        let membershipRequest = server.requests[0];
+        responseHeader['Symitri-DAP-Token'] = encMembership;
+        membershipRequest.respond(200, responseHeader, JSON.stringify(encMembership));
+        let tokenWithExpiry = 'Sample-token-with-exp'
+        let tokenizeRequest = server.requests[1];
+        responseHeader['Symitri-DAP-Token'] = tokenWithExpiry;
+        tokenizeRequest.respond(200, responseHeader, JSON.stringify(tokenWithExpiry));
+        let data = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, emoduleConfig.params.segtax);
+        expect(ortb2.user.data).to.deep.include.members(data.rtd.ortb2.user.data);
+      } finally {
+        dapExtractExpiryFromTokenStub.restore();
+      }
+    });
+  });
+
+  describe('dapTokenize', function () {
+    it('dapTokenize error callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(sampleConfig));
+      let submoduleCallback = dapUtils.dapTokenize(configAsync, sampleIdentity, onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(400, responseHeader, JSON.stringify('error'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+
+    it('dapTokenize success callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(sampleConfig));
+      let submoduleCallback = dapUtils.dapTokenize(configAsync, sampleIdentity, onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify('success'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+  });
+
+  describe('dapTokenize and dapMembership incorrect params', function () {
+    it('Onerror and config are null', function () {
+      expect(dapUtils.dapTokenize(null, 'identity', onDone, null, null)).to.be.equal(undefined);
+      expect(dapUtils.dapMembership(null, 'identity', onDone, null, null)).to.be.equal(undefined);
+      expect(dapUtils.dapEncryptedMembership(null, 'identity', onDone, null, null)).to.be.equal(undefined);
+      const config = {
+        'api_hostname': 'prebid.dap.akadns.net',
+        'api_version': 1,
+        'domain': '',
+        'segtax': 708
+      };
+      const encConfig = {
+        'api_hostname': 'prebid.dap.akadns.net',
+        'api_version': 1,
+        'domain': '',
+        'segtax': 710
+      };
+      let identity = {
+        type: 'dap-signature:1.0.0'
+      };
+      expect(dapUtils.dapTokenize(config, identity, onDone, null, null)).to.be.equal(undefined);
+      expect(dapUtils.dapMembership(config, 'token', onDone, null, null)).to.be.equal(undefined);
+      expect(dapUtils.dapEncryptedMembership(encConfig, 'token', onDone, null, null)).to.be.equal(undefined);
+    });
+  });
+
+  describe('Getting dapTokenize, dapMembership and dapEncryptedMembership from localstorage', function () {
+    it('dapGetTokenFromLocalStorage success', function () {
+      storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+      expect(dapUtils.dapGetTokenFromLocalStorage(60)).to.be.equal(sampleCachedToken.token);
+    });
+
+    it('dapGetMembershipFromLocalStorage success', function () {
+      storage.setDataInLocalStorage(DAP_MEMBERSHIP, JSON.stringify(cachedMembership));
+      expect(JSON.stringify(dapUtils.dapGetMembershipFromLocalStorage())).to.be.equal(JSON.stringify(membership));
+    });
+
+    it('dapGetEncryptedMembershipFromLocalStorage success', function () {
+      storage.setDataInLocalStorage(DAP_ENCRYPTED_MEMBERSHIP, JSON.stringify(cachedEncryptedMembership));
+      expect(JSON.stringify(dapUtils.dapGetEncryptedMembershipFromLocalStorage())).to.be.equal(JSON.stringify(encMembership));
+    });
+  });
+
+  describe('dapMembership', function () {
+    it('dapMembership success callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(sampleConfig));
+      let submoduleCallback = dapUtils.dapMembership(configAsync, 'token', onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify('success'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+
+    it('dapMembership error callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(sampleConfig));
+      let submoduleCallback = dapUtils.dapMembership(configAsync, 'token', onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(400, responseHeader, JSON.stringify('error'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+  });
+
+  describe('dapEncMembership', function () {
+    it('dapEncMembership success callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(esampleConfig));
+      let submoduleCallback = dapUtils.dapEncryptedMembership(configAsync, 'token', onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify('success'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+
+    it('dapEncMembership error callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(esampleConfig));
+      let submoduleCallback = dapUtils.dapEncryptedMembership(configAsync, 'token', onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(400, responseHeader, JSON.stringify('error'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+  });
+
+  describe('dapMembership', function () {
+    it('should invoke the getDapToken and getDapMembership', function () {
+      let membership = {
+        said: 'item.said1',
+        cohorts: 'item.cohorts',
+        attributes: null
+      };
+
+      let getDapMembershipStub = sinon.stub(dapUtils, 'dapGetMembershipFromLocalStorage').returns(membership);
+      let callDapApisStub = sinon.stub(dapUtils, 'callDapAPIs');
+      try {
+        generateRealTimeData(testReqBidsConfigObj, onDone, cmoduleConfig);
+        expect(getDapMembershipStub.calledOnce).to.be.equal(true);
+      } finally {
+        getDapMembershipStub.restore();
+        callDapApisStub.restore();
+      }
+    });
+  });
+
+  describe('dapEncMembership test', function () {
+    it('should invoke the getDapToken and getEncDapMembership', function () {
+      let encMembership = {
+        encryptedSegments: 'enc.seg',
+      };
+
+      let getDapEncMembershipStub = sinon.stub(dapUtils, 'dapGetEncryptedMembershipFromLocalStorage').returns(encMembership);
+      let callDapApisStub = sinon.stub(dapUtils, 'callDapAPIs');
+      try {
+        generateRealTimeData(testReqBidsConfigObj, onDone, emoduleConfig);
+        expect(getDapEncMembershipStub.calledOnce).to.be.equal(true);
+      } finally {
+        getDapEncMembershipStub.restore();
+        callDapApisStub.restore();
+      }
+    });
+  });
+
+  describe('dapGetRtdObj test', function () {
+    it('dapGetRtdObj', function () {
+      const config = {
+        apiHostname: 'prebid.dap.akadns.net',
+        apiVersion: 'x1',
+        domain: 'prebid.org',
+        segtax: 708
+      };
+      expect(dapUtils.dapRefreshMembership(ortb2, config, 'token', onDone)).to.equal(undefined)
+      const membership = {cohorts: ['1', '5', '7']}
+      expect(dapUtils.dapGetRtdObj(membership, config.segtax)).to.not.equal(undefined);
+    });
+  });
+
+  describe('checkAndAddRealtimeData test', function () {
+    it('add realtime data for segtax 708 and 710', function () {
+      dapUtils.checkAndAddRealtimeData(ortb2, cachedEncRtd, 710);
+      dapUtils.checkAndAddRealtimeData(ortb2, cachedEncRtd, 710);
+      expect(ortb2.user.data).to.deep.include.members([encRtdUserObj]);
+      dapUtils.checkAndAddRealtimeData(ortb2, cachedRtd, 708);
+      expect(ortb2.user.data).to.deep.include.members([rtdUserObj]);
+    });
+  });
+
+  describe('dapExtractExpiryFromToken test', function () {
+    it('test dapExtractExpiryFromToken function', function () {
+      let tokenWithoutExpiry = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIn0..6buzBd2BjtgoyaNbHN8YnQ.l38avCfm3sYNy798-ETYOugz0cOx1cCkjACkAhYszxzrZ0sUJ0AiF-NdDXVTiTyp2Ih3vCWKzS0rKJ8lbS1zhyEVWVu91QwtwseM2fBbwA5ggAgBEo5wV-IXqDLPxVnxsPF0D3hP6cNCiH9Q2c-vULfsLhMhG5zvvZDPBbn4hUY5fKB8LoCBTF9rbuuWGYK1nramnb4AlS5UK82wBsHQea1Ou_Kp5wWCMNZ6TZk5qKIuRBfPIAhQblWvHECaHXkg1wyoM9VASs_yNhne7RR-qkwzbFiPFiMJibNOt9hF3_vPDJO5-06ZBjRTP1BllYGWxI-uQX6InzN18Wtun2WHqg.63sH0SNlIRcsK57v0pMujfB_nhU8Y5CuQbsHqH5MGoM'
+      expect(dapUtils.dapExtractExpiryFromToken(tokenWithoutExpiry)).to.equal(undefined);
+      let tokenWithExpiry = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIiwiZXhwIjoxNjQzODMwMzY5fQ..hTbcSQgmmO0HUJJrQ5fRHw.7zjrQXNNVkb-GD0ZhIVhEPcWbyaDBilHTWv-bp1lFZ9mdkSC0QbcAvUbYteiTD7ya23GUwcL2WOW8WgRSHaWHOJe0B5NDqfdUGTzElWfu7fFodRxRgGmwG8Rq5xxteFKLLGHLf1mFYRJKDtjtgajGNUKIDfn9AEt-c5Qz4KU8VolG_KzrLROx-f6Z7MnoPTcwRCj0WjXD6j2D6RAZ80-mKTNIsMIELdj6xiabHcjDJ1WzwtwCZSE2y2nMs451pSYp8W-bFPfZmDDwrkjN4s9ASLlIXcXgxK-H0GsiEbckQOZ49zsIKyFtasBvZW8339rrXi1js-aBh99M7aS5w9DmXPpUDmppSPpwkeTfKiqF0cQiAUq8tpeEQrGDJuw3Qt2.XI8h9Xw-VZj_NOmKtV19wLM63S4snos7rzkoHf9FXCw'
+      expect(dapUtils.dapExtractExpiryFromToken(tokenWithExpiry)).to.equal(1643830369);
+    });
+  });
+
+  describe('dapRefreshToken test', function () {
+    it('test dapRefreshToken success response', function () {
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, true, onDone)
+      let request = server.requests[0];
+      responseHeader['Symitri-DAP-Token'] = sampleCachedToken.token;
+      request.respond(200, responseHeader, JSON.stringify(sampleCachedToken.token));
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_TOKEN)).token).to.be.equal(sampleCachedToken.token);
+    });
+
+    it('test dapRefreshToken success response with deviceid 100', function () {
+      dapUtils.dapRefreshToken(ortb2, esampleConfig, true, onDone)
+      let request = server.requests[0];
+      responseHeader['Symitri-DAP-100'] = sampleCachedToken.token;
+      request.respond(200, responseHeader, '');
+      expect(storage.getDataFromLocalStorage('dap_deviceId100')).to.be.equal(sampleCachedToken.token);
+    });
+
+    it('test dapRefreshToken success response with exp claim', function () {
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, true, onDone)
+      let request = server.requests[0];
+      let tokenWithExpiry = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIiwiZXhwIjoxNjQzODMwMzY5fQ..hTbcSQgmmO0HUJJrQ5fRHw.7zjrQXNNVkb-GD0ZhIVhEPcWbyaDBilHTWv-bp1lFZ9mdkSC0QbcAvUbYteiTD7ya23GUwcL2WOW8WgRSHaWHOJe0B5NDqfdUGTzElWfu7fFodRxRgGmwG8Rq5xxteFKLLGHLf1mFYRJKDtjtgajGNUKIDfn9AEt-c5Qz4KU8VolG_KzrLROx-f6Z7MnoPTcwRCj0WjXD6j2D6RAZ80-mKTNIsMIELdj6xiabHcjDJ1WzwtwCZSE2y2nMs451pSYp8W-bFPfZmDDwrkjN4s9ASLlIXcXgxK-H0GsiEbckQOZ49zsIKyFtasBvZW8339rrXi1js-aBh99M7aS5w9DmXPpUDmppSPpwkeTfKiqF0cQiAUq8tpeEQrGDJuw3Qt2.XI8h9Xw-VZj_NOmKtV19wLM63S4snos7rzkoHf9FXCw'
+      responseHeader['Symitri-DAP-Token'] = tokenWithExpiry;
+      request.respond(200, responseHeader, JSON.stringify(tokenWithExpiry));
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_TOKEN)).expires_at).to.be.equal(1643830359);
+    });
+
+    it('test dapRefreshToken error response', function () {
+      storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, false, onDone)
+      let request = server.requests[0];
+      request.respond(400, responseHeader, 'error');
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_TOKEN)).expires_at).to.be.equal(cacheExpiry);// Since the expiry is same, the token is not updated in the cache
+    });
+  });
+
+  describe('dapRefreshEncryptedMembership test', function () {
+    it('test dapRefreshEncryptedMembership success response', function () {
+      let expiry = Math.round(Date.now() / 1000.0) + 3600; // in seconds
+      let encMembership = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoic29tZXNlY3JldGludmF1bHQifQ..f8_At4OqeQXyQcSwThOJ_w.69ImVQ3bEZ6QP7ROCRpAJjNcKY49SEPYR6qTp_8l7L8kQdPbpi4wmuOzt78j7iBrX64k2wltzmQFjDmVKSxDhrEguxpgx6t-L1tT8ZA0UosMWpVsgmKEZxOn2e9ES3jw8RNCS4WSWocSPQX33xSb51evXjm9E1s0tGoLnwXl0GsUvzRsSU86wQG6RZnAQTi7s-r-M2TKibdDjUqgIt62vJ-aBZ7RWw91MINgOdmDNs1bFfbBX5Cy1kd4-kjvRDz_aJ6zHX4sK_7EmQhGEY3tW-A3_l2I88mw-RSJaPkb_IWg0QpVwXDaE2F2g8NpY1PzCRvG_NIE8r28eK5q44OMVitykHmKmBXGDj7z2JVgoXkfo5u0I-dypZARn4GP_7niK932avB-9JD7Mz3TrlU4GZ7IpYfJ91PMsRhrs5xNPQwLZbpuhF76A7Dp7iss71UjkGCiPTU6udfRb4foyf_7xEF66m1eQVcVaMdxEbMuu9GBfdr-d04TbtJhPfUV8JfxTenvRYoi13n0j5kH0M5OgaSQD9kQ3Mrd9u-Cms-BGtT0vf-N8AaFZY_wn0Y4rkpv5HEaH7z3iT4RCHINWrXb_D0WtjLTKQi2YmF8zMlzUOewNJGwZRwbRwxc7JoDIKEc5RZkJYevfJXOEEOPGXZ7AGZxOEsJawPqFqd_nOUosCZS4akHhcDPcVowoecVAV0hhhoS6JEY66PhPp1snbt6yqA-fQhch7z8Y-DZT3Scibvffww3Scg_KFANWp0KeEvHG0vyv9R2F4o66viSS8y21MDnM7Yjk8C-j7aNMldUQbjN_7Yq1nkfe0jiBX_hsINBRPgJHUY4zCaXuyXs-JZZfU92nwG0RT3A_3RP2rpY8-fXp9d3C2QJjEpnmHvTMsuAZCQSBe5DVrJwN_UKedxcJEoOt0wLz6MaCMyYZPd8tnQeqYK1cd3RgQDXtzKC0HDw1En489DqJXEst4eSSkaaW1lImLeaF8XCOaIqPqoyGk4_6KVLw5Q7OnpczuXqYKMd9UTMovGeuTuo1k0ddfEqTq9QwxkwZL51AiDRnwTCAeYBU1krV8FCJQx-mH_WPB5ftZj-o_3pbvANeRk27QBVmjcS-tgDllJkWBxX-4axRXzLw8pUUUZUT_NOL0OiqUCWVm0qMBEpgRQ57Se42-hkLMTzLhhGJOnVcaXU1j4ep-N7faNvbgREBjf_LgzvaWS90a2NJ9bB_J9FyXelhCN_AMLfdOS3fHkeWlZ0u0PMbn5DxXRMe0l9jB-2VJZhcPQRlWoYyoCO3l4F5ZmuQP5Xh9CU4tvSWih6jlwMDgdVWuTpdfPD5bx8ccog3JDq87enx-QtPzLU3gMgouNARJGgNwKS_GJSE1uPrt2oiqgZ3Z0u_I5MKvPdQPV3o-4rsaE730eB4OwAOF-mkGWpzy8Pbl-Qe5PR9mHBhuyJgZ-WDSCHl5yvet2kfO9mPXZlqBQ26fzTcUYH94MULAZn36og6w.3iKGv-Le-AvRmi26W1v6ibRLGbwKbCR92vs-a9t55hw';
+      dapUtils.dapRefreshEncryptedMembership(ortb2, esampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      responseHeader['Symitri-DAP-Token'] = encMembership;
+      request.respond(200, responseHeader, encMembership);
+      let rtdObj = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, 710)
+      expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP)).expires_at).to.equal(expiry);
+    });
+
+    it('test dapRefreshEncryptedMembership success response with exp claim', function () {
+      let encMembership = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoic29tZXNlY3JldGludmF1bHQiLCJleHAiOjE2NDM4MzA2NDB9..inYoxwht_aqTIWqGhEm_Gw.wDcCUOCwtqgnNUouaD723gKfm7X7bgkHgtiX4mr07P3tWk25PUQunmwTLhWBB5CYzzGIfIvveG_u4glNRLi_eRSQV4ihKKk1AN-BSSJ3d0CLAdY9I1WG5vX1VmopXyKnV90bl9SLNqnhg4Vxe6YU4ogTYxsKHuIN1EeIH4hpl-HbCQWQ1DQt4mB-MQF8V9AWTfU0D7sFMSK8f9qj6NGmf1__oHdHUlws0t5V2UAn_dhJexsuREK_gh65pczCuly5eEcziZ82LeP-nOhKWSRHB_tS_mKXrRU6_At_EVDgtfA3PSBJ6eQylCii6bTL42vZzz4jZhJv_3eLfRdKqpVT5CWNBzcDoQ2VcQgKgIBtPJ45KFfAYTQ6kdl21QMSjqtu8GTsv1lEZtrqHY6zRiG8_Mu28-PmjEw4LDdZmBDOeroue_MJD6wuE_jlE7J2iVdo8CkVnoRgzFwNbKBo7CK4z0WahV9rhuOm0LKAN5H0jF_gj696U-3fVTDTIb8ndNKNI2_xAhvWs00BFGtUtWgr8QGDGRTDCNGsDgnb_Vva9xCqVOyAE9O3Fq1QYl-tMA-KkBt3zzvmFFpOxpOyH-lUubKLKlsrxKc3GSyVEQ9DDLhrXXJgR5H5BSE4tjlK7p3ODF5qz0FHtIj7oDcgLazFO7z2MuFy2LjJmd3hKl6ujcfYEDiQ4D3pMIo7oiU33aFBD1YpzI4-WzNfJlUt1FoK0-DAXpbbV95s8p08GOD4q81rPw5hRADKJEr0QzrbDwplTWCzT2fKXMg_dIIc5AGqGKnVRUS6UyF1DnHpudNIJWxyWZjWIEw_QNjU0cDFmyPSyKxNrnfq9w8WE2bfbS5KTicxei5QHnC-cnL7Nh7IXp7WOW6R1YHbNPT7Ad4OhnlV-jjrXwkSv4wMAbfwAWoSCchGh7uvENNAeJymuponlJbOgw_GcYM73hMs8Z8W9qxRfbyF4WX5fDKXg61mMlaieHkc0EnoC5q7uKyXuZUehHZ76JLDFmewslLkQq5SkVCttzJePBnY1ouPEHw5ZTzUnG5f01QQOVcjIN-AqXNDbG5IOwq0heyS6vVfq7lZKJdLDVQ21qRjazGPaqYwLzugkWkzCOzPTgyFdbXzgjfmJwylHSOM5Jpnul84GzxEQF-1mHP2A8wtIT-M7_iX24It2wwWvc8qLA6GEqruWCtNyoug8CXo44mKdSSCGeEZHtfMbzXdLIBHCy2jSHz5i8S7DU_R7rE_5Ssrb81CqIYbgsAQBHtOYoyvzduTOruWcci4De0QcULloqImIEHUuIe2lnYO889_LIx5p7nE3UlSvLBo0sPexavFUtHqI6jdG6ye9tdseUEoNBDXW0aWD4D-KXX1JLtAgToPVUtEaXCJI7QavwO9ZG6UZM6jbfuJ5co0fvUXp6qYrFxPQo2dYHkar0nT6s1Zg5l2g8yWlLUJrHdHAzAw_NScUp71OpM4TmNsLnYaPVPcOxMvtJXTanbNWr0VKc8gy9q3k_1XxAnQwiduNs7f5bA-6qCVpayHv5dE7mUhFEwyh1_w95jEaURsQF_hnnd2OqRkADfiok4ZiPU2b38kFW1LXjpI39XXES3JU0e08Rq2uuelyLbCLWuJWq_axuKSZbZvpYeqWtIAde8FjCiO7RPlEc0nyzWBst8RBxQ-Bekg9UXPhxBRcm0HwA.Q2cBSFOQAC-QKDwmjrQXnVQd3jNOppMl9oZfd2yuKeY';
+      dapUtils.dapRefreshEncryptedMembership(ortb2, esampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      responseHeader['Symitri-DAP-Token'] = encMembership;
+      request.respond(200, responseHeader, encMembership);
+      let rtdObj = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, 710)
+      expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP)).expires_at).to.equal(1643830630);
+    });
+
+    it('test dapRefreshEncryptedMembership error response', function () {
+      dapUtils.dapRefreshEncryptedMembership(ortb2, esampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      request.respond(400, responseHeader, 'error');
+      expect(ortb2).to.eql({});
+    });
+
+    it('test dapRefreshEncryptedMembership 403 error response', function () {
+      dapUtils.dapRefreshEncryptedMembership(ortb2, esampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      request.respond(403, responseHeader, 'error');
+      let requestTokenize = server.requests[1];
+      responseHeader['Symitri-DAP-Token'] = sampleCachedToken.token;
+      requestTokenize.respond(200, responseHeader, '');
+      let requestMembership = server.requests[2];
+      requestMembership.respond(403, responseHeader, 'error');
+      expect(server.requests.length).to.be.equal(DAP_MAX_RETRY_TOKENIZE + 2);
+    });
+  });
+
+  describe('dapRefreshMembership test', function () {
+    it('test dapRefreshMembership success response', function () {
+      let membership = {'cohorts': ['9', '11', '13'], 'said': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIn0..17wnrhz6FbWx0Cf6LXpm1A.m9PKVCradk3CZokNKzVHzE06TOqiXYeijgxTQUiQy5Syx-yicnO8DyYX6zQ6rgPcNgUNRt4R4XE5MXuK0laUVQJr9yc9g3vUfQfw69OMYGW_vRlLMPzoNOhF2c4gSyfkRrLr7C0qgALmZO1D11sPflaCTNmO7pmZtRaCOB5buHoWcQhp1bUSJ09DNDb31dX3llimPwjNGSrUhyq_EZl4HopnnjxbM4qVNMY2G_43C_idlVOvbFoTxcDRATd-6MplJoIOIHQLDZEetpIOVcbEYN9gQ_ndBISITwuu5YEgs5C_WPHA25nm6e4BT5R-tawSA8yPyQAupqE8gk4ZWq_2-T0cqyTstIHrMQnZ_vysYN7h6bkzE-KeZRk7GMtySN87_fiu904hLD9QentGegamX6UAbVqQh7Htj7SnMHXkEenjxXAM5mRqQvNCTlw8k-9-VPXs-vTcKLYP8VFf8gMOmuYykgWac1gX-svyAg-24mo8cUbqcsj9relx4Qj5HiXUVyDMBZxK-mHZi-Xz6uv9GlggcsjE13DSszar-j2OetigpdibnJIxRZ-4ew3-vlvZ0Dul3j0LjeWURVBWYWfMjuZ193G7lwR3ohh_NzlNfwOPBK_SYurdAnLh7jJgTW-lVLjH2Dipmi9JwX9s03IQq9opexAn7hlM9oBI6x5asByH8JF8WwZ5GhzDjpDwpSmHPQNGFRSyrx_Sh2CPWNK6C1NJmLkyqAtJ5iw0_al7vPDQyZrKXaLTjBCUnbpJhUZ8dUKtWLzGPjzFXp10muoDIutd1NfyKxk1aWGhx5aerYuLdywv6cT_M8RZTi8924NGj5VA30V5OvEwLLyX93eDhntXZSCbkPHpAfiRZNGXrPY.GhCbWGQz11mIRD4uPKmoAuFXDH7hGnils54zg7N7-TU'}
+      dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone);
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify(membership));
+      let rtdObj = dapUtils.dapGetRtdObj(membership, 708);
+      expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
+    });
+
+    it('test dapRefreshMembership success response with exp claim', function () {
+      let membership = {'cohorts': ['9', '11', '13'], 'said': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIiwiZXhwIjoxNjQ3OTcxNTU4fQ..ptdM5WO-62ypXlKxFXD4FQ.waEo9MHS2NYQCi-zh_p6HgT9BdqGyQbBq4GfGLfsay4nRBgICsTS-VkV6e7xx5U1T8BgpKkRJIZBwTOY5Pkxk9FpK5nnffDSEljRrp1LXLCkNP4qwrlqHInFbZsonNWW4_mW-7aUPlTwIsTbfjTuyHdXHeQa1ALrwFFFWE7QUmPNd2RsHjDwUsxlJPEb5TnHn5W0Mgo_PQZaxvhJInMbxPgtJLoqnJvOqCBEoQY7au7ALZL_nWK8XIwPMF19J7Z3cBg9vQInhr_E3rMdQcAFHEzYfgoNcIYCCR0t1UOqUE3HNtX-E64kZAYKWdlsBb9eW5Gj9hHYyPNL_4Hntjg5eLXGpsocMg0An-qQKGC6hkrxKzeM-GrjpvSaQLNs4iqDpHUtzA02LW_vkLkMNRUiyXVJ3FUZwfyq6uHSRKWZ6UFdAfL0rfJ8q8x8Ll-qJO2Jfyvidlsi9FIs7x1WJrvDCKepfAQM1UXRTonrQljFBAk83PcL2bmWuJDgJZ0lWS4VnZbIf6A7fDourmkDxdVRptvQq5nSjtzCA6whRw0-wGz8ehNJsaJw9H_nG9k4lRKs7A5Lqsyy7TVFrAPjnA_Q1a2H6xF2ULxrtIqoNqdX7k9RjowEZSQlZgZUOAmI4wzjckdcSyC_pUlYBMcBwmlld34mmOJe9EBHAxjdci7Q_9lvj1HTcwGDcQITXnkW9Ux5Jkt9Naw-IGGrnEIADaT2guUAto8W_Gb05TmwHSd6DCmh4zepQCbqeVe6AvPILtVkTgsTTo27Q-NvS7h-XtthJy8425j5kqwxxpZFJ0l0ytc6DUyNCLJXuxi0JFU6-LoSXcROEMVrHa_Achufr9vHIELwacSAIHuwseEvg_OOu1c1WYEwZH8ynBLSjqzy8AnDj24hYgA0YanPAvDqacrYrTUFqURbHmvcQqLBTcYa_gs7uDx4a1EjtP_NvHRlvCgGAaASrjGMhTX8oJxlTqahhQ.pXm-7KqnNK8sbyyczwkVYhcjgiwkpO8LjBBVw4lcyZE'};
+      dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone);
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify(membership));
+      let rtdObj = dapUtils.dapGetRtdObj(membership, 708)
+      expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_MEMBERSHIP)).expires_at).to.be.equal(1647971548);
+    });
+
+    it('test dapRefreshMembership 400 error response', function () {
+      dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      request.respond(400, responseHeader, 'error');
+      expect(ortb2).to.eql({});
+    });
+
+    it('test dapRefreshMembership 403 error response', function () {
+      dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      request.respond(403, responseHeader, 'error');
+      expect(server.requests.length).to.be.equal(DAP_MAX_RETRY_TOKENIZE);
+    });
+  });
+
+  describe('dapGetEncryptedMembershipFromLocalStorage test', function () {
+    it('test dapGetEncryptedMembershipFromLocalStorage function with valid cache', function () {
+      storage.setDataInLocalStorage(DAP_ENCRYPTED_MEMBERSHIP, JSON.stringify(cachedEncryptedMembership))
+      expect(JSON.stringify(dapUtils.dapGetEncryptedMembershipFromLocalStorage())).to.equal(JSON.stringify(encMembership));
+    });
+
+    it('test dapGetEncryptedMembershipFromLocalStorage function with invalid cache', function () {
+      let expiry = Math.round(Date.now() / 1000.0) - 100; // in seconds
+      let encMembership = {'expiry': expiry, 'encryptedSegments': cachedEncryptedMembership.encryptedSegments}
+      storage.setDataInLocalStorage(DAP_ENCRYPTED_MEMBERSHIP, JSON.stringify(encMembership))
+      expect(dapUtils.dapGetEncryptedMembershipFromLocalStorage()).to.equal(null);
+    });
+  });
+
+  describe('Symitri-DAP-SS-ID test', function () {
+    it('Symitri-DAP-SS-ID present in response header', function () {
+      let expiry = Math.round(Date.now() / 1000.0) + 300; // in seconds
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, false, onDone)
+      let request = server.requests[0];
+      let sampleSSID = 'Test_SSID_Spec';
+      responseHeader['Symitri-DAP-Token'] = sampleCachedToken.token;
+      responseHeader['Symitri-DAP-SS-ID'] = sampleSSID;
+      request.respond(200, responseHeader, '');
+      expect(storage.getDataFromLocalStorage(DAP_SS_ID)).to.be.equal(JSON.stringify(sampleSSID));
+    });
+
+    it('Test if Symitri-DAP-SS-ID is present in request header', function () {
+      let expiry = Math.round(Date.now() / 1000.0) + 100; // in seconds
+      storage.setDataInLocalStorage(DAP_SS_ID, JSON.stringify('Test_SSID_Spec'))
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, false, onDone)
+      let request = server.requests[0];
+      let ssidHeader = request.requestHeaders['Symitri-DAP-SS-ID'];
+      responseHeader['Symitri-DAP-Token'] = sampleCachedToken.token;
+      request.respond(200, responseHeader, '');
+      expect(ssidHeader).to.be.equal('Test_SSID_Spec');
+    });
+  });
+
+  describe('Test gdpr and usp consent handling', function () {
+    it('Gdpr applies and gdpr consent string not present', function () {
+      expect(symitriDapRtdSubmodule.init(null, sampleGdprConsentConfig)).to.equal(false);
+    });
+
+    it('Gdpr applies and gdpr consent string is present', function () {
+      sampleGdprConsentConfig.gdpr.consentString = 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==';
+      expect(symitriDapRtdSubmodule.init(null, sampleGdprConsentConfig)).to.equal(true);
+    });
+
+    it('USP consent present and user have opted out', function () {
+      expect(symitriDapRtdSubmodule.init(null, sampleUspConsentConfig)).to.equal(false);
+    });
+
+    it('USP consent present and user have not been provided with option to opt out', function () {
+      expect(symitriDapRtdSubmodule.init(null, {'usp': '1NYY'})).to.equal(false);
+    });
+
+    it('USP consent present and user have not opted out', function () {
+      expect(symitriDapRtdSubmodule.init(null, {'usp': '1YNY'})).to.equal(true);
+    });
+  });
+
+  describe('Test identifier is added properly to apiParams', function() {
+    let sandbox;
+
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('passed identifier is handled', async function () {
+      const test_identity = 'test_identity_1234';
+      let identity = {
+        value: test_identity
+      };
+      let apiParams = {
+        'type': identity.type,
+      };
+
+      if (window.crypto && window.crypto.subtle) {
+        let hid = await dapUtils.addIdentifier(identity, apiParams).then();
+        expect(hid['identity']).is.equal('843BE0FB20AAE699F27E5BC88C554B716F3DD366F58C1BDE0ACFB7EA0DD90CE7');
+      } else {
+        expect(window.crypto.subtle).is.undefined
+      }
+    });
+
+    it('passed undefined identifier is handled', async function () {
+      const test_identity = undefined;
+      let identity = {
+        identity: test_identity
+      }
+      let apiParams = {
+        'type': identity.type,
+      };
+
+      let hid = await dapUtils.addIdentifier(identity, apiParams);
+      expect(hid.identity).is.undefined;
+    });
+  });
+
+  describe('onBidResponseEvent', function () {
+    const bidResponse = {adId: 'ad_123', bidder: 'test_bidder', bidderCode: 'test_bidder_code', cpm: '1.5', creativeId: 'creative_123', dealId: 'DEMODEAL555', mediaType: 'banner', responseTimestamp: '1725892736147', ad: ''};
+    let url = emoduleConfig.params.pixelUrl + '?token=' + sampleCachedToken.token + '&ad_id=' + bidResponse.adId + '&bidder=' + bidResponse.bidder + '&bidder_code=' + bidResponse.bidderCode + '&cpm=' + bidResponse.cpm + '&creative_id=' + bidResponse.creativeId + '&deal_id=' + bidResponse.dealId + '&media_type=' + bidResponse.mediaType + '&response_timestamp=' + bidResponse.responseTimestamp;
+    let adPixel = `${bidResponse.ad}",
+            'adomain': ['google.com'],
+            'iurl': 'https://cdn.tapnative.com/1_368853_1.png',
+            'cid': '468133/368853',
+            'crid': '368853',
+            'w': 300,
+            'h': 250,
+            'cat': ['IAB7-19']
+          }],
+          'seat': 'tapnative',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_-1'
+      }
+    };
+    nativeResponse = {
+      'body': {
+        'id': '453ade66-9113-4944-a674-5bbdcb9808ac',
+        'seatbid': [{
+          'bid': [{
+            'id': '652c9a4c-66ea-4579-998b-cefe7b4cfecd',
+            'impid': '2c3875bdbb1893',
+            'price': 1.1,
+            'adid': '368852',
+            'adm': '{\"native\":{\"ver\":\"1.1\",\"assets\": [{\"id\":1,\"required\":1,\"title\":{\"text\":\"Integrative Approaches: Merging Traditional and Alternative \"}},{\"id\":2,\"required\":1,\"img\":{\"url\":\"https://cdn.tapnative.com/1_368852_0.png\",\"w\":500,\"h\":300,\"type\":\"3\"}},{\"id\":3,\"required\":0,\"data\":{\"value\":\"Diabetes In Control. A free weekly diabetes newsletter for Medical Professionals.\"}},{\"id\":4,\"required\":1,\"data\":{\"value\":\"Integrative Approaches: Merging Traditional and Alternative \"}},{\"id\":6,\"required\":1,\"data\":{\"value\":\"URL\"}}],\"link\":{\"url\":\"https://r.tapnative.com/adx-rtb-d/servlet/WebF_AdManager.AdLinkManager?qs=H4sIAAAAAAAAAx2U2QHDIAxDVwKDr3F84P1HqNLPtMSRpSeG9RiPXH+5a474KzO/47YX7UoP50m61fLujlNjb76/8ZiblkimHq5nL/ZRedp3031x1tnk55LjSNN6h9/Zq+qmaLLuWTl74m1ZJKnb+m2OtQm/3L4sb933pM92qMOgjJ41MYmPXKnndRVKs+9bfSEumoZIFpTXuXbCP+WXuzl725E3O+9odi5OJrnBzhwjx9+UnFN3nTNt1/HY5aeljKtvZYpoJHNXr8BWa8ysKQY7ZmNA3DHK2qRwY7+zLu+xm9z5eheJ4Pv2usSptvO3p7JHrnXn0T5yVWdccp9Yz7hhoz2iu2zqsXsGFZ9hh14J6yU4TkJ0BgnOY8tY3tS+n2qsw7xZfKuanSNbAo+9nkJ83i20+FwhfbJeDVOllXsdxmDWauYcSRgS9+yG5qHwUDjAxxA0iZnOjlsnI+y09+ATeTEwbAVGgp0Qu/ceP0kjUvpu1Ty7O9MoegfrmLPxdjUh3mJL+XhARby+Ax8iBckf6BQdn9W+DMlvmlzYLuLlIy7YociFOIvXvEiYYCMboVk8BLHbnw3Zmr5us3xbjtXL67L96F15acJXkM5BOmTaUbBkYGdCI+Et8XmlpbuE3xVQwmxryc2y4wP3ByuuP8GogPZz8OpPaBv8diWWUTrC2nnLhdNUrJRTKc9FepDvwHTDwfbbMCTSb4LhUIFkyFrw/i7GtkPi6NCCai6N47TgNsTnzZWRoVtOSLq7FsLiF29y0Gj0GHVPVYG3QOPS7Swc3UuiFAQZJx3YvpHA2geUgVBASMEL4vcDi2Dw3NPtBSC4EQEvH/uMILu6WyUwraywTeVpoqoHTqOoD84FzReKoWemJy6jyuiBieGlQIe6wY2elTaMOwEUFF5NagzPj6nauc0+aXzQN3Q72hxFAgtfORK60RRAHYZLYymIzSJcXLgRFsqrb1UoD+5Atq7TWojaLTfOyUvH9EeJvZEOilQAXrf/ALoI8ZhABQAA\"},\"imptrackers\":[\"https://i.tapnative.com/adx-rtb-d/servlet/WebF_AdManager.ImpCounter?price=${AUCTION_PRICE}&ids=111519,16703,468132,368852,211356,233,13,16704,1&cb=1728409547&ap=5.00000&vd=223.233.85.189,14,8&nm=0.00&GUIDs=[adx_guid],652c9a4c-66ea-4579-998b-cefe7b4cfecd,652c9a4c-66ea-4579-998b-cefe7b4cfecd,999999,-1_&info=2,-1,IN&adx_custom=&adx_custom_ex=~~~-1~~~0&cat=-1&ref=https%3A%2F%2Fqa-jboss.audiencelogy.com%2Ftn_native_prod.html\",\"https://i.tapnative.com/adx-rtb-d/servlet/WebF_AdManager.ImpTracker?price=${AUCTION_PRICE}&ids=111519,16703,468132,368852,211356,233,13,16704,1&cb=1728409547&ap=5.00000&vd=223.233.85.189,14,8&nm=0.00&GUIDs=[adx_guid],652c9a4c-66ea-4579-998b-cefe7b4cfecd,652c9a4c-66ea-4579-998b-cefe7b4cfecd,999999,-1_&info=2,-1,IN&adx_custom=&adx_custom_ex=~~~-1~~~0&cat=-1&ref=\",\"https://rtb-east.tapnative.com:9001/beacon?uid=44636f6605b06ec6d4389d6efb7e5054&cc=468132&fccap=5&nid=1\"]}}',
+            'adomain': ['www.diabetesincontrol.com'],
+            'iurl': 'https://cdn.tapnative.com/1_368852_0.png',
+            'cid': '468132/368852',
+            'crid': '368852',
+            'cat': ['IAB7']
+          }],
+          'seat': 'tapnative',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_-1'
+      }
+    };
+    invalidBannerResponse = {
+      'body': {
+        'id': '006ac3b3-67f0-43bf-a33a-388b2f869fef',
+        'seatbid': [{
+          'bid': [{
+            'id': '049d07ed-c07e-4890-9f19-5cf41406a42d',
+            'impid': '286e606ac84a09',
+            'price': 0.11,
+            'adid': '368853',
+            'adm': 'invalid response',
+            'adomain': ['google.com'],
+            'iurl': 'https://cdn.tapnative.com/1_368853_1.png',
+            'cid': '468133/368853',
+            'crid': '368853',
+            'w': 300,
+            'h': 250,
+            'cat': ['IAB7-19']
+          }],
+          'seat': 'tapnative',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_-1'
+      }
+    };
+    invalidNativeResponse = {
+      'body': {
+        'id': '453ade66-9113-4944-a674-5bbdcb9808ac',
+        'seatbid': [{
+          'bid': [{
+            'id': '652c9a4c-66ea-4579-998b-cefe7b4cfecd',
+            'impid': '2c3875bdbb1893',
+            'price': 1.1,
+            'adid': '368852',
+            'adm': 'invalid response',
+            'adomain': ['www.diabetesincontrol.com'],
+            'iurl': 'https://cdn.tapnative.com/1_368852_0.png',
+            'cid': '468132/368852',
+            'crid': '368852',
+            'cat': ['IAB7']
+          }],
+          'seat': 'tapnative',
+          'group': 0
+        }],
+        'cur': 'USD',
+        'bidid': 'BIDDER_-1'
+      }
+    };
+  });
+
+  describe('validations', function () {
+    it('isBidValid : placement_id is passed', function () {
+      let bid = {
+          bidder: 'tapnative',
+          params: {
+            placement_id: 111520
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(true);
+    });
+    it('isBidValid : placement_id is not passed', function () {
+      let bid = {
+          bidder: 'tapnative',
+          params: {
+            width: 300,
+            height: 250,
+            domain: '',
+            bid_floor: 0.5
+          }
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equals(false);
+    });
+  });
+  describe('Validate Banner Request', function () {
+    it('Immutable bid request validate', function () {
+      let _Request = utils.deepClone(bannerRequest),
+        bidRequest = spec.buildRequests(bannerRequest);
+      expect(bannerRequest).to.deep.equal(_Request);
+    });
+    it('Validate bidder connection', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      expect(_Request.url).to.equal('https://rtb-east.tapnative.com/hb');
+      expect(_Request.method).to.equal('POST');
+      expect(_Request.options.contentType).to.equal('application/json');
+    });
+    it('Validate bid request : Impression', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      let data = JSON.parse(_Request.data);
+      // expect(data.at).to.equal(1); // auction type
+      expect(data[0].imp[0].id).to.equal(bannerRequest[0].bidId);
+      expect(data[0].placementId).to.equal(111520);
+    });
+    it('Validate bid request : ad size', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].imp[0].banner).to.be.a('object');
+      expect(data[0].imp[0].banner.w).to.equal(300);
+      expect(data[0].imp[0].banner.h).to.equal(250);
+    });
+    it('Validate bid request : user object', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].user).to.be.a('object');
+      expect(data[0].user.id).to.be.a('string');
+    });
+    it('Validate bid request : CCPA Check', function () {
+      let bidRequest = {
+        uspConsent: '1NYN'
+      };
+      let _Request = spec.buildRequests(bannerRequest, bidRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.ext.us_privacy).to.equal('1NYN');
+      //   let _bidRequest = {};
+      //   let _Request1 = spec.buildRequests(request, _bidRequest);
+      //   let data1 = JSON.parse(_Request1.data);
+      //   expect(data1.regs).to.equal(undefined);
+    });
+  });
+  describe('Validate banner response ', function () {
+    it('Validate bid response : valid bid response', function () {
+      let _Request = spec.buildRequests(bannerRequest);
+      let bResponse = spec.interpretResponse(bannerResponse, _Request);
+      expect(bResponse).to.be.an('array').with.length.above(0);
+      expect(bResponse[0].requestId).to.equal(bannerResponse.body.seatbid[0].bid[0].impid);
+      expect(bResponse[0].width).to.equal(bannerResponse.body.seatbid[0].bid[0].w);
+      expect(bResponse[0].height).to.equal(bannerResponse.body.seatbid[0].bid[0].h);
+      expect(bResponse[0].currency).to.equal('USD');
+      expect(bResponse[0].netRevenue).to.equal(false);
+      expect(bResponse[0].mediaType).to.equal('banner');
+      expect(bResponse[0].meta.advertiserDomains).to.deep.equal(['google.com']);
+      expect(bResponse[0].ttl).to.equal(300);
+      expect(bResponse[0].creativeId).to.equal(bannerResponse.body.seatbid[0].bid[0].crid);
+      expect(bResponse[0].dealId).to.equal(bannerResponse.body.seatbid[0].bid[0].dealId);
+    });
+    it('Invalid bid response check ', function () {
+      let bRequest = spec.buildRequests(bannerRequest);
+      let response = spec.interpretResponse(invalidBannerResponse, bRequest);
+      expect(response[0].ad).to.equal('invalid response');
+    });
+  });
+  describe('Validate Native Request', function () {
+    it('Immutable bid request validate', function () {
+      let _Request = utils.deepClone(nativeRequest),
+        bidRequest = spec.buildRequests(nativeRequest);
+      expect(nativeRequest).to.deep.equal(_Request);
+    });
+    it('Validate bidder connection', function () {
+      let _Request = spec.buildRequests(nativeRequest);
+      expect(_Request.url).to.equal('https://rtb-east.tapnative.com/hb');
+      expect(_Request.method).to.equal('POST');
+      expect(_Request.options.contentType).to.equal('application/json');
+    });
+    it('Validate bid request : Impression', function () {
+      let _Request = spec.buildRequests(nativeRequest);
+      let data = JSON.parse(_Request.data);
+      // expect(data.at).to.equal(1); // auction type
+      expect(data[0].imp[0].id).to.equal(nativeRequest[0].bidId);
+      expect(data[0].placementId).to.equal(111519);
+    });
+    it('Validate bid request : user object', function () {
+      let _Request = spec.buildRequests(nativeRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].user).to.be.a('object');
+      expect(data[0].user.id).to.be.a('string');
+    });
+    it('Validate bid request : CCPA Check', function () {
+      let bidRequest = {
+        uspConsent: '1NYN'
+      };
+      let _Request = spec.buildRequests(nativeRequest, bidRequest);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.ext.us_privacy).to.equal('1NYN');
+      //   let _bidRequest = {};
+      //   let _Request1 = spec.buildRequests(request, _bidRequest);
+      //   let data1 = JSON.parse(_Request1.data);
+      //   expect(data1.regs).to.equal(undefined);
+    });
+  });
+  describe('Validate native response ', function () {
+    it('Validate bid response : valid bid response', function () {
+      let _Request = spec.buildRequests(nativeRequest);
+      let bResponse = spec.interpretResponse(nativeResponse, _Request);
+      expect(bResponse).to.be.an('array').with.length.above(0);
+      expect(bResponse[0].requestId).to.equal(nativeResponse.body.seatbid[0].bid[0].impid);
+      // expect(bResponse[0].width).to.equal(bannerResponse.body.seatbid[0].bid[0].w);
+      // expect(bResponse[0].height).to.equal(bannerResponse.body.seatbid[0].bid[0].h);
+      expect(bResponse[0].currency).to.equal('USD');
+      expect(bResponse[0].netRevenue).to.equal(false);
+      expect(bResponse[0].mediaType).to.equal('native');
+      expect(bResponse[0].native.clickUrl).to.be.a('string').and.not.be.empty;
+      expect(bResponse[0].native.impressionTrackers).to.be.an('array').with.length.above(0);
+      expect(bResponse[0].native.title).to.be.a('string').and.not.be.empty;
+      expect(bResponse[0].native.image.url).to.be.a('string').and.not.be.empty;
+      expect(bResponse[0].meta.advertiserDomains).to.deep.equal(['www.diabetesincontrol.com']);
+      expect(bResponse[0].ttl).to.equal(300);
+      expect(bResponse[0].creativeId).to.equal(nativeResponse.body.seatbid[0].bid[0].crid);
+      expect(bResponse[0].dealId).to.equal(nativeResponse.body.seatbid[0].bid[0].dealId);
+    });
+  });
+  describe('GPP and coppa', function () {
+    it('Request params check with GPP Consent', function () {
+      let bidderReq = { gppConsent: { gppString: 'gpp-string-test', applicableSections: [5] } };
+      let _Request = spec.buildRequests(bannerRequest, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.gpp).to.equal('gpp-string-test');
+      expect(data[0].regs.gpp_sid[0]).to.equal(5);
+    });
+    it('Request params check with GPP Consent read from ortb2', function () {
+      let bidderReq = {
+        ortb2: {
+          regs: {
+            gpp: 'gpp-test-string',
+            gpp_sid: [5]
+          }
+        }
+      };
+      let _Request = spec.buildRequests(bannerRequest, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.gpp).to.equal('gpp-test-string');
+      expect(data[0].regs.gpp_sid[0]).to.equal(5);
+    });
+    it(' Bid request should have coppa flag if its true', () => {
+      let bidderReq = { ortb2: { regs: { coppa: 1 } } };
+      let _Request = spec.buildRequests(bannerRequest, bidderReq);
+      let data = JSON.parse(_Request.data);
+      expect(data[0].regs.coppa).to.equal(1);
+    });
+  });
+});
diff --git a/test/spec/modules/tappxBidAdapter_spec.js b/test/spec/modules/tappxBidAdapter_spec.js
index 46fac8de1e2..1dd3f1b3c50 100644
--- a/test/spec/modules/tappxBidAdapter_spec.js
+++ b/test/spec/modules/tappxBidAdapter_spec.js
@@ -124,8 +124,8 @@ const c_CONSENTSTRING = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
 const c_VALIDBIDREQUESTS = [{'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com\/rtb\/v2\/', 'tappxkey': 'pub-1234-android-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.005, 'test': 1}, 'userId': {'haloId': '0000x179MZAzMqUWsFonu7Drm3eDDBMYtj5SPoWQnl89Upk3WTlCvEnKI9SshX0p6eFJ7otPYix179MZAzMqUWsFonu7Drm3eDDBMYtj5SPoWQnl89Upk3WTlCvEnKI9SshX0p6e', 'id5id': {'uid': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_rEXbz6UYtYEJelYrDaZOLkh8WcF9J0ZHmEHFKZEBlLXsgP6xqXU3BCj4Ay0Z6fw_jSOaHxMHwd-voRHqFA4Q9NwAxFcVLyPWnNGZ9VbcSAPos1wupq7Xu3MIm-Bw_0vxjhZdWNy4chM9x3i', 'ext': {'linkType': 0}}, 'intentIqId': 'GIF89a\u0000\u0000\u0000\u0000�\u0000\u0000���\u0000\u0000\u0000?�\u0000\u0000\u0000\u0000\u0000\u0000,\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000A\u0000\u0000;', 'lotamePanoramaId': 'xTtLUY7GwqX2MMqSHo9RQ2YUOIBFhlASOR43I9KjvgtcrxIys3RxME96M02LTjWR', 'parrableId': {'eid': '02.YoqC9lWZh8.C8QTSiJTNgI6Pp0KCM5zZgEgwVMSsVP5W51X8cmiUHQESq9WRKB4nreqZJwsWIcNKlORhG4u25Wm6lmDOBmQ0B8hv0KP6uVQ97aouuH52zaz2ctVQTORUKkErPRPcaCJ7dKFcrNoF2i6WOR0S5Nk'}, 'pubcid': 'b1254-152f-12F5-5698-dI1eljK6C7WA', 'pubProvidedId': [{'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}, {'source': '3rdpartyprovided.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 3, 'ext': {'stype': 'sha256email'}}]}]}, 'userIdAsEids': [{'source': 'audigent.com', 'uids': [{'id': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'atype': 1}]}, {'source': 'id5-sync.com', 'uids': [{'id': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'atype': 1, 'ext': {'linkType': 0}}]}], 'ortb2Imp': {'ext': {'data': {'adserver': {'name': 'gam', 'adslot': '/19968336/header-bid-tag-0'}, 'pbadslot': '/19968336/header-bid-tag-0'}}}, 'mediaTypes': {'banner': {'sizes': [[320, 480], [320, 50]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '71c0d86b-4b47-4aff-a6da-1af0b1712439', 'sizes': [[320, 480], [320, 50]], 'bidId': '264d7969b125a5', 'bidderRequestId': '1c674c14a3889c', 'auctionId': '13a8a3a9-ed3a-4101-9435-4699ee77bb62', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}];
 const c_VALIDBIDAPPREQUESTS = [{'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com\/rtb\/v2\/', 'tappxkey': 'pub-1234-android-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.005, 'test': 1, 'app': {'name': 'Tappx Test', 'bundle': 'com.test.tappx', 'domain': 'tappx.com', 'publisher': { 'name': 'Tappx', 'domain': 'tappx.com' }}}, 'userId': {'haloId': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'id5id': {'uid': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'ext': {'linkType': 0}}, 'intentIqId': 'GIF89a\u0001\u0000\u0001\u0000�\u0000\u0000���\u0000\u0000\u0000!�\u0004\u0001\u0000\u0000\u0000\u0000,\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000\u0000\u0002\u0002D\u0001\u0000;', 'lotamePanoramaId': '8003916b61a95b185690ec103bdf4945a70213e01818a5e5d8690b542730755a', 'parrableId': {'eid': '01.1617088921.7faa68d9570a50ea8e4f359e9b99ca4b7509e948a6175b3e5b0b8cbaf5b62424104ccfb0191ca79366de8368ed267b89a68e236df5f41f96f238e4301659e9023fec05e46399fb1ad0a0'}, 'pubcid': 'b7143795-852f-42f0-8864-5ecbea1ade4e', 'pubProvidedId': [{'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}, {'source': '3rdpartyprovided.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 3, 'ext': {'stype': 'sha256email'}}]}]}, 'userIdAsEids': [{'source': 'audigent.com', 'uids': [{'id': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'atype': 1}]}, {'source': 'id5-sync.com', 'uids': [{'id': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'atype': 1, 'ext': {'linkType': 0}}]}, {'source': 'intentiq.com', 'uids': [{'id': 'GIF89a\u0001\u0000\u0001\u0000�\u0000\u0000���\u0000\u0000\u0000!�\u0004\u0001\u0000\u0000\u0000\u0000,\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000\u0000\u0002\u0002D\u0001\u0000;', 'atype': 1}]}, {'source': 'crwdcntrl.net', 'uids': [{'id': '8003916b61a95b185690ec103bdf4945a70213e01818a5e5d8690b542730755a', 'atype': 1}]}, {'source': 'parrable.com', 'uids': [{'id': '01.1617088921.7faa68d9570a50ea8e4f359e9b99ca4b7509e948a6175b3e5b0b8cbaf5b62424104ccfb0191ca79366de8368ed267b89a68e236df5f41f96f238e4301659e9023fec05e46399fb1ad0a0', 'atype': 1}]}, {'source': 'pubcid.org', 'uids': [{'id': 'b7143795-852f-42f0-8864-5ecbea1ade4e', 'atype': 1}]}, {'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}, {'source': '3rdpartyprovided.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 3, 'ext': {'stype': 'sha256email'}}]}], 'ortb2Imp': {'ext': {'data': {'adserver': {'name': 'gam', 'adslot': '/19968336/header-bid-tag-0'}, 'pbadslot': '/19968336/header-bid-tag-0'}}}, 'mediaTypes': {'banner': {'sizes': [[320, 480], [320, 50]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '71c0d86b-4b47-4aff-a6da-1af0b1712439', 'sizes': [[320, 480], [320, 50]], 'bidId': '264d7969b125a5', 'bidderRequestId': '1c674c14a3889c', 'auctionId': '13a8a3a9-ed3a-4101-9435-4699ee77bb62', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}];
 const c_BIDDERREQUEST_B = {'bidderCode': 'tappx', 'auctionId': '13a8a3a9-ed3a-4101-9435-4699ee77bb62', 'bidderRequestId': '1c674c14a3889c', 'bids': [{'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com\/rtb\/v2\/', 'tappxkey': 'pub-1234-android-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.005, 'test': 1}, 'userId': {'haloId': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'id5id': {'uid': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'ext': {'linkType': 0}}, 'intentIqId': 'GIF89a\u0000\u0000\u0000\u0000�\u0000\u0000���\u0000\u0000\u0000?�\u0000\u0000\u0000\u0000\u0000\u0000,\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000A\u0000\u0000;', 'lotamePanoramaId': '8003916b61a95b185690ec103bdf4945a70213e01818a5e5d8690b542730755a', 'parrableId': {'eid': '01.1617088921.7faa68d9570a50ea8e4f359e9b99ca4b7509e948a6175b3e5b0b8cbaf5b62424104ccfb0191ca79366de8368ed267b89a68e236df5f41f96f238e4301659e9023fec05e46399fb1ad0a0'}, 'pubcid': 'b7143795-852f-42f0-8864-5ecbea1ade4e', 'pubProvidedId': [{'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}, {'source': '3rdpartyprovided.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 3, 'ext': {'stype': 'sha256email'}}]}]}, 'userIdAsEids': [{'source': 'audigent.com', 'uids': [{'id': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'atype': 1}]}, {'source': 'id5-sync.com', 'uids': [{'id': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'atype': 1, 'ext': {'linkType': 0}}]}], 'ortb2Imp': {'ext': {'data': {'adserver': {'name': 'gam', 'adslot': '/19968336/header-bid-tag-0'}, 'pbadslot': '/19968336/header-bid-tag-0'}}}, 'mediaTypes': {'banner': {'sizes': [[320, 480], [320, 50]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '71c0d86b-4b47-4aff-a6da-1af0b1712439', 'sizes': [[320, 480], [320, 50]], 'bidId': '264d7969b125a5', 'bidderRequestId': '1c674c14a3889c', 'auctionId': '13a8a3a9-ed3a-4101-9435-4699ee77bb62', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}], 'auctionStart': 1617088922120, 'timeout': 700, 'refererInfo': {'page': 'http://localhost:9999/integrationExamples/gpt/gdpr_hello_world.html?pbjs_debug=true', 'reachedTop': true, 'isAmp': false, 'numIframes': 0, 'stack': ['http://localhost:9999/integrationExamples/gpt/gdpr_hello_world.html?pbjs_debug=true'], 'canonicalUrl': null}, 'gdprConsent': {'consentString': c_CONSENTSTRING, 'vendorData': {'metadata': 'BO-JeiTPABAOkAAABAENABA', 'gdprApplies': true, 'hasGlobalScope': false, 'cookieVersion': 1, 'created': '2020-12-09T09:22:09.900Z', 'lastUpdated': '2021-01-14T15:44:03.600Z', 'cmpId': 0, 'cmpVersion': 1, 'consentScreen': 0, 'consentLanguage': 'EN', 'vendorListVersion': 1, 'maxVendorId': 0, 'purposeConsents': {}, 'vendorConsents': {}}, 'gdprApplies': true, 'apiVersion': 1}, 'uspConsent': '1YCC', 'start': 1611308859099};
-const c_BIDDERREQUEST_V = {'method': 'POST', 'url': 'https://testing.ssp.tappx.com/rtb/v2//VZ12TESTCTV?type_cnn=prebidjs&v=0.1.10329', 'data': '{"site":{"name":"localhost","bundle":"localhost","domain":"localhost"},"user":{"ext":{}},"id":"0fecfa84-c541-49f8-8c45-76b90fddc30e","test":1,"at":1,"tmax":1000,"bidder":"tappx","imp":[{"video":{"mimes":["video/mp4","application/javascript"],"minduration":3,"maxduration":30,"startdelay":5,"playbackmethod":[1,3],"api":[1,2],"protocols":[2,3],"battr":[13,14],"linearity":1,"placement":2,"minbitrate":10,"maxbitrate":10,"w":320,"h":250},"id":"2398241a5a860b","tagid":"localhost_typeAdBanVid_windows","secure":1,"bidfloor":0.005,"ext":{"bidder":{"tappxkey":"pub-1234-desktop-1234","endpoint":"vz34906po","host":"https://vz34906po.pub.tappx.com/rtb/","bidfloor":0.005}}}],"device":{"os":"windows","ip":"peer","ua":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36","h":864,"w":1536,"dnt":0,"language":"en","make":"Google Inc."},"params":{"host":"tappx.com","bidfloor":0.005},"regs":{"gdpr":0,"ext":{}}}', 'bids': {'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com/rtb/v2/', 'tappxkey': 'pub-1234-desktop-1234', 'endpoint': 'VZ12TESTCTV', 'bidfloor': 0.005, 'test': true}, 'crumbs': {'pubcid': 'dccfe922-3823-4676-b7b2-e5ed8743154e'}, 'ortb2Imp': {'ext': {'data': {'pbadslot': 'video-ad-div'}}}, 'renderer': {'options': {'text': 'Tappx Outstream Video'}}, 'mediaTypes': {'video': {'mimes': ['video/mp4', 'application/javascript'], 'minduration': 3, 'maxduration': 30, 'startdelay': 5, 'playbackmethod': [1, 3], 'api': [1, 2], 'protocols': [2, 3], 'battr': [13, 14], 'linearity': 1, 'placement': 2, 'minbitrate': 10, 'maxbitrate': 10, 'w': 320, 'h': 250}}, 'adUnitCode': 'video-ad-div', 'transactionId': 'ed41c805-d14c-49c3-954d-26b98b2aa2c2', 'sizes': [[320, 250]], 'bidId': '28f49c71b13f2f', 'bidderRequestId': '1401710496dc7', 'auctionId': 'e807363f-3095-43a8-a4a6-f44196cb7318', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}}
-const c_BIDDERREQUEST_VOutstream = {'method': 'POST', 'url': 'https://testing.ssp.tappx.com/rtb/v2//VZ12TESTCTV?type_cnn=prebidjs&v=0.1.10329', 'data': '{"site":{"name":"localhost","bundle":"localhost","domain":"localhost"},"user":{"ext":{}},"id":"0fecfa84-c541-49f8-8c45-76b90fddc30e","test":1,"at":1,"tmax":1000,"bidder":"tappx","imp":[{"video":{"context": "outstream","playerSize":[640, 480],"mimes":["video/mp4","application/javascript"],"minduration":3,"maxduration":30,"startdelay":5,"playbackmethod":[1,3],"api":[1,2],"protocols":[2,3],"battr":[13,14],"linearity":1,"placement":2,"minbitrate":10,"maxbitrate":10,"w":320,"h":250},"id":"2398241a5a860b","tagid":"localhost_typeAdBanVid_windows","secure":1,"bidfloor":0.005,"ext":{"bidder":{"tappxkey":"pub-1234-desktop-1234","endpoint":"vz34906po","host":"https://vz34906po.pub.tappx.com/rtb/","bidfloor":0.005}}}],"device":{"os":"windows","ip":"peer","ua":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36","h":864,"w":1536,"dnt":0,"language":"en","make":"Google Inc."},"params":{"host":"tappx.com","bidfloor":0.005},"regs":{"gdpr":0,"ext":{}}}', 'bids': {'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com/rtb/v2/', 'tappxkey': 'pub-1234-desktop-1234', 'endpoint': 'VZ12TESTCTV', 'bidfloor': 0.005, 'test': true}, 'crumbs': {'pubcid': 'dccfe922-3823-4676-b7b2-e5ed8743154e'}, 'ortb2Imp': {'ext': {'data': {'pbadslot': 'video-ad-div'}}}, 'renderer': {'options': {'text': 'Tappx Outstream Video'}}, 'mediaTypes': {'video': {'mimes': ['video/mp4', 'application/javascript'], 'minduration': 3, 'maxduration': 30, 'startdelay': 5, 'playbackmethod': [1, 3], 'api': [1, 2], 'protocols': [2, 3], 'battr': [13, 14], 'linearity': 1, 'placement': 2, 'minbitrate': 10, 'maxbitrate': 10, 'w': 320, 'h': 250}}, 'adUnitCode': 'video-ad-div', 'transactionId': 'ed41c805-d14c-49c3-954d-26b98b2aa2c2', 'sizes': [[320, 250]], 'bidId': '28f49c71b13f2f', 'bidderRequestId': '1401710496dc7', 'auctionId': 'e807363f-3095-43a8-a4a6-f44196cb7318', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}}
+const c_BIDDERREQUEST_V = {'method': 'POST', 'url': 'https://testing.ssp.tappx.com/rtb/v2//VZ12TESTCTV?type_cnn=prebidjs&v=0.1.10329', 'data': '{"site":{"name":"localhost","bundle":"localhost","domain":"localhost"},"user":{"ext":{}},"id":"0fecfa84-c541-49f8-8c45-76b90fddc30e","test":1,"at":1,"tmax":1000,"bidder":"tappx","imp":[{"video":{"mimes":["video/mp4","application/javascript"],"minduration":3,"maxduration":30,"startdelay":5,"playbackmethod":[1,3],"api":[1,2],"protocols":[2,3],"battr":[13,14],"linearity":1,"plcmt":2,"minbitrate":10,"maxbitrate":10,"w":320,"h":250},"id":"2398241a5a860b","tagid":"localhost_typeAdBanVid_windows","secure":1,"bidfloor":0.005,"ext":{"bidder":{"tappxkey":"pub-1234-desktop-1234","endpoint":"vz34906po","host":"https://vz34906po.pub.tappx.com/rtb/","bidfloor":0.005}}}],"device":{"os":"windows","ip":"peer","ua":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36","h":864,"w":1536,"dnt":0,"language":"en","make":"Google Inc."},"params":{"host":"tappx.com","bidfloor":0.005},"regs":{"gdpr":0,"ext":{}}}', 'bids': {'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com/rtb/v2/', 'tappxkey': 'pub-1234-desktop-1234', 'endpoint': 'VZ12TESTCTV', 'bidfloor': 0.005, 'test': true}, 'crumbs': {'pubcid': 'dccfe922-3823-4676-b7b2-e5ed8743154e'}, 'ortb2Imp': {'ext': {'data': {'pbadslot': 'video-ad-div'}}}, 'renderer': {'options': {'text': 'Tappx Outstream Video'}}, 'mediaTypes': {'video': {'mimes': ['video/mp4', 'application/javascript'], 'minduration': 3, 'maxduration': 30, 'startdelay': 5, 'playbackmethod': [1, 3], 'api': [1, 2], 'protocols': [2, 3], 'battr': [13, 14], 'linearity': 1, 'plcmt': 2, 'minbitrate': 10, 'maxbitrate': 10, 'w': 320, 'h': 250}}, 'adUnitCode': 'video-ad-div', 'transactionId': 'ed41c805-d14c-49c3-954d-26b98b2aa2c2', 'sizes': [[320, 250]], 'bidId': '28f49c71b13f2f', 'bidderRequestId': '1401710496dc7', 'auctionId': 'e807363f-3095-43a8-a4a6-f44196cb7318', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}}
+const c_BIDDERREQUEST_VOutstream = {'method': 'POST', 'url': 'https://testing.ssp.tappx.com/rtb/v2//VZ12TESTCTV?type_cnn=prebidjs&v=0.1.10329', 'data': '{"site":{"name":"localhost","bundle":"localhost","domain":"localhost"},"user":{"ext":{}},"id":"0fecfa84-c541-49f8-8c45-76b90fddc30e","test":1,"at":1,"tmax":1000,"bidder":"tappx","imp":[{"video":{"context": "outstream","playerSize":[640, 480],"mimes":["video/mp4","application/javascript"],"minduration":3,"maxduration":30,"startdelay":5,"playbackmethod":[1,3],"api":[1,2],"protocols":[2,3],"battr":[13,14],"linearity":1,"plcmt":2,"minbitrate":10,"maxbitrate":10,"w":320,"h":250},"id":"2398241a5a860b","tagid":"localhost_typeAdBanVid_windows","secure":1,"bidfloor":0.005,"ext":{"bidder":{"tappxkey":"pub-1234-desktop-1234","endpoint":"vz34906po","host":"https://vz34906po.pub.tappx.com/rtb/","bidfloor":0.005}}}],"device":{"os":"windows","ip":"peer","ua":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36","h":864,"w":1536,"dnt":0,"language":"en","make":"Google Inc."},"params":{"host":"tappx.com","bidfloor":0.005},"regs":{"gdpr":0,"ext":{}}}', 'bids': {'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com/rtb/v2/', 'tappxkey': 'pub-1234-desktop-1234', 'endpoint': 'VZ12TESTCTV', 'bidfloor': 0.005, 'test': true}, 'crumbs': {'pubcid': 'dccfe922-3823-4676-b7b2-e5ed8743154e'}, 'ortb2Imp': {'ext': {'data': {'pbadslot': 'video-ad-div'}}}, 'renderer': {'options': {'text': 'Tappx Outstream Video'}}, 'mediaTypes': {'video': {'mimes': ['video/mp4', 'application/javascript'], 'minduration': 3, 'maxduration': 30, 'startdelay': 5, 'playbackmethod': [1, 3], 'api': [1, 2], 'protocols': [2, 3], 'battr': [13, 14], 'linearity': 1, 'plcmt': 2, 'minbitrate': 10, 'maxbitrate': 10, 'w': 320, 'h': 250}}, 'adUnitCode': 'video-ad-div', 'transactionId': 'ed41c805-d14c-49c3-954d-26b98b2aa2c2', 'sizes': [[320, 250]], 'bidId': '28f49c71b13f2f', 'bidderRequestId': '1401710496dc7', 'auctionId': 'e807363f-3095-43a8-a4a6-f44196cb7318', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}}
 
 describe('Tappx bid adapter', function () {
   /**
@@ -323,14 +323,14 @@ describe('Tappx bid adapter', function () {
    * INTERPRET RESPONSE TESTS
    */
   describe('interpretResponse', function () {
-    it('receive banner reponse with single placement', function () {
+    it('receive banner reponse with single plcmt', function () {
       const bids = spec.interpretResponse(c_SERVERRESPONSE_B, c_BIDDERREQUEST_B);
       const bid = bids[0];
       expect(bid.cpm).to.exist;
       expect(bid.ad).to.match(/^',
-          'price': 4.2,
+          'price': 2,
           'adid': '12345asdfg',
-          'currency': 'EUR',
+          'currency': 'USD',
           'statusMessage': 'Bid available',
           'requestId': 'bidId123',
           'width': 300,
@@ -133,7 +266,13 @@ describe('vdoaiBidAdapter', function () {
             'height': '200',
             'bidId': 'bidId123',
             'referer': 'www.example.com',
-            'mediaType': 'video'
+            'mediaType': 'video',
+            'mediaTypes': {
+              video: {
+                context: 'instream',
+                playerSize: [[640, 360]]
+              }
+            }
           }
         }
       ];
@@ -142,5 +281,131 @@ describe('vdoaiBidAdapter', function () {
       expect(result[0]).to.have.property('vastXml');
       expect(result[0]).to.have.property('mediaType', 'video');
     });
+    it('should not return invalid responses', function() {
+      serverResponse.body.w = 0;
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(result).to.be.empty;
+    });
+    it('should not return invalid responses with invalid height', function() {
+      serverResponse.body.w = 300;
+      serverResponse.body.h = 0;
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(result).to.be.empty;
+    });
+    it('should not return invalid responses with invalid cpm', function() {
+      serverResponse.body.h = 250;
+      serverResponse.body.price = 0;
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(result).to.be.empty;
+    });
+    it('should not return invalid responses with invalid creative ID', function() {
+      serverResponse.body.price = 2;
+      serverResponse.body.adid = undefined;
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(result).to.be.empty;
+    });
+  });
+  describe('getUserSyncs', function() {
+    it('should return correct sync urls', function() {
+      let serverResponse = [{
+        body: {
+          'vdoCreative': '',
+          'price': 2,
+          'adid': '12345asdfg',
+          'currency': 'USD',
+          'statusMessage': 'Bid available',
+          'requestId': 'bidId123',
+          'width': 300,
+          'height': 250,
+          'netRevenue': true,
+          'mediaType': 'video',
+          'cookiesync': {
+            'status': 'no_cookie',
+            'bidder_status': [
+              {
+                'bidder': 'vdoai',
+                'no_cookie': true,
+                'usersync': {
+                  'url': 'https://rtb.vdo.ai/setuid/',
+                  'type': 'iframe'
+                }
+              }
+            ]
+          }
+        }
+      }];
+
+      let syncUrls = spec.getUserSyncs({
+        iframeEnabled: true
+      }, serverResponse);
+      expect(syncUrls[0].url).to.be.equal(serverResponse[0].body.cookiesync.bidder_status[0].usersync.url);
+
+      syncUrls = spec.getUserSyncs({
+        iframeEnabled: false
+      }, serverResponse);
+      expect(syncUrls[0]).to.be.undefined;
+    });
+    it('should not return invalid sync urls', function() {
+      let serverResponse = [{
+        body: {
+          'vdoCreative': '',
+          'price': 2,
+          'adid': '12345asdfg',
+          'currency': 'USD',
+          'statusMessage': 'Bid available',
+          'requestId': 'bidId123',
+          'width': 300,
+          'height': 250,
+          'netRevenue': true,
+          'mediaType': 'video',
+          'cookiesync': {
+            'status': 'no_cookie',
+            'bidder_status': [
+            ]
+          }
+        }
+      }];
+
+      var syncUrls = spec.getUserSyncs({
+        iframeEnabled: true
+      }, serverResponse);
+      expect(syncUrls[0]).to.be.undefined;
+
+      delete serverResponse[0].body.cookiesync.bidder_status;
+      syncUrls = spec.getUserSyncs({
+        iframeEnabled: true
+      }, serverResponse);
+      expect(syncUrls[0]).to.be.undefined;
+
+      delete serverResponse[0].body.cookiesync;
+      syncUrls = spec.getUserSyncs({
+        iframeEnabled: true
+      }, serverResponse);
+      expect(syncUrls[0]).to.be.undefined;
+
+      delete serverResponse[0].body;
+      syncUrls = spec.getUserSyncs({
+        iframeEnabled: true
+      }, serverResponse);
+      expect(syncUrls[0]).to.be.undefined;
+    });
+  });
+
+  describe('onTimeout', function() {
+    it('should run without errors', function() {
+      spec.onTimeout();
+    });
+  });
+
+  describe('onBidWon', function() {
+    it('should run without errors', function() {
+      spec.onBidWon();
+    });
+  });
+
+  describe('onSetTargeting', function() {
+    it('should run without errors', function() {
+      spec.onSetTargeting();
+    });
   });
 });
diff --git a/test/spec/modules/viantOrtbBidAdapter_spec.js b/test/spec/modules/viantOrtbBidAdapter_spec.js
index ef537d50986..67ae8b07821 100644
--- a/test/spec/modules/viantOrtbBidAdapter_spec.js
+++ b/test/spec/modules/viantOrtbBidAdapter_spec.js
@@ -1,8 +1,9 @@
-import { spec, converter } from 'modules/viantOrtbBidAdapter.js';
+import {spec, converter} from 'modules/viantOrtbBidAdapter.js';
 import {assert, expect} from 'chai';
-import { deepClone } from '../../../src/utils';
+import {deepClone} from '../../../src/utils';
 import {buildWindowTree} from '../../helpers/refererDetectionHelper';
 import {detectReferer} from '../../../src/refererDetection';
+
 describe('viantOrtbBidAdapter', function () {
   function testBuildRequests(bidRequests, bidderRequestBase) {
     let clonedBidderRequest = deepClone(bidderRequestBase);
@@ -10,7 +11,8 @@ describe('viantOrtbBidAdapter', function () {
     let requests = spec.buildRequests(bidRequests, clonedBidderRequest);
     return requests
   }
-  describe('isBidRequestValid', function() {
+
+  describe('isBidRequestValid', function () {
     function makeBid() {
       return {
         'bidder': 'viant',
@@ -46,9 +48,7 @@ describe('viantOrtbBidAdapter', function () {
       it('should return true if placementId is not passed ', function () {
         let bid = makeBid();
         delete bid.params.placementId;
-        bid.ortb2Imp = {
-
-        }
+        bid.ortb2Imp = {}
         expect(spec.isBidRequestValid(bid)).to.equal(true);
       });
 
@@ -98,6 +98,7 @@ describe('viantOrtbBidAdapter', function () {
             'transactionId': '4008d88a-8137-410b-aa35-fbfdabcb478e'
           }
         }
+
         it('should return true when required params found', function () {
           expect(spec.isBidRequestValid(makeBid())).to.equal(true);
         });
@@ -109,6 +110,50 @@ describe('viantOrtbBidAdapter', function () {
         });
       });
     });
+
+    describe('native', function () {
+      describe('and request config uses mediaTypes', () => {
+        function makeBid() {
+          return {
+            'bidder': 'viant',
+            'params': {
+              'unit': '12345678',
+              'delDomain': 'test-del-domain',
+              'publisherId': '464',
+              'placementId': 'some-PlacementId_2'
+            },
+            'mediaTypes': {
+              'video': {
+                'context': 'instream',
+                'playerSize': [[640, 480]],
+                'mimes': ['video/mp4'],
+                'protocols': [1, 2, 3, 4, 5, 6, 7, 8],
+                'api': [1, 3],
+                'skip': 1,
+                'skipafter': 5,
+                'minduration': 10,
+                'maxduration': 30
+              }
+            },
+            'adUnitCode': 'adunit-code',
+            'bidId': '30b31c1838de1e',
+            'bidderRequestId': '22edbae2733bf6',
+            'auctionId': '1d1a030790a475',
+            'transactionId': '4008d88a-8137-410b-aa35-fbfdabcb478e'
+          }
+        }
+
+        it('should return true when required params found', function () {
+          expect(spec.isBidRequestValid(makeBid())).to.equal(true);
+        });
+
+        it('should return false when required params are not passed', function () {
+          let nativeBidWithMediaTypes = Object.assign({}, makeBid());
+          nativeBidWithMediaTypes.params = {};
+          expect(spec.isBidRequestValid(nativeBidWithMediaTypes)).to.equal(false);
+        });
+      });
+    });
   });
 
   describe('buildRequests-banner', function () {
@@ -137,6 +182,57 @@ describe('viantOrtbBidAdapter', function () {
       'src': 'client',
       'bidRequestsCount': 1
     }];
+    const basePMPDealsBidRequests = [{
+      'bidder': 'viant',
+      'params': {
+        'publisherId': '464',
+        'placementId': '1'
+      },
+      'ortb2Imp': {
+        'pmp': {
+          'private_auction': 0,
+          'deals': [
+            {
+              'id': '1234567',
+              'at': 3,
+              'bidfloor': 25,
+              'bidfloorcur': 'USD',
+              'ext': {
+                'must_bid': 1,
+                'private_auction': 1
+              }
+            },
+            {
+              'id': '1234568',
+              'at': 3,
+              'bidfloor': 25,
+              'bidfloorcur': 'USD',
+              'ext': {
+                'must_bid': 0
+              }
+            }
+          ]
+        },
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[728, 90]]
+        }
+      },
+      'gdprConsent': {
+        'consentString': 'consentString',
+        'gdprApplies': true,
+      },
+      'uspConsent': '1YYY',
+      'sizes': [[728, 90]],
+      'transactionId': '1111474f-58b1-4368-b812-84f8c937a099',
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'bidId': '243310435309b5',
+      'bidderRequestId': '18084284054531',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'src': 'client',
+      'bidRequestsCount': 1
+    }];
 
     const testWindow = buildWindowTree(['https://www.example.com/test', 'https://www.example.com/other/page', 'https://www.example.com/third/page'], 'https://othersite.com/', 'https://example.com/canonical/page');
     const baseBidderRequestReferer = detectReferer(testWindow)();
@@ -172,7 +268,7 @@ describe('viantOrtbBidAdapter', function () {
     });
     it('sends bid requests to the correct endpoint', function () {
       const url = testBuildRequests(baseBannerBidRequests, baseBidderRequest)[0].url;
-      expect(url).to.equal('https://bidders-us-east-1.adelphic.net/d/rtb/v25/prebid/bidder_test');
+      expect(url).to.equal('https://bidders-us.adelphic.net/d/rtb/v25/prebid/bidder');
     });
 
     it('sends site', function () {
@@ -193,6 +289,34 @@ describe('viantOrtbBidAdapter', function () {
       const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest)[0].data;
       expect(requestBody.imp[0].banner.pos).to.equal(1);
     });
+    it('includes the deals in the bid request', function () {
+      const requestBody = testBuildRequests(basePMPDealsBidRequests, baseBidderRequest)[0].data;
+      expect(requestBody.imp[0].pmp).to.be.not.null;
+      expect(requestBody.imp[0].pmp).to.deep.equal({
+        'private_auction': 0,
+        'deals': [
+          {
+            'id': '1234567',
+            'at': 3,
+            'bidfloor': 25,
+            'bidfloorcur': 'USD',
+            'ext': {
+              'must_bid': 1,
+              'private_auction': 1
+            }
+          },
+          {
+            'id': '1234568',
+            'at': 3,
+            'bidfloor': 25,
+            'bidfloorcur': 'USD',
+            'ext': {
+              'must_bid': 0
+            }
+          }
+        ]
+      });
+    });
   });
 
   if (FEATURES.VIDEO) {
@@ -216,6 +340,7 @@ describe('viantOrtbBidAdapter', function () {
               'skip': 1,
               'skipafter': 5,
               'minduration': 10,
+              'placement': 1,
               'maxduration': 31
             }
           },
diff --git a/test/spec/modules/vibrantmediaBidAdapter_spec.js b/test/spec/modules/vibrantmediaBidAdapter_spec.js
index c6ce7d52fb3..cf9487ebf25 100644
--- a/test/spec/modules/vibrantmediaBidAdapter_spec.js
+++ b/test/spec/modules/vibrantmediaBidAdapter_spec.js
@@ -62,12 +62,6 @@ describe('VibrantMediaBidAdapter', function () {
     });
   });
 
-  describe('transformBidParams', function () {
-    it('transforms bid params correctly', function () {
-      expect(spec.transformBidParams(VALID_VIDEO_BID_PARAMS)).to.deep.equal(VALID_VIDEO_BID_PARAMS);
-    });
-  })
-
   let bidRequest;
 
   beforeEach(function () {
@@ -1077,13 +1071,9 @@ describe('VibrantMediaBidAdapter', function () {
   describe('Flow tests', function () {
     describe('For successive API calls to the public functions', function () {
       it('should succeed with one media type per bid', function () {
-        const transformedBannerBidParams = spec.transformBidParams(VALID_BANNER_BID_PARAMS);
-        const transformedVideoBidParams = spec.transformBidParams(VALID_VIDEO_BID_PARAMS);
-        const transformedNativeBidParams = spec.transformBidParams(VALID_NATIVE_BID_PARAMS);
-
         const bannerBid = {
           bidder: 'vibrantmedia',
-          params: transformedBannerBidParams,
+          params: VALID_BANNER_BID_PARAMS,
           mediaTypes: {
             banner: {
               sizes: DEFAULT_BID_SIZES,
@@ -1097,7 +1087,7 @@ describe('VibrantMediaBidAdapter', function () {
         };
         const videoBid = {
           bidder: 'vibrantmedia',
-          params: transformedVideoBidParams,
+          params: VALID_VIDEO_BID_PARAMS,
           mediaTypes: {
             video: {
               context: OUTSTREAM,
@@ -1112,7 +1102,7 @@ describe('VibrantMediaBidAdapter', function () {
         };
         const nativeBid = {
           bidder: 'vibrantmedia',
-          params: transformedNativeBidParams,
+          params: VALID_NATIVE_BID_PARAMS,
           mediaTypes: {
             native: {
               image: {
@@ -1178,10 +1168,9 @@ describe('VibrantMediaBidAdapter', function () {
       });
 
       it('should succeed with multiple media types for a single bid', function () {
-        const bidParams = spec.transformBidParams(VALID_VIDEO_BID_PARAMS);
         const bid = {
           bidder: 'vibrantmedia',
-          params: bidParams,
+          params: VALID_VIDEO_BID_PARAMS,
           mediaTypes: {
             banner: {
               sizes: DEFAULT_BID_SIZES
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index 864f2b8551c..14a49b21cdc 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -1,7 +1,11 @@
 import {expect} from 'chai';
 import {
   spec as adapter,
+  storage,
   createDomain,
+  webSessionId
+} from 'modules/vidazooBidAdapter.js';
+import {
   hashCode,
   extractPID,
   extractCID,
@@ -11,16 +15,17 @@ import {
   tryParseJSON,
   getUniqueDealId,
   getNextDealId,
-  getVidazooSessionId,
-  webSessionId
-} from 'modules/vidazooBidAdapter.js';
+  getTopWindowQueryParams,
+  getVidazooSessionId
+} from 'libraries/vidazooUtils/bidderUtils.js'
 import * as utils from 'src/utils.js';
 import {version} from 'package.json';
 import {useFakeTimers} from 'sinon';
 import {BANNER, VIDEO} from '../../../src/mediaTypes';
 import {config} from '../../../src/config';
+import {deepSetValue} from 'src/utils.js';
 
-export const TEST_ID_SYSTEMS = ['britepoolid', 'criteoId', 'id5id', 'idl_env', 'lipb', 'netId', 'parrableId', 'pubcid', 'tdid', 'pubProvidedId'];
+export const TEST_ID_SYSTEMS = ['criteoId', 'id5id', 'idl_env', 'lipb', 'netId', 'pubcid', 'tdid', 'pubProvidedId'];
 
 const SUB_DOMAIN = 'openrtb';
 
@@ -87,7 +92,7 @@ const VIDEO_BID = {
       'minduration': 0,
       'startdelay': 0,
       'linearity': 1,
-      'api': [2],
+      'api': [2, 7],
       'placement': 1
     }
   }
@@ -108,11 +113,25 @@ const BIDDER_REQUEST = {
   'ortb2': {
     'site': {
       'cat': ['IAB2'],
-      'pagecat': ['IAB2-2']
+      'pagecat': ['IAB2-2'],
+      'content': {
+        'language': 'en',
+        'data': [{
+          'name': 'example.com',
+          'ext': {
+            'segtax': 7
+          },
+          'segments': [
+            {'id': 'segId1'},
+            {'id': 'segId2'}
+          ]
+        }]
+      }
     },
     'regs': {
       'gpp': 'gpp_string',
-      'gpp_sid': [7]
+      'gpp_sid': [7],
+      'coppa': 0
     },
     'device': {
       'sua': {
@@ -131,8 +150,23 @@ const BIDDER_REQUEST = {
         'bitness': '64',
         'architecture': ''
       }
+    },
+    user: {
+      data: [
+        {
+          ext: {segtax: 600, segclass: '1'},
+          name: 'example.com',
+          segment: [{id: '243'}],
+        },
+      ],
+    },
+    source: {
+      ext: {
+        omidpn: 'MyIntegrationPartner',
+        omidpv: '7.1'
+      }
     }
-  },
+  }
 };
 
 const SERVER_RESPONSE = {
@@ -183,15 +217,6 @@ const REQUEST = {
   }
 };
 
-function getTopWindowQueryParams() {
-  try {
-    const parsedUrl = utils.parseUrl(window.top.document.URL, {decodeSearchAsString: true});
-    return parsedUrl.search;
-  } catch (e) {
-    return '';
-  }
-}
-
 describe('VidazooBidAdapter', function () {
   describe('validtae spec', function () {
     it('exists and is a function', function () {
@@ -295,6 +320,7 @@ describe('VidazooBidAdapter', function () {
           gpid: '',
           prebidVersion: version,
           ptrace: '1000',
+          vdzhum: '1000',
           publisherId: '59ac17c192832d0011283fe3',
           url: 'https%3A%2F%2Fwww.greatsite.com',
           referrer: 'https://www.somereferrer.com',
@@ -318,13 +344,32 @@ describe('VidazooBidAdapter', function () {
             'bitness': '64',
             'architecture': ''
           },
+          contentLang: 'en',
+          coppa: 0,
+          contentData: [{
+            'name': 'example.com',
+            'ext': {
+              'segtax': 7
+            },
+            'segments': [
+              {'id': 'segId1'},
+              {'id': 'segId2'}
+            ]
+          }],
+          userData: [
+            {
+              ext: {segtax: 600, segclass: '1'},
+              name: 'example.com',
+              segment: [{id: '243'}],
+            },
+          ],
           uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
           uqs: getTopWindowQueryParams(),
           isStorageAllowed: true,
           webSessionId: webSessionId,
           mediaTypes: {
             video: {
-              api: [2],
+              api: [2, 7],
               context: 'instream',
               linearity: 1,
               maxduration: 60,
@@ -338,9 +383,12 @@ describe('VidazooBidAdapter', function () {
               protocols: [2, 3, 5, 6],
               startdelay: 0
             }
-          }
+          },
+          omidpn: 'MyIntegrationPartner',
+          omidpv: '7.1'
         }
-      });
+      })
+      ;
     });
 
     it('should build banner request for each size', function () {
@@ -396,6 +444,7 @@ describe('VidazooBidAdapter', function () {
           prebidVersion: version,
           schain: BID.schain,
           ptrace: '1000',
+          vdzhum: '1000',
           res: `${window.top.screen.width}x${window.top.screen.height}`,
           mediaTypes: [BANNER],
           uqs: getTopWindowQueryParams(),
@@ -405,6 +454,25 @@ describe('VidazooBidAdapter', function () {
           gpid: '1234567890',
           cat: ['IAB2'],
           pagecat: ['IAB2-2'],
+          contentLang: 'en',
+          coppa: 0,
+          contentData: [{
+            'name': 'example.com',
+            'ext': {
+              'segtax': 7
+            },
+            'segments': [
+              {'id': 'segId1'},
+              {'id': 'segId2'}
+            ]
+          }],
+          userData: [
+            {
+              ext: {segtax: 600, segclass: '1'},
+              name: 'example.com',
+              segment: [{id: '243'}],
+            },
+          ],
           webSessionId: webSessionId
         }
       });
@@ -469,6 +537,7 @@ describe('VidazooBidAdapter', function () {
         prebidVersion: version,
         schain: BID.schain,
         ptrace: '1000',
+        vdzhum: '1000',
         res: `${window.top.screen.width}x${window.top.screen.height}`,
         mediaTypes: [BANNER],
         uqs: getTopWindowQueryParams(),
@@ -478,6 +547,25 @@ describe('VidazooBidAdapter', function () {
         gpid: '1234567890',
         cat: ['IAB2'],
         pagecat: ['IAB2-2'],
+        contentLang: 'en',
+        coppa: 0,
+        contentData: [{
+          'name': 'example.com',
+          'ext': {
+            'segtax': 7
+          },
+          'segments': [
+            {'id': 'segId1'},
+            {'id': 'segId2'}
+          ]
+        }],
+        userData: [
+          {
+            ext: {segtax: 600, segclass: '1'},
+            name: 'example.com',
+            segment: [{id: '243'}],
+          },
+        ],
         webSessionId: webSessionId
       };
 
@@ -523,6 +611,15 @@ describe('VidazooBidAdapter', function () {
       expect(requests).to.have.length(2);
     });
 
+    it('should set fledge correctly if enabled', function () {
+      config.resetConfig();
+      const bidderRequest = utils.deepClone(BIDDER_REQUEST);
+      bidderRequest.paapi = {enabled: true};
+      deepSetValue(bidderRequest, 'ortb2Imp.ext.ae', 1);
+      const requests = adapter.buildRequests([BID], bidderRequest);
+      expect(requests[0].data.fledge).to.equal(1);
+    });
+
     after(function () {
       $$PREBID_GLOBAL$$.bidderSettings = {};
       config.resetConfig();
@@ -648,6 +745,14 @@ describe('VidazooBidAdapter', function () {
       expect(responses).to.have.length(1);
       expect(responses[0].ttl).to.equal(300);
     });
+
+    it('should add nurl if exists on response', function () {
+      const serverResponse = utils.deepClone(SERVER_RESPONSE);
+      serverResponse.body.results[0].nurl = 'https://test.com/win-notice?test=123';
+      const responses = adapter.interpretResponse(serverResponse, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0].nurl).to.equal('https://test.com/win-notice?test=123');
+    });
   });
 
   describe('user id system', function () {
@@ -659,8 +764,6 @@ describe('VidazooBidAdapter', function () {
         switch (idSystemProvider) {
           case 'lipb':
             return {lipbid: id};
-          case 'parrableId':
-            return {eid: id};
           case 'id5id':
             return {uid: id};
           default:
@@ -711,14 +814,14 @@ describe('VidazooBidAdapter', function () {
       $$PREBID_GLOBAL$$.bidderSettings = {};
     });
     it('should get undefined vidazoo session id', function () {
-      const sessionId = getVidazooSessionId();
+      const sessionId = getVidazooSessionId(storage);
       expect(sessionId).to.be.empty;
     });
 
     it('should get vidazoo session id from storage', function () {
       const vidSid = '1234-5678';
       window.localStorage.setItem('vidSid', vidSid);
-      const sessionId = getVidazooSessionId();
+      const sessionId = getVidazooSessionId(storage);
       expect(sessionId).to.be.equal(vidSid);
     });
   });
@@ -737,15 +840,15 @@ describe('VidazooBidAdapter', function () {
     const key = 'myDealKey';
 
     it('should get the next deal id', function () {
-      const dealId = getNextDealId(key);
-      const nextDealId = getNextDealId(key);
+      const dealId = getNextDealId(storage, key);
+      const nextDealId = getNextDealId(storage, key);
       expect(dealId).to.be.equal(1);
       expect(nextDealId).to.be.equal(2);
     });
 
     it('should get the first deal id on expiration', function (done) {
       setTimeout(function () {
-        const dealId = getNextDealId(key, 100);
+        const dealId = getNextDealId(storage, key, 100);
         expect(dealId).to.be.equal(1);
         done();
       }, 200);
@@ -766,13 +869,13 @@ describe('VidazooBidAdapter', function () {
     const key = 'myKey';
     let uniqueDealId;
     beforeEach(() => {
-      uniqueDealId = getUniqueDealId(key, 0);
+      uniqueDealId = getUniqueDealId(storage, key, 0);
     })
 
     it('should get current unique deal id', function (done) {
       // waiting some time so `now` will become past
       setTimeout(() => {
-        const current = getUniqueDealId(key);
+        const current = getUniqueDealId(storage, key);
         expect(current).to.be.equal(uniqueDealId);
         done();
       }, 200);
@@ -780,7 +883,7 @@ describe('VidazooBidAdapter', function () {
 
     it('should get new unique deal id on expiration', function (done) {
       setTimeout(() => {
-        const current = getUniqueDealId(key, 100);
+        const current = getUniqueDealId(storage, key, 100);
         expect(current).to.not.be.equal(uniqueDealId);
         done();
       }, 200)
@@ -804,8 +907,8 @@ describe('VidazooBidAdapter', function () {
         shouldAdvanceTime: true,
         now
       });
-      setStorageItem('myKey', 2020);
-      const {value, created} = getStorageItem('myKey');
+      setStorageItem(storage, 'myKey', 2020);
+      const {value, created} = getStorageItem(storage, 'myKey');
       expect(created).to.be.equal(now);
       expect(value).to.be.equal(2020);
       expect(typeof value).to.be.equal('number');
@@ -816,7 +919,7 @@ describe('VidazooBidAdapter', function () {
     it('should get external stored value', function () {
       const value = 'superman'
       window.localStorage.setItem('myExternalKey', value);
-      const item = getStorageItem('myExternalKey');
+      const item = getStorageItem(storage, 'myExternalKey');
       expect(item).to.be.equal(value);
     });
 
@@ -833,4 +936,66 @@ describe('VidazooBidAdapter', function () {
       expect(parsed).to.be.equal(value);
     });
   });
+
+  describe('validate onBidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('should call triggerPixel if nurl exists', function () {
+      const bid = {
+        adUnitCode: 'div-gpt-ad-12345-0',
+        adId: '2d52001cabd527',
+        auctionId: '1fdb5ff1b6eaa7',
+        transactionId: 'c881914b-a3b5-4ecf-ad9c-1c2f37c6aabf',
+        status: 'rendered',
+        timeToRespond: 100,
+        cpm: 0.8,
+        originalCpm: 0.8,
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        originalCurrency: 'USD',
+        height: 250,
+        mediaType: 'banner',
+        nurl: 'https://test.com/win-notice?test=123',
+        netRevenue: true,
+        requestId: '2d52001cabd527',
+        ttl: 30,
+        width: 300
+      };
+      adapter.onBidWon(bid);
+      expect(utils.triggerPixel.called).to.be.true;
+
+      const url = utils.triggerPixel.args[0];
+
+      expect(url[0]).to.be.equal('https://test.com/win-notice?test=123&adId=2d52001cabd527&creativeId=12610997325162499419&auctionId=1fdb5ff1b6eaa7&transactionId=c881914b-a3b5-4ecf-ad9c-1c2f37c6aabf&adUnitCode=div-gpt-ad-12345-0&cpm=0.8¤cy=USD&originalCpm=0.8&originalCurrency=USD&netRevenue=true&mediaType=banner&timeToRespond=100&status=rendered');
+    });
+
+    it('should not call triggerPixel if nurl does not exist', function () {
+      const bid = {
+        adUnitCode: 'div-gpt-ad-12345-0',
+        adId: '2d52001cabd527',
+        auctionId: '1fdb5ff1b6eaa7',
+        transactionId: 'c881914b-a3b5-4ecf-ad9c-1c2f37c6aabf',
+        status: 'rendered',
+        timeToRespond: 100,
+        cpm: 0.8,
+        originalCpm: 0.8,
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        originalCurrency: 'USD',
+        height: 250,
+        mediaType: 'banner',
+        netRevenue: true,
+        requestId: '2d52001cabd527',
+        ttl: 30,
+        width: 300
+      };
+      adapter.onBidWon(bid);
+      expect(utils.triggerPixel.called).to.be.false;
+    });
+  });
 });
diff --git a/test/spec/modules/videoModule/pbVideo_spec.js b/test/spec/modules/videoModule/pbVideo_spec.js
index 2e26737da40..58af1a15e43 100644
--- a/test/spec/modules/videoModule/pbVideo_spec.js
+++ b/test/spec/modules/videoModule/pbVideo_spec.js
@@ -1,6 +1,7 @@
+import 'src/prebid.js';
 import { expect } from 'chai';
 import { PbVideo } from 'modules/videoModule';
-import CONSTANTS from 'src/constants.json';
+import { EVENTS } from 'src/constants.js';
 
 let ortbVideoMock;
 let ortbContentMock;
@@ -26,7 +27,8 @@ function resetTestVars() {
     onEvents: sinon.spy(),
     getOrtbVideo: () => ortbVideoMock,
     getOrtbContent: () => ortbContentMock,
-    setAdTagUrl: sinon.spy()
+    setAdTagUrl: sinon.spy(),
+    hasProviderFor: sinon.spy(),
   };
   getConfigMock = () => {};
   requestBidsMock = {
@@ -223,7 +225,7 @@ describe('Prebid Video', function () {
     const pbEvents = {
       emit: () => {},
       on: (event, callback) => {
-        if (event === CONSTANTS.EVENTS.AUCTION_END) {
+        if (event === EVENTS.AUCTION_END) {
           auctionEndCallback = callback
         }
       },
@@ -335,7 +337,7 @@ describe('Prebid Video', function () {
 
     const pbEvents = {
       on: (event, callback) => {
-        if (event === CONSTANTS.EVENTS.BID_ADJUSTMENT) {
+        if (event === EVENTS.BID_ADJUSTMENT) {
           bidAdjustmentCb = callback;
         } else if (event === 'videoAdImpression') {
           adImpressionCb = callback;
diff --git a/test/spec/modules/videoModule/submodules/adplayerproVideoProvider_spec.js b/test/spec/modules/videoModule/submodules/adplayerproVideoProvider_spec.js
new file mode 100644
index 00000000000..1a792411497
--- /dev/null
+++ b/test/spec/modules/videoModule/submodules/adplayerproVideoProvider_spec.js
@@ -0,0 +1,521 @@
+// Using require style imports for fine grained control of import time
+import {
+  AD_CLICK,
+  AD_COMPLETE,
+  AD_ERROR,
+  AD_IMPRESSION,
+  AD_LOADED,
+  AD_PAUSE,
+  AD_PLAY,
+  AD_REQUEST,
+  AD_SKIPPED,
+  AD_STARTED,
+  DESTROYED,
+  PLAYER_RESIZE,
+  SETUP_COMPLETE,
+  SETUP_FAILED,
+  VOLUME
+} from 'libraries/video/constants/events.js';
+import adPlayerProSubmoduleFactory, {callbackStorageFactory} from '../../../../../modules/adplayerproVideoProvider.js';
+import {PLACEMENT} from '../../../../../libraries/video/constants/ortb';
+import sinon from 'sinon';
+
+const {AdPlayerProProvider, utils} = require('modules/adplayerproVideoProvider.js');
+
+const {
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, VPAID_MIME_TYPE
+} = require('libraries/video/constants/ortb.js');
+
+function getPlayerMock() {
+  return {
+    setup: function () {
+      return this;
+    },
+    load: function () {
+    },
+    resize: function () {
+    },
+    remove: function () {
+    },
+    on: function () {
+      return this;
+    },
+    off: function () {
+      return this;
+    },
+    getAdWidth: function () {
+      return 600
+    },
+    getAdHeight: function () {
+      return 400;
+    }
+  };
+}
+
+function makePlayerFactoryMock(playerMock_) {
+  return () => playerMock_;
+}
+
+function getUtilsMock() {
+  return {
+    getConfig: function () {
+    },
+    getPlayerEvent: event => event,
+    getSupportedMediaTypes: function () {
+    },
+    getPlacement: function () {
+    },
+    getPlaybackMethod: function () {
+    }
+  };
+}
+
+function addDiv() {
+  const div = document.createElement('div');
+  div.setAttribute('id', 'test');
+  document.body.appendChild(div);
+}
+
+function removeDiv() {
+  const div = document.getElementById('test');
+  if (div) {
+    div.remove();
+  }
+}
+
+describe('AdPlayerProProvider', function () {
+  let config;
+  let callbackStorage;
+  let utilsMock;
+  let player;
+
+  beforeEach(() => {
+    addDiv();
+    config = {divId: 'test', playerConfig: {placementId: 'testId'}};
+    callbackStorage = callbackStorageFactory();
+    utilsMock = getUtilsMock();
+    player = getPlayerMock();
+  });
+
+  afterEach(() => {
+    removeDiv();
+  });
+
+  describe('init', function () {
+    it('should trigger failure when Adplayer.Pro is missing', function () {
+      const provider = AdPlayerProProvider(config, null, callbackStorage, utilsMock);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-1);
+    });
+
+    it('should trigger failure when the div is not found', function () {
+      config.divId = 'fake-div'
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utilsMock);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-3);
+    });
+
+    it('should trigger failure when the placementId is not found', function () {
+      config.playerConfig.placementId = '';
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utilsMock);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-4);
+    });
+
+    it('should instantiate the player after setAdTagUrl', function () {
+      const setupSpy = player.setup = sinon.spy(player.setup);
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      provider.init();
+      expect(setupSpy.calledOnce).to.be.false;
+      provider.setAdTagUrl('https://test.com', {});
+      expect(setupSpy.calledOnce).to.be.true;
+      const payload = setupSpy.args[0][0];
+      expect(payload.advertising.tag.url).to.be.equal('https://test.com');
+    });
+
+    it('should instantiate the player after setAdTagUrl for adPlayerProSubmoduleFactory', function () {
+      const setupSpy = player.setup = sinon.spy(player.setup);
+      window.playerPro = makePlayerFactoryMock(player);
+      const provider = adPlayerProSubmoduleFactory(config, {});
+      provider.init();
+      expect(setupSpy.calledOnce).to.be.false;
+      provider.setAdTagUrl('https://test.com', {});
+      expect(setupSpy.calledOnce).to.be.true;
+      const payload = setupSpy.args[0][0];
+      expect(payload.advertising.tag.url).to.be.equal('https://test.com');
+    });
+
+    it('should trigger setup complete when player is already instantiated', function () {
+      const setupSpy = player.setup = sinon.spy(player.setup);
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      const setupComplete = sinon.spy();
+      provider.onEvent(SETUP_COMPLETE, setupComplete, {});
+      provider.init();
+      expect(setupComplete.calledOnce).to.be.true;
+      expect(setupSpy.called).to.be.false;
+    });
+
+    it('should support multiple setup complete event handlers', function () {
+      const setupSpy = player.setup = sinon.spy(player.setup);
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      const setupComplete = sinon.spy();
+      const setupComplete2 = sinon.spy();
+      provider.onEvent(SETUP_COMPLETE, setupComplete, {});
+      provider.onEvent(SETUP_COMPLETE, setupComplete2, {});
+      provider.init();
+      expect(setupComplete.calledOnce).to.be.true;
+      expect(setupComplete2.calledOnce).to.be.true;
+      expect(setupSpy.called).to.be.false;
+    });
+
+    it('should not reinstantiate player', function () {
+      const setupSpy = player.setup = sinon.spy(player.setup);
+      const onSpy = player.on = sinon.spy(player.on);
+
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      provider.init();
+      expect(setupSpy.calledOnce).to.be.false;
+      provider.setAdTagUrl('https://test.com', {});
+      expect(setupSpy.calledOnce).to.be.true;
+      const payload = setupSpy.args[0][0];
+      expect(payload.advertising.tag.url).to.be.equal('https://test.com');
+
+      // test that the player is not reinitialized
+      provider.setAdTagUrl('https://test.com', {});
+      expect(setupSpy.calledOnce).to.be.true;
+
+      // get and call AdStopped event
+      const args = onSpy.args[0];
+      expect(args[0]).to.be.equal('AdStopped');
+      args[1]();
+
+      provider.setAdTagUrl('https://test.com', {});
+      expect(setupSpy.calledTwice).to.be.true;
+    });
+  });
+
+  describe('getId', function () {
+    it('should return configured div id', function () {
+      const provider = AdPlayerProProvider(config, undefined, undefined, utils);
+      expect(provider.getId()).to.be.equal('test');
+    });
+  });
+
+  describe('getOrtbVideo', function () {
+    it('should populate oRTB Video params', function () {
+      const test_media_type = VIDEO_MIME_TYPE.MP4;
+      const test_placement = PLACEMENT.ARTICLE;
+      const test_playback_method = PLAYBACK_METHODS.CLICK_TO_PLAY;
+
+      utilsMock.getSupportedMediaTypes = () => [test_media_type];
+      utilsMock.getPlacement = () => test_placement;
+      utilsMock.getPlaybackMethod = () => test_playback_method;
+
+      const provider = AdPlayerProProvider(config, null, null, utilsMock);
+      provider.init();
+      let video = provider.getOrtbVideo();
+
+      expect(video.mimes).to.include(VIDEO_MIME_TYPE.MP4);
+      expect(video.protocols).to.include.members([
+        PROTOCOLS.VAST_2_0,
+        PROTOCOLS.VAST_3_0,
+        PROTOCOLS.VAST_4_0,
+        PROTOCOLS.VAST_2_0_WRAPPER,
+        PROTOCOLS.VAST_3_0_WRAPPER,
+        PROTOCOLS.VAST_4_0_WRAPPER
+      ]);
+      expect(video.placement).to.equal(test_placement);
+      expect(video.maxextended).to.equal(-1);
+      expect(video.boxingallowed).to.equal(1);
+      expect(video.playbackmethod).to.include(test_playback_method);
+      expect(video.playbackend).to.equal(1);
+      expect(video.api).to.have.length(2);
+      expect(video.api).to.include.members([API_FRAMEWORKS.VPAID_2_0, API_FRAMEWORKS.OMID_1_0]); //
+    });
+  });
+
+  describe('getOrtbContent', function () {
+    it('should populate oRTB Content params', function () {
+      const provider = AdPlayerProProvider(config, null, null, utils);
+      provider.init();
+      expect(provider.getOrtbContent()).to.be.undefined;
+    });
+  });
+
+  describe('setAdTagUrl', function () {
+    it('should call setup', function () {
+      const setupSpy = player.setup = sinon.spy(player.setup);
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      provider.init();
+      provider.setAdTagUrl('', {adXml: 'https://test.com'});
+      expect(setupSpy.calledOnce).to.be.true;
+    });
+
+    it('should not call setup', function () {
+      const setupSpy = player.setup = sinon.spy(player.setup);
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      provider.init();
+      provider.setAdTagUrl('', {});
+      expect(setupSpy.calledOnce).to.be.false;
+    });
+  });
+
+  describe('events', function () {
+    it('should register event listener on player', function () {
+      const onSpy = player.on = sinon.spy();
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      provider.init();
+      provider.setAdTagUrl('https://test.com', {});
+      const callback = () => {
+      };
+      provider.onEvent(AD_REQUEST, callback, {});
+      provider.onEvent('test', callback, {});
+      expect(onSpy.calledTwice).to.be.true;
+      expect(onSpy.args[0][0]).to.be.equal('AdStopped');
+      expect(onSpy.args[1][0]).to.be.equal('AdRequest');
+    });
+
+    it('should remove event listener on player', function () {
+      const offSpy = player.off = sinon.spy();
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      provider.init();
+      provider.setAdTagUrl('https://test.com', {});
+      const callback = () => {
+      };
+      provider.onEvent(AD_IMPRESSION, callback, {});
+      provider.offEvent(AD_IMPRESSION, callback);
+      expect(offSpy.calledOnce).to.be.true;
+      const eventName = offSpy.args[0][0];
+      const eventCallback = offSpy.args[0][1];
+      expect(eventName).to.be.equal('AdImpression');
+      expect(eventCallback).to.be.exist;
+    });
+
+    it('should remove event listener on player by eventName', function () {
+      const offSpy = player.off = sinon.spy();
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      provider.init();
+      provider.setAdTagUrl('https://test.com', {});
+      const callback = () => {
+      };
+      provider.onEvent(AD_IMPRESSION, callback, {});
+      provider.offEvent(AD_IMPRESSION);
+      expect(offSpy.calledOnce).to.be.true;
+      const eventName = offSpy.args[0][0];
+      expect(eventName).to.be.equal('AdImpression');
+    });
+
+    it('should call event player resize', function () {
+      const onSpy = player.on = sinon.spy();
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      provider.init();
+      provider.setAdTagUrl('https://test.com', {});
+      const callbackSpy = sinon.spy();
+      provider.onEvent(PLAYER_RESIZE, callbackSpy, {});
+      expect(onSpy.calledTwice).to.be.true;
+      expect(onSpy.args[1][0]).to.be.equal('AdSizeChange');
+      expect(callbackSpy.notCalled).to.be.true;
+      onSpy.args[1][1]();
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(callbackSpy.args[0][1].width).to.be.equal(600);
+      expect(callbackSpy.args[0][1].height).to.be.equal(400);
+    });
+  });
+
+  describe('destroy', function () {
+    it('should remove and null the player', function () {
+      const removeSpy = player.remove = sinon.spy();
+      player.remove = removeSpy;
+      const provider = AdPlayerProProvider(config, makePlayerFactoryMock(player), callbackStorage, utils);
+      provider.init();
+      provider.setAdTagUrl('https://test.com', {});
+      provider.destroy();
+      provider.destroy();
+      expect(removeSpy.calledOnce).to.be.true;
+    });
+  });
+});
+
+describe('AdPlayerProProvider utils', function () {
+  it('getConfig', function () {
+    expect(utils.getConfig()).to.be.undefined;
+    expect(utils.getConfig({})).to.be.undefined;
+    const config = utils.getConfig({}, 'https://test.com');
+    expect(config.advertising.tag.url).to.be.equal('https://test.com');
+    expect(config._pType).to.be.equal('pbjs');
+  });
+
+  it('getPlayerEvent', function () {
+    function test(event, expected) {
+      expect(utils.getPlayerEvent(event)).to.be.equal(expected);
+    }
+
+    test(DESTROYED, 'AdStopped');
+    test(AD_REQUEST, 'AdRequest');
+    test(AD_LOADED, 'AdLoaded');
+    test(AD_STARTED, 'AdStarted');
+    test(AD_IMPRESSION, 'AdImpression');
+    test(AD_PLAY, 'AdPlaying');
+    test(AD_PAUSE, 'AdPaused');
+    test(AD_CLICK, 'AdClickThru');
+    test(AD_SKIPPED, 'AdSkipped');
+    test(AD_ERROR, 'AdError');
+    test(AD_COMPLETE, 'AdCompleted');
+    test(VOLUME, 'AdVolumeChange');
+    test(PLAYER_RESIZE, 'AdSizeChange');
+    test('test', 'test');
+  });
+
+  it('getSupportedMediaTypes', function () {
+    let supportedMediaTypes = utils.getSupportedMediaTypes([]);
+    expect(supportedMediaTypes).to.include(VPAID_MIME_TYPE);
+
+    supportedMediaTypes = utils.getSupportedMediaTypes([VIDEO_MIME_TYPE.MP4]);
+    expect(supportedMediaTypes).to.include(VPAID_MIME_TYPE);
+  });
+
+  it('getPlacement', function () {
+    function test(config, expected) {
+      expect(utils.getPlacement(config)).to.be.equal(expected);
+    }
+
+    test(false, PLACEMENT.BANNER);
+    test({}, PLACEMENT.BANNER);
+    test({type: 'test'}, PLACEMENT.BANNER);
+    test({type: 'inPage'}, PLACEMENT.ARTICLE);
+    test({type: 'rewarded'}, PLACEMENT.INTERSTITIAL_SLIDER_FLOATING);
+    test({type: 'inView'}, PLACEMENT.INTERSTITIAL_SLIDER_FLOATING);
+  });
+
+  it('getPlaybackMethod', function () {
+    function test(autoplay, mute, expected) {
+      expect(utils.getPlaybackMethod({autoplay, mute})).to.be.equal(expected);
+    }
+
+    test(false, false, PLAYBACK_METHODS.CLICK_TO_PLAY);
+    test(false, true, PLAYBACK_METHODS.CLICK_TO_PLAY);
+    test(true, false, PLAYBACK_METHODS.AUTOPLAY);
+    test(true, true, PLAYBACK_METHODS.AUTOPLAY_MUTED);
+  });
+});
+
+describe('AdPlayerProProvider callbackStorageFactory', function () {
+  let player;
+  let callbackStorage;
+
+  beforeEach(() => {
+    player = getPlayerMock();
+    callbackStorage = callbackStorageFactory();
+  });
+
+  it('storeCallback and getCallback', function () {
+    const eventType = 'test';
+    const callback = () => 11;
+    const eventHandler = () => 12;
+    callbackStorage.storeCallback(eventType, eventHandler, callback);
+    expect(callbackStorage.getCallback(eventType, callback)).to.be.equal(eventHandler);
+
+    const callback2 = () => 21;
+    const eventHandler2 = () => 22;
+    callbackStorage.storeCallback(eventType, eventHandler2, callback2);
+    expect(callbackStorage.getCallback(eventType, callback2)).to.be.equal(eventHandler2);
+
+    expect(callbackStorage.getCallback(eventType, callback)).to.be.equal(eventHandler);
+  });
+
+  it('clearCallback', function () {
+    const eventType = 'test';
+    const callback = () => 11;
+    const callback2 = () => 21;
+    callbackStorage.storeCallback(eventType, () => 12, callback);
+    callbackStorage.storeCallback(eventType, () => 22, callback2);
+
+    expect(callbackStorage.getCallback(eventType, callback)()).to.be.equal(12);
+    expect(callbackStorage.getCallback(eventType, callback2)()).to.be.equal(22);
+
+    callbackStorage.clearCallback(eventType);
+
+    expect(callbackStorage.getCallback(eventType, callback)).to.be.undefined;
+    expect(callbackStorage.getCallback(eventType, callback2)).to.be.undefined;
+
+    callbackStorage.storeCallback(eventType, () => 12, callback);
+    callbackStorage.storeCallback(eventType, () => 22, callback2);
+
+    callbackStorage.clearCallback(eventType, callback);
+
+    expect(callbackStorage.getCallback(eventType, callback)).to.be.undefined;
+    expect(callbackStorage.getCallback(eventType, callback2)()).to.be.equal(22);
+  });
+
+  it('addAllCallbacks', function () {
+    const eventType = 'test';
+    const eventType2 = 'test2';
+    const callback = () => 11;
+    const callback2 = () => 21;
+    const eventHandler = () => 12;
+    const eventHandler2 = () => 22;
+    callbackStorage.storeCallback(eventType, eventHandler, callback);
+    callbackStorage.storeCallback(eventType, eventHandler2, callback2);
+    callbackStorage.storeCallback(eventType2, eventHandler, callback);
+    callbackStorage.storeCallback(eventType2, eventHandler2, callback2);
+
+    let spy = sinon.spy();
+    callbackStorage.addAllCallbacks(spy);
+    expect(spy.callCount).to.be.equal(4);
+    expect(spy.calledWith(eventType, eventHandler)).to.be.true;
+    expect(spy.calledWith(eventType, eventHandler2)).to.be.true;
+    expect(spy.calledWith(eventType2, eventHandler)).to.be.true;
+    expect(spy.calledWith(eventType2, eventHandler2)).to.be.true;
+
+    callbackStorage.clearCallback(eventType, callback);
+    spy = sinon.spy();
+    callbackStorage.addAllCallbacks(spy);
+    expect(spy.callCount).to.be.equal(3);
+    expect(spy.calledWith(eventType, eventHandler2)).to.be.true;
+    expect(spy.calledWith(eventType2, eventHandler)).to.be.true;
+    expect(spy.calledWith(eventType2, eventHandler2)).to.be.true;
+
+    callbackStorage.clearCallback(eventType2);
+    spy = sinon.spy();
+    callbackStorage.addAllCallbacks(spy);
+    expect(spy.callCount).to.be.equal(1);
+    expect(spy.calledWith(eventType, eventHandler2)).to.be.true;
+
+    callbackStorage.storeCallback(eventType, eventHandler, callback);
+    callbackStorage.storeCallback(eventType2, eventHandler, callback);
+    spy = sinon.spy();
+    callbackStorage.addAllCallbacks(spy);
+    expect(spy.callCount).to.be.equal(3);
+    expect(spy.calledWith(eventType, eventHandler)).to.be.true;
+    expect(spy.calledWith(eventType, eventHandler2)).to.be.true;
+    expect(spy.calledWith(eventType2, eventHandler)).to.be.true;
+
+    callbackStorage.clearStorage();
+    spy = sinon.spy();
+    callbackStorage.addAllCallbacks(spy);
+    expect(spy.callCount).to.be.equal(0);
+  });
+
+  it('clearStorage', function () {
+    const eventType = 'test';
+    const callback = () => 11;
+    const eventHandler = () => 12;
+    callbackStorage.storeCallback(eventType, eventHandler, callback);
+    expect(callbackStorage.getCallback(eventType, callback)).to.be.equal(eventHandler);
+
+    callbackStorage.clearStorage();
+    expect(callbackStorage.getCallback(eventType, callback)).to.be.undefined;
+  });
+});
diff --git a/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js b/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js
index a7379ccbab2..125f608f803 100644
--- a/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js
+++ b/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js
@@ -6,7 +6,7 @@ import {
 const {VideojsProvider, utils} = require('modules/videojsVideoProvider');
 
 const {
-  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE, AD_POSITION
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLCMT, VPAID_MIME_TYPE, AD_POSITION
 } = require('libraries/video/constants/ortb.js');
 
 const videojs = require('video.js').default;
@@ -139,7 +139,7 @@ describe('videojsProvider', function () {
       expect(video.playbackmethod).to.include(PLAYBACK_METHODS.CLICK_TO_PLAY);
       expect(video.playbackend).to.equal(1);
       expect(video.api).to.deep.equal([2]);
-      expect(video.placement).to.be.equal(PLACEMENT.INSTREAM);
+      expect(video.plcmt).to.be.equal(PLCMT.ACCOMPANYING_CONTENT);
     });
 
     it('should populate oRTB Content', function () {
diff --git a/test/spec/modules/videoreachBidAdapter_spec.js b/test/spec/modules/videoreachBidAdapter_spec.js
index 67ad89eac3d..dc81ec74ff8 100644
--- a/test/spec/modules/videoreachBidAdapter_spec.js
+++ b/test/spec/modules/videoreachBidAdapter_spec.js
@@ -21,12 +21,12 @@ describe('videoreachBidAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'TagId': ''
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/vidoomyBidAdapter_spec.js b/test/spec/modules/vidoomyBidAdapter_spec.js
index 38fa872e6b8..6fd779bdb0b 100644
--- a/test/spec/modules/vidoomyBidAdapter_spec.js
+++ b/test/spec/modules/vidoomyBidAdapter_spec.js
@@ -44,9 +44,9 @@ describe('vidoomyBidAdapter', function() {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when mediaType is video with INSTREAM context and lacks playerSize property', function () {
diff --git a/test/spec/modules/viqeoBidAdapter_spec.js b/test/spec/modules/viqeoBidAdapter_spec.js
index 8f597318af9..af397393a51 100644
--- a/test/spec/modules/viqeoBidAdapter_spec.js
+++ b/test/spec/modules/viqeoBidAdapter_spec.js
@@ -6,9 +6,7 @@ describe('viqeoBidAdapter', function () {
     expect(spec.isBidRequestValid({
       bidder: 'viqeo',
       params: {
-        user: {
-          buyeruid: '1',
-        },
+        tagId: '2',
         playerOptions: {
           videoId: 'ed584da454c7205ca7e4',
           profileId: 1382,
@@ -27,9 +25,7 @@ describe('viqeoBidAdapter', function () {
       bidId: 'id1',
       bidder: 'viqeo',
       params: {
-        user: {
-          buyeruid: '1',
-        },
+        tagId: '2',
         currency: 'EUR',
         floor: 0.5,
         playerOptions: {
@@ -48,7 +44,7 @@ describe('viqeoBidAdapter', function () {
     expect(requestData.imp[0].bidfloor).to.equal(0.5);
     expect(requestData.imp[0].video.w).to.equal(240);
     expect(requestData.imp[0].video.h).to.equal(400);
-    expect(requestData.user.buyeruid).to.equal('1');
+    expect(requestData.imp[0].tagid).to.equal('2');
   });
   it('build request check url', function () {
     const bidRequestData = [{
@@ -58,14 +54,13 @@ describe('viqeoBidAdapter', function () {
           videoId: 'ed584da454c7205ca7e4',
           profileId: 1382,
         },
-        sspId: 42,
       },
       mediaTypes: {
         video: { playerSize: [[240, 400]] }
       },
     }];
     const request = spec.buildRequests(bidRequestData);
-    expect(request[0].url).to.equal('https://ads.betweendigital.com/openrtb_bid/?sspId=42')
+    expect(request[0].url).to.equal('https://ad.vqserve.com/ads/prebid')
   });
   it('response_params common case', function () {
     const bidRequestData = {
diff --git a/test/spec/modules/visiblemeasuresBidAdapter_spec.js b/test/spec/modules/visiblemeasuresBidAdapter_spec.js
index ad75e17699f..55f2a74ce77 100644
--- a/test/spec/modules/visiblemeasuresBidAdapter_spec.js
+++ b/test/spec/modules/visiblemeasuresBidAdapter_spec.js
@@ -3,11 +3,21 @@ import { spec } from '../../../modules/visiblemeasuresBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 
-const bidder = 'visiblemeasures'
+const bidder = 'visiblemeasures';
 const adUrl = 'https://us-e.visiblemeasures.com/pbjs';
 const syncUrl = 'https://cs.visiblemeasures.com';
 
 describe('VisibleMeasuresBidAdapter', function () {
+  const userIdAsEids = [{
+    source: 'test.org',
+    uids: [{
+      id: '01**********',
+      atype: 1,
+      ext: {
+        third: '01***********'
+      }
+    }]
+  }];
   const bids = [
     {
       bidId: getUniqueIdentifierStr(),
@@ -18,8 +28,9 @@ describe('VisibleMeasuresBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testBanner',
-      }
+        placementId: 'testBanner'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -32,8 +43,9 @@ describe('VisibleMeasuresBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testVideo',
-      }
+        placementId: 'testVideo'
+      },
+      userIdAsEids
     },
     {
       bidId: getUniqueIdentifierStr(),
@@ -55,8 +67,9 @@ describe('VisibleMeasuresBidAdapter', function () {
         }
       },
       params: {
-        placementId: 'testNative',
-      }
+        placementId: 'testNative'
+      },
+      userIdAsEids
     }
   ];
 
@@ -75,9 +88,20 @@ describe('VisibleMeasuresBidAdapter', function () {
 
   const bidderRequest = {
     uspConsent: '1---',
-    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    gdprConsent: {
+      consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+      vendorData: {}
+    },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK'
+      }
     },
     timeout: 500
   };
@@ -114,6 +138,7 @@ describe('VisibleMeasuresBidAdapter', function () {
       expect(data).to.be.an('object');
       expect(data).to.have.all.keys('deviceWidth',
         'deviceHeight',
+        'device',
         'language',
         'secure',
         'host',
@@ -131,7 +156,7 @@ describe('VisibleMeasuresBidAdapter', function () {
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
       expect(data.coppa).to.be.a('number');
-      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.be.a('object');
       expect(data.ccpa).to.be.a('string');
       expect(data.tmax).to.be.a('number');
       expect(data.placements).to.have.lengthOf(3);
@@ -147,6 +172,56 @@ describe('VisibleMeasuresBidAdapter', function () {
         expect(placement.schain).to.be.an('object');
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');
@@ -172,8 +247,10 @@ describe('VisibleMeasuresBidAdapter', function () {
       serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
       expect(data.gdpr).to.exist;
-      expect(data.gdpr).to.be.a('string');
-      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.gdpr).to.be.a('object');
+      expect(data.gdpr).to.have.property('consentString');
+      expect(data.gdpr).to.not.have.property('vendorData');
+      expect(data.gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.ccpa).to.not.exist;
       delete bidderRequest.gdprConsent;
     });
@@ -188,12 +265,38 @@ describe('VisibleMeasuresBidAdapter', function () {
       expect(data.ccpa).to.equal(bidderRequest.uspConsent);
       expect(data.gdpr).to.not.exist;
     });
+  });
+
+  describe('gpp consent', function () {
+    it('bidderRequest.gppConsent', () => {
+      bidderRequest.gppConsent = {
+        gppString: 'abc123',
+        applicableSections: [8]
+      };
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([], bidderRequest);
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
       let data = serverRequest.data;
-      expect(data.placements).to.be.an('array').that.is.empty;
-    });
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      delete bidderRequest.gppConsent;
+    })
+
+    it('bidderRequest.ortb2.regs.gpp', () => {
+      bidderRequest.ortb2 = bidderRequest.ortb2 || {};
+      bidderRequest.ortb2.regs = bidderRequest.ortb2.regs || {};
+      bidderRequest.ortb2.regs.gpp = 'abc123';
+      bidderRequest.ortb2.regs.gpp_sid = [8];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('gpp');
+      expect(data).to.have.property('gpp_sid');
+
+      bidderRequest.ortb2;
+    })
   });
 
   describe('interpretResponse', function () {
@@ -397,5 +500,17 @@ describe('VisibleMeasuresBidAdapter', function () {
       expect(syncData[0].url).to.be.a('string')
       expect(syncData[0].url).to.equal(`${syncUrl}/image?pbjs=1&ccpa_consent=1---&coppa=0`)
     });
+    it('Should return array of objects with proper sync config , include GPP', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {}, {
+        gppString: 'abc123',
+        applicableSections: [8]
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal(`${syncUrl}/image?pbjs=1&gpp=abc123&gpp_sid=8&coppa=0`);
+    });
   });
 });
diff --git a/test/spec/modules/visxBidAdapter_spec.js b/test/spec/modules/visxBidAdapter_spec.js
index 139349ceead..923ff7e86b2 100755
--- a/test/spec/modules/visxBidAdapter_spec.js
+++ b/test/spec/modules/visxBidAdapter_spec.js
@@ -4,6 +4,9 @@ import { config } from 'src/config.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import * as utils from 'src/utils.js';
 import { makeSlot } from '../integration/faker/googletag.js';
+import { mergeDeep } from '../../../src/utils.js';
+import { setConfig as setCurrencyConfig } from '../../../modules/currency.js';
+import { addFPDToBidderRequest } from '../../helpers/fpd.js';
 
 describe('VisxAdapter', function () {
   const adapter = newBidder(spec);
@@ -32,21 +35,21 @@ describe('VisxAdapter', function () {
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'uid': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when uid can not be parsed as number', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'uid': 'sdvsdv'
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('it should fail on invalid video bid', function () {
@@ -89,6 +92,46 @@ describe('VisxAdapter', function () {
       timeout: 3000,
       refererInfo: {
         page: 'https://example.com'
+      },
+      ortb2: {
+        device: {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        site: {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       }
     };
     const referrer = bidderRequest.refererInfo.page;
@@ -109,7 +152,7 @@ describe('VisxAdapter', function () {
         'sizes': [[300, 250], [300, 600]],
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '1d1a030790a475'
       },
       {
         'bidder': 'visx',
@@ -120,7 +163,7 @@ describe('VisxAdapter', function () {
         'sizes': [[728, 90], [300, 250]],
         'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '1d1a030790a475'
       },
       {
         'bidder': 'visx',
@@ -131,7 +174,7 @@ describe('VisxAdapter', function () {
         'sizes': [[300, 250], [300, 600]],
         'bidId': '42dbe3a7168a6a',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '1d1a030790a475'
       },
       {
         'bidder': 'visx',
@@ -151,7 +194,7 @@ describe('VisxAdapter', function () {
         },
         'bidId': '39a4e3a7168a6a',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '1d1a030790a475'
       }
     ];
 
@@ -217,7 +260,44 @@ describe('VisxAdapter', function () {
         'tmax': 3000,
         'cur': ['EUR'],
         'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
-        'site': {'page': referrer}
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       });
     });
 
@@ -235,13 +315,49 @@ describe('VisxAdapter', function () {
         'tmax': 3000,
         'cur': ['EUR'],
         'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
-        'site': {'page': referrer}
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       });
     });
 
     it('should add currency from currency.bidderCurrencyDefault', function () {
-      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
-        arg => arg === 'currency.bidderCurrencyDefault.visx' ? 'GBP' : 'USD');
+      config.setConfig({currency: {bidderCurrencyDefault: {visx: 'GBP'}}})
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = parseRequest(request.url);
       expect(payload).to.be.an('object');
@@ -255,32 +371,62 @@ describe('VisxAdapter', function () {
         'tmax': 3000,
         'cur': ['GBP'],
         'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
-        'site': {'page': referrer}
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       });
 
-      getConfigStub.restore();
+      config.resetConfig();
     });
 
     it('should add currency from currency.adServerCurrency', function () {
-      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
-        arg => arg === 'currency.bidderCurrencyDefault.visx' ? '' : 'USD');
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const payload = parseRequest(request.url);
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
-
-      const postData = request.data;
-      expect(postData).to.be.an('object');
-      expect(postData).to.deep.equal({
-        'id': '22edbae2733bf6',
-        'imp': expectedFullImps,
-        'tmax': 3000,
-        'cur': ['USD'],
-        'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
-        'site': {'page': referrer}
+      setCurrencyConfig({ adServerCurrency: 'USD' })
+      return addFPDToBidderRequest(bidderRequest).then(res => {
+        const request = spec.buildRequests(bidRequests, res);
+        const payload = parseRequest(request.url);
+        expect(payload).to.be.an('object');
+        expect(payload).to.have.property('auids', '903535,903535,903536,903537');
+
+        const postData = request.data;
+        expect(postData).to.be.an('object');
+        expect(postData.cur).to.deep.equal(['USD']);
+        setCurrencyConfig({})
       });
-
-      getConfigStub.restore();
     });
 
     it('if gdprConsent is present payload must have gdpr params', function () {
@@ -294,9 +440,50 @@ describe('VisxAdapter', function () {
         'tmax': 3000,
         'cur': ['EUR'],
         'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
-        'site': {'page': referrer},
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'regs': {
+          'ext': {
+            'gdpr': 1
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        },
         'user': {'ext': {'consent': 'AAA'}},
-        'regs': {'ext': {'gdpr': 1}}
       });
     });
 
@@ -311,7 +498,44 @@ describe('VisxAdapter', function () {
         'tmax': 3000,
         'cur': ['EUR'],
         'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
-        'site': {'page': referrer},
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        },
         'user': {'ext': {'consent': 'AAA'}},
         'regs': {'ext': {'gdpr': 0}}
       });
@@ -328,7 +552,44 @@ describe('VisxAdapter', function () {
         'tmax': 3000,
         'cur': ['EUR'],
         'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
-        'site': {'page': referrer},
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        },
         'user': {'ext': {'consent': 'AAA'}},
         'regs': {'ext': {'gdpr': 1}}
       });
@@ -359,7 +620,44 @@ describe('VisxAdapter', function () {
             'schain': schainObject
           }
         },
-        'site': {'page': referrer},
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       });
     });
 
@@ -408,7 +706,44 @@ describe('VisxAdapter', function () {
             'wrapperVersion': '$prebid.version$'
           }
         },
-        'site': {'page': referrer},
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        },
         'user': {'ext': {'eids': eids}}
       });
     });
@@ -429,7 +764,44 @@ describe('VisxAdapter', function () {
             'wrapperVersion': '$prebid.version$'
           }
         },
-        'site': {'page': referrer}
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       });
     });
   });
@@ -448,6 +820,46 @@ describe('VisxAdapter', function () {
       timeout: 3000,
       refererInfo: {
         page: 'https://example.com'
+      },
+      'ortb2': {
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       }
     };
     const referrer = bidderRequest.refererInfo.page;
@@ -467,7 +879,7 @@ describe('VisxAdapter', function () {
         },
         'bidId': '39aff3a7169a6a',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a476',
+        'auctionId': '1d1a030790a476'
       }
     ];
 
@@ -494,7 +906,6 @@ describe('VisxAdapter', function () {
       const payload = parseRequest(request.url);
       expect(payload).to.be.an('object');
       expect(payload).to.have.property('auids', '903538');
-
       const postData = request.data;
       expect(postData).to.be.an('object');
       expect(postData).to.deep.equal({
@@ -512,7 +923,50 @@ describe('VisxAdapter', function () {
             'wrapperVersion': '$prebid.version$'
           }
         },
-        'site': {'page': referrer}
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        },
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [
+                  '124'
+                ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [
+                  '124'
+                ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [
+                  '99'
+                ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        }
       });
     });
   });
@@ -531,6 +985,46 @@ describe('VisxAdapter', function () {
       timeout: 3000,
       refererInfo: {
         page: 'https://example.com'
+      },
+      ortb2: {
+        device: {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        site: {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       }
     };
     const referrer = bidderRequest.refererInfo.page;
@@ -544,7 +1038,7 @@ describe('VisxAdapter', function () {
         'sizes': [[300, 250], [300, 600]],
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '1d1a030790a475'
       },
       {
         'bidder': 'visx',
@@ -555,7 +1049,7 @@ describe('VisxAdapter', function () {
         'sizes': [[300, 250], [300, 600]],
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '1d1a030790a475'
       }
     ];
     let sandbox;
@@ -612,7 +1106,44 @@ describe('VisxAdapter', function () {
             'wrapperVersion': '$prebid.version$'
           }
         },
-        'site': {'page': referrer}
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       });
     });
 
@@ -641,7 +1172,44 @@ describe('VisxAdapter', function () {
             'wrapperVersion': '$prebid.version$'
           }
         },
-        'site': {'page': referrer}
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       });
     });
   });
@@ -669,7 +1237,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '300bfeb0d71a5b',
           'bidderRequestId': '5f2009617a7c0a',
-          'auctionId': '1cbd2feafe5e8b',
+          'auctionId': '1cbd2feafe5e8b'
         }
       ];
       const request = spec.buildRequests(bidRequests);
@@ -719,7 +1287,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '300bfeb0d71a5b',
           'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
+          'auctionId': '1fa09aee5c8c99'
         },
         {
           'bidder': 'visx',
@@ -730,7 +1298,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '4dff80cc4ee346',
           'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
+          'auctionId': '1fa09aee5c8c99'
         },
         {
           'bidder': 'visx',
@@ -741,7 +1309,7 @@ describe('VisxAdapter', function () {
           'sizes': [[728, 90]],
           'bidId': '5703af74d0472a',
           'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
+          'auctionId': '1fa09aee5c8c99'
         }
       ];
       const request = spec.buildRequests(bidRequests);
@@ -823,7 +1391,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '300bfeb0d71a5b',
           'bidderRequestId': '5f2009617a7c0a',
-          'auctionId': '1cbd2feafe5e8b',
+          'auctionId': '1cbd2feafe5e8b'
         }
       ];
       const getConfigStub = sinon.stub(config, 'getConfig').returns('PLN');
@@ -888,7 +1456,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '300bfeb0d71321',
           'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
+          'auctionId': '1fa09aee5c84d34'
         },
         {
           'bidder': 'visx',
@@ -899,7 +1467,7 @@ describe('VisxAdapter', function () {
           'sizes': [[728, 90]],
           'bidId': '300bfeb0d7183bb',
           'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
+          'auctionId': '1fa09aee5c84d34'
         }
       ];
       const request = spec.buildRequests(bidRequests);
@@ -925,7 +1493,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '2164be6358b9',
           'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
+          'auctionId': '32a1f276cb87cb8'
         },
         {
           'bidder': 'visx',
@@ -936,7 +1504,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '326bde7fbf69',
           'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
+          'auctionId': '32a1f276cb87cb8'
         },
         {
           'bidder': 'visx',
@@ -947,7 +1515,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '4e111f1b66e4',
           'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
+          'auctionId': '32a1f276cb87cb8'
         },
         {
           'bidder': 'visx',
@@ -958,7 +1526,7 @@ describe('VisxAdapter', function () {
           'sizes': [[728, 90]],
           'bidId': '26d6f897b516',
           'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
+          'auctionId': '32a1f276cb87cb8'
         },
         {
           'bidder': 'visx',
@@ -969,7 +1537,7 @@ describe('VisxAdapter', function () {
           'sizes': [[728, 90]],
           'bidId': '1751cd90161',
           'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
+          'auctionId': '32a1f276cb87cb8'
         }
       ];
       const request = spec.buildRequests(bidRequests);
@@ -1075,7 +1643,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '5126e301f4be',
           'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
+          'auctionId': '35bcbc0f7e79c'
         },
         {
           'bidder': 'visx',
@@ -1086,7 +1654,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '57b2ebe70e16',
           'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
+          'auctionId': '35bcbc0f7e79c'
         },
         {
           'bidder': 'visx',
@@ -1097,7 +1665,7 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '225fcd44b18c',
           'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
+          'auctionId': '35bcbc0f7e79c'
         }
       ];
       const request = spec.buildRequests(bidRequests);
@@ -1162,7 +1730,7 @@ describe('VisxAdapter', function () {
           'sizes': [[400, 300]],
           'bidId': '2164be6358b9',
           'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
+          'auctionId': '32a1f276cb87cb8'
         }
       ];
       const request = spec.buildRequests(bidRequests);
@@ -1214,7 +1782,7 @@ describe('VisxAdapter', function () {
           'sizes': [[400, 300]],
           'bidId': '2164be6358b9',
           'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
+          'auctionId': '32a1f276cb87cb8'
         }
       ];
       const request = spec.buildRequests(bidRequests);
@@ -1251,12 +1819,13 @@ describe('VisxAdapter', function () {
           'sizes': [[300, 250], [300, 600]],
           'bidId': '300bfeb0d71a5b',
           'bidderRequestId': '5f2009617a7c0a',
-          'auctionId': '1cbd2feafe5e8b',
+          'auctionId': '1cbd2feafe5e8b'
         }
       ];
       const request = spec.buildRequests(bidRequests);
       const pendingUrl = 'https://t.visx.net/track/pending/123123123';
       const winUrl = 'https://t.visx.net/track/win/53245341';
+      const runtimeUrl = 'https://t.visx.net/track/status/12345678';
       const expectedResponse = [
         {
           'requestId': '300bfeb0d71a5b',
@@ -1281,7 +1850,8 @@ describe('VisxAdapter', function () {
           'ext': {
             'events': {
               'pending': pendingUrl,
-              'win': winUrl
+              'win': winUrl,
+              'runtime': runtimeUrl
             },
             'targeting': {
               'hb_visx_product': 'understitial',
@@ -1298,6 +1868,9 @@ describe('VisxAdapter', function () {
         pending: pendingUrl,
         win: winUrl,
       });
+      utils.deepSetValue(serverResponse.bid[0], 'ext.visx.events', {
+        runtime: runtimeUrl
+      });
       const result = spec.interpretResponse({'body': {'seatbid': [serverResponse]}}, request);
       expect(result).to.deep.equal(expectedResponse);
     });
@@ -1325,6 +1898,39 @@ describe('VisxAdapter', function () {
       expect(utils.triggerPixel.calledOnceWith(trackUrl)).to.equal(true);
     });
 
+    it('onBidWon with runtime tracker (0 < timeToRespond <= 5000 )', function () {
+      const trackUrl = 'https://t.visx.net/track/win/123123123';
+      const runtimeUrl = 'https://t.visx.net/track/status/12345678/{STATUS_CODE}';
+      const bid = { auctionId: '1', ext: { events: { win: trackUrl, runtime: runtimeUrl } }, timeToRespond: 100 };
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.calledTwice).to.equal(true);
+      expect(utils.triggerPixel.calledWith(trackUrl)).to.equal(true);
+      expect(utils.triggerPixel.calledWith(runtimeUrl.replace('{STATUS_CODE}', 999002))).to.equal(true);
+    });
+
+    it('onBidWon with runtime tracker (timeToRespond <= 0 )', function () {
+      const runtimeUrl = 'https://t.visx.net/track/status/12345678/{STATUS_CODE}';
+      const bid = { auctionId: '2', ext: { events: { runtime: runtimeUrl } }, timeToRespond: 0 };
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.calledOnceWith(runtimeUrl.replace('{STATUS_CODE}', 999000))).to.equal(true);
+    });
+
+    it('onBidWon with runtime tracker (timeToRespond > 5000 )', function () {
+      const runtimeUrl = 'https://t.visx.net/track/status/12345678/{STATUS_CODE}';
+      const bid = { auctionId: '3', ext: { events: { runtime: runtimeUrl } }, timeToRespond: 5001 };
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.calledOnceWith(runtimeUrl.replace('{STATUS_CODE}', 999100))).to.equal(true);
+    });
+
+    it('onBidWon runtime tracker should be called once per auction', function () {
+      const runtimeUrl = 'https://t.visx.net/track/status/12345678/{STATUS_CODE}';
+      const bid1 = { auctionId: '4', ext: { events: { runtime: runtimeUrl } }, timeToRespond: 100 };
+      spec.onBidWon(bid1);
+      const bid2 = { auctionId: '4', ext: { events: { runtime: runtimeUrl } }, timeToRespond: 200 };
+      spec.onBidWon(bid2);
+      expect(utils.triggerPixel.calledOnceWith(runtimeUrl.replace('{STATUS_CODE}', 999002))).to.equal(true);
+    });
+
     it('onTimeout', function () {
       const data = [{ timeout: 3000, adUnitCode: 'adunit-code-1', auctionId: '1cbd2feafe5e8b', bidder: 'visx', bidId: '23423', params: [{ uid: '1' }] }];
       const expectedData = [{ timeout: 3000, params: [{ uid: 1 }] }];
@@ -1396,13 +2002,53 @@ describe('VisxAdapter', function () {
         'sizes': [[300, 250], [300, 600]],
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '1d1a030790a475'
       }
     ];
     const bidderRequest = {
       timeout: 3000,
       refererInfo: {
         page: 'https://example.com'
+      },
+      'ortb2': {
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        }
       }
     };
 
@@ -1473,4 +2119,183 @@ describe('VisxAdapter', function () {
       expect(request.data.user.ext.vads).to.be.a('string');
     });
   });
+
+  describe('ortb2 data', function () {
+    const bidRequests = [
+      {
+        'bidder': 'visx',
+        'params': {
+          'uid': 903535
+        },
+        'adUnitCode': 'adunit-code-1',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475'
+      }
+    ];
+    const bidderRequest = {
+      timeout: 3000,
+      refererInfo: {
+        page: 'https://example.com'
+      },
+      'ortb2': {
+        'device': {
+          'w': 1259,
+          'h': 934,
+          'dnt': 0,
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'language': 'tr',
+          'sua': {
+            'source': 1,
+            'platform': {
+              'brand': 'macOS'
+            },
+            'browsers': [
+              {
+                'brand': 'Chromium',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Google Chrome',
+                'version': [ '124' ]
+              },
+              {
+                'brand': 'Not-A.Brand',
+                'version': [ '99' ]
+              }
+            ],
+            'mobile': 0
+          },
+          'ext': {
+            'cdep': 'treatment_1.1'
+          }
+        },
+        'site': {
+          'domain': 'localhost:9999',
+          'publisher': {
+            'domain': 'localhost:9999'
+          },
+          'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html'
+        },
+        'user': {
+          'keywords': 'x,y',
+          'data': [
+            {
+              'name': 'exampleprovider.de',
+              'ext': {
+                'segtax': 5
+              },
+              'segment': [
+                {
+                  'id': '1'
+                }
+              ]
+            },
+            {
+              'ext': {
+                'segtax': 601,
+                'segclass': '5'
+              },
+              'segment': [
+                {
+                  'id': '140'
+                }
+              ],
+              'name': 'pa.openx.net'
+            },
+            {
+              'ext': {
+                'segtax': 601,
+                'segclass': '5'
+              },
+              'segment': [
+                {
+                  'id': '140'
+                }
+              ],
+              'name': 'ads.pubmatic.com'
+            }
+          ],
+          'ext': {
+            'data': {
+              'registered': true,
+              'interests': [
+                'ads'
+              ]
+            }
+          }
+        }
+      }
+    };
+
+    it('should pass interests if ortb2 has interests in user data', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.user.ext.data.interests).not.to.be.undefined;
+    });
+
+    it('should pass device if ortb2 has device', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.device).not.to.be.undefined;
+    });
+
+    it('should pass site if ortb2 has site', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.site).not.to.be.undefined;
+    });
+
+    it('should merge if user object exists', function () {
+      const user = {
+        'ext': {
+          'vads': 'cXaIRA425BmynEN1ratEnc_5e',
+          'data': {
+            'registered': true,
+            'interests': [
+              'ads'
+            ]
+          }
+        },
+        'keywords': 'x,y',
+        'data': [
+          {
+            'name': 'exampleprovider.de',
+            'ext': {
+              'segtax': 5
+            },
+            'segment': [
+              {
+                'id': '1'
+              }
+            ]
+          }
+        ]
+      };
+      const userOrtb2 = {
+        'keywords': 'x,y',
+        'data': [
+          {
+            'name': 'exampleprovider.de',
+            'ext': {
+              'segtax': 5
+            },
+            'segment': [
+              {
+                'id': '1'
+              }
+            ]
+          }
+        ],
+        'ext': {
+          'data': {
+            'registered': true,
+            'interests': [
+              'ads'
+            ]
+          }
+        }
+      }
+      const userReq = mergeDeep(user, userOrtb2);
+      expect(userReq.ext.vads).not.to.be.undefined;
+    });
+  });
 });
diff --git a/test/spec/modules/voxBidAdapter_spec.js b/test/spec/modules/voxBidAdapter_spec.js
index 5f4ada06c65..65752837b23 100644
--- a/test/spec/modules/voxBidAdapter_spec.js
+++ b/test/spec/modules/voxBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai'
 import { spec } from 'modules/voxBidAdapter.js'
-import {config} from 'src/config.js'
+import { setConfig as setCurrencyConfig } from '../../../modules/currency'
+import { addFPDToBidderRequest } from '../../helpers/fpd'
 
 function getSlotConfigs(mediaTypes, params) {
   return {
@@ -247,14 +248,17 @@ describe('VOX Adapter', function() {
       })
 
       it('should request floor price in adserver currency', function () {
-        const configCurrency = 'DKK'
-        config.setConfig({ currency: { adServerCurrency: configCurrency } })
-        const request = spec.buildRequests([ getBidWithFloor() ], bidderRequest)
-        const data = JSON.parse(request.data)
-        data.bidRequests.forEach(bid => {
-          expect(bid.floorInfo.currency).to.equal(configCurrency)
-        })
-      })
+        const configCurrency = 'DKK';
+        setCurrencyConfig({ adServerCurrency: configCurrency });
+        return addFPDToBidderRequest(bidderRequest).then(res => {
+          const request = spec.buildRequests([ getBidWithFloor() ], res)
+          const data = JSON.parse(request.data)
+          data.bidRequests.forEach(bid => {
+            expect(bid.floorInfo.currency).to.equal(configCurrency)
+          })
+          setCurrencyConfig({});
+        });
+      });
 
       function getBidWithFloor(floor) {
         return {
diff --git a/test/spec/modules/vrtcalBidAdapter_spec.js b/test/spec/modules/vrtcalBidAdapter_spec.js
index cc4dc0a3882..938934170e9 100644
--- a/test/spec/modules/vrtcalBidAdapter_spec.js
+++ b/test/spec/modules/vrtcalBidAdapter_spec.js
@@ -134,4 +134,39 @@ describe('vrtcalBidAdapter', function () {
       ).to.be.true
     })
   })
+
+  describe('getUserSyncs', function() {
+    const syncurl_iframe = 'https://usync.vrtcal.com/i?ssp=1804&synctype=iframe';
+    const syncurl_redirect = 'https://usync.vrtcal.com/i?ssp=1804&synctype=redirect';
+
+    it('base iframe sync pper config', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, undefined)).to.deep.equal([{
+        type: 'iframe', url: syncurl_iframe + '&us_privacy=&gdpr=0&gdpr_consent=&gpp=&gpp_sid=&surl='
+      }]);
+    });
+
+    it('base redirect sync per config', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: false }, {}, undefined, undefined)).to.deep.equal([{
+        type: 'image', url: syncurl_redirect + '&us_privacy=&gdpr=0&gdpr_consent=&gpp=&gpp_sid=&surl='
+      }]);
+    });
+
+    it('pass with ccpa data', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, 'ccpa_consent_string', undefined)).to.deep.equal([{
+        type: 'iframe', url: syncurl_iframe + '&us_privacy=ccpa_consent_string&gdpr=0&gdpr_consent=&gpp=&gpp_sid=&surl='
+      }]);
+    });
+
+    it('pass with gdpr data', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {gdprApplies: 1, consentString: 'gdpr_consent_string'}, undefined, undefined)).to.deep.equal([{
+        type: 'iframe', url: syncurl_iframe + '&us_privacy=&gdpr=1&gdpr_consent=gdpr_consent_string&gpp=&gpp_sid=&surl='
+      }]);
+    });
+
+    it('pass with gpp data', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, undefined, {gppString: 'gpp_consent_string', applicableSections: [1, 5]})).to.deep.equal([{
+        type: 'iframe', url: syncurl_iframe + '&us_privacy=&gdpr=0&gdpr_consent=&gpp=gpp_consent_string&gpp_sid=1,5&surl='
+      }]);
+    });
+  })
 })
diff --git a/test/spec/modules/weboramaRtdProvider_spec.js b/test/spec/modules/weboramaRtdProvider_spec.js
index 7de8474d7c9..964c42eff07 100644
--- a/test/spec/modules/weboramaRtdProvider_spec.js
+++ b/test/spec/modules/weboramaRtdProvider_spec.js
@@ -48,6 +48,120 @@ describe('weboramaRtdProvider', function() {
       };
       expect(weboramaSubmodule.init(moduleConfig)).to.equal(true);
     });
+
+    it('instantiate with empty sfbxLiteData should return true', function() {
+      const moduleConfig = {
+        params: {
+          sfbxLiteDataConf: {},
+        }
+      };
+      expect(weboramaSubmodule.init(moduleConfig)).to.equal(true);
+    });
+
+    describe('webo user data should check gdpr consent', function() {
+      it('should initialize if gdpr does not applies', function() {
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {}
+          }
+        };
+        const userConsent = {
+          gdpr: {
+            gdprApplies: false,
+          },
+        }
+        expect(weboramaSubmodule.init(moduleConfig, userConsent)).to.equal(true);
+      });
+      it('should initialize if gdpr applies and consent is ok', function() {
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {}
+          }
+        };
+        const userConsent = {
+          gdpr: {
+            gdprApplies: true,
+            vendorData: {
+              purpose: {
+                consents: {
+                  1: true,
+                  3: true,
+                  4: true,
+                  5: true,
+                  6: true,
+                  9: true,
+                },
+              },
+              specialFeatureOptins: {
+                1: true,
+              },
+              vendor: {
+                consents: {
+                  284: true,
+                },
+              }
+            },
+          },
+        }
+        expect(weboramaSubmodule.init(moduleConfig, userConsent)).to.equal(true);
+      });
+      it('should NOT initialize if gdpr applies and consent is nok: miss consent vendor id', function() {
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {}
+          }
+        };
+        const userConsent = {
+          gdpr: {
+            gdprApplies: true,
+            vendorData: {
+              purpose: {
+                consents: {
+                  1: true,
+                  3: true,
+                  4: true,
+                },
+              },
+              specialFeatureOptins: {},
+              vendor: {
+                consents: {
+                  284: false,
+                },
+              }
+            },
+          },
+        }
+        expect(weboramaSubmodule.init(moduleConfig, userConsent)).to.equal(false);
+      });
+      it('should NOT initialize if gdpr applies and consent is nok: miss one purpose id', function() {
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {}
+          }
+        };
+        const userConsent = {
+          gdpr: {
+            gdprApplies: true,
+            vendorData: {
+              purpose: {
+                consents: {
+                  1: false,
+                  3: true,
+                  4: true,
+                },
+              },
+              specialFeatureOptins: {},
+              vendor: {
+                consents: {
+                  284: true,
+                },
+              }
+            },
+          },
+        }
+        expect(weboramaSubmodule.init(moduleConfig, userConsent)).to.equal(false);
+      });
+    });
   });
 
   describe('Handle Set Targeting and Bid Request', function() {
@@ -1395,7 +1509,7 @@ describe('weboramaRtdProvider', function() {
           }
         };
         const data = {
-          webo_cs: ['foo', 'bar'],
+          webo_cs: [12, 345],
           webo_audiences: ['baz'],
         };
 
@@ -1506,7 +1620,7 @@ describe('weboramaRtdProvider', function() {
             };
             const data = {
               webo_cs: ['foo', 'bar'],
-              webo_audiences: ['baz'],
+              webo_audiences: [12345],
             };
 
             const entry = {
@@ -1632,7 +1746,7 @@ describe('weboramaRtdProvider', function() {
             };
             const data = {
               webo_cs: ['foo', 'bar'],
-              webo_audiences: ['baz'],
+              webo_audiences: [12345],
             };
 
             const entry = {
@@ -1754,7 +1868,7 @@ describe('weboramaRtdProvider', function() {
             };
             const data = {
               webo_cs: ['foo', 'bar'],
-              webo_audiences: ['baz'],
+              webo_audiences: [12345],
             };
 
             const entry = {
@@ -1899,7 +2013,7 @@ describe('weboramaRtdProvider', function() {
             };
             const data = {
               webo_cs: ['foo', 'bar'],
-              webo_audiences: ['baz'],
+              webo_audiences: [12345],
             };
 
             const entry = {
@@ -2042,7 +2156,7 @@ describe('weboramaRtdProvider', function() {
         };
         const data = {
           webo_cs: ['foo', 'bar'],
-          webo_audiences: ['baz'],
+          webo_audiences: [12345],
         };
 
         const entry = {
@@ -2103,7 +2217,7 @@ describe('weboramaRtdProvider', function() {
         };
         const data = {
           webo_cs: ['foo', 'bar'],
-          webo_audiences: ['baz'],
+          webo_audiences: [12345],
         };
 
         const entry = {
@@ -2175,7 +2289,7 @@ describe('weboramaRtdProvider', function() {
         expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal({
           foo: ['bar'],
           webo_cs: ['foo', 'bar'],
-          webo_audiences: ['baz'],
+          webo_audiences: [12345],
         });
         expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
           inventory: {
@@ -2198,7 +2312,74 @@ describe('weboramaRtdProvider', function() {
 
       it('should use default profile in case of nothing on local storage', function() {
         const defaultProfile = {
-          webo_audiences: ['baz']
+          webo_audiences: [12345]
+        };
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {
+              accoundId: 12345,
+              setPrebidTargeting: true,
+              defaultProfile: defaultProfile,
+            }
+          }
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': defaultProfile,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params).to.be.undefined;
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params).to.be.undefined;
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(defaultProfile);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.be.undefined;
+        ['smartadserver', 'pubmatic', 'appnexus', 'rubicon', 'other'].forEach((v) => {
+          expect(reqBidsConfigObj.ortb2Fragments.bidder[v]).to.deep.equal({
+            user: {
+              ext: {
+                data: defaultProfile
+              },
+            }
+          });
+        })
+      });
+
+      it('should use default profile in case of something malformed on local storage', function() {
+        const defaultProfile = {
+          webo_audiences: [12345]
         };
         const moduleConfig = {
           params: {
@@ -2210,8 +2391,17 @@ describe('weboramaRtdProvider', function() {
           }
         };
 
+        const malformed = {
+          targeting: {
+            webo_audiences: 'must be an array, not a string',
+          },
+        };
+
         sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+        sandbox.stub(storage, 'getDataFromLocalStorage')
+          .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
+          .returns(JSON.stringify(malformed));
 
         const adUnitCode = 'adunit1';
         const reqBidsConfigObj = {
@@ -2265,7 +2455,7 @@ describe('weboramaRtdProvider', function() {
 
       it('should use default profile if cant read from local storage', function() {
         const defaultProfile = {
-          webo_audiences: ['baz']
+          webo_audiences: [12345]
         };
         let onDataResponse = {};
         const moduleConfig = {
@@ -2375,7 +2565,7 @@ describe('weboramaRtdProvider', function() {
         };
         const data = {
           webo_cs: ['foo', 'bar'],
-          webo_audiences: ['baz'],
+          webo_audiences: [12345],
         };
 
         const entry = {
@@ -2436,7 +2626,7 @@ describe('weboramaRtdProvider', function() {
         expect(targeting).to.deep.equal({
           'adunit1': {
             webo_cs: ['foo', 'bar'],
-            webo_audiences: ['baz'],
+            webo_audiences: [12345],
             webo_foo: ['bar'],
           },
           'adunit2': data,
@@ -2455,7 +2645,7 @@ describe('weboramaRtdProvider', function() {
                 ext: {
                   data: {
                     webo_cs: ['foo', 'bar'],
-                    webo_audiences: ['baz'],
+                    webo_audiences: [12345],
                     webo_bar: ['baz'],
                   }
                 },
diff --git a/test/spec/modules/winrBidAdapter_spec.js b/test/spec/modules/winrBidAdapter_spec.js
index 95d1473d1cb..b0d8d72f0a1 100644
--- a/test/spec/modules/winrBidAdapter_spec.js
+++ b/test/spec/modules/winrBidAdapter_spec.js
@@ -93,22 +93,22 @@ describe('WinrAdapter', function () {
     });
 
     it('should return false when mediaType is not banner', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.mediaTypes;
-      bid.mediaTypes = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.mediaTypes;
+      invalidBid.mediaTypes = {
         'video': {}
       };
-      expect(getMediaTypeFromBid(bid)).to.not.equal('banner');
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(getMediaTypeFromBid(invalidBid)).to.not.equal('banner');
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
+      let invalidBid = Object.assign({}, bid);
+      delete invalidBid.params;
+      invalidBid.params = {
         'placementId': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/wipesBidAdapter_spec.js b/test/spec/modules/wipesBidAdapter_spec.js
index a458dcf69c8..a45e324f4fd 100644
--- a/test/spec/modules/wipesBidAdapter_spec.js
+++ b/test/spec/modules/wipesBidAdapter_spec.js
@@ -29,9 +29,9 @@ describe('wipesBidAdapter', function () {
     });
 
     it('should return false when require params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      let invalidBid = Object.assign({}, bid);
+      invalidBid.params = {};
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
   });
 
diff --git a/test/spec/modules/wurflRtdProvider_spec.js b/test/spec/modules/wurflRtdProvider_spec.js
new file mode 100644
index 00000000000..0ac324ef8b2
--- /dev/null
+++ b/test/spec/modules/wurflRtdProvider_spec.js
@@ -0,0 +1,453 @@
+import {
+  bidderData,
+  enrichBidderRequest,
+  lowEntropyData,
+  wurflSubmodule,
+  makeOrtb2DeviceType,
+} from 'modules/wurflRtdProvider';
+import * as ajaxModule from 'src/ajax';
+import { loadExternalScriptStub } from 'test/mocks/adloaderStub.js';
+
+describe('wurflRtdProvider', function () {
+  describe('wurflSubmodule', function () {
+    const altHost = 'http://example.local/wurfl.js';
+
+    const wurfl_pbjs = {
+      low_entropy_caps: ['is_mobile', 'complete_device_name', 'form_factor'],
+      caps: ['advertised_browser', 'advertised_browser_version', 'advertised_device_os', 'advertised_device_os_version', 'ajax_support_javascript', 'brand_name', 'complete_device_name', 'density_class', 'form_factor', 'is_android', 'is_app_webview', 'is_connected_tv', 'is_full_desktop', 'is_ios', 'is_mobile', 'is_ott', 'is_phone', 'is_robot', 'is_smartphone', 'is_smarttv', 'is_tablet', 'manufacturer_name', 'marketing_name', 'max_image_height', 'max_image_width', 'model_name', 'physical_screen_height', 'physical_screen_width', 'pixel_density', 'pointing_method', 'resolution_height', 'resolution_width'],
+      authorized_bidders: {
+        bidder1: [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31],
+        bidder2: [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 21, 25, 28, 30, 31]
+      }
+    }
+    const WURFL = {
+      advertised_browser: 'Chrome Mobile',
+      advertised_browser_version: '130.0.0.0',
+      advertised_device_os: 'Android',
+      advertised_device_os_version: '6.0',
+      ajax_support_javascript: !0,
+      brand_name: 'Google',
+      complete_device_name: 'Google Nexus 5',
+      density_class: '3.0',
+      form_factor: 'Feature Phone',
+      is_android: !0,
+      is_app_webview: !1,
+      is_connected_tv: !1,
+      is_full_desktop: !1,
+      is_ios: !1,
+      is_mobile: !0,
+      is_ott: !1,
+      is_phone: !0,
+      is_robot: !1,
+      is_smartphone: !1,
+      is_smarttv: !1,
+      is_tablet: !1,
+      manufacturer_name: 'LG',
+      marketing_name: '',
+      max_image_height: 640,
+      max_image_width: 360,
+      model_name: 'Nexus 5',
+      physical_screen_height: 110,
+      physical_screen_width: 62,
+      pixel_density: 443,
+      pointing_method: 'touchscreen',
+      resolution_height: 1920,
+      resolution_width: 1080
+    };
+
+    // expected analytics values
+    const expectedStatsURL = 'https://prebid.wurflcloud.com/v1/prebid/stats';
+    const expectedData = JSON.stringify({ bidders: ['bidder1', 'bidder2'] });
+
+    let sandbox;
+
+    beforeEach(function () {
+      sandbox = sinon.createSandbox();
+      window.WURFLPromises = {
+        init: new Promise(function (resolve, reject) { resolve({ WURFL, wurfl_pbjs }) }),
+        complete: new Promise(function (resolve, reject) { resolve({ WURFL, wurfl_pbjs }) }),
+      };
+    });
+
+    afterEach(() => {
+      // Restore the original functions
+      sandbox.restore();
+      window.WURFLPromises = undefined;
+    });
+
+    // Bid request config
+    const reqBidsConfigObj = {
+      adUnits: [{
+        bids: [
+          { bidder: 'bidder1' },
+          { bidder: 'bidder2' },
+          { bidder: 'bidder3' },
+        ]
+      }],
+      ortb2Fragments: {
+        global: {
+          device: {},
+        },
+        bidder: {},
+      }
+    };
+
+    it('initialises the WURFL RTD provider', function () {
+      expect(wurflSubmodule.init()).to.be.true;
+    });
+
+    it('should enrich the bid request data', (done) => {
+      const expectedURL = new URL(altHost);
+      expectedURL.searchParams.set('debug', true);
+      expectedURL.searchParams.set('mode', 'prebid');
+
+      const callback = () => {
+        const v = {
+          bidder1: {
+            device: {
+              make: 'Google',
+              model: 'Nexus 5',
+              devicetype: 1,
+              os: 'Android',
+              osv: '6.0',
+              hwv: 'Nexus 5',
+              h: 1920,
+              w: 1080,
+              ppi: 443,
+              pxratio: '3.0',
+              js: true,
+              ext: {
+                wurfl: {
+                  advertised_browser: 'Chrome Mobile',
+                  advertised_browser_version: '130.0.0.0',
+                  advertised_device_os: 'Android',
+                  advertised_device_os_version: '6.0',
+                  ajax_support_javascript: !0,
+                  brand_name: 'Google',
+                  complete_device_name: 'Google Nexus 5',
+                  density_class: '3.0',
+                  form_factor: 'Feature Phone',
+                  is_app_webview: !1,
+                  is_connected_tv: !1,
+                  is_full_desktop: !1,
+                  is_mobile: !0,
+                  is_ott: !1,
+                  is_phone: !0,
+                  is_robot: !1,
+                  is_smartphone: !1,
+                  is_smarttv: !1,
+                  is_tablet: !1,
+                  manufacturer_name: 'LG',
+                  marketing_name: '',
+                  max_image_height: 640,
+                  max_image_width: 360,
+                  model_name: 'Nexus 5',
+                  physical_screen_height: 110,
+                  physical_screen_width: 62,
+                  pixel_density: 443,
+                  pointing_method: 'touchscreen',
+                  resolution_height: 1920,
+                  resolution_width: 1080
+                },
+              },
+            },
+          },
+          bidder2: {
+            device: {
+              make: 'Google',
+              model: 'Nexus 5',
+              devicetype: 1,
+              os: 'Android',
+              osv: '6.0',
+              hwv: 'Nexus 5',
+              h: 1920,
+              w: 1080,
+              ppi: 443,
+              pxratio: '3.0',
+              js: true,
+              ext: {
+                wurfl: {
+                  advertised_device_os: 'Android',
+                  advertised_device_os_version: '6.0',
+                  ajax_support_javascript: !0,
+                  brand_name: 'Google',
+                  complete_device_name: 'Google Nexus 5',
+                  density_class: '3.0',
+                  form_factor: 'Feature Phone',
+                  is_android: !0,
+                  is_app_webview: !1,
+                  is_connected_tv: !1,
+                  is_full_desktop: !1,
+                  is_ios: !1,
+                  is_mobile: !0,
+                  is_ott: !1,
+                  is_phone: !0,
+                  is_tablet: !1,
+                  manufacturer_name: 'LG',
+                  model_name: 'Nexus 5',
+                  pixel_density: 443,
+                  resolution_height: 1920,
+                  resolution_width: 1080
+                },
+              },
+            },
+          },
+          bidder3: {
+            device: {
+              make: 'Google',
+              model: 'Nexus 5',
+              ext: {
+                wurfl: {
+                  complete_device_name: 'Google Nexus 5',
+                  form_factor: 'Feature Phone',
+                  is_mobile: !0,
+                  model_name: 'Nexus 5',
+                  brand_name: 'Google',
+                },
+              },
+            },
+          },
+        };
+        expect(reqBidsConfigObj.ortb2Fragments.bidder).to.deep.equal(v);
+        done();
+      };
+
+      const config = {
+        params: {
+          altHost: altHost,
+          debug: true,
+        }
+      };
+      const userConsent = {};
+
+      wurflSubmodule.getBidRequestData(reqBidsConfigObj, callback, config, userConsent);
+      expect(loadExternalScriptStub.calledOnce).to.be.true;
+      const loadExternalScriptCall = loadExternalScriptStub.getCall(0);
+      expect(loadExternalScriptCall.args[0]).to.equal(expectedURL.toString());
+      expect(loadExternalScriptCall.args[2]).to.equal('wurfl');
+    });
+
+    it('onAuctionEndEvent: should send analytics data using navigator.sendBeacon, if available', () => {
+      const auctionDetails = {};
+      const config = {};
+      const userConsent = {};
+
+      const sendBeaconStub = sandbox.stub(navigator, 'sendBeacon');
+
+      // Call the function
+      wurflSubmodule.onAuctionEndEvent(auctionDetails, config, userConsent);
+
+      // Assertions
+      expect(sendBeaconStub.calledOnce).to.be.true;
+      expect(sendBeaconStub.calledWithExactly(expectedStatsURL, expectedData)).to.be.true;
+    });
+
+    it('onAuctionEndEvent: should send analytics data using fetch as fallback, if navigator.sendBeacon is not available', () => {
+      const auctionDetails = {};
+      const config = {};
+      const userConsent = {};
+
+      const sendBeaconStub = sandbox.stub(navigator, 'sendBeacon').value(undefined);
+      const windowFetchStub = sandbox.stub(window, 'fetch');
+      const fetchAjaxStub = sandbox.stub(ajaxModule, 'fetch');
+
+      // Call the function
+      wurflSubmodule.onAuctionEndEvent(auctionDetails, config, userConsent);
+
+      // Assertions
+      expect(sendBeaconStub.called).to.be.false;
+
+      expect(fetchAjaxStub.calledOnce).to.be.true;
+      const fetchAjaxCall = fetchAjaxStub.getCall(0);
+      expect(fetchAjaxCall.args[0]).to.equal(expectedStatsURL);
+      expect(fetchAjaxCall.args[1].method).to.equal('POST');
+      expect(fetchAjaxCall.args[1].body).to.equal(expectedData);
+      expect(fetchAjaxCall.args[1].mode).to.equal('no-cors');
+    });
+  });
+
+  describe('bidderData', () => {
+    it('should return the WURFL data for a bidder', () => {
+      const wjsData = {
+        capability1: 'value1',
+        capability2: 'value2',
+        capability3: 'value3',
+      };
+      const caps = ['capability1', 'capability2', 'capability3'];
+      const filter = [0, 2];
+
+      const result = bidderData(wjsData, caps, filter);
+
+      expect(result).to.deep.equal({
+        capability1: 'value1',
+        capability3: 'value3',
+      });
+    });
+
+    it('should return an empty object if the filter is empty', () => {
+      const wjsData = {
+        capability1: 'value1',
+        capability2: 'value2',
+        capability3: 'value3',
+      };
+      const caps = ['capability1', 'capability3'];
+      const filter = [];
+
+      const result = bidderData(wjsData, caps, filter);
+
+      expect(result).to.deep.equal({});
+    });
+  });
+
+  describe('lowEntropyData', () => {
+    it('should return the correct low entropy data for Apple devices', () => {
+      const wjsData = {
+        complete_device_name: 'Apple iPhone X',
+        form_factor: 'Smartphone',
+        is_mobile: !0,
+        brand_name: 'Apple',
+        model_name: 'iPhone X',
+      };
+      const lowEntropyCaps = ['complete_device_name', 'form_factor', 'is_mobile'];
+      const expectedData = {
+        complete_device_name: 'Apple iPhone',
+        form_factor: 'Smartphone',
+        is_mobile: !0,
+        brand_name: 'Apple',
+        model_name: 'iPhone',
+      };
+      const result = lowEntropyData(wjsData, lowEntropyCaps);
+      expect(result).to.deep.equal(expectedData);
+    });
+
+    it('should return the correct low entropy data for Android devices', () => {
+      const wjsData = {
+        complete_device_name: 'Samsung SM-G981B (Galaxy S20 5G)',
+        form_factor: 'Smartphone',
+        is_mobile: !0,
+      };
+      const lowEntropyCaps = ['complete_device_name', 'form_factor', 'is_mobile'];
+      const expectedData = {
+        complete_device_name: 'Samsung SM-G981B (Galaxy S20 5G)',
+        form_factor: 'Smartphone',
+        is_mobile: !0,
+      };
+      const result = lowEntropyData(wjsData, lowEntropyCaps);
+      expect(result).to.deep.equal(expectedData);
+    });
+
+    it('should return an empty object if the lowEntropyCaps array is empty', () => {
+      const wjsData = {
+        complete_device_name: 'Samsung SM-G981B (Galaxy S20 5G)',
+        form_factor: 'Smartphone',
+        is_mobile: !0,
+      };
+      const lowEntropyCaps = [];
+      const expectedData = {};
+      const result = lowEntropyData(wjsData, lowEntropyCaps);
+      expect(result).to.deep.equal(expectedData);
+    });
+  });
+
+  describe('enrichBidderRequest', () => {
+    it('should enrich the bidder request with WURFL data', () => {
+      const reqBidsConfigObj = {
+        ortb2Fragments: {
+          global: {
+            device: {},
+          },
+          bidder: {
+            exampleBidder: {
+              device: {
+                ua: 'user-agent',
+              }
+            }
+          }
+        }
+      };
+      const bidderCode = 'exampleBidder';
+      const wjsData = {
+        capability1: 'value1',
+        capability2: 'value2'
+      };
+
+      enrichBidderRequest(reqBidsConfigObj, bidderCode, wjsData);
+
+      expect(reqBidsConfigObj.ortb2Fragments.bidder).to.deep.equal({
+        exampleBidder: {
+          device: {
+            ua: 'user-agent',
+            ext: {
+              wurfl: {
+                capability1: 'value1',
+                capability2: 'value2'
+              }
+            }
+          }
+        }
+      });
+    });
+  });
+
+  describe('makeOrtb2DeviceType', function () {
+    it('should return 1 when wurflData is_mobile and is_phone is true', function () {
+      const wurflData = { is_mobile: true, is_phone: true, is_tablet: false };
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.equal(1);
+    });
+
+    it('should return 1 when wurflData is_mobile and is_tablet is true', function () {
+      const wurflData = { is_mobile: true, is_phone: false, is_tablet: true };
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.equal(1);
+    });
+
+    it('should return 6 when wurflData is_mobile but is_phone and is_tablet are false', function () {
+      const wurflData = { is_mobile: true, is_phone: false, is_tablet: false };
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.equal(6);
+    });
+
+    it('should return 2 when wurflData is_full_desktop is true', function () {
+      const wurflData = { is_full_desktop: true };
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.equal(2);
+    });
+
+    it('should return 3 when wurflData is_connected_tv is true', function () {
+      const wurflData = { is_connected_tv: true };
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.equal(3);
+    });
+
+    it('should return 4 when wurflData is_phone is true and is_mobile is false or undefined', function () {
+      const wurflData = { is_phone: true };
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.equal(4);
+    });
+
+    it('should return 5 when wurflData is_tablet is true and is_mobile is false or undefined', function () {
+      const wurflData = { is_tablet: true };
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.equal(5);
+    });
+
+    it('should return 7 when wurflData is_ott is true', function () {
+      const wurflData = { is_ott: true };
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.equal(7);
+    });
+
+    it('should return undefined when wurflData is_mobile is true but is_phone and is_tablet are missing', function () {
+      const wurflData = { is_mobile: true };
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.be.undefined;
+    });
+
+    it('should return undefined when no conditions are met', function () {
+      const wurflData = {};
+      const result = makeOrtb2DeviceType(wurflData);
+      expect(result).to.be.undefined;
+    });
+  });
+});
diff --git a/test/spec/modules/xeBidAdapter_spec.js b/test/spec/modules/xeBidAdapter_spec.js
index 914b0cacd71..e15ab6251ea 100644
--- a/test/spec/modules/xeBidAdapter_spec.js
+++ b/test/spec/modules/xeBidAdapter_spec.js
@@ -1,8 +1,8 @@
-import { expect } from 'chai';
-import { config } from 'src/config.js';
-import { spec, getBidFloor } from 'modules/xeBidAdapter.js';
-import { deepClone } from 'src/utils';
-import { createEidsArray } from 'modules/userId/eids.js';
+import {expect} from 'chai';
+import {config} from 'src/config.js';
+import {spec} from 'modules/xeBidAdapter.js';
+import {deepClone} from 'src/utils';
+import {getBidFloor} from '../../../libraries/xeUtils/bidderUtils.js';
 
 const ENDPOINT = 'https://pbjs.xe.works/bid';
 
@@ -10,7 +10,11 @@ const defaultRequest = {
   adUnitCode: 'test',
   bidId: '1',
   requestId: 'qwerty',
-  auctionId: 'auctionId',
+  ortb2: {
+    source: {
+      tid: 'auctionId'
+    }
+  },
   ortb2Imp: {
     ext: {
       tid: 'tr1',
@@ -27,7 +31,7 @@ const defaultRequest = {
   bidder: 'xe',
   params: {
     env: 'xe',
-    placement: 'test-banner',
+    pid: '40',
     ext: {}
   },
   bidRequestsCount: 1
@@ -41,6 +45,17 @@ defaultRequestVideo.mediaTypes = {
     skipppable: true
   }
 };
+
+const videoBidderRequest = {
+  bidderCode: 'xe',
+  bids: [{mediaTypes: {video: {}}, bidId: 'qwerty'}]
+};
+
+const displayBidderRequest = {
+  bidderCode: 'xe',
+  bids: [{bidId: 'qwerty'}]
+};
+
 describe('xeBidAdapter', () => {
   describe('isBidRequestValid', function () {
     it('should return false when request params is missing', function () {
@@ -55,9 +70,9 @@ describe('xeBidAdapter', () => {
       expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
     });
 
-    it('should return false when required placement param is missing', function () {
+    it('should return false when required pid param is missing', function () {
       const invalidRequest = deepClone(defaultRequest);
-      delete invalidRequest.params.placement;
+      delete invalidRequest.params.pid;
       expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
     });
 
@@ -80,7 +95,7 @@ describe('xeBidAdapter', () => {
     it('should send request with correct structure', function () {
       const request = spec.buildRequests([defaultRequest], {});
       expect(request.method).to.equal('POST');
-      expect(request.url).to.equal(ENDPOINT);
+      expect(request.url).to.equal(ENDPOINT + '/bid');
       expect(request.options).to.have.property('contentType').and.to.equal('application/json');
       expect(request).to.have.property('data');
     });
@@ -88,22 +103,21 @@ describe('xeBidAdapter', () => {
     it('should build basic request structure', function () {
       const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
       expect(request).to.have.property('bidId').and.to.equal(defaultRequest.bidId);
-      expect(request).to.have.property('auctionId').and.to.equal(defaultRequest.auctionId);
+      expect(request).to.have.property('auctionId').and.to.equal(defaultRequest.ortb2.source.tid);
       expect(request).to.have.property('transactionId').and.to.equal(defaultRequest.ortb2Imp.ext.tid);
       expect(request).to.have.property('tz').and.to.equal(new Date().getTimezoneOffset());
       expect(request).to.have.property('bc').and.to.equal(1);
       expect(request).to.have.property('floor').and.to.equal(null);
-      expect(request).to.have.property('banner').and.to.deep.equal({ sizes: [[300, 250], [300, 200]] });
+      expect(request).to.have.property('banner').and.to.deep.equal({sizes: [[300, 250], [300, 200]]});
       expect(request).to.have.property('gdprApplies').and.to.equal(0);
       expect(request).to.have.property('consentString').and.to.equal('');
       expect(request).to.have.property('userEids').and.to.deep.equal([]);
       expect(request).to.have.property('usPrivacy').and.to.equal('');
-      expect(request).to.have.property('coppa').and.to.equal(0);
       expect(request).to.have.property('sizes').and.to.deep.equal(['300x250', '300x200']);
       expect(request).to.have.property('ext').and.to.deep.equal({});
       expect(request).to.have.property('env').and.to.deep.equal({
         env: 'xe',
-        placement: 'test-banner'
+        pid: '40'
       });
       expect(request).to.have.property('device').and.to.deep.equal({
         ua: navigator.userAgent,
@@ -186,7 +200,7 @@ describe('xeBidAdapter', () => {
 
     it('should build request with valid bidfloor', function () {
       const bfRequest = deepClone(defaultRequest);
-      bfRequest.getFloor = () => ({ floor: 5, currency: 'USD' });
+      bfRequest.getFloor = () => ({floor: 5, currency: 'USD'});
       const request = JSON.parse(spec.buildRequests([bfRequest], {}).data)[0];
       expect(request).to.have.property('floor').and.to.equal(5);
     });
@@ -211,19 +225,11 @@ describe('xeBidAdapter', () => {
       expect(request).to.have.property('usPrivacy').and.equals('1YA-');
     });
 
-    it('should build request with coppa 1', function () {
-      config.setConfig({
-        coppa: true
-      });
-      const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
-      expect(request).to.have.property('coppa').and.equals(1);
-    });
-
     it('should build request with extended ids', function () {
       const idRequest = deepClone(defaultRequest);
       idRequest.userIdAsEids = [
-        { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
-        { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
+        {source: 'adserver.org', uids: [{id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: {rtiPartner: 'TDID'}}]},
+        {source: 'pubcid.org', uids: [{id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1}]}
       ];
       const request = JSON.parse(spec.buildRequests([idRequest], {}).data)[0];
       expect(request).to.have.property('userEids').and.deep.equal(idRequest.userIdAsEids);
@@ -263,19 +269,19 @@ describe('xeBidAdapter', () => {
             height: 250,
             ttl: 600,
             meta: {
-              advertiserDomains: ['xe.works']
+              advertiserDomains: ['xe']
             },
             ext: {
               pixels: [
-                [ 'iframe', 'surl1' ],
-                [ 'image', 'surl2' ],
+                ['iframe', 'surl1'],
+                ['image', 'surl2'],
               ]
             }
           }]
         }
       };
 
-      const validResponse = spec.interpretResponse(serverResponse, { bidderRequest: defaultRequest });
+      const validResponse = spec.interpretResponse(serverResponse, {bidderRequest: displayBidderRequest});
       const bid = validResponse[0];
       expect(validResponse).to.be.an('array').that.is.not.empty;
       expect(bid.requestId).to.equal('qwerty');
@@ -284,7 +290,7 @@ describe('xeBidAdapter', () => {
       expect(bid.width).to.equal(300);
       expect(bid.height).to.equal(250);
       expect(bid.ttl).to.equal(600);
-      expect(bid.meta).to.deep.equal({ advertiserDomains: ['xe.works'] });
+      expect(bid.meta).to.deep.equal({advertiserDomains: ['xe']});
     });
 
     it('should interpret valid banner response', function () {
@@ -305,7 +311,7 @@ describe('xeBidAdapter', () => {
         }
       };
 
-      const validResponseBanner = spec.interpretResponse(serverResponse, { bidderRequest: defaultRequest });
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: displayBidderRequest});
       const bid = validResponseBanner[0];
       expect(validResponseBanner).to.be.an('array').that.is.not.empty;
       expect(bid.mediaType).to.equal('banner');
@@ -331,7 +337,7 @@ describe('xeBidAdapter', () => {
         }
       };
 
-      const validResponseBanner = spec.interpretResponse(serverResponse, { bidderRequest: defaultRequestVideo });
+      const validResponseBanner = spec.interpretResponse(serverResponse, {bidderRequest: videoBidderRequest});
       const bid = validResponseBanner[0];
       expect(validResponseBanner).to.be.an('array').that.is.not.empty;
       expect(bid.mediaType).to.equal('video');
@@ -358,8 +364,8 @@ describe('xeBidAdapter', () => {
             requestId: 'qwerty',
             ext: {
               pixels: [
-                [ 'iframe', 'surl1?a=b' ],
-                [ 'image', 'surl2?a=b' ],
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
               ]
             }
           }]
@@ -377,8 +383,8 @@ describe('xeBidAdapter', () => {
             requestId: 'qwerty',
             ext: {
               pixels: [
-                [ 'iframe', 'surl1?a=b' ],
-                [ 'image', 'surl2?a=b' ],
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
               ]
             }
           }]
@@ -396,8 +402,8 @@ describe('xeBidAdapter', () => {
             requestId: 'qwerty',
             ext: {
               pixels: [
-                [ 'iframe', 'surl1?a=b' ],
-                [ 'image', 'surl2?a=b' ],
+                ['iframe', 'surl1?a=b'],
+                ['image', 'surl2?a=b'],
               ]
             }
           }]
@@ -414,20 +420,20 @@ describe('xeBidAdapter', () => {
 
   describe('getBidFloor', function () {
     it('should return null when getFloor is not a function', () => {
-      const bid = { getFloor: 2 };
+      const bid = {getFloor: 2};
       const result = getBidFloor(bid);
       expect(result).to.be.null;
     });
 
     it('should return null when getFloor doesnt return an object', () => {
-      const bid = { getFloor: () => 2 };
+      const bid = {getFloor: () => 2};
       const result = getBidFloor(bid);
       expect(result).to.be.null;
     });
 
     it('should return null when floor is not a number', () => {
       const bid = {
-        getFloor: () => ({ floor: 'string', currency: 'USD' })
+        getFloor: () => ({floor: 'string', currency: 'USD'})
       };
       const result = getBidFloor(bid);
       expect(result).to.be.null;
@@ -435,7 +441,7 @@ describe('xeBidAdapter', () => {
 
     it('should return null when currency is not USD', () => {
       const bid = {
-        getFloor: () => ({ floor: 5, currency: 'EUR' })
+        getFloor: () => ({floor: 5, currency: 'EUR'})
       };
       const result = getBidFloor(bid);
       expect(result).to.be.null;
@@ -443,7 +449,7 @@ describe('xeBidAdapter', () => {
 
     it('should return floor value when everything is correct', () => {
       const bid = {
-        getFloor: () => ({ floor: 5, currency: 'USD' })
+        getFloor: () => ({floor: 5, currency: 'USD'})
       };
       const result = getBidFloor(bid);
       expect(result).to.equal(5);
diff --git a/test/spec/modules/yahoosspBidAdapter_spec.js b/test/spec/modules/yahooAdsBidAdapter_spec.js
similarity index 94%
rename from test/spec/modules/yahoosspBidAdapter_spec.js
rename to test/spec/modules/yahooAdsBidAdapter_spec.js
index 40dc2b3c63b..f8ed7693f3f 100644
--- a/test/spec/modules/yahoosspBidAdapter_spec.js
+++ b/test/spec/modules/yahooAdsBidAdapter_spec.js
@@ -1,8 +1,9 @@
 import { expect } from 'chai';
 import { config } from 'src/config.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
-import { spec } from 'modules/yahoosspBidAdapter.js';
+import { spec } from 'modules/yahooAdsBidAdapter.js';
 import {createEidsArray} from '../../../modules/userId/eids';
+import {deepAccess} from '../../../src/utils';
 
 const DEFAULT_BID_ID = '84ab500420319d';
 const DEFAULT_BID_DCN = '2093845709823475';
@@ -193,7 +194,7 @@ describe('Yahoo Advertising Bid Adapter:', () => {
     });
 
     it('should define the correct bidder aliases', () => {
-      expect(spec.aliases).to.deep.equal(['yahoossp', 'yahooAdvertising']);
+      expect(spec.aliases).to.deep.equal([{ 'code': 'yahoossp', 'gvlid': 25 }, { 'code': 'yahooAdvertising', 'gvlid': 25 }]);
     });
 
     it('should define the correct vendor ID', () => {
@@ -1169,7 +1170,8 @@ describe('Yahoo Advertising Bid Adapter:', () => {
           pos: undefined,
           playbackmethod: undefined,
           rewarded: undefined,
-          placement: undefined
+          placement: undefined,
+          plcmt: undefined
         });
       });
 
@@ -1201,7 +1203,8 @@ describe('Yahoo Advertising Bid Adapter:', () => {
           pos: undefined,
           playbackmethod: undefined,
           rewarded: undefined,
-          placement: undefined
+          placement: undefined,
+          plcmt: undefined
         });
       });
     });
@@ -1298,7 +1301,8 @@ describe('Yahoo Advertising Bid Adapter:', () => {
           pos: undefined,
           playbackmethod: undefined,
           rewarded: undefined,
-          placement: undefined
+          placement: undefined,
+          plcmt: undefined
         });
       });
     });
@@ -1351,7 +1355,8 @@ describe('Yahoo Advertising Bid Adapter:', () => {
         pos: undefined,
         playbackmethod: undefined,
         rewarded: undefined,
-        placement: undefined
+        placement: undefined,
+        plcmt: undefined
       });
     });
   });
@@ -1381,7 +1386,8 @@ describe('Yahoo Advertising Bid Adapter:', () => {
               pos: 123456,
               playbackmethod: 1,
               rewarded: 1,
-              placement: 1
+              placement: 1,
+              plcmt: 1
             }
           }
         }
@@ -1410,7 +1416,8 @@ describe('Yahoo Advertising Bid Adapter:', () => {
           delivery: 1,
           pos: 123456,
           playbackmethod: 1,
-          placement: 1
+          placement: 1,
+          plcmt: 1
         }
         const validBidRequests = [bidRequest];
         bidderRequest.bids = validBidRequests;
@@ -1430,6 +1437,7 @@ describe('Yahoo Advertising Bid Adapter:', () => {
           pos: 123456,
           playbackmethod: 1,
           placement: 1,
+          plcmt: 1,
           rewarded: undefined
         });
       });
@@ -1488,15 +1496,6 @@ describe('Yahoo Advertising Bid Adapter:', () => {
         expect(response[0].mediaType).to.equal('video');
       })
 
-      it('should insert video VAST win notification into vastUrl', () => {
-        const { serverResponse, bidderRequest } = generateResponseMock('video', 'vast');
-        const response = spec.interpretResponse(serverResponse, {bidderRequest});
-        expect(response[0].ad).to.be.undefined;
-        expect(response[0].vastUrl).to.equal('https://yahoo.com?event=adAttempt');
-        expect(response[0].vastXml).to.equal('');
-        expect(response[0].mediaType).to.equal('video');
-      })
-
       describe('wrapped in video players for display inventory', () => {
         beforeEach(() => {
           config.setConfig({
@@ -1621,5 +1620,74 @@ describe('Yahoo Advertising Bid Adapter:', () => {
         expect(response[0].bidderCode).to.be.undefined;
       });
     });
+
+    describe('Renderer:', () => {
+      it('should create and set renderer when bidder request context is outstream, bidder request renderer is falsy, and bid response mediaType is VIDEO', () => {
+        config.setConfig({
+          yahooAds: {
+            mode: VIDEO
+          }
+        });
+        const { serverResponse, bidderRequest } = generateResponseMock('video', 'vast');
+        bidderRequest.mediaTypes = {
+          video: {
+            context: 'outstream'
+          }
+        };
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(deepAccess(bidderRequest, 'mediaTypes.video.context')).to.equal('outstream');
+        expect(bidderRequest.renderer).to.be.undefined;
+        expect(response[0].mediaType).to.equal('video');
+        expect(response[0].renderer).to.not.be.undefined;
+      });
+
+      it('should not create and set renderer when bidder request renderer is falsy and bid response mediaType is VIDEO, but bidder request context is not outstream,', () => {
+        config.setConfig({
+          yahooAds: {
+            mode: VIDEO
+          }
+        });
+        const { serverResponse, bidderRequest } = generateResponseMock('video', 'vast');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(deepAccess(bidderRequest, 'mediaTypes.video.context')).to.not.equal('outstream');
+        expect(bidderRequest.renderer).to.be.undefined;
+        expect(response[0].mediaType).to.equal('video');
+        expect(response[0].renderer).to.be.undefined;
+      });
+
+      it('should not create and set renderer when bidder request context is outstream and bid response mediaType is VIDEO, but bidder request renderer is not falsy', () => {
+        config.setConfig({
+          yahooAds: {
+            mode: VIDEO
+          }
+        });
+        const { serverResponse, bidderRequest } = generateResponseMock('video', 'vast');
+        bidderRequest.mediaTypes = {
+          video: {
+            context: 'outstream'
+          }
+        };
+        bidderRequest.renderer = 'not falsy';
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(deepAccess(bidderRequest, 'mediaTypes.video.context')).to.equal('outstream');
+        expect(bidderRequest.renderer).to.not.be.undefined;
+        expect(response[0].mediaType).to.equal('video');
+        expect(response[0].renderer).to.be.undefined;
+      });
+
+      it('should not create and set renderer when bidder request context is outstream and bidder request renderer is falsy, but bid response mediaType is not VIDEO', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        bidderRequest.mediaTypes = {
+          video: {
+            context: 'outstream'
+          }
+        };
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(deepAccess(bidderRequest, 'mediaTypes.video.context')).to.equal('outstream');
+        expect(bidderRequest.renderer).to.be.undefined;
+        expect(response[0].mediaType).to.not.equal('video');
+        expect(response[0].renderer).to.be.undefined;
+      });
+    });
   });
 });
diff --git a/test/spec/modules/yandexAnalyticsAdapter_spec.js b/test/spec/modules/yandexAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..a7a850b7cf2
--- /dev/null
+++ b/test/spec/modules/yandexAnalyticsAdapter_spec.js
@@ -0,0 +1,164 @@
+import * as sinon from 'sinon';
+import yandexAnalytics, { EVENTS_TO_TRACK, PBJS_INIT_EVENT_NAME } from 'modules/yandexAnalyticsAdapter.js';
+import * as log from '../../../src/utils.js'
+import * as events from '../../../src/events.js';
+import * as globalUtils from '../../../src/prebidGlobal.js';
+
+describe('Yandex analytics adapter testing', () => {
+  const sandbox = sinon.createSandbox();
+  let clock;
+  let logError;
+  let getEvents;
+  let onEvent;
+  const counterId = 123;
+  const counterWindowKey = 'yaCounter123';
+  const prebidVersion = '123.0';
+  const prebidInitEvent = {
+    event: PBJS_INIT_EVENT_NAME,
+    data: {
+      version: prebidVersion,
+    },
+  }
+
+  beforeEach(() => {
+    yandexAnalytics.counters = {};
+    yandexAnalytics.counterInitTimeouts = {};
+    yandexAnalytics.bufferedEvents = [];
+    yandexAnalytics.oneCounterInited = false;
+    clock = sinon.useFakeTimers();
+    logError = sandbox.stub(log, 'logError');
+    sandbox.stub(globalUtils, 'getGlobal').returns({
+      version: prebidVersion,
+    });
+    sandbox.stub(log, 'logInfo');
+    getEvents = sandbox.stub(events, 'getEvents').returns([]);
+    onEvent = sandbox.stub(events, 'on');
+    sandbox.stub(window.document, 'createElement').callsFake((tag) => {
+      const element = {
+        tag,
+        events: {},
+        attributes: {},
+        addEventListener: (event, cb) => {
+          element.events[event] = cb;
+        },
+        removeEventListener: (event, cb) => {
+          chai.expect(element.events[event]).to.equal(cb);
+        },
+        setAttribute: (attr, val) => {
+          element.attributes[attr] = val;
+        },
+      };
+      return element;
+    });
+  });
+
+  afterEach(() => {
+    window.Ya = null;
+    window[counterWindowKey] = null;
+    sandbox.restore();
+    clock.restore();
+  });
+
+  it('fails if timeout for counter insertion is exceeded', () => {
+    yandexAnalytics.enableAnalytics({
+      options: {
+        counters: [
+          123,
+        ],
+      },
+    });
+    clock.tick(25001);
+    chai.expect(yandexAnalytics.bufferedEvents).to.deep.equal([]);
+    sinon.assert.calledWith(logError, `Can't find metrika counter after 25 seconds.`);
+    sinon.assert.calledWith(logError, `Aborting yandex analytics provider initialization.`);
+  });
+
+  it('fails if no valid counters provided', () => {
+    yandexAnalytics.enableAnalytics({
+      options: {
+        counters: [
+          'abc',
+        ],
+      },
+    });
+    sinon.assert.calledWith(logError, 'options.counters contains no valid counter ids');
+  });
+
+  it('subscribes to events if counter is already present', () => {
+    window[counterWindowKey] = {
+      pbjs: sandbox.stub(),
+    };
+
+    getEvents.returns([
+      {
+        eventType: EVENTS_TO_TRACK[0],
+      },
+      {
+        eventType: 'Some_untracked_event',
+      }
+    ]);
+    const eventsToSend = [
+      prebidInitEvent,
+      {
+        event: EVENTS_TO_TRACK[0],
+        data: {
+          eventType: EVENTS_TO_TRACK[0],
+        }
+      }
+    ];
+
+    yandexAnalytics.enableAnalytics({
+      options: {
+        counters: [
+          counterId,
+        ],
+      },
+    });
+
+    EVENTS_TO_TRACK.forEach((eventName, i) => {
+      const [event, callback] = onEvent.getCall(i).args;
+      chai.expect(event).to.equal(eventName);
+      callback(i);
+      eventsToSend.push({
+        event: eventName,
+        data: i,
+      });
+    });
+
+    clock.tick(1501);
+
+    const [ sentEvents ] = window[counterWindowKey].pbjs.getCall(0).args;
+    chai.expect(sentEvents).to.deep.equal(eventsToSend);
+  });
+
+  it('waits for counter initialization', () => {
+    window.Ya = {};
+    // Simulatin metrika script initialization
+    yandexAnalytics.enableAnalytics({
+      options: {
+        counters: [
+          counterId,
+        ],
+      },
+    });
+
+    // Sending event
+    const [event, eventCallback] = onEvent.getCall(0).args;
+    eventCallback({});
+
+    const counterPbjsMethod = sandbox.stub();
+    window[`yaCounter${counterId}`] = {
+      pbjs: counterPbjsMethod,
+    };
+    clock.tick(2001);
+
+    const [ sentEvents ] = counterPbjsMethod.getCall(0).args;
+    chai.expect(sentEvents).to.deep.equal([
+      prebidInitEvent,
+      {
+        event,
+        data: {},
+      }
+    ]);
+  });
+});
diff --git a/test/spec/modules/yandexBidAdapter_spec.js b/test/spec/modules/yandexBidAdapter_spec.js
index f14e8df6c09..e6b2f5cc1f0 100644
--- a/test/spec/modules/yandexBidAdapter_spec.js
+++ b/test/spec/modules/yandexBidAdapter_spec.js
@@ -1,8 +1,9 @@
 import { assert, expect } from 'chai';
-import { spec, NATIVE_ASSETS } from 'modules/yandexBidAdapter.js';
-import { parseUrl } from 'src/utils.js';
+import { NATIVE_ASSETS, spec } from 'modules/yandexBidAdapter.js';
+import * as utils from 'src/utils.js';
+import { setConfig as setCurrencyConfig } from '../../../modules/currency';
 import { BANNER, NATIVE } from '../../../src/mediaTypes';
-import { config } from '../../../src/config';
+import { addFPDToBidderRequest } from '../../helpers/fpd';
 
 describe('Yandex adapter', function () {
   describe('isBidRequestValid', function () {
@@ -41,11 +42,45 @@ describe('Yandex adapter', function () {
   });
 
   describe('buildRequests', function () {
+    /** @type {import('../../../src/auction').BidderRequest} */
     const bidderRequest = {
-      refererInfo: {
-        domain: 'ya.ru',
-        ref: 'https://ya.ru/',
-        page: 'https://ya.ru/',
+      ortb2: {
+        site: {
+          domain: 'ya.ru',
+          ref: 'https://ya.ru/',
+          page: 'https://ya.ru/',
+          publisher: {
+            domain: 'ya.ru',
+          },
+        },
+        device: {
+          w: 1600,
+          h: 900,
+          dnt: 0,
+          ua: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+          language: 'en',
+          sua: {
+            source: 1,
+            platform: {
+              brand: 'macOS',
+            },
+            browsers: [
+              {
+                brand: 'Not_A Brand',
+                version: ['8'],
+              },
+              {
+                brand: 'Chromium',
+                version: ['120'],
+              },
+              {
+                brand: 'Google Chrome',
+                version: ['120'],
+              },
+            ],
+            mobile: 0,
+          },
+        },
       },
       gdprConsent: {
         gdprApplies: 1,
@@ -71,7 +106,7 @@ describe('Yandex adapter', function () {
 
       expect(method).to.equal('POST');
 
-      const parsedRequestUrl = parseUrl(url);
+      const parsedRequestUrl = utils.parseUrl(url);
       const { search: query } = parsedRequestUrl
 
       expect(parsedRequestUrl.hostname).to.equal('bs.yandex.ru');
@@ -91,35 +126,60 @@ describe('Yandex adapter', function () {
     });
 
     it('should send currency if defined', function () {
-      config.setConfig({
-        currency: {
-          adServerCurrency: 'USD'
-        }
+      setCurrencyConfig({
+        adServerCurrency: 'USD'
       });
 
       const bannerRequest = getBidRequest();
-      const requests = spec.buildRequests([bannerRequest], bidderRequest);
-      const { url } = requests[0];
-      const parsedRequestUrl = parseUrl(url);
-      const { search: query } = parsedRequestUrl
 
-      expect(query['ssp-cur']).to.equal('USD');
+      return addFPDToBidderRequest(bidderRequest).then(res => {
+        const requests = spec.buildRequests([bannerRequest], res);
+        const { url } = requests[0];
+        const parsedRequestUrl = utils.parseUrl(url);
+        const { search: query } = parsedRequestUrl
+
+        expect(query['ssp-cur']).to.equal('USD');
+        setCurrencyConfig({});
+      });
     });
 
-    it('should send eids if defined', function() {
-      const bannerRequest = getBidRequest({
+    it('should send eids and ortb2 user data if defined', function() {
+      const bidderRequestWithUserData = {
+        ...bidderRequest,
+        ortb2: {
+          ...bidderRequest.ortb2,
+          user: {
+            data: [
+              {
+                ext: { segtax: 600, segclass: '1' },
+                name: 'example.com',
+                segment: [{ id: '243' }],
+              },
+              {
+                ext: { segtax: 600, segclass: '1' },
+                name: 'ads.example.org',
+                segment: [{ id: '243' }],
+              },
+            ],
+          },
+        }
+      };
+      const bidRequestExtra = {
         userIdAsEids: [{
           source: 'sharedid.org',
-          uids: [
-            {
-              id: '01',
-              atype: 1
-            }
-          ]
-        }]
-      });
+          uids: [{ id: '01', atype: 1 }],
+        }],
+      };
 
-      const requests = spec.buildRequests([bannerRequest], bidderRequest);
+      const expected = {
+        ext: {
+          eids: bidRequestExtra.userIdAsEids,
+        },
+        data: bidderRequestWithUserData.ortb2.user.data,
+      };
+
+      const bannerRequest = getBidRequest(bidRequestExtra);
+      const requests = spec.buildRequests([bannerRequest], bidderRequestWithUserData);
 
       expect(requests).to.have.lengthOf(1);
       const request = requests[0];
@@ -128,17 +188,17 @@ describe('Yandex adapter', function () {
       const { data } = request;
 
       expect(data.user).to.exist;
-      expect(data.user).to.deep.equal({
-        ext: {
-          eids: [{
-            source: 'sharedid.org',
-            uids: [{
-              id: '01',
-              atype: 1,
-            }],
-          }],
-        }
-      });
+      expect(data.user).to.deep.equal(expected);
+    });
+
+    it('should send site', function() {
+      const expected = {
+        site: bidderRequest.ortb2.site
+      };
+
+      const requests = spec.buildRequests([getBidRequest()], bidderRequest);
+
+      expect(requests[0].data.site).to.deep.equal(expected.site);
     });
 
     describe('banner', () => {
@@ -478,6 +538,60 @@ describe('Yandex adapter', function () {
       });
     });
   });
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should not trigger pixel if bid does not contain nurl', function() {
+      spec.onBidWon({});
+
+      expect(utils.triggerPixel.callCount).to.equal(0)
+    })
+
+    it('Should trigger pixel if bid has nurl', function() {
+      spec.onBidWon({
+        nurl: 'https://example.com/some-tracker',
+        timeToRespond: 378,
+      });
+
+      expect(utils.triggerPixel.callCount).to.equal(1)
+      expect(utils.triggerPixel.getCall(0).args[0]).to.equal('https://example.com/some-tracker?rtt=378')
+    })
+
+    it('Should trigger pixel if bid has nurl with path & params', function() {
+      spec.onBidWon({
+        nurl: 'https://example.com/some-tracker/abcdxyz?param1=1¶m2=2',
+        timeToRespond: 378,
+      });
+
+      expect(utils.triggerPixel.callCount).to.equal(1)
+      expect(utils.triggerPixel.getCall(0).args[0]).to.equal('https://example.com/some-tracker/abcdxyz?param1=1¶m2=2&rtt=378')
+    })
+
+    it('Should trigger pixel if bid has nurl with path & params and rtt macros', function() {
+      spec.onBidWon({
+        nurl: 'https://example.com/some-tracker/abcdxyz?param1=1¶m2=2&custom-rtt=${RTT}',
+        timeToRespond: 378,
+      });
+
+      expect(utils.triggerPixel.callCount).to.equal(1)
+      expect(utils.triggerPixel.getCall(0).args[0]).to.equal('https://example.com/some-tracker/abcdxyz?param1=1¶m2=2&custom-rtt=378')
+    })
+
+    it('Should trigger pixel if bid has nurl and there is no timeToRespond param, but has rtt macros in nurl', function() {
+      spec.onBidWon({
+        nurl: 'https://example.com/some-tracker/abcdxyz?param1=1¶m2=2&custom-rtt=${RTT}',
+      });
+
+      expect(utils.triggerPixel.callCount).to.equal(1)
+      expect(utils.triggerPixel.getCall(0).args[0]).to.equal('https://example.com/some-tracker/abcdxyz?param1=1¶m2=2&custom-rtt=-1')
+    })
+  })
 });
 
 function getBidConfig() {
diff --git a/test/spec/modules/yandexIdSystem_spec.js b/test/spec/modules/yandexIdSystem_spec.js
new file mode 100644
index 00000000000..593ce0841d4
--- /dev/null
+++ b/test/spec/modules/yandexIdSystem_spec.js
@@ -0,0 +1,201 @@
+// @ts-check
+
+import {
+  BIDDER_EID_KEY,
+  YANDEX_ID_KEY,
+  YANDEX_EXT_COOKIE_NAMES,
+  BIDDER_CODE,
+  YANDEX_USER_ID_KEY,
+  YANDEX_STORAGE_TYPE,
+  YANDEX_MIN_EXPIRE_DAYS,
+  PREBID_STORAGE,
+  yandexIdSubmodule,
+} from '../../../modules/yandexIdSystem.js';
+import {attachIdSystem} from '../../../modules/userId/index.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {createSandbox} from 'sinon'
+import * as utils from '../../../src/utils.js';
+
+/**
+ * @typedef {import('sinon').SinonStub} SinonStub
+ * @typedef {import('sinon').SinonSpy} SinonSpy
+ * @typedef {import('sinon').SinonSandbox} SinonSandbox
+ */
+
+const MIN_METRICA_ID_LEN = 17;
+
+/** @satisfies {import('../../../modules/userId/index.js').SubmoduleConfig} */
+const CORRECT_SUBMODULE_CONFIG = {
+  name: BIDDER_CODE,
+  storage: {
+    expires: YANDEX_MIN_EXPIRE_DAYS,
+    name: YANDEX_USER_ID_KEY,
+    type: YANDEX_STORAGE_TYPE,
+    refreshInSeconds: undefined,
+  },
+  params: undefined,
+  value: undefined,
+};
+
+/** @type {import('../../../modules/userId/index.js').SubmoduleConfig[]} */
+const INCORRECT_SUBMODULE_CONFIGS = [
+  {
+    ...CORRECT_SUBMODULE_CONFIG,
+    storage: {
+      ...CORRECT_SUBMODULE_CONFIG.storage,
+      expires: 0,
+    }
+  },
+  {
+    ...CORRECT_SUBMODULE_CONFIG,
+    storage: {
+      ...CORRECT_SUBMODULE_CONFIG.storage,
+      type: 'html5'
+    }
+  },
+  {
+    ...CORRECT_SUBMODULE_CONFIG,
+    storage: {
+      ...CORRECT_SUBMODULE_CONFIG.storage,
+      name: 'custom_key'
+    }
+  },
+];
+
+const YANDEX_EXT_COOKIE_VALUE = 'ext_cookie_value';
+
+describe('YandexId module', () => {
+  /** @type {SinonSandbox} */
+  let sandbox;
+  /** @type {SinonStub} */
+  let getCryptoRandomValuesStub;
+  /** @type {SinonStub} */
+  let randomStub;
+  /** @type {SinonStub} */
+  let getCookieStub;
+  /** @type {SinonStub} */
+  let cookiesAreEnabledStub;
+  /** @type {SinonSpy} */
+  let logErrorSpy;
+
+  beforeEach(() => {
+    sandbox = createSandbox();
+    getCookieStub = sandbox.stub(PREBID_STORAGE, 'getCookie').returns(YANDEX_EXT_COOKIE_VALUE);
+    cookiesAreEnabledStub = sandbox.stub(PREBID_STORAGE, 'cookiesAreEnabled');
+    logErrorSpy = sandbox.spy(utils, 'logError');
+
+    getCryptoRandomValuesStub = sandbox
+      .stub(window.crypto, 'getRandomValues')
+      .callsFake((bufferView) => {
+        if (bufferView != null) {
+          bufferView[0] = 10000;
+        }
+
+        return null;
+      });
+    randomStub = sandbox.stub(window.Math, 'random').returns(0.555);
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  describe('getId()', () => {
+    it('user id matches Yandex Metrica format', () => {
+      const generatedId = yandexIdSubmodule.getId(CORRECT_SUBMODULE_CONFIG)?.id;
+
+      expect(isNaN(Number(generatedId))).to.be.false;
+      expect(generatedId).to.have.length.greaterThanOrEqual(
+        MIN_METRICA_ID_LEN
+      );
+    });
+
+    it('uses stored id', () => {
+      const storedId = '11111111111111111';
+      const generatedId = yandexIdSubmodule.getId(CORRECT_SUBMODULE_CONFIG, undefined, storedId)?.id;
+
+      expect(generatedId).to.be.equal(storedId);
+    })
+
+    describe('config validation', () => {
+      INCORRECT_SUBMODULE_CONFIGS.forEach((config, i) => {
+        it(`invalid config #${i} fails`, () => {
+          const generatedId = yandexIdSubmodule.getId(config)?.id;
+
+          expect(generatedId).to.be.undefined;
+          expect(logErrorSpy.called).to.be.true;
+        })
+      })
+    })
+
+    describe('crypto', () => {
+      it('uses Math.random when crypto is not available', () => {
+        const cryptoTmp = window.crypto;
+
+        // @ts-expect-error -- Crypto is always defined in modern JS. TS yells when trying to delete non-nullable property.
+        delete window.crypto;
+
+        yandexIdSubmodule.getId(CORRECT_SUBMODULE_CONFIG);
+
+        expect(randomStub.calledOnce).to.be.true;
+        expect(getCryptoRandomValuesStub.called).to.be.false;
+
+        window.crypto = cryptoTmp;
+      });
+
+      it('uses crypto when it is available', () => {
+        yandexIdSubmodule.getId(CORRECT_SUBMODULE_CONFIG);
+
+        expect(randomStub.called).to.be.false;
+        expect(getCryptoRandomValuesStub.calledOnce).to.be.true;
+      });
+    });
+  });
+
+  describe('decode()', () => {
+    it('should not transform value', () => {
+      const value = 'test value';
+
+      expect(yandexIdSubmodule.decode(value).yandexId).to.equal(value);
+    });
+  });
+
+  describe('eid', () => {
+    const id = '11111111111111111';
+    const userId = { [YANDEX_ID_KEY]: id };
+
+    before(() => {
+      attachIdSystem(yandexIdSubmodule);
+    });
+
+    it('with enabled cookies', () => {
+      cookiesAreEnabledStub.returns(true);
+      const [eid] = createEidsArray(userId);
+
+      expect(eid).to.deep.equal({
+        source: BIDDER_EID_KEY,
+        uids: [{
+          id,
+          atype: 1,
+          ext: YANDEX_EXT_COOKIE_NAMES.reduce((acc, cookieName) => ({
+            ...acc,
+            [cookieName]: YANDEX_EXT_COOKIE_VALUE,
+          }), {}),
+        }]
+      });
+    });
+
+    it('with disabled cookies', () => {
+      cookiesAreEnabledStub.returns(false);
+      const [eid] = createEidsArray(userId);
+
+      expect(eid).to.deep.equal({
+        source: BIDDER_EID_KEY,
+        uids: [{
+          id,
+          atype: 1,
+        }]
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index 93c231c816b..25d8f2baec0 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -226,6 +226,36 @@ const PVID_RESPONSE = Object.assign({}, VIDEO_RESPONSE, {
   pvid: '43513f11-55a0-4a83-94e5-0ebc08f54a2c',
 });
 
+const DIGITAL_SERVICES_ACT_RESPONSE = Object.assign({}, RESPONSE, {
+  dsa: {
+    behalf: 'some-behalf',
+    paid: 'some-paid',
+    transparency: [{
+      domain: 'test.com',
+      dsaparams: [1, 2, 3]
+    }],
+    adrender: 1
+  }
+});
+
+const DIGITAL_SERVICES_ACT_CONFIG = {
+  ortb2: {
+    regs: {
+      ext: {
+        dsa: {
+          dsarequired: '1',
+          pubrender: '2',
+          datatopub: '3',
+          transparency: [{
+            domain: 'test.com',
+            dsaparams: [1, 2, 3]
+          }]
+        },
+      }
+    },
+  }
+}
+
 const REQPARAMS = {
   json: true,
   ts: 1234567890,
@@ -486,6 +516,145 @@ describe('yieldlabBidAdapter', () => {
         expect(request.url).to.not.include('sizes');
       });
     });
+
+    describe('Digital Services Act handling', () => {
+      beforeEach(() => {
+        config.setConfig(DIGITAL_SERVICES_ACT_CONFIG);
+      });
+
+      afterEach(() => {
+        config.resetConfig();
+      });
+
+      it('does pass dsarequired parameter', () => {
+        let request = spec.buildRequests([DEFAULT_REQUEST()], { ...REQPARAMS, ...DIGITAL_SERVICES_ACT_CONFIG });
+        expect(request.url).to.include('dsarequired=1');
+      });
+
+      it('does pass dsapubrender parameter', () => {
+        let request = spec.buildRequests([DEFAULT_REQUEST()], { ...REQPARAMS, ...DIGITAL_SERVICES_ACT_CONFIG });
+        expect(request.url).to.include('dsapubrender=2');
+      });
+
+      it('does pass dsadatatopub parameter', () => {
+        let request = spec.buildRequests([DEFAULT_REQUEST()], { ...REQPARAMS, ...DIGITAL_SERVICES_ACT_CONFIG });
+        expect(request.url).to.include('dsadatatopub=3');
+      });
+
+      it('does pass dsadomain parameter', () => {
+        let request = spec.buildRequests([DEFAULT_REQUEST()], { ...REQPARAMS, ...DIGITAL_SERVICES_ACT_CONFIG });
+        expect(request.url).to.include('dsadomain=test.com');
+      });
+
+      it('does pass encoded dsaparams parameter', () => {
+        let request = spec.buildRequests([DEFAULT_REQUEST()], { ...REQPARAMS, ...DIGITAL_SERVICES_ACT_CONFIG });
+        expect(request.url).to.include('dsaparams=1%2C2%2C3');
+      });
+
+      it('does pass multiple transparencies in dsatransparency param', () => {
+        const DSA_CONFIG_WITH_MULTIPLE_TRANSPARENCIES = {
+          ortb2: {
+            regs: {
+              ext: {
+                dsa: {
+                  dsarequired: '1',
+                  pubrender: '2',
+                  datatopub: '3',
+                  transparency: [
+                    {
+                      domain: 'test.com',
+                      dsaparams: [1, 2, 3]
+                    },
+                    {
+                      domain: 'example.com',
+                      dsaparams: [4, 5, 6]
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        };
+
+        config.setConfig(DSA_CONFIG_WITH_MULTIPLE_TRANSPARENCIES);
+
+        let request = spec.buildRequests([DEFAULT_REQUEST()], { ...REQPARAMS, ...DSA_CONFIG_WITH_MULTIPLE_TRANSPARENCIES });
+
+        expect(request.url).to.include('dsatransparency=test.com~1_2_3~~example.com~4_5_6');
+        expect(request.url).to.not.include('dsadomain');
+        expect(request.url).to.not.include('dsaparams');
+      });
+    });
+
+    describe('google topics handling', () => {
+      afterEach(() => {
+        config.resetConfig();
+      });
+
+      it('does pass segtax, segclass, segments for google topics data', () => {
+        const GOOGLE_TOPICS_DATA = {
+          ortb2: {
+            user: {
+              data: [
+                {
+                  ext: {
+                    segtax: 600,
+                    segclass: 'v1',
+                  },
+                  segment: [
+                    {id: '717'}, {id: '808'},
+                  ]
+                }
+              ]
+            },
+          },
+        }
+        config.setConfig(GOOGLE_TOPICS_DATA);
+        const request = spec.buildRequests([DEFAULT_REQUEST()], { ...REQPARAMS, ...GOOGLE_TOPICS_DATA });
+        expect(request.url).to.include('segtax=600&segclass=v1&segments=717%2C808');
+      });
+
+      it('does not pass topics params for invalid topics data', () => {
+        const INVALID_TOPICS_DATA = {
+          ortb2: {
+            user: {
+              data: [
+                {
+                  segment: []
+                },
+                {
+                  segment: [{id: ''}]
+                },
+                {
+                  segment: [{id: null}]
+                },
+                {
+                  segment: [{id: 'dummy'}, {id: '123'}]
+                },
+                {
+                  ext: {
+                    segtax: 600,
+                    segclass: 'v1',
+                  },
+                  segment: [
+                    {
+                      name: 'dummy'
+                    }
+                  ]
+                },
+              ]
+            }
+          }
+        };
+
+        config.setConfig(INVALID_TOPICS_DATA);
+        let request = spec.buildRequests([DEFAULT_REQUEST()], { ...REQPARAMS, ...INVALID_TOPICS_DATA });
+
+        expect(request.url).to.not.include('segtax');
+        expect(request.url).to.not.include('segclass');
+        expect(request.url).to.not.include('segments');
+      });
+    });
   });
 
   describe('interpretResponse', () => {
@@ -513,7 +682,7 @@ describe('yieldlabBidAdapter', () => {
       expect(result[0].netRevenue).to.equal(false);
       expect(result[0].ttl).to.equal(300);
       expect(result[0].referrer).to.equal('');
-      expect(result[0].meta.advertiserDomains).to.equal('yieldlab');
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['yieldlab']);
       expect(result[0].ad).to.include('',
-        adUrl: 'http://creative.prebid.org/${AUCTION_PRICE}',
-        width: 300,
-        height: 250,
-        renderer: null,
-        cpm: '1.00',
-        adUnitCode: config.adUnitCodes[0],
-      };
-
-      _sendAdToCreative(mockAdObject, sinon.stub());
-
-      expect(slots[0].spyGetSlotElementId.called).to.equal(false);
-      expect(slots[1].spyGetSlotElementId.called).to.equal(true);
-      expect(slots[2].spyGetSlotElementId.called).to.equal(false);
-    });
-
     it('Calling enableSendAllBids should set targeting to include standard keys with bidder' +
       ' append to key name', function () {
       var slots = createSlotArray();
@@ -1142,19 +1149,19 @@ describe('Unit: Prebid Module', function () {
 
       var expected = [
         [
-          CONSTANTS.TARGETING_KEYS.BIDDER,
+          TARGETING_KEYS.BIDDER,
           'appnexus'
         ],
         [
-          CONSTANTS.TARGETING_KEYS.AD_ID,
+          TARGETING_KEYS.AD_ID,
           '233bcbee889d46d'
         ],
         [
-          CONSTANTS.TARGETING_KEYS.PRICE_BUCKET,
+          TARGETING_KEYS.PRICE_BUCKET,
           '10.00'
         ],
         [
-          CONSTANTS.TARGETING_KEYS.SIZE,
+          TARGETING_KEYS.SIZE,
           '300x250'
         ],
         [
@@ -1230,9 +1237,14 @@ describe('Unit: Prebid Module', function () {
             height: 0
           }
         },
+        body: {
+          appendChild: sinon.stub()
+        },
         getElementsByTagName: sinon.stub(),
-        querySelector: sinon.stub()
+        querySelector: sinon.stub(),
+        createElement: sinon.stub(),
       };
+      doc.defaultView.document = doc;
 
       elStub = {
         insertBefore: sinon.stub()
@@ -1260,16 +1272,25 @@ describe('Unit: Prebid Module', function () {
       spyAddWinningBid.restore();
     });
 
+    function renderAd(...args) {
+      $$PREBID_GLOBAL$$.renderAd(...args);
+      return new Promise((resolve) => {
+        setTimeout(resolve, 10);
+      });
+    }
+
     it('should require doc and id params', function () {
-      $$PREBID_GLOBAL$$.renderAd();
-      var error = 'Error trying to write ad Id :undefined to the page. Missing adId';
-      assert.ok(spyLogError.calledWith(error), 'expected param error was logged');
+      return renderAd().then(() => {
+        var error = 'Error rendering ad (id: undefined): missing adId';
+        assert.ok(spyLogError.calledWith(error), 'expected param error was logged');
+      })
     });
 
     it('should log message with bid id', function () {
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      var message = 'Calling renderAd with adId :' + bidId;
-      assert.ok(spyLogMessage.calledWith(message), 'expected message was logged');
+      return renderAd(doc, bidId).then(() => {
+        var message = 'Calling renderAd with adId :' + bidId;
+        assert.ok(spyLogMessage.calledWith(message), 'expected message was logged');
+      })
     });
 
     it('should write the ad to the doc', function () {
@@ -1277,24 +1298,26 @@ describe('Unit: Prebid Module', function () {
         ad: ""
       });
       adResponse.ad = "";
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      assert.ok(doc.write.calledWith(adResponse.ad), 'ad was written to doc');
-      assert.ok(doc.close.called, 'close method called');
+      return renderAd(doc, bidId).then(() => {
+        assert.ok(doc.write.calledWith(adResponse.ad), 'ad was written to doc');
+        assert.ok(doc.close.called, 'close method called');
+      })
     });
 
     it('should place the url inside an iframe on the doc', function () {
       pushBidResponseToAuction({
         adUrl: 'http://server.example.com/ad/ad.js'
       });
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      assert.ok(elStub.insertBefore.called, 'url was written to iframe in doc');
+      return renderAd(doc, bidId).then(() => {
+        sinon.assert.calledWith(doc.createElement, 'iframe');
+      });
     });
 
     it('should log an error when no ad or url', function () {
       pushBidResponseToAuction({});
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      var error = 'Error trying to write ad. No ad for bid response id: ' + bidId;
-      assert.ok(spyLogError.calledWith(error), 'expected error was logged');
+      return renderAd(doc, bidId).then(() => {
+        sinon.assert.called(spyLogError);
+      });
     });
 
     it('should log an error when not in an iFrame', function () {
@@ -1302,17 +1325,29 @@ describe('Unit: Prebid Module', function () {
         ad: ""
       });
       inIframe = false;
-      $$PREBID_GLOBAL$$.renderAd(document, bidId);
-      const error = 'Error trying to write ad. Ad render call ad id ' + bidId + ' was prevented from writing to the main document.';
-      assert.ok(spyLogError.calledWith(error), 'expected error was logged');
+      return renderAd(document, bidId).then(() => {
+        const error = `Error rendering ad (id: ${bidId}): renderAd was prevented from writing to the main document.`;
+        assert.ok(spyLogError.calledWith(error), 'expected error was logged');
+      });
+    });
+
+    it('should emit AD_RENDER_SUCCEEDED', () => {
+      sandbox.stub(events, 'emit');
+      pushBidResponseToAuction({
+        ad: ""
+      });
+      return renderAd(document, bidId).then(() => {
+        sinon.assert.calledWith(events.emit, EVENTS.AD_RENDER_SUCCEEDED, sinon.match({adId: bidId}));
+      });
     });
 
     it('should not render videos', function () {
       pushBidResponseToAuction({
         mediatype: 'video'
       });
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      sinon.assert.notCalled(doc.write);
+      return renderAd(doc, bidId).then(() => {
+        sinon.assert.notCalled(doc.write);
+      });
     });
 
     it('should catch errors thrown when trying to write ads to the page', function () {
@@ -1322,33 +1357,28 @@ describe('Unit: Prebid Module', function () {
 
       var error = { message: 'doc write error' };
       doc.write = sinon.stub().throws(error);
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
 
-      var errorMessage = 'Error trying to write ad Id :' + bidId + ' to the page:' + error.message;
-      assert.ok(spyLogError.calledWith(errorMessage), 'expected error was logged');
+      return renderAd(doc, bidId).then(() => {
+        var errorMessage = `Error rendering ad (id: ${bidId}): doc write error`
+        assert.ok(spyLogError.calledWith(errorMessage), 'expected error was logged');
+      });
     });
 
     it('should log an error when ad not found', function () {
       var fakeId = 99;
-      $$PREBID_GLOBAL$$.renderAd(doc, fakeId);
-      var error = 'Error trying to write ad. Cannot find ad by given id : ' + fakeId;
-      assert.ok(spyLogError.calledWith(error), 'expected error was logged');
+      return renderAd(doc, fakeId).then(() => {
+        var error = `Error rendering ad (id: ${fakeId}): Cannot find ad '${fakeId}'`
+        assert.ok(spyLogError.calledWith(error), 'expected error was logged');
+      });
     });
 
     it('should save bid displayed to winning bid', function () {
       pushBidResponseToAuction({
         ad: ""
       });
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      assert.deepEqual($$PREBID_GLOBAL$$.getAllWinningBids()[0], adResponse);
-    });
-
-    it('should replace ${CLICKTHROUGH} macro in winning bids response', function () {
-      pushBidResponseToAuction({
-        ad: ""
+      return renderAd(doc, bidId).then(() => {
+        assert.deepEqual($$PREBID_GLOBAL$$.getAllWinningBids()[0], adResponse);
       });
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId, {clickThrough: 'https://someadserverclickurl.com'});
-      expect(adResponse).to.have.property('ad').and.to.match(/https:\/\/someadserverclickurl\.com/i);
     });
 
     it('fires billing url if present on s2s bid', function () {
@@ -1359,22 +1389,23 @@ describe('Unit: Prebid Module', function () {
         burl
       });
 
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-
-      sinon.assert.calledOnce(triggerPixelStub);
-      sinon.assert.calledWith(triggerPixelStub, burl);
+      return renderAd(doc, bidId).then(() => {
+        sinon.assert.calledOnce(triggerPixelStub);
+        sinon.assert.calledWith(triggerPixelStub, burl);
+      });
     });
 
     it('should call addWinningBid', function () {
       pushBidResponseToAuction({
         ad: ""
       });
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      var message = 'Calling renderAd with adId :' + bidId;
-      sinon.assert.calledWith(spyLogMessage, message);
+      return renderAd(doc, bidId).then(() => {
+        var message = 'Calling renderAd with adId :' + bidId;
+        sinon.assert.calledWith(spyLogMessage, message);
 
-      sinon.assert.calledOnce(spyAddWinningBid);
-      sinon.assert.calledWith(spyAddWinningBid, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(spyAddWinningBid, adResponse);
+      });
     });
 
     it('should warn stale rendering', function () {
@@ -1383,46 +1414,44 @@ describe('Unit: Prebid Module', function () {
       var onWonEvent = sinon.stub();
       var onStaleEvent = sinon.stub();
 
-      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.EVENTS.BID_WON, onWonEvent);
-      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.EVENTS.STALE_RENDER, onStaleEvent);
+      $$PREBID_GLOBAL$$.onEvent(EVENTS.BID_WON, onWonEvent);
+      $$PREBID_GLOBAL$$.onEvent(EVENTS.STALE_RENDER, onStaleEvent);
 
       pushBidResponseToAuction({
         ad: ""
       });
 
       // First render should pass with no warning and added to winning bids
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      sinon.assert.calledWith(spyLogMessage, message);
-      sinon.assert.neverCalledWith(spyLogWarn, warning);
-
-      sinon.assert.calledOnce(spyAddWinningBid);
-      sinon.assert.calledWith(spyAddWinningBid, adResponse);
-
-      sinon.assert.calledWith(onWonEvent, adResponse);
-      sinon.assert.notCalled(onStaleEvent);
-      expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
-
-      // Reset call history for spies and stubs
-      spyLogMessage.resetHistory();
-      spyLogWarn.resetHistory();
-      spyAddWinningBid.resetHistory();
-      onWonEvent.resetHistory();
-      onStaleEvent.resetHistory();
-
-      // Second render should have a warning but still added to winning bids
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      sinon.assert.calledWith(spyLogMessage, message);
-      sinon.assert.calledWith(spyLogWarn, warning);
-
-      sinon.assert.calledOnce(spyAddWinningBid);
-      sinon.assert.calledWith(spyAddWinningBid, adResponse);
-
-      sinon.assert.calledWith(onWonEvent, adResponse);
-      sinon.assert.calledWith(onStaleEvent, adResponse);
-
-      // Clean up
-      $$PREBID_GLOBAL$$.offEvent(CONSTANTS.EVENTS.BID_WON, onWonEvent);
-      $$PREBID_GLOBAL$$.offEvent(CONSTANTS.EVENTS.STALE_RENDER, onStaleEvent);
+      return renderAd(doc, bidId).then(() => {
+        sinon.assert.calledWith(spyLogMessage, message);
+        sinon.assert.neverCalledWith(spyLogWarn, warning);
+
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(spyAddWinningBid, adResponse);
+
+        sinon.assert.calledWith(onWonEvent, adResponse);
+        sinon.assert.notCalled(onStaleEvent);
+        expect(adResponse).to.have.property('status', BID_STATUS.RENDERED);
+
+        // Reset call history for spies and stubs
+        spyLogMessage.resetHistory();
+        spyLogWarn.resetHistory();
+        spyAddWinningBid.resetHistory();
+        onWonEvent.resetHistory();
+        onStaleEvent.resetHistory();
+        doc.write.resetHistory();
+        return renderAd(doc, bidId);
+      }).then(() => {
+        // Second render should have a warning but still be rendered
+        sinon.assert.calledWith(spyLogMessage, message);
+        sinon.assert.calledWith(spyLogWarn, warning);
+        sinon.assert.calledWith(onStaleEvent, adResponse);
+        sinon.assert.called(doc.write);
+
+        // Clean up
+        $$PREBID_GLOBAL$$.offEvent(EVENTS.BID_WON, onWonEvent);
+        $$PREBID_GLOBAL$$.offEvent(EVENTS.STALE_RENDER, onStaleEvent);
+      });
     });
 
     it('should stop stale rendering', function () {
@@ -1434,46 +1463,48 @@ describe('Unit: Prebid Module', function () {
       // Setting suppressStaleRender to true explicitly
       configObj.setConfig({'auctionOptions': {'suppressStaleRender': true}});
 
-      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.EVENTS.BID_WON, onWonEvent);
-      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.EVENTS.STALE_RENDER, onStaleEvent);
+      $$PREBID_GLOBAL$$.onEvent(EVENTS.BID_WON, onWonEvent);
+      $$PREBID_GLOBAL$$.onEvent(EVENTS.STALE_RENDER, onStaleEvent);
 
       pushBidResponseToAuction({
         ad: ""
       });
 
       // First render should pass with no warning and added to winning bids
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      sinon.assert.calledWith(spyLogMessage, message);
-      sinon.assert.neverCalledWith(spyLogWarn, warning);
+      return renderAd(doc, bidId).then(() => {
+        sinon.assert.calledWith(spyLogMessage, message);
+        sinon.assert.neverCalledWith(spyLogWarn, warning);
 
-      sinon.assert.calledOnce(spyAddWinningBid);
-      sinon.assert.calledWith(spyAddWinningBid, adResponse);
-      expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(spyAddWinningBid, adResponse);
+        expect(adResponse).to.have.property('status', BID_STATUS.RENDERED);
 
-      sinon.assert.calledWith(onWonEvent, adResponse);
-      sinon.assert.notCalled(onStaleEvent);
+        sinon.assert.calledWith(onWonEvent, adResponse);
+        sinon.assert.notCalled(onStaleEvent);
 
-      // Reset call history for spies and stubs
-      spyLogMessage.resetHistory();
-      spyLogWarn.resetHistory();
-      spyAddWinningBid.resetHistory();
-      onWonEvent.resetHistory();
-      onStaleEvent.resetHistory();
+        // Reset call history for spies and stubs
+        spyLogMessage.resetHistory();
+        spyLogWarn.resetHistory();
+        spyAddWinningBid.resetHistory();
+        onWonEvent.resetHistory();
+        onStaleEvent.resetHistory();
 
-      // Second render should have a warning and do not proceed further
-      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
-      sinon.assert.calledWith(spyLogMessage, message);
-      sinon.assert.calledWith(spyLogWarn, warning);
+        // Second render should have a warning and do not proceed further
+        return renderAd(doc, bidId);
+      }).then(() => {
+        sinon.assert.calledWith(spyLogMessage, message);
+        sinon.assert.calledWith(spyLogWarn, warning);
 
-      sinon.assert.notCalled(spyAddWinningBid);
+        sinon.assert.notCalled(spyAddWinningBid);
 
-      sinon.assert.notCalled(onWonEvent);
-      sinon.assert.calledWith(onStaleEvent, adResponse);
+        sinon.assert.notCalled(onWonEvent);
+        sinon.assert.calledWith(onStaleEvent, adResponse);
 
-      // Clean up
-      $$PREBID_GLOBAL$$.offEvent(CONSTANTS.EVENTS.BID_WON, onWonEvent);
-      $$PREBID_GLOBAL$$.offEvent(CONSTANTS.EVENTS.STALE_RENDER, onStaleEvent);
-      configObj.setConfig({'auctionOptions': {}});
+        // Clean up
+        $$PREBID_GLOBAL$$.offEvent(EVENTS.BID_WON, onWonEvent);
+        $$PREBID_GLOBAL$$.offEvent(EVENTS.STALE_RENDER, onStaleEvent);
+        configObj.setConfig({'auctionOptions': {}});
+      });
     });
   });
 
@@ -1538,6 +1569,7 @@ describe('Unit: Prebid Module', function () {
           }
         },
         transactionId: 'mock-tid',
+        adUnitId: 'mock-au',
         bids: [
           {bidder: BIDDER_CODE, params: {placementId: 'id'}},
         ]
@@ -1612,6 +1644,7 @@ describe('Unit: Prebid Module', function () {
         height: 250,
         adUnitCode: bidRequests[0].bids[0].adUnitCode,
         transactionId: 'mock-tid',
+        adUnitId: 'mock-au',
         adserverTargeting: {
           'hb_bidder': BIDDER_CODE,
           'hb_adid': bidId,
@@ -1690,7 +1723,8 @@ describe('Unit: Prebid Module', function () {
             const bid = {
               bidder: 'mock-bidder',
               adUnitCode: adUnits[0].code,
-              transactionId: adUnits[0].transactionId
+              transactionId: adUnits[0].transactionId,
+              adUnitId: adUnits[0].adUnitId,
             }
             requestBids({
               adUnits,
@@ -1805,6 +1839,29 @@ describe('Unit: Prebid Module', function () {
           }));
         });
 
+        it('that cannot alter global config', () => {
+          configObj.setConfig({ortb2: {value: 'old'}});
+          startAuctionStub.callsFake(({ortb2Fragments}) => {
+            ortb2Fragments.global.value = 'new'
+          });
+          $$PREBID_GLOBAL$$.requestBids({ortb2: auctionFPD});
+          expect(configObj.getAnyConfig('ortb2').value).to.eql('old');
+        });
+
+        it('that cannot alter bidder config', () => {
+          configObj.setBidderConfig({
+            bidders: ['mockBidder'],
+            config: {
+              ortb2: {value: 'old'}
+            }
+          })
+          startAuctionStub.callsFake(({ortb2Fragments}) => {
+            ortb2Fragments.bidder.mockBidder.value = 'new';
+          })
+          $$PREBID_GLOBAL$$.requestBids({ortb2: auctionFPD});
+          expect(configObj.getBidderConfig().mockBidder.ortb2.value).to.eql('old');
+        })
+
         it('enriched through enrichFPD', () => {
           function enrich(next, fpd) {
             next.bail(fpd.then(ortb2 => {
@@ -1831,7 +1888,24 @@ describe('Unit: Prebid Module', function () {
           adUnitCodes: 'two'
         });
         sinon.assert.calledWith(startAuctionStub, sinon.match({
-          adUnits: [{code: 'two'}]
+          adUnits: [{code: 'two'}],
+          adUnitCodes: ['two']
+        }));
+      });
+
+      it('does not repeat ad unit codes on twin ad units', () => {
+        $$PREBID_GLOBAL$$.requestBids({
+          adUnits: [{code: 'au1'}, {code: 'au2'}, {code: 'au1'}, {code: 'au2'}],
+        });
+        sinon.assert.calledWith(startAuctionStub, sinon.match({
+          adUnitCodes: ['au1', 'au2']
+        }));
+      });
+
+      it('filters out repeated ad unit codes from input', () => {
+        $$PREBID_GLOBAL$$.requestBids({adUnitCodes: ['au1', 'au1', 'au2']});
+        sinon.assert.calledWith(startAuctionStub, sinon.match({
+          adUnitCodes: ['au1', 'au2']
         }));
       });
 
@@ -1887,7 +1961,7 @@ describe('Unit: Prebid Module', function () {
     });
 
     it('passes ortb2 fragments to createAuction', () => {
-      const ortb2Fragments = {};
+      const ortb2Fragments = {global: {}, bidder: {}};
       pbjsModule.startAuction({
         adUnits: [{
           code: 'au',
@@ -1976,6 +2050,102 @@ describe('Unit: Prebid Module', function () {
           .and.to.match(/[a-f0-9\-]{36}/i);
       });
 
+      it('should use the same transactionID for ad units with the same code', () => {
+        $$PREBID_GLOBAL$$.requestBids({
+          adUnits: [
+            {
+              code: 'twin',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: []
+            }, {
+              code: 'twin',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: []
+            }
+          ]
+        });
+        const tid = auctionArgs.adUnits[0].transactionId;
+        expect(tid).to.exist;
+        expect(auctionArgs.adUnits[1].transactionId).to.eql(tid);
+      });
+
+      it('should re-use pub-provided transaction ID for ad units with the same code', () => {
+        $$PREBID_GLOBAL$$.requestBids({
+          adUnits: [
+            {
+              code: 'twin',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: [],
+            }, {
+              code: 'twin',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: [],
+              ortb2Imp: {
+                ext: {
+                  tid: 'pub-tid'
+                }
+              }
+            }
+          ]
+        });
+        expect(auctionArgs.adUnits.map(au => au.transactionId)).to.eql(['pub-tid', 'pub-tid']);
+      });
+
+      it('should use pub-provided TIDs when they conflict for ad units with the same code', () => {
+        $$PREBID_GLOBAL$$.requestBids({
+          adUnits: [
+            {
+              code: 'twin',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: [],
+              ortb2Imp: {
+                ext: {
+                  tid: 't1'
+                }
+              }
+            }, {
+              code: 'twin',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: [],
+              ortb2Imp: {
+                ext: {
+                  tid: 't2'
+                }
+              }
+            }
+          ]
+        });
+        expect(auctionArgs.adUnits.map(au => au.transactionId)).to.eql(['t1', 't2']);
+      });
+
+      it('should generate unique adUnitId', () => {
+        $$PREBID_GLOBAL$$.requestBids({
+          adUnits: [
+            {
+              code: 'single',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: []
+            }, {
+              code: 'twin',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: []
+            },
+            {
+              code: 'twin',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: []
+            }
+          ]
+        });
+
+        const ids = new Set();
+        auctionArgs.adUnits.forEach(au => {
+          expect(au.adUnitId).to.exist;
+          ids.add(au.adUnitId);
+        });
+        expect(ids.size).to.eql(3);
+      });
+
       describe('transactionId', () => {
         let adUnit;
         beforeEach(() => {
@@ -2399,6 +2569,52 @@ describe('Unit: Prebid Module', function () {
             }
           });
 
+          if (FEATURES.NATIVE) {
+            Object.entries({
+              missing: {},
+              negative: {id: -1},
+              'not an integer': {id: 1.23},
+              NaN: {id: 'garbage'}
+            }).forEach(([t, props]) => {
+              it(`should reject native ortb when asset ID is ${t}`, () => {
+                const adUnit = {
+                  code: 'au',
+                  mediaTypes: {
+                    native: {
+                      ortb: {
+                        assets: [props]
+                      }
+                    }
+                  },
+                  bids: [{bidder: 'appnexus'}]
+                };
+                $$PREBID_GLOBAL$$.requestBids({
+                  adUnits: [adUnit]
+                });
+                expect(auctionArgs.adUnits[0].bids.length).to.equal(0);
+              });
+            });
+
+            ['sendTargetingKeys', 'types'].forEach(key => {
+              it(`should reject native that includes both ortb and ${key}`, () => {
+                const adUnit = {
+                  code: 'au',
+                  mediaTypes: {
+                    native: {
+                      ortb: {},
+                      [key]: {}
+                    }
+                  },
+                  bids: [{bidder: 'appnexus'}]
+                };
+                $$PREBID_GLOBAL$$.requestBids({
+                  adUnits: [adUnit]
+                });
+                expect(auctionArgs.adUnits[0].bids.length).to.equal(0);
+              })
+            });
+          }
+
           it('should throw error message and remove adUnit if adUnit.bids is not defined correctly', function () {
             const adUnits = [{
               code: 'ad-unit-1',
@@ -2689,17 +2905,17 @@ describe('Unit: Prebid Module', function () {
         let result = targeting.getAllTargeting(['/19968336/header-bid-tag-0', '/19968336/header-bid-tag1']); // $$PREBID_GLOBAL$$.getAdserverTargeting();
         let expected = {
           '/19968336/header-bid-tag-0': {
-            'foobar': '0x0,300x250,300x600',
-            [CONSTANTS.TARGETING_KEYS.SIZE]: '300x250',
-            [CONSTANTS.TARGETING_KEYS.PRICE_BUCKET]: '10.00',
-            [CONSTANTS.TARGETING_KEYS.AD_ID]: '233bcbee889d46d',
-            [CONSTANTS.TARGETING_KEYS.BIDDER]: 'appnexus'
+            'foobar': '300x250,300x600,0x0',
+            [TARGETING_KEYS.SIZE]: '300x250',
+            [TARGETING_KEYS.PRICE_BUCKET]: '10.00',
+            [TARGETING_KEYS.AD_ID]: '233bcbee889d46d',
+            [TARGETING_KEYS.BIDDER]: 'appnexus'
           },
           '/19968336/header-bid-tag1': {
-            [CONSTANTS.TARGETING_KEYS.BIDDER]: 'appnexus',
-            [CONSTANTS.TARGETING_KEYS.AD_ID]: '24bd938435ec3fc',
-            [CONSTANTS.TARGETING_KEYS.PRICE_BUCKET]: '10.00',
-            [CONSTANTS.TARGETING_KEYS.SIZE]: '728x90',
+            [TARGETING_KEYS.BIDDER]: 'appnexus',
+            [TARGETING_KEYS.AD_ID]: '24bd938435ec3fc',
+            [TARGETING_KEYS.PRICE_BUCKET]: '10.00',
+            [TARGETING_KEYS.SIZE]: '728x90',
             'foobar': '728x90'
           }
         }
@@ -2734,6 +2950,13 @@ describe('Unit: Prebid Module', function () {
       events.on.restore();
     });
 
+    it('should emit event BID_ACCEPTED when invoked', function () {
+      var callback = sinon.spy();
+      $$PREBID_GLOBAL$$.onEvent('bidAccepted', callback);
+      events.emit(EVENTS.BID_ACCEPTED);
+      sinon.assert.calledOnce(callback);
+    });
+
     describe('beforeRequestBids', function () {
       let bidRequestedHandler;
       let beforeRequestBidsHandler;
@@ -2976,7 +3199,7 @@ describe('Unit: Prebid Module', function () {
   describe('emit', function () {
     it('should be able to emit event without arguments', function () {
       var spyEventsEmit = sinon.spy(events, 'emit');
-      events.emit(CONSTANTS.EVENTS.REQUEST_BIDS);
+      events.emit(EVENTS.REQUEST_BIDS);
       assert.ok(spyEventsEmit.calledWith('requestBids'));
       events.emit.restore();
     });
@@ -3096,7 +3319,7 @@ describe('Unit: Prebid Module', function () {
       let priceGranularity = configObj.getConfig('priceGranularity');
       let newCustomPriceBucket = configObj.getConfig('customPriceBucket');
       expect(goodConfig).to.deep.equal(newCustomPriceBucket);
-      expect(priceGranularity).to.equal(CONSTANTS.GRANULARITY_OPTIONS.CUSTOM);
+      expect(priceGranularity).to.equal(GRANULARITY_OPTIONS.CUSTOM);
     });
   });
 
@@ -3236,11 +3459,11 @@ describe('Unit: Prebid Module', function () {
           'auctionId': 123456,
           'adserverTargeting': {
             'foobar': '300x250',
-            [CONSTANTS.TARGETING_KEYS.BIDDER]: 'appnexus',
-            [CONSTANTS.TARGETING_KEYS.AD_ID]: '233bcbee889d46d',
-            [CONSTANTS.TARGETING_KEYS.PRICE_BUCKET]: '10.00',
-            [CONSTANTS.TARGETING_KEYS.SIZE]: '300x250',
-            [CONSTANTS.TARGETING_KEYS.DEAL + '_appnexusDummyName']: '1234'
+            [TARGETING_KEYS.BIDDER]: 'appnexus',
+            [TARGETING_KEYS.AD_ID]: '233bcbee889d46d',
+            [TARGETING_KEYS.PRICE_BUCKET]: '10.00',
+            [TARGETING_KEYS.SIZE]: '300x250',
+            [TARGETING_KEYS.DEAL + '_appnexusDummyName']: '1234'
           }
         }
       ];
@@ -3280,7 +3503,7 @@ describe('Unit: Prebid Module', function () {
       auction.getBidsReceived = function() { return _bidsReceived };
       const highestBid1 = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('/19968336/header-bid-tag-0');
       expect(highestBid1).to.deep.equal(_bidsReceived[1])
-      _bidsReceived[1].status = CONSTANTS.BID_STATUS.RENDERED
+      _bidsReceived[1].status = BID_STATUS.RENDERED
       const highestBid2 = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('/19968336/header-bid-tag-0');
       expect(highestBid2).to.deep.equal(_bidsReceived[2])
     })
@@ -3302,16 +3525,20 @@ describe('Unit: Prebid Module', function () {
       const highestBid = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('/19968336/header-bid-tag-0');
       expect(highestBid).to.deep.equal(_bidsReceived[2])
     })
-  })
+  });
 
-  describe('getHighestCpm', () => {
+  describe('getHighestCpmBids', () => {
     after(() => {
       resetAuction();
     });
     it('returns an array containing the highest bid object for the given adUnitCode', function () {
-      const highestCpmBids = $$PREBID_GLOBAL$$.getHighestCpmBids('/19968336/header-bid-tag-0');
+      const adUnitcode = '/19968336/header-bid-tag-0';
+      targeting.setLatestAuctionForAdUnit(adUnitcode, auctionId)
+      const highestCpmBids = $$PREBID_GLOBAL$$.getHighestCpmBids(adUnitcode);
       expect(highestCpmBids.length).to.equal(1);
-      expect(highestCpmBids[0]).to.deep.equal(auctionManager.getBidsReceived()[1]);
+      const expectedBid = auctionManager.getBidsReceived()[1];
+      expectedBid.latestTargetedAuctionId = auctionId;
+      expect(highestCpmBids[0]).to.deep.equal(expectedBid);
     });
 
     it('returns an empty array when the given adUnit is not found', function () {
@@ -3349,7 +3576,7 @@ describe('Unit: Prebid Module', function () {
   if (FEATURES.VIDEO) {
     describe('markWinningBidAsUsed', function () {
       const adUnitCode = '/19968336/header-bid-tag-0';
-      let winningBid;
+      let winningBid, markedBid;
 
       beforeEach(() => {
         const bidsReceived = $$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode(adUnitCode);
@@ -3358,45 +3585,63 @@ describe('Unit: Prebid Module', function () {
         // mark the bid and verify the state has changed to RENDERED
         winningBid = targeting.getWinningBids(adUnitCode)[0];
         auction.getAuctionId = function() { return winningBid.auctionId };
+        sandbox.stub(events, 'emit');
+        markedBid = find($$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode(adUnitCode).bids,
+          bid => bid.adId === winningBid.adId);
       })
 
       afterEach(() => {
         resetAuction();
       })
 
-      it('marks the bid object as used for the given adUnitCode/adId combination', function () {
-        // make sure the auction has "state" and does not reload the fixtures
-        $$PREBID_GLOBAL$$.markWinningBidAsUsed({ adUnitCode, adId: winningBid.adId });
-        const markedBid = find($$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode(adUnitCode).bids,
-          bid => bid.adId === winningBid.adId);
+      function checkBidRendered() {
+        expect(markedBid.status).to.equal(BID_STATUS.RENDERED);
+      }
 
-        expect(markedBid.status).to.equal(CONSTANTS.BID_STATUS.RENDERED);
-      });
+      Object.entries({
+        'analytics=true': {
+          mark(options = {}) {
+            $$PREBID_GLOBAL$$.markWinningBidAsUsed(Object.assign({analytics: true}, options))
+          },
+          checkBidWon() {
+            sinon.assert.calledWith(events.emit, EVENTS.BID_WON, markedBid);
+          }
+        },
+        'analytics=false': {
+          mark(options = {}) {
+            $$PREBID_GLOBAL$$.markWinningBidAsUsed(options)
+          },
+          checkBidWon() {
+            sinon.assert.notCalled(events.emit)
+          }
+        }
+      }).forEach(([t, {mark, checkBidWon}]) => {
+        describe(`when ${t}`, () => {
+          it('marks the bid object as used for the given adUnitCode/adId combination', function () {
+            mark({ adUnitCode, adId: winningBid.adId });
+            checkBidRendered();
+            checkBidWon();
+          });
+          it('marks the winning bid object as used for the given adUnitCode', function () {
+            mark({ adUnitCode });
+            checkBidRendered();
+            checkBidWon();
+          });
+
+          it('marks a bid object as used for the given adId', function () {
+            mark({ adId: winningBid.adId });
+            checkBidRendered();
+            checkBidWon();
+          });
+        })
+      })
 
       it('try and mark the bid object, but fail because we supplied the wrong adId', function () {
         $$PREBID_GLOBAL$$.markWinningBidAsUsed({ adUnitCode, adId: 'miss' });
         const markedBid = find($$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode(adUnitCode).bids,
           bid => bid.adId === winningBid.adId);
 
-        expect(markedBid.status).to.not.equal(CONSTANTS.BID_STATUS.RENDERED);
-      });
-
-      it('marks the winning bid object as used for the given adUnitCode', function () {
-        // make sure the auction has "state" and does not reload the fixtures
-        $$PREBID_GLOBAL$$.markWinningBidAsUsed({ adUnitCode });
-        const markedBid = find($$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode(adUnitCode).bids,
-          bid => bid.adId === winningBid.adId);
-
-        expect(markedBid.status).to.equal(CONSTANTS.BID_STATUS.RENDERED);
-      });
-
-      it('marks a bid object as used for the given adId', function () {
-        // make sure the auction has "state" and does not reload the fixtures
-        $$PREBID_GLOBAL$$.markWinningBidAsUsed({ adId: winningBid.adId });
-        const markedBid = find($$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode(adUnitCode).bids,
-          bid => bid.adId === winningBid.adId);
-
-        expect(markedBid.status).to.equal(CONSTANTS.BID_STATUS.RENDERED);
+        expect(markedBid.status).to.not.equal(BID_STATUS.RENDERED);
       });
     });
   }
@@ -3466,11 +3711,11 @@ describe('Unit: Prebid Module', function () {
       expect(window.apntag.tags[adUnitCode].keywords).to.deep.equal({});
     });
 
-    it('should not find ' + CONSTANTS.TARGETING_KEYS.AD_ID + ' key in lowercase for all bidders', function() {
+    it('should not find ' + TARGETING_KEYS.AD_ID + ' key in lowercase for all bidders', function () {
       const adUnitCode = '/19968336/header-bid-tag-0';
       $$PREBID_GLOBAL$$.setConfig({ enableSendAllBids: true });
       targeting.setTargetingForAst();
-      const keywords = Object.keys(window.apntag.tags[adUnitCode].keywords).filter(keyword => (keyword.substring(0, CONSTANTS.TARGETING_KEYS.AD_ID.length) === CONSTANTS.TARGETING_KEYS.AD_ID));
+      const keywords = Object.keys(window.apntag.tags[adUnitCode].keywords).filter(keyword => (keyword.substring(0, TARGETING_KEYS.AD_ID.length) === TARGETING_KEYS.AD_ID));
       expect(keywords.length).to.equal(0);
     });
   });
@@ -3529,67 +3774,39 @@ describe('Unit: Prebid Module', function () {
       auctionManagerStub.returns(bidsReceived)
       let bids = $$PREBID_GLOBAL$$.getAllPrebidWinningBids();
 
-      expect(bids.length).to.equal(1);
+      expect(bids.length).to.equal(1); sandbox
       expect(bids[0].adId).to.equal('adid-1');
     });
   });
 
   describe('deferred billing', function () {
-    const sandbox = sinon.createSandbox();
-
-    let adUnits = [
-      {
-        code: 'adUnit-code-1',
-        mediaTypes: { banner: { sizes: [[300, 250], [300, 600]] } },
-        transactionId: '1234567890',
-        bids: [
-          { bidder: 'pubmatic', params: {placementId: '10433394'}, adUnitCode: 'adUnit-code-1' }
-        ]
-      },
-      {
-        code: 'adUnit-code-2',
-        deferBilling: true,
-        mediaTypes: { banner: { sizes: [[300, 250], [300, 600]] } },
-        transactionId: '0987654321',
-        bids: [
-          { bidder: 'pubmatic', params: {placementId: '10433394'}, adUnitCode: 'adUnit-code-2' }
-        ]
-      }
-    ];
-
-    let winningBid1 = { adapterCode: 'pubmatic', bidder: 'pubmatic', params: {placementId: '10433394'}, adUnitCode: 'adUnit-code-1', transactionId: '1234567890', adId: 'abcdefg' }
-    let winningBid2 = { adapterCode: 'pubmatic', bidder: 'pubmatic', params: {placementId: '10433394'}, adUnitCode: 'adUnit-code-2', transactionId: '0987654321' }
-    let adUnitCodes = ['adUnit-code-1', 'adUnit-code-2'];
-    let auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: function() {}, cbTimeout: 2000});
+    let bid;
 
     beforeEach(function () {
-      sandbox.spy(adapterManager, 'callBidWonBidder');
-      sandbox.spy(adapterManager, 'callBidBillableBidder');
-      sandbox.stub(auctionManager, 'getBidsReceived').returns([winningBid1]);
+      bid = { adapterCode: 'pubmatic', bidder: 'pubmatic', params: {placementId: '10433394'}, adUnitCode: 'adUnit-code-1', adUnitId: '1234567890', adId: 'abcdefg' };
+      sandbox.spy(adapterManager, 'triggerBilling');
+      sandbox.stub(auctionManager, 'getAllWinningBids').returns([bid]);
     });
 
-    afterEach(function () {
-      sandbox.resetHistory();
-      sandbox.restore();
-    });
-
-    it('should by default invoke callBidWonBidder and callBidBillableBidder', function () {
-      auction.addWinningBid(winningBid1);
-      sinon.assert.calledOnce(adapterManager.callBidWonBidder);
-      sinon.assert.calledOnce(adapterManager.callBidBillableBidder);
-    });
+    Object.entries({
+      'bid': () => bid,
+      'adUnitCode': () => ({adUnitCode: bid.adUnitCode})
+    }).forEach(([t, val]) => {
+      it(`should trigger billing when invoked with ${t}`, () => {
+        $$PREBID_GLOBAL$$.triggerBilling(val());
+        sinon.assert.calledWith(adapterManager.triggerBilling, bid);
+      })
+    })
+  });
 
-    it('should only invoke callBidWonBidder and NOT callBidBillableBidder if deferBilling is present and true within the winning adUnit object', function () {
-      auction.addWinningBid(winningBid2);
-      sinon.assert.calledOnce(adapterManager.callBidWonBidder);
-      sinon.assert.notCalled(adapterManager.callBidBillableBidder);
+  describe('clearAllAuctions', () => {
+    after(() => {
+      resetAuction();
     });
-
-    it('should invoke callBidBillableBidder when pbjs.triggerBilling is invoked', function () {
-      $$PREBID_GLOBAL$$.triggerBilling(winningBid1);
-      sinon.assert.calledOnce(auctionManager.getBidsReceived);
-      sinon.assert.notCalled(adapterManager.callBidWonBidder);
-      sinon.assert.calledOnce(adapterManager.callBidBillableBidder);
+    it('clears auction data', function () {
+      expect(auctionManager.getBidsReceived().length).to.not.equal(0);
+      $$PREBID_GLOBAL$$.clearAllAuctions();
+      expect(auctionManager.getBidsReceived().length).to.equal(0);
     });
   });
 });
diff --git a/test/spec/unit/secureCreatives_spec.js b/test/spec/unit/secureCreatives_spec.js
index 7d5f9af35dd..aeb78501d51 100644
--- a/test/spec/unit/secureCreatives_spec.js
+++ b/test/spec/unit/secureCreatives_spec.js
@@ -1,6 +1,4 @@
-import {
-  _sendAdToCreative, getReplier, receiveMessage
-} from 'src/secureCreatives.js';
+import {getReplier, receiveMessage, resizeRemoteCreative} from 'src/secureCreatives.js';
 import * as utils from 'src/utils.js';
 import {getAdUnits, getBidRequests, getBidResponses} from 'test/fixtures/fixtures.js';
 import {auctionManager} from 'src/auctionManager.js';
@@ -8,18 +6,46 @@ import * as auctionModule from 'src/auction.js';
 import * as native from 'src/native.js';
 import {fireNativeTrackers, getAllAssetsMessage} from 'src/native.js';
 import * as events from 'src/events.js';
-import { config as configObj } from 'src/config.js';
+import {config as configObj} from 'src/config.js';
+import * as creativeRenderers from 'src/creativeRenderers.js';
 import 'src/prebid.js';
+import 'modules/nativeRendering.js';
 
-import { expect } from 'chai';
+import {expect} from 'chai';
 
-var CONSTANTS = require('src/constants.json');
+import {AD_RENDER_FAILED_REASON, BID_STATUS, EVENTS} from 'src/constants.js';
+import {getBidToRender} from '../../../src/adRendering.js';
 
 describe('secureCreatives', () => {
+  let sandbox;
+
+  function getBidToRenderHook(next, adId) {
+    // make sure that bids can be retrieved asynchronously
+    next(adId, new Promise((resolve) => setTimeout(resolve)))
+  }
+  before(() => {
+    getBidToRender.before(getBidToRenderHook);
+  });
+  after(() => {
+    getBidToRender.getHooks({hook: getBidToRenderHook}).remove()
+  });
+
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
   function makeEvent(ev) {
     return Object.assign({origin: 'mock-origin', ports: []}, ev)
   }
 
+  function receive(ev) {
+    return Promise.resolve(receiveMessage(ev));
+  }
+
   describe('getReplier', () => {
     it('should use source.postMessage if no MessagePort is available', () => {
       const ev = {
@@ -54,40 +80,6 @@ describe('secureCreatives', () => {
     });
   });
 
-  describe('_sendAdToCreative', () => {
-    beforeEach(function () {
-      sinon.stub(utils, 'logError');
-      sinon.stub(utils, 'logWarn');
-    });
-
-    afterEach(function () {
-      utils.logError.restore();
-      utils.logWarn.restore();
-    });
-    it('should macro replace ${AUCTION_PRICE} with the winning bid for ad and adUrl', () => {
-      const oldVal = window.googletag;
-      const oldapntag = window.apntag;
-      window.apntag = null
-      window.googletag = null;
-      const mockAdObject = {
-        adId: 'someAdId',
-        ad: '',
-        adUrl: 'http://creative.prebid.org/${AUCTION_PRICE}',
-        width: 300,
-        height: 250,
-        renderer: null,
-        cpm: '1.00',
-        adUnitCode: 'some_dom_id'
-      };
-      const reply = sinon.spy();
-      _sendAdToCreative(mockAdObject, reply);
-      expect(reply.args[0][0].ad).to.equal('');
-      expect(reply.args[0][0].adUrl).to.equal('http://creative.prebid.org/1.00');
-      window.googletag = oldVal;
-      window.apntag = oldapntag;
-    });
-  });
-
   describe('receiveMessage', function() {
     const bidId = 1;
     const warning = `Ad id ${bidId} has been rendered before`;
@@ -149,19 +141,15 @@ describe('secureCreatives', () => {
     });
 
     beforeEach(function() {
-      spyAddWinningBid = sinon.spy(auctionManager, 'addWinningBid');
-      spyLogWarn = sinon.spy(utils, 'logWarn');
-      stubFireNativeTrackers = sinon.stub(native, 'fireNativeTrackers').callsFake(message => { return message.action; });
-      stubGetAllAssetsMessage = sinon.stub(native, 'getAllAssetsMessage');
-      stubEmit = sinon.stub(events, 'emit');
+      spyAddWinningBid = sandbox.spy(auctionManager, 'addWinningBid');
+      spyLogWarn = sandbox.spy(utils, 'logWarn');
+      stubFireNativeTrackers = sandbox.stub(native, 'fireNativeTrackers').callsFake(message => { return message.action; });
+      stubGetAllAssetsMessage = sandbox.stub(native, 'getAllAssetsMessage');
+      stubEmit = sandbox.stub(events, 'emit');
     });
 
     afterEach(function() {
-      spyAddWinningBid.restore();
-      spyLogWarn.restore();
-      stubFireNativeTrackers.restore();
-      stubGetAllAssetsMessage.restore();
-      stubEmit.restore();
+      sandbox.restore();
       resetAuction();
       adResponse.adId = bidId;
     });
@@ -181,17 +169,17 @@ describe('secureCreatives', () => {
           data: JSON.stringify(data),
         });
 
-        receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(spyAddWinningBid);
-        sinon.assert.calledWith(spyAddWinningBid, adResponse);
-        sinon.assert.calledOnce(adResponse.renderer.render);
-        sinon.assert.calledWith(adResponse.renderer.render, adResponse);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
+        return receive(ev).then(() => {
+          sinon.assert.neverCalledWith(spyLogWarn, warning);
+          sinon.assert.calledOnce(spyAddWinningBid);
+          sinon.assert.calledWith(spyAddWinningBid, adResponse);
+          sinon.assert.calledOnce(adResponse.renderer.render);
+          sinon.assert.calledWith(adResponse.renderer.render, adResponse);
+          sinon.assert.calledWith(stubEmit, EVENTS.BID_WON, adResponse);
+          sinon.assert.neverCalledWith(stubEmit, EVENTS.STALE_RENDER);
 
-        expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
+          expect(adResponse).to.have.property('status', BID_STATUS.RENDERED);
+        });
       });
 
       it('should allow stale rendering without config', function () {
@@ -208,29 +196,23 @@ describe('secureCreatives', () => {
           data: JSON.stringify(data)
         });
 
-        receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(spyAddWinningBid);
-        sinon.assert.calledWith(spyAddWinningBid, adResponse);
-        sinon.assert.calledOnce(adResponse.renderer.render);
-        sinon.assert.calledWith(adResponse.renderer.render, adResponse);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
-
-        expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
-
-        resetHistories(adResponse.renderer.render);
-
-        receiveMessage(ev);
-
-        sinon.assert.calledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(spyAddWinningBid);
-        sinon.assert.calledWith(spyAddWinningBid, adResponse);
-        sinon.assert.calledOnce(adResponse.renderer.render);
-        sinon.assert.calledWith(adResponse.renderer.render, adResponse);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER, adResponse);
+        return receive(ev).then(() => {
+          sinon.assert.neverCalledWith(spyLogWarn, warning);
+          sinon.assert.calledOnce(spyAddWinningBid);
+          sinon.assert.calledWith(spyAddWinningBid, adResponse);
+          sinon.assert.calledOnce(adResponse.renderer.render);
+          sinon.assert.calledWith(adResponse.renderer.render, adResponse);
+          sinon.assert.calledWith(stubEmit, EVENTS.BID_WON, adResponse);
+          sinon.assert.neverCalledWith(stubEmit, EVENTS.STALE_RENDER);
+          expect(adResponse).to.have.property('status', BID_STATUS.RENDERED);
+          resetHistories(adResponse.renderer.render);
+          return receive(ev);
+        }).then(() => {
+          sinon.assert.calledWith(spyLogWarn, warning);
+          sinon.assert.calledOnce(adResponse.renderer.render);
+          sinon.assert.calledWith(adResponse.renderer.render, adResponse);
+          sinon.assert.calledWith(stubEmit, EVENTS.STALE_RENDER, adResponse);
+        });
       });
 
       it('should stop stale rendering with config', function () {
@@ -249,29 +231,27 @@ describe('secureCreatives', () => {
           data: JSON.stringify(data)
         });
 
-        receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(spyAddWinningBid);
-        sinon.assert.calledWith(spyAddWinningBid, adResponse);
-        sinon.assert.calledOnce(adResponse.renderer.render);
-        sinon.assert.calledWith(adResponse.renderer.render, adResponse);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
-
-        expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
-
-        resetHistories(adResponse.renderer.render);
-
-        receiveMessage(ev);
-
-        sinon.assert.calledWith(spyLogWarn, warning);
-        sinon.assert.notCalled(spyAddWinningBid);
-        sinon.assert.notCalled(adResponse.renderer.render);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER, adResponse);
-
-        configObj.setConfig({'auctionOptions': {}});
+        return receive(ev).then(() => {
+          sinon.assert.neverCalledWith(spyLogWarn, warning);
+          sinon.assert.calledOnce(spyAddWinningBid);
+          sinon.assert.calledWith(spyAddWinningBid, adResponse);
+          sinon.assert.calledOnce(adResponse.renderer.render);
+          sinon.assert.calledWith(adResponse.renderer.render, adResponse);
+          sinon.assert.calledWith(stubEmit, EVENTS.BID_WON, adResponse);
+          sinon.assert.neverCalledWith(stubEmit, EVENTS.STALE_RENDER);
+
+          expect(adResponse).to.have.property('status', BID_STATUS.RENDERED);
+
+          resetHistories(adResponse.renderer.render);
+          return receive(ev)
+        }).then(() => {
+          sinon.assert.calledWith(spyLogWarn, warning);
+          sinon.assert.notCalled(spyAddWinningBid);
+          sinon.assert.notCalled(adResponse.renderer.render);
+          sinon.assert.neverCalledWith(stubEmit, EVENTS.BID_WON, adResponse);
+          sinon.assert.calledWith(stubEmit, EVENTS.STALE_RENDER, adResponse);
+          configObj.setConfig({'auctionOptions': {}});
+        });
       });
 
       it('should emit AD_RENDER_FAILED if requested missing adId', () => {
@@ -281,11 +261,12 @@ describe('secureCreatives', () => {
             adId: 'missing'
           })
         });
-        receiveMessage(ev);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.AD_RENDER_FAILED, sinon.match({
-          reason: CONSTANTS.AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
-          adId: 'missing'
-        }));
+        return receive(ev).then(() => {
+          sinon.assert.calledWith(stubEmit, EVENTS.AD_RENDER_FAILED, sinon.match({
+            reason: AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
+            adId: 'missing'
+          }));
+        });
       });
 
       it('should emit AD_RENDER_FAILED if creative can\'t be sent to rendering frame', () => {
@@ -299,12 +280,75 @@ describe('secureCreatives', () => {
             adId: bidId
           })
         });
-        receiveMessage(ev)
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.AD_RENDER_FAILED, sinon.match({
-          reason: CONSTANTS.AD_RENDER_FAILED_REASON.EXCEPTION,
-          adId: bidId
-        }));
+        return receive(ev).then(() => {
+          sinon.assert.calledWith(stubEmit, EVENTS.AD_RENDER_FAILED, sinon.match({
+            reason: AD_RENDER_FAILED_REASON.EXCEPTION,
+            adId: bidId
+          }));
+        })
+      });
+
+      it('should include renderers in responses', () => {
+        sandbox.stub(creativeRenderers, 'getCreativeRendererSource').returns('mock-renderer');
+        pushBidResponseToAuction({});
+        const ev = makeEvent({
+          source: {
+            postMessage: sinon.stub()
+          },
+          data: JSON.stringify({adId: bidId, message: 'Prebid Request'})
+        });
+        return receive(ev).then(() => {
+          sinon.assert.calledWith(ev.source.postMessage, sinon.match(ob => JSON.parse(ob).renderer === 'mock-renderer'));
+        });
       });
+
+      if (FEATURES.NATIVE) {
+        it('should include native rendering data in responses', () => {
+          const bid = {
+            native: {
+              ortb: {
+                assets: [
+                  {
+                    id: 1,
+                    data: {
+                      type: 2,
+                      value: 'vbody'
+                    }
+                  }
+                ]
+              },
+              body: 'vbody',
+              adTemplate: 'tpl',
+              rendererUrl: 'rurl'
+            }
+          }
+          pushBidResponseToAuction(bid);
+          const ev = makeEvent({
+            source: {
+              postMessage: sinon.stub()
+            },
+            data: JSON.stringify({adId: bidId, message: 'Prebid Request'})
+          })
+          return receive(ev).then(() => {
+            sinon.assert.calledWith(ev.source.postMessage, sinon.match(ob => {
+              const data = JSON.parse(ob);
+              ['width', 'height'].forEach(prop => expect(data[prop]).to.not.exist);
+              const native = data.native;
+              sinon.assert.match(native, {
+                ortb: bid.native.ortb,
+                adTemplate: bid.native.adTemplate,
+                rendererUrl: bid.native.rendererUrl,
+              })
+              expect(Object.fromEntries(native.assets.map(({key, value}) => [key, value]))).to.eql({
+                adTemplate: bid.native.adTemplate,
+                rendererUrl: bid.native.rendererUrl,
+                body: 'vbody'
+              });
+              return true;
+            }))
+          });
+        })
+      }
     });
 
     describe('Prebid Native', function() {
@@ -329,16 +373,16 @@ describe('secureCreatives', () => {
           origin: 'any origin'
         });
 
-        receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(stubGetAllAssetsMessage);
-        sinon.assert.calledWith(stubGetAllAssetsMessage, data, adResponse);
-        sinon.assert.calledOnce(ev.source.postMessage);
-        sinon.assert.notCalled(stubFireNativeTrackers);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
-        sinon.assert.calledOnce(spyAddWinningBid);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
+        return receive(ev).then(() => {
+          sinon.assert.neverCalledWith(spyLogWarn, warning);
+          sinon.assert.calledOnce(stubGetAllAssetsMessage);
+          sinon.assert.calledWith(stubGetAllAssetsMessage, data, adResponse);
+          sinon.assert.calledOnce(ev.source.postMessage);
+          sinon.assert.notCalled(stubFireNativeTrackers);
+          sinon.assert.calledWith(stubEmit, EVENTS.BID_WON, adResponse);
+          sinon.assert.calledOnce(spyAddWinningBid);
+          sinon.assert.neverCalledWith(stubEmit, EVENTS.STALE_RENDER);
+        });
       });
 
       it('Prebid native should not fire BID_WON when receiveMessage is called more than once', () => {
@@ -359,57 +403,81 @@ describe('secureCreatives', () => {
           origin: 'any origin'
         });
 
-        receiveMessage(ev);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
-
-        receiveMessage(ev);
-        stubEmit.withArgs(CONSTANTS.EVENTS.BID_WON, adResponse).calledOnce;
+        return receive(ev).then(() => {
+          sinon.assert.calledWith(stubEmit, EVENTS.BID_WON, adResponse);
+          return receive(ev);
+        }).then(() => {
+          stubEmit.withArgs(EVENTS.BID_WON, adResponse).calledOnce;
+        });
       });
 
-      it('Prebid native should fire trackers', function () {
-        let adId = 2;
-        pushBidResponseToAuction({adId});
-
+      it('should fire BID_WON when no asset is requested', () => {
+        pushBidResponseToAuction({});
         const data = {
-          adId: adId,
+          adId: bidId,
           message: 'Prebid Native',
-          action: 'click',
         };
 
         const ev = makeEvent({
           data: JSON.stringify(data),
-          source: {
-            postMessage: sinon.stub()
-          },
-          origin: 'any origin'
         });
-
-        receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(stubFireNativeTrackers);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
-        sinon.assert.calledOnce(spyAddWinningBid);
-
-        resetHistories(ev.source.postMessage);
-
-        delete data.action;
-        ev.data = JSON.stringify(data);
-        receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(stubFireNativeTrackers);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON);
-        sinon.assert.notCalled(spyAddWinningBid);
-
-        expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
-      });
+        return receive(ev).then(() => {
+          sinon.assert.calledWith(stubEmit, EVENTS.BID_WON, adResponse);
+        });
+      })
+
+      describe('resizing', () => {
+        let container, slot;
+        before(() => {
+          const [gtag, atag] = [window.googletag, window.apntag];
+          delete window.googletag;
+          delete window.apntag;
+          after(() => {
+            window.googletag = gtag;
+            window.apntag = atag;
+          })
+        })
+        beforeEach(() => {
+          pushBidResponseToAuction({
+            adUnitCode: 'mock-au'
+          });
+          container = document.createElement('div');
+          container.id = 'mock-au';
+          slot = document.createElement('div');
+          container.appendChild(slot);
+          document.body.appendChild(container)
+        });
+        afterEach(() => {
+          if (container) {
+            document.body.removeChild(container);
+          }
+        })
+        it('should handle resize request', () => {
+          const ev = makeEvent({
+            data: JSON.stringify({
+              adId: bidId,
+              message: 'Prebid Native',
+              action: 'resizeNativeHeight',
+              width: 123,
+              height: 321
+            }),
+            source: {
+              postMessage: sinon.stub()
+            },
+            origin: 'any origin'
+          });
+          return receive(ev).then(() => {
+            expect(slot.style.width).to.eql('123px');
+            expect(slot.style.height).to.eql('321px');
+          });
+        })
+      })
     });
 
     describe('Prebid Event', () => {
       Object.entries({
         'unrendered': [false, (bid) => { delete bid.status; }],
-        'rendered': [true, (bid) => { bid.status = CONSTANTS.BID_STATUS.RENDERED }]
+        'rendered': [true, (bid) => { bid.status = BID_STATUS.RENDERED }]
       }).forEach(([test, [shouldEmit, prepBid]]) => {
         describe(`for ${test} bids`, () => {
           beforeEach(() => {
@@ -421,7 +489,7 @@ describe('secureCreatives', () => {
             const event = makeEvent({
               data: JSON.stringify({
                 message: 'Prebid Event',
-                event: CONSTANTS.EVENTS.AD_RENDER_FAILED,
+                event: EVENTS.AD_RENDER_FAILED,
                 adId: bidId,
                 info: {
                   reason: 'Fail reason',
@@ -429,32 +497,83 @@ describe('secureCreatives', () => {
                 },
               })
             });
-            receiveMessage(event);
-            expect(stubEmit.calledWith(CONSTANTS.EVENTS.AD_RENDER_FAILED, {
-              adId: bidId,
-              bid: adResponse,
-              reason: 'Fail reason',
-              message: 'Fail message'
-            })).to.equal(shouldEmit);
+            return receive(event).then(() => {
+              expect(stubEmit.calledWith(EVENTS.AD_RENDER_FAILED, {
+                adId: bidId,
+                bid: adResponse,
+                reason: 'Fail reason',
+                message: 'Fail message'
+              })).to.equal(shouldEmit);
+            });
           });
 
           it(`should${shouldEmit ? ' ' : ' not '}emit AD_RENDER_SUCCEEDED`, () => {
             const event = makeEvent({
               data: JSON.stringify({
                 message: 'Prebid Event',
-                event: CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED,
+                event: EVENTS.AD_RENDER_SUCCEEDED,
                 adId: bidId,
               })
             });
-            receiveMessage(event);
-            expect(stubEmit.calledWith(CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED, {
-              adId: bidId,
-              bid: adResponse,
-              doc: null
-            })).to.equal(shouldEmit);
+            return receive(event).then(() => {
+              expect(stubEmit.calledWith(EVENTS.AD_RENDER_SUCCEEDED, {
+                adId: bidId,
+                bid: adResponse,
+                doc: null
+              })).to.equal(shouldEmit);
+            });
           });
         });
       });
     });
   });
+
+  describe('resizeRemoteCreative', () => {
+    let origGpt;
+    before(() => {
+      origGpt = window.googletag;
+    });
+    after(() => {
+      window.googletag = origGpt;
+    });
+    function mockSlot(elementId, pathId) {
+      let targeting = {};
+      return {
+        getSlotElementId: sinon.stub().callsFake(() => elementId),
+        getAdUnitPath: sinon.stub().callsFake(() => pathId),
+        setTargeting: sinon.stub().callsFake((key, value) => {
+          value = Array.isArray(value) ? value : [value];
+          targeting[key] = value;
+        }),
+        getTargetingKeys: sinon.stub().callsFake(() => Object.keys(targeting)),
+        getTargeting: sinon.stub().callsFake((key) => targeting[key] || [])
+      }
+    }
+    let slots;
+    beforeEach(() => {
+      slots = [
+        mockSlot('div1', 'au1'),
+        mockSlot('div2', 'au2'),
+        mockSlot('div3', 'au3')
+      ]
+      window.googletag = {
+        pubads: sinon.stub().returns({
+          getSlots: sinon.stub().returns(slots)
+        })
+      };
+      sandbox.stub(document, 'getElementById');
+    })
+
+    it('should find correct gpt slot based on ad id rather than ad unit code when resizing secure creative', function () {
+      slots[1].setTargeting('hb_adid', ['adId']);
+      resizeRemoteCreative({
+        adId: 'adId',
+        width: 300,
+        height: 250,
+      });
+      [0, 2].forEach((i) => sinon.assert.notCalled(slots[i].getSlotElementId))
+      sinon.assert.called(slots[1].getSlotElementId);
+      sinon.assert.calledWith(document.getElementById, 'div2');
+    });
+  })
 });
diff --git a/test/spec/unit/utils/focusTimeout_spec.js b/test/spec/unit/utils/focusTimeout_spec.js
new file mode 100644
index 00000000000..3fcc4af18fe
--- /dev/null
+++ b/test/spec/unit/utils/focusTimeout_spec.js
@@ -0,0 +1,87 @@
+import {setFocusTimeout, reset} from '../../../../src/utils/focusTimeout';
+
+export const setDocumentHidden = (hidden) => {
+  Object.defineProperty(document, 'hidden', {
+    configurable: true,
+    get: () => hidden,
+  });
+  document.dispatchEvent(new Event('visibilitychange'));
+};
+
+describe('focusTimeout', () => {
+  let clock, callback;
+
+  beforeEach(() => {
+    reset()
+    clock = sinon.useFakeTimers();
+    callback = sinon.spy();
+  });
+
+  afterEach(() => {
+    clock.restore();
+  })
+
+  it('should invoke callback when page is visible', () => {
+    setFocusTimeout(callback, 2000);
+    clock.tick(2000);
+    expect(callback.called).to.be.true;
+  });
+
+  it('should not choke if page starts hidden', () => {
+    setDocumentHidden(true);
+    reset();
+    setDocumentHidden(false);
+    setFocusTimeout(callback, 1000);
+    clock.tick(1000);
+    sinon.assert.called(callback);
+  })
+
+  it('should not invoke callback if page was hidden', () => {
+    setFocusTimeout(callback, 2000);
+    setDocumentHidden(true);
+    clock.tick(3000);
+    expect(callback.called).to.be.false;
+  });
+
+  it('should defer callback execution when page is hidden', () => {
+    setFocusTimeout(callback, 4000);
+    clock.tick(2000);
+    setDocumentHidden(true);
+    clock.tick(2000);
+    setDocumentHidden(false);
+    expect(callback.called).to.be.false;
+    clock.tick(2000);
+    expect(callback.called).to.be.true;
+  });
+
+  it('should not execute deferred callbacks again', () => {
+    setDocumentHidden(true);
+    setFocusTimeout(callback, 1000);
+    clock.tick(2000);
+    [false, true, false].forEach(setDocumentHidden);
+    clock.tick(2000);
+    sinon.assert.calledOnce(callback);
+  });
+
+  it('should run callbacks that expire while page is hidden', () => {
+    setFocusTimeout(callback, 1000);
+    clock.tick(500);
+    setDocumentHidden(true);
+    clock.tick(1000);
+    setDocumentHidden(false);
+    sinon.assert.notCalled(callback);
+    clock.tick(1000);
+    sinon.assert.called(callback);
+  })
+
+  it('should return updated timerId after page was showed again', () => {
+    const getCurrentTimerId = setFocusTimeout(callback, 4000);
+    const oldTimerId = getCurrentTimerId();
+    clock.tick(2000);
+    setDocumentHidden(true);
+    clock.tick(2000);
+    setDocumentHidden(false);
+    const newTimerId = getCurrentTimerId();
+    expect(oldTimerId).to.not.equal(newTimerId);
+  });
+});
diff --git a/test/spec/unit/utils/ipUtils_spec.js b/test/spec/unit/utils/ipUtils_spec.js
new file mode 100644
index 00000000000..8cd82a8c4fe
--- /dev/null
+++ b/test/spec/unit/utils/ipUtils_spec.js
@@ -0,0 +1,58 @@
+import { scrubIPv4, scrubIPv6 } from '../../../../src/utils/ipUtils'
+
+describe('ipUtils', () => {
+  describe('ipv4', () => {
+    it('should mask ip v4', () => {
+      let input = '192.168.1.1';
+      let output = scrubIPv4(input);
+      expect(output).to.deep.equal('192.168.1.0');
+      input = '192.168.255.255';
+      output = scrubIPv4(input);
+      expect(output).to.deep.equal('192.168.255.0');
+    });
+
+    it('should return null for null input', () => {
+      let input = null;
+      let output = scrubIPv4(input);
+      expect(output).to.deep.equal(null);
+    });
+
+    it('should convert invalid format to null', () => {
+      let invalidIp = '192.130.2';
+      let output = scrubIPv4(invalidIp);
+      expect(output).to.deep.equal(null);
+    });
+
+    it('should convert invalid format to null', () => {
+      let invalidIp = '2001:db8:3333:4444:CCCC:DDDD:EEEE:FFFF';
+      let output = scrubIPv4(invalidIp);
+      expect(output).to.deep.equal(null);
+    });
+  });
+
+  describe('ipv6', () => {
+    it('should mask ip v6', () => {
+      let input = '2001:db8:3333:4444:CCCC:DDDD:EEEE:FFFF';
+      let output = scrubIPv6(input);
+      expect(output).to.deep.equal('2001:db8:3333:4444:0:0:0:0');
+    });
+
+    it('should return null for null input', () => {
+      let input = null;
+      let output = scrubIPv6(input);
+      expect(output).to.deep.equal(null);
+    });
+
+    it('should convert invalid format to null', () => {
+      let invalidIp = '2001:db8:3333:4444:CCCC:DDDD:EEEE';
+      let output = scrubIPv4(invalidIp);
+      expect(output).to.deep.equal(null);
+    });
+
+    it('should convert invalid format to null', () => {
+      let invalidIp = 'invalid';
+      let output = scrubIPv4(invalidIp);
+      expect(output).to.deep.equal(null);
+    });
+  });
+})
diff --git a/test/spec/unit/utils/ttlCollection_spec.js b/test/spec/unit/utils/ttlCollection_spec.js
index 29c6c438855..76cfa32d955 100644
--- a/test/spec/unit/utils/ttlCollection_spec.js
+++ b/test/spec/unit/utils/ttlCollection_spec.js
@@ -67,6 +67,33 @@ describe('ttlCollection', () => {
           });
         });
 
+        it('should run onExpiry when items are cleared', () => {
+          const i1 = {ttl: 1000, some: 'data'};
+          const i2 = {ttl: 2000, some: 'data'};
+          coll.add(i1);
+          coll.add(i2);
+          const cb = sinon.stub();
+          coll.onExpiry(cb);
+          return waitForPromises().then(() => {
+            clock.tick(500);
+            sinon.assert.notCalled(cb);
+            clock.tick(SLACK + 500);
+            sinon.assert.calledWith(cb, i1);
+            clock.tick(3000);
+            sinon.assert.calledWith(cb, i2);
+          })
+        });
+
+        it('should allow unregistration of onExpiry callbacks', () => {
+          const cb = sinon.stub();
+          coll.add({ttl: 500});
+          coll.onExpiry(cb)();
+          return waitForPromises().then(() => {
+            clock.tick(500 + SLACK);
+            sinon.assert.notCalled(cb);
+          })
+        })
+
         it('should not wait too long if a shorter ttl shows up', () => {
           coll.add({ttl: 4000});
           coll.add({ttl: 1000});
diff --git a/test/spec/utils_spec.js b/test/spec/utils_spec.js
index 098582c0af6..1b4cc3764f6 100644
--- a/test/spec/utils_spec.js
+++ b/test/spec/utils_spec.js
@@ -1,9 +1,8 @@
 import {getAdServerTargeting} from 'test/fixtures/fixtures.js';
 import {expect} from 'chai';
-import CONSTANTS from 'src/constants.json';
+import {TARGETING_KEYS} from 'src/constants.js';
 import * as utils from 'src/utils.js';
-import {getHighestCpm, getLatestHighestCpmBid, getOldestHighestCpmBid} from '../../src/utils/reducers.js';
-import {binarySearch, deepEqual, memoize, waitForElementToLoad} from 'src/utils.js';
+import {binarySearch, deepEqual, encodeMacroURI, memoize, sizesToSizeTuples, waitForElementToLoad} from 'src/utils.js';
 import {convertCamelToUnderscore} from '../../libraries/appnexusUtils/anUtils.js';
 
 var assert = require('assert');
@@ -21,6 +20,54 @@ describe('Utils', function () {
     type_array = 'Array',
     type_function = 'Function';
 
+  describe('canAccessWindowTop', function () {
+    let sandbox;
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+    });
+    it('should return true if window.top is accessible', function () {
+      assert.equal(utils.canAccessWindowTop(), true);
+    });
+
+    it('should return false if window.top is not accessible', function () {
+      sandbox.stub(utils.internal, 'getWindowTop').returns(false);
+      assert.equal(utils.canAccessWindowTop(), false);
+    });
+  });
+
+  describe('isSafeFrameWindow', function () {
+    // SafeFrames implementation
+    // https://iabtechlab.com/wp-content/uploads/2016/03/SafeFrames_v1.1_final.pdf
+    const $sf = {
+      ext: {
+        geom: function() {}
+      }
+    };
+
+    afterEach(function() {
+      delete window.$sf;
+    })
+
+    it('should return true if window.$sf is accessible', function () {
+      window.$sf = $sf;
+      assert.equal(utils.isSafeFrameWindow(), true);
+    });
+
+    it('should return false if window.$sf is missimplemented', function () {
+      window.$sf = {};
+      assert.equal(utils.isSafeFrameWindow(), false);
+    });
+
+    it('should return false if window.$sf is missing', function () {
+      assert.equal(utils.isSafeFrameWindow(), false);
+    });
+  });
+
   describe('getBidIdParameter', function () {
     it('should return value of the key in input object', function () {
       var obj = {
@@ -65,7 +112,7 @@ describe('Utils', function () {
       var obj = getAdServerTargeting();
 
       var output = utils.transformAdServerTargetingObj(obj[Object.keys(obj)[0]]);
-      var expected = 'foobar=0x0%2C300x250%2C300x600&' + CONSTANTS.TARGETING_KEYS.SIZE + '=300x250&' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '=10.00&' + CONSTANTS.TARGETING_KEYS.AD_ID + '=233bcbee889d46d&' + CONSTANTS.TARGETING_KEYS.BIDDER + '=appnexus&' + CONSTANTS.TARGETING_KEYS.SIZE + '_triplelift=0x0&' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_triplelift=10.00&' + CONSTANTS.TARGETING_KEYS.AD_ID + '_triplelift=222bb26f9e8bd&' + CONSTANTS.TARGETING_KEYS.BIDDER + '_triplelift=triplelift&' + CONSTANTS.TARGETING_KEYS.SIZE + '_appnexus=300x250&' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_appnexus=10.00&' + CONSTANTS.TARGETING_KEYS.AD_ID + '_appnexus=233bcbee889d46d&' + CONSTANTS.TARGETING_KEYS.BIDDER + '_appnexus=appnexus&' + CONSTANTS.TARGETING_KEYS.SIZE + '_pagescience=300x250&' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_pagescience=10.00&' + CONSTANTS.TARGETING_KEYS.AD_ID + '_pagescience=25bedd4813632d7&' + CONSTANTS.TARGETING_KEYS.BIDDER + '_pagescienc=pagescience&' + CONSTANTS.TARGETING_KEYS.SIZE + '_brightcom=300x250&' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_brightcom=10.00&' + CONSTANTS.TARGETING_KEYS.AD_ID + '_brightcom=26e0795ab963896&' + CONSTANTS.TARGETING_KEYS.BIDDER + '_brightcom=brightcom&' + CONSTANTS.TARGETING_KEYS.SIZE + '_brealtime=300x250&' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_brealtime=10.00&' + CONSTANTS.TARGETING_KEYS.AD_ID + '_brealtime=275bd666f5a5a5d&' + CONSTANTS.TARGETING_KEYS.BIDDER + '_brealtime=brealtime&' + CONSTANTS.TARGETING_KEYS.SIZE + '_pubmatic=300x250&' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_pubmatic=10.00&' + CONSTANTS.TARGETING_KEYS.AD_ID + '_pubmatic=28f4039c636b6a7&' + CONSTANTS.TARGETING_KEYS.BIDDER + '_pubmatic=pubmatic&' + CONSTANTS.TARGETING_KEYS.SIZE + '_rubicon=300x600&' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_rubicon=10.00&' + CONSTANTS.TARGETING_KEYS.AD_ID + '_rubicon=29019e2ab586a5a&' + CONSTANTS.TARGETING_KEYS.BIDDER + '_rubicon=rubicon';
+      var expected = 'foobar=300x250%2C300x600%2C0x0&' + TARGETING_KEYS.SIZE + '=300x250&' + TARGETING_KEYS.PRICE_BUCKET + '=10.00&' + TARGETING_KEYS.AD_ID + '=233bcbee889d46d&' + TARGETING_KEYS.BIDDER + '=appnexus&' + TARGETING_KEYS.SIZE + '_triplelift=0x0&' + TARGETING_KEYS.PRICE_BUCKET + '_triplelift=10.00&' + TARGETING_KEYS.AD_ID + '_triplelift=222bb26f9e8bd&' + TARGETING_KEYS.BIDDER + '_triplelift=triplelift&' + TARGETING_KEYS.SIZE + '_appnexus=300x250&' + TARGETING_KEYS.PRICE_BUCKET + '_appnexus=10.00&' + TARGETING_KEYS.AD_ID + '_appnexus=233bcbee889d46d&' + TARGETING_KEYS.BIDDER + '_appnexus=appnexus&' + TARGETING_KEYS.SIZE + '_pagescience=300x250&' + TARGETING_KEYS.PRICE_BUCKET + '_pagescience=10.00&' + TARGETING_KEYS.AD_ID + '_pagescience=25bedd4813632d7&' + TARGETING_KEYS.BIDDER + '_pagescienc=pagescience&' + TARGETING_KEYS.SIZE + '_brightcom=300x250&' + TARGETING_KEYS.PRICE_BUCKET + '_brightcom=10.00&' + TARGETING_KEYS.AD_ID + '_brightcom=26e0795ab963896&' + TARGETING_KEYS.BIDDER + '_brightcom=brightcom&' + TARGETING_KEYS.SIZE + '_brealtime=300x250&' + TARGETING_KEYS.PRICE_BUCKET + '_brealtime=10.00&' + TARGETING_KEYS.AD_ID + '_brealtime=275bd666f5a5a5d&' + TARGETING_KEYS.BIDDER + '_brealtime=brealtime&' + TARGETING_KEYS.SIZE + '_pubmatic=300x250&' + TARGETING_KEYS.PRICE_BUCKET + '_pubmatic=10.00&' + TARGETING_KEYS.AD_ID + '_pubmatic=28f4039c636b6a7&' + TARGETING_KEYS.BIDDER + '_pubmatic=pubmatic&' + TARGETING_KEYS.SIZE + '_rubicon=300x600&' + TARGETING_KEYS.PRICE_BUCKET + '_rubicon=10.00&' + TARGETING_KEYS.AD_ID + '_rubicon=29019e2ab586a5a&' + TARGETING_KEYS.BIDDER + '_rubicon=rubicon';
       assert.equal(output, expected);
     });
 
@@ -119,6 +166,43 @@ describe('Utils', function () {
     });
   });
 
+  describe('sizesToSizeTuples', () => {
+    Object.entries({
+      'single size, numerical': {
+        in: [1, 2],
+        out: [[1, 2]]
+      },
+      'single size, numerical, nested': {
+        in: [[1, 2]],
+        out: [[1, 2]]
+      },
+      'multiple sizes, numerical': {
+        in: [[1, 2], [3, 4]],
+        out: [[1, 2], [3, 4]]
+      },
+      'single size, string': {
+        in: '1x2',
+        out: [[1, 2]]
+      },
+      'multiple sizes, string': {
+        in: '1x2, 4x3',
+        out: [[1, 2], [4, 3]]
+      },
+      'incorrect size, numerical': {
+        in: [1],
+        out: []
+      },
+      'incorrect size, string': {
+        in: '1x',
+        out: []
+      }
+    }).forEach(([t, {in: input, out}]) => {
+      it(`can parse ${t}`, () => {
+        expect(sizesToSizeTuples(input)).to.eql(out);
+      })
+    })
+  })
+
   describe('parseSizesInput', function () {
     it('should return query string using multi size array', function () {
       var sizes = [[728, 90], [970, 90]];
@@ -778,6 +862,22 @@ describe('Utils', function () {
         expect(parsed.search).to.equal('?search=test&foo=bar&bar=foo&foo=xxx');
       });
     });
+
+    describe('encodeMacroURI', () => {
+      [
+        ['https://www.example.com', 'https://www.example.com'],
+        ['https://www.example/${MACRO}', 'https://www.example/${MACRO}'],
+        ['http://www.example/è', `http://www.example/${encodeURIComponent('è')}`],
+        ['https://www.${MACRO_1}/${MACRO_1}/${MACRO_2}è', 'https://www.${MACRO_1}/${MACRO_1}/${MACRO_2}' + encodeURIComponent('è')],
+        ['http://${MACRO}${MACRO}/${MACRO}', 'http://${MACRO}${MACRO}/${MACRO}'],
+        ['{MACRO}${MACRO}', `${encodeURIComponent('{MACRO}')}\${MACRO}`],
+        ['https://www.example.com?p=${AUCTION_PRICE}', 'https://www.example.com?p=${AUCTION_PRICE}']
+      ].forEach(([input, expected]) => {
+        it(`can encode ${input} -> ${expected}`, () => {
+          expect(encodeMacroURI(input)).to.eql(expected);
+        })
+      })
+    })
   });
 
   describe('insertElement', function () {
@@ -1002,6 +1102,15 @@ describe('Utils', function () {
       const obj = {key: 'value'};
       expect(deepEqual({outer: obj}, {outer: new Typed(obj)}, {checkTypes: true})).to.be.false;
     });
+    it('should work when adding properties to the prototype of Array', () => {
+      after(function () {
+        // eslint-disable-next-line no-extend-native
+        delete Array.prototype.unitTestTempProp;
+      });
+      // eslint-disable-next-line no-extend-native
+      Array.prototype.unitTestTempProp = 'testing';
+      expect(deepEqual([], [])).to.be.true;
+    });
 
     describe('cyrb53Hash', function() {
       it('should return the same hash for the same string', function() {
@@ -1061,6 +1170,44 @@ describe('Utils', function () {
     });
   });
 
+  describe('getUnixTimestampFromNow', () => {
+    it('correctly obtains unix timestamp', () => {
+      const nowValue = new Date('2024-01-01').valueOf();
+      sinon.stub(Date, 'now').returns(nowValue);
+      let val = utils.getUnixTimestampFromNow();
+      expect(val).equal(nowValue);
+
+      val = utils.getUnixTimestampFromNow(1);
+      expect(val).equal(nowValue + (1000 * 60 * 60 * 24));
+
+      val = utils.getUnixTimestampFromNow(1, 'd');
+      expect(val).equal(nowValue + (1000 * 60 * 60 * 24));
+
+      val = utils.getUnixTimestampFromNow(1, 'm');
+      expect(val).equal(nowValue + (1000 * 60 * 60 * 24 / 1440));
+
+      val = utils.getUnixTimestampFromNow(2, 'm');
+      expect(val).equal(nowValue + (1000 * 60 * 60 * 24 * 2 / 1440));
+
+      // any value that isn't 'm' or 'd' gets treated as Date.now();
+      val = utils.getUnixTimestampFromNow(10, 'o');
+      expect(val).equal(nowValue);
+    });
+  });
+
+  describe('convertObjectToArray', () => {
+    it('correctly converts object to array', () => {
+      const obj = {key: 1, anotherKey: 'fred', third: ['fred'], fourth: {sub: {obj: 'test'}}};
+      const array = utils.convertObjectToArray(obj);
+
+      expect(JSON.stringify(array[0])).equal(JSON.stringify({'key': 1}))
+      expect(JSON.stringify(array[1])).equal(JSON.stringify({'anotherKey': 'fred'}))
+      expect(JSON.stringify(array[2])).equal(JSON.stringify({'third': ['fred']}))
+      expect(JSON.stringify(array[3])).equal(JSON.stringify({'fourth': {sub: {obj: 'test'}}}));
+      expect(array.length).to.equal(4);
+    });
+  });
+
   describe('setScriptAttributes', () => {
     it('correctly adds attributes from an object', () => {
       const script = document.createElement('script'),
@@ -1076,6 +1223,25 @@ describe('Utils', function () {
       expect(script.id).to.equal('newId');
     });
   });
+
+  describe('safeJSONParse', () => {
+    it('correctly encodes valid input', () => {
+      const jsonObj = {
+        key1: 'val1',
+        key2: {
+          key3: 100,
+          key4: true
+        }
+      };
+      const result = utils.safeJSONEncode(jsonObj);
+      expect(result).to.equal(`{"key1":"val1","key2":{"key3":100,"key4":true}}`);
+    });
+    it('return empty string for stringify errors', () => {
+      const jsonObj = {k: 2n};
+      const result = utils.safeJSONEncode(jsonObj);
+      expect(result).to.equal('');
+    });
+  });
 });
 
 describe('memoize', () => {
diff --git a/test/spec/videoCache_spec.js b/test/spec/videoCache_spec.js
index c746fdd2afd..7d07da9de90 100644
--- a/test/spec/videoCache_spec.js
+++ b/test/spec/videoCache_spec.js
@@ -1,39 +1,13 @@
 import chai from 'chai';
-import { getCacheUrl, store } from 'src/videoCache.js';
-import { config } from 'src/config.js';
-import { server } from 'test/mocks/xhr.js';
+import {batchingCache, getCacheUrl, store, _internal, storeBatch} from 'src/videoCache.js';
+import {config} from 'src/config.js';
+import {server} from 'test/mocks/xhr.js';
 import {auctionManager} from '../../src/auctionManager.js';
 import {AuctionIndex} from '../../src/auctionIndex.js';
-import { batchingCache } from '../../src/auction.js';
+import * as utils from 'src/utils.js';
 
 const should = chai.should();
 
-function getMockBid(bidder, auctionId, bidderRequestId) {
-  return {
-    'bidder': bidder,
-    'params': {
-      'placementId': '10433394',
-      'member': 123,
-      'keywords': {
-        'foo': ['bar', 'baz'],
-        'fizz': ['buzz']
-      }
-    },
-    'bid_id': '12345abc',
-    'adUnitCode': 'div-gpt-ad-1460505748561-0',
-    'mediaTypes': {
-      'banner': {
-        'sizes': [[300, 250]]
-      }
-    },
-    'transactionId': '4ef956ad-fd83-406d-bd35-e4bb786ab86c',
-    'sizes': [300, 250],
-    'bidId': '123',
-    'bidderRequestId': bidderRequestId,
-    'auctionId': auctionId
-  };
-}
-
 describe('The video cache', function () {
   function assertError(callbackSpy) {
     callbackSpy.calledOnce.should.equal(true);
@@ -126,9 +100,7 @@ describe('The video cache', function () {
     
       
         prebid.org wrapper
-        
-        
-        
+        \n        \n        
       
     
   `;
@@ -149,6 +121,20 @@ describe('The video cache', function () {
       assertRequestMade({ vastUrl: 'my-mock-url.com', vastImpUrl: 'imptracker.com', ttl: 25 }, expectedValue)
     });
 
+    it('should include multiple vastImpUrl when it\'s an array', function() {
+      const expectedValue = `
+    
+      
+        prebid.org wrapper
+        
+        
+        
+      
+    
+  `;
+      assertRequestMade({ vastUrl: 'my-mock-url.com', vastImpUrl: ['https://vasttracking.mydomain.com/vast?cpm=1.2', 'imptracker.com'], ttl: 25, cpm: 1.2 }, expectedValue)
+    });
+
     it('should make the expected request when store() is called on an ad with vastXml', function () {
       const vastXml = '';
       assertRequestMade({ vastXml: vastXml, ttl: 25 }, vastXml);
@@ -321,34 +307,36 @@ describe('The video cache', function () {
       JSON.parse(request.requestBody).should.deep.equal(payload);
     });
 
-    it('should wait the duration of the batchTimeout and pass the correct batchSize if batched requests are enabled in the config', () => {
-      const mockAfterBidAdded = function() {};
-      let callback = null;
-      let mockTimeout = sinon.stub().callsFake((cb) => { callback = cb });
+    if (FEATURES.VIDEO) {
+      it('should wait the duration of the batchTimeout and pass the correct batchSize if batched requests are enabled in the config', () => {
+        const mockAfterBidAdded = function() {};
+        let callback = null;
+        let mockTimeout = sinon.stub().callsFake((cb) => { callback = cb });
 
-      config.setConfig({
-        cache: {
-          url: 'https://prebid.adnxs.com/pbc/v1/cache',
-          batchSize: 3,
-          batchTimeout: 20
-        }
-      });
+        config.setConfig({
+          cache: {
+            url: 'https://prebid.adnxs.com/pbc/v1/cache',
+            batchSize: 3,
+            batchTimeout: 20
+          }
+        });
 
-      let stubCache = sinon.stub();
-      const batchAndStore = batchingCache(mockTimeout, stubCache);
-      for (let i = 0; i < 3; i++) {
-        batchAndStore({}, {}, mockAfterBidAdded);
-      }
+        let stubCache = sinon.stub();
+        const batchAndStore = batchingCache(mockTimeout, stubCache);
+        for (let i = 0; i < 3; i++) {
+          batchAndStore({}, {}, mockAfterBidAdded);
+        }
 
-      sinon.assert.calledOnce(mockTimeout);
-      sinon.assert.calledWith(mockTimeout, sinon.match.any, 20);
+        sinon.assert.calledOnce(mockTimeout);
+        sinon.assert.calledWith(mockTimeout, sinon.match.any, 20);
 
-      const expectedBatch = [{ afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }, { afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }, { afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }];
+        const expectedBatch = [{ afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }, { afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }, { afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }];
 
-      callback();
+        callback();
 
-      sinon.assert.calledWith(stubCache, expectedBatch);
-    });
+        sinon.assert.calledWith(stubCache, expectedBatch);
+      });
+    }
 
     function assertRequestMade(bid, expectedValue) {
       store([bid], function () { });
@@ -379,6 +367,35 @@ describe('The video cache', function () {
       return callback;
     }
   });
+
+  describe('storeBatch', () => {
+    let sandbox;
+    let err, cacheIds
+    beforeEach(() => {
+      err = null;
+      cacheIds = [];
+      sandbox = sinon.createSandbox();
+      sandbox.stub(utils, 'logError');
+      sandbox.stub(_internal, 'store').callsFake((_, cb) => cb(err, cacheIds));
+    });
+    afterEach(() => {
+      sandbox.restore();
+    })
+    it('should log an error when store replies with an error', () => {
+      err = new Error('err');
+      storeBatch([]);
+      sinon.assert.called(utils.logError);
+    });
+    it('should not process returned uuids if they do not match the batch size', () => {
+      const el = {auctionInstance: {}, bidResponse: {}, afterBidAdded: sinon.stub()}
+      const batch = [el, el];
+      cacheIds = [{uuid: 'mock-id'}]
+      storeBatch(batch);
+      expect(el.bidResponse.videoCacheKey).to.not.exist;
+      sinon.assert.notCalled(batch[0].afterBidAdded);
+      sinon.assert.called(utils.logError);
+    })
+  })
 });
 
 describe('The getCache function', function () {
diff --git a/test/spec/video_spec.js b/test/spec/video_spec.js
index 35d0a4fef24..0d2a32659e9 100644
--- a/test/spec/video_spec.js
+++ b/test/spec/video_spec.js
@@ -1,12 +1,27 @@
-import {fillVideoDefaults, isValidVideoBid} from 'src/video.js';
+import {fillVideoDefaults, isValidVideoBid, validateOrtbVideoFields} from 'src/video.js';
 import {hook} from '../../src/hook.js';
 import {stubAuctionIndex} from '../helpers/indexStub.js';
+import * as utils from '../../src/utils.js';
+import { syncOrtb2 } from '../../src/prebid.js';
 
 describe('video.js', function () {
+  let sandbox;
+  let utilsMock;
+
   before(() => {
     hook.ready();
   });
 
+  beforeEach(() => {
+    sandbox = sinon.createSandbox();
+    utilsMock = sandbox.mock(utils);
+  })
+
+  afterEach(() => {
+    utilsMock.restore();
+    sandbox.restore();
+  });
+
   describe('fillVideoDefaults', () => {
     function fillDefaults(videoMediaType = {}) {
       const adUnit = {mediaTypes: {video: videoMediaType}};
@@ -77,15 +92,103 @@ describe('video.js', function () {
     })
   })
 
+  describe('validateOrtbVideoFields', () => {
+    it('remove incorrect ortb properties, and keep non ortb ones', () => {
+      sandbox.spy(utils, 'logWarn');
+
+      const mt = {
+        content: 'outstream',
+
+        mimes: ['video/mp4'],
+        minduration: 5,
+        maxduration: 15,
+        startdelay: 0,
+        maxseq: 0,
+        poddur: 0,
+        protocols: [7],
+        w: 600,
+        h: 480,
+        podid: 'an-id',
+        podseq: 0,
+        rqddurs: [5],
+        placement: 1,
+        plcmt: 1,
+        linearity: 1,
+        skip: 0,
+        skipmin: 3,
+        skipafter: 3,
+        sequence: 0,
+        slotinpod: 0,
+        mincpmpersec: 2.5,
+        battr: [6, 7],
+        maxextended: 0,
+        minbitrate: 800,
+        maxbitrate: 1000,
+        boxingallowed: 1,
+        playbackmethod: [1],
+        playbackend: 1,
+        delivery: [2],
+        pos: 0,
+        api: 6, // -- INVALID
+        companiontype: [1, 2, 3],
+        poddedupe: [1],
+
+        otherOne: 'test',
+      };
+
+      const expected = {...mt};
+      delete expected.api;
+
+      const adUnit = {
+        code: 'adUnitCode',
+        mediaTypes: { video: mt }
+      };
+      validateOrtbVideoFields(adUnit);
+
+      expect(adUnit.mediaTypes.video).to.eql(expected);
+      sinon.assert.callCount(utils.logWarn, 1);
+    });
+
+    it('Early return when 1st param is not a plain object', () => {
+      sandbox.spy(utils, 'logWarn');
+
+      validateOrtbVideoFields();
+      validateOrtbVideoFields([]);
+      validateOrtbVideoFields(null);
+      validateOrtbVideoFields('hello');
+      validateOrtbVideoFields(() => {});
+
+      sinon.assert.callCount(utils.logWarn, 5);
+    });
+
+    it('Calls onInvalidParam when a property is invalid', () => {
+      const onInvalidParam = sandbox.spy();
+      const adUnit = {
+        code: 'adUnitCode',
+        mediaTypes: {
+          video: {
+            content: 'outstream',
+            mimes: ['video/mp4'],
+            api: 6
+          }
+        }
+      };
+      validateOrtbVideoFields(adUnit, onInvalidParam);
+
+      sinon.assert.calledOnce(onInvalidParam);
+      sinon.assert.calledWith(onInvalidParam, 'api', 6, adUnit);
+    });
+  })
+
   describe('isValidVideoBid', () => {
     it('validates valid instream bids', function () {
       const bid = {
         adId: '456xyz',
         vastUrl: 'http://www.example.com/vastUrl',
-        transactionId: 'au'
+        adUnitId: 'au'
       };
       const adUnits = [{
-        transactionId: 'au',
+        adUnitId: 'au',
         mediaTypes: {
           video: {context: 'instream'}
         }
@@ -96,10 +199,10 @@ describe('video.js', function () {
 
     it('catches invalid instream bids', function () {
       const bid = {
-        transactionId: 'au'
+        adUnitId: 'au'
       };
       const adUnits = [{
-        transactionId: 'au',
+        adUnitId: 'au',
         mediaTypes: {
           video: {context: 'instream'}
         }
@@ -110,26 +213,26 @@ describe('video.js', function () {
 
     it('catches invalid bids when prebid-cache is disabled', function () {
       const adUnits = [{
-        transactionId: 'au',
+        adUnitId: 'au',
         bidder: 'vastOnlyVideoBidder',
         mediaTypes: {video: {}},
       }];
 
-      const valid = isValidVideoBid({ transactionId: 'au', vastXml: 'vast' }, {index: stubAuctionIndex({adUnits})});
+      const valid = isValidVideoBid({ adUnitId: 'au', vastXml: 'vast' }, {index: stubAuctionIndex({adUnits})});
 
       expect(valid).to.equal(false);
     });
 
     it('validates valid outstream bids', function () {
       const bid = {
-        transactionId: 'au',
+        adUnitId: 'au',
         renderer: {
           url: 'render.url',
           render: () => true,
         }
       };
       const adUnits = [{
-        transactionId: 'au',
+        adUnitId: 'au',
         mediaTypes: {
           video: {context: 'outstream'}
         }
@@ -140,10 +243,10 @@ describe('video.js', function () {
 
     it('validates valid outstream bids with a publisher defined renderer', function () {
       const bid = {
-        transactionId: 'au',
+        adUnitId: 'au',
       };
       const adUnits = [{
-        transactionId: 'au',
+        adUnitId: 'au',
         mediaTypes: {
           video: {
             context: 'outstream',
@@ -160,10 +263,10 @@ describe('video.js', function () {
 
     it('catches invalid outstream bids', function () {
       const bid = {
-        transactionId: 'au',
+        adUnitId: 'au',
       };
       const adUnits = [{
-        transactionId: 'au',
+        adUnitId: 'au',
         mediaTypes: {
           video: {context: 'outstream'}
         }
@@ -172,4 +275,207 @@ describe('video.js', function () {
       expect(valid).to.equal(false);
     });
   })
+
+  describe('syncOrtb2', () => {
+    if (!FEATURES.VIDEO) {
+      return;
+    }
+
+    let logWarnSpy;
+
+    beforeEach(function () {
+      logWarnSpy = sinon.spy(utils, 'logWarn');
+    });
+
+    afterEach(function () {
+      utils.logWarn.restore();
+    });
+
+    it('should properly sync fields if both present', () => {
+      const adUnit = {
+        mediaTypes: {
+          video: {
+            minduration: 500,
+            maxduration: 1000,
+            protocols: [1, 2, 3],
+            linearity: 5, // should be overwritten with value from ortb2Imp
+            w: 100,
+            h: 200,
+            foo: 'omitted_value' // should be omitted during copying - not part of video obj spec
+          }
+        },
+        ortb2Imp: {
+          video: {
+            minbitrate: 10,
+            maxbitrate: 50,
+            delivery: [1, 2, 3, 4],
+            linearity: 10,
+            bar: 'omitted_value' // should be omitted during copying - not part of video obj spec
+          }
+        }
+      };
+
+      const expected = {
+        mediaTypes: {
+          video: {
+            minduration: 500,
+            maxduration: 1000,
+            protocols: [1, 2, 3],
+            w: 100,
+            h: 200,
+            minbitrate: 10,
+            maxbitrate: 50,
+            delivery: [1, 2, 3, 4],
+            linearity: 10,
+            foo: 'omitted_value'
+          }
+        },
+        ortb2Imp: {
+          video: {
+            minduration: 500,
+            maxduration: 1000,
+            protocols: [1, 2, 3],
+            w: 100,
+            h: 200,
+            minbitrate: 10,
+            maxbitrate: 50,
+            delivery: [1, 2, 3, 4],
+            linearity: 10,
+            bar: 'omitted_value'
+          }
+        }
+      };
+
+      syncOrtb2(adUnit, 'video');
+      expect(adUnit).to.deep.eql(expected);
+
+      assert.ok(logWarnSpy.calledOnce, 'expected warning was logged due to conflicting linearity');
+    });
+
+    it('should omit sync if video mediaType not present on adUnit', () => {
+      const adUnit = {
+        mediaTypes: {
+          native: {
+            fieldToOmit: 'omitted_value'
+          }
+        },
+        ortb2Imp: {
+          native: {
+            fieldToOmit2: 'omitted_value'
+          }
+        }
+      };
+
+      syncOrtb2(adUnit, 'video');
+
+      expect(adUnit.mediaTypes.video).to.be.undefined;
+      expect(adUnit.ortb2Imp.video).to.be.undefined;
+    });
+
+    it('should properly sync if mediaTypes is not present on any of side', () => {
+      const adUnit = {
+        mediaTypes: {
+          video: {
+            minduration: 500,
+            maxduration: 1000,
+            protocols: [1, 2, 3],
+            linearity: 5,
+            w: 100,
+            h: 200,
+            foo: 'omitted_value'
+          }
+        },
+        ortb2Imp: {
+          // lack of video field
+        }
+      };
+
+      const expected1 = {
+        mediaTypes: {
+          video: {
+            minduration: 500,
+            maxduration: 1000,
+            protocols: [1, 2, 3],
+            linearity: 5,
+            w: 100,
+            h: 200,
+            foo: 'omitted_value'
+          }
+        },
+        ortb2Imp: {
+          video: {
+            minduration: 500,
+            maxduration: 1000,
+            protocols: [1, 2, 3],
+            linearity: 5,
+            w: 100,
+            h: 200,
+          }
+        }
+      };
+
+      syncOrtb2(adUnit, 'video');
+      expect(adUnit).to.deep.eql(expected1);
+
+      const adUnit2 = {
+        mediaTypes: {
+          // lack of video field
+        },
+        ortb2Imp: {
+          video: {
+            minduration: 500,
+            maxduration: 1000,
+            protocols: [1, 2, 3],
+            linearity: 5,
+            w: 100,
+            h: 200,
+            foo: 'omitted_value'
+          }
+        }
+      };
+
+      const expected2 = {
+        mediaTypes: {
+          video: {
+            minduration: 500,
+            maxduration: 1000,
+            protocols: [1, 2, 3],
+            linearity: 5,
+            w: 100,
+            h: 200,
+          }
+        },
+        ortb2Imp: {
+          video: {
+            minduration: 500,
+            maxduration: 1000,
+            protocols: [1, 2, 3],
+            linearity: 5,
+            w: 100,
+            h: 200,
+            foo: 'omitted_value',
+          }
+        }
+      };
+
+      syncOrtb2(adUnit2, 'video');
+      expect(adUnit2).to.deep.eql(expected2);
+    });
+
+    it('should not create empty video object on ortb2Imp if there was nothing to copy', () => {
+      const adUnit2 = {
+        mediaTypes: {
+          video: {
+            noOrtbVideoField1: 'value',
+            noOrtbVideoField2: 'value'
+          }
+        },
+        ortb2Imp: {
+          // lack of video field
+        }
+      };
+      syncOrtb2(adUnit2, 'video');
+      expect(adUnit2.ortb2Imp.video).to.be.undefined
+    });
+  });
 });
diff --git a/test/test_deps.js b/test/test_deps.js
index 35713106f8c..3f0f766b457 100644
--- a/test/test_deps.js
+++ b/test/test_deps.js
@@ -4,8 +4,19 @@ window.process = {
   }
 };
 
+window.addEventListener('error', function (ev) {
+  // eslint-disable-next-line no-console
+  console.error('Uncaught exception:', ev.error, ev.error?.stack);
+})
+
+window.addEventListener('unhandledrejection', function (ev) {
+  // eslint-disable-next-line no-console
+  console.error('Unhandled rejection:', ev.reason);
+})
+
 require('test/helpers/consentData.js');
 require('test/helpers/prebidGlobal.js');
 require('test/mocks/adloaderStub.js');
 require('test/mocks/xhr.js');
 require('test/mocks/analyticsStub.js');
+require('test/mocks/ortbConverter.js')
diff --git a/test/test_index.js b/test/test_index.js
index ce9b671be89..030082735c3 100644
--- a/test/test_index.js
+++ b/test/test_index.js
@@ -1,25 +1,4 @@
-[it, describe].forEach((ob) => {
-  ob.only = function () {
-    [
-      'describe.only and it.only are disabled unless you provide a single spec --file,',
-      'because they can silently break the pipeline tests',
-      // eslint-disable-next-line no-console
-    ].forEach(l => console.error(l))
-    throw new Error('do not use .only()')
-  };
-});
-
-[it, describe].forEach((ob) => {
-  ob.skip = function () {
-    [
-      'describe.skip and it.skip are disabled,',
-      'because they pollute the pipeline test output',
-      // eslint-disable-next-line no-console
-    ].forEach(l => console.error(l))
-    throw new Error('do not use .skip()')
-  };
-});
-
+require('./pipeline_setup.js');
 require('./test_deps.js');
 
 var testsContext = require.context('.', true, /_spec$/);
diff --git a/wdio.conf.js b/wdio.conf.js
index 3d93f909971..d23fecd0b15 100644
--- a/wdio.conf.js
+++ b/wdio.conf.js
@@ -1,3 +1,5 @@
+const shared = require('./wdio.shared.conf.js');
+
 const browsers = Object.fromEntries(
   Object.entries(require('./browsers.json'))
     .filter(([k, v]) => {
@@ -35,14 +37,7 @@ function getCapabilities() {
 }
 
 exports.config = {
-  specs: [
-    './test/spec/e2e/**/*.spec.js',
-  ],
-  exclude: [
-    // TODO: decipher original intent for "longform" tests
-    // they all appear to be almost exact copies
-    './test/spec/e2e/longform/**/*'
-  ],
+  ...shared.config,
   services: [
     ['browserstack', {
       browserstackLocal: true
@@ -53,17 +48,4 @@ exports.config = {
   maxInstances: 5, // Do not increase this, since we have only 5 parallel tests in browserstack account
   maxInstancesPerCapability: 1,
   capabilities: getCapabilities(),
-  logLevel: 'info', // put option here: info | trace | debug | warn| error | silent
-  bail: 0,
-  waitforTimeout: 60000, // Default timeout for all waitFor* commands.
-  connectionRetryTimeout: 60000, // Default timeout in milliseconds for request if Selenium Grid doesn't send response
-  connectionRetryCount: 3, // Default request retries count
-  framework: 'mocha',
-  mochaOpts: {
-    ui: 'bdd',
-    timeout: 60000,
-    compilers: ['js:babel-register'],
-  },
-  // if you see error, update this to spec reporter and logLevel above to get detailed report.
-  reporters: ['spec']
 }
diff --git a/wdio.local.conf.js b/wdio.local.conf.js
new file mode 100644
index 00000000000..772448472bf
--- /dev/null
+++ b/wdio.local.conf.js
@@ -0,0 +1,13 @@
+const shared = require('./wdio.shared.conf.js');
+
+exports.config = {
+  ...shared.config,
+  capabilities: [
+    {
+      browserName: 'chrome',
+      'goog:chromeOptions': {
+        args: ['headless', 'disable-gpu'],
+      },
+    },
+  ],
+};
diff --git a/wdio.shared.conf.js b/wdio.shared.conf.js
new file mode 100644
index 00000000000..08b46eaab91
--- /dev/null
+++ b/wdio.shared.conf.js
@@ -0,0 +1,23 @@
+exports.config = {
+  specs: [
+    './test/spec/e2e/**/*.spec.js',
+  ],
+  exclude: [
+    // TODO: decipher original intent for "longform" tests
+    // they all appear to be almost exact copies
+    './test/spec/e2e/longform/**/*'
+  ],
+  logLevel: 'info', // put option here: info | trace | debug | warn| error | silent
+  bail: 0,
+  waitforTimeout: 60000, // Default timeout for all waitFor* commands.
+  connectionRetryTimeout: 60000, // Default timeout in milliseconds for request if Selenium Grid doesn't send response
+  connectionRetryCount: 3, // Default request retries count
+  framework: 'mocha',
+  mochaOpts: {
+    ui: 'bdd',
+    timeout: 60000,
+    compilers: ['js:@babel/register'],
+  },
+  // if you see error, update this to spec reporter and logLevel above to get detailed report.
+  reporters: ['spec']
+}
diff --git a/webpack.conf.js b/webpack.conf.js
index 0ead550e446..5b0d864045e 100644
--- a/webpack.conf.js
+++ b/webpack.conf.js
@@ -51,9 +51,6 @@ module.exports = {
       'prebid-core': {
         import: './src/prebid.js'
       },
-      'debugging-standalone': {
-        import: './modules/debugging/standalone.js'
-      }
     };
     const selectedModules = new Set(helpers.getArgModules());
 
@@ -128,10 +125,19 @@ module.exports = {
               return [lib, def];
             })
         );
+        const core = path.resolve('./src');
+
         return Object.assign(libraries, {
+          core: {
+            name: 'chunk-core',
+            test: (module) => {
+              return module.resource && module.resource.startsWith(core);
+            }
+          },
+        }, {
           default: false,
           defaultVendors: false
-        })
+        });
       })()
     }
   },
diff --git a/webpack.creative.js b/webpack.creative.js
new file mode 100644
index 00000000000..86f5f24d580
--- /dev/null
+++ b/webpack.creative.js
@@ -0,0 +1,25 @@
+const path = require('path');
+
+module.exports = {
+  mode: 'production',
+  resolve: {
+    modules: [
+      path.resolve('.'),
+      'node_modules'
+    ],
+  },
+  entry: {
+    'creative': {
+      import: './creative/crossDomain.js',
+    },
+    'renderers/display': {
+      import: './creative/renderers/display/renderer.js'
+    },
+    'renderers/native': {
+      import: './creative/renderers/native/renderer.js'
+    }
+  },
+  output: {
+    path: path.resolve('./build/creative'),
+  },
+}
diff --git a/webpack.debugging.js b/webpack.debugging.js
new file mode 100644
index 00000000000..3952649c557
--- /dev/null
+++ b/webpack.debugging.js
@@ -0,0 +1,30 @@
+var path = require('path');
+
+module.exports = {
+  mode: 'production',
+  devtool: 'source-map',
+  resolve: {
+    modules: [
+      path.resolve('.'),
+      'node_modules'
+    ],
+  },
+  entry: {
+    'debugging-standalone': {
+      import: './modules/debugging/standalone.js',
+    }
+  },
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: path.resolve('./node_modules'), // required to prevent loader from choking non-Prebid.js node_modules
+        use: [
+          {
+            loader: 'babel-loader'
+          }
+        ]
+      },
+    ]
+  }
+};

From 30cd778d5d9f97c440a8956cb7eda9de13f90185 Mon Sep 17 00:00:00 2001
From: AcuityAds 
Date: Mon, 16 Dec 2024 14:53:02 +0200
Subject: [PATCH 09/12] add gvlid

---
 modules/acuityadsBidAdapter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/acuityadsBidAdapter.js b/modules/acuityadsBidAdapter.js
index bd85d2b3cc0..99ed8dc7f28 100644
--- a/modules/acuityadsBidAdapter.js
+++ b/modules/acuityadsBidAdapter.js
@@ -3,11 +3,13 @@ import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'acuityads';
+const GVLID = 231;
 const AD_URL = 'https://prebid.admanmedia.com/pbjs';
 const SYNC_URL = 'https://cs.admanmedia.com';
 
 export const spec = {
-  code: BIDDER_CODE,
+  code: BIDDER_CODE,  
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   isBidRequestValid: isBidRequestValid(['placementId']),

From e29b6f52644ed7f93e4bf4c1b9a89988b770225d Mon Sep 17 00:00:00 2001
From: AcuityAds 
Date: Sun, 12 Jan 2025 19:05:26 +0200
Subject: [PATCH 10/12] add endpointId param

---
 modules/acuityadsBidAdapter.js                |  2 +-
 test/spec/modules/acuityadsBidAdapter_spec.js | 49 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/modules/acuityadsBidAdapter.js b/modules/acuityadsBidAdapter.js
index 3caaacb46a4..b94234c2c26 100644
--- a/modules/acuityadsBidAdapter.js
+++ b/modules/acuityadsBidAdapter.js
@@ -12,7 +12,7 @@ export const spec = {
   gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  isBidRequestValid: isBidRequestValid(['placementId']),
+  isBidRequestValid: isBidRequestValid(),
   buildRequests: buildRequests(AD_URL),
   interpretResponse,
   getUserSyncs: getUserSyncs(SYNC_URL)
diff --git a/test/spec/modules/acuityadsBidAdapter_spec.js b/test/spec/modules/acuityadsBidAdapter_spec.js
index ecc40025c95..3f2705a26c3 100644
--- a/test/spec/modules/acuityadsBidAdapter_spec.js
+++ b/test/spec/modules/acuityadsBidAdapter_spec.js
@@ -191,6 +191,55 @@ describe('AcuityAdsBidAdapter', function () {
       }
     });
 
+    it('Returns valid endpoints', function () {
+      const bids = [
+        {
+          bidId: getUniqueIdentifierStr(),
+          bidder: bidder,
+          mediaTypes: {
+            [BANNER]: {
+              sizes: [[300, 250]]
+            }
+          },
+          params: {
+            endpointId: 'testBanner',
+          },
+          userIdAsEids
+        }
+      ];
+
+      let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.endpointId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('network');
+        expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
     it('Returns data with gdprConsent and without uspConsent', function () {
       delete bidderRequest.uspConsent;
       serverRequest = spec.buildRequests(bids, bidderRequest);

From 0a429564b43f221ad7a49030602d034b2e2cf4af Mon Sep 17 00:00:00 2001
From: Kanceliarenko 
Date: Wed, 2 Jul 2025 15:28:31 +0300
Subject: [PATCH 11/12] add publisherId to placement

---
 modules/acuityadsBidAdapter.js                | 20 +++++++++++++++++--
 modules/acuityadsBidAdapter.md                |  9 +++++++--
 test/spec/modules/acuityadsBidAdapter_spec.js |  1 +
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/modules/acuityadsBidAdapter.js b/modules/acuityadsBidAdapter.js
index b94234c2c26..cf5a5d5c2bb 100644
--- a/modules/acuityadsBidAdapter.js
+++ b/modules/acuityadsBidAdapter.js
@@ -1,19 +1,35 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { isBidRequestValid, buildRequests, interpretResponse, getUserSyncs } from '../libraries/teqblazeUtils/bidderUtils.js';
+import {
+  isBidRequestValid,
+  buildRequestsBase,
+  interpretResponse,
+  getUserSyncs,
+  buildPlacementProcessingFunction
+} from '../libraries/teqblazeUtils/bidderUtils.js';
 
 const BIDDER_CODE = 'acuityads';
 const GVLID = 231;
 const AD_URL = 'https://prebid.admanmedia.com/pbjs';
 const SYNC_URL = 'https://cs.admanmedia.com';
 
+const addCustomFieldsToPlacement = (bid, bidderRequest, placement) => {
+  placement.publisherId = bid.params.publisherId || '';
+};
+
+const placementProcessingFunction = buildPlacementProcessingFunction({ addCustomFieldsToPlacement });
+
+const buildRequests = (validBidRequests = [], bidderRequest = {}) => {
+  return buildRequestsBase({ adUrl: AD_URL, validBidRequests, bidderRequest, placementProcessingFunction });
+};
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   isBidRequestValid: isBidRequestValid(),
-  buildRequests: buildRequests(AD_URL),
+  buildRequests: buildRequests(),
   interpretResponse,
   getUserSyncs: getUserSyncs(SYNC_URL)
 };
diff --git a/modules/acuityadsBidAdapter.md b/modules/acuityadsBidAdapter.md
index 7f001cd9376..2aa355a3054 100644
--- a/modules/acuityadsBidAdapter.md
+++ b/modules/acuityadsBidAdapter.md
@@ -27,7 +27,8 @@ AcuityAds bid adapter supports Banner, Video (instream and outstream) and Native
                             bidder: 'acuityads',
                             params: {
                                 placementId: 'testBanner',
-                            }
+                                endpointId: 'testBanner',
+                                publisherId: 'testBanner',
                         }
                     ]
                 },
@@ -46,6 +47,8 @@ AcuityAds bid adapter supports Banner, Video (instream and outstream) and Native
                             bidder: 'acuityads',
                             params: {
                                 placementId: 'testVideo',
+                                endpointId: 'testVideo',
+                                publisherId: 'testVideo',
                             }
                         }
                     ]
@@ -71,9 +74,11 @@ AcuityAds bid adapter supports Banner, Video (instream and outstream) and Native
                             bidder: 'acuityads',
                             params: {
                                 placementId: 'testNative',
+                                endpointId: 'testNative',
+                                publisherId: 'testNative',
                             }
                         }
                     ]
                 }
             ];
-```
\ No newline at end of file
+```
diff --git a/test/spec/modules/acuityadsBidAdapter_spec.js b/test/spec/modules/acuityadsBidAdapter_spec.js
index 3f2705a26c3..736bb8fdbb9 100644
--- a/test/spec/modules/acuityadsBidAdapter_spec.js
+++ b/test/spec/modules/acuityadsBidAdapter_spec.js
@@ -171,6 +171,7 @@ describe('AcuityAdsBidAdapter', function () {
         expect(placement.bidfloor).to.exist.and.to.equal(0);
         expect(placement.type).to.exist.and.to.equal('publisher');
         expect(placement.eids).to.exist.and.to.be.deep.equal(userIdAsEids);
+        expect(placement.publisherId).to.exist.and.to.be.a('string');
 
         if (placement.adFormat === BANNER) {
           expect(placement.sizes).to.be.an('array');

From b7d84db0ed8f2d543f205ad1d0d143ad91b42d32 Mon Sep 17 00:00:00 2001
From: AcuityAdsIntegrations 
Date: Thu, 3 Jul 2025 13:04:29 +0300
Subject: [PATCH 12/12] fix import issue

---
 modules/acuityadsBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/acuityadsBidAdapter.js b/modules/acuityadsBidAdapter.js
index cf5a5d5c2bb..2ddd0eb81de 100644
--- a/modules/acuityadsBidAdapter.js
+++ b/modules/acuityadsBidAdapter.js
@@ -29,7 +29,7 @@ export const spec = {
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   isBidRequestValid: isBidRequestValid(),
-  buildRequests: buildRequests(),
+  buildRequests,
   interpretResponse,
   getUserSyncs: getUserSyncs(SYNC_URL)
 };